diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 119f883aa..8d62c1525 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-ARG RUBY_VERSION=3.4.7
+ARG RUBY_VERSION=3.4.9
 FROM ruby:${RUBY_VERSION}-slim-bookworm
 
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/.env.example b/.env.example
index 9128d758a..c84d0e414 100644
--- a/.env.example
+++ b/.env.example
@@ -27,7 +27,8 @@ OPENAI_URI_BASE=
 
 # Optional: LLM token budget (applies to chat, auto-categorize, merchant detection, PDF processing).
 # Lower these for small-context local models (Ollama, LM Studio, LocalAI).
-# Defaults work for modern cloud OpenAI models without configuration.
+# For larger local models, raise the context window to match the model you actually run.
+# Example: Gemma 3/4, Qwen, and other large-context models often need `LLM_CONTEXT_WINDOW=8192` or higher.
 # LLM_CONTEXT_WINDOW=2048
 # LLM_MAX_RESPONSE_TOKENS=512
 # LLM_MAX_HISTORY_TOKENS=
@@ -111,6 +112,13 @@ REDIS_URL=redis://localhost:6379/1
 # REDIS_SENTINEL_USERNAME=default
 # REDIS_PASSWORD=your-redis-password # pipelock:ignore
 
+# Sidekiq Web UI (/sidekiq)
+# The queue dashboard is reachable in production only by signed-in super admins
+# (the first user created on the instance). Optionally set BOTH variables below
+# to require basic-auth credentials as a second layer on top of that.
+# SIDEKIQ_WEB_USERNAME=
+# SIDEKIQ_WEB_PASSWORD=
+
 # App Domain
 # This is the domain that your Sure instance will be hosted at. It is used to generate links in emails and other places.
 APP_DOMAIN=
@@ -138,6 +146,14 @@ POSTHOG_HOST=
 # Disable enforcing SSL connections
 # DISABLE_SSL=true
 
+# Customizations to outbound SSL/TLS connections
+# Path to custom CA certificate (PEM format)
+# SSL_CA_FILE=
+# Enable/disable SSL verification
+# SSL_VERIFY=true
+# Enable verbose SSL logging
+# SSL_DEBUG=false
+
 # Active Record Encryption Keys (Optional)
 # These keys are used to encrypt sensitive data like API keys in the database.
 # For managed mode: Set these environment variables to provide encryption keys.
diff --git a/.env.local.example b/.env.local.example
index fea16335c..383fb71ac 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -12,6 +12,11 @@ SIMPLEFIN_DEBUG_RAW=false
 # SIMPLEFIN_INCLUDE_PENDING: when truthy, forces `pending=1` on SimpleFIN fetches when caller doesn't specify `pending:`
 SIMPLEFIN_INCLUDE_PENDING=false
 
+# SnapTrade OAuth app credentials (register an OAuth app at https://dashboard.snaptrade.com,
+# add https://<your-host>/snaptrade_items/oauth_callback as a redirect URI)
+SNAPTRADE_OAUTH_CLIENT_ID=
+SNAPTRADE_OAUTH_CLIENT_SECRET=
+
 # Lunchflow runtime flags (default-off)
 # LUNCHFLOW_DEBUG_RAW: when truthy, logs the raw payload returned by Lunchflow (debug-only; can be noisy)
 LUNCHFLOW_DEBUG_RAW=false
diff --git a/.env.test.example b/.env.test.example
index 02d7fea24..e8f7848de 100644
--- a/.env.test.example
+++ b/.env.test.example
@@ -11,6 +11,11 @@ SIMPLEFIN_DEBUG_RAW=false
 # SIMPLEFIN_INCLUDE_PENDING: when truthy, forces `pending=1` on SimpleFIN fetches when caller doesn't specify `pending:`
 SIMPLEFIN_INCLUDE_PENDING=false
 
+# SnapTrade OAuth app credentials (register an OAuth app at https://dashboard.snaptrade.com,
+# add https://<your-host>/snaptrade_items/oauth_callback as a redirect URI)
+SNAPTRADE_OAUTH_CLIENT_ID=
+SNAPTRADE_OAUTH_CLIENT_SECRET=
+
 # Lunchflow runtime flags (default-off)
 # LUNCHFLOW_DEBUG_RAW: when truthy, logs the raw payload returned by Lunchflow (debug-only; can be noisy)
 LUNCHFLOW_DEBUG_RAW=false
diff --git a/.gitattributes b/.gitattributes
index b387bb10a..36ff81d2b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,3 +15,4 @@ config/credentials.yml.enc diff=rails_credentials
 bin/* text eol=lf
 *.sh text eol=lf
 *.rb text eol=lf
+.devcontainer/.bashrc text eol=lf
diff --git a/.github/workflows/chart-ci.yml b/.github/workflows/chart-ci.yml
index 8ca9111d4..a80af679f 100644
--- a/.github/workflows/chart-ci.yml
+++ b/.github/workflows/chart-ci.yml
@@ -1,6 +1,7 @@
 name: Chart CI
 
 on:
+  workflow_dispatch:
   pull_request:
     paths:
       - 'charts/**'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9ab5d2c4..76d7c52a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -90,7 +90,7 @@ jobs:
     env:
       PLAID_CLIENT_ID: foo
       PLAID_SECRET: bar
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432 # pipelock:ignore
       REDIS_URL: redis://localhost:6379
       RAILS_ENV: test
 
@@ -141,7 +141,7 @@ jobs:
     env:
       PLAID_CLIENT_ID: foo
       PLAID_SECRET: bar
-      DATABASE_URL: postgres://postgres:postgres@localhost:5432
+      DATABASE_URL: postgres://postgres:postgres@localhost:5432 # pipelock:ignore
       REDIS_URL: redis://localhost:6379
       RAILS_ENV: test
 
diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml
new file mode 100644
index 000000000..222ecf164
--- /dev/null
+++ b/.github/workflows/desktop-release.yml
@@ -0,0 +1,82 @@
+name: Desktop Build
+
+# Build the macOS desktop app as part of the normal Sure release. The caller
+# supplies the v* release ref, so desktop versions cannot diverge independently.
+on:
+  workflow_call:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build macOS Desktop App
+    runs-on: macos-latest # Apple Silicon runner; cross-builds the x86_64 slice
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          persist-credentials: false
+
+      - name: Resolve and verify release version
+        id: ver
+        shell: bash
+        run: |
+          set -euo pipefail
+          VERSION="$(tr -d '[:space:]' < .sure-version)"
+          TAG_VERSION="${GITHUB_REF_NAME#v}"
+
+          if [ -z "$VERSION" ]; then
+            echo "::error::.sure-version is empty or unreadable"
+            exit 1
+          fi
+          if [ "$VERSION" != "$TAG_VERSION" ]; then
+            echo "::error::.sure-version ($VERSION) does not match release tag (v$TAG_VERSION)"
+            exit 1
+          fi
+          echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+([.-][0-9A-Za-z.-]+)?$' \
+            || { echo "::error::invalid version '$VERSION'"; exit 1; }
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Stamp desktop version for the build
+        env:
+          VERSION: ${{ steps.ver.outputs.version }}
+        run: |
+          set -euo pipefail
+          npm version "$VERSION" --no-git-tag-version --allow-same-version --prefix desktop
+          tmp="$(mktemp)"
+          jq --arg v "$VERSION" '.version = $v' desktop/src-tauri/tauri.conf.json > "$tmp"
+          mv "$tmp" desktop/src-tauri/tauri.conf.json
+          perl -0pi -e 's/(^version = ").*?(")/$1$ENV{VERSION}$2/m' desktop/src-tauri/Cargo.toml
+          perl -0pi -e 's/(name = "sure-desktop"\nversion = ").*?(")/$1$ENV{VERSION}$2/' desktop/src-tauri/Cargo.lock
+
+      # No dependency/build caches on the release workflow: a poisoned Actions
+      # cache written by another workflow must never flow into a published .dmg.
+      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        with:
+          node-version: 20
+
+      - uses: dtolnay/rust-toolchain@4cda84d5c5c54efe2404f9d843567869ab1699d4 # stable
+        with:
+          targets: aarch64-apple-darwin,x86_64-apple-darwin
+
+      - name: Install frontend dependencies
+        working-directory: desktop
+        run: npm ci
+
+      - name: Build universal unsigned DMG
+        uses: tauri-apps/tauri-action@84b9d35b5fc46c1e45415bdb6144030364f7ebc5 # v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          projectPath: desktop
+          includeUpdaterJson: false
+          args: --target universal-apple-darwin
+
+      - name: Upload desktop DMG
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        with:
+          name: desktop-release-dmg
+          path: desktop/src-tauri/target/universal-apple-darwin/release/bundle/dmg/*.dmg
+          if-no-files-found: error
+          retention-days: 1
diff --git a/.github/workflows/gittensor-impact.yml b/.github/workflows/gittensor-impact.yml
new file mode 100644
index 000000000..64bec0433
--- /dev/null
+++ b/.github/workflows/gittensor-impact.yml
@@ -0,0 +1,32 @@
+name: Gittensor Impact Report
+
+on:
+  schedule:
+    # Refresh daily at 14:00 UTC.
+    - cron: "0 14 * * *"
+  workflow_dispatch:
+    inputs:
+      since:
+        description: "Git date window for the report"
+        default: "30 days ago"
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  refresh:
+    name: Refresh Gittensor impact assets
+    if: github.repository == 'we-promise/sure'
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: matthewevans/gittensor-impact-action@v1
+        with:
+          repo: we-promise/sure
+          since: ${{ inputs.since || '30 days ago' }}
+          publish-mode: branch
+          asset-branch: gittensor-impact-assets
+          title: "Sure is part of the Gittensor community"
+          accent-color: "#ff6a00"
+          neutral-color: "#85898b"
\ No newline at end of file
diff --git a/.github/workflows/helm-publish.yml b/.github/workflows/helm-publish.yml
index 510c64049..0588162c0 100644
--- a/.github/workflows/helm-publish.yml
+++ b/.github/workflows/helm-publish.yml
@@ -40,6 +40,12 @@ jobs:
       - name: Resolve chart and app versions
         id: version
         shell: bash
+        # Bind workflow inputs to env so the values arrive as shell variables
+        # instead of being interpolated verbatim by the `${{ }}` runner pass.
+        # zizmor flags the direct expansion as a template-injection risk.
+        env:
+          CHART_VERSION_INPUT: ${{ inputs.chart_version }}
+          APP_VERSION_INPUT: ${{ inputs.app_version }}
         run: |
           set -euo pipefail
 
@@ -48,18 +54,24 @@ jobs:
             echo "${raw#v}"
           }
 
-          if [ -n "${{ inputs.chart_version }}" ]; then
-            CHART_VERSION="$(normalize_version "${{ inputs.chart_version }}")"
+          if [ -n "$CHART_VERSION_INPUT" ]; then
+            CHART_VERSION="$(normalize_version "$CHART_VERSION_INPUT")"
           elif [[ "${GITHUB_REF_TYPE}" == "tag" && "${GITHUB_REF_NAME}" == v* ]]; then
             CHART_VERSION="$(normalize_version "${GITHUB_REF_NAME}")"
           else
             CHART_VERSION="0.0.0-nightly.$(date -u +'%Y%m%d.%H%M%S')"
           fi
 
-          if [ -n "${{ inputs.app_version }}" ]; then
-            APP_VERSION="${{ inputs.app_version }}"
+          # Normalize APP_VERSION the same way CHART_VERSION is — appVersion
+          # must match the OCI image tag in GHCR, which is published without a
+          # leading `v`. Without this, a release on tag `v0.7.1-rc.1` writes
+          # `appVersion: "v0.7.1-rc.1"` into Chart.yaml / index.yaml, and Helm
+          # then fails to pull `ghcr.io/we-promise/sure:v0.7.1-rc.1` (the real
+          # tag is `0.7.1-rc.1`). See #2050.
+          if [ -n "$APP_VERSION_INPUT" ]; then
+            APP_VERSION="$(normalize_version "$APP_VERSION_INPUT")"
           elif [[ "${GITHUB_REF_TYPE}" == "tag" && "${GITHUB_REF_NAME}" == v* ]]; then
-            APP_VERSION="${GITHUB_REF_NAME}"
+            APP_VERSION="$(normalize_version "${GITHUB_REF_NAME}")"
           else
             APP_VERSION="${CHART_VERSION}"
           fi
diff --git a/.github/workflows/ios-testflight.yml b/.github/workflows/ios-testflight.yml
index 13ae2f52c..718f49bad 100644
--- a/.github/workflows/ios-testflight.yml
+++ b/.github/workflows/ios-testflight.yml
@@ -153,7 +153,7 @@ jobs:
         working-directory: mobile
         if: ${{ steps.check_prereqs.outputs.enabled == 'true' }}
         env:
-          APP_BUNDLE_ID: am.sure.mobile
+          APP_BUNDLE_ID: ${{ vars.IOS_APP_BUNDLE_ID || 'am.sure.mobile' }}
           IOS_TEAM_ID: ${{ secrets.IOS_TEAM_ID }}
           PROFILE_NAME: ${{ secrets.IOS_PROVISIONING_PROFILE_NAME }}
           IOS_DISTRIBUTION_CERT_NAME: ${{ secrets.IOS_DISTRIBUTION_CERT_NAME }}
@@ -173,14 +173,16 @@ jobs:
           path = Path("ios/Runner.xcodeproj/project.pbxproj")
           text = path.read_text()
 
+          app_bundle_id = os.environ["APP_BUNDLE_ID"]
           team = os.environ["IOS_TEAM_ID"]
           profile = os.environ["PROFILE_NAME"]
           identity = os.environ["IOS_DISTRIBUTION_CERT_NAME"]
 
           def patch_block(match):
               block = match.group(0)
-              if "PRODUCT_BUNDLE_IDENTIFIER = am.sure.mobile;" not in block:
+              if "PRODUCT_BUNDLE_IDENTIFIER =" not in block:
                   return block
+              block = re.sub(r'PRODUCT_BUNDLE_IDENTIFIER = .*?;', f'PRODUCT_BUNDLE_IDENTIFIER = {app_bundle_id};', block)
               if "CODE_SIGN_STYLE = Manual;" not in block:
                   block = block.replace("CURRENT_PROJECT_VERSION = \"$(FLUTTER_BUILD_NUMBER)\";", "CURRENT_PROJECT_VERSION = \"$(FLUTTER_BUILD_NUMBER)\";\n\t\t\t\tCODE_SIGN_STYLE = Manual;")
               if '"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Distribution";' not in block:
diff --git a/.github/workflows/llm-evals.yml b/.github/workflows/llm-evals.yml
index aaa5a13a1..249afa96b 100644
--- a/.github/workflows/llm-evals.yml
+++ b/.github/workflows/llm-evals.yml
@@ -11,7 +11,7 @@ permissions:
 env:
   EVAL_MODELS: gpt-4.1
   RAILS_ENV: test
-  DATABASE_URL: postgres://postgres:postgres@localhost:5432
+  DATABASE_URL: postgres://postgres:postgres@localhost:5432 # pipelock:ignore
   REDIS_URL: redis://localhost:6379
   PLAID_CLIENT_ID: foo
   PLAID_SECRET: bar
diff --git a/.github/workflows/pipelock.yml b/.github/workflows/pipelock.yml
index f19d3b94f..d0e7c72cb 100644
--- a/.github/workflows/pipelock.yml
+++ b/.github/workflows/pipelock.yml
@@ -17,8 +17,9 @@ jobs:
           persist-credentials: false
 
       - name: Pipelock Scan
-        uses: luckyPipewrench/pipelock@cef4f47eb99ffe00e20fa7d1423bff1a44742dbe # v2.4.0
+        uses: luckyPipewrench/pipelock@818ca0a7af4dbcd56ada7fa57e2dc32f9e799e34 # v2.8.0
         with:
+          version: '2.8.0'
           scan-diff: 'true'
           fail-on-findings: 'true'
           test-vectors: 'false'
@@ -30,3 +31,6 @@ jobs:
             docs/hosting/ai.md
             app/models/provider/binance.rb
             workers/preview/package-lock.json
+            # Preview Dockerfile uses local dev credentials (rails/rails) that are
+            # not real secrets; Dockerfile format does not support inline # pipelock:ignore
+            Dockerfile.preview
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index edd1e2f6e..5c9e4fd50 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,6 +1,7 @@
 name: Pull Request
 
 on:
+  workflow_dispatch:
   pull_request:
     types: [opened, synchronize, reopened, labeled]
     paths-ignore:
diff --git a/.github/workflows/preview-cleanup.yml b/.github/workflows/preview-cleanup.yml
index 60f21c8d9..052708868 100644
--- a/.github/workflows/preview-cleanup.yml
+++ b/.github/workflows/preview-cleanup.yml
@@ -24,7 +24,12 @@ permissions:
 jobs:
   cleanup-on-close:
     name: Cleanup closed PR preview
-    if: github.event_name == 'pull_request' && (github.event.action == 'closed' || (github.event.action == 'unlabeled' && github.event.label.name == 'preview-cf'))
+    if: |
+      github.event_name == 'pull_request' &&
+      (
+        (github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'preview-cf')) ||
+        (github.event.action == 'unlabeled' && github.event.label.name == 'preview-cf')
+      )
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
@@ -34,27 +39,51 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Setup Node.js
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
-        with:
-          node-version: "24"
-
-      - name: Install Wrangler
-        run: npm install -g wrangler
-
       - name: Delete preview Worker
         env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_PREVIEW_API_TOKEN || secrets.CLOUDFLARE_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
         run: |
+          set -euo pipefail
+
           WORKER_NAME="sure-preview-${{ github.event.pull_request.number }}"
           echo "Deleting Worker: $WORKER_NAME"
 
+          if [ -z "${CLOUDFLARE_API_TOKEN:-}" ] || [ -z "${CLOUDFLARE_ACCOUNT_ID:-}" ]; then
+            echo "Missing Cloudflare credentials; refusing to mark preview cleanup as successful"
+            exit 1
+          fi
+
           # Delete the worker (this also stops any running containers)
-          wrangler delete --name "$WORKER_NAME" --force || echo "Worker may not exist"
+          response_file="$(mktemp)"
+          http_status="$(curl -sS -o "$response_file" -w "%{http_code}" -X DELETE \
+            "https://api.cloudflare.com/client/v4/accounts/$CLOUDFLARE_ACCOUNT_ID/workers/scripts/$WORKER_NAME?force=true" \
+            -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
+            -H "Content-Type: application/json")" || {
+              echo "Failed to delete preview Worker via Cloudflare API"
+              exit 1
+            }
+          response="$(cat "$response_file")"
+
+          if [ -z "$response" ] && [[ "$http_status" =~ ^2 ]]; then
+            echo "Deleted Worker: $WORKER_NAME"
+          elif [ -n "$response" ] && echo "$response" | jq -e '.success == true' >/dev/null; then
+            echo "Deleted Worker: $WORKER_NAME"
+          elif [ -n "$response" ] && echo "$response" | jq -e '[.errors[]?.code] | index(10007)' >/dev/null; then
+            echo "$response" | jq -c '.errors'
+            echo "Worker may not exist"
+          else
+            echo "Cloudflare API failed to delete preview Worker (HTTP $http_status)"
+            if [ -n "$response" ]; then
+              echo "$response" | jq -c '.errors // .' || printf '%s\n' "$response"
+            else
+              echo "No response body"
+            fi
+            exit 1
+          fi
 
       - name: Delete GitHub Deployment
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const environment = `preview-pr-${{ github.event.pull_request.number }}`;
@@ -88,7 +117,7 @@ jobs:
 
   cleanup-expired:
     name: Cleanup expired previews
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    if: github.repository == 'we-promise/sure' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch')
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
diff --git a/.github/workflows/preview-deploy.yml b/.github/workflows/preview-deploy.yml
index 63ea9590d..3064ab9f6 100644
--- a/.github/workflows/preview-deploy.yml
+++ b/.github/workflows/preview-deploy.yml
@@ -25,6 +25,7 @@ jobs:
       head_sha: ${{ steps.preview.outputs.head_sha }}
       is_fork: ${{ steps.preview.outputs.is_fork }}
       pr_number: ${{ steps.preview.outputs.pr_number }}
+      resolution_source: ${{ steps.preview.outputs.resolution_source }}
       should_deploy: ${{ steps.preview.outputs.should_deploy }}
 
     steps:
@@ -39,7 +40,7 @@ jobs:
 
       - name: Resolve preview request
         id: preview
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const { resolvePreviewRequest } = require('./trusted-preview-resolver/workers/preview/deploy/resolve_preview_request.cjs');
@@ -65,7 +66,7 @@ jobs:
       - name: Create GitHub Deployment
         if: env.IS_FORK == 'false'
         id: deployment
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const prNumber = process.env.PR_NUMBER;
@@ -105,6 +106,7 @@ jobs:
       HEAD_SHA: ${{ needs.preview-gate.outputs.head_sha }}
       IS_FORK: ${{ needs.preview-gate.outputs.is_fork }}
       PR_NUMBER: ${{ needs.preview-gate.outputs.pr_number }}
+      RESOLUTION_SOURCE: ${{ needs.preview-gate.outputs.resolution_source }}
 
     steps:
       - name: Checkout trusted preview tooling
@@ -202,11 +204,16 @@ jobs:
           cp trusted/workers/preview/tsconfig.json "$preview_dir/tsconfig.json"
           cp trusted/workers/preview/wrangler.toml "$preview_dir/wrangler.toml"
           cp -R trusted/workers/preview/src "$preview_dir/src"
+          mkdir -p "$preview_dir/deploy"
+          cp trusted/workers/preview/deploy/redact_preview_log.sh "$preview_dir/deploy/redact_preview_log.sh"
+          cp trusted/workers/preview/deploy/render_preview_config.cjs "$preview_dir/deploy/render_preview_config.cjs"
+          chmod 0755 "$preview_dir/deploy/redact_preview_log.sh"
 
           diagnostics_nonce="$(openssl rand -hex 32)"
           sed -i "s/\${PR_NUMBER}/${PR_NUMBER}/g" "$preview_dir/wrangler.toml"
           sed -i "s/\${PR_NUMBER}/${PR_NUMBER}/g" "$preview_dir/src/index.ts"
           sed -i "s/\${PREVIEW_DIAGNOSTICS_NONCE}/${diagnostics_nonce}/g" "$preview_dir/src/index.ts"
+          cp "$preview_dir/wrangler.toml" "$preview_dir/wrangler.source.toml"
 
           if grep -F "\${PREVIEW_DIAGNOSTICS_NONCE}" "$preview_dir/src/index.ts" >/dev/null; then
             echo "Preview diagnostics nonce placeholder was not replaced" >&2
@@ -243,34 +250,30 @@ jobs:
           set -euo pipefail
 
           cd "$RUNNER_TEMP/sure-preview-worker"
+          source_config="$RUNNER_TEMP/sure-preview-worker/wrangler.source.toml"
           config_path="$RUNNER_TEMP/sure-preview-worker/wrangler.toml"
           image_tag="sure-preview-pr-${PR_NUMBER}:${HEAD_SHA}"
+          temporary_image_ref="registry.cloudflare.com/${CLOUDFLARE_ACCOUNT_ID}/${image_tag}"
           push_log="$RUNNER_TEMP/wrangler-containers-push.log"
           clean_log="$RUNNER_TEMP/wrangler-containers-push.clean.log"
+          push_status=0
 
           # wrangler containers push validates wrangler.toml, so point the trusted
-          # config at the loaded CI image before replacing it with the registry ref.
-          LOCAL_IMAGE_TAG="$image_tag" node - "$config_path" <<'NODE'
-          const fs = require('node:fs');
+          # config at a registry-shaped ref while it pushes the verified local image.
+          PREVIEW_IMAGE_REF="$temporary_image_ref" node ./deploy/render_preview_config.cjs render "$source_config" "$config_path"
+          cp "$config_path" "$RUNNER_TEMP/wrangler-push.toml"
 
-          const configPath = process.argv[2];
-          const imageTag = process.env.LOCAL_IMAGE_TAG;
-
-          if (!/^sure-preview-pr-[1-9][0-9]*:[a-f0-9]{40}$/.test(imageTag || '')) {
-            throw new Error('Expected local preview image tag for wrangler containers push');
-          }
-
-          const original = fs.readFileSync(configPath, 'utf8');
-          const updated = original.replace(/image = "[^"]+"/, `image = ${JSON.stringify(imageTag)}`);
-          if (updated === original) {
-            throw new Error('Expected wrangler.toml to contain an image entry to rewrite before push');
-          }
-          fs.writeFileSync(configPath, updated);
-          NODE
-
-          ./node_modules/.bin/wrangler containers push "$image_tag" 2>&1 | tee "$push_log"
+          set +e
+          ./node_modules/.bin/wrangler containers push "$image_tag" 2>&1 | tee "$push_log" | ./deploy/redact_preview_log.sh
+          push_status=${PIPESTATUS[0]}
+          set -e
           perl -pe 's/\e\[[0-9;]*[A-Za-z]//g' "$push_log" > "$clean_log"
-          image_ref=$(grep -Eo 'registry\.cloudflare\.com/[^[:space:]]+' "$clean_log" | tail -n 1 | tr -d '\r')
+
+          if [ "$push_status" -ne 0 ]; then
+            exit "$push_status"
+          fi
+
+          image_ref="$(node ./deploy/render_preview_config.cjs find "$clean_log")"
 
           if [ -z "$image_ref" ]; then
             echo "Could not find Cloudflare registry image reference in wrangler output" >&2
@@ -285,27 +288,17 @@ jobs:
         run: |
           set -euo pipefail
 
+          source_config="$RUNNER_TEMP/sure-preview-worker/wrangler.source.toml"
           config_path="$RUNNER_TEMP/sure-preview-worker/wrangler.toml"
-          # Use Node instead of sed so the replacement preserves TOML string syntax.
-          node - "$config_path" <<'NODE'
-          const fs = require('node:fs');
+          # Render from the preserved trusted source template so the push-time
+          # registry ref cannot make the final deploy rewrite stateful.
+          PREVIEW_IMAGE_REF="$IMAGE_REF" node "$RUNNER_TEMP/sure-preview-worker/deploy/render_preview_config.cjs" render "$source_config" "$config_path"
+          cp "$config_path" "$RUNNER_TEMP/wrangler-final.toml"
 
-          const configPath = process.argv[2];
-          const imageRef = process.env.IMAGE_REF;
-
-          if (!imageRef || !imageRef.startsWith('registry.cloudflare.com/')) {
-            throw new Error('Expected a Cloudflare registry image reference');
-          }
-
-          const original = fs.readFileSync(configPath, 'utf8');
-          const updated = original.replace(/image = "[^"]+"/, `image = ${JSON.stringify(imageRef)}`);
-          if (updated === original) {
-            throw new Error('Expected wrangler.toml to contain an image entry to rewrite');
-          }
-          fs.writeFileSync(configPath, updated);
-          NODE
-
-          cat "$config_path"
+          # Print a redacted copy for logs without mutating the config used by deploy.
+          redacted_config="$RUNNER_TEMP/wrangler-redacted.toml"
+          "$RUNNER_TEMP/sure-preview-worker/deploy/redact_preview_log.sh" < "$config_path" > "$redacted_config"
+          cat "$redacted_config"
 
       - name: Deploy to Cloudflare Containers
         id: deploy
@@ -321,7 +314,11 @@ jobs:
           clean_deploy_log="$RUNNER_TEMP/wrangler-deploy.clean.log"
 
           deploy_once() {
-            ./node_modules/.bin/wrangler deploy --config wrangler.toml --var "PR_NUMBER:${PR_NUMBER}" 2>&1 | tee "$deploy_log"
+            set +e
+            ./node_modules/.bin/wrangler deploy --config wrangler.toml --var "PR_NUMBER:${PR_NUMBER}" 2>&1 | tee "$deploy_log" | ./deploy/redact_preview_log.sh
+            local deploy_status=${PIPESTATUS[0]}
+            set -e
+            return "$deploy_status"
           }
 
           if ! deploy_once; then
@@ -356,27 +353,72 @@ jobs:
         run: |
           set -euo pipefail
 
-          diagnostics_file="$RUNNER_TEMP/preview-diagnostics.json"
+          diagnostics_dir="$RUNNER_TEMP/preview-diagnostics"
+          diagnostics_file="$diagnostics_dir/preview-diagnostics.json"
+          latest_metrics_file="$diagnostics_dir/latest-metrics.json"
+          polls_log="$diagnostics_dir/metrics-polls.log"
+          summary_file="$diagnostics_dir/summary.md"
           last_error=""
+          mkdir -p "$diagnostics_dir"
 
-          for attempt in $(seq 1 40); do
+          # ~100 polls x ~3.5s = up to ~6 min. The preview must cold-start the
+          # container (≈1.3 GB image pull + sandbox init) and generate the full
+          # demo dataset before previewReady flips. A real Cloudflare standard-1
+          # run measured previewReady at ~195s (rails ~46s, demo data ~149s) —
+          # the old 40-poll (~140s) budget would have failed a working preview.
+          # Keep generous headroom; the loop still breaks early on ready/failed.
+          for attempt in $(seq 1 100); do
             if curl -fsS --connect-timeout 5 --max-time 15 "$PREVIEW_URL/_container_status" -o "$diagnostics_file"; then
-              if jq -e '.previewReady == true or .previewFailed == true' "$diagnostics_file" >/dev/null; then
-                break
+              if jq -e . "$diagnostics_file" >/dev/null 2>&1; then
+                jq -c --argjson attempt "$attempt" --arg at "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+                  '{attempt: $attempt, at: $at, previewReady: (.previewReady // false), previewFailed: (.previewFailed // false), progress: (.progress // {}), timings: (.timings // {})}' \
+                  "$diagnostics_file" >> "$polls_log"
+                jq '{previewReady: (.previewReady // false), previewFailed: (.previewFailed // false), progress: (.progress // {}), timings: (.timings // {})}' "$diagnostics_file" > "$latest_metrics_file"
+
+                if jq -e '.previewReady == true or .previewFailed == true' "$diagnostics_file" >/dev/null; then
+                  break
+                fi
+              else
+                last_error="invalid diagnostics JSON on attempt ${attempt}"
+                raw_snippet="$(head -c 2048 "$diagnostics_file")"
+                latest_metrics_snapshot="none"
+                if [ -f "$latest_metrics_file" ]; then
+                  latest_metrics_snapshot="$(head -c 2048 "$latest_metrics_file")"
+                fi
+                jq -nc --argjson attempt "$attempt" --arg at "$(date -u +%Y-%m-%dT%H:%M:%SZ)" --arg error "$last_error" --arg latestMetrics "$latest_metrics_snapshot" --arg rawSnippet "$raw_snippet" \
+                  '{attempt: $attempt, at: $at, error: $error, latestMetrics: $latestMetrics, rawSnippet: $rawSnippet}' >> "$polls_log"
               fi
             else
               last_error="curl failed on attempt ${attempt}"
+              jq -nc --argjson attempt "$attempt" --arg at "$(date -u +%Y-%m-%dT%H:%M:%SZ)" --arg error "$last_error" \
+                '{attempt: $attempt, at: $at, error: $error}' >> "$polls_log"
             fi
 
             sleep 3
           done
 
-          if [ ! -s "$diagnostics_file" ]; then
+          if [ ! -s "$diagnostics_file" ] || ! jq -e . "$diagnostics_file" >/dev/null 2>&1; then
             jq -n --arg error "${last_error:-preview diagnostics unavailable}" \
               --arg url "$PREVIEW_URL" \
               '{previewReady: false, previewFailed: false, error: $error, previewUrl: $url}' > "$diagnostics_file"
           fi
 
+          jq '{previewReady: (.previewReady // false), previewFailed: (.previewFailed // false), progress: (.progress // {}), timings: (.timings // {}), error: (.error // null)}' "$diagnostics_file" > "$latest_metrics_file"
+          {
+            echo "# Preview diagnostics"
+            echo
+            echo "- PR: ${PR_NUMBER}"
+            echo "- Commit: ${HEAD_SHA}"
+            echo "- Preview URL: ${PREVIEW_URL}"
+            echo "- Preview ready: $(jq -r '.previewReady // false' "$diagnostics_file")"
+            echo "- Preview failed: $(jq -r '.previewFailed // false' "$diagnostics_file")"
+            echo "- Phase: $(jq -r '.progress.phase // "unknown"' "$diagnostics_file")"
+            echo "- Stage: $(jq -r '.progress.stage // "unknown"' "$diagnostics_file")"
+            echo "- Seconds to Rails ready: $(jq -r '.timings.secondsToRailsReady // "unknown"' "$diagnostics_file")"
+            echo "- Seconds to demo data ready: $(jq -r '.timings.secondsToDemoDataReady // "unknown"' "$diagnostics_file")"
+            echo "- Seconds to preview ready: $(jq -r '.timings.secondsToPreviewReady // "unknown"' "$diagnostics_file")"
+          } > "$summary_file"
+
           jq -c . "$diagnostics_file"
 
           if jq -e '.previewFailed == true' "$diagnostics_file" >/dev/null; then
@@ -402,16 +444,97 @@ jobs:
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: preview-diagnostics-pr-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}
-          path: ${{ runner.temp }}/preview-diagnostics.json
+          path: ${{ runner.temp }}/preview-diagnostics
           if-no-files-found: error
           retention-days: 3
 
+      - name: Collect preview failure diagnostics
+        if: failure()
+        run: |
+          set -euo pipefail
+
+          diagnostics_dir="$RUNNER_TEMP/preview-failure-diagnostics"
+          manifest_file="$RUNNER_TEMP/preview-image/sure-preview-image.manifest.json"
+          redaction_helper="$RUNNER_TEMP/sure-preview-worker/deploy/redact_preview_log.sh"
+          mkdir -p "$diagnostics_dir"
+
+          jq -n \
+            --arg artifactName "$ARTIFACT_NAME" \
+            --arg headSha "$HEAD_SHA" \
+            --arg isFork "$IS_FORK" \
+            --arg prNumber "$PR_NUMBER" \
+            --arg resolutionSource "$RESOLUTION_SOURCE" \
+            '{
+              artifactName: $artifactName,
+              headSha: $headSha,
+              isFork: $isFork,
+              prNumber: $prNumber,
+              resolutionSource: $resolutionSource
+            }' > "$diagnostics_dir/preview-request.json"
+
+          sanitize_copy() {
+            local source="$1"
+            local destination="$2"
+            if [ -f "$source" ]; then
+              if [ -x "$redaction_helper" ]; then
+                "$redaction_helper" < "$source" > "$destination"
+              else
+                cp "$source" "$destination"
+              fi
+            fi
+          }
+
+          if [ -f "$manifest_file" ]; then
+            jq '{
+              artifactVersion,
+              archivePath,
+              archiveSha256,
+              headSha,
+              imageId,
+              imageTag,
+              prNumber
+            }' "$manifest_file" > "$diagnostics_dir/preview-image-manifest.json"
+          fi
+
+          sanitize_copy "$RUNNER_TEMP/sure-preview-worker/wrangler.source.toml" "$diagnostics_dir/wrangler-source.toml"
+          sanitize_copy "$RUNNER_TEMP/wrangler-push.toml" "$diagnostics_dir/wrangler-push.toml"
+          sanitize_copy "$RUNNER_TEMP/wrangler-final.toml" "$diagnostics_dir/wrangler-final.toml"
+          sanitize_copy "$RUNNER_TEMP/sure-preview-worker/wrangler.toml" "$diagnostics_dir/wrangler.toml"
+          sanitize_copy "$RUNNER_TEMP/wrangler-containers-push.clean.log" "$diagnostics_dir/wrangler-containers-push.log"
+          if [ -f "$RUNNER_TEMP/wrangler-deploy.clean.log" ]; then
+            sanitize_copy "$RUNNER_TEMP/wrangler-deploy.clean.log" "$diagnostics_dir/wrangler-deploy.log"
+          else
+            sanitize_copy "$RUNNER_TEMP/wrangler-deploy.log" "$diagnostics_dir/wrangler-deploy.log"
+          fi
+
+          find "$diagnostics_dir" -maxdepth 1 -type f -print
+
+      - name: Upload preview failure diagnostics
+        if: failure()
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        with:
+          name: preview-failure-diagnostics-pr-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}
+          path: ${{ runner.temp }}/preview-failure-diagnostics
+          if-no-files-found: error
+          retention-days: 3
+
+      - name: Prepare cleanup metadata
+        if: success()
+        run: |
+          set -euo pipefail
+
+          metadata_dir="$RUNNER_TEMP/preview-cleanup-metadata"
+          mkdir -p "$metadata_dir"
+          "$RUNNER_TEMP/sure-preview-worker/deploy/redact_preview_log.sh" \
+            < "$RUNNER_TEMP/sure-preview-worker/wrangler.toml" \
+            > "$metadata_dir/wrangler.toml"
+
       - name: Store cleanup metadata
         if: success()
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
         with:
           name: preview-cleanup-pr-${{ env.PR_NUMBER }}
-          path: ${{ runner.temp }}/sure-preview-worker/wrangler.toml
+          path: ${{ runner.temp }}/preview-cleanup-metadata/wrangler.toml
           retention-days: 2
 
   deployment_status:
@@ -434,7 +557,7 @@ jobs:
 
     steps:
       - name: Update Deployment Status
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const state = process.env.DEPLOY_RESULT === 'success' ? 'success' : 'failure';
@@ -464,7 +587,7 @@ jobs:
 
     steps:
       - name: Comment on PR
-        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const previewUrl = process.env.PREVIEW_URL;
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9a30609b0..6a93d58f1 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -199,6 +199,7 @@ jobs:
         env:
           TAGS: ${{ needs.build.outputs.tags }}
           DIGESTS_DIR: ${{ runner.temp }}/digests
+          REF_NAME: ${{ github.ref_name }}
         shell: bash -xeuo pipefail {0}
         run: |
           tag_args=()
@@ -216,7 +217,7 @@ jobs:
             "index:org.opencontainers.image.created=$(date -Iseconds)"
             'index:org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}'
             'index:org.opencontainers.image.revision=${{ github.sha }}'
-            'index:org.opencontainers.image.ref.name=${{ github.ref_name }}'
+            "index:org.opencontainers.image.ref.name=${REF_NAME}"
             'index:org.opencontainers.image.vendor=we-promise'
             'index:org.opencontainers.image.licenses=AGPL-3.0'
             'index:org.opencontainers.image.title=Sure'
@@ -264,10 +265,16 @@ jobs:
     uses: ./.github/workflows/flutter-build.yml
     secrets: inherit
 
+  desktop:
+    name: Build macOS Desktop App
+    if: startsWith(github.ref, 'refs/tags/v')
+    uses: ./.github/workflows/desktop-release.yml
+    secrets: inherit
+
   release:
     name: Create GitHub Release
     if: startsWith(github.ref, 'refs/tags/v')
-    needs: [merge, mobile, helm]
+    needs: [merge, mobile, desktop, helm]
     runs-on: ubuntu-latest
     timeout-minutes: 10
 
@@ -293,7 +300,15 @@ jobs:
           name: helm-chart-package
           path: ${{ runner.temp }}/helm-artifacts
 
+      - name: Download desktop DMG artifact
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        with:
+          name: desktop-release-dmg
+          path: ${{ runner.temp }}/desktop-artifacts
+
       - name: Prepare release assets
+        env:
+          REF_NAME: ${{ github.ref_name }}
         run: |
           mkdir -p ${{ runner.temp }}/release-assets
 
@@ -306,13 +321,13 @@ jobs:
 
           # Copy debug APK if it exists
           if [ -f "${{ runner.temp }}/mobile-artifacts/app-debug.apk" ]; then
-            cp "${{ runner.temp }}/mobile-artifacts/app-debug.apk" "${{ runner.temp }}/release-assets/sure-${{ github.ref_name }}-debug.apk"
+            cp "${{ runner.temp }}/mobile-artifacts/app-debug.apk" "${{ runner.temp }}/release-assets/sure-${REF_NAME}-debug.apk"
             echo "✓ Debug APK prepared"
           fi
 
           # Copy release APK if it exists
           if [ -f "${{ runner.temp }}/mobile-artifacts/app-release.apk" ]; then
-            cp "${{ runner.temp }}/mobile-artifacts/app-release.apk" "${{ runner.temp }}/release-assets/sure-${{ github.ref_name }}.apk"
+            cp "${{ runner.temp }}/mobile-artifacts/app-release.apk" "${{ runner.temp }}/release-assets/sure-${REF_NAME}.apk"
             echo "✓ Release APK prepared"
           fi
 
@@ -320,7 +335,7 @@ jobs:
           # Path preserves directory structure from artifact upload
           if [ -d "${{ runner.temp }}/ios-build/ios/iphoneos/Runner.app" ]; then
             cd "${{ runner.temp }}/ios-build/ios/iphoneos"
-            zip -r "${{ runner.temp }}/release-assets/sure-${{ github.ref_name }}-ios-unsigned.zip" Runner.app
+            zip -r "${{ runner.temp }}/release-assets/sure-${REF_NAME}-ios-unsigned.zip" Runner.app
             echo "✓ iOS build archive prepared"
           fi
 
@@ -335,6 +350,12 @@ jobs:
             echo "✓ Helm chart package prepared"
           fi
 
+          # Copy the universal macOS desktop build.
+          if compgen -G "${{ runner.temp }}/desktop-artifacts/*.dmg" > /dev/null; then
+            cp ${{ runner.temp }}/desktop-artifacts/*.dmg "${{ runner.temp }}/release-assets/"
+            echo "✓ Desktop DMG prepared"
+          fi
+
           echo "Release assets:"
           ls -la "${{ runner.temp }}/release-assets/"
 
@@ -398,7 +419,9 @@ jobs:
     timeout-minutes: 10
 
     permissions:
+      actions: write
       contents: write
+      pull-requests: write
 
     steps:
       - name: Determine source branch for tag
@@ -433,71 +456,66 @@ jobs:
 
       - name: Bump pre-release version
         run: |
-           VERSION_FILE=".sure-version"
-           CHART_FILE="charts/sure/Chart.yaml"
+          set -euo pipefail
 
-           # Ensure version file exists
-           if [ ! -f "$VERSION_FILE" ]; then
-             echo "ERROR: Version file not found: $VERSION_FILE"
-             exit 1
-           fi
+          VERSION_FILE=".sure-version"
+          CHART_FILE="charts/sure/Chart.yaml"
 
-           # Ensure chart file exists
-           if [ ! -f "$CHART_FILE" ]; then
-             echo "ERROR: Chart file not found: $CHART_FILE"
-             exit 1
-           fi
- 
-           # Extract current version
-           CURRENT_VERSION=$(cat "$VERSION_FILE" | tr -d '[:space:]')
-           if [ -z "$CURRENT_VERSION" ]; then
-             echo "ERROR: Could not extract version from $VERSION_FILE"
-             exit 1
-           fi
-           echo "Current version: $CURRENT_VERSION"
+          # Ensure version file exists
+          if [ ! -f "$VERSION_FILE" ]; then
+            echo "ERROR: Version file not found: $VERSION_FILE"
+            exit 1
+          fi
 
-           # Extract the pre-release tag and number, then increment it
-           PRE_RELEASE_TAG=$(echo "$CURRENT_VERSION" | grep -oP '(alpha|beta|rc)')
-           if [ -z "$PRE_RELEASE_TAG" ]; then
-             echo "ERROR: Could not extract pre-release tag from $CURRENT_VERSION"
-             exit 1
-           fi
+          # Ensure chart file exists
+          if [ ! -f "$CHART_FILE" ]; then
+            echo "ERROR: Chart file not found: $CHART_FILE"
+            exit 1
+          fi
 
-           PRE_RELEASE_NUM=$(echo "$CURRENT_VERSION" | grep -oP '(alpha|beta|rc)\.\K[0-9]+')
-           if [ -z "$PRE_RELEASE_NUM" ]; then
-             echo "ERROR: Could not extract pre-release number from $CURRENT_VERSION"
-             exit 1
-           fi
-           NEW_PRE_RELEASE_NUM=$((PRE_RELEASE_NUM + 1))
- 
-           # Create new version string
-           BASE_VERSION=$(echo "$CURRENT_VERSION" | grep -oP '^[0-9]+\.[0-9]+\.[0-9]+')
-           if [ -z "$BASE_VERSION" ]; then
-             echo "ERROR: Could not extract base version from $CURRENT_VERSION"
-             exit 1
-           fi
-           NEW_VERSION="${BASE_VERSION}-${PRE_RELEASE_TAG}.${NEW_PRE_RELEASE_NUM}"
-           echo "New version: $NEW_VERSION"
+          # Extract current version
+          CURRENT_VERSION=$(tr -d '[:space:]' < "$VERSION_FILE")
+          if [ -z "$CURRENT_VERSION" ]; then
+            echo "ERROR: Could not extract version from $VERSION_FILE"
+            exit 1
+          fi
+          echo "Current version: $CURRENT_VERSION"
 
-           # Update the version file
-           echo "$NEW_VERSION" > "$VERSION_FILE"
+          if [[ ! "$CURRENT_VERSION" =~ ^([0-9]+\.[0-9]+\.[0-9]+)-(alpha|beta|rc)\.([0-9]+)$ ]]; then
+            echo "ERROR: Expected prerelease version like 1.2.3-alpha.4, got $CURRENT_VERSION"
+            exit 1
+          fi
 
-           # Verify the change
-           echo "Updated .sure-version:"
-           cat "$VERSION_FILE"
+          BASE_VERSION="${BASH_REMATCH[1]}"
+          PRE_RELEASE_TAG="${BASH_REMATCH[2]}"
+          PRE_RELEASE_NUM="${BASH_REMATCH[3]}"
+          NEW_PRE_RELEASE_NUM=$((PRE_RELEASE_NUM + 1))
+          NEW_VERSION="${BASE_VERSION}-${PRE_RELEASE_TAG}.${NEW_PRE_RELEASE_NUM}"
+          echo "New version: $NEW_VERSION"
 
-           # Update Helm chart version and appVersion
-           sed -i -E "s/^version: .*/version: ${NEW_VERSION}/" "$CHART_FILE"
-           sed -i -E "s/^appVersion: .*/appVersion: \"${NEW_VERSION}\"/" "$CHART_FILE"
+          # Update the version file
+          echo "$NEW_VERSION" > "$VERSION_FILE"
 
-           # Verify the change
-           echo "Updated Chart.yaml:"
-           grep -E "^(version|appVersion):" "$CHART_FILE"
+          # Verify the change
+          echo "Updated .sure-version:"
+          cat "$VERSION_FILE"
+
+          # Update Helm chart version and appVersion
+          sed -i -E "s/^version: .*/version: ${NEW_VERSION}/" "$CHART_FILE"
+          sed -i -E "s/^appVersion: .*/appVersion: \"${NEW_VERSION}\"/" "$CHART_FILE"
+
+          # Verify the change
+          echo "Updated Chart.yaml:"
+          grep -E "^(version|appVersion):" "$CHART_FILE"
 
       - name: Commit and push version bump
         env:
           SOURCE_BRANCH: ${{ steps.source_branch.outputs.branch }}
+          GH_TOKEN: ${{ github.token }}
+          REF_NAME: ${{ github.ref_name }}
         run: |
+          set -euo pipefail
+
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
@@ -510,20 +528,85 @@ jobs:
             exit 0
           fi
 
-          git commit -m "Bump version to next iteration after ${{ github.ref_name }} release"
+          COMMIT_MESSAGE="Bump version to next iteration after ${REF_NAME} release"
+          git commit -m "$COMMIT_MESSAGE"
 
           echo "Pushing to branch: $SOURCE_BRANCH"
 
-          # Push with retry logic
-          attempts=0
-          until git push origin HEAD:$SOURCE_BRANCH; do
-            attempts=$((attempts + 1))
-            if [[ $attempts -ge 4 ]]; then
-              echo "ERROR: Failed to push after 4 attempts." >&2
-              exit 1
+          # Push directly when allowed. Main is protected and must be updated
+          # through a pull request. Other branches get a direct-push attempt, but
+          # protected-branch rejections fall back to a pull request immediately.
+          push_succeeded=false
+          if [[ "$SOURCE_BRANCH" == "main" || "$SOURCE_BRANCH" == "master" ]]; then
+            echo "$SOURCE_BRANCH is protected; creating a pull request instead of pushing directly."
+          else
+            direct_push_output=""
+            for attempt in 1 2 3 4; do
+              set +e
+              direct_push_output=$(git push origin HEAD:"refs/heads/${SOURCE_BRANCH}" 2>&1)
+              push_status=$?
+              set -e
+
+              echo "$direct_push_output"
+
+              if [[ $push_status -eq 0 ]]; then
+                push_succeeded=true
+                break
+              fi
+
+              if grep -Eq 'GH006|Protected branch update failed|Changes must be made through a pull request' <<< "$direct_push_output"; then
+                echo "Direct push is blocked by branch protection; creating a pull request instead."
+                break
+              fi
+
+              if [[ $attempt -eq 4 ]]; then
+                echo "Direct push failed after 4 attempts; creating a pull request instead."
+                break
+              fi
+
+              delay=$((2 ** attempt))
+              echo "Push failed (attempt $attempt). Retrying in ${delay} seconds..."
+              sleep "$delay"
+              git fetch origin "${SOURCE_BRANCH}"
+              git rebase "origin/${SOURCE_BRANCH}"
+            done
+          fi
+
+          if [[ "$push_succeeded" == "true" ]]; then
+            exit 0
+          fi
+
+          SAFE_TAG=$(printf '%s' "${REF_NAME}" | tr -c '[:alnum:]._-' '-')
+          BUMP_BRANCH="automation/bump-version-after-${SAFE_TAG}-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
+
+          git push --force-with-lease origin HEAD:"refs/heads/${BUMP_BRANCH}"
+
+          PR_BODY="This automated PR bumps .sure-version and charts/sure/Chart.yaml after the ${REF_NAME} pre-release. It was opened because the workflow could not push directly to ${SOURCE_BRANCH}."
+
+          set +e
+          pr_create_output=$(gh pr create \
+            --repo "$GITHUB_REPOSITORY" \
+            --head "$BUMP_BRANCH" \
+            --base "$SOURCE_BRANCH" \
+            --title "$COMMIT_MESSAGE" \
+            --body "$PR_BODY" 2>&1)
+          pr_create_status=$?
+          set -e
+
+          if [[ $pr_create_status -ne 0 ]]; then
+            echo "::error::Pushed ${BUMP_BRANCH}, but could not create the version bump PR: ${pr_create_output}"
+            if grep -q "GitHub Actions is not permitted to create or approve pull requests" <<< "$pr_create_output"; then
+              echo "::notice::Enable the organization setting that allows GitHub Actions to create and approve pull requests."
             fi
-            delay=$((2 ** attempts))
-            echo "Push failed (attempt $attempts). Retrying in ${delay} seconds..."
-            sleep ${delay}
-            git pull --rebase origin $SOURCE_BRANCH
-          done
+            exit 1
+          fi
+
+          PR_URL="$pr_create_output"
+          echo "Created version bump PR: $PR_URL"
+          echo "Dispatching PR checks for $BUMP_BRANCH"
+          if ! gh workflow run pr.yml --repo "$GITHUB_REPOSITORY" --ref "$BUMP_BRANCH"; then
+            echo "::warning::Could not dispatch pr.yml for $BUMP_BRANCH"
+          fi
+          if ! gh workflow run chart-ci.yml --repo "$GITHUB_REPOSITORY" --ref "$BUMP_BRANCH"; then
+            echo "::warning::Could not dispatch chart-ci.yml for $BUMP_BRANCH"
+          fi
diff --git a/.gitignore b/.gitignore
index 19cc81a3a..dd7707feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,9 @@ coverage
 .cursor/rules/structure.mdc
 .cursor/rules/agent.mdc
 
+# Ignore Redis dump file
+dump.rdb
+
 # Ignore node related files
 node_modules
 
diff --git a/.rubocop.yml b/.rubocop.yml
index 1d2341687..d313b5ab5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,6 +1,6 @@
 inherit_gem:
   rubocop-rails-omakase: rubocop.yml
-  
+
 Layout/IndentationWidth:
   Enabled: true
 
@@ -12,4 +12,8 @@ Layout/IndentationConsistency:
   Enabled: true
 
 Layout/SpaceInsidePercentLiteralDelimiters:
-  Enabled: true
\ No newline at end of file
+  Enabled: true
+
+Layout/SpaceInsideArrayLiteralBrackets:
+  Exclude:
+    - "db/schema.rb"
diff --git a/.ruby-version b/.ruby-version
index 2aa513199..7bcbb3808 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.4.7
+3.4.9
diff --git a/.sure-version b/.sure-version
index 845eb31ba..bac2cef88 100644
--- a/.sure-version
+++ b/.sure-version
@@ -1 +1 @@
-0.7.2-alpha.3
+0.7.3-alpha.7
diff --git a/AGENTS.md b/AGENTS.md
index c5359f025..399375924 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -63,6 +63,15 @@ Reviewers escalate violations of (2)–(3) to close/rewrite; (1) and (4) are req
 
 If you need to add a new securities price provider (Tiingo, EODHD, Binance-style crypto, etc.), see [adding-a-securities-provider.md](./docs/llm-guides/adding-a-securities-provider.md) for the full walkthrough — provider class, registry wiring, MIC handling, settings UI, locales, and tests.
 
+## Debug Logging for Provider Syncs
+
+When a provider sync/import path hits a recoverable error or suspicious partial response that support may need to inspect later, prefer `DebugLogEntry.capture(...)` over `Rails.logger.*`.
+
+- Record support-relevant diagnostics in the debug log so they surface in the super-admin-friendly `/settings/debug` UI.
+- Include `category`, `level`, `message`, `source`, `provider_key`, and useful structured `metadata`.
+- Attach `family` and `account_provider` when available so support can filter and trace the affected connection.
+- Reserve raw Rails logging for low-value local noise; anything operators may need should go to the debug log.
+
 ## Providers: Pending Transactions and FX Metadata (SimpleFIN/Plaid/Lunchflow)
 
 - Pending detection
diff --git a/CLAUDE.md b/CLAUDE.md
index 4fc9fcf10..a1da3b7bb 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -118,6 +118,7 @@ Two primary data ingestion methods:
   - Set `SIMPLEFIN_INCLUDE_PENDING=0` to disable pending fetching for SimpleFIN.
   - Set `PLAID_INCLUDE_PENDING=0` to disable pending fetching for Plaid.
   - Set `SIMPLEFIN_DEBUG_RAW=1` to enable raw payload debug logging.
+  - Set `UP_DEBUG_RAW=1` to enable raw Up payload debug logging. DEV-ONLY: the dump contains PII and is gated to local environments, so it never logs in managed/production.
 
 Provider support notes:
 - SimpleFIN: supports pending + FX metadata (stored under `extra["simplefin"]`).
@@ -132,6 +133,12 @@ Sidekiq handles asynchronous tasks:
 - AI chat responses (`AssistantResponseJob`)
 - Scheduled maintenance via sidekiq-cron
 
+### Debug Logging for Provider Syncs
+- Prefer `DebugLogEntry.capture(...)` over `Rails.logger.*` for provider sync/import failures, partial responses, and other support-relevant diagnostics.
+- Record support-relevant incidents in the super-admin `/settings/debug` UI rather than leaving them only in raw application logs.
+- Include `category`, `level`, `message`, `source`, `provider_key`, and structured `metadata`.
+- Attach `family` and `account_provider` whenever possible so support can filter to the affected provider connection.
+
 ### Frontend Architecture
 - **Hotwire Stack**: Turbo + Stimulus for reactive UI without heavy JavaScript
 - **ViewComponents**: Reusable UI components in `app/components/`
diff --git a/Dockerfile b/Dockerfile
index c165b18f7..f691c470b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.4.7
+ARG RUBY_VERSION=3.4.9
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here
diff --git a/Dockerfile.preview b/Dockerfile.preview
index b1661d9b3..06a958a5e 100644
--- a/Dockerfile.preview
+++ b/Dockerfile.preview
@@ -3,7 +3,7 @@
 # Preview Dockerfile for Cloudflare Containers
 # Includes PostgreSQL and Redis for self-contained development testing
 
-ARG RUBY_VERSION=3.4.7
+ARG RUBY_VERSION=3.4.9
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
 
 WORKDIR /rails
@@ -48,13 +48,41 @@ RUN groupadd --system --gid 1000 rails && \
     echo "rails ALL=(ALL) NOPASSWD: /usr/bin/pg_ctlcluster, /usr/bin/redis-server" > /etc/sudoers.d/rails && \
     chmod 0440 /etc/sudoers.d/rails
 
-# Configure PostgreSQL to allow local connections
-RUN PG_HBA=$(find /etc/postgresql -name pg_hba.conf 2>/dev/null | head -1) && \
-    if [ -n "$PG_HBA" ]; then \
-      echo "local all all trust" > "$PG_HBA" && \
-      echo "host all all 127.0.0.1/32 trust" >> "$PG_HBA" && \
-      echo "host all all ::1/128 trust" >> "$PG_HBA"; \
-    fi
+# Configure PostgreSQL to allow local connections. Target the highest-version
+# cluster's pg_hba.conf -- the same one the entrypoint starts (ls
+# /etc/postgresql | sort -V | tail -1) -- so the trust rules always land on the
+# cluster that actually runs, even if multiple majors are present.
+RUN PG_VERSION="$(ls /etc/postgresql 2>/dev/null | sort -V | tail -1)" && \
+    PG_HBA="/etc/postgresql/${PG_VERSION}/main/pg_hba.conf" && \
+    if [ -z "$PG_VERSION" ] || [ ! -f "$PG_HBA" ]; then \
+      echo "ERROR: pg_hba.conf not found for cluster '${PG_VERSION:-none}'; cannot configure local trust" >&2; \
+      exit 1; \
+    fi && \
+    echo "local all all trust" > "$PG_HBA" && \
+    echo "host all all 127.0.0.1/32 trust" >> "$PG_HBA" && \
+    echo "host all all ::1/128 trust" >> "$PG_HBA"
+
+# Use file-backed dynamic shared memory instead of POSIX /dev/shm.
+# Cloudflare Containers provide only a tiny /dev/shm, and PostgreSQL's default
+# dynamic_shared_memory_type = posix FATALs on startup there with
+# "could not resize shared memory segment ... No space left on device", which
+# kills the container before it can serve a port. mmap keeps DSM in the data
+# directory ($PGDATA/pg_dynshmem), removing the /dev/shm dependency. Local
+# Docker hides this because its default /dev/shm is 64MB.
+#
+# Select the highest-version cluster's config -- the same one the entrypoint
+# starts (ls /etc/postgresql | sort -V | tail -1) -- so the override always
+# lands on the cluster that actually runs, even if multiple majors are present.
+RUN PG_VERSION="$(ls /etc/postgresql 2>/dev/null | sort -V | tail -1)" && \
+    PG_CONF="/etc/postgresql/${PG_VERSION}/main/postgresql.conf" && \
+    if [ -z "$PG_VERSION" ] || [ ! -f "$PG_CONF" ]; then \
+      echo "ERROR: postgresql.conf not found for cluster '${PG_VERSION:-none}'; cannot disable /dev/shm DSM dependency" >&2; \
+      exit 1; \
+    fi && \
+    sed -i 's/^[[:space:]]*dynamic_shared_memory_type[[:space:]]*=/# &/' "$PG_CONF" && \
+    printf '\n# Preview: avoid /dev/shm dependency (small in Cloudflare Containers)\ndynamic_shared_memory_type = mmap\n' >> "$PG_CONF" && \
+    grep -qx 'dynamic_shared_memory_type = mmap' "$PG_CONF" && \
+    echo "Configured dynamic_shared_memory_type=mmap in $PG_CONF"
 
 # Create database directory with correct permissions
 RUN mkdir -p /var/run/postgresql && \
@@ -72,19 +100,26 @@ set -e
 
 cd /rails
 
-emit_status() {
+# Diagnostics posts are best-effort and must NEVER stall boot: the worker's
+# Durable Object can be unresponsive while it waits for this container's port,
+# so an unbounded curl here deadlocks startup against the port check.
+emit_status_sync() {
   if [ -n "$PREVIEW_ORIGIN" ] && [ -n "$PREVIEW_DIAGNOSTICS_NONCE" ]; then
     local stage="$1"
     local detail="$2"
     local payload
     payload=$(STAGE="$stage" DETAIL="$detail" ruby -rjson -e 'print JSON.generate({stage: ENV.fetch("STAGE"), detail: ENV.fetch("DETAIL", "")})' 2>/dev/null) || return 0
-    curl -fsS -X POST "$PREVIEW_ORIGIN/_container_event" \
+    curl -fsS --connect-timeout 2 --max-time 5 -X POST "$PREVIEW_ORIGIN/_container_event" \
       -H 'content-type: application/json' \
       -H "x-preview-diagnostics-nonce: $PREVIEW_DIAGNOSTICS_NONCE" \
       --data "$payload" >/dev/null || true
   fi
 }
 
+emit_status() {
+  emit_status_sync "$1" "$2" &
+}
+
 summarize_log_tail() {
   local file="$1"
   local label="$2"
@@ -101,9 +136,90 @@ summarize_log_tail() {
     cut -c 1-1600
 }
 
-trap 'emit_status failed "preview-entrypoint failed on line ${LINENO}"' ERR
+fail_preview() {
+  local detail="$1"
+  trap - ERR
+  # Always log to stderr too: the HTTP diagnostics channel can be unreachable
+  # while the worker's Durable Object is still waiting for this container's
+  # port, but stderr is captured by Cloudflare container observability, so the
+  # real reason survives even when the event POST does not.
+  echo "PREVIEW FAILED: ${detail}" >&2
+  emit_status_sync failed "$detail"
+  exit 1
+}
+
+postgres_cluster_snapshot() {
+  local snapshot=""
+  local cluster_status
+  local postgres_log
+
+  if command -v pg_lsclusters >/dev/null 2>&1; then
+    cluster_status="$(pg_lsclusters 2>&1 | tr '\n' '|' | sed 's/"/'"'"'/g' | cut -c 1-500)"
+    snapshot="clusters=${cluster_status}"
+  fi
+
+  postgres_log="/var/log/postgresql/postgresql-${PG_VERSION}-main.log"
+  if [ -f "$postgres_log" ]; then
+    snapshot="${snapshot} log=$(summarize_log_tail "$postgres_log" postgres)"
+  fi
+
+  printf '%s' "$snapshot"
+}
+
+trap 'emit_status_sync failed "preview-entrypoint failed on line ${LINENO}"' ERR
 emit_status boot "preview-entrypoint started"
 
+# Bind :3000 immediately with a tiny placeholder responder. Cloudflare's
+# container supervisor only waits ~20s for the port, while the full stack
+# (redis, postgres, migrations) needs 60s+ on a basic instance. The
+# placeholder answers 503 with a meta-refresh; the worker still gates
+# previewReady on the real Rails /up probe and sample data, so readiness
+# semantics are unchanged. It is replaced by the real server below.
+ruby -rsocket -e '
+  server = TCPServer.new("0.0.0.0", 3000)
+  body = "<!doctype html><html><head><meta http-equiv=\"refresh\" content=\"3\"><title>Sure preview warming</title></head><body>Sure preview is booting (database setup in progress). This page refreshes automatically.</body></html>"
+  loop do
+    client = begin
+      server.accept
+    rescue StandardError
+      next
+    end
+    begin
+      # Never read from the client: the response is static, and a blocking read
+      # would let one silent connection (e.g. a bare TCP port probe) wedge this
+      # single-threaded loop and starve every later probe.
+      client.write("HTTP/1.1 503 Service Unavailable\r\nContent-Type: text/html; charset=utf-8\r\nContent-Length: #{body.bytesize}\r\nRetry-After: 3\r\nConnection: close\r\n\r\n#{body}")
+    rescue StandardError
+    ensure
+      begin
+        client.close
+      rescue StandardError
+      end
+    end
+  end
+' >/tmp/port-placeholder.log 2>&1 &
+PLACEHOLDER_PID=$!
+
+# Confirm the placeholder actually bound :3000 before reporting it. A plain
+# TCP connect is used because the placeholder intentionally answers 503.
+PLACEHOLDER_BOUND=0
+for i in {1..10}; do
+  if (exec 3<>/dev/tcp/127.0.0.1/3000) 2>/dev/null; then
+    PLACEHOLDER_BOUND=1
+    break
+  fi
+  if ! kill -0 "$PLACEHOLDER_PID" 2>/dev/null; then
+    break
+  fi
+  sleep 0.2
+done
+if [ "$PLACEHOLDER_BOUND" -eq 1 ]; then
+  emit_status port-placeholder "bound :3000 placeholder responder (pid ${PLACEHOLDER_PID})"
+else
+  echo "Warning: :3000 placeholder did not come up; continuing boot" >&2
+  emit_status port-placeholder-missing "placeholder responder failed to bind :3000: $(summarize_log_tail /tmp/port-placeholder.log port-placeholder)"
+fi
+
 REDIS_READY=0
 POSTGRES_READY=0
 
@@ -125,8 +241,7 @@ for i in {1..10}; do
 done
 
 if [ "$REDIS_READY" -ne 1 ]; then
-  echo "Redis did not become ready in time"
-  exit 1
+  fail_preview "redis did not become ready in time"
 fi
 
 # Start PostgreSQL
@@ -134,13 +249,15 @@ echo "Starting PostgreSQL..."
 emit_status postgres-start "starting postgres"
 PG_VERSION=$(ls /etc/postgresql/ | sort -V | tail -1)
 if [ -z "$PG_VERSION" ]; then
-  echo "Could not determine installed PostgreSQL version"
-  exit 1
+  fail_preview "could not determine installed PostgreSQL version"
 fi
 if sudo pg_ctlcluster --skip-systemctl-redirect "$PG_VERSION" main status > /dev/null 2>&1; then
   emit_status postgres-already-running "postgres cluster already running"
 else
-  sudo pg_ctlcluster --skip-systemctl-redirect "$PG_VERSION" main start
+  POSTGRES_START_LOG=/tmp/postgres-start.log
+  if ! sudo pg_ctlcluster --skip-systemctl-redirect "$PG_VERSION" main start >"$POSTGRES_START_LOG" 2>&1; then
+    fail_preview "pg_ctlcluster start failed: $(summarize_log_tail "$POSTGRES_START_LOG" pg_ctlcluster-start) | $(postgres_cluster_snapshot)"
+  fi
 fi
 
 # Wait for PostgreSQL to be ready
@@ -156,8 +273,7 @@ for i in {1..30}; do
 done
 
 if [ "$POSTGRES_READY" -ne 1 ]; then
-  echo "PostgreSQL did not become ready in time"
-  exit 1
+  fail_preview "postgres did not become ready in time: $(postgres_cluster_snapshot)"
 fi
 
 # Create database user and database if they don't exist
@@ -205,6 +321,11 @@ else
   emit_status demo-data-deferred "deferring demo data creation until after rails boot"
 fi
 
+# Release :3000 for the real server. The brief listener gap is handled by the
+# worker, which catches containerFetch errors and serves its wait page.
+kill "$PLACEHOLDER_PID" 2>/dev/null || true
+wait "$PLACEHOLDER_PID" 2>/dev/null || true
+
 # Execute the main command with an internal readiness probe
 echo "Starting Rails server..."
 emit_status rails-start "starting rails server"
diff --git a/Gemfile b/Gemfile
index a58e0ccf9..f38a1a3a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,14 +3,14 @@ source "https://rubygems.org"
 ruby file: ".ruby-version"
 
 # Rails
-gem "rails", "~> 7.2.2"
+gem "rails", "~> 8.1.0"
 
 # Drivers
 gem "pg", "~> 1.5"
 gem "redis", "~> 5.4"
 
 # Deployment
-gem "puma", ">= 5.0"
+gem "puma", ">= 7.2.1"
 gem "bootsnap", require: false
 
 # Assets
@@ -59,7 +59,6 @@ gem "image_processing", ">= 1.2"
 gem "ostruct"
 gem "bcrypt", "~> 3.1"
 gem "jwt"
-gem "ed25519" # For Coinbase CDP API authentication
 gem "jbuilder"
 gem "countries"
 
@@ -82,7 +81,6 @@ gem "rchardet" # Character encoding detection
 gem "redcarpet"
 gem "stripe"
 gem "plaid"
-gem "snaptrade", "~> 2.0"
 gem "httparty"
 gem "rotp", "~> 6.3"
 gem "rqrcode", "~> 3.0"
@@ -93,7 +91,7 @@ gem "pdf-reader", "~> 2.12"
 
 # OpenID Connect, OAuth & SAML authentication
 gem "omniauth", "~> 2.1"
-gem "omniauth-rails_csrf_protection"
+gem "omniauth-rails_csrf_protection", ">= 2.0"
 gem "omniauth_openid_connect"
 gem "omniauth-google-oauth2"
 gem "omniauth-github"
diff --git a/Gemfile.lock b/Gemfile.lock
index 6bc0b988d..e929585e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,83 +4,84 @@ GEM
     Ascii85 (2.0.1)
     aasm (5.5.1)
       concurrent-ruby (~> 1.0)
-    actioncable (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    action_text-trix (2.1.19)
+      railties
+    actioncable (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionmailbox (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       mail (>= 2.8.0)
-    actionmailer (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionmailer (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.3.1)
-      actionview (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    actionpack (8.1.3.1)
+      actionview (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.3)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actiontext (8.1.3.1)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    actionview (8.1.3.1)
+      activesupport (= 8.1.3.1)
       builder (~> 3.1)
-      cgi
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activejob (8.1.3.1)
+      activesupport (= 8.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.3.1)
-      activesupport (= 7.2.3.1)
-    activerecord (7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activemodel (8.1.3.1)
+      activesupport (= 8.1.3.1)
+    activerecord (8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       timeout (>= 0.4.0)
     activerecord-import (2.2.0)
       activerecord (>= 4.2)
-    activestorage (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    activestorage (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       marcel (~> 1.0)
-    activesupport (7.2.3.1)
+    activesupport (8.1.3.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
-      minitest (>= 5.1, < 6)
+      minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+      uri (>= 0.13.1)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
     aes_key_wrap (1.1.0)
     afm (1.0.0)
     after_commit_everywhere (1.6.0)
@@ -93,6 +94,8 @@ GEM
       standardwebhooks
     ast (2.4.3)
     attr_required (1.0.2)
+    auth-sanitizer (0.2.3)
+      version_gem (~> 1.1, >= 1.1.14)
     aws-eventstream (1.4.0)
     aws-partitions (1.1196.0)
     aws-sdk-core (3.240.0)
@@ -146,7 +149,7 @@ GEM
       logger (~> 1.5)
     chunky_png (1.4.0)
     climate_control (1.2.0)
-    concurrent-ruby (1.3.6)
+    concurrent-ruby (1.3.7)
     connection_pool (2.5.5)
     cose (1.3.1)
       cbor (~> 0.5.9)
@@ -156,14 +159,15 @@ GEM
     crack (1.0.0)
       bigdecimal
       rexml
-    crass (1.0.6)
+    crass (1.0.7)
     cronex (0.15.0)
       tzinfo
       unicode (>= 0.4.4.5)
-    css_parser (1.21.1)
+    css_parser (3.0.0)
       addressable
+      ssrf_filter (~> 1.5)
     csv (3.3.5)
-    date (3.4.1)
+    date (3.5.1)
     debug (1.11.0)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -197,10 +201,9 @@ GEM
       dotenv (= 3.1.8)
       railties (>= 6.1)
     drb (2.2.3)
-    ed25519 (1.4.0)
     email_validator (2.2.4)
       activemodel
-    erb (5.0.1)
+    erb (6.0.4)
     erb_lint (0.9.0)
       activesupport
       better_html (>= 2.0.1)
@@ -214,7 +217,7 @@ GEM
     event_stream_parser (1.0.0)
     faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.14.1)
+    faraday (2.14.3)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -222,7 +225,7 @@ GEM
       faraday (>= 1, < 3)
     faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
-    faraday-net_http (3.4.2)
+    faraday-net_http (3.4.4)
       net-http (~> 0.5)
     faraday-retry (2.3.2)
       faraday (~> 2.0)
@@ -282,7 +285,8 @@ GEM
       signet (>= 0.16, < 2.a)
     hashdiff (1.2.0)
     hashery (2.1.2)
-    hashie (5.0.0)
+    hashie (5.1.0)
+      logger
     heapy (0.2.0)
       thor
     highline (3.1.2)
@@ -325,16 +329,17 @@ GEM
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.8.0)
-    irb (1.15.2)
+    io-console (0.8.2)
+    irb (1.18.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jmespath (1.6.2)
-    json (2.19.2)
+    json (2.21.1)
     json-jwt (1.16.7)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -345,7 +350,7 @@ GEM
     json-schema (5.2.2)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
-    jwt (2.10.2)
+    jwt (2.10.3)
       base64
     langfuse-ruby (0.1.4)
       concurrent-ruby (~> 1.0)
@@ -375,7 +380,7 @@ GEM
       logtail (~> 0.1, >= 0.1.14)
       logtail-rack (~> 0.1)
       railties (>= 5.0.0)
-    loofah (2.25.1)
+    loofah (2.25.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (2.3.11)
@@ -392,15 +397,15 @@ GEM
       zeitwerk (~> 2.5)
     lucide-rails (0.7.3)
       railties (>= 4.1.0)
-    mail (2.8.1)
+    mail (2.9.0)
+      logger
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
-    marcel (1.1.0)
+    marcel (1.2.1)
     matrix (0.4.2)
     memory_profiler (1.1.0)
-    method_source (1.1.0)
     mini_histogram (0.3.1)
     mini_magick (5.2.0)
       benchmark
@@ -411,13 +416,13 @@ GEM
       ruby2_keywords (>= 0.0.5)
     msgpack (1.8.0)
     multi_json (1.20.1)
-    multi_xml (0.8.0)
+    multi_xml (0.9.1)
       bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.5.8)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -426,31 +431,32 @@ GEM
       timeout
     net-smtp (0.5.1)
       net-protocol
-    nio4r (2.7.4)
-    nokogiri (1.19.2-aarch64-linux-gnu)
+    nio4r (2.7.5)
+    nokogiri (1.19.4-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-aarch64-linux-musl)
+    nokogiri (1.19.4-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm-linux-gnu)
+    nokogiri (1.19.4-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm-linux-musl)
+    nokogiri (1.19.4-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.19.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-darwin)
+    nokogiri (1.19.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.4-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-musl)
+    nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
-    oauth2 (2.0.18)
+    oauth2 (2.0.22)
+      auth-sanitizer (~> 0.2, >= 0.2.1)
       faraday (>= 0.17.3, < 4.0)
       jwt (>= 1.0, < 4.0)
       logger (~> 1.2)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-      snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (~> 1.1, >= 1.1.9)
+      snaky_hash (~> 2.0, >= 2.0.5)
+      version_gem (~> 1.1, >= 1.1.11)
     octokit (10.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
@@ -469,7 +475,7 @@ GEM
     omniauth-oauth2 (1.8.0)
       oauth2 (>= 1.4, < 3)
       omniauth (~> 2.0)
-    omniauth-rails_csrf_protection (1.0.2)
+    omniauth-rails_csrf_protection (2.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-saml (2.2.4)
@@ -516,7 +522,7 @@ GEM
       useragent (~> 0.16.3)
     posthog-ruby (3.3.3)
       concurrent-ruby (~> 1)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
     prism (1.4.0)
@@ -525,11 +531,11 @@ GEM
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
-    psych (5.2.6)
+    psych (5.4.0)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (6.6.0)
+    public_suffix (7.0.5)
+    puma (7.2.1)
       nio4r (~> 2.0)
     pundit (2.5.2)
       activesupport (>= 3.0.0)
@@ -559,39 +565,38 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.2.0)
       rack (>= 1.3)
-    rackup (2.2.1)
+    rackup (2.3.1)
       rack (>= 3)
-    rails (7.2.3.1)
-      actioncable (= 7.2.3.1)
-      actionmailbox (= 7.2.3.1)
-      actionmailer (= 7.2.3.1)
-      actionpack (= 7.2.3.1)
-      actiontext (= 7.2.3.1)
-      actionview (= 7.2.3.1)
-      activejob (= 7.2.3.1)
-      activemodel (= 7.2.3.1)
-      activerecord (= 7.2.3.1)
-      activestorage (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
+    rails (8.1.3.1)
+      actioncable (= 8.1.3.1)
+      actionmailbox (= 8.1.3.1)
+      actionmailer (= 8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actiontext (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 7.2.3.1)
+      railties (= 8.1.3.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.7.0)
-      loofah (~> 2.25)
+    rails-html-sanitizer (1.7.1)
+      loofah (~> 2.25, >= 2.25.2)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (7.0.10)
+    rails-i18n (8.1.0)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
+      railties (>= 8.0.0, < 9)
     rails-settings-cached (2.9.6)
       activerecord (>= 5.0.0)
       railties (>= 5.0.0)
-    railties (7.2.3.1)
-      actionpack (= 7.2.3.1)
-      activesupport (= 7.2.3.1)
-      cgi
+    railties (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -599,23 +604,24 @@ GEM
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.4.2)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rbs (3.9.4)
       logger
     rchardet (1.10.0)
-    rdoc (6.14.2)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
+      tsort
     redcarpet (3.6.1)
     redis (5.4.0)
       redis-client (>= 0.22.0)
     redis-client (0.25.0)
       connection_pool
     regexp_parser (2.10.0)
-    reline (0.6.1)
+    reline (0.6.3)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -646,17 +652,17 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.6)
-    rswag-api (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
-    rswag-specs (2.16.0)
-      activesupport (>= 5.2, < 8.1)
-      json-schema (>= 2.2, < 6.0)
-      railties (>= 5.2, < 8.1)
+    rswag-api (2.17.0)
+      activesupport (>= 5.2, < 8.2)
+      railties (>= 5.2, < 8.2)
+    rswag-specs (2.17.0)
+      activesupport (>= 5.2, < 8.2)
+      json-schema (>= 2.2, < 7.0)
+      railties (>= 5.2, < 8.2)
       rspec-core (>= 2.14)
-    rswag-ui (2.16.0)
-      actionpack (>= 5.2, < 8.1)
-      railties (>= 5.2, < 8.1)
+    rswag-ui (2.17.0)
+      actionpack (>= 5.2, < 8.2)
+      railties (>= 5.2, < 8.2)
     rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
@@ -756,17 +762,15 @@ GEM
     skylight (6.0.4)
       activesupport (>= 5.2.0)
     smart_properties (1.17.0)
-    snaky_hash (2.0.3)
+    snaky_hash (2.0.7)
       hashie (>= 0.1.0, < 6)
-      version_gem (>= 1.1.8, < 3)
-    snaptrade (2.0.156)
-      faraday (>= 1.0.1, < 3.0)
-      faraday-multipart (~> 1.0, >= 1.0.4)
+      version_gem (~> 1.1, >= 1.1.14)
+    ssrf_filter (1.5.0)
     stackprof (0.2.27)
     standardwebhooks (1.1.0)
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
-    stringio (3.1.7)
+    stringio (3.2.0)
     stripe (15.3.0)
     swd (2.0.3)
       activesupport (>= 3)
@@ -785,7 +789,7 @@ GEM
     tailwindcss-ruby (4.1.8-x86_64-linux-musl)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    thor (1.4.0)
+    thor (1.5.0)
     timeout (0.6.1)
     tpm-key_attestation (0.14.1)
       bindata (~> 2.4)
@@ -814,11 +818,11 @@ GEM
     vcr (6.3.1)
       base64
     vernier (1.8.0)
-    version_gem (1.1.9)
-    view_component (3.23.2)
-      activesupport (>= 5.2.0, < 8.1)
+    version_gem (1.1.14)
+    view_component (4.12.0)
+      actionview (>= 7.1.0)
+      activesupport (>= 7.1.0)
       concurrent-ruby (~> 1)
-      method_source (~> 1.0)
     web-console (4.2.1)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -841,14 +845,14 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     websocket (1.2.11)
-    websocket-driver (0.8.0)
+    websocket-driver (0.8.2)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.37)
-    zeitwerk (2.7.3)
+    yard (0.9.44)
+    zeitwerk (2.8.2)
 
 PLATFORMS
   aarch64-linux-gnu
@@ -879,7 +883,6 @@ DEPENDENCIES
   derailed_benchmarks
   doorkeeper
   dotenv-rails
-  ed25519
   erb_lint
   faker
   faraday
@@ -906,7 +909,7 @@ DEPENDENCIES
   omniauth (~> 2.1)
   omniauth-github
   omniauth-google-oauth2
-  omniauth-rails_csrf_protection
+  omniauth-rails_csrf_protection (>= 2.0)
   omniauth-saml (~> 2.1)
   omniauth_openid_connect
   ostruct
@@ -916,12 +919,12 @@ DEPENDENCIES
   plaid
   posthog-ruby
   propshaft
-  puma (>= 5.0)
+  puma (>= 7.2.1)
   pundit
   rack-attack (~> 6.6)
   rack-cors
   rack-mini-profiler
-  rails (~> 7.2.2)
+  rails (~> 8.1.0)
   rails-i18n
   rails-settings-cached
   rchardet
@@ -946,7 +949,6 @@ DEPENDENCIES
   sidekiq-unique-jobs
   simplecov
   skylight
-  snaptrade (~> 2.0)
   stackprof
   stimulus-rails
   stripe
@@ -961,7 +963,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 3.4.7p58
+   ruby 3.4.9p82
 
 BUNDLED WITH
    2.6.7
diff --git a/README.md b/README.md
index 41c93b4c6..c2deadee1 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ For further instructions, see guides below.
 
 [![Run on PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=sure)
 
-[![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/T_draF?referralCode=CW_fPQ)
+[![Deploy on Railway](https://railway.com/button.svg)](https://railway.com/deploy/sure?referralCode=CW_fPQ)
 
 ### Managed OpenClaw for Sure Finances
 
@@ -120,3 +120,13 @@ an [AGPLv3 license](https://github.com/we-promise/sure/blob/main/LICENSE).
 - "Sure" is not, and refers to this community fork.
 
 ![Alt](https://repobeats.axiom.co/api/embed/3a9753cff07501fba8a6749d0ebd567ff63848c8.svg "Repobeats analytics image")
+
+<p align="center">
+  <a href="https://gittensor.io/miners/repository?name=we-promise%2Fsure">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/we-promise/sure/gittensor-impact-assets/gittensor-impact-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/we-promise/sure/gittensor-impact-assets/gittensor-impact-light.svg">
+      <img src="https://raw.githubusercontent.com/we-promise/sure/gittensor-impact-assets/gittensor-impact-light.svg" alt="Gittensor contributor impact for Sure repo" width="600">
+    </picture>
+  </a>
+</p>
diff --git a/SECURITY.md b/SECURITY.md
index 034e84803..390fb7b2e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,20 +2,15 @@
 
 ## Supported Versions
 
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
+We maintain `vX.Y.Z-release-branch` [active areas](https://github.com/we-promise/sure/branches/all?query=release-branch&lastTab=overview) for high impact fixes that need to go out as "hotfix" releases ASAP.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
+| 0.7.1   | :white_check_mark: |
+| 0.7.0   | :white_check_mark: |
+| 0.6.x   | :x:                |
 
 ## Reporting a Vulnerability
 
-Use this section to tell people how to report a vulnerability.
-
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.
+Join our Discord and DM @Juanjo there so he can address the vulnerability before
+disclosing it.
diff --git a/app/assets/images/google-icon.svg b/app/assets/images/google-icon.svg
new file mode 100644
index 000000000..31f21e61d
--- /dev/null
+++ b/app/assets/images/google-icon.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" aria-hidden="true" focusable="false">
+  <path fill="#EA4335" d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"/>
+  <path fill="#4285F4" d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"/>
+  <path fill="#FBBC05" d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"/>
+  <path fill="#34A853" d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"/>
+</svg>
diff --git a/app/assets/images/ynab-logo.png b/app/assets/images/ynab-logo.png
new file mode 100644
index 000000000..21ce33ac5
Binary files /dev/null and b/app/assets/images/ynab-logo.png differ
diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css
index ddbda9b04..035b80946 100644
--- a/app/assets/tailwind/application.css
+++ b/app/assets/tailwind/application.css
@@ -10,7 +10,6 @@
 
 @import "./simonweb_pickr.css";
 
-@import "./google-sign-in.css";
 @import "./date-picker-dark-mode.css";
 @import "./print-report.css";
 @import "./privacy-mode.css";
diff --git a/app/assets/tailwind/google-sign-in.css b/app/assets/tailwind/google-sign-in.css
deleted file mode 100644
index 151b14fe3..000000000
--- a/app/assets/tailwind/google-sign-in.css
+++ /dev/null
@@ -1,106 +0,0 @@
-@layer components {
-  .gsi-material-button {
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    -webkit-appearance: none;
-    background-color: WHITE;
-    background-image: none;
-    border: 1px solid #747775;
-    -webkit-border-radius: 4px;
-    border-radius: 4px;
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    color: #1f1f1f;
-    cursor: pointer;
-    font-family: 'Roboto', arial, sans-serif;
-    font-size: 14px;
-    height: 40px;
-    letter-spacing: 0.25px;
-    outline: none;
-    overflow: hidden;
-    padding: 0 12px;
-    position: relative;
-    text-align: center;
-    -webkit-transition: background-color .218s, border-color .218s, box-shadow .218s;
-    transition: background-color .218s, border-color .218s, box-shadow .218s;
-    vertical-align: middle;
-    white-space: nowrap;
-    width: auto;
-    max-width: 400px;
-    min-width: min-content;
-    display: inline-flex;
-  }
-
-  .gsi-material-button .gsi-material-button-icon {
-    height: 20px;
-    margin-right: 12px;
-    min-width: 20px;
-    width: 20px;
-  }
-
-  .gsi-material-button .gsi-material-button-content-wrapper {
-    -webkit-align-items: center;
-    align-items: center;
-    display: flex;
-    -webkit-flex-direction: row;
-    flex-direction: row;
-    -webkit-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-    height: 100%;
-    justify-content: space-between;
-    position: relative;
-    width: 100%;
-  }
-
-  .gsi-material-button .gsi-material-button-contents {
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-    font-family: 'Roboto', arial, sans-serif;
-    font-weight: 500;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-  }
-
-  .gsi-material-button .gsi-material-button-state {
-    -webkit-transition: opacity .218s;
-    transition: opacity .218s;
-    bottom: 0;
-    left: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-  }
-
-  .gsi-material-button:disabled {
-    cursor: default;
-    background-color: #ffffff61;
-    border-color: #1f1f1f1f;
-  }
-
-  .gsi-material-button:disabled .gsi-material-button-contents {
-    opacity: 38%;
-  }
-
-  .gsi-material-button:disabled .gsi-material-button-icon {
-    opacity: 38%;
-  }
-
-  .gsi-material-button:not(:disabled):active .gsi-material-button-state,
-  .gsi-material-button:not(:disabled):focus .gsi-material-button-state {
-    background-color: #303030;
-    opacity: 12%;
-  }
-
-  .gsi-material-button:not(:disabled):hover {
-    -webkit-box-shadow: 0 1px 2px 0 rgba(60, 64, 67, .30), 0 1px 3px 1px rgba(60, 64, 67, .15);
-    box-shadow: 0 1px 2px 0 rgba(60, 64, 67, .30), 0 1px 3px 1px rgba(60, 64, 67, .15);
-  }
-
-  .gsi-material-button:not(:disabled):hover .gsi-material-button-state {
-    background-color: #303030;
-    opacity: 8%;
-  }
-}
diff --git a/app/assets/tailwind/sure-design-system/_generated.css b/app/assets/tailwind/sure-design-system/_generated.css
index 79ae54d43..27a345930 100644
--- a/app/assets/tailwind/sure-design-system/_generated.css
+++ b/app/assets/tailwind/sure-design-system/_generated.css
@@ -7,14 +7,17 @@
 @theme {
   --font-sans: 'Geist', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
   --font-mono: 'Geist Mono', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+  --font-weight-medium: 500;
+  --font-weight-semibold: 600;
   --color-white: #ffffff;
   --color-black: #0B0B0B;
   --color-success: var(--color-green-700);
   --color-warning: var(--color-yellow-600);
-  --color-destructive: var(--color-red-600);
+  --color-destructive: var(--color-red-500);
   --color-info: var(--color-blue-600);
   --color-shadow: --alpha(var(--color-black) / 6%);
   --color-link: var(--color-blue-600);
+  --color-focus-ring: var(--color-alpha-black-700);
   --color-tertiary: var(--color-alpha-black-100);
   --color-surface: var(--color-gray-50);
   --color-surface-hover: var(--color-gray-100);
@@ -25,7 +28,7 @@
   --color-container-inset: var(--color-gray-50);
   --color-container-inset-hover: var(--color-gray-100);
   --color-nav-indicator: var(--color-black);
-  --color-toggle-track: var(--color-gray-100);
+  --color-toggle-track: var(--color-gray-300);
   --color-destructive-subtle: var(--color-red-200);
   --color-gray-25: #FAFAFA;
   --color-gray-50: #F7F7F7;
@@ -216,6 +219,7 @@
     --color-info: var(--color-blue-500);
     --color-shadow: --alpha(var(--color-white) / 8%);
     --color-link: var(--color-blue-500);
+    --color-focus-ring: var(--color-alpha-white-700);
     --color-tertiary: var(--color-alpha-white-200);
     --color-surface: var(--color-black);
     --color-surface-hover: var(--color-gray-800);
@@ -294,7 +298,7 @@
   @apply text-gray-400;
 
   @variant theme-dark {
-    @apply text-gray-500;
+    @apply text-gray-400;
   }
 }
 
@@ -342,7 +346,7 @@
   @apply border-alpha-black-300;
 
   @variant theme-dark {
-    @apply border-alpha-white-400;
+    @apply border-alpha-white-500;
   }
 }
 
@@ -350,7 +354,7 @@
   @apply border-alpha-black-200;
 
   @variant theme-dark {
-    @apply border-alpha-white-300;
+    @apply border-alpha-white-400;
   }
 }
 
@@ -362,7 +366,7 @@
   @apply border-alpha-black-50;
 
   @variant theme-dark {
-    @apply border-alpha-white-100;
+    @apply border-alpha-white-200;
   }
 }
 
@@ -447,7 +451,7 @@
 }
 
 @utility button-bg-destructive {
-  @apply bg-red-500;
+  @apply bg-red-600;
 
   @variant theme-dark {
     @apply bg-red-400;
@@ -455,7 +459,7 @@
 }
 
 @utility button-bg-destructive-hover {
-  @apply bg-red-600;
+  @apply bg-red-700;
 
   @variant theme-dark {
     @apply bg-red-500;
diff --git a/app/assets/tailwind/sure-design-system/base.css b/app/assets/tailwind/sure-design-system/base.css
index b23d9fb9e..9bf606a10 100644
--- a/app/assets/tailwind/sure-design-system/base.css
+++ b/app/assets/tailwind/sure-design-system/base.css
@@ -11,10 +11,21 @@
   }
 
   button {
-    @apply cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-alpha-black-300;
+    @apply cursor-pointer;
 
-    @variant theme-dark {
-      @apply focus-visible:ring-alpha-white-300;
+    /* Canonical keyboard-focus indicator (#2136) — the same recipe as
+       `.focus-ring` in components.css, applied here so every <button> gets
+       it by default. This used to be a `ring-2 ring-offset-2` box-shadow,
+       which double-painted alongside the `.focus-ring` outline on DS
+       primitives (Buttonish, tabs, popover, tooltip): box-shadow and
+       outline are independent properties, so the components-layer class
+       could never clear it. Transparent resting outline for the same
+       transition reasoning as `.focus-ring`. */
+    outline: 2px solid transparent;
+    outline-offset: 0;
+
+    &:focus-visible {
+      outline-color: var(--color-focus-ring);
     }
   }
 
diff --git a/app/assets/tailwind/sure-design-system/components.css b/app/assets/tailwind/sure-design-system/components.css
index 7d814388f..63c1229fe 100644
--- a/app/assets/tailwind/sure-design-system/components.css
+++ b/app/assets/tailwind/sure-design-system/components.css
@@ -1,4 +1,39 @@
 @layer components {
+  /*
+    Canonical keyboard-focus indicator (#2136). One recipe for every focusable
+    primitive: a neutral 2px `outline` that hugs the control (`outline-offset: 0`
+    so it sits right at the edge and follows the border-radius), in the
+    theme-aware `focus-ring` token.
+
+    `outline` — NOT box-shadow — on purpose: a components-layer box-shadow loses
+    to any utility-layer `shadow-*` (or `focus-within:shadow-none` on the field)
+    on the same element, so the ring silently vanished on shadowed controls.
+    `outline` is a separate property with no such conflict, and it doubles as the
+    forced-colors (Windows high-contrast) indicator. `:focus-visible` only, so it
+    never shows for mouse/touch. `.focus-ring-within` mirrors it onto a wrapper
+    whose focus lands on a child input. `.form-field` deliberately does NOT
+    adopt it: form fields keep their original always-on soft halo (ring-4 at
+    low alpha) — a resting decoration, not a keyboard-only indicator.
+  */
+  /* Base: an always-present transparent outline so consumers that carry
+     `transition-all` (or any transition touching outline-color) animate
+     transparent -> token instead of passing through `currentColor` — the
+     latter reads as a black border flashing in and out. */
+  .focus-ring,
+  .focus-ring-within {
+    outline: 2px solid transparent;
+    outline-offset: 0;
+  }
+
+  .focus-ring:focus-visible,
+  .focus-ring-within:focus-within {
+    /* Note: consumers carrying `transition-colors` animate this in over
+       150ms — Tailwind v4's color transition list includes outline-color.
+       Combined with the transparent base above, that reads as a quick
+       fade-in rather than a pop, never a flash through currentColor. */
+    outline-color: var(--color-focus-ring);
+  }
+
   /* Forms */
   .form-field {
     @apply flex flex-col gap-1 relative px-3 py-2 rounded-md border bg-container border-secondary shadow-xs w-full;
@@ -109,18 +144,27 @@
 
     @variant theme-dark {
       &[type='checkbox'] {
-        @apply ring-gray-900 checked:text-white;
-        background-color: var(--color-gray-100);
+        @apply ring-gray-900 border-alpha-white-300;
+        background-color: transparent;
       }
 
       &[type='checkbox']:disabled {
-        @apply cursor-not-allowed opacity-80;
-        background-color: var(--color-gray-600);
+        @apply cursor-not-allowed opacity-80 border-transparent;
+        background-color: var(--color-gray-700);
+      }
+
+      &[type='checkbox']:checked,
+      &[type='checkbox']:indeterminate {
+        @apply border-transparent;
+        background-color: var(--color-gray-100);
       }
 
       &[type='checkbox']:checked {
-        background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='%23808080' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
-        background-color: var(--color-gray-100);
+        background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='%23171717' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M12.207 4.793a1 1 0 010 1.414l-5 5a1 1 0 01-1.414 0l-2-2a1 1 0 011.414-1.414L6.5 9.086l4.293-4.293a1 1 0 011.414 0z'/%3e%3c/svg%3e");
+      }
+
+      &[type='checkbox']:indeterminate {
+        background-image: url("data:image/svg+xml,%3csvg viewBox='0 0 16 16' fill='%23171717' xmlns='http://www.w3.org/2000/svg'%3e%3crect x='3.5' y='7' width='9' height='2' rx='1'/%3e%3c/svg%3e");
       }
     }
   }
@@ -150,4 +194,91 @@
       fill: var(--color-white);
     }
   }
+
+  /*
+    Segmented control (#2137) — track + equal-footprint segments. The selected
+    state is a single `--active` class so an optional Stimulus controller can
+    toggle it as one unit. Values mirror the DS tab tokens (tab-bg-group /
+    tab-item-active / tab-item-hover) but are inlined with `@variant theme-dark`
+    because `@apply`-ing a custom utility drops its dark override. The near-black
+    dark track (alpha-black-700) is what makes the gray-700 selected pill read —
+    the bespoke controls used a too-light `container-inset` track, hence the
+    audit's "selected pill invisible on dark." Focus comes from the canonical
+    recipe (`focus-ring` on link segments, the base button rule on button
+    segments), not from this block.
+  */
+  .segmented-control {
+    @apply inline-flex items-center gap-0.5 p-1 rounded-lg bg-gray-50;
+    @variant theme-dark {
+      @apply bg-alpha-black-700;
+    }
+  }
+
+  .segmented-control__segment {
+    @apply inline-flex items-center justify-center px-2 py-1 rounded-md whitespace-nowrap;
+    @apply text-sm font-medium text-secondary cursor-pointer transition-colors duration-200;
+    @apply hover:bg-gray-200;
+    @variant theme-dark {
+      @apply hover:bg-gray-800;
+    }
+  }
+
+  .segmented-control__segment--active {
+    @apply bg-white text-primary shadow-sm hover:bg-white;
+    @variant theme-dark {
+      @apply bg-gray-700 hover:bg-gray-700;
+    }
+  }
+
+  /*
+    Horizontally scrollable table wrapper (#2137). `overflow-x: auto` so wide
+    tables scroll instead of clipping (the LLM-usage table was `overflow-hidden`
+    and pushed columns off-screen) or wrapping money mid-digit. The pure-CSS
+    "scroll shadow" gives the missing affordance: the cover gradients
+    (`--table-scroll-bg`, default container-inset) scroll WITH the content
+    (`background-attachment: local`) and hide the fixed shadow gradients at the
+    edges, so a soft edge-shadow only appears when there is more to scroll.
+    Theme-aware via `--color-shadow`. Set `--table-scroll-bg` to match the wrapper.
+  */
+  .table-scroll {
+    --table-scroll-bg: var(--color-container-inset);
+    overflow-x: auto;
+    background:
+      linear-gradient(to right, var(--table-scroll-bg) 30%, transparent),
+      linear-gradient(to left, var(--table-scroll-bg) 30%, transparent) 100% 0,
+      radial-gradient(farthest-side at 0 50%, var(--color-shadow), transparent),
+      radial-gradient(farthest-side at 100% 50%, var(--color-shadow), transparent) 100% 0;
+    background-repeat: no-repeat;
+    background-color: var(--table-scroll-bg);
+    background-size: 32px 100%, 32px 100%, 12px 100%, 12px 100%;
+    background-attachment: local, local, scroll, scroll;
+  }
+
+  /*
+    Chart hover tooltip surface (see utils/chart_tooltip.js for the JS-side
+    contract). Matches the design reference exactly: hairline border ring
+    composed with a soft 8/24 drop shadow (Tailwind shadow utilities don't
+    compose, hence the component class), 10px radius, 10x12 padding. Dark
+    mode swaps the ring to alpha-white; the drop shadow is near-invisible
+    there, which is fine — the ring carries the edge.
+
+    No position transition here on purpose: cursor-following tooltips
+    (sankey, time-series) update left/top every mousemove and a transition
+    makes them trail the pointer. Snap-positioned tooltips (goal projection,
+    which jumps between dates) opt into the 80ms glide via inline style.
+  */
+  .chart-tooltip {
+    background: var(--color-container);
+    border-radius: 10px;
+    padding: 10px 12px;
+    box-shadow:
+      0 0 0 1px var(--color-alpha-black-50),
+      0 8px 24px rgba(11, 11, 11, 0.12);
+
+    @variant theme-dark {
+      box-shadow:
+        0 0 0 1px var(--color-alpha-white-50),
+        0 8px 24px rgba(11, 11, 11, 0.12);
+    }
+  }
 }
diff --git a/app/components/DS/button.html.erb b/app/components/DS/button.html.erb
index 557db0bd9..8186a4349 100644
--- a/app/components/DS/button.html.erb
+++ b/app/components/DS/button.html.erb
@@ -1,6 +1,6 @@
 <%= container do %>
   <% if icon && (icon_position != :right) %>
-    <%= helpers.icon(icon, size: size, color: icon_color, class: icon_classes) %>
+    <%= helpers.icon(icon, size: size, color: icon_color, custom: icon_custom, class: icon_classes) %>
   <% end %>
 
   <% unless icon_only? %>
@@ -8,6 +8,6 @@
   <% end %>
 
   <% if icon && icon_position == :right %>
-    <%= helpers.icon(icon, size: size, color: icon_color) %>
+    <%= helpers.icon(icon, size: size, color: icon_color, custom: icon_custom) %>
   <% end %>
 <% end %>
diff --git a/app/components/DS/button.rb b/app/components/DS/button.rb
index ca5644225..67c33ecb5 100644
--- a/app/components/DS/button.rb
+++ b/app/components/DS/button.rb
@@ -25,7 +25,8 @@ class DS::Button < DS::Buttonish
       data = merged_opts.delete(:data) || {}
 
       if confirm.present?
-        data = data.merge(turbo_confirm: confirm.to_data_attribute)
+        confirm_value = confirm.respond_to?(:to_data_attribute) ? confirm.to_data_attribute : confirm
+        data = data.merge(turbo_confirm: confirm_value)
       end
 
       if frame.present?
@@ -42,6 +43,16 @@ class DS::Button < DS::Buttonish
         merged_opts[:type] ||= "button"
       end
 
+      # A bare `aria_label:` option reaches the tag helpers as a literal
+      # `aria_label` attribute — Rails only dasherizes the nested `aria:` hash.
+      # Callers use both spellings, so fold `aria_label:` into the aria hash
+      # (before the icon fallback below, which must see it as a real label).
+      if (aria_label = merged_opts.delete(:aria_label)).present?
+        aria = (merged_opts[:aria] || {}).symbolize_keys
+        aria[:label] = aria_label if aria[:label].blank?
+        merged_opts[:aria] = aria
+      end
+
       # Icon-only buttons have no visible text node, so screen readers fall
       # back to announcing "button" with no name. Derive a humanized fallback
       # from the icon key so AT users hear *something* meaningful; explicit
diff --git a/app/components/DS/buttonish.rb b/app/components/DS/buttonish.rb
index f1e864511..967874fba 100644
--- a/app/components/DS/buttonish.rb
+++ b/app/components/DS/buttonish.rb
@@ -9,7 +9,7 @@ class DS::Buttonish < DesignSystemComponent
       icon_classes: "text-primary"
     },
     destructive: {
-      container_classes: "text-inverse bg-red-500 theme-dark:bg-red-400 hover:bg-red-600 theme-dark:hover:bg-red-500 disabled:bg-red-200 theme-dark:disabled:bg-red-600",
+      container_classes: "text-inverse button-bg-destructive hover:button-bg-destructive-hover disabled:bg-red-200 theme-dark:disabled:bg-red-600",
       icon_classes: "text-inverse"
     },
     outline: {
@@ -34,16 +34,25 @@ class DS::Buttonish < DesignSystemComponent
     }
   }.freeze
 
+  # Icon-only containers share a height rail with the text buttons of the
+  # same size (sm ≈ 28px, md ≈ 36px, lg ≈ 48px), so a mixed row — icon
+  # trigger next to text buttons, the most common header layout — lines up
+  # instead of mixing 32/44px squares with 36px buttons.
+  #
+  # pointer-coarse restores the 44px square on touch devices: the visual
+  # rail is a pointer-precision tradeoff, and WCAG 2.5.5's 44x44 target
+  # minimum is about fingers, not mice. Coarse-pointer users get the full
+  # target; fine-pointer users get the aligned row.
   SIZES = {
     sm: {
       container_classes: "px-2 py-1",
-      icon_container_classes: "inline-flex items-center justify-center w-8 h-8",
+      icon_container_classes: "inline-flex items-center justify-center w-7 h-7 pointer-coarse:w-11 pointer-coarse:h-11",
       radius_classes: "rounded-md",
       text_classes: "text-sm"
     },
     md: {
       container_classes: "px-3 py-2",
-      icon_container_classes: "inline-flex items-center justify-center w-11 h-11",
+      icon_container_classes: "inline-flex items-center justify-center w-9 h-9 pointer-coarse:w-11 pointer-coarse:h-11",
       radius_classes: "rounded-lg",
       text_classes: "text-sm"
     },
@@ -55,13 +64,14 @@ class DS::Buttonish < DesignSystemComponent
     }
   }.freeze
 
-  attr_reader :variant, :size, :href, :icon, :icon_position, :text, :full_width, :extra_classes, :frame, :opts
+  attr_reader :variant, :size, :href, :icon, :icon_custom, :icon_position, :text, :full_width, :extra_classes, :frame, :opts
 
-  def initialize(variant: :primary, size: :md, href: nil, text: nil, icon: nil, icon_position: :left, full_width: false, frame: nil, **opts)
+  def initialize(variant: :primary, size: :md, href: nil, text: nil, icon: nil, icon_custom: false, icon_position: :left, full_width: false, frame: nil, **opts)
     @variant = variant.to_s.underscore.to_sym
     @size = size.to_sym
     @href = href
     @icon = icon
+    @icon_custom = icon_custom
     @icon_position = icon_position.to_sym
     @text = text
     @full_width = full_width
@@ -76,7 +86,13 @@ class DS::Buttonish < DesignSystemComponent
 
   def container_classes(override_classes = nil)
     class_names(
-      "font-medium whitespace-nowrap",
+      # Tailwind v4 preflight sets `cursor: pointer` on all <button>s, which
+      # also applies while disabled. Override so disabled buttons read as
+      # non-interactive. The aria-disabled twins cover buttons that gate via
+      # `aria-disabled` to stay clickable/focusable (e.g. submit buttons whose
+      # click handler surfaces validation errors — a truly disabled default
+      # submit would also swallow Enter-key implicit submission).
+      "font-medium whitespace-nowrap focus-ring disabled:cursor-not-allowed aria-disabled:cursor-not-allowed aria-disabled:opacity-50",
       merged_base_classes,
       full_width ? "w-full justify-center" : nil,
       container_size_classes,
diff --git a/app/components/DS/dialog.rb b/app/components/DS/dialog.rb
index fe2611339..4a917b91e 100644
--- a/app/components/DS/dialog.rb
+++ b/app/components/DS/dialog.rb
@@ -48,11 +48,15 @@ class DS::Dialog < DesignSystemComponent
   }.freeze
   VALID_HEADING_LEVELS = (1..6).freeze
 
-  def initialize(variant: "modal", auto_open: true, reload_on_close: false, width: "md", frame: nil, disable_frame: false, content_class: nil, disable_click_outside: false, responsive: false, scrollable: true, heading_level: 2, **opts)
+  class_attribute :defaults_provider, default: nil
+
+  def initialize(variant: "modal", auto_open: true, reload_on_close: false, width: "md", frame: nil, disable_frame: false, content_class: nil, disable_click_outside: nil, responsive: false, scrollable: true, heading_level: 2, **opts)
     unless heading_level.is_a?(Integer) && VALID_HEADING_LEVELS.cover?(heading_level)
       raise ArgumentError, "heading_level must be an Integer between 1 and 6, got: #{heading_level.inspect}"
     end
 
+    defaults = self.class.defaults_provider&.call || {}
+
     @variant = variant.to_sym
     @auto_open = auto_open
     @reload_on_close = reload_on_close
@@ -60,7 +64,7 @@ class DS::Dialog < DesignSystemComponent
     @frame = frame
     @disable_frame = disable_frame
     @content_class = content_class
-    @disable_click_outside = disable_click_outside
+    @disable_click_outside = disable_click_outside.nil? ? defaults.fetch(:disable_click_outside, false) : disable_click_outside
     @responsive = responsive
     @scrollable = scrollable
     @heading_level = heading_level
@@ -142,6 +146,7 @@ class DS::Dialog < DesignSystemComponent
     classes = responsive? ? "ml-auto hidden lg:flex" : "ml-auto"
     render DS::Button.new(
       variant: "icon",
+      size: :sm,
       class: classes,
       icon: "x",
       title: I18n.t("ds.dialog.close"),
diff --git a/app/components/DS/disclosure.html.erb b/app/components/DS/disclosure.html.erb
index c323aa76c..007b09ac9 100644
--- a/app/components/DS/disclosure.html.erb
+++ b/app/components/DS/disclosure.html.erb
@@ -1,7 +1,7 @@
 <%= tag.details class: details_classes, open: open, **details_opts do %>
-  <%= tag.summary class: summary_classes do %>
+  <%= tag.summary class: summary_classes, aria: summary_aria_attrs do %>
     <% if summary_content? %>
-      <% if variant == :default %>
+      <% if variant.in?(%i[default bare]) %>
         <%# `:default` summary is already `flex justify-between`, so
             caller-provided sibling divs get distributed directly.
             Wrapping would collapse them into a single flex child and
@@ -33,7 +33,11 @@
     <% end %>
   <% end %>
 
-  <div class="mt-2">
+  <% if variant == :bare %>
     <%= content %>
-  </div>
+  <% else %>
+    <%= tag.div class: body_class.presence do %>
+      <%= content %>
+    <% end %>
+  <% end %>
 <% end %>
diff --git a/app/components/DS/disclosure.rb b/app/components/DS/disclosure.rb
index 1acb7dfe0..ea1c9ec08 100644
--- a/app/components/DS/disclosure.rb
+++ b/app/components/DS/disclosure.rb
@@ -1,9 +1,9 @@
 class DS::Disclosure < DesignSystemComponent
   renders_one :summary_content
 
-  VARIANTS = %i[default card card_inset inline].freeze
+  VARIANTS = %i[default card card_inset inline bare].freeze
 
-  attr_reader :title, :align, :open, :variant, :summary_class_override, :opts
+  attr_reader :title, :align, :open, :variant, :summary_class_override, :summary_aria_label, :body_class, :opts
 
   # `:default` — bg-surface summary, no chrome on the `<details>`. Use
   # for inline expanders that sit inside a parent card (the summary
@@ -25,15 +25,26 @@ class DS::Disclosure < DesignSystemComponent
   # the summary text (and optional chevron) via the `summary_content`
   # slot.
   #
+  # `:bare` — like `:default` on the `<details>` element (`group` only),
+  # but content is yielded without the in-flow body wrapper. Use for
+  # popovers anchored with absolute/fixed positioning inside the panel
+  # (e.g. goal/category color-icon pickers).
+  #
   # In card / inline variants, callers should pass their own
   # `summary_content` slot; the built-in title rendering assumes the
   # `:default` shape.
-  def initialize(title: nil, align: "right", open: false, variant: :default, summary_class: nil, **opts)
+  #
+  # `body_class:` styles the wrapper around the disclosure body (ignored for
+  # `:bare`, which renders no wrapper). Defaults to `mt-2` (the standard gap
+  # below the summary). Pass `nil`/`""` to drop it on non-bare variants.
+  def initialize(title: nil, align: "right", open: false, variant: :default, summary_class: nil, summary_aria_label: nil, body_class: "mt-2", **opts)
     @title = title
     @align = align.to_sym
     @open = open
     @variant = variant&.to_sym
     @summary_class_override = summary_class
+    @summary_aria_label = summary_aria_label
+    @body_class = body_class
     @opts = opts
 
     raise ArgumentError, "Invalid variant: #{@variant.inspect}. Must be one of #{VARIANTS.inspect}" unless VARIANTS.include?(@variant)
@@ -65,18 +76,21 @@ class DS::Disclosure < DesignSystemComponent
     case variant
     when :card, :card_inset
       # Card variants: no bg on summary — the parent details *is* the
-      # surface. Keep cursor + focus-visible ring + flex baseline.
-      # Ring token matches `settings/provider_card.html.erb` (the
-      # established focus pattern on container cards).
-      "list-none cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-300 rounded-xl"
+      # surface. Keep cursor + focus ring + flex baseline.
+      "list-none cursor-pointer focus-ring rounded-xl"
     when :inline
       # Inline variant: no surface, no padding — the summary reads as
       # plain text-link copy. Caller markup (text + optional chevron)
-      # provides the visual. Keep cursor + focus-visible ring + matching
-      # alpha-black-300 token used by the card variants for consistency.
-      "list-none cursor-pointer focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-300 rounded-sm"
+      # provides the visual.
+      "list-none cursor-pointer focus-ring rounded-sm"
+    when :bare
+      "list-none cursor-pointer focus-ring"
     else
-      "px-3 py-2 rounded-xl cursor-pointer flex items-center justify-between bg-surface focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-300"
+      "px-3 py-2 rounded-xl cursor-pointer flex items-center justify-between bg-surface focus-ring min-h-11"
     end
   end
+
+  def summary_aria_attrs
+    summary_aria_label.present? ? { label: summary_aria_label } : {}
+  end
 end
diff --git a/app/components/DS/empty_state.rb b/app/components/DS/empty_state.rb
new file mode 100644
index 000000000..db4f8daa0
--- /dev/null
+++ b/app/components/DS/empty_state.rb
@@ -0,0 +1,34 @@
+class DS::EmptyState < DesignSystemComponent
+  # Centered empty / no-data / disabled state: icon, title, optional
+  # description, optional action slot. Replaces the repeated
+  # `text-center py-12 + icon + title + description + CTA` markup across the
+  # empty screens (#2137), and gives the bare-text feature-disabled pages a real
+  # state instead of unstyled top-left text.
+  #
+  #   <%= render DS::EmptyState.new(icon: "repeat", title: "...", description: "...") do |es| %>
+  #     <% es.with_action do %><%= render DS::Link.new(...) %><% end %>
+  #   <% end %>
+  renders_one :action
+
+  def initialize(icon:, title:, description: nil, icon_size: "xl", icon_custom: false, **opts)
+    @icon = icon
+    @title = title
+    @description = description
+    @icon_size = icon_size
+    @icon_custom = icon_custom
+    @opts = opts
+  end
+
+  erb_template <<~ERB
+    <%= content_tag :div,
+          class: class_names("flex flex-col items-center text-center px-4 py-12", @opts[:class]),
+          **@opts.except(:class) do %>
+      <div class="mb-4"><%= helpers.icon(@icon, size: @icon_size, custom: @icon_custom) %></div>
+      <p class="text-primary font-medium mb-2"><%= @title %></p>
+      <% if @description.present? %>
+        <p class="<%= class_names("text-secondary text-sm max-w-md", ("mb-4" if action?)) %>"><%= @description %></p>
+      <% end %>
+      <% if action? %><div><%= action %></div><% end %>
+    <% end %>
+  ERB
+end
diff --git a/app/components/DS/link.rb b/app/components/DS/link.rb
index 9ca73aacb..0d5c8501a 100644
--- a/app/components/DS/link.rb
+++ b/app/components/DS/link.rb
@@ -6,12 +6,9 @@ class DS::Link < DS::Buttonish
   VARIANTS = VARIANTS.reverse_merge(
     default: {
       # Underline + `text-link` so the link is distinguishable by more
-      # than color alone (WCAG 1.4.1). Focus ring uses the established
-      # alpha-ring DS pattern (also used by DS::Toggle, DS::Tooltip,
-      # provider_card, form-field) so theming stays centralized.
-      container_classes: "text-link underline underline-offset-2 hover:no-underline " \
-                         "focus-visible:ring-2 focus-visible:ring-alpha-black-300 " \
-                         "theme-dark:focus-visible:ring-alpha-white-300",
+      # than color alone (WCAG 1.4.1). Keyboard focus uses the canonical
+      # `.focus-ring` (#2136) so every primitive shares one indicator.
+      container_classes: "text-link underline underline-offset-2 hover:no-underline focus-ring",
       icon_classes: "text-secondary"
     }
   ).freeze
diff --git a/app/components/DS/menu.html.erb b/app/components/DS/menu.html.erb
index c77895cbd..6d9114cf0 100644
--- a/app/components/DS/menu.html.erb
+++ b/app/components/DS/menu.html.erb
@@ -5,9 +5,9 @@
     <%= button %>
   <% end %>
 
-  <div id="<%= menu_id %>" data-DS--menu-target="content" class="px-2 lg:px-0 max-w-full hidden z-50" role="menu">
-    <%= tag.div class: "mx-auto min-w-[200px] shadow-border-xs bg-container rounded-lg", style: ("max-width: #{max_width}" if max_width) do %>
-      <%= tag.div class: class_names("py-1" => !no_padding) do %>
+  <div id="<%= menu_id %>" data-DS--menu-target="content" class="fixed px-2 lg:px-0 max-w-full hidden z-50" role="menu">
+    <%= tag.div class: "mx-auto min-w-[200px] shadow-border-lg bg-container rounded-lg", style: ("max-width: #{max_width}" if max_width) do %>
+      <%= tag.div class: class_names("py-1" => !no_padding, "overflow-y-auto" => max_height), style: ("max-height: #{max_height}" if max_height) do %>
         <% items.each do |item| %>
           <%= item %>
         <% end %>
diff --git a/app/components/DS/menu.rb b/app/components/DS/menu.rb
index 778d48702..0c63ae3eb 100644
--- a/app/components/DS/menu.rb
+++ b/app/components/DS/menu.rb
@@ -10,7 +10,7 @@
 # content? Use `DS::Popover` — `role="menu"` restricts AT users to
 # menuitem-only navigation and breaks anything that isn't an action.
 class DS::Menu < DesignSystemComponent
-  attr_reader :variant, :placement, :offset, :icon_vertical, :no_padding, :testid, :mobile_fullwidth, :max_width, :menu_id
+  attr_reader :variant, :placement, :offset, :icon_vertical, :no_padding, :testid, :mobile_fullwidth, :max_width, :max_height, :menu_id
 
   renders_one :button, ->(**button_options, &block) do
     options_with_target = button_options.deep_dup
@@ -33,7 +33,7 @@ class DS::Menu < DesignSystemComponent
 
   VARIANTS = %i[icon icon_sm button].freeze
 
-  def initialize(variant: "icon", placement: "bottom-end", offset: 12, icon_vertical: false, no_padding: false, testid: nil, mobile_fullwidth: true, max_width: nil)
+  def initialize(variant: "icon", placement: "bottom-end", offset: 12, icon_vertical: false, no_padding: false, testid: nil, mobile_fullwidth: true, max_width: nil, max_height: nil)
     @variant = variant.to_sym
     @placement = placement
     @offset = offset
@@ -42,6 +42,7 @@ class DS::Menu < DesignSystemComponent
     @testid = testid
     @mobile_fullwidth = mobile_fullwidth
     @max_width = max_width
+    @max_height = max_height
     @menu_id = "menu-#{SecureRandom.hex(4)}"
 
     raise ArgumentError, "Invalid variant: #{@variant}. DS::Menu is for action lists only; use DS::Popover for mixed content (forms, pickers, account dropdowns)." unless VARIANTS.include?(@variant)
diff --git a/app/components/DS/menu_controller.js b/app/components/DS/menu_controller.js
index 0c766909f..5615c6e5b 100644
--- a/app/components/DS/menu_controller.js
+++ b/app/components/DS/menu_controller.js
@@ -24,12 +24,21 @@ export default class extends Controller {
   };
 
   connect() {
-    this.show = this.showValue;
     this.boundUpdate = this.update.bind(this);
     this.addEventListeners();
     this.startAutoUpdate();
   }
 
+  // Derived from the content element's own class rather than tracked as
+  // separate state. A Turbo morph (e.g. the same-page refresh after this
+  // menu's own "disable account" action) re-renders the content element
+  // closed without going through toggle()/close(), which would otherwise
+  // leave a plain instance property out of sync with the DOM — swallowing
+  // the next click because toggle() would think it still needs to close.
+  get show() {
+    return !this.contentTarget.classList.contains("hidden");
+  }
+
   disconnect() {
     this.removeEventListeners();
     this.stopAutoUpdate();
@@ -103,23 +112,29 @@ export default class extends Controller {
   };
 
   toggle = () => {
-    this.show = !this.show;
-    this.contentTarget.classList.toggle("hidden", !this.show);
-    this.buttonTarget.setAttribute("aria-expanded", this.show.toString());
-    if (this.show) {
+    const nextShow = !this.show;
+    this.contentTarget.classList.toggle("hidden", !nextShow);
+    this.buttonTarget.setAttribute("aria-expanded", nextShow.toString());
+    if (nextShow) {
       this.update();
       this.#focusFirstMenuItem();
     }
   };
 
   close() {
-    this.show = false;
     this.contentTarget.classList.add("hidden");
     this.buttonTarget.setAttribute("aria-expanded", "false");
   }
 
   #menuItems() {
-    return Array.from(this.contentTarget.querySelectorAll('[role="menuitem"]'));
+    // Include selectable roles (menuitemradio/menuitemcheckbox) so roving focus
+    // and keyboard handling work for single/multi-select menus, not just plain
+    // action items.
+    return Array.from(
+      this.contentTarget.querySelectorAll(
+        '[role="menuitem"], [role="menuitemradio"], [role="menuitemcheckbox"]',
+      ),
+    );
   }
 
   #focusFirstMenuItem() {
diff --git a/app/components/DS/menu_item.html.erb b/app/components/DS/menu_item.html.erb
index 1e401ddf2..96a432c56 100644
--- a/app/components/DS/menu_item.html.erb
+++ b/app/components/DS/menu_item.html.erb
@@ -5,6 +5,11 @@
 <% else %>
   <div class="px-1" role="none">
     <%= wrapper do %>
+      <% if selectable? %>
+        <span class="flex items-center justify-center w-5 h-5 shrink-0" aria-hidden="true">
+          <% if selected %><%= helpers.icon("check", color: destructive? ? :destructive : :default) %><% end %>
+        </span>
+      <% end %>
       <% if icon %>
         <%= helpers.icon(icon, color: destructive? ? :destructive : :default) %>
       <% end %>
diff --git a/app/components/DS/menu_item.rb b/app/components/DS/menu_item.rb
index 7e55968c2..f798f1d5d 100644
--- a/app/components/DS/menu_item.rb
+++ b/app/components/DS/menu_item.rb
@@ -1,14 +1,14 @@
 class DS::MenuItem < DesignSystemComponent
   VARIANTS = %i[link button divider].freeze
 
-  attr_reader :variant, :text, :icon, :href, :method, :destructive, :confirm, :frame, :roving, :opts
+  attr_reader :variant, :text, :icon, :href, :method, :destructive, :confirm, :frame, :roving, :selected, :opts
 
   # `roving: true` (default) emits `tabindex="-1"` and `role="menuitem"` — correct
   # for `DS::Menu`, which provides arrow-key roving and announces `role="menu"`.
   # `roving: false` omits both so items stay in the normal Tab order — required
   # inside `DS::Popover`, which has no roving handler and is not a `role="menu"`
   # container.
-  def initialize(variant:, text: nil, icon: nil, href: nil, method: :post, destructive: false, confirm: nil, frame: nil, roving: true, **opts)
+  def initialize(variant:, text: nil, icon: nil, href: nil, method: :post, destructive: false, confirm: nil, frame: nil, roving: true, selected: nil, **opts)
     @variant = variant.to_sym
     @text = text
     @icon = icon
@@ -18,6 +18,7 @@ class DS::MenuItem < DesignSystemComponent
     @confirm = confirm
     @frame = frame
     @roving = roving
+    @selected = selected
     @opts = opts
     raise ArgumentError, "Invalid variant: #{@variant}" unless VARIANTS.include?(@variant)
   end
@@ -29,10 +30,18 @@ class DS::MenuItem < DesignSystemComponent
     # `tabindex: 0` can't downgrade keyboard/AT semantics.
     html_opts = roving ? merged_opts.except(:role, :tabindex) : merged_opts
 
+    # Merge the contract's ARIA (e.g. aria-checked for selectable rows) with any
+    # caller-supplied aria so neither clobbers the other; the contract wins per-key.
+    attrs = menuitem_attrs
+    if attrs[:aria] && html_opts[:aria]
+      html_opts = html_opts.merge(aria: html_opts[:aria].merge(attrs[:aria]))
+      attrs = attrs.except(:aria)
+    end
+
     if variant == :button
-      button_to href, method: method, class: container_classes, **html_opts, **menuitem_attrs, &block
+      button_to href, method: method, class: container_classes, **html_opts, **attrs, &block
     elsif variant == :link
-      link_to href, class: container_classes, **html_opts, **menuitem_attrs, &block
+      link_to href, class: container_classes, **html_opts, **attrs, &block
     else
       nil
     end
@@ -49,14 +58,30 @@ class DS::MenuItem < DesignSystemComponent
     method == :delete || destructive
   end
 
+  # A selectable item participates in a single-select list (e.g. a period or
+  # category picker). When set (true/false) the item reserves a fixed-width
+  # leading check gutter so row text stays aligned whether or not it is the
+  # current selection. Leave nil for plain action items (no gutter).
+  def selectable?
+    !selected.nil?
+  end
+
   private
     def menuitem_attrs
-      roving ? { role: "menuitem", tabindex: "-1" } : {}
+      return {} unless roving
+
+      # Selectable rows are a single-select group: announce selection state to AT
+      # via menuitemradio + aria-checked, not only the visual check gutter.
+      if selectable?
+        { role: "menuitemradio", tabindex: "-1", aria: { checked: selected ? "true" : "false" } }
+      else
+        { role: "menuitem", tabindex: "-1" }
+      end
     end
 
     def container_classes
       [
-        "flex items-center gap-2 p-2 rounded-md w-full",
+        "flex items-center gap-2 p-2 rounded-md w-full focus-ring",
         destructive? ? "hover:bg-red-tint-5 theme-dark:hover:bg-red-tint-10" : "hover:bg-container-hover"
       ].join(" ")
     end
diff --git a/app/components/DS/pill.html.erb b/app/components/DS/pill.html.erb
index 2dc15e0ec..67e051905 100644
--- a/app/components/DS/pill.html.erb
+++ b/app/components/DS/pill.html.erb
@@ -10,11 +10,15 @@
 <% else %>
   <span class="<%= container_classes %>" style="<%= container_styles %>" title="<%= title || label %>">
     <% if icon %>
-      <%= helpers.icon(icon, size: "xs", color: "current") %>
+      <span class="shrink-0"><%= helpers.icon(icon, size: icon_size, color: "current") %></span>
     <% elsif show_dot %>
       <span class="inline-block shrink-0 rounded-full"
             style="width: <%= dot_size_px %>px; height: <%= dot_size_px %>px; background-color: <%= dot_color %>;"></span>
     <% end %>
-    <%= label %>
+    <% if truncate || label_testid %>
+      <%= tag.span label, class: ("min-w-0 truncate" if truncate), data: (label_testid ? { testid: label_testid } : nil) %>
+    <% else %>
+      <%= label %>
+    <% end %>
   </span>
 <% end %>
diff --git a/app/components/DS/pill.rb b/app/components/DS/pill.rb
index a868d8baa..a51084652 100644
--- a/app/components/DS/pill.rb
+++ b/app/components/DS/pill.rb
@@ -16,7 +16,8 @@ class DS::Pill < DesignSystemComponent
     neutral:     :gray
   }.freeze
 
-  attr_reader :label, :tone, :style, :size, :show_dot, :dot_only, :title, :icon, :marker, :custom_color
+  attr_reader :label, :tone, :style, :size, :show_dot, :dot_only, :title, :icon, :marker, :custom_color,
+              :truncate, :label_testid, :icon_size
 
   # Generic inline pill primitive. Two modes:
   #
@@ -32,6 +33,13 @@ class DS::Pill < DesignSystemComponent
   #
   # Other options:
   #
+  # - `show_dot:` defaults per mode. Stage markers (`marker: true`) keep
+  #   their dot; status / category badges (`marker: false`) are clean by
+  #   default — the pill shape + tone + label already carry the signal, so
+  #   a leading dot is usually redundant and noisy in dense lists. Pass
+  #   `show_dot: true` to opt a badge back in where the dot is genuinely
+  #   additive: live / temporal status ("Syncing", "Active"), or a single
+  #   sparse pill where the dot anchors it as a discrete element.
   # - `dot_only: true` renders only the colored dot (no label, no border).
   #   Use on the collapsed sidebar nav, where there's no room for the label.
   # - `icon:` overrides the dot with a Lucide icon (sized xs, current color).
@@ -43,19 +51,33 @@ class DS::Pill < DesignSystemComponent
   #   `SEMANTIC_TONE_ALIASES`.
   # - Sure has full violet / indigo / fuchsia / amber / green / gray /
   #   red ramps in the design system; this component picks named tokens
-  #   at render time. No raw hex.
-  def initialize(label: nil, tone: :violet, style: :soft, size: :sm, show_dot: true, dot_only: false, title: nil, icon: nil, marker: true, custom_color: nil)
+  #   at render time. No raw hex — except `custom_color:`, which exists for
+  #   user-defined entities (categories, tags) whose hue is data, not design.
+  # - `truncate: true` lets the pill shrink inside a `min-w-0` parent and
+  #   ellipsize its label instead of overflowing (dense table cells like the
+  #   transaction row's category column). Default pills stay `shrink-0`.
+  # - `label_testid:` stamps `data-testid` on the label span for system /
+  #   controller tests that need to target the text node.
+  # - `icon_size:` passes through to the icon helper (default "xs"; the
+  #   category badge uses "sm" to keep its established glyph size).
+  def initialize(label: nil, tone: :violet, style: :soft, size: :sm, show_dot: nil, dot_only: false, title: nil, icon: nil, marker: true, custom_color: nil,
+                 truncate: false, label_testid: nil, icon_size: "xs")
     resolved_tone = SEMANTIC_TONE_ALIASES.fetch(tone.to_sym, tone.to_sym)
     @label = label || I18n.t("ds.pill.default_label", default: "Beta")
     @tone = TONES.include?(resolved_tone) ? resolved_tone : :violet
     @style = STYLES.include?(style.to_sym) ? style.to_sym : :soft
     @size = SIZES.include?(size.to_sym) ? size.to_sym : :sm
-    @show_dot = show_dot
+    # Default per mode: markers keep their dot, badges are dot-less. An
+    # explicit show_dot: true/false always wins.
+    @show_dot = show_dot.nil? ? marker : show_dot
     @dot_only = dot_only
     @title = title
     @icon = icon
     @marker = marker
     @custom_color = custom_color
+    @truncate = truncate
+    @label_testid = label_testid
+    @icon_size = icon_size
   end
 
   def palette
@@ -84,8 +106,13 @@ class DS::Pill < DesignSystemComponent
     p = palette
     case style
     when :filled
+      # Filled = solid / high-emphasis. The tone-500 fill fails white-label AA on
+      # the brighter tones (amber 2.4:1, green 2.6:1, red 4.0:1) and glares on dark
+      # surfaces. Deepen to tone-700 — every `fill` is a `*-500`, so derive -700 —
+      # so the white label clears AA on every tone in both themes.
+      strong_fill = p[:fill].sub("-500)", "-700)")
       <<~CSS.strip.gsub(/\s+/, " ")
-        background-color: #{p[:fill]};
+        background-color: #{strong_fill};
         color: var(--color-white);
         border-color: transparent;
       CSS
@@ -135,7 +162,10 @@ class DS::Pill < DesignSystemComponent
 
   def container_classes
     base = [
-      "inline-flex items-center align-middle font-medium whitespace-nowrap shrink-0",
+      "inline-flex items-center align-middle font-medium",
+      # Truncating pills must be allowed to shrink (and let the label span
+      # ellipsize); everything else keeps its intrinsic width.
+      truncate ? "max-w-full min-w-0" : "whitespace-nowrap shrink-0",
       "border leading-none"
     ]
 
@@ -148,7 +178,7 @@ class DS::Pill < DesignSystemComponent
       # tracking snap to Tailwind's scale to satisfy the design-system
       # "no arbitrary values" rule.
       base << "rounded-md uppercase"
-      base << (size == :md ? "px-2 py-0.5 text-[11px] tracking-wide gap-1" : "px-1.5 py-0.5 text-[10px] tracking-wider gap-1")
+      base << (size == :md ? "px-2 py-1 text-[11px] tracking-wide gap-1" : "px-1.5 py-0.5 text-[10px] tracking-wider gap-1")
     else
       # Badge mode (Pending / Active / Past due / category tag):
       # rounded-full pill shape (matches the existing convention used
@@ -156,7 +186,7 @@ class DS::Pill < DesignSystemComponent
       # the inline transaction badges). Normal case, snaps to the
       # design-system text scale (`text-xs` / `text-sm`).
       base << "rounded-full"
-      base << (size == :md ? "px-2 py-0.5 text-sm gap-1.5" : "px-1.5 py-0.5 text-xs gap-1")
+      base << (size == :md ? "px-2 py-1 text-sm gap-1.5" : "px-1.5 py-0.5 text-xs gap-1")
     end
     class_names(*base)
   end
diff --git a/app/components/DS/popover.html.erb b/app/components/DS/popover.html.erb
index 2b7e45d15..a2030628a 100644
--- a/app/components/DS/popover.html.erb
+++ b/app/components/DS/popover.html.erb
@@ -9,7 +9,7 @@
         the fallback `ds.popover.avatar_default_label` is used. %>
     <button type="button"
             data-DS--popover-target="button"
-            class="inline-flex items-center justify-center w-11 h-11 cursor-pointer rounded-full focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-900 theme-dark:focus-visible:outline-white"
+            class="inline-flex items-center justify-center w-9 h-9 pointer-coarse:w-11 pointer-coarse:h-11 cursor-pointer rounded-full focus-ring"
             aria-label="<%= trigger_aria_label %>"
             aria-haspopup="dialog"
             aria-expanded="false"
@@ -20,8 +20,8 @@
     </button>
   <% end %>
 
-  <div id="<%= panel_id %>" data-DS--popover-target="content" class="px-2 lg:px-0 max-w-full hidden z-50">
-    <%= tag.div class: "mx-auto min-w-[200px] shadow-border-xs bg-container rounded-lg", style: ("max-width: #{max_width}" if max_width) do %>
+  <div id="<%= panel_id %>" data-DS--popover-target="content" class="fixed px-2 lg:px-0 max-w-full hidden z-50">
+    <%= tag.div class: "mx-auto min-w-[200px] shadow-border-lg bg-container rounded-lg", style: ("max-width: #{max_width}" if max_width) do %>
       <%= header %>
 
       <%= tag.div class: class_names("py-1" => !no_padding) do %>
diff --git a/app/components/DS/popover_controller.js b/app/components/DS/popover_controller.js
index 2040a04e2..18a96c03e 100644
--- a/app/components/DS/popover_controller.js
+++ b/app/components/DS/popover_controller.js
@@ -25,12 +25,21 @@ export default class extends Controller {
   };
 
   connect() {
-    this.show = this.showValue;
     this.boundUpdate = this.update.bind(this);
     this.addEventListeners();
     this.startAutoUpdate();
   }
 
+  // Derived from the content element's own class rather than tracked as
+  // separate state. A Turbo morph (e.g. a same-page refresh while this
+  // popover is mounted) re-renders the content element closed without
+  // going through toggle()/close(), which would otherwise leave a plain
+  // instance property out of sync with the DOM — swallowing the next
+  // click because toggle() would think it still needs to close.
+  get show() {
+    return !this.contentTarget.classList.contains("hidden");
+  }
+
   disconnect() {
     this.removeEventListeners();
     this.stopAutoUpdate();
@@ -67,17 +76,16 @@ export default class extends Controller {
   };
 
   toggle = () => {
-    this.show = !this.show;
-    this.contentTarget.classList.toggle("hidden", !this.show);
-    this.buttonTarget.setAttribute("aria-expanded", this.show.toString());
-    if (this.show) {
+    const nextShow = !this.show;
+    this.contentTarget.classList.toggle("hidden", !nextShow);
+    this.buttonTarget.setAttribute("aria-expanded", nextShow.toString());
+    if (nextShow) {
       this.update();
       this.focusFirstElement();
     }
   };
 
   close() {
-    this.show = false;
     this.contentTarget.classList.add("hidden");
     this.buttonTarget.setAttribute("aria-expanded", "false");
   }
diff --git a/app/components/DS/progress_ring.html.erb b/app/components/DS/progress_ring.html.erb
new file mode 100644
index 000000000..d3940cca8
--- /dev/null
+++ b/app/components/DS/progress_ring.html.erb
@@ -0,0 +1,20 @@
+<%= tag.div class: "relative inline-flex shrink-0",
+            style: "width: #{size}px; height: #{size}px;",
+            **wrapper_aria do %>
+  <svg width="<%= size %>" height="<%= size %>" viewBox="0 0 <%= size %> <%= size %>" aria-hidden="true">
+    <circle cx="<%= center %>" cy="<%= center %>" r="<%= radius %>"
+            fill="none" stroke="<%= track_color %>" stroke-width="<%= stroke_width %>" />
+    <circle cx="<%= center %>" cy="<%= center %>" r="<%= radius %>"
+            fill="none" stroke="<%= stroke_color %>" stroke-width="<%= stroke_width %>"
+            stroke-linecap="round"
+            stroke-dasharray="<%= circumference %>"
+            stroke-dashoffset="<%= dash_offset %>"
+            transform="rotate(-90 <%= center %> <%= center %>)" />
+  </svg>
+  <% if show_percent %>
+    <div class="absolute inset-0 flex items-center justify-center font-medium text-primary tabular-nums"
+         style="font-size: <%= percent_font_px %>px;" aria-hidden="true">
+      <%= clamped_percent %>%
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/components/DS/progress_ring.rb b/app/components/DS/progress_ring.rb
new file mode 100644
index 000000000..eb904164c
--- /dev/null
+++ b/app/components/DS/progress_ring.rb
@@ -0,0 +1,80 @@
+# A single-arc circular progress ring, decoupled from any domain model.
+#
+# Extracted from the goal card's inline <svg> (issue #1899) so goals, loans,
+# sub-account funding, etc. stop each hand-rolling the same two-circle SVG with
+# slightly different chrome / colors / a11y. Pass a percent and a tone; the
+# component owns the geometry (radius, circumference, dash offset) and the
+# accessible progressbar markup.
+#
+# Not a segmented donut — that's the `donut-chart` Stimulus controller's job
+# (budget/dashboard breakdowns, and the goals/show ring). This is the simple
+# "X% of one thing" ring.
+class DS::ProgressRing < DesignSystemComponent
+  TONES = {
+    success: "var(--color-success)",
+    warning: "var(--color-warning)",
+    destructive: "var(--color-destructive)",
+    neutral: "var(--color-gray-400)"
+  }.freeze
+
+  # Track (unfilled remainder) color. Reuses the existing token to keep the
+  # goal card pixel-identical. TODO(#1899 follow-up): rename this to a generic
+  # --color-progress-track-fill in the token source — that change also touches
+  # the budget donut surfaces, so it's deferred out of this extraction.
+  DEFAULT_TRACK = "var(--budget-unused-fill)".freeze
+
+  attr_reader :size, :stroke_width, :label, :show_percent
+
+  def initialize(percent:, size: 64, stroke_width: 6, tone: :neutral, label: nil, show_percent: true, track: DEFAULT_TRACK)
+    @percent = percent
+    @size = size
+    @stroke_width = stroke_width
+    @tone = tone.to_sym
+    @label = label
+    @show_percent = show_percent
+    @track = track
+  end
+
+  def clamped_percent
+    [ [ @percent.to_i, 0 ].max, 100 ].min
+  end
+
+  def stroke_color
+    TONES.fetch(@tone, TONES[:neutral])
+  end
+
+  def track_color
+    @track
+  end
+
+  def center
+    size / 2.0
+  end
+
+  def radius
+    (size - stroke_width) / 2.0
+  end
+
+  def circumference
+    2 * Math::PI * radius
+  end
+
+  # Length of the dash gap that hides the unfilled portion of the arc.
+  def dash_offset
+    circumference * (1 - clamped_percent / 100.0)
+  end
+
+  # Center label scales with the ring so 64px reads ~11px (the goal card's size)
+  # and a 180px ring reads ~30px without a per-callsite font class.
+  def percent_font_px
+    (size * 0.17).round
+  end
+
+  # role=progressbar + value/label only when a label is supplied; otherwise the
+  # ring is decorative (aria-hidden via the inner svg) and the caller labels it.
+  def wrapper_aria
+    return {} if label.blank?
+
+    { role: "progressbar", aria: { valuenow: clamped_percent, valuemin: 0, valuemax: 100, label: label } }
+  end
+end
diff --git a/app/components/DS/search_input.rb b/app/components/DS/search_input.rb
index 51c3dc9ca..919d59fcc 100644
--- a/app/components/DS/search_input.rb
+++ b/app/components/DS/search_input.rb
@@ -53,15 +53,11 @@ class DS::SearchInput < DesignSystemComponent
         "h-10 pl-10 w-full border-none rounded-lg " \
         "focus:outline-hidden focus:ring-0"
     else
-      # `focus-visible:outline-*` matches the focus-ring pattern from
-      # DS::Button (base.css) so every interactive surface in the design
-      # system uses the same ring token. Replaces the broken
-      # `focus:ring-gray-500` from the inline callsites — that utility
-      # had no backing token and rendered invisibly on the bordered
-      # bg-container surface.
+      # Canonical `.focus-ring` (#2136) — one shared keyboard-focus
+      # indicator across every DS primitive. Replaces the earlier neutral
+      # `outline-gray-900 / theme-dark:outline-white` pair.
       "block w-full border border-secondary rounded-md py-2.5 pl-10 pr-3 bg-container text-base sm:text-sm " \
-        "focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-900 " \
-        "theme-dark:focus-visible:outline-white"
+        "focus-ring"
     end
   end
 
diff --git a/app/components/DS/segmented_control.rb b/app/components/DS/segmented_control.rb
new file mode 100644
index 000000000..f055dff9e
--- /dev/null
+++ b/app/components/DS/segmented_control.rb
@@ -0,0 +1,51 @@
+class DS::SegmentedControl < DesignSystemComponent
+  # A single-select pill group — filters, mode switches, compact view toggles.
+  # NOT the full ARIA tab/panel widget; use DS::Tabs for tabs-with-panels.
+  #
+  # Each segment is a link (pass `href:`) or a button (default — pass `data:`
+  # for a Stimulus-driven control). Mark the current one with `active: true`.
+  # The selected style lives in `.segmented-control__segment--active`, so a
+  # controller can toggle selection by flipping that one class.
+  #
+  # `full_width: true` stretches segments to equal width (the "equal-footprint"
+  # the #2137 audit asked for); default is content width.
+  renders_many :segments, ->(label, active: false, href: nil, **opts) do
+    # `focus-ring` is for link segments — button segments already get the
+    # canonical outline from the base-layer button rule (it's an idempotent
+    # duplicate there).
+    classes = class_names(
+      "segmented-control__segment focus-ring",
+      ("flex-1" if full_width),
+      ("segmented-control__segment--active" if active),
+      opts.delete(:class)
+    )
+
+    # Expose the selected state to assistive tech: link segments use
+    # `aria-current`, button segments use `aria-pressed`. A Stimulus
+    # controller that toggles `--active` should mirror these (see
+    # budget_filter_controller#filterValueChanged).
+    if href
+      link_to(label, href, class: classes, "aria-current": (active ? "true" : nil), **opts)
+    else
+      content_tag(:button, label, type: "button", class: classes, "aria-pressed": active.to_s, **opts)
+    end
+  end
+
+  attr_reader :full_width, :aria_label
+
+  def initialize(full_width: false, aria_label: nil, **opts)
+    @full_width = full_width
+    @aria_label = aria_label
+    @opts = opts
+  end
+
+  erb_template <<~ERB
+    <%= content_tag :div,
+          class: class_names("segmented-control", ("w-full" if full_width), @opts[:class]),
+          role: "group",
+          "aria-label": aria_label,
+          **@opts.except(:class) do %>
+      <% segments.each do |segment| %><%= segment %><% end %>
+    <% end %>
+  ERB
+end
diff --git a/app/components/DS/select.html.erb b/app/components/DS/select.html.erb
index 1ac9b027f..6999d697b 100644
--- a/app/components/DS/select.html.erb
+++ b/app/components/DS/select.html.erb
@@ -23,17 +23,18 @@
                 id="<%= method %>_trigger"
                 class="form-field__input w-full"
                 data-select-target="button"
-                data-action="click->select#toggle"
+                data-action="click->select#toggle focus->select#handleButtonFocus"
                 aria-haspopup="listbox"
                 aria-expanded="false"
+                tabindex="0"
                 <%= "aria-labelledby=\"#{method}_label #{method}_trigger\"".html_safe if options[:label].present? %>>
           <%= selected_item&.dig(:label) || @placeholder %>
         </button>
     </div>
   </div>
-  <div class="absolute z-50 p-1.5 w-full min-w-32 rounded-lg shadow-lg shadow-border-xs bg-container mt-1.5 transition duration-150 ease-out -translate-y-1 opacity-0 hidden" data-select-target="menu">
+  <div class="absolute z-50 p-1.5 w-full min-w-32 rounded-lg shadow-border-lg bg-container mt-1.5 transition duration-150 ease-out -translate-y-1 opacity-0 hidden" data-select-target="menu">
     <% if searchable %>
-      <div class="flex items-center bg-container border border-secondary rounded-lg mb-1 focus-within:ring-4 focus-within:ring-alpha-black-200 theme-dark:focus-within:ring-alpha-white-300 transition-shadow">
+      <div class="flex items-center bg-container rounded-lg mb-1 focus-ring-within transition-shadow">
         <%= render DS::SearchInput.new(
           variant: :embedded,
           placeholder: t("helpers.select.search_placeholder"),
@@ -50,12 +51,12 @@
         <% is_selected = item[:value] == selected_value %>
         <% obj = item[:object] %>
 
-        <%# Roving tabindex: selected option is in tab order (`0`); others
-            are reachable only via ArrowUp/Down (`-1`). WAI-ARIA APG
-            listbox keyboard pattern. %>
+        <%# Options use tabindex="-1" always — keyboard focus is managed
+            programmatically so listbox items never appear in the Tab
+            sequence and skip past the trigger to the next form field. %>
         <div class="filterable-item text-primary text-sm cursor-pointer flex items-center gap-2 px-3 py-2 rounded-lg hover:bg-container-inset-hover <%= "bg-container-inset" if is_selected %>"
               role="option"
-              tabindex="<%= is_selected ? "0" : "-1" %>"
+              tabindex="-1"
               aria-selected="<%= is_selected %>"
               data-select-target="option"
               data-action="click->select#select"
diff --git a/app/components/DS/tabs/nav.rb b/app/components/DS/tabs/nav.rb
index eb77672fa..ba84d13b9 100644
--- a/app/components/DS/tabs/nav.rb
+++ b/app/components/DS/tabs/nav.rb
@@ -22,7 +22,7 @@ class DS::Tabs::Nav < DesignSystemComponent
     content_tag(
       :button, label, id: "#{dom_prefix}-tab-#{id}",
       type: "button",
-      class: class_names(btn_classes, is_active ? active_btn_classes : inactive_btn_classes, classes),
+      class: class_names("focus-ring", btn_classes, is_active ? active_btn_classes : inactive_btn_classes, classes),
       role: "tab",
       "aria-selected": is_active.to_s,
       "aria-controls": "#{dom_prefix}-panel-#{id}",
diff --git a/app/components/DS/toggle.rb b/app/components/DS/toggle.rb
index e45b69051..36912d5aa 100644
--- a/app/components/DS/toggle.rb
+++ b/app/components/DS/toggle.rb
@@ -24,14 +24,13 @@ class DS::Toggle < DesignSystemComponent
        # `prefers-reduced-motion`; reduced-motion users get a snap.
        "motion-safe:transition-colors motion-safe:duration-300",
        "after:content-[''] after:block after:bg-white after:absolute after:rounded-full",
-       "after:top-0.5 after:left-0.5 after:w-4 after:h-4",
+       "after:top-0.5 after:left-0.5 after:w-4 after:h-4 after:shadow-sm",
        "motion-safe:after:transition-transform motion-safe:after:duration-300 motion-safe:after:ease-in-out",
        "peer-checked:bg-success peer-checked:after:translate-x-4",
-       # Focus ring driven from the sr-only input via `peer-focus-visible:`.
-       # Offset places the ring outside the track so it lands on the
-       # surrounding chrome regardless of theme.
-       "peer-focus-visible:ring-2 peer-focus-visible:ring-offset-2",
-       "peer-focus-visible:ring-alpha-black-300 theme-dark:peer-focus-visible:ring-alpha-white-300",
+       # Canonical focus ring (#2136), driven from the sr-only input via
+       # `peer-focus-visible:`. outline-offset places it just outside the track
+       # so it lands on surrounding chrome in either theme.
+       "peer-focus-visible:outline-2 peer-focus-visible:outline-offset-2 peer-focus-visible:outline-focus-ring",
        "peer-disabled:opacity-70 peer-disabled:cursor-not-allowed"
     )
   end
diff --git a/app/components/DS/tooltip.html.erb b/app/components/DS/tooltip.html.erb
index fe0c04366..281f2d8e6 100644
--- a/app/components/DS/tooltip.html.erb
+++ b/app/components/DS/tooltip.html.erb
@@ -6,7 +6,7 @@
         name comes from `aria-label`, and the tooltip text is exposed
         via `aria-describedby`. %>
     <button type="button"
-            class="inline-flex items-center cursor-default focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-300 theme-dark:focus-visible:ring-alpha-white-300 rounded"
+            class="inline-flex items-center cursor-default focus-ring rounded"
             aria-describedby="<%= tooltip_id %>"
             aria-label="<%= t("ds.tooltip.trigger_label", default: "More info") %>">
       <%= helpers.icon icon_name, size: size, color: color %>
diff --git a/app/components/UI/account/chart.html.erb b/app/components/UI/account/chart.html.erb
index c14627575..aedc04abf 100644
--- a/app/components/UI/account/chart.html.erb
+++ b/app/components/UI/account/chart.html.erb
@@ -9,31 +9,31 @@
         <% end %>
       </div>
       <div class="flex flex-row gap-2 items-baseline">
-        <%= tag.p view_balance_money.format, class: "text-primary text-3xl font-medium truncate privacy-sensitive" %>
+        <%= tag.p view_balance_display, class: "text-primary text-3xl font-medium truncate privacy-sensitive" %>
 
-        <% if converted_balance_money %>
-          <%= tag.p converted_balance_money.format, class: "text-sm font-medium text-secondary privacy-sensitive" %>
+        <% if converted_balance_display %>
+          <%= tag.p converted_balance_display, class: "text-sm font-medium text-secondary privacy-sensitive" %>
         <% end %>
       </div>
     </div>
 
-    <%= form_with url: account_path(account), method: :get, data: { controller: "auto-submit-form" } do |form| %>
-      <div class="flex items-center gap-2">
-        <% if account.supports_trades? %>
+    <div class="flex items-center gap-2">
+      <% if account.supports_trades? %>
+        <%= form_with url: account_path(account), method: :get, data: { controller: "auto-submit-form" } do |form| %>
           <%= form.select :chart_view,
-            [[t(".views.total_value"), "balance"], [t(".views.holdings"), "holdings_balance"], [t(".views.cash"), "cash_balance"]],
+            [[t(".views.total_value"), "balance"], [t(".views.holdings"), "holdings_balance"], [t(".views.cash"), "cash_balance"], [t(".views.gains"), "gains"]],
             { selected: view },
             class: "bg-container border border-secondary rounded-lg text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0",
             data: { "auto-submit-form-target": "auto" } %>
         <% end %>
+      <% end %>
 
-        <%= form.select :period,
-                    Period.as_options,
-                    { selected: period.key },
-                    data: { "auto-submit-form-target": "auto" },
-                    class: "bg-container border border-secondary rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
-      </div>
-    <% end %>
+      <%= render UI::PeriodPicker.new(
+        selected: period,
+        url: account_path(account),
+        extra_params: account.supports_trades? ? { chart_view: view } : {}
+      ) %>
+    </div>
   </div>
 
   <%= turbo_frame_tag dom_id(@account, :chart_details) do %>
diff --git a/app/components/UI/account/chart.rb b/app/components/UI/account/chart.rb
index 25c5880ab..9b1471551 100644
--- a/app/components/UI/account/chart.rb
+++ b/app/components/UI/account/chart.rb
@@ -15,6 +15,7 @@ class UI::Account::Chart < ApplicationComponent
     account.balance_money - account.cash_balance_money
   end
 
+  # Money value shown as the main indicator for the selected chart view.
   def view_balance_money
     case view
     when "balance"
@@ -23,9 +24,24 @@ class UI::Account::Chart < ApplicationComponent
       holdings_value_money
     when "cash_balance"
       account.cash_balance_money
+    when "gains"
+      gains_money
     end
   end
 
+  # Formatted main indicator. Gains are signed explicitly (e.g. "+€79.53") since
+  # a gain of zero-or-more is otherwise indistinguishable from a balance.
+  def view_balance_display
+    signed_format(view_balance_money)
+  end
+
+  # Formatted family-currency amount for foreign-currency accounts, signed the
+  # same way as the main indicator. Nil when no conversion applies.
+  def converted_balance_display
+    converted_balance_money&.then { |money| signed_format(money) }
+  end
+
+  # Label displayed above the main indicator, based on account type and chart view.
   def title
     case account.accountable_type
     when "Investment", "Crypto"
@@ -36,6 +52,8 @@ class UI::Account::Chart < ApplicationComponent
         I18n.t("UI.account.chart.title.holdings_value")
       when "cash_balance"
         I18n.t("UI.account.chart.title.cash_value")
+      when "gains"
+        I18n.t("UI.account.chart.title.total_gains")
       end
     when "Property"
       I18n.t("UI.account.chart.title.estimated_property_value")
@@ -54,11 +72,14 @@ class UI::Account::Chart < ApplicationComponent
     account.currency != account.family.currency
   end
 
+  # Main indicator converted to the family currency for foreign-currency accounts,
+  # or nil when no conversion applies (same currency or missing exchange rate).
   def converted_balance_money
     return nil unless foreign_currency?
 
     begin
-      account.balance_money.exchange_to(account.family.currency)
+      base_money = view == "gains" ? gains_money : account.balance_money
+      base_money.exchange_to(account.family.currency)
     rescue Money::ConversionError
       nil
     end
@@ -72,6 +93,12 @@ class UI::Account::Chart < ApplicationComponent
     account.balance_series(period: period, view: view)
   end
 
+  # Current total unrealized gains, taken from the series so the main indicator
+  # always matches the last point of the chart (there is no stored gains column).
+  def gains_money
+    series.values.last&.value || Money.new(0, account.currency)
+  end
+
   def trend
     series.trend
   end
@@ -86,4 +113,12 @@ class UI::Account::Chart < ApplicationComponent
       period.comparison_label
     end
   end
+
+  private
+    # Prefixes positive gains with "+"; other views keep plain Money formatting.
+    def signed_format(money)
+      return money.format unless view == "gains" && money.amount.positive?
+
+      "+#{money.format}"
+    end
 end
diff --git a/app/components/UI/period_picker.html.erb b/app/components/UI/period_picker.html.erb
new file mode 100644
index 000000000..d7ccbf302
--- /dev/null
+++ b/app/components/UI/period_picker.html.erb
@@ -0,0 +1,20 @@
+<%= render DS::Menu.new(variant: :button, placement: placement) do |menu| %>
+  <% menu.with_button(
+       type: "button",
+       class: "inline-flex items-center gap-1.5 bg-container border border-secondary font-medium rounded-lg pl-3 pr-2 py-2 text-sm cursor-pointer text-primary hover:bg-container-inset-hover focus:outline-hidden focus:ring-0",
+       aria: { label: t(".aria_label", period: selected_label, default: "Time period: %{period}") }
+     ) do %>
+    <span class="whitespace-nowrap"><%= selected_label %></span>
+    <%= helpers.icon("chevron-down", size: "sm") %>
+  <% end %>
+
+  <% periods.each do |period| %>
+    <% menu.with_item(
+         variant: :link,
+         text: period.label_short,
+         href: href_for(period.key),
+         frame: frame,
+         selected: selected?(period.key)
+       ) %>
+  <% end %>
+<% end %>
diff --git a/app/components/UI/period_picker.rb b/app/components/UI/period_picker.rb
new file mode 100644
index 000000000..60d75a459
--- /dev/null
+++ b/app/components/UI/period_picker.rb
@@ -0,0 +1,46 @@
+class UI::PeriodPicker < ApplicationComponent
+  # Unified time-range selector shared by the dashboard and account charts.
+  #
+  # Renders a DS::Menu as a flat list of link items — one per Period. Each item
+  # is a GET link to `url` carrying `?period=<key>` (plus any `extra_params`),
+  # which re-renders `frame` (a Turbo Frame id) with the chosen period. When
+  # `frame` is nil the links fall back to a normal Turbo Drive visit.
+  #
+  # The selected period is marked with a check icon and `aria-current`, and the
+  # trigger button shows its label.
+  #
+  # NOTE: `url` must be a path without a query string; pass query state via
+  # `extra_params` so the picker can compose `?period=…` cleanly.
+  attr_reader :selected_key, :url, :frame, :extra_params, :placement
+
+  def initialize(selected:, url:, frame: nil, extra_params: {}, placement: "bottom-end")
+    @selected_key = selected.respond_to?(:key) ? selected.key : selected.to_s
+    @url = url
+    @frame = frame
+    @extra_params = (extra_params || {}).symbolize_keys
+    @placement = placement
+  end
+
+  def periods
+    Period.all
+  end
+
+  def selected_label
+    period_for(selected_key).label_short
+  end
+
+  def selected?(key)
+    key == selected_key
+  end
+
+  def href_for(key)
+    "#{url}?#{extra_params.merge(period: key).to_query}"
+  end
+
+  private
+    def period_for(key)
+      Period.from_key(key)
+    rescue Period::InvalidKeyError
+      Period.last_30_days
+    end
+end
diff --git a/app/components/goals/card_component.html.erb b/app/components/goals/card_component.html.erb
index 7e2174885..6c38e7921 100644
--- a/app/components/goals/card_component.html.erb
+++ b/app/components/goals/card_component.html.erb
@@ -5,41 +5,26 @@
   <div class="flex items-start gap-3">
     <%= render Goals::AvatarComponent.new(goal: goal, size: "lg") %>
     <div class="min-w-0 flex-1">
-      <div class="flex items-center gap-2 mb-0.5">
-        <p class="text-base font-medium text-primary truncate">
-          <a href="<%= goal_path(goal) %>"
-             aria-label="<%= aria_label %>"
-             class="before:absolute before:inset-0 before:rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-100">
-            <%= goal.name %>
-          </a>
-        </p>
+      <%# Name owns its row at full width — the status pill moved to the meta
+          line below so it stops eating the title space on narrow cards. %>
+      <p class="text-base font-medium text-primary truncate">
+        <a href="<%= goal_path(goal) %>"
+           aria-label="<%= aria_label %>"
+           class="before:absolute before:inset-0 before:rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-100">
+          <%= goal.name %>
+        </a>
+      </p>
+      <div class="flex items-center gap-2 mt-0.5">
         <%= render Goals::StatusPillComponent.new(goal: goal) %>
+        <% if secondary_line.present? %>
+          <p class="min-w-0 text-xs text-subdued truncate"><%= secondary_line %></p>
+        <% end %>
       </div>
-      <p class="text-xs text-subdued truncate"><%= secondary_line %></p>
     </div>
 
-    <div class="shrink-0 relative" style="width: <%= Goals::CardComponent::RING_SIZE %>px; height: <%= Goals::CardComponent::RING_SIZE %>px;">
-      <svg width="<%= Goals::CardComponent::RING_SIZE %>" height="<%= Goals::CardComponent::RING_SIZE %>" viewBox="0 0 <%= Goals::CardComponent::RING_SIZE %> <%= Goals::CardComponent::RING_SIZE %>" aria-hidden="true">
-        <circle cx="<%= Goals::CardComponent::RING_SIZE / 2.0 %>"
-                cy="<%= Goals::CardComponent::RING_SIZE / 2.0 %>"
-                r="<%= ring_radius %>"
-                fill="none"
-                stroke="var(--budget-unused-fill)"
-                stroke-width="<%= Goals::CardComponent::RING_STROKE %>" />
-        <circle cx="<%= Goals::CardComponent::RING_SIZE / 2.0 %>"
-                cy="<%= Goals::CardComponent::RING_SIZE / 2.0 %>"
-                r="<%= ring_radius %>"
-                fill="none"
-                stroke="<%= ring_color %>"
-                stroke-width="<%= Goals::CardComponent::RING_STROKE %>"
-                stroke-linecap="round"
-                stroke-dasharray="<%= ring_circumference %>"
-                stroke-dashoffset="<%= ring_offset %>"
-                transform="rotate(-90 <%= Goals::CardComponent::RING_SIZE / 2.0 %> <%= Goals::CardComponent::RING_SIZE / 2.0 %>)" />
-      </svg>
-      <div class="absolute inset-0 flex items-center justify-center text-[11px] font-medium text-primary tabular-nums" aria-hidden="true">
-        <%= progress_percent %>%
-      </div>
+    <%# shrink-0 keeps the ring at full size; the name block shrinks first. %>
+    <div class="shrink-0">
+      <%= render DS::ProgressRing.new(percent: progress_percent, tone: ring_tone) %>
     </div>
   </div>
 
@@ -53,10 +38,13 @@
     <% end %>
   </div>
 
-  <div class="mt-4 flex items-center justify-between">
-    <div class="flex items-center gap-2">
+  <%# flex-wrap + gap so the account label and the footer line wrap onto
+      separate lines under a gap when cramped, instead of butting together
+      (the "1 accountcatch up" run-on at narrow card widths). %>
+  <div class="mt-4 flex flex-wrap items-center justify-between gap-x-3 gap-y-1">
+    <div class="flex items-center gap-2 min-w-0">
       <%= render Goals::AccountStackComponent.new(accounts: linked_accounts, color_map: goal.account_color_map) %>
-      <span class="text-xs text-subdued"><%= linked_accounts_count_label %></span>
+      <span class="text-xs text-subdued whitespace-nowrap"><%= linked_accounts_count_label %></span>
     </div>
     <span class="text-xs text-subdued tabular-nums <%= "privacy-sensitive" if footer_has_money? %>">
       <%= footer_line %><% if has_pending_pledge? %> · <%= t("goals.goal_card.pending_count", count: pending_pledges_count) %><% end %>
diff --git a/app/components/goals/card_component.rb b/app/components/goals/card_component.rb
index 0f68d4839..2a1d23fc2 100644
--- a/app/components/goals/card_component.rb
+++ b/app/components/goals/card_component.rb
@@ -1,7 +1,4 @@
 class Goals::CardComponent < ApplicationComponent
-  RING_SIZE = 64
-  RING_STROKE = 6
-
   def initialize(goal:, filterable: true)
     @goal = goal
     @filterable = filterable
@@ -13,11 +10,13 @@ class Goals::CardComponent < ApplicationComponent
     goal.progress_percent
   end
 
-  def ring_color
+  # Maps goal status to a DS::ProgressRing tone (the ring geometry/colors now
+  # live in that primitive — see #1899).
+  def ring_tone
     case goal.status
-    when :reached, :on_track then "var(--color-success)"
-    when :behind then "var(--color-warning)"
-    else "var(--color-gray-400)"
+    when :reached, :on_track then :success
+    when :behind then :warning
+    else :neutral
     end
   end
 
@@ -52,33 +51,21 @@ class Goals::CardComponent < ApplicationComponent
   end
 
   def secondary_line
-    if goal.completed?
-      I18n.t("goals.goal_card.completed")
-    elsif goal.target_date.nil?
-      I18n.t("goals.goal_card.no_target_date")
+    # nil when the status pill already carries it — the pill now sits on this
+    # same meta line, so "Completed Completed" / "Open Open" would read twice.
+    return nil if goal.completed? || goal.target_date.nil?
+
+    days = (goal.target_date - Date.current).to_i
+    if days >= 0
+      # Count only ("211 days left"); the full target date lives on the show
+      # page. Appending "· by <long date>" here overflowed the card's single
+      # line and truncated to a useless "211 d…".
+      I18n.t("goals.goal_card.days_left", count: days)
     else
-      days = (goal.target_date - Date.current).to_i
-      if days >= 0
-        I18n.t("goals.goal_card.days_left_by", count: days, date: I18n.l(goal.target_date, format: :long))
-      else
-        I18n.t("goals.goal_card.past_due")
-      end
+      I18n.t("goals.goal_card.past_due")
     end
   end
 
-  def ring_circumference
-    @ring_circumference ||= 2 * Math::PI * ring_radius
-  end
-
-  def ring_radius
-    @ring_radius ||= (RING_SIZE - RING_STROKE) / 2.0
-  end
-
-  def ring_offset
-    pct = [ [ progress_percent.to_i, 0 ].max, 100 ].min
-    ring_circumference * (1 - pct / 100.0)
-  end
-
   def pace_line
     return nil if goal.archived? || goal.paused? || goal.completed? || goal.status == :reached
 
diff --git a/app/components/goals/funding_accounts_breakdown_component.html.erb b/app/components/goals/funding_accounts_breakdown_component.html.erb
index 587038a8d..f98118fb4 100644
--- a/app/components/goals/funding_accounts_breakdown_component.html.erb
+++ b/app/components/goals/funding_accounts_breakdown_component.html.erb
@@ -13,8 +13,8 @@
     <% if rows.size > 1 && total.positive? %>
       <div class="flex gap-1">
         <% rows.each do |row| %>
-          <% next if row[:balance].to_d.zero? %>
-          <div class="h-1.5 rounded-sm" style="width: <%= percent_for(row[:balance]) %>%; background-color: <%= color_for(row[:account]) %>;"></div>
+          <% next if row[:backing].to_d.zero? %>
+          <div class="h-1.5 rounded-sm" style="width: <%= percent_for(row[:backing]) %>%; background-color: <%= color_for(row[:account]) %>;"></div>
         <% end %>
       </div>
     <% end %>
@@ -31,13 +31,17 @@
             <div class="min-w-0">
               <p class="text-sm font-medium text-primary truncate"><%= account.name %></p>
               <p class="text-sm text-subdued tabular-nums privacy-sensitive">
-                <%= accountable_label(account) %> · <%= row[:balance_money].format(precision: 0) %>
+                <% if row[:earmarked] %>
+                  <%= t("goals.show.funding_accounts.earmarked_of", earmarked: row[:backing_money].format(precision: 0), balance: row[:balance_money].format(precision: 0)) %>
+                <% else %>
+                  <%= accountable_label(account) %> · <%= row[:backing_money].format(precision: 0) %>
+                <% end %>
               </p>
             </div>
 
             <% if rows.size > 1 %>
               <p class="hidden sm:block text-sm text-secondary tabular-nums text-right privacy-sensitive">
-                <%= percent_for(row[:balance]) %>%
+                <%= percent_for(row[:backing]) %>%
               </p>
             <% else %>
               <span class="hidden sm:block"></span>
diff --git a/app/components/goals/funding_accounts_breakdown_component.rb b/app/components/goals/funding_accounts_breakdown_component.rb
index 345d40988..6917bf47c 100644
--- a/app/components/goals/funding_accounts_breakdown_component.rb
+++ b/app/components/goals/funding_accounts_breakdown_component.rb
@@ -9,12 +9,16 @@ class Goals::FundingAccountsBreakdownComponent < ApplicationComponent
   attr_reader :goal
 
   def rows
-    @rows ||= goal.linked_accounts.sort_by { |a| -a.balance.to_d }.map do |account|
+    @rows ||= goal.linked_accounts.sort_by { |a| -goal.account_backing(a).amount.to_d }.map do |account|
       totals = inflow_totals_for(account)
+      backing = goal.account_backing(account).amount.to_d
+      goal_account = goal_account_by_id[account.id]
       {
         account: account,
-        balance: account.balance.to_d,
+        backing: backing,
+        backing_money: Money.new(backing, goal.currency),
         balance_money: Money.new(account.balance.to_d, goal.currency),
+        earmarked: goal_account&.allocated_amount.present?,
         last_30_money: Money.new(totals[:last_30], goal.currency),
         last_90_money: Money.new(totals[:last_90], goal.currency)
       }
@@ -22,12 +26,12 @@ class Goals::FundingAccountsBreakdownComponent < ApplicationComponent
   end
 
   def total
-    @total ||= rows.sum { |r| r[:balance].to_d }
+    @total ||= rows.sum { |r| r[:backing].to_d }
   end
 
-  def percent_for(balance)
+  def percent_for(backing)
     return 0 if total.zero?
-    ((balance.to_d / total) * 100).round
+    ((backing.to_d / total) * 100).round
   end
 
   # Pull from the goal's per-goal account color map so the colors here
@@ -52,6 +56,10 @@ class Goals::FundingAccountsBreakdownComponent < ApplicationComponent
   end
 
   private
+    def goal_account_by_id
+      @goal_account_by_id ||= goal.goal_accounts.index_by(&:account_id)
+    end
+
     # Per-account net inflow for both windows in one pass over the 90-day
     # entries set. Entry amount sign in Sure: inflow is negative; flip and
     # clamp ≥ 0.
diff --git a/app/constraints/super_admin_constraint.rb b/app/constraints/super_admin_constraint.rb
new file mode 100644
index 000000000..39acc8b53
--- /dev/null
+++ b/app/constraints/super_admin_constraint.rb
@@ -0,0 +1,23 @@
+# Routing constraint for mounting engines that bypass ApplicationController
+# entirely (e.g. Sidekiq::Web). Resolves the signed session cookie the same
+# way Authentication#find_session_by_cookie does and requires the session's
+# user to be a super admin.
+#
+# The session's user is always the TRUE user: impersonation is resolved at the
+# Current level, so an impersonated member can never satisfy this, and a
+# super admin impersonating someone still is one. Sessions are only created
+# after MFA verification, so this does not bypass MFA either.
+#
+# Fails closed: any error (garbage cookie, unreachable DB) means the route
+# does not exist for the request (404).
+class SuperAdminConstraint
+  def matches?(request)
+    cookie_value = request.cookie_jar.signed[:session_token]
+    return false if cookie_value.blank?
+
+    Session.find_by(id: cookie_value)&.user&.super_admin? || false
+  rescue => e
+    Rails.logger.warn("SuperAdminConstraint rejected request: #{e.class}: #{e.message}")
+    false
+  end
+end
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 6ce5e02c6..223483f6b 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -2,7 +2,7 @@ class AccountsController < ApplicationController
   include StreamExtensions
 
   before_action :set_account, only: %i[show sparkline sync set_default remove_default]
-  before_action :set_manageable_account, only: %i[toggle_active destroy unlink confirm_unlink select_provider]
+  before_action :set_manageable_account, only: %i[toggle_active toggle_exclude_from_reports destroy unlink confirm_unlink select_provider]
   include Periodable
 
   def index
@@ -10,22 +10,30 @@ class AccountsController < ApplicationController
     @manual_accounts = family.accounts
           .listable_manual
           .where(id: @accessible_account_ids)
+          .with_attached_logo
           .includes(:accountable, :account_providers, :plaid_account, :simplefin_account)
           .order(:name)
-    @plaid_items = visible_provider_items(family.plaid_items.ordered.includes(:syncs, :plaid_accounts))
-    @simplefin_items = visible_provider_items(family.simplefin_items.ordered.includes(:syncs))
-    @lunchflow_items = visible_provider_items(family.lunchflow_items.ordered.includes(:syncs, :lunchflow_accounts))
-    @akahu_items = visible_provider_items(family.akahu_items.ordered.includes(:syncs, :akahu_accounts))
-    @enable_banking_items = visible_provider_items(family.enable_banking_items.ordered.includes(:syncs))
-    @coinstats_items = visible_provider_items(family.coinstats_items.ordered.includes(:coinstats_accounts, :accounts, :syncs))
-    @mercury_items = visible_provider_items(family.mercury_items.ordered.includes(:syncs, :mercury_accounts))
-    @brex_items = visible_provider_items(family.brex_items.ordered.includes(:accounts, :syncs, brex_accounts: :account_provider))
-    @coinbase_items = visible_provider_items(family.coinbase_items.ordered.includes(:coinbase_accounts, :accounts, :syncs))
-    @snaptrade_items = visible_provider_items(family.snaptrade_items.ordered.includes(:syncs, :snaptrade_accounts))
-    @ibkr_items = visible_provider_items(family.ibkr_items.ordered.includes(:syncs, :ibkr_accounts))
-    @indexa_capital_items = visible_provider_items(family.indexa_capital_items.ordered.includes(:syncs, :indexa_capital_accounts))
-    @sophtron_items = visible_provider_items(family.sophtron_items.ordered.includes(:syncs, :sophtron_accounts))
-    @binance_items = visible_provider_items(family.binance_items.ordered.includes(:binance_accounts, :accounts, :syncs))
+    @plaid_items = visible_provider_items(family.plaid_items.ordered.with_attached_logo.includes(:plaid_accounts))
+    @simplefin_items = visible_provider_items(family.simplefin_items.ordered.with_attached_logo)
+    @lunchflow_items = visible_provider_items(family.lunchflow_items.ordered.with_attached_logo.includes(:lunchflow_accounts))
+    @redbark_items = visible_provider_items(family.redbark_items.ordered.with_attached_logo.includes(:redbark_accounts))
+    @akahu_items = visible_provider_items(family.akahu_items.ordered.with_attached_logo.includes(:akahu_accounts))
+    @up_items = visible_provider_items(family.up_items.ordered.with_attached_logo.includes(:up_accounts))
+    @enable_banking_items = visible_provider_items(family.enable_banking_items.ordered.with_attached_logo)
+    @coinstats_items = visible_provider_items(family.coinstats_items.ordered.with_attached_logo.includes(:coinstats_accounts, :accounts))
+    @mercury_items = visible_provider_items(family.mercury_items.ordered.with_attached_logo.includes(:mercury_accounts))
+    @brex_items = visible_provider_items(family.brex_items.ordered.with_attached_logo.includes(:accounts, brex_accounts: :account_provider))
+    @coinbase_items = visible_provider_items(family.coinbase_items.ordered.with_attached_logo.includes(:coinbase_accounts, :accounts))
+    @snaptrade_items = visible_provider_items(family.snaptrade_items.ordered.with_attached_logo.includes(:snaptrade_accounts))
+    @ibkr_items = visible_provider_items(family.ibkr_items.ordered.with_attached_logo.includes(:ibkr_accounts))
+    @indexa_capital_items = visible_provider_items(family.indexa_capital_items.ordered.with_attached_logo.includes(:indexa_capital_accounts))
+    @sophtron_items = visible_provider_items(family.sophtron_items.ordered.with_attached_logo.includes(:sophtron_accounts))
+    @binance_items = visible_provider_items(family.binance_items.ordered.with_attached_logo.includes(:binance_accounts, :accounts))
+    @kraken_items = visible_provider_items(family.kraken_items.ordered.with_attached_logo.includes(:kraken_accounts, :accounts))
+    @questrade_items = visible_provider_items(family.questrade_items.ordered.with_attached_logo.includes(:accounts, questrade_accounts: :account_provider))
+    @wise_items = visible_provider_items(family.wise_items.ordered.includes(:wise_accounts, :accounts))
+
+    preload_latest_sync_metadata_for_index!
 
     # Build sync stats maps for all providers
     build_sync_stats_maps
@@ -50,8 +58,10 @@ class AccountsController < ApplicationController
   def show
     @chart_view = params[:chart_view] || "balance"
     @tab = params[:tab]
+    @accessible_account_ids = Current.user.accessible_accounts.pluck(:id).to_set
     @q = params.fetch(:q, {}).permit(:search, status: [])
     entries = @account.entries.where(excluded: false).search(@q).reverse_chronological.includes(:entryable)
+
     if statement_tab_active?
       build_statement_tab_data
       return render_statement_tab_frame if statement_tab_frame_request?
@@ -62,8 +72,37 @@ class AccountsController < ApplicationController
       limit: safe_per_page,
       params: request.query_parameters.except("tab").merge("tab" => "activity")
     )
+
+    # Preload transfer associations only for Transaction entries
+    txn_entryables = @entries.filter_map { |e| e.entryable if e.entryable_type == "Transaction" }
+    ActiveRecord::Associations::Preloader.new(
+      records: txn_entryables,
+      associations: {
+        transfer_as_outflow: { inflow_transaction: { entry: :account } },
+        transfer_as_inflow: { outflow_transaction: { entry: :account } }
+      }
+    ).call
+
     Transaction::ActivitySecurityPreloader.new(@entries).preload
 
+    # The preload and split-parent lookup below are intentionally scoped to the
+    # current page (@entries) — only this page is rendered, so a child entry
+    # whose split parent sits on another page deliberately won't resolve it.
+    transactions = @entries.filter_map { |e| e.entryable if e.transaction? }
+    if transactions.any?
+      ActiveRecord::Associations::Preloader.new(
+        records: transactions,
+        associations: [ :transfer_as_inflow, :transfer_as_outflow, :category, :merchant ]
+      ).call
+    end
+
+    entry_ids = @entries.map(&:id)
+    @split_parent_entry_ids = if entry_ids.any?
+      Entry.where(parent_entry_id: entry_ids).distinct.pluck(:parent_entry_id).to_set
+    else
+      Set.new
+    end
+
     @activity_feed_data = Account::ActivityFeedData.new(@account, @entries)
   end
 
@@ -105,6 +144,14 @@ class AccountsController < ApplicationController
     redirect_to accounts_path
   end
 
+  # Toggles the exclude_from_reports flag on the account and redirects to the
+  # account list. The flag controls whether the account's data appears in
+  # financial reports, dashboards, and exports.
+  def toggle_exclude_from_reports
+    @account.update!(exclude_from_reports: !@account.exclude_from_reports?)
+    redirect_to accounts_path
+  end
+
   def set_default
     unless @account.eligible_for_transaction_default?
       redirect_to accounts_path, alert: t("accounts.set_default.depository_only")
@@ -243,6 +290,43 @@ class AccountsController < ApplicationController
       end
     end
 
+    def preload_latest_sync_metadata_for_index!
+      items = [
+        @plaid_items,
+        @simplefin_items,
+        @lunchflow_items,
+        @redbark_items,
+        @akahu_items,
+        @up_items,
+        @enable_banking_items,
+        @coinstats_items,
+        @mercury_items,
+        @brex_items,
+        @coinbase_items,
+        @snaptrade_items,
+        @ibkr_items,
+        @indexa_capital_items,
+        @sophtron_items,
+        @binance_items,
+        @kraken_items,
+        @questrade_items,
+        @wise_items
+      ].flatten.compact
+
+      accounts = @manual_accounts.to_a
+      items.each do |item|
+        next unless item.respond_to?(:accounts)
+        accounts.concat(item.accounts)
+      end
+      accounts = accounts.uniq { |account| account.id }
+
+      syncables = items + accounts
+
+      Current.latest_sync_by_syncable = Sync.latest_by_syncable(syncables)
+      Current.latest_completed_sync_by_syncable = Sync.latest_completed_by_syncable(syncables)
+      Current.syncing_by_syncable = Sync.syncing_by_syncable(syncables)
+    end
+
     def build_statement_tab_data
       return unless statement_tab_active?
 
@@ -278,6 +362,8 @@ class AccountsController < ApplicationController
 
     # Builds sync stats maps for all provider types to avoid N+1 queries in views
     def build_sync_stats_maps
+      manual_accounts_exist = @manual_accounts.any?
+
       # SimpleFIN sync stats
       @simplefin_sync_stats_map = {}
       @simplefin_has_unlinked_map = {}
@@ -285,22 +371,37 @@ class AccountsController < ApplicationController
       @simplefin_show_relink_map = {}
       @simplefin_duplicate_only_map = {}
 
+      simplefin_item_ids = @simplefin_items.map(&:id)
+      simplefin_accounts_counts_by_item_id =
+        if simplefin_item_ids.any?
+          SimplefinAccount.where(simplefin_item_id: simplefin_item_ids).group(:simplefin_item_id).count
+        else
+          {}
+        end
+      simplefin_unlinked_counts_by_item_id =
+        if simplefin_item_ids.any?
+          SimplefinAccount.where(simplefin_item_id: simplefin_item_ids)
+            .left_joins(:account, :account_provider)
+            .where(accounts: { id: nil }, account_providers: { id: nil })
+            .group(:simplefin_item_id)
+            .count
+        else
+          {}
+        end
+
       @simplefin_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         stats = latest_sync&.sync_stats || {}
         @simplefin_sync_stats_map[item.id] = stats
-        @simplefin_has_unlinked_map[item.id] = item.family.accounts.listable_manual.exists?
+        @simplefin_has_unlinked_map[item.id] = manual_accounts_exist
 
         # Count unlinked accounts
-        count = item.simplefin_accounts
-          .left_joins(:account, :account_provider)
-          .where(accounts: { id: nil }, account_providers: { id: nil })
-          .count
+        count = simplefin_unlinked_counts_by_item_id[item.id].to_i
         @simplefin_unlinked_count_map[item.id] = count
 
         # CTA visibility
         manuals_exist = @simplefin_has_unlinked_map[item.id]
-        sfa_any = item.simplefin_accounts.loaded? ? item.simplefin_accounts.any? : item.simplefin_accounts.exists?
+        sfa_any = simplefin_accounts_counts_by_item_id[item.id].to_i > 0
         @simplefin_show_relink_map[item.id] = (count.to_i == 0 && manuals_exist && sfa_any)
 
         # Check if all errors are duplicate-skips
@@ -316,29 +417,36 @@ class AccountsController < ApplicationController
       # Plaid sync stats
       @plaid_sync_stats_map = {}
       @plaid_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @plaid_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
       # Lunchflow sync stats
       @lunchflow_sync_stats_map = {}
       @lunchflow_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @lunchflow_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
       # Akahu sync stats
       @akahu_sync_stats_map = {}
       @akahu_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @akahu_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
+      # Up sync stats
+      @up_sync_stats_map = {}
+      @up_items.each do |item|
+        latest_sync = item.latest_sync_record
+        @up_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
+      end
+
       # Enable Banking sync stats
       @enable_banking_sync_stats_map = {}
       @enable_banking_latest_sync_error_map = {}
       @enable_banking_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @enable_banking_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
         @enable_banking_latest_sync_error_map[item.id] = latest_sync&.error
       end
@@ -346,21 +454,28 @@ class AccountsController < ApplicationController
       # CoinStats sync stats
       @coinstats_sync_stats_map = {}
       @coinstats_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @coinstats_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
       # Sophtron sync stats
       @sophtron_sync_stats_map = {}
       @sophtron_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @sophtron_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
+      # Redbark sync stats
+      @redbark_sync_stats_map = {}
+      @redbark_items.each do |item|
+        latest_sync = item.latest_sync_record
+        @redbark_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
+      end
+
       # Mercury sync stats
       @mercury_sync_stats_map = {}
       @mercury_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @mercury_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
@@ -369,7 +484,7 @@ class AccountsController < ApplicationController
       @brex_account_counts_map = {}
       @brex_institutions_count_map = {}
       @brex_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @brex_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
         brex_accounts = item.brex_accounts.to_a
         linked_count = brex_accounts.count { |brex_account| brex_account.account_provider.present? }
@@ -388,22 +503,31 @@ class AccountsController < ApplicationController
       # Coinbase sync stats
       @coinbase_sync_stats_map = {}
       @coinbase_unlinked_count_map = {}
+
+      coinbase_item_ids = @coinbase_items.map(&:id)
+      coinbase_unlinked_counts_by_item_id =
+        if coinbase_item_ids.any?
+          CoinbaseAccount.where(coinbase_item_id: coinbase_item_ids)
+            .left_joins(:account_provider)
+            .where(account_providers: { id: nil })
+            .group(:coinbase_item_id)
+            .count
+        else
+          {}
+        end
+
       @coinbase_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @coinbase_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
 
         # Count unlinked accounts
-        count = item.coinbase_accounts
-          .left_joins(:account_provider)
-          .where(account_providers: { id: nil })
-          .count
-        @coinbase_unlinked_count_map[item.id] = count
+        @coinbase_unlinked_count_map[item.id] = coinbase_unlinked_counts_by_item_id[item.id].to_i
       end
 
       # IndexaCapital sync stats
       @indexa_capital_sync_stats_map = {}
       @indexa_capital_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @indexa_capital_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
       end
 
@@ -411,7 +535,7 @@ class AccountsController < ApplicationController
       @binance_sync_stats_map = {}
       @binance_unlinked_count_map = {}
       @binance_items.each do |item|
-        latest_sync = item.syncs.ordered.first
+        latest_sync = item.latest_sync_record
         @binance_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
 
         # Count unlinked accounts
@@ -421,5 +545,25 @@ class AccountsController < ApplicationController
           .count
         @binance_unlinked_count_map[item.id] = count
       end
+
+      # Questrade sync stats and account counts
+      @questrade_sync_stats_map = {}
+      @questrade_account_counts_map = {}
+      @questrade_items.each do |item|
+        latest_sync = item.latest_sync_record
+        @questrade_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
+        accounts = item.questrade_accounts.to_a
+        linked = accounts.count { |a| a.account_provider.present? }
+        @questrade_account_counts_map[item.id] = {
+          linked: linked, unlinked: accounts.size - linked, total: accounts.size
+        }
+      end
+
+      # Wise sync stats
+      @wise_sync_stats_map = {}
+      @wise_items.each do |item|
+        latest_sync = item.latest_sync_record
+        @wise_sync_stats_map[item.id] = latest_sync&.sync_stats || {}
+      end
     end
 end
diff --git a/app/controllers/admin/sso_providers_controller.rb b/app/controllers/admin/sso_providers_controller.rb
index 97bc86fa3..ca493380b 100644
--- a/app/controllers/admin/sso_providers_controller.rb
+++ b/app/controllers/admin/sso_providers_controller.rb
@@ -50,7 +50,8 @@ module Admin
       authorize @sso_provider
 
       # Auto-update redirect_uri if name changed
-      params_hash = processed_params.to_h
+      params_hash = processed_params.to_h.with_indifferent_access
+      params_hash.delete(:client_secret) if params_hash[:client_secret].blank?
       if params_hash[:name].present? && params_hash[:name] != @sso_provider.name
         params_hash[:redirect_uri] = "#{request.base_url}/auth/#{params_hash[:name]}/callback"
       end
diff --git a/app/controllers/api/v1/auth_controller.rb b/app/controllers/api/v1/auth_controller.rb
index c92e80334..6332f65f3 100644
--- a/app/controllers/api/v1/auth_controller.rb
+++ b/app/controllers/api/v1/auth_controller.rb
@@ -214,17 +214,41 @@ module Api
           user.role = User.role_for_new_family_creator(fallback_role: provider_default_role || :admin)
         end
 
-        if user.save
-          # Mark invitation as accepted if one was used
-          invitation&.update!(accepted_at: Time.current)
+        identity = nil
+        account_created = false
 
-          OidcIdentity.create_from_omniauth(build_omniauth_hash(cached), user)
+        begin
+          account_created = ActiveRecord::Base.transaction do
+            unless user.save
+              raise ActiveRecord::Rollback
+            end
 
-          SsoAuditLog.log_jit_account_created!(
-            user: user,
-            provider: cached[:provider],
-            request: request
-          )
+            # Mark invitation as accepted if one was used
+            invitation&.update!(accepted_at: Time.current)
+
+            # Joining an existing family via invitation must honor the family's
+            # default sharing policy, matching Invitation#accept_for, so a mobile
+            # SSO invitee sees the accounts the family shares by default.
+            user.family.auto_share_existing_accounts_with(user) if invitation.present?
+
+            identity = OidcIdentity.create_from_omniauth(build_omniauth_hash(cached), user)
+            true
+          end
+        rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
+          # Expected persistence failures (e.g. a duplicate identity) roll the
+          # whole onboarding back and return the error response. Unexpected
+          # errors propagate so they surface instead of being hidden.
+          user.errors.add(:base, e.message)
+        end
+
+        if account_created
+          if identity&.persisted?
+            SsoAuditLog.log_jit_account_created!(
+              user: user,
+              provider: cached[:provider],
+              request: request
+            )
+          end
 
           issue_mobile_tokens(user, cached[:device_info])
         else
diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb
index 1a8dff77f..c6aa72422 100644
--- a/app/controllers/api/v1/base_controller.rb
+++ b/app/controllers/api/v1/base_controller.rb
@@ -310,23 +310,15 @@ class Api::V1::BaseController < ApplicationController
 
     # Set up Current context for API requests since we don't use session-based auth
     def setup_current_context_for_api
-      # For API requests, we need to create a minimal session-like object
-      # or find/create an actual session for this user to make Current.user work
-      if @current_user
-        # Try to find an existing session for this user, or create a temporary one
-        session = @current_user.sessions.first
-        if session
-          Current.session = session
-        else
-          # Create a temporary session for this API request
-          # This won't be persisted but will allow Current.user to work
-          session = @current_user.sessions.build(
-            user_agent: request.user_agent,
-            ip_address: request.ip
-          )
-          Current.session = session
-        end
-      end
+      return unless @current_user
+
+      # Build a fresh unsaved session so API requests never reuse an existing
+      # web session that may already carry impersonation state.
+      Current.session = @current_user.sessions.build(
+        user_agent: request.user_agent,
+        ip_address: request.ip
+      )
+      Current.session.active_impersonator_session = nil
     end
 
     # Check if AI features are enabled for the current user
diff --git a/app/controllers/api/v1/chats_controller.rb b/app/controllers/api/v1/chats_controller.rb
index ad1a2b228..a739000c3 100644
--- a/app/controllers/api/v1/chats_controller.rb
+++ b/app/controllers/api/v1/chats_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::ChatsController < Api::V1::BaseController
   before_action :set_chat, only: [ :show, :update, :destroy ]
 
   def index
-    @pagy, @chats = pagy(Current.user.chats.ordered, items: 20)
+    @pagy, @chats = pagy(current_resource_owner.chats.ordered, items: 20)
   end
 
   def show
@@ -17,7 +17,7 @@ class Api::V1::ChatsController < Api::V1::BaseController
   end
 
   def create
-    @chat = Current.user.chats.build(title: chat_params[:title])
+    @chat = current_resource_owner.chats.build(title: chat_params[:title])
 
     if @chat.save
       if chat_params[:message].present?
@@ -74,7 +74,7 @@ class Api::V1::ChatsController < Api::V1::BaseController
     end
 
     def set_chat
-      @chat = Current.user.chats.find(params[:id])
+      @chat = current_resource_owner.chats.find(params[:id])
     rescue ActiveRecord::RecordNotFound
       render json: { error: "Chat not found" }, status: :not_found
     end
diff --git a/app/controllers/api/v1/holdings_controller.rb b/app/controllers/api/v1/holdings_controller.rb
index 4be295c27..8f61b5f60 100644
--- a/app/controllers/api/v1/holdings_controller.rb
+++ b/app/controllers/api/v1/holdings_controller.rb
@@ -8,8 +8,7 @@ class Api::V1::HoldingsController < Api::V1::BaseController
   before_action :set_holding, only: [ :show ]
 
   def index
-    family = current_resource_owner.family
-    holdings_query = family.holdings.joins(:account).where(accounts: { status: [ "draft", "active" ] })
+    holdings_query = accessible_holdings
 
     holdings_query = apply_filters(holdings_query)
     holdings_query = holdings_query.includes(:account, :security).chronological
@@ -37,12 +36,24 @@ class Api::V1::HoldingsController < Api::V1::BaseController
   private
 
     def set_holding
-      family = current_resource_owner.family
-      @holding = family.holdings.joins(:account).where(accounts: { status: %w[draft active] }).find(params[:id])
+      @holding = accessible_holdings.find(params[:id])
     rescue ActiveRecord::RecordNotFound
       render json: { error: "not_found", message: "Holding not found" }, status: :not_found
     end
 
+    # Holdings restricted to accounts the token owner can access (owned or shared),
+    # not the whole family. Mirrors Api::V1::BalancesController and the web
+    # HoldingsController, both of which scope through Account.accessible_by.
+    def accessible_holdings
+      Holding
+        .joins(:account)
+        .where(accounts: { status: %w[draft active], id: accessible_account_ids })
+    end
+
+    def accessible_account_ids
+      @accessible_account_ids ||= current_resource_owner.family.accounts.accessible_by(current_resource_owner).select(:id)
+    end
+
     def ensure_read_scope
       authorize_scope!(:read)
     end
diff --git a/app/controllers/api/v1/import_sessions_controller.rb b/app/controllers/api/v1/import_sessions_controller.rb
new file mode 100644
index 000000000..212c97c2a
--- /dev/null
+++ b/app/controllers/api/v1/import_sessions_controller.rb
@@ -0,0 +1,195 @@
+# frozen_string_literal: true
+
+class Api::V1::ImportSessionsController < Api::V1::BaseController
+  before_action :ensure_read_scope, only: [ :show ]
+  before_action :ensure_write_scope, only: [ :create, :create_chunk, :publish ]
+  before_action :set_import_session, only: [ :show, :create_chunk, :publish ]
+
+  def create
+    @import_session = ImportSession.create_or_find_for!(
+      family: current_resource_owner.family,
+      import_type: params[:type].to_s,
+      client_session_id: params[:client_session_id].presence,
+      expected_chunks: expected_chunks_param
+    )
+
+    render_import_session(status: :created)
+  rescue ImportSession::ConflictError => e
+    render_import_session_conflict(e.message)
+  rescue ActiveRecord::RecordInvalid => e
+    render_error(
+      "validation_failed",
+      "Import session could not be created",
+      :unprocessable_entity,
+      errors: e.record.errors.full_messages
+    )
+  end
+
+  def show
+    render_import_session
+  end
+
+  def create_chunk
+    content, filename, content_type = sure_import_upload_attributes
+    return unless content
+
+    @import_session.attach_chunk!(
+      sequence: sequence_param,
+      client_chunk_id: params[:client_chunk_id].presence,
+      content: content,
+      filename: filename,
+      content_type: content_type
+    )
+
+    @import_session.reload
+    render_import_session(status: :created)
+  rescue ImportSession::ConflictError => e
+    render_import_session_conflict(e.message)
+  rescue ActiveRecord::RecordInvalid => e
+    render_error(
+      "validation_failed",
+      "Import chunk could not be created",
+      :unprocessable_entity,
+      errors: e.record.errors.full_messages
+    )
+  end
+
+  def publish
+    @import_session.publish_later
+    @import_session.reload
+    render_import_session(status: :accepted)
+  rescue Import::MaxRowCountExceededError
+    render_error("max_row_count_exceeded", "Import session has too many rows to publish.", :unprocessable_entity)
+  rescue ImportSession::EnqueueError
+    render_error("import_enqueue_failed", "Import session could not be queued.", :service_unavailable)
+  rescue ImportSession::ConflictError => e
+    render_import_session_conflict(e.message)
+  end
+
+  private
+    def set_import_session
+      @import_session = current_resource_owner.family.import_sessions.find(params[:id])
+    end
+
+    def ensure_read_scope
+      authorize_scope!(:read)
+    end
+
+    def ensure_write_scope
+      authorize_scope!(:write)
+    end
+
+    def expected_chunks_param
+      return if params[:expected_chunks].blank?
+
+      params[:expected_chunks]
+    end
+
+    def sequence_param
+      raise ActionController::ParameterMissing.new(:sequence) if params[:sequence].blank?
+
+      params[:sequence]
+    end
+
+    def sure_import_upload_attributes
+      if params[:file].present?
+        sure_import_file_upload_attributes(params[:file])
+      elsif params[:raw_file_content].present?
+        sure_import_raw_content_attributes(params[:raw_file_content].to_s)
+      else
+        render_error("missing_content", "Provide a Sure NDJSON file or raw_file_content.", :unprocessable_entity)
+        nil
+      end
+    end
+
+    def sure_import_file_upload_attributes(file)
+      if file.size > SureImport.max_ndjson_size
+        render_error(
+          "file_too_large",
+          "File is too large. Maximum size is #{SureImport.max_ndjson_size / 1.megabyte}MB.",
+          :unprocessable_entity
+        )
+        return
+      end
+
+      extension = File.extname(file.original_filename.to_s).downcase
+      unless SureImport::ALLOWED_NDJSON_CONTENT_TYPES.include?(file.content_type) || extension.in?(%w[.ndjson .json])
+        render_error("invalid_file_type", "Invalid file type. Please upload a Sure NDJSON file.", :unprocessable_entity)
+        return
+      end
+
+      sure_import_validated_attributes(
+        content: file.read,
+        filename: file.original_filename.presence || "sure-import.ndjson",
+        content_type: file.content_type.presence || "application/x-ndjson"
+      )
+    end
+
+    def sure_import_raw_content_attributes(content)
+      if content.bytesize > SureImport.max_ndjson_size
+        render_error(
+          "content_too_large",
+          "Content is too large. Maximum size is #{SureImport.max_ndjson_size / 1.megabyte}MB.",
+          :unprocessable_entity
+        )
+        return
+      end
+
+      sure_import_validated_attributes(
+        content: content,
+        filename: "sure-import.ndjson",
+        content_type: "application/x-ndjson"
+      )
+    end
+
+    def sure_import_validated_attributes(content:, filename:, content_type:)
+      unless SureImport.valid_ndjson_first_line?(content)
+        render_error("invalid_ndjson", "Invalid Sure NDJSON content.", :unprocessable_entity)
+        return
+      end
+
+      [ content, filename, content_type ]
+    end
+
+    def render_import_session_conflict(message)
+      render_error("import_session_conflict", message, :conflict)
+    end
+
+    def render_import_session(status: :ok)
+      chunks = @import_session.imports.ordered_by_sequence.map do |import|
+        {
+          id: import.id,
+          sequence: import.sequence,
+          client_chunk_id: import.client_chunk_id,
+          status: import.status,
+          rows_count: import.rows_count,
+          summary: import.summary || {},
+          error: import.error_details.presence,
+          created_at: import.created_at,
+          updated_at: import.updated_at
+        }
+      end
+
+      render json: {
+        data: {
+          id: @import_session.id,
+          type: @import_session.import_type,
+          status: @import_session.status,
+          client_session_id: @import_session.client_session_id,
+          expected_chunks: @import_session.expected_chunks,
+          chunks_count: chunks.size,
+          summary: @import_session.summary || {},
+          error: @import_session.error_details.presence,
+          created_at: @import_session.created_at,
+          updated_at: @import_session.updated_at,
+          chunks: chunks
+        }
+      }, status: status
+    end
+
+    def render_error(error, message, status, errors: nil)
+      payload = { error: error, message: message }
+      payload[:errors] = errors if errors
+      render json: payload, status: status
+    end
+end
diff --git a/app/controllers/api/v1/imports_controller.rb b/app/controllers/api/v1/imports_controller.rb
index 5f1e9cf3e..3c92bff20 100644
--- a/app/controllers/api/v1/imports_controller.rb
+++ b/app/controllers/api/v1/imports_controller.rb
@@ -35,14 +35,14 @@ class Api::V1::ImportsController < Api::V1::BaseController
 
   rescue StandardError => e
     Rails.logger.error "ImportsController#index error: #{e.message}"
-    render json: { error: "internal_server_error", message: e.message }, status: :internal_server_error
+    render json: { error: "internal_server_error", message: "An unexpected error occurred." }, status: :internal_server_error
   end
 
   def show
     render :show
   rescue StandardError => e
     Rails.logger.error "ImportsController#show error: #{e.message}"
-    render json: { error: "internal_server_error", message: e.message }, status: :internal_server_error
+    render json: { error: "internal_server_error", message: "An unexpected error occurred." }, status: :internal_server_error
   end
 
   def rows
@@ -58,7 +58,7 @@ class Api::V1::ImportsController < Api::V1::BaseController
     render :rows
   rescue StandardError => e
     Rails.logger.error "ImportsController#rows error: #{e.message}"
-    render json: { error: "internal_server_error", message: e.message }, status: :internal_server_error
+    render json: { error: "internal_server_error", message: "An unexpected error occurred." }, status: :internal_server_error
   end
 
   def create
@@ -133,7 +133,7 @@ class Api::V1::ImportsController < Api::V1::BaseController
 
   rescue StandardError => e
     Rails.logger.error "ImportsController#create error: #{e.message}"
-    render json: { error: "internal_server_error", message: e.message }, status: :internal_server_error
+    render json: { error: "internal_server_error", message: "An unexpected error occurred." }, status: :internal_server_error
   end
 
   def preflight
@@ -156,7 +156,7 @@ class Api::V1::ImportsController < Api::V1::BaseController
 
     render json: {
       error: "internal_server_error",
-      message: "Error: #{e.message}"
+      message: "Import preflight could not be completed."
     }, status: :internal_server_error
   end
 
@@ -242,7 +242,7 @@ class Api::V1::ImportsController < Api::V1::BaseController
       end
 
       begin
-        @import.publish_later if @import.publishable? && params[:publish] == "true"
+        @import.publish_later if params[:publish] == "true"
       rescue Import::MaxRowCountExceededError
         render json: {
           error: "max_row_count_exceeded",
@@ -250,6 +250,22 @@ class Api::V1::ImportsController < Api::V1::BaseController
           import_id: @import.id
         }, status: :unprocessable_entity
         return
+      rescue SureImport::PreflightError
+        render json: {
+          error: "preflight_failed",
+          message: "Import was uploaded but did not pass Sure NDJSON preflight.",
+          errors: sure_import_error_lines,
+          import_id: @import.id
+        }, status: :unprocessable_entity
+        return
+      rescue SureImport::NotPublishableError => e
+        Rails.logger.warn "Sure import not publishable for import #{@import.id}: #{e.message}"
+        render json: {
+          error: "not_publishable",
+          message: "Import was uploaded but has no publishable records.",
+          import_id: @import.id
+        }, status: :unprocessable_entity
+        return
       rescue StandardError => e
         Rails.logger.error "Sure import publish failed for import #{@import.id}: #{e.message}"
         restore_pending_sure_import_after_publish_failure
@@ -284,6 +300,8 @@ class Api::V1::ImportsController < Api::V1::BaseController
       @import.update_column(:status, "pending") if @import&.persisted? && @import.importing?
     end
 
+    def sure_import_error_lines = @import.error.to_s.lines.map(&:strip).reject(&:blank?)
+
     def clean_up_failed_sure_import(import)
       return unless import
 
diff --git a/app/controllers/api/v1/merchants_controller.rb b/app/controllers/api/v1/merchants_controller.rb
index c11c7246c..cf190fc06 100644
--- a/app/controllers/api/v1/merchants_controller.rb
+++ b/app/controllers/api/v1/merchants_controller.rb
@@ -2,29 +2,14 @@
 
 module Api
   module V1
-    # API v1 endpoint for merchants
-    # Provides read-only access to family and provider merchants
-    #
-    # @example List all merchants
-    #   GET /api/v1/merchants
-    #
-    # @example Get a specific merchant
-    #   GET /api/v1/merchants/:id
-    #
     class MerchantsController < BaseController
-      before_action -> { authorize_scope!(:read) }
+      before_action -> { authorize_scope!(:read) }, only: [ :index, :show ]
+      before_action -> { authorize_scope!(:write) }, only: [ :create ]
 
-      # List all merchants available to the family
-      #
-      # Returns both family-owned merchants and provider merchants
-      # that are assigned to the family's transactions.
-      #
-      # @return [Array<Hash>] JSON array of merchant objects
       def index
         family = current_resource_owner.family
         user = current_resource_owner
 
-        # Single query with OR conditions - more efficient than Ruby deduplication
         family_merchant_ids = family.merchants.select(:id)
         accessible_account_ids = family.accounts.accessible_by(user).select(:id)
         provider_merchant_ids = Transaction.joins(:entry)
@@ -44,13 +29,6 @@ module Api
         render json: { error: "Failed to fetch merchants" }, status: :internal_server_error
       end
 
-      # Get a specific merchant by ID
-      #
-      # Returns a merchant if it belongs to the family or is assigned
-      # to any of the family's transactions.
-      #
-      # @param id [String] The merchant ID
-      # @return [Hash] JSON merchant object or error
       def show
         family = current_resource_owner.family
         user = current_resource_owner
@@ -71,12 +49,83 @@ module Api
         render json: { error: "Failed to fetch merchant" }, status: :internal_server_error
       end
 
+      def create
+        family = current_resource_owner.family
+
+        unless params[:file].present?
+          return render json: { error: "missing_file", message: "Please provide a CSV file." },
+                        status: :unprocessable_entity
+        end
+
+        file = params[:file]
+
+        if file.size > Import::MAX_CSV_SIZE
+          return render json: {
+            error: "file_too_large",
+            message: "File is too large. Maximum size is #{Import::MAX_CSV_SIZE / 1.megabyte}MB."
+          }, status: :unprocessable_entity
+        end
+
+        unless Import::ALLOWED_CSV_MIME_TYPES.include?(file.content_type)
+          return render json: {
+            error: "invalid_file_type",
+            message: "Invalid file type. Please upload a CSV file."
+          }, status: :unprocessable_entity
+        end
+
+        csv = Import.parse_csv_str(file.read)
+
+        name_header = normalized_header(csv.headers, "name")
+        unless name_header
+          return render json: {
+            error: "missing_column",
+            message: "CSV must include a 'name' column."
+          }, status: :unprocessable_entity
+        end
+
+        color_header = normalized_header(csv.headers, "color")
+        website_url_header = normalized_header(csv.headers, "website_url", "website url", "website")
+
+        imported = []
+        skipped = []
+
+        csv.each do |row|
+          name = row[name_header].to_s.strip
+          next if name.blank?
+
+          merchant = family.merchants.find_or_initialize_by(name: name)
+
+          if merchant.persisted?
+            skipped << { name: name, reason: "already_exists" }
+            next
+          end
+
+          merchant.color = row[color_header].to_s.strip.presence if color_header
+          merchant.website_url = row[website_url_header].to_s.strip.presence if website_url_header
+
+          if merchant.save
+            imported << merchant
+          else
+            skipped << { name: name, errors: merchant.errors.full_messages }
+          end
+        end
+
+        render json: {
+          imported: imported.count,
+          skipped: skipped.count,
+          merchants: imported.map { |m| merchant_json(m) }
+        }, status: :created
+      rescue CSV::MalformedCSVError => e
+        render json: { error: "invalid_csv", message: "CSV could not be parsed: #{e.message}" },
+               status: :unprocessable_entity
+      rescue StandardError => e
+        Rails.logger.error("API Merchants Import Error: #{e.message}")
+        render json: { error: "internal_server_error", message: "An unexpected error occurred" },
+               status: :internal_server_error
+      end
+
       private
 
-        # Serialize a merchant to JSON format
-        #
-        # @param merchant [Merchant] The merchant to serialize
-        # @return [Hash] JSON-serializable hash
         def merchant_json(merchant)
           {
             id: merchant.id,
@@ -86,6 +135,19 @@ module Api
             updated_at: merchant.updated_at
           }
         end
+
+        def normalized_header(headers, *candidates)
+          normalized_map = headers.to_h { |h| [ normalize(h), h ] }
+          candidates.each do |candidate|
+            header = normalized_map[normalize(candidate)]
+            return header if header.present?
+          end
+          nil
+        end
+
+        def normalize(str)
+          str.to_s.strip.downcase.gsub(/\*/, "").gsub(/[\s_-]+/, "_")
+        end
     end
   end
 end
diff --git a/app/controllers/api/v1/messages_controller.rb b/app/controllers/api/v1/messages_controller.rb
index f9f3b8388..5076dde0b 100644
--- a/app/controllers/api/v1/messages_controller.rb
+++ b/app/controllers/api/v1/messages_controller.rb
@@ -49,7 +49,7 @@ class Api::V1::MessagesController < Api::V1::BaseController
     end
 
     def set_chat
-      @chat = Current.user.chats.find(params[:chat_id])
+      @chat = current_resource_owner.chats.find(params[:chat_id])
     rescue ActiveRecord::RecordNotFound
       render json: { error: "Chat not found" }, status: :not_found
     end
diff --git a/app/controllers/api/v1/provider_connections_controller.rb b/app/controllers/api/v1/provider_connections_controller.rb
index 11e0c6f7b..d8ac2c240 100644
--- a/app/controllers/api/v1/provider_connections_controller.rb
+++ b/app/controllers/api/v1/provider_connections_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::ProviderConnectionsController < Api::V1::BaseController
   before_action :ensure_read_scope
 
   def index
-    @provider_connections = ProviderConnectionStatus.for_family(Current.family)
+    @provider_connections = ProviderConnectionStatus.for_family(current_resource_owner.family)
     render :index
   rescue StandardError => e
     Rails.logger.error "ProviderConnectionsController#index error: #{e.message}"
diff --git a/app/controllers/api/v1/rule_runs_controller.rb b/app/controllers/api/v1/rule_runs_controller.rb
index 4aeae3a62..79120c9d6 100644
--- a/app/controllers/api/v1/rule_runs_controller.rb
+++ b/app/controllers/api/v1/rule_runs_controller.rb
@@ -44,7 +44,7 @@ class Api::V1::RuleRunsController < Api::V1::BaseController
     def rule_runs_scope
       RuleRun
         .joins(:rule)
-        .where(rules: { family_id: Current.family.id })
+        .where(rules: { family_id: current_resource_owner.family.id })
         .includes(:rule)
     end
 
diff --git a/app/controllers/api/v1/syncs_controller.rb b/app/controllers/api/v1/syncs_controller.rb
index 401362392..4f44df55b 100644
--- a/app/controllers/api/v1/syncs_controller.rb
+++ b/app/controllers/api/v1/syncs_controller.rb
@@ -41,6 +41,6 @@ class Api::V1::SyncsController < Api::V1::BaseController
     end
 
     def family_syncs_query
-      Sync.for_family(Current.family, resource_owner: Current.user)
+      Sync.for_family(current_resource_owner.family, resource_owner: current_resource_owner)
     end
 end
diff --git a/app/controllers/api/v1/trades_controller.rb b/app/controllers/api/v1/trades_controller.rb
index 33638ef6b..44fcd4275 100644
--- a/app/controllers/api/v1/trades_controller.rb
+++ b/app/controllers/api/v1/trades_controller.rb
@@ -63,16 +63,27 @@ class Api::V1::TradesController < Api::V1::BaseController
       model.lock_saved_attributes!
       model.mark_user_modified!
       model.sync_account_later
-      @trade = model.trade
+
+      if model.entryable.is_a?(Transaction)
+        @transaction = model.entryable
+        render template: "api/v1/transactions/show", status: :created
+      else
+        @trade = model.trade
+        apply_trade_create_options!
+        return if performed?
+        @entry = @trade.entry
+        render :show, status: :created
+      end
+    elsif model.is_a?(Transfer)
+      @transfer = model
+      render template: "api/v1/transfers/show", status: :created
     else
       @trade = model
+      apply_trade_create_options!
+      return if performed?
+      @entry = @trade.entry
+      render :show, status: :created
     end
-
-    apply_trade_create_options!
-    return if performed?
-
-    @entry = @trade.entry
-    render :show, status: :created
   rescue ActiveRecord::RecordNotFound => e
     message = (e.model == "Account") ? "Account not found" : "Security not found"
     render json: { error: "not_found", message: message }, status: :not_found
@@ -147,7 +158,8 @@ class Api::V1::TradesController < Api::V1::BaseController
     def trade_params
       params.require(:trade).permit(
         :account_id, :date, :qty, :price, :currency,
-        :security_id, :ticker, :manual_ticker, :investment_activity_label, :category_id
+        :security_id, :ticker, :manual_ticker, :investment_activity_label, :category_id,
+        :fee, :type, :amount, :transfer_account_id
       )
     end
 
@@ -203,11 +215,70 @@ class Api::V1::TradesController < Api::V1::BaseController
 
     def build_create_form_params(account)
       type = params.dig(:trade, :type).to_s.downcase
-      unless %w[buy sell].include?(type)
-        render_validation_error("Type must be buy or sell", [ "type must be 'buy' or 'sell'" ])
+      unless %w[buy sell dividend deposit withdrawal interest].include?(type)
+        render_validation_error("Invalid type", [ "type must be 'buy', 'sell', 'dividend', 'deposit', 'withdrawal', or 'interest'" ])
         return nil
       end
 
+      case type
+      when "deposit", "withdrawal"
+        unless trade_params[:amount].present?
+          render_validation_error("Amount is required", [ "amount must be present for deposit/withdrawal" ])
+          return nil
+        end
+
+        unless trade_params[:date].present?
+          render_validation_error("Date is required", [ "date must be present" ])
+          return nil
+        end
+
+        {
+          account: account,
+          date: trade_params[:date],
+          amount: parse_positive_amount!(trade_params[:amount], context: "deposit/withdrawal"),
+          currency: trade_params[:currency].presence || account.currency,
+          type: type,
+          transfer_account_id: trade_params[:transfer_account_id]
+        }.compact
+
+      when "interest"
+        unless trade_params[:date].present?
+          render_validation_error("Date is required", [ "date must be present" ])
+          return nil
+        end
+
+        unless trade_params[:amount].present?
+          render_validation_error("Amount is required", [ "amount must be present" ])
+          return nil
+        end
+
+        ticker_value = nil
+        manual_ticker_value = nil
+        if trade_params[:ticker].present?
+          ticker_value = trade_params[:ticker]
+        elsif trade_params[:manual_ticker].present?
+          manual_ticker_value = trade_params[:manual_ticker]
+        end
+
+        {
+          account: account,
+          date: trade_params[:date],
+          amount: parse_positive_amount!(trade_params[:amount], context: "interest"),
+          currency: trade_params[:currency].presence || account.currency,
+          type: type,
+          ticker: ticker_value,
+          manual_ticker: manual_ticker_value
+        }.compact
+
+      when "dividend"
+        build_dividend_params(account)
+
+      else
+        build_investment_trade_params(account)
+      end
+    end
+
+    def build_investment_trade_params(account)
       ticker_value = nil
       manual_ticker_value = nil
 
@@ -246,8 +317,46 @@ class Api::V1::TradesController < Api::V1::BaseController
         date: trade_params[:date],
         qty: qty,
         price: price,
+        fee: trade_params[:fee].to_d,
         currency: trade_params[:currency].presence || account.currency,
-        type: type,
+        type: trade_params[:type].to_s.downcase,
+        ticker: ticker_value,
+        manual_ticker: manual_ticker_value
+      }.compact
+    end
+
+    def build_dividend_params(account)
+      ticker_value = nil
+      manual_ticker_value = nil
+
+      unless trade_params[:date].present?
+        render_validation_error("Date is required", [ "date must be present" ])
+        return nil
+      end
+
+      if trade_params[:security_id].present?
+        security = Security.find(trade_params[:security_id])
+        ticker_value = security.exchange_operating_mic.present? ? "#{security.ticker}|#{security.exchange_operating_mic}" : security.ticker
+      elsif trade_params[:ticker].present?
+        ticker_value = trade_params[:ticker]
+      elsif trade_params[:manual_ticker].present?
+        manual_ticker_value = trade_params[:manual_ticker]
+      else
+        render_validation_error("Security identifier required", [ "Provide security_id, ticker, or manual_ticker" ])
+        return nil
+      end
+
+      unless trade_params[:amount].present?
+        render_validation_error("Amount is required", [ "amount must be present for dividend" ])
+        return nil
+      end
+
+      {
+        account: account,
+        date: trade_params[:date],
+        amount: parse_positive_amount!(trade_params[:amount], context: "dividend"),
+        currency: trade_params[:currency].presence || account.currency,
+        type: "dividend",
         ticker: ticker_value,
         manual_ticker: manual_ticker_value
       }.compact
@@ -297,10 +406,21 @@ class Api::V1::TradesController < Api::V1::BaseController
       }, status: :internal_server_error
     end
 
+    def parse_positive_amount!(raw, context:)
+      value_raw = raw.to_s.strip
+      return render_validation_error("Amount is required", [ "amount must be present for #{context}" ]) if value_raw.blank?
+
+      value = value_raw.to_d
+      non_numeric = value.zero? && value_raw !~ /\A0(\.0*)?\z/
+      return render_validation_error("Amount must be a valid number", [ "amount must be a valid positive number" ]) if non_numeric || value <= 0
+
+      value
+         end
+
     def safe_page_param
       page = params[:page].to_i
       page > 0 ? page : 1
-    end
+   end
 
     def safe_per_page_param
       per_page = params[:per_page].to_i
diff --git a/app/controllers/api/v1/transactions_controller.rb b/app/controllers/api/v1/transactions_controller.rb
index f208d83b2..2370ffa3e 100644
--- a/app/controllers/api/v1/transactions_controller.rb
+++ b/app/controllers/api/v1/transactions_controller.rb
@@ -127,7 +127,7 @@ class Api::V1::TransactionsController < Api::V1::BaseController
       error: "internal_server_error",
       message: "An unexpected error occurred"
     }, status: :internal_server_error
-end
+  end
 
   def update
     if @entry.split_child?
@@ -227,12 +227,12 @@ end
     def apply_filters(query)
       # Account filtering
       if params[:account_id].present?
-        query = query.joins(:entry).where(entries: { account_id: params[:account_id] })
+        query = query.where(entries: { account_id: params[:account_id] })
       end
 
       if params[:account_ids].present?
         account_ids = Array(params[:account_ids])
-        query = query.joins(:entry).where(entries: { account_id: account_ids })
+        query = query.where(entries: { account_id: account_ids })
       end
 
       # Category filtering
@@ -257,37 +257,39 @@ end
 
       # Date range filtering
       if params[:start_date].present?
-        query = query.joins(:entry).where("entries.date >= ?", Date.parse(params[:start_date]))
+        query = query.where("entries.date >= ?", Date.parse(params[:start_date]))
       end
 
       if params[:end_date].present?
-        query = query.joins(:entry).where("entries.date <= ?", Date.parse(params[:end_date]))
+        query = query.where("entries.date <= ?", Date.parse(params[:end_date]))
       end
 
       # Amount filtering
       if params[:min_amount].present?
         min_amount = params[:min_amount].to_f
-        query = query.joins(:entry).where("entries.amount >= ?", min_amount)
+        query = query.where("entries.amount >= ?", min_amount)
       end
 
       if params[:max_amount].present?
         max_amount = params[:max_amount].to_f
-        query = query.joins(:entry).where("entries.amount <= ?", max_amount)
+        query = query.where("entries.amount <= ?", max_amount)
       end
 
       # Tag filtering
       if params[:tag_ids].present?
         tag_ids = Array(params[:tag_ids])
-        query = query.joins(:tags).where(tags: { id: tag_ids })
+        query = query.where(
+          id: query.joins(:tags).where(tags: { id: tag_ids }).distinct.select(:id)
+        )
       end
 
       # Transaction type filtering (income/expense)
       if params[:type].present?
         case params[:type].downcase
         when "income"
-          query = query.joins(:entry).where("entries.amount < 0")
+          query = query.where("entries.amount < 0")
         when "expense"
-          query = query.joins(:entry).where("entries.amount > 0")
+          query = query.where("entries.amount > 0")
         end
       end
 
@@ -297,13 +299,13 @@ end
     def apply_search(query)
       search_term = "%#{params[:search]}%"
 
-      query.joins(:entry)
-           .left_joins(:merchant)
-           .where(
-             "entries.name ILIKE ? OR entries.notes ILIKE ? OR merchants.name ILIKE ?",
-             search_term, search_term, search_term
-           )
-end
+      query
+        .left_joins(:merchant)
+        .where(
+          "entries.name ILIKE ? OR entries.notes ILIKE ? OR merchants.name ILIKE ?",
+          search_term, search_term, search_term
+        )
+    end
 
     def transaction_params
       params.require(:transaction).permit(
diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb
index fa1c934a9..291304914 100644
--- a/app/controllers/api/v1/users_controller.rb
+++ b/app/controllers/api/v1/users_controller.rb
@@ -45,7 +45,6 @@ class Api::V1::UsersController < Api::V1::BaseController
     user = current_resource_owner
 
     if user.deactivate
-      Current.session&.destroy
       render json: { message: "Account has been deleted" }
     else
       render json: { error: "Failed to delete account", details: user.errors.full_messages }, status: :unprocessable_entity
diff --git a/app/controllers/budget_categories_controller.rb b/app/controllers/budget_categories_controller.rb
index 65880ea05..89061834a 100644
--- a/app/controllers/budget_categories_controller.rb
+++ b/app/controllers/budget_categories_controller.rb
@@ -51,6 +51,6 @@ class BudgetCategoriesController < ApplicationController
 
     def set_budget
       start_date = Budget.param_to_date(params[:budget_month_year], family: Current.family)
-      @budget = Current.family.budgets.find_by(start_date: start_date)
+      @budget = Current.family.budgets.find_by!(start_date: start_date)
     end
 end
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 0b37fc4b6..2f1a1cbaa 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -4,9 +4,12 @@ class CategoriesController < ApplicationController
   before_action :set_transaction, only: :create
 
   def index
-    @categories = Current.family.categories.alphabetically.to_a
+    @categories = Current.family.categories.alphabetically_by_hierarchy.to_a
     @category_groups = Category::Group.for(@categories)
-    @category_ids_with_transactions = category_ids_with_transactions(@categories)
+    @category_ids_with_transactions = Category.ids_with_transactions(
+      family: Current.family,
+      category_ids: @categories.map(&:id)
+    )
 
     render layout: "settings"
   end
@@ -125,17 +128,6 @@ class CategoriesController < ApplicationController
       params.permit(:target_id, source_ids: [])
     end
 
-    def category_ids_with_transactions(categories)
-      category_ids = categories.map(&:id)
-      return {} if category_ids.empty?
-
-      Current.family.transactions
-                    .where(category_id: category_ids)
-                    .distinct
-                    .pluck(:category_id)
-                    .index_with(true)
-    end
-
     def record_error_message(error)
       record = error.respond_to?(:record) ? error.record : nil
       record&.errors&.full_messages&.to_sentence.presence || error.message
diff --git a/app/controllers/concerns/accountable_resource.rb b/app/controllers/concerns/accountable_resource.rb
index 479ad9efc..1b3e8c040 100644
--- a/app/controllers/concerns/accountable_resource.rb
+++ b/app/controllers/concerns/accountable_resource.rb
@@ -48,7 +48,14 @@ module AccountableResource
       @account.lock_saved_attributes!
     end
 
-    redirect_to account_params[:return_to].presence || @account, notice: t("accounts.create.success", type: accountable_type.name.underscore.humanize)
+    # Prefer the form-carried return_to, then the session value StoreLocation
+    # captured from `?return_to=` (survives multi-step flows where the param
+    # isn't threaded), then the account page. The form param is sanitized here
+    # (the session value is already filtered at store time); the session is
+    # consumed with delete so a stale value can't leak into a later flow.
+    return_path = safe_return_to(account_params[:return_to]) || session.delete(:return_to).presence || @account
+    redirect_to return_path,
+                notice: t("accounts.create.success", type: accountable_type.name.underscore.humanize)
   end
 
   def update
@@ -104,7 +111,8 @@ module AccountableResource
       params.require(:account).permit(
         :name, :balance, :subtype, :currency, :accountable_type, :return_to,
         :opening_balance_date,
-        :institution_name, :institution_domain, :notes,
+        :institution_name, :institution_domain, :notes, :exclude_from_reports,
+        :enable_category_matcher,
         accountable_attributes: self.class.permitted_accountable_attributes
       )
     end
diff --git a/app/controllers/concerns/oauth_base.rb b/app/controllers/concerns/oauth_base.rb
new file mode 100644
index 000000000..b176cee67
--- /dev/null
+++ b/app/controllers/concerns/oauth_base.rb
@@ -0,0 +1,8 @@
+module OauthBase
+  extend ActiveSupport::Concern
+
+  private
+    def configured_base_url
+      (ENV["APP_URL"].presence || request.base_url).chomp("/")
+    end
+end
diff --git a/app/controllers/concerns/store_location.rb b/app/controllers/concerns/store_location.rb
index e2e8d3181..14f98068d 100644
--- a/app/controllers/concerns/store_location.rb
+++ b/app/controllers/concerns/store_location.rb
@@ -24,9 +24,20 @@ private
   end
 
   def store_return_to
-    if params[:return_to].present?
-      session[:return_to] = params[:return_to]
-    end
+    safe = safe_return_to(params[:return_to])
+    session[:return_to] = safe if safe
+  end
+
+  # Only allow internal absolute paths (a single leading "/"). Blocks absolute
+  # URLs, protocol-relative ("//evil"), and backslash tricks ("/\\evil") so a
+  # crafted ?return_to= can't open-redirect — including via a custom
+  # turbo_stream redirect, which Rails' redirect host-guard does NOT cover
+  # (the client `Turbo.visit`es the target and full-navigates cross-origin).
+  def safe_return_to(value)
+    # is_a?(String) first: a crafted `?return_to[]=foo` makes params[:return_to]
+    # an Array, and Array#match? doesn't exist — without this guard the helper
+    # raises NoMethodError before the redirect hardening can reject it.
+    value if value.is_a?(String) && value.present? && value.match?(%r{\A/(?![/\\])})
   end
 
   def clear_previous_path
diff --git a/app/controllers/credit_cards_controller.rb b/app/controllers/credit_cards_controller.rb
index 4d0f56594..982ce5483 100644
--- a/app/controllers/credit_cards_controller.rb
+++ b/app/controllers/credit_cards_controller.rb
@@ -9,4 +9,30 @@ class CreditCardsController < ApplicationController
     :annual_fee,
     :expiration_date
   )
+
+  def update
+    super
+    # Only apply provider settings once the account update succeeded (redirect);
+    # a failed update renders :edit and must not persist the flag.
+    update_enable_banking_settings if response.redirect?
+  end
+
+  private
+    def update_enable_banking_settings
+      eb_params = params.permit(account: { enable_banking: [ :treat_balance_as_available_credit ] })
+        .dig(:account, :enable_banking)
+      return if eb_params.blank?
+
+      provider_account = @account.provider_account_for("EnableBankingAccount")
+      return unless provider_account.present?
+
+      provider_account.update!(
+        treat_balance_as_available_credit: ActiveModel::Type::Boolean.new.cast(eb_params[:treat_balance_as_available_credit])
+      )
+
+      # Re-sync so the balance is reinterpreted right away instead of on the next scheduled sync
+      if provider_account.saved_change_to_treat_balance_as_available_credit?
+        provider_account.enable_banking_item.sync_later
+      end
+    end
 end
diff --git a/app/controllers/enable_banking_items_controller.rb b/app/controllers/enable_banking_items_controller.rb
index 0bfc0dabb..901d0589c 100644
--- a/app/controllers/enable_banking_items_controller.rb
+++ b/app/controllers/enable_banking_items_controller.rb
@@ -131,39 +131,6 @@ class EnableBankingItemsController < ApplicationController
       return
     end
 
-    # Re-fetch ASPSP list from provider to avoid session cookie overflow.
-    # We do not store full ASPSP metadata in the session to stay within the 4KB limit;
-    # instead, we re-query the provider here for the final authorization parameters.
-    aspsp_data = nil
-    begin
-      provider_for_lookup = @enable_banking_item.enable_banking_provider
-      if provider_for_lookup
-        response = provider_for_lookup.get_aspsps(country: @enable_banking_item.country_code)
-        raw_aspsps = response[:aspsps] || response["aspsps"] || []
-        found = raw_aspsps.find { |a| a[:name] == aspsp_name || a["name"] == aspsp_name }
-        aspsp_data = found&.with_indifferent_access
-      end
-    rescue Provider::EnableBanking::EnableBankingError => e
-      Rails.logger.warn "Enable Banking: could not fetch ASPSP metadata in authorize: #{e.message}"
-    end
-
-    # Block DECOUPLED banks — our OAuth redirect flow doesn't support them
-    if aspsp_data.present?
-      # Adjust psu_type if the bank does not support the requested type
-      supported_types = Array(aspsp_data[:psu_types]).map(&:to_s)
-      if supported_types.any? && !supported_types.include?(psu_type)
-        psu_type = supported_types.first
-      end
-
-      first_method = Array(aspsp_data[:auth_methods]).first
-      approach = first_method&.dig(:approach) || first_method&.dig("approach")
-      if approach == "DECOUPLED"
-        redirect_to settings_providers_path, alert: t(".decoupled_not_supported",
-          default: "This bank uses a separate device authentication method which is not yet supported. Please add this account manually.")
-        return
-      end
-    end
-
     begin
       target_item = if params[:new_connection] == "true"
         Current.family.enable_banking_items.create!(
@@ -181,12 +148,14 @@ class EnableBankingItemsController < ApplicationController
 
       language = I18n.locale.to_s.split("-").first
 
-      redirect_url = target_item.start_authorization(
+      # begin_authorization! re-fetches ASPSP metadata and auto-selects the best
+      # auth method (REDIRECT > DECOUPLED > EMBEDDED). Decoupled/MFA banks proceed
+      # through Enable Banking's hosted SCA page rather than being blocked.
+      redirect_url = target_item.begin_authorization!(
         aspsp_name: aspsp_name,
         redirect_url: enable_banking_callback_url,
         state: target_item.id,
         psu_type: psu_type,
-        aspsp_data: aspsp_data,
         language: language
       )
 
@@ -269,11 +238,11 @@ class EnableBankingItemsController < ApplicationController
     begin
       language = I18n.locale.to_s.split("-").first
 
-      redirect_url = @enable_banking_item.start_authorization(
-        aspsp_name: @enable_banking_item.aspsp_name,
+      # Route through the shared path so reauthorization re-selects the same auth
+      # method (decoupled banks included) instead of falling back to a default.
+      redirect_url = @enable_banking_item.begin_authorization!(
         redirect_url: enable_banking_callback_url,
         state: @enable_banking_item.id,
-        psu_type: @enable_banking_item.psu_type || "personal",
         language: language
       )
 
diff --git a/app/controllers/family_exports_controller.rb b/app/controllers/family_exports_controller.rb
index cc9226a54..c313da6af 100644
--- a/app/controllers/family_exports_controller.rb
+++ b/app/controllers/family_exports_controller.rb
@@ -2,7 +2,7 @@ class FamilyExportsController < ApplicationController
   include StreamExtensions
 
   before_action :require_admin
-  before_action :set_export, only: [ :download, :destroy ]
+  before_action :set_export, only: [ :download, :destroy, :cancel ]
 
   def new
     # Modal view for initiating export
@@ -46,6 +46,14 @@ class FamilyExportsController < ApplicationController
     redirect_to family_exports_path, notice: t("family_exports.destroy.success")
   end
 
+  def cancel
+    if @export.force_fail!
+      redirect_to family_exports_path, notice: t(".cancelled")
+    else
+      redirect_to family_exports_path, alert: t(".not_cancellable")
+    end
+  end
+
   private
 
     def set_export
diff --git a/app/controllers/family_merchants_controller.rb b/app/controllers/family_merchants_controller.rb
index d6420b01f..eb3f3a52d 100644
--- a/app/controllers/family_merchants_controller.rb
+++ b/app/controllers/family_merchants_controller.rb
@@ -8,6 +8,16 @@ class FamilyMerchantsController < ApplicationController
     @all_family_merchants = Current.family.merchants.alphabetically
     @all_provider_merchants = Current.family.assigned_merchants_for(Current.user).where(type: "ProviderMerchant").alphabetically
 
+    family_scope = @all_family_merchants
+    if params[:family_search].is_a?(String) && params[:family_search].strip.present?
+      family_scope = family_scope.where("LOWER(name) LIKE ?", "%#{ActiveRecord::Base.sanitize_sql_like(params[:family_search].strip.downcase)}%")
+    end
+
+    provider_scope = @all_provider_merchants
+    if params[:provider_search].is_a?(String) && params[:provider_search].strip.present?
+      provider_scope = provider_scope.where("LOWER(name) LIKE ?", "%#{ActiveRecord::Base.sanitize_sql_like(params[:provider_search].strip.downcase)}%")
+    end
+
     # Show recently unlinked ProviderMerchants (within last 30 days)
     # Exclude merchants that are already assigned to transactions (they appear in provider_merchants)
     recently_unlinked_ids = FamilyMerchantAssociation
@@ -20,8 +30,8 @@ class FamilyMerchantsController < ApplicationController
     @enhanceable_count = @all_provider_merchants.where(website_url: [ nil, "" ]).count
     @llm_available = Provider::Registry.get_provider(:openai).present?
 
-    @pagy_family_merchants, @family_merchants = pagy(@all_family_merchants, page_param: :family_page, limit: safe_per_page)
-    @pagy_provider_merchants, @provider_merchants = pagy(@all_provider_merchants, page_param: :provider_page, limit: safe_per_page)
+    @pagy_family_merchants, @family_merchants = pagy(family_scope, page_param: :family_page, limit: safe_per_page)
+    @pagy_provider_merchants, @provider_merchants = pagy(provider_scope, page_param: :provider_page, limit: safe_per_page)
 
     render layout: "settings"
   end
diff --git a/app/controllers/goals_controller.rb b/app/controllers/goals_controller.rb
index c54a44371..ae0ccb8b2 100644
--- a/app/controllers/goals_controller.rb
+++ b/app/controllers/goals_controller.rb
@@ -1,6 +1,8 @@
 class GoalsController < ApplicationController
   before_action :require_preview_features!
-  before_action :set_goal, only: %i[show edit update destroy pause resume complete archive unarchive]
+  before_action :set_goal, only: %i[show edit update destroy pause resume complete archive unarchive reopen]
+
+  FUNDABLE_TYPES = %w[Depository Investment].freeze
   rescue_from ActiveRecord::RecordNotFound, with: :goal_not_found
 
   STATE_FILTERS = %w[all active paused completed archived].freeze
@@ -14,7 +16,7 @@ class GoalsController < ApplicationController
 
     all_goals = Current.family.goals
                        .alphabetically
-                       .includes(:open_pledges, linked_accounts: :account_providers)
+                       .includes(:open_pledges, :goal_accounts, linked_accounts: :account_providers)
                        .to_a
     @active_goals = all_goals.reject { |g| %w[completed archived].include?(g.state) }
                              .sort_by { |g| [ g.paused? ? 3 : ACTIVE_STATUS_RANK.fetch(g.status, 4), g.name.downcase ] }
@@ -26,7 +28,16 @@ class GoalsController < ApplicationController
     # entirely (rendered with filterable: false).
     @grid_goals = @active_goals + @completed_goals
 
-    @linkable_account_count = Current.family.accounts.where(accountable_type: "Depository").visible.count
+    # One family-wide earmark-pool + market-flows query injected into every
+    # rendered goal so the backing math doesn't fire a query per card (N+1).
+    pooled = Goal.pooled_allocations_for(Current.family)
+    flows = Goal.market_flows_for(Current.family)
+    (@grid_goals + @archived_goals).each do |goal|
+      goal.pooled_allocations = pooled
+      goal.market_flows = flows
+    end
+
+    @linkable_account_count = Current.user.accessible_accounts.where(accountable_type: FUNDABLE_TYPES).visible.count
     @kpi = kpi_payload(@active_goals)
     @any_pending_pledge = @active_goals.any? { |g| g.open_pledges.any? }
     @show_search = @grid_goals.size > 6
@@ -61,10 +72,11 @@ class GoalsController < ApplicationController
   def create
     @goal = Current.family.goals.new(goal_params)
     accounts = lookup_accounts(params.dig(:goal, :account_ids))
-    @goal.currency = accounts.first.currency if accounts.any? && @goal.currency.blank?
+    @goal.currency = (accounts.first&.currency || Current.family.primary_currency_code) if @goal.currency.blank?
 
+    allocations = submitted_allocations
     Goal.transaction do
-      accounts.each { |a| @goal.goal_accounts.build(account: a) }
+      accounts.each { |a| @goal.goal_accounts.build(account: a, allocated_amount: allocations[a.id.to_s]) }
       @goal.save!
     end
 
@@ -100,7 +112,7 @@ class GoalsController < ApplicationController
 
     Goal.transaction do
       @goal.update!(goal_update_params)
-      sync_linked_accounts!(@goal, accounts) if accounts_supplied
+      sync_linked_accounts!(@goal, accounts, submitted_allocations) if accounts_supplied
     end
 
     flash[:notice] = t(".success")
@@ -146,6 +158,10 @@ class GoalsController < ApplicationController
     perform_transition!(:unarchive)
   end
 
+  def reopen
+    perform_transition!(:reopen)
+  end
+
   private
     def set_goal
       @goal = Current.family.goals
@@ -169,28 +185,56 @@ class GoalsController < ApplicationController
       return [] if ids.blank?
 
       ids = Array(ids).reject(&:blank?)
-      Current.family.accounts.where(accountable_type: "Depository").visible.where(id: ids).to_a
+      Current.user.accessible_accounts.where(accountable_type: FUNDABLE_TYPES).visible.where(id: ids).to_a
     end
 
     def linkable_accounts_for_new
-      Current.family.accounts.where(accountable_type: "Depository").visible.alphabetically.to_a
+      Current.user.accessible_accounts.where(accountable_type: FUNDABLE_TYPES).visible.alphabetically.to_a
     end
 
-    def sync_linked_accounts!(goal, accounts)
+    def sync_linked_accounts!(goal, accounts, allocations = {})
       desired_ids = accounts.map(&:id).to_set
       current_ids = goal.goal_accounts.pluck(:account_id).to_set
 
-      (current_ids - desired_ids).each do |id|
+      # Only unlink accounts the current user can actually see in the picker.
+      # A family goal may be linked to another member's private account, which
+      # never renders as a checkbox — so its absence from the submitted set is
+      # not an intentional removal and must not destroy the link.
+      removable_ids = Current.user.accessible_accounts.where(id: current_ids.to_a).pluck(:id).to_set
+
+      ((current_ids & removable_ids) - desired_ids).each do |id|
         goal.goal_accounts.where(account_id: id).destroy_all
       end
-      additions = accounts.reject { |a| current_ids.include?(a.id) }
-      additions.each { |a| goal.goal_accounts.build(account: a) }
-      # Save through the goal so currency / depository / family
-      # validations fire. `create!` on goal_accounts directly bypasses them
-      # and let cross-currency / non-depository attachments through.
+      goal.goal_accounts.reload
+
+      # Add new links and refresh the earmark on kept links. Only touch the
+      # allocation when the form actually submitted a value for that account
+      # (allocations.key?), so a caller that omits the hash leaves earmarks
+      # untouched. Save through the goal so currency / depository / family
+      # validations fire — create! on goal_accounts bypasses them.
+      accounts.each do |account|
+        existing = goal.goal_accounts.find { |ga| ga.account_id == account.id }
+        if existing
+          existing.allocated_amount = allocations[account.id.to_s] if allocations.key?(account.id.to_s)
+        else
+          goal.goal_accounts.build(account: account, allocated_amount: allocations[account.id.to_s])
+        end
+      end
       goal.save!
     end
 
+    # { account_id_string => amount_string_or_nil } from goal[allocations].
+    # A blank amount means "dedicate the whole balance" (NULL allocated_amount).
+    def submitted_allocations
+      raw = params.dig(:goal, :allocations)
+      return {} if raw.blank?
+
+      hash = raw.respond_to?(:to_unsafe_h) ? raw.to_unsafe_h : raw
+      hash.each_with_object({}) do |(account_id, amount), memo|
+        memo[account_id.to_s] = amount.to_s.strip.presence
+      end
+    end
+
     def kpi_payload(active_goals)
       family = Current.family
       currency = family.primary_currency_code
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index 194a55dd3..7d36a783e 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,8 +1,8 @@
 class ImportsController < ApplicationController
   include SettingsHelper
 
-  before_action :set_import, only: %i[show update publish destroy revert apply_template]
-  before_action :require_statement_import_permission!, only: %i[update publish destroy revert apply_template]
+  before_action :set_import, only: %i[show update publish destroy revert apply_template cancel]
+  before_action :require_statement_import_permission!, only: %i[update publish destroy revert apply_template cancel]
 
   def update
     # Handle both pdf_import[account_id] and import[account_id] param formats
@@ -30,6 +30,14 @@ class ImportsController < ApplicationController
     redirect_back_or_to import_path(@import), alert: t(".max_rows_exceeded", max: @import.max_row_count)
   end
 
+  def cancel
+    if @import.force_fail!
+      redirect_to imports_path, notice: t(".cancelled")
+    else
+      redirect_to imports_path, alert: t(".not_cancellable")
+    end
+  end
+
   def index
     @pagy, @imports = pagy(Current.family.imports.where(type: Import::TYPES).ordered, limit: safe_per_page)
     @breadcrumbs = [
@@ -111,7 +119,8 @@ class ImportsController < ApplicationController
     if !@import.uploaded?
       redirect_to import_upload_path(@import), alert: t("imports.show.finalize_upload")
     elsif !@import.publishable?
-      redirect_to import_confirm_path(@import), alert: t("imports.show.finalize_mappings")
+      next_path = @import.mapping_steps.empty? ? import_clean_path(@import) : import_confirm_path(@import)
+      redirect_to next_path, alert: t("imports.show.finalize_mappings")
     end
   end
 
diff --git a/app/controllers/insights_controller.rb b/app/controllers/insights_controller.rb
new file mode 100644
index 000000000..9ba67c9fa
--- /dev/null
+++ b/app/controllers/insights_controller.rb
@@ -0,0 +1,63 @@
+class InsightsController < ApplicationController
+  before_action :require_preview_features!
+  before_action :set_insight, only: %i[dismiss undismiss]
+
+  def index
+    load_feed
+    @breadcrumbs = [ [ t("breadcrumbs.home"), root_path ], [ t("insights.index.title"), nil ] ]
+
+    # Viewing the feed is what "read" means here; the New badge for this
+    # render comes from @unread_ids captured above. Turbo's hover prefetch
+    # hits this GET before the user actually navigates, so skip the write
+    # for prefetch requests or badges would clear on hover.
+    unless prefetch_request?
+      Current.family.insights.active.update_all(status: "read", read_at: Time.current, updated_at: Time.current)
+    end
+  end
+
+  def dismiss
+    @insight.dismiss!
+
+    respond_to do |format|
+      format.turbo_stream
+      format.html { redirect_back_or_to insights_path }
+    end
+  end
+
+  def undismiss
+    @insight.undismiss!
+    load_feed
+
+    respond_to do |format|
+      format.turbo_stream
+      format.html { redirect_back_or_to insights_path }
+    end
+  end
+
+  def refresh
+    GenerateInsightsJob.perform_later(family_id: Current.family.id)
+
+    respond_to do |format|
+      # Swaps the button into its pending state; the job broadcasts the
+      # refreshed list and the idle button back when it finishes.
+      format.turbo_stream
+      format.html { redirect_to insights_path, notice: t("insights.refresh.queued") }
+    end
+  end
+
+  private
+    def set_insight
+      @insight = Current.family.insights.find(params[:id])
+    end
+
+    def load_feed
+      @insights = Current.family.insights.visible.ordered.to_a
+      @unread_ids = @insights.select(&:active?).map(&:id).to_set
+    end
+
+    # Turbo sends X-Sec-Purpose (the fetch spec forbids setting Sec-Purpose
+    # from JS) on hover-prefetch requests.
+    def prefetch_request?
+      request.headers["X-Sec-Purpose"] == "prefetch" || request.headers["Sec-Purpose"].to_s.include?("prefetch")
+    end
+end
diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb
index f11965a0a..70f672581 100644
--- a/app/controllers/invitations_controller.rb
+++ b/app/controllers/invitations_controller.rb
@@ -14,7 +14,7 @@ class InvitationsController < ApplicationController
     @invitation = Current.family.invitations.build(invitation_params)
     @invitation.inviter = Current.user
 
-    if @invitation.save
+    if save_invitation
       normalized_email = @invitation.email.to_s.strip.downcase
       existing_user = User.find_by(email: normalized_email)
       if existing_user && @invitation.would_orphan_owned_accounts?(existing_user)
@@ -67,4 +67,15 @@ class InvitationsController < ApplicationController
     def invitation_params
       params.require(:invitation).permit(:email, :role)
     end
+
+    # Persist the invitation, treating a raced partial-unique-index violation as
+    # an ordinary save failure. A concurrent double-submit can still slip between
+    # the `no_duplicate_pending_invitation_in_family` validation and the INSERT.
+    # Scoping the rescue to the save alone keeps later writes in #create (e.g.
+    # accept_for) from silently swallowing a genuine RecordNotUnique.
+    def save_invitation
+      @invitation.save
+    rescue ActiveRecord::RecordNotUnique
+      false
+    end
 end
diff --git a/app/controllers/mcp_controller.rb b/app/controllers/mcp_controller.rb
index 1a7308b86..cf4906738 100644
--- a/app/controllers/mcp_controller.rb
+++ b/app/controllers/mcp_controller.rb
@@ -1,4 +1,6 @@
 class McpController < ApplicationController
+  include OauthBase
+
   PROTOCOL_VERSION = "2025-03-26"
 
   # Skip session-based auth and CSRF — this is a token-authenticated API
@@ -101,36 +103,52 @@ class McpController < ApplicationController
     end
 
     def authenticate_mcp_token!
-      expected = ENV["MCP_API_TOKEN"]
+      auth_header = request.authorization.to_s
+      token = auth_header[/\ABearer\s+(.+)\z/i, 1]&.strip&.presence # pipelock:ignore
 
-      unless expected.present?
-        render json: { error: "MCP endpoint not configured" }, status: :service_unavailable
-        return
-      end
+      return if token.present? && authenticate_via_doorkeeper(token)
+      return if token.present? && authenticate_via_env_token(token)
 
-      token = request.headers["Authorization"]&.delete_prefix("Bearer ")&.strip
-
-      unless ActiveSupport::SecurityUtils.secure_compare(token.to_s, expected)
-        render json: { error: "unauthorized" }, status: :unauthorized
-        return
-      end
-
-      setup_mcp_user
+      render_mcp_unauthorized
     end
 
-    def setup_mcp_user
-      email = ENV["MCP_USER_EMAIL"]
-      @mcp_user = User.find_by(email: email) if email.present?
+    def authenticate_via_doorkeeper(token)
+      access_token = Doorkeeper::AccessToken.by_token(token)
+      return false unless access_token&.accessible?
+      return false unless access_token.scopes.include?("read_write")
 
-      unless @mcp_user
-        render json: { error: "MCP user not configured" }, status: :service_unavailable
-        return
+      user = User.find_by(id: access_token.resource_owner_id)
+      return false unless user&.active?
+
+      setup_mcp_session(user)
+      true
+    end
+
+    def authenticate_via_env_token(token)
+      expected = ENV["MCP_API_TOKEN"]
+      return false unless expected.present?
+      return false unless ActiveSupport::SecurityUtils.secure_compare(
+        OpenSSL::Digest::SHA256.hexdigest(token),
+        OpenSSL::Digest::SHA256.hexdigest(expected)
+      )
+
+      user = User.find_by(email: ENV["MCP_USER_EMAIL"])
+
+      unless user
+        Rails.logger.warn "[MCP] MCP_USER_EMAIL does not match any user — check environment configuration"
+        return false
       end
 
+      setup_mcp_session(user)
+      true
+    end
+
+    def setup_mcp_session(user)
+      @mcp_user = user
       # Build a fresh session to avoid inheriting impersonation state from
       # existing sessions (Current.user resolves via active_impersonator_session
       # first, which could leak another user's data into MCP tool calls).
-      Current.session = @mcp_user.sessions.build(
+      Current.session = user.sessions.build(
         user_agent: request.user_agent,
         ip_address: request.ip
       )
@@ -140,6 +158,14 @@ class McpController < ApplicationController
       @mcp_user
     end
 
+    def render_mcp_unauthorized
+      response.set_header(
+        "WWW-Authenticate",
+        "Bearer resource_metadata=\"#{configured_base_url}/.well-known/oauth-protected-resource\""
+      )
+      render json: { error: "unauthorized" }, status: :unauthorized
+    end
+
     def render_jsonrpc_error(id, code, message)
       render json: {
         jsonrpc: "2.0",
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f5e98ae41..71c2107f3 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -17,6 +17,17 @@ class MessagesController < ApplicationController
     end
   end
 
+  # Called by the chat watchdog when an assistant "Thinking…" bubble has waited
+  # too long for a response that never arrived. Idempotent and scoped to the
+  # current user's chat.
+  def report_timeout
+    message = @chat.messages.find(params[:id])
+    @chat.handle_undelivered_response!(message)
+    head :ok
+  rescue ActiveRecord::RecordNotFound
+    head :not_found
+  end
+
   private
     def set_chat
       @chat = Current.user.chats.find(params[:chat_id])
diff --git a/app/controllers/oauth_metadata_controller.rb b/app/controllers/oauth_metadata_controller.rb
new file mode 100644
index 000000000..d5260ff55
--- /dev/null
+++ b/app/controllers/oauth_metadata_controller.rb
@@ -0,0 +1,29 @@
+class OauthMetadataController < ApplicationController
+  include OauthBase
+
+  skip_authentication
+  skip_before_action :verify_authenticity_token
+  skip_before_action :require_onboarding_and_upgrade, raise: false
+  skip_before_action :set_default_chat, raise: false
+  skip_before_action :detect_os, raise: false
+
+  def protected_resource
+    render json: {
+      resource: configured_base_url,
+      authorization_servers: [ configured_base_url ]
+    }
+  end
+
+  def authorization_server
+    render json: {
+      issuer: configured_base_url,
+      authorization_endpoint: "#{configured_base_url}/oauth/authorize",
+      token_endpoint: "#{configured_base_url}/oauth/token",
+      registration_endpoint: "#{configured_base_url}/register",
+      response_types_supported: [ "code" ],
+      grant_types_supported: [ "authorization_code" ],
+      code_challenge_methods_supported: [ "S256" ],
+      scopes_supported: [ "read_write" ]
+    }
+  end
+end
diff --git a/app/controllers/oauth_registration_controller.rb b/app/controllers/oauth_registration_controller.rb
new file mode 100644
index 000000000..1b3170be4
--- /dev/null
+++ b/app/controllers/oauth_registration_controller.rb
@@ -0,0 +1,90 @@
+class OauthRegistrationController < ApplicationController
+  LOOPBACK_HOSTS = [ "localhost", "127.0.0.1", "::1" ].freeze
+
+  skip_authentication
+  skip_before_action :verify_authenticity_token
+  skip_before_action :require_onboarding_and_upgrade, raise: false
+  skip_before_action :set_default_chat, raise: false
+  skip_before_action :detect_os, raise: false
+
+  rescue_from ActionDispatch::Http::Parameters::ParseError do
+    render json: {
+      error: "invalid_client_metadata",
+      error_description: "Invalid JSON"
+    }, status: :bad_request
+  end
+
+  def create
+    body = JSON.parse(request.raw_post)
+
+    redirect_uris = body["redirect_uris"]
+    if redirect_uris.blank?
+      render json: {
+        error: "invalid_client_metadata",
+        error_description: "redirect_uris is required"
+      }, status: :bad_request
+      return
+    end
+
+    redirect_uris = Array(redirect_uris).map { |u| u.to_s.strip }.reject(&:blank?)
+    if redirect_uris.empty?
+      render json: {
+        error: "invalid_client_metadata",
+        error_description: "redirect_uris is required"
+      }, status: :bad_request
+      return
+    end
+
+    unless redirect_uris.all? { |uri| valid_redirect_uri?(uri) }
+      render json: {
+        error: "invalid_client_metadata",
+        error_description: "redirect_uris must use https or loopback http"
+      }, status: :bad_request
+      return
+    end
+
+    client_name = body["client_name"].presence || "MCP Client"
+
+    app = Doorkeeper::Application.new(
+      name: client_name,
+      redirect_uri: redirect_uris.join("\n"),
+      confidential: false
+    )
+
+    if app.save
+      render json: {
+        client_id: app.uid,
+        client_name: app.name,
+        redirect_uris: app.redirect_uri.split("\n"),
+        grant_types: [ "authorization_code" ],
+        token_endpoint_auth_method: "none"
+      }, status: :created
+    else
+      render json: {
+        error: "invalid_client_metadata",
+        error_description: app.errors.full_messages.join(", ")
+      }, status: :bad_request
+    end
+  rescue JSON::ParserError
+    render json: {
+      error: "invalid_client_metadata",
+      error_description: "Invalid JSON"
+    }, status: :bad_request
+  end
+
+  private
+
+    def valid_redirect_uri?(raw_uri)
+      uri = URI.parse(raw_uri)
+      return false if uri.host.blank?
+
+      scheme = uri.scheme.to_s.downcase
+      return true if scheme == "https"
+      return false unless scheme == "http"
+
+      host = uri.host.downcase.delete_prefix("[").delete_suffix("]")
+      LOOPBACK_HOSTS.include?(host)
+    rescue URI::InvalidURIError
+      false
+    end
+end
diff --git a/app/controllers/oidc_accounts_controller.rb b/app/controllers/oidc_accounts_controller.rb
index a0e31e7a4..6e26e5e3a 100644
--- a/app/controllers/oidc_accounts_controller.rb
+++ b/app/controllers/oidc_accounts_controller.rb
@@ -136,15 +136,41 @@ class OidcAccountsController < ApplicationController
       @user.role = User.role_for_new_family_creator(fallback_role: provider_default_role || :admin)
     end
 
-    if @user.save
-      # Create the OIDC (or other SSO) identity
-      identity = OidcIdentity.create_from_omniauth(
-        build_auth_hash(@pending_auth),
-        @user
-      )
+    identity = nil
+    account_created = false
 
+    begin
+      account_created = ActiveRecord::Base.transaction do
+        unless @user.save
+          raise ActiveRecord::Rollback
+        end
+
+        # Mark invitation as accepted if one was used
+        invitation&.update!(accepted_at: Time.current)
+
+        # Joining an existing family via invitation must honor the family's
+        # default sharing policy, matching Invitation#accept_for. Without this a
+        # JIT SSO invitee lands in the family but sees none of its accounts.
+        @user.family.auto_share_existing_accounts_with(@user) if invitation.present?
+
+        # Create the OIDC (or other SSO) identity
+        identity = OidcIdentity.create_from_omniauth(
+          build_auth_hash(@pending_auth),
+          @user
+        )
+
+        true
+      end
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
+      # Expected persistence failures (e.g. a duplicate identity) roll the whole
+      # onboarding back and re-render the form. Unexpected errors propagate so
+      # they surface instead of being hidden as a form validation message.
+      @user.errors.add(:base, e.message)
+    end
+
+    if account_created
       # Only log JIT account creation if identity was successfully created
-      if identity.persisted?
+      if identity&.persisted?
         SsoAuditLog.log_jit_account_created!(
           user: @user,
           provider: @pending_auth["provider"],
@@ -152,9 +178,6 @@ class OidcAccountsController < ApplicationController
         )
       end
 
-      # Mark invitation as accepted if one was used
-      invitation&.update!(accepted_at: Time.current)
-
       # Clear pending auth from session
       session.delete(:pending_oidc_auth)
 
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 90a1f1054..e1dc1a5d7 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -1,6 +1,34 @@
 class PagesController < ApplicationController
   include Periodable
 
+  # Per-widget dashboard layout guardrails. Deterministic defaults the masonry
+  # packer reads; users may override a grow widget's height via presets.
+  #   col_span:   "single" | "full" (full spans both columns in 2-col mode)
+  #   grow:       true for charts that should fill an allotted height,
+  #               false for content-sized widgets (tables, stat grids)
+  #   min_height: floor in px
+  DASHBOARD_SECTION_LAYOUTS = {
+    # Width-toggleable but full by default: the feed is much shorter than any
+    # other single-width widget, so defaulting to half leaves a grid hole the
+    # masonry can't backfill (dense placement needs a later card short enough
+    # to fit beside it, and none is). Users who pair it manually can go half.
+    "insights_feed"      => { col_span: "full",   grow: false, min_height: 0, width_toggle: true },
+    "cashflow_sankey"    => { col_span: "full",   grow: false, min_height: 384, width_toggle: true },
+    "money_flow"         => { col_span: "single", grow: false, min_height: 0,   width_toggle: true },
+    "outflows_donut"     => { col_span: "single", grow: false, min_height: 0 },
+    "investment_summary" => { col_span: "single", grow: false, min_height: 0, width_toggle: true },
+    "net_worth_chart"    => { col_span: "single", grow: true,  min_height: 208, width_toggle: true },
+    "balance_sheet"      => { col_span: "single", grow: false, min_height: 0, width_toggle: true }
+  }.freeze
+
+  # Number of consecutive months (ending at the selected month) shown as
+  # bars in the "money_flow" dashboard widget.
+  MONEY_FLOW_CHART_MONTHS = 6
+
+  # Selectable height presets (px) for grow widgets.
+  DASHBOARD_HEIGHT_PRESETS = { "compact" => 208, "auto" => 288, "tall" => 416 }.freeze
+  DEFAULT_HEIGHT_PRESET = "auto"
+
   skip_authentication only: %i[redis_configuration_error privacy terms]
   before_action :ensure_intro_guest!, only: :intro
 
@@ -23,6 +51,14 @@ class PagesController < ApplicationController
 
     @cashflow_sankey_data = build_cashflow_sankey_data(net_totals, income_totals, expense_totals, family_currency)
     @outflows_data = build_outflows_donut_data(net_totals)
+    # Preview-gated: skip the query outright rather than loading rows the
+    # section won't be built from.
+    @feed_insights = preview_features_enabled? ? Current.family.insights.visible.ordered.limit(3) : Insight.none
+
+    @money_flow_accounts = income_statement.eligible_accounts
+    @money_flow_month = money_flow_month_param
+    @money_flow_account_ids = money_flow_account_ids_param
+    @money_flow_data = build_money_flow_data(income_statement, @money_flow_month, @money_flow_account_ids)
 
     @dashboard_sections = build_dashboard_sections
 
@@ -78,25 +114,56 @@ class PagesController < ApplicationController
     def preferences_params
       prefs = params.require(:preferences)
       {}.tap do |permitted|
-        permitted["collapsed_sections"] = prefs[:collapsed_sections].to_unsafe_h if prefs[:collapsed_sections]
-        permitted["section_order"] = prefs[:section_order] if prefs[:section_order]
+        permitted["collapsed_sections"] = prefs[:collapsed_sections].to_unsafe_h if prefs[:collapsed_sections].respond_to?(:to_unsafe_h)
+        permitted["section_order"] = prefs[:section_order] if prefs[:section_order].is_a?(Array)
+        permitted["dashboard_section_layout"] = prefs[:dashboard_section_layout].to_unsafe_h if prefs[:dashboard_section_layout].respond_to?(:to_unsafe_h)
       end
     end
 
+    # Preview-gated, and omitted from the section list entirely rather than
+    # left in it with `visible: false`. Dropping it here means the two
+    # downstream behaviors fall out for free: the saved-order lookup finds
+    # nothing to map, and the insights_feed unshift special-case never fires.
+    def insights_feed_section
+      return nil unless preview_features_enabled?
+
+      {
+        key: "insights_feed",
+        title: "pages.dashboard.insights_feed.title",
+        partial: "pages/dashboard/insights_feed",
+        layout: section_layout("insights_feed"),
+        locals: { insights: @feed_insights },
+        visible: @feed_insights.any?,
+        collapsible: true
+      }
+    end
+
     def build_dashboard_sections
       all_sections = [
+        insights_feed_section,
         {
           key: "cashflow_sankey",
           title: "pages.dashboard.cashflow_sankey.title",
           partial: "pages/dashboard/cashflow_sankey",
+          layout: section_layout("cashflow_sankey"),
           locals: { sankey_data: @cashflow_sankey_data, period: @period },
           visible: @accounts.any?,
           collapsible: true
         },
+        {
+          key: "money_flow",
+          title: "pages.dashboard.money_flow.title",
+          partial: "pages/dashboard/money_flow",
+          layout: section_layout("money_flow"),
+          locals: { money_flow_data: @money_flow_data, accounts: @money_flow_accounts, col_span: section_layout("money_flow")[:col_span] },
+          visible: @accounts.any?,
+          collapsible: true
+        },
         {
           key: "outflows_donut",
           title: "pages.dashboard.outflows_donut.title",
           partial: "pages/dashboard/outflows_donut",
+          layout: section_layout("outflows_donut"),
           locals: { outflows_data: @outflows_data, period: @period },
           visible: @accounts.any? && @outflows_data[:categories].present?,
           collapsible: true
@@ -105,6 +172,7 @@ class PagesController < ApplicationController
           key: "investment_summary",
           title: "pages.dashboard.investment_summary.title",
           partial: "pages/dashboard/investment_summary",
+          layout: section_layout("investment_summary"),
           locals: { investment_statement: @investment_statement, period: @period },
           visible: @accounts.any? && @investment_statement.investment_accounts.any?,
           collapsible: true
@@ -113,6 +181,7 @@ class PagesController < ApplicationController
           key: "net_worth_chart",
           title: "pages.dashboard.net_worth_chart.title",
           partial: "pages/dashboard/net_worth_chart",
+          layout: section_layout("net_worth_chart"),
           locals: { balance_sheet: @balance_sheet, period: @period },
           visible: @accounts.any?,
           collapsible: true
@@ -121,11 +190,12 @@ class PagesController < ApplicationController
           key: "balance_sheet",
           title: "pages.dashboard.balance_sheet.title",
           partial: "pages/dashboard/balance_sheet",
+          layout: section_layout("balance_sheet"),
           locals: { balance_sheet: @balance_sheet },
           visible: @accounts.any?,
           collapsible: true
         }
-      ]
+      ].compact
 
       # Order sections according to user preference
       section_order = Current.user.dashboard_section_order
@@ -133,14 +203,39 @@ class PagesController < ApplicationController
         all_sections.find { |s| s[:key] == key }
       end.compact
 
-      # Add any new sections that aren't in the saved order (future-proofing)
+      # Add any new sections that aren't in the saved order (future-proofing).
+      # The insights feed leads instead of appending: it's a proactive surface,
+      # and appending would bury it below the fold for every family with a
+      # saved order. Users can still drag it back down — that choice persists.
       all_sections.each do |section|
-        ordered_sections << section unless ordered_sections.include?(section)
+        next if ordered_sections.include?(section)
+
+        if section[:key] == "insights_feed"
+          ordered_sections.unshift(section)
+        else
+          ordered_sections << section
+        end
       end
 
       ordered_sections
     end
 
+    # Resolves a section's layout guardrails, applying the user's height preset
+    # override (falling back to the deterministic default) for grow widgets.
+    def section_layout(key)
+      base = DASHBOARD_SECTION_LAYOUTS.fetch(key, { col_span: "single", grow: false, min_height: 0, width_toggle: false })
+      preset = Current.user.dashboard_section_height(key)
+      preset = DEFAULT_HEIGHT_PRESET unless DASHBOARD_HEIGHT_PRESETS.key?(preset)
+
+      col_span = base[:col_span]
+      if base[:width_toggle]
+        user_span = Current.user.dashboard_section_width(key)
+        col_span = user_span if %w[single full].include?(user_span)
+      end
+
+      base.merge(col_span: col_span, height_preset: preset, height_px: DASHBOARD_HEIGHT_PRESETS.fetch(preset))
+    end
+
     def github_provider
       Provider::Registry.get_provider(:github)
     end
@@ -336,6 +431,64 @@ class PagesController < ApplicationController
       { categories: categories, total: total.to_f.round(2), currency: net_totals.currency, currency_symbol: currency_symbol }
     end
 
+    def money_flow_month_param
+      current_month = Date.current.beginning_of_month
+      month = Date.strptime(params[:money_flow_month], "%Y-%m-%d").beginning_of_month
+      # Clamp future months: build_money_flow_data caps each bar's end_date at
+      # Date.current, which would otherwise be earlier than a future month's
+      # start_date and blow up Period.custom's date-range validation.
+      month > current_month ? current_month : month
+    rescue ArgumentError, TypeError
+      current_month
+    end
+
+    # nil means "all accessible accounts" (the widget's default, unfiltered state)
+    def money_flow_account_ids_param
+      ids = Array(params[:money_flow_account_ids]).reject(&:blank?)
+      eligible_ids = @money_flow_accounts.map { |a| a.id.to_s }
+      ids &= eligible_ids
+      ids.presence
+    end
+
+    def build_money_flow_data(income_statement, selected_month, account_ids)
+      months = (MONEY_FLOW_CHART_MONTHS - 1).downto(0).map { |i| selected_month - i.months }
+
+      selected_period = nil
+      selected_totals = nil
+
+      bars = months.map do |month_start|
+        # Cap at today so an in-progress month (most commonly the current one)
+        # doesn't report totals for its not-yet-arrived days.
+        end_date = [ month_start.end_of_month, Date.current ].min
+        period = Period.custom(start_date: month_start, end_date: end_date)
+        totals = income_statement.totals_for(period, account_ids: account_ids)
+
+        if month_start == selected_month
+          selected_period = period
+          selected_totals = totals
+        end
+
+        {
+          date: month_start,
+          label: I18n.l(month_start, format: :short_month_year),
+          income: totals.income_money.amount.to_f.round(2),
+          expense: totals.expense_money.amount.to_f.round(2),
+          highlighted: month_start == selected_month,
+          partial: end_date < month_start.end_of_month
+        }
+      end
+
+      {
+        bars: bars,
+        period: selected_period,
+        month: selected_month,
+        income: selected_totals.income_money,
+        expense: selected_totals.expense_money,
+        balance: selected_totals.income_money - selected_totals.expense_money,
+        account_ids: account_ids
+      }
+    end
+
     def ensure_intro_guest!
       return if Current.user&.guest?
 
diff --git a/app/controllers/properties_controller.rb b/app/controllers/properties_controller.rb
index 1de7a5f8c..3e069d853 100644
--- a/app/controllers/properties_controller.rb
+++ b/app/controllers/properties_controller.rb
@@ -6,9 +6,12 @@ class PropertiesController < ApplicationController
 
   def new
     @account = Current.family.accounts.build(accountable: Property.new)
+    @avm_providers = configured_avm_providers
   end
 
   def create
+    return create_via_avm_provider if params[:avm_provider].present?
+
     @account = Current.family.accounts.create!(
       property_params.merge(
         balance: 0,
@@ -75,9 +78,18 @@ class PropertiesController < ApplicationController
       if @account.draft?
         @account.activate!
 
+        # The property setup wizard (create → balances → address) is multi-step,
+        # so the original `?return_to=` only survives in the session (captured by
+        # StoreLocation), not as a threaded form param. Honor it on completion so
+        # flows like the savings-goals "Add an account" CTA land back where they
+        # started instead of on the account page. Sanitized + consumed: the
+        # turbo_stream branch below isn't covered by Rails' redirect host-guard,
+        # so an unsafe value must not reach stream_redirect_to.
+        return_path = safe_return_to(session.delete(:return_to)) || account_path(@account)
+
         respond_to do |format|
-          format.html { redirect_to account_path(@account) }
-          format.turbo_stream { stream_redirect_to account_path(@account) }
+          format.html { redirect_to return_path }
+          format.turbo_stream { stream_redirect_to return_path }
         end
       else
         @success_message = "Address updated successfully."
@@ -90,6 +102,119 @@ class PropertiesController < ApplicationController
   end
 
   private
+    def create_via_avm_provider
+      @avm_providers = configured_avm_providers
+      provider_key = params[:avm_provider].to_s
+
+      unless @avm_providers.map(&:to_s).include?(provider_key)
+        redirect_to new_property_path, alert: t("providers.property_valuation.not_configured") and return
+      end
+
+      if params[:avm_step] == "confirm"
+        # The signed token proves the lookup step actually ran (and spent its
+        # provider request) — a direct confirm POST with fabricated data
+        # would otherwise create provider-linked properties that the daily
+        # refresh job then spends quota on. Everything is rebuilt from the
+        # token payload, so nothing user-editable is trusted.
+        payload = verify_avm_preview_token!
+
+        importer = Property::AvmImport.new(
+          family: Current.family,
+          owner: Current.user,
+          provider_key: payload["provider_key"],
+          name: payload["name"],
+          address_attributes: payload["address"].symbolize_keys
+        )
+
+        @account = importer.create_account(avm_data_from_payload(payload))
+
+        # The provider lookup fills in what the manual wizard's balance and
+        # address steps would have collected, so the account is complete —
+        # land on the account page (or the flow that initiated the wizard).
+        return_path = safe_return_to(session.delete(:return_to)) || account_path(@account)
+
+        respond_to do |format|
+          format.html { redirect_to return_path }
+          format.turbo_stream { stream_redirect_to return_path }
+        end
+      else
+        # Step 1: spend one provider request, then show the fetched data for
+        # review before anything is created.
+        importer = Property::AvmImport.new(
+          family: Current.family,
+          owner: Current.user,
+          provider_key: provider_key,
+          name: params.dig(:account, :name),
+          address_attributes: avm_address_params.to_h.symbolize_keys
+        )
+
+        @avm_preview = importer.lookup
+        @avm_preview_token = avm_preview_verifier.generate(
+          {
+            "provider_key" => provider_key,
+            "name" => params.dig(:account, :name),
+            "address" => avm_address_params.to_h,
+            "data" => @avm_preview.to_h.transform_values(&:to_s)
+          },
+          expires_in: 1.hour,
+          purpose: avm_preview_token_purpose
+        )
+        @avm_provider_key = provider_key
+        @account = Current.family.accounts.build(name: params.dig(:account, :name), accountable: Property.new)
+        @avm_address = Address.new(avm_address_params.to_h)
+        render :new
+      end
+    rescue Property::AvmImport::Error => error
+      @avm_provider_key = provider_key
+      @error_message = error.message
+      @account = Current.family.accounts.build(name: params.dig(:account, :name), accountable: Property.new)
+      # The confirm step doesn't resubmit the address fields, so build
+      # defensively — an expired token re-renders an empty lookup form.
+      @avm_address = Address.new(params.dig(:account, :address)&.permit(:line1, :locality, :region, :postal_code)&.to_h || {})
+      render :new, status: :unprocessable_entity
+    end
+
+    def avm_address_params
+      params.require(:account).require(:address).permit(:line1, :locality, :region, :postal_code)
+    end
+
+    def avm_preview_verifier
+      Rails.application.message_verifier(:avm_preview)
+    end
+
+    # Scoping the token's purpose to the family means a token minted in one
+    # family's session can't be replayed to seed a property in another —
+    # a purpose mismatch fails verification just like a bad signature.
+    def avm_preview_token_purpose
+      "avm_preview/family/#{Current.family.id}"
+    end
+
+    def verify_avm_preview_token!
+      avm_preview_verifier.verify(params[:avm_preview_token].to_s, purpose: avm_preview_token_purpose)
+    rescue ActiveSupport::MessageVerifier::InvalidSignature
+      raise Property::AvmImport::Error.new(t("providers.property_valuation.preview_expired"))
+    end
+
+    # Rebuilds the valuation data from the signed preview payload (values
+    # were stringified for serialization; blanks were nil).
+    def avm_data_from_payload(payload)
+      raw = payload["data"] || {}
+
+      Provider::PropertyValuationConcept::PropertyValuation.new(
+        valuation: raw["valuation"].to_d,
+        currency: raw["currency"].presence || "USD",
+        property_type: raw["property_type"].presence,
+        year_built: raw["year_built"].presence&.to_i,
+        area_value: raw["area_value"].presence&.to_i,
+        area_unit: raw["area_unit"].presence || "sqft"
+      )
+    end
+
+    def configured_avm_providers
+      registry = Provider::Registry.for_concept(:property_valuations)
+      registry.provider_keys.select { |key| registry.get_provider(key).present? }
+    end
+
     def balance_params
       params.require(:account).permit(:balance, :currency)
     end
diff --git a/app/controllers/pwa_controller.rb b/app/controllers/pwa_controller.rb
index dd3f1a65f..46c949e12 100644
--- a/app/controllers/pwa_controller.rb
+++ b/app/controllers/pwa_controller.rb
@@ -4,12 +4,12 @@ class PwaController < ApplicationController
   def manifest
     # Force JSON format to avoid MissingTemplate errors when browsers request /manifest
     # with HTML Accept headers (Safari Mobile does this for PWA manifest discovery)
-    render "pwa/manifest", content_type: "application/manifest+json"
+    render "pwa/manifest", formats: [ :json ], content_type: "application/manifest+json"
   end
 
   def service_worker
     # Explicitly render JS template to avoid format negotiation issues
-    render "pwa/service-worker", content_type: "application/javascript"
+    render "pwa/service-worker", formats: [ :js ], content_type: "application/javascript"
   end
   # Renders app/views/pwa/service-worker.js with content type application/javascript
 end
diff --git a/app/controllers/questrade_items_controller.rb b/app/controllers/questrade_items_controller.rb
new file mode 100644
index 000000000..5289cec5d
--- /dev/null
+++ b/app/controllers/questrade_items_controller.rb
@@ -0,0 +1,407 @@
+# frozen_string_literal: true
+
+class QuestradeItemsController < ApplicationController
+  ALLOWED_ACCOUNTABLE_TYPES = %w[Depository CreditCard Investment Loan OtherAsset OtherLiability Crypto Property Vehicle].freeze
+
+  before_action :set_questrade_item, only: [ :show, :edit, :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+  before_action :require_admin!, only: [ :create, :update, :destroy, :sync, :preload_accounts, :select_accounts, :link_accounts, :select_existing_account, :link_existing_account, :setup_accounts, :complete_account_setup ]
+
+  def index
+    @questrade_items = Current.family.questrade_items.ordered
+  end
+
+  def show
+  end
+
+  def new
+    @questrade_item = Current.family.questrade_items.build
+  end
+
+  def edit
+  end
+
+  def create
+    @questrade_item = Current.family.questrade_items.build(questrade_item_params)
+    @questrade_item.name = I18n.t("questrade_items.default_name") if @questrade_item.name.blank?
+
+    if @questrade_item.save
+      # Kick off an initial sync so accounts are discovered and appear under the
+      # Accounts tab for setup.
+      @questrade_item.sync_later unless @questrade_item.syncing?
+
+      if turbo_frame_request?
+        flash.now[:notice] = t(".success", default: "Successfully configured Questrade.")
+        @questrade_items = Current.family.questrade_items.ordered
+        render turbo_stream: [
+          turbo_stream.replace(
+            "questrade-providers-panel",
+            partial: "settings/providers/questrade_panel",
+            locals: { questrade_items: @questrade_items }
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+      end
+    else
+      @error_message = @questrade_item.errors.full_messages.join(", ")
+
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "questrade-providers-panel",
+          partial: "settings/providers/questrade_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message
+      end
+    end
+  end
+
+  def update
+    update_attrs = update_params
+    # A fresh, non-blank token re-arms a connection that was marked requires_update.
+    update_attrs = update_attrs.merge(status: :good) if update_attrs[:refresh_token].present?
+
+    if @questrade_item.update(update_attrs)
+      if turbo_frame_request?
+        flash.now[:notice] = t(".success", default: "Successfully updated Questrade configuration.")
+        @questrade_items = Current.family.questrade_items.ordered
+        render turbo_stream: [
+          turbo_stream.replace(
+            "questrade-providers-panel",
+            partial: "settings/providers/questrade_panel",
+            locals: { questrade_items: @questrade_items }
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+      end
+    else
+      @error_message = @questrade_item.errors.full_messages.join(", ")
+
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "questrade-providers-panel",
+          partial: "settings/providers/questrade_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message
+      end
+    end
+  end
+
+  def destroy
+    @questrade_item.destroy_later
+    redirect_to settings_providers_path, notice: t(".success", default: "Disconnected Questrade."), status: :see_other
+  end
+
+  def sync
+    unless @questrade_item.syncing?
+      @questrade_item.sync_later
+    end
+
+    respond_to do |format|
+      format.html { redirect_back_or_to accounts_path }
+      format.json { head :ok }
+    end
+  end
+
+  # Collection actions for account linking flow
+
+  def preload_accounts
+    # Trigger a sync to fetch accounts from the provider
+    questrade_item = Current.family.questrade_items.first
+    unless questrade_item&.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      return
+    end
+
+    questrade_item.sync_later unless questrade_item.syncing?
+    redirect_to select_accounts_questrade_items_path(accountable_type: params[:accountable_type], return_to: params[:return_to])
+  end
+
+  def select_accounts
+    questrade_item = Current.family.questrade_items.first
+    unless questrade_item&.credentials_configured?
+      if turbo_frame_request?
+        render partial: "questrade_items/setup_required", layout: false
+      else
+        redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      end
+      return
+    end
+
+    # The account-linking UI lives in the setup_accounts view (mirrors IBKR).
+    redirect_to setup_accounts_questrade_item_path(questrade_item, return_to: safe_return_to_path)
+  end
+
+  def link_accounts
+    questrade_item = Current.family.questrade_items.first
+    unless questrade_item&.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_api_key")
+      return
+    end
+
+    selected_ids = params[:selected_account_ids] || []
+    if selected_ids.empty?
+      redirect_to select_accounts_questrade_items_path, alert: t(".no_accounts_selected")
+      return
+    end
+
+    accountable_type = params[:accountable_type] || "Depository"
+    created_count = 0
+    already_linked_count = 0
+    invalid_count = 0
+
+    questrade_item.questrade_accounts.where(id: selected_ids).find_each do |questrade_account|
+      # Skip if already linked
+      if questrade_account.account_provider.present?
+        already_linked_count += 1
+        next
+      end
+
+      # Skip if invalid name
+      if questrade_account.name.blank?
+        invalid_count += 1
+        next
+      end
+
+      # Create Sure account and link
+      link_questrade_account(questrade_account, accountable_type)
+      created_count += 1
+    rescue => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Failed to link Questrade account",
+        source: "QuestradeItemsController",
+        provider_key: "questrade",
+        family: Current.family,
+        metadata: { questrade_account_id: questrade_account.id, error_class: e.class.name, error_message: e.message }
+      )
+    end
+
+    if created_count > 0
+      questrade_item.sync_later unless questrade_item.syncing?
+      redirect_to accounts_path, notice: t(".success", count: created_count)
+    else
+      redirect_to select_accounts_questrade_items_path, alert: t(".link_failed")
+    end
+  end
+
+  def select_existing_account
+    @account = find_writable_account!(params[:account_id])
+    @questrade_item = Current.family.questrade_items.first
+
+    unless @questrade_item&.credentials_configured?
+      if turbo_frame_request?
+        render partial: "questrade_items/setup_required", layout: false
+      else
+        redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      end
+      return
+    end
+
+    @questrade_accounts = @questrade_item.questrade_accounts
+                                                      .left_joins(:account_provider)
+                                                      .where(account_providers: { id: nil })
+                                                      .order(:name)
+  end
+
+  def link_existing_account
+    account = find_writable_account!(params[:account_id])
+    questrade_item = Current.family.questrade_items.first
+
+    unless questrade_item&.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_api_key")
+      return
+    end
+
+    questrade_account = questrade_item.questrade_accounts.find(params[:questrade_account_id])
+
+    if questrade_account.account_provider.present?
+      redirect_to account_path(account), alert: t(".provider_account_already_linked")
+      return
+    end
+
+    questrade_account.ensure_account_provider!(account)
+    questrade_item.sync_later unless questrade_item.syncing?
+
+    redirect_to account_path(account), notice: t(".success", account_name: account.name)
+  end
+
+  def setup_accounts
+    @unlinked_accounts = @questrade_item.unlinked_questrade_accounts.order(:name)
+    # When empty, the view renders an "all linked" message inside the modal
+    # frame; redirecting to accounts_path here would dead-end the Turbo modal.
+  end
+
+  def complete_account_setup
+    account_configs = params[:accounts] || {}
+
+    if account_configs.empty?
+      redirect_to setup_accounts_questrade_item_path(@questrade_item), alert: t(".no_accounts")
+      return
+    end
+
+    created_count = 0
+    skipped_count = 0
+
+    account_configs.each do |questrade_account_id, config|
+      next if config[:account_type] == "skip"
+
+      questrade_account = @questrade_item.questrade_accounts.find_by(id: questrade_account_id)
+      next unless questrade_account
+      next if questrade_account.account_provider.present?
+
+      accountable_type = infer_accountable_type(config[:account_type], config[:subtype])
+
+      # Atomic: roll back the manual account if linking the provider fails.
+      ActiveRecord::Base.transaction do
+        account = create_account_from_questrade(questrade_account, accountable_type, config)
+        questrade_account.ensure_account_provider!(account)
+        questrade_account.update!(sync_start_date: config[:sync_start_date]) if config[:sync_start_date].present?
+      end
+      created_count += 1
+    rescue => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Failed to create account during Questrade setup",
+        source: "QuestradeItemsController",
+        provider_key: "questrade",
+        family: Current.family,
+        metadata: { questrade_account_id: questrade_account_id, error_class: e.class.name, error_message: e.message }
+      )
+      skipped_count += 1
+    end
+
+    return_to = safe_return_to_path
+
+    if created_count > 0
+      @questrade_item.sync_later unless @questrade_item.syncing?
+      redirect_to return_to || accounts_path, notice: t(".success", count: created_count)
+    elsif skipped_count > 0 && created_count == 0
+      redirect_to return_to || accounts_path, notice: t(".all_skipped")
+    else
+      redirect_to setup_accounts_questrade_item_path(@questrade_item, return_to: return_to), alert: t(".creation_failed", error: "Unknown error")
+    end
+  end
+
+  private
+
+    def set_questrade_item
+      @questrade_item = Current.family.questrade_items.find(params[:id])
+    end
+
+    # Mirror AccountsController's access gate: only accounts the user can reach
+    # and write to may be inspected or linked to a provider.
+    def find_writable_account!(account_id)
+      account = Current.user.accessible_accounts.find(account_id)
+      raise ActiveRecord::RecordNotFound unless account.permission_for(Current.user).in?([ :owner, :full_control ])
+      account
+    end
+
+    def questrade_item_params
+      params.require(:questrade_item).permit(
+        :name,
+        :sync_start_date,
+        :refresh_token
+      )
+    end
+
+    # Params for update: drop a blank refresh_token so an empty submission
+    # never wipes the stored (still-valid) token.
+    def update_params
+      permitted = questrade_item_params
+      permitted = permitted.except(:refresh_token) if permitted[:refresh_token].blank?
+      permitted
+    end
+
+    def link_questrade_account(questrade_account, accountable_type)
+      accountable_class = validated_accountable_class(accountable_type)
+
+      # Atomic: a failure in ensure_account_provider! must roll back the account
+      # so we never leave an orphan manual account behind.
+      ActiveRecord::Base.transaction do
+        account = Current.family.accounts.create!(
+          name: questrade_account.name,
+          balance: questrade_account.current_balance || 0,
+          currency: questrade_account.currency || "USD",
+          accountable: accountable_class.new
+        )
+
+        questrade_account.ensure_account_provider!(account)
+        account
+      end
+    end
+
+    def create_account_from_questrade(questrade_account, accountable_type, config)
+      accountable_class = validated_accountable_class(accountable_type)
+      accountable_attrs = {}
+
+      # Set subtype if the accountable supports it
+      if config[:subtype].present? && accountable_class.respond_to?(:subtypes)
+        accountable_attrs[:subtype] = config[:subtype]
+      end
+
+      Current.family.accounts.create!(
+        name: questrade_account.name,
+        balance: config[:balance].present? ? config[:balance].to_d : (questrade_account.current_balance || 0),
+        currency: questrade_account.currency || "USD",
+        accountable: accountable_class.new(accountable_attrs)
+      )
+    end
+
+    def infer_accountable_type(account_type, subtype = nil)
+      case account_type&.downcase
+      when "depository"
+        "Depository"
+      when "credit_card"
+        "CreditCard"
+      when "investment"
+        "Investment"
+      when "loan"
+        "Loan"
+      when "other_asset"
+        "OtherAsset"
+      when "other_liability"
+        "OtherLiability"
+      when "crypto"
+        "Crypto"
+      when "property"
+        "Property"
+      when "vehicle"
+        "Vehicle"
+      else
+        "Depository"
+      end
+    end
+
+    def validated_accountable_class(accountable_type)
+      unless ALLOWED_ACCOUNTABLE_TYPES.include?(accountable_type)
+        raise ArgumentError, "Invalid accountable type: #{accountable_type}"
+      end
+
+      accountable_type.constantize
+    end
+
+    def safe_return_to_path
+      return nil if params[:return_to].blank?
+
+      return_to = params[:return_to].to_s
+
+      begin
+        uri = URI.parse(return_to)
+        return nil if uri.scheme.present?
+        return nil if uri.host.present?
+        return nil unless return_to.start_with?("/")
+        return_to
+      rescue URI::InvalidURIError
+        nil
+      end
+    end
+end
diff --git a/app/controllers/redbark_items_controller.rb b/app/controllers/redbark_items_controller.rb
new file mode 100644
index 000000000..0076a0302
--- /dev/null
+++ b/app/controllers/redbark_items_controller.rb
@@ -0,0 +1,360 @@
+# frozen_string_literal: true
+
+class RedbarkItemsController < ApplicationController
+  ALLOWED_ACCOUNTABLE_TYPES = %w[Depository CreditCard Investment Loan OtherAsset OtherLiability Crypto Property Vehicle].freeze
+
+  before_action :set_redbark_item, only: [ :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+  before_action :require_admin!, only: [ :create, :select_accounts, :select_existing_account, :link_existing_account, :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+
+  def create
+    @redbark_item = Current.family.redbark_items.build(redbark_item_params)
+    @redbark_item.name ||= t("redbark_items.default_name")
+
+    if @redbark_item.save
+      # Trigger the initial sync so accounts appear without a manual refresh
+      @redbark_item.sync_later
+
+      if turbo_frame_request?
+        flash.now[:notice] = t(".success")
+        @redbark_items = Current.family.redbark_items.ordered
+        render turbo_stream: [
+          turbo_stream.replace(
+            "redbark-providers-panel",
+            partial: "settings/providers/redbark_panel",
+            locals: { redbark_items: @redbark_items }
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+      end
+    else
+      @error_message = @redbark_item.errors.full_messages.join(", ")
+
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "redbark-providers-panel",
+          partial: "settings/providers/redbark_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message, status: :see_other
+      end
+    end
+  end
+
+  def update
+    update_params = redbark_item_params
+    # A fresh key means the connection can be retried - clear requires_update
+    update_params = update_params.merge(status: :good) if update_params[:api_key].present?
+
+    if @redbark_item.update(update_params)
+      # Rotated credentials should be exercised right away
+      @redbark_item.sync_later if update_params[:api_key].present? && !@redbark_item.syncing?
+
+      if turbo_frame_request?
+        flash.now[:notice] = t(".success")
+        @redbark_items = Current.family.redbark_items.ordered
+        render turbo_stream: [
+          turbo_stream.replace(
+            "redbark-providers-panel",
+            partial: "settings/providers/redbark_panel",
+            locals: { redbark_items: @redbark_items }
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+      end
+    else
+      @error_message = @redbark_item.errors.full_messages.join(", ")
+
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "redbark-providers-panel",
+          partial: "settings/providers/redbark_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message, status: :see_other
+      end
+    end
+  end
+
+  def destroy
+    # Detach provider links before scheduling deletion; abort if anything
+    # failed to unlink so we never orphan holdings or provider links
+    unlink_results = @redbark_item.unlink_all!(dry_run: false)
+    failed = unlink_results.select { |r| r[:error].present? }
+
+    if failed.any?
+      redirect_to settings_providers_path, alert: t(".unlink_failed", count: failed.count), status: :see_other
+      return
+    end
+
+    @redbark_item.destroy_later
+    redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+  end
+
+  def sync
+    unless @redbark_item.syncing?
+      @redbark_item.sync_later
+    end
+
+    respond_to do |format|
+      format.html { redirect_back_or_to accounts_path }
+      format.json { head :ok }
+    end
+  end
+
+  # Collection actions for account linking flow
+
+  def select_accounts
+    redbark_item = Current.family.redbark_items.first
+    unless redbark_item&.credentials_configured?
+      if turbo_frame_request?
+        render partial: "redbark_items/setup_required", layout: false
+      else
+        redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      end
+      return
+    end
+
+    # The account-linking UI lives in the setup_accounts view
+    redirect_to setup_accounts_redbark_item_path(redbark_item, return_to: safe_return_to_path)
+  end
+
+  def select_existing_account
+    @account = Current.family.accounts.find(params[:account_id])
+    @redbark_item = Current.family.redbark_items.first
+
+    unless @redbark_item&.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      return
+    end
+
+    @redbark_accounts = @redbark_item.redbark_accounts
+                                                      .without_linked
+                                                      .order(:name)
+  end
+
+  def link_existing_account
+    account = Current.family.accounts.find(params[:account_id])
+    redbark_item = Current.family.redbark_items.first
+
+    unless redbark_item&.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_api_key")
+      return
+    end
+
+    redbark_account = redbark_item.redbark_accounts.find(params[:redbark_account_id])
+
+    if redbark_account.account_provider.present?
+      redirect_to account_path(account), alert: t(".provider_account_already_linked")
+      return
+    end
+
+    if account.account_providers.exists?
+      redirect_to account_path(account), alert: t(".account_already_linked")
+      return
+    end
+
+    redbark_account.ensure_account_provider!(account)
+    redbark_account.update!(ignored: false)
+    redbark_item.sync_later unless redbark_item.syncing?
+
+    redirect_to account_path(account), notice: t(".success", account_name: account.name)
+  end
+
+  def setup_accounts
+    # A fresh connection has no imported accounts yet - fetch them inline so
+    # the setup dialog is usable straight after the API key is saved
+    @api_error = fetch_redbark_accounts_from_api
+
+    @unlinked_accounts = @redbark_item.unlinked_redbark_accounts.order(:name)
+
+    if @unlinked_accounts.empty? && @api_error.nil?
+      redirect_to accounts_path, notice: t(".all_accounts_linked")
+    end
+  end
+
+  def complete_account_setup
+    account_configs = params[:accounts] || {}
+
+    if account_configs.empty?
+      redirect_to setup_accounts_redbark_item_path(@redbark_item), alert: t(".no_accounts")
+      return
+    end
+
+    created_count = 0
+    skipped_count = 0
+    failed_count = 0
+
+    account_configs.each do |redbark_account_id, config|
+      redbark_account = @redbark_item.redbark_accounts.find_by(id: redbark_account_id)
+      next unless redbark_account
+      next if redbark_account.account_provider.present?
+
+      # Remember the user's choice to skip so the account stops resurfacing
+      # as "needs setup" on every sync
+      if config[:account_type] == "skip" || config[:account_type].blank?
+        redbark_account.update!(ignored: true)
+        skipped_count += 1
+        next
+      end
+
+      accountable_type = infer_accountable_type(config[:account_type], config[:subtype])
+
+      # Atomic: roll back the manual account if linking the provider fails
+      ActiveRecord::Base.transaction do
+        account = create_account_from_redbark(redbark_account, accountable_type, config)
+        redbark_account.ensure_account_provider!(account)
+        redbark_account.update!(ignored: false)
+        redbark_account.update!(sync_start_date: config[:sync_start_date]) if config[:sync_start_date].present?
+      end
+      created_count += 1
+    rescue => e
+      DebugLogEntry.capture(
+        category: "provider_sync",
+        level: "error",
+        message: "Redbark account setup failed",
+        source: self.class.name,
+        provider_key: "redbark",
+        family: Current.family,
+        metadata: { redbark_account_id: redbark_account_id, error_class: e.class.name, error: e.message }
+      )
+      failed_count += 1
+    end
+
+    @redbark_item.sync_later if created_count > 0 && !@redbark_item.syncing?
+
+    if failed_count > 0
+      redirect_to setup_accounts_redbark_item_path(@redbark_item), alert: t(".setup_failed", count: failed_count)
+    elsif created_count > 0
+      redirect_to accounts_path, notice: t(".success", count: created_count)
+    elsif skipped_count > 0
+      redirect_to accounts_path, notice: t(".all_skipped")
+    else
+      redirect_to setup_accounts_redbark_item_path(@redbark_item), alert: t(".creation_failed_generic")
+    end
+  end
+
+  private
+
+    def set_redbark_item
+      @redbark_item = Current.family.redbark_items.find(params[:id])
+    end
+
+    # Imports accounts synchronously when the item has none yet.
+    # Returns nil on success, or an error message string on failure.
+    def fetch_redbark_accounts_from_api
+      return nil if @redbark_item.redbark_accounts.any?
+      return t("redbark_items.setup_accounts.no_api_key") unless @redbark_item.credentials_configured?
+
+      @redbark_item.import_latest_redbark_data
+      nil
+    rescue Provider::Redbark::Error => e
+      t("redbark_items.setup_accounts.api_error", message: e.message)
+    rescue StandardError => e
+      DebugLogEntry.capture(
+        category: "provider_sync",
+        level: "error",
+        message: "Inline Redbark account fetch failed",
+        source: self.class.name,
+        provider_key: "redbark",
+        family: Current.family,
+        metadata: { redbark_item_id: @redbark_item.id, error_class: e.class.name, error: e.message }
+      )
+      t("redbark_items.setup_accounts.api_error", message: e.message)
+    end
+
+    # Only allow internal relative paths in return_to
+    def safe_return_to_path
+      return nil if params[:return_to].blank?
+
+      return_to = params[:return_to].to_s
+
+      begin
+        uri = URI.parse(return_to)
+        return nil if uri.scheme.present?
+        return nil if uri.host.present?
+        return nil unless return_to.start_with?("/")
+        return_to
+      rescue URI::InvalidURIError
+        nil
+      end
+    end
+
+    def redbark_item_params
+      params.require(:redbark_item).permit(
+        :name,
+        :sync_start_date,
+        :api_key
+      )
+    end
+
+    def link_redbark_account(redbark_account, accountable_type)
+      accountable_class = validated_accountable_class(accountable_type)
+
+      account = Current.family.accounts.create!(
+        name: redbark_account.name,
+        balance: redbark_account.current_balance || 0,
+        currency: redbark_account.currency || "AUD",
+        accountable: accountable_class.new
+      )
+
+      redbark_account.ensure_account_provider!(account)
+      redbark_account.update!(ignored: false)
+      account
+    end
+
+    def create_account_from_redbark(redbark_account, accountable_type, config)
+      accountable_class = validated_accountable_class(accountable_type)
+      accountable_attrs = {}
+
+      # Set subtype if the accountable supports it
+      if config[:subtype].present? && accountable_class.respond_to?(:subtypes)
+        accountable_attrs[:subtype] = config[:subtype]
+      end
+
+      Current.family.accounts.create!(
+        name: redbark_account.name,
+        balance: config[:balance].present? ? config[:balance].to_d : (redbark_account.current_balance || 0),
+        currency: redbark_account.currency || "AUD",
+        accountable: accountable_class.new(accountable_attrs)
+      )
+    end
+
+    def infer_accountable_type(account_type, subtype = nil)
+      case account_type&.downcase
+      when "depository"
+        "Depository"
+      when "credit_card"
+        "CreditCard"
+      when "investment"
+        "Investment"
+      when "loan"
+        "Loan"
+      when "other_asset"
+        "OtherAsset"
+      when "other_liability"
+        "OtherLiability"
+      when "crypto"
+        "Crypto"
+      when "property"
+        "Property"
+      when "vehicle"
+        "Vehicle"
+      else
+        "Depository"
+      end
+    end
+
+    def validated_accountable_class(accountable_type)
+      unless ALLOWED_ACCOUNTABLE_TYPES.include?(accountable_type)
+        raise ArgumentError, "Invalid accountable type: #{accountable_type}"
+      end
+
+      accountable_type.constantize
+    end
+end
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 5da04aaf3..14cdc4851 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -73,6 +73,9 @@ class RegistrationsController < ApplicationController
         end
 
         @invitation&.update!(accepted_at: Time.current)
+        # Joining an existing family must honor the family's default sharing
+        # policy so the user sees the accounts the family shares.
+        @user.family.auto_share_existing_accounts_with(@user)
         @session = create_session_for(@user)
         success = true
       end
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index c31df1eb0..7568a2949 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -111,17 +111,18 @@ class ReportsController < ApplicationController
       @previous_period = build_previous_period
 
       # Get aggregated data
-      @current_income_totals = Current.family.income_statement.income_totals(period: @period)
-      @current_expense_totals = Current.family.income_statement.expense_totals(period: @period)
+      @income_statement = Current.family.income_statement(user: Current.user)
+      @current_income_totals = @income_statement.income_totals(period: @period)
+      @current_expense_totals = @income_statement.expense_totals(period: @period)
 
-      @previous_income_totals = Current.family.income_statement.income_totals(period: @previous_period)
-      @previous_expense_totals = Current.family.income_statement.expense_totals(period: @previous_period)
+      @previous_income_totals = @income_statement.income_totals(period: @previous_period)
+      @previous_expense_totals = @income_statement.expense_totals(period: @previous_period)
 
       # Calculate summary metrics
       @summary_metrics = build_summary_metrics
 
       # Build trend data (last 6 months)
-      @trends_data = build_trends_data
+      @trends_data = build_trends_data(income_statement: @income_statement)
 
       # Net worth metrics
       @net_worth_metrics = build_net_worth_metrics
@@ -320,7 +321,7 @@ class ReportsController < ApplicationController
       nil
     end
 
-    def build_trends_data
+    def build_trends_data(income_statement:)
       # Generate month-by-month data based on the current period filter
       trends = []
 
@@ -337,8 +338,8 @@ class ReportsController < ApplicationController
 
         period = Period.custom(start_date: month_start, end_date: month_end)
 
-        income = Current.family.income_statement.income_totals(period: period).total
-        expenses = Current.family.income_statement.expense_totals(period: period).total
+        income = income_statement.income_totals(period: period).total
+        expenses = income_statement.expense_totals(period: period).total
 
         trends << {
           month: month_start.strftime("%b %Y"),
@@ -361,9 +362,11 @@ class ReportsController < ApplicationController
         .joins(:entry)
         .joins(entry: :account)
         .where(accounts: { family_id: Current.family.id, status: [ "draft", "active" ] })
+        .merge(Account.included_in_reports)
         .where(entries: { entryable_type: "Transaction", excluded: false, date: @period.date_range })
         .where.not(kind: Transaction::BUDGET_EXCLUDED_KINDS)
         .includes(entry: :account, category: :parent)
+      transactions = exclude_tax_advantaged_accounts(transactions)
 
       # Apply filters (includes finance account scoping)
       transactions = apply_transaction_filters(transactions)
@@ -373,14 +376,20 @@ class ReportsController < ApplicationController
         .joins(:entry)
         .joins(entry: :account)
         .where(accounts: { family_id: Current.family.id, status: [ "draft", "active" ] })
+        .merge(Account.included_in_reports)
         .where(entries: { entryable_type: "Trade", excluded: false, date: @period.date_range })
         .includes(entry: :account, category: :parent)
+      trades = exclude_tax_advantaged_accounts(trades)
 
       trades = apply_entry_filters(trades)
 
       # Get sort parameters
-      sort_by = params[:sort_by] || "amount"
-      sort_direction = params[:sort_direction] || "desc"
+      sort_by = %w[amount count].include?(params[:sort_by]) ? params[:sort_by] : "amount"
+      sort_direction = %w[asc desc].include?(params[:sort_direction]) ? params[:sort_direction] : "desc"
+      sort_logic = ->(item) do
+        value = (sort_by == "count") ? item[:count] : item[:total]
+        sort_direction == "asc" ? (value || 0) : -(value || 0)
+      end
 
       # Group by category (tracking parent relationship) and type
       # Structure: { [parent_category_id, type] => { parent_data, subcategories: { subcategory_id => data } } }
@@ -447,16 +456,12 @@ class ReportsController < ApplicationController
 
       # Convert to array and sort subcategories
       result = grouped_data.values.map do |parent_data|
-        subcategories = parent_data[:subcategories].values.sort_by { |s| sort_direction == "asc" ? s[:total] : -s[:total] }
+        subcategories = parent_data[:subcategories].values.sort_by(&sort_logic)
         parent_data.merge(subcategories: subcategories)
       end
 
-      # Sort by amount (total) with the specified direction
-      if sort_direction == "asc"
-        result.sort_by { |g| g[:total] }
-      else
-        result.sort_by { |g| -g[:total] }
-      end
+      # Sort by the chosen key with the specified direction
+      result.sort_by(&sort_logic)
     end
 
     def build_investment_metrics
@@ -466,7 +471,6 @@ class ReportsController < ApplicationController
       return { has_investments: false } unless investment_accounts.any?
 
       period_totals = investment_statement.totals(period: @period)
-
       {
         has_investments: true,
         portfolio_value: investment_statement.portfolio_value_money,
@@ -493,8 +497,9 @@ class ReportsController < ApplicationController
       # Get sell trades in period with realized gains
       # Eager-load security, account, and accountable to avoid N+1
       sell_trades = Current.family.trades
-        .joins(:entry)
+        .joins(entry: :account)
         .where(entries: { date: @period.date_range })
+        .merge(Account.included_in_reports)
         .where("trades.qty < 0")
         .includes(:security, entry: { account: :accountable })
         .to_a
@@ -593,13 +598,19 @@ class ReportsController < ApplicationController
         { name: group.name, total: Money.new(group.total, currency) }
       end.reject { |g| g[:total].zero? }
 
+      # Monthly net worth series with per-account-group breakdown for the chart
+      breakdown_series = BalanceSheet::NetWorthBreakdownSeriesBuilder
+        .new(Current.family, user: Current.user)
+        .breakdown_series(period: @period)
+
       {
         current_net_worth: Money.new(current_net_worth, currency),
         total_assets: Money.new(total_assets, currency),
         total_liabilities: Money.new(total_liabilities, currency),
         trend: trend,
         asset_groups: asset_groups,
-        liability_groups: liability_groups
+        liability_groups: liability_groups,
+        breakdown_series: breakdown_series
       }
     end
 
@@ -614,6 +625,13 @@ class ReportsController < ApplicationController
       scope
     end
 
+    def exclude_tax_advantaged_accounts(scope)
+      tax_advantaged_account_ids = Current.family.tax_advantaged_account_ids
+      return scope if tax_advantaged_account_ids.blank?
+
+      scope.where.not(accounts: { id: tax_advantaged_account_ids })
+    end
+
     # Filters applicable to both transactions and trades (entry-level + category)
     def apply_entry_filters(scope)
       # Scope to user's finance accounts
@@ -666,9 +684,11 @@ class ReportsController < ApplicationController
         .joins(:entry)
         .joins(entry: :account)
         .where(accounts: { family_id: Current.family.id, status: [ "draft", "active" ] })
+        .merge(Account.included_in_reports)
         .where(entries: { entryable_type: "Transaction", excluded: false, date: @period.date_range })
         .where.not(kind: Transaction::BUDGET_EXCLUDED_KINDS)
         .includes(entry: :account, category: [])
+      transactions = exclude_tax_advantaged_accounts(transactions)
 
       transactions = apply_transaction_filters(transactions)
 
@@ -703,9 +723,11 @@ class ReportsController < ApplicationController
         .joins(:entry)
         .joins(entry: :account)
         .where(accounts: { family_id: Current.family.id, status: [ "draft", "active" ] })
+        .merge(Account.included_in_reports)
         .where(entries: { entryable_type: "Transaction", excluded: false, date: @period.date_range })
         .where.not(kind: Transaction::BUDGET_EXCLUDED_KINDS)
         .includes(entry: :account, category: [])
+      transactions = exclude_tax_advantaged_accounts(transactions)
 
       transactions = apply_transaction_filters(transactions)
 
@@ -1060,14 +1082,18 @@ class ReportsController < ApplicationController
         return false
       end
 
-      # Find or create a session for this API request
-      # We need to find or create a persisted session so that Current.user delegation works properly
-      session = @current_user.sessions.first_or_create!(
+      unless @current_user.active?
+        render plain: "Invalid or expired API key", status: :unauthorized
+        return false
+      end
+
+      # Build a fresh unsaved session so API key exports never reuse an existing
+      # web session that may already carry impersonation state.
+      Current.session = @current_user.sessions.build(
         user_agent: request.user_agent,
         ip_address: request.ip
       )
-
-      Current.session = session
+      Current.session.active_impersonator_session = nil
 
       # Verify the delegation chain works
       unless Current.user
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index ea2f37c08..7db6d098f 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -2,7 +2,11 @@ class SessionsController < ApplicationController
   extend SslConfigurable
 
   before_action :set_session, only: :destroy
-  skip_authentication only: %i[index new create openid_connect failure post_logout mobile_sso_start]
+  skip_authentication only: %i[index new create openid_connect failure post_logout mobile_sso_start desktop_sso_start desktop_exchange]
+  # The desktop exchange is a cross-context POST from the app's webview that
+  # can't carry a CSRF token; the single-use, PKCE-bound one-time code is the
+  # protection instead (same model as the OAuth callback).
+  skip_forgery_protection only: :desktop_exchange
 
   layout "auth"
 
@@ -13,8 +17,9 @@ class SessionsController < ApplicationController
 
   def new
     store_pending_invitation_if_valid
-    # Clear any stale mobile SSO session flag from an abandoned mobile flow
+    # Clear any stale mobile/desktop SSO session flag from an abandoned flow
     session.delete(:mobile_sso)
+    session.delete(:desktop_sso)
 
     begin
       demo = Rails.application.config_for(:demo)
@@ -142,6 +147,75 @@ class SessionsController < ApplicationController
     render layout: false
   end
 
+  # Entry point for desktop-app SSO, opened in the system browser so passkeys
+  # work. Stashes the desktop PKCE challenge, then hands off to OmniAuth exactly
+  # like the mobile flow (reusing its auto-submitting form).
+  def desktop_sso_start
+    provider = params[:provider].to_s
+    configured_providers = Rails.configuration.x.auth.sso_providers.map { |p| p[:name].to_s }
+
+    unless configured_providers.include?(provider)
+      redirect_to new_session_path, alert: t("sessions.openid_connect.failed")
+      return
+    end
+
+    code_challenge = params[:code_challenge].to_s
+    # Require a well-formed PKCE (S256) challenge — a 43-char base64url SHA-256
+    # digest — so the one-time code returned via the custom URL scheme can only
+    # be redeemed by the app instance that started the flow (it alone holds the
+    # verifier). Validate the format before copying it into session state.
+    unless code_challenge.match?(/\A[A-Za-z0-9_-]{43}\z/)
+      redirect_to new_session_path, alert: t("sessions.openid_connect.failed")
+      return
+    end
+
+    session[:desktop_sso] = { code_challenge: code_challenge }
+    @provider = provider
+    render :mobile_sso_start, layout: false
+  end
+
+  # Exchanges the single-use, PKCE-bound code (delivered to the desktop app via
+  # sure://sso/callback) for a real web session in the app's own webview.
+  def desktop_exchange
+    code = params[:code].to_s
+    code_verifier = params[:code_verifier].to_s
+
+    cache_key = "desktop_sso:#{code}"
+    data = Rails.cache.read(cache_key)
+    # Atomically claim the code: only the request whose delete actually removes
+    # the entry may proceed, so two concurrent exchanges can't both succeed
+    # (delete returns false for the loser). Redis/MemoryStore both report this.
+    claimed = Rails.cache.delete(cache_key)
+
+    if code.blank? || code_verifier.blank? || data.blank? || !claimed
+      redirect_to new_session_path, alert: t("sessions.openid_connect.failed")
+      return
+    end
+
+    data = data.with_indifferent_access
+    expected_challenge = Base64.urlsafe_encode64(Digest::SHA256.digest(code_verifier), padding: false)
+
+    unless ActiveSupport::SecurityUtils.secure_compare(expected_challenge, data[:code_challenge].to_s)
+      redirect_to new_session_path, alert: t("sessions.openid_connect.failed")
+      return
+    end
+
+    user = User.find_by(id: data[:user_id])
+    unless user
+      redirect_to new_session_path, alert: t("sessions.openid_connect.failed")
+      return
+    end
+
+    if user.otp_required?
+      session[:mfa_user_id] = user.id
+      redirect_to verify_mfa_path
+    else
+      @session = create_session_for(user)
+      flash[:notice] = t("invitations.accept_choice.joined_household") if accept_pending_invitation_for(user)
+      redirect_to root_path
+    end
+  end
+
   def openid_connect
     auth = request.env["omniauth.auth"]
 
@@ -174,6 +248,14 @@ class SessionsController < ApplicationController
         return
       end
 
+      # Desktop SSO: hand a single-use, PKCE-bound code back to the desktop app,
+      # which exchanges it for a normal web session. MFA is enforced later, at
+      # exchange time (the desktop webview can complete MFA), so it is supported.
+      if session[:desktop_sso].present?
+        handle_desktop_sso_callback(user)
+        return
+      end
+
       # Store id_token and provider for RP-initiated logout
       session[:id_token_hint] = auth.credentials&.id_token if auth.credentials&.id_token
       session[:sso_login_provider] = auth.provider
@@ -195,6 +277,15 @@ class SessionsController < ApplicationController
         return
       end
 
+      # Desktop SSO with no linked identity: send the app back to the login
+      # screen with an error. Linking/JIT creation still happens through the
+      # normal web flow; the desktop handoff only resumes already-linked users.
+      if session[:desktop_sso].present?
+        session.delete(:desktop_sso)
+        redirect_to "sure://sso/callback?error=account_not_linked", allow_other_host: true
+        return
+      end
+
       # No existing OIDC identity - need to link to account
       # Store auth data in session and redirect to linking page
       session[:pending_oidc_auth] = {
@@ -228,6 +319,14 @@ class SessionsController < ApplicationController
       return
     end
 
+    # Desktop SSO: send the error back to the app via the custom scheme so it
+    # stops waiting, instead of stranding the flow on the web login page.
+    if session[:desktop_sso].present?
+      session.delete(:desktop_sso)
+      redirect_to "sure://sso/callback?error=#{sanitized_reason}", allow_other_host: true
+      return
+    end
+
     message = case sanitized_reason
     when "sso_provider_unavailable"
       t("sessions.failure.sso_provider_unavailable")
@@ -273,6 +372,27 @@ class SessionsController < ApplicationController
       mobile_sso_redirect(error: "device_error", message: "Unable to register device")
     end
 
+    def handle_desktop_sso_callback(user)
+      context = (session.delete(:desktop_sso) || {}).with_indifferent_access
+      code_challenge = context[:code_challenge]
+
+      if code_challenge.blank?
+        redirect_to "sure://sso/callback?error=missing_session", allow_other_host: true
+        return
+      end
+
+      # One-time authorization code, bound to the PKCE challenge, exchanged by
+      # the desktop webview for a session. Short TTL + single-use + PKCE.
+      code = SecureRandom.urlsafe_base64(32)
+      Rails.cache.write(
+        "desktop_sso:#{code}",
+        { "user_id" => user.id, "code_challenge" => code_challenge },
+        expires_in: 2.minutes
+      )
+
+      redirect_to "sure://sso/callback?code=#{code}", allow_other_host: true
+    end
+
     def handle_mobile_sso_onboarding(auth)
       device_info = session.delete(:mobile_sso)
       email = auth.info&.email
diff --git a/app/controllers/settings/ai_prompts_controller.rb b/app/controllers/settings/ai_prompts_controller.rb
index dddbc15df..38a1319db 100644
--- a/app/controllers/settings/ai_prompts_controller.rb
+++ b/app/controllers/settings/ai_prompts_controller.rb
@@ -1,6 +1,8 @@
 class Settings::AiPromptsController < ApplicationController
   layout "settings"
 
+  before_action :require_admin!
+
   def show
     @breadcrumbs = [
       [ t("breadcrumbs.home"), root_path ],
diff --git a/app/controllers/settings/api_keys_controller.rb b/app/controllers/settings/api_keys_controller.rb
index cb8b2c3db..ac5d53aa4 100644
--- a/app/controllers/settings/api_keys_controller.rb
+++ b/app/controllers/settings/api_keys_controller.rb
@@ -5,18 +5,24 @@ class Settings::ApiKeysController < ApplicationController
 
   before_action :set_api_key, only: [ :show, :destroy ]
 
-  def show
+  def index
+    @api_keys = Current.user.api_keys.active.visible.order(created_at: :desc)
     @breadcrumbs = [
       [ t("breadcrumbs.home"), root_path ],
-      [ t("breadcrumbs.api_key"), nil ]
+      [ t("breadcrumbs.api_keys"), nil ]
+    ]
+  end
+
+  def show
+    @newly_created = params[:newly_created].present?
+    @breadcrumbs = [
+      [ t("breadcrumbs.home"), root_path ],
+      [ t("breadcrumbs.api_keys"), settings_api_keys_path ],
+      [ @api_key.name, nil ]
     ]
-    @current_api_key = @api_key
   end
 
   def new
-    # Allow regeneration by not redirecting if user explicitly wants to create a new key
-    # Only redirect if user stumbles onto new page without explicit intent
-    redirect_to settings_api_key_path if Current.user.api_keys.active.visible.exists? && !params[:regenerate]
     @api_key = ApiKey.new
   end
 
@@ -25,42 +31,33 @@ class Settings::ApiKeysController < ApplicationController
     @api_key = Current.user.api_keys.build(api_key_params)
     @api_key.key = @plain_key
 
-    # Temporarily revoke existing visible keys for validation to pass
-    # (demo monitoring key is excluded and remains active)
-    existing_keys = Current.user.api_keys.active.visible
-    existing_keys.each { |key| key.update_column(:revoked_at, Time.current) }
-
     if @api_key.save
       flash[:notice] = t(".success")
-      redirect_to settings_api_key_path
+      redirect_to settings_api_key_path(@api_key, newly_created: true)
     else
-      # Restore existing keys if new key creation failed
-      existing_keys.each { |key| key.update_column(:revoked_at, nil) }
       render :new, status: :unprocessable_entity
     end
   end
 
   def destroy
-    if @api_key.nil?
-      flash[:alert] = t(".not_found")
-    elsif @api_key.demo_monitoring_key?
-      flash[:alert] = t(".cannot_revoke")
-    elsif @api_key.revoke!
-      flash[:notice] = t(".revoked_successfully")
-    else
-      flash[:alert] = t(".revoke_failed")
-    end
-    redirect_to settings_api_key_path
+    @api_key.revoke!
+    flash[:notice] = t(".revoked_successfully")
+  rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotDestroyed
+    flash[:alert] = t(".revoke_failed")
+  ensure
+    redirect_to settings_api_keys_path
   end
 
   private
 
+    # `.visible` excludes the demo monitoring key, so a demo key id 404s here
+    # before #destroy can revoke it — this is intentional (see the SECURITY note
+    # on ApiKey's `visible` scope).
     def set_api_key
-      @api_key = Current.user.api_keys.active.visible.first
+      @api_key = Current.user.api_keys.active.visible.find(params[:id])
     end
 
     def api_key_params
-      # Convert single scope value to array for storage
       permitted_params = params.require(:api_key).permit(:name, :scopes)
       if permitted_params[:scopes].present?
         permitted_params[:scopes] = [ permitted_params[:scopes] ]
diff --git a/app/controllers/settings/appearances_controller.rb b/app/controllers/settings/appearances_controller.rb
index 51ae26739..c9a0ccbc9 100644
--- a/app/controllers/settings/appearances_controller.rb
+++ b/app/controllers/settings/appearances_controller.rb
@@ -12,6 +12,7 @@ class Settings::AppearancesController < ApplicationController
       updated_prefs = (@user.preferences || {}).deep_dup
       updated_prefs["show_split_grouped"] = params.dig(:user, :show_split_grouped) == "1" if params.dig(:user, :show_split_grouped)
       updated_prefs["dashboard_two_column"] = params.dig(:user, :dashboard_two_column) == "1" if params.dig(:user, :dashboard_two_column)
+      updated_prefs["disable_modal_click_outside"] = params.dig(:user, :disable_modal_click_outside) == "1" if params.dig(:user, :disable_modal_click_outside)
       @user.update!(preferences: updated_prefs)
     end
     redirect_to settings_appearance_path
diff --git a/app/controllers/settings/background_jobs_controller.rb b/app/controllers/settings/background_jobs_controller.rb
new file mode 100644
index 000000000..704e9f209
--- /dev/null
+++ b/app/controllers/settings/background_jobs_controller.rb
@@ -0,0 +1,123 @@
+# frozen_string_literal: true
+
+class Settings::BackgroundJobsController < Admin::BaseController
+  CANCELLABLE_BASE_TYPES = [ Sync, Import, ImportSession, FamilyExport ].freeze
+
+  def show
+    @breadcrumbs = [
+      [ t("breadcrumbs.home"), root_path ],
+      [ t("settings.background_jobs.show.page_title"), nil ]
+    ]
+
+    @console = BackgroundJobConsole.new
+    @operations = @console.operations
+  end
+
+  def cancel
+    record = find_record!
+    console = BackgroundJobConsole.new
+
+    # Server-side re-check — the button state in the UI is not trusted. The
+    # with_lock block re-reads the record, so a job finishing between render
+    # and click cannot be clobbered (it already moved the status on). The
+    # stuck-window check repeats inside the lock too: cancellable? evaluated
+    # Sidekiq liveness outside the transaction (re-running Redis calls under
+    # a row lock would be worse), so a worker that grabbed the job in between
+    # shows up here as a freshly-touched updated_at.
+    cancelled = console.cancellable?(record) && record.with_lock do
+      if cancellable_status?(record) && record.updated_at <= BackgroundJobConsole::STUCK_AFTER.ago
+        prior_status = record.status
+        apply_cancel!(record)
+        audit_cancel!(record, prior_status)
+        true
+      else
+        false
+      end
+    end
+
+    if cancelled
+      redirect_to settings_background_jobs_path, notice: t(".cancelled", type: record.class.name)
+    else
+      redirect_to settings_background_jobs_path, alert: t(".not_cancellable")
+    end
+  end
+
+  private
+    # Resolves record_type without reflecting on request input: rather than
+    # turning the param into a constant, look the id up in each cancellable
+    # base table and require the claimed type to match the found record's
+    # class (or its base class). STI subclass names are still accepted —
+    # the UI sends base_class names, but a direct request naming e.g.
+    # TransactionImport shouldn't 404.
+    def find_record!
+      claimed_type = params[:record_type].to_s
+
+      CANCELLABLE_BASE_TYPES.each do |base|
+        record = base.find_by(id: params[:id])
+        return record if record && [ record.class.name, base.name ].include?(claimed_type)
+      end
+
+      raise ActiveRecord::RecordNotFound, "Unknown record type"
+    end
+
+    # User-facing: surfaces as the failed operation's error in the family UI.
+    def cancelled_error_message
+      t("settings.background_jobs.cancel.cancelled_error")
+    end
+
+    def cancellable_status?(record)
+      case record
+      when Sync then record.in_progress?
+      when Import then record.importing? || record.reverting?
+      when ImportSession then record.importing?
+      when FamilyExport then record.pending? || record.processing?
+      end
+    end
+
+    def apply_cancel!(record)
+      case record
+      when Sync
+        record.mark_stale!
+      when PdfImport
+        if record.reverting?
+          # A stuck revert may have half-deleted entries — pending would
+          # present the import as publishable again. Route it through the
+          # same revert_failed retry path as every other import.
+          record.update!(status: :revert_failed, error: cancelled_error_message)
+        else
+          # importing is the AI-processing claim — release it so the user
+          # can re-trigger, mirroring ProcessPdfJob's own reclaim.
+          record.update!(status: :pending)
+        end
+      when Import
+        record.update!(
+          status: record.reverting? ? :revert_failed : :failed,
+          error: cancelled_error_message
+        )
+      when ImportSession
+        record.update!(
+          status: :failed,
+          error_details: { "code" => "cancelled_by_admin", "message" => cancelled_error_message }
+        )
+      when FamilyExport
+        record.update!(status: :failed)
+      end
+    end
+
+    def audit_cancel!(record, prior_status)
+      DebugLogEntry.capture(
+        category: "background_jobs",
+        level: "warn",
+        message: "#{record.class.name} #{record.id} marked as lost from the background jobs console (was #{prior_status})",
+        source: self.class.name,
+        family: BackgroundJobConsole.family_for(record),
+        metadata: {
+          record_type: record.class.name,
+          record_id: record.id,
+          previous_status: prior_status,
+          new_status: record.status,
+          actor_user_id: Current.user.id
+        }
+      )
+    end
+end
diff --git a/app/controllers/settings/hostings_controller.rb b/app/controllers/settings/hostings_controller.rb
index e6ac154b8..f988aca36 100644
--- a/app/controllers/settings/hostings_controller.rb
+++ b/app/controllers/settings/hostings_controller.rb
@@ -31,6 +31,10 @@ class Settings::HostingsController < ApplicationController
     @show_tiingo_settings = enabled_securities.include?("tiingo")
     @show_eodhd_settings = enabled_securities.include?("eodhd")
     @show_alpha_vantage_settings = enabled_securities.include?("alpha_vantage")
+    # T-Invest doubles as a brand-logo source consulted regardless of the price
+    # provider, so its token is useful even when it's not enabled for prices.
+    # Always surface the token field, decoupled from the securities checklist.
+    @show_tinkoff_invest_settings = true
 
     # Only fetch provider data if we're showing the section
     if @show_twelve_data_settings
@@ -41,7 +45,13 @@ class Settings::HostingsController < ApplicationController
 
     if @show_yahoo_finance_settings
       @yahoo_finance_provider = Provider::Registry.get_provider(:yahoo_finance)
+      @yahoo_finance_health_status = @yahoo_finance_provider&.health_status || :unknown
     end
+
+    # Property valuation (AVM) providers — usage is shown against their tight
+    # monthly request caps when a key is configured
+    @rentcast_usage = Provider::Registry.get_provider(:rentcast)&.usage
+    @realie_usage = Provider::Registry.get_provider(:realie)&.usage
   end
 
   def update
@@ -110,6 +120,9 @@ class Settings::HostingsController < ApplicationController
     update_encrypted_setting(:tiingo_api_key)
     update_encrypted_setting(:eodhd_api_key)
     update_encrypted_setting(:alpha_vantage_api_key)
+    update_encrypted_setting(:tinkoff_invest_api_key)
+    update_encrypted_setting(:rentcast_api_key)
+    update_encrypted_setting(:realie_api_key)
 
     if hosting_params.key?(:syncs_include_pending)
       Setting.syncs_include_pending = hosting_params[:syncs_include_pending] == "1"
@@ -138,13 +151,7 @@ class Settings::HostingsController < ApplicationController
       sync_auto_sync_scheduler!
     end
 
-    if hosting_params.key?(:openai_access_token)
-      token_param = hosting_params[:openai_access_token].to_s.strip
-      # Ignore blanks and redaction placeholders to prevent accidental overwrite
-      unless token_param.blank? || token_param == "********"
-        Setting.openai_access_token = token_param
-      end
-    end
+    update_encrypted_setting(:openai_access_token)
 
     # Validate OpenAI configuration before updating
     if hosting_params.key?(:openai_uri_base) || hosting_params.key?(:openai_model)
@@ -166,6 +173,44 @@ class Settings::HostingsController < ApplicationController
       Setting.openai_json_mode = hosting_params[:openai_json_mode].presence
     end
 
+    update_encrypted_setting(:anthropic_access_token)
+
+    if hosting_params.key?(:anthropic_base_url)
+      raw_base_url = hosting_params[:anthropic_base_url].to_s.strip
+      if raw_base_url.blank?
+        Setting.anthropic_base_url = nil
+      else
+        parsed = URI.parse(raw_base_url) rescue nil
+        unless parsed.is_a?(URI::HTTP)
+          raise Setting::ValidationError, t(".invalid_anthropic_base_url")
+        end
+        # A custom Anthropic-compatible endpoint requires a model — Provider::Anthropic
+        # raises without one. Validate the pair together (mirrors the OpenAI branch), using
+        # the submitted model when present so a blanked model field is caught too.
+        effective_model =
+          if hosting_params.key?(:anthropic_model)
+            hosting_params[:anthropic_model].to_s.strip
+          else
+            Setting.anthropic_model.to_s.strip
+          end
+        if effective_model.blank?
+          raise Setting::ValidationError, t(".anthropic_model_required_for_base_url")
+        end
+        Setting.anthropic_base_url = raw_base_url
+      end
+    end
+
+    if hosting_params.key?(:anthropic_model)
+      Setting.anthropic_model = hosting_params[:anthropic_model].presence
+    end
+
+    if hosting_params.key?(:llm_provider)
+      provider = hosting_params[:llm_provider].to_s
+      if %w[openai anthropic].include?(provider)
+        Setting.llm_provider = provider
+      end
+    end
+
     LLM_BUDGET_MINIMUMS.each do |key, minimum|
       next unless hosting_params.key?(key)
       raw = hosting_params[key].to_s.strip
@@ -185,12 +230,7 @@ class Settings::HostingsController < ApplicationController
       Setting.external_assistant_url = hosting_params[:external_assistant_url]
     end
 
-    if hosting_params.key?(:external_assistant_token)
-      token_param = hosting_params[:external_assistant_token].to_s.strip
-      unless token_param.blank? || token_param == "********"
-        Setting.external_assistant_token = token_param
-      end
-    end
+    update_encrypted_setting(:external_assistant_token)
 
     if hosting_params.key?(:external_assistant_agent_id)
       Setting.external_assistant_agent_id = hosting_params[:external_assistant_agent_id]
@@ -206,6 +246,8 @@ class Settings::HostingsController < ApplicationController
     # be wiped because the view reads from the unchanged Setting.* values.
     @openai_uri_base_input = hosting_params[:openai_uri_base] if hosting_params.key?(:openai_uri_base)
     @openai_model_input = hosting_params[:openai_model] if hosting_params.key?(:openai_model)
+    @anthropic_base_url_input = hosting_params[:anthropic_base_url] if hosting_params.key?(:anthropic_base_url)
+    @anthropic_model_input = hosting_params[:anthropic_model] if hosting_params.key?(:anthropic_model)
     flash.now[:alert] = error.message
     render :show, status: :unprocessable_entity
   end
@@ -229,7 +271,7 @@ class Settings::HostingsController < ApplicationController
   private
     def hosting_params
       return ActionController::Parameters.new unless params.key?(:setting)
-      params.require(:setting).permit(:onboarding_state, :require_email_confirmation, :invite_only_default_family_id, :brand_fetch_client_id, :brand_fetch_high_res_logos, :twelve_data_api_key, :tiingo_api_key, :eodhd_api_key, :alpha_vantage_api_key, :openai_access_token, :openai_uri_base, :openai_model, :openai_json_mode, :llm_context_window, :llm_max_response_tokens, :llm_max_items_per_call, :exchange_rate_provider, :securities_provider, :syncs_include_pending, :auto_sync_enabled, :auto_sync_time, :external_assistant_url, :external_assistant_token, :external_assistant_agent_id, securities_providers: [])
+      params.require(:setting).permit(:onboarding_state, :require_email_confirmation, :invite_only_default_family_id, :brand_fetch_client_id, :brand_fetch_high_res_logos, :twelve_data_api_key, :tiingo_api_key, :eodhd_api_key, :alpha_vantage_api_key, :tinkoff_invest_api_key, :rentcast_api_key, :realie_api_key, :openai_access_token, :openai_uri_base, :openai_model, :openai_json_mode, :anthropic_access_token, :anthropic_base_url, :anthropic_model, :llm_provider, :llm_context_window, :llm_max_response_tokens, :llm_max_items_per_call, :exchange_rate_provider, :securities_provider, :syncs_include_pending, :auto_sync_enabled, :auto_sync_time, :external_assistant_url, :external_assistant_token, :external_assistant_agent_id, securities_providers: [])
     end
 
     def update_assistant_type
@@ -261,7 +303,13 @@ class Settings::HostingsController < ApplicationController
     def update_encrypted_setting(param_key)
       return unless hosting_params.key?(param_key)
       value = hosting_params[param_key].to_s.strip
-      Setting.public_send(:"#{param_key}=", value) unless value.blank? || value == "********"
+
+      # "********" is the masked placeholder rendered for an existing key; it
+      # means "leave the stored value untouched". A blank submission, however,
+      # is an explicit request to clear the key, so persist nil in that case.
+      return if value == "********"
+
+      Setting.public_send(:"#{param_key}=", value.presence)
     end
 
     def current_user_timezone
diff --git a/app/controllers/settings/llm_usages_controller.rb b/app/controllers/settings/llm_usages_controller.rb
index 73ec812b8..cf736bb50 100644
--- a/app/controllers/settings/llm_usages_controller.rb
+++ b/app/controllers/settings/llm_usages_controller.rb
@@ -1,6 +1,8 @@
 class Settings::LlmUsagesController < ApplicationController
   layout "settings"
 
+  before_action :require_admin!
+
   def show
     @breadcrumbs = [
       [ t("breadcrumbs.home"), root_path ],
diff --git a/app/controllers/settings/mcp_controller.rb b/app/controllers/settings/mcp_controller.rb
new file mode 100644
index 000000000..3d0305a77
--- /dev/null
+++ b/app/controllers/settings/mcp_controller.rb
@@ -0,0 +1,26 @@
+class Settings::McpController < ApplicationController
+  include OauthBase
+  layout "settings"
+
+  def show
+    @breadcrumbs = [
+      [ t("breadcrumbs.home"), root_path ],
+      [ t("breadcrumbs.mcp"), nil ]
+    ]
+    @mcp_url = "#{configured_base_url}/mcp"
+    @connected_tokens = Doorkeeper::AccessToken
+      .where(resource_owner_id: Current.user.id, revoked_at: nil, mobile_device_id: nil)
+      .includes(:application)
+      .order(created_at: :desc)
+      .to_a
+  end
+
+  def revoke
+    token = Doorkeeper::AccessToken.find_by( # pipelock:ignore
+      id: params[:token_id],
+      resource_owner_id: Current.user.id
+    )
+    token&.revoke
+    redirect_to settings_mcp_path, notice: t(".revoked")
+  end
+end
diff --git a/app/controllers/settings/providers_controller.rb b/app/controllers/settings/providers_controller.rb
index 1a3a03ca1..a3f968834 100644
--- a/app/controllers/settings/providers_controller.rb
+++ b/app/controllers/settings/providers_controller.rb
@@ -183,10 +183,13 @@ class Settings::ProvidersController < ApplicationController
     # them (see prepare_show_context).
     FAMILY_PANELS = [
       { key: "akahu",          title: "Akahu",           turbo_id: "akahu",          partial: "akahu_panel" },
+      { key: "up",             title: "Up",              turbo_id: "up",             partial: "up_panel" },
       { key: "lunchflow",      title: "Lunch Flow",      turbo_id: "lunchflow",      partial: "lunchflow_panel" },
+      { key: "redbark",        title: "Redbark",         turbo_id: "redbark",        partial: "redbark_panel" },
       { key: "simplefin",      title: "SimpleFIN",       turbo_id: "simplefin",      partial: "simplefin_panel" },
       { key: "enable_banking", title: "Enable Banking",  turbo_id: "enable_banking", partial: "enable_banking_panel" },
       { key: "coinstats",      title: "CoinStats",       turbo_id: "coinstats",      partial: "coinstats_panel" },
+      { key: "wise",           title: "Wise",            turbo_id: "wise",           partial: "wise_panel" },
       { key: "mercury",        title: "Mercury",         turbo_id: "mercury",        partial: "mercury_panel" },
       { key: "brex",           title: "Brex",            turbo_id: "brex",           partial: "brex_panel" },
       { key: "coinbase",       title: "Coinbase",        turbo_id: "coinbase",       partial: "coinbase_panel" },
@@ -194,8 +197,10 @@ class Settings::ProvidersController < ApplicationController
       { key: "kraken",         title: "Kraken",          turbo_id: "kraken",         partial: "kraken_panel" },
       { key: "snaptrade",      title: "SnapTrade",       turbo_id: "snaptrade",      partial: "snaptrade_panel", auto_open: "manage" },
       { key: "ibkr",           title: "Interactive Brokers", turbo_id: "ibkr",      partial: "ibkr_panel" },
+      { key: "trading212",     title: "Trading 212",     turbo_id: "trading212", partial: "trading212_panel" },
       { key: "indexa_capital", title: "Indexa Capital",  turbo_id: "indexa_capital", partial: "indexa_capital_panel" },
-      { key: "sophtron",       title: "Sophtron",        turbo_id: "sophtron",       partial: "sophtron_panel" }
+      { key: "sophtron",       title: "Sophtron",        turbo_id: "sophtron",       partial: "sophtron_panel" },
+      { key: "questrade",      title: "Questrade",       turbo_id: "questrade",      partial: "questrade_panel" }
     ].freeze
 
     FAMILY_PANEL_KEYS = FAMILY_PANELS.map { |p| p[:key] }.freeze
@@ -203,17 +208,22 @@ class Settings::ProvidersController < ApplicationController
     # Maps panel key → ActiveRecord model name for sync health queries
     PANEL_SYNCABLE_TYPES = {
       "akahu"          => "AkahuItem",
+      "up"             => "UpItem",
       "simplefin"      => "SimplefinItem",
       "lunchflow"      => "LunchflowItem",
+      "redbark"        => "RedbarkItem",
       "enable_banking" => "EnableBankingItem",
       "coinstats"      => "CoinstatsItem",
+      "wise"           => "WiseItem",
       "mercury"        => "MercuryItem",
       "brex"           => "BrexItem",
       "coinbase"       => "CoinbaseItem",
       "binance"        => "BinanceItem",
       "kraken"         => "KrakenItem",
       "snaptrade"      => "SnaptradeItem",
+      "questrade"      => "QuestradeItem",
       "ibkr"           => "IbkrItem",
+      "trading212"     => "Trading212Item",
       "indexa_capital" => "IndexaCapitalItem",
       "sophtron"       => "SophtronItem"
     }.freeze
@@ -222,14 +232,20 @@ class Settings::ProvidersController < ApplicationController
       case provider_key
       when "akahu"
         @akahu_items = Current.family.akahu_items.active.ordered
+      when "up"
+        @up_items = Current.family.up_items.active.ordered
       when "simplefin"
         @simplefin_items = Current.family.simplefin_items.ordered
       when "lunchflow"
         @lunchflow_items = Current.family.lunchflow_items.ordered
+      when "redbark"
+        @redbark_items = Current.family.redbark_items.ordered
       when "enable_banking"
         @enable_banking_items = Current.family.enable_banking_items.ordered
       when "coinstats"
         @coinstats_items = Current.family.coinstats_items.ordered
+      when "wise"
+        @wise_items = Current.family.wise_items.active.ordered.includes(:syncs, :wise_accounts)
       when "mercury"
         @mercury_items = Current.family.mercury_items.active.ordered.includes(:syncs, :mercury_accounts)
       when "brex"
@@ -244,10 +260,14 @@ class Settings::ProvidersController < ApplicationController
         @snaptrade_items = Current.family.snaptrade_items.includes(:snaptrade_accounts).ordered
       when "ibkr"
         @ibkr_items = Current.family.ibkr_items.ordered
+      when "trading212"
+        @trading212_items = Current.family.trading212_items.ordered
       when "indexa_capital"
         @indexa_capital_items = Current.family.indexa_capital_items.ordered
       when "sophtron"
         @sophtron_items = Current.family.sophtron_items.ordered
+      when "questrade"
+        @questrade_items = Current.family.questrade_items.active.ordered
       end
     end
 
@@ -260,21 +280,26 @@ class Settings::ProvidersController < ApplicationController
       end
 
       @akahu_items = Current.family.akahu_items.active.ordered
+      @up_items = Current.family.up_items.active.ordered
       # Providers page only needs to know whether any SimpleFin/Lunchflow connections exist with valid credentials
       @simplefin_items = Current.family.simplefin_items.where.not(access_url: [ nil, "" ]).ordered.select(:id)
       @lunchflow_items = Current.family.lunchflow_items.where.not(api_key: [ nil, "" ]).ordered.select(:id)
+      @redbark_items = Current.family.redbark_items.where.not(api_key: [ nil, "" ]).ordered.select(:id)
       @enable_banking_items = Current.family.enable_banking_items.ordered # Enable Banking panel needs session info for status display
       # Providers page only needs to know whether any Sophtron connections exist with valid credentials
       @sophtron_items = Current.family.sophtron_items.where.not(user_id: [ nil, "" ], access_key: [ nil, "" ]).ordered.select(:id)
       @coinstats_items = Current.family.coinstats_items.ordered # CoinStats panel needs account info for status display
+      @wise_items = Current.family.wise_items.active.ordered
       @mercury_items = Current.family.mercury_items.active.ordered
       @brex_items = Current.family.brex_items.active.ordered
       @coinbase_items = Current.family.coinbase_items.ordered # Coinbase panel needs name and sync info for status display
       @snaptrade_items = Current.family.snaptrade_items.ordered
       @ibkr_items = Current.family.ibkr_items.ordered.select(:id)
+      @trading212_items = Current.family.trading212_items.ordered.select(:id)
       @indexa_capital_items = Current.family.indexa_capital_items.ordered.select(:id)
       @binance_items = Current.family.binance_items.active.ordered
       @kraken_items = Current.family.kraken_items.active.ordered
+      @questrade_items = Current.family.questrade_items.active.ordered.select(:id)
 
       @provider_sync_health = compute_provider_sync_health(family_panel_items)
 
@@ -293,17 +318,22 @@ class Settings::ProvidersController < ApplicationController
     def family_panel_items
       {
         "akahu"          => @akahu_items,
+        "up"             => @up_items,
         "simplefin"      => @simplefin_items,
         "lunchflow"      => @lunchflow_items,
+        "redbark"        => @redbark_items,
         "enable_banking" => @enable_banking_items,
         "coinstats"      => @coinstats_items,
+        "wise"           => @wise_items,
         "mercury"        => @mercury_items,
         "brex"           => @brex_items,
         "coinbase"       => @coinbase_items,
         "binance"        => @binance_items,
         "kraken"         => @kraken_items,
         "snaptrade"      => @snaptrade_items,
+        "questrade"      => @questrade_items,
         "ibkr"           => @ibkr_items,
+        "trading212"     => @trading212_items,
         "indexa_capital" => @indexa_capital_items,
         "sophtron"       => @sophtron_items
       }
diff --git a/app/controllers/settings/securities_controller.rb b/app/controllers/settings/securities_controller.rb
index d53bddd77..6d32a0785 100644
--- a/app/controllers/settings/securities_controller.rb
+++ b/app/controllers/settings/securities_controller.rb
@@ -8,5 +8,7 @@ class Settings::SecuritiesController < ApplicationController
     ]
     @oidc_identities = Current.user.oidc_identities.order(:provider)
     @webauthn_credentials = Current.user.webauthn_credentials.order(created_at: :asc)
+    @encryption_unconfigured = Rails.application.config.app_mode.self_hosted? &&
+      !ActiveRecordEncryptionConfig.explicitly_configured?
   end
 end
diff --git a/app/controllers/snaptrade_items_controller.rb b/app/controllers/snaptrade_items_controller.rb
index 6062c4dfb..b9e5a9013 100644
--- a/app/controllers/snaptrade_items_controller.rb
+++ b/app/controllers/snaptrade_items_controller.rb
@@ -1,6 +1,6 @@
 class SnaptradeItemsController < ApplicationController
-  before_action :set_snaptrade_item, only: [ :show, :edit, :update, :destroy, :sync, :connect, :setup_accounts, :complete_account_setup, :connections, :delete_connection, :delete_orphaned_user ]
-  before_action :require_admin!, only: [ :new, :create, :preload_accounts, :select_accounts, :link_accounts, :select_existing_account, :link_existing_account, :edit, :update, :destroy, :sync, :connect, :callback, :setup_accounts, :complete_account_setup, :connections, :delete_connection, :delete_orphaned_user ]
+  before_action :set_snaptrade_item, only: [ :show, :destroy, :sync, :connect, :setup_accounts, :complete_account_setup, :connections, :delete_connection ]
+  before_action :require_admin!, only: [ :destroy, :sync, :connect, :callback, :setup_accounts, :complete_account_setup, :connections, :delete_connection, :oauth_authorize, :oauth_callback, :preload_accounts, :select_accounts, :select_existing_account, :link_existing_account ]
 
   def index
     @snaptrade_items = Current.family.snaptrade_items.ordered
@@ -9,86 +9,6 @@ class SnaptradeItemsController < ApplicationController
   def show
   end
 
-  def new
-    @snaptrade_item = Current.family.snaptrade_items.build
-  end
-
-  def edit
-  end
-
-  def create
-    @snaptrade_item = Current.family.snaptrade_items.build(snaptrade_item_params)
-    @snaptrade_item.name ||= t("snaptrade_items.default_name")
-
-    if @snaptrade_item.save
-      # Register user with SnapTrade after saving credentials
-      begin
-        @snaptrade_item.ensure_user_registered!
-      rescue => e
-        Rails.logger.error "SnapTrade user registration failed: #{e.message}"
-        # Don't fail the whole operation - user can retry connection later
-      end
-
-      if turbo_frame_request?
-        flash.now[:notice] = t(".success", default: "Successfully configured SnapTrade.")
-        @snaptrade_items = Current.family.snaptrade_items.ordered
-        render turbo_stream: [
-          turbo_stream.replace(
-            "snaptrade-providers-panel",
-            partial: "settings/providers/snaptrade_panel",
-            locals: { snaptrade_items: @snaptrade_items }
-          ),
-          *flash_notification_stream_items
-        ]
-      else
-        redirect_to settings_providers_path, notice: t(".success"), status: :see_other
-      end
-    else
-      @error_message = @snaptrade_item.errors.full_messages.join(", ")
-
-      if turbo_frame_request?
-        render turbo_stream: turbo_stream.replace(
-          "snaptrade-providers-panel",
-          partial: "settings/providers/snaptrade_panel",
-          locals: { error_message: @error_message }
-        ), status: :unprocessable_entity
-      else
-        redirect_to settings_providers_path, alert: @error_message, status: :unprocessable_entity
-      end
-    end
-  end
-
-  def update
-    if @snaptrade_item.update(snaptrade_item_params)
-      if turbo_frame_request?
-        flash.now[:notice] = t(".success", default: "Successfully updated SnapTrade configuration.")
-        @snaptrade_items = Current.family.snaptrade_items.ordered
-        render turbo_stream: [
-          turbo_stream.replace(
-            "snaptrade-providers-panel",
-            partial: "settings/providers/snaptrade_panel",
-            locals: { snaptrade_items: @snaptrade_items }
-          ),
-          *flash_notification_stream_items
-        ]
-      else
-        redirect_to settings_providers_path, notice: t(".success"), status: :see_other
-      end
-    else
-      @error_message = @snaptrade_item.errors.full_messages.join(", ")
-
-      if turbo_frame_request?
-        render turbo_stream: turbo_stream.replace(
-          "snaptrade-providers-panel",
-          partial: "settings/providers/snaptrade_panel",
-          locals: { error_message: @error_message }
-        ), status: :unprocessable_entity
-      else
-        redirect_to settings_providers_path, alert: @error_message, status: :unprocessable_entity
-      end
-    end
-  end
-
   def destroy
     @snaptrade_item.destroy_later
     redirect_to settings_providers_path, notice: t(".success", default: "Scheduled SnapTrade connection for deletion.")
@@ -107,9 +27,11 @@ class SnaptradeItemsController < ApplicationController
 
   # Redirect user to SnapTrade connection portal
   def connect
-    @snaptrade_item.ensure_user_registered! unless @snaptrade_item.user_registered?
-
-    redirect_url = callback_snaptrade_items_url(item_id: @snaptrade_item.id)
+    redirect_url = callback_snaptrade_items_url(
+      item_id: @snaptrade_item.id,
+      return_to: params[:return_to].presence,
+      accountable_type: params[:accountable_type].presence
+    )
     portal_url = @snaptrade_item.connection_portal_url(redirect_url: redirect_url)
     redirect_to portal_url, allow_other_host: true
   rescue ActiveRecord::Encryption::Errors::Decryption => e
@@ -132,19 +54,14 @@ class SnaptradeItemsController < ApplicationController
     snaptrade_item = Current.family.snaptrade_items.find_by(id: params[:item_id])
 
     if snaptrade_item
-      snaptrade_item.sync_later unless snaptrade_item.syncing?
+      snaptrade_item.sync_later_with_follow_up
 
-      stored_return_to, stored_accountable_type = clear_snaptrade_resume_context
-      return_to = params[:return_to].presence || stored_return_to
-      accountable_type = params[:accountable_type].presence || stored_accountable_type
-
-      if return_to == "setup_accounts"
-        redirect_to setup_accounts_snaptrade_item_path(snaptrade_item, accountable_type: accountable_type.presence), notice: t(".success")
+      if params[:return_to].presence == "setup_accounts"
+        redirect_to setup_accounts_snaptrade_item_path(snaptrade_item, accountable_type: params[:accountable_type].presence), notice: t(".success")
       else
         redirect_to accounts_path, notice: t(".success")
       end
     else
-      clear_snaptrade_resume_context
       redirect_to settings_providers_path, alert: t(".no_item")
     end
   end
@@ -162,7 +79,7 @@ class SnaptradeItemsController < ApplicationController
     latest_sync = @snaptrade_item.syncs.ordered.first
     should_sync = latest_sync.nil? || !latest_sync.completed?
 
-    if no_accounts && !@snaptrade_item.syncing? && should_sync
+    if @snaptrade_item.oauth_configured? && no_accounts && !@snaptrade_item.syncing? && should_sync
       @snaptrade_item.sync_later
     end
 
@@ -174,6 +91,15 @@ class SnaptradeItemsController < ApplicationController
       .where(account_providers: { id: nil })
       .order(:name)
 
+    @account_type_options = [
+      [ t(".account_types.depository"), "Depository" ],
+      [ t(".account_types.credit_card"), "CreditCard" ],
+      [ t(".account_types.investment"), "Investment" ],
+      [ t(".account_types.crypto"), "Crypto" ],
+      [ t(".account_types.loan"), "Loan" ],
+      [ t(".account_types.other_asset"), "OtherAsset" ]
+    ]
+
     # Determine view state
     @syncing = @snaptrade_item.syncing?
     @waiting_for_sync = no_accounts && @syncing
@@ -184,6 +110,7 @@ class SnaptradeItemsController < ApplicationController
   def complete_account_setup
     Rails.logger.info "SnapTrade complete_account_setup - params: #{params.to_unsafe_h.inspect}"
     account_ids = params[:account_ids] || []
+    account_types = params[:account_types] || {}
     sync_start_dates = params[:sync_start_dates] || {}
     Rails.logger.info "SnapTrade complete_account_setup - account_ids: #{account_ids.inspect}, sync_start_dates: #{sync_start_dates.inspect}"
 
@@ -210,7 +137,7 @@ class SnaptradeItemsController < ApplicationController
         end
 
         Rails.logger.info "SnapTrade complete_account_setup - linking snaptrade_account #{snaptrade_account_id}"
-        link_snaptrade_account(snaptrade_account)
+        link_snaptrade_account(snaptrade_account, account_types[snaptrade_account_id])
         linked_count += 1
         Rails.logger.info "SnapTrade complete_account_setup - successfully linked snaptrade_account #{snaptrade_account_id}"
       rescue => e
@@ -251,12 +178,91 @@ class SnaptradeItemsController < ApplicationController
     data = build_connections_list
     render partial: "snaptrade_items/connections_list", layout: false, locals: {
       connections: data[:connections],
-      orphaned_users: data[:orphaned_users],
       snaptrade_item: @snaptrade_item,
       error: @error
     }
   end
 
+  # Start the SnapTrade OAuth authorization-code + PKCE flow
+  def oauth_authorize
+    unless Provider::Snaptrade.oauth_configured?
+      redirect_to settings_providers_path, alert: t(".not_configured")
+      return
+    end
+
+    snaptrade_item = if params[:item_id].present?
+      Current.family.snaptrade_items.find(params[:item_id])
+    else
+      current_snaptrade_item || Current.family.snaptrade_items.create!(name: t("snaptrade_items.default_name"))
+    end
+
+    pkce = Provider::Snaptrade.generate_pkce
+    state = SecureRandom.hex(32)
+
+    session[:snaptrade_oauth] = {
+      "state" => state,
+      "code_verifier" => pkce[:verifier],
+      "item_id" => snaptrade_item.id,
+      "return_to" => params[:return_to].presence,
+      "accountable_type" => params[:accountable_type].presence
+    }
+
+    redirect_to Provider::Snaptrade.authorize_url(
+      redirect_uri: oauth_callback_snaptrade_items_url,
+      state: state,
+      code_challenge: pkce[:challenge]
+    ), allow_other_host: true
+  end
+
+  # Registered OAuth redirect URI: verify state, exchange code, store tokens
+  def oauth_callback
+    oauth_session = (session.delete(:snaptrade_oauth) || {}).with_indifferent_access
+
+    if params[:error].present?
+      Rails.logger.warn "SnapTrade OAuth callback error: #{params[:error]}"
+      alert = params[:error] == "access_denied" ? t(".access_denied") : t(".failed")
+      redirect_to settings_providers_path, alert: alert
+      return
+    end
+
+    unless params[:state].present? && oauth_session[:state].present? &&
+           ActiveSupport::SecurityUtils.secure_compare(params[:state].to_s, oauth_session[:state].to_s)
+      redirect_to settings_providers_path, alert: t(".state_mismatch")
+      return
+    end
+
+    snaptrade_item = Current.family.snaptrade_items.find_by(id: oauth_session[:item_id])
+    unless snaptrade_item && params[:code].present?
+      redirect_to settings_providers_path, alert: t(".failed")
+      return
+    end
+
+    snaptrade_item.complete_oauth_exchange!(
+      code: params[:code],
+      redirect_uri: oauth_callback_snaptrade_items_url,
+      code_verifier: oauth_session[:code_verifier]
+    )
+
+    snaptrade_item.sync_later_with_follow_up
+
+    if oauth_session[:return_to] == "setup_accounts"
+      redirect_to setup_accounts_snaptrade_item_path(snaptrade_item, accountable_type: oauth_session[:accountable_type].presence), notice: t(".success")
+    else
+      redirect_to settings_providers_path, notice: t(".success")
+    end
+  rescue Provider::Snaptrade::Error => e
+    Rails.logger.error "SnapTrade OAuth exchange failed: #{e.class} - #{e.message}"
+    DebugLogEntry.capture(
+      category: "provider_auth",
+      level: :error,
+      message: "SnapTrade OAuth code exchange failed: #{e.message}",
+      source: "SnaptradeItemsController#oauth_callback",
+      provider_key: "snaptrade",
+      family: Current.family
+    )
+    redirect_to settings_providers_path, alert: t(".failed")
+  end
+
   # Delete a brokerage connection
   def delete_connection
     authorization_id = params[:authorization_id]
@@ -276,16 +282,10 @@ class SnaptradeItemsController < ApplicationController
     api_deletion_failed = false
     if accounts_deleted == 0
       provider = @snaptrade_item.snaptrade_provider
-      creds = @snaptrade_item.snaptrade_credentials
-
-      if provider && creds&.dig(:user_id) && creds&.dig(:user_secret)
-        provider.delete_connection(
-          user_id: creds[:user_id],
-          user_secret: creds[:user_secret],
-          authorization_id: authorization_id
-        )
+      if provider
+        provider.delete_connection(authorization_id: authorization_id)
       else
-        Rails.logger.warn "SnapTrade: Cannot delete orphaned connection #{authorization_id} - missing credentials"
+        Rails.logger.warn "SnapTrade: Cannot delete orphaned connection #{authorization_id} - item not authorized"
         api_deletion_failed = true
       end
     end
@@ -312,38 +312,6 @@ class SnaptradeItemsController < ApplicationController
     end
   end
 
-  # Delete an orphaned SnapTrade user (and all their connections)
-  def delete_orphaned_user
-    user_id = params[:user_id]
-
-    # Security: verify this is actually an orphaned user
-    unless @snaptrade_item.orphaned_users.include?(user_id)
-      respond_to do |format|
-        format.html { redirect_to settings_providers_path, alert: t(".failed") }
-        format.turbo_stream do
-          flash.now[:alert] = t(".failed")
-          render turbo_stream: flash_notification_stream_items
-        end
-      end
-      return
-    end
-
-    if @snaptrade_item.delete_orphaned_user(user_id)
-      respond_to do |format|
-        format.html { redirect_to settings_providers_path, notice: t(".success") }
-        format.turbo_stream { render turbo_stream: turbo_stream.remove("orphaned_user_#{user_id.parameterize}") }
-      end
-    else
-      respond_to do |format|
-        format.html { redirect_to settings_providers_path, alert: t(".failed") }
-        format.turbo_stream do
-          flash.now[:alert] = t(".failed")
-          render turbo_stream: flash_notification_stream_items
-        end
-      end
-    end
-  end
-
   # Collection actions for account linking flow
 
   def preload_accounts
@@ -353,11 +321,11 @@ class SnaptradeItemsController < ApplicationController
       return
     end
 
-    if snaptrade_item.user_registered?
-      snaptrade_item.sync_later unless snaptrade_item.syncing?
+    if snaptrade_item.oauth_configured?
+      snaptrade_item.sync_later_with_follow_up
       redirect_to setup_accounts_snaptrade_item_path(snaptrade_item)
     else
-      redirect_to connect_snaptrade_item_path(snaptrade_item)
+      redirect_to oauth_authorize_snaptrade_items_path(item_id: snaptrade_item.id)
     end
   end
 
@@ -371,18 +339,13 @@ class SnaptradeItemsController < ApplicationController
       return
     end
 
-    if snaptrade_item.user_registered?
+    if snaptrade_item.oauth_configured?
       redirect_to setup_accounts_snaptrade_item_path(snaptrade_item, accountable_type: @accountable_type, return_to: @return_to)
     else
-      store_snaptrade_resume_context(return_to: @return_to, accountable_type: @accountable_type)
-      redirect_to connect_snaptrade_item_path(snaptrade_item)
+      redirect_to oauth_authorize_snaptrade_items_path(item_id: snaptrade_item.id, accountable_type: @accountable_type, return_to: @return_to)
     end
   end
 
-  def link_accounts
-    redirect_to settings_providers_path, alert: t(".use_setup_flow")
-  end
-
   def select_existing_account
     @account_id = params[:account_id]
     @account = Current.family.accounts.find_by(id: @account_id)
@@ -417,7 +380,7 @@ class SnaptradeItemsController < ApplicationController
         end
 
         # Trigger sync to process the linked account
-        snaptrade_item.sync_later unless snaptrade_item.syncing?
+        snaptrade_item.sync_later_with_follow_up
 
         redirect_to account_path(account), notice: t(".success", default: "Successfully linked to SnapTrade account.")
       rescue => e
@@ -439,52 +402,26 @@ class SnaptradeItemsController < ApplicationController
       active_items = Current.family.snaptrade_items.active
 
       active_items.syncable.ordered.first ||
-        active_items.credentials_configured.ordered.first ||
         active_items.ordered.first
     end
 
-    def store_snaptrade_resume_context(return_to:, accountable_type:)
-      session[:snaptrade_resume] = {
-        return_to: return_to,
-        accountable_type: accountable_type
-      }
-    end
-
-    def clear_snaptrade_resume_context
-      resume = (session.delete(:snaptrade_resume) || {}).with_indifferent_access
-      [ resume[:return_to], resume[:accountable_type] ]
-    end
-
-    def snaptrade_item_params
-      params.require(:snaptrade_item).permit(
-        :name,
-        :sync_start_date,
-        :client_id,
-        :consumer_key
-      )
-    end
-
     def build_connections_list
-      # Fetch connections for current user from API
       api_connections = @snaptrade_item.fetch_connections
 
-      # Get local accounts grouped by authorization_id
       local_accounts = @snaptrade_item.snaptrade_accounts
         .includes(:account_provider)
         .group_by(&:snaptrade_authorization_id)
 
-      # Build unified list
-      result = { connections: [], orphaned_users: [] }
+      result = { connections: [] }
 
-      # Add connections from API for current user
       api_connections.each do |api_conn|
-        auth_id = api_conn.id
+        auth_id = api_conn["id"]
         local_accts = local_accounts[auth_id] || []
 
         result[:connections] << {
           authorization_id: auth_id,
-          brokerage_name: api_conn.brokerage&.name || I18n.t("snaptrade_items.connections.unknown_brokerage"),
-          brokerage_slug: api_conn.brokerage&.slug,
+          brokerage_name: api_conn.dig("brokerage", "name") || I18n.t("snaptrade_items.connections.unknown_brokerage"),
+          brokerage_slug: api_conn.dig("brokerage", "slug"),
           accounts: local_accts.map { |acct|
             { id: acct.id, name: acct.name, linked: acct.account_provider.present? }
           },
@@ -492,24 +429,17 @@ class SnaptradeItemsController < ApplicationController
         }
       end
 
-      # Add orphaned users (users registered but not current)
-      orphaned = @snaptrade_item.orphaned_users
-      orphaned.each do |user_id|
-        result[:orphaned_users] << {
-          user_id: user_id,
-          display_name: user_id.truncate(30)
-        }
-      end
-
       result
     rescue Provider::Snaptrade::ApiError => e
       @error = e.message
-      { connections: [], orphaned_users: [] }
+      { connections: [] }
     end
 
-    def link_snaptrade_account(snaptrade_account)
-      # Determine account type based on SnapTrade account type
-      accountable_type = infer_accountable_type(snaptrade_account.account_type)
+    def link_snaptrade_account(snaptrade_account, selected_type)
+      accountable_type = selected_type.presence || snaptrade_account.suggested_account_type
+      unless Accountable::TYPES.include?(accountable_type)
+        raise ArgumentError, "Invalid SnapTrade account type: #{accountable_type}"
+      end
 
       # Create the Sure account
       account = Current.family.accounts.create!(
@@ -530,20 +460,4 @@ class SnaptradeItemsController < ApplicationController
 
       account
     end
-
-    def infer_accountable_type(snaptrade_type)
-      # SnapTrade account types: https://docs.snaptrade.com/reference/get_accounts
-      case snaptrade_type&.downcase
-      when "tfsa", "rrsp", "rrif", "resp", "rdsp", "lira", "lrsp", "lif", "rlsp", "prif",
-           "401k", "403b", "457b", "ira", "roth_ira", "roth_401k", "sep_ira", "simple_ira",
-           "pension", "retirement", "registered"
-        "Investment" # Tax-advantaged accounts
-      when "margin", "cash", "non-registered", "individual", "joint"
-        "Investment" # Standard brokerage accounts
-      when "crypto"
-        "Crypto"
-      else
-        "Investment" # Default to Investment for brokerage accounts
-      end
-    end
 end
diff --git a/app/controllers/syncs_controller.rb b/app/controllers/syncs_controller.rb
new file mode 100644
index 000000000..97939159f
--- /dev/null
+++ b/app/controllers/syncs_controller.rb
@@ -0,0 +1,23 @@
+class SyncsController < ApplicationController
+  def cancel
+    # for_family with resource_owner scoping: account-level syncs are only
+    # reachable for accounts the user can access; cross-family ids 404.
+    sync = Sync.for_family(Current.family, resource_owner: Current.user).find(params[:id])
+
+    # resource_owner only scopes the Account branch of for_family — provider
+    # item syncs match for every member, including accounts a restricted
+    # member cannot see. Provider connections are admin-managed surfaces, so
+    # cancelling their syncs requires admin too. Family- and account-level
+    # syncs stay member-cancellable (the accounts page shows those buttons
+    # to every member).
+    unless sync.syncable.is_a?(Account) || sync.syncable.is_a?(Family) || Current.user.admin?
+      raise ActiveRecord::RecordNotFound
+    end
+
+    if sync.request_cancel!
+      redirect_back_or_to accounts_path, notice: t(".cancelled")
+    else
+      redirect_back_or_to accounts_path, alert: t(".not_cancellable")
+    end
+  end
+end
diff --git a/app/controllers/tag/deletions_controller.rb b/app/controllers/tag/deletions_controller.rb
index 5ec31a3d5..c4b8d889b 100644
--- a/app/controllers/tag/deletions_controller.rb
+++ b/app/controllers/tag/deletions_controller.rb
@@ -13,10 +13,12 @@ class Tag::DeletionsController < ApplicationController
   private
 
     def set_tag
-      @tag = Current.family.tags.find_by(id: params[:tag_id])
+      @tag = Current.family.tags.find(params[:tag_id])
     end
 
     def set_replacement_tag
-      @replacement_tag = Current.family.tags.find_by(id: params[:replacement_tag_id])
+      if params[:replacement_tag_id].present?
+        @replacement_tag = Current.family.tags.find(params[:replacement_tag_id])
+      end
     end
 end
diff --git a/app/controllers/trading212_items_controller.rb b/app/controllers/trading212_items_controller.rb
new file mode 100644
index 000000000..7d5b6ed09
--- /dev/null
+++ b/app/controllers/trading212_items_controller.rb
@@ -0,0 +1,252 @@
+class Trading212ItemsController < ApplicationController
+  before_action :set_trading212_item, only: [ :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+  before_action :require_admin!, only: [ :create, :select_accounts, :select_existing_account, :link_existing_account, :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+
+  def create
+    @trading212_item = Current.family.trading212_items.build(trading212_item_params)
+    @trading212_item.name ||= t("trading212_items.defaults.name")
+    @trading212_item.currency ||= Current.family.currency
+
+    if @trading212_item.save
+      @trading212_item.sync_later
+
+      if turbo_frame_request?
+        flash.now[:notice] = t(".success")
+        render turbo_stream: [
+          turbo_stream.replace(
+            "trading212-providers-panel",
+            partial: "settings/providers/trading212_panel"
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to accounts_path, notice: t(".success"), status: :see_other
+      end
+    else
+      @error_message = @trading212_item.errors.full_messages.join(", ")
+
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "trading212-providers-panel",
+          partial: "settings/providers/trading212_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message, status: :see_other
+      end
+    end
+  end
+
+  def update
+    attrs = trading212_item_params.to_h
+    attrs["api_key"] = @trading212_item.api_key if attrs["api_key"].blank?
+    attrs["api_secret"] = @trading212_item.api_secret if attrs["api_secret"].blank?
+
+    if @trading212_item.update(attrs.merge(status: :good))
+      @trading212_item.sync_later unless @trading212_item.syncing?
+
+      if turbo_frame_request?
+        flash.now[:notice] = t(".success")
+        render turbo_stream: [
+          turbo_stream.replace(
+            "trading212-providers-panel",
+            partial: "settings/providers/trading212_panel"
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to accounts_path, notice: t(".success"), status: :see_other
+      end
+    else
+      @error_message = @trading212_item.errors.full_messages.join(", ")
+
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "trading212-providers-panel",
+          partial: "settings/providers/trading212_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message, status: :see_other
+      end
+    end
+  end
+
+  def destroy
+    @trading212_item.unlink_all!(dry_run: false)
+    @trading212_item.destroy_later
+    redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+  end
+
+  def sync
+    @trading212_item.sync_later unless @trading212_item.syncing?
+
+    respond_to do |format|
+      format.html { redirect_back_or_to accounts_path }
+      format.json { head :ok }
+    end
+  end
+
+  def select_accounts
+    item = current_trading212_item
+    unless item
+      redirect_to settings_providers_path, alert: t(".not_configured")
+      return
+    end
+
+    redirect_to setup_accounts_trading212_item_path(item)
+  end
+
+  def select_existing_account
+    @account = Current.family.accounts.find(params[:account_id])
+    @available_trading212_accounts = Current.family.trading212_items
+      .includes(trading212_accounts: { account_provider: :account })
+      .flat_map(&:trading212_accounts)
+      .select { |t212_account| t212_account.account_provider.nil? }
+      .sort_by { |t212_account| t212_account.updated_at || t212_account.created_at }
+      .reverse
+
+    render :select_existing_account, layout: false
+  end
+
+  def link_existing_account
+    account = Current.family.accounts.find_by(id: params[:account_id])
+    t212_account = Current.family.trading212_items
+      .joins(:trading212_accounts)
+      .where(trading212_accounts: { id: params[:trading212_account_id] })
+      .first
+      &.trading212_accounts
+      &.find_by(id: params[:trading212_account_id])
+
+    if account.blank? || t212_account.blank?
+      redirect_to settings_providers_path, alert: t(".not_found")
+      return
+    end
+
+    if account.accountable_type != "Investment" || account.account_providers.any? || account.plaid_account_id.present? || account.simplefin_account_id.present?
+      redirect_to account_path(account), alert: t(".only_manual_investment")
+      return
+    end
+
+    provider = nil
+
+    t212_account.with_lock do
+      if t212_account.current_account.present?
+        redirect_to account_path(account), alert: t(".already_linked")
+        return
+      end
+
+      provider = t212_account.ensure_account_provider!(account)
+    end
+
+    raise "Failed to create AccountProvider link" unless provider
+
+    begin
+      Trading212Account::Processor.new(t212_account.reload).process
+    rescue => e
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "error",
+        message: "Failed to process linked Trading 212 account #{t212_account.id}: #{e.class} - #{e.message}",
+        source: "trading212",
+        family: Current.family,
+        provider_key: "trading212"
+      )
+    end
+
+    t212_account.trading212_item.sync_later unless t212_account.trading212_item.syncing?
+    redirect_to account_path(account), notice: t(".success"), status: :see_other
+  rescue => e
+    DebugLogEntry.capture(
+      category: "sync",
+      level: "error",
+      message: "Failed to link existing Trading 212 account: #{e.class} - #{e.message}",
+      source: "trading212",
+      family: Current.family,
+      provider_key: "trading212"
+    )
+    redirect_to settings_providers_path, alert: t(".failed"), status: :see_other
+  end
+
+  def setup_accounts
+    @trading212_accounts = @trading212_item.trading212_accounts.includes(account_provider: :account)
+    @linked_accounts = @trading212_accounts.select { |a| a.current_account.present? }
+    @unlinked_accounts = @trading212_accounts.reject { |a| a.current_account.present? }
+
+    no_accounts = @linked_accounts.blank? && @unlinked_accounts.blank?
+    latest_sync = @trading212_item.syncs.ordered.first
+    should_sync = latest_sync.nil? || !latest_sync.completed?
+
+    if no_accounts && !@trading212_item.syncing? && should_sync
+      @trading212_item.sync_later
+    end
+
+    @linkable_accounts = Current.family.accounts
+      .visible
+      .where(accountable_type: "Investment")
+      .left_joins(:account_providers)
+      .where(account_providers: { id: nil })
+      .order(:name)
+
+    @syncing = @trading212_item.syncing?
+    @waiting_for_sync = no_accounts && @syncing
+    @no_accounts_found = no_accounts && !@syncing && @trading212_item.last_synced_at.present?
+  end
+
+  def complete_account_setup
+    selected_accounts = Array(params[:account_ids]).reject(&:blank?)
+    created_accounts = []
+
+    selected_accounts.each do |t212_account_id|
+      t212_account = @trading212_item.trading212_accounts.find_by(id: t212_account_id)
+      next unless t212_account
+
+      t212_account.with_lock do
+        next if t212_account.current_account.present?
+
+        account = Account.create_from_trading212_account(t212_account)
+        t212_account.ensure_account_provider!(account)
+        created_accounts << account
+      end
+
+      begin
+        Trading212Account::Processor.new(t212_account.reload).process
+      rescue => e
+        DebugLogEntry.capture(
+          category: "sync",
+          level: "error",
+          message: "Failed to process Trading 212 account #{t212_account.id} after setup: #{e.class} - #{e.message}",
+          source: "trading212",
+          family: Current.family,
+          provider_key: "trading212"
+        )
+      end
+    end
+
+    @trading212_item.update!(pending_account_setup: @trading212_item.unlinked_accounts_count.positive?)
+    @trading212_item.sync_later if created_accounts.any?
+
+    if created_accounts.any?
+      redirect_to accounts_path, notice: t(".success", count: created_accounts.count), status: :see_other
+    elsif selected_accounts.empty?
+      redirect_to setup_accounts_trading212_item_path(@trading212_item), alert: t(".none_selected"), status: :see_other
+    else
+      redirect_to setup_accounts_trading212_item_path(@trading212_item), alert: t(".none_created"), status: :see_other
+    end
+  end
+
+  private
+
+    def set_trading212_item
+      @trading212_item = Current.family.trading212_items.find(params[:id])
+    end
+
+    def current_trading212_item
+      active_items = Current.family.trading212_items.active
+      active_items.syncable.ordered.first || active_items.ordered.first
+    end
+
+    def trading212_item_params
+      params.require(:trading212_item).permit(:api_key, :api_secret, :environment, :currency)
+    end
+end
diff --git a/app/controllers/transactions_controller.rb b/app/controllers/transactions_controller.rb
index 2fd63e4be..b57a10654 100644
--- a/app/controllers/transactions_controller.rb
+++ b/app/controllers/transactions_controller.rb
@@ -9,23 +9,22 @@ class TransactionsController < ApplicationController
     prefill_params_from_duplicate!
     super
     apply_duplicate_attributes!
-    @income_categories = Current.family.categories.incomes.alphabetically
-    @expense_categories = Current.family.categories.expenses.alphabetically
-    @categories = Current.family.categories.alphabetically
+    set_new_transaction_form_options
   end
 
   def index
     @q = search_params
-    accessible_account_ids = Current.user.accessible_accounts.pluck(:id)
-    @search = Transaction::Search.new(Current.family, filters: @q, accessible_account_ids: accessible_account_ids)
+    @accessible_account_ids = Current.user.accessible_accounts.pluck(:id)
+    @search = Transaction::Search.new(Current.family, filters: @q, accessible_account_ids: @accessible_account_ids)
 
     base_scope = @search.transactions_scope
                        .reverse_chronological
                        .includes(
-                         { entry: :account },
-                         :category, :merchant, :tags,
-                         :transfer_as_inflow, :transfer_as_outflow
-                       )
+                          { entry: :account },
+                          :category, :merchant, :tags,
+                          transfer_as_outflow: { inflow_transaction: { entry: :account } },
+                          transfer_as_inflow: { outflow_transaction: { entry: :account } }
+                        )
 
     @pagy, @transactions = pagy(base_scope, limit: safe_per_page)
     Transaction::ActivitySecurityPreloader.new(@transactions).preload
@@ -117,6 +116,7 @@ class TransactionsController < ApplicationController
         format.turbo_stream { stream_redirect_back_or_to(account_path(@entry.account)) }
       end
     else
+      set_new_transaction_form_options
       render :new, status: :unprocessable_entity
     end
   end
@@ -489,6 +489,21 @@ class TransactionsController < ApplicationController
       set_entry
     end
 
+    def set_new_transaction_form_options
+      accessible_accounts_scope = accessible_accounts
+
+      @account_currencies = accessible_accounts_scope.pluck(:id, :currency).to_h
+      @manual_accounts = accessible_accounts_scope
+        .manual
+        .active
+        .alphabetically
+        .includes(:account_providers, logo_attachment: :blob)
+        .to_a
+      @categories = Current.family.categories.alphabetically.to_a
+      @merchants = Current.family.available_merchants_for(Current.user).alphabetically.to_a
+      @tags = Current.family.tags.alphabetically.to_a
+    end
+
     # Filters entry_params based on the user's permission on the account.
     # read_write users can only annotate (category, tags, notes, merchant).
     # read_only users cannot update anything.
diff --git a/app/controllers/transfers_controller.rb b/app/controllers/transfers_controller.rb
index 465891f2f..44f6b8217 100644
--- a/app/controllers/transfers_controller.rb
+++ b/app/controllers/transfers_controller.rb
@@ -38,7 +38,9 @@ class TransfersController < ApplicationController
       destination_account_id: destination_account.id,
       date: transfer_params[:date].present? ? Date.parse(transfer_params[:date]) : Date.current,
       amount: transfer_params[:amount].to_d,
-      exchange_rate: transfer_params[:exchange_rate].presence&.to_d
+      exchange_rate: transfer_params[:exchange_rate].presence&.to_d,
+      source_fee_amount: transfer_params[:source_fee_amount],
+      destination_fee_amount: transfer_params[:destination_fee_amount]
     ).create
 
     if @transfer.persisted?
@@ -69,6 +71,7 @@ class TransfersController < ApplicationController
 
     Transfer.transaction do
       update_transfer_status
+      update_transfer_fees_and_amount
       update_transfer_details unless transfer_update_params[:status] == "rejected"
     end
 
@@ -160,7 +163,7 @@ class TransfersController < ApplicationController
     end
 
     def transfer_params
-      params.require(:transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name, :excluded, :exchange_rate)
+      params.require(:transfer).permit(:from_account_id, :to_account_id, :amount, :date, :name, :excluded, :exchange_rate, :source_fee_amount, :destination_fee_amount)
     end
 
     def set_accounts
@@ -173,7 +176,7 @@ class TransfersController < ApplicationController
     end
 
     def transfer_update_params
-      params.require(:transfer).permit(:notes, :status, :category_id)
+      params.require(:transfer).permit(:notes, :status, :category_id, :amount, :source_fee_amount, :destination_fee_amount)
     end
 
     def update_transfer_status
@@ -188,4 +191,78 @@ class TransfersController < ApplicationController
       @transfer.outflow_transaction.update!(category_id: transfer_update_params[:category_id])
       @transfer.update!(notes: transfer_update_params[:notes])
     end
+
+    def update_transfer_fees_and_amount
+      new_amount = transfer_update_params[:amount]
+      new_source_fee = transfer_update_params[:source_fee_amount]
+      new_destination_fee = transfer_update_params[:destination_fee_amount]
+
+      current_source_fee = @transfer.derived_source_fee_amount
+      current_destination_fee = @transfer.derived_destination_fee_amount
+      source_fee_changed = new_source_fee.present? && new_source_fee.to_d != current_source_fee
+      dest_fee_changed = new_destination_fee.present? && new_destination_fee.to_d != current_destination_fee
+      amount_changed = new_amount.present? && new_amount.to_d != @transfer.amount.to_d
+
+      return unless amount_changed || source_fee_changed || dest_fee_changed
+
+      @transfer.amount = new_amount.to_d if amount_changed
+
+      if amount_changed
+        outflow_entry = @transfer.outflow_transaction.entry
+        outflow_entry.amount = @transfer.amount
+        outflow_entry.save!
+
+        inflow_entry = @transfer.inflow_transaction.entry
+        converted = Money.new(@transfer.amount, @transfer.from_account.currency)
+                      .exchange_to(@transfer.to_account.currency, date: @transfer.date)
+        inflow_entry.amount = -(converted.amount)
+        inflow_entry.save!
+      end
+
+      if source_fee_changed
+        update_fee_transaction(
+          account: @transfer.from_account,
+          old_fee: current_source_fee,
+          new_fee: new_source_fee.to_d,
+          name: "Transfer fee — #{@transfer.name}"
+        )
+      end
+
+      if dest_fee_changed
+        update_fee_transaction(
+          account: @transfer.to_account,
+          old_fee: current_destination_fee,
+          new_fee: new_destination_fee.to_d,
+          name: "Transfer fee — #{@transfer.name}"
+        )
+      end
+
+      @transfer.save!
+    end
+
+    def update_fee_transaction(account:, old_fee:, new_fee:, name:)
+      if old_fee > 0 && new_fee > 0
+        fee_tx = @transfer.fee_transactions.find { |t| t.entry.account_id == account.id }
+        if fee_tx
+          fee_tx.entry.update!(amount: new_fee)
+        end
+      elsif old_fee > 0 && new_fee == 0
+        fee_tx = @transfer.fee_transactions.find { |t| t.entry.account_id == account.id }
+        fee_tx&.destroy!
+      elsif old_fee == 0 && new_fee > 0
+        fee_category = account.family.categories.find_or_create_by!(name: I18n.t("models.category.defaults.fees"))
+        fee_tx = Transaction.new(
+          kind: "standard",
+          category: fee_category,
+          entry: account.entries.build(
+            amount: new_fee,
+            currency: account.currency,
+            date: @transfer.date,
+            name: name,
+          )
+        )
+        fee_tx.save!
+        @transfer.fee_transactions << fee_tx
+      end
+    end
 end
diff --git a/app/controllers/up_items_controller.rb b/app/controllers/up_items_controller.rb
new file mode 100644
index 000000000..19998bd1c
--- /dev/null
+++ b/app/controllers/up_items_controller.rb
@@ -0,0 +1,442 @@
+class UpItemsController < ApplicationController
+  before_action :set_up_item, only: [ :show, :edit, :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+  before_action :require_admin!, only: [
+    :new, :create, :preload_accounts, :select_accounts, :link_accounts,
+    :select_existing_account, :link_existing_account, :edit, :update,
+    :destroy, :sync, :setup_accounts, :complete_account_setup
+  ]
+
+  # List the family's active Up connections in settings.
+  def index
+    @up_items = Current.family.up_items.active.ordered
+    render layout: "settings"
+  end
+
+  # Show a single Up connection.
+  def show
+  end
+
+  # Render the new-connection form.
+  def new
+    @up_item = Current.family.up_items.build
+  end
+
+  # Render the edit-connection form.
+  def edit
+  end
+
+  # Create an Up connection and kick off its first sync.
+  def create
+    @up_item = Current.family.up_items.build(up_item_params)
+    @up_item.name = t("up_items.provider_panel.default_connection_name") if @up_item.name.blank?
+
+    if @up_item.save
+      @up_item.sync_later
+      render_provider_panel(:notice, t(".success"))
+    else
+      render_provider_panel_error(@up_item.errors.full_messages.join(", "))
+    end
+  end
+
+  # Update connection settings (name/token/start date).
+  def update
+    if @up_item.update(update_params)
+      render_provider_panel(:notice, t(".success"))
+    else
+      render_provider_panel_error(@up_item.errors.full_messages.join(", "))
+    end
+  end
+
+  # Unlink all accounts then schedule deletion of the connection.
+  def destroy
+    results = @up_item.unlink_all!(dry_run: false)
+
+    if results.any? { |result| result[:error].present? }
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "warn",
+        message: "Up unlink during destroy failed",
+        source: self.class.name,
+        provider_key: "up",
+        family: @up_item.family,
+        metadata: { up_item_id: @up_item.id, failures: results.select { |r| r[:error].present? } }
+      )
+      redirect_to settings_providers_path, alert: t(".unlink_failed"), status: :see_other
+      return
+    end
+
+    @up_item.destroy_later
+    redirect_to settings_providers_path, notice: t(".success"), status: :see_other
+  rescue => e
+    DebugLogEntry.capture(
+      category: "provider_sync_error",
+      level: "warn",
+      message: "Up unlink during destroy failed",
+      source: self.class.name,
+      provider_key: "up",
+      family: @up_item&.family,
+      metadata: { up_item_id: @up_item&.id, error_class: e.class.name, error_message: e.message }
+    )
+    redirect_to settings_providers_path, alert: t(".unlink_failed"), status: :see_other
+  end
+
+  # Trigger a manual sync unless one is already running.
+  def sync
+    @up_item.sync_later unless @up_item.syncing?
+
+    respond_to do |format|
+      format.html { redirect_back_or_to accounts_path }
+      format.json { head :ok }
+    end
+  end
+
+  # Fetch accounts from the API (JSON) so the UI can show whether any exist.
+  def preload_accounts
+    up_item = requested_up_item
+    return render json: { success: false, error: "no_credentials", has_accounts: false } unless up_item.credentials_configured?
+
+    error = fetch_up_accounts_from_api(up_item)
+    render json: { success: error.blank?, error_message: error, has_accounts: up_item.up_accounts.exists? }
+  end
+
+  # Render the picker of unlinked Up accounts for a new Sure account.
+  def select_accounts
+    @accountable_type = params[:accountable_type] || "Depository"
+    @return_to = safe_return_to_path
+    @up_item = requested_up_item
+
+    unless @up_item.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      return
+    end
+
+    @api_error = fetch_up_accounts_from_api(@up_item)
+    @up_accounts = @up_item.up_accounts
+      .left_joins(:account_provider)
+      .where(account_providers: { id: nil })
+      .order(:name)
+
+    render layout: false
+  end
+
+  # Create new Sure accounts for the selected Up accounts and link them.
+  def link_accounts
+    up_item = requested_up_item
+    unless up_item.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      return
+    end
+
+    selected_ids = Array(params[:account_ids]).compact_blank
+    if selected_ids.empty?
+      redirect_to select_accounts_up_items_path(up_item_id: up_item.id, accountable_type: params[:accountable_type], return_to: safe_return_to_path), alert: t(".no_accounts_selected")
+      return
+    end
+
+    account_type = params[:accountable_type].presence || "Depository"
+    unless Provider::UpAdapter.supported_account_types.include?(account_type)
+      redirect_to new_account_path, alert: t(".unsupported_account_type")
+      return
+    end
+
+    created_accounts = []
+
+    ActiveRecord::Base.transaction do
+      up_item.up_accounts.where(id: selected_ids).find_each do |up_account|
+        next if up_account.account_provider.present?
+
+        account = create_account_from_up(up_account, account_type)
+        AccountProvider.create!(account: account, provider: up_account)
+        created_accounts << account
+      end
+    end
+
+    up_item.sync_later if created_accounts.any?
+
+    if created_accounts.any?
+      redirect_to safe_return_to_path || accounts_path, notice: t(".success", count: created_accounts.count)
+    else
+      redirect_to select_accounts_up_items_path(up_item_id: up_item.id, accountable_type: account_type, return_to: safe_return_to_path), alert: t(".link_failed")
+    end
+  end
+
+  # Render the picker to attach an Up account to an existing Sure account.
+  def select_existing_account
+    @account = Current.family.accounts.find(params[:account_id])
+
+    if @account.account_providers.exists?
+      redirect_to accounts_path, alert: t(".account_already_linked")
+      return
+    end
+
+    @up_item = requested_up_item
+    unless @up_item.credentials_configured?
+      redirect_to settings_providers_path, alert: t(".no_credentials_configured")
+      return
+    end
+
+    @api_error = fetch_up_accounts_from_api(@up_item)
+    @up_accounts = @up_item.up_accounts
+      .left_joins(:account_provider)
+      .where(account_providers: { id: nil })
+      .order(:name)
+    @return_to = safe_return_to_path
+
+    render layout: false
+  end
+
+  # Link a selected Up account to an existing Sure account and sync.
+  def link_existing_account
+    account = Current.family.accounts.find(params[:account_id])
+    up_item = requested_up_item
+
+    unless up_item.credentials_configured?
+      redirect_to settings_providers_path, alert: t("up_items.select_existing_account.no_credentials_configured")
+      return
+    end
+
+    if params[:up_account_id].blank?
+      redirect_to accounts_path, alert: t(".no_account_selected")
+      return
+    end
+
+    up_account = up_item.up_accounts.find_by(id: params[:up_account_id])
+    unless up_account
+      redirect_to accounts_path, alert: t(".no_account_selected")
+      return
+    end
+
+    if account.account_providers.exists?
+      redirect_to accounts_path, alert: t(".account_already_linked")
+      return
+    end
+
+    if up_account.account_provider.present?
+      redirect_to accounts_path, alert: t(".up_account_already_linked")
+      return
+    end
+
+    AccountProvider.create!(account: account, provider: up_account)
+    up_item.sync_later
+
+    redirect_to safe_return_to_path || accounts_path, notice: t(".success", account_name: account.name)
+  end
+
+  # Render the post-sync setup screen for accounts still needing a decision.
+  def setup_accounts
+    @api_error = fetch_up_accounts_from_api(@up_item)
+    @up_accounts = @up_item.up_accounts.needs_setup.order(:name)
+    @account_type_options = [
+      [ t(".account_types.skip"), "skip" ],
+      [ t(".account_types.depository"), "Depository" ],
+      [ t(".account_types.loan"), "Loan" ]
+    ]
+    @up_account_type_suggestions = @up_accounts.each_with_object({}) do |up_account, suggestions|
+      suggestions[up_account.id] = up_account.suggested_account_type || "skip"
+    end
+  end
+
+  # Apply the user's per-account setup choices (create/link or skip).
+  def complete_account_setup
+    account_types = params[:account_types] || {}
+    created_accounts = []
+    skipped_count = 0
+
+    ActiveRecord::Base.transaction do
+      account_types.each do |up_account_id, selected_type|
+        up_account = @up_item.up_accounts.find_by(id: up_account_id)
+        next unless up_account
+
+        if selected_type.blank? || selected_type == "skip"
+          # Persist the skip so the account stops resurfacing as "needs setup" on every sync.
+          up_account.update!(ignored: true) unless up_account.account_provider.present?
+          skipped_count += 1
+          next
+        end
+
+        next unless Provider::UpAdapter.supported_account_types.include?(selected_type)
+        next if up_account.account_provider.present?
+
+        account = create_account_from_up(up_account, selected_type)
+        AccountProvider.create!(account: account, provider: up_account)
+        created_accounts << account
+      end
+    end
+
+    @up_item.sync_later if created_accounts.any?
+
+    flash[:notice] = if created_accounts.any?
+      t(".success", count: created_accounts.count)
+    elsif skipped_count.positive?
+      t(".all_skipped")
+    else
+      t(".no_accounts")
+    end
+
+    redirect_to accounts_path, status: :see_other
+  rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+    DebugLogEntry.capture(
+      category: "provider_sync_error",
+      level: "error",
+      message: "Up account setup failed",
+      source: self.class.name,
+      provider_key: "up",
+      family: @up_item&.family,
+      metadata: { up_item_id: @up_item&.id, error_class: e.class.name, error_message: e.message }
+    )
+    redirect_to accounts_path, alert: t(".creation_failed"), status: :see_other
+  end
+
+  private
+
+    # Load the requested item scoped to the current family.
+    def set_up_item
+      @up_item = Current.family.up_items.find(params[:id])
+    end
+
+    # Strong params for creating/updating a connection.
+    def up_item_params
+      params.require(:up_item).permit(:name, :sync_start_date, :access_token)
+    end
+
+    # Params for update, dropping a blank token so it isn't overwritten.
+    def update_params
+      permitted = up_item_params
+      permitted = permitted.except(:access_token) if permitted[:access_token].blank?
+      permitted
+    end
+
+    # Load the active item referenced by up_item_id, scoped to the family.
+    def requested_up_item
+      Current.family.up_items.active.find_by!(id: params[:up_item_id])
+    end
+
+    # Fetch and upsert account snapshots from the API; returns an error string or nil.
+    def fetch_up_accounts_from_api(up_item)
+      return t("up_items.setup_accounts.no_credentials") unless up_item.credentials_configured?
+
+      provider = up_item.up_provider
+      accounts = provider.get_accounts
+      accounts.each do |account_data|
+        account = account_data.with_indifferent_access
+        account_id = account[:id].presence
+        next if account_id.blank? || account[:displayName].blank?
+
+        up_account = up_item.up_accounts.find_or_initialize_by(account_id: account_id.to_s)
+        up_account.upsert_up_snapshot!(account)
+      end
+
+      nil
+    rescue Provider::Up::UpError => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Up API error while fetching accounts",
+        source: self.class.name,
+        provider_key: "up",
+        family: up_item.family,
+        metadata: { up_item_id: up_item.id, error_class: e.class.name, error_message: e.message }
+      )
+      t("up_items.setup_accounts.api_error")
+    rescue StandardError => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Unexpected error fetching Up accounts",
+        source: self.class.name,
+        provider_key: "up",
+        family: up_item.family,
+        metadata: { up_item_id: up_item.id, error_class: e.class.name, error_message: e.message }
+      )
+      t("up_items.setup_accounts.api_error")
+    end
+
+    # Create and sync a Sure account from an Up account snapshot.
+    def create_account_from_up(up_account, account_type)
+      # Linking an account clears any prior skip so a future unlink re-prompts for setup.
+      up_account.update!(ignored: false) if up_account.ignored?
+
+      balance = up_account.current_balance || 0
+      balance = balance.abs if account_type == "Loan"
+      subtype = if account_type == "Depository" && up_account.suggested_account_type == account_type
+        up_account.suggested_subtype
+      end
+
+      Account.create_and_sync(
+        {
+          family: Current.family,
+          name: up_account.name,
+          balance: balance,
+          cash_balance: balance,
+          currency: up_account.currency || "AUD",
+          accountable_type: account_type,
+          accountable_attributes: subtype.present? ? { subtype: subtype } : {}
+        },
+        skip_initial_sync: true
+      )
+    end
+
+    # Re-render the providers settings panel (Turbo) or redirect with a flash.
+    def render_provider_panel(flash_type, message)
+      if turbo_frame_request?
+        flash.now[flash_type] = message
+        @up_items = Current.family.up_items.active.ordered
+        render turbo_stream: [
+          turbo_stream.replace(
+            "up-providers-panel",
+            partial: "settings/providers/up_panel",
+            locals: { up_items: @up_items }
+          ),
+          *flash_notification_stream_items
+        ]
+      else
+        redirect_to settings_providers_path, { flash_type => message, status: :see_other }
+      end
+    end
+
+    # Re-render the providers panel with an error (Turbo) or redirect with alert.
+    def render_provider_panel_error(message)
+      @error_message = message
+      if turbo_frame_request?
+        render turbo_stream: turbo_stream.replace(
+          "up-providers-panel",
+          partial: "settings/providers/up_panel",
+          locals: { error_message: @error_message }
+        ), status: :unprocessable_entity
+      else
+        redirect_to settings_providers_path, alert: @error_message, status: :see_other
+      end
+    end
+
+    # Validate the return_to param as a safe in-app relative path, or nil.
+    def safe_return_to_path
+      return nil if params[:return_to].blank?
+
+      return_to = params[:return_to].to_s.strip
+      return nil unless return_to.start_with?("/")
+      return nil if return_to[1] == "/" || return_to[1] == "\\"
+      return nil if return_to.include?("\\") || return_to.match?(/[[:cntrl:]]/)
+      return nil if encoded_path_separator?(return_to)
+
+      uri = URI.parse(return_to)
+      return nil unless uri.relative?
+
+      Rails.application.routes.recognize_path(uri.path, method: :get)
+
+      return_to
+    rescue URI::InvalidURIError, ActionController::RoutingError
+      nil
+    end
+
+    # True if the path's second char is a percent-encoded slash/backslash
+    # (used to block protocol-relative redirect bypasses).
+    def encoded_path_separator?(return_to)
+      encoded_second_character = return_to[1, 3]
+      return false unless encoded_second_character&.start_with?("%")
+
+      decoded = URI.decode_www_form_component(encoded_second_character)
+      decoded == "/" || decoded == "\\"
+    rescue ArgumentError
+      true
+    end
+end
diff --git a/app/controllers/wise_items_controller.rb b/app/controllers/wise_items_controller.rb
new file mode 100644
index 000000000..f92daec0b
--- /dev/null
+++ b/app/controllers/wise_items_controller.rb
@@ -0,0 +1,326 @@
+# frozen_string_literal: true
+
+class WiseItemsController < ApplicationController
+  before_action :set_wise_item, only: [ :show, :edit, :update, :destroy, :sync, :setup_accounts, :complete_account_setup ]
+  before_action :require_admin!, except: [ :index ]
+
+  def index
+    @wise_items = Current.family.wise_items.active.ordered
+    render layout: "settings"
+  end
+
+  def show
+  end
+
+  def new
+    @wise_item = Current.family.wise_items.build
+  end
+
+  # Step 1: Validate token and fetch profiles, then proceed to profile selection.
+  def create
+    token = wise_item_token_param # pipelock:ignore
+
+    if token.blank?
+      @wise_item = Current.family.wise_items.build
+      @wise_item.errors.add(:token, :blank)
+      return render_provider_panel_error
+    end
+
+    provider = Provider::Wise.new(token, base_url: Rails.configuration.x.wise.base_url)
+    profiles = provider.get_profiles
+
+    if profiles.blank?
+      @wise_item = Current.family.wise_items.build
+      @wise_item.errors.add(:base, t(".no_profiles_found"))
+      return render_provider_panel_error
+    end
+
+    session[:wise_pending_profiles] = profiles
+    session[:wise_pending_encrypted_token] = encrypt_pending_token(token)
+
+    redirect_to select_profiles_wise_items_path
+  rescue Provider::Wise::WiseError => e
+    @wise_item = Current.family.wise_items.build
+    error_key = e.error_type == :unauthorized ? ".invalid_token" : ".connection_failed"
+    @wise_item.errors.add(:base, t(error_key))
+    render_provider_panel_error
+  end
+
+  # Step 2: Show profile selection.
+  def select_profiles
+    @pending_profiles = session[:wise_pending_profiles]
+    @encrypted_pending_token = session[:wise_pending_encrypted_token]
+
+    if @pending_profiles.blank? || @encrypted_pending_token.blank?
+      redirect_to settings_providers_path, alert: t(".session_expired") and return
+    end
+
+    @existing_profile_ids = Current.family.wise_items.pluck(:profile_id).map(&:to_s).to_set
+  end
+
+  # Step 3: Create one WiseItem per selected profile.
+  def link_profiles
+    token = decrypt_pending_token(session[:wise_pending_encrypted_token]) # pipelock:ignore
+    profiles = session[:wise_pending_profiles]
+
+    if token.blank? || profiles.blank?
+      redirect_to settings_providers_path, alert: t(".session_expired") and return
+    end
+
+    selected_ids = Array(params[:profile_ids]).map(&:to_s).compact_blank
+    if selected_ids.empty?
+      redirect_to select_profiles_wise_items_path, alert: t(".no_profiles_selected") and return
+    end
+
+    created = 0
+    profiles.each do |profile|
+      profile_id = profile["id"].to_s
+      next unless selected_ids.include?(profile_id)
+      next if Current.family.wise_items.exists?(profile_id: profile_id)
+
+      profile_type = profile["type"] == "business" ? "business" : "personal"
+      display_name = profile_display_name(profile)
+
+      Current.family.create_wise_item!(
+        token: token,
+        profile_id: profile_id,
+        profile_type: profile_type,
+        item_name: display_name
+      )
+      created += 1
+    end
+
+    session.delete(:wise_pending_profiles)
+    session.delete(:wise_pending_encrypted_token)
+
+    if created.zero?
+      redirect_to settings_providers_path, alert: t(".already_connected")
+    else
+      redirect_to settings_providers_path, notice: t(".success", count: created)
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    permitted = wise_item_update_params
+    if @wise_item.update(permitted)
+      render_provider_panel_success(t(".success"))
+    else
+      render_provider_panel_error
+    end
+  end
+
+  def destroy
+    @wise_item.unlink_all!(dry_run: false)
+    @wise_item.destroy_later
+    redirect_to accounts_path, notice: t(".success")
+  end
+
+  def sync
+    @wise_item.sync_later unless @wise_item.syncing?
+
+    respond_to do |format|
+      format.html { redirect_back_or_to accounts_path }
+      format.json { head :ok }
+    end
+  end
+
+  def setup_accounts
+    @wise_accounts = @wise_item.wise_accounts.unlinked
+  end
+
+  def complete_account_setup
+    wise_account_id = params[:wise_account_id]
+    wise_account = @wise_item.wise_accounts.find_by(id: wise_account_id)
+
+    unless wise_account
+      redirect_to accounts_path, alert: t(".not_found") and return
+    end
+
+    account = Account.create_from_wise_account(wise_account)
+
+    AccountProvider.create!(
+      account: account,
+      provider: wise_account
+    )
+
+    @wise_item.sync_later unless @wise_item.syncing?
+
+    redirect_to accounts_path, notice: t(".success")
+  rescue => e
+    Rails.logger.error "WiseItemsController#complete_account_setup - #{e.class}: #{e.message}"
+    redirect_to setup_accounts_wise_item_path(@wise_item), alert: t(".failed")
+  end
+
+  # Collection actions for provider-panel account linking flow
+
+  def select_accounts
+    @accountable_type = params[:accountable_type] || "Depository"
+    @return_to = safe_return_to_path
+    @wise_item = resolve_wise_item_for_selection
+
+    unless @wise_item
+      redirect_to settings_providers_path, alert: t("wise_items.select_accounts.no_connection") and return
+    end
+
+    @available_accounts = @wise_item.wise_accounts.unlinked
+
+    render layout: false
+  end
+
+  def link_accounts
+    wise_account = find_wise_account_for_linking(params[:wise_account_id])
+
+    unless wise_account
+      redirect_to safe_return_to_path || accounts_path, alert: t("wise_items.link_accounts.not_found") and return
+    end
+
+    account = Account.create_from_wise_account(wise_account)
+    AccountProvider.create!(account: account, provider: wise_account)
+    wise_account.wise_item.sync_later unless wise_account.wise_item.syncing?
+
+    redirect_to safe_return_to_path || accounts_path, notice: t("wise_items.link_accounts.success")
+  rescue => e
+    Rails.logger.error "WiseItemsController#link_accounts - #{e.class}: #{e.message}"
+    redirect_to safe_return_to_path || accounts_path, alert: t("wise_items.link_accounts.failed")
+  end
+
+  def select_existing_account
+    @account = Current.family.accounts.find_by(id: params[:account_id])
+    @return_to = safe_return_to_path
+    @wise_item = resolve_wise_item_for_selection
+
+    unless @account && @wise_item
+      redirect_to accounts_path, alert: t("wise_items.select_existing_account.not_found") and return
+    end
+
+    @available_accounts = @wise_item.wise_accounts.unlinked
+
+    render layout: false
+  end
+
+  def link_existing_account
+    account = Current.family.accounts.find_by(id: params[:account_id])
+    wise_account = find_wise_account_for_linking(params[:wise_account_id])
+
+    unless account && wise_account
+      redirect_to accounts_path, alert: t("wise_items.link_existing_account.not_found") and return
+    end
+
+    AccountProvider.create!(account: account, provider: wise_account)
+    wise_account.wise_item.sync_later unless wise_account.wise_item.syncing?
+
+    redirect_to safe_return_to_path || accounts_path, notice: t("wise_items.link_existing_account.success", account_name: account.name)
+  rescue => e
+    Rails.logger.error "WiseItemsController#link_existing_account - #{e.class}: #{e.message}"
+    redirect_to accounts_path, alert: t("wise_items.link_existing_account.failed")
+  end
+
+  private
+
+    def set_wise_item
+      @wise_item = Current.family.wise_items.find(params[:id])
+    end
+
+    def wise_item_token_param
+      params.dig(:wise_item, :token).to_s.strip
+    end
+
+    def wise_item_update_params
+      permitted = params.require(:wise_item).permit(:name, :sync_start_date, :token)
+      permitted.delete(:token) if @wise_item.persisted? && permitted[:token].blank?
+      permitted[:token] = permitted[:token].to_s.strip if permitted[:token].present?
+      permitted
+    end
+
+    def resolve_wise_item_for_selection
+      wise_item_id = params[:wise_item_id]
+
+      if wise_item_id.present?
+        Current.family.wise_items.active.find_by(id: wise_item_id)
+      else
+        Current.family.wise_items.active.ordered.first
+      end
+    end
+
+    def find_wise_account_for_linking(wise_account_id)
+      return nil if wise_account_id.blank?
+
+      WiseAccount.joins(:wise_item)
+                 .merge(Current.family.wise_items.active)
+                 .find_by(id: wise_account_id)
+    end
+
+    def profile_display_name(profile)
+      type_key = profile["type"] == "business" ? :business : :personal
+      type_label = I18n.t("wise_items.profile_types.#{type_key}")
+      details = profile["details"] || {}
+      name = details["name"].presence ||
+             [ details["firstName"], details["lastName"] ].compact.join(" ").presence
+
+      name.present? ? "#{name} (#{type_label})" : "Wise #{type_label}"
+    end
+
+    def render_provider_panel_success(message)
+      return redirect_to accounts_path, notice: message, status: :see_other unless turbo_frame_request?
+
+      flash.now[:notice] = message
+      @wise_items = Current.family.wise_items.active.ordered.includes(:syncs, :wise_accounts)
+      render_wise_provider_panel(locals: { wise_items: @wise_items }, include_flash: true)
+    end
+
+    def render_provider_panel_error
+      @error_message = @wise_item.errors.full_messages.join(", ")
+      return redirect_to settings_providers_path, alert: @error_message, status: :see_other unless turbo_frame_request?
+
+      render_wise_provider_panel(locals: { error_message: @error_message }, status: :unprocessable_entity)
+    end
+
+    def render_wise_provider_panel(locals:, status: :ok, include_flash: false)
+      streams = [
+        turbo_stream.replace(
+          "wise-providers-panel",
+          partial: "settings/providers/wise_panel",
+          locals: locals
+        )
+      ]
+      streams += flash_notification_stream_items if include_flash
+      render turbo_stream: streams, status: status
+    end
+
+    def encrypt_pending_token(token)
+      build_token_encryptor.encrypt_and_sign(token, expires_in: 15.minutes)
+    end
+
+    def decrypt_pending_token(encrypted)
+      return nil if encrypted.blank?
+      build_token_encryptor.decrypt_and_verify(encrypted)
+    rescue ActiveSupport::MessageEncryptor::InvalidMessage, ArgumentError
+      nil
+    end
+
+    def build_token_encryptor
+      key = Rails.application.key_generator.generate_key("wise_pending_token", 32)
+      ActiveSupport::MessageEncryptor.new(key)
+    end
+
+    def safe_return_to_path
+      return nil if params[:return_to].blank?
+
+      return_to = params[:return_to].to_s.strip
+      return nil unless return_to.start_with?("/")
+
+      second_char = return_to[1]
+      return nil if second_char.blank? || second_char == "/" || second_char == "\\"
+      return nil if second_char.match?(/[[:space:][:cntrl:]]/)
+
+      uri = URI.parse(return_to)
+      return nil if uri.scheme.present? || uri.host.present?
+
+      return_to
+    rescue URI::InvalidURIError
+      nil
+    end
+end
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb
index a119246fd..d35ed07ed 100644
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -36,7 +36,7 @@ module AccountsHelper
       end
 
     [
-      family.build_cache_key("account_sidebar_tabs_v1", invalidate_on_data_updates: true),
+      family.build_cache_key("account_sidebar_tabs_v2", invalidate_on_data_updates: true),
       Current.user&.id,
       shares_version,
       active_tab,
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 369cb9df9..324d96b55 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -149,6 +149,11 @@ module ApplicationHelper
     cookies[:admin] == "true"
   end
 
+  def sidekiq_web_available?
+    named_routes = Rails.application.routes.named_routes
+    named_routes.route_defined?(:sidekiq_web_path) || named_routes.route_defined?(:sidekiq_web_url)
+  end
+
   def assistant_icon
     type = ENV["ASSISTANT_TYPE"].presence || Current.family&.assistant_type.presence || "builtin"
     type == "external" ? "claw" : "ai"
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index 30f986bce..7cb0abd13 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -25,7 +25,9 @@ module ImportsHelper
       entity_type: I18n.t("imports.column_labels.entity_type"),
       category_parent: I18n.t("imports.column_labels.category_parent"),
       category_color: I18n.t("imports.column_labels.category_color"),
-      category_icon: I18n.t("imports.column_labels.category_icon")
+      category_icon: I18n.t("imports.column_labels.category_icon"),
+      merchant_color: I18n.t("imports.column_labels.merchant_color"),
+      merchant_website: I18n.t("imports.column_labels.merchant_website")
     }[key]
   end
 
@@ -80,7 +82,7 @@ module ImportsHelper
 
   private
     def permitted_import_types
-      %w[transaction_import trade_import account_import mint_import actual_import category_import rule_import]
+      %w[transaction_import trade_import account_import mint_import actual_import ynab_import category_import rule_import merchant_import]
     end
 
     DryRunResource = Struct.new(:label, :icon, :text_class, :bg_class, keyword_init: true)
diff --git a/app/helpers/insights_helper.rb b/app/helpers/insights_helper.rb
new file mode 100644
index 000000000..6ee5ca339
--- /dev/null
+++ b/app/helpers/insights_helper.rb
@@ -0,0 +1,158 @@
+module InsightsHelper
+  INSIGHT_ICONS = {
+    "spending_anomaly" => "activity",
+    "cash_flow_warning" => "alert-triangle",
+    "net_worth_milestone" => "trophy",
+    "subscription_audit" => "repeat",
+    "savings_rate_change" => "piggy-bank",
+    "idle_cash" => "wallet",
+    "budget_at_risk" => "alert-triangle",
+    "budget_on_track" => "circle-check"
+  }.freeze
+
+  def insight_icon_key(insight)
+    INSIGHT_ICONS.fetch(insight.insight_type, "lightbulb")
+  end
+
+  # "Savings rate · June" / "Cash flow · Next 30 days" — the card's meta line.
+  # Uses the insight's stored period; falls back to the subject (account or
+  # merchant name from facts) for insights without one.
+  def insight_meta_line(insight)
+    parts = [ t("insights.types.#{insight.insight_type}", default: insight.insight_type.humanize) ]
+    parts << insight_period_label(insight)
+    parts.compact.join(" · ")
+  end
+
+  # [value, caption] for the card's right-aligned key figure, from the display
+  # facts stored on the row. Nil (no figure) for rows written before facts
+  # were persisted — they backfill on the next nightly run.
+  def insight_key_figure(insight)
+    facts = insight.facts || {}
+    return nil if facts.blank?
+
+    case insight.insight_type
+    when "savings_rate_change"
+      return nil unless facts["change_pp"]
+      sign = insight_sentiment(insight) == :positive ? "+" : "−"
+      [ "#{sign}#{facts["change_pp"]} pp", t("insights.figures.vs_previous") ]
+    when "net_worth_milestone"
+      facts["net_worth"] && [ facts["net_worth"], t("insights.figures.today") ]
+    when "spending_anomaly"
+      facts["projected_spend"] && [ facts["projected_spend"], t("insights.figures.on_pace") ]
+    when "cash_flow_warning"
+      facts["projected_low"] && [ facts["projected_low"], facts["projected_low_date"] ]
+    when "subscription_audit"
+      facts["amount"] && [ facts["amount"], t("insights.figures.days_overdue", count: facts["days_overdue"].to_i) ]
+    when "idle_cash"
+      facts["balance"] && [ facts["balance"], t("insights.figures.idle_days", count: facts["idle_days"].to_i) ]
+    when "budget_at_risk", "budget_on_track"
+      facts["budget_spent_pct"] && [ "#{facts["budget_spent_pct"]}%", t("insights.figures.of_budget") ]
+    end
+  end
+
+  # The contextual action for a card, built from the subject ids each
+  # generator stores in metadata. Returns nil when the subject no longer
+  # resolves (deleted category/account) — the card renders without a link.
+  # Looks up through insight.family, not Current, so broadcast renders work.
+  def insight_action(insight)
+    metadata = insight.metadata || {}
+
+    case insight.insight_type
+    when "spending_anomaly"
+      category = insight.family.categories.find_by(id: metadata["category_id"])
+      category && {
+        text: t("insights.actions.spending_anomaly", category: category.name),
+        href: transactions_path(q: { categories: [ category.name ] })
+      }
+    when "idle_cash"
+      account = insight.family.accounts.visible.find_by(id: metadata["account_id"])
+      account && { text: t("insights.actions.idle_cash"), href: account_path(account) }
+    when "subscription_audit"
+      { text: t("insights.actions.subscription_audit"), href: recurring_transactions_path }
+    when "cash_flow_warning"
+      { text: t("insights.actions.cash_flow_warning"), href: recurring_transactions_path }
+    when "savings_rate_change"
+      return nil unless insight.period_start && insight.period_end
+      { text: t("insights.actions.savings_rate_change"),
+        href: transactions_path(q: { start_date: insight.period_start.to_s, end_date: insight.period_end.to_s }) }
+    when "net_worth_milestone"
+      { text: t("insights.actions.net_worth_milestone"), href: reports_path }
+    when "budget_at_risk", "budget_on_track"
+      return nil unless insight.period_start
+      { text: t("insights.actions.budget"), href: budget_path(Budget.date_to_param(insight.period_start)) }
+    end
+  end
+
+  # Sentiment picks the color; priority only orders the feed. The two are
+  # orthogonal — a big savings-rate improvement is high priority AND good news,
+  # and must not render red. Red is reserved for a projected-negative balance,
+  # matching the app's wider rule that even negative amounts aren't red.
+  def insight_icon_color(insight)
+    case insight_sentiment(insight)
+    when :positive then "success"
+    when :negative then "destructive"
+    when :warning then "warning"
+    else "default"
+    end
+  end
+
+  # CSS color for the tinted icon circle (FilledIcon-style, color-mix'd to a
+  # 10% tint) — CSS variables so dark mode retunes automatically.
+  def insight_icon_css_color(insight)
+    case insight_sentiment(insight)
+    when :positive then "var(--color-success)"
+    when :negative then "var(--color-destructive)"
+    when :warning then "var(--color-warning)"
+    else "var(--color-gray-500)"
+    end
+  end
+
+  # Derived from type + the direction already stored in metadata, so rows
+  # written before a metadata-shape change degrade to :warning, never :negative.
+  def insight_sentiment(insight)
+    metadata = insight.metadata || {}
+
+    case insight.insight_type
+    when "net_worth_milestone", "budget_on_track"
+      :positive
+    when "savings_rate_change"
+      metadata["current_rate"].to_f >= metadata["previous_rate"].to_f ? :positive : :warning
+    when "spending_anomaly"
+      metadata["direction"] == "below" ? :positive : :warning
+    when "cash_flow_warning"
+      metadata["negative"] ? :negative : :warning
+    when "budget_at_risk"
+      :warning
+    else
+      :neutral
+    end
+  end
+
+  private
+    # "June" for month-aligned periods, "Next 30 days" / "Last 30 days" for
+    # rolling windows, an explicit range otherwise; subject name (account,
+    # merchant) for insights without a period.
+    def insight_period_label(insight)
+      start_date = insight.period_start
+      end_date = insight.period_end
+
+      if start_date.nil? || end_date.nil?
+        facts = insight.facts || {}
+        return facts["account"] || facts["name"]
+      end
+
+      if start_date == start_date.beginning_of_month && end_date == start_date.end_of_month
+        format = start_date.year == Date.current.year ? "%B" : "%B %Y"
+        return I18n.l(start_date, format: format)
+      end
+
+      days = (end_date - start_date).to_i
+      if start_date >= Date.current - 1
+        t("insights.meta.next_n_days", count: days)
+      elsif end_date >= Date.current - 1
+        t("insights.meta.last_n_days", count: days)
+      else
+        t("insights.meta.date_range", from: I18n.l(start_date, format: :short), to: I18n.l(end_date, format: :short))
+      end
+    end
+end
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 3e5c73e3a..9694ba072 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -159,10 +159,12 @@ module LanguagesHelper
     "fr",   # French
     "de",   # German
     "es",   # Spanish
+    "it",   # Italian
     "tr",   # Turkish
     "nb",   # Norwegian Bokmål
     "ca",   # Catalan
     "ro",   # Romanian
+    "ru",   # Russian
     "pl",   # Polish
     "pt-BR", # Brazilian Portuguese
     "zh-CN", # Chinese (Simplified)
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 4b89c3f8d..4744ba041 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -18,7 +18,7 @@ module SettingsHelper
     # Advanced section
     { name: -> { t("settings.settings_nav.ai_prompts_label") }, path: :settings_ai_prompts_path, condition: :admin_user? },
     { name: -> { t("settings.settings_nav.llm_usage_label") }, path: :settings_llm_usage_path, condition: :admin_user? },
-    { name: -> { t("settings.settings_nav.api_key_label") }, path: :settings_api_key_path, condition: :admin_user? },
+    { name: -> { t("settings.settings_nav.api_key_label") }, path: :settings_api_keys_path, condition: :admin_user? },
     { name: -> { t("settings.settings_nav.self_hosting_label") }, path: :settings_hosting_path, condition: :self_hosted_and_admin? },
     { name: -> { t("settings.settings_nav.imports_label") }, path: :imports_path, condition: :admin_user? },
     { name: -> { t("settings.settings_nav.exports_label") }, path: :family_exports_path, condition: :admin_user? },
@@ -45,7 +45,7 @@ module SettingsHelper
     }
   end
 
-  def settings_section(title:, subtitle: nil, collapsible: false, open: true, auto_open_param: nil, status: nil, meta: nil, actions: nil, badge: nil, &block)
+  def settings_section(title: nil, subtitle: nil, collapsible: false, open: true, auto_open_param: nil, status: nil, meta: nil, actions: nil, badge: nil, &block)
     content = capture(&block)
     render partial: "settings/section", locals: { title: title, subtitle: subtitle, content: content, collapsible: collapsible, open: open, auto_open_param: auto_open_param, status: status, meta: meta, actions: actions, badge: badge }
   end
@@ -60,6 +60,9 @@ module SettingsHelper
     when "akahu"
       return { status: :off } unless @akahu_items&.any?
       sync_based_summary(key)
+    when "up"
+      return { status: :off } unless @up_items&.any?
+      sync_based_summary(key)
     when "simplefin"
       return { status: :off } unless @simplefin_items&.any?
       sync_based_summary(key)
@@ -75,6 +78,9 @@ module SettingsHelper
     when "mercury"
       return { status: :off } unless @mercury_items&.any?
       sync_based_summary(key)
+    when "redbark"
+      return { status: :off } unless @redbark_items&.any?
+      sync_based_summary(key)
     when "brex"
       return { status: :off } unless @brex_items&.any?
       sync_based_summary(key)
@@ -88,11 +94,9 @@ module SettingsHelper
       return { status: :off } unless @kraken_items&.any?
       sync_based_summary(key)
     when "snaptrade"
-      configured_item = @snaptrade_items&.find(&:credentials_configured?)
+      configured_item = @snaptrade_items&.find(&:oauth_configured?)
       return { status: :off } unless configured_item
-      unless configured_item.user_registered?
-        return { status: :warn, meta: t("settings.providers.meta.registration_needed") }
-      end
+
       sync_based_summary(key)
     when "ibkr"
       return { status: :off } unless @ibkr_items&.any?
@@ -103,6 +107,9 @@ module SettingsHelper
     when "sophtron"
       return { status: :off } unless @sophtron_items&.any?
       sync_based_summary(key)
+    when "questrade"
+      return { status: :off } unless @questrade_items&.any?
+      sync_based_summary(key)
     else
       { status: :off }
     end
@@ -128,6 +135,38 @@ module SettingsHelper
     end
   end
 
+  def yahoo_finance_health_presentation(status)
+    status = status.to_sym if status.respond_to?(:to_sym)
+    status = :unknown unless %i[healthy rate_limited unavailable unknown].include?(status)
+
+    presentation = {
+      status_class: {
+        healthy: "bg-success",
+        rate_limited: "bg-warning",
+        unavailable: "bg-destructive",
+        unknown: "bg-surface-inset"
+      }.fetch(status),
+      status_text: t("settings.hostings.yahoo_finance_settings.status_#{status}")
+    }
+
+    presentation[:alert] = case status
+    when :rate_limited
+      {
+        title: t("settings.hostings.yahoo_finance_settings.rate_limited_title"),
+        message: t("settings.hostings.yahoo_finance_settings.rate_limited_message"),
+        variant: :warning
+      }
+    when :unavailable
+      {
+        title: t("settings.hostings.yahoo_finance_settings.unavailable_title"),
+        message: t("settings.hostings.yahoo_finance_settings.unavailable_message"),
+        variant: :warning
+      }
+    end
+
+    presentation
+  end
+
   # Below this many synced accounts, the per-row pills already give the user
   # enough at-a-glance signal and the strip is redundant chrome.
   HEALTH_STRIP_MIN_ACCOUNTS = 10
diff --git a/app/helpers/styled_form_builder.rb b/app/helpers/styled_form_builder.rb
index 277d34aa3..7899dd5ea 100644
--- a/app/helpers/styled_form_builder.rb
+++ b/app/helpers/styled_form_builder.rb
@@ -1,5 +1,10 @@
 class StyledFormBuilder < ActionView::Helpers::FormBuilder
-  class_attribute :text_field_helpers, default: field_helpers - [ :label, :check_box, :radio_button, :fields_for, :fields, :hidden_field, :file_field ]
+  # Rails 8 renamed two field_helpers entries: :text_area -> :textarea and
+  # :check_box -> :checkbox. Exclude both spellings of the non-text helpers, and
+  # alias the legacy method names below so existing `form.text_area` call sites
+  # stay styled. (Harmless on Rails 7.2, where the old names are present instead.)
+  NON_TEXT_FIELD_HELPERS = [ :label, :check_box, :checkbox, :radio_button, :fields_for, :fields, :hidden_field, :file_field ].freeze
+  class_attribute :text_field_helpers, default: field_helpers - NON_TEXT_FIELD_HELPERS
 
   text_field_helpers.each do |selector|
     class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
@@ -14,6 +19,9 @@ class StyledFormBuilder < ActionView::Helpers::FormBuilder
     RUBY_EVAL
   end
 
+  # Keep `form.text_area` styled after Rails 8 renamed the helper to `textarea`.
+  alias_method :text_area, :textarea if method_defined?(:textarea)
+
   def radio_button(method, tag_value, options = {})
     merged_options = { class: "form-field__radio" }.merge(options)
     super(method, tag_value, merged_options)
diff --git a/app/javascript/controllers/app_layout_controller.js b/app/javascript/controllers/app_layout_controller.js
index 612114735..ceeec0f33 100644
--- a/app/javascript/controllers/app_layout_controller.js
+++ b/app/javascript/controllers/app_layout_controller.js
@@ -3,6 +3,7 @@ import { Controller } from "@hotwired/stimulus";
 // Connects to data-controller="dialog"
 export default class extends Controller {
   static targets = ["leftSidebar", "rightSidebar", "mobileSidebar"];
+  static values = { userId: String };
   static classes = [
     "expandedSidebar",
     "collapsedSidebar",
diff --git a/app/javascript/controllers/bar_chart_controller.js b/app/javascript/controllers/bar_chart_controller.js
new file mode 100644
index 000000000..673030ad5
--- /dev/null
+++ b/app/javascript/controllers/bar_chart_controller.js
@@ -0,0 +1,159 @@
+import { Controller } from "@hotwired/stimulus";
+import * as d3 from "d3";
+import { CHART_TOOLTIP_CLASSES } from "utils/chart_tooltip";
+
+// Grouped bar chart used by the dashboard "money flow" widget — each month
+// shows an expense bar (red) and an income bar (green) side by side.
+// Modeled after time_series_chart_controller's lifecycle (install/teardown,
+// ResizeObserver, turbo:load reinstall, page-relative tooltip positioning)
+// but with scaleBand/scaleLinear instead of a line.
+export default class extends Controller {
+  static values = {
+    data: Array,
+    currency: { type: String, default: "USD" },
+    incomeLabel: { type: String, default: "Income" },
+    expenseLabel: { type: String, default: "Expenses" },
+  };
+
+  _resizeObserver = null;
+
+  connect() {
+    this._install();
+    document.addEventListener("turbo:load", this._reinstall);
+    this._resizeObserver = new ResizeObserver(() => this._reinstall());
+    this._resizeObserver.observe(this.element);
+  }
+
+  disconnect() {
+    this._teardown();
+    document.removeEventListener("turbo:load", this._reinstall);
+    this._resizeObserver?.disconnect();
+  }
+
+  _reinstall = () => {
+    this._teardown();
+    this._install();
+  };
+
+  _teardown() {
+    d3.select(this.element).selectAll("*").remove();
+  }
+
+  _install() {
+    const width = this.element.clientWidth;
+    const height = this.element.clientHeight;
+    const data = this.dataValue || [];
+
+    if (width < 50 || height < 50 || data.length === 0) return;
+
+    const margin = { top: 16, right: 4, bottom: 24, left: 4 };
+    const innerWidth = width - margin.left - margin.right;
+    const innerHeight = height - margin.top - margin.bottom;
+
+    const svg = d3
+      .select(this.element)
+      .append("svg")
+      .attr("width", width)
+      .attr("height", height)
+      .attr("viewBox", [0, 0, width, height]);
+
+    const group = svg
+      .append("g")
+      .attr("transform", `translate(${margin.left},${margin.top})`);
+
+    const series = ["income", "expense"];
+    const seriesColor = { expense: "var(--color-gray-400)", income: "var(--color-success)" };
+
+    const x0 = d3
+      .scaleBand()
+      .domain(data.map((d) => d.label))
+      .range([0, innerWidth])
+      .padding(0.3);
+
+    const x1 = d3.scaleBand().domain(series).range([0, x0.bandwidth()]).padding(0.15);
+
+    const maxValue = d3.max(data, (d) => Math.max(d.income, d.expense)) || 1;
+    const y = d3.scaleLinear().domain([0, maxValue * 1.1]).range([innerHeight, 0]);
+    // Floor tiny-but-nonzero bars (e.g. an in-progress month) at 2px so they stay visible.
+    const barHeight = (v) => (v > 0 ? Math.max(2, innerHeight - y(v)) : 0);
+
+    const tooltip = d3
+      .select(this.element)
+      .append("div")
+      .attr("class", `${CHART_TOOLTIP_CLASSES} opacity-0 top-0`);
+
+    const showTooltip = (event, month, key) => {
+      const estimatedTooltipWidth = 200;
+      const pageWidth = document.body.clientWidth;
+      const tooltipX = event.pageX + 10;
+      const overflowX = tooltipX + estimatedTooltipWidth - pageWidth;
+      const adjustedX = overflowX > 0 ? event.pageX - overflowX - 20 : tooltipX;
+
+      tooltip
+        .html(this._tooltipTemplate(month, key))
+        .style("opacity", 1)
+        .style("left", `${adjustedX}px`)
+        .style("top", `${event.pageY - 10}px`);
+    };
+
+    const hideTooltip = () => tooltip.style("opacity", 0);
+
+    const monthGroups = group
+      .selectAll("g.month")
+      .data(data)
+      .join("g")
+      .attr("class", "month")
+      .attr("transform", (d) => `translate(${x0(d.label)},0)`);
+
+    monthGroups
+      .selectAll("rect")
+      .data((d) => series.map((key) => ({ key, value: d[key], month: d })))
+      .join("rect")
+      .attr("x", (d) => x1(d.key))
+      .attr("y", (d) => innerHeight - barHeight(d.value))
+      .attr("width", x1.bandwidth())
+      .attr("height", (d) => barHeight(d.value))
+      .attr("rx", 3)
+      .attr("fill", (d) => seriesColor[d.key])
+      // In-progress month (period capped at today) reads as provisional.
+      .attr("fill-opacity", (d) => (d.month.partial ? 0.5 : 1))
+      .on("mousemove", (event, d) => showTooltip(event, d.month, d.key))
+      .on("mouseleave", hideTooltip);
+
+    group
+      .append("g")
+      .attr("transform", `translate(0,${innerHeight})`)
+      .call(d3.axisBottom(x0).tickSize(0))
+      .call((g) => g.select(".domain").remove())
+      .selectAll("text")
+      .attr("class", (_d, i) => (data[i].highlighted ? "text-primary fill-current" : "text-secondary fill-current"))
+      .style("font-size", "12px")
+      .style("font-weight", (_d, i) => (data[i].highlighted ? 600 : 500));
+  }
+
+  _tooltipTemplate(month, key) {
+    const label = key === "income" ? this.incomeLabelValue : this.expenseLabelValue;
+    // Match the bar/legend palette — expenses render gray, not destructive red.
+    const color = key === "income" ? "var(--color-success)" : "var(--color-gray-400)";
+
+    return `
+      <div class="text-xs text-secondary mb-1">${month.label}</div>
+      <div class="flex items-center gap-1.5 text-primary font-medium tabular-nums">
+        <span class="inline-block w-2 h-2 rounded-full" style="background-color: ${color};"></span>
+        ${label}: ${this._formatCurrency(month[key])}
+      </div>
+    `;
+  }
+
+  _formatCurrency(value) {
+    try {
+      return new Intl.NumberFormat(undefined, {
+        style: "currency",
+        currency: this.currencyValue,
+        maximumFractionDigits: 0,
+      }).format(value);
+    } catch {
+      return value;
+    }
+  }
+}
diff --git a/app/javascript/controllers/budget_filter_controller.js b/app/javascript/controllers/budget_filter_controller.js
index 2187a0f65..0d73e4f43 100644
--- a/app/javascript/controllers/budget_filter_controller.js
+++ b/app/javascript/controllers/budget_filter_controller.js
@@ -32,11 +32,13 @@ export default class extends Controller {
 
     this.tabTargets.forEach((tab) => {
       const isActive = tab.dataset.budgetFilterFilterParam === filter;
-      tab.classList.toggle("bg-white", isActive);
-      tab.classList.toggle("theme-dark:bg-gray-700", isActive);
-      tab.classList.toggle("text-primary", isActive);
-      tab.classList.toggle("shadow-sm", isActive);
-      tab.classList.toggle("text-secondary", !isActive);
+      // Selected styling is encapsulated in the DS::SegmentedControl active
+      // class; the base `.segmented-control__segment` already carries the
+      // inactive (text-secondary) state.
+      tab.classList.toggle("segmented-control__segment--active", isActive);
+      // Keep assistive tech in sync with the visual selection (these are
+      // button segments, so aria-pressed).
+      tab.setAttribute("aria-pressed", String(isActive));
     });
   }
 
diff --git a/app/javascript/controllers/chat_controller.js b/app/javascript/controllers/chat_controller.js
index 25020f35e..dfb750238 100644
--- a/app/javascript/controllers/chat_controller.js
+++ b/app/javascript/controllers/chat_controller.js
@@ -1,17 +1,31 @@
 import { Controller } from "@hotwired/stimulus";
 
 export default class extends Controller {
-  static targets = ["messages", "form", "input", "submit"];
+  static targets = ["messages", "form", "input", "submit", "pendingResponse"];
+  static values = {
+    // How long a pending "Thinking…" bubble may wait before we assume the
+    // background worker never delivered a response. Generous so slow models or
+    // tool calls don't trip it.
+    responseTimeout: { type: Number, default: 90000 },
+    // How often to re-check pending bubbles.
+    pollInterval: { type: Number, default: 5000 },
+  };
 
   connect() {
+    this.reportedUrls = new Set();
+    this.inFlightUrls = new Set();
     this.#configureAutoScroll();
     this.#updateSubmitState();
+    this.#startUndeliveredWatchdog();
   }
 
   disconnect() {
     if (this.messagesObserver) {
       this.messagesObserver.disconnect();
     }
+    if (this.watchdogTimer) {
+      clearInterval(this.watchdogTimer);
+    }
   }
 
   autoResize() {
@@ -72,4 +86,66 @@ export default class extends Controller {
   #scrollToBottom = () => {
     this.messagesTarget.scrollTop = this.messagesTarget.scrollHeight;
   };
+
+  // Watchdog: a "Thinking…" bubble only resolves when the background worker
+  // streams a response over Turbo. If the worker is down — or the job dies
+  // before it can broadcast an error — the bubble would otherwise spin forever
+  // with no feedback. We detect a pending bubble that has waited past the
+  // threshold and ask the server to mark it failed, so the user gets an error
+  // message + Retry instead of a dead spinner.
+  //
+  // We key off the pending marker itself (it only exists while pending and
+  // disappears the instant a real response renders) rather than a status flag,
+  // so a response that starts streaming can never be falsely timed out.
+  #startUndeliveredWatchdog() {
+    this.#checkUndeliveredResponses();
+    this.watchdogTimer = setInterval(() => {
+      this.#checkUndeliveredResponses();
+    }, this.pollIntervalValue);
+  }
+
+  #checkUndeliveredResponses() {
+    if (!this.hasPendingResponseTarget) return;
+
+    const now = Date.now();
+
+    this.pendingResponseTargets.forEach((el) => {
+      const url = el.dataset.pendingResponseTimeoutUrl;
+      // Skip if already reported (succeeded) or a report is in flight.
+      if (!url || this.reportedUrls.has(url) || this.inFlightUrls.has(url)) return;
+
+      const createdAt = Date.parse(el.dataset.pendingResponseCreatedAt);
+      if (Number.isNaN(createdAt)) return;
+      if (now - createdAt < this.responseTimeoutValue) return;
+
+      this.#reportUndelivered(url);
+    });
+  }
+
+  #reportUndelivered(url) {
+    const token = document.querySelector('meta[name="csrf-token"]')?.content;
+
+    this.inFlightUrls.add(url);
+
+    fetch(url, {
+      method: "POST",
+      headers: {
+        "X-CSRF-Token": token || "",
+        Accept: "text/vnd.turbo-stream.html, text/html",
+      },
+      credentials: "same-origin",
+    })
+      .then((response) => {
+        // Only mark as reported on success. fetch resolves on HTTP 4xx/5xx
+        // (it rejects only on network errors), so without this check a failed
+        // POST would permanently suppress retries and strand the bubble.
+        if (response.ok) this.reportedUrls.add(url);
+      })
+      .catch(() => {
+        // Best-effort. Leave the URL un-reported so the next tick can retry.
+      })
+      .finally(() => {
+        this.inFlightUrls.delete(url);
+      });
+  }
 }
diff --git a/app/javascript/controllers/clipboard_controller.js b/app/javascript/controllers/clipboard_controller.js
index 7e0b1a493..d895ac7b8 100644
--- a/app/javascript/controllers/clipboard_controller.js
+++ b/app/javascript/controllers/clipboard_controller.js
@@ -1,28 +1,69 @@
 import { Controller } from "@hotwired/stimulus";
 
+// Single source of truth so the icon-swap and label-flash feedback last the
+// same time when both copy buttons appear on one page.
+const RESET_DELAY_MS = 2000;
+
 export default class extends Controller {
   static targets = ["source", "iconDefault", "iconSuccess"];
+  static values = { copiedText: String };
 
   copy(event) {
     event.preventDefault();
-    if (this.sourceTarget?.textContent) {
-      navigator.clipboard
-        .writeText(this.sourceTarget.textContent)
-        .then(() => {
-          this.showSuccess();
-        })
-        .catch((error) => {
-          console.error("Failed to copy text: ", error);
-        });
-    }
+    // Capture the button now: `event.currentTarget` is reset to null once the
+    // event finishes dispatching, so it can't be read inside the async `.then`.
+    const button = event.currentTarget;
+    const text = this.sourceTarget?.textContent;
+    if (!text) return;
+
+    navigator.clipboard
+      .writeText(text)
+      .then(() => {
+        this.showSuccess(button);
+      })
+      .catch((error) => {
+        console.error("Failed to copy text: ", error);
+      });
   }
 
-  showSuccess() {
-    this.iconDefaultTarget.classList.add("hidden");
-    this.iconSuccessTarget.classList.remove("hidden");
-    setTimeout(() => {
-      this.iconDefaultTarget.classList.remove("hidden");
-      this.iconSuccessTarget.classList.add("hidden");
-    }, 3000);
+  showSuccess(button) {
+    // Markup that ships explicit default/success icons (invite codes, MFA,
+    // profiles) toggles between them.
+    if (this.hasIconDefaultTarget && this.hasIconSuccessTarget) {
+      this.iconDefaultTarget.classList.add("hidden");
+      this.iconSuccessTarget.classList.remove("hidden");
+      setTimeout(() => {
+        this.iconDefaultTarget.classList.remove("hidden");
+        this.iconSuccessTarget.classList.add("hidden");
+      }, RESET_DELAY_MS);
+      return;
+    }
+
+    // A single-icon button (e.g. DS::Button) has no icons to swap, so confirm
+    // the copy by briefly flipping the button's own label.
+    this.flashLabel(button);
+  }
+
+  flashLabel(button) {
+    // DS::Button renders its icon as an <svg> and its text in `span.truncate`,
+    // so scope to that class rather than the first <span> in case an icon ever
+    // ships wrapped in a span.
+    const label = button?.querySelector("span.truncate") ?? button?.querySelector("span");
+    if (!label || !this.hasCopiedTextValue) return;
+
+    clearTimeout(this.labelResetTimer);
+    if (this.originalLabel == null) {
+      this.originalLabel = label.textContent;
+    }
+
+    label.textContent = this.copiedTextValue;
+    this.labelResetTimer = setTimeout(() => {
+      label.textContent = this.originalLabel;
+      this.originalLabel = null;
+    }, RESET_DELAY_MS);
+  }
+
+  disconnect() {
+    clearTimeout(this.labelResetTimer);
   }
 }
diff --git a/app/javascript/controllers/color_icon_picker_controller.js b/app/javascript/controllers/color_icon_picker_controller.js
index a208ba969..59e321d63 100644
--- a/app/javascript/controllers/color_icon_picker_controller.js
+++ b/app/javascript/controllers/color_icon_picker_controller.js
@@ -152,10 +152,10 @@ export default class extends Controller {
         "Poor contrast, choose darker color or auto-adjust.",
       );
 
-      this.validationMessageTarget.classList.remove("hidden");
+      this.showFlex(this.validationMessageTarget);
     } else {
       this.colorInputTarget.setCustomValidity("");
-      this.validationMessageTarget.classList.add("hidden");
+      this.hideFlex(this.validationMessageTarget);
     }
   }
 
@@ -226,7 +226,7 @@ export default class extends Controller {
   showPaletteSection() {
     this.initPicker();
     this.colorsSectionTarget.classList.add("hidden");
-    this.paletteSectionTarget.classList.remove("hidden");
+    this.showFlex(this.paletteSectionTarget);
     this.pickerSectionTarget.classList.remove("hidden");
     this.updatePopupPosition();
     this.picker.show();
@@ -234,7 +234,7 @@ export default class extends Controller {
 
   showColorsSection() {
     this.colorsSectionTarget.classList.remove("hidden");
-    this.paletteSectionTarget.classList.add("hidden");
+    this.hideFlex(this.paletteSectionTarget);
     this.pickerSectionTarget.classList.add("hidden");
     this.updatePopupPosition()
     if (this.picker) {
@@ -256,6 +256,16 @@ export default class extends Controller {
     }
   };
 
+  showFlex(element) {
+    element.classList.remove("hidden");
+    element.classList.add("flex");
+  }
+
+  hideFlex(element) {
+    element.classList.add("hidden");
+    element.classList.remove("flex");
+  }
+
   updatePopupPosition() {
     const popup = this.popupTarget;
     popup.style.top = "";
diff --git a/app/javascript/controllers/dashboard_masonry_controller.js b/app/javascript/controllers/dashboard_masonry_controller.js
new file mode 100644
index 000000000..99c2343b1
--- /dev/null
+++ b/app/javascript/controllers/dashboard_masonry_controller.js
@@ -0,0 +1,82 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Packs variable-height dashboard cards into a tight masonry layout by computing
+// each card's grid row span from its measured height, letting `grid-auto-flow:
+// dense` fill the gaps. Active only when the grid is actually multi-column; in
+// single-column mode it clears the spans and normal block flow takes over.
+//
+// The DOM stays a single flat list of <section data-section-key> children, so
+// the dashboard-sortable controller (drag / keyboard reorder) is unaffected —
+// reordering just moves a node and the CSS re-packs.
+export default class extends Controller {
+  connect() {
+    this._scheduleLayout = this._scheduleLayout.bind(this);
+    this._frame = null;
+    this._resizeObserver = new ResizeObserver(this._scheduleLayout);
+
+    this._cards().forEach((card) => this._resizeObserver.observe(card));
+    this._scheduleLayout();
+
+    // Re-pack after the dashboard turbo frame re-renders (period change, reorder
+    // save) and on viewport changes that may cross the column breakpoint.
+    this.element.addEventListener("turbo:frame-load", this._scheduleLayout);
+    window.addEventListener("resize", this._scheduleLayout);
+  }
+
+  disconnect() {
+    this._resizeObserver?.disconnect();
+    this.element.removeEventListener("turbo:frame-load", this._scheduleLayout);
+    window.removeEventListener("resize", this._scheduleLayout);
+    if (this._frame) cancelAnimationFrame(this._frame);
+    this._cards().forEach((card) => {
+      card.style.gridRowEnd = "";
+      delete card.dataset.masonrySpan;
+    });
+  }
+
+  _cards() {
+    return Array.from(
+      this.element.querySelectorAll(":scope > [data-section-key]"),
+    );
+  }
+
+  _scheduleLayout() {
+    if (this._frame) cancelAnimationFrame(this._frame);
+    this._frame = requestAnimationFrame(() => this._layout());
+  }
+
+  _layout() {
+    const styles = getComputedStyle(this.element);
+    const columns = styles.gridTemplateColumns
+      .split(" ")
+      .filter(Boolean).length;
+
+    // Single column: let natural block flow handle it, clear any stale spans.
+    if (columns < 2) {
+      this._cards().forEach((card) => {
+        if (card.dataset.masonrySpan) {
+          card.style.gridRowEnd = "";
+          delete card.dataset.masonrySpan;
+        }
+      });
+      return;
+    }
+
+    // The row gap is zeroed in masonry mode (2xl:gap-y-0). We reproduce a uniform
+    // inter-card gap by padding each card's span with empty tracks equal to the
+    // column gap. Integer row-spans over a non-zero row gap otherwise overshoot
+    // by up to one gap's worth of slack, giving visibly uneven vertical gaps.
+    const rowUnit = Number.parseFloat(styles.gridAutoRows) || 1;
+    const gap = Number.parseFloat(styles.columnGap) || 0;
+    const gapTracks = Math.round(gap / rowUnit);
+
+    this._cards().forEach((card) => {
+      const height = card.getBoundingClientRect().height;
+      const span = Math.max(1, Math.ceil(height / rowUnit) + gapTracks);
+      if (card.dataset.masonrySpan !== String(span)) {
+        card.style.gridRowEnd = `span ${span}`;
+        card.dataset.masonrySpan = String(span);
+      }
+    });
+  }
+}
diff --git a/app/javascript/controllers/dashboard_widget_size_controller.js b/app/javascript/controllers/dashboard_widget_size_controller.js
new file mode 100644
index 000000000..57c87cf5d
--- /dev/null
+++ b/app/javascript/controllers/dashboard_widget_size_controller.js
@@ -0,0 +1,110 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Per-widget layout picker (mounted on the <details> menu). Optimistically applies
+// the choice for instant feedback, then persists it fire-and-forget — mirroring how
+// collapse / reorder already save dashboard preferences:
+//
+//   - Height: sets the `--dash-widget-h` CSS var; the chart redraws via its own
+//     ResizeObserver and dashboard-masonry re-packs from the height change.
+//   - Width: toggles the `2xl:col-span-2` class; the CSS grid re-flows and a
+//     synthetic resize nudges dashboard-masonry to re-pack.
+export default class extends Controller {
+  static values = { sectionKey: String };
+
+  connect() {
+    this._closeOnOutsideClick = this._closeOnOutsideClick.bind(this);
+    document.addEventListener("click", this._closeOnOutsideClick);
+  }
+
+  disconnect() {
+    document.removeEventListener("click", this._closeOnOutsideClick);
+  }
+
+  // Keep Enter/Space/arrow keydowns inside the menu from bubbling to the
+  // section-level dashboard-sortable handler, which would otherwise hijack them
+  // to toggle keyboard reorder mode.
+  stopKeydown(event) {
+    event.stopPropagation();
+  }
+
+  selectHeight(event) {
+    const { preset, height } = event.currentTarget.dataset;
+    const section = this._section();
+    if (section && height) {
+      section.style.setProperty("--dash-widget-h", `${height}px`);
+    }
+    this._markSelected(event.currentTarget);
+    this.element.open = false;
+    this._save({ height: preset });
+  }
+
+  selectWidth(event) {
+    const { colSpan } = event.currentTarget.dataset;
+    const section = this._section();
+    if (section) {
+      section.classList.toggle("2xl:col-span-2", colSpan === "full");
+    }
+    this._markSelected(event.currentTarget);
+    this.element.open = false;
+    this._save({ col_span: colSpan });
+    // Width change re-flows the grid; nudge dashboard-masonry to re-pack.
+    window.dispatchEvent(new Event("resize"));
+  }
+
+  _section() {
+    return this.element.closest("[data-section-key]");
+  }
+
+  // Move the active state to the clicked segment within its segmented control,
+  // mirroring DS::SegmentedControl's class + aria-pressed contract.
+  _markSelected(button) {
+    const group = button.closest(".segmented-control");
+    if (!group) return;
+    group.querySelectorAll(".segmented-control__segment").forEach((el) => {
+      const on = el === button;
+      el.classList.toggle("segmented-control__segment--active", on);
+      el.setAttribute("aria-pressed", on ? "true" : "false");
+    });
+  }
+
+  _closeOnOutsideClick(event) {
+    if (this.element.open && !this.element.contains(event.target)) {
+      this.element.open = false;
+    }
+  }
+
+  async _save(payload) {
+    const csrfToken = document.querySelector('meta[name="csrf-token"]');
+    if (!csrfToken) {
+      console.error("[Dashboard Widget Size] CSRF token not found.");
+      return;
+    }
+
+    try {
+      const response = await fetch("/dashboard/preferences", {
+        method: "PATCH",
+        headers: {
+          "Content-Type": "application/json",
+          "X-CSRF-Token": csrfToken.content,
+        },
+        body: JSON.stringify({
+          preferences: {
+            dashboard_section_layout: { [this.sectionKeyValue]: payload },
+          },
+        }),
+      });
+
+      if (!response.ok) {
+        console.error(
+          "[Dashboard Widget Size] Failed to save layout:",
+          response.status,
+        );
+      }
+    } catch (error) {
+      console.error(
+        "[Dashboard Widget Size] Network error saving layout:",
+        error,
+      );
+    }
+  }
+}
diff --git a/app/javascript/controllers/donut_chart_controller.js b/app/javascript/controllers/donut_chart_controller.js
index 0e9219141..9392d9459 100644
--- a/app/javascript/controllers/donut_chart_controller.js
+++ b/app/javascript/controllers/donut_chart_controller.js
@@ -1,5 +1,6 @@
 import { Controller } from "@hotwired/stimulus";
 import * as d3 from "d3";
+import { buildCategoryTransactionsUrl } from "utils/transactions_filter_url";
 
 // Connects to data-controller="donut-chart"
 export default class extends Controller {
@@ -250,14 +251,15 @@ export default class extends Controller {
 
   // Handles click on segment (optional, controlled by enableClick value)
   #handleClick(segment) {
-    if (!segment.name || !this.startDateValue || !this.endDateValue) return;
+    if (!segment.name) return;
 
-    const segmentName = encodeURIComponent(segment.name);
-    const startDate = this.startDateValue;
-    const endDate = this.endDateValue;
-
-    const url = `/transactions?q[categories][]=${segmentName}&q[start_date]=${startDate}&q[end_date]=${endDate}`;
-    window.location.href = url;
+    Turbo.visit(
+      buildCategoryTransactionsUrl({
+        name: segment.name,
+        startDate: this.startDateValue,
+        endDate: this.endDateValue,
+      }),
+    );
   }
 
   // Public methods for external highlighting (e.g., from category list hover)
diff --git a/app/javascript/controllers/goal_form_controller.js b/app/javascript/controllers/goal_form_controller.js
index 251d50aae..eb556b81e 100644
--- a/app/javascript/controllers/goal_form_controller.js
+++ b/app/javascript/controllers/goal_form_controller.js
@@ -18,6 +18,7 @@ export default class extends Controller {
     "accountsError",
     "linkedAccountCheckbox",
     "suggested",
+    "submitButton",
   ];
 
   static INVALID_INPUT_CLASSES = ["ring-2", "ring-destructive", "border-destructive"];
@@ -26,6 +27,11 @@ export default class extends Controller {
     currency: { type: String, default: "USD" },
     suggestedWithDate: { type: String, default: "Save {monthly}/mo across {accounts} to hit it on time." },
     suggestedNoDate: { type: String, default: "Set a target date to project a finish line." },
+    // Only the create form must pick an account. On edit the checkboxes are
+    // populated from visible accounts only, so a goal backed by a now-hidden
+    // account renders none — and the controller preserves existing links when
+    // account_ids is omitted. Requiring a checkbox there would wedge the form.
+    requireAccount: { type: Boolean, default: true },
   };
 
   connect() {
@@ -35,12 +41,16 @@ export default class extends Controller {
       this._defaultAvatarHTML = this.avatarPreviewTarget.innerHTML;
     }
     this.updateSuggested();
+    // Edit form arrives pre-filled (valid) so this clears immediately; new
+    // form arrives empty so the submit starts visually disabled.
+    this.refreshSubmitState();
   }
 
   nameChanged() {
     if (this.hasNameInputTarget) {
       this.clearFieldError(this.nameInputTarget, this.hasNameErrorTarget ? this.nameErrorTarget : null);
     }
+    this.refreshSubmitState();
     if (!this.hasAvatarPreviewTarget || !this.hasNameInputTarget) return;
 
     // If the user has explicitly picked an icon, leave it alone. Name
@@ -62,6 +72,7 @@ export default class extends Controller {
     if (this.hasAmountInputTarget) {
       this.clearFieldError(this.amountInputTarget, this.hasAmountErrorTarget ? this.amountErrorTarget : null);
     }
+    this.refreshSubmitState();
   }
 
   linkedAccountChanged() {
@@ -69,6 +80,64 @@ export default class extends Controller {
     if (this.linkedAccountCheckboxTargets.some((cb) => cb.checked) && this.hasAccountsErrorTarget) {
       this.accountsErrorTarget.classList.add("hidden");
     }
+    this.refreshSubmitState();
+  }
+
+  // Required to create a goal: a name, a positive target amount, and at least
+  // one funding account. Mirrors the server-side Goal validations (name
+  // presence, target_amount > 0, must_have_at_least_one_linked_account) so the
+  // button only enables when a submit would actually succeed.
+  isValid() {
+    const name = this.hasNameInputTarget ? this.nameInputTarget.value.trim() : "";
+    const amount = this.hasAmountInputTarget ? Number.parseFloat(this.amountInputTarget.value) : Number.NaN;
+    const accountOk = !this.requireAccountValue || this.linkedAccountCheckboxTargets.some((cb) => cb.checked);
+    return name.length > 0 && Number.isFinite(amount) && amount > 0 && accountOk;
+  }
+
+  // `aria-disabled` instead of the `disabled` attribute: a truly disabled
+  // default submit also blocks Enter-key implicit submission, so an invalid
+  // form would be a dead button with every inline error still hidden. With
+  // aria-disabled the button keeps its not-allowed affordance (styled via the
+  // DS `aria-disabled:` variants) while clicks and Enter still reach
+  // validateOnSubmit, which surfaces the errors and moves focus.
+  refreshSubmitState() {
+    if (this.hasSubmitButtonTarget) {
+      this.submitButtonTarget.setAttribute("aria-disabled", String(!this.isValid()));
+    }
+  }
+
+  // The real gate for the submit: covers the funding-accounts group (a
+  // checkbox group can't carry native `required`) and everything the
+  // aria-disabled affordance merely hints at. Surfaces the inline errors and
+  // focuses the first offending field instead of a silent no-op.
+  validateOnSubmit(event) {
+    if (this.isValid()) return;
+
+    event.preventDefault();
+
+    const nameEmpty = !(this.hasNameInputTarget && this.nameInputTarget.value.trim().length > 0);
+    const amount = this.hasAmountInputTarget ? Number.parseFloat(this.amountInputTarget.value) : Number.NaN;
+    const amountInvalid = !(Number.isFinite(amount) && amount > 0);
+    const noAccount = this.requireAccountValue && !this.linkedAccountCheckboxTargets.some((cb) => cb.checked);
+
+    if (nameEmpty) {
+      this.showFieldError(this.nameInputTarget, this.hasNameErrorTarget ? this.nameErrorTarget : null);
+    }
+    if (amountInvalid) {
+      this.showFieldError(this.amountInputTarget, this.hasAmountErrorTarget ? this.amountErrorTarget : null);
+    }
+    if (noAccount && this.hasAccountsErrorTarget) {
+      this.accountsErrorTarget.classList.remove("hidden");
+    }
+
+    const firstInvalid = nameEmpty
+      ? this.nameInputTarget
+      : amountInvalid
+        ? this.amountInputTarget
+        : noAccount
+          ? this.linkedAccountCheckboxTargets[0]
+          : null;
+    firstInvalid?.focus();
   }
 
   // Hook for any input that influences the suggested-pace hint
diff --git a/app/javascript/controllers/goal_projection_chart_controller.js b/app/javascript/controllers/goal_projection_chart_controller.js
index cefddedeb..43e3c5481 100644
--- a/app/javascript/controllers/goal_projection_chart_controller.js
+++ b/app/javascript/controllers/goal_projection_chart_controller.js
@@ -1,5 +1,10 @@
 import { Controller } from "@hotwired/stimulus";
 import * as d3 from "d3";
+import {
+  createChartTooltip,
+  CHART_TOOLTIP_CONTEXT_CLASSES,
+  CHART_TOOLTIP_VALUE_CLASSES,
+} from "utils/chart_tooltip";
 
 // Projection chart for a goal. Renders:
 //   - Saved area + line from goal creation → today (solid)
@@ -18,6 +23,7 @@ export default class extends Controller {
     todayLabel: { type: String, default: "Today" },
     projectedTemplate: { type: String, default: "Projected: {amount}" },
     savedTemplate: { type: String, default: "Saved: {amount}" },
+    targetRelationTemplate: { type: String, default: "{percent}% of {target} target" },
   };
 
   connect() {
@@ -439,10 +445,38 @@ export default class extends Controller {
     // clobber a stylesheet `position: fixed/sticky/absolute` with our
     // own `relative`. Read the computed style instead.
     if (getComputedStyle(root).position === "static") root.style.position = "relative";
-    const tooltip = document.createElement("div");
-    tooltip.className = "bg-container text-primary text-sm font-sans absolute p-2 border border-secondary rounded-lg pointer-events-none z-50 privacy-sensitive";
-    tooltip.style.display = "none";
-    root.appendChild(tooltip);
+    // Shared visual contract (utils/chart_tooltip) — this used to be a
+    // hand-copied class string that drifted from the other charts the moment
+    // the contract changed.
+    const tooltip = createChartTooltip(root);
+    // This tooltip snaps between discrete dates (not raw cursor positions),
+    // so the glide reads as easing, not lag. Cursor-following tooltips must
+    // not do this — see the .chart-tooltip comment in components.css.
+    tooltip.style.transition = "left 80ms ease-out, top 80ms ease-out";
+    const tooltipDate = document.createElement("div");
+    tooltipDate.className = CHART_TOOLTIP_CONTEXT_CLASSES;
+    const tooltipValue = document.createElement("div");
+    tooltipValue.className = CHART_TOOLTIP_VALUE_CLASSES;
+    // Relation line: where this value sits against the goal target. Tertiary
+    // so the hierarchy stays date < value > relation; hidden when the goal
+    // has no positive target to compare against.
+    const tooltipRelation = document.createElement("div");
+    tooltipRelation.className = "text-xs text-subdued mt-0.5";
+    tooltip.replaceChildren(tooltipDate, tooltipValue, tooltipRelation);
+
+    const setRelation = (amount) => {
+      // `targetAmount` is _draw()'s outer const (data.target_amount) — no
+      // local copy, which previously shadowed the `target` date const.
+      if (targetAmount <= 0 || !data.target_amount_short_label) {
+        tooltipRelation.style.display = "none";
+        return;
+      }
+      const percent = Math.round((amount / targetAmount) * 100);
+      tooltipRelation.textContent = this.targetRelationTemplateValue
+        .replace("{percent}", percent)
+        .replace("{target}", data.target_amount_short_label);
+      tooltipRelation.style.display = "";
+    };
 
     const overlay = svg
       .append("rect")
@@ -485,7 +519,7 @@ export default class extends Controller {
       const hoverX = x(hoverDate);
       crosshair.attr("x1", hoverX).attr("x2", hoverX).style("display", null);
 
-      const lines = [dateFmt(hoverDate)];
+      tooltipDate.textContent = dateFmt(hoverDate);
 
       if (future) {
         // Projection segment: interpolate along the dashed line; saved dot
@@ -494,7 +528,8 @@ export default class extends Controller {
         const projValue = currentAmount + tFrac * (projectionEnd - currentAmount);
         hoverProjDot.attr("cx", hoverX).attr("cy", y(projValue)).style("display", null);
         hoverSavedDot.style("display", "none");
-        lines.push(this.projectedTemplateValue.replace("{amount}", this._fmtMoney(projValue, data.currency)));
+        tooltipValue.textContent = this.projectedTemplateValue.replace("{amount}", this._fmtMoney(projValue, data.currency));
+        setRelation(projValue);
       } else {
         // Saved segment: hoverDate is already snapped to nearest savedSeries
         // entry above, so reuse that entry directly instead of running
@@ -502,11 +537,10 @@ export default class extends Controller {
         const savedPoint = savedSeries.find((p) => p.date.getTime() === hoverDate.getTime()) || savedSeries[savedSeries.length - 1];
         hoverSavedDot.attr("cx", x(savedPoint.date)).attr("cy", y(savedPoint.value)).style("display", null);
         hoverProjDot.style("display", "none");
-        lines.push(this.savedTemplateValue.replace("{amount}", this._fmtMoney(savedPoint.value, data.currency)));
+        tooltipValue.textContent = this.savedTemplateValue.replace("{amount}", this._fmtMoney(savedPoint.value, data.currency));
+        setRelation(savedPoint.value);
       }
 
-      tooltip.textContent = lines.join("\n");
-      tooltip.style.whiteSpace = "pre";
       tooltip.style.display = "block";
       const tipRect = tooltip.getBoundingClientRect();
       const left = Math.min(width - tipRect.width - 4, Math.max(4, xPos + 12));
diff --git a/app/javascript/controllers/goals_filter_controller.js b/app/javascript/controllers/goals_filter_controller.js
index 5e68db6f8..ed98040b9 100644
--- a/app/javascript/controllers/goals_filter_controller.js
+++ b/app/javascript/controllers/goals_filter_controller.js
@@ -155,10 +155,7 @@ export default class extends Controller {
     this.chipTargets.forEach((chip) => {
       const active = chip.dataset.status === this.statusValue;
       chip.setAttribute("aria-pressed", active);
-      chip.classList.toggle("bg-container", active);
-      chip.classList.toggle("shadow-border-xs", active);
-      chip.classList.toggle("text-primary", active);
-      chip.classList.toggle("text-secondary", !active);
+      chip.classList.toggle("segmented-control__segment--active", active);
     });
   }
 }
diff --git a/app/javascript/controllers/net_worth_chart_controller.js b/app/javascript/controllers/net_worth_chart_controller.js
new file mode 100644
index 000000000..738f80839
--- /dev/null
+++ b/app/javascript/controllers/net_worth_chart_controller.js
@@ -0,0 +1,79 @@
+import TimeSeriesChartController from "controllers/time_series_chart_controller";
+
+// Net worth chart for the Reports page. Inherits all drawing behavior from
+// the time series chart and extends the tooltip with a per-account-group
+// breakdown of assets and liabilities at the hovered point.
+export default class extends TimeSeriesChartController {
+  static values = {
+    assetsLabel: { type: String, default: "Assets" },
+    liabilitiesLabel: { type: String, default: "Liabilities" },
+  };
+
+  _normalizeDataPoints() {
+    super._normalizeDataPoints();
+
+    const rawValues = this.dataValue.values || [];
+    this._normalDataPoints = this._normalDataPoints.map((point, i) => ({
+      ...point,
+      assets: rawValues[i]?.assets,
+      liabilities: rawValues[i]?.liabilities,
+      groups: rawValues[i]?.groups || [],
+    }));
+  }
+
+  _tooltipTemplate(datum) {
+    return `${super._tooltipTemplate(datum)}${this._breakdownTemplate(datum)}`;
+  }
+
+  _breakdownTemplate(datum) {
+    const assetGroups = datum.groups.filter(
+      (group) => group.classification === "asset",
+    );
+    const liabilityGroups = datum.groups.filter(
+      (group) => group.classification === "liability",
+    );
+
+    const sections = [
+      this._sectionTemplate(this.assetsLabelValue, datum.assets, assetGroups),
+      this._sectionTemplate(
+        this.liabilitiesLabelValue,
+        datum.liabilities,
+        liabilityGroups,
+      ),
+    ]
+      .filter(Boolean)
+      .join("");
+
+    if (!sections) return "";
+
+    return `<div class="mt-2 pt-2 border-t border-secondary space-y-2">${sections}</div>`;
+  }
+
+  _sectionTemplate(label, total, groups) {
+    if (groups.length === 0) return "";
+
+    const rows = groups
+      .map(
+        (group) => `
+          <div class="flex items-center justify-between gap-4">
+            <div class="flex items-center gap-1.5 text-secondary">
+              <span class="w-2 h-2 rounded-full shrink-0" style="background-color: ${group.color};"></span>
+              ${group.name}
+            </div>
+            <span class="text-primary tabular-nums">${this._extractFormattedValue(group.value)}</span>
+          </div>
+        `,
+      )
+      .join("");
+
+    return `
+      <div class="space-y-1 text-xs">
+        <div class="flex items-center justify-between gap-4 font-medium">
+          <span class="text-secondary uppercase">${label}</span>
+          <span class="text-primary tabular-nums">${this._extractFormattedValue(total)}</span>
+        </div>
+        ${rows}
+      </div>
+    `;
+  }
+}
diff --git a/app/javascript/controllers/notification_tray_controller.js b/app/javascript/controllers/notification_tray_controller.js
new file mode 100644
index 000000000..2f0cf5a06
--- /dev/null
+++ b/app/javascript/controllers/notification_tray_controller.js
@@ -0,0 +1,40 @@
+import { Controller } from "@hotwired/stimulus";
+
+// The tray is `position: fixed` with `left: 50%` (viewport-center) by
+// default, which is correct for every single-column layout. Layouts with a
+// sidebar (app, settings) opt in here so the tray centers on the actual
+// content pane instead. A ResizeObserver on <main> catches every case that
+// moves its bounds — window resize, sidebar drag-resize, sidebar
+// collapse/expand — since all of those already reflow <main> natively; no
+// cooperation needed from the sidebar controllers themselves.
+export default class extends Controller {
+  static targets = ["tray", "main"];
+
+  connect() {
+    this.resizeObserver = new ResizeObserver(() => this.reposition());
+    this.resizeObserver.observe(this.mainTarget);
+    this.reposition();
+  }
+
+  disconnect() {
+    this.resizeObserver?.disconnect();
+  }
+
+  reposition() {
+    const rect = this.mainTarget.getBoundingClientRect();
+    this.trayTarget.style.left = `${rect.left + rect.width / 2}px`;
+  }
+
+  // turbo_refreshes_with(method: :morph) is enabled app-wide
+  // (_head.html.erb), and idiomorph resets any inline style a client
+  // script set that isn't present in the freshly-fetched server HTML —
+  // which `left` always is. `data-turbo-permanent` looked like the fix,
+  // but it invokes idiomorph's node-identity matching (same id preserved
+  // across ANY morphed page), which misbehaves once the id also exists
+  // on structurally different layouts (app vs settings). Wiring this
+  // narrower per-attribute event as a declarative action instead blocks
+  // only `style` on this one element — no node-identity system involved.
+  preserveStyle(event) {
+    if (event.detail.attributeName === "style") event.preventDefault();
+  }
+}
diff --git a/app/javascript/controllers/provider_settings_controller.js b/app/javascript/controllers/provider_settings_controller.js
new file mode 100644
index 000000000..694ad7353
--- /dev/null
+++ b/app/javascript/controllers/provider_settings_controller.js
@@ -0,0 +1,44 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Drives the LLM provider picker on the self-hosting settings page.
+//
+// A DS::SegmentedControl selects the active provider: clicking a segment
+// reveals that provider's settings panel immediately (no reload flash),
+// updates the hidden llm_provider field, and submits the selector form to
+// persist the choice. Both panels stay in the DOM so either provider can be
+// configured; the inactive one is `hidden`.
+export default class extends Controller {
+  static targets = ["panel", "segment", "field", "form"];
+  static values = { active: String };
+
+  activeValueChanged() {
+    this.panelTargets.forEach((panel) => {
+      panel.hidden = panel.dataset.provider !== this.activeValue;
+    });
+
+    this.segmentTargets.forEach((segment) => {
+      const isActive = segment.dataset.provider === this.activeValue;
+      segment.classList.toggle(
+        "segmented-control__segment--active",
+        isActive,
+      );
+      segment.setAttribute("aria-pressed", isActive.toString());
+    });
+
+    if (this.hasFieldTarget) this.fieldTarget.value = this.activeValue;
+  }
+
+  select(event) {
+    // Works for both the desktop segmented buttons (data-provider) and the
+    // mobile <select> fallback (its value).
+    const el = event.currentTarget;
+    const provider = el.dataset.provider || el.value;
+    if (!provider || provider === this.activeValue) return;
+
+    // Set the field explicitly before submitting: `activeValueChanged` runs on
+    // a microtask, so relying on it to update the field would race requestSubmit.
+    if (this.hasFieldTarget) this.fieldTarget.value = provider;
+    this.activeValue = provider;
+    if (this.hasFormTarget) this.formTarget.requestSubmit();
+  }
+}
diff --git a/app/javascript/controllers/providers_filter_controller.js b/app/javascript/controllers/providers_filter_controller.js
index a4d90e2a4..3b07a0f45 100644
--- a/app/javascript/controllers/providers_filter_controller.js
+++ b/app/javascript/controllers/providers_filter_controller.js
@@ -58,10 +58,7 @@ export default class extends Controller {
     if (!this.hasChipTarget) return;
     this.chipTargets.forEach((chip) => {
       const active = chip.dataset.kind === this.kindValue;
-      chip.classList.toggle("bg-container", active);
-      chip.classList.toggle("shadow-border-xs", active);
-      chip.classList.toggle("text-primary", active);
-      chip.classList.toggle("text-secondary", !active);
+      chip.classList.toggle("segmented-control__segment--active", active);
       chip.setAttribute("aria-pressed", active ? "true" : "false");
     });
   }
diff --git a/app/javascript/controllers/sankey_chart_controller.js b/app/javascript/controllers/sankey_chart_controller.js
index cb24edeb9..21d1478cf 100644
--- a/app/javascript/controllers/sankey_chart_controller.js
+++ b/app/javascript/controllers/sankey_chart_controller.js
@@ -1,7 +1,12 @@
 import { Controller } from "@hotwired/stimulus";
 import * as d3 from "d3";
 import { sankey } from "d3-sankey";
+import { CHART_TOOLTIP_CLASSES } from "utils/chart_tooltip";
 import { sankeyNodeHasChildren, zoomSankeyData } from "utils/sankey_zoom";
+import {
+  buildCategoryTransactionsUrl,
+  isNavigableCategoryNode,
+} from "utils/transactions_filter_url";
 
 // Connects to data-controller="sankey-chart"
 export default class extends Controller {
@@ -12,6 +17,8 @@ export default class extends Controller {
     nodeWidth: { type: Number, default: 15 },
     nodePadding: { type: Number, default: 20 },
     currencySymbol: { type: String, default: "$" },
+    startDate: String,
+    endDate: String,
   };
 
   // Visual constants
@@ -162,6 +169,22 @@ export default class extends Controller {
     this.#draw({ animate: true });
   }
 
+  #navigateToTransactions(d) {
+    if (!isNavigableCategoryNode(d.id)) {
+      // Structural node (Cash Flow / Surplus): keep current zoom behavior.
+      this.#zoomIn(d);
+      return;
+    }
+
+    Turbo.visit(
+      buildCategoryTransactionsUrl({
+        name: d.name,
+        startDate: this.startDateValue,
+        endDate: this.endDateValue,
+      }),
+    );
+  }
+
   // Dynamic padding prevents padding from dominating when there are many nodes
   #calculateNodePadding(nodeCount, height) {
     const margin = this.constructor.EXTENT_MARGIN;
@@ -444,7 +467,16 @@ export default class extends Controller {
     linkPaths
       .on("mouseenter", (event, d) => {
         applyHover([d]);
-        this.#showTooltip(event, d.value, d.percentage);
+        // A link is a flow between two named nodes — without the names the
+        // value floats context-free (the old tooltip showed only "$X (Y%)").
+        this.#showTooltip(
+          event,
+          d.value,
+          d.percentage,
+          this.#tooltipContext(
+            `${this.#esc(d.source.name)} → ${this.#esc(d.target.name)}`,
+          ),
+        );
       })
       .on("mousemove", (event) => this.#updateTooltipPosition(event))
       .on("mouseleave", () => {
@@ -465,7 +497,12 @@ export default class extends Controller {
           (l) => l.source === d || l.target === d,
         );
         applyHover(connectedLinks);
-        this.#showTooltip(event, d.value, d.percentage, d.name);
+        this.#showTooltip(
+          event,
+          d.value,
+          d.percentage,
+          this.#tooltipContext(this.#esc(d.name)),
+        );
       })
       .on("mousemove", (event) => this.#updateTooltipPosition(event))
       .on("click", (event, d) => {
@@ -480,6 +517,7 @@ export default class extends Controller {
     nodeGroups
       .selectAll("text")
       .style("cursor", (d) =>
+        isNavigableCategoryNode(d.id) ||
         sankeyNodeHasChildren(this.#visibleData(), d.id)
           ? "pointer"
           : "default",
@@ -489,12 +527,17 @@ export default class extends Controller {
           (l) => l.source === d || l.target === d,
         );
         applyHover(connectedLinks);
-        this.#showTooltip(event, d.value, d.percentage, d.name);
+        this.#showTooltip(
+          event,
+          d.value,
+          d.percentage,
+          this.#tooltipContext(this.#esc(d.name)),
+        );
       })
       .on("mousemove", (event) => this.#updateTooltipPosition(event))
       .on("click", (event, d) => {
         event.stopPropagation();
-        this.#zoomIn(d);
+        this.#navigateToTransactions(d);
       })
       .on("mouseleave", () => {
         resetHover();
@@ -509,20 +552,39 @@ export default class extends Controller {
     this.tooltip = d3
       .select(dialog || document.body)
       .append("div")
-      .attr(
-        "class",
-        "bg-container text-primary text-sm font-sans p-2 border border-secondary rounded-lg pointer-events-none absolute z-50 top-0 privacy-sensitive",
-      )
+      // Shared visual contract + this chart's positioning class; opacity is
+      // toggled via inline style below.
+      .attr("class", `${CHART_TOOLTIP_CLASSES} top-0`)
       .style("opacity", 0)
       .style("pointer-events", "none");
   }
 
-  #showTooltip(event, value, percentage, title = null) {
+  // Node names are user-named categories; escape anything interpolated into
+  // .html() (the previous code injected them raw).
+  #esc(s) {
+    return String(s).replace(
+      /[&<>"']/g,
+      (c) =>
+        ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c],
+    );
+  }
+
+  // Context line shared by node and link tooltips: the (escaped) name(s) of
+  // what's hovered. No color swatch — the hover highlight on the diagram
+  // itself already says which ribbon the card belongs to.
+  #tooltipContext(label) {
+    // max-w-64 gives truncate a constraint to fire against — an absolute
+    // tooltip otherwise grows to fit and never ellipsizes deep flows.
+    return `<div class="max-w-64 text-xs text-secondary mb-1 truncate">${label}</div>`;
+  }
+
+  #showTooltip(event, value, percentage, contextHtml = null) {
     if (!this.tooltip) this.#createTooltip();
 
-    const content = title
-      ? `${title}<br/>${this.#formatCurrency(value)} (${percentage || 0}%)`
-      : `${this.#formatCurrency(value)} (${percentage || 0}%)`;
+    const valueLine = `<span class="font-medium tabular-nums">${this.#formatCurrency(value)}</span> <span class="text-secondary">(${percentage || 0}%)</span>`;
+    const content = contextHtml
+      ? `${contextHtml}<div>${valueLine}</div>`
+      : valueLine;
 
     const isInDialog = !!this.element.closest("dialog");
     const x = isInDialog ? event.clientX : event.pageX;
diff --git a/app/javascript/controllers/select_controller.js b/app/javascript/controllers/select_controller.js
index 19b44bb64..b803cc23d 100644
--- a/app/javascript/controllers/select_controller.js
+++ b/app/javascript/controllers/select_controller.js
@@ -1,6 +1,15 @@
 import { Controller } from "@hotwired/stimulus"
 import { autoUpdate } from "@floating-ui/dom"
 
+const FOCUSABLE_SELECTOR = [
+  "a[href]",
+  "button:not([disabled])",
+  "textarea:not([disabled])",
+  "input:not([disabled]):not([type=hidden])",
+  "select:not([disabled])",
+  "[tabindex]:not([tabindex='-1'])",
+].join(", ")
+
 export default class extends Controller {
   static targets = ["button", "menu", "input", "content", "option"]
   static values = {
@@ -10,14 +19,19 @@ export default class extends Controller {
 
   connect() {
     this.isOpen = false
+    this.suppressReopenOnFocus = false
     this.boundOutsideClick = this.handleOutsideClick.bind(this)
     this.boundKeydown = this.handleKeydown.bind(this)
     this.boundTurboLoad = this.handleTurboLoad.bind(this)
+    this.boundFocusOut = this.handleFocusOut.bind(this)
 
     document.addEventListener("click", this.boundOutsideClick)
     document.addEventListener("turbo:load", this.boundTurboLoad)
     this.element.addEventListener("keydown", this.boundKeydown)
+    this.element.addEventListener("focusout", this.boundFocusOut)
 
+    this.resetOptionTabindex()
+    this.setMenuInert(true)
     this.observeMenuResize()
   }
 
@@ -25,6 +39,7 @@ export default class extends Controller {
     document.removeEventListener("click", this.boundOutsideClick)
     document.removeEventListener("turbo:load", this.boundTurboLoad)
     this.element.removeEventListener("keydown", this.boundKeydown)
+    this.element.removeEventListener("focusout", this.boundFocusOut)
     this.stopAutoUpdate()
     if (this.resizeObserver) this.resizeObserver.disconnect()
   }
@@ -33,8 +48,63 @@ export default class extends Controller {
     this.isOpen ? this.close() : this.openMenu()
   }
 
+  // Tab lands on the trigger — open the menu but keep focus here so the
+  // browser doesn't continue Tab into the listbox and skip to the next field.
+  // Skip when we just closed via Escape/Enter and re-focused the trigger:
+  // keyboard modality keeps :focus-visible, which would otherwise reopen.
+  handleButtonFocus() {
+    if (this.isOpen) return
+    if (this.suppressReopenOnFocus) return
+    if (!this.buttonTarget.matches(":focus-visible")) return
+    this.openMenu()
+  }
+
+  focusTriggerWithoutReopening() {
+    this.suppressReopenOnFocus = true
+    this.buttonTarget.focus()
+    requestAnimationFrame(() => { this.suppressReopenOnFocus = false })
+  }
+
+  // Move focus to the next/previous tab stop after the trigger. Used when Tab
+  // closes the listbox: options are tabindex="-1" and close() sets inert on
+  // the menu, so the browser can't reliably continue native Tab navigation.
+  focusAdjacentTabStop(reverse = false) {
+    const scope = this.element.closest("dialog") || document
+    const focusables = this.#focusablesIn(scope)
+    const index = focusables.indexOf(this.buttonTarget)
+    if (index === -1) return
+
+    const next = focusables[index + (reverse ? -1 : 1)]
+    next?.focus()
+  }
+
+  #focusablesIn(scope) {
+    return Array.from(scope.querySelectorAll(FOCUSABLE_SELECTOR)).filter((el) => {
+      if (el.closest("[inert]")) return false
+      return el.offsetParent !== null || el === document.activeElement
+    })
+  }
+
+  // Arrow / Space / Enter from a closed trigger — open and move focus in.
+  openAndFocusMenu() {
+    this.openMenu()
+    requestAnimationFrame(() => {
+      if (this.focusSearch()) return
+      this.focusSelectedOrFirstOption()
+    })
+  }
+
+  focusSelectedOrFirstOption() {
+    const visible = this.visibleOptions()
+    if (visible.length === 0) return
+
+    const selected = visible.find(opt => opt.getAttribute("aria-selected") === "true")
+    this.focusOption(selected || visible[0])
+  }
+
   openMenu() {
     this.isOpen = true
+    this.setMenuInert(false)
     this.menuTarget.classList.remove("hidden")
     this.buttonTarget.setAttribute("aria-expanded", "true")
     this.startAutoUpdate()
@@ -53,6 +123,8 @@ export default class extends Controller {
     this.menuTarget.classList.remove("opacity-100", "translate-y-0")
     this.menuTarget.classList.add("opacity-0", "-translate-y-1", "pointer-events-none")
     this.buttonTarget.setAttribute("aria-expanded", "false")
+    this.resetOptionTabindex()
+    this.setMenuInert(true)
     setTimeout(() => { if (!this.isOpen && this.hasMenuTarget) this.menuTarget.classList.add("hidden") }, 150)
   }
 
@@ -70,14 +142,12 @@ export default class extends Controller {
     const previousSelected = this.menuTarget.querySelector("[aria-selected='true']")
     if (previousSelected) {
       previousSelected.setAttribute("aria-selected", "false")
-      previousSelected.setAttribute("tabindex", "-1")
       previousSelected.classList.remove("bg-container-inset")
       const prevIcon = previousSelected.querySelector(".check-icon")
       if (prevIcon) prevIcon.classList.add("hidden")
     }
 
     selectedElement.setAttribute("aria-selected", "true")
-    selectedElement.setAttribute("tabindex", "0")
     selectedElement.classList.add("bg-container-inset")
     const selectedIcon = selectedElement.querySelector(".check-icon")
     if (selectedIcon) selectedIcon.classList.remove("hidden")
@@ -87,8 +157,8 @@ export default class extends Controller {
       bubbles: true
     }))
 
+    this.focusTriggerWithoutReopening()
     this.close()
-    this.buttonTarget.focus()
   }
 
   focusSearch() {
@@ -130,24 +200,66 @@ export default class extends Controller {
     if (this.isOpen && !this.element.contains(event.target)) this.close()
   }
 
-  handleKeydown(event) {
+  handleFocusOut(event) {
     if (!this.isOpen) return
-    if (event.key === "Escape") { this.close(); this.buttonTarget.focus(); return }
+    const related = event.relatedTarget
+    if (related && this.element.contains(related)) return
+    this.close()
+  }
+
+  handleKeydown(event) {
+    if (!this.isOpen && event.target === this.buttonTarget) {
+      if (["ArrowDown", "ArrowUp", " ", "Enter"].includes(event.key)) {
+        event.preventDefault()
+        this.openAndFocusMenu()
+      }
+      return
+    }
+
+    if (!this.isOpen) return
+
+    if (event.key === "Tab") {
+      const reverse = event.shiftKey
+      event.preventDefault()
+      // Focus the trigger before close() sets inert on the menu — otherwise
+      // focus is still on an option and the UA drops it to <body>.
+      this.focusTriggerWithoutReopening()
+      this.close()
+      this.focusAdjacentTabStop(reverse)
+      return
+    }
+
+    // Stop Escape from reaching DS::Dialog's esc hotkey so only the
+    // listbox closes; a second Escape can still dismiss the modal.
+    if (event.key === "Escape") {
+      event.preventDefault()
+      event.stopPropagation()
+      this.focusTriggerWithoutReopening()
+      this.close()
+      return
+    }
     if (event.key === "Enter" && event.target.dataset.value) { event.preventDefault(); event.target.click(); return }
 
     // WAI-ARIA APG listbox keyboard pattern: ArrowUp/Down moves focus
-    // between options (roving tabindex), Home/End jump to first/last.
-    // From the search input, ArrowDown/Up bridge into the visible
-    // options so users can reach the filtered matches; other keys
-    // (typing, caret movement) stay with the input.
+    // between options, Home/End jump to first/last. Options stay at
+    // tabindex="-1" so they never appear in the Tab sequence — focus moves
+    // programmatically only.
+    // From the search input, ArrowDown/Up bridge into the visible options.
     const fromSearch = event.target.matches('input[type="search"]')
+    const fromButton = event.target === this.buttonTarget
     const visibleOptions = this.visibleOptions()
+
     if (fromSearch) {
       if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return
       if (visibleOptions.length === 0) return
       event.preventDefault()
       const targetIndex = event.key === "ArrowDown" ? 0 : visibleOptions.length - 1
-      this.rovingFocus(visibleOptions, targetIndex)
+      this.focusOption(visibleOptions[targetIndex])
+      return
+    }
+
+    if (fromButton && event.key === "ArrowDown" && this.focusSearch()) {
+      event.preventDefault()
       return
     }
 
@@ -162,16 +274,27 @@ export default class extends Controller {
       default: return
     }
     event.preventDefault()
-    this.rovingFocus(visibleOptions, nextIndex)
+    this.focusOption(visibleOptions[nextIndex])
   }
 
-  // Roving tabindex helper: makes the target option tabbable (and
-  // focuses it), clears tabindex on every other option in the listbox.
-  rovingFocus(visibleOptions, index) {
-    const all = this.hasOptionTarget ? this.optionTargets : []
-    const target = visibleOptions[index]
-    all.forEach(opt => opt.setAttribute("tabindex", opt === target ? "0" : "-1"))
-    target.focus()
+  focusOption(option) {
+    if (!option) return
+    option.focus({ preventScroll: true })
+    option.scrollIntoView({ block: "nearest" })
+  }
+
+  resetOptionTabindex() {
+    if (!this.hasOptionTarget) return
+    this.optionTargets.forEach(opt => opt.setAttribute("tabindex", "-1"))
+  }
+
+  setMenuInert(inert) {
+    if (!this.hasMenuTarget) return
+    if (inert) {
+      this.menuTarget.setAttribute("inert", "")
+    } else {
+      this.menuTarget.removeAttribute("inert")
+    }
   }
 
   // Options the user can currently see — list-filter hides non-matches
@@ -181,17 +304,19 @@ export default class extends Controller {
     return options.filter(opt => opt.style.display !== "none")
   }
 
-  // After list-filter#filter runs, the option holding tabindex="0" may
-  // be hidden. Promote the first visible option so Tab from the search
-  // input still lands somewhere reachable; if none match, no-op.
+  // After list-filter#filter runs, a keyboard-focused option may be hidden.
+  // Repoint focus to the first visible match. Leave the search input and
+  // trigger alone — this handler also runs on every search keystroke.
   syncTabindex() {
     const visible = this.visibleOptions()
     if (visible.length === 0) return
-    const tabbable = visible.find(opt => opt.getAttribute("tabindex") === "0")
-    if (tabbable) return
-    const all = this.hasOptionTarget ? this.optionTargets : []
-    all.forEach(opt => opt.setAttribute("tabindex", "-1"))
-    visible[0].setAttribute("tabindex", "0")
+
+    const active = document.activeElement
+    if (active.matches('input[type="search"]') && this.menuTarget.contains(active)) return
+    if (!this.hasOptionTarget || !this.optionTargets.includes(active)) return
+    if (visible.includes(active)) return
+
+    this.focusOption(visible[0])
   }
 
   handleTurboLoad() { if (this.isOpen) this.close() }
@@ -258,4 +383,4 @@ export default class extends Controller {
       this.menuTarget.style.maxHeight = `${Math.max(0, spaceBelow - this.offsetValue)}px`
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/controllers/settings_scroll_controller.js b/app/javascript/controllers/settings_scroll_controller.js
new file mode 100644
index 000000000..585be9bcc
--- /dev/null
+++ b/app/javascript/controllers/settings_scroll_controller.js
@@ -0,0 +1,39 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Preserves the settings content scroll position PER PAGE across Turbo Drive
+// navigation. Settings nav items are plain links (full-body Turbo visits), and
+// Turbo only restores window scroll — so this nested overflow-y-auto container
+// snaps to top on every visit.
+//
+// Keyed by pathname: returning to a page restores its scroll, a brand-new page
+// starts at the top, and a same-page re-render (e.g. a settings form that
+// auto-submits) keeps scroll. This differs from the nav's `preserve-scroll`
+// controller, which intentionally carries one position across all pages because
+// the nav is the same persistent element on every settings page.
+export default class extends Controller {
+  static positions = {};
+
+  connect() {
+    this.save = this.save.bind(this);
+    document.addEventListener("turbo:before-cache", this.save);
+    this.restore();
+  }
+
+  disconnect() {
+    document.removeEventListener("turbo:before-cache", this.save);
+  }
+
+  save() {
+    this.constructor.positions[window.location.pathname] = {
+      top: this.element.scrollTop,
+      left: this.element.scrollLeft,
+    };
+  }
+
+  restore() {
+    const pos = this.constructor.positions[window.location.pathname];
+    if (!pos) return;
+    this.element.scrollTop = pos.top;
+    this.element.scrollLeft = pos.left;
+  }
+}
diff --git a/app/javascript/controllers/sidebar_resize_controller.js b/app/javascript/controllers/sidebar_resize_controller.js
new file mode 100644
index 000000000..0ea840a67
--- /dev/null
+++ b/app/javascript/controllers/sidebar_resize_controller.js
@@ -0,0 +1,198 @@
+import { Controller } from "@hotwired/stimulus";
+import {
+  SIDEBAR_ABS_MAX,
+  SIDEBAR_DEFAULTS,
+  clampSidebarWidth,
+} from "utils/sidebar_resize";
+
+// Drives the draggable dividers on the left (accounts) and right (assistant)
+// sidebars. The chosen width is stored as a CSS variable on the root layout
+// element (consumed via `max-width: var(--left-sidebar-width)`) and persisted
+// per-device in localStorage. Width changes compose with the show/hide toggle
+// owned by app_layout_controller — collapsing wins via `w-0`, reopening
+// restores the last width.
+//
+// Connects to data-controller="sidebar-resize"
+export default class extends Controller {
+  static targets = ["leftSidebar", "rightSidebar"];
+
+  static STORAGE_KEYS = {
+    left: "sure.sidebarWidth.left",
+    right: "sure.sidebarWidth.right",
+  };
+  // Keyboard nudge step (px) for the focusable divider handles.
+  static KEY_STEP = 16;
+
+  #drag = null;
+  #onMove = null;
+  #onUp = null;
+
+  connect() {
+    this.#applyStoredWidth("left");
+    this.#applyStoredWidth("right");
+  }
+
+  disconnect() {
+    this.#teardownListeners();
+  }
+
+  startLeft(event) {
+    this.#startResize(event, "left");
+  }
+
+  startRight(event) {
+    this.#startResize(event, "right");
+  }
+
+  // Arrow keys nudge the focused divider; Home resets to the default width.
+  keyLeft(event) {
+    this.#keyResize(event, "left");
+  }
+
+  keyRight(event) {
+    this.#keyResize(event, "right");
+  }
+
+  // Double-clicking a divider restores its default width.
+  resetLeft() {
+    this.#commitWidth("left", SIDEBAR_DEFAULTS.left);
+  }
+
+  resetRight() {
+    this.#commitWidth("right", SIDEBAR_DEFAULTS.right);
+  }
+
+  #startResize(event, side) {
+    const sidebar = this.#sidebar(side);
+    if (!sidebar) return;
+
+    event.preventDefault();
+    this.#drag = { side, sidebar };
+
+    // Suppress the open/close transition so the panel tracks the pointer 1:1.
+    sidebar.style.transition = "none";
+    document.body.style.userSelect = "none";
+    document.body.style.cursor = "col-resize";
+
+    this.#onMove = (moveEvent) => this.#resize(moveEvent);
+    this.#onUp = () => this.#endResize();
+    window.addEventListener("pointermove", this.#onMove);
+    window.addEventListener("pointerup", this.#onUp, { once: true });
+  }
+
+  #resize(event) {
+    if (!this.#drag) return;
+
+    const { side, sidebar } = this.#drag;
+    const rect = sidebar.getBoundingClientRect();
+    // Left handle sits on the sidebar's right edge; right handle on its left.
+    const raw =
+      side === "left" ? event.clientX - rect.left : rect.right - event.clientX;
+
+    this.#setWidth(side, this.#clamp(side, raw));
+  }
+
+  #endResize() {
+    if (!this.#drag) return;
+
+    const { side, sidebar } = this.#drag;
+    sidebar.style.transition = "";
+    document.body.style.userSelect = "";
+    document.body.style.cursor = "";
+    this.#teardownListeners();
+
+    this.#persist(side, this.#currentWidth(side));
+    this.#drag = null;
+  }
+
+  #keyResize(event, side) {
+    // A left sidebar grows as its right edge moves right; a right sidebar grows
+    // as its left edge moves left. Mirror the arrow direction per side so the
+    // key matches the visual edge movement.
+    const dir = side === "left" ? 1 : -1;
+    const step = this.constructor.KEY_STEP;
+    let next;
+    if (event.key === "ArrowRight") {
+      next = this.#currentWidth(side) + dir * step;
+    } else if (event.key === "ArrowLeft") {
+      next = this.#currentWidth(side) - dir * step;
+    } else if (event.key === "Home") {
+      next = SIDEBAR_DEFAULTS[side];
+    } else {
+      return;
+    }
+
+    event.preventDefault();
+    this.#commitWidth(side, next);
+  }
+
+  #commitWidth(side, rawWidth) {
+    const width = this.#clamp(side, rawWidth);
+    this.#setWidth(side, width);
+    this.#persist(side, width);
+  }
+
+  #applyStoredWidth(side) {
+    let stored = Number.NaN;
+    try {
+      stored = Number.parseInt(
+        localStorage.getItem(this.constructor.STORAGE_KEYS[side]),
+        10,
+      );
+    } catch (_e) {
+      // Storage blocked (private mode / locked down) — fall back to default.
+    }
+    const requested = Number.isFinite(stored) ? stored : SIDEBAR_DEFAULTS[side];
+    this.#setWidth(side, this.#clamp(side, requested));
+  }
+
+  #clamp(side, rawWidth) {
+    const opposite = this.#sidebar(side === "left" ? "right" : "left");
+    // Use the opposite sidebar's *rendered* width, not its stored CSS variable:
+    // a collapsed sidebar renders at 0 (w-0), so its space is correctly freed
+    // for this one instead of staying reserved at the stored value.
+    const otherWidth = opposite
+      ? Math.round(opposite.getBoundingClientRect().width)
+      : 0;
+
+    return clampSidebarWidth(rawWidth, {
+      viewportWidth: window.innerWidth || 1280,
+      otherWidth,
+      absMax: SIDEBAR_ABS_MAX[side],
+    });
+  }
+
+  #persist(side, width) {
+    try {
+      localStorage.setItem(this.constructor.STORAGE_KEYS[side], String(width));
+    } catch (_e) {
+      // Private browsing / storage disabled — width still applies for this session.
+    }
+  }
+
+  #setWidth(side, width) {
+    this.element.style.setProperty(`--${side}-sidebar-width`, `${width}px`);
+  }
+
+  #currentWidth(side) {
+    const value = Number.parseInt(
+      this.element.style.getPropertyValue(`--${side}-sidebar-width`),
+      10,
+    );
+    return Number.isFinite(value) ? value : SIDEBAR_DEFAULTS[side];
+  }
+
+  #sidebar(side) {
+    if (side === "left") {
+      return this.hasLeftSidebarTarget ? this.leftSidebarTarget : null;
+    }
+    return this.hasRightSidebarTarget ? this.rightSidebarTarget : null;
+  }
+
+  #teardownListeners() {
+    if (this.#onMove) window.removeEventListener("pointermove", this.#onMove);
+    if (this.#onUp) window.removeEventListener("pointerup", this.#onUp);
+    this.#onMove = null;
+    this.#onUp = null;
+  }
+}
diff --git a/app/javascript/controllers/sync_toast_controller.js b/app/javascript/controllers/sync_toast_controller.js
index 567f54635..20cfc4c9e 100644
--- a/app/javascript/controllers/sync_toast_controller.js
+++ b/app/javascript/controllers/sync_toast_controller.js
@@ -2,32 +2,114 @@ import { Controller } from "@hotwired/stimulus";
 
 // Connects to data-controller="sync-toast"
 //
-// Shown when a background sync completes and the family's data changes.
-// - If the user is not interacting with a form, auto-reloads after a short delay.
-// - If the user is mid-form, the toast stays visible so they can choose when to refresh.
+// Shown when a background sync completes and the family's data has changed.
+// - Idle              → morph-refreshes the page after a short delay.
+// - Mid-form          → stays put; the user refreshes when ready.
+// - A modal <dialog> is open → the toast is deferred (it would otherwise sit
+//   dimmed-but-clickable behind the dialog's top-layer backdrop, and a refresh
+//   would close the dialog and discard its in-progress input). It is revealed
+//   once the dialog closes — the first moment a refresh is actually safe.
 export default class extends Controller {
   static values = {
     autoRefreshDelay: { type: Number, default: 2000 },
   };
 
   connect() {
-    if (!this.#userIsInteracting()) {
-      this._timer = setTimeout(() => this.refresh(), this.autoRefreshDelayValue);
+    if (this.#dialogOpen()) {
+      this.#deferUntilDialogCloses();
+      return;
     }
+    this.#arm();
   }
 
   disconnect() {
     clearTimeout(this._timer);
+    this.#removeDeferredDialogListener();
   }
 
+  // Turbo 8 morph refresh (the app sets `turbo_refreshes_with method: :morph,
+  // scroll: :preserve`) instead of window.location.reload(): no white flash,
+  // scroll position and `data-turbo-permanent` elements (the AI chat panel)
+  // are preserved.
   refresh() {
     clearTimeout(this._timer);
-    window.location.reload();
+    Turbo.visit(window.location.href, { action: "replace" });
+  }
+
+  #arm() {
+    if (this.#userIsInteracting()) return; // mid-form: wait for a manual refresh
+    // Re-check at fire time, not just arm time: the post-dialog reveal often
+    // lands on a form the dialog was sitting on, and the user resumes typing
+    // inside this window (a morph would wipe their non-turbo-permanent
+    // input). A dialog opened during the window is the same hazard — the
+    // refresh would close it. Either way, bail and leave the toast visible
+    // for a manual refresh, matching the mid-form behavior.
+    this._timer = setTimeout(() => {
+      if (this.#userIsInteracting() || this.#dialogOpen()) return;
+      this.refresh();
+    }, this.autoRefreshDelayValue);
+  }
+
+  #deferUntilDialogCloses() {
+    this.element.style.display = "none";
+    const dialog = document.querySelector("dialog[open]");
+    if (!dialog) {
+      this.#reveal();
+      return;
+    }
+    // Keep refs so disconnect() can detach this listener. Otherwise a toast
+    // replaced by a newer broadcast while the dialog is still open stays
+    // subscribed, and its now-detached controller fires #reveal()/#arm() on
+    // close — a spurious auto-refresh from a stale toast.
+    //
+    // Known edge: if this dialog leaves the DOM without firing `close` (e.g.
+    // a morph removes it), the toast stays hidden until the next broadcast
+    // replaces it. Acceptable: the next sync re-delivers the toast.
+    this._deferredDialog = dialog;
+    this._dialogCloseHandler = () => this.#onDialogClose();
+    dialog.addEventListener("close", this._dialogCloseHandler, { once: true });
+  }
+
+  #onDialogClose() {
+    // The `once` listener has already fired and detached itself.
+    this._deferredDialog = null;
+    this._dialogCloseHandler = null;
+    // Another dialog may still be open (stacked modals) — keep deferring until
+    // every dialog has closed.
+    if (this.#dialogOpen()) {
+      this.#deferUntilDialogCloses();
+      return;
+    }
+    this.#reveal();
+  }
+
+  #removeDeferredDialogListener() {
+    if (this._deferredDialog && this._dialogCloseHandler) {
+      this._deferredDialog.removeEventListener(
+        "close",
+        this._dialogCloseHandler,
+      );
+    }
+    this._deferredDialog = null;
+    this._dialogCloseHandler = null;
+  }
+
+  #reveal() {
+    this.element.style.display = "";
+    this.#arm();
+  }
+
+  #dialogOpen() {
+    return !!document.querySelector("dialog[open]");
   }
 
   #userIsInteracting() {
     const el = document.activeElement;
-    if (!el || el === document.body || el === document.documentElement) return false;
-    return el.isContentEditable || el.closest("form, dialog, [role='dialog']") !== null;
+    if (!el || el === document.body || el === document.documentElement)
+      return false;
+    return (
+      el.isContentEditable ||
+      el.closest("form, dialog, [role='dialog']") !== null
+    );
   }
 }
diff --git a/app/javascript/controllers/time_series_chart_controller.js b/app/javascript/controllers/time_series_chart_controller.js
index d4f4988af..3c358dd96 100644
--- a/app/javascript/controllers/time_series_chart_controller.js
+++ b/app/javascript/controllers/time_series_chart_controller.js
@@ -1,5 +1,6 @@
 import { Controller } from "@hotwired/stimulus";
 import * as d3 from "d3";
+import { CHART_TOOLTIP_CLASSES } from "utils/chart_tooltip";
 
 const parseLocalDate = d3.timeParse("%Y-%m-%d");
 
@@ -139,7 +140,18 @@ export default class extends Controller {
       .attr("d", this._d3Line)
       .attr("stroke-linejoin", "round")
       .attr("stroke-linecap", "round")
-      .attr("stroke-width", this.strokeWidthValue);
+      // A flat series (no variation across the period — a single valuation or an
+      // unchanged balance) otherwise renders as a full-bleed near-black rule
+      // bisecting the hero card. Draw it as a faint hairline so it reads as
+      // "no change", consistent across light and dark (#2137).
+      .attr("stroke-width", this._isFlatSeries ? 1 : this.strokeWidthValue)
+      .attr("stroke-opacity", this._isFlatSeries ? 0.4 : 1);
+  }
+
+  get _isFlatSeries() {
+    const min = d3.min(this._normalDataPoints, this._getDatumValue);
+    const max = d3.max(this._normalDataPoints, this._getDatumValue);
+    return min === max;
   }
 
   _installTrendlineSplit() {
@@ -287,10 +299,8 @@ export default class extends Controller {
     this._d3Tooltip = d3
       .select(`#${this.element.id}`)
       .append("div")
-      .attr(
-        "class",
-        "bg-container text-sm font-sans absolute p-2 border border-secondary rounded-lg pointer-events-none opacity-0 top-0 privacy-sensitive",
-      );
+      // Shared visual contract + this chart's initial-hidden / positioning classes.
+      .attr("class", `${CHART_TOOLTIP_CLASSES} opacity-0 top-0`);
   }
 
   _trackMouseForShowingTooltip() {
@@ -386,11 +396,11 @@ export default class extends Controller {
 
   _tooltipTemplate(datum) {
     return `
-      <div style="margin-bottom: 4px; color: var(--color-gray-500);">
+      <div class="text-xs text-secondary mb-1">
         ${datum.date_formatted}
       </div>
       <div class="flex items-center gap-4">
-        <div class="flex items-center gap-2 text-primary">
+        <div class="flex items-center gap-2 text-primary font-medium tabular-nums">
           <div class="flex items-center justify-center h-4 w-4">
             ${this._getTrendIcon(datum)}
           </div>
@@ -401,7 +411,7 @@ export default class extends Controller {
           datum.trend.value === 0
             ? `<span class="w-20"></span>`
             : `
-          <span style="color: ${datum.trend.color};">
+          <span class="tabular-nums" style="color: ${datum.trend.color};">
             ${this._extractFormattedValue(datum.trend.value)} (${datum.trend.percent_formatted})
           </span>
         `
diff --git a/app/javascript/controllers/transaction_type_tabs_controller.js b/app/javascript/controllers/transaction_type_tabs_controller.js
index e347121de..ca16a0459 100644
--- a/app/javascript/controllers/transaction_type_tabs_controller.js
+++ b/app/javascript/controllers/transaction_type_tabs_controller.js
@@ -1,21 +1,26 @@
-import { Controller } from "@hotwired/stimulus"
-
-const ACTIVE_CLASSES = ["bg-container", "text-primary", "shadow-sm"]
-const INACTIVE_CLASSES = ["hover:bg-container", "text-subdued", "hover:text-primary", "hover:shadow-sm"]
+import { Controller } from "@hotwired/stimulus";
 
+// Expense / income tabs render as a DS::SegmentedControl. Switching is
+// client-side here: it updates the form's hidden nature field and flips the
+// active segment without navigating (the href is a progressive-enhancement
+// fallback). Transfer is a plain link to the transfer form.
 export default class extends Controller {
-  static targets = ["tab", "natureField"]
+  static targets = ["tab", "natureField"];
 
   selectTab(event) {
-    event.preventDefault()
+    event.preventDefault();
 
-    const selectedTab = event.currentTarget
-    this.natureFieldTarget.value = selectedTab.dataset.nature
+    const selectedTab = event.currentTarget;
+    this.natureFieldTarget.value = selectedTab.dataset.nature;
 
-    this.tabTargets.forEach(tab => {
-      const isActive = tab === selectedTab
-      tab.classList.remove(...(isActive ? INACTIVE_CLASSES : ACTIVE_CLASSES))
-      tab.classList.add(...(isActive ? ACTIVE_CLASSES : INACTIVE_CLASSES))
-    })
+    this.tabTargets.forEach((tab) => {
+      const isActive = tab === selectedTab;
+      tab.classList.toggle("segmented-control__segment--active", isActive);
+      if (isActive) {
+        tab.setAttribute("aria-current", "true");
+      } else {
+        tab.removeAttribute("aria-current");
+      }
+    });
   }
 }
diff --git a/app/javascript/utils/chart_tooltip.js b/app/javascript/utils/chart_tooltip.js
new file mode 100644
index 000000000..228095602
--- /dev/null
+++ b/app/javascript/utils/chart_tooltip.js
@@ -0,0 +1,39 @@
+// Single source of truth for the cursor-following tooltip used by the chart
+// controllers (time-series, sankey, and goal-projection once it lands from the
+// goals work). Keeping the visual contract here stops the bg / text / border /
+// privacy-sensitive classes from drifting apart across the controllers, the way
+// they had before (time-series was missing `text-primary` and `z-50`).
+//
+// This is the VISUAL contract only. Callers append their own behavioural
+// classes (initial `opacity-0`, `top-0`, …) or set them via inline styles,
+// because how each chart shows/hides and positions its tooltip differs.
+//
+// Not to be confused with DS::Tooltip — that is the info-icon hint primitive
+// (bg-inverse, aria-describedby, anchored to a static trigger). This is a
+// data-card surface created and updated inside D3 handler code.
+// The surface itself lives in the design system as `.chart-tooltip`
+// (sure-design-system/components.css): container bg, 10px radius, 12x14
+// padding, hairline ring composed with a soft 8/24 drop shadow, 80ms
+// left/top glide. It's a component class because Tailwind shadow utilities
+// can't compose a ring with a custom drop shadow. This constant adds the
+// behavioural classes shared by every chart tooltip.
+export const CHART_TOOLTIP_CLASSES =
+  "chart-tooltip text-primary text-sm font-sans absolute pointer-events-none z-50 privacy-sensitive";
+
+// Content conventions (kept here so the controllers stay aligned):
+//   - context line (date / node title): `text-xs text-secondary mb-1`
+//   - money / numeric figures: tabular-nums so digits don't jitter while the
+//     scrubber moves (sans, not mono — the app's money convention everywhere
+//     else); secondary parentheticals in `text-secondary`
+export const CHART_TOOLTIP_CONTEXT_CLASSES = "text-xs text-secondary mb-1";
+export const CHART_TOOLTIP_VALUE_CLASSES = "font-medium tabular-nums";
+
+// Convenience factory for the raw-DOM idiom (no d3.select). Creates a hidden
+// tooltip div carrying the shared contract and appends it to `parent`.
+export function createChartTooltip(parent) {
+  const tooltip = document.createElement("div");
+  tooltip.className = CHART_TOOLTIP_CLASSES;
+  tooltip.style.display = "none";
+  parent.appendChild(tooltip);
+  return tooltip;
+}
diff --git a/app/javascript/utils/sidebar_resize.js b/app/javascript/utils/sidebar_resize.js
new file mode 100644
index 000000000..39d59a818
--- /dev/null
+++ b/app/javascript/utils/sidebar_resize.js
@@ -0,0 +1,42 @@
+// Pure geometry helpers for the resizable app sidebars.
+//
+// Kept free of any DOM access so the clamping logic can be unit-tested in
+// isolation. Must be kept in sync with
+// test/javascript/utils/sidebar_resize_test.mjs.
+
+// Width of the always-visible icon navbar to the left of the sidebars.
+export const SIDEBAR_NAVBAR_WIDTH = 84;
+// Smallest a sidebar may shrink to while still being usable.
+export const SIDEBAR_MIN_WIDTH = 240;
+// Minimum breathing room the center content must always keep so the dashboard
+// stays legible no matter how wide the sidebars are dragged.
+export const SIDEBAR_MIN_MAIN_WIDTH = 400;
+
+export const SIDEBAR_DEFAULTS = { left: 320, right: 400 };
+// Hard upper bounds per side, regardless of how much room is available.
+export const SIDEBAR_ABS_MAX = { left: 480, right: 560 };
+
+// Clamp a requested sidebar width to a value that respects the per-side bounds
+// AND guarantees the center column keeps at least SIDEBAR_MIN_MAIN_WIDTH.
+//
+// rawWidth   - desired width in px (e.g. derived from the pointer position)
+// viewportWidth - window.innerWidth
+// otherWidth - current width of the opposite sidebar (0 if collapsed/hidden)
+export function clampSidebarWidth(
+  rawWidth,
+  {
+    viewportWidth,
+    otherWidth = 0,
+    navbarWidth = SIDEBAR_NAVBAR_WIDTH,
+    min = SIDEBAR_MIN_WIDTH,
+    minMain = SIDEBAR_MIN_MAIN_WIDTH,
+    absMax = Number.POSITIVE_INFINITY,
+  } = {},
+) {
+  const available = viewportWidth - navbarWidth - otherWidth - minMain;
+  // Never let the computed max fall below `min`; if the viewport is genuinely
+  // too small we pin to `min` and accept the squeeze rather than going invalid.
+  const max = Math.max(min, Math.min(absMax, available));
+  const clamped = Math.min(Math.max(rawWidth, min), max);
+  return Math.round(clamped);
+}
diff --git a/app/javascript/utils/transactions_filter_url.mjs b/app/javascript/utils/transactions_filter_url.mjs
new file mode 100644
index 000000000..b10c9b01b
--- /dev/null
+++ b/app/javascript/utils/transactions_filter_url.mjs
@@ -0,0 +1,23 @@
+// Category nodes in the cashflow Sankey have ids prefixed income_/expense_
+// (incl. *_sub_). Structural nodes (cash_flow_node, surplus_node) are not
+// categories and must not deep-link to transactions.
+export function isNavigableCategoryNode(id) {
+  return /^(income|expense)_/.test(id);
+}
+
+// Builds a relative deep link to the transactions index, filtered by a single
+// category name and (optionally) a start/end date range. Mirrors the params
+// the transactions search form submits: q[categories][], q[start_date],
+// q[end_date].
+export function buildCategoryTransactionsUrl({
+  name,
+  startDate,
+  endDate,
+  basePath = "/transactions",
+}) {
+  const params = new URLSearchParams();
+  params.append("q[categories][]", name);
+  if (startDate) params.append("q[start_date]", startDate);
+  if (endDate) params.append("q[end_date]", endDate);
+  return `${basePath}?${params.toString()}`;
+}
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
index 25727230f..104f5cd39 100644
--- a/app/jobs/application_job.rb
+++ b/app/jobs/application_job.rb
@@ -1,4 +1,18 @@
 class ApplicationJob < ActiveJob::Base
+  # Defer enqueuing until the surrounding Active Record transaction commits, so a
+  # job is never picked up by a worker before the records it references (by
+  # GlobalID) are committed and visible on the worker's connection — and is
+  # dropped entirely if the transaction rolls back. Without this, a job enqueued
+  # inside a transaction can be dequeued before COMMIT, fail to load its
+  # arguments (ActiveJob::DeserializationError), and be silently dropped by the
+  # `discard_on` below — the "stuck sync" regression for SyncJob enqueued in
+  # Syncable#sync_later.
+  #
+  # This is the Rails 8.2 default. On 8.1 the global
+  # `config.active_job.enqueue_after_transaction_commit` toggle is non-functional,
+  # so we set the class attribute on the base job, which every job inherits.
+  self.enqueue_after_transaction_commit = true
+
   retry_on ActiveRecord::Deadlocked
   discard_on ActiveJob::DeserializationError
   queue_as :low_priority # default queue
diff --git a/app/jobs/destroy_job.rb b/app/jobs/destroy_job.rb
index ba937e61f..8d9483536 100644
--- a/app/jobs/destroy_job.rb
+++ b/app/jobs/destroy_job.rb
@@ -1,6 +1,10 @@
 class DestroyJob < ApplicationJob
   queue_as :low_priority
-  self.enqueue_after_transaction_commit = :never
+  # Inherits enqueue_after_transaction_commit = true from ApplicationJob. (This
+  # previously read `= :never`, the removed Rails 7.2 symbol API; under 8.1 that
+  # symbol is truthy, so it already deferred — the explicit line was dead and
+  # misleading.) Deferring is correct here: destroy after the enclosing
+  # transaction commits, never against an uncommitted/rolled-back record.
 
   def perform(model)
     model.destroy
diff --git a/app/jobs/family_data_export_job.rb b/app/jobs/family_data_export_job.rb
index 1b62bd66c..78bb1cff3 100644
--- a/app/jobs/family_data_export_job.rb
+++ b/app/jobs/family_data_export_job.rb
@@ -2,6 +2,12 @@ class FamilyDataExportJob < ApplicationJob
   queue_as :default
 
   def perform(family_export)
+    # Terminal statuses own the record: a redelivered job must not restart a
+    # completed export, and one the reaper already failed stays failed.
+    # A processing export is allowed through — graceful worker shutdowns
+    # re-enqueue in-flight jobs, and that redelivery is what completes it.
+    return if family_export.completed? || family_export.failed?
+
     family_export.update!(status: :processing)
 
     exporter = Family::DataExporter.new(family_export.family)
diff --git a/app/jobs/generate_insights_job.rb b/app/jobs/generate_insights_job.rb
new file mode 100644
index 000000000..311071950
--- /dev/null
+++ b/app/jobs/generate_insights_job.rb
@@ -0,0 +1,184 @@
+class GenerateInsightsJob < ApplicationJob
+  queue_as :scheduled
+  sidekiq_options lock: :until_executed, on_conflict: :log
+
+  # Without args (cron): fans out one job per family.
+  # With family_id: generates and upserts that family's insights.
+  def perform(family_id: nil)
+    if family_id.present?
+      generate_for_family(family_id)
+    else
+      fan_out
+    end
+  end
+
+  private
+    # Insights are a preview feature, so the nightly sweep only visits families
+    # with an opted-in member. Unlike a job that moves existing data around,
+    # this one manufactures data per family — seven generators over the income
+    # statement and balance sheet, plus paid LLM narration — so running it for
+    # families who can't see the result is pure waste. Scoped in SQL rather
+    # than checked per family to keep the fan-out a single indexed query.
+    def fan_out
+      Family.with_preview_features.find_each do |family|
+        GenerateInsightsJob.perform_later(family_id: family.id)
+      rescue => e
+        Rails.logger.error("Failed to enqueue insight generation for family #{family.id}: #{e.message}")
+      end
+    end
+
+    def generate_for_family(family_id)
+      family = Family.find_by(id: family_id)
+      return unless family
+      return if family.accounts.none?
+      # Also checked here, not just at the fan-out: this path is reachable
+      # directly via perform_later(family_id:) from the refresh action and the
+      # console. Returning above the lock means a gated family skips the
+      # broadcast below too, not just the generation.
+      return unless family.preview_features_enabled?
+
+      with_advisory_lock(family_id) do
+        I18n.with_locale(family.locale) do
+          result = Insight::GeneratorRegistry.new(family).generate_all
+          upsert_insights(family, result.insights)
+          expire_stale_insights(family, result)
+        end
+      end
+
+      # Outside the lock on purpose: even a lock-skipped run re-broadcasts the
+      # current state, so a subscribed /insights page (waiting on its manual
+      # refresh) always gets its list and button restored.
+      broadcast_feed(family)
+    end
+
+    def broadcast_feed(family)
+      insights = family.insights.visible.ordered.to_a
+      unread_ids = insights.select(&:active?).map(&:id).to_set
+
+      Turbo::StreamsChannel.broadcast_replace_to(
+        [ family, :insights ],
+        target: "insights-list",
+        partial: "insights/list",
+        locals: { insights: insights, unread_ids: unread_ids }
+      )
+      Turbo::StreamsChannel.broadcast_replace_to(
+        [ family, :insights ],
+        target: "insights-refresh",
+        partial: "insights/refresh_button",
+        locals: { pending: false }
+      )
+    end
+
+    # A visible insight whose generator ran successfully but did not re-emit
+    # its dedup_key has had its condition clear — hide it. Types whose
+    # generator crashed are left untouched so a transient failure can't wipe
+    # out healthy insights.
+    def expire_stale_insights(family, result)
+      family.insights
+        .visible
+        .where(insight_type: result.succeeded_types)
+        .where.not(dedup_key: result.insights.map(&:dedup_key))
+        .update_all(status: "expired", updated_at: Time.current)
+    end
+
+    def upsert_insights(family, generated_insights)
+      writer = Insight::BodyWriter.new(family)
+
+      generated_insights.each do |generated|
+        metadata = normalize_json(generated.metadata)
+        facts = normalize_json(generated.facts)
+        existing = family.insights.find_by(dedup_key: generated.dedup_key)
+
+        if existing.nil?
+          family.insights.create!(
+            insight_type: generated.insight_type,
+            priority: generated.priority,
+            status: "active",
+            title: generated.title,
+            body: writer.write(generated),
+            metadata: metadata,
+            facts: facts,
+            currency: generated.currency,
+            period_start: generated.period_start,
+            period_end: generated.period_end,
+            generated_at: Time.current,
+            dedup_key: generated.dedup_key
+          )
+        elsif existing.metadata != metadata
+          # The numbers changed materially: refresh the prose and resurface the
+          # insight even if the user had read or dismissed the stale version.
+          existing.update!(
+            priority: generated.priority,
+            status: "active",
+            title: generated.title,
+            body: writer.write(generated),
+            metadata: metadata,
+            facts: facts,
+            period_start: generated.period_start,
+            period_end: generated.period_end,
+            generated_at: Time.current,
+            read_at: nil,
+            dismissed_at: nil
+          )
+        elsif existing.expired?
+          # The condition cleared earlier and has now returned with the same
+          # numbers. Expiry was the system's doing, not the user's, so the
+          # insight resurfaces; the body is still accurate, so no rewrite.
+          existing.update!(status: "active", facts: facts, generated_at: Time.current, read_at: nil)
+        else
+          # Same signal, same numbers: don't rewrite the body (avoids an LLM
+          # call) and don't undo the user's read/dismissed state. Facts still
+          # refresh — they're display values (key figure, link labels), and
+          # keeping them current is exactly why they're not part of the
+          # material-change comparison.
+          existing.update!(facts: facts, generated_at: Time.current)
+        end
+      rescue ActiveRecord::RecordNotUnique
+        # A concurrent run created the same dedup_key first; it owns this row.
+        next
+      rescue => e
+        DebugLogEntry.capture(
+          category: "insights",
+          level: "error",
+          message: "Failed to upsert insight #{generated.dedup_key}: #{e.class}: #{e.message}",
+          source: "GenerateInsightsJob",
+          family: family,
+          metadata: { dedup_key: generated.dedup_key, insight_type: generated.insight_type }
+        )
+      end
+    end
+
+    # GeneratedInsight metadata/facts may hold symbols, dates, or BigDecimals;
+    # the persisted jsonb columns round-trip everything to JSON primitives.
+    # Compare like with like or every nightly run would look like a material
+    # change.
+    def normalize_json(hash)
+      JSON.parse(hash.to_json)
+    end
+
+    def with_advisory_lock(family_id)
+      lock_key = advisory_lock_key(family_id)
+      acquired = ActiveRecord::Base.connection.select_value(
+        ActiveRecord::Base.sanitize_sql_array([ "SELECT pg_try_advisory_lock(?)", lock_key ])
+      )
+
+      unless acquired
+        Rails.logger.warn("Skipped insight generation for family #{family_id}: advisory lock unavailable")
+        return
+      end
+
+      begin
+        yield
+      ensure
+        ActiveRecord::Base.connection.execute(
+          ActiveRecord::Base.sanitize_sql_array([ "SELECT pg_advisory_unlock(?)", lock_key ])
+        )
+      end
+    end
+
+    def advisory_lock_key(family_id)
+      # Use (nearly) the full signed-bigint space pg_try_advisory_lock accepts
+      # to keep the collision odds between families negligible.
+      Digest::MD5.hexdigest("generate_insights:#{family_id}").to_i(16) % (2**62)
+    end
+end
diff --git a/app/jobs/import_session_job.rb b/app/jobs/import_session_job.rb
new file mode 100644
index 000000000..de7f0e377
--- /dev/null
+++ b/app/jobs/import_session_job.rb
@@ -0,0 +1,12 @@
+class ImportSessionJob < ApplicationJob
+  queue_as :high_priority
+
+  def perform(import_session)
+    raise ArgumentError, "ImportSessionJob requires an import_session" if import_session.nil?
+
+    Rails.logger.info("ImportSessionJob started import_session_id=#{import_session.id}")
+    import_session.publish
+    import_session.reload
+    Rails.logger.info("ImportSessionJob finished import_session_id=#{import_session.id} status=#{import_session.status}")
+  end
+end
diff --git a/app/jobs/questrade_activities_fetch_job.rb b/app/jobs/questrade_activities_fetch_job.rb
new file mode 100644
index 000000000..26337a424
--- /dev/null
+++ b/app/jobs/questrade_activities_fetch_job.rb
@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+class QuestradeActivitiesFetchJob < ApplicationJob
+  include QuestradeAccount::DataHelpers
+
+  queue_as :default
+
+  MAX_RETRIES = 6
+  RETRY_INTERVAL = 10.seconds
+
+  sidekiq_options lock: :until_executed,
+                  lock_args_method: ->(args) { args.first },
+                  on_conflict: :log
+
+  def perform(questrade_account, start_date: nil, retry_count: 0)
+    @questrade_account = questrade_account
+    @start_date = start_date || 3.years.ago.to_date
+    @retry_count = retry_count
+
+    return clear_pending_flag unless valid_for_fetch?
+
+    fetch_and_process_activities
+  rescue => e
+    Rails.logger.error("QuestradeActivitiesFetchJob error: #{e.class} - #{e.message}")
+    clear_pending_flag
+    raise
+  end
+
+  private
+
+    def valid_for_fetch?
+      return false unless @questrade_account
+      return false unless @questrade_account.questrade_item
+      return false unless @questrade_account.current_account
+      true
+    end
+
+    def fetch_and_process_activities
+      activities = fetch_activities
+
+      if activities.blank? && @retry_count < MAX_RETRIES
+        schedule_retry
+        return
+      end
+
+      if activities.any?
+        merged = merge_activities(existing_activities, activities)
+        @questrade_account.upsert_activities_snapshot!(merged)
+        QuestradeAccount::ActivitiesProcessor.new(@questrade_account).process
+      end
+
+      # Always record the fetch as completed (even for legitimately empty
+      # accounts) so the importer's fresh-account check stops re-queueing this.
+      @questrade_account.update!(last_activities_sync: Time.current)
+      clear_pending_flag
+      broadcast_updates
+    end
+
+    def fetch_activities
+      provider = @questrade_account.questrade_item.questrade_provider
+      return [] unless provider
+
+      response = provider.get_activities(
+        account_id: @questrade_account.questrade_account_id,
+        start_date: @start_date,
+        end_date: Date.current
+      )
+      Array(response.is_a?(Hash) ? response[:activities] : response)
+    rescue Provider::Questrade::AuthenticationError
+      # Re-raise auth errors - they need immediate attention
+      raise
+    rescue => e
+      # Transient errors trigger retry via blank response
+      Rails.logger.error("QuestradeActivitiesFetchJob - API error: #{e.message}")
+      []
+    end
+
+    def existing_activities
+      @questrade_account.raw_activities_payload || []
+    end
+
+    def merge_activities(existing, new_activities)
+      by_id = {}
+      existing.each { |a| by_id[activity_key(a)] = a }
+      new_activities.each do |a|
+        activity_hash = sdk_object_to_hash(a)
+        by_id[activity_key(activity_hash)] = activity_hash
+      end
+      by_id.values
+    end
+
+    def activity_key(activity)
+      activity = activity.with_indifferent_access if activity.is_a?(Hash)
+      # Questrade activities have no id; key on the immutable fields (same basis
+      # as QuestradeItem::Importer#activity_key) to dedup across syncs.
+      [ activity[:transactionDate], activity[:action], activity[:symbolId],
+        activity[:netAmount], activity[:description], activity[:currency], activity[:type] ].join("-")
+    end
+
+    def schedule_retry
+      Rails.logger.info(
+        "QuestradeActivitiesFetchJob - No activities found, scheduling retry " \
+        "#{@retry_count + 1}/#{MAX_RETRIES} in #{RETRY_INTERVAL.to_i}s"
+      )
+
+      self.class.set(wait: RETRY_INTERVAL).perform_later(
+        @questrade_account,
+        start_date: @start_date,
+        retry_count: @retry_count + 1
+      )
+    end
+
+    def clear_pending_flag
+      @questrade_account.update!(activities_fetch_pending: false)
+    rescue => e
+      # Best-effort: never let clearing the flag mask the original error in
+      # perform's rescue (which then re-raises).
+      Rails.logger.warn("QuestradeActivitiesFetchJob - failed to clear pending flag: #{e.message}")
+    end
+
+    def broadcast_updates
+      @questrade_account.current_account&.broadcast_sync_complete
+      @questrade_account.questrade_item&.broadcast_replace_to(
+        @questrade_account.questrade_item.family,
+        target: "questrade_item_#{@questrade_account.questrade_item.id}",
+        partial: "questrade_items/questrade_item"
+      )
+    rescue => e
+      Rails.logger.warn("QuestradeActivitiesFetchJob - Broadcast failed: #{e.message}")
+    end
+end
diff --git a/app/jobs/redbark_connection_cleanup_job.rb b/app/jobs/redbark_connection_cleanup_job.rb
new file mode 100644
index 000000000..e8e15da8d
--- /dev/null
+++ b/app/jobs/redbark_connection_cleanup_job.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class RedbarkConnectionCleanupJob < ApplicationJob
+  queue_as :default
+
+  def perform(redbark_item_id:, account_id:)
+    Rails.logger.info(
+      "RedbarkConnectionCleanupJob - Cleaning up for former account #{account_id}"
+    )
+
+    redbark_item = RedbarkItem.find_by(id: redbark_item_id)
+    return unless redbark_item
+
+    # For banking providers, cleanup is typically simpler since there's no
+    # separate authorization concept - the item itself holds the credentials.
+    # Override this method if your provider needs specific cleanup logic.
+
+    Rails.logger.info("RedbarkConnectionCleanupJob - Cleanup complete for account #{account_id}")
+  rescue => e
+    Rails.logger.warn(
+      "RedbarkConnectionCleanupJob - Failed: #{e.class} - #{e.message}"
+    )
+    # Don't raise - cleanup failures shouldn't block other operations
+  end
+end
diff --git a/app/jobs/rule_email_notification_job.rb b/app/jobs/rule_email_notification_job.rb
new file mode 100644
index 000000000..1be404c7a
--- /dev/null
+++ b/app/jobs/rule_email_notification_job.rb
@@ -0,0 +1,17 @@
+class RuleEmailNotificationJob < ApplicationJob
+  queue_as :medium_priority
+
+  def perform(rule_id, transaction_ids)
+    rule = Rule.find_by(id: rule_id)
+    return unless rule
+
+    transactions = rule.family.transactions
+                       .where(id: transaction_ids)
+                       .includes(entry: :account)
+                       .references(:entry)
+                       .order("entries.date DESC")
+                       .to_a
+
+    RuleNotificationMailer.digest(rule: rule, transactions: transactions).deliver_later if transactions.any?
+  end
+end
diff --git a/app/jobs/snaptrade_activities_fetch_job.rb b/app/jobs/snaptrade_activities_fetch_job.rb
index 18ecd3993..a0d45e3e8 100644
--- a/app/jobs/snaptrade_activities_fetch_job.rb
+++ b/app/jobs/snaptrade_activities_fetch_job.rb
@@ -29,20 +29,19 @@ class SnaptradeActivitiesFetchJob < ApplicationJob
       "retry #{retry_count}/#{MAX_RETRIES}, range: #{start_date} to #{end_date}"
     )
 
-    # Get provider and credentials
+    # Get provider (nil when the item is not authorized)
     snaptrade_item = snaptrade_account.snaptrade_item
     provider = snaptrade_item.snaptrade_provider
-    credentials = snaptrade_item.snaptrade_credentials
 
-    unless provider && credentials
-      Rails.logger.error("SnaptradeActivitiesFetchJob - No provider/credentials for account #{snaptrade_account.id}")
+    if provider.nil?
+      Rails.logger.error("SnaptradeActivitiesFetchJob - Item not authorized for account #{snaptrade_account.id}")
       snaptrade_account.update!(activities_fetch_pending: false)
       snaptrade_account.snaptrade_item.broadcast_sync_complete
       return
     end
 
     # Fetch activities from API
-    activities_data = fetch_activities(snaptrade_account, provider, credentials, start_date, end_date)
+    activities_data = fetch_activities(snaptrade_account, provider, start_date, end_date)
 
     if activities_data.any?
       Rails.logger.info(
@@ -95,25 +94,21 @@ class SnaptradeActivitiesFetchJob < ApplicationJob
 
   private
 
-    def fetch_activities(snaptrade_account, provider, credentials, start_date, end_date)
+    def fetch_activities(snaptrade_account, provider, start_date, end_date)
       response = provider.get_account_activities(
-        user_id: credentials[:user_id],
-        user_secret: credentials[:user_secret],
         account_id: snaptrade_account.snaptrade_account_id,
         start_date: start_date,
         end_date: end_date
       )
 
-      # Handle paginated response
-      activities = if response.respond_to?(:data)
-        response.data || []
+      activities = if response.is_a?(Hash)
+        response["data"] || []
       elsif response.is_a?(Array)
         response
       else
         []
       end
 
-      # Convert SDK objects to hashes
       activities.map { |a| sdk_object_to_hash(a) }
     end
 
diff --git a/app/jobs/snaptrade_connection_cleanup_job.rb b/app/jobs/snaptrade_connection_cleanup_job.rb
index 2320cb9d0..d5d418184 100644
--- a/app/jobs/snaptrade_connection_cleanup_job.rb
+++ b/app/jobs/snaptrade_connection_cleanup_job.rb
@@ -33,11 +33,10 @@ class SnaptradeConnectionCleanupJob < ApplicationJob
     end
 
     provider = snaptrade_item.snaptrade_provider
-    credentials = snaptrade_item.snaptrade_credentials
 
-    unless provider && credentials
+    unless provider
       Rails.logger.warn(
-        "SnaptradeConnectionCleanupJob - No provider/credentials for item #{snaptrade_item_id}"
+        "SnaptradeConnectionCleanupJob - Item #{snaptrade_item_id} not authorized, skipping API deletion"
       )
       return
     end
@@ -46,11 +45,7 @@ class SnaptradeConnectionCleanupJob < ApplicationJob
       "SnaptradeConnectionCleanupJob - Deleting SnapTrade connection #{authorization_id}"
     )
 
-    provider.delete_connection(
-      user_id: credentials[:user_id],
-      user_secret: credentials[:user_secret],
-      authorization_id: authorization_id
-    )
+    provider.delete_connection(authorization_id: authorization_id)
 
     Rails.logger.info(
       "SnaptradeConnectionCleanupJob - Successfully deleted connection #{authorization_id}"
diff --git a/app/jobs/snaptrade_follow_up_sync_job.rb b/app/jobs/snaptrade_follow_up_sync_job.rb
new file mode 100644
index 000000000..4ab91819a
--- /dev/null
+++ b/app/jobs/snaptrade_follow_up_sync_job.rb
@@ -0,0 +1,20 @@
+class SnaptradeFollowUpSyncJob < ApplicationJob
+  queue_as :high_priority
+
+  RETRY_DELAY = 10.seconds
+  MAX_ATTEMPTS = 30
+
+  def perform(snaptrade_item, attempts_remaining: MAX_ATTEMPTS)
+    if snaptrade_item.syncs.visible.exists?
+      if attempts_remaining.positive?
+        self.class.set(wait: RETRY_DELAY).perform_later(snaptrade_item, attempts_remaining: attempts_remaining - 1)
+      else
+        Rails.logger.warn("SnaptradeFollowUpSyncJob - gave up waiting for SnaptradeItem #{snaptrade_item.id} to finish syncing")
+      end
+
+      return
+    end
+
+    snaptrade_item.sync_later
+  end
+end
diff --git a/app/jobs/sync_cleaner_job.rb b/app/jobs/sync_cleaner_job.rb
index f5e425516..ea9799a95 100644
--- a/app/jobs/sync_cleaner_job.rb
+++ b/app/jobs/sync_cleaner_job.rb
@@ -1,7 +1,67 @@
 class SyncCleanerJob < ApplicationJob
   queue_as :scheduled
 
+  # Provider account rows flip activities_fetch_pending while a fetch-job chain
+  # runs; the chain's state lives only in job args, so a lost link strands the
+  # flag (and its "fetching" UI badge) forever.
+  ACTIVITY_FLAG_STUCK_AFTER = 6.hours
+  ACTIVITY_FLAG_MODELS = %w[SnaptradeAccount QuestradeAccount IndexaCapitalAccount].freeze
+
+  # Sweeps records whose background job died without finalizing them. A hard
+  # worker kill (OOM, SIGKILL during deploy) loses in-flight Sidekiq jobs
+  # permanently, leaving records wedged in non-terminal statuses. Each sweep is
+  # isolated so one failing model doesn't block the others.
   def perform
-    Sync.clean
+    sweep("syncs") { Sync.clean }
+    sweep("imports") { Import.clean }
+    sweep("import_sessions") { ImportSession.clean }
+    sweep("family_exports") { FamilyExport.clean }
+    sweep("pdf_imports") { PdfImport.clean }
+    sweep("provider_activity_flags") { clear_stuck_activity_fetch_flags }
   end
+
+  private
+    def sweep(label)
+      yield
+    rescue => e
+      Rails.logger.error("SyncCleanerJob sweep #{label} failed: #{e.class}: #{e.message}")
+      Sentry.capture_exception(e) do |scope|
+        scope.set_tags(sweep: label)
+      end
+    end
+
+    def clear_stuck_activity_fetch_flags
+      ACTIVITY_FLAG_MODELS.each do |model_name|
+        model = model_name.constantize
+        scope = model.where(activities_fetch_pending: true)
+                     .where("updated_at < ?", ACTIVITY_FLAG_STUCK_AFTER.ago)
+        scope = scope.includes(:account) if model.reflect_on_association(:account)
+        scope.find_each do |record|
+          # Read before the lock — see Import.reap_stuck!.
+          account = record.respond_to?(:account) ? record.account : nil
+
+          # Row-lock + re-check so a fetch chain finishing right now isn't
+          # clobbered mid-write (same guard as the reapers, see #2680).
+          record.with_lock do
+            next unless record.activities_fetch_pending? && record.updated_at < ACTIVITY_FLAG_STUCK_AFTER.ago
+
+            record.update!(activities_fetch_pending: false)
+
+            DebugLogEntry.capture(
+              category: "background_jobs",
+              level: "warn",
+              message: "Cleared #{model_name} activities_fetch_pending flag stuck for over #{ACTIVITY_FLAG_STUCK_AFTER.inspect}",
+              source: self.class.name,
+              account: account,
+              metadata: { record_type: model_name, record_id: record.id }
+            )
+          end
+        rescue => e
+          # One bad record must not abort the sweep for the rest of this
+          # model or the models still to come.
+          Rails.logger.error("SyncCleanerJob activity-flag sweep failed for #{model_name} #{record.id}: #{e.class}: #{e.message}")
+          Sentry.capture_exception(e) { |scope| scope.set_tags(record_type: model_name, record_id: record.id) } if defined?(Sentry)
+        end
+      end
+    end
 end
diff --git a/app/jobs/sync_property_valuations_job.rb b/app/jobs/sync_property_valuations_job.rb
new file mode 100644
index 000000000..b41279e7e
--- /dev/null
+++ b/app/jobs/sync_property_valuations_job.rb
@@ -0,0 +1,102 @@
+# Refreshes the valuation of properties linked to an AVM provider.
+#
+# Runs once per day (see config/schedule.yml) — never hourly — because the
+# provider budgets are tight monthly caps (RentCast 50/month, Realie
+# 25/month). Each provider additionally enforces its cap via a durable
+# monthly request counter, so refreshes stop once the month's budget is spent.
+class SyncPropertyValuationsJob < ApplicationJob
+  queue_as :scheduled
+  sidekiq_options lock: :until_executed, on_conflict: :log
+
+  def perform
+    registry = Provider::Registry.for_concept(:property_valuations)
+
+    # Stalest valuations first (never-synced before oldest-refreshed) so a
+    # tight monthly budget is spent where it matters most, not in
+    # primary-key order.
+    properties = Property.where.not(avm_provider: nil)
+                         .includes(:address, :account)
+                         .order(Arel.sql("avm_last_synced_on ASC NULLS FIRST"))
+
+    # One provider instance per key for the whole run — the request throttle
+    # tracks its last request time on the instance, so a fresh instance per
+    # property would bypass the inter-request delay.
+    providers = {}
+
+    properties.each do |property|
+      account = property.account
+      next unless account&.active?
+      next if property.avm_last_synced_on == Date.current
+
+      # Skip before spending a monthly-budget request: mirrors the
+      # import-time completeness check. A blank city/ZIP would also disable
+      # the wrong-city guard in the Realie lookup, letting a refresh accept
+      # another property's valuation — and the providers only cover the US.
+      address = property.address
+      if address.nil? ||
+          %i[line1 locality region postal_code].any? { |field| address[field].blank? } ||
+          (address.country.present? && !address.country.to_s.strip.match?(/\A(US|USA)\z/i))
+        capture_failure(property, account, "Skipping refresh: property address is incomplete or not a US address", level: "warn")
+        next
+      end
+
+      unless providers.key?(property.avm_provider)
+        providers[property.avm_provider] = begin
+          registry.get_provider(property.avm_provider)
+        rescue Provider::Registry::Error
+          nil
+        end
+      end
+
+      provider = providers[property.avm_provider]
+      next unless provider # API key was removed after the property was linked
+      next unless provider.requests_remaining?
+
+      # The account was created in the provider's currency, but the user can
+      # change it later. Writing a USD valuation as another currency would
+      # corrupt the balance, so skip mismatches — before spending a request.
+      unless account.currency == provider.valuation_currency
+        capture_failure(property, account, "Skipping refresh: account currency #{account.currency} does not match provider valuation currency #{provider.valuation_currency}", level: "warn")
+        next
+      end
+
+      response = provider.fetch_property_valuation(
+        line1: address.line1,
+        locality: address.locality,
+        region: address.region,
+        postal_code: address.postal_code
+      )
+
+      if response.success?
+        result = nil
+        Property.transaction do
+          result = account.set_current_balance(response.data.valuation)
+          raise ActiveRecord::Rollback unless result.success?
+          property.update!(avm_last_synced_on: Date.current)
+        end
+
+        unless result&.success?
+          capture_failure(property, account, "Failed to update valuation balance: #{result&.error}")
+        end
+      else
+        capture_failure(property, account, "Valuation refresh failed: #{response.error.message}")
+      end
+    rescue => e
+      capture_failure(property, property.account, "Error refreshing valuation: #{e.class} - #{e.message}")
+    end
+  end
+
+  private
+
+    def capture_failure(property, account, message, level: "error")
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: level,
+        message: message,
+        source: self.class.name,
+        provider_key: property.avm_provider,
+        account: account,
+        metadata: { property_id: property.id }
+      )
+    end
+end
diff --git a/app/jobs/yahoo_finance_health_check_job.rb b/app/jobs/yahoo_finance_health_check_job.rb
new file mode 100644
index 000000000..f1a6f1174
--- /dev/null
+++ b/app/jobs/yahoo_finance_health_check_job.rb
@@ -0,0 +1,5 @@
+class YahooFinanceHealthCheckJob < ApplicationJob
+  def perform
+    Provider::YahooFinance.new.refresh_health_status
+  end
+end
diff --git a/app/mailers/rule_notification_mailer.rb b/app/mailers/rule_notification_mailer.rb
new file mode 100644
index 000000000..6ae8a70aa
--- /dev/null
+++ b/app/mailers/rule_notification_mailer.rb
@@ -0,0 +1,20 @@
+class RuleNotificationMailer < ApplicationMailer
+  def digest(rule:, transactions:)
+    @rule = rule
+    @transactions = transactions
+    @family = rule.family
+    @transactions_url = transactions_url
+
+    # Admins only: the digest contains transaction details, so never widen the
+    # recipient set to a regular member/guest. super_admin is the family owner
+    # and must be included (see User#admin?); a self-hosted family is commonly a
+    # single super_admin. Skip delivery entirely when there is no admin.
+    recipient = @family.users.find_by(role: %w[admin super_admin])
+    return if recipient.nil?
+
+    mail(
+      to: recipient.email,
+      subject: t(".subject", count: transactions.size, product_name: product_name)
+    )
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 48a64b796..e2bb0c0bb 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -41,7 +41,14 @@ class Account < ApplicationRecord
 
   enum :classification, { asset: "asset", liability: "liability" }, validate: { allow_nil: true }
 
-  scope :visible, -> { where(status: [ "draft", "active" ]) }
+  VISIBLE_STATUSES = %w[draft active].freeze
+  HISTORICAL_STATUSES = (VISIBLE_STATUSES + %w[disabled]).freeze
+
+  scope :visible, -> { where(status: VISIBLE_STATUSES) }
+  scope :historical, -> { where(status: HISTORICAL_STATUSES) }
+  # Accounts whose data should be included in financial reports, dashboards,
+  # and exports. Excludes accounts where the user has opted to suppress them.
+  scope :included_in_reports, -> { where(exclude_from_reports: false) }
   scope :assets, -> { where(classification: "asset") }
   scope :liabilities, -> { where(classification: "liability") }
   scope :alphabetically, -> { order(:name) }
@@ -91,10 +98,43 @@ class Account < ApplicationRecord
   delegated_type :accountable, types: Accountable::TYPES, dependent: :destroy
   delegate :subtype, to: :accountable, allow_nil: true
 
-  # Writer for subtype that delegates to the accountable
-  # This allows forms to set subtype directly on the account
+  # Writer for subtype that delegates to the accountable, allowing forms to set
+  # subtype directly on the account.
+  #
+  # On create the accountable is not built yet, and the chosen subtype is easy to
+  # drop because of mass-assignment ordering. Two cases:
+  #
+  #   1. `subtype` is applied while `accountable_type` is already known — build
+  #      the accountable from the delegated type so the value lands on it. The
+  #      later `accountable_attributes` assignment (update_only) then updates that
+  #      same record instead of building a new one.
+  #   2. `subtype` is applied *before* `accountable_type` — this is the real
+  #      controller path: strong-params `permit` preserves filter order, and
+  #      `account_params` lists `:subtype` before `:accountable_type`, so the
+  #      writer runs while the type (and thus `accountable_class`) is still
+  #      unknown. We can't build the accountable yet, so stash the value and
+  #      apply it from `accountable_type=` once the type is set.
   def subtype=(value)
-    accountable&.subtype = value
+    self.accountable = accountable_class.new if accountable.nil? && accountable_type.present?
+
+    if accountable
+      accountable.subtype = value
+    else
+      @deferred_subtype = value
+    end
+  end
+
+  # Applies a subtype that arrived before the type was known (see `subtype=`
+  # case 2). `super` resolves `accountable_type`/`accountable_class` first, then
+  # the re-entrant `subtype=` builds the accountable and assigns the value.
+  def accountable_type=(value)
+    super
+
+    if defined?(@deferred_subtype)
+      pending = @deferred_subtype
+      remove_instance_variable(:@deferred_subtype)
+      self.subtype = pending
+    end
   end
 
   accepts_nested_attributes_for :accountable, update_only: true
@@ -240,6 +280,23 @@ class Account < ApplicationRecord
       )
     end
 
+    def create_from_wise_account(wise_account)
+      family = wise_account.wise_item.family
+
+      create_and_sync(
+        {
+          family: family,
+          name: wise_account.name || "Wise #{wise_account.currency}",
+          balance: wise_account.current_balance || 0,
+          cash_balance: wise_account.current_balance || 0,
+          currency: wise_account.currency,
+          accountable_type: "Depository",
+          accountable_attributes: { subtype: wise_account.account_subtype }
+        },
+        skip_initial_sync: true
+      )
+    end
+
     def create_from_coinbase_account(coinbase_account)
       # All Coinbase accounts are crypto exchange accounts
       family = coinbase_account.coinbase_item.family
@@ -295,6 +352,24 @@ class Account < ApplicationRecord
       create_and_sync(attributes, skip_initial_sync: true)
     end
 
+    def create_from_trading212_account(trading212_account)
+      family = trading212_account.trading212_item.family
+
+      attributes = {
+        family: family,
+        name: trading212_account.name.presence || "Trading 212",
+        balance: 0,
+        cash_balance: 0,
+        currency: trading212_account.currency.presence || family.currency,
+        accountable_type: "Investment",
+        accountable_attributes: {
+          subtype: "brokerage"
+        }
+      }
+
+      create_and_sync(attributes, skip_initial_sync: true)
+    end
+
     def create_from_kraken_account(kraken_account)
       create_from_crypto_exchange_account(kraken_account, family: kraken_account.kraken_item.family)
     end
@@ -367,7 +442,50 @@ class Account < ApplicationRecord
   # decision in one place so the new-pledge controller / preview helper
   # can't disagree on what they're going to save.
   def default_pledge_kind
-    manual? ? "manual_save" : "transfer"
+    # Investment accounts never use manual_save: a positive valuation delta on a
+    # brokerage is usually a market move, not a deposit, and would false-match a
+    # pledge. They resolve on transfer (cash-inflow) entries only.
+    manual? && !investment? ? "manual_save" : "transfer"
+  end
+
+  # Total fixed earmark this account currently has reserved across every
+  # non-archived goal (unallocated/whole-balance links reserve no fixed
+  # slice). Mirrors Budget#allocated_spending.
+  def goal_earmarked_total
+    GoalAccount.joins(:goal)
+               .where(account_id: id)
+               .where.not(allocated_amount: nil)
+               .where.not(goals: { state: "archived" })
+               .sum(:allocated_amount)
+               .to_d
+  end
+
+  # Headroom left to earmark toward goals before fixed allocations exceed the
+  # balance. Negative means the account is over-earmarked. Intended to back a
+  # non-blocking over-allocation warning (UI is a follow-up). Mirrors
+  # Budget#available_to_allocate.
+  def free_to_earmark
+    balance.to_d - goal_earmarked_total
+  end
+
+  # Total fixed earmark this account currently has reserved across every
+  # non-archived goal (unallocated/whole-balance links reserve no fixed
+  # slice). Mirrors Budget#allocated_spending.
+  def goal_earmarked_total
+    GoalAccount.joins(:goal)
+               .where(account_id: id)
+               .where.not(allocated_amount: nil)
+               .where.not(goals: { state: "archived" })
+               .sum(:allocated_amount)
+               .to_d
+  end
+
+  # Headroom left to earmark toward goals before fixed allocations exceed the
+  # balance. Negative means the account is over-earmarked. Intended to back a
+  # non-blocking over-allocation warning (UI is a follow-up). Mirrors
+  # Budget#available_to_allocate.
+  def free_to_earmark
+    balance.to_d - goal_earmarked_total
   end
 
   def logo_url
@@ -526,8 +644,12 @@ class Account < ApplicationRecord
   end
 
   def auto_share_with_family!
-    records = family.users.where.not(id: owner_id).pluck(:id).map do |user_id|
-      { account_id: id, user_id: user_id, permission: "read_write",
+    # Guests get read_only, everyone else read_write. This mirrors
+    # Family#auto_share_existing_accounts_with so a guest's permission on an
+    # account is the same whether they joined before or after it was created.
+    records = family.users.where.not(id: owner_id).pluck(:id, :role).map do |user_id, role|
+      { account_id: id, user_id: user_id,
+        permission: role == "guest" ? "read_only" : "read_write",
         include_in_finances: true, created_at: Time.current, updated_at: Time.current }
     end
 
diff --git a/app/models/account/chartable.rb b/app/models/account/chartable.rb
index 59bc85c2a..d84b43d9c 100644
--- a/app/models/account/chartable.rb
+++ b/app/models/account/chartable.rb
@@ -6,8 +6,10 @@ module Account::Chartable
     classification == "asset" ? "up" : "down"
   end
 
+  # Returns the chart Series for this account over the given period.
+  # Supported views: :balance, :cash_balance, :holdings_balance, :gains.
   def balance_series(period: Period.last_30_days, view: :balance, interval: nil)
-    raise ArgumentError, "Invalid view type" unless [ :balance, :cash_balance, :holdings_balance ].include?(view.to_sym)
+    raise ArgumentError, "Invalid view type" unless [ :balance, :cash_balance, :holdings_balance, :gains ].include?(view.to_sym)
 
     @balance_series ||= {}
 
diff --git a/app/models/account/linkable.rb b/app/models/account/linkable.rb
index b91d4ed83..a3d3b5c98 100644
--- a/app/models/account/linkable.rb
+++ b/app/models/account/linkable.rb
@@ -52,6 +52,11 @@ module Account::Linkable
     account_provider&.adapter
   end
 
+  # Returns the raw provider account record (e.g. EnableBankingAccount) for a specific provider type
+  def provider_account_for(provider_type)
+    account_providers.find_by(provider_type: provider_type)&.provider
+  end
+
   # Convenience method to get the provider name
   def provider_name
     # Try new system first
@@ -69,6 +74,13 @@ module Account::Linkable
     account_providers.exists?(provider_type: provider_type)
   end
 
+  # Whether this account's provider applies the category matcher to imported
+  # transactions. Only Plaid honors `enable_category_matcher` today; extend this
+  # when other providers (e.g. SimpleFIN) wire up category matching.
+  def supports_category_matcher?
+    plaid_account.present? || linked_to?("PlaidAccount")
+  end
+
   # Check if holdings can be deleted
   # If account has multiple providers, returns true only if ALL providers allow deletion
   # This prevents deleting holdings that would be recreated on next sync
diff --git a/app/models/account/provider_import_adapter.rb b/app/models/account/provider_import_adapter.rb
index acd2fd7cf..0e3a479ea 100644
--- a/app/models/account/provider_import_adapter.rb
+++ b/app/models/account/provider_import_adapter.rb
@@ -26,7 +26,7 @@ class Account::ProviderImportAdapter
   # @param extra [Hash, nil] Optional provider-specific metadata to merge into transaction.extra
   # @param investment_activity_label [String, nil] Optional activity type label (e.g., "Buy", "Dividend")
   # @return [Entry] The created or updated entry
-  def import_transaction(external_id:, amount:, currency:, date:, name:, source:, category_id: nil, merchant: nil, notes: nil, pending_transaction_id: nil, extra: nil, investment_activity_label: nil)
+  def import_transaction(external_id:, amount:, currency:, date:, name:, source:, category_id: nil, kind: nil, merchant: nil, notes: nil, pending_transaction_id: nil, extra: nil, investment_activity_label: nil)
     raise ArgumentError, "external_id is required" if external_id.blank?
     raise ArgumentError, "source is required" if source.blank?
 
@@ -208,7 +208,13 @@ class Account::ProviderImportAdapter
         detected_label = detect_activity_label(name, amount)
       end
 
-      # Auto-set kind for internal movements and contributions
+      # Determine the transaction kind. Activity-label and account-type classification
+      # take precedence; an explicit kind supplied by the provider is used as a fallback
+      # for the standard case. A provider such as Up flags internal transfers and
+      # round-ups (via relationships.transferAccount) and passes funds_movement, but a
+      # repayment imported onto a linked Loan/CreditCard account must stay
+      # loan_payment/cc_payment (a budgeted expense) rather than being reclassified, so
+      # the account-type branches below win over the provider hint.
       auto_kind = nil
       auto_category = nil
       if Transaction::INTERNAL_MOVEMENT_LABELS.include?(detected_label)
@@ -221,6 +227,7 @@ class Account::ProviderImportAdapter
       elsif account.accountable_type == "CreditCard" && amount.negative?
         auto_kind = "cc_payment"
       end
+      auto_kind ||= kind.presence
 
       # Set investment activity label, kind, and category if detected
       if entry.entryable.is_a?(Transaction)
@@ -770,6 +777,9 @@ class Account::ProviderImportAdapter
         OR (transactions.extra -> 'lunchflow' ->> 'pending')::boolean = true
         OR (transactions.extra -> 'enable_banking' ->> 'pending')::boolean = true
         OR (transactions.extra -> 'akahu' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'up' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'mercury' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'redbark' ->> 'pending')::boolean = true
       SQL
       .order(date: :desc) # Prefer most recent pending transaction
 
@@ -818,6 +828,9 @@ class Account::ProviderImportAdapter
         OR (transactions.extra -> 'lunchflow' ->> 'pending')::boolean = true
         OR (transactions.extra -> 'enable_banking' ->> 'pending')::boolean = true
         OR (transactions.extra -> 'akahu' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'up' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'mercury' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'redbark' ->> 'pending')::boolean = true
       SQL
 
     # If merchant_id is provided, prioritize matching by merchant
@@ -889,6 +902,9 @@ class Account::ProviderImportAdapter
         OR (transactions.extra -> 'lunchflow' ->> 'pending')::boolean = true
         OR (transactions.extra -> 'enable_banking' ->> 'pending')::boolean = true
         OR (transactions.extra -> 'akahu' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'up' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'mercury' ->> 'pending')::boolean = true
+        OR (transactions.extra -> 'redbark' ->> 'pending')::boolean = true
       SQL
 
     # For low confidence, require BOTH merchant AND name match (stronger signal needed)
diff --git a/app/models/account/reconciliation_manager.rb b/app/models/account/reconciliation_manager.rb
index 774e9b330..dd6915f34 100644
--- a/app/models/account/reconciliation_manager.rb
+++ b/app/models/account/reconciliation_manager.rb
@@ -9,10 +9,14 @@ class Account::ReconciliationManager
   def reconcile_balance(balance:, date: Date.current, dry_run: false, existing_valuation_entry: nil)
     old_balance_components = old_balance_components(reconciliation_date: date, existing_valuation_entry: existing_valuation_entry)
     prepared_valuation = prepare_reconciliation(balance, date, existing_valuation_entry)
+    # Captured before save!: the amount this valuation already had on disk
+    # (nil when this reconciliation creates it). See valuation_contribution.
+    prior_valuation_amount = prepared_valuation.amount_in_database
 
     unless dry_run
       prepared_valuation.save!
-      GoalPledge::Reconciler.new(prepared_valuation).run
+      contribution = valuation_contribution(prepared_valuation, prior_valuation_amount, old_balance_components)
+      GoalPledge::Reconciler.new(prepared_valuation, valuation_delta: contribution).run
     end
 
     ReconciliationResult.new(
@@ -42,6 +46,40 @@ class Account::ReconciliationManager
       keyword_init: true
     )
 
+    # Contribution recorded by this reconciliation: how much the balance moved
+    # vs. the prior balance. This (not the full new balance) is what a
+    # manual_save GoalPledge matches against.
+    #
+    # The prior balance is resolved in freshness order:
+    #   1. The valuation's own pre-save amount, when this reconciliation
+    #      updates an existing valuation. The balances table recomputes
+    #      asynchronously (sync_later fires after this manager returns), so a
+    #      same-date re-reconcile racing that sync would otherwise read the
+    #      pre-first-reconcile row and over- or under-state the delta — an
+    #      overstated delta could wrongly close a larger pledge, which never
+    #      self-heals. The valuation's own prior amount is immune to that
+    #      race, and once the sync lands the two sources are identical (the
+    #      valuation anchors that date's end_balance).
+    #   2. The balances-table row for the date (first reconcile on a date).
+    #      This can still be stale in one residual window: a reconcile on a
+    #      NEW date racing the previous date's pending sync reads a
+    #      carried-forward row. A missed match self-heals on the next re-save
+    #      — the pledge stays open and retryable until `expires_at`, and the
+    #      date/amount tolerance in GoalPledge#matches? accepts the retry.
+    #   3. 0, for a brand-new account with no balance record yet, so the
+    #      first reconciliation's full balance is its contribution.
+    #
+    # The delta is only ever consumed by manual_save pledges, which never
+    # attach to investment accounts: Account#default_pledge_kind forces
+    # `transfer` there and GoalPledge#matches? rejects valuation deltas on
+    # investment accounts (a market move isn't a deposit). So a positive delta
+    # only feeds depository saves, where balances are positive and a positive
+    # delta really is a deposit — the reconciler's positive-delta guard holds.
+    def valuation_contribution(valuation, prior_valuation_amount, old_balance_components)
+      prior_balance = prior_valuation_amount || old_balance_components[:balance] || 0
+      valuation.amount.to_d - prior_balance.to_d
+    end
+
     def prepare_reconciliation(balance, date, existing_valuation)
       valuation_record = existing_valuation ||
                          account.entries.valuations.find_by(date: date) || # In case of conflict, where existing valuation is not passed as arg, but one exists
diff --git a/app/models/account/syncer.rb b/app/models/account/syncer.rb
index 874091f81..60c2917c7 100644
--- a/app/models/account/syncer.rb
+++ b/app/models/account/syncer.rb
@@ -13,7 +13,7 @@ class Account::Syncer
   end
 
   def perform_post_sync
-    account.family.auto_match_transfers!
+    account.family.auto_match_transfers!(account: account)
   end
 
   private
diff --git a/app/models/account_statement/coverage.rb b/app/models/account_statement/coverage.rb
index 225df183c..33233d72d 100644
--- a/app/models/account_statement/coverage.rb
+++ b/app/models/account_statement/coverage.rb
@@ -130,11 +130,11 @@ class AccountStatement::Coverage
       linked_statements = statements_covering(linked_statement_scope, month)
       ambiguous_statements = statements_covering(ambiguous_statement_scope, month)
 
-      status = if linked_statements.size > 1
+      status = if linked_statements.many? && overlapping_statements?(linked_statements)
         "duplicate"
       elsif linked_statements.any? { |statement| statement.reconciliation_mismatched?(balance_lookup: balance_lookup) }
         "mismatched"
-      elsif linked_statements.one?
+      elsif linked_statements.any?
         "covered"
       elsif ambiguous_statements.any?
         "ambiguous"
@@ -177,6 +177,13 @@ class AccountStatement::Coverage
       end
     end
 
+    def overlapping_statements?(statements)
+      statements.combination(2).any? do |a, b|
+        a.period_start_on <= b.period_end_on &&
+          b.period_start_on <= a.period_end_on
+      end
+    end
+
     def balance_lookup
       @balance_lookup ||= begin
         currencies = linked_statement_scope.map(&:statement_currency).compact.uniq
diff --git a/app/models/actual_import.rb b/app/models/actual_import.rb
index 32628f4aa..9b41bcc0f 100644
--- a/app/models/actual_import.rb
+++ b/app/models/actual_import.rb
@@ -28,7 +28,7 @@ class ActualImport < Import
         date: row[date_col_label].to_s,
         amount: signed_csv_amount(row).to_s,
         currency: default_currency.to_s,
-        name: row[name_col_label].to_s,
+        name: row_name(row),
         category: combined_category(row),
         notes: row[notes_col_label].to_s
       }
@@ -92,6 +92,16 @@ class ActualImport < Import
       save!
     end
 
+    # Actual Budget exports reconciliation and starting-balance rows with a blank
+    # Payee. Entry requires a name, so fall back to the Notes column (which usually
+    # carries text like "Reconciliation balance adjustment") and finally to the
+    # generic default, matching the blank-name handling in Import and MintImport.
+    def row_name(row)
+      row[name_col_label].to_s.presence ||
+        row[notes_col_label].to_s.presence ||
+        default_row_name
+    end
+
     def combined_category(row)
       category = row[category_col_label].to_s.strip
       category_group = row[CATEGORY_GROUP_COLUMN].to_s.strip
diff --git a/app/models/akahu_entry/processor.rb b/app/models/akahu_entry/processor.rb
index a928fab96..a7b8d0375 100644
--- a/app/models/akahu_entry/processor.rb
+++ b/app/models/akahu_entry/processor.rb
@@ -172,11 +172,15 @@ class AkahuEntry::Processor
       value = data[:date]
       case value
       when String
-        Date.parse(value)
+        if value.include?("T") || value.include?(":")
+          Time.parse(value).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(value)
+        end
       when Integer, Float
-        Time.at(value).to_date
+        Time.at(value).in_time_zone(account&.family&.timezone).to_date
       when Time, DateTime
-        value.to_date
+        value.in_time_zone(account&.family&.timezone).to_date
       when Date
         value
       else
diff --git a/app/models/akahu_item/importer.rb b/app/models/akahu_item/importer.rb
index 2c1f71204..50077fce9 100644
--- a/app/models/akahu_item/importer.rb
+++ b/app/models/akahu_item/importer.rb
@@ -236,7 +236,11 @@ class AkahuItem::Importer
       if has_stored_transactions && akahu_item.last_synced_at
         akahu_item.last_synced_at - 7.days
       else
-        90.days.ago
+        # Initial sync: omit the start date entirely. Akahu's transactions
+        # endpoint defaults to the full accessible range when no start is given,
+        # so this pulls the connection's complete history instead of clamping it
+        # to a fixed lookback window (which truncated apps with >5 years of data).
+        nil
       end
     end
 
diff --git a/app/models/api_key.rb b/app/models/api_key.rb
index 4c12b4668..1b5543763 100644
--- a/app/models/api_key.rb
+++ b/app/models/api_key.rb
@@ -18,7 +18,7 @@ class ApiKey < ApplicationRecord
   validates :scopes, presence: true
   validates :source, presence: true, inclusion: { in: SOURCES }
   validate :scopes_not_empty
-  validate :one_active_key_per_user_per_source, on: :create
+  validate :name_unique_among_active_keys, on: :create
 
   # Callbacks
   before_validation :set_display_key
@@ -26,6 +26,10 @@ class ApiKey < ApplicationRecord
 
   # Scopes
   scope :active, -> { where(revoked_at: nil).where("expires_at IS NULL OR expires_at > ?", Time.current) }
+  # SECURITY: excluding the demo monitoring key here is also the revocation guard
+  # in Settings::ApiKeysController#destroy — a demo key id 404s in `set_api_key`
+  # (it is not `.visible`) before it can be revoked. Do NOT broaden this scope to
+  # include monitoring keys without adding another explicit destroy guard.
   scope :visible, -> { where.not(display_key: DEMO_MONITORING_KEY) }
 
   # Class methods
@@ -103,10 +107,11 @@ class ApiKey < ApplicationRecord
       end
     end
 
-    def one_active_key_per_user_per_source
-      if user&.api_keys&.active&.where(source: source)&.where&.not(id: id)&.exists?
-        errors.add(:user, "can only have one active API key per source (#{source})")
-      end
+    def name_unique_among_active_keys
+      return if name.blank? || user.blank?
+      scope = user.api_keys.active.visible.where(name: name)
+      scope = scope.where.not(id: id) if persisted?
+      errors.add(:name, :taken) if scope.exists?
     end
 
     def prevent_demo_monitoring_key_destroy!
diff --git a/app/models/assistant.rb b/app/models/assistant.rb
index 583737761..708c0aabf 100644
--- a/app/models/assistant.rb
+++ b/app/models/assistant.rb
@@ -30,7 +30,13 @@ module Assistant
         Function::GetBudget,
         Function::ImportBankStatement,
         Function::SearchFamilyFiles,
-        Function::CreateGoal
+        Function::CreateGoal,
+        Function::GetTags,
+        Function::CreateTag,
+        Function::UpdateTag,
+        Function::GetCategories,
+        Function::CreateCategory,
+        Function::UpdateCategory
       ]
     end
 
diff --git a/app/models/assistant/function.rb b/app/models/assistant/function.rb
index 4e918cb54..99e4df300 100644
--- a/app/models/assistant/function.rb
+++ b/app/models/assistant/function.rb
@@ -79,6 +79,10 @@ class Assistant::Function
       user.family
     end
 
+    def valid_uuid?(str)
+      UuidFormat.valid?(str)
+    end
+
     # To save tokens, we provide the AI metadata about the series and a flat array of
     # raw, formatted values which it can infer dates from
     def to_ai_time_series(series)
diff --git a/app/models/assistant/function/create_category.rb b/app/models/assistant/function/create_category.rb
new file mode 100644
index 000000000..8d1a6c76c
--- /dev/null
+++ b/app/models/assistant/function/create_category.rb
@@ -0,0 +1,81 @@
+class Assistant::Function::CreateCategory < Assistant::Function
+  class << self
+    def name
+      "create_category"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Creates a new category for the user's family.
+
+        Categories support two levels of hierarchy: a top-level category can have subcategories,
+        but subcategories cannot have children. Provide parent_id (from get_categories) to make
+        a subcategory — it will inherit the parent's color automatically.
+
+        If icon is omitted it is suggested from the name. If color is omitted a palette color is used
+        (ignored for subcategories since color is inherited). Category names must be unique.
+      INSTRUCTIONS
+    end
+  end
+
+  def strict_mode?
+    false
+  end
+
+  def params_schema
+    build_schema(
+      required: [ "name" ],
+      properties: {
+        name: {
+          type: "string",
+          description: "Category name (must be unique within the family)"
+        },
+        color: {
+          type: "string",
+          description: "Hex color code (e.g. #e99537). Ignored for subcategories. Defaults to a palette color."
+        },
+        icon: {
+          type: "string",
+          description: "Lucide icon name (e.g. 'shopping-cart'). Suggested from name if omitted."
+        },
+        parent_id: {
+          type: "string",
+          description: "ID of an existing top-level category to nest under (makes this a subcategory). Use get_categories to find ids."
+        }
+      }
+    )
+  end
+
+  def call(params = {})
+    name = params["name"].to_s.strip
+    return error("name_required", "Please provide a name for the category.") if name.blank?
+
+    color = params["color"].presence || Category::COLORS.sample
+    icon = params["icon"].presence || Category.suggested_icon(name)
+    attrs = { name: name, color: color, lucide_icon: icon }
+
+    if params["parent_id"].present?
+      return error("parent_not_found", "Parent category with id '#{params["parent_id"]}' not found.") unless valid_uuid?(params["parent_id"])
+      parent = family.categories.find_by(id: params["parent_id"])
+      return error("parent_not_found", "Parent category with id '#{params["parent_id"]}' not found.") unless parent
+      attrs[:parent] = parent
+    end
+
+    category = family.categories.new(attrs)
+
+    if category.save
+      { success: true, category: serialize(category), message: "Category '#{category.name_with_parent}' created." }
+    else
+      error("validation_failed", category.errors.full_messages.join("; "))
+    end
+  end
+
+  private
+    def serialize(c)
+      { id: c.id, name: c.name, name_with_parent: c.name_with_parent, color: c.color, icon: c.lucide_icon, parent_id: c.parent_id }
+    end
+
+    def error(key, message)
+      { success: false, error: key, message: message }
+    end
+end
diff --git a/app/models/assistant/function/create_tag.rb b/app/models/assistant/function/create_tag.rb
new file mode 100644
index 000000000..4acffa838
--- /dev/null
+++ b/app/models/assistant/function/create_tag.rb
@@ -0,0 +1,56 @@
+class Assistant::Function::CreateTag < Assistant::Function
+  class << self
+    def name
+      "create_tag"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Creates a new tag for the user's family.
+
+        Tags are applied to transactions to organize them beyond categories.
+        If color is omitted, one is chosen automatically from the default palette.
+        Tag names must be unique within the family.
+      INSTRUCTIONS
+    end
+  end
+
+  def strict_mode?
+    false
+  end
+
+  def params_schema
+    build_schema(
+      required: [ "name" ],
+      properties: {
+        name: {
+          type: "string",
+          description: "Tag name (must be unique within the family)"
+        },
+        color: {
+          type: "string",
+          description: "Hex color code (e.g. #e99537). If omitted, one is chosen from the default palette."
+        }
+      }
+    )
+  end
+
+  def call(params = {})
+    name = params["name"].to_s.strip
+    return error("name_required", "Please provide a name for the tag.") if name.blank?
+
+    color = params["color"].presence || Tag::COLORS.sample
+    tag = family.tags.new(name: name, color: color)
+
+    if tag.save
+      { success: true, tag: { id: tag.id, name: tag.name, color: tag.color }, message: "Tag '#{tag.name}' created." }
+    else
+      error("validation_failed", tag.errors.full_messages.join("; "))
+    end
+  end
+
+  private
+    def error(key, message)
+      { success: false, error: key, message: message }
+    end
+end
diff --git a/app/models/assistant/function/get_categories.rb b/app/models/assistant/function/get_categories.rb
new file mode 100644
index 000000000..f7bf643d8
--- /dev/null
+++ b/app/models/assistant/function/get_categories.rb
@@ -0,0 +1,36 @@
+class Assistant::Function::GetCategories < Assistant::Function
+  class << self
+    def name
+      "get_categories"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Returns all categories for the user's family, ordered alphabetically by hierarchy.
+
+        Each entry includes id, name, color, icon, parent_id (null for top-level), and
+        name_with_parent (e.g. "Food & Drink > Restaurants"). Use this before creating
+        subcategories or referencing a category by id in update_category.
+      INSTRUCTIONS
+    end
+  end
+
+  def call(params = {})
+    categories = family.categories.alphabetically_by_hierarchy
+
+    {
+      categories: categories.map { |c|
+        {
+          id: c.id,
+          name: c.name,
+          name_with_parent: c.name_with_parent,
+          color: c.color,
+          icon: c.lucide_icon,
+          parent_id: c.parent_id,
+          is_subcategory: c.subcategory?
+        }
+      },
+      total: categories.size
+    }
+  end
+end
diff --git a/app/models/assistant/function/get_tags.rb b/app/models/assistant/function/get_tags.rb
new file mode 100644
index 000000000..b4dfdcd98
--- /dev/null
+++ b/app/models/assistant/function/get_tags.rb
@@ -0,0 +1,25 @@
+class Assistant::Function::GetTags < Assistant::Function
+  class << self
+    def name
+      "get_tags"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Returns all tags defined for the user's family, sorted alphabetically.
+
+        Use this when the user wants to see available tags or before referencing
+        a tag in another operation like create_tag or update_tag.
+      INSTRUCTIONS
+    end
+  end
+
+  def call(params = {})
+    tags = family.tags.alphabetically
+
+    {
+      tags: tags.map { |t| { id: t.id, name: t.name, color: t.color } },
+      total: tags.size
+    }
+  end
+end
diff --git a/app/models/assistant/function/get_transactions.rb b/app/models/assistant/function/get_transactions.rb
index 853f39e80..5af66048c 100644
--- a/app/models/assistant/function/get_transactions.rb
+++ b/app/models/assistant/function/get_transactions.rb
@@ -155,6 +155,7 @@ class Assistant::Function::GetTransactions < Assistant::Function
     normalized_transactions = paginated_transactions.map do |txn|
       entry = txn.entry
       {
+        name: entry.name,
         date: entry.date,
         amount: entry.amount.abs,
         currency: entry.currency,
diff --git a/app/models/assistant/function/import_bank_statement.rb b/app/models/assistant/function/import_bank_statement.rb
index dee54602f..8920ffad5 100644
--- a/app/models/assistant/function/import_bank_statement.rb
+++ b/app/models/assistant/function/import_bank_statement.rb
@@ -92,13 +92,15 @@ class Assistant::Function::ImportBankStatement < Assistant::Function
       }
     end
 
-    # Extract transactions from the PDF using provider
-    provider = Provider::Registry.get_provider(:openai)
+    # Extract transactions from the PDF using the configured LLM provider.
+    # Honors Setting.llm_provider (issue #2113) — Provider::Anthropic implements
+    # extract_bank_statement (PR #1985).
+    provider = Provider::Registry.preferred_llm_provider
     unless provider
       return {
         success: false,
         error: "provider_not_configured",
-        message: "OpenAI provider is not configured"
+        message: "AI provider is not configured"
       }
     end
 
diff --git a/app/models/assistant/function/search_family_files.rb b/app/models/assistant/function/search_family_files.rb
index c9c917f0a..3f5f914ff 100644
--- a/app/models/assistant/function/search_family_files.rb
+++ b/app/models/assistant/function/search_family_files.rb
@@ -71,7 +71,10 @@ class Assistant::Function::SearchFamilyFiles < Assistant::Function
       return {
         success: false,
         error: "provider_not_configured",
-        message: "No vector store is configured. Set VECTOR_STORE_PROVIDER or configure OpenAI."
+        message: "No vector store is configured. Set VECTOR_STORE_PROVIDER " \
+                 "(openai | pgvector | qdrant), configure OpenAI, or — for " \
+                 "Anthropic-only installs — enable the pgvector adapter and " \
+                 "point EMBEDDING_URI_BASE at an embeddings endpoint."
       }
     end
 
diff --git a/app/models/assistant/function/update_category.rb b/app/models/assistant/function/update_category.rb
new file mode 100644
index 000000000..73e50e3b4
--- /dev/null
+++ b/app/models/assistant/function/update_category.rb
@@ -0,0 +1,73 @@
+class Assistant::Function::UpdateCategory < Assistant::Function
+  class << self
+    def name
+      "update_category"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Updates an existing category's name, color, or icon.
+
+        Use get_categories first to find the category id. At least one of name, color,
+        or icon must be supplied. Changing a parent's color does not cascade to existing
+        subcategories (their colors are set at creation time).
+      INSTRUCTIONS
+    end
+  end
+
+  def strict_mode?
+    false
+  end
+
+  def params_schema
+    build_schema(
+      required: [ "id" ],
+      properties: {
+        id: {
+          type: "string",
+          description: "ID of the category to update (use get_categories to find it)"
+        },
+        name: {
+          type: "string",
+          description: "New name for the category (optional)"
+        },
+        color: {
+          type: "string",
+          description: "New hex color code (optional)"
+        },
+        icon: {
+          type: "string",
+          description: "New Lucide icon name (optional)"
+        }
+      }
+    )
+  end
+
+  def call(params = {})
+    return error("not_found", "Category with id '#{params["id"]}' not found.") unless valid_uuid?(params["id"])
+    category = family.categories.find_by(id: params["id"])
+    return error("not_found", "Category with id '#{params["id"]}' not found.") unless category
+
+    attrs = {}
+    attrs[:name] = params["name"].to_s.strip if params["name"].present?
+    attrs[:color] = params["color"].to_s.strip if params["color"].present?
+    attrs[:lucide_icon] = params["icon"].to_s.strip if params["icon"].present?
+
+    return error("no_changes", "Provide at least one of name, color, or icon to update.") if attrs.empty?
+
+    if category.update(attrs)
+      { success: true, category: serialize(category), message: "Category '#{category.name_with_parent}' updated." }
+    else
+      error("validation_failed", category.errors.full_messages.join("; "))
+    end
+  end
+
+  private
+    def serialize(c)
+      { id: c.id, name: c.name, name_with_parent: c.name_with_parent, color: c.color, icon: c.lucide_icon, parent_id: c.parent_id }
+    end
+
+    def error(key, message)
+      { success: false, error: key, message: message }
+    end
+end
diff --git a/app/models/assistant/function/update_tag.rb b/app/models/assistant/function/update_tag.rb
new file mode 100644
index 000000000..750b3184b
--- /dev/null
+++ b/app/models/assistant/function/update_tag.rb
@@ -0,0 +1,63 @@
+class Assistant::Function::UpdateTag < Assistant::Function
+  class << self
+    def name
+      "update_tag"
+    end
+
+    def description
+      <<~INSTRUCTIONS
+        Updates an existing tag's name or color.
+
+        Identify the tag by its current name. At least one of new_name or color must be provided.
+        Use get_tags first to confirm the tag exists.
+      INSTRUCTIONS
+    end
+  end
+
+  def strict_mode?
+    false
+  end
+
+  def params_schema
+    build_schema(
+      required: [ "name" ],
+      properties: {
+        name: {
+          type: "string",
+          description: "Current name of the tag to update",
+          enum: family_tag_names
+        },
+        new_name: {
+          type: "string",
+          description: "New name for the tag (optional)"
+        },
+        color: {
+          type: "string",
+          description: "New hex color code (optional)"
+        }
+      }
+    )
+  end
+
+  def call(params = {})
+    tag = family.tags.find_by(name: params["name"].to_s.strip)
+    return error("not_found", "Tag '#{params["name"]}' not found.") unless tag
+
+    attrs = {}
+    attrs[:name] = params["new_name"].strip if params["new_name"].present?
+    attrs[:color] = params["color"].strip if params["color"].present?
+
+    return error("no_changes", "Provide at least one of new_name or color to update.") if attrs.empty?
+
+    if tag.update(attrs)
+      { success: true, tag: { id: tag.id, name: tag.name, color: tag.color }, message: "Tag updated." }
+    else
+      error("validation_failed", tag.errors.full_messages.join("; "))
+    end
+  end
+
+  private
+    def error(key, message)
+      { success: false, error: key, message: message }
+    end
+end
diff --git a/app/models/assistant/function_tool_caller.rb b/app/models/assistant/function_tool_caller.rb
index 4ed081021..bc73b9c50 100644
--- a/app/models/assistant/function_tool_caller.rb
+++ b/app/models/assistant/function_tool_caller.rb
@@ -23,7 +23,7 @@ class Assistant::FunctionToolCaller
   private
     def execute(function_request)
       fn = find_function(function_request)
-      fn_args = JSON.parse(function_request.function_args)
+      fn_args = JSON.parse(function_request.function_args.presence || "{}")
       fn.call(fn_args)
     rescue => e
       raise FunctionExecutionError.new(
diff --git a/app/models/background_job_console.rb b/app/models/background_job_console.rb
new file mode 100644
index 000000000..13a5535b5
--- /dev/null
+++ b/app/models/background_job_console.rb
@@ -0,0 +1,180 @@
+require "sidekiq/api"
+
+# Backs the super-admin background jobs console (/settings/background_jobs).
+#
+# Combines domain truth (in-flight Sync / Import / ImportSession / FamilyExport
+# records across all families) with Sidekiq runtime truth (worker processes,
+# queue depths, jobs currently executing) so an operator can tell a running
+# job from one whose worker died and mark the latter as lost.
+#
+# Unlike BackgroundJobHealth this fails CLOSED: when Redis is unreachable,
+# liveness is unknown and destructive actions are refused rather than the
+# console pretending everything is healthy.
+class BackgroundJobConsole
+  OPERATIONS_LIMIT = 100
+
+  # A record younger than this may belong to a job that is merely queued
+  # behind a backlog or between Sidekiq heartbeats — refuse to touch it.
+  STUCK_AFTER = 30.minutes
+
+  # Upper bound on queue/retry/schedule entries scanned for record
+  # references. Past this the backlog is inspected only partially, so
+  # liveness is unknowable and cancellation fails closed (like redis_error?).
+  QUEUE_SCAN_LIMIT = 5_000
+
+  Stats = Struct.new(:processes, :busy, :enqueued, :retry_size, :dead_size, :scheduled_size, :queues, keyword_init: true)
+
+  attr_reader :stats
+
+  def initialize
+    @redis_error = false
+    @queue_scan_truncated = false
+    @running_global_ids = Set.new
+    @queued_global_ids = Set.new
+    @stats = nil
+    load_runtime_state
+  end
+
+  def redis_error?
+    @redis_error
+  end
+
+  def queue_scan_truncated?
+    @queue_scan_truncated
+  end
+
+  # In-flight operations across ALL families, newest activity first. This is
+  # deliberately instance-global — the console is super-admin only.
+  def operations
+    @operations ||= [
+      Sync.incomplete.includes(:syncable).order(updated_at: :desc).limit(OPERATIONS_LIMIT).to_a,
+      Import.where(status: [ :importing, :reverting ]).includes(:family).order(updated_at: :desc).limit(OPERATIONS_LIMIT).to_a,
+      ImportSession.where(status: :importing).includes(:family).order(updated_at: :desc).limit(OPERATIONS_LIMIT).to_a,
+      FamilyExport.where(status: [ :pending, :processing ]).includes(:family).order(updated_at: :desc).limit(OPERATIONS_LIMIT).to_a
+    ].flatten.sort_by(&:updated_at).reverse
+  end
+
+  # A record's job is visibly executing right now (its GlobalID appears in a
+  # worker's payload). False also means "unknown" when redis_error? is set —
+  # callers must check that first for destructive decisions.
+  def running?(record)
+    @running_global_ids.include?(record.to_global_id.to_s)
+  end
+
+  # A job referencing this record is sitting in a queue, the retry set, or
+  # the scheduled set. Such a job WILL run later — most of the affected job
+  # classes don't abort just because an operator flipped the record's status,
+  # so terminalizing now would invite duplicate/conflicting work when it
+  # finally executes.
+  def enqueued?(record)
+    @queued_global_ids.include?(record.to_global_id.to_s)
+  end
+
+  # Safe to force-terminalize: liveness is knowable (Redis reachable, backlog
+  # scan complete), no job referencing the record is executing or waiting to
+  # execute, the record has been idle past the stuck window, and (for syncs)
+  # no children are still in flight — a parent Sync legitimately has no live
+  # job of its own while its children run.
+  def cancellable?(record)
+    return false if redis_error?
+    return false if queue_scan_truncated?
+    return false if running?(record)
+    return false if enqueued?(record)
+    return false if record.updated_at > STUCK_AFTER.ago
+    return false if record.is_a?(Sync) && record.children.incomplete.exists?
+
+    true
+  end
+
+  def self.family_for(record)
+    if record.is_a?(Sync)
+      syncable = record.syncable
+      syncable.is_a?(Family) ? syncable : syncable&.family
+    else
+      record.family
+    end
+  end
+
+  private
+    def load_runtime_state
+      processes = Sidekiq::ProcessSet.new
+      sidekiq_stats = Sidekiq::Stats.new
+
+      @stats = Stats.new(
+        processes: processes.size,
+        busy: processes.sum { |process| process["busy"].to_i },
+        enqueued: sidekiq_stats.enqueued,
+        retry_size: sidekiq_stats.retry_size,
+        dead_size: sidekiq_stats.dead_size,
+        scheduled_size: sidekiq_stats.scheduled_size,
+        queues: Sidekiq::Queue.all.map { |queue| { name: queue.name, size: queue.size, latency: queue.latency.round(1) } }
+      )
+
+      @running_global_ids = collect_running_global_ids
+      @queued_global_ids = collect_queued_global_ids
+    rescue => e
+      Rails.logger.warn("BackgroundJobConsole: Sidekiq state unavailable: #{e.class}: #{e.message}")
+      @redis_error = true
+      @stats = nil
+      @running_global_ids = Set.new
+      @queued_global_ids = Set.new
+    end
+
+    # All jobs are ActiveJob-wrapped, so record references appear in worker
+    # payloads as serialized GlobalIDs ({"_aj_globalid" => "gid://..."}).
+    def collect_running_global_ids
+      ids = Set.new
+
+      Sidekiq::Workers.new.each do |_process_id, _thread_id, work|
+        payload = work.respond_to?(:payload) ? work.payload : work["payload"]
+        payload = JSON.parse(payload) if payload.is_a?(String)
+        collect_global_ids(payload, ids)
+      rescue JSON::ParserError
+        next
+      end
+
+      ids
+    end
+
+    # Record references in jobs that are waiting to run: queue backlogs, the
+    # retry set, and the scheduled set. Bounded by QUEUE_SCAN_LIMIT — on a
+    # truncated scan, cancellation fails closed via queue_scan_truncated?.
+    def collect_queued_global_ids
+      ids = Set.new
+      scanned = 0
+
+      each_waiting_job do |item|
+        scanned += 1
+        if scanned > QUEUE_SCAN_LIMIT
+          @queue_scan_truncated = true
+          break
+        end
+        collect_global_ids(item, ids)
+      end
+
+      ids
+    end
+
+    def each_waiting_job(&block)
+      Sidekiq::Queue.all.each do |queue|
+        queue.each { |job| yield job.item }
+      end
+      Sidekiq::RetrySet.new.each { |job| yield job.item }
+      Sidekiq::ScheduledSet.new.each { |job| yield job.item }
+    end
+
+    def collect_global_ids(node, ids)
+      case node
+      when Hash
+        node.each do |key, value|
+          if key == "_aj_globalid" && value.is_a?(String)
+            ids << value
+          else
+            collect_global_ids(value, ids)
+          end
+        end
+      when Array
+        node.each { |value| collect_global_ids(value, ids) }
+      end
+    end
+end
diff --git a/app/models/background_job_health.rb b/app/models/background_job_health.rb
new file mode 100644
index 000000000..fe3b1bc48
--- /dev/null
+++ b/app/models/background_job_health.rb
@@ -0,0 +1,60 @@
+require "sidekiq/api"
+
+# Reads Sidekiq's runtime state (live worker processes + queue latency) directly
+# from Redis in the *web* process, so a down or stuck worker can be detected even
+# when the worker itself is the thing that's broken (a worker-side healthcheck
+# can't report that it's dead).
+#
+# Fails open: if Sidekiq/Redis is unreachable we assume healthy rather than block
+# or alarm the UI on an unrelated infrastructure blip.
+class BackgroundJobHealth
+  # The queue chat (AssistantResponseJob), syncs and imports run on. If nothing
+  # is polling it, user-facing background work silently never runs.
+  CRITICAL_QUEUE = "high_priority".freeze
+  LATENCY_WARN_SECONDS = 60
+  CACHE_KEY = "background_job_health".freeze
+  CACHE_TTL = 15.seconds
+
+  class << self
+    def current
+      Rails.cache.fetch(CACHE_KEY, expires_in: CACHE_TTL) { compute }
+    rescue => e
+      Rails.logger.warn("BackgroundJobHealth check failed: #{e.class}: #{e.message}")
+      fail_open
+    end
+
+    def healthy?
+      current[:healthy]
+    end
+
+    def snapshot
+      current
+    end
+
+    def summary
+      h = current
+      "workers=#{h[:workers].inspect} polls_#{CRITICAL_QUEUE}=#{h[:polls_critical_queue].inspect} latency=#{h[:latency].inspect}s"
+    end
+
+    private
+      def compute
+        processes = Sidekiq::ProcessSet.new
+        workers = processes.size
+        polled_queues = processes.flat_map { |p| Array(p["queues"]) }.uniq
+        polls_critical = polled_queues.include?(CRITICAL_QUEUE)
+        latency = Sidekiq::Queue.new(CRITICAL_QUEUE).latency
+
+        {
+          healthy: workers.positive? && polls_critical && latency < LATENCY_WARN_SECONDS,
+          workers: workers,
+          polls_critical_queue: polls_critical,
+          latency: latency.round(1),
+          checked_at: Time.current
+        }
+      end
+
+      def fail_open
+        { healthy: true, workers: nil, polls_critical_queue: nil, latency: nil, checked_at: Time.current, error: true }
+      end
+  end
+end
diff --git a/app/models/balance/base_calculator.rb b/app/models/balance/base_calculator.rb
index c8b090547..a980cffd9 100644
--- a/app/models/balance/base_calculator.rb
+++ b/app/models/balance/base_calculator.rb
@@ -9,6 +9,32 @@ class Balance::BaseCalculator
     raise NotImplementedError, "Subclasses must implement this method"
   end
 
+  # The earliest date balances should be materialized for.
+  #
+  # Normally this is the opening anchor date, which our system keeps at or
+  # before the oldest entry. But an entry (most commonly a backfilled
+  # reconciliation Valuation) can be created with a date EARLIER than the
+  # opening anchor — the reconciliation path does not move the anchor back.
+  # When that happens the anchor date alone would clip all pre-anchor entries
+  # out of the balance series (they'd be stored but never materialized into
+  # Balance rows, leaving the net-worth chart empty before the anchor).
+  #
+  # Bounding on min(opening_anchor_date, oldest_entry_date) ensures those
+  # earlier entries are included. The opening anchor and any reconciliation
+  # still reset the absolute balance on their own dates via the
+  # valuation-override path, so extending the window backward is safe.
+  #
+  # Public so Balance::Materializer can use the same lower bound when deciding
+  # which balances to preserve during an incremental purge.
+  #
+  # Memoized: this is read multiple times per sync (calc bound + both purge
+  # branches) and the underlying MIN(date) is a non-trivial scan on accounts
+  # with large entry histories. Calculator instances are per-sync, so there is
+  # no staleness concern.
+  def calculation_start_date
+    @calculation_start_date ||= [ account.opening_anchor_date, account.entries.minimum(:date) ].compact.min
+  end
+
   private
     def sync_cache
       @sync_cache ||= Balance::SyncCache.new(account)
@@ -40,6 +66,11 @@ class Balance::BaseCalculator
       end_non_cash - start_non_cash - non_cash_flows
     end
 
+    # Keeps asset/liability flow sign conventions centralized for persisted balances.
+    def flows_factor
+      account.classification == "asset" ? 1 : -1
+    end
+
     # If holdings value goes from $100 -> $200 (change_holdings_value is $100)
     # And non-cash flows (i.e. "buys") for day are +$50 (net_buy_sell_value is $50)
     # That means value increased by $100, where $50 of that is due to the change in holdings value, and $50 is due to the buy/sell
@@ -66,15 +97,24 @@ class Balance::BaseCalculator
       txn_inflow_sum = entries.select { |e| e.amount < 0 && e.transaction? }.sum(&:amount)
       txn_outflow_sum = entries.select { |e| e.amount >= 0 && e.transaction? }.sum(&:amount)
 
-      trade_cash_inflow_sum = entries.select { |e| e.amount < 0 && e.trade? }.sum(&:amount)
-      trade_cash_outflow_sum = entries.select { |e| e.amount >= 0 && e.trade? }.sum(&:amount)
+      # Separate regular trades (buy/sell, affecting holdings) from income-only
+      # trades (interest/dividend with qty=0, which are cash-only events and
+      # must not produce spurious non_cash_outflows in the flow breakdown).
+      regular_trades = entries.select { |e| e.trade? && e.entryable.qty != 0 }
+      income_trades   = entries.select { |e| e.trade? && e.entryable.qty == 0 }
+
+      trade_cash_inflow_sum = regular_trades.select { |e| e.amount < 0 }.sum(&:amount)
+      trade_cash_outflow_sum = regular_trades.select { |e| e.amount >= 0 }.sum(&:amount)
+
+      income_inflow_sum = income_trades.select { |e| e.amount < 0 }.sum(&:amount)
+      income_outflow_sum = income_trades.select { |e| e.amount >= 0 }.sum(&:amount)
 
       if account.balance_type == :non_cash && account.accountable_type == "Loan"
         non_cash_inflows = txn_inflow_sum.abs
         non_cash_outflows = txn_outflow_sum
       elsif account.balance_type != :non_cash
-        cash_inflows = txn_inflow_sum.abs + trade_cash_inflow_sum.abs
-        cash_outflows = txn_outflow_sum + trade_cash_outflow_sum
+        cash_inflows = txn_inflow_sum.abs + trade_cash_inflow_sum.abs + income_inflow_sum.abs
+        cash_outflows = txn_outflow_sum + trade_cash_outflow_sum + income_outflow_sum
 
         # Trades are inverse (a "buy" is outflow of cash, but "inflow" of non-cash, aka "holdings")
         non_cash_outflows = trade_cash_inflow_sum.abs
@@ -133,7 +173,7 @@ class Balance::BaseCalculator
         cash_adjustments: args[:cash_adjustments] || 0,
         non_cash_adjustments: args[:non_cash_adjustments] || 0,
         net_market_flows: args[:net_market_flows] || 0,
-        flows_factor: account.classification == "asset" ? 1 : -1
+        flows_factor: flows_factor
       )
     end
 end
diff --git a/app/models/balance/chart_series_builder.rb b/app/models/balance/chart_series_builder.rb
index c8c733579..ae24e9cba 100644
--- a/app/models/balance/chart_series_builder.rb
+++ b/app/models/balance/chart_series_builder.rb
@@ -1,10 +1,14 @@
 class Balance::ChartSeriesBuilder
-  def initialize(account_ids:, currency:, period: Period.last_30_days, interval: nil, favorable_direction: "up")
+  def initialize(account_ids:, currency:, period: Period.last_30_days, interval: nil,
+                 favorable_direction: "up", account_active_until_dates: {})
     @account_ids = account_ids
     @currency = currency
     @period = period
     @interval = interval
     @favorable_direction = favorable_direction
+    @account_active_until_dates = account_active_until_dates.compact
+      .transform_keys(&:to_s)
+      .transform_values { |date| date.to_date.iso8601 }
   end
 
   def balance_series
@@ -28,8 +32,37 @@ class Balance::ChartSeriesBuilder
     raise
   end
 
+  # Unrealized gains series: for each date, sum of (market value - cost basis) across
+  # the latest holding snapshot per security. Holdings without a usable cost basis
+  # (nil, or unlocked zero from providers) contribute a gain of 0.
+  def gains_series
+    values = gains_query_data.map do |datum|
+      Series::Value.new(
+        date: datum.date,
+        date_formatted: I18n.l(datum.date, format: :long),
+        value: Money.new(datum.end_gains, currency),
+        trend: Trend.new(
+          current: Money.new(datum.end_gains, currency),
+          previous: Money.new(datum.start_gains, currency),
+          favorable_direction: favorable_direction
+        )
+      )
+    end
+
+    Series.new(
+      start_date: period.start_date,
+      end_date: period.end_date,
+      interval: interval,
+      values: values,
+      favorable_direction: favorable_direction
+    )
+  rescue => e
+    Rails.logger.error "Gains series error: #{e.message} for accounts #{@account_ids}"
+    raise
+  end
+
   private
-    attr_reader :account_ids, :currency, :period, :favorable_direction
+    attr_reader :account_ids, :currency, :period, :favorable_direction, :account_active_until_dates
 
     def interval
       @interval || period.interval
@@ -74,7 +107,8 @@ class Balance::ChartSeriesBuilder
           start_date: period.start_date,
           end_date: period.end_date,
           interval: interval,
-          sign_multiplier: sign_multiplier
+          sign_multiplier: sign_multiplier,
+          account_active_until_dates_json: account_active_until_dates.to_json
         }
       ])
     rescue => e
@@ -82,6 +116,25 @@ class Balance::ChartSeriesBuilder
       raise
     end
 
+    # Executes the gains query and memoizes the per-date rows
+    # (date, end_gains, start_gains) used to build the gains series.
+    def gains_query_data
+      @gains_query_data ||= Balance.find_by_sql([
+        gains_query,
+        {
+          account_ids: account_ids,
+          target_currency: currency,
+          start_date: period.start_date,
+          end_date: period.end_date,
+          interval: interval,
+          account_active_until_dates_json: account_active_until_dates.to_json
+        }
+      ])
+    rescue => e
+      Rails.logger.error "Gains query data error: #{e.message} for accounts #{account_ids}, period #{period.start_date} to #{period.end_date}"
+      raise
+    end
+
     # Since the query aggregates the *net* of assets - liabilities, this means that if we're looking at
     # a single liability account, we'll get a negative set of values.  This is not what the user expects
     # to see.  When favorable direction is "down" (i.e. liability, decrease is "good"), we need to invert
@@ -96,6 +149,19 @@ class Balance::ChartSeriesBuilder
           SELECT generate_series(DATE :start_date, DATE :end_date, :interval::interval)::date AS date
           UNION DISTINCT
           SELECT :end_date::date  -- Ensure end date is included
+        ),
+        account_windows AS (
+          SELECT
+            account_window.account_id::uuid AS account_id,
+            account_window.active_until_date::date AS active_until_date
+          FROM jsonb_each_text(CAST(:account_active_until_dates_json AS jsonb))
+            AS account_window(account_id, active_until_date)
+        ),
+        selected_accounts AS (
+          SELECT accounts.*, account_windows.active_until_date
+          FROM accounts
+          LEFT JOIN account_windows ON account_windows.account_id = accounts.id
+          WHERE accounts.id = ANY(array[:account_ids]::uuid[])
         )
         SELECT
           d.date,
@@ -119,7 +185,8 @@ class Balance::ChartSeriesBuilder
             END * COALESCE(er.rate, 1) * :sign_multiplier::integer
           ), 0) AS start_holdings_balance
         FROM dates d
-        CROSS JOIN accounts
+        LEFT JOIN selected_accounts accounts
+          ON accounts.active_until_date IS NULL OR d.date <= accounts.active_until_date
         LEFT JOIN LATERAL (
           SELECT b.end_balance,
                  b.end_cash_balance,
@@ -153,9 +220,104 @@ class Balance::ChartSeriesBuilder
              LIMIT 1)
           ) AS rate
         ) er ON TRUE
-        WHERE accounts.id = ANY(array[:account_ids]::uuid[])
         GROUP BY d.date
         ORDER BY d.date
       SQL
     end
+
+    # Mirrors the balance query structure: for each date in the series, find the latest
+    # holding snapshot per (account, security) on or before that date (LOCF), convert to
+    # the target currency, and aggregate unrealized gains (amount - cost_basis * qty).
+    # Holdings only exist on asset accounts, so no liability sign handling is needed.
+    def gains_query
+      <<~SQL
+        WITH dates AS (
+          SELECT generate_series(DATE :start_date, DATE :end_date, :interval::interval)::date AS date
+          UNION DISTINCT
+          SELECT :end_date::date  -- Ensure end date is included
+        ),
+        account_windows AS (
+          SELECT
+            account_window.account_id::uuid AS account_id,
+            account_window.active_until_date::date AS active_until_date
+          FROM jsonb_each_text(CAST(:account_active_until_dates_json AS jsonb))
+            AS account_window(account_id, active_until_date)
+        ),
+        selected_accounts AS (
+          SELECT accounts.*, account_windows.active_until_date
+          FROM accounts
+          LEFT JOIN account_windows ON account_windows.account_id = accounts.id
+          WHERE accounts.id = ANY(array[:account_ids]::uuid[])
+        ),
+        account_securities AS (
+          SELECT DISTINCT h.account_id, h.security_id
+          FROM holdings h
+          WHERE h.account_id = ANY(array[:account_ids]::uuid[])
+        ),
+        daily_gains AS (
+          SELECT
+            d.date,
+            COALESCE(SUM(
+              CASE
+                WHEN last_basis.cost_basis IS NOT NULL
+                THEN (last_h.amount - (last_basis.cost_basis * last_h.qty)) * COALESCE(er.rate, 1)
+                ELSE 0
+              END
+            ), 0) AS gains
+          FROM dates d
+          LEFT JOIN selected_accounts accounts
+            ON accounts.active_until_date IS NULL OR d.date <= accounts.active_until_date
+          LEFT JOIN account_securities sec ON sec.account_id = accounts.id
+          LEFT JOIN LATERAL (
+            SELECT h.amount, h.qty, h.currency
+            FROM holdings h
+            WHERE h.account_id = accounts.id
+              AND h.security_id = sec.security_id
+              AND h.date <= d.date
+            ORDER BY h.date DESC
+            LIMIT 1
+          ) last_h ON TRUE
+          -- Cost basis is looked up separately from the latest row that has a usable one:
+          -- gap-filled holding rows (weekends, price-history gaps) are persisted without
+          -- cost_basis even though the position and basis are unchanged, so the basis is
+          -- carried forward from the last real snapshot instead of zeroing those points.
+          LEFT JOIN LATERAL (
+            SELECT h2.cost_basis
+            FROM holdings h2
+            WHERE h2.account_id = accounts.id
+              AND h2.security_id = sec.security_id
+              AND h2.date <= d.date
+              AND h2.cost_basis IS NOT NULL
+              AND (h2.cost_basis_locked OR h2.cost_basis > 0)
+            ORDER BY h2.date DESC
+            LIMIT 1
+          ) last_basis ON TRUE
+          LEFT JOIN LATERAL (
+            SELECT COALESCE(
+              (SELECT er.rate
+               FROM exchange_rates er
+               WHERE er.from_currency = last_h.currency
+                 AND er.to_currency = :target_currency
+                 AND er.date <= d.date
+               ORDER BY er.date DESC
+               LIMIT 1),
+              (SELECT er.rate
+               FROM exchange_rates er
+               WHERE er.from_currency = last_h.currency
+                 AND er.to_currency = :target_currency
+                 AND er.date > d.date
+               ORDER BY er.date ASC
+               LIMIT 1)
+            ) AS rate
+          ) er ON TRUE
+          GROUP BY d.date
+        )
+        SELECT
+          dg.date,
+          dg.gains AS end_gains,
+          COALESCE(LAG(dg.gains) OVER (ORDER BY dg.date), dg.gains) AS start_gains
+        FROM daily_gains dg
+        ORDER BY dg.date
+      SQL
+    end
 end
diff --git a/app/models/balance/forward_calculator.rb b/app/models/balance/forward_calculator.rb
index 3e9956f60..521473693 100644
--- a/app/models/balance/forward_calculator.rb
+++ b/app/models/balance/forward_calculator.rb
@@ -108,6 +108,14 @@ class Balance::ForwardCalculator < Balance::BaseCalculator
     end
 
     def opening_starting_balances
+      # When the window starts before the opening anchor (a reconciliation or
+      # other entry was backfilled with a date earlier than the anchor), we have
+      # no known balance for that earlier start date. Seed flat at zero — the
+      # earliest reconciliation and the opening anchor each reset the absolute
+      # balance on their own dates via the valuation-override path, so the seed
+      # only affects the pre-anchor opening day's adjustment, not later totals.
+      return [ 0, 0 ] if calculation_start_date < account.opening_anchor_date
+
       cash = derive_cash_balance_on_date_from_total(
         total_balance: account.opening_anchor_balance,
         date: account.opening_anchor_date
@@ -123,7 +131,7 @@ class Balance::ForwardCalculator < Balance::BaseCalculator
     end
 
     def calc_start_date
-      incremental? ? @window_start_date : account.opening_anchor_date
+      incremental? ? @window_start_date : calculation_start_date
     end
 
     def calc_end_date
@@ -148,8 +156,4 @@ class Balance::ForwardCalculator < Balance::BaseCalculator
     def derive_end_non_cash_balance(start_non_cash_balance:, date:)
       derive_non_cash_balance(start_non_cash_balance, date, direction: :forward)
     end
-
-    def flows_factor
-      account.asset? ? 1 : -1
-    end
 end
diff --git a/app/models/balance/materializer.rb b/app/models/balance/materializer.rb
index 4a2066454..59df779e6 100644
--- a/app/models/balance/materializer.rb
+++ b/app/models/balance/materializer.rb
@@ -80,10 +80,10 @@ class Balance::Materializer
         # In incremental forward-sync, even when no balances were calculated for the window
         # (e.g. window_start_date is beyond the last entry), purge stale tail records that
         # now fall beyond the prior-balance boundary so orphaned future rows are cleaned up.
-        if strategy == :forward && calculator.incremental? && account.opening_anchor_date <= @window_start_date - 1
+        if strategy == :forward && calculator.incremental? && calculator.calculation_start_date <= @window_start_date - 1
           deleted_count = account.balances.delete_by(
             "date < ? OR date > ?",
-            account.opening_anchor_date,
+            calculator.calculation_start_date,
             @window_start_date - 1
           )
           Rails.logger.info("Purged #{deleted_count} stale balances") if deleted_count > 0
@@ -95,11 +95,13 @@ class Balance::Materializer
 
       # In incremental forward-sync mode the calculator only recalculates from
       # window_start_date onward, so balances before that date are still valid.
-      # Use opening_anchor_date as the lower purge bound to preserve them.
+      # Use calculation_start_date as the lower purge bound to preserve them —
+      # this is the same lower bound the calculator uses, so pre-anchor balances
+      # (from entries dated before the opening anchor) are not deleted.
       # We ask the calculator whether it actually ran incrementally — it may have
       # fallen back to a full recalculation, in which case we use the normal bound.
       oldest_valid_date = if strategy == :forward && calculator.incremental?
-        account.opening_anchor_date
+        calculator.calculation_start_date
       else
         sorted_balances.first.date
       end
diff --git a/app/models/balance/reverse_calculator.rb b/app/models/balance/reverse_calculator.rb
index ba970fdcd..64e999375 100644
--- a/app/models/balance/reverse_calculator.rb
+++ b/app/models/balance/reverse_calculator.rb
@@ -9,10 +9,17 @@ class Balance::ReverseCalculator < Balance::BaseCalculator
       )
       end_non_cash_balance = account.current_anchor_balance - end_cash_balance
 
-      # Calculates in reverse-chronological order (End of day -> Start of day)
-      account.current_anchor_date.downto(account.opening_anchor_date).map do |date|
+      # Calculates in reverse-chronological order (End of day -> Start of day).
+      # Bound on calculation_start_date (not opening_anchor_date) so entries
+      # backfilled with a date earlier than the opening anchor are still
+      # materialized. Reconciliation waypoints below the anchor reset the
+      # balance on their own dates; use_opening_anchor_for_date? still keys off
+      # the anchor's real date, so the anchor's own treatment is unchanged.
+      account.current_anchor_date.downto(calculation_start_date).map do |date|
         flows = flows_for_date(date)
         valuation = sync_cache.get_valuation(date)
+        cash_adjustments = 0
+        non_cash_adjustments = 0
 
         if use_opening_anchor_for_date?(date)
           end_cash_balance = derive_cash_balance_on_date_from_total(
@@ -45,6 +52,20 @@ class Balance::ReverseCalculator < Balance::BaseCalculator
           market_value_change = market_value_change_on_date(date, flows)
         end
 
+        if use_opening_boundary_adjustment_for_date?(date)
+          boundary_adjustment = opening_boundary_adjustment(
+            end_cash_balance: end_cash_balance,
+            end_non_cash_balance: end_non_cash_balance,
+            flows: flows,
+            market_value_change: market_value_change
+          )
+
+          start_cash_balance = boundary_adjustment[:start_cash_balance]
+          start_non_cash_balance = boundary_adjustment[:start_non_cash_balance]
+          cash_adjustments = boundary_adjustment[:cash_adjustments]
+          non_cash_adjustments = boundary_adjustment[:non_cash_adjustments]
+        end
+
         output_balance = build_balance(
           date: date,
           balance: end_cash_balance + end_non_cash_balance,
@@ -55,6 +76,8 @@ class Balance::ReverseCalculator < Balance::BaseCalculator
           cash_outflows: flows[:cash_outflows],
           non_cash_inflows: flows[:non_cash_inflows],
           non_cash_outflows: flows[:non_cash_outflows],
+          cash_adjustments: cash_adjustments,
+          non_cash_adjustments: non_cash_adjustments,
           net_market_flows: market_value_change
         )
 
@@ -95,4 +118,51 @@ class Balance::ReverseCalculator < Balance::BaseCalculator
     def use_opening_anchor_for_date?(date)
       account.has_opening_anchor? && date == account.opening_anchor_date
     end
+
+    # Applies the one-day bridge from the opening anchor to the first derived day.
+    def use_opening_boundary_adjustment_for_date?(date)
+      account.has_opening_anchor? && date == account.opening_anchor_date.next_day
+    end
+
+    # Builds explicit adjustments that make the opening-boundary row auditably reconcile.
+    def opening_boundary_adjustment(end_cash_balance:, end_non_cash_balance:, flows:, market_value_change:)
+      opening_cash_balance, opening_non_cash_balance = opening_balance_components
+
+      {
+        start_cash_balance: opening_cash_balance,
+        start_non_cash_balance: opening_non_cash_balance,
+        cash_adjustments: cash_adjustments_for_date(opening_cash_balance, end_cash_balance, cash_flows_total(flows)),
+        non_cash_adjustments: opening_boundary_non_cash_adjustments(
+          opening_non_cash_balance: opening_non_cash_balance,
+          end_non_cash_balance: end_non_cash_balance,
+          flows: flows,
+          market_value_change: market_value_change
+        )
+      }
+    end
+
+    # Splits the opening anchor total into the calculator's persisted components.
+    def opening_balance_components
+      opening_cash_balance = derive_cash_balance_on_date_from_total(
+        total_balance: account.opening_anchor_balance,
+        date: account.opening_anchor_date
+      )
+
+      [ opening_cash_balance, account.opening_anchor_balance - opening_cash_balance ]
+    end
+
+    # Converts same-day cash flow columns into their signed balance impact.
+    def cash_flows_total(flows)
+      (flows[:cash_inflows] - flows[:cash_outflows]) * flows_factor
+    end
+
+    # Converts same-day non-cash flow columns into their signed balance impact.
+    def non_cash_flows_total(flows)
+      (flows[:non_cash_inflows] - flows[:non_cash_outflows]) * flows_factor
+    end
+
+    # Keeps boundary non-cash math market-value-aware for investment accounts.
+    def opening_boundary_non_cash_adjustments(opening_non_cash_balance:, end_non_cash_balance:, flows:, market_value_change:)
+      end_non_cash_balance - opening_non_cash_balance - non_cash_flows_total(flows) - market_value_change
+    end
 end
diff --git a/app/models/balance/sync_cache.rb b/app/models/balance/sync_cache.rb
index 58caf70ad..2bbc65d36 100644
--- a/app/models/balance/sync_cache.rb
+++ b/app/models/balance/sync_cache.rb
@@ -36,6 +36,9 @@ class Balance::SyncCache
     def converted_entries
       @converted_entries ||= account.entries.excluding_split_parents.includes(:entryable).order(:date).to_a.map do |e|
         converted_entry = e.dup
+        # dup does not copy the association cache, so the entryable would
+        # be re-fetched on access. Copy it to keep the preload active.
+        converted_entry.association(:entryable).target = e.entryable
 
         custom_rate = e.entryable.exchange_rate if e.entryable.respond_to?(:exchange_rate)
 
diff --git a/app/models/balance_sheet/account_group.rb b/app/models/balance_sheet/account_group.rb
index a4b23d1f7..3ad275f34 100644
--- a/app/models/balance_sheet/account_group.rb
+++ b/app/models/balance_sheet/account_group.rb
@@ -34,7 +34,7 @@ class BalanceSheet::AccountGroup
   end
 
   def total
-    accounts.sum(&:converted_balance)
+    accounts.reject { |a| a.respond_to?(:exclude_from_reports?) && a.exclude_from_reports? }.sum(&:converted_balance)
   end
 
   def weight
diff --git a/app/models/balance_sheet/account_totals.rb b/app/models/balance_sheet/account_totals.rb
index 5c767687f..a3769bf6d 100644
--- a/app/models/balance_sheet/account_totals.rb
+++ b/app/models/balance_sheet/account_totals.rb
@@ -16,9 +16,12 @@ class BalanceSheet::AccountTotals
   private
     attr_reader :family, :user, :sync_status_monitor
 
-    AccountRow = Data.define(:account, :converted_balance, :is_syncing, :included_in_finances) do
+    AccountRow = Data.define(:account, :converted_balance, :is_syncing, :included_in_finances, :exclude_from_reports) do
       def syncing? = is_syncing
       def included_in_finances? = included_in_finances
+      # Whether this account is excluded from financial reports, dashboards,
+      # and exports.
+      def exclude_from_reports? = exclude_from_reports
 
       # Allows Rails path helpers to generate URLs from the wrapper
       def to_param = account.to_param
@@ -55,7 +58,8 @@ class BalanceSheet::AccountTotals
           account: account,
           converted_balance: converted_balance_for(account),
           is_syncing: sync_status_monitor.account_syncing?(account),
-          included_in_finances: finance_account_ids.nil? || finance_account_ids.include?(account.id)
+          included_in_finances: finance_account_ids.nil? || finance_account_ids.include?(account.id),
+          exclude_from_reports: account.exclude_from_reports?
         )
       end
     end
diff --git a/app/models/balance_sheet/classification_group.rb b/app/models/balance_sheet/classification_group.rb
index 2efced22d..50d20ceec 100644
--- a/app/models/balance_sheet/classification_group.rb
+++ b/app/models/balance_sheet/classification_group.rb
@@ -21,7 +21,9 @@ class BalanceSheet::ClassificationGroup
   end
 
   def total
-    accounts.select { |a| a.respond_to?(:included_in_finances?) ? a.included_in_finances? : true }.sum(&:converted_balance)
+    accounts.select { |a| a.respond_to?(:included_in_finances?) ? a.included_in_finances? : true }
+            .reject { |a| a.respond_to?(:exclude_from_reports?) && a.exclude_from_reports? }
+            .sum(&:converted_balance)
   end
 
   def syncing?
diff --git a/app/models/balance_sheet/historical_account_scope.rb b/app/models/balance_sheet/historical_account_scope.rb
new file mode 100644
index 000000000..b0afb8865
--- /dev/null
+++ b/app/models/balance_sheet/historical_account_scope.rb
@@ -0,0 +1,18 @@
+class BalanceSheet::HistoricalAccountScope
+  def initialize(family, user: nil)
+    @family = family
+    @user = user
+  end
+
+  def account_ids
+    relation.pluck(:id)
+  end
+
+  def relation
+    scope = family.accounts.historical.included_in_reports
+    user.present? ? scope.included_in_finances_for(user) : scope
+  end
+
+  private
+    attr_reader :family, :user
+end
diff --git a/app/models/balance_sheet/net_worth_breakdown_series_builder.rb b/app/models/balance_sheet/net_worth_breakdown_series_builder.rb
new file mode 100644
index 000000000..06397c4a5
--- /dev/null
+++ b/app/models/balance_sheet/net_worth_breakdown_series_builder.rb
@@ -0,0 +1,139 @@
+class BalanceSheet::NetWorthBreakdownSeriesBuilder
+  # Monthly interval regardless of period length so the reports chart always
+  # shows one point per month in the selected range.
+  INTERVAL = "1 month"
+
+  def initialize(family, user: nil)
+    @family = family
+    @user = user
+  end
+
+  # Returns a chart payload where each monthly point carries the net worth
+  # value plus a per-account-group breakdown (grouped by accountable type)
+  # split into assets and liabilities, for rendering in chart tooltips.
+  def breakdown_series(period:)
+    Rails.cache.fetch(cache_key(period)) do
+      net_series = series_for(historical_accounts, favorable_direction: "up", period: period)
+      groups = group_series(period)
+
+      {
+        start_date: period.start_date,
+        end_date: period.end_date,
+        interval: INTERVAL,
+        trend: net_series.trend,
+        values: [ nil, *net_series.values ].each_cons(2).map do |previous, value|
+          breakdown_value(value, previous, groups)
+        end
+      }
+    end
+  end
+
+  private
+    attr_reader :family, :user
+
+    def breakdown_value(value, previous, groups)
+      point_groups = groups.map do |group|
+        {
+          name: group[:name],
+          color: group[:color],
+          classification: group[:classification],
+          value: group[:values_by_date][value.date] || Money.new(0, family.currency)
+        }
+      end
+
+      {
+        date: value.date,
+        date_formatted: value.date_formatted,
+        value: value.value,
+        # Month-over-month change between chart points. The trend on the raw
+        # series value compares the underlying balance row's own start/end,
+        # which at a monthly interval reflects only the last balance update
+        # before the sample date. The first point has no prior month, so it
+        # gets a flat trend.
+        trend: Trend.new(
+          current: value.value,
+          previous: previous&.value || value.value,
+          favorable_direction: "up"
+        ),
+        assets: classification_total(point_groups, "asset"),
+        liabilities: classification_total(point_groups, "liability"),
+        groups: point_groups
+      }
+    end
+
+    def classification_total(point_groups, classification)
+      total = point_groups
+        .select { |group| group[:classification] == classification }
+        .sum { |group| group[:value].amount }
+
+      Money.new(total, family.currency)
+    end
+
+    def group_series(period)
+      grouped_accounts.filter_map do |(classification, accountable), accounts|
+        direction = classification == "asset" ? "up" : "down"
+        series = series_for(accounts, favorable_direction: direction, period: period)
+        values_by_date = series.values.index_by(&:date).transform_values(&:value)
+
+        next if values_by_date.values.all? { |money| money.amount.zero? }
+
+        {
+          name: accountable.display_name,
+          color: accountable.color,
+          classification: classification,
+          values_by_date: values_by_date
+        }
+      end
+    end
+
+    def grouped_accounts
+      historical_accounts
+        .group_by { |account| [ account.classification, Accountable.from_type(account.accountable_type) ] }
+        .sort_by do |(classification, accountable), _accounts|
+          [
+            classification == "asset" ? 0 : 1,
+            Accountable::TYPES.index(accountable.name) || Float::INFINITY
+          ]
+        end
+    end
+
+    def series_for(accounts, favorable_direction:, period:)
+      Balance::ChartSeriesBuilder.new(
+        account_ids: accounts.map(&:id),
+        account_active_until_dates: disabled_account_active_until_dates(accounts),
+        currency: family.currency,
+        period: period,
+        interval: INTERVAL,
+        favorable_direction: favorable_direction
+      ).balance_series
+    end
+
+    def historical_accounts
+      @historical_accounts ||= BalanceSheet::HistoricalAccountScope.new(family, user: user).relation.to_a
+    end
+
+    def disabled_account_active_until_dates(accounts)
+      accounts.each_with_object({}) do |account, dates|
+        next unless account.disabled?
+
+        disabled_on = (account.disabled_at || account.updated_at).to_date
+        dates[account.id] = disabled_on - 1.day
+      end
+    end
+
+    def cache_key(period)
+      shares_version = user ? AccountShare.where(user: user).maximum(:updated_at)&.to_i : nil
+      key = [
+        "balance_sheet_net_worth_breakdown_series",
+        user&.id,
+        shares_version,
+        period.start_date,
+        period.end_date
+      ].compact.join("_")
+
+      family.build_cache_key(
+        key,
+        invalidate_on_data_updates: true
+      )
+    end
+end
diff --git a/app/models/balance_sheet/net_worth_series_builder.rb b/app/models/balance_sheet/net_worth_series_builder.rb
index 7c29a6ece..58f97d321 100644
--- a/app/models/balance_sheet/net_worth_series_builder.rb
+++ b/app/models/balance_sheet/net_worth_series_builder.rb
@@ -7,7 +7,8 @@ class BalanceSheet::NetWorthSeriesBuilder
   def net_worth_series(period: Period.last_30_days)
     Rails.cache.fetch(cache_key(period)) do
       builder = Balance::ChartSeriesBuilder.new(
-        account_ids: visible_account_ids,
+        account_ids: historical_account_ids,
+        account_active_until_dates: disabled_account_active_until_dates,
         currency: family.currency,
         period: period,
         favorable_direction: "up"
@@ -20,18 +21,31 @@ class BalanceSheet::NetWorthSeriesBuilder
   private
     attr_reader :family, :user
 
-    def visible_account_ids
-      @visible_account_ids ||= begin
-        scope = family.accounts.visible
-        scope = scope.included_in_finances_for(user) if user
-        scope.pluck(:id)
+    def historical_accounts
+      @historical_accounts ||= historical_account_scope.relation.to_a
+    end
+
+    def historical_account_ids
+      @historical_account_ids ||= historical_accounts.map(&:id)
+    end
+
+    def disabled_account_active_until_dates
+      @disabled_account_active_until_dates ||= historical_accounts.each_with_object({}) do |account, dates|
+        next unless account.disabled?
+
+        disabled_on = (account.disabled_at || account.updated_at).to_date
+        dates[account.id] = disabled_on - 1.day
       end
     end
 
+    def historical_account_scope
+      @historical_account_scope ||= BalanceSheet::HistoricalAccountScope.new(family, user: user)
+    end
+
     def cache_key(period)
       shares_version = user ? AccountShare.where(user: user).maximum(:updated_at)&.to_i : nil
       key = [
-        "balance_sheet_net_worth_series",
+        "balance_sheet_net_worth_series_historical",
         user&.id,
         shares_version,
         period.start_date,
diff --git a/app/models/brex_entry/processor.rb b/app/models/brex_entry/processor.rb
index 03bbb8689..4e31fc46a 100644
--- a/app/models/brex_entry/processor.rb
+++ b/app/models/brex_entry/processor.rb
@@ -146,11 +146,15 @@ class BrexEntry::Processor
 
       case date_value
       when String
-        Date.parse(date_value)
+        if date_value.include?("T") || date_value.include?(":")
+          Time.parse(date_value).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(date_value)
+        end
       when Integer, Float
-        Time.at(date_value).to_date
+        Time.at(date_value).in_time_zone(account&.family&.timezone).to_date
       when Time, DateTime
-        date_value.to_date
+        date_value.in_time_zone(account&.family&.timezone).to_date
       when Date
         date_value
       else
diff --git a/app/models/budget.rb b/app/models/budget.rb
index 7e673b3fa..dcc9466a1 100644
--- a/app/models/budget.rb
+++ b/app/models/budget.rb
@@ -90,7 +90,9 @@ class Budget < ApplicationRecord
   end
 
   def sync_budget_categories
-    current_category_ids = family.categories.pluck(:id).to_set
+    # Category changes can leave the association memoized before this sync runs.
+    current_categories_by_id = family.categories.reload.index_by(&:id)
+    current_category_ids = current_categories_by_id.keys.to_set
     existing_budget_category_ids = budget_categories.pluck(:category_id).to_set
     categories_to_add = current_category_ids - existing_budget_category_ids
     categories_to_remove = existing_budget_category_ids - current_category_ids
@@ -98,7 +100,7 @@ class Budget < ApplicationRecord
     # Create missing categories
     categories_to_add.each do |category_id|
       budget_categories.create!(
-        category_id: category_id,
+        category: current_categories_by_id.fetch(category_id),
         budgeted_spending: 0,
         currency: family.currency
       )
@@ -118,7 +120,7 @@ class Budget < ApplicationRecord
   def transactions
     scope = family.transactions.visible.in_period(period)
     if current_user
-      scope = scope.joins(:entry).where(entries: { account_id: family.accounts.accessible_by(current_user).select(:id) })
+      scope = scope.joins(:entry).where(entries: { account_id: family.accounts.accessible_by(current_user).included_in_reports.select(:id) })
     end
     scope
   end
diff --git a/app/models/category.rb b/app/models/category.rb
index 229dfa324..7bad10cd5 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -5,7 +5,11 @@ class Category < ApplicationRecord
   belongs_to :family
 
   has_many :budget_categories, dependent: :destroy
-  has_many :subcategories, class_name: "Category", foreign_key: :parent_id, dependent: :nullify
+  has_many :subcategories,
+         -> { order(:name) },
+         class_name: "Category",
+         foreign_key: :parent_id,
+         dependent: :nullify
   belongs_to :parent, class_name: "Category", optional: true
 
   validates :name, :color, :lucide_icon, :family, presence: true
@@ -89,6 +93,29 @@ class Category < ApplicationRecord
   UNCATEGORIZED_NAME_KEY = "models.category.uncategorized"
   OTHER_INVESTMENTS_NAME_KEY = "models.category.other_investments"
   INVESTMENT_CONTRIBUTIONS_NAME_KEY = "models.category.investment_contributions"
+  DEFAULT_CATEGORY_TRANSLATION_KEYS = %w[
+    income
+    food_and_drink
+    groceries
+    shopping
+    transportation
+    travel
+    entertainment
+    healthcare
+    personal_care
+    home_improvement
+    mortgage_rent
+    utilities
+    subscriptions
+    insurance
+    sports_and_fitness
+    gifts_and_donations
+    taxes
+    loan_payments
+    services
+    fees
+    savings_and_investments
+  ].freeze
 
   class Group
     attr_reader :category, :subcategories
@@ -110,6 +137,17 @@ class Category < ApplicationRecord
   end
 
   class << self
+    def ids_with_transactions(family:, category_ids:)
+      category_ids = Array(category_ids).compact
+      return {} if category_ids.empty?
+
+      family.transactions
+            .where(category_id: category_ids)
+            .distinct
+            .pluck(:category_id)
+            .index_with(true)
+    end
+
     def suggested_icon(name)
       name_down = name.to_s.downcase
 
@@ -196,7 +234,38 @@ class Category < ApplicationRecord
       end.uniq
     end
 
+    def localized_default_name_for(name)
+      i18n_key = default_category_translation_key_for(name)
+
+      i18n_key ? I18n.t(i18n_key, default: name) : name
+    end
+
     private
+      def default_category_translation_key_for(name)
+        default_category_translation_keys_by_name[name.to_s]
+      end
+
+      def default_category_translation_keys_by_name
+        @default_category_translation_keys_by_name ||= begin
+          # Default categories store the translated name in the `name` column, so
+          # older families may have default names from any supported locale. This
+          # display-layer bridge maps those known labels back to their i18n key
+          # before rendering in the current locale. A future schema-level
+          # default_key would remove the ambiguity with user-created categories.
+          i18n_keys = DEFAULT_CATEGORY_TRANSLATION_KEYS.index_with { |key| "models.category.defaults.#{key}" }
+          i18n_keys["uncategorized"] = UNCATEGORIZED_NAME_KEY
+          i18n_keys["other_investments"] = OTHER_INVESTMENTS_NAME_KEY
+          i18n_keys["investment_contributions"] = INVESTMENT_CONTRIBUTIONS_NAME_KEY
+
+          LanguagesHelper::SUPPORTED_LOCALES.each_with_object({}) do |locale, mapping|
+            i18n_keys.each_value do |i18n_key|
+              translated_name = I18n.t(i18n_key, locale: locale, default: nil)
+              mapping[translated_name.to_s] ||= i18n_key if translated_name.present?
+            end
+          end
+        end
+      end
+
       def default_categories
         [
           [ I18n.t("models.category.defaults.income"),                "#22c55e", "circle-dollar-sign" ],
@@ -226,9 +295,7 @@ class Category < ApplicationRecord
   end
 
   def inherit_color_from_parent
-    if subcategory?
-      self.color = parent.color
-    end
+    self.color = parent.color if subcategory? && parent
   end
 
   def replace_and_destroy!(replacement)
@@ -239,15 +306,30 @@ class Category < ApplicationRecord
   end
 
   def parent?
-    subcategories.any?
+    if association(:subcategories).loaded?
+      subcategories.any?
+    else
+      subcategories.exists?
+    end
   end
 
   def subcategory?
-    parent.present?
+    parent_id.present? && parent.present?
   end
 
   def name_with_parent
-    subcategory? ? "#{parent.name} > #{name}" : name
+    return name unless subcategory?
+
+    parent_name = parent&.name
+    parent_name.present? ? "#{parent_name} > #{name}" : name
+  end
+
+  def display_name
+    self.class.localized_default_name_for(name)
+  end
+
+  def display_name_with_parent
+    subcategory? ? "#{parent.display_name} > #{display_name}" : display_name
   end
 
   # Predicate: is this the synthetic "Uncategorized" category?
@@ -267,7 +349,7 @@ class Category < ApplicationRecord
 
   private
     def category_level_limit
-      if (subcategory? && parent.subcategory?) || (parent? && subcategory?)
+      if (subcategory? && parent&.subcategory?) || (parent? && subcategory?)
         errors.add(:parent, "can't have more than 2 levels of subcategories")
       end
     end
diff --git a/app/models/category_import.rb b/app/models/category_import.rb
index 1bf4564bb..0ca853df7 100644
--- a/app/models/category_import.rb
+++ b/app/models/category_import.rb
@@ -28,6 +28,12 @@ class CategoryImport < Import
     end
   end
 
+  # Categories hang off the family, not the import — see
+  # Import#committed_by_named_records?.
+  def data_committed?
+    committed_by_named_records?(family.categories)
+  end
+
   def column_keys
     %i[name category_color category_parent category_icon]
   end
diff --git a/app/models/chat.rb b/app/models/chat.rb
index f8935e427..6b76f4c95 100644
--- a/app/models/chat.rb
+++ b/app/models/chat.rb
@@ -132,8 +132,74 @@ class Chat < ApplicationRecord
     assistant.respond_to(message, assistant_message: assistant_message)
   end
 
+  # Minimum age before the server will treat a still-pending response as
+  # undelivered. The browser watchdog waits longer (default 90s) before it even
+  # asks, but the client clock is untrusted, so the server enforces its own floor.
+  UNDELIVERED_RESPONSE_TIMEOUT = 60.seconds
+
+  # Handles the case where an assistant response was never delivered — the
+  # background worker never ran `AssistantResponseJob` (or it died before it
+  # could broadcast an error), leaving a `pending` "Thinking…" bubble forever.
+  # Mirrors `Assistant::Builtin`'s rescue: clears the dead bubble, records a
+  # friendly error + a debug log entry, and broadcasts the error/Retry UI.
+  #
+  # Driven by an untrusted client watchdog, so the state change is gated behind a
+  # row lock + a server-side age check: we re-read the row under lock and only act
+  # if it is *still* pending and has genuinely waited past the timeout, so we never
+  # race a worker that is finishing a legitimate (slow) response.
+  def handle_undelivered_response!(assistant_message)
+    return false unless assistant_message.is_a?(AssistantMessage)
+
+    resolved = assistant_message.with_lock do
+      next false unless assistant_message.pending?
+      next false if assistant_message.created_at > UNDELIVERED_RESPONSE_TIMEOUT.ago
+
+      if assistant_message.content.blank?
+        assistant_message.destroy!
+      else
+        # Demote partially-streamed turns to `failed` so history builders exclude them.
+        assistant_message.update_columns(status: "failed")
+      end
+      true
+    end
+
+    return false unless resolved
+
+    capture_undelivered_response!(assistant_message)
+    update!(error: undelivered_error_payload(assistant_message).to_json)
+    broadcast_append target: messages_target, partial: "chats/error", locals: { chat: self }
+    true
+  end
+
   private
 
+    def undelivered_error_payload(assistant_message)
+      {
+        message: I18n.t("chat.errors.no_response"),
+        technical_message: "Assistant response was never delivered. The background worker did not process " \
+          "AssistantResponseJob for message ##{assistant_message.id} (model #{assistant_message.ai_model}). " \
+          "#{BackgroundJobHealth.summary}",
+        type: "DeliveryTimeout"
+      }
+    end
+
+    def capture_undelivered_response!(assistant_message)
+      DebugLogEntry.capture(
+        category: "assistant",
+        level: "error",
+        message: "Assistant response not delivered — background worker likely down or not polling the high_priority queue",
+        source: "chat.delivery_timeout",
+        metadata: {
+          chat_id: id,
+          message_id: assistant_message.id,
+          ai_model: assistant_message.ai_model,
+          waited_seconds: (Time.current - assistant_message.created_at).round,
+          background_jobs: BackgroundJobHealth.snapshot
+        },
+        family: user&.family
+      )
+    end
+
     def build_error_payload(error)
       technical_message = error_message_for(error)
 
diff --git a/app/models/coinbase_account/processor.rb b/app/models/coinbase_account/processor.rb
index 1cb879ca3..a817534c0 100644
--- a/app/models/coinbase_account/processor.rb
+++ b/app/models/coinbase_account/processor.rb
@@ -47,7 +47,7 @@ class CoinbaseAccount::Processor
 
     # Creates/updates Holdings record for this crypto wallet.
     def process_holdings
-      HoldingsProcessor.new(coinbase_account).process
+      CoinbaseAccount::HoldingsProcessor.new(coinbase_account).process
     end
 
     # Updates the linked Account with current balance from Coinbase.
diff --git a/app/models/coinstats_entry/processor.rb b/app/models/coinstats_entry/processor.rb
index ce1731b4c..33b75d5cb 100644
--- a/app/models/coinstats_entry/processor.rb
+++ b/app/models/coinstats_entry/processor.rb
@@ -255,11 +255,15 @@ class CoinstatsEntry::Processor
 
       case timestamp
       when Integer, Float
-        Time.at(timestamp).to_date
+        Time.at(timestamp).in_time_zone(account&.family&.timezone).to_date
       when String
-        Time.parse(timestamp).to_date
+        if timestamp.include?("T") || timestamp.include?(":")
+          Time.parse(timestamp).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(timestamp)
+        end
       when Time, DateTime
-        timestamp.to_date
+        timestamp.in_time_zone(account&.family&.timezone).to_date
       when Date
         timestamp
       else
diff --git a/app/models/coinstats_item/importer.rb b/app/models/coinstats_item/importer.rb
index b3e35250d..220b69d2a 100644
--- a/app/models/coinstats_item/importer.rb
+++ b/app/models/coinstats_item/importer.rb
@@ -3,6 +3,12 @@
 class CoinstatsItem::Importer
   include CoinstatsTransactionIdentifiable
 
+  FETCH_FAILED = Object.new.freeze
+  DEFI_UNSUPPORTED_BLOCKCHAINS = %w[
+    bitcoin btc litecoin ltc dogecoin doge ripple xrp stellar xlm
+    cardano ada polkadot dot cosmos atom
+  ].freeze
+
   attr_reader :coinstats_item, :coinstats_provider
 
   # @param coinstats_item [CoinstatsItem] Item containing accounts to import
@@ -25,6 +31,7 @@ class CoinstatsItem::Importer
     linked_accounts = coinstats_item.coinstats_accounts
                                     .joins(:account_provider)
                                     .includes(:account)
+                                    .order(:created_at, :id)
 
     if linked_accounts.empty?
       Rails.logger.info "CoinstatsItem::Importer - No linked accounts to sync for item #{coinstats_item.id}"
@@ -43,6 +50,19 @@ class CoinstatsItem::Importer
 
     bulk_balance_data = fetch_balances_for_accounts(wallet_accounts)
     bulk_transactions_data = fetch_transactions_for_accounts(wallet_accounts)
+
+    if fetch_failed?(bulk_balance_data) || fetch_failed?(bulk_transactions_data)
+      accounts_failed += wallet_accounts.size
+      Rails.logger.warn "CoinstatsItem::Importer - Wallet bulk fetch failed; preserving existing wallet snapshots for item #{coinstats_item.id}"
+
+      return {
+        success: false,
+        accounts_updated: 0,
+        accounts_failed: accounts_failed,
+        transactions_imported: 0
+      }
+    end
+
     portfolio_coins_data = fetch_portfolio_coins_for_exchange(exchange_accounts)
     portfolio_transactions_data = fetch_portfolio_transactions_for_exchange(exchange_accounts)
 
@@ -110,7 +130,7 @@ class CoinstatsItem::Importer
 
     # Fetch balance data for all linked accounts using the bulk endpoint
     # @param linked_accounts [Array<CoinstatsAccount>] Accounts to fetch balances for
-    # @return [Array<Hash>, nil] Bulk balance data, or nil on error
+    # @return [Array<Hash>, Object] Bulk balance data, or FETCH_FAILED on error
     def fetch_balances_for_accounts(linked_accounts)
       # Extract unique wallet addresses and blockchains
       wallets = linked_accounts.filter_map do |account|
@@ -122,15 +142,29 @@ class CoinstatsItem::Importer
         { address: address, blockchain: blockchain }
       end.uniq { |w| [ w[:address].downcase, w[:blockchain].downcase ] }
 
-      return nil if wallets.empty?
+      return [] if wallets.empty?
 
       Rails.logger.info "CoinstatsItem::Importer - Fetching balances for #{wallets.size} wallet(s) via bulk endpoint"
-      # Build comma-separated string in format "blockchain:address"
-      wallets_param = wallets.map { |w| "#{w[:blockchain]}:#{w[:address]}" }.join(",")
+      # Build comma-separated string in format "blockchain:address". Sort for a
+      # deterministic batch order so the request is stable regardless of the
+      # account query order (otherwise the bulk-endpoint param varies run to run).
+      wallets_param = wallets
+        .sort_by { |w| "#{w[:blockchain]}:#{w[:address]}".downcase }
+        .map { |w| "#{w[:blockchain]}:#{w[:address]}" }
+        .join(",")
       response = coinstats_provider.get_wallet_balances(wallets_param)
-      response.success? ? response.data : nil
+      response.success? ? response.data : FETCH_FAILED
     rescue => e
-      Rails.logger.warn "CoinstatsItem::Importer - Bulk balance fetch failed: #{e.message}"
+      log_debug_event(
+        level: "warn",
+        message: "CoinStats bulk balance fetch failed",
+        metadata: {
+          coinstats_item_id: coinstats_item.id,
+          wallets: wallets.map { |wallet| "#{wallet[:blockchain]}:#{wallet[:address]}" },
+          error_class: e.class.name,
+          error_message: e.message
+        }
+      )
       nil
     end
 
@@ -148,7 +182,7 @@ class CoinstatsItem::Importer
 
     # Fetch transaction data for all linked accounts using the bulk endpoint
     # @param linked_accounts [Array<CoinstatsAccount>] Accounts to fetch transactions for
-    # @return [Array<Hash>, nil] Bulk transaction data, or nil on error
+    # @return [Array<Hash>, Object] Bulk transaction data, or FETCH_FAILED on error
     def fetch_transactions_for_accounts(linked_accounts)
       # Extract unique wallet addresses and blockchains
       wallets = linked_accounts.filter_map do |account|
@@ -160,16 +194,21 @@ class CoinstatsItem::Importer
         { address: address, blockchain: blockchain }
       end.uniq { |w| [ w[:address].downcase, w[:blockchain].downcase ] }
 
-      return nil if wallets.empty?
+      return [] if wallets.empty?
 
       Rails.logger.info "CoinstatsItem::Importer - Fetching transactions for #{wallets.size} wallet(s) via bulk endpoint"
-      # Build comma-separated string in format "blockchain:address"
-      wallets_param = wallets.map { |w| "#{w[:blockchain]}:#{w[:address]}" }.join(",")
+      # Build comma-separated string in format "blockchain:address". Sort for a
+      # deterministic batch order so the request is stable regardless of the
+      # account query order (otherwise the bulk-endpoint param varies run to run).
+      wallets_param = wallets
+        .sort_by { |w| "#{w[:blockchain]}:#{w[:address]}".downcase }
+        .map { |w| "#{w[:blockchain]}:#{w[:address]}" }
+        .join(",")
       response = coinstats_provider.get_wallet_transactions(wallets_param)
-      response.success? ? response.data : nil
+      response.success? ? response.data : FETCH_FAILED
     rescue => e
       Rails.logger.warn "CoinstatsItem::Importer - Bulk transaction fetch failed: #{e.message}"
-      nil
+      FETCH_FAILED
     end
 
     def fetch_portfolio_transactions_for_exchange(linked_accounts)
@@ -225,15 +264,38 @@ class CoinstatsItem::Importer
         return { success: false, error: "Missing address or blockchain" }
       end
 
-      # Extract balance data for this specific wallet from the bulk response
-      balance_data = if bulk_balance_data.present?
-        coinstats_provider.extract_wallet_balance(bulk_balance_data, address, blockchain)
+      if bulk_balance_data.nil?
+        log_debug_event(
+          level: "warn",
+          message: "CoinStats wallet balance sync preserved existing snapshot after bulk fetch failure",
+          account_provider: coinstats_account.account_provider,
+          metadata: {
+            coinstats_item_id: coinstats_item.id,
+            coinstats_account_id: coinstats_account.id,
+            wallet_address: address,
+            blockchain: blockchain,
+            reason: "bulk_balance_data_missing"
+          }
+        )
+      elsif wallet_missing_from_bulk_balance_data?(bulk_balance_data, address, blockchain)
+        log_debug_event(
+          level: "warn",
+          message: "CoinStats wallet balance sync preserved existing snapshot because wallet was missing from bulk response",
+          account_provider: coinstats_account.account_provider,
+          metadata: {
+            coinstats_item_id: coinstats_item.id,
+            coinstats_account_id: coinstats_account.id,
+            wallet_address: address,
+            blockchain: blockchain,
+            reason: "wallet_missing_from_bulk_response"
+          }
+        )
       else
-        []
-      end
+        balance_data = coinstats_provider.extract_wallet_balance(bulk_balance_data, address, blockchain)
 
-      # Update the coinstats account with new balance data
-      coinstats_account.upsert_coinstats_snapshot!(normalize_balance_data(balance_data, coinstats_account))
+        # Update the coinstats account with new balance data
+        coinstats_account.upsert_coinstats_snapshot!(normalize_balance_data(balance_data, coinstats_account))
+      end
 
       # Extract and merge transactions from bulk response
       transactions_count = fetch_and_merge_transactions(coinstats_account, address, blockchain, bulk_transactions_data)
@@ -241,6 +303,30 @@ class CoinstatsItem::Importer
       { success: true, transactions_count: transactions_count }
     end
 
+    def wallet_missing_from_bulk_balance_data?(bulk_balance_data, address, blockchain)
+      return true unless bulk_balance_data.is_a?(Array)
+
+      bulk_balance_data.none? do |entry|
+        entry = entry.with_indifferent_access
+        entry[:address]&.downcase == address&.downcase &&
+          (entry[:connectionId]&.downcase == blockchain&.downcase ||
+           entry[:blockchain]&.downcase == blockchain&.downcase)
+      end
+    end
+
+    def log_debug_event(level:, message:, metadata:, account_provider: nil)
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: level,
+        message: message,
+        source: self.class.name,
+        provider_key: "coinstats",
+        family: coinstats_item.family,
+        account_provider: account_provider,
+        metadata: metadata
+      )
+    end
+
     def update_exchange_account(coinstats_account, portfolio_coins_data:, portfolio_transactions_data:)
       portfolio_id = exchange_portfolio_id_for(coinstats_account)
       balance_data = portfolio_coins_data[portfolio_id]
@@ -472,6 +558,10 @@ class CoinstatsItem::Importer
       end
     end
 
+    def fetch_failed?(data)
+      data.equal?(FETCH_FAILED)
+    end
+
     def find_matching_portfolio_coin(balance_data, coinstats_account)
       Array(balance_data).map(&:with_indifferent_access).find do |coin_data|
         coin = coin_data[:coin].to_h.with_indifferent_access
@@ -598,6 +688,7 @@ class CoinstatsItem::Importer
       unique_wallets = (wallet_accounts + defi_accounts).uniq(&:id).filter_map do |account|
         raw = account.raw_payload.to_h.with_indifferent_access
         next unless raw[:address].present? && raw[:blockchain].present?
+        next unless defi_supported_blockchain?(raw[:blockchain])
 
         { address: raw[:address], blockchain: raw[:blockchain] }
       end.uniq { |w| [ w[:address].downcase, w[:blockchain].downcase ] }
@@ -617,4 +708,8 @@ class CoinstatsItem::Importer
       Rails.logger.warn "CoinstatsItem::Importer - DeFi sync failed: #{e.message}"
       Set.new
     end
+
+    def defi_supported_blockchain?(blockchain)
+      blockchain.present? && !DEFI_UNSUPPORTED_BLOCKCHAINS.include?(blockchain.to_s.downcase)
+    end
 end
diff --git a/app/models/concerns/accountable.rb b/app/models/concerns/accountable.rb
index f008fea5e..1ff0096a7 100644
--- a/app/models/concerns/accountable.rb
+++ b/app/models/concerns/accountable.rb
@@ -54,6 +54,10 @@ module Accountable
       subtype_label_for(subtype, format: :long)
     end
 
+    def subtype_options_for_select
+      self::SUBTYPES.keys.map { |subtype| [ long_subtype_label_for(subtype), subtype ] }
+    end
+
     def favorable_direction
       classification == "asset" ? "up" : "down"
     end
diff --git a/app/models/concerns/enrichable.rb b/app/models/concerns/enrichable.rb
index a354d4245..8b01698e2 100644
--- a/app/models/concerns/enrichable.rb
+++ b/app/models/concerns/enrichable.rb
@@ -41,20 +41,20 @@ module Enrichable
   end
 
   # Convenience method for a single attribute
-  def enrich_attribute(attr, value, source:, metadata: {})
-    enrich_attributes({ attr => value }, source:, metadata:)
+  def enrich_attribute(attr, value, source:, metadata: {}, ignore_locks: false)
+    enrich_attributes({ attr => value }, source:, metadata:, ignore_locks:)
   end
 
   # Enriches and logs all attributes that:
-  # - Are not locked
+  # - Are not locked (unless ignore_locks: true, e.g. an explicit rule re-apply)
   # - Are not ignored
   # - Have changed value from the last saved value
   # Returns true if any attributes were actually changed, false otherwise
-  def enrich_attributes(attrs, source:, metadata: {})
+  def enrich_attributes(attrs, source:, metadata: {}, ignore_locks: false)
     # Track current values before modification for virtual attributes (like tag_ids)
     current_values = {}
     enrichable_attrs = Array(attrs).reject do |attr_key, attr_value|
-      if locked?(attr_key) || ignored_enrichable_attributes.include?(attr_key)
+      if (locked?(attr_key) && !ignore_locks) || ignored_enrichable_attributes.include?(attr_key)
         true
       else
         # For virtual attributes (like tag_ids), use the getter method
diff --git a/app/models/concerns/qif_parser.rb b/app/models/concerns/qif_parser.rb
index 65e8a9ba8..654cae5d4 100644
--- a/app/models/concerns/qif_parser.rb
+++ b/app/models/concerns/qif_parser.rb
@@ -354,12 +354,15 @@ module QifParser
   #   - Optional spaces around components:  6/ 4'20  →  6/4/20
   #   - Dot separators:  04.06.2020
   #   - Dash separators:  04-06-2020
+  #   - Month-name separators:  26 Jan 2026  (Amex-style "dd mmm yyyy")
   #
   # This method:
   #   1. Strips whitespace
   #   2. Replaces the Quicken apostrophe with the file's date separator
-  #   3. Expands 2-digit years to 4-digit (00-99 → 2000-2099, capped at current year)
-  #   4. Returns a cleaned date string suitable for Date.strptime
+  #   3. Collapses whitespace (removes it for numeric dates; keeps single
+  #      spaces for month-name dates since the space IS the separator)
+  #   4. Expands 2-digit years to 4-digit (00-99 → 2000-2099, capped at current year)
+  #   5. Returns a cleaned date string suitable for Date.strptime
   def self.normalize_qif_date(date_str)
     return nil if date_str.blank?
 
@@ -371,12 +374,20 @@ module QifParser
       s = s.gsub("'", sep)
     end
 
-    # Remove internal spaces (e.g. "6/ 4/20" → "6/4/20")
-    s = s.gsub(/\s+/, "")
+    # Whitespace handling depends on the date style:
+    #   - Month-name dates (e.g. "26 Jan 2026") use spaces as the field
+    #     separator, so collapse multiples to a single space.
+    #   - Numeric dates (e.g. Quicken's padded "6/ 4/20") use / . or - as
+    #     separators and may carry stray padding spaces, so strip them.
+    if s.match?(/[A-Za-z]/)
+      s = s.gsub(/\s+/, " ").strip
+    else
+      s = s.gsub(/\s+/, "")
+    end
 
     # Expand 2-digit year at end to 4-digit, but only when the string doesn't
     # already contain a 4-digit number (which would be a full year).
-    if !s.match?(/\d{4}/) && (m = s.match(%r{\A(.+[/.\-])(\d{2})\z}))
+    if !s.match?(/\d{4}/) && (m = s.match(%r{\A(.+[/.\- ])(\d{2})\z}))
       short_year = m[2].to_i
       full_year  = 2000 + short_year
       full_year -= 100 if full_year > Date.today.year
diff --git a/app/models/concerns/syncable.rb b/app/models/concerns/syncable.rb
index ff47e0c6a..90809b4d1 100644
--- a/app/models/concerns/syncable.rb
+++ b/app/models/concerns/syncable.rb
@@ -6,7 +6,42 @@ module Syncable
   end
 
   def syncing?
-    syncs.visible.any?
+    if Current.respond_to?(:syncing_by_syncable) && (syncing_by_syncable = Current.syncing_by_syncable)
+      key = [ self.class.base_class.name, id ]
+      return !!syncing_by_syncable[key] if syncing_by_syncable.key?(key)
+    end
+
+    if association(:syncs).loaded?
+      syncs.any?(&:visible?)
+    else
+      syncs.visible.any?
+    end
+  end
+
+  def latest_sync_record
+    if Current.respond_to?(:latest_sync_by_syncable) && (latest_sync_by_syncable = Current.latest_sync_by_syncable)
+      key = [ self.class.base_class.name, id ]
+      return latest_sync_by_syncable[key] if latest_sync_by_syncable.key?(key)
+    end
+
+    if association(:syncs).loaded?
+      syncs.max_by { |sync| [ sync.created_at, sync.id ] }
+    else
+      syncs.ordered.first
+    end
+  end
+
+  def latest_completed_sync_record
+    if Current.respond_to?(:latest_completed_sync_by_syncable) && (latest_completed_sync_by_syncable = Current.latest_completed_sync_by_syncable)
+      key = [ self.class.base_class.name, id ]
+      return latest_completed_sync_by_syncable[key] if latest_completed_sync_by_syncable.key?(key)
+    end
+
+    if association(:syncs).loaded?
+      syncs.select(&:completed?).max_by { |sync| [ sync.created_at, sync.id ] }
+    else
+      syncs.completed.ordered.first
+    end
   end
 
   # Schedules a sync for syncable.  If there is an existing sync pending/syncing for this syncable,
@@ -56,24 +91,24 @@ module Syncable
   end
 
   def sync_error
-    latest_sync&.error || latest_sync&.children&.map(&:error)&.compact&.first
+    latest_sync_record&.error || latest_sync_record&.children&.map(&:error)&.compact&.first
   end
 
   def last_synced_at
-    latest_completed_sync&.completed_at
+    latest_completed_sync_record&.completed_at
   end
 
   def last_sync_created_at
-    latest_sync&.created_at
+    latest_sync_record&.created_at
   end
 
   private
     def latest_sync
-      syncs.ordered.first
+      latest_sync_record
     end
 
     def latest_completed_sync
-      syncs.completed.ordered.first
+      latest_completed_sync_record
     end
 
     def syncer
diff --git a/app/models/current.rb b/app/models/current.rb
index 612c2af76..af9f14b77 100644
--- a/app/models/current.rb
+++ b/app/models/current.rb
@@ -2,6 +2,7 @@ class Current < ActiveSupport::CurrentAttributes
   attribute :user_agent, :ip_address
 
   attribute :session
+  attribute :latest_sync_by_syncable, :latest_completed_sync_by_syncable, :syncing_by_syncable
 
   delegate :family, to: :user, allow_nil: true
 
diff --git a/app/models/data_enrichment.rb b/app/models/data_enrichment.rb
index 66c364660..ae29d80dd 100644
--- a/app/models/data_enrichment.rb
+++ b/app/models/data_enrichment.rb
@@ -7,6 +7,7 @@ class DataEnrichment < ApplicationRecord
     simplefin: "simplefin",
     lunchflow: "lunchflow",
     akahu: "akahu",
+    up: "up",
     synth: "synth",
     ai: "ai",
     enable_banking: "enable_banking",
@@ -15,6 +16,8 @@ class DataEnrichment < ApplicationRecord
     brex: "brex",
     indexa_capital: "indexa_capital",
     sophtron: "sophtron",
-    ibkr: "ibkr"
+    ibkr: "ibkr",
+    questrade: "questrade",
+    redbark: "redbark"
   }
 end
diff --git a/app/models/demo/data_cleaner.rb b/app/models/demo/data_cleaner.rb
index 726ceb9e8..829411db2 100644
--- a/app/models/demo/data_cleaner.rb
+++ b/app/models/demo/data_cleaner.rb
@@ -11,6 +11,15 @@ class Demo::DataCleaner
     # Clear SSO audit logs first (they reference users)
     SsoAuditLog.destroy_all
 
+    # ApiKey#prevent_demo_monitoring_key_destroy! throws :abort to stop the demo
+    # monitoring key being revoked from the UI. That abort silently no-ops the
+    # entire Family.destroy_all cascade below (accounts/entries/trades all
+    # survive), which only then surfaces as a NOT NULL crash in
+    # `Security.destroy_all`. Safe to bypass here: this class only runs in
+    # dev/test (see #ensure_safe_environment!).
+
+    ApiKey.where(display_key: ApiKey::DEMO_MONITORING_KEY).delete_all
+
     Family.destroy_all
     Setting.destroy_all
     InviteCode.destroy_all
diff --git a/app/models/demo/generator.rb b/app/models/demo/generator.rb
index e047424cc..417028b94 100644
--- a/app/models/demo/generator.rb
+++ b/app/models/demo/generator.rb
@@ -871,16 +871,24 @@ class Demo::Generator
       diff_amex     = amex_balance - target_amex
       diff_sapphire = sapphire_balance - target_sapphire
 
-      if diff_amex.abs > 250
-        adjust_payment = diff_amex.positive? ? diff_amex : 0
-        create_transfer!(@chase_checking, @amex_gold, adjust_payment, "Amex Balance Adjust", Date.current)
-        amex_balance -= adjust_payment
+      if diff_amex > 250
+        create_transfer!(@chase_checking, @amex_gold, diff_amex, "Amex Balance Adjust", Date.current)
+        amex_balance -= diff_amex
+      elsif diff_amex < -250
+        # Balance landed below target: a transfer can't have a negative payment
+        # amount, so bring the card up to target with a direct charge instead.
+        shortfall = diff_amex.abs
+        create_transaction!(@amex_gold, shortfall, "Balance Reconciliation", random_expense_category, Date.current)
+        amex_balance += shortfall
       end
 
-      if diff_sapphire.abs > 250
-        adjust_payment = diff_sapphire.positive? ? diff_sapphire : 0
-        create_transfer!(@chase_checking, @chase_sapphire, adjust_payment, "Sapphire Balance Adjust", Date.current)
-        sapphire_balance -= adjust_payment
+      if diff_sapphire > 250
+        create_transfer!(@chase_checking, @chase_sapphire, diff_sapphire, "Sapphire Balance Adjust", Date.current)
+        sapphire_balance -= diff_sapphire
+      elsif diff_sapphire < -250
+        shortfall = diff_sapphire.abs
+        create_transaction!(@chase_sapphire, shortfall, "Balance Reconciliation", random_expense_category, Date.current)
+        sapphire_balance += shortfall
       end
 
       puts "   💳 Charges generated: #{charges_this_run} | Payments: #{payments_this_run}"
diff --git a/app/models/enable_banking_account.rb b/app/models/enable_banking_account.rb
index 91bf07539..c211bb931 100644
--- a/app/models/enable_banking_account.rb
+++ b/app/models/enable_banking_account.rb
@@ -105,7 +105,12 @@ class EnableBankingAccount < ApplicationRecord
 
     update!(
       current_balance: nil,
-      currency: parse_currency(snapshot[:currency]) || "EUR",
+      # Preserve an established currency when the snapshot omits or mangles it
+      # (normalized, so blank/invalid stored values still fall through) —
+      # EUR only for records that never had a valid currency. Mirrors the
+      # equivalent Lunch Flow fix; PSD2 payloads usually carry currency, so
+      # this is parity/safety rather than an observed failure.
+      currency: parse_currency(snapshot[:currency]) || parse_currency(currency) || "EUR",
       name: build_account_name(snapshot),
       account_id: snapshot[:uid],
       uid: snapshot[:identification_hash] || snapshot[:uid],
diff --git a/app/models/enable_banking_account/processor.rb b/app/models/enable_banking_account/processor.rb
index a6b546f0a..20e2218b6 100644
--- a/app/models/enable_banking_account/processor.rb
+++ b/app/models/enable_banking_account/processor.rb
@@ -37,33 +37,35 @@ class EnableBankingAccount::Processor
       end
 
       account = enable_banking_account.current_account
-      balance = enable_banking_account.current_balance || 0
+      balance = enable_banking_account.current_balance
+
+      # A nil current_balance means this sync's balance fetch did not succeed:
+      # upsert_enable_banking_snapshot! clears it and only a successful
+      # balance fetch repopulates it. Coercing nil to 0 here would persist a
+      # zero balance (and a zero current_anchor valuation) onto a healthy
+      # account whenever the provider has a transient failure, so leave the
+      # account untouched instead.
+      if balance.nil?
+        Rails.logger.warn("EnableBankingAccount::Processor - No balance available for enable_banking_account #{enable_banking_account.id} (balance fetch failed or not yet run), skipping account update")
+        return
+      end
+
       available_credit = nil
+      skip_balance_update = false
 
       # For liability accounts, ensure balance sign is correct.
-      # DELIBERATE UX DECISION: For CreditCards, we display the available credit (credit_limit - outstanding debt)
-      # rather than the raw outstanding debt. Do not revert this behavior, as future maintainers should understand
-      # users expect to see how much credit they have left rather than their debt balance.
-      # The 'available_credit' calculation overrides the 'balance' variable.
-      if account.accountable_type == "Loan"
+      # For CreditCards, we expect the main balance to reflect the absolute outstanding debt
+      # rather than available credit, to ensure net worth calculations handle the liability accurately.
+      # Any available credit metrics (from limits) are instead stored safely as metadata on the Accountable.
+      # Loans and CreditCards must always represent their outstanding balance as an absolute
+      # positive debt amount, regardless of the API's reported sign, to ensure the BalanceSheet
+      # calculates net worth accurately.
+      if account.accountable_type == "Loan" || account.accountable_type == "CreditCard"
+        # Standardize the raw balance to an absolute positive debt
         balance = balance.abs
-      elsif account.accountable_type == "CreditCard"
-        if enable_banking_account.credit_limit.present?
-          available = enable_banking_account.credit_limit - balance.abs
-          available_credit = [ available, 0 ].max
-          balance = available_credit
-          unless account.accountable.present?
-            Rails.logger.warn "EnableBankingAccount::Processor - CreditCard accountable missing for account #{account.id}"
-          end
-        elsif account.accountable&.available_credit.present?
-          # Fallback: no credit_limit from API — compute it using available_credit defined at account level
-          Rails.logger.info "Using stored available_credit fallback for account #{account.id}"
-          available_credit = account.accountable.available_credit
-          outstanding = balance.abs
-          balance = [ available_credit - outstanding, 0 ].max
-        else
-          # Fallback: no credit_limit from API — display raw outstanding balance
-          # We cannot derive available credit without knowing the limit; leave balance unchanged.
+
+        if account.accountable_type == "CreditCard"
+          balance, available_credit, skip_balance_update = interpret_credit_card_balance(account, balance)
         end
       end
 
@@ -74,19 +76,85 @@ class EnableBankingAccount::Processor
         if account.accountable.present? && account.accountable.respond_to?(:available_credit=)
           account.accountable.update!(available_credit: available_credit)
         end
-        account.update!(currency: currency, cash_balance: balance)
 
-        # Use set_current_balance to create a current_anchor valuation entry.
-        # This enables Balance::ReverseCalculator, which works backward from the
-        # bank-reported balance — eliminating spurious cash adjustment spikes.
-        result = account.set_current_balance(balance)
-        raise ProcessingError, "Failed to set current balance: #{result.error}" unless result.success?
+        if skip_balance_update
+          account.update!(currency: currency)
+        else
+          account.update!(currency: currency, cash_balance: balance)
+
+          # Use set_current_balance to create a current_anchor valuation entry.
+          # This enables Balance::ReverseCalculator, which works backward from the
+          # bank-reported balance — eliminating spurious cash adjustment spikes.
+          result = account.set_current_balance(balance)
+          raise ProcessingError, "Failed to set current balance: #{result.error}" unless result.success?
+        end
       end
 
       # TODO: pass explicit window_start_date to sync_later to avoid full history recalculation on every sync
       # Currently relies on set_current_balance's implicit sync trigger; window params would require refactor
     end
 
+    # Interprets the reported credit card balance based on the
+    # treat_balance_as_available_credit flag.
+    # Returns [balance, available_credit, skip_balance_update].
+    def interpret_credit_card_balance(account, reported_balance)
+      if enable_banking_account.treat_balance_as_available_credit?
+        # In this mode the accountable's available_credit field holds the credit
+        # limit: the API-provided one, or a user-entered value when the API
+        # omits it. Writing the limit back (never the reported balance) keeps
+        # the field stable across syncs so a manual limit is never clobbered.
+        credit_limit = enable_banking_account.credit_limit.presence ||
+                       account.accountable&.available_credit
+
+        unless account.accountable.present?
+          capture_debug_log("CreditCard accountable missing for account", account)
+        end
+
+        if credit_limit.present?
+          # The API returns the available credit as the current balance, so the
+          # outstanding debt is derived from the credit limit.
+          # Use .max(0) to prevent synthetic debt on overpaid cards.
+          outstanding_debt = [ credit_limit - reported_balance, 0 ].max
+
+          [ outstanding_debt, credit_limit, false ]
+        else
+          # No credit limit from the API or the card's available credit field.
+          # The reported balance is available credit, so the outstanding debt is
+          # unknown. Keep the existing account balance instead of recording
+          # available credit as debt.
+          capture_debug_log("Cannot compute debt from available credit because no credit limit is set (API or manual)", account)
+
+          [ nil, nil, true ]
+        end
+      else
+        # Default behavior: API returns outstanding debt
+        available_credit = if enable_banking_account.credit_limit.present?
+          [ enable_banking_account.credit_limit - reported_balance, 0 ].max
+        elsif account.accountable&.available_credit.present?
+          # No limit from API, but we have stored available_credit metadata
+          account.accountable.available_credit
+        end
+
+        [ reported_balance, available_credit, false ]
+      end
+    end
+
+    def capture_debug_log(message, account)
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "warn",
+        message: message,
+        source: "EnableBankingAccount::Processor",
+        provider_key: "enable_banking",
+        account: account,
+        account_provider: account.account_providers.find_by(provider_type: "EnableBankingAccount"),
+        metadata: {
+          enable_banking_account_id: enable_banking_account.id,
+          enable_banking_item_id: enable_banking_account.enable_banking_item_id
+        }
+      )
+    end
+
     def process_transactions
       EnableBankingAccount::Transactions::Processor.new(enable_banking_account).process
     rescue => e
diff --git a/app/models/enable_banking_entry/processor.rb b/app/models/enable_banking_entry/processor.rb
index 4f41b21f8..6afee84f0 100644
--- a/app/models/enable_banking_entry/processor.rb
+++ b/app/models/enable_banking_entry/processor.rb
@@ -258,11 +258,15 @@ class EnableBankingEntry::Processor
 
       case date_value
       when String
-        Date.parse(date_value)
+        if date_value.include?("T") || date_value.include?(":")
+          Time.parse(date_value).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(date_value)
+        end
       when Integer, Float
-        Time.at(date_value).to_date
+        Time.at(date_value).in_time_zone(account&.family&.timezone).to_date
       when Time, DateTime
-        date_value.to_date
+        date_value.in_time_zone(account&.family&.timezone).to_date
       when Date
         date_value
       else
diff --git a/app/models/enable_banking_item.rb b/app/models/enable_banking_item.rb
index 7f3b6a540..87af6ec78 100644
--- a/app/models/enable_banking_item.rb
+++ b/app/models/enable_banking_item.rb
@@ -73,19 +73,31 @@ class EnableBankingItem < ApplicationRecord
     raise StandardError.new("Enable Banking provider is not configured") unless provider
 
     validated_psu_type = psu_type
+    selected_method = nil
 
     # Store ASPSP metadata before calling provider so it's available even if auth fails
     if aspsp_data.present?
       aspsp_data = aspsp_data.with_indifferent_access
-      first_auth_method = aspsp_data.dig(:auth_methods, 0) || aspsp_data.dig("auth_methods", 0)
-      aspsp_types = aspsp_data[:psu_types] || []
+      aspsp_types = Array(aspsp_data[:psu_types]).map(&:to_s)
+
+      # If the requested PSU type isn't supported by this ASPSP, fall back to the
+      # first type it advertises rather than failing outright.
+      validated_psu_type = if psu_type.present? && aspsp_types.include?(psu_type)
+        psu_type
+      elsif aspsp_types.any?
+        aspsp_types.first
+      else
+        psu_type
+      end
+
+      selected_method = select_auth_method(aspsp_data, validated_psu_type)
+
       update!(
         aspsp_required_psu_headers: aspsp_data[:required_psu_headers] || [],
         aspsp_maximum_consent_validity: aspsp_data[:maximum_consent_validity],
-        aspsp_auth_approach: first_auth_method&.dig(:approach) || first_auth_method&.dig("approach"),
+        aspsp_auth_approach: selected_method&.dig(:approach),
         aspsp_psu_types: aspsp_types
       )
-      validated_psu_type = psu_type.present? && aspsp_types.include?(psu_type) ? psu_type : nil
     end
 
     result = provider.start_authorization(
@@ -95,7 +107,8 @@ class EnableBankingItem < ApplicationRecord
       state: state,
       psu_type: validated_psu_type,
       maximum_consent_validity: aspsp_maximum_consent_validity,
-      language: language
+      language: language,
+      auth_method: selected_method&.dig(:name)
     )
 
     attributes = {
@@ -109,6 +122,26 @@ class EnableBankingItem < ApplicationRecord
     result[:url]
   end
 
+  # Shared entry point for both initial authorization and reauthorization.
+  # Re-fetches ASPSP metadata (so the auth method / PSU type selection and the
+  # stored approach stay accurate) and starts the provider authorization. The
+  # re-fetch — rather than caching the full ASPSP object in the session — keeps
+  # us under the 4KB session cookie limit.
+  # @return [String] Redirect URL for the user
+  def begin_authorization!(redirect_url:, state:, language: nil, psu_type: nil, aspsp_name: nil)
+    name = aspsp_name.presence || self.aspsp_name
+    raise StandardError.new("No bank selected for this connection") if name.blank?
+
+    start_authorization(
+      aspsp_name: name,
+      redirect_url: redirect_url,
+      state: state,
+      psu_type: psu_type.presence || self.psu_type || "personal",
+      aspsp_data: fetch_aspsp_data(name),
+      language: language
+    )
+  end
+
   # Complete the authorization flow with the code from callback
   def complete_authorization(code:)
     provider = enable_banking_provider
@@ -130,6 +163,27 @@ class EnableBankingItem < ApplicationRecord
     result
   end
 
+  # Reconcile the locally-stored session expiry with what the API reports.
+  # The session info returned by GET /sessions carries the authoritative
+  # access.valid_until; persisting it on every sync keeps session_valid? accurate
+  # and avoids both premature "expired" states and stale "still valid" states.
+  def reconcile_session_expiry!(session_data)
+    return unless session_data.is_a?(Hash)
+
+    valid_until = session_data.dig(:access, :valid_until) || session_data.dig("access", "valid_until")
+    return if valid_until.blank?
+
+    parsed = Time.zone.parse(valid_until.to_s)
+    return if parsed.nil? || parsed == session_expires_at
+
+    update!(session_expires_at: parsed)
+  rescue ArgumentError, TypeError, ActiveRecord::ActiveRecordError => e
+    # Best-effort reconciliation: swallow bad timestamps (ArgumentError/TypeError)
+    # as well as validation/locking failures from update! (RecordInvalid,
+    # StaleObjectError) so a sync is never derailed by expiry bookkeeping.
+    Rails.logger.warn "EnableBankingItem #{id} - Failed to reconcile session expiry: #{e.message}"
+  end
+
   def import_latest_enable_banking_data
     provider = enable_banking_provider
     unless provider
@@ -288,6 +342,51 @@ class EnableBankingItem < ApplicationRecord
 
   private
 
+    # Authentication approach preference, lowest number wins.
+    # REDIRECT is the smoothest (PSU authenticates entirely on the ASPSP page).
+    # DECOUPLED works through Enable Banking's hosted page (push-to-app / photoTAN
+    # / chipTAN). EMBEDDED is last resort (handled by the hosted page too).
+    AUTH_APPROACH_PRIORITY = { "REDIRECT" => 0, "DECOUPLED" => 1, "EMBEDDED" => 2 }.freeze
+
+    # Choose the best authentication method for the given PSU type.
+    # Returns a hash with :name and :approach, or nil when the ASPSP exposes no
+    # API-selectable methods (Enable Banking then falls back to its default).
+    def select_auth_method(aspsp_data, psu_type)
+      methods = Array(aspsp_data[:auth_methods]).map(&:with_indifferent_access)
+      return nil if methods.empty?
+
+      # Hidden methods aren't surfaced on Enable Banking's hosted page, so we don't
+      # auto-select one (the PSU couldn't complete it). If every method is hidden,
+      # return nil and let /auth fall back to the ASPSP's default rather than
+      # forcing a non-selectable method.
+      methods = methods.reject { |m| ActiveModel::Type::Boolean.new.cast(m[:hidden_method]) }
+      return nil if methods.empty?
+
+      # Prefer methods that match the chosen PSU type; if none declare a psu_type
+      # (or none match), consider all of them.
+      matching = methods.select { |m| m[:psu_type].blank? || m[:psu_type].to_s == psu_type.to_s }
+      candidates = matching.presence || methods
+
+      best = candidates.min_by { |m| AUTH_APPROACH_PRIORITY.fetch(m[:approach].to_s, 99) }
+      return nil unless best
+
+      { name: best[:name], approach: best[:approach] }
+    end
+
+    # Fetch the ASPSP object for a given name from the provider's /aspsps list.
+    # Returns a HashWithIndifferentAccess, or nil if unavailable.
+    def fetch_aspsp_data(aspsp_name)
+      provider = enable_banking_provider
+      return nil unless provider
+
+      response = provider.get_aspsps(country: country_code)
+      raw_aspsps = response[:aspsps] || response["aspsps"] || []
+      raw_aspsps.find { |a| (a[:name] || a["name"]) == aspsp_name }&.with_indifferent_access
+    rescue Provider::EnableBanking::EnableBankingError => e
+      Rails.logger.warn "EnableBankingItem #{id} - could not fetch ASPSP metadata for #{aspsp_name}: #{e.message}"
+      nil
+    end
+
     def parse_session_expiry(session_result)
       if session_result[:access].present? && session_result[:access][:valid_until].present?
         parsed = Time.zone.parse(session_result[:access][:valid_until])
diff --git a/app/models/enable_banking_item/importer.rb b/app/models/enable_banking_item/importer.rb
index 696b4f673..e34f4cf11 100644
--- a/app/models/enable_banking_item/importer.rb
+++ b/app/models/enable_banking_item/importer.rb
@@ -3,6 +3,17 @@ class EnableBankingItem::Importer
   # Enable Banking typically returns ~100 transactions per page, so 100 pages = ~10,000 transactions
   MAX_PAGINATION_PAGES = 100
 
+  # Prefer booked ledger balances for net worth/current_balance. Available balances
+  # can include an arranged overdraft facility for some ASPSPs (for example CGD PT),
+  # so they are only a last-resort fallback.
+  BALANCE_TYPE_PRIORITY = %w[
+    CLBD closingBooked
+    ITBD interimBooked
+    XPCD expected
+    CLAV closingAvailable
+    ITAV interimAvailable
+  ].freeze
+
   NETWORK_ERRORS = [
     ::SocketError,
     ::Errno::ECONNREFUSED,
@@ -82,19 +93,18 @@ class EnableBankingItem::Importer
       end
     end
 
-    # Fetch balances and transactions for linked accounts
+    # Fetch balances and transactions for linked accounts. Balance refreshes are
+    # best-effort: a balance endpoint failure should keep the previous balance and
+    # must not prevent transaction sync for the same account.
     transactions_imported = 0
     transactions_failed = 0
+    balances_failed = 0
 
     linked_accounts_query = enable_banking_item.enable_banking_accounts.joins(:account_provider).joins(:account).merge(Account.visible)
 
     linked_accounts_query.each do |enable_banking_account|
       begin
-        unless fetch_and_update_balance(enable_banking_account)
-          transactions_failed += 1
-          # @sync_error already set in fetch_and_update_balance
-          next
-        end
+        balances_failed += 1 unless fetch_and_update_balance(enable_banking_account)
 
         result = fetch_and_store_transactions(enable_banking_account)
         if result[:success]
@@ -115,7 +125,8 @@ class EnableBankingItem::Importer
       accounts_updated: accounts_updated,
       accounts_failed: accounts_failed,
       transactions_imported: transactions_imported,
-      transactions_failed: transactions_failed
+      transactions_failed: transactions_failed,
+      balances_failed: balances_failed
     }
 
     result[:error] = @sync_error || I18n.t("enable_banking_items.errors.unexpected") if !result[:success]
@@ -124,14 +135,20 @@ class EnableBankingItem::Importer
 
   private
 
-    def handle_sync_error(exception)
+    # @param session_level [Boolean] true only for the top-level GET /sessions call.
+    #   A session-level 401/404 means the consent is genuinely dead and the user
+    #   must re-authorize. Per-account 401/404 (a stale account UID, a transient
+    #   hiccup on one account) must NOT mark the whole connection requires_update —
+    #   doing so is what made every sync report "session expired". Those are recorded
+    #   as ordinary sync errors and retried on the next sync.
+    def handle_sync_error(exception, session_level: false)
       # Check the underlying cause first, then the exception itself
       exceptions = [ exception.cause, exception ].compact
 
       provider_error = exceptions.find { |ex| ex.is_a?(Provider::EnableBanking::EnableBankingError) }
 
-      # Handle session expiration status update
-      if provider_error && [ :unauthorized, :not_found ].include?(provider_error.error_type)
+      # Handle session expiration status update (session-level failures only)
+      if session_level && provider_error && [ :unauthorized, :not_found ].include?(provider_error.error_type)
         enable_banking_item.update!(status: :requires_update)
         return I18n.t("enable_banking_items.errors.session_invalid")
       end
@@ -151,14 +168,18 @@ class EnableBankingItem::Importer
     end
 
     def fetch_session_data
-      enable_banking_provider.get_session(session_id: enable_banking_item.session_id)
+      session_data = enable_banking_provider.get_session(session_id: enable_banking_item.session_id)
+      # Keep the local expiry in sync with the authoritative value from the API so
+      # session_valid? doesn't drift (premature "expired" or stale "still valid").
+      enable_banking_item.reconcile_session_expiry!(session_data)
+      session_data
     rescue Provider::EnableBanking::EnableBankingError => e
       Rails.logger.error "EnableBankingItem::Importer - Enable Banking API error: #{e.message}"
-      @session_error = handle_sync_error(e)
+      @session_error = handle_sync_error(e, session_level: true)
       nil
     rescue => e
       Rails.logger.error "EnableBankingItem::Importer - Unexpected error fetching session: #{e.class} - #{e.message}"
-      @session_error = handle_sync_error(e)
+      @session_error = handle_sync_error(e, session_level: true)
       nil
     end
 
@@ -177,46 +198,145 @@ class EnableBankingItem::Importer
       balance_data = enable_banking_provider.get_account_balances(
         account_id: enable_banking_account.api_account_id,
         psu_headers: enable_banking_item.build_psu_headers
+      ).with_indifferent_access
+
+      # Enable Banking returns an array of balances. Use booked ledger balances for
+      # current_balance/net worth before considering available balances. Available
+      # balances can include arranged overdraft facilities and overstate cash.
+      balances = Array(balance_data[:balances]).map { |balance| balance.with_indifferent_access }
+
+      if balances.empty?
+        mark_balance_unavailable(enable_banking_account)
+        return false
+      end
+
+      balance = select_current_balance(balances)
+
+      unless balance.present?
+        mark_balance_unavailable(enable_banking_account)
+        return false
+      end
+
+      amount = balance.dig(:balance_amount, :amount) || balance[:amount]
+      currency = balance.dig(:balance_amount, :currency) || balance[:currency]
+
+      unless amount.present?
+        mark_balance_unavailable(enable_banking_account)
+        return false
+      end
+
+      indicator = balance[:credit_debit_indicator].to_s.upcase
+      parsed_amount = amount.to_d
+
+      # Enable Banking uses positive amounts for both credit and debit.
+      # DBIT indicates a negative balance (money owed/withdrawn).
+      parsed_amount = -parsed_amount if indicator == "DBIT"
+
+      enable_banking_account.update!(
+        current_balance: parsed_amount,
+        currency: currency.presence || enable_banking_account.currency
       )
 
-      # Enable Banking returns an array of balances. We prioritize types based on reliability.
-      # closingBooked (CLBD) > interimAvailable (ITAV) > expected (XPCD)
-      balances = balance_data[:balances] || []
-      return true if balances.empty?
-
-      priority_types = [ "CLBD", "ITAV", "XPCD", "CLAV", "ITBD" ]
-      balance = nil
-
-      priority_types.each do |type|
-        balance = balances.find { |b| b[:balance_type] == type }
-        break if balance
-      end
-
-      balance ||= balances.first
-
-      if balance.present?
-        amount = balance.dig(:balance_amount, :amount) || balance[:amount]
-        currency = balance.dig(:balance_amount, :currency) || balance[:currency]
-
-        if amount.present?
-          indicator = balance[:credit_debit_indicator]
-          parsed_amount = amount.to_d
-
-          # Enable Banking uses positive amounts for both credit and debit.
-          # DBIT indicates a negative balance (money owed/withdrawn).
-          parsed_amount = -parsed_amount if indicator == "DBIT"
-
-          enable_banking_account.update!(
-            current_balance: parsed_amount,
-            currency: currency.presence || enable_banking_account.currency
-          )
-        end
-      end
       true
     rescue Provider::EnableBanking::EnableBankingError => e
       @sync_error = promote_session_invalid(@sync_error, handle_sync_error(e))
       Rails.logger.error "EnableBankingItem::Importer - Error fetching balance for account #{enable_banking_account.uid}: #{e.message}"
+      capture_balance_sync_error(enable_banking_account, e)
+      mark_balance_unavailable(enable_banking_account)
       false
+    rescue => e
+      @sync_error = promote_session_invalid(@sync_error, handle_sync_error(e))
+      Rails.logger.error "EnableBankingItem::Importer - Unexpected error fetching balance for account #{enable_banking_account.uid}: #{e.class} - #{e.message}"
+      capture_balance_sync_error(enable_banking_account, e)
+      mark_balance_unavailable(enable_banking_account)
+      false
+    end
+
+    def select_current_balance(balances)
+      by_type = balances.index_by { |balance| normalize_balance_type(balance[:balance_type]) }
+
+      BALANCE_TYPE_PRIORITY.each do |type|
+        balance = by_type[normalize_balance_type(type)]
+        return balance if balance.present?
+      end
+
+      balances.first
+    end
+
+    def normalize_balance_type(type)
+      type.to_s.delete("_-").downcase
+    end
+
+    def mark_balance_unavailable(enable_banking_account)
+      unless enable_banking_account.persisted?
+        enable_banking_account.current_balance = nil
+        return
+      end
+
+      enable_banking_account.update_columns(
+        current_balance: nil,
+        updated_at: Time.current
+      )
+    end
+
+    def capture_balance_sync_error(enable_banking_account, error)
+      metadata = {
+        enable_banking_item_id: enable_banking_item.id,
+        enable_banking_account_id: enable_banking_account.id,
+        uid: enable_banking_account.uid,
+        api_account_id: enable_banking_account.api_account_id,
+        previous_current_balance: enable_banking_account.current_balance,
+        error_class: error.class.name,
+        error_message: sanitized_error_message(error)
+      }
+
+      if error.is_a?(Provider::EnableBanking::EnableBankingError)
+        metadata[:error_type] = error.error_type.to_s
+        metadata[:provider_error] = sanitized_provider_error(error)
+      end
+
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "warn",
+        message: "Failed to fetch Enable Banking balance; keeping previous balance and continuing transaction sync",
+        source: self.class.name,
+        provider_key: "enable_banking",
+        family: enable_banking_item.family,
+        account_provider: enable_banking_account.account_provider,
+        metadata: metadata
+      )
+    end
+
+    def sanitized_error_message(error)
+      return error.message unless error.is_a?(Provider::EnableBanking::EnableBankingError)
+
+      provider_error = sanitized_provider_error(error)
+      provider_error[:message].presence ||
+        provider_error[:error].presence ||
+        provider_error[:error_type].presence ||
+        error.error_type.to_s
+    end
+
+    def sanitized_provider_error(error)
+      response_data = error.response_data
+      response_data = response_data.with_indifferent_access if response_data.respond_to?(:with_indifferent_access)
+
+      metadata = { error_type: error.error_type.to_s }
+      return metadata unless response_data.is_a?(Hash)
+
+      metadata[:code] = response_data[:code] if response_data[:code].present?
+      metadata[:error] = response_data[:error] if response_data[:error].present?
+      metadata[:message] = response_data[:message] if response_data[:message].present?
+
+      detail = response_data[:detail]
+      detail = detail.with_indifferent_access if detail.respond_to?(:with_indifferent_access)
+
+      if detail.is_a?(Hash)
+        metadata[:detail_message] = detail[:message] if detail[:message].present?
+        metadata[:detail_error_name] = detail[:error_name] if detail[:error_name].present?
+      end
+
+      metadata
     end
 
     def promote_session_invalid(existing, new)
@@ -240,9 +360,28 @@ class EnableBankingItem::Importer
         psu_headers: enable_banking_item.build_psu_headers
       )
 
+      if include_pending
+        # Tag any transaction in all_transactions (fetched as BOOK but actually PDNG) with _pending: true
+        all_transactions = all_transactions.map do |tx|
+          tx_ia = tx.with_indifferent_access
+          tx_ia[:status] == "PDNG" ? tx_ia.merge(_pending: true) : tx_ia
+        end
+      else
+        # If include_pending is false, we must filter out any pending transactions
+        # that were returned (e.g. if the bank ignores transaction_status="BOOK").
+        all_transactions = all_transactions.reject do |tx|
+          tx.with_indifferent_access[:status] == "PDNG"
+        end
+      end
+
       pending_transactions = []
       if include_pending
-        # Also fetch pending transactions (visible for 1-3 days before they become BOOK) if setting is enabled
+        # Also fetch pending transactions (visible for 1-3 days before they become BOOK) if setting is enabled.
+        # The BOOK fetch above used the same date_from/date_to and succeeded, so any 422 raised here is
+        # necessarily about the transaction_status param. Different ASPSPs reject it with different bodies
+        # (e.g. ImaginV2 returns WRONG_REQUEST_PARAMETERS; others mention "transactionStatus" verbatim),
+        # so we treat every validation_error on PDNG as "ASPSP doesn't support pending" and continue with
+        # the booked transactions only. (Issue #1805)
         begin
           pending_transactions = fetch_paginated_transactions(
             enable_banking_account,
@@ -251,19 +390,22 @@ class EnableBankingItem::Importer
             psu_headers: enable_banking_item.build_psu_headers
           )
         rescue Provider::EnableBanking::EnableBankingError => e
-          raise unless e.error_type == :validation_error && e.message.include?("transactionStatus")
-          Rails.logger.warn "EnableBankingItem::Importer - ASPSP does not support PDNG transaction status for account #{enable_banking_account.uid}, skipping pending transactions. API error: #{e.message}"
+          raise unless e.error_type == :validation_error
+          api_error = e.response_data.is_a?(Hash) ? (e.response_data[:error] || e.response_data["error"]) : nil
+          Rails.logger.warn "EnableBankingItem::Importer - ASPSP does not support PDNG transaction status for account #{enable_banking_account.uid}, skipping pending transactions. API error: #{api_error || e.message}"
         end
       end
 
-      book_fingerprints = all_transactions
+      booked_transactions = all_transactions.reject { |tx| tx.with_indifferent_access[:_pending] }
+
+      book_fingerprints = booked_transactions
         .map { |tx| EnableBankingEntry::Processor.compute_external_id(tx) }
         .compact.to_set
 
       # Also index all booked entry_references so a pending row that lacks
       # transaction_id can still be matched when the settled BOOK row adds one
       # (fingerprints differ; entry_reference stays the same across settlement).
-      book_entry_refs = all_transactions
+      book_entry_refs = booked_transactions
         .map { |tx| tx.with_indifferent_access[:entry_reference].presence }
         .compact.to_set
 
@@ -307,13 +449,13 @@ class EnableBankingItem::Importer
         #    no transaction_id but the settled BOOK row gained one — fingerprints
         #    diverge (enable_banking_<ref> vs enable_banking_<txn_id>) but the
         #    shared entry_reference is a reliable settlement signal.
-        book_fingerprints = all_transactions
-          .reject { |tx| tx.with_indifferent_access[:_pending] }
+        booked_transactions_for_settlement = all_transactions.reject { |tx| tx.with_indifferent_access[:_pending] }
+
+        book_fingerprints = booked_transactions_for_settlement
           .map { |tx| EnableBankingEntry::Processor.compute_external_id(tx) }
           .compact.to_set
 
-        book_entry_refs = all_transactions
-          .reject { |tx| tx.with_indifferent_access[:_pending] }
+        book_entry_refs = booked_transactions_for_settlement
           .map { |tx| tx.with_indifferent_access[:entry_reference].presence }
           .compact.to_set
 
diff --git a/app/models/enable_banking_item/syncer.rb b/app/models/enable_banking_item/syncer.rb
index dfe8ce984..3049a05eb 100644
--- a/app/models/enable_banking_item/syncer.rb
+++ b/app/models/enable_banking_item/syncer.rb
@@ -8,11 +8,14 @@ class EnableBankingItem::Syncer
   end
 
   def perform_sync(sync)
-    # Check if session is valid before syncing
+    # An expired/missing session is an expected state that needs user action, not a
+    # hard failure. Mark the connection requires_update and finish the sync
+    # gracefully so the UI surfaces the "Reconnect" CTA instead of a red sync error.
     unless enable_banking_item.session_valid?
       sync.update!(status_text: "Session expired - re-authorization required") if sync.respond_to?(:status_text)
       enable_banking_item.update!(status: :requires_update)
-      raise StandardError.new("Enable Banking session has expired. Please re-authorize.")
+      collect_health_stats(sync, errors: nil)
+      return
     end
 
     # Phase 1: Import data from Enable Banking API
@@ -20,6 +23,16 @@ class EnableBankingItem::Syncer
     import_result = enable_banking_item.import_latest_enable_banking_data
 
     unless import_result[:success]
+      # A session-level auth failure detected mid-import flips the item to
+      # requires_update — surface that as a graceful reconnect state, not a red
+      # error. Transient/per-account failures leave status good and fall through
+      # to a normal sync error that retries next time.
+      if enable_banking_item.requires_update?
+        sync.update!(status_text: "Re-authorization required") if sync.respond_to?(:status_text)
+        collect_health_stats(sync, errors: nil)
+        return
+      end
+
       error_msg = import_result[:error]
       if error_msg.blank? && (import_result[:accounts_failed].to_i > 0 || import_result[:transactions_failed].to_i > 0)
         parts = []
diff --git a/app/models/entry.rb b/app/models/entry.rb
index 1599f4ad4..a29b3b2bd 100644
--- a/app/models/entry.rb
+++ b/app/models/entry.rb
@@ -36,7 +36,8 @@ class Entry < ApplicationRecord
     order(
       date: :asc,
       Arel.sql("CASE WHEN entries.entryable_type = 'Valuation' THEN 1 ELSE 0 END") => :asc,
-      created_at: :asc
+      created_at: :asc,
+      id: :asc
     )
   }
 
@@ -44,7 +45,8 @@ class Entry < ApplicationRecord
     order(
       date: :desc,
       Arel.sql("CASE WHEN entries.entryable_type = 'Valuation' THEN 1 ELSE 0 END") => :desc,
-      created_at: :desc
+      created_at: :desc,
+      id: :desc
     )
   }
 
diff --git a/app/models/exchange_rate/provided.rb b/app/models/exchange_rate/provided.rb
index 157d793a9..0d96038da 100644
--- a/app/models/exchange_rate/provided.rb
+++ b/app/models/exchange_rate/provided.rb
@@ -41,10 +41,12 @@ module ExchangeRate::Provided
         ) do |exchange_rate|
           exchange_rate.rate = rate.rate
         end if cache
-      rescue ActiveRecord::RecordNotUnique
-        # Race condition: another process inserted between our SELECT and INSERT
-        # Retry by finding the existing record
-        ExchangeRate.find_by!(
+      rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
+        # Race condition: another process inserted between our SELECT and INSERT.
+        # RecordNotUnique = DB unique constraint; RecordInvalid = model uniqueness
+        # validation fired before the DB got a chance to reject it. Both are safe
+        # to handle by reading back the record that the other process just saved.
+        return ExchangeRate.find_by!(
           from_currency: rate.from,
           to_currency: rate.to,
           date: rate.date
@@ -56,14 +58,44 @@ module ExchangeRate::Provided
     # Batch-fetches exchange rates for multiple source currencies.
     # Returns a hash mapping each currency to its numeric rate, defaulting to 1 when unavailable.
     def rates_for(currencies, to:, date: Date.current)
-      currencies.uniq.each_with_object({}) do |currency, map|
+      unique_currencies = currencies.uniq
+      return {} if unique_currencies.empty?
+
+      # Batch-load exact-date matches in a single query
+      exact_rates = where(from_currency: unique_currencies, to_currency: to, date: date)
+                      .index_by(&:from_currency)
+
+      missing = unique_currencies - exact_rates.keys
+
+      # For currencies without an exact match, batch-load the nearest recent rate
+      nearest_rates = if missing.any?
+        where(from_currency: missing, to_currency: to)
+          .where(date: (date - NEAREST_RATE_LOOKBACK_DAYS)..date)
+          .order(date: :desc)
+          .to_a
+          .each_with_object({}) do |r, map|
+            map[r.from_currency] ||= r  # keep most-recent (first due to ORDER BY date DESC)
+          end
+      else
+        {}
+      end
+
+      still_missing = missing - nearest_rates.keys
+
+      # Only hit the provider for currencies with no cached rate at all
+      fetched_rates = still_missing.each_with_object({}) do |currency, map|
         rate = find_or_fetch_rate(from: currency, to: to, date: date)
+        map[currency] = rate if rate
+      end
+
+      unique_currencies.each_with_object({}) do |currency, result|
+        rate = exact_rates[currency] || nearest_rates[currency] || fetched_rates[currency]
         if rate.nil?
           Rails.logger.warn("No exchange rate found for #{currency}/#{to} on #{date}, using 1")
         elsif rate.date != date
           Rails.logger.debug("FX rate #{currency}/#{to}: using #{rate.date} for #{date} (gap=#{(date - rate.date).to_i}d)")
         end
-        map[currency] = rate&.rate || 1
+        result[currency] = rate&.rate || 1
       end
     end
 
diff --git a/app/models/family.rb b/app/models/family.rb
index f92b7917e..0b1a52e91 100644
--- a/app/models/family.rb
+++ b/app/models/family.rb
@@ -2,7 +2,11 @@ class Family < ApplicationRecord
   include Syncable, AutoTransferMatchable, Subscribeable, VectorSearchable
   include PlaidConnectable, SimplefinConnectable, LunchflowConnectable, AkahuConnectable, EnableBankingConnectable
   include CoinbaseConnectable, BinanceConnectable, KrakenConnectable, CoinstatsConnectable, SnaptradeConnectable, MercuryConnectable, BrexConnectable, SophtronConnectable
-  include IndexaCapitalConnectable, IbkrConnectable
+  include IndexaCapitalConnectable, IbkrConnectable, WiseConnectable
+  include UpConnectable
+  include Trading212Connectable
+  include QuestradeConnectable
+  include RedbarkConnectable
 
   DATE_FORMATS = [
     [ "MM-DD-YYYY", "%m-%d-%Y" ],
@@ -14,7 +18,9 @@ class Family < ApplicationRecord
     [ "MM/DD/YYYY", "%m/%d/%Y" ],
     [ "D/MM/YYYY", "%e/%m/%Y" ],
     [ "YYYY.MM.DD", "%Y.%m.%d" ],
-    [ "YYYYMMDD", "%Y%m%d" ]
+    [ "YYYYMMDD", "%Y%m%d" ],
+    # QIF month-name imports rely on QifParser preserving normalized spaces.
+    [ "DD MMM YYYY", "%d %b %Y" ]
   ].freeze
 
 
@@ -28,6 +34,8 @@ class Family < ApplicationRecord
   has_many :invitations, dependent: :destroy
 
   has_many :imports, dependent: :destroy
+  has_many :import_sessions, dependent: :destroy
+  has_many :import_source_mappings, dependent: :destroy
   has_many :family_exports, dependent: :destroy
   has_many :account_statements, dependent: :destroy
 
@@ -108,6 +116,28 @@ class Family < ApplicationRecord
 
   has_many :llm_usages, dependent: :destroy
   has_many :recurring_transactions, dependent: :destroy
+  has_many :insights, dependent: :destroy
+
+  # Families with at least one opted-in member. Lets a job filter in one
+  # indexed query rather than loading every family and asking each in Ruby.
+  scope :with_preview_features, -> { where(id: User.with_preview_features.select(:family_id)) }
+
+  # Family-level rollup of the per-user preview flag, for callers that run
+  # without a Current.user (the nightly insights job). Preview access is a
+  # personal preference but the data it produces is family-scoped, so one
+  # opted-in member is enough to generate for the family.
+  #
+  # EXISTS rather than `users.any?(&:preview_features_enabled?)`: the job asks
+  # this once per family, and the block form would load and instantiate every
+  # member just to answer a boolean.
+  #
+  # Never gate UI on this — visibility is per-user, and this answers "somebody
+  # in the household opted in", so a view using it would show the feature to a
+  # user who explicitly opted out. Use the PreviewGateable helper (Current.user)
+  # for anything a person sees.
+  def preview_features_enabled?
+    users.with_preview_features.exists?
+  end
 
   validates :locale, inclusion: { in: I18n.available_locales.map(&:to_s) }
   validates :date_format, inclusion: { in: DATE_FORMATS.map(&:last) }
@@ -175,6 +205,33 @@ class Family < ApplicationRecord
     default_account_sharing == "shared"
   end
 
+  # Shares every existing account in this family (except ones the user already
+  # owns) with the given user, honoring the family's default sharing policy and
+  # the user's role. Guests receive read_only; members/admins receive read_write.
+  #
+  # This is the single entry point for "a member just joined, give them the
+  # accounts the family shares by default." It self-guards on the sharing policy
+  # and family membership so every membership path (invitation accept, SSO JIT
+  # sign-up, token registration, mobile SSO) can call it without reintroducing
+  # the "member joined but sees nothing" bug. No-op when sharing is disabled or
+  # there is nothing to share, and idempotent on re-run.
+  def auto_share_existing_accounts_with(user)
+    return unless share_all_by_default?
+    # Load-bearing security guard: insert_all below bypasses AccountShare's
+    # user_in_same_family / cannot_share_with_owner validations, so this
+    # membership check is the ONLY thing preventing cross-family sharing.
+    # Do not drop it when refactoring.
+    return unless user&.persisted? && user.family_id == id
+
+    permission = user.guest? ? "read_only" : "read_write"
+    records = accounts.where.not(owner_id: user.id).pluck(:id).map do |account_id|
+      { account_id: account_id, user_id: user.id, permission: permission,
+        include_in_finances: true, created_at: Time.current, updated_at: Time.current }
+    end
+
+    AccountShare.insert_all(records, unique_by: %i[account_id user_id]) if records.any?
+  end
+
   def uses_custom_month_start?
     month_start_day != 1
   end
diff --git a/app/models/family/auto_categorizer.rb b/app/models/family/auto_categorizer.rb
index c28cb7eb5..de56e18d5 100644
--- a/app/models/family/auto_categorizer.rb
+++ b/app/models/family/auto_categorizer.rb
@@ -58,13 +58,11 @@ class Family::AutoCategorizer
   private
     attr_reader :family, :transaction_ids
 
-    # TODO(#2113): hardcoded to OpenAI. Provider::Anthropic now
-    # implements auto_categorize (PR #1984), so this should honor
-    # Setting.llm_provider the way chat does, instead of always routing batch
-    # categorization to OpenAI. Until then, Anthropic batch ops are only
-    # reachable directly / via the eval runner, not this family flow.
+    # Honors Setting.llm_provider (issue #2113) — Provider::Anthropic implements
+    # auto_categorize (PR #1984), so batch categorization routes to the configured
+    # provider, with fallback handled by Provider::Registry.preferred_llm_provider.
     def llm_provider
-      Provider::Registry.get_provider(:openai)
+      Provider::Registry.preferred_llm_provider
     end
 
     def user_categories_input
diff --git a/app/models/family/auto_merchant_detector.rb b/app/models/family/auto_merchant_detector.rb
index e93da64b4..45ebabcbb 100644
--- a/app/models/family/auto_merchant_detector.rb
+++ b/app/models/family/auto_merchant_detector.rb
@@ -61,13 +61,12 @@ class Family::AutoMerchantDetector
   private
     attr_reader :family, :transaction_ids
 
-    # TODO(#2113): hardcoded to OpenAI. Provider::Anthropic now
-    # implements auto_detect_merchants (PR #1984), so this should honor
-    # Setting.llm_provider the way chat does, instead of always routing batch
-    # merchant detection to OpenAI. Until then, Anthropic batch ops are only
-    # reachable directly / via the eval runner, not this family flow.
+    # Honors Setting.llm_provider (issue #2113) — Provider::Anthropic implements
+    # auto_detect_merchants (PR #1984), so batch merchant detection routes to the
+    # configured provider, with fallback handled by
+    # Provider::Registry.preferred_llm_provider.
     def llm_provider
-      Provider::Registry.get_provider(:openai)
+      Provider::Registry.preferred_llm_provider
     end
 
     def default_logo_provider_url
diff --git a/app/models/family/auto_transfer_matchable.rb b/app/models/family/auto_transfer_matchable.rb
index e88b7141d..9ff6395fd 100644
--- a/app/models/family/auto_transfer_matchable.rb
+++ b/app/models/family/auto_transfer_matchable.rb
@@ -4,6 +4,7 @@ module Family::AutoTransferMatchable
     exchange_rate_tolerance: 0.1,
     inflow_transaction_id: nil,
     outflow_transaction_id: nil,
+    account_id: nil,
     include_rejected: true
   )
     date_window = coerce_transfer_match_date_window!(date_window)
@@ -16,6 +17,7 @@ module Family::AutoTransferMatchable
         family_id: id,
         inflow_transaction_id:,
         outflow_transaction_id:,
+        account_id:,
         include_rejected:,
         lower_exchange_rate_bound: 1 - exchange_rate_tolerance,
         upper_exchange_rate_bound: 1 + exchange_rate_tolerance
@@ -23,9 +25,9 @@ module Family::AutoTransferMatchable
     ])
   end
 
-  def auto_match_transfers!
+  def auto_match_transfers!(account: nil)
     # Exclude already matched transfers
-    candidates_scope = transfer_match_candidates(include_rejected: false)
+    candidates_scope = transfer_match_candidates(account_id: account&.id, include_rejected: false)
     transaction_ids = candidates_scope.flat_map do |match|
       [ match.inflow_transaction_id, match.outflow_transaction_id ]
     end.uniq
@@ -110,6 +112,7 @@ module Family::AutoTransferMatchable
           JOIN accounts inflow_accounts ON inflow_accounts.id = inflow_candidates.account_id
           JOIN entries outflow_candidates ON (
             outflow_candidates.entryable_type = 'Transaction' AND
+            outflow_candidates.excluded = FALSE AND
             outflow_candidates.amount > 0 AND
             outflow_candidates.account_id <> inflow_candidates.account_id AND
             outflow_candidates.date BETWEEN inflow_candidates.date - :date_window AND inflow_candidates.date + :date_window AND
@@ -127,12 +130,14 @@ module Family::AutoTransferMatchable
           )
           WHERE
             inflow_candidates.entryable_type = 'Transaction' AND
+            inflow_candidates.excluded = FALSE AND
             inflow_candidates.amount < 0 AND
             inflow_accounts.family_id = :family_id AND
             outflow_accounts.family_id = :family_id AND
             inflow_accounts.status IN ('draft', 'active') AND
             outflow_accounts.status IN ('draft', 'active') AND
             existing_transfers.id IS NULL AND
+            (:account_id IS NULL OR inflow_candidates.account_id = :account_id OR outflow_candidates.account_id = :account_id) AND
             (:inflow_transaction_id IS NULL OR inflow_candidates.entryable_id = :inflow_transaction_id) AND
             (:outflow_transaction_id IS NULL OR outflow_candidates.entryable_id = :outflow_transaction_id) AND
             (:include_rejected = TRUE OR rejected_transfers.id IS NULL)
@@ -146,6 +151,7 @@ module Family::AutoTransferMatchable
           JOIN accounts inflow_accounts ON inflow_accounts.id = inflow_candidates.account_id
           JOIN entries outflow_candidates ON (
             outflow_candidates.entryable_type = 'Transaction' AND
+            outflow_candidates.excluded = FALSE AND
             outflow_candidates.amount > 0 AND
             outflow_candidates.account_id <> inflow_candidates.account_id AND
             outflow_candidates.date BETWEEN inflow_candidates.date - :date_window AND inflow_candidates.date + :date_window AND
@@ -167,12 +173,14 @@ module Family::AutoTransferMatchable
           )
           WHERE
             inflow_candidates.entryable_type = 'Transaction' AND
+            inflow_candidates.excluded = FALSE AND
             inflow_candidates.amount < 0 AND
             inflow_accounts.family_id = :family_id AND
             outflow_accounts.family_id = :family_id AND
             inflow_accounts.status IN ('draft', 'active') AND
             outflow_accounts.status IN ('draft', 'active') AND
             existing_transfers.id IS NULL AND
+            (:account_id IS NULL OR inflow_candidates.account_id = :account_id OR outflow_candidates.account_id = :account_id) AND
             ABS(inflow_candidates.amount / NULLIF(outflow_candidates.amount * exchange_rates.rate, 0))
               BETWEEN :lower_exchange_rate_bound AND :upper_exchange_rate_bound AND
             (:inflow_transaction_id IS NULL OR inflow_candidates.entryable_id = :inflow_transaction_id) AND
diff --git a/app/models/family/data_exporter.rb b/app/models/family/data_exporter.rb
index 0435e1ec3..20e08a70d 100644
--- a/app/models/family/data_exporter.rb
+++ b/app/models/family/data_exporter.rb
@@ -300,27 +300,38 @@ class Family::DataExporter
         }.to_json
       end
 
-      # Export transactions with full data (exclude split parents, export children instead)
-      exportable_transactions.includes(:category, :merchant, :tags, entry: :account).find_each do |transaction|
+      ndjson_exportable_transactions.includes(
+        :category,
+        :merchant,
+        :tags,
+        entry: [
+          :account,
+          { child_entries: { entryable: :tags } }
+        ]
+      ).find_each do |transaction|
+        transaction_data = {
+          id: transaction.id,
+          entry_id: transaction.entry.id,
+          account_id: transaction.entry.account_id,
+          date: transaction.entry.date,
+          amount: transaction.entry.amount,
+          currency: transaction.entry.currency,
+          name: transaction.entry.name,
+          notes: transaction.entry.notes,
+          excluded: transaction.entry.excluded,
+          category_id: transaction.category_id,
+          merchant_id: transaction.merchant_id,
+          tag_ids: transaction.tag_ids,
+          kind: transaction.kind,
+          created_at: transaction.created_at,
+          updated_at: transaction.updated_at
+        }
+        split_lines = serialize_split_lines_for_export(transaction.entry)
+        transaction_data[:split_lines] = split_lines if split_lines.any?
+
         lines << {
           type: "Transaction",
-          data: {
-            id: transaction.id,
-            entry_id: transaction.entry.id,
-            account_id: transaction.entry.account_id,
-            date: transaction.entry.date,
-            amount: transaction.entry.amount,
-            currency: transaction.entry.currency,
-            name: transaction.entry.name,
-            notes: transaction.entry.notes,
-            excluded: transaction.entry.excluded,
-            category_id: transaction.category_id,
-            merchant_id: transaction.merchant_id,
-            tag_ids: transaction.tag_ids,
-            kind: transaction.kind,
-            created_at: transaction.created_at,
-            updated_at: transaction.updated_at
-          }
+          data: transaction_data
         }.to_json
       end
 
@@ -456,6 +467,42 @@ class Family::DataExporter
       @family.transactions.merge(Entry.excluding_split_parents)
     end
 
+    def ndjson_exportable_transactions
+      @family.transactions.joins(:entry).where(entries: { parent_entry_id: nil })
+    end
+
+    def serialize_split_lines_for_export(parent_entry)
+      child_entries = split_child_entries_for_export(parent_entry)
+      return [] if child_entries.empty?
+
+      child_entries.map do |child_entry|
+        transaction = child_entry.entryable
+        {
+          id: transaction.id,
+          entry_id: child_entry.id,
+          amount: child_entry.amount,
+          currency: child_entry.currency,
+          name: child_entry.name,
+          notes: child_entry.notes,
+          excluded: child_entry.excluded,
+          category_id: transaction.category_id,
+          merchant_id: transaction.merchant_id,
+          tag_ids: transaction.tag_ids,
+          kind: transaction.kind,
+          created_at: transaction.created_at,
+          updated_at: transaction.updated_at
+        }
+      end
+    end
+
+    def split_child_entries_for_export(parent_entry)
+      if parent_entry.association(:child_entries).loaded?
+        parent_entry.child_entries.sort_by { |entry| [ entry.created_at, entry.id ] }
+      else
+        parent_entry.child_entries.order(:created_at, :id).to_a
+      end
+    end
+
     def family_transaction_ids
       @family_transaction_ids ||= exportable_transactions.select(:id)
     end
@@ -498,6 +545,7 @@ class Family::DataExporter
 
     def serialize_rule_for_export(rule)
       {
+        id: rule.id,
         name: rule.name,
         resource_type: rule.resource_type,
         active: rule.active,
diff --git a/app/models/family/data_importer.rb b/app/models/family/data_importer.rb
index 8ee468dc8..7a68419c5 100644
--- a/app/models/family/data_importer.rb
+++ b/app/models/family/data_importer.rb
@@ -1,12 +1,82 @@
 require "set"
 
 class Family::DataImporter
-  SUPPORTED_TYPES = %w[Account Balance Category Tag Merchant RecurringTransaction Transaction Transfer RejectedTransfer Trade Holding Valuation Budget BudgetCategory Rule].freeze
-  ACCOUNTABLE_TYPES = Accountable::TYPES.freeze
+  MissingReferenceError = Class.new(StandardError) do
+    attr_reader :code, :details
 
-  def initialize(family, ndjson_content)
+    def initialize(record_type:, source_type:, source_id:)
+      @code = "missing_source_reference"
+      @details = {
+        record_type: record_type,
+        source_type: source_type,
+        source_id: source_id
+      }
+
+      super("#{record_type} references missing #{source_type} source id #{source_id}")
+    end
+  end
+
+  InvalidRecordError = Class.new(StandardError) do
+    attr_reader :code, :details
+
+    def initialize(record_type:, field:, value:)
+      @code = "invalid_import_record"
+      @details = {
+        record_type: record_type,
+        field: field,
+        value: value
+      }
+
+      super("#{record_type} has invalid #{field}: #{value.inspect}")
+    end
+  end
+
+  SUPPORTED_TYPES = %w[Account Balance Category Tag Merchant RecurringTransaction Transaction Transfer RejectedTransfer Trade Holding Valuation Budget BudgetCategory Rule].freeze
+  ACCOUNTABLE_TYPE_CLASSES = {
+    "Depository" => Depository, "Investment" => Investment, "Crypto" => Crypto,
+    "Property" => Property, "Vehicle" => Vehicle, "OtherAsset" => OtherAsset,
+    "CreditCard" => CreditCard, "Loan" => Loan, "OtherLiability" => OtherLiability
+  }.freeze
+
+  def self.accountable_class_for(type)
+    ACCOUNTABLE_TYPE_CLASSES[type.to_s]
+  end
+
+  MAPPING_TYPES = {
+    accounts: "Account",
+    categories: "Category",
+    tags: "Tag",
+    merchants: "Merchant",
+    recurring_transactions: "RecurringTransaction",
+    transactions: "Transaction",
+    budgets: "Budget",
+    securities: "Security",
+    rules: "Rule"
+  }.freeze
+  SUMMARY_KEYS = {
+    "Account" => "accounts",
+    "Balance" => "balances",
+    "Category" => "categories",
+    "Tag" => "tags",
+    "Merchant" => "merchants",
+    "RecurringTransaction" => "recurring_transactions",
+    "Transaction" => "transactions",
+    "Transfer" => "transfers",
+    "RejectedTransfer" => "rejected_transfers",
+    "Trade" => "trades",
+    "Holding" => "holdings",
+    "Valuation" => "valuations",
+    "Budget" => "budgets",
+    "BudgetCategory" => "budget_categories",
+    "Rule" => "rules"
+  }.freeze
+
+  def initialize(family, ndjson_content, import_session: nil, import: nil)
     @family = family
     @ndjson_content = ndjson_content
+    @import_session = import_session
+    @import = import
+    @strict_references = import_session.present?
     @id_mappings = {
       accounts: {},
       categories: {},
@@ -15,11 +85,13 @@ class Family::DataImporter
       recurring_transactions: {},
       transactions: {},
       budgets: {},
-      securities: {}
+      securities: {},
+      rules: {}
     }
     @security_cache = {}
     @created_accounts = []
     @created_entries = []
+    @summary = Hash.new { |hash, key| hash[key] = empty_summary_bucket }
   end
 
   def import!
@@ -46,7 +118,7 @@ class Family::DataImporter
       import_rules(records["Rule"] || [])
     end
 
-    { accounts: @created_accounts, entries: @created_entries }
+    { accounts: @created_accounts, entries: @created_entries, summary: compact_summary }
   end
 
   private
@@ -71,6 +143,128 @@ class Family::DataImporter
       records
     end
 
+    def empty_summary_bucket
+      { "created" => 0, "updated" => 0, "skipped" => 0, "failed" => 0 }
+    end
+
+    def compact_summary
+      @summary.select { |_entity_type, counts| counts.values.any?(&:positive?) }
+    end
+
+    def increment_summary(record_type, status)
+      @summary[SUMMARY_KEYS.fetch(record_type)].tap do |counts|
+        counts[status.to_s] = counts.fetch(status.to_s, 0) + 1
+      end
+    end
+
+    def map_source!(mapping_key, source_id, target)
+      return if source_id.blank? || target.blank?
+
+      @id_mappings[mapping_key][source_id] = target.id
+      return unless @import_session
+
+      source_type = MAPPING_TYPES.fetch(mapping_key)
+      mapping = @import_session.source_mappings.find_or_initialize_by(
+        family: @family,
+        source_type: source_type,
+        source_id: source_id
+      )
+      mapping.target = target
+      mapping.save!
+    end
+
+    def mapped_id(mapping_key, old_id, record_type:, required: true)
+      if old_id.blank?
+        missing_reference(record_type, mapping_key, "(blank)") if required
+        return
+      end
+
+      return @id_mappings[mapping_key][old_id] if @id_mappings[mapping_key].key?(old_id)
+
+      source_type = MAPPING_TYPES.fetch(mapping_key)
+      mapping = @import_session&.source_mappings&.find_by(
+        family: @family,
+        source_type: source_type,
+        source_id: old_id
+      )
+
+      if mapping
+        @id_mappings[mapping_key][old_id] = mapping.target_id
+        return mapping.target_id
+      end
+
+      if required && @strict_references
+        raise MissingReferenceError.new(
+          record_type: record_type,
+          source_type: source_type,
+          source_id: old_id
+        )
+      end
+
+      nil
+    end
+
+    def mapped_record(mapping_key, old_id, scope, record_type:)
+      target_id = mapped_id(mapping_key, old_id, record_type: record_type, required: false)
+      return if target_id.blank?
+
+      scope.find_by(id: target_id)
+    end
+
+    def missing_reference(record_type, mapping_key, old_id)
+      if @strict_references
+        increment_summary(record_type, :failed)
+        raise MissingReferenceError.new(
+          record_type: record_type,
+          source_type: MAPPING_TYPES.fetch(mapping_key),
+          source_id: old_id
+        )
+      end
+
+      increment_summary(record_type, :skipped)
+      nil
+    end
+
+    def require_source_id!(record_type, source_id)
+      return if source_id.present? || !@strict_references
+
+      increment_summary(record_type, :failed)
+      raise MissingReferenceError.new(
+        record_type: record_type,
+        source_type: record_type,
+        source_id: "(blank)"
+      )
+    end
+
+    def invalid_record!(record_type, field, value)
+      if @strict_references
+        increment_summary(record_type, :failed)
+        raise InvalidRecordError.new(record_type: record_type, field: field, value: value)
+      end
+
+      increment_summary(record_type, :skipped)
+      nil
+    end
+
+    def session_entry_source
+      return unless @import_session
+
+      "sure_import_session:#{@import_session.id}"
+    end
+
+    def session_entry_external_id(record_type, source_id)
+      return if @import_session.blank? || source_id.blank?
+
+      "#{record_type}:#{source_id}"
+    end
+
+    def session_imported_entry(account, record_type, source_id)
+      external_id = session_entry_external_id(record_type, source_id)
+      return if external_id.blank?
+
+      account.entries.find_by(source: session_entry_source, external_id: external_id)
+    end
+
     def import_accounts(records)
       records.each do |record|
         data = record["data"]
@@ -78,28 +272,41 @@ class Family::DataImporter
         accountable_data = data["accountable"] || {}
         accountable_type = data["accountable_type"]
 
-        # Skip if accountable type is not valid
-        next unless ACCOUNTABLE_TYPES.include?(accountable_type)
+        require_source_id!("Account", old_id)
 
-        # Build accountable
-        accountable_class = accountable_type.constantize
-        accountable = accountable_class.new
-        accountable.subtype = accountable_data["subtype"] if accountable.respond_to?(:subtype=) && accountable_data["subtype"]
+        accountable_class = self.class.accountable_class_for(accountable_type)
 
-        # Copy any other accountable attributes
-        safe_accountable_attrs = %w[subtype locked_attributes]
-        safe_accountable_attrs.each do |attr|
-          if accountable.respond_to?("#{attr}=") && accountable_data[attr].present?
-            accountable.send("#{attr}=", accountable_data[attr])
-          end
+        unless accountable_class
+          invalid_record!("Account", "accountable_type", accountable_type)
+          next
         end
 
-        account = @family.accounts.build(
+        account = mapped_record(:accounts, old_id, @family.accounts, record_type: "Account")
+        created = account.blank?
+
+        if account
+          accountable = account.accountable
+        else
+          # Build accountable
+          accountable = accountable_class.new
+          accountable.subtype = accountable_data["subtype"] if accountable.respond_to?(:subtype=) && accountable_data["subtype"]
+
+          # Copy any other accountable attributes
+          safe_accountable_attrs = %w[subtype locked_attributes]
+          safe_accountable_attrs.each do |attr|
+            if accountable.respond_to?("#{attr}=") && accountable_data[attr].present?
+              accountable.send("#{attr}=", accountable_data[attr])
+            end
+          end
+
+          account = @family.accounts.build(accountable: accountable)
+        end
+
+        account.assign_attributes(
           name: data["name"],
           balance: data["balance"].to_d,
           cash_balance: data["cash_balance"]&.to_d || data["balance"].to_d,
           currency: data["currency"] || @family.currency,
-          accountable: accountable,
           subtype: data["subtype"],
           institution_name: data["institution_name"],
           institution_domain: data["institution_domain"],
@@ -110,8 +317,9 @@ class Family::DataImporter
         account.save!
 
         # Set opening balance if we have a historical balance and the import
-        # does not provide an explicit opening-anchor valuation for this account.
-        if data["balance"].present? && !@imported_opening_anchor_account_ids.include?(old_id)
+        # does not provide either an explicit opening-anchor valuation or an
+        # authoritative balance-history stream for this account.
+        if created && data["balance"].present? && !skip_opening_balance_import?(old_id, data)
           manager = Account::OpeningBalanceManager.new(account)
           result = manager.set_opening_balance(
             balance: data["balance"].to_d,
@@ -120,8 +328,9 @@ class Family::DataImporter
           log_failed_opening_balance_import(account, old_id, result) unless result.success?
         end
 
-        @id_mappings[:accounts][old_id] = account.id
-        @created_accounts << account
+        map_source!(:accounts, old_id, account)
+        @created_accounts << account if created
+        increment_summary("Account", created ? :created : :updated)
       end
     end
 
@@ -132,16 +341,23 @@ class Family::DataImporter
     def import_balances(records)
       records.each do |record|
         data = record["data"] || {}
-        new_account_id = @id_mappings[:accounts][data["account_id"]]
+        new_account_id = mapped_id(:accounts, data["account_id"], record_type: "Balance")
         balance_date = parse_import_date(data["date"])
-        next if new_account_id.blank? || balance_date.blank? || data["balance"].blank?
+        next if new_account_id.blank?
+
+        if balance_date.blank? || data["balance"].blank?
+          increment_summary("Balance", :skipped)
+          next
+        end
 
         account = @family.accounts.find(new_account_id)
         currency = data["currency"].presence || account.currency
         balance = account.balances.find_or_initialize_by(date: balance_date, currency: currency)
+        created = balance.new_record?
 
         balance.assign_attributes(imported_balance_attributes(data))
         balance.save!
+        increment_summary("Balance", created ? :created : :updated)
       end
     end
 
@@ -181,24 +397,30 @@ class Family::DataImporter
         old_id = data["id"]
         parent_id = data["parent_id"]
 
+        require_source_id!("Category", old_id)
+
         # Store parent relationship for second pass
         parent_mappings[old_id] = parent_id if parent_id.present?
 
-        category = @family.categories.build(
+        category = mapped_record(:categories, old_id, @family.categories, record_type: "Category")
+        created = category.blank?
+        category ||= @family.categories.build
+
+        category.assign_attributes(
           name: data["name"],
           color: data["color"] || Category::UNCATEGORIZED_COLOR,
           classification_unused: data["classification_unused"] || data["classification"] || "expense",
           lucide_icon: data["lucide_icon"] || "shapes"
         )
-
         category.save!
-        @id_mappings[:categories][old_id] = category.id
+        map_source!(:categories, old_id, category)
+        increment_summary("Category", created ? :created : :updated)
       end
 
       # Second pass: establish parent relationships
       parent_mappings.each do |old_id, old_parent_id|
-        new_id = @id_mappings[:categories][old_id]
-        new_parent_id = @id_mappings[:categories][old_parent_id]
+        new_id = mapped_id(:categories, old_id, record_type: "Category")
+        new_parent_id = mapped_id(:categories, old_parent_id, record_type: "Category")
 
         next unless new_id && new_parent_id
 
@@ -212,13 +434,22 @@ class Family::DataImporter
         data = record["data"]
         old_id = data["id"]
 
-        tag = @family.tags.build(
-          name: data["name"],
-          color: data["color"] || Tag::COLORS.sample
-        )
+        require_source_id!("Tag", old_id)
 
+        tag = mapped_record(:tags, old_id, @family.tags, record_type: "Tag")
+        created = tag.blank?
+        tag ||= @family.tags.build
+        color = data["color"] || tag.color
+        # Keep replayed session imports deterministic when the source omits a color.
+        color ||= Tag::COLORS.first if created
+
+        tag.assign_attributes(
+          name: data["name"],
+          color: color
+        )
         tag.save!
-        @id_mappings[:tags][old_id] = tag.id
+        map_source!(:tags, old_id, tag)
+        increment_summary("Tag", created ? :created : :updated)
       end
     end
 
@@ -227,14 +458,20 @@ class Family::DataImporter
         data = record["data"]
         old_id = data["id"]
 
-        merchant = @family.merchants.build(
+        require_source_id!("Merchant", old_id)
+
+        merchant = mapped_record(:merchants, old_id, @family.merchants, record_type: "Merchant")
+        created = merchant.blank?
+        merchant ||= @family.merchants.build
+
+        merchant.assign_attributes(
           name: data["name"],
           color: data["color"],
           logo_url: data["logo_url"]
         )
-
         merchant.save!
-        @id_mappings[:merchants][old_id] = merchant.id
+        map_source!(:merchants, old_id, merchant)
+        increment_summary("Merchant", created ? :created : :updated)
       end
     end
 
@@ -243,10 +480,20 @@ class Family::DataImporter
         data = record["data"]
         old_id = data["id"]
 
-        new_account_id = remap_optional_id(:accounts, data["account_id"])
+        require_source_id!("RecurringTransaction", old_id)
+
+        recurring_transaction = mapped_record(
+          :recurring_transactions,
+          old_id,
+          @family.recurring_transactions,
+          record_type: "RecurringTransaction"
+        )
+        created = recurring_transaction.blank?
+
+        new_account_id = remap_optional_id(:accounts, data["account_id"], record_type: "RecurringTransaction")
         next if data["account_id"].present? && new_account_id.blank?
 
-        new_merchant_id = remap_optional_id(:merchants, data["merchant_id"])
+        new_merchant_id = remap_optional_id(:merchants, data["merchant_id"], record_type: "RecurringTransaction")
         next if data["merchant_id"].present? && new_merchant_id.blank?
 
         expected_day_of_month = recurring_expected_day_for(data["expected_day_of_month"])
@@ -255,7 +502,8 @@ class Family::DataImporter
         next_expected_date = parse_import_date(data["next_expected_date"])
         next unless last_occurrence_date && next_expected_date
 
-        recurring_transaction = @family.recurring_transactions.build(
+        recurring_transaction ||= @family.recurring_transactions.build
+        recurring_transaction.assign_attributes(
           account_id: new_account_id,
           merchant_id: new_merchant_id,
           amount: data["amount"].to_d,
@@ -273,14 +521,15 @@ class Family::DataImporter
         )
 
         recurring_transaction.save!
-        @id_mappings[:recurring_transactions][old_id] = recurring_transaction.id
+        map_source!(:recurring_transactions, old_id, recurring_transaction)
+        increment_summary("RecurringTransaction", created ? :created : :updated)
       end
     end
 
-    def remap_optional_id(mapping_key, old_id)
+    def remap_optional_id(mapping_key, old_id, record_type:)
       return if old_id.blank?
 
-      @id_mappings[mapping_key][old_id]
+      mapped_id(mapping_key, old_id, record_type: record_type)
     end
 
     def recurring_transaction_status_for(status)
@@ -305,8 +554,10 @@ class Family::DataImporter
         data = record["data"]
         old_id = data["id"]
 
+        require_source_id!("Transaction", old_id)
+
         # Map account ID
-        new_account_id = @id_mappings[:accounts][data["account_id"]]
+        new_account_id = mapped_id(:accounts, data["account_id"], record_type: "Transaction")
         next unless new_account_id
 
         account = @family.accounts.find(new_account_id)
@@ -314,78 +565,185 @@ class Family::DataImporter
         # Map category ID (optional)
         new_category_id = nil
         if data["category_id"].present?
-          new_category_id = @id_mappings[:categories][data["category_id"]]
+          new_category_id = mapped_id(:categories, data["category_id"], record_type: "Transaction")
         end
 
         # Map merchant ID (optional)
         new_merchant_id = nil
         if data["merchant_id"].present?
-          new_merchant_id = @id_mappings[:merchants][data["merchant_id"]]
+          new_merchant_id = mapped_id(:merchants, data["merchant_id"], record_type: "Transaction")
         end
 
         # Map tag IDs (optional)
-        new_tag_ids = []
-        if data["tag_ids"].present?
-          new_tag_ids = Array(data["tag_ids"]).map { |old_tag_id| @id_mappings[:tags][old_tag_id] }.compact
-        end
+        new_tag_ids = mapped_tag_ids(data["tag_ids"], record_type: "Transaction")
 
-        transaction = Transaction.new(
+        entry = session_imported_entry(account, "Transaction", old_id)
+        transaction = entry&.entryable if entry&.entryable.is_a?(Transaction)
+        created = transaction.blank?
+
+        transaction ||= Transaction.new
+        transaction.assign_attributes(
           category_id: new_category_id,
           merchant_id: new_merchant_id,
           kind: data["kind"] || "standard"
         )
 
-        entry = Entry.new(
+        entry ||= Entry.new(entryable: transaction)
+        entry.assign_attributes(
           account: account,
           date: Date.parse(data["date"].to_s),
           amount: data["amount"].to_d,
           name: data["name"] || "Imported transaction",
           currency: data["currency"] || account.currency,
           notes: data["notes"],
-          excluded: data["excluded"] || false,
-          entryable: transaction
+          excluded: data["excluded"] || false
         )
+        if @import_session
+          entry.external_id = session_entry_external_id("Transaction", old_id)
+          entry.source = session_entry_source
+        end
 
         entry.save!
 
-        # Add tags through the tagging association
-        new_tag_ids.each do |tag_id|
+        map_source!(:transactions, old_id, transaction)
+        split_rows = importable_split_rows(data)
+
+        if split_rows.any?
+          @created_entries << entry if created
+          import_split_lines!(entry, split_rows, fallback_tag_ids: new_tag_ids)
+        else
+          transaction.taggings.destroy_all unless created
+          new_tag_ids.each do |tag_id|
+            transaction.taggings.create!(tag_id: tag_id)
+          end
+
+          @created_entries << entry if created
+        end
+
+        increment_summary("Transaction", created ? :created : :updated)
+      end
+    end
+
+    def mapped_tag_ids(old_tag_ids, record_type:)
+      Array(old_tag_ids).map do |old_tag_id|
+        mapped_id(:tags, old_tag_id, record_type: record_type)
+      end.compact
+    end
+
+    def importable_split_rows(data)
+      rows = data["split_lines"].presence || data["splitLines"].presence || data["splits"].presence
+      Array(rows).filter_map do |row|
+        next unless row.is_a?(Hash)
+
+        amount = row["amount"] || row["amount_money"] || row["amount_decimal"]
+        next if amount.blank?
+
+        category_id = remap_optional_id(:categories, row["category_id"], record_type: "Transaction")
+        merchant_id = remap_optional_id(:merchants, row["merchant_id"], record_type: "Transaction")
+
+        {
+          old_id: row["id"],
+          name: row["name"].presence || row["memo"].presence || row["description"].presence || "Imported split",
+          amount: amount.to_d,
+          category_id: category_id,
+          merchant_id: merchant_id,
+          merchant_id_provided: row.key?("merchant_id"),
+          notes: row["notes"],
+          excluded: boolean_import_value(row, "excluded", default: false),
+          tag_ids: mapped_tag_ids(row["tag_ids"], record_type: "Transaction"),
+          tag_ids_provided: row.key?("tag_ids"),
+          kind: row["kind"]
+        }
+      end
+    end
+
+    def import_split_lines!(entry, split_rows, fallback_tag_ids:)
+      children = entry.split!(
+        split_rows.map do |row|
+          {
+            name: row[:name],
+            amount: row[:amount],
+            category_id: row[:category_id],
+            excluded: row[:excluded]
+          }
+        end
+      )
+
+      children.zip(split_rows).each do |child_entry, row|
+        transaction = child_entry.entryable
+        transaction.update!(
+          merchant_id: row[:merchant_id_provided] ? row[:merchant_id] : transaction.merchant_id,
+          kind: row[:kind].presence || transaction.kind
+        )
+        child_entry.update!(notes: row[:notes]) if row[:notes].present?
+
+        tag_ids = row[:tag_ids_provided] ? row[:tag_ids] : fallback_tag_ids
+        tag_ids.each do |tag_id|
           transaction.taggings.create!(tag_id: tag_id)
         end
 
-        @created_entries << entry
-        @id_mappings[:transactions][old_id] = transaction.id
+        map_source!(:transactions, row[:old_id], transaction) if row[:old_id].present?
+        @created_entries << child_entry
       end
     end
 
     def import_transfers(records)
       records.each do |record|
         data = record["data"]
-        inflow_transaction_id = @id_mappings[:transactions][data["inflow_transaction_id"]]
-        outflow_transaction_id = @id_mappings[:transactions][data["outflow_transaction_id"]]
+        inflow_transaction_id = mapped_id(:transactions, data["inflow_transaction_id"], record_type: "Transfer")
+        outflow_transaction_id = mapped_id(:transactions, data["outflow_transaction_id"], record_type: "Transfer")
         next unless inflow_transaction_id && outflow_transaction_id
 
-        Transfer.find_or_create_by!(
+        transfer = Transfer.find_or_create_by!(
           inflow_transaction_id: inflow_transaction_id,
           outflow_transaction_id: outflow_transaction_id
         ) do |transfer|
           transfer.status = transfer_status_for(data["status"])
           transfer.notes = data["notes"]
         end
+        apply_transfer_transaction_kinds!(transfer)
+        increment_summary("Transfer", transfer.previously_new_record? ? :created : :updated)
       end
     end
 
+    def apply_transfer_transaction_kinds!(transfer)
+      destination_account = transfer.inflow_transaction.entry.account
+      outflow_kind = imported_transfer_outflow_kind(transfer)
+      outflow_attrs = { kind: outflow_kind }
+      if outflow_kind == "investment_contribution" && transfer.outflow_transaction.category_id.blank?
+        outflow_attrs[:category] = destination_account.family.investment_contributions_category
+      end
+
+      transfer.outflow_transaction.update!(outflow_attrs)
+      transfer.inflow_transaction.update!(kind: "funds_movement")
+    end
+
+    def imported_transfer_outflow_kind(transfer)
+      source_account = transfer.outflow_transaction.entry.account
+      destination_account = transfer.inflow_transaction.entry.account
+      return "loan_payment" if destination_account.loan?
+      return "cc_payment" if destination_account.liability?
+      return "investment_contribution" if investment_account?(destination_account) && !investment_account?(source_account)
+
+      "funds_movement"
+    end
+
+    def investment_account?(account)
+      account.investment? || account.crypto?
+    end
+
     def import_rejected_transfers(records)
       records.each do |record|
         data = record["data"]
-        inflow_transaction_id = @id_mappings[:transactions][data["inflow_transaction_id"]]
-        outflow_transaction_id = @id_mappings[:transactions][data["outflow_transaction_id"]]
+        inflow_transaction_id = mapped_id(:transactions, data["inflow_transaction_id"], record_type: "RejectedTransfer")
+        outflow_transaction_id = mapped_id(:transactions, data["outflow_transaction_id"], record_type: "RejectedTransfer")
         next unless inflow_transaction_id && outflow_transaction_id
 
-        RejectedTransfer.find_or_create_by!(
+        rejected_transfer = RejectedTransfer.find_or_create_by!(
           inflow_transaction_id: inflow_transaction_id,
           outflow_transaction_id: outflow_transaction_id
         )
+        increment_summary("RejectedTransfer", rejected_transfer.previously_new_record? ? :created : :updated)
       end
     end
 
@@ -400,9 +758,12 @@ class Family::DataImporter
     def import_trades(records)
       records.each do |record|
         data = record["data"]
+        old_id = data["id"]
+
+        require_source_id!("Trade", old_id)
 
         # Map account ID
-        new_account_id = @id_mappings[:accounts][data["account_id"]]
+        new_account_id = mapped_id(:accounts, data["account_id"], record_type: "Trade")
         next unless new_account_id
 
         account = @family.accounts.find(new_account_id)
@@ -419,34 +780,47 @@ class Family::DataImporter
           exchange_operating_mic: data["exchange_operating_mic"]
         )
 
-        trade = Trade.new(
+        entry = session_imported_entry(account, "Trade", old_id)
+        trade = entry&.entryable if entry&.entryable.is_a?(Trade)
+        created = trade.blank?
+
+        trade ||= Trade.new
+        trade.assign_attributes(
           security: security,
           qty: data["qty"].to_d,
           price: data["price"].to_d,
           currency: data["currency"] || account.currency
         )
 
-        entry = Entry.new(
+        entry ||= Entry.new(entryable: trade)
+        entry.assign_attributes(
           account: account,
           date: Date.parse(data["date"].to_s),
           amount: data["amount"].to_d,
           name: "#{data["qty"].to_d >= 0 ? 'Buy' : 'Sell'} #{ticker}",
-          currency: data["currency"] || account.currency,
-          entryable: trade
+          currency: data["currency"] || account.currency
         )
+        if @import_session
+          entry.external_id = session_entry_external_id("Trade", old_id)
+          entry.source = session_entry_source
+        end
 
         entry.save!
-        @created_entries << entry
+        @created_entries << entry if created
+        increment_summary("Trade", created ? :created : :updated)
       end
     end
 
     def import_holdings(records)
-      accounts_by_id = @family.accounts.where(id: records.filter_map { |record| @id_mappings[:accounts][record.dig("data", "account_id")] }).index_by(&:id)
+      account_ids = records.filter_map do |record|
+        mapped_id(:accounts, record.dig("data", "account_id"), record_type: "Holding", required: false)
+      end
+      accounts_by_id = @family.accounts.where(id: account_ids).index_by(&:id)
 
       records.each do |record|
         data = record["data"]
 
-        new_account_id = @id_mappings[:accounts][data["account_id"]]
+        new_account_id = mapped_id(:accounts, data["account_id"], record_type: "Holding")
         next unless new_account_id
 
         account = accounts_by_id[new_account_id]
@@ -481,33 +855,46 @@ class Family::DataImporter
           security_locked: truthy?(data["security_locked"]) || false
         }
 
-        upsert_imported_holding!(account, security, holding_date, holding_currency, holding_attributes)
+        created = upsert_imported_holding!(account, security, holding_date, holding_currency, holding_attributes)
+        increment_summary("Holding", created ? :created : :updated)
       end
     end
 
     def import_valuations(records)
       records.each do |record|
         data = record["data"]
+        old_id = data["id"]
+
+        require_source_id!("Valuation", old_id)
 
         # Map account ID
-        new_account_id = @id_mappings[:accounts][data["account_id"]]
+        new_account_id = mapped_id(:accounts, data["account_id"], record_type: "Valuation")
         next unless new_account_id
 
         account = @family.accounts.find(new_account_id)
 
-        valuation = Valuation.new(kind: valuation_kind_for(data["kind"]))
+        entry = session_imported_entry(account, "Valuation", old_id)
+        valuation = entry&.entryable if entry&.entryable.is_a?(Valuation)
+        created = valuation.blank?
+        valuation ||= Valuation.new
+        valuation.kind = valuation_kind_for(data["kind"])
 
-        entry = Entry.new(
+        entry ||= Entry.new(entryable: valuation)
+        entry.assign_attributes(
           account: account,
           date: Date.parse(data["date"].to_s),
           amount: data["amount"].to_d,
           name: data["name"] || "Valuation",
-          currency: data["currency"] || account.currency,
-          entryable: valuation
+          currency: data["currency"] || account.currency
         )
+        if @import_session
+          entry.external_id = session_entry_external_id("Valuation", old_id)
+          entry.source = session_entry_source
+        end
 
         entry.save!
-        @created_entries << entry
+        @created_entries << entry if created
+        increment_summary("Valuation", created ? :created : :updated)
       end
     end
 
@@ -540,6 +927,12 @@ class Family::DataImporter
       end
     end
 
+    def skip_opening_balance_import?(old_id, data)
+      @imported_opening_anchor_account_ids.include?(old_id) ||
+        truthy?(data["skip_opening_balance_import"]) ||
+        truthy?(data["authoritative_balance_history"])
+    end
+
     def opening_balance_date_for(old_id, data)
       explicit_date = parse_import_date(
         data["opening_balance_date"] || data["opening_balance_on"]
@@ -573,7 +966,13 @@ class Family::DataImporter
         data = record["data"]
         old_id = data["id"]
 
-        budget = @family.budgets.build(
+        require_source_id!("Budget", old_id)
+
+        budget = mapped_record(:budgets, old_id, @family.budgets, record_type: "Budget")
+        created = budget.blank?
+        budget ||= @family.budgets.build
+
+        budget.assign_attributes(
           start_date: Date.parse(data["start_date"].to_s),
           end_date: Date.parse(data["end_date"].to_s),
           budgeted_spending: data["budgeted_spending"]&.to_d,
@@ -582,7 +981,8 @@ class Family::DataImporter
         )
 
         budget.save!
-        @id_mappings[:budgets][old_id] = budget.id
+        map_source!(:budgets, old_id, budget)
+        increment_summary("Budget", created ? :created : :updated)
       end
     end
 
@@ -591,36 +991,49 @@ class Family::DataImporter
         data = record["data"]
 
         # Map budget ID
-        new_budget_id = @id_mappings[:budgets][data["budget_id"]]
+        new_budget_id = mapped_id(:budgets, data["budget_id"], record_type: "BudgetCategory")
         next unless new_budget_id
 
         # Map category ID
-        new_category_id = @id_mappings[:categories][data["category_id"]]
+        new_category_id = mapped_id(:categories, data["category_id"], record_type: "BudgetCategory")
         next unless new_category_id
 
         budget = @family.budgets.find(new_budget_id)
 
-        budget_category = budget.budget_categories.build(
+        budget_category = budget.budget_categories.find_or_initialize_by(category_id: new_category_id)
+        created = budget_category.new_record?
+        budget_category.assign_attributes(
           category_id: new_category_id,
           budgeted_spending: data["budgeted_spending"].to_d,
           currency: data["currency"] || budget.currency
         )
 
         budget_category.save!
+        increment_summary("BudgetCategory", created ? :created : :updated)
       end
     end
 
     def import_rules(records)
       records.each do |record|
         data = record["data"]
+        old_id = data["id"]
 
-        rule = @family.rules.build(
+        require_source_id!("Rule", old_id)
+
+        rule = mapped_record(:rules, old_id, @family.rules, record_type: "Rule")
+        created = rule.blank?
+        rule ||= @family.rules.build
+
+        rule.assign_attributes(
           name: data["name"],
           resource_type: data["resource_type"] || "transaction",
           active: data["active"] || false,
           effective_date: data["effective_date"].present? ? Date.parse(data["effective_date"].to_s) : nil
         )
 
+        rule.conditions.destroy_all unless created
+        rule.actions.destroy_all unless created
+
         # Build conditions
         (data["conditions"] || []).each do |condition_data|
           build_rule_condition(rule, condition_data)
@@ -632,6 +1045,8 @@ class Family::DataImporter
         end
 
         rule.save!
+        map_source!(:rules, old_id, rule)
+        increment_summary("Rule", created ? :created : :updated)
       end
     end
 
@@ -768,8 +1183,9 @@ class Family::DataImporter
         return security
       end
 
-      if old_security_id.present? && @id_mappings[:securities][old_security_id]
-        security = Security.find(@id_mappings[:securities][old_security_id])
+      mapped_security_id = mapped_id(:securities, old_security_id, record_type: "Security", required: false)
+      if old_security_id.present? && mapped_security_id
+        security = Security.find(mapped_security_id)
         apply_security_metadata(security, normalized_ticker, attributes)
         @security_cache[cache_key] = security
         return security
@@ -779,7 +1195,7 @@ class Family::DataImporter
       apply_security_metadata(security, normalized_ticker, attributes)
 
       @security_cache[cache_key] = security
-      @id_mappings[:securities][old_security_id] = security.id if old_security_id.present?
+      map_source!(:securities, old_security_id, security) if old_security_id.present?
       security
     end
 
@@ -824,6 +1240,7 @@ class Family::DataImporter
 
     def upsert_imported_holding!(account, security, date, currency, attributes)
       holding = account.holdings.find_or_initialize_by(security: security, date: date, currency: currency)
+      created = holding.new_record?
       holding.assign_attributes(attributes)
 
       begin
@@ -831,7 +1248,10 @@ class Family::DataImporter
       rescue ActiveRecord::RecordNotUnique
         existing = account.holdings.find_by!(security: security, date: date, currency: currency)
         existing.update!(attributes)
+        created = false
       end
+
+      created
     end
 
     def security_kind_for(value)
diff --git a/app/models/family/financial_data_reset.rb b/app/models/family/financial_data_reset.rb
index 91759e239..10ef3257d 100644
--- a/app/models/family/financial_data_reset.rb
+++ b/app/models/family/financial_data_reset.rb
@@ -7,6 +7,8 @@ class Family::FinancialDataReset
     account_statements
     family_exports
     imports
+    import_sessions
+    import_source_mappings
     import_rows
     import_mappings
     accounts
@@ -46,12 +48,15 @@ class Family::FinancialDataReset
     ibkr_items
     indexa_capital_items
     kraken_items
+    questrade_items
     lunchflow_items
+    redbark_items
     mercury_items
     plaid_items
     simplefin_items
     snaptrade_items
     sophtron_items
+    up_items
   ].freeze
 
   Result = Struct.new(:user, :family, :dry_run, :before_counts, :deleted_counts, :after_counts, keyword_init: true)
@@ -127,6 +132,7 @@ class Family::FinancialDataReset
       delete_active_storage_attachments!
       scope(:transfers).destroy_all
       scope(:rejected_transfers).destroy_all
+      scope(:import_source_mappings).destroy_all
       scope(:import_mappings).destroy_all
       scope(:import_rows).destroy_all
       scope(:rule_runs).destroy_all
@@ -138,6 +144,7 @@ class Family::FinancialDataReset
       scope(:account_statements).destroy_all
       scope(:family_exports).destroy_all
       scope(:imports).destroy_all
+      scope(:import_sessions).destroy_all
       scope(:entries).destroy_all
       scope(:holdings).destroy_all
       scope(:balances).destroy_all
@@ -239,6 +246,7 @@ class Family::FinancialDataReset
         account_scope = Account.where(family_id: family.id)
         account_ids = account_scope.select(:id)
         import_scope = Import.where(family_id: family.id)
+        import_session_scope = ImportSession.where(family_id: family.id)
         import_ids = import_scope.select(:id)
         rule_scope = Rule.where(family_id: family.id)
         rule_ids = rule_scope.select(:id)
@@ -252,6 +260,8 @@ class Family::FinancialDataReset
           account_statements: AccountStatement.where(family_id: family.id),
           family_exports: FamilyExport.where(family_id: family.id),
           imports: import_scope,
+          import_sessions: import_session_scope,
+          import_source_mappings: ImportSourceMapping.where(family_id: family.id),
           import_rows: Import::Row.where(import_id: import_ids),
           import_mappings: Import::Mapping.where(import_id: import_ids),
           accounts: account_scope,
diff --git a/app/models/family/questrade_connectable.rb b/app/models/family/questrade_connectable.rb
new file mode 100644
index 000000000..1a337b690
--- /dev/null
+++ b/app/models/family/questrade_connectable.rb
@@ -0,0 +1,28 @@
+module Family::QuestradeConnectable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :questrade_items, dependent: :destroy
+  end
+
+  def can_connect_questrade?
+    # Families can configure their own Questrade credentials
+    true
+  end
+
+  def create_questrade_item!(refresh_token:, api_server: nil, item_name: nil)
+    questrade_item = questrade_items.create!(
+      name: item_name || "Questrade Connection",
+      refresh_token: refresh_token,
+      api_server: api_server
+    )
+
+    questrade_item.sync_later
+
+    questrade_item
+  end
+
+  def has_questrade_credentials?
+    questrade_items.where.not(refresh_token: nil).exists?
+  end
+end
diff --git a/app/models/family/redbark_connectable.rb b/app/models/family/redbark_connectable.rb
new file mode 100644
index 000000000..03a06c7dc
--- /dev/null
+++ b/app/models/family/redbark_connectable.rb
@@ -0,0 +1,27 @@
+module Family::RedbarkConnectable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :redbark_items, dependent: :destroy
+  end
+
+  def can_connect_redbark?
+    # Families can configure their own Redbark credentials
+    true
+  end
+
+  def create_redbark_item!(api_key:, item_name: nil)
+    redbark_item = redbark_items.create!(
+      name: item_name || I18n.t("redbark_items.default_name"),
+      api_key: api_key
+    )
+
+    redbark_item.sync_later
+
+    redbark_item
+  end
+
+  def has_redbark_credentials?
+    redbark_items.where.not(api_key: nil).exists?
+  end
+end
diff --git a/app/models/family/snaptrade_connectable.rb b/app/models/family/snaptrade_connectable.rb
index c8c8876aa..867a972da 100644
--- a/app/models/family/snaptrade_connectable.rb
+++ b/app/models/family/snaptrade_connectable.rb
@@ -6,25 +6,7 @@ module Family::SnaptradeConnectable
   end
 
   def can_connect_snaptrade?
-    # Families can configure their own Snaptrade credentials
+    # Families can connect to SnapTrade via OAuth (env-level app configuration).
     true
   end
-
-  def create_snaptrade_item!(client_id:, consumer_key:, snaptrade_user_secret:, snaptrade_user_id: nil, item_name: nil)
-    snaptrade_item = snaptrade_items.create!(
-      name: item_name || "Snaptrade Connection",
-      client_id: client_id,
-      consumer_key: consumer_key,
-      snaptrade_user_id: snaptrade_user_id,
-      snaptrade_user_secret: snaptrade_user_secret
-    )
-
-    snaptrade_item.sync_later
-
-    snaptrade_item
-  end
-
-  def has_snaptrade_credentials?
-    snaptrade_items.where.not(client_id: nil).exists?
-  end
 end
diff --git a/app/models/family/sync_complete_event.rb b/app/models/family/sync_complete_event.rb
index 859e380fd..4747d3fd0 100644
--- a/app/models/family/sync_complete_event.rb
+++ b/app/models/family/sync_complete_event.rb
@@ -6,10 +6,11 @@ class Family::SyncCompleteEvent
   end
 
   def broadcast
-    # Append a lightweight toast to the notification tray instead of a full
-    # page refresh.  The sync-toast Stimulus controller handles two cases:
-    #   - User is idle       → auto-reloads after a short delay
-    #   - User is mid-form   → toast stays visible; user clicks "Refresh now"
+    # Replace the #sync-toast slot with a lightweight toast instead of a full
+    # page refresh.  The sync-toast Stimulus controller handles three cases:
+    #   - User is idle         → morph-refreshes after a short delay
+    #   - User is mid-form     → toast stays visible; user clicks "Refresh"
+    #   - A modal is open      → toast defers until the dialog closes
     #
     # This avoids wiping in-progress form state when a background sync fires.
     # The partial contains no user-scoped data (Current.user is nil here), so
@@ -20,6 +21,21 @@ class Family::SyncCompleteEvent
       partial: "shared/notifications/sync_toast"
     )
 
+    # The accounts page's own sync toolbar (refresh icon + "Cancel sync") is
+    # plain server-rendered HTML from whatever request last loaded the page,
+    # so without this it stays stuck showing "still syncing" — disabled icon,
+    # "Cancel sync" visible — indefinitely after the sync actually finishes,
+    # even while the toast above says otherwise. Replace it in the same
+    # broadcast so the two agree. Visitors not on the accounts page simply
+    # don't have #accounts-sync-controls in their DOM, so this no-ops for
+    # them, same as the sync-toast replace above.
+    family.broadcast_replace_to(
+      family,
+      target: "accounts-sync-controls",
+      partial: "accounts/sync_controls",
+      locals: { family: family }
+    )
+
     # Schedule recurring transaction pattern identification (debounced to run after all syncs complete)
     begin
       RecurringTransaction.identify_patterns_for(family)
diff --git a/app/models/family/syncer.rb b/app/models/family/syncer.rb
index 66721a1a2..03b799ecf 100644
--- a/app/models/family/syncer.rb
+++ b/app/models/family/syncer.rb
@@ -1,29 +1,6 @@
 class Family::Syncer
   attr_reader :family
 
-  # Registry of item association names that participate in family sync.
-  # Each model must:
-  #   1. Include Syncable
-  #   2. Define a `syncable` scope (items ready for auto-sync)
-  #
-  # To add a new provider: add its association name here.
-  # The model handles its own "ready to sync" logic via the syncable scope.
-  SYNCABLE_ITEM_ASSOCIATIONS = %i[
-    plaid_items
-    simplefin_items
-    lunchflow_items
-    akahu_items
-    enable_banking_items
-    indexa_capital_items
-    coinbase_items
-    coinstats_items
-    mercury_items
-    brex_items
-    binance_items
-    snaptrade_items
-    sophtron_items
-  ].freeze
-
   def initialize(family)
     @family = family
   end
@@ -34,6 +11,10 @@ class Family::Syncer
 
     # Schedule child syncs
     child_syncables.each do |syncable|
+      # Cooperative cancellation: stop fanning out child syncs once a cancel
+      # has been requested (fresh read — the flag is set from another process).
+      break if sync.cancel_requested?
+
       syncable.sync_later(parent_sync: sync, window_start_date: sync.window_start_date, window_end_date: sync.window_end_date)
     end
   end
@@ -49,14 +30,25 @@ class Family::Syncer
 
   private
 
-    # Collects all syncable items from registered providers + manual accounts.
-    # Each provider model defines its own `syncable` scope that encapsulates
-    # the "ready to sync" business logic (active, configured, etc.)
+    # Collect all syncable provider items via reflection so new `*_items`
+    # integrations participate in nightly family sync as soon as they include
+    # Syncable and expose a `syncable` scope.
     def child_syncables
-      provider_items = SYNCABLE_ITEM_ASSOCIATIONS.flat_map do |association|
+      provider_items = syncable_item_associations.flat_map do |association|
         family.public_send(association).syncable
       end
 
       provider_items + family.accounts.manual
     end
+
+    def syncable_item_associations
+      Family.reflect_on_all_associations(:has_many).filter_map do |association|
+        next unless association.name.to_s.end_with?("_items")
+        next unless association.klass.included_modules.include?(Syncable)
+
+        association.name
+      rescue NameError
+        nil
+      end
+    end
 end
diff --git a/app/models/family/trading212_connectable.rb b/app/models/family/trading212_connectable.rb
new file mode 100644
index 000000000..5b3147e27
--- /dev/null
+++ b/app/models/family/trading212_connectable.rb
@@ -0,0 +1,11 @@
+module Family::Trading212Connectable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :trading212_items, dependent: :destroy
+  end
+
+  def can_connect_trading212?
+    true
+  end
+end
diff --git a/app/models/family/up_connectable.rb b/app/models/family/up_connectable.rb
new file mode 100644
index 000000000..4f56e2398
--- /dev/null
+++ b/app/models/family/up_connectable.rb
@@ -0,0 +1,28 @@
+module Family::UpConnectable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :up_items, dependent: :destroy
+  end
+
+  # Whether this family may connect Up Bank accounts (always true).
+  def can_connect_up?
+    true
+  end
+
+  # Create an Up item with the given token and trigger an initial sync.
+  def create_up_item!(access_token:, item_name: nil)
+    up_item = up_items.create!(
+      name: item_name || I18n.t("family.up.create_up_item.default_name"),
+      access_token: access_token
+    )
+
+    up_item.sync_later
+    up_item
+  end
+
+  # True when any active Up item has usable credentials.
+  def has_up_credentials?
+    up_items.active.any?(&:credentials_configured?)
+  end
+end
diff --git a/app/models/family/wise_connectable.rb b/app/models/family/wise_connectable.rb
new file mode 100644
index 000000000..855277ea5
--- /dev/null
+++ b/app/models/family/wise_connectable.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Family::WiseConnectable
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :wise_items, dependent: :destroy
+  end
+
+  def can_connect_wise?
+    true
+  end
+
+  def create_wise_item!(token:, profile_id:, profile_type:, item_name:)
+    item = wise_items.create!(
+      token: token,
+      profile_id: profile_id,
+      profile_type: profile_type,
+      name: item_name
+    )
+
+    item.sync_later
+
+    item
+  end
+end
diff --git a/app/models/family_export.rb b/app/models/family_export.rb
index 94e4fd836..b3af1cf92 100644
--- a/app/models/family_export.rb
+++ b/app/models/family_export.rb
@@ -1,4 +1,9 @@
 class FamilyExport < ApplicationRecord
+  # See Import::STUCK_AFTER — same dead-worker failure mode. Exports build in
+  # minutes, so a shorter window; a wedged pending/processing export otherwise
+  # spins in the UI forever (the exports index polls while any is in flight).
+  STUCK_AFTER = 2.hours
+
   belongs_to :family
 
   has_one_attached :export_file, dependent: :purge_later
@@ -12,6 +17,60 @@ class FamilyExport < ApplicationRecord
 
   scope :ordered, -> { order(created_at: :desc) }
 
+  # See Import::PRESUMED_LOST_AFTER — same dead-worker failure mode. Exports
+  # build in minutes; a pending/processing export idle for an hour is lost.
+  PRESUMED_LOST_AFTER = 1.hour
+
+  def presumed_lost?
+    (pending? || processing?) && updated_at < PRESUMED_LOST_AFTER.ago
+  end
+
+  # Escape hatch for exports whose background job died mid-flight; the
+  # with_lock re-check means a job finishing between render and click wins.
+  # Export generation is in-memory, so nothing is left behind — the user
+  # simply creates a new export.
+  def force_fail!
+    with_lock do
+      return false unless presumed_lost?
+
+      update!(status: :failed)
+    end
+
+    true
+  end
+
+  def self.clean
+    where(status: [ :pending, :processing ])
+      .where("updated_at < ?", STUCK_AFTER.ago)
+      .includes(:family)
+      .find_each do |export|
+        # Read before the lock — see Import.reap_stuck!.
+        family = export.family
+
+        # Row-lock + staleness re-check before mutating, as Sync#perform
+        # does since #2680 — the export job may have finished in between.
+        export.with_lock do
+          next unless %w[pending processing].include?(export.status) && export.updated_at < STUCK_AFTER.ago
+
+          previous_status = export.status
+          export.update!(status: :failed)
+
+          DebugLogEntry.capture(
+            category: "background_jobs",
+            level: "warn",
+            message: "Reaped FamilyExport stuck in #{previous_status} for over #{STUCK_AFTER.inspect}",
+            source: name,
+            family: family,
+            metadata: { record_type: name, record_id: export.id, previous_status: previous_status, new_status: "failed" }
+          )
+        end
+      rescue => e
+        # One bad record must not abort the sweep for the rest.
+        Rails.logger.error("FamilyExport.clean failed for #{export.id}: #{e.class}: #{e.message}")
+        Sentry.capture_exception(e) { |scope| scope.set_tags(record_type: name, record_id: export.id) } if defined?(Sentry)
+      end
+  end
+
   def filename
     "sure_export_#{created_at.strftime('%Y%m%d_%H%M%S')}.zip"
   end
diff --git a/app/models/family_merchant.rb b/app/models/family_merchant.rb
index 3baec76bb..d45947aca 100644
--- a/app/models/family_merchant.rb
+++ b/app/models/family_merchant.rb
@@ -6,12 +6,16 @@ class FamilyMerchant < Merchant
   before_validation :set_default_color
   before_save :generate_logo_url_from_website, if: :should_generate_logo?
 
-  validates :color, presence: true
+  validates :color, presence: true, format: { with: /\A#[0-9A-Fa-f]{6}\z/ }
   validates :name, uniqueness: { scope: :family }
 
   private
     def set_default_color
-      self.color = COLORS.sample
+      self.color = COLORS.sample unless valid_hex_color?
+    end
+
+    def valid_hex_color?
+      color.present? && color.match?(/\A#[0-9A-Fa-f]{6}\z/)
     end
 
     def should_generate_logo?
diff --git a/app/models/goal.rb b/app/models/goal.rb
index da4f597af..51935a86e 100644
--- a/app/models/goal.rb
+++ b/app/models/goal.rb
@@ -8,7 +8,10 @@ class Goal < ApplicationRecord
   validates :color, format: { with: /\A#[0-9A-Fa-f]{6}\z/ }, allow_nil: true
 
   belongs_to :family
-  has_many :goal_accounts, dependent: :destroy
+  # autosave so earmark (allocated_amount) edits on already-linked accounts
+  # persist through goal.save! — without it Rails only saves newly built
+  # children, silently dropping changes to existing goal_accounts.
+  has_many :goal_accounts, dependent: :destroy, autosave: true
   has_many :linked_accounts, through: :goal_accounts, source: :account
   has_many :goal_pledges, dependent: :destroy
   has_many :open_pledges,
@@ -18,8 +21,12 @@ class Goal < ApplicationRecord
   validates :name, presence: true, length: { maximum: 255 }
   validates :target_amount, presence: true, numericality: { greater_than: 0 }
   validates :currency, presence: true
+  # before_save (not before_validation) so it only mutates on persistence, not
+  # on every valid? call — a goal can be inspected without its basis flipping.
+  before_save :default_progress_basis_for_investment
+
   validate :must_have_at_least_one_linked_account
-  validate :linked_accounts_must_be_depository
+  validate :linked_accounts_must_be_fundable
   validate :linked_accounts_must_match_goal_currency
   validate :linked_accounts_must_belong_to_family
   validate :currency_locked_once_linked
@@ -35,6 +42,37 @@ class Goal < ApplicationRecord
     Digest::SHA1.hexdigest("goals:family:#{family_id}").to_i(16) % (2**63)
   end
 
+  # Family-wide map of non-archived goal earmarks, grouped by account_id:
+  # { account_id => [{ goal_id:, allocated_amount: }, ...] }. The controller
+  # assigns this to each goal on index (goal.pooled_allocations = ...) so the
+  # shared-pool backing math runs ONE query for the whole page instead of one
+  # per goal.
+  def self.pooled_allocations_for(family)
+    GoalAccount.joins(:goal)
+               .where(goals: { family_id: family.id })
+               .where.not(goals: { state: "archived" })
+               .pluck(:account_id, :goal_id, :allocated_amount)
+               .group_by(&:first)
+               .transform_values do |triples|
+                 triples.map { |(_, goal_id, amount)| { goal_id: goal_id, allocated_amount: amount } }
+               end
+  end
+
+  attr_writer :pooled_allocations
+
+  # Family-wide map of cumulative market gain/loss per account_id (sum of
+  # balances.net_market_flows). Injected on index alongside pooled_allocations
+  # so contributions-basis goals don't fire one Balance aggregate per account
+  # per goal (N+1).
+  def self.market_flows_for(family)
+    account_ids = GoalAccount.joins(:goal).where(goals: { family_id: family.id }).distinct.pluck(:account_id)
+    return {} if account_ids.empty?
+
+    Balance.where(account_id: account_ids).group(:account_id).sum(:net_market_flows)
+  end
+
+  attr_writer :market_flows
+
   aasm column: :state do
     after_all_transitions :reset_state_dependent_caches!
 
@@ -62,15 +100,20 @@ class Goal < ApplicationRecord
     event :unarchive do
       transitions from: :archived, to: :active
     end
+
+    event :reopen do
+      transitions from: :completed, to: :active
+    end
   end
 
-  # Balance is the live balance of every linked depository account that
-  # matches the goal's currency. The model validates this invariant at
-  # write time, but defensive filter + telemetry here guards against any
-  # drift caused by direct DB writes, account-currency edits outside
-  # goal validation, or future code that bypasses the validation chain.
-  # v1.1+: minus other goals' allocations via the upcoming GoalBacking
-  # query.
+  # Balance is this goal's backing across its linked depository accounts that
+  # match the goal's currency. Each linked account contributes either its
+  # earmarked slice (goal_accounts.allocated_amount) or — when unallocated —
+  # the whole balance left after other goals' earmarks (see
+  # #backing_balance_for). The model validates the currency invariant at write
+  # time, but the defensive filter + telemetry here guards against drift from
+  # direct DB writes, account-currency edits outside goal validation, or
+  # future code that bypasses the validation chain.
   def current_balance
     @current_balance ||= begin
       matching = linked_accounts.select { |a| a.currency == currency }
@@ -78,7 +121,7 @@ class Goal < ApplicationRecord
         Rails.logger.warn("Goal##{id} linked-account currency drift: #{linked_accounts.size - matching.size} of #{linked_accounts.size} mismatched (expected #{currency})")
         Sentry.capture_message("Goal linked-account currency drift", level: :warning, extra: { goal_id: id, expected_currency: currency }) if defined?(Sentry)
       end
-      matching.sum { |a| a.balance.to_d }
+      matching.sum { |account| account_amount_for(account) }
     end
   end
 
@@ -86,6 +129,25 @@ class Goal < ApplicationRecord
     @current_balance_money ||= Money.new(current_balance, currency)
   end
 
+  # This goal's backing from a single linked account — the earmarked slice, or
+  # the whole-balance remainder when the link is unallocated — as Money. Used
+  # by the funding breakdown so the per-account rows reconcile with the ring.
+  def account_backing(account)
+    Money.new(account_amount_for(account), currency)
+  end
+
+  def contributions_basis?
+    progress_basis == "contributions"
+  end
+
+  # Market value of the goal's backing (balance basis), regardless of the
+  # progress basis — the "what it's worth today" figure shown next to
+  # contributions on an investment-backed goal.
+  def market_value_money
+    amount = linked_accounts.select { |a| a.currency == currency }.sum { |a| backing_share_for(a, a.balance.to_d) }
+    Money.new(amount, currency)
+  end
+
   def remaining_amount
     @remaining_amount ||= [ target_amount - current_balance, 0 ].max
   end
@@ -101,8 +163,10 @@ class Goal < ApplicationRecord
       100
     elsif target_amount.to_d.zero?
       0
+    elsif remaining_amount.to_d.zero?
+      100
     else
-      [ ((current_balance.to_d / target_amount.to_d) * 100).round, 100 ].min
+      ((current_balance.to_d / target_amount.to_d) * 100).floor.clamp(0, 99)
     end
   end
 
@@ -137,6 +201,11 @@ class Goal < ApplicationRecord
   # user records a pledge, the transfer arrives, balance goes up, pace
   # goes up, status flips off "behind". Excludes user-flagged-excluded
   # entries. Entry amount sign convention in Sure: inflow is negative.
+  #
+  # NOTE: pace is whole-account inflow by design in this phase, even for an
+  # earmarked goal whose current_balance is only a slice — so runway/status
+  # mix a whole-account numerator with an earmark-scoped balance. Earmark-aware
+  # pace is a deliberate follow-up; don't "fix" the basis without that work.
   def pace
     return @pace if defined?(@pace)
 
@@ -188,7 +257,16 @@ class Goal < ApplicationRecord
   # strings server-side rather than build them with its own Intl calls.
   def projection_payload
     series_values = balance_series_values
-    saved_series = series_values.map { |v| { date: v.date.to_s, value: v.value.amount.to_f } }
+    # The historical series tracks the whole linked-account balances. Scale it
+    # to this goal's backing so the saved line meets current_balance at "today"
+    # instead of dropping off a cliff for earmarked goals. Assumes the earmark
+    # ratio held over the window (an approximation); exact for unallocated
+    # goals, where ratio == 1 and the series is unchanged.
+    whole_total = linked_accounts.select { |a| a.currency == currency }.sum { |a| a.balance.to_d }
+    # 0 when the linked-account total is non-positive: current_balance is forced
+    # to 0 there, so the saved series must end at 0 too (no stray non-zero tail).
+    backing_ratio = whole_total.positive? ? (current_balance.to_d / whole_total) : 0.to_d
+    saved_series = series_values.map { |v| { date: v.date.to_s, value: (v.value.amount.to_d * backing_ratio).to_f } }
 
     earliest = series_values.first&.date || created_at.to_date
     target_amt = target_amount.to_d
@@ -238,14 +316,14 @@ class Goal < ApplicationRecord
     end
   end
 
-  # :reached         → progress_percent >= 100
+  # :reached         → completed, or no remaining amount
   # :on_track        → has target_date and pace >= required monthly
   # :behind          → has target_date and pace < required monthly
   # :no_target_date  → open-ended
   def status
     return @status if defined?(@status)
 
-    @status = if progress_percent >= 100
+    @status = if completed? || remaining_amount.to_d.zero?
       :reached
     elsif target_date.nil?
       :no_target_date
@@ -286,9 +364,17 @@ class Goal < ApplicationRecord
     linked_accounts.any? { |a| !a.manual? }
   end
 
-  # "I just transferred" for bank-connected accounts, "I just saved" for manual-only.
+  # "I just transferred" when any linked account resolves pledges via a transfer
+  # (synced accounts AND investment accounts, per default_pledge_kind); "I just
+  # saved" only for manual cash accounts. Keyed off default_pledge_kind so the
+  # copy matches the kind actually saved — a manual brokerage uses transfer, not
+  # manual_save, so it must not show the "update your manual balance" path.
   def pledge_action_label_key
-    any_connected_account? ? "goals.show.pledge_just_transferred" : "goals.show.pledge_just_saved"
+    pledges_use_transfer? ? "goals.show.pledge_just_transferred" : "goals.show.pledge_just_saved"
+  end
+
+  def pledges_use_transfer?
+    linked_accounts.any? { |a| a.default_pledge_kind == "transfer" }
   end
 
   # { account_id => palette_hex } for this goal's linked accounts. Stable
@@ -400,12 +486,87 @@ class Goal < ApplicationRecord
   end
 
   private
+    # This goal's amount from one linked account under the active progress
+    # basis: net contributions (market-gain-excluded, floored at 0) on the
+    # contributions basis, or the allocation-aware backing balance otherwise.
+    def account_amount_for(account)
+      base = contributions_basis? ? net_contributed_for(account) : account.balance.to_d
+      backing_share_for(account, base)
+    end
+
+    # Net contributions into `account` to date = current value minus cumulative
+    # market gain/loss (sum of balances.net_market_flows), floored at 0.
+    # Depository accounts have zero net_market_flows, so this equals their
+    # balance. The per-account base on the contributions basis.
+    def net_contributed_for(account)
+      market_gain = (market_flows[account.id] || 0).to_d
+      [ account.balance.to_d - market_gain, 0.to_d ].max
+    end
+
+    # This goal's share of one linked account given a per-account `base` amount
+    # (the live balance on the balance basis, net contributions on the
+    # contributions basis). Shared-pool semantics are the same either way: the
+    # goal's OWN earmark is read from its own goal_accounts (reliable even for
+    # an archived goal, which is excluded from the pool); OTHER non-archived
+    # goals' fixed earmarks come from the shared pool. A fixed earmark takes its
+    # slice; an unallocated link takes the remainder after others' fixed
+    # earmarks. When fixed earmarks exceed the base they're scaled down pro-rata
+    # (to within sub-cent rounding) so shares never sum past it — no
+    # double-counting. A non-positive base backs nothing.
+    def backing_share_for(account, base)
+      base = base.to_d
+      return 0.to_d if base <= 0
+
+      mine = own_allocation_for(account)
+      others_fixed = (pooled_allocations[account.id] || [])
+        .reject { |r| r[:goal_id] == id }
+        .sum { |r| r[:allocated_amount].to_d }
+
+      if mine
+        total_fixed = others_fixed + mine
+        if total_fixed > base && total_fixed.positive?
+          (mine * (base / total_fixed)).round(4) # pro-rata haircut
+        else
+          mine
+        end
+      else
+        [ base - others_fixed, 0 ].max # unallocated link: the remainder
+      end
+    end
+
+    # This goal's own earmark on `account` (a BigDecimal, or nil for a
+    # whole-balance link). Read from the loaded goal_accounts association so it
+    # is correct even for archived goals, which are excluded from the pool.
+    def own_allocation_for(account)
+      goal_accounts.find { |ga| ga.account_id == account.id }&.allocated_amount
+    end
+
+    # Family-wide map of non-archived goal earmarks. Injected once per request
+    # by the controller on index (one query for the whole page); falls back to
+    # a single query for the standalone (show) case.
+    def pooled_allocations
+      @pooled_allocations ||= self.class.pooled_allocations_for(family)
+    end
+
+    def market_flows
+      @market_flows ||= self.class.market_flows_for(family)
+    end
+
     # Cleared after every AASM transition. The state column drives the
     # display_status / projection_summary memos; without this the same
     # instance keeps returning the pre-transition value if a controller
     # calls archive! / pause! and then renders without reload.
     def reset_state_dependent_caches!
-      %i[@display_status @projection_summary].each do |ivar|
+      # current_balance now depends on the goal's own archived state (an
+      # archived goal is excluded from the shared pool), so the balance-derived
+      # memos must be cleared on a transition too, not just the status memos.
+      %i[
+        @display_status @projection_summary
+        @current_balance @current_balance_money
+        @remaining_amount @remaining_amount_money
+        @progress_percent @monthly_target_amount
+        @pace @pace_money @status @pooled_allocations
+      ].each do |ivar|
         remove_instance_variable(ivar) if instance_variable_defined?(ivar)
       end
     end
@@ -450,13 +611,23 @@ class Goal < ApplicationRecord
       errors.add(:base, :at_least_one_linked_account_required)
     end
 
-    def linked_accounts_must_be_depository
+    def linked_accounts_must_be_fundable
       offending = goal_accounts.reject(&:marked_for_destruction?).reject do |sga|
-        sga.account&.depository?
+        sga.account&.depository? || sga.account&.investment?
       end
       return if offending.empty?
 
-      errors.add(:linked_accounts, :must_be_depository)
+      errors.add(:linked_accounts, :must_be_fundable)
+    end
+
+    # Goals funded by an investment account default to the contributions basis
+    # (so a market swing doesn't move them); depository-only goals stay on the
+    # balance basis. Only auto-set when the basis is still the default.
+    def default_progress_basis_for_investment
+      return unless goal_accounts.any? { |ga| ga.account&.investment? }
+      return unless progress_basis.blank? || progress_basis == "balance"
+
+      self.progress_basis = "contributions"
     end
 
     def linked_accounts_must_match_goal_currency
diff --git a/app/models/goal_account.rb b/app/models/goal_account.rb
index 4ab38bb68..57f906db6 100644
--- a/app/models/goal_account.rb
+++ b/app/models/goal_account.rb
@@ -3,4 +3,16 @@ class GoalAccount < ApplicationRecord
   belongs_to :account
 
   validates :account_id, uniqueness: { scope: :goal_id }
+  validates :allocated_amount,
+            numericality: { greater_than_or_equal_to: 0 },
+            allow_nil: true
+
+  # nil allocated_amount means "dedicate the whole account balance" (the v1
+  # default). A set amount earmarks a fixed slice of the account toward this
+  # goal. The share that actually counts toward the goal — after sibling
+  # earmarks and the pro-rata over-allocation haircut — is computed by
+  # Goal#current_balance, which owns the shared-pool math.
+  def whole_account?
+    allocated_amount.nil?
+  end
 end
diff --git a/app/models/goal_pledge.rb b/app/models/goal_pledge.rb
index a72b2cb5b..052e6c9d1 100644
--- a/app/models/goal_pledge.rb
+++ b/app/models/goal_pledge.rb
@@ -38,19 +38,42 @@ class GoalPledge < ApplicationRecord
 
   # Tolerance check: entry date within [created_at − 5d, expires_at] (so
   # extend! widens the upper bound) and amount within ±$0.50 OR ±1%.
-  # Transfer pledges only fire on inflows (Sure convention: inflow < 0).
-  # Without this guard, .abs below lets a $200 outflow satisfy a $200
-  # transfer pledge as readily as a $200 deposit.
-  def matches?(entry)
+  #
+  # The amount being compared is the money that actually moved IN:
+  #   - transfer pledges resolve against a Transaction inflow (Sure
+  #     convention: inflow < 0), so the entry amount IS the contribution.
+  #   - manual_save pledges resolve against a Valuation, whose amount is the
+  #     account's full new TOTAL balance — not the contribution. The caller
+  #     (Account::ReconciliationManager) passes the balance delta
+  #     (new_balance − prior_balance) via `valuation_delta`; that delta is
+  #     the contribution we match against. Comparing the raw valuation amount
+  #     would only ever match on an account whose entire balance equals the
+  #     pledge (i.e. one starting from ~$0).
+  #
+  # Both kinds only fire on money coming in: transfers require an inflow
+  # entry, manual_save requires a positive balance delta. Without these
+  # guards, .abs below would let a $200 outflow / a $200 drawdown satisfy a
+  # $200 pledge as readily as a $200 deposit.
+  def matches?(entry, valuation_delta: nil)
     return false unless status_open?
     return false unless entry.account_id == account_id
-    return false if kind_transfer? && !entry.amount.to_d.negative?
+
+    is_valuation = entry.entryable.is_a?(Valuation)
+
+    if is_valuation
+      # Never match a valuation delta on an investment account: it may be a
+      # market move, not a deposit, and would false-match (investment goals).
+      return false if account&.investment?
+      return false if valuation_delta.nil? || valuation_delta.to_d <= 0
+    elsif kind_transfer? && !entry.amount.to_d.negative?
+      return false
+    end
 
     earliest = created_at.to_date - MATCH_DATE_TOLERANCE_DAYS.days
     latest = [ created_at.to_date + MATCH_DATE_TOLERANCE_DAYS.days, expires_at.to_date ].max
     return false unless entry.date >= earliest && entry.date <= latest
 
-    txn_amount = entry.amount.to_d.abs
+    txn_amount = (is_valuation ? valuation_delta.to_d : entry.amount.to_d).abs
     pledge_amount = amount.to_d
     diff_abs = (txn_amount - pledge_amount).abs
 
diff --git a/app/models/goal_pledge/reconciler.rb b/app/models/goal_pledge/reconciler.rb
index f3309dc9e..81de43746 100644
--- a/app/models/goal_pledge/reconciler.rb
+++ b/app/models/goal_pledge/reconciler.rb
@@ -1,8 +1,13 @@
 class GoalPledge::Reconciler
   attr_reader :entry
 
-  def initialize(entry)
+  # `valuation_delta` is the contribution (new_balance − prior_balance) for
+  # Valuation entries, supplied by Account::ReconciliationManager which knows
+  # the prior balance. It is ignored for Transaction entries, whose own
+  # amount is already the contribution.
+  def initialize(entry, valuation_delta: nil)
     @entry = entry
+    @valuation_delta = valuation_delta
   end
 
   def run
@@ -17,7 +22,7 @@ class GoalPledge::Reconciler
       .where("expires_at >= ?", Time.current)
       .order(:created_at, :id)
       .each do |pledge|
-      next unless pledge.matches?(entry)
+      next unless pledge.matches?(entry, valuation_delta: @valuation_delta)
 
       begin
         if entry.entryable.is_a?(Transaction)
diff --git a/app/models/holding/portfolio_cache.rb b/app/models/holding/portfolio_cache.rb
index 4ea52920e..014c7ceb7 100644
--- a/app/models/holding/portfolio_cache.rb
+++ b/app/models/holding/portfolio_cache.rb
@@ -118,7 +118,14 @@ class Holding::PortfolioCache
         end
 
         # Medium priority prices from trades
+        # Exclude income entries (interest/dividend) — they are non-trading
+        # events with qty=0 and their zero price would clobber the security's
+        # market price on that date in the ForwardCalculator, producing a
+        # zero-amount holding.  Use qty (the same heuristic as
+        # Balance::BaseCalculator) rather than price to avoid blocking
+        # non-income zero-price trades such as Questrade journal transfers.
         trade_prices = (trades_by_security_id[security.id] || [])
+          .reject { |t| t.entryable.qty == 0 }
           .map do |trade|
             PriceWithPriority.new(
               price: Security::Price.new(
diff --git a/app/models/ibkr_item.rb b/app/models/ibkr_item.rb
index aca60d1b2..923debb1e 100644
--- a/app/models/ibkr_item.rb
+++ b/app/models/ibkr_item.rb
@@ -81,7 +81,7 @@ class IbkrItem < ApplicationRecord
   end
 
   def accounts
-    ibkr_accounts.includes(account_provider: :account).filter_map(&:current_account).uniq
+    @accounts ||= ibkr_accounts.includes(account_provider: :account).filter_map(&:current_account).uniq
   end
 
   def linked_ibkr_accounts
diff --git a/app/models/import.rb b/app/models/import.rb
index d70a19eb2..6d92a01e8 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -2,6 +2,35 @@ class Import < ApplicationRecord
   MaxRowCountExceededError = Class.new(StandardError)
   MappingError = Class.new(StandardError)
 
+  # A hard-killed worker (OOM, SIGKILL during deploy) loses its in-flight job
+  # permanently, wedging the record in importing/reverting with no UI recourse.
+  # After this idle window the job is presumed lost and the user may force the
+  # record into a retryable terminal status. Imports finish in minutes, so an
+  # hour of silence dwarfs any legitimate run.
+  PRESUMED_LOST_AFTER = 1.hour
+
+  # The automated counterpart to the manual escape hatch above: SyncCleanerJob
+  # reaps records stuck past this longer window (see Import.clean).
+  STUCK_AFTER = 6.hours
+
+  # User-facing (shown as the import's error in the UI), so resolved through
+  # i18n at call time rather than frozen at boot.
+  def self.lost_error_message
+    I18n.t(
+      "imports.errors.presumed_lost",
+      default: "Marked as failed after the background job was presumed lost. The imported data was rolled back — you can safely try again."
+    )
+  end
+
+  # User-facing (shown as the import's error in the UI). Resolved at reap
+  # time; the sweep runs from cron so this snapshots the default locale.
+  def self.interrupted_error_message
+    I18n.t(
+      "imports.errors.interrupted",
+      default: "The background worker was interrupted before this finished. Imported data was rolled back — you can safely try again."
+    )
+  end
+
   # Shared CSV upload/content limit for web and API imports, including preflight.
   MAX_CSV_SIZE = 10.megabytes
   MAX_PDF_SIZE = 25.megabytes
@@ -10,7 +39,7 @@ class Import < ApplicationRecord
 
   DOCUMENT_TYPES = %w[bank_statement credit_card_statement investment_statement financial_document contract other].freeze
 
-  TYPES = %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport PdfImport QifImport SureImport].freeze
+  TYPES = %w[TransactionImport TradeImport AccountImport MintImport ActualImport YnabImport CategoryImport RuleImport MerchantImport PdfImport QifImport SureImport].freeze
   SIGNAGE_CONVENTIONS = %w[inflows_positive inflows_negative]
   SEPARATORS = [ [ "Comma (,)", "," ], [ "Semicolon (;)", ";" ] ].freeze
 
@@ -41,11 +70,15 @@ class Import < ApplicationRecord
   belongs_to :family
   belongs_to :account, optional: true
   belongs_to :account_statement, optional: true
+  belongs_to :import_session, optional: true
 
   before_validation :set_default_number_format
   before_validation :ensure_utf8_encoding
+  before_save :ensure_utf8_encoding
+  normalizes :client_chunk_id, with: ->(value) { value.strip.presence }
 
   scope :ordered, -> { order(created_at: :desc) }
+  scope :ordered_by_sequence, -> { order(:sequence, :created_at) }
 
   enum :status, {
     pending: "pending",
@@ -61,9 +94,15 @@ class Import < ApplicationRecord
   validates :col_sep, inclusion: { in: SEPARATORS.map(&:last) }
   validates :signage_convention, inclusion: { in: SIGNAGE_CONVENTIONS }, allow_nil: true
   validates :number_format, presence: true, inclusion: { in: NUMBER_FORMATS.keys }
+  validates :sequence, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+  validates :client_chunk_id, length: { maximum: 255 }, allow_blank: true
+  validates :checksum, length: { is: 64 }, allow_blank: true
   validate :custom_column_import_requires_identifier
   validates :rows_to_skip, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
   validate :account_belongs_to_family
+  validate :import_session_belongs_to_family
+  validate :session_chunk_metadata
+  validate :session_payloads_are_json_objects
   validate :rows_to_skip_within_file_bounds
 
   has_many :rows, dependent: :destroy
@@ -72,6 +111,71 @@ class Import < ApplicationRecord
   has_many :entries, dependent: :destroy
 
   class << self
+    # Reaps imports whose job died mid-flight. import! runs in a single DB
+    # transaction, so which side of its commit the worker died on is
+    # observable: no rows attached → the data rolled back, failing the record
+    # re-enables the "Try again" path; rows attached → the job died between
+    # the commit and the status write, so the truthful terminal state is
+    # complete (re-enabling retry there would double-import types without row
+    # dedup, e.g. TradeImport). Reverts that died the same way go to
+    # revert_failed so the revert can be retried. PdfImports are excluded
+    # (their statuses double as processing claims, see PdfImport.clean), and
+    # so are session-owned chunks — ImportSession.clean reconciles those
+    # within the session flow.
+    def clean
+      where(status: [ :importing, :reverting ])
+        .where.not(type: "PdfImport")
+        .where(import_session_id: nil)
+        .where("updated_at < ?", STUCK_AFTER.ago)
+        .includes(:family)
+        .find_each do |import|
+          reap_stuck!(import)
+        rescue => e
+          # One bad record must not abort the sweep for every other stuck
+          # import this hour.
+          Rails.logger.error("Import.clean failed for #{import.type} #{import.id}: #{e.class}: #{e.message}")
+          Sentry.capture_exception(e) { |scope| scope.set_tags(record_type: import.type, record_id: import.id) } if defined?(Sentry)
+        end
+    end
+
+    def reap_stuck!(import)
+      needs_sync = false
+      # Read before the lock: with_lock reloads the row and drops the
+      # association cache, which would turn the sweep's preload into an N+1.
+      family = import.family
+
+      # Same guard Sync#perform gained in #2680: between the sweep query
+      # and this row the owning job may have finished (or another sweep
+      # won), so re-check staleness under a row lock before mutating.
+      import.with_lock do
+        next unless import.reapable_since?(STUCK_AFTER.ago)
+
+        previous_status = import.status
+        if previous_status == "reverting"
+          import.update!(status: :revert_failed, error: interrupted_error_message)
+        elsif import.data_committed?
+          import.update!(status: :complete, error: nil)
+          needs_sync = true
+        else
+          import.update!(status: :failed, error: interrupted_error_message)
+        end
+
+        DebugLogEntry.capture(
+          category: "background_jobs",
+          level: "warn",
+          message: "Reaped #{import.type} stuck in #{previous_status} for over #{STUCK_AFTER.inspect} (→ #{import.status})",
+          source: name,
+          family: family,
+          metadata: { record_type: import.type, record_id: import.id, previous_status: previous_status, new_status: import.status }
+        )
+      end
+
+      # Outside the row-lock transaction: Rails doesn't defer enqueues to
+      # after-commit by default, so enqueuing inside the lock could hand
+      # Sidekiq a job before the status write is visible.
+      family.sync_later if needs_sync
+    end
+
     def parse_csv_str(csv_str, col_sep: ",")
       CSV.parse(
         (csv_str || "").strip,
@@ -137,7 +241,38 @@ class Import < ApplicationRecord
     ImportJob.perform_later(self)
   end
 
+  # Whether import! already committed rows for this import. Distinguishes a
+  # job that died mid-import (single transaction → rolled back, nothing
+  # attached) from one that died after the data landed but before the status
+  # write. Covers entry-producing imports and account-producing ones
+  # (AccountImport creates accounts, not entries).
+  def data_committed?
+    entries.exists? || accounts.exists?
+  end
+
+  # Reaper guard: still wedged in a job-owned status and untouched since the
+  # sweep's cutoff. Called under the record's row lock (fresh read).
+  def reapable_since?(cutoff)
+    %w[importing reverting].include?(status) && updated_at < cutoff
+  end
+
   def publish
+    # A redelivered or stray ImportJob must not re-import data that already
+    # committed (types without row dedup would double-apply), and must not
+    # race a revert that owns the record. A failed import is deliberately NOT
+    # blocked: its transaction rolled back, so a re-run is a safe retry.
+    if complete? || reverting? || revert_failed?
+      DebugLogEntry.capture(
+        category: "background_jobs",
+        level: "warn",
+        message: "Import publish skipped: job redelivered while record was #{status}",
+        source: self.class.name,
+        family: family,
+        metadata: { record_type: type, record_id: id, status: status }
+      )
+      return
+    end
+
     raise MaxRowCountExceededError if row_count_exceeded?
 
     import!
@@ -157,6 +292,29 @@ class Import < ApplicationRecord
     RevertImportJob.perform_later(self)
   end
 
+  def presumed_lost?
+    (importing? || reverting?) && updated_at < PRESUMED_LOST_AFTER.ago
+  end
+
+  # Escape hatch for imports whose background job died mid-flight. Only
+  # allowed once the record has been idle past PRESUMED_LOST_AFTER, and the
+  # with_lock re-check means a job finishing between page render and button
+  # click wins. Every import! runs in a single DB transaction, so a lost job
+  # rolled its data back — failing the record is safe and re-enables the
+  # existing "Try again" (failed) / revert-retry (revert_failed) paths.
+  def force_fail!(error_message = self.class.lost_error_message)
+    with_lock do
+      return false unless presumed_lost?
+
+      update!(
+        status: reverting? ? :revert_failed : :failed,
+        error: error_message
+      )
+    end
+
+    true
+  end
+
   def revert
     Import.transaction do
       accounts.destroy_all
@@ -373,6 +531,20 @@ class Import < ApplicationRecord
   end
 
   private
+    # Commit signal for import types whose records hang off the family rather
+    # than the import itself (Category/Merchant/Rule imports create no entries
+    # or accounts, so the base data_committed? can't see them). import! runs as
+    # a single find-or-create-by-name transaction, so once every named row has
+    # a matching family record the data committed — or every name already
+    # existed, leaving the family in the same end state. Either way the
+    # truthful terminal status is complete, not a retryable failed. Rows with
+    # blank names carry no stable key, so a file with only blank names yields
+    # no signal and stays retryable (the conservative side of the reaper).
+    def committed_by_named_records?(scope)
+      names = rows.pluck(:name).filter_map { |value| value.to_s.strip.presence }.uniq
+      names.any? && (names - scope.where(name: names).pluck(:name)).empty?
+    end
+
     def row_count_exceeded?
       rows_count > max_row_count
     end
@@ -449,6 +621,13 @@ class Import < ApplicationRecord
       @parsed_csv = self.class.parse_csv_str(csv_content, col_sep: col_sep)
     end
 
+    # Normalizes a raw CSV numeric string into a plain, parseable decimal string
+    # based on the import's configured +number_format+ (thousands delimiter and
+    # decimal separator). Returns "" when the value is blank, the format is
+    # unknown, or the result is not a valid number.
+    #
+    # @param value [String, nil] the raw cell value from the CSV
+    # @return [String] a normalized number like "1234.56", or "" if invalid
     def sanitize_number(value)
       return "" if value.nil?
 
@@ -460,7 +639,20 @@ class Import < ApplicationRecord
 
       # Handle French/Scandinavian format specially
       if format[:delimiter] == " "
-        sanitized = sanitized.gsub(/\s+/, "") # Remove all spaces first
+        # The thousands "space" can be an ASCII space, a non-breaking space
+        # (U+00A0) or a narrow no-break space (U+202F) depending on the locale
+        # or exporter. Ruby's \s does not match those Unicode spaces, so strip
+        # every kind of whitespace via the Unicode property.
+        sanitized = sanitized.gsub(/\p{Space}/, "")
+
+        # Strip currency symbols/codes only at the leading/trailing edges (e.g.
+        # "€1 234,56" or "1 234,56 kr"). Interior characters are deliberately
+        # left in place so a misconfigured US-style value like "1,234.56" keeps
+        # its period and is rejected by the numeric guard below, rather than
+        # being silently reinterpreted as 1.23456. Digits, the separator, and a
+        # minus sign are preserved so signed values and the guard still work.
+        edge_junk = /\A[^\d#{Regexp.escape(format[:separator])}\-]+|[^\d#{Regexp.escape(format[:separator])}\-]+\z/
+        sanitized = sanitized.gsub(edge_junk, "")
       else
         sanitized = sanitized.gsub(/[^\d#{Regexp.escape(format[:delimiter])}#{Regexp.escape(format[:separator])}\-]/, "")
 
@@ -564,6 +756,25 @@ class Import < ApplicationRecord
       errors.add(:account, "must belong to your family")
     end
 
+    def import_session_belongs_to_family
+      return if import_session.nil?
+      return if import_session.family_id == family_id
+
+      errors.add(:import_session, "must belong to your family")
+    end
+
+    def session_chunk_metadata
+      return if import_session.nil?
+
+      errors.add(:sequence, "must be present for import session chunks") if sequence.blank?
+      errors.add(:checksum, "must be present for import session chunks") if checksum.blank?
+    end
+
+    def session_payloads_are_json_objects
+      errors.add(:summary, "must be an object") unless summary.is_a?(Hash)
+      errors.add(:error_details, "must be an object") unless error_details.is_a?(Hash)
+    end
+
     def rows_to_skip_within_file_bounds
       return if raw_file_str.blank?
       return if rows_to_skip.to_i == 0
diff --git a/app/models/import/preflight.rb b/app/models/import/preflight.rb
index 69051eac3..20199f80b 100644
--- a/app/models/import/preflight.rb
+++ b/app/models/import/preflight.rb
@@ -232,68 +232,21 @@ class Import::Preflight
     end
 
     def sure_import_preflight_payload(content, filename, content_type)
-      line_counts = Hash.new(0)
-      errors = []
-      valid_rows_count = 0
-      nonblank_rows_count = 0
-
-      content.each_line.with_index(1) do |line, line_number|
-        next if line.strip.blank?
-
-        nonblank_rows_count += 1
-        record = JSON.parse(line)
-
-        unless record.is_a?(Hash)
-          errors << {
-            code: "invalid_ndjson_record",
-            message: "Line #{line_number} must be a JSON object."
-          }
-          next
-        end
-
-        if record["type"].blank? || !record.key?("data")
-          errors << {
-            code: "invalid_ndjson_record",
-            message: "Line #{line_number} must include type and data."
-          }
-          next
-        end
-
-        valid_rows_count += 1
-        line_counts[record["type"]] += 1
-      rescue JSON::ParserError => e
-        errors << {
-          code: "invalid_json",
-          message: "Line #{line_number} is not valid JSON: #{e.message}"
-        }
-      end
-
-      if nonblank_rows_count.zero?
-        errors << {
-          code: "no_data_rows",
-          message: "No data rows were found."
-        }
-      end
-
-      entity_counts = SureImport.dry_run_totals_from_line_type_counts(line_counts)
-      unsupported_types = line_counts.keys - SureImport.importable_ndjson_types
-      warnings = []
-      warnings << "No importable records were found." if nonblank_rows_count.positive? && entity_counts.values.sum.zero?
-      warnings << "Some records use unsupported types: #{unsupported_types.join(', ')}" if unsupported_types.any?
-      warnings << "Row count exceeds this import type's publish limit." if nonblank_rows_count > SureImport.max_row_count
+      result = SureImport::Preflight.new(
+        family: family,
+        content: content
+      ).call
+      stats = result.stats
+      warnings = result.warnings.dup
+      warnings << "No importable records were found." if stats[:rows_count].positive? && (stats[:entity_counts] || {}).values.sum.zero?
+      warnings << "Row count exceeds this import type's publish limit." if stats[:rows_count] > SureImport.max_row_count
 
       {
         type: "SureImport",
-        valid: errors.empty?,
+        valid: result.valid?,
         content: content_payload(filename, content_type, content),
-        stats: {
-          rows_count: nonblank_rows_count,
-          valid_rows_count: valid_rows_count,
-          invalid_rows_count: nonblank_rows_count - valid_rows_count,
-          entity_counts: entity_counts,
-          record_type_counts: line_counts
-        },
-        errors: errors,
+        stats: stats,
+        errors: result.errors,
         warnings: warnings
       }
     end
diff --git a/app/models/import_session.rb b/app/models/import_session.rb
new file mode 100644
index 000000000..c6b667781
--- /dev/null
+++ b/app/models/import_session.rb
@@ -0,0 +1,496 @@
+require "digest"
+
+class ImportSession < ApplicationRecord
+  ConflictError = Class.new(StandardError)
+  EnqueueError = Class.new(StandardError)
+
+  IMPORT_TYPES = %w[SureImport].freeze
+  STATUSES = %w[pending importing complete failed].freeze
+
+  belongs_to :family
+  has_many :imports, -> { order(:sequence, :created_at) }, dependent: :destroy
+  has_many :source_mappings,
+           class_name: "ImportSourceMapping",
+           dependent: :destroy
+
+  enum :status, {
+    pending: "pending",
+    importing: "importing",
+    complete: "complete",
+    failed: "failed"
+  }, validate: true, default: "pending"
+
+  validates :import_type, inclusion: { in: IMPORT_TYPES }
+  validates :client_session_id, uniqueness: { scope: :family_id }, allow_blank: true
+  validates :client_session_id, length: { maximum: 255 }, allow_blank: true
+  normalizes :client_session_id, with: ->(value) { value.strip.presence }
+  validates :expected_chunks,
+            numericality: { only_integer: true, greater_than: 0 },
+            allow_nil: true
+  validate :payloads_are_json_objects
+
+  # See Import::STUCK_AFTER — same dead-worker failure mode, same sweep.
+  # A session wedged in importing is otherwise unrecoverable: publish_later
+  # refuses to re-publish while importing. Before failing it, chunks whose
+  # import! committed but never got their complete-status write are
+  # reconciled — otherwise the re-publish would run those chunks again
+  # (process_chunk! only skips complete ones) and double-import their rows.
+  # Failing the session then re-enables re-publish, which resumes safely at
+  # the first genuinely incomplete chunk.
+  def self.clean
+    where(status: :importing)
+      .where("updated_at < ?", Import::STUCK_AFTER.ago)
+      .includes(:family)
+      .find_each do |session|
+        # Read before the lock — see Import.reap_stuck!.
+        family = session.family
+
+        # Row-lock + staleness re-check before mutating, as Sync#perform
+        # does since #2680 — the owning job may have finished in between.
+        session.with_lock do
+          next unless session.importing? && session.updated_at < Import::STUCK_AFTER.ago
+
+          session.reconcile_committed_chunks!
+          session.update!(
+            status: :failed,
+            error_details: {
+              "code" => "import_interrupted",
+              "message" => Import.interrupted_error_message
+            }
+          )
+
+          DebugLogEntry.capture(
+            category: "background_jobs",
+            level: "warn",
+            message: "Reaped ImportSession stuck in importing for over #{Import::STUCK_AFTER.inspect}",
+            source: name,
+            family: family,
+            metadata: { record_type: name, record_id: session.id, previous_status: "importing", new_status: "failed" }
+          )
+        end
+      rescue => e
+        # One bad record must not abort the sweep for the rest.
+        Rails.logger.error("ImportSession.clean failed for #{session.id}: #{e.class}: #{e.message}")
+        Sentry.capture_exception(e) { |scope| scope.set_tags(record_type: name, record_id: session.id) } if defined?(Sentry)
+      end
+  end
+
+  # Chunks caught by a worker kill between import!'s commit and the
+  # complete-status write have their rows attached but still read importing.
+  # Mark them complete so a re-publish skips them instead of importing the
+  # same rows twice (SureImport's split path would duplicate child entries).
+  # The chunk's summary was lost with the job; aggregate_chunk_summaries
+  # tolerates the empty hash.
+  def reconcile_committed_chunks!
+    # Plain each: the association carries a default order (find_each would
+    # log a scoped-order warning) and sessions cap out at a handful of chunks.
+    imports.where(status: :importing).each do |chunk|
+      next unless chunk.data_committed?
+
+      chunk.update!(status: :complete, error: nil, error_details: {})
+
+      DebugLogEntry.capture(
+        category: "background_jobs",
+        level: "warn",
+        message: "Reconciled ImportSession chunk whose data committed before the worker died",
+        source: self.class.name,
+        family: family,
+        metadata: { record_type: chunk.type, record_id: chunk.id, import_session_id: id }
+      )
+    end
+  end
+
+  def self.create_or_find_for!(family:, import_type:, client_session_id:, expected_chunks:)
+    import_type = import_type.presence || "SureImport"
+    expected_chunks = normalize_positive_integer(expected_chunks)
+    unless IMPORT_TYPES.include?(import_type)
+      session = new(import_type: import_type)
+      session.errors.add(:import_type, "must be SureImport")
+      raise ActiveRecord::RecordInvalid.new(session)
+    end
+
+    if client_session_id.present?
+      session = family.import_sessions.find_or_initialize_by(client_session_id: client_session_id)
+      if session.persisted? &&
+         expected_chunks.present? &&
+         session.expected_chunks.present? &&
+         session.expected_chunks != expected_chunks
+        raise ConflictError, "client_session_id already exists with a different expected_chunks value"
+      end
+    else
+      session = family.import_sessions.build
+    end
+
+    session.import_type = import_type
+    session.expected_chunks ||= expected_chunks
+    session.save!
+    session
+  rescue ActiveRecord::RecordNotUnique
+    raise unless client_session_id.present?
+
+    existing = family.import_sessions.find_by(client_session_id: client_session_id)
+    raise unless existing
+
+    if expected_chunks.present? &&
+       existing.expected_chunks.present? &&
+       existing.expected_chunks != expected_chunks
+      raise ConflictError, "client_session_id already exists with a different expected_chunks value"
+    end
+    if expected_chunks.present? && existing.expected_chunks.nil?
+      existing.update!(expected_chunks: expected_chunks)
+    end
+
+    existing
+  end
+
+  def self.normalize_positive_integer(value)
+    return if value.blank?
+
+    Integer(value, exception: false) || 0
+  end
+  private_class_method :normalize_positive_integer
+
+  def attach_chunk!(sequence:, content:, filename:, content_type:, client_chunk_id: nil)
+    sequence = self.class.send(:normalize_positive_integer, sequence)
+    raise ConflictError, "sequence must be a positive integer" unless sequence.positive?
+    raise ConflictError, "sequence exceeds expected_chunks" if expected_chunks.present? && sequence > expected_chunks
+
+    checksum = Digest::SHA256.hexdigest(content)
+    normalized_client_chunk_id = client_chunk_id.presence
+    chunk_needs_finalization = false
+
+    chunk = with_lock do
+      raise ConflictError, "cannot add chunks after publishing starts" unless pending? || failed?
+
+      existing = existing_chunk_for!(
+        sequence: sequence,
+        client_chunk_id: normalized_client_chunk_id,
+        checksum: checksum
+      )
+
+      if existing
+        chunk_needs_finalization = prepare_existing_chunk_for_retry!(
+          existing,
+          checksum: checksum,
+          content: content,
+          filename: filename,
+          content_type: content_type
+        )
+        existing
+      else
+        chunk_needs_finalization = true
+        chunk = create_chunk!(
+          sequence: sequence,
+          client_chunk_id: normalized_client_chunk_id,
+          checksum: checksum,
+          content: content,
+          filename: filename,
+          content_type: content_type
+        )
+      end
+    end
+
+    finalize_chunk_for_retry!(chunk, checksum) if chunk_needs_finalization
+    chunk
+  rescue ActiveRecord::RecordNotUnique
+    imports.reset
+    existing = existing_chunk_for!(
+      sequence: sequence,
+      client_chunk_id: normalized_client_chunk_id,
+      checksum: checksum
+    )
+    return prepare_and_finalize_existing_chunk!(
+      existing,
+      checksum: checksum,
+      content: content,
+      filename: filename,
+      content_type: content_type
+    ) if existing
+
+    raise ConflictError, "chunk already exists with different content"
+  end
+
+  def create_chunk!(sequence:, client_chunk_id:, checksum:, content:, filename:, content_type:)
+    imports.create!(
+      family: family,
+      type: "SureImport",
+      sequence: sequence,
+      client_chunk_id: client_chunk_id,
+      checksum: checksum
+    ).tap do |import|
+      import.ndjson_file.attach(
+        io: StringIO.new(content),
+        filename: filename,
+        content_type: content_type
+      )
+    end
+  end
+  private :create_chunk!
+
+  def publish_later
+    previous_status = nil
+    should_enqueue = false
+
+    sync_chunk_row_counts!
+
+    with_lock do
+      return if complete? || importing?
+
+      validate_publishable_chunks!
+
+      previous_status = status
+      update!(status: :importing, error_details: {})
+      should_enqueue = true
+    end
+
+    return unless should_enqueue
+
+    begin
+      ImportSessionJob.perform_later(self)
+    rescue => error
+      with_lock do
+        reload
+        if importing?
+          update!(status: previous_status, error_details: enqueue_error_details)
+        end
+      end
+      Rails.logger.error("ImportSession enqueue failed import_session_id=#{id} exception=#{error.class}")
+      raise EnqueueError, "Import session could not be queued."
+    end
+  end
+
+  def publish
+    return unless prepare_for_publish!
+
+    Rails.logger.info("ImportSession publish started import_session_id=#{id}")
+
+    imports.ordered_by_sequence.each do |import|
+      process_chunk!(import)
+    end
+
+    update!(status: :complete, summary: aggregate_chunk_summaries, error_details: {})
+    enqueue_family_sync
+    Rails.logger.info("ImportSession publish completed import_session_id=#{id}")
+  rescue => error
+    update!(
+      status: :failed,
+      error_details: error_details_for(error),
+      summary: aggregate_chunk_summaries
+    )
+    Rails.logger.error("ImportSession publish failed import_session_id=#{id} exception=#{error.class}")
+  end
+
+  def aggregate_chunk_summaries
+    imports.reload.each_with_object({}) do |import, totals|
+      merge_summary!(totals, import.summary || {})
+    end
+  end
+
+  private
+    def prepare_for_publish!
+      sync_chunk_row_counts!
+
+      with_lock do
+        return false if complete?
+
+        validate_publishable_chunks!
+
+        update!(status: :importing, error_details: {}) unless importing?
+        true
+      end
+    end
+
+    def enqueue_family_sync
+      family.sync_later
+    rescue => error
+      update!(error_details: sync_enqueue_error_details)
+      Rails.logger.error(
+        "ImportSession family sync enqueue failed import_session_id=#{id} exception=#{error.class}"
+      )
+    end
+
+    def existing_chunk_for!(sequence:, client_chunk_id:, checksum:)
+      sequence_match = imports.find_by(sequence: sequence)
+      client_chunk_match = imports.find_by(client_chunk_id: client_chunk_id) if client_chunk_id.present?
+
+      if sequence_match && client_chunk_match && sequence_match.id != client_chunk_match.id
+        raise ConflictError, "sequence and client_chunk_id refer to different chunks"
+      end
+
+      existing = sequence_match || client_chunk_match
+      return unless existing
+
+      if existing.sequence != sequence
+        raise ConflictError, "client_chunk_id already exists with a different sequence"
+      end
+
+      if client_chunk_id.present? && existing.client_chunk_id.present? && existing.client_chunk_id != client_chunk_id
+        raise ConflictError, "sequence already exists with a different client_chunk_id"
+      end
+
+      raise ConflictError, "chunk already exists with different content" unless existing.checksum == checksum
+
+      existing
+    end
+
+    def prepare_and_finalize_existing_chunk!(chunk, checksum:, content:, filename:, content_type:)
+      needs_finalization = with_lock do
+        prepare_existing_chunk_for_retry!(
+          chunk.reload,
+          checksum: checksum,
+          content: content,
+          filename: filename,
+          content_type: content_type
+        )
+      end
+
+      finalize_chunk_for_retry!(chunk, checksum) if needs_finalization
+      chunk
+    end
+
+    def prepare_existing_chunk_for_retry!(chunk, checksum:, content:, filename:, content_type:)
+      return false if chunk_ready_for_retry?(chunk, checksum)
+      return true if chunk.ndjson_file.attached? && chunk_content_checksum(chunk) == checksum
+
+      chunk.ndjson_file.attach(
+        io: StringIO.new(content),
+        filename: filename,
+        content_type: content_type
+      )
+      true
+    end
+
+    def finalize_chunk_for_retry!(chunk, checksum)
+      chunk.sync_ndjson_rows_count!
+      chunk.reload
+      return chunk if chunk_ready_for_retry?(chunk, checksum)
+
+      raise ConflictError, "chunk already exists but is incomplete"
+    rescue ActiveStorage::FileNotFoundError
+      raise ConflictError, "chunk already exists but is incomplete"
+    end
+
+    def chunk_ready_for_retry?(chunk, checksum)
+      chunk.ndjson_file.attached? &&
+        chunk.rows_count.to_i.positive? &&
+        chunk_content_checksum(chunk) == checksum
+    end
+
+    def chunk_content_checksum(chunk)
+      Digest::SHA256.hexdigest(chunk.ndjson_file.download)
+    rescue ActiveStorage::FileNotFoundError
+      nil
+    end
+
+    def process_chunk!(import)
+      return if import.complete?
+
+      import.update!(status: :importing, error: nil, error_details: {})
+      result = import.import!(import_session: self)
+      import.update!(status: :complete, summary: result.fetch(:summary, {}), error_details: {})
+    rescue => error
+      import.update!(
+        status: :failed,
+        error: public_error_message_for(error),
+        error_details: error_details_for(error),
+        summary: failed_summary_for(error)
+      )
+      raise
+    end
+
+    def row_count_exceeded?
+      imports.sum(:rows_count) > SureImport.max_row_count
+    end
+
+    def validate_publishable_chunks!
+      raise ConflictError, "import session has no chunks" unless imports.exists?
+      raise Import::MaxRowCountExceededError if row_count_exceeded?
+      validate_expected_chunk_sequences!
+    end
+
+    def sync_chunk_row_counts!
+      raise ConflictError, "import session has no chunks" unless imports.exists?
+      imports.reload.each(&:sync_ndjson_rows_count!)
+    rescue ActiveStorage::FileNotFoundError
+      raise ConflictError, "import session chunks are incomplete"
+    end
+
+    def validate_expected_chunk_sequences!
+      return if expected_chunks.blank?
+
+      expected_sequences = (1..expected_chunks).to_a
+      actual_sequences = imports.pluck(:sequence).sort
+      return if actual_sequences == expected_sequences
+
+      missing_sequences = expected_sequences - actual_sequences
+      unexpected_sequences = actual_sequences - expected_sequences
+      details = []
+      details << "missing sequences: #{missing_sequences.join(', ')}" if missing_sequences.any?
+      details << "unexpected sequences: #{unexpected_sequences.join(', ')}" if unexpected_sequences.any?
+
+      raise ConflictError, "import session chunks do not match expected sequences (#{details.join('; ')})"
+    end
+
+    def error_details_for(error)
+      details = {
+        "code" => error.respond_to?(:code) ? error.code : "import_failed",
+        "message" => public_error_message_for(error)
+      }
+
+      if error.respond_to?(:details)
+        details.merge!(error.details.stringify_keys)
+      end
+
+      details
+    end
+
+    def public_error_message_for(error)
+      return error.message if error.respond_to?(:code)
+
+      "Import session failed."
+    end
+
+    def enqueue_error_details
+      {
+        "code" => "import_enqueue_failed",
+        "message" => "Import session could not be queued."
+      }
+    end
+
+    def sync_enqueue_error_details
+      {
+        "code" => "family_sync_enqueue_failed",
+        "message" => "Family sync could not be queued after import completion."
+      }
+    end
+
+    def merge_summary!(totals, summary)
+      summary.each do |entity_type, counts|
+        next unless counts.respond_to?(:each)
+
+        totals[entity_type] ||= {}
+        counts.each do |status, count|
+          totals[entity_type][status] = totals[entity_type].fetch(status, 0) + count.to_i
+        end
+      end
+    end
+
+    def failed_summary_for(error)
+      record_type = error_details_for(error)["record_type"]
+      return {} if record_type.blank?
+
+      {
+        record_type.to_s.underscore.pluralize => {
+          "created" => 0,
+          "updated" => 0,
+          "skipped" => 0,
+          "failed" => 1
+        }
+      }
+    end
+
+    def payloads_are_json_objects
+      errors.add(:summary, "must be an object") unless summary.is_a?(Hash)
+      errors.add(:error_details, "must be an object") unless error_details.is_a?(Hash)
+    end
+end
diff --git a/app/models/import_source_mapping.rb b/app/models/import_source_mapping.rb
new file mode 100644
index 000000000..c59bd8a81
--- /dev/null
+++ b/app/models/import_source_mapping.rb
@@ -0,0 +1,41 @@
+class ImportSourceMapping < ApplicationRecord
+  SOURCE_TYPES = %w[Account Category Tag Merchant RecurringTransaction Transaction Budget Security Rule].freeze
+
+  belongs_to :family
+  belongs_to :import_session
+  belongs_to :target, polymorphic: true, optional: true
+
+  validates :source_type, :source_id, :target_type, :target_id, presence: true
+  validates :source_type, inclusion: { in: SOURCE_TYPES }
+  validates :target_type, inclusion: { in: SOURCE_TYPES }, allow_blank: true
+  validates :source_type, length: { maximum: 64 }
+  validates :source_id, length: { maximum: 255 }
+  validates :source_id, uniqueness: { scope: [ :import_session_id, :source_type ] }
+  normalizes :source_type, :source_id, with: ->(value) { value.strip.presence }
+  validate :family_matches_import_session
+  validate :target_exists
+  validate :target_matches_family
+
+  private
+    def family_matches_import_session
+      return if import_session.blank? || family_id == import_session.family_id
+
+      errors.add(:family, "must match import session")
+    end
+
+    def target_exists
+      return if target_type.blank? || target_id.blank? || !SOURCE_TYPES.include?(target_type)
+      return if target.present?
+
+      errors.add(:target, "must exist")
+    end
+
+    def target_matches_family
+      return if target_type.blank? || !SOURCE_TYPES.include?(target_type)
+      return if target.blank?
+      return unless target.respond_to?(:family_id)
+      return if target.family_id == family_id
+
+      errors.add(:target, "must belong to your family")
+    end
+end
diff --git a/app/models/income_statement.rb b/app/models/income_statement.rb
index dd1cf459a..e81bbf8b0 100644
--- a/app/models/income_statement.rb
+++ b/app/models/income_statement.rb
@@ -107,6 +107,34 @@ class IncomeStatement
     )
   end
 
+  # Income/expense totals for an arbitrary period, optionally scoped to a
+  # subset of accounts (e.g. a dashboard widget's account filter). Unlike
+  # `income_totals`/`expense_totals`, this isn't memoized per-period since
+  # callers (e.g. a monthly bar chart) typically query several distinct
+  # periods and account combinations in one request.
+  def totals_for(period, account_ids: nil)
+    scope = family.transactions.visible.excluding_pending.in_period(period)
+    scope = scope.where(entries: { account_id: account_ids }) if account_ids.present?
+
+    totals(transactions_scope: scope, date_range: period.date_range)
+  end
+
+  # Accounts actually reflected in totals/totals_for: visible, not excluded
+  # from reports, not tax-advantaged, and (when scoped to a user) included in
+  # that user's finances. Callers offering an account filter (e.g. a
+  # dashboard widget) should build their options from this, not a broader
+  # "accessible accounts" list, or selecting an ineligible account silently
+  # computes to zero instead of the totals it actually appears in elsewhere.
+  def eligible_accounts
+    @eligible_accounts ||= begin
+      scope = family.accounts.visible.included_in_reports
+      tax_advantaged_ids = family.tax_advantaged_account_ids
+      scope = scope.where.not(id: tax_advantaged_ids) if tax_advantaged_ids.present?
+      scope = scope.merge(Account.included_in_finances_for(user)) if user
+      scope
+    end
+  end
+
   def median_expense(interval: "month", category: nil)
     if category.present?
       category_stats(interval: interval).find { |stat| stat.classification == "expense" && stat.category_id == category.id }&.median || 0
@@ -134,7 +162,8 @@ class IncomeStatement
     NetCategoryTotals = Data.define(:net_expense_categories, :net_income_categories, :total_net_expense, :total_net_income, :currency)
 
     def categories
-      @categories ||= family.categories.all.to_a
+      # Keep Category#subcategory?'s parent-based orphan semantics without lazy loads.
+      @categories ||= family.categories.includes(:parent).to_a
     end
 
     def period_cache_key(period)
@@ -143,7 +172,7 @@ class IncomeStatement
 
     def build_period_total(classification:, period:)
       # Exclude pending transactions from budget calculations
-      totals = totals_query(transactions_scope: family.transactions.visible.excluding_pending.in_period(period), date_range: period.date_range).select { |t| t.classification == classification }
+      totals = totals_for_period(period).select { |t| t.classification == classification }
       classification_total = totals.sum(&:total)
 
       uncategorized_category = family.categories.uncategorized
@@ -186,6 +215,15 @@ class IncomeStatement
       )
     end
 
+    def totals_for_period(period)
+      @totals_for_period ||= {}
+      @totals_for_period[period_cache_key(period)] ||=
+        totals_query(
+          transactions_scope: family.transactions.visible.excluding_pending.in_period(period),
+          date_range: period.date_range
+        )
+    end
+
     def family_stats(interval: "month")
       @family_stats ||= {}
       @family_stats[interval] ||= Rails.cache.fetch([
@@ -212,7 +250,7 @@ class IncomeStatement
       sql_hash = Digest::MD5.hexdigest(transactions_scope.to_sql)
 
       Rails.cache.fetch([
-        "income_statement", "totals_query", "v2", family.id, user&.id, included_account_ids_hash, sql_hash, date_range.begin, date_range.end, family.entries_cache_version
+        "income_statement", "totals_query", "v2", family.id, user&.id, included_account_ids_hash, sql_hash, date_range.begin, date_range.end, family.entries_cache_version, family.accounts.maximum(:updated_at)&.to_i
       ]) { Totals.new(family, transactions_scope: transactions_scope, date_range: date_range, included_account_ids: included_account_ids).call }
     end
 
diff --git a/app/models/income_statement/category_stats.rb b/app/models/income_statement/category_stats.rb
index 4dc40af05..878934d44 100644
--- a/app/models/income_statement/category_stats.rb
+++ b/app/models/income_statement/category_stats.rb
@@ -80,6 +80,7 @@ class IncomeStatement::CategoryStats
           WHERE a.family_id = :family_id
             AND t.kind NOT IN (#{budget_excluded_kinds_sql})
             AND ae.excluded = false
+            AND a.exclude_from_reports = false
             #{pending_providers_sql}
             #{exclude_tax_advantaged_sql}
             #{scope_to_account_ids_sql}
diff --git a/app/models/income_statement/family_stats.rb b/app/models/income_statement/family_stats.rb
index c3925025f..bc4db4a9b 100644
--- a/app/models/income_statement/family_stats.rb
+++ b/app/models/income_statement/family_stats.rb
@@ -77,6 +77,7 @@ class IncomeStatement::FamilyStats
           WHERE a.family_id = :family_id
             AND t.kind NOT IN (#{budget_excluded_kinds_sql})
             AND ae.excluded = false
+            AND a.exclude_from_reports = false
             #{pending_providers_sql}
             #{exclude_tax_advantaged_sql}
             #{scope_to_account_ids_sql}
diff --git a/app/models/income_statement/totals.rb b/app/models/income_statement/totals.rb
index 81920038f..c3facaae0 100644
--- a/app/models/income_statement/totals.rb
+++ b/app/models/income_statement/totals.rb
@@ -77,6 +77,7 @@ class IncomeStatement::Totals
           AND ae.excluded = false
           AND a.family_id = :family_id
           AND a.status IN ('draft', 'active')
+          AND a.exclude_from_reports = false
           #{exclude_tax_advantaged_sql}
           #{include_finance_accounts_sql}
         GROUP BY c.id, c.parent_id, CASE WHEN at.kind IN ('investment_contribution', 'loan_payment') THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END;
@@ -109,6 +110,7 @@ class IncomeStatement::Totals
           AND ae.excluded = false
           AND a.family_id = :family_id
           AND a.status IN ('draft', 'active')
+          AND a.exclude_from_reports = false
           #{exclude_tax_advantaged_sql}
           #{include_finance_accounts_sql}
         GROUP BY c.id, c.parent_id, CASE WHEN at.kind IN ('investment_contribution', 'loan_payment') THEN 'expense' WHEN ae.amount < 0 THEN 'income' ELSE 'expense' END
diff --git a/app/models/indexa_capital_account/activities_processor.rb b/app/models/indexa_capital_account/activities_processor.rb
index 0a4331bc4..082467fc2 100644
--- a/app/models/indexa_capital_account/activities_processor.rb
+++ b/app/models/indexa_capital_account/activities_processor.rb
@@ -131,9 +131,9 @@ class IndexaCapitalAccount::ActivitiesProcessor
 
       # Get the activity date
       # TODO: Customize date field names
-      activity_date = parse_date(data[:settlement_date]) ||
-                      parse_date(data[:trade_date]) ||
-                      parse_date(data[:date]) ||
+      activity_date = parse_date(data[:settlement_date], family: account&.family) ||
+                      parse_date(data[:trade_date], family: account&.family) ||
+                      parse_date(data[:date], family: account&.family) ||
                       Date.current
 
       currency = extract_currency(data, fallback: account.currency)
@@ -165,9 +165,9 @@ class IndexaCapitalAccount::ActivitiesProcessor
 
       # Get the activity date
       # TODO: Customize date field names
-      activity_date = parse_date(data[:settlement_date]) ||
-                      parse_date(data[:trade_date]) ||
-                      parse_date(data[:date]) ||
+      activity_date = parse_date(data[:settlement_date], family: account&.family) ||
+                      parse_date(data[:trade_date], family: account&.family) ||
+                      parse_date(data[:date], family: account&.family) ||
                       Date.current
 
       # Build description
@@ -196,9 +196,9 @@ class IndexaCapitalAccount::ActivitiesProcessor
     def normalize_cash_amount(amount, activity_type)
       case activity_type
       when "WITHDRAWAL", "TRANSFER_OUT", "FEE", "TAX"
-        -amount.abs  # These should be negative (money out)
+        amount.abs   # Money out should be positive in Sure
       when "CONTRIBUTION", "TRANSFER_IN", "DIVIDEND", "DIV", "INTEREST"
-        amount.abs   # These should be positive (money in)
+        -amount.abs  # Money in should be negative in Sure
       else
         amount
       end
diff --git a/app/models/indexa_capital_account/data_helpers.rb b/app/models/indexa_capital_account/data_helpers.rb
index db9283788..943d2bfe4 100644
--- a/app/models/indexa_capital_account/data_helpers.rb
+++ b/app/models/indexa_capital_account/data_helpers.rb
@@ -58,17 +58,22 @@ module IndexaCapitalAccount::DataHelpers
       hash[:identifier] || hash[:isin_code] || hash[:isin] || hash[:symbol] || hash[:ticker]
     end
 
-    def parse_date(date_value)
+    def parse_date(date_value, family: nil)
       return nil if date_value.nil?
 
+      tz = family&.timezone
+
       case date_value
+      when String
+        if tz && (date_value.include?("T") || date_value.include?(":"))
+          Time.parse(date_value).in_time_zone(tz).to_date
+        else
+          Date.parse(date_value)
+        end
+      when Time, DateTime, ActiveSupport::TimeWithZone
+        date_value.in_time_zone(tz).to_date
       when Date
         date_value
-      when String
-        # Use Time.zone.parse for external timestamps (Rails timezone guidelines)
-        Time.zone.parse(date_value)&.to_date
-      when Time, DateTime, ActiveSupport::TimeWithZone
-        date_value.to_date
       else
         nil
       end
diff --git a/app/models/insight.rb b/app/models/insight.rb
new file mode 100644
index 000000000..02d562c4d
--- /dev/null
+++ b/app/models/insight.rb
@@ -0,0 +1,54 @@
+# A proactive, typed observation about a family's finances, produced nightly
+# by GenerateInsightsJob. The financial logic lives in Insight::Generators::*;
+# the LLM (when configured) only writes the `body` prose from pre-computed
+# numbers, so rows are safe to render verbatim.
+#
+# Status semantics: `read` and `dismissed` are user actions; `expired` is the
+# system's — set when a signal stops being generated (the condition cleared).
+# A returning condition reactivates an expired row but never a dismissed one.
+class Insight < ApplicationRecord
+  belongs_to :family
+
+  TYPES = %w[
+    spending_anomaly
+    cash_flow_warning
+    net_worth_milestone
+    subscription_audit
+    savings_rate_change
+    idle_cash
+    budget_at_risk
+    budget_on_track
+  ].freeze
+
+  enum :status, { active: "active", read: "read", dismissed: "dismissed", expired: "expired" }
+  enum :priority, { high: "high", medium: "medium", low: "low" }, prefix: true
+
+  validates :insight_type, presence: true, inclusion: { in: TYPES }
+  validates :title, :body, :dedup_key, presence: true
+  # Mirrors the DB unique index so direct callers get a validation error
+  # instead of ActiveRecord::RecordNotUnique; races still hit the index.
+  validates :dedup_key, uniqueness: { scope: :family_id }
+
+  # Everything the user hasn't dismissed; what the feed renders.
+  scope :visible, -> { where(status: [ :active, :read ]) }
+  scope :ordered, -> {
+    order(Arel.sql("CASE insights.priority WHEN 'high' THEN 0 WHEN 'medium' THEN 1 ELSE 2 END"))
+      .order(generated_at: :desc)
+  }
+
+  def mark_read!
+    return unless active?
+
+    update!(status: :read, read_at: Time.current)
+  end
+
+  def dismiss!
+    update!(status: :dismissed, dismissed_at: Time.current)
+  end
+
+  # Undoes a dismissal without re-badging the insight as new — the user has
+  # obviously seen it, so it returns as read.
+  def undismiss!
+    update!(status: :read, dismissed_at: nil, read_at: read_at || Time.current)
+  end
+end
diff --git a/app/models/insight/body_writer.rb b/app/models/insight/body_writer.rb
new file mode 100644
index 000000000..76587af4b
--- /dev/null
+++ b/app/models/insight/body_writer.rb
@@ -0,0 +1,75 @@
+# Writes the user-facing prose for a GeneratedInsight. The LLM acts as a
+# writer, not a reasoner: it receives pre-computed facts and may only phrase
+# them. When no LLM provider is configured (common on self-hosted installs),
+# nobody in the family has opted into AI, or the call fails, the i18n template
+# interpolated with the same facts is used instead, so insight generation
+# never depends on an external service.
+class Insight::BodyWriter
+  SYSTEM_PROMPT = <<~PROMPT.freeze
+    You write short insights for a personal finance app.
+    Rules:
+    - Write 1-2 plain sentences addressed to the user as "you".
+    - Use only the facts provided. Never invent numbers, dates, or projections.
+    - Repeat monetary amounts exactly as formatted in the facts.
+    - No financial advice, no jargon, no emoji, no exclamation marks, no lists or headers.
+    - Respond with the sentences only.
+  PROMPT
+
+  def initialize(family)
+    @family = family
+  end
+
+  def write(generated_insight)
+    llm_body(generated_insight) || template_body(generated_insight)
+  end
+
+  private
+    attr_reader :family
+
+    def template_body(generated_insight)
+      I18n.t(
+        "insights.templates.#{generated_insight.template_key}",
+        **generated_insight.facts.symbolize_keys
+      )
+    end
+
+    def llm_body(generated_insight)
+      return nil unless provider
+
+      prompt = <<~PROMPT
+        Insight type: #{generated_insight.insight_type.humanize}
+        Facts: #{generated_insight.facts.to_json}
+      PROMPT
+
+      response = provider.chat_response(
+        prompt,
+        model: provider.class.effective_model,
+        instructions: SYSTEM_PROMPT,
+        family: family
+      )
+      return nil unless response.success?
+
+      response.data.messages.filter_map(&:output_text).join(" ").strip.presence
+    rescue => e
+      DebugLogEntry.capture(
+        category: "insights",
+        level: "warn",
+        message: "Insight::BodyWriter narration failed: #{e.class}: #{e.message}",
+        source: "Insight::BodyWriter",
+        family: family,
+        metadata: { insight_type: generated_insight.insight_type }
+      )
+      nil
+    end
+
+    # This job runs unprompted for every family, so unlike chat (where the user
+    # initiates each call) LLM narration is gated on someone in the family
+    # having AI enabled — consent to share financial data with the provider,
+    # and a cost cap in managed mode. Everyone else gets the template body.
+    def provider
+      return @provider if defined?(@provider)
+      return @provider = nil unless family.users.any?(&:ai_enabled?)
+
+      @provider = Provider::Registry.preferred_llm_provider
+    end
+end
diff --git a/app/models/insight/generator.rb b/app/models/insight/generator.rb
new file mode 100644
index 000000000..d426f434b
--- /dev/null
+++ b/app/models/insight/generator.rb
@@ -0,0 +1,93 @@
+# Base class for insight generators. Subclasses compute a financial signal in
+# pure Ruby and return GeneratedInsight records — numbers only, no prose. The
+# prose (`body`) is written later by Insight::BodyWriter, and only when the
+# insight is new or its numbers changed, so nightly re-runs don't re-invoke
+# the LLM for unchanged insights.
+class Insight::Generator
+  # `facts` doubles as the i18n interpolation args for the template fallback
+  # and as the grounding data handed to the LLM writer. `metadata` is what the
+  # job compares between runs to decide whether an insight changed — keep its
+  # values JSON-primitive (floats, strings, ISO dates) so comparisons are stable.
+  GeneratedInsight = Data.define(
+    :insight_type,
+    :priority,
+    :title,
+    :template_key,
+    :facts,
+    :metadata,
+    :currency,
+    :period_start,
+    :period_end,
+    :dedup_key
+  )
+
+  class << self
+    # Declares the insight_type values this generator can emit. The job uses
+    # this to expire stale insights: a visible insight whose type belongs to a
+    # generator that ran successfully, but whose dedup_key was not regenerated,
+    # has had its condition clear.
+    def produces(*types)
+      @produced_types = types.flatten.map(&:to_s)
+    end
+
+    def produced_types
+      @produced_types || []
+    end
+  end
+
+  def initialize(family)
+    @family = family
+  end
+
+  def generate
+    raise NotImplementedError
+  end
+
+  private
+    attr_reader :family
+
+    def income_statement
+      @income_statement ||= IncomeStatement.new(family)
+    end
+
+    def balance_sheet
+      @balance_sheet ||= BalanceSheet.new(family)
+    end
+
+    def build_insight(insight_type:, priority:, title:, template_key:, facts:, dedup_key:, metadata:, period: nil)
+      GeneratedInsight.new(
+        insight_type: insight_type,
+        priority: priority,
+        title: title,
+        template_key: template_key,
+        facts: facts,
+        metadata: metadata,
+        currency: family.currency,
+        period_start: period&.start_date,
+        period_end: period&.end_date,
+        dedup_key: dedup_key
+      )
+    end
+
+    def format_money(amount)
+      Money.new(amount, family.currency).format
+    end
+
+    # Normalizes BigDecimal/Rational math results so metadata survives a jsonb
+    # round-trip unchanged (BigDecimal#as_json is a string, which would make
+    # every nightly run look like a material change).
+    def round(amount, precision = 2)
+      amount.to_f.round(precision)
+    end
+
+    def month_token(date = Date.current)
+      date.strftime("%Y-%m")
+    end
+
+    # Formats a number for display facts with a true minus sign (U+2212) —
+    # the app types negatives with a minus, not a hyphen. Keep raw numerics
+    # in `metadata`; this is for interpolation into template/LLM prose only.
+    def signed_number(value)
+      value.negative? ? "−#{value.abs}" : value.to_s
+    end
+end
diff --git a/app/models/insight/generator_registry.rb b/app/models/insight/generator_registry.rb
new file mode 100644
index 000000000..3fb928792
--- /dev/null
+++ b/app/models/insight/generator_registry.rb
@@ -0,0 +1,46 @@
+# Runs every insight generator for a family. A failing generator is logged to
+# the super-admin debug UI and skipped, so one bad signal never blocks the rest
+# of the nightly run. The result records which insight types were produced by
+# generators that ran to completion — the job only expires stale insights of
+# those types, so a crashing generator can never wipe out its healthy insights.
+class Insight::GeneratorRegistry
+  GENERATORS = [
+    Insight::Generators::SpendingAnomalyGenerator,
+    Insight::Generators::CashFlowWarningGenerator,
+    Insight::Generators::NetWorthMilestoneGenerator,
+    Insight::Generators::SubscriptionAuditGenerator,
+    Insight::Generators::SavingsRateChangeGenerator,
+    Insight::Generators::IdleCashGenerator,
+    Insight::Generators::BudgetInsightGenerator
+  ].freeze
+
+  Result = Data.define(:insights, :succeeded_types)
+
+  def initialize(family)
+    @family = family
+  end
+
+  def generate_all
+    insights = []
+    succeeded_types = []
+
+    GENERATORS.each do |generator_class|
+      insights.concat(generator_class.new(family).generate)
+      succeeded_types.concat(generator_class.produced_types)
+    rescue => e
+      DebugLogEntry.capture(
+        category: "insights",
+        level: "error",
+        message: "#{generator_class.name} failed: #{e.class}: #{e.message}",
+        source: "Insight::GeneratorRegistry",
+        family: family,
+        metadata: { generator: generator_class.name, backtrace: e.backtrace&.first(5) }
+      )
+    end
+
+    Result.new(insights: insights, succeeded_types: succeeded_types)
+  end
+
+  private
+    attr_reader :family
+end
diff --git a/app/models/insight/generators/budget_insight_generator.rb b/app/models/insight/generators/budget_insight_generator.rb
new file mode 100644
index 000000000..9e2b173f5
--- /dev/null
+++ b/app/models/insight/generators/budget_insight_generator.rb
@@ -0,0 +1,92 @@
+# Reads the family's current budget (if they've set one up) and produces
+# either a warning — categories over or near their limit — or, once the month
+# is at least half over, a quiet positive signal that everything is on track.
+# Reuses BudgetCategory's own health checks rather than re-deriving pace math.
+class Insight::Generators::BudgetInsightGenerator < Insight::Generator
+  produces "budget_at_risk", "budget_on_track"
+
+  NEAR_LIMIT_MIN_ELAPSED = 0.0 # near-limit/over warnings fire any time
+  ON_TRACK_MIN_ELAPSED = 0.5   # positive signal only once the month is half over
+  MAX_LISTED_CATEGORIES = 3
+
+  def generate
+    budget = current_budget
+    return [] unless budget&.initialized?
+
+    parent_categories = budget.budget_categories.reject(&:subcategory?)
+    over = parent_categories.select(&:over_budget_with_budget?)
+    near = parent_categories.select { |bc| bc.budgeted? && bc.near_limit? }
+
+    if over.any? || near.any?
+      [ at_risk_insight(budget, over, near) ]
+    elsif on_track_eligible?(budget, parent_categories)
+      [ on_track_insight(budget) ]
+    else
+      []
+    end
+  end
+
+  private
+    def current_budget
+      family.budgets
+        .includes(budget_categories: :category)
+        .where("start_date <= ? AND end_date >= ?", Date.current, Date.current)
+        .first
+    end
+
+    def at_risk_insight(budget, over, near)
+      flagged = over + near
+      category_names = flagged.first(MAX_LISTED_CATEGORIES).map { |bc| bc.category.name }
+
+      build_insight(
+        insight_type: "budget_at_risk",
+        priority: over.any? ? "high" : "medium",
+        title: I18n.t("insights.titles.budget_at_risk", count: flagged.size),
+        template_key: over.any? ? "budget_at_risk.over" : "budget_at_risk.near",
+        facts: {
+          categories: category_names.to_sentence,
+          count: flagged.size,
+          budget_spent_pct: round(budget.percent_of_budget_spent, 0).to_i
+        },
+        # The percent bucket keeps the body fresh as overall usage moves (a
+        # >=10-point swing rewrites it) without nightly one-point churn.
+        metadata: {
+          over_category_ids: over.map { |bc| bc.category.id }.sort,
+          near_category_ids: near.map { |bc| bc.category.id }.sort,
+          budget_spent_pct_bucket: (round(budget.percent_of_budget_spent, 0).to_i / 10) * 10
+        },
+        period: budget.period,
+        dedup_key: "budget_at_risk:#{month_token(budget.start_date)}"
+      )
+    end
+
+    def on_track_insight(budget)
+      build_insight(
+        insight_type: "budget_on_track",
+        priority: "low",
+        title: I18n.t("insights.titles.budget_on_track"),
+        template_key: "budget_on_track",
+        facts: {
+          spent: format_money(budget.actual_spending),
+          budgeted: format_money(budget.budgeted_spending),
+          budget_spent_pct: round(budget.percent_of_budget_spent, 0).to_i
+        },
+        # Bucketed to damp nightly churn: a one-point move shouldn't count as
+        # a material change that rewrites the body or reactivates a dismissal.
+        metadata: {
+          budget_spent_pct_bucket: (round(budget.percent_of_budget_spent, 0).to_i / 10) * 10
+        },
+        period: budget.period,
+        dedup_key: "budget_on_track:#{month_token(budget.start_date)}"
+      )
+    end
+
+    def on_track_eligible?(budget, parent_categories)
+      return false unless parent_categories.any?(&:budgeted?)
+
+      total_days = (budget.end_date - budget.start_date).to_i + 1
+      elapsed_days = (Date.current - budget.start_date).to_i + 1
+
+      elapsed_days.to_f / total_days >= ON_TRACK_MIN_ELAPSED
+    end
+end
diff --git a/app/models/insight/generators/cash_flow_warning_generator.rb b/app/models/insight/generators/cash_flow_warning_generator.rb
new file mode 100644
index 000000000..36ed14bf2
--- /dev/null
+++ b/app/models/insight/generators/cash_flow_warning_generator.rb
@@ -0,0 +1,88 @@
+# Projects the family's combined cash (Depository) balance forward 30 days by
+# layering known recurring transactions on top of a statistical daily-spend
+# baseline, and warns when the projected balance dips below the threshold.
+class Insight::Generators::CashFlowWarningGenerator < Insight::Generator
+  produces "cash_flow_warning"
+
+  # Known limitation: family-currency units, tuned for dollar/euro-scale
+  # currencies (¥500 ≈ $3 would make this threshold meaninglessly low).
+  LOW_BALANCE_THRESHOLD = 500
+  HORIZON_DAYS = 30
+
+  def generate
+    accounts = cash_accounts
+    return [] if accounts.empty?
+
+    starting_balance = accounts.sum(:balance).to_d
+    entries = upcoming_recurring_entries
+    recurring_by_date = entries.group_by(&:date)
+
+    # The recurring bills are part of the monthly median too — subtract them so
+    # they aren't counted twice when we spread the remainder across the horizon.
+    median_monthly_expense = income_statement.median_expense(interval: "month").to_d
+    return [] if median_monthly_expense <= 0 && entries.empty?
+
+    recurring_expense_total = entries.sum { |e| [ e.amount.to_d, 0.to_d ].max }
+    other_daily_spend = [ median_monthly_expense - recurring_expense_total, 0.to_d ].max / HORIZON_DAYS
+
+    balance = starting_balance
+    low_point = starting_balance
+    low_date = Date.current
+
+    (1..HORIZON_DAYS).each do |offset|
+      date = Date.current + offset
+      balance -= other_daily_spend
+      recurring_by_date.fetch(date, []).each { |e| balance -= e.amount.to_d }
+
+      if balance < low_point
+        low_point = balance
+        low_date = date
+      end
+    end
+
+    return [] if low_point >= LOW_BALANCE_THRESHOLD
+
+    template_key = low_point.negative? ? "cash_flow_warning.negative" : "cash_flow_warning.low"
+
+    [
+      build_insight(
+        insight_type: "cash_flow_warning",
+        priority: low_point.negative? ? "high" : "medium",
+        title: I18n.t("insights.titles.#{template_key}"),
+        template_key: template_key,
+        facts: {
+          projected_low: format_money(low_point),
+          projected_low_date: I18n.l(low_date),
+          current_balance: format_money(starting_balance),
+          horizon_days: HORIZON_DAYS
+        },
+        # Balances and projected dates drift with nearly every transaction, so
+        # exact values here would read as a material change nightly — rewriting
+        # the body and resurrecting dismissals. Only severity and a coarse
+        # bucket of the low point are material; display values live in `facts`.
+        metadata: {
+          negative: low_point.negative?,
+          projected_low_bucket: (round(low_point, 0).to_i / 250) * 250
+        },
+        period: Period.custom(start_date: Date.current, end_date: Date.current + HORIZON_DAYS),
+        dedup_key: "cash_flow_warning:#{month_token}"
+      )
+    ]
+  end
+
+  private
+    def cash_accounts
+      family.accounts.visible.where(accountable_type: "Depository", currency: family.currency)
+    end
+
+    # Projected occurrences of known recurring transactions within the horizon.
+    # Transfers are internal moves, and cross-currency amounts can't be applied
+    # to a family-currency balance without a rate lookup, so both are skipped.
+    def upcoming_recurring_entries
+      family.recurring_transactions
+        .expected_soon
+        .where(destination_account_id: nil)
+        .filter_map(&:projected_entry)
+        .select { |e| e.currency == family.currency && e.date <= Date.current + HORIZON_DAYS }
+    end
+end
diff --git a/app/models/insight/generators/idle_cash_generator.rb b/app/models/insight/generators/idle_cash_generator.rb
new file mode 100644
index 000000000..651e6b5bb
--- /dev/null
+++ b/app/models/insight/generators/idle_cash_generator.rb
@@ -0,0 +1,44 @@
+# Points out sizable cash balances that have sat untouched for a while. Low
+# priority by design — it's a nudge, not a warning. The dedup key rotates
+# monthly so a dismissed nudge stays gone for the rest of the month.
+class Insight::Generators::IdleCashGenerator < Insight::Generator
+  produces "idle_cash"
+
+  # Known limitation: family-currency units, tuned for dollar/euro-scale
+  # currencies (¥5,000 ≈ $33 would make this fire on trivial balances).
+  MIN_BALANCE = 5_000
+  IDLE_DAYS = 60
+  MAX_INSIGHTS = 2
+
+  def generate
+    idle_accounts.first(MAX_INSIGHTS).map do |account|
+      build_insight(
+        insight_type: "idle_cash",
+        priority: "low",
+        title: I18n.t("insights.titles.idle_cash", account: account.name),
+        template_key: "idle_cash",
+        facts: {
+          account: account.name,
+          balance: format_money(account.balance),
+          idle_days: IDLE_DAYS
+        },
+        metadata: {
+          account_id: account.id,
+          balance: round(account.balance, 0)
+        },
+        dedup_key: "idle_cash:#{account.id}:#{month_token}"
+      )
+    end
+  end
+
+  private
+    # Ordered so the pick is stable between runs — an unordered relation could
+    # nudge a different pair of accounts each night, churning the feed.
+    def idle_accounts
+      family.accounts.visible
+        .where(accountable_type: "Depository", currency: family.currency)
+        .where("balance >= ?", MIN_BALANCE)
+        .where.not(id: Entry.where("date >= ?", IDLE_DAYS.days.ago.to_date).select(:account_id))
+        .order(balance: :desc)
+    end
+end
diff --git a/app/models/insight/generators/net_worth_milestone_generator.rb b/app/models/insight/generators/net_worth_milestone_generator.rb
new file mode 100644
index 000000000..5ba4bf363
--- /dev/null
+++ b/app/models/insight/generators/net_worth_milestone_generator.rb
@@ -0,0 +1,58 @@
+# Celebrates the family's net worth crossing a round-number milestone within
+# the last 30 days. The dedup key is the milestone amount itself, so a
+# milestone row is reused for life: a dismissal is permanent, and only a
+# dip-below-and-recross within a 30-day window can resurface an expired one.
+class Insight::Generators::NetWorthMilestoneGenerator < Insight::Generator
+  produces "net_worth_milestone"
+
+  # Known limitation: milestones are family-currency units, tuned for
+  # dollar/euro-scale currencies. In JPY-scale currencies the lower rungs are
+  # trivially small ($10k ≈ ¥1.5M would be the right first rung, not ¥10k).
+  MILESTONES = [
+    10_000, 25_000, 50_000, 100_000, 250_000,
+    500_000, 1_000_000, 2_500_000, 5_000_000, 10_000_000
+  ].freeze
+
+  def generate
+    series = balance_sheet.net_worth_series(period: Period.last_30_days)
+    values = series.values
+    return [] if values.size < 2
+
+    current = money_amount(values.last.value)
+    previous = money_amount(values.first.value)
+    return [] if current <= previous
+
+    milestone = MILESTONES.select { |m| previous < m && current >= m }.max
+    return [] unless milestone
+
+    [
+      build_insight(
+        insight_type: "net_worth_milestone",
+        priority: "high",
+        title: I18n.t("insights.titles.net_worth_milestone", milestone: format_whole_money(milestone)),
+        template_key: "net_worth_milestone",
+        facts: {
+          milestone: format_whole_money(milestone),
+          net_worth: format_money(current)
+        },
+        # The milestone alone is the signal. Net worth itself drifts daily for
+        # the ~30 days the crossing stays in the series window — storing it
+        # here would rewrite the body and resurrect dismissals every night.
+        metadata: {
+          milestone: milestone
+        },
+        period: Period.last_30_days,
+        dedup_key: "net_worth_milestone:#{milestone}"
+      )
+    ]
+  end
+
+  private
+    def money_amount(value)
+      (value.respond_to?(:amount) ? value.amount : value).to_d
+    end
+
+    def format_whole_money(amount)
+      Money.new(amount, family.currency).format(precision: 0)
+    end
+end
diff --git a/app/models/insight/generators/savings_rate_change_generator.rb b/app/models/insight/generators/savings_rate_change_generator.rb
new file mode 100644
index 000000000..11f606c9c
--- /dev/null
+++ b/app/models/insight/generators/savings_rate_change_generator.rb
@@ -0,0 +1,63 @@
+# Compares the savings rate of the last two complete months. The current
+# (partial) month is skipped on purpose — income usually lands early or late
+# in a month, which makes mid-month rates meaningless.
+class Insight::Generators::SavingsRateChangeGenerator < Insight::Generator
+  produces "savings_rate_change"
+
+  THRESHOLD_PP = 5
+  HIGH_PRIORITY_PP = 10
+
+  def generate
+    last_month = Period.last_month_for(family)
+    prior_start = last_month.start_date - 1.month
+    prior_month = Period.custom(start_date: prior_start, end_date: last_month.start_date - 1.day)
+
+    current_rate = savings_rate(last_month)
+    previous_rate = savings_rate(prior_month)
+    return [] unless current_rate && previous_rate
+
+    delta = current_rate - previous_rate
+    return [] if delta.abs < THRESHOLD_PP
+
+    direction = delta.positive? ? "up" : "down"
+    month_name = I18n.l(last_month.start_date, format: "%B")
+
+    # "You saved -5.4% of your income" is machine-speak; a negative rate means
+    # the family spent more than it earned, and the copy should say so.
+    template_key = if direction == "down" && current_rate.negative?
+      "savings_rate_change.down_negative"
+    else
+      "savings_rate_change.#{direction}"
+    end
+
+    [
+      build_insight(
+        insight_type: "savings_rate_change",
+        priority: delta.abs >= HIGH_PRIORITY_PP ? "high" : "medium",
+        title: I18n.t("insights.titles.savings_rate_change.#{direction}", month: month_name),
+        template_key: template_key,
+        facts: {
+          month: month_name,
+          current_rate: signed_number(round(current_rate, 1)),
+          previous_rate: signed_number(round(previous_rate, 1)),
+          change_pp: round(delta.abs, 1)
+        },
+        metadata: {
+          current_rate: round(current_rate, 1),
+          previous_rate: round(previous_rate, 1)
+        },
+        period: last_month,
+        dedup_key: "savings_rate_change:#{month_token(last_month.start_date)}"
+      )
+    ]
+  end
+
+  private
+    def savings_rate(period)
+      income = income_statement.income_totals(period: period).total.to_d
+      return nil if income <= 0
+
+      expense = income_statement.expense_totals(period: period).total.to_d
+      (income - expense) / income * 100
+    end
+end
diff --git a/app/models/insight/generators/spending_anomaly_generator.rb b/app/models/insight/generators/spending_anomaly_generator.rb
new file mode 100644
index 000000000..4c739baad
--- /dev/null
+++ b/app/models/insight/generators/spending_anomaly_generator.rb
@@ -0,0 +1,97 @@
+# Flags parent categories whose current-month spending pace deviates from
+# their average over the previous three full months.
+class Insight::Generators::SpendingAnomalyGenerator < Insight::Generator
+  produces "spending_anomaly"
+
+  MIN_BASELINE = 50           # ignore categories with a negligible baseline
+  MIN_ELAPSED_DAYS = 7        # too early in the month = too noisy to project
+  DEVIATION_THRESHOLD_PCT = 25
+  HIGH_PRIORITY_PCT = 50
+  BASELINE_MONTHS = 3
+  MAX_INSIGHTS = 3
+
+  def generate
+    period = Period.current_month_for(family)
+    elapsed_days = (Date.current - period.start_date).to_i + 1
+    return [] if elapsed_days < MIN_ELAPSED_DAYS
+
+    current = category_spend(period)
+    return [] if current.empty?
+
+    baseline = baseline_spend(period)
+    pace_factor = period.days.to_f / elapsed_days
+
+    anomalies = current.filter_map do |category_id, data|
+      baseline_amount = baseline[category_id]
+      next unless baseline_amount && baseline_amount >= MIN_BASELINE
+
+      projected = data[:total] * pace_factor
+      deviation_pct = (projected - baseline_amount) / baseline_amount * 100
+      next if deviation_pct.abs < DEVIATION_THRESHOLD_PCT
+
+      { category_id: category_id, name: data[:name], projected: projected,
+        baseline: baseline_amount, deviation_pct: deviation_pct }
+    end
+
+    anomalies
+      .sort_by { |a| -a[:deviation_pct].abs }
+      .first(MAX_INSIGHTS)
+      .map { |anomaly| anomaly_insight(anomaly, period) }
+  end
+
+  private
+    def anomaly_insight(anomaly, period)
+      direction = anomaly[:deviation_pct].positive? ? "above" : "below"
+
+      build_insight(
+        insight_type: "spending_anomaly",
+        priority: anomaly[:deviation_pct].abs >= HIGH_PRIORITY_PCT ? "high" : "medium",
+        title: I18n.t("insights.titles.spending_anomaly.#{direction}", category: anomaly[:name]),
+        template_key: "spending_anomaly.#{direction}",
+        facts: {
+          category: anomaly[:name],
+          deviation_pct: round(anomaly[:deviation_pct].abs, 0).to_i,
+          projected_spend: format_money(anomaly[:projected]),
+          baseline_spend: format_money(anomaly[:baseline])
+        },
+        # The projection moves every night by construction (spend accrues and
+        # the pace factor shrinks as the month elapses), so exact amounts here
+        # would rewrite the body and resurrect dismissals nightly. Bucket the
+        # deviation instead; the display numbers live in `facts` only.
+        metadata: {
+          category_id: anomaly[:category_id],
+          direction: direction,
+          deviation_bucket: (round(anomaly[:deviation_pct].abs, 0).to_i / 25) * 25
+        },
+        period: period,
+        dedup_key: "spending_anomaly:#{anomaly[:category_id]}:#{month_token(period.start_date)}"
+      )
+    end
+
+    # { category_id => { name:, total: } } for persisted parent categories only.
+    # Subcategory spend is already rolled into its parent's total, and synthetic
+    # categories (uncategorized / other investments) are too noisy to flag.
+    def category_spend(period)
+      income_statement.expense_totals(period: period).category_totals.each_with_object({}) do |ct, totals|
+        next if ct.category.synthetic? || ct.category.parent_id.present?
+        next unless ct.total.positive?
+
+        totals[ct.category.id] = { name: ct.category.name, total: ct.total.to_d }
+      end
+    end
+
+    def baseline_spend(current_period)
+      sums = Hash.new { |h, k| h[k] = 0.to_d }
+
+      BASELINE_MONTHS.times do |i|
+        start_date = current_period.start_date - (i + 1).months
+        month = Period.custom(start_date: start_date, end_date: start_date + 1.month - 1.day)
+
+        category_spend(month).each do |category_id, data|
+          sums[category_id] += data[:total]
+        end
+      end
+
+      sums.transform_values { |total| total / BASELINE_MONTHS }
+    end
+end
diff --git a/app/models/insight/generators/subscription_audit_generator.rb b/app/models/insight/generators/subscription_audit_generator.rb
new file mode 100644
index 000000000..dbbae8952
--- /dev/null
+++ b/app/models/insight/generators/subscription_audit_generator.rb
@@ -0,0 +1,50 @@
+# Surfaces recurring expenses that are well past their expected date — the
+# provider may have raised the price, the charge may have moved, or the user
+# may be paying for something that quietly stopped (or should stop).
+class Insight::Generators::SubscriptionAuditGenerator < Insight::Generator
+  produces "subscription_audit"
+
+  OVERDUE_DAYS = 45
+  MAX_INSIGHTS = 3
+
+  def generate
+    overdue_recurring.map do |recurring|
+      name = recurring.merchant&.name.presence || recurring.name
+      amount = Money.new(recurring.amount, recurring.currency).format
+      days_overdue = (Date.current - recurring.next_expected_date).to_i
+
+      build_insight(
+        insight_type: "subscription_audit",
+        priority: "medium",
+        title: I18n.t("insights.titles.subscription_audit", name: name),
+        template_key: "subscription_audit",
+        facts: {
+          name: name,
+          amount: amount,
+          days_overdue: days_overdue,
+          expected_on: I18n.l(recurring.next_expected_date)
+        },
+        # days_overdue is deliberately left out: it changes every night, and
+        # metadata drift would resurrect insights the user already dismissed.
+        metadata: {
+          recurring_transaction_id: recurring.id,
+          amount: round(recurring.amount, 2),
+          expected_on: recurring.next_expected_date.iso8601
+        },
+        dedup_key: "subscription_audit:#{recurring.id}"
+      )
+    end
+  end
+
+  private
+    def overdue_recurring
+      family.recurring_transactions
+        .includes(:merchant)
+        .active
+        .where(destination_account_id: nil)
+        .where("amount > 0")
+        .where("next_expected_date < ?", OVERDUE_DAYS.days.ago.to_date)
+        .order(:next_expected_date)
+        .limit(MAX_INSIGHTS)
+    end
+end
diff --git a/app/models/investment.rb b/app/models/investment.rb
index ffb6331b3..4e397326e 100644
--- a/app/models/investment.rb
+++ b/app/models/investment.rb
@@ -142,7 +142,7 @@ class Investment < ApplicationRecord
 
       region_order.filter_map do |region|
         next unless grouped[region]
-        [ region_label_for(region), grouped[region].map { |k, v| [ v[:long], k ] } ]
+        [ region_label_for(region), grouped[region].map { |k, _v| [ long_subtype_label_for(k), k ] } ]
       end
     end
   end
diff --git a/app/models/investment_flow_statement.rb b/app/models/investment_flow_statement.rb
index 66d68b7a9..4d7418e00 100644
--- a/app/models/investment_flow_statement.rb
+++ b/app/models/investment_flow_statement.rb
@@ -1,6 +1,16 @@
 class InvestmentFlowStatement
   include Monetizable
 
+  CONTRIBUTIONS_TOTAL_SQL = Arel.sql(
+    "COALESCE(ABS(SUM(CASE WHEN transactions.investment_activity_label = 'Contribution' " \
+    "THEN entries.amount ELSE 0 END)), 0)"
+  )
+  WITHDRAWALS_TOTAL_SQL = Arel.sql(
+    "COALESCE(ABS(SUM(CASE WHEN transactions.investment_activity_label = 'Withdrawal' " \
+    "THEN entries.amount ELSE 0 END)), 0)"
+  )
+  private_constant :CONTRIBUTIONS_TOTAL_SQL, :WITHDRAWALS_TOTAL_SQL
+
   attr_reader :family, :user
 
   def initialize(family, user: nil)
@@ -18,13 +28,14 @@ class InvestmentFlowStatement
       .where(investment_activity_label: %w[Contribution Withdrawal])
 
     if user
-      scope = scope.joins(entry: :account).merge(Account.included_in_finances_for(user))
+      account_ids = family.accounts.included_in_finances_for(user).included_in_reports.select(:id)
+      scope = scope.where(entries: { account_id: account_ids })
     end
 
-    transactions = scope
-
-    contributions = transactions.where(investment_activity_label: "Contribution").sum("entries.amount").abs
-    withdrawals = transactions.where(investment_activity_label: "Withdrawal").sum("entries.amount").abs
+    contributions, withdrawals = scope.pick(
+      CONTRIBUTIONS_TOTAL_SQL,
+      WITHDRAWALS_TOTAL_SQL
+    )
 
     PeriodTotals.new(
       contributions: Money.new(contributions, family.currency),
diff --git a/app/models/investment_statement.rb b/app/models/investment_statement.rb
index bb7a836a9..8ef420976 100644
--- a/app/models/investment_statement.rb
+++ b/app/models/investment_statement.rb
@@ -14,11 +14,9 @@ class InvestmentStatement
 
   # Get totals for a specific period
   def totals(period: Period.current_month)
-    trades_in_period = family.trades
-      .joins(:entry)
-      .where(entries: { date: period.date_range, account_id: investment_account_ids })
+    account_ids = investment_account_ids
 
-    result = totals_query(trades_scope: trades_in_period)
+    result = totals_query(account_ids: account_ids, date_range: period.date_range)
 
     PeriodTotals.new(
       contributions: Money.new(result[:contributions], family.currency),
@@ -251,7 +249,7 @@ class InvestmentStatement
   # Investment accounts
   def investment_accounts
     @investment_accounts ||= begin
-      scope = family.accounts.visible.where(accountable_type: %w[Investment Crypto])
+      scope = family.accounts.visible.included_in_reports.where(accountable_type: %w[Investment Crypto])
       scope = scope.included_in_finances_for(user) if user
       scope
     end
@@ -305,12 +303,17 @@ class InvestmentStatement
       @investment_account_ids ||= investment_accounts.pluck(:id)
     end
 
-    def totals_query(trades_scope:)
-      sql_hash = Digest::MD5.hexdigest(trades_scope.to_sql)
+    def totals_query(account_ids:, date_range:)
+      if account_ids.empty?
+        return Totals.new(family, account_ids: account_ids, date_range: date_range).call
+      end
+
+      account_ids_hash = Digest::MD5.hexdigest(account_ids.sort.join(","))
 
       Rails.cache.fetch([
-        "investment_statement", "totals_query", family.id, user&.id, sql_hash, family.entries_cache_version
-      ]) { Totals.new(family, trades_scope: trades_scope).call }
+        "investment_statement", "totals_query", family.id, user&.id,
+        account_ids_hash, date_range.begin, date_range.end, family.entries_cache_version
+      ]) { Totals.new(family, account_ids: account_ids, date_range: date_range).call }
     end
 
     def monetizable_currency
diff --git a/app/models/investment_statement/totals.rb b/app/models/investment_statement/totals.rb
index 65af7be6f..9d8efffa1 100644
--- a/app/models/investment_statement/totals.rb
+++ b/app/models/investment_statement/totals.rb
@@ -1,10 +1,13 @@
 class InvestmentStatement::Totals
-  def initialize(family, trades_scope:)
+  def initialize(family, account_ids:, date_range:)
     @family = family
-    @trades_scope = trades_scope
+    @account_ids = account_ids
+    @date_range = date_range
   end
 
   def call
+    return empty_result if @account_ids.empty?
+
     result = ActiveRecord::Base.connection.select_one(query_sql)
 
     {
@@ -17,6 +20,16 @@ class InvestmentStatement::Totals
   end
 
   private
+    def empty_result
+      {
+        contributions: 0,
+        withdrawals: 0,
+        dividends: 0,
+        interest: 0,
+        trades_count: 0
+      }
+    end
+
     def query_sql
       ActiveRecord::Base.sanitize_sql_array([
         aggregation_sql,
@@ -27,30 +40,36 @@ class InvestmentStatement::Totals
     # Aggregate trades by direction (buy vs sell)
     # Buys (qty > 0) = contributions (cash going out to buy securities)
     # Sells (qty < 0) = withdrawals (cash coming in from selling securities)
+    # Missing FX rates preserve InvestmentStatement's existing 1:1 fallback.
+    #
+    # account_ids is already scoped to the family's visible (draft/active)
+    # investment accounts, so the query trusts that input and skips a join back
+    # to accounts for family/status filtering.
     def aggregation_sql
       <<~SQL
         SELECT
-          COALESCE(SUM(CASE WHEN t.qty > 0 THEN ABS(ae.amount * COALESCE(er.rate, 1)) ELSE 0 END), 0) as contributions,
-          COALESCE(SUM(CASE WHEN t.qty < 0 THEN ABS(ae.amount * COALESCE(er.rate, 1)) ELSE 0 END), 0) as withdrawals,
-          COUNT(t.id) as trades_count
-        FROM (#{@trades_scope.to_sql}) t
-        JOIN entries ae ON ae.entryable_id = t.id AND ae.entryable_type = 'Trade'
-        JOIN accounts a ON a.id = ae.account_id
+          COALESCE(SUM(CASE WHEN trades.qty > 0 THEN ABS(entries.amount * COALESCE(er.rate, 1)) ELSE 0 END), 0) as contributions,
+          COALESCE(SUM(CASE WHEN trades.qty < 0 THEN ABS(entries.amount * COALESCE(er.rate, 1)) ELSE 0 END), 0) as withdrawals,
+          COUNT(trades.id) as trades_count
+        FROM entries
+        JOIN trades ON trades.id = entries.entryable_id AND entries.entryable_type = 'Trade'
         LEFT JOIN exchange_rates er ON (
-          er.date = ae.date AND
-          er.from_currency = ae.currency AND
+          er.date = entries.date AND
+          er.from_currency = entries.currency AND
           er.to_currency = :target_currency
         )
-        WHERE a.family_id = :family_id
-          AND a.status IN ('draft', 'active')
-          AND ae.excluded = false
+        WHERE entries.account_id IN (:account_ids)
+          AND entries.date BETWEEN :start_date AND :end_date
+          AND entries.excluded = false
       SQL
     end
 
     def sql_params
       {
-        family_id: @family.id,
-        target_currency: @family.currency
+        target_currency: @family.currency,
+        account_ids: @account_ids,
+        start_date: @date_range.begin,
+        end_date: @date_range.end
       }
     end
 end
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index a7b391288..59b10d115 100644
--- a/app/models/invitation.rb
+++ b/app/models/invitation.rb
@@ -19,6 +19,7 @@ class Invitation < ApplicationRecord
 
   before_validation :normalize_email
   before_validation :generate_token, on: :create
+  before_create :remove_expired_duplicates_in_family
   before_create :set_expiration
 
   scope :pending, -> { where(accepted_at: nil).where("expires_at > ?", Time.current) }
@@ -37,7 +38,7 @@ class Invitation < ApplicationRecord
     transaction do
       user.update!(family_id: family_id, role: role.to_s)
       update!(accepted_at: Time.current)
-      auto_share_existing_accounts(user) if family.share_all_by_default?
+      family.auto_share_existing_accounts_with(user)
     end
     true
   end
@@ -69,6 +70,29 @@ class Invitation < ApplicationRecord
       self.expires_at = 3.days.from_now
     end
 
+    # An expired, never-accepted invitation still occupies the partial unique
+    # index `index_invitations_on_email_and_family_id_pending` (predicate
+    # `accepted_at IS NULL`), but the `pending` scope treats it as gone because
+    # of the `expires_at > now` clause. The duplicate-guard validation therefore
+    # passes, and the INSERT collides with the index, raising RecordNotUnique.
+    # Removing the stale row inside the create transaction frees the slot so the
+    # re-invite can proceed. It runs only after validations pass, so a still
+    # pending (non-expired) invitation can never be removed here.
+    def remove_expired_duplicates_in_family
+      return if email.blank?
+
+      scope = self.class.where(family_id: family_id, accepted_at: nil)
+                        .where("expires_at <= ?", Time.current)
+
+      scope = if self.class.encryption_ready?
+        scope.where(email: email)
+      else
+        scope.where("LOWER(email) = ?", email.to_s.strip.downcase)
+      end
+
+      scope.delete_all
+    end
+
     def normalize_email
       self.email = email.to_s.strip.downcase if email.present?
     end
@@ -105,13 +129,4 @@ class Invitation < ApplicationRecord
     def inviter_is_admin
       inviter.admin?
     end
-
-    def auto_share_existing_accounts(user)
-      records = family.accounts.where.not(owner_id: user.id).pluck(:id).map do |account_id|
-        { account_id: account_id, user_id: user.id, permission: "read_write",
-          include_in_finances: true, created_at: Time.current, updated_at: Time.current }
-      end
-
-      AccountShare.insert_all(records, unique_by: %i[account_id user_id]) if records.any?
-    end
 end
diff --git a/app/models/kraken_account/ledger_processor.rb b/app/models/kraken_account/ledger_processor.rb
new file mode 100644
index 000000000..74d661cae
--- /dev/null
+++ b/app/models/kraken_account/ledger_processor.rb
@@ -0,0 +1,264 @@
+# frozen_string_literal: true
+
+# Processes Kraken Ledger entries (deposits, withdrawals, staking rewards, Earn
+# income, standalone fees) stored in KrakenAccount#raw_transactions_payload["ledgers"].
+#
+# Kraken TradesHistory already handles spot buy/sell trades; ledger entries with
+# type="trade" are therefore skipped here to avoid double-counting.  Internal
+# sub-account transfers (type="transfer") and margin events (type="margin",
+# "rollover", "settled") are also skipped.
+#
+# Sign convention (Sure): negative = inflow/income, positive = outflow/expense.
+# Deposits and rewards are negative; withdrawals and fees are positive.
+class KrakenAccount::LedgerProcessor
+  include KrakenAccount::UsdConverter
+
+  # Ledger types we import as Transaction entries.
+  SUPPORTED_TYPES = %w[deposit withdrawal staking earn fee].freeze
+
+  # Ledger types we intentionally ignore (handled elsewhere or out of scope).
+  SKIP_TYPES = %w[trade transfer margin rollover settled adjustment].freeze
+
+  # Kraken Earn internal subtypes that represent fund movements, not income.
+  EARN_INTERNAL_SUBTYPES = %w[allocation deallocation].freeze
+
+  def initialize(kraken_account)
+    @kraken_account = kraken_account
+    @normalizer = KrakenAccount::AssetNormalizer.new(raw_payload&.dig("asset_metadata") || {})
+  end
+
+  def process
+    return unless account.present?
+
+    # Idempotency: load existing Kraken *ledger* external IDs once and test
+    # membership in memory, instead of an EXISTS query per ledger entry (a full
+    # sync can carry up to ~10k entries — see MAX_LEDGER_PAGES in the importer).
+    # Scoped to the kraken_ledger_ prefix so trade entries aren't loaded.
+    @existing_external_ids = account.entries
+                                    .where(source: "kraken")
+                                    .where("external_id LIKE 'kraken_ledger_%'")
+                                    .pluck(:external_id)
+                                    .to_set
+
+    raw_ledgers.each do |ledger_id, ledger|
+      process_ledger_entry(ledger_id, ledger)
+    rescue StandardError => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Failed to process ledger entry #{ledger_id}: #{e.message}",
+        source: self.class.name,
+        provider_key: "kraken",
+        family: kraken_account.kraken_item&.family,
+        metadata: { ledger_id: ledger_id, error_class: e.class.name }
+      )
+    end
+  end
+
+  private
+
+    attr_reader :kraken_account, :normalizer
+
+    def account
+      kraken_account.current_account
+    end
+
+    def target_currency
+      kraken_account.kraken_item&.family&.currency
+    end
+
+    def raw_payload
+      kraken_account.raw_payload
+    end
+
+    def raw_ledgers
+      kraken_account.raw_transactions_payload&.dig("ledgers") || {}
+    end
+
+    def process_ledger_entry(ledger_id, ledger)
+      type    = ledger["type"].to_s.downcase
+      subtype = ledger["subtype"].to_s.downcase
+
+      return if SKIP_TYPES.include?(type)
+      return unless SUPPORTED_TYPES.include?(type)
+
+      # Skip Earn allocation/deallocation — these are internal fund movements, not income.
+      return if type == "earn" && EARN_INTERNAL_SUBTYPES.include?(subtype)
+
+      external_id = "kraken_ledger_#{ledger_id}"
+      return if @existing_external_ids.include?(external_id)
+
+      raw_asset  = ledger["asset"].to_s
+      raw_amount = ledger["amount"].to_d
+      raw_fee    = ledger["fee"].to_d
+      date       = Time.zone.at(ledger["time"].to_d).to_date
+
+      # Compute the total balance impact: Kraken applies amount - fee to the balance.
+      # abs_impact captures the full magnitude of the cash movement for this event.
+      abs_impact = (raw_amount - raw_fee).abs
+      return if abs_impact.zero?
+
+      normalized = normalizer.normalize(raw_asset)
+      symbol     = normalized[:symbol]
+
+      entry_amount, price_missing = resolve_amount(abs_impact, symbol, date)
+      return if entry_amount.nil?
+
+      # Sure sign convention: inflow = negative, outflow = positive.
+      signed_amount = inflow?(type) ? -entry_amount.abs : entry_amount.abs
+
+      name  = build_name(type, abs_impact, symbol)
+      label = activity_label(type)
+      kind  = transaction_kind(type)
+      extra = build_extra(ledger_id, ledger, raw_asset, price_missing)
+
+      account.entries.create!(
+        date: date,
+        name: name,
+        amount: signed_amount,
+        currency: target_currency,
+        external_id: external_id,
+        source: "kraken",
+        entryable: Transaction.new(
+          kind: kind,
+          investment_activity_label: label,
+          extra: extra
+        )
+      )
+
+      @existing_external_ids << external_id
+    end
+
+    # Returns [family_currency_amount, price_missing_bool] or [nil, nil] on hard failure.
+    def resolve_amount(abs_impact, symbol, date)
+      return [ abs_impact, false ] if symbol == target_currency
+
+      if KrakenAccount::FIAT_CURRENCIES.include?(symbol)
+        resolve_fiat_amount(abs_impact, symbol, date)
+      else
+        resolve_crypto_amount(abs_impact, symbol, date)
+      end
+    end
+
+    def resolve_fiat_amount(abs_impact, symbol, date)
+      if symbol == "USD"
+        converted, stale, = convert_from_usd(abs_impact, date: date)
+        return [ converted, stale ]
+      end
+
+      # Non-USD fiat: bridge through USD
+      rate_to_usd = ExchangeRate.find_or_fetch_rate(from: symbol, to: "USD", date: date)
+      return [ nil, nil ] unless rate_to_usd
+
+      usd_amount = abs_impact * rate_to_usd.rate.to_d
+      converted, stale, = convert_from_usd(usd_amount, date: date)
+      [ converted, stale ]
+    rescue StandardError => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "warn",
+        message: "Fiat rate fetch failed for #{symbol}: #{e.message}",
+        source: self.class.name,
+        provider_key: "kraken",
+        family: kraken_account.kraken_item&.family,
+        metadata: { symbol: symbol, date: date.to_s, error_class: e.class.name }
+      )
+      [ nil, nil ]
+    end
+
+    def resolve_crypto_amount(abs_impact, symbol, date)
+      price_usd = stored_price_usd(symbol)
+
+      if price_usd.nil?
+        DebugLogEntry.capture(
+          category: "provider_sync_error",
+          level: "warn",
+          message: "No price available for #{symbol} on #{date}; amount recorded as 0",
+          source: self.class.name,
+          provider_key: "kraken",
+          family: kraken_account.kraken_item&.family,
+          metadata: { symbol: symbol, date: date.to_s }
+        )
+        return [ 0.to_d, true ]
+      end
+
+      usd_amount = abs_impact * price_usd
+      converted, stale, = convert_from_usd(usd_amount, date: date)
+      [ converted, stale ]
+    rescue StandardError => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "warn",
+        message: "Crypto price resolution failed for #{symbol}: #{e.message}",
+        source: self.class.name,
+        provider_key: "kraken",
+        family: kraken_account.kraken_item&.family,
+        metadata: { symbol: symbol, date: date.to_s, error_class: e.class.name }
+      )
+      [ 0.to_d, true ]
+    end
+
+    # Use the current spot price cached in raw_payload["assets"] by the Importer.
+    # This is the price at last sync time, not at entry date — a best-effort
+    # approximation; precise historical pricing is a future enhancement.
+    def stored_price_usd(symbol)
+      assets = raw_payload&.dig("assets") || []
+      asset  = assets.find do |a|
+        (a["symbol"] || a[:symbol]).to_s.upcase == symbol.upcase
+      end
+      price = asset&.dig("price_usd") || asset&.dig(:price_usd)
+      price.present? ? price.to_d : nil
+    end
+
+    # True when the ledger event represents money flowing INTO the account.
+    def inflow?(type)
+      case type
+      when "deposit", "staking", "earn" then true
+      when "withdrawal", "fee"          then false
+      else false
+      end
+    end
+
+    def build_name(type, abs_impact, symbol)
+      qty = abs_impact.to_d.round(8).to_s("F").sub(/\.?0+\z/, "")
+      case type
+      when "deposit"    then "Deposit #{qty} #{symbol}"
+      when "withdrawal" then "Withdrawal #{qty} #{symbol}"
+      when "staking"    then "Staking reward #{qty} #{symbol}"
+      when "earn"       then "Earn reward #{qty} #{symbol}"
+      when "fee"        then "Fee #{qty} #{symbol}"
+      else "#{type.capitalize} #{qty} #{symbol}"
+      end
+    end
+
+    def activity_label(type)
+      case type
+      when "deposit"    then "Contribution"
+      when "withdrawal" then "Withdrawal"
+      when "staking"    then "Dividend"
+      when "earn"       then "Interest"
+      when "fee"        then "Fee"
+      end
+    end
+
+    def transaction_kind(type)
+      case type
+      when "deposit", "withdrawal" then "funds_movement"
+      else "standard"
+      end
+    end
+
+    def build_extra(ledger_id, ledger, raw_asset, price_missing)
+      meta = {
+        "ledger_id"  => ledger_id,
+        "refid"      => ledger["refid"],
+        "raw_asset"  => raw_asset,
+        "raw_amount" => ledger["amount"],
+        "fee_native" => ledger["fee"],
+        "type"       => ledger["type"],
+        "subtype"    => ledger["subtype"]
+      }
+      meta["price_missing"] = true if price_missing
+      { "kraken" => meta }
+    end
+end
diff --git a/app/models/kraken_account/processor.rb b/app/models/kraken_account/processor.rb
index 483ac1f1e..c85ab6195 100644
--- a/app/models/kraken_account/processor.rb
+++ b/app/models/kraken_account/processor.rb
@@ -15,6 +15,7 @@ class KrakenAccount::Processor
     KrakenAccount::HoldingsProcessor.new(kraken_account).process
     process_account!
     process_trades
+    KrakenAccount::LedgerProcessor.new(kraken_account).process
   end
 
   private
diff --git a/app/models/kraken_item/importer.rb b/app/models/kraken_item/importer.rb
index 38944fe0f..fe03a82cb 100644
--- a/app/models/kraken_item/importer.rb
+++ b/app/models/kraken_item/importer.rb
@@ -3,6 +3,8 @@
 class KrakenItem::Importer
   MAX_TRADE_PAGES = 200
   TRADE_PAGE_SIZE = 50
+  MAX_LEDGER_PAGES = 200
+  LEDGER_PAGE_SIZE = 50
 
   attr_reader :kraken_item, :kraken_provider
 
@@ -19,12 +21,14 @@ class KrakenItem::Importer
     balances = kraken_provider.get_extended_balance || {}
     assets = parse_assets(balances, asset_metadata)
     trades = fetch_trades
+    ledgers = fetch_ledgers
 
     total_usd = assets.sum { |asset| asset[:amount_usd].to_d }.round(2)
     kraken_account = upsert_kraken_account(
       assets: assets,
       balances: balances,
       trades: trades,
+      ledgers: ledgers,
       asset_metadata: asset_metadata,
       pair_metadata: pair_metadata,
       api_key_info: api_key_info,
@@ -39,7 +43,7 @@ class KrakenItem::Importer
       "imported_at" => Time.current.iso8601
     })
 
-    { success: true, account_id: kraken_account.id, assets_imported: assets.size, trades_imported: trades.size, total_usd: total_usd }
+    { success: true, account_id: kraken_account.id, assets_imported: assets.size, trades_imported: trades.size, ledgers_imported: ledgers.size, total_usd: total_usd }
   rescue Provider::Kraken::PermissionError => e
     kraken_item.update!(status: :requires_update)
     raise e
@@ -141,7 +145,51 @@ class KrakenItem::Importer
       all_trades
     end
 
-    def upsert_kraken_account(assets:, balances:, trades:, asset_metadata:, pair_metadata:, api_key_info:, total_usd:)
+    def fetch_ledgers
+      start_time = kraken_item.sync_start_date&.to_i
+      offset = 0
+      all_ledgers = {}
+
+      MAX_LEDGER_PAGES.times do
+        result = kraken_provider.get_ledgers(start: start_time, offset: offset)
+        ledgers = result.to_h.fetch("ledger", {})
+        duplicate_ids = all_ledgers.keys & ledgers.keys
+        if duplicate_ids.any?
+          DebugLogEntry.capture(
+            category: "provider_sync_error",
+            level: "warn",
+            message: "#{duplicate_ids.size} duplicate ledger ids from Kraken ignored",
+            source: self.class.name,
+            provider_key: "kraken",
+            family: kraken_item.family,
+            metadata: { kraken_item_id: kraken_item.id, duplicate_ids: duplicate_ids }
+          )
+        end
+        all_ledgers.merge!(ledgers.except(*duplicate_ids))
+
+        count = result.to_h["count"].to_i
+        break if ledgers.size < LEDGER_PAGE_SIZE
+
+        offset += ledgers.size
+        break if count.positive? && offset >= count
+      end
+
+      all_ledgers
+    rescue Provider::Kraken::PermissionError => e
+      # Key may not have Query Ledger Entries permission; degrade gracefully.
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "warn",
+        message: "Ledgers permission denied; skipping ledger import: #{e.message}",
+        source: self.class.name,
+        provider_key: "kraken",
+        family: kraken_item.family,
+        metadata: { kraken_item_id: kraken_item.id }
+      )
+      {}
+    end
+
+    def upsert_kraken_account(assets:, balances:, trades:, ledgers:, asset_metadata:, pair_metadata:, api_key_info:, total_usd:)
       kraken_item.kraken_accounts.find_or_initialize_by(account_id: "combined").tap do |account|
         account.assign_attributes(
           name: kraken_item.institution_name.presence || "Kraken",
@@ -159,6 +207,7 @@ class KrakenItem::Importer
           },
           raw_transactions_payload: {
             "trades" => trades,
+            "ledgers" => ledgers,
             "fetched_at" => Time.current.iso8601
           },
           extra: account.extra.to_h.deep_merge(price_metadata(assets))
diff --git a/app/models/llm_usage.rb b/app/models/llm_usage.rb
index 2a7189c5d..03d883639 100644
--- a/app/models/llm_usage.rb
+++ b/app/models/llm_usage.rb
@@ -10,18 +10,33 @@ class LlmUsage < ApplicationRecord
   scope :recent, -> { order(created_at: :desc) }
   scope :for_date_range, ->(start_date, end_date) { where(created_at: start_date..end_date) }
 
-  # OpenAI pricing per 1M tokens (as of Oct 2025)
+  # OpenAI pricing per 1M tokens (as of July 2026)
   # Source: https://platform.openai.com/docs/pricing
   PRICING = {
     "openai" => {
       # GPT-4.1 and similar models
       "gpt-4.1" => { prompt: 2.00, completion: 8.00 },
       "gpt-4.1-mini" => { prompt: 0.40, completion: 1.60 },
-      "gpt-4.1-nano" => { prompt: 0.40, completion: 1.60 },
+      "gpt-4.1-nano" => { prompt: 0.10, completion: 0.40 },
       # 4o
       "gpt-4o" => { prompt: 2.50, completion: 10.00 },
       "gpt-4o-mini" => { prompt: 0.15, completion: 0.60 },
-      # GPT-5 models (estimated pricing)
+      # GPT-5 models
+      "gpt-5.6-sol" => { prompt: 5.00, completion: 30.00 },
+      "gpt-5.6-terra" => { prompt: 2.50, completion: 15.00 },
+      "gpt-5.6-luna" => { prompt: 1.00, completion: 6.00 },
+      "gpt-5.5-pro" => { prompt: 30.00, completion: 180.00 },
+      "gpt-5.5" => { prompt: 5.00, completion: 30.00 },
+      "gpt-5.4" => { prompt: 2.50, completion: 15.00 },
+      "gpt-5.4-mini" => { prompt: 0.75, completion: 4.50 },
+      "gpt-5.4-nano" => { prompt: 0.20, completion: 1.25 },
+      "gpt-5.4-pro" => { prompt: 30.00, completion: 180.00 },
+      # GPT-5.2 Pro is published at 12x the GPT-5.2 Thinking rate.
+      "gpt-5.2-pro" => { prompt: 21.00, completion: 168.00 },
+      "gpt-5.2-chat-latest" => { prompt: 1.75, completion: 14.00 },
+      "gpt-5.2" => { prompt: 1.75, completion: 14.00 },
+      "gpt-5.1-chat-latest" => { prompt: 1.25, completion: 10.00 },
+      "gpt-5.1" => { prompt: 1.25, completion: 10.00 },
       "gpt-5" => { prompt: 1.25, completion: 10.00 },
       "gpt-5-mini" => { prompt: 0.25, completion: 2.00 },
       "gpt-5-nano" => { prompt: 0.05, completion: 0.40 },
@@ -29,8 +44,9 @@ class LlmUsage < ApplicationRecord
       # o1 models
       "o1-mini" => { prompt: 1.10, completion: 4.40 },
       "o1" => { prompt: 15.00, completion: 60.00 },
-      # o3 models (estimated pricing)
+      # o-series models
       "o3" => { prompt: 2.00, completion: 8.00 },
+      "o4-mini" => { prompt: 1.10, completion: 4.40 },
       "o3-mini" => { prompt: 1.10, completion: 4.40 },
       "o3-pro" => { prompt: 20.00, completion: 80.00 }
     },
@@ -92,8 +108,10 @@ class LlmUsage < ApplicationRecord
     # Try exact match first
     return provider_pricing[model] if provider_pricing.key?(model)
 
-    # Try prefix matching (e.g., "gpt-4.1-2024-08-06" matches "gpt-4.1")
-    provider_pricing.each do |model_prefix, pricing|
+    # Try prefix matching longest-first so snapshot IDs for variants (e.g.,
+    # "gpt-5.4-mini-2026-03-17") do not match a broader family row
+    # ("gpt-5.4") before their specific pricing row.
+    provider_pricing.sort_by { |model_prefix, _pricing| -model_prefix.length }.each do |model_prefix, pricing|
       return pricing if model.start_with?(model_prefix)
     end
 
@@ -117,8 +135,8 @@ class LlmUsage < ApplicationRecord
       # Try exact match first
       return provider_name if provider_pricing.key?(model)
 
-      # Try prefix matching
-      provider_pricing.each_key do |model_prefix|
+      # Try prefix matching longest-first to mirror find_pricing.
+      provider_pricing.keys.sort_by { |model_prefix| -model_prefix.length }.each do |model_prefix|
         return provider_name if model.start_with?(model_prefix)
       end
     end
diff --git a/app/models/loan.rb b/app/models/loan.rb
index 980c19885..4b6b88cca 100644
--- a/app/models/loan.rb
+++ b/app/models/loan.rb
@@ -5,6 +5,9 @@ class Loan < ApplicationRecord
     "mortgage" => { short: "Mortgage", long: "Mortgage" },
     "student" => { short: "Student Loan", long: "Student Loan" },
     "auto" => { short: "Auto Loan", long: "Auto Loan" },
+    "home_equity" => { short: "Home Equity", long: "Home Equity Loan" },
+    "line_of_credit" => { short: "Line of Credit", long: "Line of Credit" },
+    "business" => { short: "Business Loan", long: "Business Loan" },
     "other" => { short: "Other Loan", long: "Other Loan" }
   }.freeze
 
diff --git a/app/models/lunchflow_account.rb b/app/models/lunchflow_account.rb
index c38ae5082..dcc0a04e2 100644
--- a/app/models/lunchflow_account.rb
+++ b/app/models/lunchflow_account.rb
@@ -37,7 +37,12 @@ class LunchflowAccount < ApplicationRecord
 
     assign_attributes(
       current_balance: nil, # Balance not provided by accounts endpoint
-      currency: parse_currency(snapshot[:currency]) || "USD",
+      # The accounts endpoint usually omits currency (the balance endpoint is
+      # the authoritative source) — preserve what we already know rather than
+      # resetting an established account to USD. Normalize the preserved value
+      # too: a blank/invalid stored currency must fall through to USD, not
+      # propagate (blank would fail the presence validation and break import).
+      currency: parse_currency(snapshot[:currency]) || parse_currency(currency) || "USD",
       name: display_name,
       account_id: snapshot[:id].to_s,
       account_status: snapshot[:status],
diff --git a/app/models/lunchflow_account/processor.rb b/app/models/lunchflow_account/processor.rb
index b9c6b2184..f6d8c3ba4 100644
--- a/app/models/lunchflow_account/processor.rb
+++ b/app/models/lunchflow_account/processor.rb
@@ -38,7 +38,18 @@ class LunchflowAccount::Processor
 
       # Update account balance from latest Lunchflow data
       account = lunchflow_account.current_account
-      balance = lunchflow_account.current_balance || 0
+      balance = lunchflow_account.current_balance
+
+      # A nil current_balance means this sync's balance fetch did not succeed:
+      # upsert_lunchflow_snapshot! clears it (the accounts endpoint carries no
+      # balance) and only a successful balance fetch repopulates it. Coercing
+      # nil to 0 here would persist a zero balance (and the USD currency
+      # fallback) onto a healthy account whenever the provider has a
+      # transient failure, so leave the account untouched instead.
+      if balance.nil?
+        Rails.logger.warn("LunchflowAccount::Processor - No balance available for lunchflow_account #{lunchflow_account.id} (balance fetch failed or not yet run), skipping account update")
+        return
+      end
 
       # LunchFlow balance convention matches our app convention:
       # - Positive balance = debt (you owe money)
diff --git a/app/models/lunchflow_entry/processor.rb b/app/models/lunchflow_entry/processor.rb
index 11e42c755..f9d43df8f 100644
--- a/app/models/lunchflow_entry/processor.rb
+++ b/app/models/lunchflow_entry/processor.rb
@@ -188,12 +188,15 @@ class LunchflowEntry::Processor
     def date
       case data[:date]
       when String
-        Date.parse(data[:date])
+        if data[:date].include?("T") || data[:date].include?(":")
+          Time.parse(data[:date]).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(data[:date])
+        end
       when Integer, Float
-        # Unix timestamp
-        Time.at(data[:date]).to_date
+        Time.at(data[:date]).in_time_zone(account&.family&.timezone).to_date
       when Time, DateTime
-        data[:date].to_date
+        data[:date].in_time_zone(account&.family&.timezone).to_date
       when Date
         data[:date]
       else
diff --git a/app/models/lunchflow_item/importer.rb b/app/models/lunchflow_item/importer.rb
index 21e06314c..0a6003947 100644
--- a/app/models/lunchflow_item/importer.rb
+++ b/app/models/lunchflow_item/importer.rb
@@ -15,7 +15,16 @@ class LunchflowItem::Importer
     accounts_data = fetch_accounts_data
     unless accounts_data
       Rails.logger.error "LunchflowItem::Importer - Failed to fetch accounts data for item #{lunchflow_item.id}"
-      return { success: false, error: "Failed to fetch accounts data", accounts_imported: 0, transactions_imported: 0 }
+      return {
+        success: false,
+        error: "Failed to fetch accounts data",
+        accounts_updated: 0,
+        accounts_created: 0,
+        accounts_failed: 0,
+        accounts_pruned: 0,
+        transactions_imported: 0,
+        transactions_failed: 0
+      }
     end
 
     # Store raw payload
@@ -30,6 +39,7 @@ class LunchflowItem::Importer
     accounts_updated = 0
     accounts_created = 0
     accounts_failed = 0
+    accounts_pruned = 0
 
     if accounts_data[:accounts].present?
       # Get linked lunchflow account IDs (ones actually imported/used by the user)
@@ -73,9 +83,16 @@ class LunchflowItem::Importer
           end
         end
       end
+
+      # Remove records for accounts that no longer exist upstream so they don't
+      # linger as unlinked "Need setup" accounts (#1861). Guarded to a non-empty
+      # upstream list so a transient empty/failed response can't wipe out all
+      # accounts.
+      upstream_account_ids = accounts_data[:accounts].filter_map { |a| a[:id].to_s.presence }
+      accounts_pruned = prune_orphaned_lunchflow_accounts(upstream_account_ids)
     end
 
-    Rails.logger.info "LunchflowItem::Importer - Updated #{accounts_updated} accounts, created #{accounts_created} new (#{accounts_failed} failed)"
+    Rails.logger.info "LunchflowItem::Importer - Updated #{accounts_updated} accounts, created #{accounts_created} new (#{accounts_failed} failed), pruned #{accounts_pruned}"
 
     # Step 3: Fetch transactions only for linked accounts with active status
     transactions_imported = 0
@@ -103,6 +120,7 @@ class LunchflowItem::Importer
       accounts_updated: accounts_updated,
       accounts_created: accounts_created,
       accounts_failed: accounts_failed,
+      accounts_pruned: accounts_pruned,
       transactions_imported: transactions_imported,
       transactions_failed: transactions_failed
     }
@@ -110,6 +128,52 @@ class LunchflowItem::Importer
 
   private
 
+    # Removes LunchflowAccount records that no longer exist upstream and are not
+    # linked to any Account, so accounts deleted in Lunch Flow stop lingering as
+    # unlinked records that pin the item to "Need setup" (#1861). Mirrors
+    # SimpleFin's prune_orphaned_simplefin_accounts. LunchFlow linkage is only
+    # via AccountProvider (no legacy FK), so a present account_provider means keep.
+    #
+    # account_id is nullable on lunchflow_accounts. A NULL account_id can never
+    # match an upstream id, and `where.not(account_id: upstream_account_ids)`
+    # alone would silently drop those rows (SQL `NULL NOT IN (...)` is never
+    # TRUE). We explicitly OR them back in so a NULL-id unlinked record — which
+    # has no upstream identity and would otherwise pin the item to "Need setup"
+    # forever — is also pruned. The per-record account_provider guard below still
+    # protects any linked record regardless of its account_id.
+    def prune_orphaned_lunchflow_accounts(upstream_account_ids)
+      return 0 if upstream_account_ids.blank?
+
+      scope = lunchflow_item.lunchflow_accounts.includes(:account_provider)
+      orphaned = scope
+        .where.not(account_id: upstream_account_ids)
+        .or(scope.where(account_id: nil))
+
+      pruned = 0
+      orphaned.each do |lunchflow_account|
+        if lunchflow_account.account_provider.present?
+          Rails.logger.info "LunchflowItem::Importer - Keeping stale LunchflowAccount id=#{lunchflow_account.id} account_id=#{lunchflow_account.account_id} (still linked to Account)"
+          next
+        end
+
+        begin
+          Rails.logger.info "LunchflowItem::Importer - Pruning orphaned LunchflowAccount id=#{lunchflow_account.id} account_id=#{lunchflow_account.account_id} (no longer exists upstream)"
+          if lunchflow_account.destroy
+            pruned += 1
+          else
+            # A before_destroy callback halted deletion — don't inflate the count.
+            Rails.logger.warn "LunchflowItem::Importer - Destroy halted for LunchflowAccount id=#{lunchflow_account.id}; not counting as pruned"
+          end
+        rescue => e
+          # Don't let one failed destroy abort the whole import (transactions are
+          # fetched in a later step). Mirrors the importer's continue-on-error style.
+          Rails.logger.error "LunchflowItem::Importer - Failed to prune LunchflowAccount id=#{lunchflow_account.id}: #{e.message}"
+        end
+      end
+
+      pruned
+    end
+
     def fetch_accounts_data
       begin
         accounts_data = lunchflow_provider.get_accounts
@@ -269,7 +333,19 @@ class LunchflowItem::Importer
         begin
           fetch_and_update_balance(lunchflow_account)
         rescue => e
-          # Log but don't fail transaction import if balance fetch fails
+          # Log but don't fail transaction import if balance fetch fails.
+          # current_balance stays nil, so the processor will skip the balance
+          # update for this account — capture the failure, because the sync
+          # still reports success and this is otherwise invisible to support.
+          DebugLogEntry.capture(
+            category: "provider_sync",
+            level: "warn",
+            message: "Balance fetch failed for account #{lunchflow_account.account_id}; keeping previous balance",
+            source: self.class.name,
+            provider_key: "lunchflow",
+            family: lunchflow_item.family,
+            metadata: { account_id: lunchflow_account.account_id, error_class: e.class.name, error: e.message }
+          )
           Rails.logger.warn "LunchflowItem::Importer - Failed to update balance for account #{lunchflow_account.account_id}: #{e.message}"
         end
 
diff --git a/app/models/merchant_import.rb b/app/models/merchant_import.rb
new file mode 100644
index 000000000..6696a6067
--- /dev/null
+++ b/app/models/merchant_import.rb
@@ -0,0 +1,116 @@
+class MerchantImport < Import
+  def import!
+    transaction do
+      rows.each do |row|
+        merchant_name = row.name.to_s.strip
+        next if merchant_name.blank?
+
+        merchant = family.merchants.find_or_initialize_by(name: merchant_name)
+        next unless merchant.new_record?
+
+        merchant.color = row.merchant_color.presence || FamilyMerchant::COLORS.sample
+        merchant.website_url = row.merchant_website.presence
+        merchant.save!
+      end
+    end
+  end
+
+  # Merchants hang off the family, not the import — see
+  # Import#committed_by_named_records?.
+  def data_committed?
+    committed_by_named_records?(family.merchants)
+  end
+
+  def column_keys
+    %i[name merchant_color merchant_website]
+  end
+
+  def required_column_keys
+    %i[name]
+  end
+
+  def mapping_steps
+    []
+  end
+
+  def dry_run
+    { merchants: rows_count }
+  end
+
+  def csv_template
+    template = <<-CSV
+      name*,color,website_url
+      Coffee Shop,#e99537,https://coffeeshop.com
+      Pizza Palace,#4da568,https://pizzapalace.com
+      Bookstore,,
+    CSV
+
+    CSV.parse(template, headers: true)
+  end
+
+  def generate_rows_from_csv
+    rows.destroy_all
+
+    validate_required_headers!
+
+    name_header = header_for("name")
+    color_header = header_for("color")
+    website_header = header_for("website_url", "website url", "website")
+
+    csv_rows.each.with_index(1) do |row, index|
+      rows.create!(
+        source_row_number: index,
+        name: row[name_header].to_s.strip,
+        merchant_color: row[color_header].to_s.strip,
+        merchant_website: row[website_header].to_s.strip,
+        currency: default_currency
+      )
+    end
+  end
+
+  private
+    def validate_required_headers!
+      missing_headers = required_column_keys.map(&:to_s).reject { |key| header_for(key).present? }
+      return if missing_headers.empty?
+
+      errors.add(:base, :missing_columns, columns: missing_headers.join(", "))
+      raise ActiveRecord::RecordInvalid.new(self)
+    end
+
+    def header_for(*candidates)
+      candidates.each do |candidate|
+        normalized = normalize_header(candidate)
+        header = normalized_headers[normalized]
+        return header if header.present?
+      end
+
+      nil
+    end
+
+    def normalized_headers
+      @normalized_headers ||= begin
+        result = {}
+        duplicates = []
+
+        csv_headers.each do |header|
+          key = normalize_header(header)
+          if result.key?(key)
+            duplicates << header
+          else
+            result[key] = header
+          end
+        end
+
+        if duplicates.any?
+          errors.add(:base, :duplicate_columns, columns: duplicates.join(", "))
+          raise ActiveRecord::RecordInvalid.new(self)
+        end
+
+        result
+      end
+    end
+
+    def normalize_header(header)
+      header.to_s.strip.downcase.gsub(/\*/, "").gsub(/[\s-]+/, "_")
+    end
+end
diff --git a/app/models/mercury_entry/processor.rb b/app/models/mercury_entry/processor.rb
index a18508111..e900a9882 100644
--- a/app/models/mercury_entry/processor.rb
+++ b/app/models/mercury_entry/processor.rb
@@ -36,7 +36,8 @@ class MercuryEntry::Processor
         name: name,
         source: "mercury",
         merchant: merchant,
-        notes: notes
+        notes: notes,
+        extra: extra
       )
     rescue ArgumentError => e
       # Re-raise validation errors (missing required fields, invalid data)
@@ -114,6 +115,17 @@ class MercuryEntry::Processor
       end
     end
 
+    def extra
+      meta = { "pending" => pending? }
+      meta["kind"]           = data[:kind] if data[:kind].present?
+      meta["counterparty_id"] = data[:counterpartyId] if data[:counterpartyId].present?
+      { "mercury" => meta }
+    end
+
+    def pending?
+      data[:status] == "pending"
+    end
+
     def amount
       parsed_amount = case data[:amount]
       when String
@@ -146,13 +158,15 @@ class MercuryEntry::Processor
 
       case date_value
       when String
-        # Mercury uses ISO 8601 format: "2024-01-15T10:30:00Z"
-        DateTime.parse(date_value).to_date
+        if date_value.include?("T") || date_value.include?(":")
+          Time.parse(date_value).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(date_value)
+        end
       when Integer, Float
-        # Unix timestamp
-        Time.at(date_value).to_date
+        Time.at(date_value).in_time_zone(account&.family&.timezone).to_date
       when Time, DateTime
-        date_value.to_date
+        date_value.in_time_zone(account&.family&.timezone).to_date
       when Date
         date_value
       else
diff --git a/app/models/mercury_item/importer.rb b/app/models/mercury_item/importer.rb
index 277ea5e2a..f507f1ad6 100644
--- a/app/models/mercury_item/importer.rb
+++ b/app/models/mercury_item/importer.rb
@@ -209,25 +209,54 @@ class MercuryItem::Importer
           begin
             existing_transactions = mercury_account.raw_transactions_payload.to_a
 
-            # Build set of existing transaction IDs for efficient lookup
-            existing_ids = existing_transactions.map do |tx|
-              tx.with_indifferent_access[:id]
-            end.to_set
+            # Build a map of existing transaction IDs for efficient lookup
+            existing_by_id = existing_transactions.index_by { |tx| tx.with_indifferent_access[:id] }
 
-            # Filter to ONLY truly new transactions (skip duplicates)
-            # Transactions are immutable on the bank side, so we don't need to update them
-            new_transactions = transactions_data[:transactions].select do |tx|
-              next false unless tx.is_a?(Hash)
+            new_transactions = []
+            updated_transactions = []
 
-              tx_id = tx.with_indifferent_access[:id]
-              tx_id.present? && !existing_ids.include?(tx_id)
+            transactions_data[:transactions].each do |tx|
+              next unless tx.is_a?(Hash)
+
+              tx_data = tx.with_indifferent_access
+              tx_id   = tx_data[:id]
+              next unless tx_id.present?
+
+              if existing_by_id.key?(tx_id)
+                existing = existing_by_id[tx_id].with_indifferent_access
+                # Mercury reuses the same transaction ID when a pending entry posts.
+                # Replace the stored copy so the processor clears the pending flag.
+                if existing[:status] == "pending" && tx_data[:status] != "pending"
+                  existing_by_id[tx_id] = tx
+                  updated_transactions << tx_id
+                end
+              else
+                new_transactions << tx
+              end
             end
 
-            if new_transactions.any?
-              Rails.logger.info "MercuryItem::Importer - Storing #{new_transactions.count} new transactions (#{existing_transactions.count} existing, #{transactions_data[:transactions].count - new_transactions.count} duplicates skipped) for account #{mercury_account.account_id}"
-              mercury_account.upsert_mercury_transactions_snapshot!(existing_transactions + new_transactions)
+            if new_transactions.any? || updated_transactions.any?
+              merged = existing_by_id.values + new_transactions
+              DebugLogEntry.capture(
+                category: "provider_sync",
+                level: "info",
+                message: "Storing #{new_transactions.count} new, #{updated_transactions.count} status-updated transactions for account #{mercury_account.account_id}",
+                source: self.class.name,
+                provider_key: "mercury",
+                family: mercury_item.family,
+                metadata: { account_id: mercury_account.account_id, new_count: new_transactions.count, updated_count: updated_transactions.count }
+              )
+              mercury_account.upsert_mercury_transactions_snapshot!(merged)
             else
-              Rails.logger.info "MercuryItem::Importer - No new transactions to store (all #{transactions_data[:transactions].count} were duplicates) for account #{mercury_account.account_id}"
+              DebugLogEntry.capture(
+                category: "provider_sync",
+                level: "info",
+                message: "No new or updated transactions for account #{mercury_account.account_id}",
+                source: self.class.name,
+                provider_key: "mercury",
+                family: mercury_item.family,
+                metadata: { account_id: mercury_account.account_id }
+              )
             end
           rescue => e
             Rails.logger.error "MercuryItem::Importer - Failed to store transactions for account #{mercury_account.account_id}: #{e.message}"
diff --git a/app/models/message.rb b/app/models/message.rb
index 736ac8785..27eca7cc0 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -12,6 +12,8 @@ class Message < ApplicationRecord
 
   after_create_commit -> { broadcast_append_to chat, target: chat.messages_target }, if: :broadcast?
   after_update_commit -> { broadcast_update_to chat }, if: :broadcast?
+  # Clears the "Thinking…" bubble if the provider errors before any text streams.
+  after_destroy_commit -> { broadcast_remove_to chat }, if: :broadcast?
 
   scope :ordered, -> { order(created_at: :asc) }
 
diff --git a/app/models/notification_delivery.rb b/app/models/notification_delivery.rb
new file mode 100644
index 000000000..d87912d27
--- /dev/null
+++ b/app/models/notification_delivery.rb
@@ -0,0 +1,35 @@
+class NotificationDelivery < ApplicationRecord
+  belongs_to :rule
+  # The association is named :transaction_record rather than :transaction because
+  # ActiveRecord refuses to define a :transaction association (it would clash with
+  # the built-in #transaction method). The underlying column is still
+  # transaction_id; dedup keys on that column directly.
+  belongs_to :transaction_record, class_name: "Transaction", foreign_key: :transaction_id
+
+  # Records deliveries race-safely in a single insert_all keyed on the unique
+  # (rule_id, transaction_id) index, and returns ONLY the transaction_ids this
+  # call actually inserted. Rows that already exist are skipped by the unique
+  # index (no raise) and excluded from the result, so two concurrent runs that
+  # observe the same candidates each get a disjoint set back — the caller can
+  # enqueue off the return value without re-notifying already-delivered ids.
+  #
+  # Dedup keys on the DB row id (`transaction_id`), NOT provider identity: a
+  # re-ingested transaction gets a new id and may notify again. This is accepted
+  # as benign (see Rule::ActionExecutor::SendEmailNotification).
+  def self.record_for(rule_id:, transaction_ids:)
+    return [] if transaction_ids.blank?
+
+    now = Time.current
+    rows = transaction_ids.map do |transaction_id|
+      { rule_id: rule_id, transaction_id: transaction_id, created_at: now, updated_at: now }
+    end
+
+    result = insert_all(
+      rows,
+      unique_by: :index_notification_deliveries_on_rule_and_transaction,
+      returning: [ :transaction_id ]
+    )
+
+    result.rows.flatten
+  end
+end
diff --git a/app/models/oidc/provider_options_builder.rb b/app/models/oidc/provider_options_builder.rb
new file mode 100644
index 000000000..d60d4a60d
--- /dev/null
+++ b/app/models/oidc/provider_options_builder.rb
@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Oidc
+  class ProviderOptionsBuilder
+    DEFAULT_SCOPES = %i[openid email profile].freeze
+
+    class << self
+      def call(raw_cfg, env: ENV, rails_env: Rails.env, ssl_config: Rails.configuration.x.ssl)
+        cfg = raw_cfg.deep_symbolize_keys
+        issuer = cfg[:issuer].presence || env["OIDC_ISSUER"].presence
+        client_id = cfg[:client_id].presence || env["OIDC_CLIENT_ID"].presence
+        client_secret = cfg[:client_secret].presence || env["OIDC_CLIENT_SECRET"].presence
+        redirect_uri = cfg[:redirect_uri].presence || env["OIDC_REDIRECT_URI"].presence
+
+        if rails_env.test?
+          issuer ||= "https://test.example.com"
+          client_id ||= "test_client_id"
+          client_secret ||= "test_client_secret"
+          redirect_uri ||= "http://test.example.com/callback"
+        end
+
+        return nil unless issuer.present? && client_id.present? && client_secret.present? && redirect_uri.present?
+
+        scopes = oidc_scopes(cfg)
+        options = {
+          name: provider_name(cfg).to_sym,
+          scope: scopes,
+          response_type: :code,
+          issuer: issuer.to_s.strip,
+          discovery: true,
+          pkce: true,
+          client_options: {
+            identifier: client_id,
+            secret: client_secret,
+            redirect_uri: redirect_uri,
+            ssl: ssl_options(ssl_config)
+          }
+        }
+
+        prompt = cfg.dig(:settings, :prompt).presence
+        options[:prompt] = prompt if prompt.present?
+
+        extra_authorize_params = oidc_extra_authorize_params(cfg, scopes)
+        options[:extra_authorize_params] = extra_authorize_params if extra_authorize_params.present?
+
+        options
+      end
+
+      def oidc_scopes(cfg)
+        custom_scopes = cfg.dig(:settings, :scopes).presence
+        return DEFAULT_SCOPES unless custom_scopes.present?
+
+        custom_scopes.to_s.split.map(&:to_sym)
+      end
+
+      private
+        def provider_name(cfg)
+          (cfg[:name] || cfg[:id]).to_s
+        end
+
+        def oidc_extra_authorize_params(cfg, scopes)
+          return {} unless request_groups_claim?(cfg, scopes)
+
+          # Best-effort OIDC Core claims request. Some IdPs still require
+          # provider-side scope/audience mapping before they emit groups.
+          {
+            claims: JSON.generate(
+              id_token: { groups: nil },
+              userinfo: { groups: nil }
+            )
+          }
+        end
+
+        def request_groups_claim?(cfg, scopes)
+          scopes.map(&:to_s).include?("groups") || role_mapping(cfg).present?
+        end
+
+        def role_mapping(cfg)
+          cfg.dig(:settings, :role_mapping).presence
+        end
+
+        def ssl_options(ssl_config)
+          ssl_opts = {}
+          ssl_opts[:ca_file] = ssl_config.ca_file if ssl_config&.ca_file.present?
+          ssl_opts[:verify] = false if ssl_config&.verify == false
+          ssl_opts
+        end
+    end
+  end
+end
diff --git a/app/models/oidc_identity.rb b/app/models/oidc_identity.rb
index a95daf10e..6aae6a7e6 100644
--- a/app/models/oidc_identity.rb
+++ b/app/models/oidc_identity.rb
@@ -62,7 +62,7 @@ class OidcIdentity < ApplicationRecord
     return unless role_mapping.present?
 
     # Check roles in order of precedence (highest to lowest)
-    %w[super_admin admin member].each do |role|
+    %w[super_admin admin member guest].each do |role|
       mapped_groups = role_mapping[role] || role_mapping[role.to_sym] || []
       mapped_groups = Array(mapped_groups)
 
diff --git a/app/models/pdf_import.rb b/app/models/pdf_import.rb
index 1e1f494ef..120c74c8e 100644
--- a/app/models/pdf_import.rb
+++ b/app/models/pdf_import.rb
@@ -5,6 +5,61 @@ class PdfImport < Import
   validate :account_statement_matches_import
 
   class << self
+    # PdfImport's importing status doubles as a processing claim: the AI
+    # extraction claim from process_with_ai_later (no rows yet) or a regular
+    # publish (rows being written). A lost job leaves the claim held forever —
+    # ProcessPdfJob's own reclaim only runs when the job is redelivered.
+    # Which claim died is observable from the data: no rows attached → the AI
+    # claim, reclaim to pending so the user can re-trigger; rows attached →
+    # the publish died after import!'s commit, so finalize as complete
+    # (pending would let the user publish the same extracted rows again —
+    # PdfImport#import! always builds new transactions). Stuck reverts go to
+    # revert_failed like every other import, keeping the retry path exposed.
+    def clean
+      where(status: [ :importing, :reverting ])
+        .where("updated_at < ?", Import::STUCK_AFTER.ago)
+        .includes(:family)
+        .find_each do |pdf_import|
+          reap_stuck!(pdf_import)
+        rescue => e
+          # One bad record must not abort the sweep for the rest.
+          Rails.logger.error("PdfImport.clean failed for #{pdf_import.id}: #{e.class}: #{e.message}")
+          Sentry.capture_exception(e) { |scope| scope.set_tags(record_type: name, record_id: pdf_import.id) } if defined?(Sentry)
+        end
+    end
+
+    def reap_stuck!(pdf_import)
+      needs_sync = false
+      # Read before the lock — see Import.reap_stuck!.
+      family = pdf_import.family
+
+      pdf_import.with_lock do
+        next unless pdf_import.reapable_since?(Import::STUCK_AFTER.ago)
+
+        previous_status = pdf_import.status
+        if previous_status == "reverting"
+          pdf_import.update!(status: :revert_failed, error: Import.interrupted_error_message)
+        elsif pdf_import.data_committed?
+          pdf_import.update!(status: :complete, error: nil)
+          needs_sync = true
+        else
+          pdf_import.update!(status: :pending)
+        end
+
+        DebugLogEntry.capture(
+          category: "background_jobs",
+          level: "warn",
+          message: "Reclaimed PdfImport stuck in #{previous_status} for over #{Import::STUCK_AFTER.inspect} (→ #{pdf_import.status})",
+          source: name,
+          family: family,
+          metadata: { record_type: name, record_id: pdf_import.id, previous_status: previous_status, new_status: pdf_import.status }
+        )
+      end
+
+      # Outside the row lock — see Import.reap_stuck!.
+      family.sync_later if needs_sync
+    end
+
     def create_from_upload!(family:, file:, user:)
       statement = AccountStatement.create_from_prepared_upload!(
         family: family,
@@ -29,6 +84,22 @@ class PdfImport < Import
     end
   end
 
+  # A PdfImport's importing status is a processing claim (AI extraction or
+  # publish). Release a lost claim back to pending so the user can re-trigger
+  # processing, mirroring ProcessPdfJob's own reclaim; lost reverts keep the
+  # base revert_failed behavior.
+  def force_fail!(error_message = Import.lost_error_message)
+    return super if reverting?
+
+    with_lock do
+      return false unless presumed_lost?
+
+      update!(status: :pending)
+    end
+
+    true
+  end
+
   def import!
     raise "Account required for PDF import" unless account.present?
 
@@ -89,7 +160,9 @@ class PdfImport < Import
   end
 
   def process_with_ai
-    provider = Provider::Registry.get_provider(:openai)
+    # Honors Setting.llm_provider (issue #2113) — Provider::Anthropic implements
+    # process_pdf (PR #1985).
+    provider = Provider::Registry.preferred_llm_provider
     raise "AI provider not configured" unless provider
     raise "AI provider does not support PDF processing" unless provider.supports_pdf_processing?
 
@@ -115,7 +188,9 @@ class PdfImport < Import
   def extract_transactions
     return unless statement_with_transactions?
 
-    provider = Provider::Registry.get_provider(:openai)
+    # Honors Setting.llm_provider (issue #2113) — Provider::Anthropic implements
+    # extract_bank_statement (PR #1985).
+    provider = Provider::Registry.preferred_llm_provider
     raise "AI provider not configured" unless provider
 
     response = provider.extract_bank_statement(
diff --git a/app/models/period.rb b/app/models/period.rb
index b4857daee..b5a3c80b6 100644
--- a/app/models/period.rb
+++ b/app/models/period.rb
@@ -124,7 +124,10 @@ class Period
     def current_month_for(family)
       return from_key("current_month") unless family&.uses_custom_month_start?
 
-      family.current_custom_month_period
+      # Keep the semantic key so callers (e.g. the period picker) can identify
+      # this as "current month" even though the date range is custom.
+      custom_period = family.current_custom_month_period
+      new(key: "current_month", start_date: custom_period.start_date, end_date: custom_period.end_date)
     end
 
     def last_month_for(family)
@@ -134,7 +137,7 @@ class Period
       last_month_date = current_start - 1.day
       start_date = family.custom_month_start_for(last_month_date)
       end_date = family.custom_month_end_for(last_month_date)
-      custom(start_date: start_date, end_date: end_date)
+      new(key: "last_month", start_date: start_date, end_date: end_date)
     end
   end
 
diff --git a/app/models/plaid_entry/processor.rb b/app/models/plaid_entry/processor.rb
index c0a890038..cf2e1ff26 100644
--- a/app/models/plaid_entry/processor.rb
+++ b/app/models/plaid_entry/processor.rb
@@ -69,6 +69,7 @@ class PlaidEntry::Processor
 
     def matched_category
       return nil unless detailed_category
+      return nil unless account&.enable_category_matcher?
       @matched_category ||= category_matcher.match(detailed_category)
     end
 
diff --git a/app/models/plaid_item.rb b/app/models/plaid_item.rb
index deef9039e..c10e98740 100644
--- a/app/models/plaid_item.rb
+++ b/app/models/plaid_item.rb
@@ -29,8 +29,7 @@ class PlaidItem < ApplicationRecord
 
   # Get accounts from both new and legacy systems
   def accounts
-    # Preload associations to avoid N+1 queries
-    plaid_accounts
+    @accounts ||= plaid_accounts
       .includes(:account, account_provider: :account)
       .map(&:current_account)
       .compact
diff --git a/app/models/property/avm_import.rb b/app/models/property/avm_import.rb
new file mode 100644
index 000000000..3ac798277
--- /dev/null
+++ b/app/models/property/avm_import.rb
@@ -0,0 +1,86 @@
+# Creates a property account from an AVM provider lookup in two steps:
+# `lookup` spends one provider request to fetch the property's attributes
+# (type, year built, area) and estimated value, which the user reviews on a
+# preview screen; `create_account` then seeds the account from the confirmed
+# data without a second request.
+class Property::AvmImport
+  Error = Class.new(StandardError)
+
+  def initialize(family:, owner:, provider_key:, name:, address_attributes:)
+    @family = family
+    @owner = owner
+    @provider_key = provider_key.to_s
+    @name = name
+    @address_attributes = address_attributes
+  end
+
+  # Step 1: validates the inputs, then spends one provider request. Returns
+  # the fetched Provider::PropertyValuationConcept::PropertyValuation.
+  def lookup
+    validate_inputs!
+
+    provider = Provider::Registry.for_concept(:property_valuations).get_provider(provider_key)
+    raise Error.new(I18n.t("providers.property_valuation.not_configured")) if provider.nil?
+
+    response = provider.fetch_property_valuation(
+      line1: address_attributes[:line1],
+      locality: address_attributes[:locality],
+      region: address_attributes[:region],
+      postal_code: address_attributes[:postal_code]
+    )
+    raise Error.new(response.error.message) unless response.success?
+
+    response.data
+  end
+
+  # Step 2: creates the active property account from the user-confirmed
+  # valuation data. No provider request is made here.
+  def create_account(data)
+    validate_inputs!
+
+    account = nil
+    Account.transaction do
+      account = family.accounts.create!(
+        name: name,
+        balance: 0,
+        currency: data.currency,
+        status: "draft",
+        owner: owner,
+        accountable: Property.new(
+          subtype: data.property_type,
+          year_built: data.year_built,
+          area_value: data.area_value,
+          area_unit: data.area_unit,
+          avm_provider: provider_key,
+          avm_last_synced_on: Date.current,
+          # Providers only cover US addresses, so the country isn't collected
+          # in the lookup form. "US" matches the manual form's placeholder.
+          address_attributes: address_attributes.merge(country: "US")
+        )
+      )
+
+      result = account.set_current_balance(data.valuation)
+      raise Error.new(result.error) unless result.success?
+
+      account.activate!
+    end
+
+    account.auto_share_with_family! if family.share_all_by_default?
+    account
+  rescue ActiveRecord::RecordInvalid => e
+    raise Error.new(e.record.errors.full_messages.to_sentence.presence || e.message)
+  end
+
+  private
+    attr_reader :family, :owner, :provider_key, :name, :address_attributes
+
+    # The form marks these required, but a forged or JS-less submission can
+    # bypass that — validate locally before spending a monthly-budget request
+    # on a lookup that can't produce a property.
+    def validate_inputs!
+      missing = name.blank? ||
+        %i[line1 locality region postal_code].any? { |field| address_attributes[field].blank? }
+
+      raise Error.new(I18n.t("providers.property_valuation.missing_fields")) if missing
+    end
+end
diff --git a/app/models/provider/akahu.rb b/app/models/provider/akahu.rb
index 9d6dda11d..7606d52af 100644
--- a/app/models/provider/akahu.rb
+++ b/app/models/provider/akahu.rb
@@ -137,7 +137,7 @@ class Provider::Akahu
             "Akahu API: #{operation_name} failed (attempt #{retries}/#{max_retries}): " \
             "#{e.class}: #{e.message}. Retrying in #{delay}s..."
           )
-          Kernel.sleep(delay)
+          sleep(delay)
           retry
         end
 
diff --git a/app/models/provider/anthropic.rb b/app/models/provider/anthropic.rb
index 8e2e1fa50..ab05a0e0b 100644
--- a/app/models/provider/anthropic.rb
+++ b/app/models/provider/anthropic.rb
@@ -155,11 +155,50 @@ class Provider::Anthropic < Provider
   end
 
   def process_pdf(pdf_content:, model: "", family: nil)
-    raise Error, "process_pdf not yet implemented for Provider::Anthropic"
+    with_provider_response do
+      effective_model = model.presence || @default_model
+      raise Error, "Model does not support PDF processing: #{effective_model}" unless supports_pdf_processing?(model: effective_model)
+
+      trace = create_langfuse_trace(
+        name: "anthropic.process_pdf",
+        input: { pdf_size: pdf_content&.bytesize }
+      )
+
+      result = PdfProcessor.new(
+        client,
+        model: effective_model,
+        pdf_content: pdf_content,
+        langfuse_trace: trace,
+        family: family
+      ).process
+
+      upsert_langfuse_trace(trace: trace, output: result.to_h)
+
+      result
+    end
   end
 
   def extract_bank_statement(pdf_content:, model: "", family: nil)
-    raise Error, "extract_bank_statement not yet implemented for Provider::Anthropic"
+    with_provider_response do
+      effective_model = model.presence || @default_model
+
+      trace = create_langfuse_trace(
+        name: "anthropic.extract_bank_statement",
+        input: { pdf_size: pdf_content&.bytesize }
+      )
+
+      result = BankStatementExtractor.new(
+        client: client,
+        pdf_content: pdf_content,
+        model: effective_model,
+        langfuse_trace: trace,
+        family: family
+      ).extract
+
+      upsert_langfuse_trace(trace: trace, output: { transaction_count: result[:transactions].size })
+
+      result
+    end
   end
 
   def chat_response(
diff --git a/app/models/provider/anthropic/bank_statement_extractor.rb b/app/models/provider/anthropic/bank_statement_extractor.rb
new file mode 100644
index 000000000..e91d44b47
--- /dev/null
+++ b/app/models/provider/anthropic/bank_statement_extractor.rb
@@ -0,0 +1,229 @@
+class Provider::Anthropic::BankStatementExtractor
+  include Provider::Anthropic::Concerns::UsageRecorder
+
+  TOOL_NAME = "report_bank_statement".freeze
+
+  # Mirrors Provider::Anthropic::PdfProcessor::MAX_PDF_BYTES.
+  MAX_PDF_BYTES = 32 * 1024 * 1024
+
+  attr_reader :client, :model, :pdf_content, :langfuse_trace, :family
+
+  def initialize(client:, model:, pdf_content:, langfuse_trace: nil, family: nil)
+    @client = client
+    @model = model
+    @pdf_content = pdf_content
+    @langfuse_trace = langfuse_trace
+    @family = family
+  end
+
+  def extract
+    raise Provider::Anthropic::Error, "PDF content is required" if pdf_content.blank?
+    if pdf_content.bytesize > MAX_PDF_BYTES
+      raise Provider::Anthropic::Error,
+            "PDF exceeds Anthropic's 32 MB limit (#{pdf_content.bytesize} bytes)"
+    end
+
+    span = langfuse_trace&.span(name: "extract_bank_statement_api_call", input: {
+      model: model,
+      pdf_size: pdf_content.bytesize
+    })
+
+    response = client.messages.create(
+      model: model,
+      max_tokens: max_tokens,
+      system_: instructions,
+      messages: [ { role: "user", content: user_content } ],
+      tools: [ output_tool ],
+      tool_choice: { type: "tool", name: TOOL_NAME, disable_parallel_tool_use: true }
+    )
+
+    parsed = extract_tool_input(response)
+    result = build_result(parsed)
+
+    truncated = stop_reason(response) == :max_tokens
+    if truncated
+      Rails.logger.warn(
+        "[BankStatementExtractor] response truncated by max_tokens — extracted #{result[:transactions].size} " \
+        "transactions but more may be present in the statement. Raise ANTHROPIC_MAX_TOKENS or chunk the PDF."
+      )
+      result[:truncated] = true
+    end
+
+    record_usage(model, response.usage, operation: "extract_bank_statement", metadata: {
+      pdf_size: pdf_content.bytesize,
+      transaction_count: result[:transactions].size,
+      truncated: truncated
+    })
+
+    span&.end(output: { transaction_count: result[:transactions].size }, usage: usage_hash(response.usage))
+    result
+  rescue => e
+    span&.end(output: { error: e.message }, level: "ERROR")
+    record_usage_error(model, operation: "extract_bank_statement", error: e, metadata: { pdf_size: pdf_content&.bytesize })
+    raise
+  end
+
+  private
+    def max_tokens
+      ENV.fetch("ANTHROPIC_MAX_TOKENS", 4096).to_i
+    end
+
+    def user_content
+      [
+        {
+          type: "document",
+          source: {
+            type: "base64",
+            media_type: "application/pdf",
+            data: Base64.strict_encode64(pdf_content)
+          }
+        },
+        {
+          type: "text",
+          text: "Extract every transaction from this bank statement and return them via the report_bank_statement tool."
+        }
+      ]
+    end
+
+    def output_tool
+      {
+        name: TOOL_NAME,
+        description: "Return the full set of transactions and statement metadata extracted from the PDF.",
+        input_schema: {
+          type: "object",
+          properties: {
+            bank_name: { type: [ "string", "null" ] },
+            account_holder: { type: [ "string", "null" ] },
+            account_number: { type: [ "string", "null" ], description: "Typically last 4 digits only." },
+            statement_period: {
+              type: "object",
+              properties: {
+                start_date: { type: [ "string", "null" ], description: "YYYY-MM-DD" },
+                end_date: { type: [ "string", "null" ], description: "YYYY-MM-DD" }
+              },
+              required: [],
+              additionalProperties: false
+            },
+            opening_balance: { type: [ "number", "null" ] },
+            closing_balance: { type: [ "number", "null" ] },
+            transactions: {
+              type: "array",
+              description: "Every transaction in the statement, in document order.",
+              items: {
+                type: "object",
+                properties: {
+                  date: { type: "string", description: "YYYY-MM-DD" },
+                  description: { type: "string" },
+                  amount: { type: "number", description: "Negative for debits / expenses, positive for credits / deposits." },
+                  reference: { type: [ "string", "null" ] },
+                  category: { type: [ "string", "null" ] }
+                },
+                required: [ "date", "description", "amount" ],
+                additionalProperties: false
+              }
+            }
+          },
+          required: [ "transactions" ],
+          additionalProperties: false
+        }
+      }
+    end
+
+    def instructions
+      <<~INSTRUCTIONS
+        Extract bank statement data from the attached PDF and return the result via the report_bank_statement tool.
+
+        Rules:
+          - Extract EVERY transaction in document order
+          - Negative amounts for debits / expenses, positive for credits / deposits
+          - Dates in YYYY-MM-DD
+          - Use null for any field you cannot read; do not invent values
+      INSTRUCTIONS
+    end
+
+    def stop_reason(response)
+      raw = response.respond_to?(:stop_reason) ? response.stop_reason : nil
+      raw.to_s.to_sym if raw
+    end
+
+    def extract_tool_input(response)
+      tool_use = Array(response.content).find { |block| block_type(block) == :tool_use }
+      raise Provider::Anthropic::Error, "Model did not invoke #{TOOL_NAME}" unless tool_use
+
+      input = block_input(tool_use)
+      input = JSON.parse(input) if input.is_a?(String)
+      input
+    end
+
+    def build_result(parsed)
+      # Intentionally NOT deduplicated, unlike Provider::Openai's extractor. That
+      # one chunks the PDF text with overlap and must drop transactions repeated
+      # across adjacent chunks. We send the whole PDF as a single native document
+      # block — no chunk artifacts — so deduping here would wrongly merge
+      # legitimate same-day, same-amount rows (e.g. two identical purchases).
+      # Preserve every transaction the model returns.
+      transactions = Array(parsed["transactions"] || parsed[:transactions]).map { |t| normalize_transaction(t) }.compact
+
+      {
+        transactions: transactions,
+        period: {
+          start_date: dig_period(parsed, :start_date),
+          end_date: dig_period(parsed, :end_date)
+        },
+        account_holder: parsed["account_holder"] || parsed[:account_holder],
+        account_number: parsed["account_number"] || parsed[:account_number],
+        bank_name: parsed["bank_name"] || parsed[:bank_name],
+        opening_balance: parsed["opening_balance"] || parsed[:opening_balance],
+        closing_balance: parsed["closing_balance"] || parsed[:closing_balance]
+      }
+    end
+
+    def dig_period(parsed, key)
+      period = parsed["statement_period"] || parsed[:statement_period]
+      return nil unless period.is_a?(Hash)
+      period[key.to_s] || period[key]
+    end
+
+    def normalize_transaction(txn)
+      return nil unless txn.is_a?(Hash)
+
+      {
+        date: parse_date(txn["date"] || txn[:date]),
+        amount: parse_amount(txn["amount"] || txn[:amount]),
+        name: txn["description"] || txn[:description] || txn["name"] || txn[:name],
+        category: txn["category"] || txn[:category],
+        notes: txn["reference"] || txn[:reference]
+      }
+    end
+
+    def parse_date(date_str)
+      return nil if date_str.blank?
+      Date.parse(date_str.to_s).strftime("%Y-%m-%d")
+    rescue ArgumentError
+      nil
+    end
+
+    def parse_amount(amount)
+      return nil if amount.nil?
+      return amount.to_f if amount.is_a?(Numeric)
+      amount.to_s.gsub(/[^0-9.\-]/, "").to_f
+    end
+
+    def block_type(block)
+      raw = block.respond_to?(:type) ? block.type : block[:type] || block["type"]
+      raw.to_s.to_sym
+    end
+
+    def block_input(block)
+      block.respond_to?(:input) ? block.input : (block[:input] || block["input"])
+    end
+
+    def usage_hash(raw_usage)
+      return {} unless raw_usage
+      {
+        "input_tokens" => raw_usage.input_tokens.to_i,
+        "output_tokens" => raw_usage.output_tokens.to_i,
+        "total_tokens" => raw_usage.input_tokens.to_i + raw_usage.output_tokens.to_i
+      }
+    end
+end
diff --git a/app/models/provider/anthropic/chat_parser.rb b/app/models/provider/anthropic/chat_parser.rb
index 1f22c465d..139df5887 100644
--- a/app/models/provider/anthropic/chat_parser.rb
+++ b/app/models/provider/anthropic/chat_parser.rb
@@ -50,7 +50,9 @@ class Provider::Anthropic::ChatParser
             id: block_value(block, :id),
             call_id: block_value(block, :id),
             function_name: block_value(block, :name),
-            function_args: input.is_a?(String) ? input : input.to_json
+            # A tool_use block with no arguments streams in as an empty string.
+            # Normalize it to an empty JSON object so downstream JSON.parse succeeds.
+            function_args: input.is_a?(String) ? input.presence || "{}" : (input || {}).to_json
           )
         end
     end
diff --git a/app/models/provider/anthropic/pdf_processor.rb b/app/models/provider/anthropic/pdf_processor.rb
new file mode 100644
index 000000000..dc6dc2c96
--- /dev/null
+++ b/app/models/provider/anthropic/pdf_processor.rb
@@ -0,0 +1,185 @@
+class Provider::Anthropic::PdfProcessor
+  include Provider::Anthropic::Concerns::UsageRecorder
+
+  TOOL_NAME = "report_document_analysis".freeze
+
+  # Anthropic enforces a 32 MB limit on the whole Messages *request body*, and
+  # the PDF travels base64-encoded (~4/3 larger) inside that body alongside the
+  # JSON envelope (instructions, tool schema). So a 32 MB raw PDF would encode
+  # to ~42 MB and be rejected. Cap the raw bytes at 3/4 of the request budget,
+  # minus a generous envelope reserve, so the encoded request stays under the
+  # limit. Guarding upstream also avoids base64-encoding an over-size blob in
+  # vain (peak heap before the API would reject it).
+  MAX_REQUEST_BYTES = 32 * 1024 * 1024
+  REQUEST_ENVELOPE_BYTES = 1 * 1024 * 1024
+  MAX_PDF_BYTES = (MAX_REQUEST_BYTES - REQUEST_ENVELOPE_BYTES) * 3 / 4
+
+  attr_reader :client, :model, :pdf_content, :langfuse_trace, :family
+
+  def initialize(client, model:, pdf_content:, langfuse_trace: nil, family: nil)
+    @client = client
+    @model = model
+    @pdf_content = pdf_content
+    @langfuse_trace = langfuse_trace
+    @family = family
+  end
+
+  def process
+    raise Provider::Anthropic::Error, "PDF content is required" if pdf_content.blank?
+    if pdf_content.bytesize > MAX_PDF_BYTES
+      raise Provider::Anthropic::Error,
+            "PDF is too large (#{pdf_content.bytesize} bytes); base64-encoded it would exceed Anthropic's 32 MB request limit"
+    end
+
+    span = langfuse_trace&.span(name: "process_pdf_api_call", input: {
+      model: model,
+      pdf_size: pdf_content&.bytesize
+    })
+
+    response = client.messages.create(
+      model: model,
+      max_tokens: max_tokens,
+      system_: instructions,
+      messages: [ { role: "user", content: user_content } ],
+      tools: [ output_tool ],
+      tool_choice: { type: "tool", name: TOOL_NAME, disable_parallel_tool_use: true }
+    )
+
+    parsed = extract_tool_input(response)
+    result = build_result(parsed)
+
+    record_usage(model, response.usage, operation: "process_pdf", metadata: { pdf_size: pdf_content.bytesize })
+
+    span&.end(output: result.to_h, usage: usage_hash(response.usage))
+    result
+  rescue => e
+    span&.end(output: { error: e.message }, level: "ERROR")
+    record_usage_error(model, operation: "process_pdf", error: e, metadata: { pdf_size: pdf_content&.bytesize })
+    raise
+  end
+
+  private
+    PdfProcessingResult = Provider::LlmConcept::PdfProcessingResult
+
+    def max_tokens
+      ENV.fetch("ANTHROPIC_MAX_TOKENS", 4096).to_i
+    end
+
+    def user_content
+      [
+        {
+          type: "document",
+          source: {
+            type: "base64",
+            media_type: "application/pdf",
+            data: Base64.strict_encode64(pdf_content)
+          }
+        },
+        {
+          type: "text",
+          text: "Analyze the attached document and return the result via the report_document_analysis tool."
+        }
+      ]
+    end
+
+    def output_tool
+      {
+        name: TOOL_NAME,
+        description: "Return the structured analysis of the attached document.",
+        input_schema: {
+          type: "object",
+          properties: {
+            document_type: {
+              type: "string",
+              enum: Import::DOCUMENT_TYPES,
+              description: "Classification of the document."
+            },
+            summary: {
+              type: "string",
+              description: "Concise human-readable summary of the document."
+            },
+            extracted_data: {
+              type: "object",
+              properties: {
+                institution_name: { type: [ "string", "null" ] },
+                statement_period_start: { type: [ "string", "null" ], pattern: "^\\d{4}-\\d{2}-\\d{2}$", description: "YYYY-MM-DD or null" },
+                statement_period_end: { type: [ "string", "null" ], pattern: "^\\d{4}-\\d{2}-\\d{2}$", description: "YYYY-MM-DD or null" },
+                transaction_count: { type: [ "integer", "null" ] },
+                opening_balance: { type: [ "number", "null" ] },
+                closing_balance: { type: [ "number", "null" ] },
+                currency: { type: [ "string", "null" ] },
+                account_holder: { type: [ "string", "null" ] }
+              },
+              required: [],
+              additionalProperties: false
+            }
+          },
+          required: [ "document_type", "summary", "extracted_data" ],
+          additionalProperties: false
+        }
+      }
+    end
+
+    def instructions
+      <<~INSTRUCTIONS
+        You analyze financial documents. For the attached PDF, classify the document type,
+        summarize it, and extract key metadata. Return the result via the report_document_analysis tool.
+
+        Classification options:
+          - bank_statement: bank account statements (incl. mobile money / digital wallets)
+          - credit_card_statement: credit card statements
+          - investment_statement: brokerage / investment statements
+          - financial_document: tax forms, receipts, invoices, financial reports
+          - contract: legal agreements, loans, terms of service
+          - other: anything else
+
+        Rules:
+          - Be factual; only report what is clearly visible
+          - If a field is unclear/redacted, return null for it
+          - Do not invent figures or names you cannot read
+          - For statements with many transactions, return the count rather than enumerating them
+      INSTRUCTIONS
+    end
+
+    def extract_tool_input(response)
+      tool_use = Array(response.content).find { |block| block_type(block) == :tool_use }
+      raise Provider::Anthropic::Error, "Model did not invoke #{TOOL_NAME}" unless tool_use
+
+      input = block_input(tool_use)
+      input = JSON.parse(input) if input.is_a?(String)
+      input
+    end
+
+    def build_result(parsed)
+      PdfProcessingResult.new(
+        summary: parsed["summary"] || parsed[:summary],
+        document_type: normalize_document_type(parsed["document_type"] || parsed[:document_type]),
+        extracted_data: parsed["extracted_data"] || parsed[:extracted_data] || {}
+      )
+    end
+
+    def normalize_document_type(doc_type)
+      return "other" if doc_type.blank?
+
+      normalized = doc_type.to_s.strip.downcase.gsub(/\s+/, "_")
+      Import::DOCUMENT_TYPES.include?(normalized) ? normalized : "other"
+    end
+
+    def block_type(block)
+      raw = block.respond_to?(:type) ? block.type : block[:type] || block["type"]
+      raw.to_s.to_sym
+    end
+
+    def block_input(block)
+      block.respond_to?(:input) ? block.input : (block[:input] || block["input"])
+    end
+
+    def usage_hash(raw_usage)
+      return {} unless raw_usage
+      {
+        "input_tokens" => raw_usage.input_tokens.to_i,
+        "output_tokens" => raw_usage.output_tokens.to_i,
+        "total_tokens" => raw_usage.input_tokens.to_i + raw_usage.output_tokens.to_i
+      }
+    end
+end
diff --git a/app/models/provider/binance_public.rb b/app/models/provider/binance_public.rb
index cc4a71f7c..6dc5b5c20 100644
--- a/app/models/provider/binance_public.rb
+++ b/app/models/provider/binance_public.rb
@@ -41,6 +41,11 @@ class Provider::BinancePublic < Provider
   # enough and avoids surfacing transient depeg ticks from market data.
   USD_STABLECOINS = %w[USDT USDC BUSD DAI FDUSD TUSD USDP PYUSD].freeze
 
+  # Trailing separator between base and quote in a stored pair ticker
+  # ("BTC-USD", "BTC/USD", "BTC_USD"), stripped so parse_ticker builds a valid
+  # Binance pair.
+  QUOTE_SEPARATOR = /[-\/_ ]\z/
+
   # Symbol prefix applied by holdings processors (CoinStats, Coinbase, Kraken,
   # Binance, SimpleFIN, Lunchflow) to distinguish crypto from stock tickers.
   CRYPTO_PREFIX = "CRYPTO:".freeze
@@ -68,12 +73,23 @@ class Provider::BinancePublic < Provider
 
   def search_securities(symbol, country_code: nil, exchange_operating_mic: nil)
     with_provider_response do
-      query = symbol.to_s.strip.upcase.delete_prefix(CRYPTO_PREFIX)
+      # Collapse separators so the canonical "BTC-USD" / "TRX/USDT" form is
+      # treated like Binance's own unseparated "BTCUSD" — the existing narrow
+      # matching then resolves it instead of falling through to an offline row.
+      query = symbol.to_s.strip.upcase.delete_prefix(CRYPTO_PREFIX).gsub(/[\s\-\/_]/, "")
       next [] if query.empty?
 
-      if USD_STABLECOINS.include?(query)
-        next [ stablecoin_search_result(query) ]
+      # Stablecoins have no Binance self-pair, so a USD-quoted query gets a
+      # synthetic 1.0 USD result: the bare coin ("USDT", or coins that end in
+      # USD like PYUSD/FDUSD), or the "<coin>USD" form ("USDTUSD", from a pasted
+      # "USDT-USD"). A non-USD quote like "USDTEUR" has a real Binance pair and
+      # must fall through to normal matching, so only the USD case short-circuits.
+      stablecoin = if USD_STABLECOINS.include?(query)
+        query
+      elsif query.end_with?("USD") && USD_STABLECOINS.include?(query.delete_suffix("USD"))
+        query.delete_suffix("USD")
       end
+      next [ stablecoin_search_result(stablecoin) ] if stablecoin
 
       symbols = exchange_info_symbols
 
@@ -86,8 +102,8 @@ class Provider::BinancePublic < Provider
 
         # Match on either the base asset (so "BTC" surfaces every BTC pair) or
         # the full Binance pair symbol (so users pasting their own portfolio
-        # ticker like "BTCEUR" or "BTCUSD" — which prefixes Binance's raw
-        # "BTCUSDT" — also hit a result).
+        # ticker like "BTCEUR", "BTCUSD", or "BTC-USD" — which prefix Binance's
+        # raw "BTCUSDT" once separators are collapsed — also hit a result).
         base.include?(query) || symbol == query || symbol.start_with?(query)
       end
 
@@ -319,7 +335,9 @@ class Provider::BinancePublic < Provider
         display_currency = QUOTE_TO_CURRENCY[quote]
         next unless ticker_up.end_with?(display_currency)
 
-        base = ticker_up.delete_suffix(display_currency)
+        # Strip the quote plus any separator so the canonical "BTC-USD" form
+        # yields "BTC" (not "BTC-") and builds a valid "BTCUSDT" pair.
+        base = ticker_up.delete_suffix(display_currency).sub(QUOTE_SEPARATOR, "")
         next if base.empty?
 
         # "{stablecoin}USD" form (e.g. "USDTUSD" produced by search_securities)
diff --git a/app/models/provider/coinbase.rb b/app/models/provider/coinbase.rb
index ec68cda02..bd451df5e 100644
--- a/app/models/provider/coinbase.rb
+++ b/app/models/provider/coinbase.rb
@@ -131,21 +131,27 @@ class Provider::Coinbase
       results.first(limit)
     end
 
-    # Generate JWT token for CDP API authentication
-    # Uses Ed25519 signing algorithm
-    def generate_jwt(method, path)
-      # Decode the base64 private key
-      private_key_bytes = Base64.decode64(api_secret)
+    # Parses a PEM EC private key, normalizing literal \n sequences to real
+    # newlines. Coinbase CDP keys are often stored or pasted as a single-line
+    # string with escaped newlines (e.g. copied directly from the JSON download
+    # file). Both forms are accepted.
+    def parse_ec_private_key(pem)
+      OpenSSL::PKey::EC.new(pem.to_s.gsub('\n', "\n"))
+    end
 
-      # Create Ed25519 signing key
-      signing_key = Ed25519::SigningKey.new(private_key_bytes[0, 32])
+    # Generate JWT token for CDP API authentication.
+    # Uses ES256 (ECDSA P-256) signing — matches the key format Coinbase CDP
+    # issues. api_secret must be a PEM EC private key
+    # (-----BEGIN EC PRIVATE KEY-----) either with real newlines or literal \n.
+    def generate_jwt(method, path)
+      private_key = parse_ec_private_key(api_secret)
 
       now = Time.now.to_i
       uri = "#{method} api.coinbase.com#{path}"
 
       # JWT header
       header = {
-        alg: "EdDSA",
+        alg: "ES256",
         kid: api_key,
         nonce: SecureRandom.hex(16),
         typ: "JWT"
@@ -164,10 +170,15 @@ class Provider::Coinbase
       encoded_header = Base64.urlsafe_encode64(header.to_json, padding: false)
       encoded_payload = Base64.urlsafe_encode64(payload.to_json, padding: false)
 
-      # Sign
+      # Sign with ECDSA SHA-256
       message = "#{encoded_header}.#{encoded_payload}"
-      signature = signing_key.sign(message)
-      encoded_signature = Base64.urlsafe_encode64(signature, padding: false)
+      der_sig = private_key.sign(OpenSSL::Digest::SHA256.new, message)
+
+      # Convert DER-encoded signature to raw r||s (required by JWT spec)
+      asn1 = OpenSSL::ASN1.decode(der_sig)
+      r = asn1.value[0].value.to_s(2).rjust(32, "\x00")[-32..]
+      s = asn1.value[1].value.to_s(2).rjust(32, "\x00")[-32..]
+      encoded_signature = Base64.urlsafe_encode64(r + s, padding: false)
 
       "#{message}.#{encoded_signature}"
     end
diff --git a/app/models/provider/coinstats.rb b/app/models/provider/coinstats.rb
index 7dda1f5ac..5c6289fbb 100644
--- a/app/models/provider/coinstats.rb
+++ b/app/models/provider/coinstats.rb
@@ -2,12 +2,26 @@
 # Handles authentication and requests to the CoinStats OpenAPI.
 class Provider::Coinstats < Provider
   include HTTParty
+  include Provider::RateLimitable
   extend SslConfigurable
 
   # Subclass so errors caught in this provider are raised as Provider::Coinstats::Error
   Error = Class.new(Provider::Error)
+  class RateLimitError < Error
+    attr_reader :retry_after
+
+    def initialize(message, details: nil, retry_after: nil)
+      super(message, details: details)
+      @retry_after = retry_after
+    end
+  end
 
   BASE_URL = "https://openapiv1.coinstats.app"
+  PROVIDER_ENV_PREFIX = "COINSTATS"
+  MIN_REQUEST_INTERVAL = 0.5
+  MAX_RETRIES = 2
+  INITIAL_RETRY_DELAY = 1
+  MAX_RETRY_DELAY = 10
 
   headers "User-Agent" => "Sure Finance CoinStats Client (https://github.com/we-promise/sure)"
   default_options.merge!({ timeout: 120 }.merge(httparty_ssl_options))
@@ -322,12 +336,14 @@ class Provider::Coinstats < Provider
   # @return [Provider::Response] Response with DeFi position data
   def get_wallet_defi(address:, connection_id:)
     with_provider_response do
-      res = self.class.get(
-        "#{BASE_URL}/wallet/defi",
-        headers: auth_headers,
-        query: { address: address, connectionId: connection_id }
-      )
-      handle_response(res)
+      with_retries("GET /wallet/defi") do
+        res = self.class.get(
+          "#{BASE_URL}/wallet/defi",
+          headers: auth_headers,
+          query: { address: address, connectionId: connection_id }
+        )
+        handle_response(res)
+      end
     end
   rescue SocketError, Net::OpenTimeout, Net::ReadTimeout => e
     Rails.logger.error "CoinStats API: GET /wallet/defi failed: #{e.class}: #{e.message}"
@@ -343,12 +359,14 @@ class Provider::Coinstats < Provider
     return with_provider_response { [] } if wallets.blank?
 
     with_provider_response do
-      res = self.class.get(
-        "#{BASE_URL}/wallet/balances",
-        headers: auth_headers,
-        query: { wallets: wallets }
-      )
-      handle_response(res)
+      with_retries("GET /wallet/balances") do
+        res = self.class.get(
+          "#{BASE_URL}/wallet/balances",
+          headers: auth_headers,
+          query: { wallets: wallets }
+        )
+        handle_response(res)
+      end
     end
   rescue SocketError, Net::OpenTimeout, Net::ReadTimeout => e
     Rails.logger.error "CoinStats API: GET /wallet/balances failed: #{e.class}: #{e.message}"
@@ -385,12 +403,14 @@ class Provider::Coinstats < Provider
     return with_provider_response { [] } if wallets.blank?
 
     with_provider_response do
-      res = self.class.get(
-        "#{BASE_URL}/wallet/transactions",
-        headers: auth_headers,
-        query: { wallets: wallets }
-      )
-      handle_response(res)
+      with_retries("GET /wallet/transactions") do
+        res = self.class.get(
+          "#{BASE_URL}/wallet/transactions",
+          headers: auth_headers,
+          query: { wallets: wallets }
+        )
+        handle_response(res)
+      end
     end
   rescue SocketError, Net::OpenTimeout, Net::ReadTimeout => e
     Rails.logger.error "CoinStats API: GET /wallet/transactions failed: #{e.class}: #{e.message}"
@@ -429,6 +449,12 @@ class Provider::Coinstats < Provider
 
   private
 
+    def default_error_transformer(error)
+      return error if error.is_a?(Error)
+
+      super
+    end
+
     def auth_headers
       {
         "X-API-KEY" => api_key,
@@ -436,6 +462,36 @@ class Provider::Coinstats < Provider
       }
     end
 
+    def with_retries(operation_name, max_retries: MAX_RETRIES)
+      retries = 0
+
+      begin
+        throttle_request
+        yield
+      rescue RateLimitError => e
+        retries += 1
+
+        if retries <= max_retries
+          delay = e.retry_after.presence || calculate_retry_delay(retries)
+          Rails.logger.warn(
+            "CoinStats API: #{operation_name} rate limited " \
+            "(attempt #{retries}/#{max_retries}). Retrying in #{delay}s..."
+          )
+          sleep(delay) if delay.to_f.positive?
+          retry
+        end
+
+        Rails.logger.error "CoinStats API: #{operation_name} rate limited after #{max_retries} retries"
+        raise
+      end
+    end
+
+    def calculate_retry_delay(retry_count)
+      base_delay = INITIAL_RETRY_DELAY * (2 ** (retry_count - 1))
+      jitter = base_delay * rand * 0.25
+      [ base_delay + jitter, MAX_RETRY_DELAY ].min
+    end
+
     # The CoinStats API uses standard HTTP status codes to indicate the success or failure of requests.
     # https://coinstats.app/api-docs/errors
     def handle_response(response)
@@ -454,12 +510,15 @@ class Provider::Coinstats < Provider
       when 404
         log_api_error(response, "Not Found")
         raise_api_error(response, fallback: "CoinStats: Resource not found")
+      when 406
+        log_api_error(response, "Not Acceptable")
+        raise_api_error(response, fallback: "CoinStats: Credits limit reached")
       when 409
         log_api_error(response, "Conflict")
         raise_api_error(response, fallback: "CoinStats: Resource conflict")
       when 429
         log_api_error(response, "Too Many Requests")
-        raise_api_error(response, fallback: "CoinStats: Rate limit exceeded, try again later")
+        raise_api_error(response, fallback: "CoinStats: Rate limit exceeded, try again later", error_class: RateLimitError)
       when 500
         log_api_error(response, "Internal Server Error")
         raise_api_error(response, fallback: "CoinStats: Server error, try again later")
@@ -476,14 +535,19 @@ class Provider::Coinstats < Provider
       Rails.logger.error "CoinStats API: #{response.code} #{error_type} - #{response.body}"
     end
 
-    def raise_api_error(response, fallback:)
+    def raise_api_error(response, fallback:, error_class: Error)
       error_payload = parse_error_payload(response.body)
       message = error_payload[:message].presence || fallback
       request_id = error_payload[:request_id].presence
+      retry_after = retry_after_seconds(response)
 
       message = "#{message} (requestId: #{request_id})" if request_id.present?
 
-      raise Error.new(message, details: error_payload.compact.presence)
+      if error_class == RateLimitError
+        raise error_class.new(message, details: error_payload.compact.presence, retry_after: retry_after)
+      end
+
+      raise error_class.new(message, details: error_payload.compact.presence)
     end
 
     def parse_error_payload(body)
@@ -498,4 +562,13 @@ class Provider::Coinstats < Provider
     rescue JSON::ParserError
       {}
     end
+
+    def retry_after_seconds(response)
+      retry_after = response.headers["Retry-After"] || response.headers["retry-after"]
+      return nil if retry_after.blank?
+
+      Integer(retry_after)
+    rescue ArgumentError, NoMethodError
+      nil
+    end
 end
diff --git a/app/models/provider/enable_banking.rb b/app/models/provider/enable_banking.rb
index 88df7ec62..540accfc4 100644
--- a/app/models/provider/enable_banking.rb
+++ b/app/models/provider/enable_banking.rb
@@ -39,9 +39,12 @@ class Provider::EnableBanking
   # @param psu_type [String] "personal" or "business"
   # @param maximum_consent_validity [Integer, nil] Max consent duration in seconds from ASPSP (nil = use 90 days)
   # @param language [String, nil] Two-letter language code (e.g. "fr", "en")
+  # @param auth_method [String, nil] Name of a specific authentication method to use (from the ASPSP's
+  #   auth_methods list). Required to drive DECOUPLED/EMBEDDED banks that expose several methods; when nil
+  #   Enable Banking falls back to the ASPSP's default method.
   # @return [Hash] Contains :url and :authorization_id
   def start_authorization(aspsp_name:, aspsp_country:, redirect_url:, state: nil,
-                          psu_type: "personal", maximum_consent_validity: nil, language: nil)
+                          psu_type: "personal", maximum_consent_validity: nil, language: nil, auth_method: nil)
     max_seconds = maximum_consent_validity ? [ maximum_consent_validity, 1 ].max : 90.days.to_i
     valid_until = [ Time.current + max_seconds.seconds, Time.current + 90.days ].min
 
@@ -60,6 +63,7 @@ class Provider::EnableBanking
       psu_type: psu_type
     }
     body[:language] = language if language.present?
+    body[:auth_method] = auth_method if auth_method.present?
     body = body.compact
 
     response = self.class.post(
@@ -243,7 +247,8 @@ class Provider::EnableBanking
       when 204
         {}
       when 400
-        raise EnableBankingError.new("Bad request to Enable Banking API: #{response.body}", :bad_request)
+        response_data = parse_error_response_body(response)
+        raise EnableBankingError.new("Bad request to Enable Banking API: #{response.body}", :bad_request, response_data: response_data)
       when 401
         raise EnableBankingError.new("Invalid credentials or expired JWT", :unauthorized)
       when 403
@@ -258,10 +263,19 @@ class Provider::EnableBanking
       when 429
         raise EnableBankingError.new("Rate limit exceeded. Please try again later.", :rate_limited)
       else
-        raise EnableBankingError.new("Failed to fetch data: #{response.code} #{response.message} - #{response.body}", :fetch_failed)
+        response_data = parse_error_response_body(response)
+        raise EnableBankingError.new("Failed to fetch data: #{response.code} #{response.message} - #{response.body}", :fetch_failed, response_data: response_data)
       end
     end
 
+    def parse_error_response_body(response)
+      return {} if response.body.blank?
+
+      JSON.parse(response.body, symbolize_names: true)
+    rescue JSON::ParserError
+      { raw_body: response.body.to_s }
+    end
+
     def parse_response_body(response)
       return {} if response.body.blank?
 
diff --git a/app/models/provider/eodhd.rb b/app/models/provider/eodhd.rb
index ccb0f412a..b4dfc57b0 100644
--- a/app/models/provider/eodhd.rb
+++ b/app/models/provider/eodhd.rb
@@ -38,7 +38,8 @@ class Provider::Eodhd < Provider
     "XSTO" => "ST",
     "XKRX" => "KS",
     "XBOM" => "BSE",
-    "XNSE" => "NSE"
+    "XNSE" => "NSE",
+    "EUFUND" => "EUFUND"
   }.freeze
 
   EODHD_EXCHANGE_TO_MIC = {
@@ -66,7 +67,8 @@ class Provider::Eodhd < Provider
     "AU" => "AUD", "TSE" => "JPY", "MI" => "EUR", "MC" => "EUR",
     "OL" => "NOK", "HE" => "EUR", "CO" => "DKK",
     "ST" => "SEK", "KS" => "KRW", "BSE" => "INR",
-    "NSE" => "INR"
+    "NSE" => "INR",
+    "EUFUND" => "EUR"
   }.freeze
 
   def initialize(api_key)
@@ -131,7 +133,7 @@ class Provider::Eodhd < Provider
 
       parsed.first(25).map do |security|
         eodhd_exchange = security.dig("Exchange")
-        mic = EODHD_EXCHANGE_TO_MIC[eodhd_exchange]
+        mic = EODHD_EXCHANGE_TO_MIC[eodhd_exchange] || eodhd_exchange
         country = EODHD_COUNTRY_TO_CODE[security.dig("Country")]
         code = security.dig("Code")
         currency = security.dig("Currency")
diff --git a/app/models/provider/frankfurter.rb b/app/models/provider/frankfurter.rb
new file mode 100644
index 000000000..aca0e7511
--- /dev/null
+++ b/app/models/provider/frankfurter.rb
@@ -0,0 +1,151 @@
+# Frankfurter (https://frankfurter.dev), a free, keyless, open-source FX rates
+# API backed by exchange rates blended across multiple central banks (ECB,
+# FED, BOC, etc). No auth, no key, no published rate limit, and self-hostable
+# (out of scope here, we just consume the public instance, with
+# FRANKFURTER_URL as an escape hatch for self-hosters later).
+#
+# This targets Frankfurter's v2 API (https://api.frankfurter.dev/v2), not v1.
+# Per Frankfurter's own root endpoint, v1 is status "frozen" (stable, no new
+# features) while v2 is status "current" (the actively developed version)
+# and covers far more currencies (201 across 84 central banks, vs v1's ~30
+# ECB-only). v2 also carries forward weekends/holidays server-side (a single
+# date lookup on a non-trading day returns the last known rate directly), so
+# unlike v1 this provider does not need its own lookback-window logic.
+class Provider::Frankfurter < Provider
+  include ExchangeRateConcept, RateLimitable
+  extend SslConfigurable
+
+  Error = Class.new(Provider::Error)
+  RateLimitError = Class.new(Error)
+
+  # No published rate limit, but a light throttle is cheap insurance.
+  MIN_REQUEST_INTERVAL = 0.15
+
+  def initialize
+    # No API key required, public endpoint only.
+  end
+
+  def healthy?
+    with_provider_response do
+      body = get_json("/currencies")
+      raise Error, "Frankfurter currencies endpoint returned no data" if body.blank?
+      true
+    end
+  end
+
+  def usage
+    with_provider_response do
+      UsageData.new(used: nil, limit: nil, utilization: nil, plan: "Free (no key required)")
+    end
+  end
+
+  # GET /rate/{base}/{quote}?date=... -> { date:, base:, quote:, rate: }.
+  # Frankfurter carries forward weekends/holidays itself, so the returned
+  # date may differ from the requested one but is never simply missing.
+  def fetch_exchange_rate(from:, to:, date:)
+    from = sanitize_currency(from)
+    to = sanitize_currency(to)
+
+    with_provider_response do
+      if from == to
+        Rate.new(date: date, from: from, to: to, rate: 1.0)
+      else
+        body = get_json("/rate/#{from}/#{to}", "date" => date.to_s)
+        raise Error, "Unexpected Frankfurter response shape" unless body.is_a?(Hash) && body["rate"]
+
+        begin
+          parsed_date = Date.parse(body["date"].to_s)
+        rescue Date::Error => e
+          raise Error, "Invalid date in Frankfurter response: #{e.message}"
+        end
+
+        Rate.new(date: parsed_date, from: from, to: to, rate: body["rate"].to_f)
+      end
+    end
+  end
+
+  def fetch_exchange_rates(from:, to:, start_date:, end_date:)
+    from = sanitize_currency(from)
+    to = sanitize_currency(to)
+
+    with_provider_response do
+      if from == to
+        generate_same_currency_rates(from, to, start_date, end_date)
+      else
+        exchange_rates(from, to, start_date, end_date)
+      end
+    end
+  end
+
+  def max_history_days
+    nil # Backed by central bank reference rates going back decades, no bounded window.
+  end
+
+  private
+
+    # from/to are interpolated directly into the URL path in
+    # fetch_exchange_rate (GET /rate/{from}/{to}), so strip anything that
+    # isn't a letter before use - real ISO 4217 codes are always A-Z anyway.
+    def sanitize_currency(code)
+      code.to_s.upcase.gsub(/[^A-Z]/, "")
+    end
+
+    def base_url
+      ENV["FRANKFURTER_URL"].presence || "https://api.frankfurter.dev/v2"
+    end
+
+    def get_json(path, params = {})
+      throttle_request
+      response = client.get("#{base_url}#{path}") do |req|
+        params.each { |k, v| req.params[k] = v }
+      end
+      JSON.parse(response.body)
+    rescue JSON::ParserError => e
+      raise Error, "Invalid Frankfurter response: #{e.message}"
+    end
+
+    def client
+      @client ||= Faraday.new(url: base_url, ssl: self.class.faraday_ssl_options) do |faraday|
+        faraday.options.open_timeout = 5
+        faraday.options.timeout      = 20
+
+        faraday.request(:retry, {
+          max: 3,
+          interval: 0.5,
+          interval_randomness: 0.5,
+          backoff_factor: 2,
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [ Faraday::ConnectionFailed ]
+        })
+
+        faraday.request :json
+        faraday.response :raise_error
+        faraday.headers["Accept"] = "application/json"
+      end
+    end
+
+    def generate_same_currency_rates(from, to, start_date, end_date)
+      (start_date..end_date).map do |date|
+        Rate.new(date: date, from: from, to: to, rate: 1.0)
+      end
+    end
+
+    # GET /rates?base=...&quotes=...&from=...&to=... -> a flat array of
+    # { date:, base:, quote:, rate: } records, one per day in range (v2
+    # carries forward weekends/holidays itself, so every calendar day in the
+    # range is present, not just trading days).
+    def exchange_rates(from, to, start_date, end_date)
+      body = get_json("/rates", "base" => from, "quotes" => to, "from" => start_date.to_s, "to" => end_date.to_s)
+      raise Error, "Unexpected Frankfurter response shape (expected an array)" unless body.is_a?(Array)
+
+      body.filter_map do |entry|
+        next nil unless entry.is_a?(Hash) && entry["quote"] == to
+
+        rate_value = entry["rate"]
+        next nil if rate_value.nil?
+
+        Rate.new(date: Date.parse(entry["date"].to_s), from: from, to: to, rate: rate_value.to_f)
+      end.sort_by(&:date)
+    rescue Date::Error => e
+      raise Error, "Invalid date in Frankfurter response: #{e.message}"
+    end
+end
diff --git a/app/models/provider/kraken.rb b/app/models/provider/kraken.rb
index 38a2db6ca..22d749dd5 100644
--- a/app/models/provider/kraken.rb
+++ b/app/models/provider/kraken.rb
@@ -43,6 +43,15 @@ class Provider::Kraken
     private_post("TradesHistory", params)
   end
 
+  def get_ledgers(start: nil, type: nil, offset: nil)
+    params = {}
+    params["start"] = start.to_i.to_s if start.present?
+    params["type"] = type.to_s if type.present?
+    params["ofs"] = offset.to_i.to_s if offset.present?
+
+    private_post("Ledgers", params)
+  end
+
   def get_asset_info(asset: nil)
     params = {}
     params["asset"] = asset if asset.present?
diff --git a/app/models/provider/metadata.rb b/app/models/provider/metadata.rb
index 805e84397..220acb6c1 100644
--- a/app/models/provider/metadata.rb
+++ b/app/models/provider/metadata.rb
@@ -4,8 +4,10 @@ class Provider
       akahu:          { region: "NZ",      kinds: %w[Bank Investment], maturity: :beta,   logo_text: "AK", logo_bg: "bg-emerald-600" },
       simplefin:      { region: "US",      kinds: %w[Bank Investment], maturity: :stable, logo_text: "SF", logo_bg: "bg-blue-600" },
       lunchflow:      { region: "Global",  kinds: %w[Bank],            maturity: :stable, logo_text: "LF", logo_bg: "bg-orange-500" },
+      up:             { region: "AU",      kinds: %w[Bank],            maturity: :beta,   logo_text: "UP", logo_bg: "bg-orange-600" },
       enable_banking: { region: "EU",      kinds: %w[Bank],            maturity: :beta,   logo_text: "EB", logo_bg: "bg-purple-600" },
       coinstats:      { region: "Global",  kinds: %w[Crypto],          maturity: :beta,   logo_text: "CS", logo_bg: "bg-pink-600" },
+      wise:           { region: "Global",  kinds: %w[Bank],            maturity: :beta,   logo_text: "WI", logo_bg: "bg-green-500" },
       mercury:        { region: "US",      kinds: %w[Bank],            maturity: :beta,   logo_text: "ME", logo_bg: "bg-cyan-600" },
       brex:           { region: "US",      kinds: %w[Bank],            maturity: :beta,   logo_text: "BX", logo_bg: "bg-emerald-600" },
       coinbase:       { region: "Global",  kinds: %w[Crypto],          maturity: :beta,   logo_text: "CB", logo_bg: "bg-blue-500" },
@@ -15,8 +17,11 @@ class Provider
       ibkr:           { region: "Global",  kinds: %w[Investment],      maturity: :beta,   logo_text: "IB", logo_bg: "bg-red-600" },
       indexa_capital: { region: "ES",      kinds: %w[Investment],      maturity: :alpha,  logo_text: "IC", logo_bg: "bg-red-600" },
       sophtron:       { region: "US",      kinds: %w[Bank Investment], maturity: :alpha,  logo_text: "SO", logo_bg: "bg-teal-600" },
+      trading212:     { region: "EU",      kinds: %w[Investment],      maturity: :alpha,  logo_text: "T2", logo_bg: "bg-teal-600" },
       plaid:          { region: "US",      kinds: %w[Bank],            maturity: :stable, logo_text: "PL", logo_bg: "bg-indigo-600", tier: "Paid" },
-      plaid_eu:       { region: "EU",      kinds: %w[Bank],            maturity: :stable, logo_text: "PL", logo_bg: "bg-indigo-600", tier: "Paid", name: "Plaid EU" }
+      plaid_eu:       { region: "EU",      kinds: %w[Bank],            maturity: :stable, logo_text: "PL", logo_bg: "bg-indigo-600", tier: "Paid", name: "Plaid EU" },
+      questrade:      { region: "CA",      kinds: %w[Investment],      maturity: :beta,   logo_text: "QT", logo_bg: "bg-teal-600" },
+      redbark:        { region: "AU",      kinds: %w[Bank],            maturity: :beta,   logo_text: "RB", logo_bg: "bg-red-700" }
     }.freeze
 
     def self.for(provider_key)
diff --git a/app/models/provider/moex_public.rb b/app/models/provider/moex_public.rb
new file mode 100644
index 000000000..2a69ccc39
--- /dev/null
+++ b/app/models/provider/moex_public.rb
@@ -0,0 +1,593 @@
+# Moscow Exchange (MOEX) market-data provider built on the free, keyless ISS
+# API (https://iss.moex.com/iss). Mirrors Provider::BinancePublic: no API key,
+# public endpoints only, Faraday client with retry/timeouts, RateLimitable
+# throttling, and SslConfigurable for self-hosted CA support.
+#
+# Covers Russian-market instruments that Yahoo dropped after 2022 — shares,
+# funds/ETF/БПИФ (e.g. LQDT), and bonds (OFZ + corporate) — and doubles as an
+# exchange-rate provider for RUB↔{USD,EUR,CNY} via the selt (FX) market.
+#
+# ISS responses are column-array JSON: each block is { "columns" => [...],
+# "data" => [[...], ...] }. We index every row by lowercased column name so the
+# code tolerates ISS reordering or casing differences across endpoints.
+class Provider::MoexPublic < Provider
+  include SecurityConcept, ExchangeRateConcept, RateLimitable
+  extend SslConfigurable
+
+  Error = Class.new(Provider::Error)
+  InvalidSecurityPriceError = Class.new(Error)
+  RateLimitError = Class.new(Error)
+
+  # ISS is generous but we still space requests to be a good citizen.
+  MIN_REQUEST_INTERVAL = 0.15
+
+  # Moscow Exchange ISO 10383 operating MIC. Like BinancePublic we intentionally
+  # do NOT propagate a country code to search results — the resolver treats a nil
+  # candidate country as a wildcard, so any family resolves a MOEX pick.
+  MOEX_MIC = "MISX".freeze
+
+  # Hardcoded board preference, consulted only when ISS does not flag a primary
+  # board. Shares (TQBR), ETF/funds (TQTF/TQIF), OFZ (TQOB), corporate/exchange
+  # bonds (TQCB/TQIR), USD/EUR-settled boards (TQTD/TQOD/TQOE/TQTE), restructured
+  # (TQRD). Earlier = higher priority.
+  BOARD_PRIORITY = %w[TQBR TQTF TQIF TQOB TQCB TQIR TQRD TQTD TQOD TQOE TQTE].freeze
+
+  # selt FX instruments quoted as roubles per 1 unit of the foreign currency
+  # (X/RUB). TOM = tomorrow settlement, the liquid benchmark line.
+  FX_INSTRUMENTS = {
+    "USD" => "USD000UTSTOM",
+    "EUR" => "EUR_RUB__TOM",
+    "CNY" => "CNYRUB_TOM"
+  }.freeze
+
+  # ISS still emits the legacy "SUR"/"RUR" codes for the rouble alongside the
+  # modern "RUB"; normalize so Price/Rate currencies are ISO 4217.
+  CURRENCY_ALIASES = { "SUR" => "RUB", "RUR" => "RUB" }.freeze
+
+  # Search/MOEX-suffix aliases users paste (Yahoo's ".ME", common ".MOEX"/MIC
+  # forms). ISIN queries are handled natively by ISS `q=`.
+  ALIAS_SUFFIX = /\.(ME|MOEX|MISX|MCX)\z/i
+
+  # ISS history blocks page at 100 rows; keep a defensive cap so a misbehaving
+  # endpoint can't loop forever.
+  HISTORY_PAGE_SIZE = 100
+  MAX_HISTORY_PAGES = 500
+
+  SEARCH_CACHE_TTL = 5.minutes
+  INSTRUMENT_CACHE_TTL = 24.hours
+
+  # When a single FX date falls on a weekend/holiday, look back this many days so
+  # we can return the most recent prior trading-day quote instead of failing.
+  FX_RATE_LOOKBACK_DAYS = 10
+
+  def initialize
+    # No API key required — public market data only.
+  end
+
+  def healthy?
+    with_provider_response do
+      get_json("/index.json", "iss.meta" => "off")
+      true
+    end
+  end
+
+  def usage
+    with_provider_response do
+      UsageData.new(used: nil, limit: nil, utilization: nil, plan: "Free (no key required)")
+    end
+  end
+
+  # ================================
+  #           Securities
+  # ================================
+
+  def search_securities(symbol, country_code: nil, exchange_operating_mic: nil)
+    with_provider_response do
+      query = normalize_query(symbol)
+      next [] if query.empty?
+
+      rows = search_rows(query)
+
+      securities = rows.filter_map do |row|
+        next nil unless row_traded?(row)
+        next nil if security_kind(row["group"], row["type"]).nil?
+
+        Provider::SecurityConcept::Security.new(
+          symbol: row["secid"].to_s,
+          name: (row["shortname"].presence || row["secid"]).to_s,
+          logo_url: nil,
+          exchange_operating_mic: MOEX_MIC,
+          country_code: nil,
+          currency: normalize_currency(row["currencyid"].presence || row["faceunit"])
+        )
+      end
+
+      securities.uniq(&:symbol)
+    end
+  end
+
+  def fetch_security_info(symbol:, exchange_operating_mic:)
+    with_provider_response do
+      instrument = resolve_instrument(normalize_secid(symbol))
+
+      SecurityInfo.new(
+        symbol: instrument[:secid],
+        name: instrument[:name],
+        # Deliberately no website: moex.com is the exchange, not the issuer, so
+        # persisting it as website_url makes Brandfetch render the exchange logo
+        # for every instrument and shadows the real per-issuer brand logo.
+        links: nil,
+        logo_url: nil,
+        description: nil,
+        kind: instrument[:kind],
+        exchange_operating_mic: MOEX_MIC
+      )
+    end
+  end
+
+  def fetch_security_price(symbol:, exchange_operating_mic:, date:)
+    with_provider_response do
+      historical = fetch_security_prices(
+        symbol: symbol,
+        exchange_operating_mic: exchange_operating_mic,
+        start_date: date,
+        end_date: date
+      )
+
+      raise historical.error if historical.error.present?
+      raise InvalidSecurityPriceError, "No price found for #{symbol} on #{date}" if historical.data.blank?
+
+      # Exact date if present, else the nearest available close on or before it.
+      historical.data.find { |p| p.date == date } ||
+        historical.data.select { |p| p.date <= date }.max_by(&:date) ||
+        historical.data.first
+    end
+  end
+
+  def fetch_security_prices(symbol:, exchange_operating_mic:, start_date:, end_date:)
+    with_provider_response do
+      secid = normalize_secid(symbol)
+      instrument = resolve_instrument(secid)
+      bond = instrument[:market].to_s.downcase == "bonds"
+
+      prices = history_prices(secid, instrument, start_date, end_date, bond)
+
+      # The history endpoint does not carry the live/most-recent session, so for
+      # a range reaching today append the current marketdata price.
+      if end_date >= Date.current
+        current = current_price(secid, instrument, bond)
+        if current
+          prices.reject! { |p| p.date == current.date }
+          prices << current
+        end
+      end
+
+      # Illiquid / non-trading window with nothing returned — fall back to the
+      # most recent available close so the caller still gets a value.
+      if prices.empty?
+        fallback = latest_history_price(secid, instrument, bond, end_date)
+        prices << fallback if fallback
+      end
+
+      prices.sort_by(&:date)
+    end
+  end
+
+  def max_history_days
+    nil # ISS serves full history.
+  end
+
+  # ================================
+  #          Exchange Rates
+  # ================================
+
+  def fetch_exchange_rate(from:, to:, date:)
+    with_provider_response do
+      # Fetch a short lookback window, not just the exact day, so a weekend or
+      # holiday request still resolves to the previous trading day's close.
+      rates = exchange_rates(from, to, date - FX_RATE_LOOKBACK_DAYS, date)
+      raise Error, "No MOEX FX rate for #{from}/#{to} on #{date}" if rates.blank?
+
+      rates.find { |r| r.date == date } ||
+        rates.select { |r| r.date <= date }.max_by(&:date) ||
+        rates.first
+    end
+  end
+
+  def fetch_exchange_rates(from:, to:, start_date:, end_date:)
+    with_provider_response do
+      exchange_rates(from, to, start_date, end_date)
+    end
+  end
+
+  private
+
+    # ================================
+    #          HTTP / parsing
+    # ================================
+
+    def base_url
+      ENV["MOEX_ISS_URL"].presence || "https://iss.moex.com/iss"
+    end
+
+    def get_json(path, params = {})
+      throttle_request
+      response = client.get("#{base_url}#{path}") do |req|
+        params.each { |k, v| req.params[k] = v }
+      end
+      JSON.parse(response.body)
+    end
+
+    def client
+      @client ||= Faraday.new(url: base_url, ssl: self.class.faraday_ssl_options) do |faraday|
+        # Generous enough for a full history page but bounded so a hung ISS
+        # endpoint can't stall a worker indefinitely.
+        faraday.options.open_timeout = 5
+        faraday.options.timeout      = 20
+
+        faraday.request(:retry, {
+          max: 3,
+          interval: 0.5,
+          interval_randomness: 0.5,
+          backoff_factor: 2,
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [ Faraday::ConnectionFailed ]
+        })
+
+        faraday.request :json
+        faraday.response :raise_error
+        faraday.headers["Accept"] = "application/json"
+      end
+    end
+
+    # Turns a column-array ISS block into an array of hashes keyed by lowercased
+    # column name, so callers reference columns by name regardless of ISS order
+    # or casing (search columns are lowercase; marketdata columns are uppercase).
+    def rows_from(body, block)
+      section = body[block] || {}
+      columns = section["columns"] || []
+      data = section["data"] || []
+      index = {}
+      columns.each_with_index { |col, i| index[col.to_s.downcase] = i }
+      data.map do |row|
+        hash = {}
+        index.each { |col, i| hash[col] = row[i] }
+        hash
+      end
+    end
+
+    # The /securities/<SECID>.json `description` block is a vertical key/value
+    # table (one property per row). Returns { "TYPE" => "common_share", ... }.
+    def description_map(body)
+      rows_from(body, "description").each_with_object({}) do |row, map|
+        map[row["name"].to_s.upcase] = row["value"]
+      end
+    end
+
+    # ================================
+    #            Search
+    # ================================
+
+    def search_rows(query)
+      Rails.cache.fetch("moex_public:search:#{query}", expires_in: SEARCH_CACHE_TTL) do
+        body = get_json("/securities.json", "q" => query, "iss.meta" => "off")
+        rows_from(body, "securities")
+      end
+    end
+
+    def normalize_query(symbol)
+      symbol.to_s.strip.upcase.sub(ALIAS_SUFFIX, "")
+    end
+
+    def normalize_secid(symbol)
+      normalize_query(symbol)
+    end
+
+    def row_traded?(row)
+      (row["is_traded"] || row["is_trading"]).to_s == "1"
+    end
+
+    # Classifies an instrument into "stock"/"fund"/"bond" from its ISS
+    # group/type, returning nil for everything we don't surface (indices,
+    # futures, currencies). Used both to filter search and to label info.
+    def security_kind(group, type)
+      g = group.to_s.downcase
+      t = type.to_s.downcase
+
+      return "bond" if g.include?("bond") || t.include?("bond")
+      return "fund" if g.include?("etf") || g.include?("ppif") || g.include?("fund") || t.include?("etf") || t.include?("ppif")
+      return "stock" if g.include?("shares") || t.include?("share") || t.include?("_dr") || t.include?("depositary")
+
+      nil
+    end
+
+    def market_kind(market)
+      case market.to_s.downcase
+      when "bonds" then "bond"
+      when /index/ then "index"
+      else "stock"
+      end
+    end
+
+    # ================================
+    #     Board / engine resolution
+    # ================================
+
+    # Resolves a SECID to its primary trading board plus engine/market, currency,
+    # display name, and kind. Cached 24h — reference data that rarely changes.
+    def resolve_instrument(secid)
+      cached = Rails.cache.fetch("moex_public:instrument:#{secid}", expires_in: INSTRUMENT_CACHE_TTL) do
+        body = get_json("/securities/#{secid}.json", "iss.meta" => "off")
+        desc = description_map(body)
+        boards = rows_from(body, "boards")
+        raise InvalidSecurityPriceError, "Unknown MOEX security: #{secid}" if boards.empty?
+
+        board = choose_board(boards)
+        kind = security_kind(desc["GROUP"] || desc["TYPE"], desc["TYPE"]) || market_kind(board["market"])
+
+        {
+          secid: secid,
+          engine: board["engine"].to_s,
+          market: board["market"].to_s,
+          board: board["boardid"].to_s,
+          currency: normalize_currency(board["currencyid"].presence || desc["FACEUNIT"].presence || desc["CURRENCYID"]),
+          name: (desc["SHORTNAME"].presence || desc["NAME"].presence || secid).to_s,
+          kind: kind
+        }
+      end
+
+      cached.symbolize_keys
+    end
+
+    def choose_board(boards)
+      traded = boards.select { |b| b["is_traded"].to_s == "1" }
+      pool = traded.any? ? traded : boards
+
+      pool.find { |b| b["is_primary"].to_s == "1" } ||
+        by_priority(pool) ||
+        pool.first
+    end
+
+    def by_priority(boards)
+      BOARD_PRIORITY.each do |boardid|
+        found = boards.find { |b| b["boardid"].to_s == boardid }
+        return found if found
+      end
+      nil
+    end
+
+    def market_securities_path(instrument, secid)
+      "/engines/#{instrument[:engine]}/markets/#{instrument[:market]}/boards/#{instrument[:board]}/securities/#{secid}.json"
+    end
+
+    def history_path(instrument, secid)
+      "/history/engines/#{instrument[:engine]}/markets/#{instrument[:market]}/boards/#{instrument[:board]}/securities/#{secid}.json"
+    end
+
+    # ================================
+    #         Security prices
+    # ================================
+
+    # Live (or most-recent-session) price via the marketdata fallback chain.
+    # Bonds quote in % of par, so multiply by the instrument FACEVALUE.
+    def current_price(secid, instrument, bond)
+      body = get_json(
+        market_securities_path(instrument, secid),
+        "iss.meta" => "off", "iss.only" => "securities,marketdata"
+      )
+
+      sec = rows_from(body, "securities").first || {}
+      md  = rows_from(body, "marketdata").first || {}
+
+      raw = md["last"].presence || md["marketprice"].presence || md["lcurrentprice"].presence ||
+            md["lcloseprice"].presence || sec["prevprice"].presence
+      return nil if raw.nil?
+
+      value = raw.to_f
+      return nil if value <= 0
+
+      value = bond_price(value, sec["facevalue"]) if bond
+      currency = normalize_currency(sec["currencyid"].presence || sec["faceunit"].presence || instrument[:currency])
+
+      Price.new(
+        symbol: secid,
+        date: Date.current,
+        price: value,
+        currency: currency,
+        exchange_operating_mic: MOEX_MIC
+      )
+    end
+
+    def history_prices(secid, instrument, start_date, end_date, bond)
+      return [] if start_date > end_date
+
+      prices = []
+      start = 0
+      pages = 0
+
+      loop do
+        body = get_json(
+          history_path(instrument, secid),
+          "iss.meta" => "off", "from" => start_date.to_s, "till" => end_date.to_s, "start" => start
+        )
+        rows = rows_from(body, "history")
+        break if rows.empty?
+
+        rows.each do |row|
+          price = history_row_price(secid, row, instrument, bond)
+          prices << price if price
+        end
+
+        pages += 1
+        break if rows.size < HISTORY_PAGE_SIZE || pages >= MAX_HISTORY_PAGES
+        start += rows.size
+      end
+
+      prices
+    end
+
+    # Fetches just the most recent close within a short lookback window — the
+    # fallback when neither history (for the requested range) nor live
+    # marketdata yielded anything.
+    def latest_history_price(secid, instrument, bond, end_date)
+      lookback_start = end_date - 14
+      history_prices(secid, instrument, lookback_start, end_date, bond).max_by(&:date)
+    end
+
+    def history_row_price(secid, row, instrument, bond)
+      date = parse_iss_date(row["tradedate"], context: secid)
+      return nil if date.nil?
+
+      raw = row["close"].presence || row["legalcloseprice"].presence
+      return nil if raw.nil?
+
+      value = raw.to_f
+      return nil if value <= 0
+
+      value = bond_price(value, row["facevalue"]) if bond
+      currency = normalize_currency(
+        (bond ? row["faceunit"].presence : nil) || row["currencyid"].presence || instrument[:currency]
+      )
+
+      Price.new(
+        symbol: secid,
+        date: date,
+        price: value,
+        currency: currency,
+        exchange_operating_mic: MOEX_MIC
+      )
+    end
+
+    # Clean price for bonds: percent-of-par × FACEVALUE / 100. NKD/accrued
+    # coupon is deliberately excluded (dirty price is out of scope). FACEVALUE
+    # is read per row so amortizing bonds price correctly across their life.
+    def bond_price(percent, facevalue)
+      face = facevalue.to_f
+      return percent if face <= 0 # no face value — leave the raw quote untouched
+      (percent / 100.0) * face
+    end
+
+    # ================================
+    #          Exchange rates
+    # ================================
+
+    # Returns Rate[] for a RUB-crossed pair, or [] for anything else (other
+    # providers handle non-RUB pairs). selt is quoted X/RUB; we invert for RUB→X.
+    def exchange_rates(from, to, start_date, end_date)
+      pair = fx_pair(from, to)
+      return [] unless pair
+
+      instrument = FX_INSTRUMENTS.fetch(pair[:currency])
+      quotes = fx_history(instrument, start_date, end_date)
+
+      if end_date >= Date.current
+        current = fx_current(instrument)
+        if current
+          quotes.reject! { |q| q[:date] == current[:date] }
+          quotes << current
+        end
+      end
+
+      quotes.map do |quote|
+        rate = if pair[:invert]
+          (BigDecimal("1") / BigDecimal(quote[:value].to_s)).round(12)
+        else
+          quote[:value]
+        end
+        Rate.new(date: quote[:date], from: from, to: to, rate: rate)
+      end.sort_by(&:date)
+    end
+
+    # { currency: "USD", invert: false } for X→RUB; invert: true for RUB→X; nil
+    # when neither side is RUB or the foreign side is unsupported.
+    def fx_pair(from, to)
+      f = from.to_s.upcase
+      t = to.to_s.upcase
+
+      if f == "RUB" && FX_INSTRUMENTS.key?(t)
+        { currency: t, invert: true }
+      elsif t == "RUB" && FX_INSTRUMENTS.key?(f)
+        { currency: f, invert: false }
+      end
+    end
+
+    def fx_current(instrument)
+      body = get_json(
+        "/engines/currency/markets/selt/boards/CETS/securities/#{instrument}.json",
+        "iss.meta" => "off", "iss.only" => "marketdata"
+      )
+      md = rows_from(body, "marketdata").first || {}
+
+      raw = md["last"].presence || md["waprice"].presence || md["marketprice"].presence || md["lcloseprice"].presence
+      return nil if raw.nil?
+
+      value = raw.to_f
+      return nil if value <= 0
+
+      { date: Date.current, value: value }
+    end
+
+    def fx_history(instrument, start_date, end_date)
+      return [] if start_date > end_date
+
+      quotes = []
+      start = 0
+      pages = 0
+
+      loop do
+        body = get_json(
+          "/history/engines/currency/markets/selt/boards/CETS/securities/#{instrument}.json",
+          "iss.meta" => "off", "from" => start_date.to_s, "till" => end_date.to_s, "start" => start
+        )
+        rows = rows_from(body, "history")
+        break if rows.empty?
+
+        rows.each do |row|
+          date = parse_iss_date(row["tradedate"], context: instrument)
+          next if date.nil?
+
+          raw = row["close"].presence || row["waprice"].presence
+          next if raw.nil?
+
+          value = raw.to_f
+          next if value <= 0
+
+          quotes << { date: date, value: value }
+        end
+
+        pages += 1
+        break if rows.size < HISTORY_PAGE_SIZE || pages >= MAX_HISTORY_PAGES
+        start += rows.size
+      end
+
+      quotes
+    end
+
+    # ================================
+    #            Helpers
+    # ================================
+
+    # Parses an ISS TRADEDATE, skipping (rather than raising on) a malformed
+    # value so one bad row can't fail an entire history fetch. Logs the offending
+    # value with context for actionable diagnostics.
+    def parse_iss_date(raw, context:)
+      return nil if raw.blank?
+      Date.parse(raw.to_s)
+    rescue Date::Error
+      Rails.logger.warn("MoexPublic: skipping #{context} history row with unparseable date #{raw.inspect}")
+      nil
+    end
+
+    def normalize_currency(code)
+      return "RUB" if code.blank?
+      upcased = code.to_s.upcase
+      CURRENCY_ALIASES.fetch(upcased, upcased)
+    end
+
+    # Preserve MoexPublic::Error subclasses (e.g. InvalidSecurityPriceError)
+    # through with_provider_response, mirroring BinancePublic. The inherited
+    # RateLimitable transformer would otherwise downcast them to Error.
+    def default_error_transformer(error)
+      return error if error.is_a?(self.class::Error)
+      super
+    end
+end
diff --git a/app/models/provider/property_valuation_concept.rb b/app/models/provider/property_valuation_concept.rb
new file mode 100644
index 000000000..4629b3bcf
--- /dev/null
+++ b/app/models/provider/property_valuation_concept.rb
@@ -0,0 +1,71 @@
+# Interface for automated valuation model (AVM) providers that can look up a
+# US property record and return both its attributes and an estimated value in
+# a single request.
+#
+# Includers must define:
+# - `MAX_REQUESTS_PER_MONTH` (Integer) — the provider's monthly request budget
+# - `RateLimitError` (Class)           — provider-scoped rate-limit error class
+module Provider::PropertyValuationConcept
+  extend ActiveSupport::Concern
+
+  PropertyValuation = Data.define(:valuation, :currency, :property_type, :year_built, :area_value, :area_unit)
+
+  def fetch_property_valuation(line1:, locality: nil, region: nil, postal_code: nil)
+    raise NotImplementedError, "Subclasses must implement #fetch_property_valuation"
+  end
+
+  # Currency of the valuations this provider returns. Both supported
+  # providers are US-based and always price in USD; the daily refresh job
+  # checks this against the account currency before spending a request.
+  def valuation_currency
+    "USD"
+  end
+
+  # Whether the provider still has monthly request budget left. Checked by
+  # SyncPropertyValuationsJob before spending a request on a refresh.
+  def requests_remaining?
+    monthly_request_count < max_requests_per_month
+  end
+
+  def usage
+    with_provider_response do
+      used = monthly_request_count
+
+      Provider::UsageData.new(
+        used: used,
+        limit: max_requests_per_month,
+        utilization: (used.to_f / max_requests_per_month * 100).round(1),
+        plan: "Free"
+      )
+    end
+  end
+
+  private
+    # Defaults to the provider's free tier cap; users on paid plans can raise
+    # it via ENV (e.g. RENTCAST_MAX_REQUESTS_PER_MONTH), mirroring the
+    # AlphaVantage/Tiingo request limit overrides.
+    def max_requests_per_month
+      ENV.fetch("#{self.class.name.demodulize.underscore.upcase}_MAX_REQUESTS_PER_MONTH", self.class::MAX_REQUESTS_PER_MONTH).to_i
+    end
+
+    def monthly_request_count
+      ProviderRequestCount.count_for(provider_key)
+    end
+
+    # Counts every outbound request (user-initiated lookups and daily
+    # refreshes) against the provider's monthly budget. Backed by a durable
+    # database counter (not Rails.cache) so the hard cap can't be reset by
+    # cache eviction or a restart.
+    def record_monthly_request!
+      count = ProviderRequestCount.increment!(provider_key)
+
+      if count > max_requests_per_month
+        ProviderRequestCount.decrement!(provider_key)
+        raise self.class::RateLimitError.new("#{self.class.name.demodulize} monthly request limit reached (#{max_requests_per_month} per month)")
+      end
+    end
+
+    def provider_key
+      self.class.name.demodulize.underscore
+    end
+end
diff --git a/app/models/provider/questrade.rb b/app/models/provider/questrade.rb
new file mode 100644
index 000000000..8bd605962
--- /dev/null
+++ b/app/models/provider/questrade.rb
@@ -0,0 +1,268 @@
+# frozen_string_literal: true
+
+# Questrade API client.
+#
+# Auth model (the important part): Questrade uses single-use, rotating refresh
+# tokens that EXPIRE 7 DAYS after generation. Exchanging a refresh token returns:
+#   - access_token  (Bearer, ~30 min TTL)
+#   - api_server    (the base URL you must use for all data calls)
+#   - refresh_token (a BRAND NEW one — the old one is now dead)
+#
+# Because the refresh token is single-use, the new one MUST be persisted
+# immediately and the exchange MUST be serialized (no two syncs refreshing at
+# once). This SDK performs the exchange and hands the new credentials back to
+# the caller via the `on_token_refresh` callback so the item model can persist
+# them inside its own row lock / transaction.
+class Provider::Questrade
+  include HTTParty
+
+  headers "User-Agent" => "Sure Finance Questrade Client"
+  default_options.merge!(verify: true, ssl_verify_mode: OpenSSL::SSL::VERIFY_PEER, timeout: 120)
+
+  LOGIN_URL         = "https://login.questrade.com/oauth2/token"
+  # Questrade STRICTLY caps activity ranges at 31 days (err 1003). Used as an
+  # inclusive day count, so a single window spans at most 30 days.
+  MAX_ACTIVITY_DAYS = 30
+  ACCESS_TOKEN_SKEW = 60   # refresh slightly early to avoid mid-call expiry
+
+  class Error < StandardError
+    attr_reader :error_type
+
+    def initialize(message, error_type = :unknown)
+      super(message)
+      @error_type = error_type
+    end
+  end
+
+  class ConfigurationError < Error; end
+  class AuthenticationError < Error; end
+  class RetryableResponseError < Error; end
+
+  attr_reader :refresh_token, :api_server
+
+  # @param refresh_token [String] current (single-use) refresh token
+  # @param api_server [String, nil] cached base URL from the last exchange
+  # @param on_token_refresh [#call] called with the new credentials hash
+  #        { refresh_token:, api_server:, access_token:, expires_at: } so the
+  #        caller can persist them. REQUIRED for durable operation.
+  def initialize(refresh_token:, api_server: nil, on_token_refresh: nil, synchronize_exchange: nil)
+    @refresh_token        = refresh_token
+    @api_server           = api_server
+    @on_token_refresh     = on_token_refresh
+    @synchronize_exchange = synchronize_exchange
+    @access_token      = nil
+    @access_expires_at = nil
+    validate_configuration!
+  end
+
+  # GET /v1/accounts -> { accounts: [...], userId: ... }
+  def list_accounts
+    get_json("v1/accounts")
+  end
+
+  # GET /v1/accounts/:id/positions  (Sure calls these "holdings")
+  def get_holdings(account_id:)
+    get_json("v1/accounts/#{account_id}/positions")
+  end
+
+  # GET /v1/accounts/:id/balances
+  def get_balances(account_id:)
+    get_json("v1/accounts/#{account_id}/balances")
+  end
+
+  # GET /v1/symbols?ids=1,2,3 -> currency/description per symbol. Questrade's
+  # positions endpoint omits currency, so we use this to tag USD vs CAD holdings.
+  def get_symbols(ids:)
+    ids = Array(ids).compact.uniq.join(",")
+    return { symbols: [] } if ids.blank?
+
+    get_json("v1/symbols", query: { ids: ids })
+  end
+
+  # GET /v1/accounts/:id/activities?startTime=&endTime=
+  # Chunked into <=30-day windows because Questrade rejects ranges > 31 days.
+  def get_activities(account_id:, start_date:, end_date: Date.current)
+    activities = []
+    window_start = start_date.to_date
+    end_date = end_date.to_date
+
+    while window_start <= end_date
+      # (MAX - 1) because the range is inclusive of both endpoints; this keeps the
+      # span strictly under Questrade's 31-day ceiling even after UTC conversion.
+      window_end = [ window_start + (MAX_ACTIVITY_DAYS - 1), end_date ].min
+      page = get_json(
+        "v1/accounts/#{account_id}/activities",
+        query: { startTime: iso(window_start.beginning_of_day),
+                 endTime:   iso(window_end.end_of_day) }
+      )
+      activities.concat(Array(page[:activities]))
+      window_start = window_end + 1
+    end
+
+    { activities: activities }
+  end
+
+  private
+
+    RETRYABLE_ERRORS = [
+      SocketError, Net::OpenTimeout, Net::ReadTimeout,
+      Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::ETIMEDOUT, EOFError
+    ].freeze
+
+    MAX_RETRIES = 3
+    INITIAL_RETRY_DELAY = 2 # seconds
+
+    def validate_configuration!
+      raise ConfigurationError.new("Refresh token is required", :missing_credentials) if @refresh_token.blank?
+    end
+
+    def get_json(path, query: {})
+      ensure_authenticated!
+      with_retries(path) do
+        response = self.class.get("#{api_base}#{path}", headers: auth_headers, query: query)
+        # Access token can expire mid-sync; refresh once and retry on 401.
+        if response.code == 401
+          authenticate!(force: true)
+          response = self.class.get("#{api_base}#{path}", headers: auth_headers, query: query)
+        end
+        handle_response(response)
+      end
+    end
+
+    # Exchange the refresh token unless we already hold a valid access token.
+    def ensure_authenticated!
+      authenticate! if @access_token.nil? || @access_expires_at.nil? || Time.current >= @access_expires_at
+    end
+
+    def authenticate!(force: false)
+      return if @access_token && !force && Time.current < @access_expires_at
+
+      # Spending a single-use refresh token must be serialized across workers
+      # and must use the freshest persisted token. The caller supplies a lock
+      # that yields the current token; without one, exchange directly.
+      if @synchronize_exchange
+        @synchronize_exchange.call do |fresh_token|
+          @refresh_token = fresh_token if fresh_token.present?
+          exchange_token!
+        end
+      else
+        exchange_token!
+      end
+    end
+
+    def exchange_token!
+      response = with_retries("oauth_token") do
+        # POST with a form body keeps the single-use refresh token out of the
+        # URL (and therefore out of access logs / error-tracking breadcrumbs).
+        self.class.post(LOGIN_URL, body: { grant_type: "refresh_token", refresh_token: @refresh_token })
+      end
+
+      unless response.code == 200
+        # 400/401 here usually means the refresh token expired (>7 days) or was
+        # already used. The connection must be re-authorized by the user.
+        raise AuthenticationError.new(
+          "Questrade token exchange failed (#{response.code}). Re-authorization required.",
+          :reauth_required
+        )
+      end
+
+      body = JSON.parse(response.body, symbolize_names: true)
+      @access_token      = body[:access_token]
+      @api_server        = body[:api_server]
+      @refresh_token     = body[:refresh_token] # rotate in-memory immediately
+      @access_expires_at = Time.current + (body[:expires_in].to_i - ACCESS_TOKEN_SKEW).seconds
+
+      # Hand the new credentials to the caller to persist (single-use token!).
+      @on_token_refresh&.call(
+        refresh_token: @refresh_token,
+        api_server:    @api_server,
+        access_token:  @access_token,
+        expires_at:    @access_expires_at
+      )
+    end
+
+    def api_base
+      raise ConfigurationError.new("No api_server; authenticate first", :missing_api_server) if @api_server.blank?
+      @api_server.end_with?("/") ? @api_server : "#{@api_server}/"
+    end
+
+    def auth_headers
+      {
+        "Authorization" => "Bearer #{@access_token}",
+        "Accept" => "application/json"
+      }
+    end
+
+    def iso(time)
+      time.utc.iso8601
+    end
+
+    def with_retries(operation_name, max_retries: MAX_RETRIES)
+      retries = 0
+
+      begin
+        yield
+      rescue *RETRYABLE_ERRORS, RetryableResponseError => e
+        retries += 1
+
+        if retries <= max_retries
+          delay = calculate_retry_delay(retries)
+          Rails.logger.warn(
+            "Questrade API: #{operation_name} failed (attempt #{retries}/#{max_retries}): " \
+            "#{e.class}: #{e.message}. Retrying in #{delay}s..."
+          )
+          sleep(delay)
+          retry
+        else
+          Rails.logger.error(
+            "Questrade API: #{operation_name} failed after #{max_retries} retries: " \
+            "#{e.class}: #{e.message}"
+          )
+          raise Error.new("Network error after #{max_retries} retries: #{e.message}", :network_error)
+        end
+      end
+    end
+
+    def calculate_retry_delay(retry_count)
+      base_delay = INITIAL_RETRY_DELAY * (2 ** (retry_count - 1))
+      jitter = base_delay * rand * 0.25
+      [ base_delay + jitter, 30 ].min
+    end
+
+    # Record provider failure detail to the super-admin /settings/debug log
+    # (the sanctioned channel) instead of echoing the raw response body into
+    # application logs or exception messages, where the importer re-logs it.
+    def capture_response_error(reason, response)
+      DebugLogEntry.capture(
+        category: "provider_sync",
+        level: "error",
+        message: "Questrade API #{reason} (#{response.code})",
+        source: self.class.name,
+        provider_key: "questrade",
+        metadata: { status: response.code, body: response.body.to_s.first(1000) }
+      )
+    end
+
+    def handle_response(response)
+      case response.code
+      when 200, 201
+        JSON.parse(response.body, symbolize_names: true)
+      when 400
+        capture_response_error("bad_request", response)
+        raise Error.new("Questrade bad request (#{response.code})", :bad_request)
+      when 401
+        raise AuthenticationError.new("Invalid or expired Questrade credentials", :unauthorized)
+      when 403
+        raise AuthenticationError.new("Access forbidden - check your permissions", :access_forbidden)
+      when 404
+        raise Error.new("Resource not found", :not_found)
+      when 429
+        raise RetryableResponseError.new("Questrade rate limit exceeded. Please try again later.", :rate_limited)
+      when 500..599
+        raise RetryableResponseError.new("Questrade server error (#{response.code}). Please try again later.", :server_error)
+      else
+        capture_response_error("unexpected_response", response)
+        raise Error.new("Questrade unexpected response (#{response.code})", :unknown)
+      end
+    end
+end
diff --git a/app/models/provider/questrade_adapter.rb b/app/models/provider/questrade_adapter.rb
new file mode 100644
index 000000000..e4f5fa708
--- /dev/null
+++ b/app/models/provider/questrade_adapter.rb
@@ -0,0 +1,103 @@
+class Provider::QuestradeAdapter < Provider::Base
+  include Provider::Syncable
+  include Provider::InstitutionMetadata
+
+  # Register this adapter with the factory
+  Provider::Factory.register("QuestradeAccount", self)
+
+  # Define which account types this provider supports
+  def self.supported_account_types
+    # Questrade is a stock/ETF/options brokerage, so it only links to
+    # Investment accounts (not Crypto).
+    %w[Investment]
+  end
+
+  # Returns connection configurations for this provider
+  def self.connection_configs(family:)
+    return [] unless family.can_connect_questrade?
+
+    [ {
+      key: "questrade",
+      name: "Questrade",
+      description: "Connect to your brokerage via Questrade",
+      can_connect: true,
+      new_account_path: ->(accountable_type, return_to) {
+        Rails.application.routes.url_helpers.select_accounts_questrade_items_path(
+          accountable_type: accountable_type,
+          return_to: return_to
+        )
+      },
+      existing_account_path: ->(account_id) {
+        Rails.application.routes.url_helpers.select_existing_account_questrade_items_path(
+          account_id: account_id
+        )
+      }
+    } ]
+  end
+
+  def provider_name
+    "questrade"
+  end
+
+  # Build a Questrade provider instance with family-specific credentials
+  # @param family [Family] The family to get credentials for (required)
+  # @return [Provider::Questrade, nil] Returns nil if credentials are not configured
+  def self.build_provider(family: nil)
+    return nil unless family.present?
+
+    # Get family-specific credentials
+    questrade_item = family.questrade_items.where.not(refresh_token: nil).first
+    return nil unless questrade_item&.credentials_configured?
+
+    questrade_item.questrade_provider
+  end
+
+  def sync_path
+    Rails.application.routes.url_helpers.sync_questrade_item_path(item)
+  end
+
+  def item
+    provider_account.questrade_item
+  end
+
+  def can_delete_holdings?
+    false
+  end
+
+  def institution_domain
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    domain = metadata["domain"]
+    url = metadata["url"]
+
+    # Derive domain from URL if missing
+    if domain.blank? && url.present?
+      begin
+        domain = URI.parse(url).host&.gsub(/^www\./, "")
+      rescue URI::InvalidURIError
+        Rails.logger.warn("Invalid institution URL for Questrade account #{provider_account.id}: #{url}")
+      end
+    end
+
+    domain
+  end
+
+  def institution_name
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    metadata["name"] || item&.institution_name
+  end
+
+  def institution_url
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    metadata["url"] || item&.institution_url
+  end
+
+  def institution_color
+    item&.institution_color
+  end
+end
diff --git a/app/models/provider/realie.rb b/app/models/provider/realie.rb
new file mode 100644
index 000000000..addd67617
--- /dev/null
+++ b/app/models/provider/realie.rb
@@ -0,0 +1,159 @@
+class Provider::Realie < Provider
+  include PropertyValuationConcept, RateLimitable
+  extend SslConfigurable
+
+  # Subclass so errors caught in this provider are raised as Provider::Realie::Error
+  Error = Class.new(Provider::Error)
+  RateLimitError = Class.new(Error)
+
+  # Minimum delay between requests to avoid rate limiting (in seconds)
+  MIN_REQUEST_INTERVAL = 1.0
+
+  # Maximum API requests per month (Realie free tier limit).
+  # Override with REALIE_MAX_REQUESTS_PER_MONTH for paid plans.
+  MAX_REQUESTS_PER_MONTH = 25
+
+  # Realie's documented numeric use codes to Property::SUBTYPES keys
+  # (https://docs.realie.ai/api-reference/feature-key). Codes without a
+  # sensible subtype equivalent (e.g. 1006 mobile/manufactured, commercial
+  # codes) are left unmapped, matching the RentCast mapping's behavior.
+  NUMERIC_USE_CODE_MAP = {
+    "1001" => "single_family_home", # Single family residential
+    "1008" => "single_family_home", # Rural/agricultural residence
+    "1022" => "single_family_home", # SFR with ADU
+    "1024" => "single_family_home", # Multiple SFRs on one parcel
+    "1002" => "townhouse",          # Townhouse (residential)
+    "1004" => "condominium",        # Condominium unit (residential)
+    "1124" => "condominium",        # Condominium building (residential)
+    "1101" => "multi_family_home",  # Duplex
+    "1102" => "multi_family_home",  # Triplex
+    "1103" => "multi_family_home",  # Quadruplex
+    "1104" => "apartment",          # Apartment house (5+ units)
+    "1105" => "apartment",          # Apartment house (100+ units)
+    "7001" => "agri_land",          # Farm
+    "7002" => "agri_land",          # Ranch
+    "8001" => "plot",               # Residential vacant land
+    "8002" => "plot",               # Commercial vacant land
+    "8008" => "plot"                # Rural/agricultural vacant land
+  }.freeze
+
+  def initialize(api_key)
+    @api_key = api_key # pipelock:ignore
+  end
+
+  # A single address lookup returns the full property record, including the
+  # Realie model (AVM) value, so no separate valuation request is needed.
+  def fetch_property_valuation(line1:, locality: nil, region: nil, postal_code: nil)
+    with_provider_response do
+      throttle_request
+      record_monthly_request!
+
+      # The address lookup endpoint accepts only the street address and
+      # 2-letter state code — filtering by city additionally requires a
+      # county, which the property address form doesn't collect.
+      response = client.get("#{base_url}/api/public/property/address/") do |req|
+        req.params["address"] = line1.to_s.strip
+        req.params["state"] = region.to_s.strip.upcase
+      end
+
+      parsed = JSON.parse(response.body)
+      records = parsed["property"]
+      records = [ records ] unless records.is_a?(Array)
+      records = records.reject(&:blank?)
+      raise Error.new(I18n.t("providers.realie.errors.no_property")) if records.empty?
+
+      # A street+state query can return several candidates across different
+      # cities; pick the first one consistent with the entered city/ZIP.
+      record = records.find { |candidate| location_match?(candidate, locality: locality, postal_code: postal_code) }
+      raise Error.new(I18n.t("providers.realie.errors.location_mismatch")) if record.nil?
+
+      # Realie returns modelValue: 0 when it couldn't produce an AVM
+      # estimate, so zero counts as absent and falls back to the assessed
+      # total market value.
+      valuation = [ record["modelValue"], record["totalMarketValue"] ].find { |value| value.present? && value.to_d.positive? }
+      raise Error.new(I18n.t("providers.realie.errors.no_valuation")) if valuation.nil?
+
+      PropertyValuation.new(
+        valuation: BigDecimal(valuation.to_s),
+        currency: "USD",
+        property_type: subtype_for_use_code(record["useCode"]),
+        year_built: record["yearBuilt"],
+        area_value: record["buildingArea"],
+        area_unit: "sqft"
+      )
+    end
+  end
+
+  private
+    attr_reader :api_key
+
+    # The address lookup matches on street + state only (filtering by city
+    # additionally requires a county, which isn't collected), so a common
+    # street name can resolve to properties in other cities. A candidate
+    # matches unless its returned city/ZIP contradict what the user entered.
+    def location_match?(record, locality:, postal_code:)
+      returned_city = record["city"].to_s.strip
+      returned_zip = record["zipCode"].to_s.strip.first(5)
+      entered_city = locality.to_s.strip
+      entered_zip = postal_code.to_s.strip.first(5)
+
+      city_mismatch = returned_city.present? && entered_city.present? && !returned_city.casecmp?(entered_city)
+      zip_mismatch = returned_zip.present? && entered_zip.present? && returned_zip != entered_zip
+
+      !(city_mismatch || zip_mismatch)
+    end
+
+    # Use codes arrive either as Realie's documented numeric codes (mapped
+    # exactly above) or as free-form parcel descriptions, matched on
+    # keywords. Unmatched codes leave the subtype unset rather than guessing.
+    def subtype_for_use_code(use_code)
+      value = use_code.to_s.strip.downcase
+      return nil if value.blank?
+
+      return NUMERIC_USE_CODE_MAP[value] if value.match?(/\A\d+\z/)
+
+      case value
+      when /single family|sfr/ then "single_family_home"
+      when /multi.?family|duplex|triplex/ then "multi_family_home"
+      when /condo/ then "condominium"
+      when /town.?(house|home)/ then "townhouse"
+      when /apartment/ then "apartment"
+      when /agricultur|farm/ then "agri_land"
+      when /commercial|retail|office|industrial/ then "commercial"
+      when /vacant|land|lot/ then "plot"
+      end
+    end
+
+    def default_error_transformer(error)
+      case error
+      when Faraday::ResourceNotFound
+        Error.new(I18n.t("providers.realie.errors.not_found"))
+      else
+        super
+      end
+    end
+
+    def base_url
+      ENV["REALIE_URL"] || "https://app.realie.ai"
+    end
+
+    def client
+      @client ||= Faraday.new(url: base_url, ssl: self.class.faraday_ssl_options) do |faraday|
+        # Retry transient connection failures so a network blip doesn't burn
+        # one of the tight monthly budget's requests
+        faraday.request(:retry, {
+          max: 3,
+          interval: 1.0,
+          interval_randomness: 0.5,
+          backoff_factor: 2,
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [ Faraday::ConnectionFailed ]
+        })
+        faraday.request :json
+        faraday.response :raise_error
+        faraday.options.timeout = 10
+        faraday.options.open_timeout = 5
+        faraday.headers["Authorization"] = api_key
+        faraday.headers["Accept"] = "application/json"
+      end
+    end
+end
diff --git a/app/models/provider/redbark.rb b/app/models/provider/redbark.rb
new file mode 100644
index 000000000..fb60ad093
--- /dev/null
+++ b/app/models/provider/redbark.rb
@@ -0,0 +1,262 @@
+# frozen_string_literal: true
+
+class Provider::Redbark
+  include HTTParty
+
+  headers "User-Agent" => "Sure Finance Redbark Client"
+  default_options.merge!(verify: true, ssl_verify_mode: OpenSSL::SSL::VERIFY_PEER, timeout: 120)
+
+  BASE_URL = "https://api.redbark.com/v1"
+
+  # Server-side maximums for limit/offset pagination
+  ACCOUNTS_PAGE_SIZE = 200
+  TRANSACTIONS_PAGE_SIZE = 500
+
+  class Error < StandardError
+    attr_reader :error_type
+
+    def initialize(message, error_type = :unknown)
+      super(message)
+      @error_type = error_type
+    end
+  end
+
+  class ConfigurationError < Error; end
+  class AuthenticationError < Error; end
+  class RateLimitError < Error; end
+  class ServerError < Error; end
+
+  attr_reader :api_key
+
+  def initialize(api_key:)
+    @api_key = api_key
+    validate_configuration!
+  end
+
+  # Returns all accounts across the user's connections.
+  # Response items: { id, connectionId, provider, name, type, institutionName, accountNumber, currency }
+  def list_accounts
+    results, truncated = paginate("list_accounts", "#{BASE_URL}/accounts", page_size: ACCOUNTS_PAGE_SIZE)
+
+    # A partial account list must never reach downstream pruning
+    raise Error.new("list_accounts returned a truncated account list", :truncated) if truncated
+
+    results
+  end
+
+  # Returns all connections: { id, provider, category, institutionId, institutionName,
+  # institutionLogo, status, lastRefreshedAt, createdAt }
+  def list_connections
+    with_retries("list_connections") do
+      response = self.class.get("#{BASE_URL}/connections", headers: auth_headers)
+      handle_response(response)[:data] || []
+    end
+  end
+
+  # Returns balances for the given account ids.
+  # Response items: { accountId, currentBalance, availableBalance, currency }
+  def get_balances(account_ids:)
+    return [] if account_ids.blank?
+
+    with_retries("get_balances") do
+      response = self.class.get(
+        "#{BASE_URL}/balances",
+        headers: auth_headers,
+        query: { accountIds: Array(account_ids).join(",") }
+      )
+      handle_response(response)[:data] || []
+    end
+  end
+
+  # Returns all transactions for one account within the date range.
+  # Both connection_id and account_id are required by the API.
+  # Response items: { id, accountId, accountName, status, date, datetime, postDate,
+  # postDatetime, valueDate, valueDatetime, description, amount, direction, category,
+  # merchantName, merchantCategoryCode }
+  # Amounts are pre-signed decimal strings: positive = credit (money in), negative = debit.
+  def get_transactions(connection_id:, account_id:, start_date: nil, end_date: nil, include_pending: false)
+    query = {
+      connectionId: connection_id,
+      accountId: account_id
+    }
+    fetch_transactions_window(
+      connection_id: connection_id,
+      account_id: account_id,
+      start_date: start_date&.to_date,
+      end_date: end_date&.to_date,
+      include_pending: include_pending,
+      splits_left: MAX_WINDOW_SPLITS
+    )
+  end
+
+  private
+
+    RETRYABLE_ERRORS = [
+      SocketError, Net::OpenTimeout, Net::ReadTimeout,
+      Errno::ECONNRESET, Errno::ECONNREFUSED, Errno::ETIMEDOUT, EOFError
+    ].freeze
+
+    MAX_RETRIES = 3
+    INITIAL_RETRY_DELAY = 2 # seconds
+    MAX_PAGES = 50 # safety cap so a bad hasMore can never loop forever
+    MAX_WINDOW_SPLITS = 6 # bounds recursion when halving a truncated date window
+
+    def validate_configuration!
+      raise ConfigurationError, "Api key is required" if @api_key.blank?
+    end
+
+    # A truncated window cannot be paged past the row ceiling; halve the date
+    # range and recurse until every window fits, raising once it cannot narrow
+    def fetch_transactions_window(connection_id:, account_id:, start_date:, end_date:, include_pending:, splits_left:)
+      query = {
+        connectionId: connection_id,
+        accountId: account_id
+      }
+      query[:from] = start_date.to_s if start_date
+      query[:to] = end_date.to_s if end_date
+      query[:includePending] = "true" if include_pending
+
+      results, truncated = paginate("get_transactions", "#{BASE_URL}/transactions", page_size: TRANSACTIONS_PAGE_SIZE, query: query)
+      return results unless truncated
+
+      if start_date.nil? || end_date.nil? || splits_left <= 0 || start_date >= end_date
+        raise Error.new("get_transactions hit the server row ceiling and the date window cannot be narrowed further", :truncated)
+      end
+
+      mid = start_date + ((end_date - start_date) / 2).to_i
+      Rails.logger.info "Redbark API: get_transactions window #{start_date}..#{end_date} truncated, splitting at #{mid}"
+
+      first_half = fetch_transactions_window(
+        connection_id: connection_id, account_id: account_id,
+        start_date: start_date, end_date: mid,
+        include_pending: include_pending, splits_left: splits_left - 1
+      )
+      second_half = fetch_transactions_window(
+        connection_id: connection_id, account_id: account_id,
+        start_date: mid + 1, end_date: end_date,
+        include_pending: include_pending, splits_left: splits_left - 1
+      )
+
+      (first_half + second_half).uniq { |t| t[:id] || t }
+    end
+
+    # Follows limit/offset pagination until hasMore is false. Returns
+    # [results, truncated] - truncated means the server row ceiling fired
+    # (X-Redbark-Truncated) and the caller decides how to recover
+    def paginate(operation_name, url, page_size:, query: {})
+      results = []
+      offset = 0
+      exhausted = false
+
+      MAX_PAGES.times do
+        page, headers = with_retries(operation_name) do
+          response = self.class.get(
+            url,
+            headers: auth_headers,
+            query: query.merge(limit: page_size, offset: offset)
+          )
+          [ handle_response(response), response.headers ]
+        end
+
+        data = page[:data] || []
+        results.concat(data)
+
+        if headers["x-redbark-truncated"].to_s == "true"
+          return [ results, true ]
+        end
+
+        pagination = page[:pagination] || {}
+        unless pagination[:hasMore]
+          exhausted = true
+          break
+        end
+
+        # hasMore with an empty page means the server stopped early
+        if data.empty?
+          raise Error.new("#{operation_name} returned an empty page while reporting more results", :truncated)
+        end
+
+        offset += data.size
+      end
+
+      unless exhausted
+        raise Error.new("#{operation_name} exceeded #{MAX_PAGES} pages without exhausting results", :too_many_pages)
+      end
+
+      [ results, false ]
+    end
+
+    def with_retries(operation_name, max_retries: MAX_RETRIES)
+      retries = 0
+
+      begin
+        yield
+      rescue *RETRYABLE_ERRORS, RateLimitError, ServerError => e
+        retries += 1
+
+        if retries <= max_retries
+          delay = calculate_retry_delay(retries)
+          Rails.logger.warn(
+            "Redbark API: #{operation_name} failed (attempt #{retries}/#{max_retries}): " \
+            "#{e.class}: #{e.message}. Retrying in #{delay}s..."
+          )
+          sleep(delay)
+          retry
+        else
+          Rails.logger.error(
+            "Redbark API: #{operation_name} failed after #{max_retries} retries: " \
+            "#{e.class}: #{e.message}"
+          )
+          raise e if e.is_a?(Error)
+          raise Error.new("Network error after #{max_retries} retries: #{e.message}", :network_error)
+        end
+      end
+    end
+
+    def calculate_retry_delay(retry_count)
+      base_delay = INITIAL_RETRY_DELAY * (2 ** (retry_count - 1))
+      jitter = base_delay * rand * 0.25
+      [ base_delay + jitter, 30 ].min
+    end
+
+    def auth_headers
+      {
+        "Authorization" => "Bearer #{@api_key}",
+        "Content-Type" => "application/json",
+        "Accept" => "application/json"
+      }
+    end
+
+    # Redbark error envelope: { error: { message, code, details } }
+    # Error messages carry the parsed provider message only, never the raw
+    # response body - callers log and re-log these strings.
+    def handle_response(response)
+      case response.code
+      when 200, 201
+        JSON.parse(response.body, symbolize_names: true)
+      when 400
+        raise Error.new("Bad request: #{error_message_from(response)}", :bad_request)
+      when 401
+        raise AuthenticationError.new("Invalid API key", :unauthorized)
+      when 403
+        raise AuthenticationError.new("Access forbidden - your Redbark plan may not include API access", :access_forbidden)
+      when 404
+        raise Error.new("Resource not found", :not_found)
+      when 410
+        raise Error.new("Endpoint requires an accountId: #{error_message_from(response)}", :bad_request)
+      when 429
+        raise RateLimitError.new("Rate limit exceeded", :rate_limited)
+      when 500..599
+        raise ServerError.new("Redbark server error (#{response.code})", :server_error)
+      else
+        raise Error.new("Unexpected response #{response.code}: #{error_message_from(response)}", :unknown)
+      end
+    end
+
+    def error_message_from(response)
+      parsed = JSON.parse(response.body)
+      parsed.dig("error", "message") || "no error message provided"
+    rescue JSON::ParserError
+      "unparseable error response"
+    end
+end
diff --git a/app/models/provider/redbark_adapter.rb b/app/models/provider/redbark_adapter.rb
new file mode 100644
index 000000000..67f112f79
--- /dev/null
+++ b/app/models/provider/redbark_adapter.rb
@@ -0,0 +1,98 @@
+class Provider::RedbarkAdapter < Provider::Base
+  include Provider::Syncable
+  include Provider::InstitutionMetadata
+
+  # Register this adapter with the factory
+  Provider::Factory.register("RedbarkAccount", self)
+
+  # Define which account types this provider supports
+  def self.supported_account_types
+    %w[Depository CreditCard Loan]
+  end
+
+  # Returns connection configurations for this provider
+  def self.connection_configs(family:)
+    return [] unless family.can_connect_redbark?
+
+    [ {
+      key: "redbark",
+      name: "Redbark",
+      description: "Connect your Australian bank accounts via Redbark",
+      can_connect: true,
+      new_account_path: ->(accountable_type, return_to) {
+        Rails.application.routes.url_helpers.select_accounts_redbark_items_path(
+          accountable_type: accountable_type,
+          return_to: return_to
+        )
+      },
+      existing_account_path: ->(account_id) {
+        Rails.application.routes.url_helpers.select_existing_account_redbark_items_path(
+          account_id: account_id
+        )
+      }
+    } ]
+  end
+
+  def provider_name
+    "redbark"
+  end
+
+  # Build a Redbark provider instance with family-specific credentials
+  # @param family [Family] The family to get credentials for (required)
+  # @return [Provider::Redbark, nil] Returns nil if credentials are not configured
+  def self.build_provider(family: nil)
+    return nil unless family.present?
+
+    # Get family-specific credentials
+    redbark_item = family.redbark_items.where.not(api_key: nil).first
+    return nil unless redbark_item&.credentials_configured?
+
+    Provider::Redbark.new(api_key: redbark_item.api_key)
+  end
+
+  def sync_path
+    Rails.application.routes.url_helpers.sync_redbark_item_path(item)
+  end
+
+  def item
+    provider_account.redbark_item
+  end
+
+
+  def institution_domain
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    domain = metadata["domain"]
+    url = metadata["url"]
+
+    # Derive domain from URL if missing
+    if domain.blank? && url.present?
+      begin
+        domain = URI.parse(url).host&.gsub(/^www\./, "")
+      rescue URI::InvalidURIError
+        Rails.logger.warn("Invalid institution URL for Redbark account #{provider_account.id}: #{url}")
+      end
+    end
+
+    domain
+  end
+
+  def institution_name
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    metadata["name"] || item&.institution_name
+  end
+
+  def institution_url
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    metadata["url"] || item&.institution_url
+  end
+
+  def institution_color
+    item&.institution_color
+  end
+end
diff --git a/app/models/provider/registry.rb b/app/models/provider/registry.rb
index 085c31b50..b625fc22f 100644
--- a/app/models/provider/registry.rb
+++ b/app/models/provider/registry.rb
@@ -3,7 +3,7 @@ class Provider::Registry
 
   Error = Class.new(StandardError)
 
-  CONCEPTS = %i[exchange_rates securities llm]
+  CONCEPTS = %i[exchange_rates securities llm property_valuations]
 
   validates :concept, inclusion: { in: CONCEPTS }
 
@@ -18,6 +18,20 @@ class Provider::Registry
       raise Error.new("Provider '#{name}' not found in registry")
     end
 
+    # Resolves the LLM provider for batch/PDF flows, honoring Setting.llm_provider
+    # the way chat does: prefer the configured provider, but fall back to whichever
+    # one actually has credentials so an install that swaps providers (or has only
+    # one configured) keeps working. Returns nil when neither is configured —
+    # callers guard on that.
+    def preferred_llm_provider
+      order = Setting.llm_provider == "anthropic" ? %i[anthropic openai] : %i[openai anthropic]
+      order.each do |name|
+        provider = get_provider(name)
+        return provider if provider
+      end
+      nil
+    end
+
     def plaid_provider_for_region(region)
       region.to_sym == :us ? plaid_us : plaid_eu
     end
@@ -126,6 +140,38 @@ class Provider::Registry
       def binance_public
         Provider::BinancePublic.new
       end
+
+      def moex_public
+        Provider::MoexPublic.new
+      end
+
+      def frankfurter
+        Provider::Frankfurter.new
+      end
+
+      def tinkoff_invest
+        api_key = ENV["TINKOFF_INVEST_API_KEY"].presence || Setting.tinkoff_invest_api_key # pipelock:ignore
+
+        return nil unless api_key.present?
+
+        Provider::TinkoffInvest.new(api_key)
+      end
+
+      def rentcast
+        api_key = ENV["RENTCAST_API_KEY"].presence || Setting.rentcast_api_key # pipelock:ignore
+
+        return nil unless api_key.present?
+
+        Provider::Rentcast.new(api_key)
+      end
+
+      def realie
+        api_key = ENV["REALIE_API_KEY"].presence || Setting.realie_api_key # pipelock:ignore
+
+        return nil unless api_key.present?
+
+        Provider::Realie.new(api_key)
+      end
   end
 
   def initialize(concept)
@@ -156,11 +202,13 @@ class Provider::Registry
     def available_providers
       case concept
       when :exchange_rates
-        %i[twelve_data yahoo_finance]
+        %i[twelve_data yahoo_finance moex_public frankfurter]
       when :securities
-        %i[twelve_data yahoo_finance tiingo eodhd alpha_vantage mfapi binance_public]
+        %i[twelve_data yahoo_finance tiingo eodhd alpha_vantage mfapi binance_public moex_public tinkoff_invest]
       when :llm
         %i[openai anthropic]
+      when :property_valuations
+        %i[rentcast realie]
       else
         %i[plaid_us plaid_eu github openai anthropic]
       end
diff --git a/app/models/provider/rentcast.rb b/app/models/provider/rentcast.rb
new file mode 100644
index 000000000..16059d1fa
--- /dev/null
+++ b/app/models/provider/rentcast.rb
@@ -0,0 +1,96 @@
+class Provider::Rentcast < Provider
+  include PropertyValuationConcept, RateLimitable
+  extend SslConfigurable
+
+  # Subclass so errors caught in this provider are raised as Provider::Rentcast::Error
+  Error = Class.new(Provider::Error)
+  RateLimitError = Class.new(Error)
+
+  # Minimum delay between requests to avoid rate limiting (in seconds)
+  MIN_REQUEST_INTERVAL = 1.0
+
+  # Maximum API requests per month (RentCast free tier limit).
+  # Override with RENTCAST_MAX_REQUESTS_PER_MONTH for paid plans.
+  MAX_REQUESTS_PER_MONTH = 50
+
+  # RentCast property types to Property::SUBTYPES keys. Unmapped types
+  # (e.g. "Manufactured") leave the subtype unset rather than guessing.
+  PROPERTY_TYPE_MAP = {
+    "Single Family" => "single_family_home",
+    "Multi-Family" => "multi_family_home",
+    "Condo" => "condominium",
+    "Townhouse" => "townhouse",
+    "Apartment" => "apartment",
+    "Land" => "plot"
+  }.freeze
+
+  def initialize(api_key)
+    @api_key = api_key # pipelock:ignore
+  end
+
+  # Fetches the value estimate and the subject property's attributes in a
+  # single request — `lookupSubjectAttributes` enriches the AVM response with
+  # the property record, so a separate /v1/properties call isn't needed.
+  def fetch_property_valuation(line1:, locality: nil, region: nil, postal_code: nil)
+    with_provider_response do
+      throttle_request
+      record_monthly_request!
+
+      response = client.get("#{base_url}/v1/avm/value") do |req|
+        req.params["address"] = [ line1, locality, region, postal_code ].map { |part| part.to_s.strip }.reject(&:empty?).join(", ")
+        req.params["lookupSubjectAttributes"] = true
+      end
+
+      parsed = JSON.parse(response.body)
+      price = parsed["price"]
+      raise Error.new(I18n.t("providers.rentcast.errors.no_valuation")) if price.blank?
+
+      subject = parsed["subjectProperty"] || {}
+
+      PropertyValuation.new(
+        valuation: BigDecimal(price.to_s),
+        currency: "USD",
+        property_type: PROPERTY_TYPE_MAP[subject["propertyType"]],
+        year_built: subject["yearBuilt"],
+        area_value: subject["squareFootage"],
+        area_unit: "sqft"
+      )
+    end
+  end
+
+  private
+    attr_reader :api_key
+
+    def default_error_transformer(error)
+      case error
+      when Faraday::ResourceNotFound
+        Error.new(I18n.t("providers.rentcast.errors.not_found"))
+      else
+        super
+      end
+    end
+
+    def base_url
+      ENV["RENTCAST_URL"] || "https://api.rentcast.io"
+    end
+
+    def client
+      @client ||= Faraday.new(url: base_url, ssl: self.class.faraday_ssl_options) do |faraday|
+        # Retry transient connection failures so a network blip doesn't burn
+        # one of the tight monthly budget's requests
+        faraday.request(:retry, {
+          max: 3,
+          interval: 1.0,
+          interval_randomness: 0.5,
+          backoff_factor: 2,
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [ Faraday::ConnectionFailed ]
+        })
+        faraday.request :json
+        faraday.response :raise_error
+        faraday.options.timeout = 10
+        faraday.options.open_timeout = 5
+        faraday.headers["X-Api-Key"] = api_key
+        faraday.headers["Accept"] = "application/json"
+      end
+    end
+end
diff --git a/app/models/provider/simplefin.rb b/app/models/provider/simplefin.rb
index b878106bb..39a0d8898 100644
--- a/app/models/provider/simplefin.rb
+++ b/app/models/provider/simplefin.rb
@@ -36,7 +36,7 @@ class Provider::Simplefin
     # Use retry logic for transient network failures during token claim
     # Claim should be fast; keep request-path latency bounded.
     # Use self.class.post to inherit class-level SSL and timeout defaults
-    response = with_retries("POST /claim", max_retries: 1, sleep: false) do
+    response = with_retries("POST /claim", max_retries: 1, backoff: false) do
       self.class.post(claim_url, timeout: 15)
     end
 
@@ -66,7 +66,11 @@ class Provider::Simplefin
       query_params["end-date"] = end_timestamp.to_s
     end
 
-    query_params["pending"] = pending ? "1" : "0" unless pending.nil?
+    # Per the SimpleFIN protocol, pending transactions are excluded by default
+    # and only included when `pending=1` is present. Bridges presence-check the
+    # param, so sending `pending=0` behaves like `pending=1` — the only
+    # spec-compliant way to exclude pending is to omit the param entirely.
+    query_params["pending"] = "1" if pending
 
     accounts_url = "#{access_url}/accounts"
     accounts_url += "?#{URI.encode_www_form(query_params)}" unless query_params.empty?
@@ -126,7 +130,7 @@ class Provider::Simplefin
     # Execute a block with retry logic and exponential backoff for transient network errors.
     # This helps handle temporary network issues that cause autosync failures while
     # manual sync (with user retry) succeeds.
-    def with_retries(operation_name, max_retries: MAX_RETRIES, sleep: true)
+    def with_retries(operation_name, max_retries: MAX_RETRIES, backoff: true)
       retries = 0
 
       begin
@@ -140,7 +144,7 @@ class Provider::Simplefin
             "SimpleFin API: #{operation_name} failed (attempt #{retries}/#{max_retries}): " \
             "#{e.class}: #{e.message}. Retrying in #{delay}s..."
           )
-          Kernel.sleep(delay) if sleep && delay.to_f.positive?
+          sleep(delay) if backoff && delay.to_f.positive?
           retry
         else
           Rails.logger.error(
diff --git a/app/models/provider/snaptrade.rb b/app/models/provider/snaptrade.rb
index 5f4e84998..39b59d069 100644
--- a/app/models/provider/snaptrade.rb
+++ b/app/models/provider/snaptrade.rb
@@ -1,3 +1,12 @@
+# SnapTrade API client using SnapTrade OAuth apps (pre-release feature).
+#
+# Auth model:
+#   - Instance admin registers an OAuth app on dashboard.snaptrade.com and sets
+#     SNAPTRADE_OAUTH_CLIENT_ID / SNAPTRADE_OAUTH_CLIENT_SECRET.
+#   - Users authorize via authorization-code + PKCE; per-item access/refresh
+#     tokens are stored (encrypted) on SnaptradeItem.
+#   - Data calls send Authorization: Bearer <access_token>. The SnapTrade user
+#     is implicit in the token; there is no userId/userSecret.
 class Provider::Snaptrade
   class Error < StandardError; end
   class AuthenticationError < Error; end
@@ -12,234 +21,358 @@ class Provider::Snaptrade
     end
   end
 
-  # Retry configuration for transient network failures
   MAX_RETRIES = 3
   INITIAL_RETRY_DELAY = 2 # seconds
   MAX_RETRY_DELAY = 30 # seconds
 
-  attr_reader :client
+  API_BASE_URL = "https://api.snaptrade.com".freeze
+  AUTHORIZE_URL = "https://dashboard.snaptrade.com/oauth/authorize".freeze
+  TOKEN_URL = "https://api.snaptrade.com/oauth/token/".freeze
+  REVOKE_URL = "https://api.snaptrade.com/oauth/revoke_token/".freeze
+  DASHBOARD_URL = "https://dashboard.snaptrade.com".freeze
+  TOKEN_EXPIRY_LEEWAY = 60 # seconds; refresh this long before actual expiry
 
-  def initialize(client_id:, consumer_key:)
-    raise ConfigurationError, "client_id is required" if client_id.blank?
-    raise ConfigurationError, "consumer_key is required" if consumer_key.blank?
-
-    configuration = SnapTrade::Configuration.new
-    configuration.client_id = client_id
-    configuration.consumer_key = consumer_key
-    @client = SnapTrade::Client.new(configuration)
-  end
-
-  # Register a new SnapTrade user
-  # Returns { user_id: String, user_secret: String }
-  def register_user(user_id)
-    with_retries("register_user") do
-      response = client.authentication.register_snap_trade_user(
-        user_id: user_id
-      )
-      {
-        user_id: response.user_id,
-        user_secret: response.user_secret
-      }
+  class << self
+    def oauth_configured?
+      oauth_client_id.present? && oauth_client_secret.present?
     end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "register_user")
-  end
 
-  # Delete a SnapTrade user (resets all connections)
-  def delete_user(user_id:)
-    with_retries("delete_user") do
-      client.authentication.delete_snap_trade_user(
-        user_id: user_id
-      )
+    def oauth_client_id
+      Rails.configuration.x.snaptrade&.oauth_client_id
     end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "delete_user")
-  end
 
-  # List all registered users
-  def list_users
-    with_retries("list_users") do
-      client.authentication.list_snap_trade_users
+    def oauth_client_secret
+      Rails.configuration.x.snaptrade&.oauth_client_secret
     end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "list_users")
-  end
 
-  # List all brokerage connections/authorizations
-  def list_connections(user_id:, user_secret:)
-    with_retries("list_connections") do
-      client.connections.list_brokerage_authorizations(
-        user_id: user_id,
-        user_secret: user_secret
-      )
+    # PKCE pair per RFC 7636 (S256)
+    def generate_pkce
+      verifier = SecureRandom.urlsafe_base64(64).delete("=")[0, 128]
+      challenge = Base64.urlsafe_encode64(OpenSSL::Digest::SHA256.digest(verifier), padding: false)
+      { verifier: verifier, challenge: challenge }
     end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "list_connections")
-  end
 
-  # Delete a specific brokerage connection/authorization
-  # This frees up one of your connection slots
-  def delete_connection(user_id:, user_secret:, authorization_id:)
-    with_retries("delete_connection") do
-      client.connections.remove_brokerage_authorization(
-        user_id: user_id,
-        user_secret: user_secret,
-        authorization_id: authorization_id
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "delete_connection")
-  end
+    def authorize_url(redirect_uri:, state:, code_challenge:, scope: "read")
+      raise ConfigurationError, "SnapTrade OAuth is not configured" unless oauth_configured?
 
-  # Get connection portal URL (OAuth-like redirect to SnapTrade)
-  # Returns the redirect URL string
-  def get_connection_url(user_id:, user_secret:, redirect_url:, broker: nil)
-    with_retries("get_connection_url") do
-      response = client.authentication.login_snap_trade_user(
-        user_id: user_id,
-        user_secret: user_secret,
-        custom_redirect: redirect_url,
-        connection_type: "read",
-        broker: broker
-      )
-      response.redirect_uri
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_connection_url")
-  end
-
-  # List connected brokerage accounts
-  # Returns array of account objects
-  def list_accounts(user_id:, user_secret:)
-    with_retries("list_accounts") do
-      client.account_information.list_user_accounts(
-        user_id: user_id,
-        user_secret: user_secret
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "list_accounts")
-  end
-
-  # Get account details
-  def get_account_details(user_id:, user_secret:, account_id:)
-    with_retries("get_account_details") do
-      client.account_information.get_user_account_details(
-        user_id: user_id,
-        user_secret: user_secret,
-        account_id: account_id
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_account_details")
-  end
-
-  # Get positions/holdings for an account
-  # Returns array of position objects
-  def get_positions(user_id:, user_secret:, account_id:)
-    with_retries("get_positions") do
-      client.account_information.get_user_account_positions(
-        user_id: user_id,
-        user_secret: user_secret,
-        account_id: account_id
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_positions")
-  end
-
-  # Get all holdings across all accounts
-  def get_all_holdings(user_id:, user_secret:)
-    with_retries("get_all_holdings") do
-      client.account_information.get_all_user_holdings(
-        user_id: user_id,
-        user_secret: user_secret
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_all_holdings")
-  end
-
-  # Get holdings for a specific account (includes more details)
-  def get_holdings(user_id:, user_secret:, account_id:)
-    with_retries("get_holdings") do
-      client.account_information.get_user_holdings(
-        user_id: user_id,
-        user_secret: user_secret,
-        account_id: account_id
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_holdings")
-  end
-
-  # Get balances for an account
-  def get_balances(user_id:, user_secret:, account_id:)
-    with_retries("get_balances") do
-      client.account_information.get_user_account_balance(
-        user_id: user_id,
-        user_secret: user_secret,
-        account_id: account_id
-      )
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_balances")
-  end
-
-  # Get activity/transaction history for a specific account
-  # Supports pagination via start_date and end_date
-  def get_account_activities(user_id:, user_secret:, account_id:, start_date: nil, end_date: nil)
-    with_retries("get_account_activities") do
       params = {
-        user_id: user_id,
-        user_secret: user_secret,
-        account_id: account_id
+        response_type: "code",
+        client_id: oauth_client_id,
+        redirect_uri: redirect_uri,
+        scope: scope,
+        state: state,
+        code_challenge: code_challenge,
+        code_challenge_method: "S256"
       }
-      params[:start_date] = start_date.to_date.to_s if start_date
-      params[:end_date] = end_date.to_date.to_s if end_date
-
-      client.account_information.get_account_activities(**params)
+      "#{AUTHORIZE_URL}?#{params.to_query}"
     end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_account_activities")
+
+    def exchange_code(code:, redirect_uri:, code_verifier:)
+      token_request(
+        grant_type: "authorization_code",
+        code: code,
+        redirect_uri: redirect_uri,
+        code_verifier: code_verifier
+      )
+    end
+
+    def refresh_tokens(refresh_token:)
+      token_request(grant_type: "refresh_token", refresh_token: refresh_token)
+    end
+
+    # Best-effort revocation (RFC 7009). Returns true on success.
+    def revoke_token(token:)
+      return false if token.blank?
+      raise ConfigurationError, "SnapTrade OAuth is not configured" unless oauth_configured?
+
+      response = oauth_connection.post(REVOKE_URL) do |request|
+        request.headers["Authorization"] = basic_auth_header
+        request.headers["Content-Type"] = "application/x-www-form-urlencoded"
+        request.body = URI.encode_www_form(token: token)
+      end
+      response.success?
+    rescue Faraday::Error => e
+      Rails.logger.warn("SnapTrade token revocation failed: #{e.class} - #{e.message}")
+      false
+    end
+
+    private
+
+      def token_request(params)
+        raise ConfigurationError, "SnapTrade OAuth is not configured" unless oauth_configured?
+
+        # Not retried: a token request consumes a single-use authorization code
+        # or rotates the refresh token. If the response is lost after SnapTrade
+        # processed it, replaying the same params would fail with invalid_grant
+        # even though the original request actually succeeded.
+        response = without_retry("POST #{TOKEN_URL}") do
+          oauth_connection.post(TOKEN_URL) do |request|
+            request.headers["Authorization"] = basic_auth_header
+            request.headers["Content-Type"] = "application/x-www-form-urlencoded"
+            request.body = URI.encode_www_form(params)
+          end
+        end
+
+        payload = parse_json(response.body)
+        return payload if response.success?
+
+        error = payload["error_description"].presence || payload["error"].presence || "HTTP #{response.status}"
+        if (400..499).cover?(response.status)
+          raise AuthenticationError, "SnapTrade OAuth token request failed: #{error}"
+        end
+
+        raise ApiError.new(
+          "SnapTrade OAuth token request failed: #{error}",
+          status_code: response.status, response_body: response.body
+        )
+      end
+
+      def basic_auth_header
+        "Basic #{Base64.strict_encode64("#{oauth_client_id}:#{oauth_client_secret}")}"
+      end
+
+      def oauth_connection
+        Faraday.new do |faraday|
+          faraday.options.timeout = 30
+          faraday.options.open_timeout = 10
+        end
+      end
+
+      def parse_json(body)
+        body.present? ? JSON.parse(body) : {}
+      rescue JSON::ParserError
+        {}
+      end
+
+      def with_retries(operation_name, max_retries: MAX_RETRIES)
+        retries = 0
+
+        begin
+          yield
+        rescue Faraday::TimeoutError, Faraday::ConnectionFailed, Errno::ECONNRESET, Errno::ETIMEDOUT => e
+          retries += 1
+
+          if retries <= max_retries
+            delay = calculate_retry_delay(retries)
+            Rails.logger.warn(
+              "SnapTrade OAuth: #{operation_name} failed (attempt #{retries}/#{max_retries}): " \
+              "#{e.class}: #{e.message}. Retrying in #{delay}s..."
+            )
+            sleep(delay)
+            retry
+          else
+            Rails.logger.error(
+              "SnapTrade OAuth: #{operation_name} failed after #{max_retries} retries: " \
+              "#{e.class}: #{e.message}"
+            )
+            raise ApiError.new("Network error after #{max_retries} retries: #{e.message}")
+          end
+        end
+      end
+
+      # For requests that must not be replayed (single-use codes, token rotation):
+      # translate a network failure into an ApiError without retrying.
+      def without_retry(operation_name)
+        yield
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed, Errno::ECONNRESET, Errno::ETIMEDOUT => e
+        Rails.logger.error("SnapTrade OAuth: #{operation_name} failed (not retried, non-idempotent): #{e.class}: #{e.message}")
+        raise ApiError.new("Network error (not retried, non-idempotent request): #{e.message}")
+      end
+
+      def calculate_retry_delay(retry_count)
+        base_delay = INITIAL_RETRY_DELAY * (2 ** (retry_count - 1))
+        jitter = base_delay * rand * 0.25
+        [ base_delay + jitter, MAX_RETRY_DELAY ].min
+      end
   end
 
-  # Get activities across all accounts (alternative endpoint)
-  def get_activities(user_id:, user_secret:, start_date: nil, end_date: nil, accounts: nil, brokerage_authorizations: nil, type: nil)
-    with_retries("get_activities") do
-      params = {
-        user_id: user_id,
-        user_secret: user_secret
-      }
-      params[:start_date] = start_date.to_date.to_s if start_date
-      params[:end_date] = end_date.to_date.to_s if end_date
-      params[:accounts] = accounts if accounts
-      params[:brokerage_authorizations] = brokerage_authorizations if brokerage_authorizations
-      params[:type] = type if type
+  attr_reader :snaptrade_item
 
-      client.transactions_and_reporting.get_activities(**params)
-    end
-  rescue SnapTrade::ApiError => e
-    handle_api_error(e, "get_activities")
+  def initialize(snaptrade_item)
+    raise ConfigurationError, "snaptrade_item is required" if snaptrade_item.nil?
+    @snaptrade_item = snaptrade_item
+  end
+
+  # --- Data methods. The SnapTrade user is implicit in the Bearer token. ---
+
+  # Returns Array<Hash> of brokerage accounts
+  def list_accounts
+    get_json("/api/v1/accounts")
+  end
+
+  # Returns Array<Hash> of balance entries
+  def get_balances(account_id:)
+    get_json("/api/v1/accounts/#{account_id}/balances")
+  end
+
+  # Returns Array<Hash> of positions
+  def get_positions(account_id:)
+    get_json("/api/v1/accounts/#{account_id}/positions")
+  end
+
+  # Returns raw JSON: paginated form is {"data" => [...]}, may also be a plain Array
+  def get_account_activities(account_id:, start_date: nil, end_date: nil)
+    params = {}
+    params[:startDate] = start_date.to_date.to_s if start_date
+    params[:endDate] = end_date.to_date.to_s if end_date
+    get_json("/api/v1/accounts/#{account_id}/activities", params)
+  end
+
+  # Cross-account activities endpoint. Returns Array<Hash>.
+  def get_activities(start_date: nil, end_date: nil, accounts: nil, brokerage_authorizations: nil, type: nil)
+    params = {}
+    params[:startDate] = start_date.to_date.to_s if start_date
+    params[:endDate] = end_date.to_date.to_s if end_date
+    params[:accounts] = accounts if accounts
+    params[:brokerageAuthorizations] = brokerage_authorizations if brokerage_authorizations
+    params[:type] = type if type
+    get_json("/api/v1/activities", params)
+  end
+
+  # Returns Array<Hash> of brokerage authorizations (connections)
+  def list_connections
+    get_json("/api/v1/authorizations")
+  end
+
+  def delete_connection(authorization_id:)
+    request_json(:delete, "/api/v1/authorizations/#{authorization_id}")
+  end
+
+  # Connection portal URL (loginUser). Returns the redirect URL string.
+  def get_connection_url(redirect_url:, broker: nil)
+    body = { customRedirect: redirect_url, connectionType: "read" }
+    body[:broker] = broker if broker
+    response = request_json(:post, "/api/v1/snapTrade/login", body: body)
+    response["redirectURI"] || response["redirectUri"]
   end
 
   private
 
-    def handle_api_error(error, operation)
-      status = error.code
-      body = error.response_body
+    def get_json(path, params = {})
+      request_json(:get, path, params: params)
+    end
 
-      Rails.logger.error("SnapTrade API error (#{operation}): #{status} - #{error.message}")
+    def request_json(method, path, params: {}, body: nil, retry_on_auth_failure: true)
+      ensure_fresh_token!
+      operation = "#{method.to_s.upcase} #{path}"
+      used_access_token = snaptrade_item.oauth_access_token
 
-      case status
-      when 401, 403
-        raise AuthenticationError, "Authentication failed: #{error.message}"
-      when 429
-        raise ApiError.new("Rate limit exceeded. Please try again later.", status_code: status, response_body: body)
-      when 500..599
-        raise ApiError.new("SnapTrade server error (#{status}). Please try again later.", status_code: status, response_body: body)
+      # Only GET is safe to retry: a lost response to a POST/DELETE (e.g.
+      # get_connection_url, delete_connection) may already have been applied by
+      # SnapTrade, so replaying it risks duplicate side effects.
+      retrier = method == :get ? method(:with_retries) : method(:without_retry)
+      response = retrier.call(operation) do
+        api_connection.public_send(method, "#{API_BASE_URL}#{path}") do |request|
+          request.headers["Authorization"] = "Bearer #{used_access_token}"
+          request.headers["Accept"] = "application/json"
+          request.params.update(params) if params.present?
+          if body
+            request.headers["Content-Type"] = "application/json"
+            request.body = body.to_json
+          end
+        end
+      end
+
+      if response.status == 401 && retry_on_auth_failure
+        refresh_access_token!(previous_access_token: used_access_token)
+        return request_json(method, path, params: params, body: body, retry_on_auth_failure: false)
+      end
+
+      handle_response(response, operation)
+    end
+
+    def ensure_fresh_token!
+      raise AuthenticationError, "SnapTrade item has no access token" if snaptrade_item.oauth_access_token.blank?
+
+      expires_at = snaptrade_item.oauth_token_expires_at
+      return if expires_at.blank? || expires_at > TOKEN_EXPIRY_LEEWAY.seconds.from_now
+
+      refresh_access_token!
+    end
+
+    # Guards against a concurrent refresh-token rotation race: multiple threads/processes
+    # (e.g. per-account jobs sharing one SnapTrade item) may all observe an expiring/rejected
+    # token and attempt to refresh at once. If SnapTrade rotates refresh tokens as single-use,
+    # every refresh after the first would fail with invalid_grant and needlessly brick the
+    # item. Taking a DB row lock and re-checking freshness after reload ensures only one
+    # caller actually performs the HTTP refresh; the rest observe the winner's fresh token.
+    #
+    # `previous_access_token`, when present, means we're refreshing reactively after a 401 on
+    # that specific token (called from request_json). In that case we skip the HTTP refresh
+    # only if the DB row's access token has already changed since we made the failed request
+    # (i.e. another caller already won the race) -- an expiry-based freshness check would be
+    # wrong here since the server rejected a token we believed was still time-valid.
+    # When `previous_access_token` is absent, we're refreshing proactively (from
+    # ensure_fresh_token!) and skip only if the reloaded row is still time-fresh.
+    def refresh_access_token!(previous_access_token: nil)
+      snaptrade_item.with_lock do
+        snaptrade_item.reload
+
+        if previous_access_token.present?
+          next if snaptrade_item.oauth_access_token != previous_access_token
+        else
+          expires_at = snaptrade_item.oauth_token_expires_at
+          next if expires_at.present? && expires_at > TOKEN_EXPIRY_LEEWAY.seconds.from_now
+        end
+
+        refresh_token = snaptrade_item.oauth_refresh_token
+        raise AuthenticationError, "SnapTrade item has no refresh token" if refresh_token.blank?
+
+        payload = self.class.refresh_tokens(refresh_token: refresh_token)
+        snaptrade_item.apply_oauth_tokens!(payload)
+      end
+    rescue AuthenticationError => e
+      mark_requires_update!
+      DebugLogEntry.capture(
+        category: "provider_sync",
+        level: :error,
+        message: "SnapTrade token refresh failed: #{e.message}",
+        source: "Provider::Snaptrade",
+        provider_key: "snaptrade",
+        family: snaptrade_item.try(:family),
+        metadata: { snaptrade_item_id: snaptrade_item.try(:id) }
+      )
+      raise
+    end
+
+    def mark_requires_update!
+      snaptrade_item.update!(status: :requires_update)
+    rescue StandardError => e
+      Rails.logger.warn("SnapTrade: could not mark item requires_update: #{e.message}")
+    end
+
+    def handle_response(response, operation)
+      if response.success?
+        return {} if response.body.blank?
+        begin
+          JSON.parse(response.body)
+        rescue JSON::ParserError
+          raise ApiError.new("SnapTrade API error (#{operation}): invalid JSON response",
+                             status_code: response.status, response_body: response.body)
+        end
       else
-        raise ApiError.new("SnapTrade API error: #{error.message}", status_code: status, response_body: body)
+        Rails.logger.error("SnapTrade API error (#{operation}): #{response.status}")
+        case response.status
+        when 401, 403
+          mark_requires_update!
+          raise AuthenticationError, "Authentication failed (#{operation}): HTTP #{response.status}"
+        when 429
+          raise ApiError.new("Rate limit exceeded. Please try again later.",
+                             status_code: response.status, response_body: response.body)
+        when 500..599
+          raise ApiError.new("SnapTrade server error (#{response.status}). Please try again later.",
+                             status_code: response.status, response_body: response.body)
+        else
+          raise ApiError.new("SnapTrade API error (#{operation}): HTTP #{response.status}",
+                             status_code: response.status, response_body: response.body)
+        end
+      end
+    end
+
+    def api_connection
+      @api_connection ||= Faraday.new do |faraday|
+        faraday.options.timeout = 30
+        faraday.options.open_timeout = 10
       end
     end
 
@@ -269,6 +402,13 @@ class Provider::Snaptrade
       end
     end
 
+    def without_retry(operation_name)
+      yield
+    rescue Faraday::TimeoutError, Faraday::ConnectionFailed, Errno::ECONNRESET, Errno::ETIMEDOUT => e
+      Rails.logger.error("SnapTrade API: #{operation_name} failed (not retried, non-idempotent): #{e.class}: #{e.message}")
+      raise ApiError.new("Network error (not retried, non-idempotent request): #{e.message}")
+    end
+
     def calculate_retry_delay(retry_count)
       base_delay = INITIAL_RETRY_DELAY * (2 ** (retry_count - 1))
       jitter = base_delay * rand * 0.25
diff --git a/app/models/provider/snaptrade_adapter.rb b/app/models/provider/snaptrade_adapter.rb
index 8f9a946fb..46db1b64c 100644
--- a/app/models/provider/snaptrade_adapter.rb
+++ b/app/models/provider/snaptrade_adapter.rb
@@ -38,20 +38,17 @@ class Provider::SnaptradeAdapter < Provider::Base
     "snaptrade"
   end
 
-  # Build a SnapTrade provider instance with family-specific credentials
-  # @param family [Family] The family to get credentials for (required)
-  # @return [Provider::Snaptrade, nil] Returns nil if credentials are not configured
+  # Build a SnapTrade provider instance for a family's authorized item
+  # @param family [Family] The family to get an authorized item for (required)
+  # @return [Provider::Snaptrade, nil] Returns nil if OAuth is not configured/authorized
   def self.build_provider(family: nil)
     return nil unless family.present?
+    return nil unless Provider::Snaptrade.oauth_configured?
 
-    # Get family-specific credentials
-    snaptrade_item = family.snaptrade_items.where.not(client_id: nil).first
-    return nil unless snaptrade_item&.credentials_configured?
+    snaptrade_item = family.snaptrade_items.syncable.first
+    return nil unless snaptrade_item
 
-    Provider::Snaptrade.new(
-      client_id: snaptrade_item.client_id,
-      consumer_key: snaptrade_item.consumer_key
-    )
+    Provider::Snaptrade.new(snaptrade_item)
   end
 
   def sync_path
diff --git a/app/models/provider/tiingo.rb b/app/models/provider/tiingo.rb
index 97c998e96..2b011b6d7 100644
--- a/app/models/provider/tiingo.rb
+++ b/app/models/provider/tiingo.rb
@@ -83,15 +83,40 @@ class Provider::Tiingo < Provider
         raise Error, "Unexpected response format from search endpoint"
       end
 
+      # Tiingo's daily-price endpoints are looked up by ticker alone, so every
+      # result sharing a ticker resolves to the same priced entry (see
+      # best_match_for_ticker) and therefore the same currency. Resolve it once
+      # per unique ticker and reuse it both for caching (so fetch_security_prices
+      # can use it without a second search request) and for the Security objects
+      # below, so what's shown in search results always matches what
+      # fetch_security_prices will later return.
+      matches_by_ticker = parsed.filter_map { |security| security["ticker"] }.map(&:upcase).uniq.index_with do |ticker|
+        best_match_for_ticker(parsed, ticker)
+      end
+
+      currency_by_ticker = matches_by_ticker.transform_values { |match| currency_for_country(match&.dig("countryCode")) }
+
+      currency_by_ticker.each do |ticker, currency|
+        next if currency.blank?
+
+        cache_key = "tiingo:currency:#{ticker}"
+
+        # A ticker's daily-price endpoint is US-centric (see best_match_for_ticker),
+        # so a currency derived from a US match is authoritative. But a search
+        # query can return a result set that happens not to include the US
+        # cross-listing for an already-cached ticker (Tiingo's relevance ranking
+        # varies by query), and this loop runs on every search_securities call.
+        # Only overwrite a cached value when this result set's match is US, or
+        # nothing is cached yet - never downgrade a previously US-derived
+        # currency to one derived from a non-US match.
+        next if matches_by_ticker[ticker]&.dig("countryCode") != "US" && Rails.cache.read(cache_key).present?
+
+        Rails.cache.write(cache_key, currency, expires_in: 24.hours)
+      end
+
       parsed.first(25).map do |security|
         ticker = security["ticker"]
-        currency = security["priceCurrency"]
-
-        # Cache the API-returned currency so fetch_security_prices can use it
-        # without making a second search request
-        if currency.present? && ticker.present?
-          Rails.cache.write("tiingo:currency:#{ticker.upcase}", currency, expires_in: 24.hours)
-        end
+        currency = currency_by_ticker[ticker&.upcase]
 
         Security.new(
           symbol: ticker,
@@ -263,8 +288,8 @@ class Provider::Tiingo < Provider
       check_api_error!(parsed)
 
       if parsed.is_a?(Array)
-        match = parsed.find { |s| s["ticker"]&.upcase == symbol.upcase }
-        currency = match&.dig("priceCurrency")
+        match = best_match_for_ticker(parsed, symbol)
+        currency = currency_for_country(match&.dig("countryCode"))
 
         if currency.present?
           Rails.cache.write("tiingo:currency:#{symbol.upcase}", currency, expires_in: 24.hours)
@@ -280,6 +305,31 @@ class Provider::Tiingo < Provider
       TIINGO_EXCHANGE_TO_MIC[exchange_name.strip] || exchange_name.strip
     end
 
+    # Tiingo's search/utilities response never includes a priceCurrency field
+    # (confirmed against the live API), only countryCode. Resolve the currency
+    # via the countries gem's ISO 4217 data (already used for country
+    # resolution in Provider::TwelveData) instead of hand-maintaining a
+    # per-provider allowlist.
+    def currency_for_country(country_code)
+      return nil if country_code.blank?
+      ISO3166::Country.new(country_code.strip)&.currency_code
+    end
+
+    # Tiingo's search endpoint can return multiple entries sharing the exact
+    # same ticker - e.g. a US primary listing alongside a foreign
+    # cross-listing (confirmed live: searching "AAPL" returns both a US entry
+    # and a CA entry). The /tiingo/daily price endpoints this resolves
+    # currency for are US-centric (also confirmed live: a Canadian ticker
+    # like VFV has search metadata but no daily price history at all), so
+    # when a US entry exists for the ticker, that's the one actually backing
+    # the price data. Fall back to the first match otherwise.
+    def best_match_for_ticker(results, ticker)
+      return nil if ticker.blank?
+
+      matches = results.select { |s| s["ticker"]&.upcase == ticker.upcase }
+      matches.find { |s| s["countryCode"] == "US" } || matches.first
+    end
+
     def check_api_error!(parsed)
       return unless parsed.is_a?(Hash) && parsed["detail"].present?
 
diff --git a/app/models/provider/tinkoff_invest.rb b/app/models/provider/tinkoff_invest.rb
new file mode 100644
index 000000000..d6313816c
--- /dev/null
+++ b/app/models/provider/tinkoff_invest.rb
@@ -0,0 +1,378 @@
+# T-Bank (Tinkoff) Invest API securities provider, built on the token-based REST
+# gateway (https://invest-public-api.tinkoff.ru/rest) over the public gRPC
+# contract. Mirrors the keyed providers (Tiingo/TwelveData) for auth and the
+# keyless market providers (MoexPublic/BinancePublic) for SslConfigurable +
+# RateLimitable plumbing.
+#
+# Why it exists: ISS (MoexPublic) prices Russian instruments but carries no
+# logos. T-Invest is the authoritative source of instrument *brand logos*
+# (shares, ETF/БПИФ, bonds) via its CDN, and can also serve prices for those
+# instruments when MOEX is not the selected provider. The app therefore uses it
+# two ways:
+#   1. As a securities price/search provider (when enabled in settings).
+#   2. As a brand-logo source consulted by Security#import_provider_details
+#      regardless of which provider prices the security (see Security::Provided),
+#      so MOEX-priced holdings still get real logos.
+#
+# REST shape: every call is POST to
+#   /tinkoff.public.invest.api.contract.v1.<Service>/<Method>
+# with a JSON body, Bearer-token auth, and a JSON response. Money is encoded as
+# Quotation { units: "<int>", nano: <int> } => units + nano/1e9.
+class Provider::TinkoffInvest < Provider
+  include SecurityConcept, RateLimitable
+  extend SslConfigurable
+
+  Error = Class.new(Provider::Error)
+  InvalidSecurityPriceError = Class.new(Error)
+  RateLimitError = Class.new(Error)
+
+  # T-Invest unary REST limits are generous (hundreds/min); space calls lightly.
+  MIN_REQUEST_INTERVAL = 0.1
+
+  # gRPC-over-REST service path prefix.
+  API_NS = "tinkoff.public.invest.api.contract.v1".freeze
+
+  # Brand-logo CDN. The API returns brand.logoName like "SBER.png"; the image is
+  # served at <CDN>/<logoName without extension><size>.png — sizes x160/x320/x640.
+  LOGO_CDN = "https://invest-brands.cdn-tinkoff.ru".freeze
+  LOGO_SIZE = "x160".freeze
+
+  # ISO 10383 operating MICs we surface. T-Invest mostly covers MOEX; SPB Exchange
+  # instruments map to XSPX. Anything else stays nil (resolver wildcard).
+  MOEX_MIC = "MISX".freeze
+  SPB_MIC = "XSPX".freeze
+
+  # GetCandles caps the window per request by interval; for daily candles we page
+  # in ~1-year chunks and bound the loop defensively.
+  CANDLE_CHUNK_DAYS = 360
+  MAX_CANDLE_PAGES = 60
+
+  INSTRUMENT_CACHE_TTL = 24.hours
+  SEARCH_CACHE_TTL = 5.minutes
+
+  def initialize(api_key)
+    @api_key = api_key # pipelock:ignore
+  end
+
+  def healthy?
+    with_provider_response do
+      post("InstrumentsService", "FindInstrument", query: "SBER", instrumentKind: "INSTRUMENT_TYPE_SHARE")
+      true
+    end
+  end
+
+  def usage
+    with_provider_response do
+      UsageData.new(used: nil, limit: nil, utilization: nil, plan: "Token (read-only)")
+    end
+  end
+
+  # ================================
+  #           Securities
+  # ================================
+
+  def search_securities(symbol, country_code: nil, exchange_operating_mic: nil)
+    with_provider_response do
+      query = symbol.to_s.strip
+      next [] if query.empty?
+
+      find_instruments(query).filter_map do |row|
+        next nil unless row["apiTradeAvailableFlag"] # only surface instruments the API can actually price
+        next nil unless surfaced_kind(row["instrumentType"])
+
+        Provider::SecurityConcept::Security.new(
+          symbol: row["ticker"].to_s,
+          name: (row["name"].presence || row["ticker"]).to_s,
+          logo_url: nil, # FindInstrument carries no brand; logos come from #fetch_security_info
+          exchange_operating_mic: mic_for(row["classCode"], row["exchange"]),
+          country_code: row["countryOfRisk"].presence,
+          currency: row["currency"].to_s.upcase.presence
+        )
+      end.uniq { |s| [ s.symbol, s.exchange_operating_mic ] }
+    end
+  end
+
+  def fetch_security_info(symbol:, exchange_operating_mic:)
+    with_provider_response do
+      short = resolve_short(symbol, exchange_operating_mic)
+      raise Error, "Unknown T-Invest instrument: #{symbol}" if short.nil?
+
+      detail = instrument_detail(short["uid"])
+
+      SecurityInfo.new(
+        symbol: short["ticker"].to_s,
+        name: (detail["name"].presence || short["name"]).to_s,
+        links: nil, # T-Invest exposes no issuer website
+        logo_url: logo_url(detail.dig("brand", "logoName")),
+        description: nil,
+        kind: surfaced_kind(short["instrumentType"]),
+        exchange_operating_mic: mic_for(short["classCode"], detail["exchange"])
+      )
+    end
+  end
+
+  def fetch_security_price(symbol:, exchange_operating_mic:, date:)
+    with_provider_response do
+      historical = fetch_security_prices(
+        symbol: symbol,
+        exchange_operating_mic: exchange_operating_mic,
+        start_date: date,
+        end_date: date
+      )
+
+      raise historical.error if historical.error.present?
+      raise InvalidSecurityPriceError, "No T-Invest price for #{symbol} on #{date}" if historical.data.blank?
+
+      historical.data.find { |p| p.date == date } ||
+        historical.data.select { |p| p.date <= date }.max_by(&:date) ||
+        historical.data.first
+    end
+  end
+
+  def fetch_security_prices(symbol:, exchange_operating_mic:, start_date:, end_date:)
+    with_provider_response do
+      short = resolve_short(symbol, exchange_operating_mic)
+      raise Error, "Unknown T-Invest instrument: #{symbol}" if short.nil?
+
+      uid = short["uid"]
+      bond = short["instrumentType"].to_s == "bond"
+      currency = short["currency"].to_s.upcase
+      mic = mic_for(short["classCode"], short["exchange"])
+
+      # Bonds quote in % of par; multiply by nominal to get a money price. A
+      # missing/invalid nominal is a provider-data failure, not a zero price.
+      nominal = nil
+      amortizing = false
+      if bond
+        info = bond_info(uid)
+        nominal = info[:nominal]
+        amortizing = info[:amortizing]
+        raise InvalidSecurityPriceError, "Missing or invalid T-Invest bond nominal for #{symbol}" if nominal.nil? || nominal <= 0
+      end
+
+      ticker = short["ticker"].to_s
+      build = ->(date, raw) { Price.new(symbol: ticker, date: date, price: (bond ? (raw / 100) * nominal : raw), currency: currency, exchange_operating_mic: mic) }
+
+      # BondBy returns only the CURRENT nominal. For an amortizing bond the par
+      # shrinks over time, so applying today's nominal to historical percent-of-
+      # par closes would underprice them — skip the candle history and return
+      # just the live price. Fixed-par bonds and equities use full history.
+      prices = (bond && amortizing) ? [] : candle_closes(uid, start_date, end_date).map { |date, close| build.call(date, close) }
+
+      # The candle endpoint lags the live session; append the last price for a
+      # range reaching today.
+      if end_date >= Date.current
+        last = last_price(uid)
+        if last
+          prices.reject! { |p| p.date == Date.current }
+          prices << build.call(Date.current, last)
+        end
+      end
+
+      prices.sort_by(&:date)
+    end
+  end
+
+  def max_history_days
+    nil # GetCandles serves the instrument's full daily history (paged).
+  end
+
+  private
+
+    attr_reader :api_key
+
+    # ================================
+    #          HTTP / parsing
+    # ================================
+
+    def base_url
+      ENV["TINKOFF_INVEST_URL"].presence || "https://invest-public-api.tinkoff.ru/rest"
+    end
+
+    def post(service, method, body)
+      throttle_request
+      response = client.post("#{base_url}/#{API_NS}.#{service}/#{method}") do |req|
+        req.body = body.to_json
+      end
+      JSON.parse(response.body)
+    end
+
+    def client
+      @client ||= Faraday.new(url: base_url, ssl: self.class.faraday_ssl_options) do |faraday|
+        faraday.options.open_timeout = 5
+        faraday.options.timeout = 20
+
+        faraday.request(:retry, {
+          max: 3,
+          interval: 0.5,
+          interval_randomness: 0.5,
+          backoff_factor: 2,
+          exceptions: Faraday::Retry::Middleware::DEFAULT_EXCEPTIONS + [ Faraday::ConnectionFailed ]
+        })
+
+        faraday.headers["Authorization"] = "Bearer #{api_key}"
+        faraday.headers["Content-Type"] = "application/json"
+        faraday.headers["Accept"] = "application/json"
+        faraday.response :raise_error
+      end
+    end
+
+    # Quotation { units, nano } -> BigDecimal. Absent/blank -> nil.
+    def quotation_to_d(q)
+      return nil if q.blank?
+      units = BigDecimal(q["units"].to_s.presence || "0")
+      nano = BigDecimal(q["nano"].to_s.presence || "0")
+      units + (nano / BigDecimal("1000000000"))
+    end
+
+    # ================================
+    #           Instruments
+    # ================================
+
+    # Users (and the MoexPublic resolver) paste exchange-suffixed tickers like
+    # "T.MOEX"/"SBER.ME"; T-Invest only knows the bare SECID, so strip the suffix
+    # before querying.
+    SUFFIX = /\.(ME|MOEX|MISX|MCX)\z/i
+
+    def find_instruments(query)
+      q = query.to_s.strip.sub(SUFFIX, "")
+      Rails.cache.fetch("tinkoff_invest:find:#{q.downcase}", expires_in: SEARCH_CACHE_TTL) do
+        # Return all matches (not just apiTradeAvailableFlag) — a ticker can have
+        # several non-tradeable listings plus one tradeable board; resolve_short
+        # ranks the tradeable one first while keeping a fallback for instruments
+        # Tinkoff lists but can't trade via API.
+        body = post("InstrumentsService", "FindInstrument", query: q)
+        body["instruments"] || []
+      end
+    end
+
+    # Best FindInstrument hit for a ticker/ISIN. A ticker like SBER returns many
+    # listings (TQBR, SPB, dark boards). When the caller supplied a MIC, honor it
+    # FIRST so a security is never priced off another exchange's listing; then
+    # prefer the API-tradeable board (the one with live prices), then an exact
+    # ticker/ISIN match.
+    def resolve_short(symbol, exchange_operating_mic)
+      key = symbol.to_s.strip.sub(SUFFIX, "")
+      # skip_nil so a transient empty/no-match response isn't cached as "unknown"
+      # for the full 24h TTL.
+      Rails.cache.fetch("tinkoff_invest:short:#{key.downcase}:#{exchange_operating_mic}", expires_in: INSTRUMENT_CACHE_TTL, skip_nil: true) do
+        rows = find_instruments(key)
+        up = key.upcase
+
+        exact = rows.select { |r| r["ticker"].to_s.upcase == up || r["isin"].to_s.upcase == up }
+        pool = exact.any? ? exact : rows
+        typed = pool.select { |r| surfaced_kind(r["instrumentType"]) }
+        pool = typed if typed.any?
+        next nil if pool.empty?
+
+        mic = exchange_operating_mic.to_s.upcase
+        pool.min_by do |r|
+          [
+            (mic.present? && mic_for(r["classCode"], r["exchange"]) == mic) ? 0 : 1,
+            r["apiTradeAvailableFlag"] ? 0 : 1,
+            (r["ticker"].to_s.upcase == up || r["isin"].to_s.upcase == up) ? 0 : 1
+          ]
+        end
+      end
+    end
+
+    # GetInstrumentBy(uid) — full instrument incl. brand/logo, exchange, nominal.
+    def instrument_detail(uid)
+      Rails.cache.fetch("tinkoff_invest:detail:#{uid}", expires_in: INSTRUMENT_CACHE_TTL) do
+        body = post("InstrumentsService", "GetInstrumentBy", idType: "INSTRUMENT_ID_TYPE_UID", id: uid)
+        body["instrument"] || {}
+      end
+    end
+
+    # Bond nominal + amortization flag from BondBy (the generic GetInstrumentBy
+    # omits nominal). `nominal` is the current (possibly amortized) par;
+    # `amortizing` tells the price path that historical par differs from today's.
+    def bond_info(uid)
+      body = post("InstrumentsService", "BondBy", idType: "INSTRUMENT_ID_TYPE_UID", id: uid)
+      ins = body["instrument"] || {}
+      { nominal: quotation_to_d(ins["nominal"]), amortizing: ins["amortizationFlag"] == true }
+    end
+
+    # ================================
+    #             Prices
+    # ================================
+
+    def candle_closes(uid, start_date, end_date)
+      return [] if start_date > end_date
+
+      closes = {}
+      window_start = start_date
+      pages = 0
+
+      while window_start <= end_date && pages < MAX_CANDLE_PAGES
+        window_end = [ window_start + CANDLE_CHUNK_DAYS, end_date ].min
+        body = post(
+          "MarketDataService", "GetCandles",
+          instrumentId: uid,
+          interval: "CANDLE_INTERVAL_DAY",
+          from: "#{window_start}T00:00:00Z",
+          to: "#{window_end}T23:59:59Z"
+        )
+
+        (body["candles"] || []).each do |c|
+          next unless c["isComplete"]
+          date = parse_time(c["time"])
+          close = quotation_to_d(c["close"])
+          closes[date] = close if date && close && close > 0
+        end
+
+        pages += 1
+        window_start = window_end + 1
+      end
+
+      closes.sort.to_h.map { |date, close| [ date, close ] }
+    end
+
+    def last_price(uid)
+      body = post("MarketDataService", "GetLastPrices", instrumentId: [ uid ])
+      row = (body["lastPrices"] || []).first
+      return nil unless row
+      value = quotation_to_d(row["price"])
+      value if value && value > 0
+    end
+
+    # ================================
+    #            Helpers
+    # ================================
+
+    def logo_url(logo_name)
+      return nil if logo_name.blank?
+      "#{LOGO_CDN}/#{logo_name.to_s.sub(/\.png\z/i, '')}#{LOGO_SIZE}.png"
+    end
+
+    # T-Invest instrumentType -> the security kinds we surface (skip futures,
+    # currencies, options, etc.).
+    def surfaced_kind(instrument_type)
+      case instrument_type.to_s.downcase
+      when "share" then "stock"
+      when "etf" then "fund"
+      when "bond" then "bond"
+      end
+    end
+
+    def mic_for(class_code, exchange)
+      ex = exchange.to_s.downcase
+      return MOEX_MIC if class_code.to_s.start_with?("TQ") || ex.include?("moex")
+      return SPB_MIC if ex.include?("spb")
+      nil
+    end
+
+    def parse_time(raw)
+      return nil if raw.blank?
+      Date.parse(raw.to_s)
+    rescue Date::Error
+      nil
+    end
+
+    # Preserve TinkoffInvest::Error subclasses through with_provider_response,
+    # mirroring MoexPublic/BinancePublic.
+    def default_error_transformer(error)
+      return error if error.is_a?(self.class::Error)
+      super
+    end
+end
diff --git a/app/models/provider/trading212.rb b/app/models/provider/trading212.rb
new file mode 100644
index 000000000..5a62cf10a
--- /dev/null
+++ b/app/models/provider/trading212.rb
@@ -0,0 +1,166 @@
+class Provider::Trading212
+  include HTTParty
+  extend SslConfigurable
+
+  class Error < StandardError; end
+  class AuthenticationError < Error; end
+  class ConfigurationError < Error; end
+  class RateLimitError < Error; end
+  class ApiError < Error
+    attr_reader :status_code, :response_body
+
+    def initialize(message, status_code: nil, response_body: nil)
+      super(message)
+      @status_code = status_code
+      @response_body = response_body
+    end
+  end
+
+  LIVE_BASE_URI = "https://live.trading212.com/api/v0".freeze
+  DEMO_BASE_URI = "https://demo.trading212.com/api/v0".freeze
+
+  MAX_PAGES = 200
+  PAGE_LIMIT = 50
+
+  RETRYABLE_ERRORS = [
+    SocketError,
+    Net::OpenTimeout,
+    Net::ReadTimeout,
+    Errno::ECONNRESET,
+    Errno::ECONNREFUSED,
+    Errno::ETIMEDOUT,
+    EOFError
+  ].freeze
+
+  default_options.merge!({ timeout: 60 }.merge(httparty_ssl_options))
+
+  attr_reader :api_key, :api_secret, :environment
+
+  def initialize(api_key:, api_secret:, environment: "live")
+    raise ConfigurationError, "api_key is required" if api_key.blank?
+    raise ConfigurationError, "api_secret is required" if api_secret.blank?
+    raise ConfigurationError, "Invalid environment: #{environment}" unless %w[live demo].include?(environment.to_s)
+
+    @api_key = api_key.to_s.strip
+    @api_secret = api_secret.to_s.strip
+    @environment = environment.to_s
+  end
+
+  def fetch_account_summary
+    get("/equity/account/summary")
+  end
+
+  def fetch_positions
+    get("/equity/positions")
+  end
+
+  def fetch_instruments
+    get("/equity/metadata/instruments")
+  end
+
+  def fetch_all_orders
+    fetch_all_pages("/equity/history/orders")
+  end
+
+  def fetch_all_dividends
+    fetch_all_pages("/equity/history/dividends")
+  end
+
+  def fetch_all_transactions
+    fetch_all_pages("/equity/history/transactions")
+  end
+
+  private
+
+    def base_uri
+      environment == "demo" ? DEMO_BASE_URI : LIVE_BASE_URI
+    end
+
+    def auth_headers
+      encoded = Base64.strict_encode64("#{api_key}:#{api_secret}")
+      {
+        "Authorization" => "Basic #{encoded}",
+        "Content-Type" => "application/json",
+        "User-Agent" => "Sure Finance Trading 212 Client"
+      }
+    end
+
+    def get(path, query: {})
+      url = "#{base_uri}#{path}"
+      response = with_retries(path) do
+        self.class.get(url, headers: auth_headers, query: query.compact)
+      end
+      handle_response(response)
+    end
+
+    def fetch_all_pages(path)
+      items = []
+      cursor = nil
+      pages_fetched = 0
+
+      loop do
+        query = { limit: PAGE_LIMIT }
+        query[:cursor] = cursor if cursor
+
+        data = get(path, query: query)
+        items.concat(Array(data["items"]))
+
+        next_page = data["nextPagePath"]
+        pages_fetched += 1
+
+        break if next_page.nil? || pages_fetched >= MAX_PAGES
+
+        cursor = extract_cursor(next_page)
+        break if cursor.nil?
+
+        sleep(10)  # 6 req/min limit on history endpoint
+      end
+
+      items
+    end
+
+    def extract_cursor(next_page_path)
+      uri = URI.parse("https://placeholder#{next_page_path}")
+      params = URI.decode_www_form(uri.query.to_s).to_h
+      params["cursor"]
+    rescue URI::InvalidURIError
+      nil
+    end
+
+    def handle_response(response)
+      case response.code
+      when 200, 201
+        response.parsed_response
+      when 401, 403
+        raise AuthenticationError, "Trading 212 authentication failed (#{response.code}). Check your API key."
+      when 429
+        raise RateLimitError, "Trading 212 rate limit exceeded. Please wait before retrying."
+      else
+        raise ApiError.new(
+          "Trading 212 API error (status #{response.code})",
+          status_code: response.code,
+          response_body: response.body
+        )
+      end
+    end
+
+    def with_retries(label, max_retries: 3)
+      attempt = 0
+      begin
+        attempt += 1
+        yield
+      rescue *RETRYABLE_ERRORS => e
+        raise if attempt >= max_retries
+        delay = [ 2**attempt, 30 ].min
+        DebugLogEntry.capture(
+          category: "sync",
+          level: "warn",
+          message: "Provider::Trading212 #{label} attempt #{attempt} failed: #{e.message}. Retrying in #{delay}s",
+          source: "trading212",
+          provider_key: "trading212"
+        )
+        sleep(delay)
+        retry
+      end
+    end
+end
diff --git a/app/models/provider/trading212_adapter.rb b/app/models/provider/trading212_adapter.rb
new file mode 100644
index 000000000..145c60cc5
--- /dev/null
+++ b/app/models/provider/trading212_adapter.rb
@@ -0,0 +1,59 @@
+class Provider::Trading212Adapter < Provider::Base
+  include Provider::Syncable
+  include Provider::InstitutionMetadata
+
+  Provider::Factory.register("Trading212Account", self)
+
+  def self.supported_account_types
+    %w[Investment]
+  end
+
+  def self.connection_configs(family:)
+    return [] unless family.can_connect_trading212?
+
+    [ {
+      key: "trading212",
+      name: I18n.t("providers.trading212.name"),
+      description: I18n.t("providers.trading212.connection_description"),
+      can_connect: true,
+      new_account_path: ->(_accountable_type, _return_to) {
+        Rails.application.routes.url_helpers.select_accounts_trading212_items_path
+      },
+      existing_account_path: ->(account_id) {
+        Rails.application.routes.url_helpers.select_existing_account_trading212_items_path(account_id: account_id)
+      }
+    } ]
+  end
+
+  def provider_name
+    "trading212"
+  end
+
+  def sync_path
+    Rails.application.routes.url_helpers.sync_trading212_item_path(item)
+  end
+
+  def item
+    provider_account.trading212_item
+  end
+
+  def can_delete_holdings?
+    false
+  end
+
+  def institution_domain
+    "trading212.com"
+  end
+
+  def institution_name
+    I18n.t("providers.trading212.institution_name")
+  end
+
+  def institution_url
+    "https://www.trading212.com"
+  end
+
+  def institution_color
+    "#2A9D8F"
+  end
+end
diff --git a/app/models/provider/up.rb b/app/models/provider/up.rb
new file mode 100644
index 000000000..cbe3272f6
--- /dev/null
+++ b/app/models/provider/up.rb
@@ -0,0 +1,230 @@
+class Provider::Up
+  include HTTParty
+  extend SslConfigurable
+
+  DEFAULT_BASE_URL = "https://api.up.com.au/api/v1".freeze
+  DEFAULT_PAGE_SIZE = 100
+  # Host that authenticated requests (bearer token) may be sent to. Absolute URLs
+  # taken from API responses (links.next) are validated against this.
+  ALLOWED_HOST = URI.parse(DEFAULT_BASE_URL).host.freeze
+
+  headers "User-Agent" => "Sure Finance Up Client"
+  default_options.merge!({ timeout: 120 }.merge(httparty_ssl_options))
+
+  attr_reader :access_token
+
+  # Build a client with the family's Up personal access token. Raises if blank.
+  def initialize(access_token)
+    @access_token = access_token.to_s.strip
+
+    raise UpError.new("Up access token is required", :configuration_error) if @access_token.blank?
+  end
+
+  # GET /util/ping - validates the personal access token.
+  # Returns the parsed payload (contains meta.id / meta.statusEmoji) or raises UpError.
+  def ping
+    get("util/ping")
+  end
+
+  # GET /accounts - returns an array of flattened account hashes.
+  # Each hash: { id:, displayName:, accountType:, ownershipType:, balance: {...}, createdAt: }
+  def get_accounts
+    fetch_all_resources("accounts").map { |resource| flatten_account(resource) }
+  end
+
+  # GET /accounts/{id}/transactions - returns an array of flattened transaction hashes.
+  # Both HELD (pending) and SETTLED (posted) transactions are returned; callers derive
+  # pending status from the :status field.
+  def get_account_transactions(account_id:, since: nil, until_date: nil, page_size: DEFAULT_PAGE_SIZE)
+    query = { "page[size]" => page_size }
+    query["filter[since]"] = format_api_time(since) if since.present?
+    query["filter[until]"] = format_api_time(until_date) if until_date.present?
+
+    path = "accounts/#{ERB::Util.url_encode(account_id.to_s)}/transactions"
+    fetch_all_resources(path, query: query).map { |resource| flatten_transaction(resource) }
+  end
+
+  private
+
+    RETRYABLE_ERRORS = [
+      SocketError,
+      Net::OpenTimeout,
+      Net::ReadTimeout,
+      Errno::ECONNRESET,
+      Errno::ECONNREFUSED,
+      Errno::ETIMEDOUT,
+      EOFError
+    ].freeze
+
+    MAX_RETRIES = 3
+    INITIAL_RETRY_DELAY = 2
+
+    # Follows JSON:API cursor pagination via links.next (absolute URLs) until exhausted,
+    # concatenating each page's `data` array.
+    def fetch_all_resources(path, query: {})
+      results = []
+      payload = get(path, query: query.presence)
+      seen_urls = Set.new
+
+      loop do
+        results.concat(Array(payload[:data]))
+        next_url = payload.dig(:links, :next)
+        break if next_url.blank?
+        # Guard against an API that returns the same cursor repeatedly.
+        break unless seen_urls.add?(next_url)
+
+        payload = get(next_url)
+      end
+
+      results
+    end
+
+    # Flattens a JSON:API account resource into a single hash with id + attributes.
+    def flatten_account(resource)
+      data = resource.with_indifferent_access
+      attributes = data[:attributes].is_a?(Hash) ? data[:attributes] : {}
+
+      attributes.merge(
+        id: data[:id],
+        type: data[:type]
+      ).with_indifferent_access
+    end
+
+    # Flattens a JSON:API transaction resource, lifting attributes to the top level and
+    # extracting the related account/category ids from relationships.
+    #
+    # transfer_account_id is the other side of an internal money movement: Up populates
+    # relationships.transferAccount on any transaction that moves funds between the
+    # user's own accounts (including round-ups swept into a Saver). It is nil for
+    # ordinary income/expense.
+    def flatten_transaction(resource)
+      data = resource.with_indifferent_access
+      attributes = data[:attributes].is_a?(Hash) ? data[:attributes] : {}
+
+      attributes.merge(
+        id: data[:id],
+        account_id: data.dig(:relationships, :account, :data, :id),
+        category_id: data.dig(:relationships, :category, :data, :id),
+        transfer_account_id: data.dig(:relationships, :transferAccount, :data, :id)
+      ).with_indifferent_access
+    end
+
+    def format_api_time(value)
+      return value if value.is_a?(String)
+      # A bare Date has no time/zone, so interpret it as UTC midnight rather than
+      # the server's local zone (which would shift `filter[since]` by the offset).
+      return value.to_time(:utc).iso8601 if value.instance_of?(Date)
+
+      value.to_time.utc.iso8601
+    end
+
+    # Issues a GET request. `path_or_url` may be a relative path (prefixed with the base URL)
+    # or an absolute URL (used when following pagination links).
+    def get(path_or_url, query: nil)
+      with_retries("GET #{path_or_url}") do
+        url = resolve_url(path_or_url)
+        response = self.class.get(url, headers: auth_headers, query: query)
+        handle_response(response)
+      end
+    end
+
+    # Resolves a relative path against the base URL, or validates an absolute URL
+    # so the bearer token is only ever sent to Up's HTTPS host.
+    def resolve_url(path_or_url)
+      value = path_or_url.to_s
+      return "#{DEFAULT_BASE_URL}/#{value}" unless value.start_with?("http")
+
+      uri = URI.parse(value)
+      unless uri.scheme == "https" && uri.host == ALLOWED_HOST
+        raise UpError.new("Refusing to send credentials to untrusted host: #{uri.host.inspect}", :invalid_url)
+      end
+
+      value
+    rescue URI::InvalidURIError
+      raise UpError.new("Invalid Up API URL", :invalid_url)
+    end
+
+    # Bearer-auth headers sent with every request.
+    def auth_headers
+      {
+        "Authorization" => "Bearer #{access_token}",
+        "Accept" => "application/json"
+      }
+    end
+
+    # Run the block, retrying transient network errors with exponential backoff.
+    def with_retries(operation_name, max_retries: MAX_RETRIES)
+      retries = 0
+
+      begin
+        yield
+      rescue *RETRYABLE_ERRORS => e
+        retries += 1
+        if retries <= max_retries
+          delay = calculate_retry_delay(retries)
+          Rails.logger.warn(
+            "Up API: #{operation_name} failed (attempt #{retries}/#{max_retries}): " \
+            "#{e.class}: #{e.message}. Retrying in #{delay}s..."
+          )
+          sleep(delay)
+          retry
+        end
+
+        Rails.logger.error("Up API: #{operation_name} failed after #{max_retries} retries: #{e.class}: #{e.message}")
+        raise UpError.new("Network error after #{max_retries} retries: #{e.message}", :network_error)
+      end
+    end
+
+    # Exponential backoff delay (with jitter), capped at 30 seconds.
+    def calculate_retry_delay(retry_count)
+      base_delay = INITIAL_RETRY_DELAY * (2 ** (retry_count - 1))
+      jitter = base_delay * rand * 0.25
+      [ base_delay + jitter, 30 ].min
+    end
+
+    # Map an HTTP response to parsed data or a typed UpError by status code.
+    def handle_response(response)
+      case response.code
+      when 200, 201
+        parse_response_body(response)
+      when 204
+        {}
+      when 400
+        raise UpError.new("Bad request to Up API (status=#{response.code})", :bad_request)
+      when 401
+        raise UpError.new("Invalid Up access token", :unauthorized)
+      when 403
+        raise UpError.new("Up access forbidden - check token permissions", :access_forbidden)
+      when 404
+        raise UpError.new("Up resource not found", :not_found)
+      when 429
+        raise UpError.new("Up rate limit exceeded. Please try again later.", :rate_limited)
+      when 500..599
+        raise UpError.new("Up server error (#{response.code}). Please try again later.", :server_error)
+      else
+        Rails.logger.error "Up API: Unexpected response status=#{response.code}"
+        raise UpError.new("Failed to fetch Up data", :fetch_failed)
+      end
+    end
+
+    # Parse a JSON response body into a symbol-keyed hash, raising on bad JSON.
+    def parse_response_body(response)
+      return {} if response.body.blank?
+
+      JSON.parse(response.body, symbolize_names: true)
+    rescue JSON::ParserError => e
+      Rails.logger.error "Up API: Failed to parse response: #{e.class}"
+      raise UpError.new("Failed to parse Up API response", :parse_error)
+    end
+
+    # Error raised for Up API failures, tagged with a symbolic +error_type+.
+    class UpError < StandardError
+      attr_reader :error_type
+
+      # Build the error with a +message+ and a categorizing +error_type+.
+      def initialize(message, error_type = :unknown)
+        super(message)
+        @error_type = error_type
+      end
+    end
+end
diff --git a/app/models/provider/up_adapter.rb b/app/models/provider/up_adapter.rb
new file mode 100644
index 000000000..1f0c2981b
--- /dev/null
+++ b/app/models/provider/up_adapter.rb
@@ -0,0 +1,111 @@
+class Provider::UpAdapter < Provider::Base
+  include Provider::Syncable
+  include Provider::InstitutionMetadata
+
+  Provider::Factory.register("UpAccount", self)
+
+  # Sure accountable types that can be created from Up accounts.
+  def self.supported_account_types
+    %w[Depository Loan]
+  end
+
+  # Connection config hashes for each of the family's configured Up items.
+  def self.connection_configs(family:)
+    return [] unless family.can_connect_up?
+
+    family.up_items.active.ordered.select(&:credentials_configured?).map do |up_item|
+      connection_config_for(up_item)
+    end
+  end
+
+  # Build an Up API client for the resolved item, or nil if none is usable.
+  def self.build_provider(family: nil, up_item_id: nil)
+    return nil unless family.present?
+
+    up_item = resolve_up_item(family, up_item_id)
+    return nil unless up_item&.credentials_configured?
+
+    Provider::Up.new(up_item.access_token)
+  end
+
+  # Build the settings connection-config hash for a single Up item.
+  def self.connection_config_for(up_item)
+    path_params = ->(extra = {}) { extra.merge(up_item_id: up_item.id) }
+
+    {
+      key: "up_#{up_item.id}",
+      name: up_item.name.presence || I18n.t("providers.up.name"),
+      description: I18n.t("providers.up.description"),
+      can_connect: true,
+      new_account_path: ->(accountable_type, return_to) {
+        Rails.application.routes.url_helpers.select_accounts_up_items_path(
+          path_params.call(accountable_type: accountable_type, return_to: return_to)
+        )
+      },
+      existing_account_path: ->(account_id) {
+        Rails.application.routes.url_helpers.select_existing_account_up_items_path(
+          path_params.call(account_id: account_id)
+        )
+      }
+    }
+  end
+  private_class_method :connection_config_for
+
+  # Provider key used across the sync/account-provider machinery.
+  def provider_name
+    "up"
+  end
+
+  # Route to trigger a manual sync for this provider account's item.
+  def sync_path
+    Rails.application.routes.url_helpers.sync_up_item_path(item)
+  end
+
+  # The UpItem backing this provider account.
+  def item
+    provider_account.up_item
+  end
+
+  # Up holdings are never deletable by the sync machinery.
+  def can_delete_holdings?
+    false
+  end
+
+  # Institution domain from account metadata, or nil.
+  def institution_domain
+    metadata = provider_account.institution_metadata
+    return nil unless metadata.present?
+
+    metadata["domain"]
+  end
+
+  # Institution name from account metadata, falling back to the item's.
+  def institution_name
+    metadata = provider_account.institution_metadata
+    metadata&.dig("name").presence || item&.institution_name
+  end
+
+  # Institution URL from account metadata, falling back to the item's.
+  def institution_url
+    metadata = provider_account.institution_metadata
+    metadata&.dig("url").presence || item&.institution_url
+  end
+
+  # Brand color for the institution, from the item.
+  def institution_color
+    item&.institution_color
+  end
+
+  # Resolve the target Up item: the requested one, else the first configured.
+  def self.resolve_up_item(family, up_item_id)
+    if up_item_id.present?
+      item = family.up_items.active.find_by(id: up_item_id)
+      return item if item&.credentials_configured?
+
+      return nil
+    end
+
+    family.up_items.active.ordered.find(&:credentials_configured?)
+  end
+  private_class_method :resolve_up_item
+end
diff --git a/app/models/provider/wise.rb b/app/models/provider/wise.rb
new file mode 100644
index 000000000..ddd64efda
--- /dev/null
+++ b/app/models/provider/wise.rb
@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+class Provider::Wise
+  include HTTParty
+  extend SslConfigurable
+
+  LIVE_BASE_URL = "https://api.wise.com"
+  SANDBOX_BASE_URL = "https://api.sandbox.transferwise.tech"
+
+  headers "User-Agent" => "Sure Finance Wise Client"
+  default_options.merge!({ timeout: 120 }.merge(httparty_ssl_options))
+
+  attr_reader :token, :base_url
+
+  def initialize(token, base_url: LIVE_BASE_URL)
+    @token = token
+    @base_url = base_url
+  end
+
+  def get_me
+    get("/v1/me")
+  end
+
+  def get_profiles
+    get("/v1/profiles")
+  end
+
+  def get_balances(profile_id)
+    get("/v4/profiles/#{profile_id}/balances", query: { types: "STANDARD" })
+  end
+
+  def get_savings_balances(profile_id)
+    get("/v4/profiles/#{profile_id}/balances", query: { types: "SAVINGS" })
+  end
+
+  def get_balance_statement(profile_id, balance_id, interval_start:, interval_end:)
+    get(
+      "/v1/profiles/#{profile_id}/balance-statements/#{balance_id}/statement.json",
+      query: {
+        intervalStart: interval_start.iso8601,
+        intervalEnd: interval_end.iso8601
+      }
+    )
+  end
+
+  def get_transfers(profile_id, limit: 100, offset: 0)
+    get(
+      "/v1/transfers",
+      query: { profile: profile_id, limit: limit, offset: offset }
+    )
+  end
+
+  def get_transfer(transfer_id)
+    get("/v1/transfers/#{transfer_id}")
+  end
+
+  def get_activities(profile_id, cursor: nil, size: 100)
+    query = { size: size }
+    query[:cursor] = cursor if cursor
+    get("/v1/profiles/#{profile_id}/activities", query: query)
+  end
+
+  def get_borderless_accounts(profile_id)
+    get("/v1/borderless-accounts", query: { profileId: profile_id })
+  end
+
+  private
+
+    def get(path, query: {})
+      response = self.class.get(
+        "#{base_url}#{path}",
+        headers: auth_headers,
+        query: query.presence
+      )
+      handle_response(response)
+    rescue WiseError
+      raise
+    rescue SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+      raise WiseError.new("Connection failed: #{e.message}", :request_failed)
+    rescue => e
+      raise WiseError.new("Unexpected error: #{e.message}", :request_failed)
+    end
+
+    def auth_headers
+      {
+        "Authorization" => "Bearer #{token}",
+        "Content-Type" => "application/json",
+        "Accept" => "application/json"
+      }
+    end
+
+    def handle_response(response)
+      case response.code
+      when 200
+        JSON.parse(response.body)
+      when 401
+        raise WiseError.new("Invalid API token", :unauthorized)
+      when 403
+        raise WiseError.new("Access forbidden — check token permissions", :access_forbidden)
+      when 404
+        raise WiseError.new("Resource not found", :not_found)
+      when 429
+        raise WiseError.new("Rate limit exceeded. Please try again later.", :rate_limited)
+      else
+        raise WiseError.new("Unexpected response #{response.code}: #{response.body}", :fetch_failed)
+      end
+    end
+
+    class WiseError < StandardError
+      attr_reader :error_type
+
+      def initialize(message, error_type = :unknown)
+        super(message)
+        @error_type = error_type
+      end
+    end
+end
diff --git a/app/models/provider/wise_adapter.rb b/app/models/provider/wise_adapter.rb
new file mode 100644
index 000000000..05c28bc23
--- /dev/null
+++ b/app/models/provider/wise_adapter.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+class Provider::WiseAdapter < Provider::Base
+  include Provider::Syncable
+  include Provider::InstitutionMetadata
+
+  Provider::Factory.register("WiseAccount", self)
+
+  def self.supported_account_types
+    %w[Depository]
+  end
+
+  def self.connection_configs(family:)
+    return [] unless family.can_connect_wise?
+
+    wise_items = family.wise_items.active.ordered
+
+    return [ connection_config_for(nil) ] if wise_items.empty?
+
+    wise_items.map { |item| connection_config_for(item) }
+  end
+
+  def provider_name
+    "wise"
+  end
+
+  def self.build_provider(family: nil, wise_item_id: nil)
+    return nil unless family.present?
+
+    item = resolve_wise_item(family, wise_item_id)
+    return nil unless item&.credentials_configured?
+
+    Provider::Wise.new(item.token.to_s.strip, base_url: Rails.configuration.x.wise.base_url)
+  end
+
+  def sync_path
+    Rails.application.routes.url_helpers.sync_wise_item_path(item)
+  end
+
+  def item
+    provider_account.wise_item
+  end
+
+  def can_delete_holdings?
+    false
+  end
+
+  def institution_name
+    "Wise"
+  end
+
+  def institution_domain
+    "wise.com"
+  end
+
+  def institution_url
+    "https://wise.com"
+  end
+
+  def institution_color
+    "#9FE870"
+  end
+
+  def self.connection_config_for(wise_item)
+    path_params = ->(extra = {}) do
+      wise_item.present? ? extra.merge(wise_item_id: wise_item.id) : extra
+    end
+
+    {
+      key: wise_item.present? ? "wise_#{wise_item.id}" : "wise",
+      name: wise_item.present? ? I18n.t("wise_items.provider_connection.name", name: wise_item.name) : I18n.t("wise_items.provider_connection.default_name"),
+      description: wise_item.present? ? I18n.t("wise_items.provider_connection.description", name: wise_item.name) : I18n.t("wise_items.provider_connection.default_description"),
+      can_connect: true,
+      new_account_path: ->(accountable_type, return_to) {
+        Rails.application.routes.url_helpers.select_accounts_wise_items_path(
+          path_params.call(accountable_type: accountable_type, return_to: return_to)
+        )
+      },
+      existing_account_path: ->(account_id) {
+        Rails.application.routes.url_helpers.select_existing_account_wise_items_path(
+          path_params.call(account_id: account_id)
+        )
+      }
+    }
+  end
+  private_class_method :connection_config_for
+
+  def self.resolve_wise_item(family, wise_item_id)
+    if wise_item_id.present?
+      return family.wise_items.active.find_by(id: wise_item_id)
+    end
+
+    family.wise_items.active.ordered.first
+  end
+  private_class_method :resolve_wise_item
+end
diff --git a/app/models/provider/yahoo_finance.rb b/app/models/provider/yahoo_finance.rb
index 36a983f93..b4a4fdbdb 100644
--- a/app/models/provider/yahoo_finance.rb
+++ b/app/models/provider/yahoo_finance.rb
@@ -19,6 +19,18 @@ class Provider::YahooFinance < Provider
   # Even if cookie has longer expiry, cap it to avoid stale crumbs
   MAX_CRUMB_CACHE_DURATION = 1.hour
 
+  HEALTH_STATUS_FRESHNESS = {
+    healthy: 15.minutes,
+    rate_limited: 30.minutes,
+    unavailable: 5.minutes
+  }.freeze
+  HEALTH_STATUS_RETENTION = 1.hour
+  HEALTH_LOCK_DURATION = 15.seconds
+  HEALTH_STATUS_CACHE_KEY = "yahoo_finance_health_status"
+  HEALTH_LOCK_CACHE_KEY = "yahoo_finance_health_status_lock"
+
+  INVALID_CRUMBS = Set.new([ "too many requests" ]).freeze
+
   # Maximum lookback window for historical data (configurable)
   MAX_LOOKBACK_WINDOW = 10.years
 
@@ -45,12 +57,51 @@ class Provider::YahooFinance < Provider
     @cache_prefix = "yahoo_finance"
   end
 
+  def health_status
+    assessment = read_health_cache(HEALTH_STATUS_CACHE_KEY)
+    return assessment[:status] if assessment_fresh?(assessment)
+
+    YahooFinanceHealthCheckJob.perform_later
+    assessment&.dig(:status) || :unknown
+  rescue HealthCacheError => e
+    record_health_cache_failure(e)
+    :unknown
+  end
+
+  def refresh_health_status
+    assessment = read_health_cache(HEALTH_STATUS_CACHE_KEY)
+    return assessment[:status] if assessment_fresh?(assessment)
+
+    lock_token = SecureRandom.uuid
+    lock_acquired = write_health_cache(
+      HEALTH_LOCK_CACHE_KEY,
+      lock_token,
+      expires_in: HEALTH_LOCK_DURATION,
+      unless_exist: true
+    )
+    return assessment&.dig(:status) || :unknown unless lock_acquired
+    return :unknown unless health_lock_owned?(lock_token)
+
+    result = perform_health_check
+    completed_assessment = result.merge(checked_at: Time.current)
+    unless publish_health_assessment(lock_token, completed_assessment)
+      return read_health_cache(HEALTH_STATUS_CACHE_KEY)&.dig(:status) || :unknown
+    end
+
+    record_health_transition(assessment, result)
+    status = result.fetch(:status)
+    released = release_health_lock(lock_token)
+    lock_token = nil
+    released ? status : :unknown
+  rescue HealthCacheError => e
+    record_health_cache_failure(e)
+    :unknown
+  ensure
+    release_health_lock(lock_token) if lock_token.present?
+  end
+
   def healthy?
-    data = fetch_authenticated_chart("AAPL", { "interval" => "1d", "range" => "1d" })
-    result = data.dig("chart", "result")
-    result.present? && result.any?
-  rescue => e
-    false
+    health_status == :healthy
   end
 
   def usage
@@ -158,12 +209,14 @@ class Provider::YahooFinance < Provider
         quotes = data.dig("quotes") || []
 
         securities = quotes.filter_map do |quote|
+          mic = map_exchange_mic(quote["exchange"])
+
           Security.new(
             symbol: quote["symbol"],
             name: quote["longname"] || quote["shortname"] || quote["symbol"],
             logo_url: nil, # Yahoo search doesn't provide logos
-            exchange_operating_mic: map_exchange_mic(quote["exchange"]),
-            country_code: map_country_code(quote["exchDisp"])
+            exchange_operating_mic: mic,
+            country_code: ::Security::EXCHANGES.dig(mic, "country") || map_country_code(quote["exchDisp"])
           )
         end
 
@@ -323,6 +376,185 @@ class Provider::YahooFinance < Provider
 
   private
 
+    HealthCacheError = Class.new(StandardError)
+
+    def perform_health_check
+      stage = :cookie
+
+      cookie, crumb, stage = fetch_health_cookie_and_crumb
+
+      stage = :chart
+      chart_response = health_authenticated_client(cookie).get("#{base_url}/v8/finance/chart/AAPL") do |req|
+        req.params["interval"] = "1d"
+        req.params["range"] = "1d"
+        req.params["crumb"] = crumb
+      end
+      return health_result(:rate_limited, stage:, http_status: 429) if chart_response.status == 429
+      return health_result(:unavailable, stage:, http_status: chart_response.status) unless chart_response.success?
+
+      data = JSON.parse(chart_response.body)
+      if data.dig("chart", "error", "code") == "Unauthorized"
+        delete_health_cache("#{@cache_prefix}_auth_crumb")
+        return health_result(:unavailable, stage:, http_status: chart_response.status)
+      end
+      return health_result(:unavailable, stage:, http_status: chart_response.status) if data.dig("chart", "error").present?
+
+      results = data.dig("chart", "result")
+      health_result(results.present? ? :healthy : :unavailable, stage:, http_status: chart_response.status)
+    rescue HealthCacheError
+      raise
+    rescue Faraday::Error, JSON::ParserError => e
+      health_result(:unavailable, stage:, exception_class: e.class.name, http_status: faraday_status(e))
+    rescue RateLimitError => e
+      health_result(:rate_limited, stage: :crumb, exception_class: e.class.name, http_status: e.details&.dig(:status))
+    rescue AuthenticationError => e
+      health_result(:unavailable, stage:, exception_class: e.class.name, http_status: e.details&.dig(:status))
+    rescue => e
+      health_result(:unavailable, stage:, exception_class: e.class.name)
+    end
+
+    def health_result(status, stage:, exception_class: nil, http_status: nil)
+      {
+        status: status,
+        stage: stage,
+        exception_class: exception_class,
+        http_status: http_status
+      }.compact
+    end
+
+    def fetch_health_cookie_and_crumb
+      cache_key = "#{@cache_prefix}_auth_crumb"
+      cached = read_health_cache(cache_key)
+      if cached.present?
+        return [ cached.first, cached.second, :authentication_cache ] if valid_crumb?(cached.second)
+
+        delete_health_cache(cache_key)
+      end
+
+      cookie, crumb, cache_duration = request_cookie_and_crumb(health_auth_client)
+      write_health_cache!(cache_key, [ cookie, crumb ], expires_in: cache_duration)
+      [ cookie, crumb, :crumb ]
+    end
+
+    def faraday_status(error)
+      error.response&.dig(:status) if error.respond_to?(:response)
+    end
+
+    def health_auth_client
+      @health_auth_client ||= Faraday.new(ssl: self.class.faraday_ssl_options) do |faraday|
+        configure_health_client(faraday)
+        faraday.headers["Accept"] = "*/*"
+      end
+    end
+
+    def health_authenticated_client(cookie)
+      Faraday.new(url: base_url, ssl: self.class.faraday_ssl_options) do |faraday|
+        configure_health_client(faraday)
+        faraday.request :json
+        faraday.headers["Accept"] = "application/json"
+        faraday.headers["Cookie"] = cookie
+      end
+    end
+
+    def configure_health_client(faraday)
+      faraday.headers["User-Agent"] = random_user_agent
+      faraday.headers["Accept-Language"] = "en-US,en;q=0.9"
+      faraday.headers["Cache-Control"] = "no-cache"
+      faraday.headers["Pragma"] = "no-cache"
+      faraday.options.timeout = 5
+      faraday.options.open_timeout = 3
+    end
+
+    def read_health_cache(key)
+      Rails.cache.read(key)
+    rescue => e
+      raise HealthCacheError, e.class.name
+    end
+
+    def write_health_cache(key, value, **options)
+      Rails.cache.write(key, value, **options)
+    rescue => e
+      raise HealthCacheError, e.class.name
+    end
+
+    def write_health_cache!(key, value, **options)
+      return true if write_health_cache(key, value, **options)
+
+      raise HealthCacheError, "CacheWriteFailed"
+    end
+
+    def delete_health_cache(key)
+      Rails.cache.delete(key)
+    rescue => e
+      raise HealthCacheError, e.class.name
+    end
+
+    def publish_health_assessment(lock_token, assessment)
+      return false unless health_lock_owned?(lock_token)
+
+      write_health_cache!(HEALTH_STATUS_CACHE_KEY, assessment, expires_in: HEALTH_STATUS_RETENTION)
+      return true if health_lock_owned?(lock_token)
+
+      delete_health_cache(HEALTH_STATUS_CACHE_KEY) if read_health_cache(HEALTH_STATUS_CACHE_KEY) == assessment
+      false
+    end
+
+    def release_health_lock(lock_token)
+      return true unless health_lock_owned?(lock_token)
+
+      Rails.cache.delete(HEALTH_LOCK_CACHE_KEY)
+      true
+    rescue HealthCacheError => e
+      record_health_cache_failure(e)
+      false
+    rescue => e
+      record_health_cache_failure(HealthCacheError.new(e.class.name))
+      false
+    end
+
+    def health_lock_owned?(lock_token)
+      read_health_cache(HEALTH_LOCK_CACHE_KEY) == lock_token
+    end
+
+    def record_health_transition(previous_assessment, result)
+      previous_status = previous_assessment&.dig(:status)
+      return if previous_status == result[:status]
+
+      status = result.fetch(:status)
+      DebugLogEntry.capture(
+        category: "provider_health",
+        level: status == :healthy ? "info" : "warn",
+        message: "Yahoo Finance Provider Health Status changed to #{status}",
+        source: self.class.name,
+        provider_key: "yahoo_finance",
+        metadata: {
+          previous_state: previous_status || :unknown,
+          new_state: status,
+          health_check_stage: result[:stage],
+          exception_class: result[:exception_class],
+          http_status: result[:http_status]
+        }.compact
+      )
+    end
+
+    def record_health_cache_failure(error)
+      DebugLogEntry.capture(
+        category: "provider_health_cache",
+        level: "warn",
+        message: "Yahoo Finance Provider Health Status cache is unavailable",
+        source: self.class.name,
+        provider_key: "yahoo_finance",
+        metadata: { exception_class: error.message }
+      )
+    end
+
+    def assessment_fresh?(assessment)
+      return false unless assessment
+
+      freshness = HEALTH_STATUS_FRESHNESS[assessment[:status]]
+      freshness && assessment[:checked_at] >= freshness.ago
+    end
+
     def base_url
       ENV["YAHOO_FINANCE_URL"] || "https://query1.finance.yahoo.com"
     end
@@ -337,7 +569,8 @@ class Provider::YahooFinance < Provider
     # rank (lower = preferred).  Adding a new market is a one-line hash entry.
     EXCHANGE_CONFIG = {
       "XNSE" => { yahoo_suffix: ".NS", default_currency: "INR", dual_list_group: :india, preference_rank: 0 },
-      "XBOM" => { yahoo_suffix: ".BO", default_currency: "INR", dual_list_group: :india, preference_rank: 1 }
+      "XBOM" => { yahoo_suffix: ".BO", default_currency: "INR", dual_list_group: :india, preference_rank: 1 },
+      "XBOG" => { yahoo_suffix: ".CL", default_currency: "COP" }
     }.freeze
 
     # Yahoo Finance sometimes returns currencies in minor units (pence, cents)
@@ -631,33 +864,71 @@ class Provider::YahooFinance < Provider
     def fetch_cookie_and_crumb
       cache_key = "#{@cache_prefix}_auth_crumb"
       cached = Rails.cache.read(cache_key)
-      return cached if cached.present?
+      if cached.present?
+        return cached if valid_crumb?(cached.second)
 
-      # Step 1: Get cookie from Yahoo Finance
-      cookie_response = auth_client.get("https://fc.yahoo.com")
-      cookie = extract_cookie(cookie_response)
-      cookie_max_age = extract_cookie_max_age(cookie_response)
-
-      raise AuthenticationError, "Failed to obtain Yahoo Finance cookie" if cookie.blank?
-
-      # Step 2: Get crumb using the cookie
-      crumb_response = auth_client.get("#{base_url}/v1/test/getcrumb") do |req|
-        req.headers["Cookie"] = cookie
+        Rails.cache.delete(cache_key)
       end
 
-      crumb = crumb_response.body.strip
-
-      raise AuthenticationError, "Failed to obtain Yahoo Finance crumb" if crumb.blank?
-
-      # Cache the cookie/crumb pair using cookie's max-age, capped at MAX_CRUMB_CACHE_DURATION
-      cache_duration = [ cookie_max_age || MAX_CRUMB_CACHE_DURATION, MAX_CRUMB_CACHE_DURATION ].min
+      cookie, crumb, cache_duration = request_cookie_and_crumb(auth_client)
       result = [ cookie, crumb ]
       Rails.cache.write(cache_key, result, expires_in: cache_duration)
       result
+    rescue Faraday::TooManyRequestsError => e
+      raise RateLimitError.new(
+        "Yahoo Finance rate limit exceeded",
+        details: { status: e.response&.dig(:status) }
+      )
     rescue Faraday::Error => e
       raise AuthenticationError, "Failed to authenticate with Yahoo Finance: #{e.message}"
     end
 
+    def request_cookie_and_crumb(authentication_client)
+      cookie_response = authentication_client.get("https://fc.yahoo.com")
+      if cookie_response.respond_to?(:status) && cookie_response.status == 429
+        raise RateLimitError.new(
+          "Yahoo Finance rate limit exceeded",
+          details: { status: cookie_response.status }
+        )
+      end
+
+      cookie = extract_cookie(cookie_response)
+      cookie_max_age = extract_cookie_max_age(cookie_response)
+      raise AuthenticationError, "Failed to obtain Yahoo Finance cookie" if cookie.blank?
+
+      crumb_response = authentication_client.get("#{base_url}/v1/test/getcrumb") do |req|
+        req.headers["Cookie"] = cookie
+      end
+      if crumb_response.status == 429
+        raise RateLimitError.new(
+          "Yahoo Finance rate limit exceeded",
+          details: { status: crumb_response.status }
+        )
+      end
+      unless crumb_response.success?
+        raise AuthenticationError.new(
+          "Failed to obtain Yahoo Finance crumb",
+          details: { status: crumb_response.status }
+        )
+      end
+
+      crumb = crumb_response.body.to_s.strip
+      unless valid_crumb?(crumb)
+        error_class = INVALID_CRUMBS.include?(crumb.downcase) ? RateLimitError : AuthenticationError
+        raise error_class.new(
+          "Failed to obtain Yahoo Finance crumb",
+          details: { status: crumb_response.status }
+        )
+      end
+
+      cache_duration = [ cookie_max_age || MAX_CRUMB_CACHE_DURATION, MAX_CRUMB_CACHE_DURATION ].min
+      [ cookie, crumb, cache_duration ]
+    end
+
+    def valid_crumb?(crumb)
+      crumb.present? && !INVALID_CRUMBS.include?(crumb.to_s.strip.downcase)
+    end
+
     def clear_crumb_cache
       Rails.cache.delete("#{@cache_prefix}_auth_crumb")
     end
@@ -835,6 +1106,8 @@ class Provider::YahooFinance < Provider
         "XNSE" # National Stock Exchange of India
       when "BSE", "BOM"
         "XBOM" # BSE (Bombay Stock Exchange)
+      when "BVC"
+        "XBOG" # Colombian Securities Exchange
       else
         exchange_code.upcase
       end
diff --git a/app/models/provider_connection_status.rb b/app/models/provider_connection_status.rb
index 0c3720323..89ee10382 100644
--- a/app/models/provider_connection_status.rb
+++ b/app/models/provider_connection_status.rb
@@ -3,6 +3,7 @@
 class ProviderConnectionStatus
   PROVIDERS = [
     { key: "akahu", type: "AkahuItem", association: :akahu_items, accounts: :akahu_accounts },
+    { key: "up", type: "UpItem", association: :up_items, accounts: :up_accounts },
     { key: "plaid", type: "PlaidItem", association: :plaid_items, accounts: :plaid_accounts },
     { key: "simplefin", type: "SimplefinItem", association: :simplefin_items, accounts: :simplefin_accounts },
     { key: "lunchflow", type: "LunchflowItem", association: :lunchflow_items, accounts: :lunchflow_accounts },
@@ -16,7 +17,11 @@ class ProviderConnectionStatus
     { key: "mercury", type: "MercuryItem", association: :mercury_items, accounts: :mercury_accounts },
     { key: "brex", type: "BrexItem", association: :brex_items, accounts: :brex_accounts },
     { key: "sophtron", type: "SophtronItem", association: :sophtron_items, accounts: :sophtron_accounts },
-    { key: "indexa_capital", type: "IndexaCapitalItem", association: :indexa_capital_items, accounts: :indexa_capital_accounts }
+    { key: "indexa_capital", type: "IndexaCapitalItem", association: :indexa_capital_items, accounts: :indexa_capital_accounts },
+    { key: "trading212", type: "Trading212Item", association: :trading212_items, accounts: :trading212_accounts },
+    { key: "questrade", type: "QuestradeItem", association: :questrade_items, accounts: :questrade_accounts },
+    { key: "redbark", type: "RedbarkItem", association: :redbark_items, accounts: :redbark_accounts },
+    { key: "wise", type: "WiseItem", association: :wise_items, accounts: :wise_accounts }
   ].freeze
 
   class << self
@@ -84,8 +89,8 @@ class ProviderConnectionStatus
       provider: provider[:key],
       provider_type: provider[:type],
       name: item_value(:name, provider[:key].humanize),
-      status: item_value(:status),
-      requires_update: item_boolean(:requires_update?),
+      status: item_status,
+      requires_update: item_requires_update?,
       credentials_configured: credentials_configured?,
       scheduled_for_deletion: item_boolean(:scheduled_for_deletion?),
       pending_account_setup: pending_account_setup?,
@@ -105,6 +110,18 @@ class ProviderConnectionStatus
       item_boolean(:credentials_configured?)
     end
 
+    def item_status
+      return item.effective_status(latest_sync: latest_sync) if item.respond_to?(:setup_token_update_required?)
+
+      item_value(:status)
+    end
+
+    def item_requires_update?
+      return item.setup_token_update_required?(latest_sync: latest_sync) if item.respond_to?(:setup_token_update_required?)
+
+      item_boolean(:requires_update?)
+    end
+
     def pending_account_setup?
       item_boolean(:pending_account_setup?)
     end
diff --git a/app/models/provider_merchant.rb b/app/models/provider_merchant.rb
index 261a1e660..be22bd778 100644
--- a/app/models/provider_merchant.rb
+++ b/app/models/provider_merchant.rb
@@ -1,5 +1,5 @@
 class ProviderMerchant < Merchant
-  enum :source, { plaid: "plaid", simplefin: "simplefin", lunchflow: "lunchflow", akahu: "akahu", synth: "synth", ai: "ai", enable_banking: "enable_banking", coinstats: "coinstats", mercury: "mercury", brex: "brex", indexa_capital: "indexa_capital", sophtron: "sophtron" }
+  enum :source, { plaid: "plaid", simplefin: "simplefin", lunchflow: "lunchflow", akahu: "akahu", up: "up", synth: "synth", ai: "ai", enable_banking: "enable_banking", coinstats: "coinstats", mercury: "mercury", brex: "brex", indexa_capital: "indexa_capital", sophtron: "sophtron", questrade: "questrade", redbark: "redbark" }
 
   validates :name, uniqueness: { scope: [ :source ] }
   validates :source, presence: true
diff --git a/app/models/provider_merchant/enhancer.rb b/app/models/provider_merchant/enhancer.rb
index e13d141a7..7114e66fd 100644
--- a/app/models/provider_merchant/enhancer.rb
+++ b/app/models/provider_merchant/enhancer.rb
@@ -70,13 +70,12 @@ class ProviderMerchant::Enhancer
       count
     end
 
-    # TODO(#2113): hardcoded to OpenAI. Provider::Anthropic now
-    # implements enhance_provider_merchants (PR #1984), so this should honor
-    # Setting.llm_provider the way chat does, instead of always routing merchant
-    # enhancement to OpenAI. Until then, Anthropic batch ops are only reachable
-    # directly / via the eval runner, not this family flow.
+    # Honors Setting.llm_provider (issue #2113) — Provider::Anthropic implements
+    # enhance_provider_merchants (PR #1984), so merchant enhancement routes to the
+    # configured provider, with fallback handled by
+    # Provider::Registry.preferred_llm_provider.
     def llm_provider
-      @llm_provider ||= Provider::Registry.get_provider(:openai)
+      @llm_provider ||= Provider::Registry.preferred_llm_provider
     end
 
     def unenhanced_merchants
diff --git a/app/models/provider_request_count.rb b/app/models/provider_request_count.rb
new file mode 100644
index 000000000..772cb36fa
--- /dev/null
+++ b/app/models/provider_request_count.rb
@@ -0,0 +1,33 @@
+# Durable monthly API request counters for providers with hard request
+# budgets (e.g. AVM property valuation providers). Stored in the database
+# rather than Rails.cache so budget enforcement survives cache eviction,
+# restarts, and Redis flushes.
+class ProviderRequestCount < ApplicationRecord
+  validates :provider_key, :period, presence: true
+  validates :provider_key, uniqueness: { scope: :period }
+
+  class << self
+    def current_period
+      Date.current.strftime("%Y-%m")
+    end
+
+    # Atomically increments the counter and returns the new count.
+    def increment!(provider_key, period: current_period)
+      result = upsert(
+        { provider_key: provider_key, period: period, count: 1 },
+        unique_by: %i[provider_key period],
+        on_duplicate: Arel.sql("count = provider_request_counts.count + 1, updated_at = CURRENT_TIMESTAMP"),
+        returning: %w[count]
+      )
+      result.rows.first.first.to_i
+    end
+
+    def decrement!(provider_key, period: current_period)
+      where(provider_key: provider_key, period: period).update_all("count = GREATEST(count - 1, 0)")
+    end
+
+    def count_for(provider_key, period: current_period)
+      where(provider_key: provider_key, period: period).pick(:count).to_i
+    end
+  end
+end
diff --git a/app/models/questrade_account.rb b/app/models/questrade_account.rb
new file mode 100644
index 000000000..c6523a4eb
--- /dev/null
+++ b/app/models/questrade_account.rb
@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+class QuestradeAccount < ApplicationRecord
+  include CurrencyNormalizable, Encryptable
+  include QuestradeAccount::DataHelpers
+
+  if encryption_ready?
+    encrypts :raw_payload
+    encrypts :raw_holdings_payload
+    encrypts :raw_activities_payload
+    encrypts :raw_balances_payload
+  end
+
+  belongs_to :questrade_item
+
+  # Association through account_providers
+  has_one :account_provider, as: :provider, dependent: :destroy
+  has_one :account, through: :account_provider, source: :account
+  has_one :linked_account, through: :account_provider, source: :account
+
+  validates :name, :currency, presence: true
+
+  # Scopes
+  scope :with_linked, -> { joins(:account_provider) }
+  scope :without_linked, -> { left_joins(:account_provider).where(account_providers: { id: nil }) }
+  scope :ordered, -> { order(created_at: :desc) }
+
+
+  # Helper to get account using account_providers system
+  def current_account
+    account
+  end
+
+  # Idempotently create or update AccountProvider link
+  # CRITICAL: After creation, reload association to avoid stale nil
+  def ensure_account_provider!(linked_account)
+    return nil unless linked_account
+
+    provider = account_provider || build_account_provider
+    provider.account = linked_account
+    provider.save!
+
+    # Reload to clear cached nil value
+    reload_account_provider
+    account_provider
+  end
+
+  def upsert_from_questrade!(account_data)
+    # Convert SDK object to hash if needed
+    data = sdk_object_to_hash(account_data).with_indifferent_access
+
+    # Questrade's list_accounts returns: number, type (TFSA/RRSP/Margin/Cash...),
+    # status, clientAccountType, isPrimary, isBilling. There's no friendly name,
+    # so we build one from the type + number.
+    number = (data[:number] || data[:id]).to_s
+    type = data[:type].presence || "Account"
+
+    update!(
+      questrade_account_id: number,
+      name: "#{type} (#{number})",
+      # Default; the real home currency is inferred from per-currency balances
+      # in upsert_balances! (Questrade exposes no account-level currency field).
+      currency: "CAD",
+      account_status: data[:status],
+      account_type: type,
+      provider: "Questrade",
+      institution_metadata: { name: "Questrade", domain: "questrade.com" },
+      raw_payload: data
+    )
+  end
+
+  # Store holdings snapshot - return early if empty to avoid setting timestamps incorrectly
+  def upsert_holdings_snapshot!(holdings_data)
+    return if holdings_data.blank?
+
+    update!(
+      raw_holdings_payload: holdings_data,
+      last_holdings_sync: Time.current
+    )
+  end
+
+  # Store activities snapshot - return early if empty to avoid setting timestamps incorrectly
+  def upsert_activities_snapshot!(activities_data)
+    return if activities_data.blank?
+
+    update!(
+      raw_activities_payload: activities_data,
+      last_activities_sync: Time.current
+    )
+  end
+
+  # Store per-currency balances. Primary (account currency) cash goes in
+  # cash_balance; the full set is kept so the processor can surface
+  # non-primary-currency cash as holdings (issue #1809).
+  def upsert_balances!(per_currency_balances)
+    data = Array(per_currency_balances).map { |b| sdk_object_to_hash(b).with_indifferent_access }
+
+    # Questrade has no account-level currency field, so infer the home currency
+    # from the per-currency balances (the currency holding the cash wins). This
+    # keeps genuinely USD-denominated accounts from being mislabelled CAD.
+    self.currency = primary_balance_currency(data) if data.any?
+
+    primary = primary_cash_entry(data)
+    cash_value = primary ? primary[:cash] : 0
+    update!(currency: currency, cash_balance: cash_value, raw_balances_payload: data)
+  end
+
+  # Cash held in currencies other than the account's primary currency, surfaced
+  # as synthetic cash holdings (issue #1809). Primary cash lives in cash_balance.
+  def non_primary_cash_entries
+    entries = Array(raw_balances_payload).map do |e|
+      e.respond_to?(:with_indifferent_access) ? e.with_indifferent_access : {}
+    end
+    entries.filter_map do |e|
+      code = e[:currency]
+      next if code.blank? || code == currency
+      amount = e[:cash]
+      next if amount.blank? || amount.to_d.abs < BigDecimal("0.01")
+      { currency: code, amount: amount }
+    end
+  end
+
+  private
+
+    # Infer the account home currency from per-currency balances: the currency
+    # holding the most cash wins (ties broken by total equity), default CAD.
+    def primary_balance_currency(entries)
+      ranked = entries.max_by do |b|
+        [ b[:cash].to_f.abs, (b[:totalEquity] || b[:marketValue]).to_f.abs ]
+      end
+      ranked&.dig(:currency).presence || "CAD"
+    end
+
+    # Primary cash entry: account currency first, then USD, then first entry.
+    def primary_cash_entry(entries)
+      entries = entries.map { |e| e.respond_to?(:with_indifferent_access) ? e.with_indifferent_access : {} }
+      # Only the account-currency (CAD) entry is primary; other currencies
+      # surface as separate cash holdings.
+      entries.find { |b| b[:currency] == currency }
+    end
+
+    def extract_institution_metadata(data)
+      {
+        name: data[:institution_name] || data.dig(:institution, :name),
+        logo: data[:institution_logo] || data.dig(:institution, :logo),
+        domain: data[:institution_domain] || data.dig(:institution, :domain)
+      }.compact
+    end
+
+    def log_invalid_currency(currency_value)
+      Rails.logger.warn("Invalid currency code '#{currency_value}' for Questrade account #{id}, defaulting to USD")
+    end
+end
diff --git a/app/models/questrade_account/activities_processor.rb b/app/models/questrade_account/activities_processor.rb
new file mode 100644
index 000000000..edddc3b34
--- /dev/null
+++ b/app/models/questrade_account/activities_processor.rb
@@ -0,0 +1,212 @@
+# frozen_string_literal: true
+
+class QuestradeAccount::ActivitiesProcessor
+  include QuestradeAccount::DataHelpers
+
+  # Questrade groups activities by `type` (category) and `action` (sub-action,
+  # e.g. Buy/Sell/CON/FCH). We route on `type`, then use `action` for direction.
+  #
+  # Sign convention: Questrade `netAmount` is +money-in / -money-out, but Sure
+  # stores transactions as -inflow / +outflow, so cash signed_amount = -netAmount.
+  TRADE_TYPE = "Trades"
+
+  # Questrade `type` -> Sure investment activity label (cash transactions)
+  CASH_TYPE_TO_LABEL = {
+    "Deposits"         => "Contribution",
+    "Withdrawals"      => "Withdrawal",
+    "Dividends"        => "Dividend",
+    "Interest"         => "Interest",
+    "Fees and rebates" => "Fee"
+  }.freeze
+
+  # Still unmapped: FX conversions (cash currency exchanges) and corporate
+  # actions. Skipped with a log rather than imported wrong.
+  UNSUPPORTED_TYPES = [ "FX conversion", "Corporate actions" ].freeze
+
+  # Norbert's Gambit / in-kind transfers: shares journaled between symbols or
+  # currencies with no cash impact. Recorded as zero-cost "Transfer" trades.
+  JOURNAL_TYPES = [ "Other", "Transfers" ].freeze
+
+  def initialize(questrade_account)
+    @questrade_account = questrade_account
+  end
+
+  def process
+    return { trades: 0, transactions: 0 } unless account.present?
+
+    @trades_count = 0
+    @transactions_count = 0
+
+    activities.each do |raw|
+      process_activity(raw.with_indifferent_access)
+    rescue => e
+      Rails.logger.error "QuestradeAccount::ActivitiesProcessor - Failed to process activity: #{e.message}"
+      Rails.logger.error e.backtrace.first(5).join("\n") if e.backtrace
+    end
+
+    { trades: @trades_count, transactions: @transactions_count }
+  end
+
+  private
+
+    def account
+      @questrade_account.current_account
+    end
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    # raw_activities_payload may be the array itself or the { activities: [...] }
+    # hash returned by Provider::Questrade#get_activities.
+    def activities
+      payload = @questrade_account.raw_activities_payload
+      payload = payload.with_indifferent_access[:activities] if payload.is_a?(Hash)
+      Array(payload)
+    end
+
+    def process_activity(data)
+      type = data[:type].to_s.strip
+      return if type.blank?
+
+      if type == TRADE_TYPE
+        process_trade(data)
+      elsif CASH_TYPE_TO_LABEL.key?(type)
+        process_cash_activity(data, CASH_TYPE_TO_LABEL[type])
+      elsif JOURNAL_TYPES.include?(type)
+        if journal?(data)
+          process_journal(data)
+        else
+          Rails.logger.info "QuestradeAccount::ActivitiesProcessor - Skipping non-journal '#{type}'"
+        end
+      elsif UNSUPPORTED_TYPES.include?(type)
+        Rails.logger.info "QuestradeAccount::ActivitiesProcessor - Skipping unsupported type '#{type}'"
+      else
+        Rails.logger.warn "QuestradeAccount::ActivitiesProcessor - Unmapped activity type '#{type}'"
+      end
+    end
+
+    # Questrade activities carry no unique id, so synthesize a stable one from
+    # the immutable fields to keep re-syncs idempotent.
+    def external_id(data, prefix)
+      digest = Digest::SHA256.hexdigest(
+        [ data[:transactionDate], data[:action], data[:symbolId], data[:quantity], data[:netAmount], data[:description] ].join("|")
+      )
+      "questrade_#{prefix}_#{digest.first(24)}"
+    end
+
+    def process_trade(data)
+      ticker = data[:symbol].to_s.strip
+      return if ticker.blank?
+
+      security = resolve_security(ticker, { name: data[:description], currency: data[:currency] })
+      return unless security
+
+      quantity = parse_decimal(data[:quantity])
+      price = parse_decimal(data[:price])
+      return if quantity.nil? || quantity.zero?
+
+      sell = data[:action].to_s.casecmp("Sell").zero?
+      signed_quantity = sell ? -quantity.abs : quantity.abs
+      # Buy => positive cost, Sell => negative (matches Sure's trade convention).
+      amount = price ? signed_quantity * price : parse_decimal(data[:netAmount])&.abs
+      return if amount.nil?
+
+      date = parse_date(data[:tradeDate]) || parse_date(data[:transactionDate]) || Date.current
+      currency = extract_currency(data, fallback: account.currency)
+
+      result = import_adapter.import_trade(
+        external_id: external_id(data, "trade"),
+        security: security,
+        quantity: signed_quantity,
+        price: price,
+        amount: amount,
+        currency: currency,
+        date: date,
+        name: data[:description].presence || "#{sell ? 'Sell' : 'Buy'} #{ticker}",
+        source: "questrade",
+        activity_label: sell ? "Sell" : "Buy"
+      )
+      @trades_count += 1 if result
+
+      import_commission(data, ticker, date, currency)
+    end
+
+    def import_commission(data, ticker, date, currency)
+      commission = parse_decimal(data[:commission])
+      return if commission.nil? || commission.zero?
+
+      result = import_adapter.import_transaction(
+        external_id: external_id(data, "fee"),
+        amount: commission.abs, # money out
+        currency: currency,
+        date: date,
+        name: "Commission for #{ticker}",
+        source: "questrade",
+        investment_activity_label: "Fee"
+      )
+      @transactions_count += 1 if result
+    end
+
+    def journal?(data)
+      data[:symbol].to_s.strip.present? && !(parse_decimal(data[:quantity]) || 0).zero?
+    end
+
+    # A journal (Norbert's Gambit / transfer) moves shares with no cash impact.
+    # Recorded as a zero-cost Transfer trade; the holding's cost basis still
+    # comes from the positions snapshot.
+    def process_journal(data)
+      ticker = data[:symbol].to_s.strip
+      security = resolve_security(ticker, { name: data[:description], currency: data[:currency] })
+      return unless security
+
+      quantity = parse_decimal(data[:quantity])
+      return if quantity.nil? || quantity.zero?
+
+      date = parse_date(data[:tradeDate]) || parse_date(data[:transactionDate]) || Date.current
+      currency = extract_currency(data, fallback: account.currency)
+
+      result = import_adapter.import_trade(
+        external_id: external_id(data, "journal"),
+        security: security,
+        quantity: quantity,
+        price: 0,
+        amount: 0,
+        currency: currency,
+        date: date,
+        name: data[:description].presence || "Journal #{ticker}",
+        source: "questrade",
+        activity_label: "Transfer"
+      )
+      @trades_count += 1 if result
+    end
+
+    def process_cash_activity(data, label)
+      net = parse_decimal(data[:netAmount])
+      return if net.nil?
+
+      signed_amount = -net # Questrade +in / -out  ->  Sure -in / +out
+      date = parse_date(data[:settlementDate]) ||
+             parse_date(data[:transactionDate]) ||
+             parse_date(data[:tradeDate]) ||
+             Date.current
+      currency = extract_currency(data, fallback: account.currency)
+
+      symbol = data[:symbol].to_s.strip
+      security = symbol.present? ? resolve_security(symbol, { name: data[:description], currency: data[:currency] }) : nil
+
+      name = data[:description].presence || (symbol.present? ? "#{label} - #{symbol}" : label)
+
+      result = import_adapter.import_transaction(
+        external_id: external_id(data, "cash"),
+        amount: signed_amount,
+        currency: currency,
+        date: date,
+        name: name,
+        source: "questrade",
+        investment_activity_label: label,
+        extra: { security_id: security&.id }.compact
+      )
+      @transactions_count += 1 if result
+    end
+end
diff --git a/app/models/questrade_account/data_helpers.rb b/app/models/questrade_account/data_helpers.rb
new file mode 100644
index 000000000..c477c0d6b
--- /dev/null
+++ b/app/models/questrade_account/data_helpers.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+module QuestradeAccount::DataHelpers
+  extend ActiveSupport::Concern
+
+  private
+
+    # Convert SDK objects to hashes via JSON round-trip
+    # Many SDKs return objects that don't have proper #to_h methods
+    def sdk_object_to_hash(obj)
+      return obj if obj.is_a?(Hash)
+
+      if obj.respond_to?(:to_json)
+        JSON.parse(obj.to_json)
+      elsif obj.respond_to?(:to_h)
+        obj.to_h
+      else
+        obj
+      end
+    rescue JSON::ParserError, TypeError
+      obj.respond_to?(:to_h) ? obj.to_h : {}
+    end
+
+    def parse_decimal(value)
+      return nil if value.nil?
+
+      case value
+      when BigDecimal
+        value
+      when String
+        BigDecimal(value)
+      when Numeric
+        BigDecimal(value.to_s)
+      else
+        nil
+      end
+    rescue ArgumentError => e
+      Rails.logger.error("QuestradeAccount::DataHelpers - Failed to parse decimal value: #{value.inspect} - #{e.message}")
+      nil
+    end
+
+    def parse_date(date_value)
+      return nil if date_value.nil?
+
+      case date_value
+      when Date
+        date_value
+      when String
+        # Use Time.zone.parse for external timestamps (Rails timezone guidelines)
+        Time.zone.parse(date_value)&.to_date
+      when Time, DateTime, ActiveSupport::TimeWithZone
+        date_value.to_date
+      else
+        nil
+      end
+    rescue ArgumentError, TypeError => e
+      Rails.logger.error("QuestradeAccount::DataHelpers - Failed to parse date: #{date_value.inspect} - #{e.message}")
+      nil
+    end
+
+    # Find or create security with race condition handling
+    def resolve_security(symbol, symbol_data = {})
+      ticker = symbol.to_s.upcase.strip
+      return nil if ticker.blank?
+
+      security = Security.find_by(ticker: ticker)
+
+      # If security exists but has a bad name (looks like a hash), update it
+      if security && security.name&.start_with?("{")
+        new_name = extract_security_name(symbol_data, ticker)
+        Rails.logger.info "QuestradeAccount::DataHelpers - Fixing security name: #{security.name.first(50)}... -> #{new_name}"
+        security.update!(name: new_name)
+      end
+
+      return security if security
+
+      # Create new security
+      security_name = extract_security_name(symbol_data, ticker)
+
+      Rails.logger.info "QuestradeAccount::DataHelpers - Creating security: ticker=#{ticker}, name=#{security_name}"
+
+      Security.create!(
+        ticker: ticker,
+        name: security_name,
+        exchange_mic: extract_exchange(symbol_data),
+        country_code: extract_country_code(symbol_data)
+      )
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique => e
+      # Handle race condition - another process may have created it
+      Rails.logger.error "QuestradeAccount::DataHelpers - Failed to create security #{ticker}: #{e.message}"
+      Security.find_by(ticker: ticker)
+    end
+
+    def extract_security_name(symbol_data, fallback_ticker)
+      symbol_data = symbol_data.with_indifferent_access if symbol_data.respond_to?(:with_indifferent_access)
+
+      # Try various paths where the name might be
+      name = symbol_data[:name] || symbol_data[:description]
+
+      # If description is missing or looks like a type description, use ticker
+      if name.blank? || name.is_a?(Hash) || name =~ /^(COMMON STOCK|CRYPTOCURRENCY|ETF|MUTUAL FUND)$/i
+        name = fallback_ticker
+      end
+
+      # Titleize for readability if it's all caps
+      name = name.titleize if name == name.upcase && name.length > 4
+
+      name
+    end
+
+    def extract_exchange(symbol_data)
+      symbol_data = symbol_data.with_indifferent_access if symbol_data.respond_to?(:with_indifferent_access)
+
+      exchange = symbol_data[:exchange]
+      return nil unless exchange.is_a?(Hash)
+
+      exchange.with_indifferent_access[:mic_code] || exchange.with_indifferent_access[:id]
+    end
+
+    def extract_country_code(symbol_data)
+      symbol_data = symbol_data.with_indifferent_access if symbol_data.respond_to?(:with_indifferent_access)
+
+      # Try to extract country from currency or exchange
+      currency = symbol_data[:currency]
+      currency = currency.dig(:code) if currency.is_a?(Hash)
+
+      case currency
+      when "USD"
+        "US"
+      when "CAD"
+        "CA"
+      when "GBP", "GBX"
+        "GB"
+      when "EUR"
+        nil # Could be many countries
+      else
+        nil
+      end
+    end
+
+    # Handle currency as string or object (API inconsistency)
+    def extract_currency(data, fallback: nil)
+      data = data.with_indifferent_access if data.respond_to?(:with_indifferent_access)
+
+      currency_data = data[:currency]
+      return fallback if currency_data.blank?
+
+      if currency_data.is_a?(Hash)
+        currency_data.with_indifferent_access[:code] || fallback
+      elsif currency_data.is_a?(String)
+        currency_data.upcase
+      else
+        fallback
+      end
+    end
+end
diff --git a/app/models/questrade_account/holdings_processor.rb b/app/models/questrade_account/holdings_processor.rb
new file mode 100644
index 000000000..af9a64dd5
--- /dev/null
+++ b/app/models/questrade_account/holdings_processor.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+class QuestradeAccount::HoldingsProcessor
+  include QuestradeAccount::DataHelpers
+
+  def initialize(questrade_account)
+    @questrade_account = questrade_account
+  end
+
+  def process
+    return unless account.present?
+
+    positions.each do |raw|
+      process_holding(raw.with_indifferent_access)
+    rescue => e
+      Rails.logger.error "QuestradeAccount::HoldingsProcessor - Failed to process holding: #{e.class} - #{e.message}"
+      Rails.logger.error e.backtrace.first(5).join("\n") if e.backtrace
+    end
+
+    # Surface non-primary-currency cash as synthetic holdings.
+    process_cash_holdings
+  end
+
+  private
+
+    # Surface cash held in currencies other than the account's primary currency
+    # as synthetic cash holdings (issue #1809). Primary-currency cash stays in
+    # account.cash_balance.
+    def process_cash_holdings
+      @questrade_account.non_primary_cash_entries.each do |entry|
+        amount = parse_decimal(entry[:amount])
+        next if amount.nil?
+
+        security = Security.cash_for(account, currency: entry[:currency])
+        date = Date.current
+        import_adapter.import_holding(
+          security: security,
+          quantity: amount,
+          amount: amount,
+          currency: entry[:currency],
+          date: date,
+          price: 1,
+          # Date-scope the id so each sync writes a daily snapshot instead of
+          # rewriting the previous cash holding row.
+          external_id: "questrade_cash_#{entry[:currency].to_s.downcase}_#{date}",
+          account_provider_id: @questrade_account.account_provider&.id,
+          source: "questrade",
+          delete_future_holdings: false
+        )
+      rescue => e
+        Rails.logger.error "QuestradeAccount::HoldingsProcessor - Failed to import #{entry[:currency]} cash holding: #{e.message}"
+      end
+    end
+
+    def account
+      @questrade_account.current_account
+    end
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    # raw_holdings_payload may be the array itself or the { positions: [...] }
+    # hash returned by Provider::Questrade#get_holdings.
+    def positions
+      payload = @questrade_account.raw_holdings_payload
+      payload = payload.with_indifferent_access[:positions] if payload.is_a?(Hash)
+      Array(payload)
+    end
+
+    def process_holding(data)
+      ticker = data[:symbol].to_s.strip
+      return if ticker.blank?
+
+      security = resolve_security(ticker, { name: ticker, currency: data[:currency] })
+      return unless security
+
+      quantity = parse_decimal(data[:openQuantity]) # may be fractional
+      price = parse_decimal(data[:currentPrice])
+      return if quantity.nil? || quantity.zero? || price.nil?
+
+      # Prefer Questrade's authoritative market value; fall back to qty * price.
+      amount = parse_decimal(data[:currentMarketValue]) || (quantity * price)
+      cost_basis = parse_decimal(data[:averageEntryPrice]) # per-share cost
+
+      # Questrade positions don't carry a currency, so we fall back to the
+      # account currency. This is fine: Sure values each holding via the
+      # security's own price/currency (Security#current_price), so this arg is
+      # just a consistent bookkeeping/dedup key, not the source of valuation.
+      currency = extract_currency(data, fallback: account.currency)
+      date = Date.current
+      external_id = [ "questrade", @questrade_account.questrade_account_id, data[:symbolId], date ].join("_")
+
+      import_adapter.import_holding(
+        security: security,
+        quantity: quantity,
+        amount: amount,
+        currency: currency,
+        date: date,
+        price: price,
+        cost_basis: cost_basis,
+        external_id: external_id,
+        source: "questrade",
+        account_provider_id: @questrade_account.account_provider&.id,
+        delete_future_holdings: false
+      )
+    end
+end
diff --git a/app/models/questrade_account/processor.rb b/app/models/questrade_account/processor.rb
new file mode 100644
index 000000000..e1526f1a6
--- /dev/null
+++ b/app/models/questrade_account/processor.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class QuestradeAccount::Processor
+  include QuestradeAccount::DataHelpers
+
+  attr_reader :questrade_account
+
+  def initialize(questrade_account)
+    @questrade_account = questrade_account
+  end
+
+  def process
+    account = questrade_account.current_account
+    return unless account
+
+    Rails.logger.info "QuestradeAccount::Processor - Processing account #{questrade_account.id} -> Sure account #{account.id}"
+
+    # Anchor the account at its reported total (cash + holdings) and store the
+    # primary-currency cash. Non-primary cash is surfaced as holdings below.
+    update_account_balance(account)
+
+    if questrade_account.raw_holdings_payload.present? || questrade_account.non_primary_cash_entries.any?
+      QuestradeAccount::HoldingsProcessor.new(questrade_account).process
+    end
+
+    if questrade_account.raw_activities_payload.present?
+      QuestradeAccount::ActivitiesProcessor.new(questrade_account).process
+    end
+
+    account.broadcast_sync_complete
+    Rails.logger.info "QuestradeAccount::Processor - Broadcast sync complete for account #{account.id}"
+
+    {
+      holdings_processed: questrade_account.raw_holdings_payload.present?,
+      activities_processed: questrade_account.raw_activities_payload.present?
+    }
+  end
+
+  private
+
+    def update_account_balance(account)
+      total = questrade_account.current_balance
+      return if total.blank?
+
+      cash = questrade_account.cash_balance || 0
+      account.assign_attributes(
+        balance: total,
+        cash_balance: cash,
+        currency: questrade_account.currency || account.currency
+      )
+      account.save!
+
+      # Current-balance anchor = the reported total (cash + holdings). The value
+      # is composed from the holdings + per-currency cash, not a made-up figure.
+      account.set_current_balance(total)
+    end
+end
diff --git a/app/models/questrade_item.rb b/app/models/questrade_item.rb
new file mode 100644
index 000000000..12a419189
--- /dev/null
+++ b/app/models/questrade_item.rb
@@ -0,0 +1,202 @@
+# frozen_string_literal: true
+
+class QuestradeItem < ApplicationRecord
+  include Syncable, Provided, Unlinking, Encryptable
+
+  enum :status, { good: "good", requires_update: "requires_update" }, default: :good
+
+  # Encrypt sensitive credentials if ActiveRecord encryption is configured
+  # (encryption_ready? is provided by Encryptable, shared with the other providers).
+  if encryption_ready?
+    encrypts :refresh_token, deterministic: true
+    encrypts :raw_payload
+    encrypts :raw_institution_payload
+  end
+
+  validates :name, presence: true
+  validates :refresh_token, presence: true, unless: :scheduled_for_deletion?
+
+  belongs_to :family
+  has_one_attached :logo, dependent: :purge_later
+
+  has_many :questrade_accounts, dependent: :destroy
+  has_many :accounts, through: :questrade_accounts
+
+  scope :active, -> { where(scheduled_for_deletion: false) }
+  scope :syncable, -> { active.where.not(refresh_token: nil) }
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :needs_update, -> { where(status: :requires_update) }
+
+  def syncer
+    QuestradeItem::Syncer.new(self)
+  end
+
+  def destroy_later
+    update!(scheduled_for_deletion: true)
+    DestroyJob.perform_later(self)
+  end
+
+  # Override syncing? to include background activities fetch
+  def syncing?
+    super || questrade_accounts.where(activities_fetch_pending: true).exists?
+  end
+
+  # Import data from provider API
+  def import_latest_questrade_data(sync: nil)
+    provider = questrade_provider
+    unless provider
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Cannot import: Questrade provider is not configured",
+        source: self.class.name,
+        provider_key: "questrade",
+        family: family,
+        metadata: { questrade_item_id: id }
+      )
+      raise StandardError, I18n.t("questrade_items.errors.provider_not_configured")
+    end
+
+    QuestradeItem::Importer.new(self, questrade_provider: provider, sync: sync).import
+  rescue => e
+    DebugLogEntry.capture(
+      category: "provider_sync_error",
+      level: "error",
+      message: "Failed to import data",
+      source: self.class.name,
+      provider_key: "questrade",
+      family: family,
+      metadata: { questrade_item_id: id, error_class: e.class.name, error_message: e.message }
+    )
+    raise
+  end
+
+  # Process linked accounts after data import
+  def process_accounts
+    return [] if questrade_accounts.empty?
+
+    results = []
+    linked_questrade_accounts.includes(account_provider: :account).each do |questrade_account|
+      begin
+        result = QuestradeAccount::Processor.new(questrade_account).process
+        results << { questrade_account_id: questrade_account.id, success: true, result: result }
+      rescue => e
+        DebugLogEntry.capture(
+          category: "provider_sync_error",
+          level: "error",
+          message: "Failed to process account",
+          source: self.class.name,
+          provider_key: "questrade",
+          family: family,
+          metadata: { questrade_item_id: id, questrade_account_id: questrade_account.id, error_class: e.class.name, error_message: e.message }
+        )
+        results << { questrade_account_id: questrade_account.id, success: false, error: e.message }
+      end
+    end
+
+    results
+  end
+
+  # Schedule sync jobs for all linked accounts
+  def schedule_account_syncs(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    return [] if accounts.empty?
+
+    results = []
+    accounts.visible.each do |account|
+      begin
+        account.sync_later(
+          parent_sync: parent_sync,
+          window_start_date: window_start_date,
+          window_end_date: window_end_date
+        )
+        results << { account_id: account.id, success: true }
+      rescue => e
+        DebugLogEntry.capture(
+          category: "provider_sync_error",
+          level: "error",
+          message: "Failed to schedule sync for account",
+          source: self.class.name,
+          provider_key: "questrade",
+          family: family,
+          metadata: { questrade_item_id: id, account_id: account.id, error_class: e.class.name, error_message: e.message }
+        )
+        results << { account_id: account.id, success: false, error: e.message }
+      end
+    end
+
+    results
+  end
+
+  def upsert_questrade_snapshot!(accounts_snapshot)
+    assign_attributes(
+      raw_payload: accounts_snapshot
+    )
+
+    save!
+  end
+
+  def has_completed_initial_setup?
+    accounts.any?
+  end
+
+  # Linked accounts (have AccountProvider association)
+  def linked_questrade_accounts
+    questrade_accounts.joins(:account_provider)
+  end
+
+  # Unlinked accounts (no AccountProvider association)
+  def unlinked_questrade_accounts
+    questrade_accounts.left_joins(:account_provider).where(account_providers: { id: nil })
+  end
+
+  def sync_status_summary
+    total_accounts = total_accounts_count
+    linked_count = linked_accounts_count
+    unlinked_count = unlinked_accounts_count
+
+    if total_accounts == 0
+      I18n.t("questrade_items.sync_status.no_accounts")
+    elsif unlinked_count == 0
+      I18n.t("questrade_items.sync_status.synced", count: linked_count)
+    else
+      I18n.t("questrade_items.sync_status.synced_with_setup", linked: linked_count, unlinked: unlinked_count)
+    end
+  end
+
+  def linked_accounts_count
+    questrade_accounts.joins(:account_provider).count
+  end
+
+  def unlinked_accounts_count
+    questrade_accounts.left_joins(:account_provider).where(account_providers: { id: nil }).count
+  end
+
+  def total_accounts_count
+    questrade_accounts.count
+  end
+
+  def institution_display_name
+    institution_name.presence || institution_domain.presence || name
+  end
+
+  def connected_institutions
+    questrade_accounts.includes(:account)
+                  .where.not(institution_metadata: nil)
+                  .map { |acc| acc.institution_metadata }
+                  .uniq { |inst| inst["name"] || inst["institution_name"] }
+  end
+
+  def institution_summary
+    institutions = connected_institutions
+    case institutions.count
+    when 0
+      I18n.t("questrade_items.institution_summary.none")
+    else
+      I18n.t("questrade_items.institution_summary.count", count: institutions.count)
+    end
+  end
+
+  def credentials_configured?
+    refresh_token.present?
+  end
+end
diff --git a/app/models/questrade_item/importer.rb b/app/models/questrade_item/importer.rb
new file mode 100644
index 000000000..99647874f
--- /dev/null
+++ b/app/models/questrade_item/importer.rb
@@ -0,0 +1,291 @@
+# frozen_string_literal: true
+
+class QuestradeItem::Importer
+  include SyncStats::Collector
+  include QuestradeAccount::DataHelpers
+
+  # Chunk size for fetching activities
+  ACTIVITY_CHUNK_DAYS = 365
+  MAX_ACTIVITY_CHUNKS = 3 # Up to 3 years of history
+
+  # Minimum existing activities required before using incremental sync
+  MINIMUM_HISTORY_FOR_INCREMENTAL = 10
+
+  attr_reader :questrade_item, :questrade_provider, :sync
+
+  def initialize(questrade_item, questrade_provider:, sync: nil)
+    @questrade_item = questrade_item
+    @questrade_provider = questrade_provider
+    @sync = sync
+  end
+
+  class CredentialsError < StandardError; end
+
+  def import
+    Rails.logger.info "QuestradeItem::Importer - Starting import for item #{questrade_item.id}"
+
+    credentials = questrade_item.questrade_credentials
+    unless credentials
+      raise CredentialsError, "No Questrade credentials configured for item #{questrade_item.id}"
+    end
+
+    # Step 1: Fetch and store all accounts
+    import_accounts(credentials)
+
+    # Step 2: For LINKED accounts only, fetch data
+    # Unlinked accounts just need basic info (name, balance) for the setup modal
+    linked_accounts = QuestradeAccount
+      .where(questrade_item_id: questrade_item.id)
+      .joins(:account_provider)
+
+    Rails.logger.info "QuestradeItem::Importer - Found #{linked_accounts.count} linked accounts to process"
+
+    linked_accounts.each do |questrade_account|
+      Rails.logger.info "QuestradeItem::Importer - Processing linked account #{questrade_account.id}"
+      import_account_data(questrade_account, credentials)
+    end
+
+    # Update raw payload on the item
+    questrade_item.upsert_questrade_snapshot!(stats)
+  rescue Provider::Questrade::AuthenticationError => e
+    questrade_item.update!(status: :requires_update)
+    raise
+  end
+
+  private
+
+    def stats
+      @stats ||= {}
+    end
+
+    def persist_stats!
+      return unless sync&.respond_to?(:sync_stats)
+      merged = (sync.sync_stats || {}).merge(stats)
+      sync.update_columns(sync_stats: merged)
+    end
+
+    def import_accounts(credentials)
+      Rails.logger.info "QuestradeItem::Importer - Fetching accounts"
+
+      response = questrade_provider.list_accounts
+      accounts_data = Array(response.is_a?(Hash) ? response[:accounts] : response)
+
+      stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+      stats["total_accounts"] = accounts_data.size
+
+      # Track upstream account IDs to detect removed accounts
+      upstream_account_ids = []
+
+      accounts_data.each do |account_data|
+        begin
+          account_data = account_data.with_indifferent_access if account_data.is_a?(Hash)
+          import_account(account_data, credentials)
+          number = (account_data[:number] || account_data[:id]).to_s
+          upstream_account_ids << number if number.present?
+        rescue => e
+          Rails.logger.error "QuestradeItem::Importer - Failed to import account: #{e.message}"
+          stats["accounts_skipped"] = stats.fetch("accounts_skipped", 0) + 1
+          register_error(e, account_data: account_data)
+        end
+      end
+
+      persist_stats!
+
+      # Clean up accounts that no longer exist upstream
+      prune_removed_accounts(upstream_account_ids)
+    end
+
+    def import_account(account_data, credentials)
+      questrade_account_id = (account_data[:number] || account_data[:id]).to_s
+      return if questrade_account_id.blank?
+
+      questrade_account = questrade_item.questrade_accounts.find_or_initialize_by(
+        questrade_account_id: questrade_account_id
+      )
+      questrade_account.upsert_from_questrade!(account_data)
+
+      stats["accounts_imported"] = stats.fetch("accounts_imported", 0) + 1
+    end
+
+
+    def import_account_data(questrade_account, credentials)
+      # Per-currency balances (cash) -> total anchor + cash holdings
+      store_balances(questrade_account)
+
+      # Import holdings
+      import_holdings(questrade_account, credentials)
+
+      # Import activities
+      import_activities(questrade_account, credentials)
+    end
+
+    # Fetch per-currency balances. Stores primary-currency cash in cash_balance
+    # (the rest become cash holdings) and the combined total equity used as the
+    # account's current-balance anchor.
+    def store_balances(questrade_account)
+      response = questrade_provider.get_balances(account_id: questrade_account.questrade_account_id)
+      stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+
+      per = Array(response.is_a?(Hash) ? response[:perCurrencyBalances] : nil)
+      questrade_account.upsert_balances!(per) if per.any?
+
+      combined = Array(response.is_a?(Hash) ? response[:combinedBalances] : nil).map { |b| b.with_indifferent_access }
+      entry = combined.find { |b| b[:currency] == questrade_account.currency } || combined.first
+      total = entry && (entry[:totalEquity] || entry[:marketValue])
+      questrade_account.update!(current_balance: total) if total.present?
+    rescue => e
+      Rails.logger.warn "QuestradeItem::Importer - Failed to fetch balances for account #{questrade_account.id}: #{e.message}"
+    end
+
+    def import_holdings(questrade_account, credentials)
+      Rails.logger.info "QuestradeItem::Importer - Fetching holdings for account #{questrade_account.id}"
+
+      begin
+        response = questrade_provider.get_holdings(account_id: questrade_account.questrade_account_id)
+        holdings_data = Array(response.is_a?(Hash) ? response[:positions] : response)
+
+        stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+
+        if holdings_data.any?
+          # Convert SDK objects to hashes for storage
+          holdings_hashes = holdings_data.map { |h| sdk_object_to_hash(h) }
+          holdings_hashes = enrich_positions_with_currency(holdings_hashes)
+          questrade_account.upsert_holdings_snapshot!(holdings_hashes)
+          stats["holdings_found"] = stats.fetch("holdings_found", 0) + holdings_data.size
+        end
+      rescue => e
+        Rails.logger.warn "QuestradeItem::Importer - Failed to fetch holdings: #{e.message}"
+        register_error(e, context: "holdings", account_id: questrade_account.id)
+      end
+    end
+
+    # Questrade positions omit currency. Tag each position with its symbol's
+    # currency (via /v1/symbols) so USD holdings aren't mislabeled as the
+    # account's CAD currency.
+    def enrich_positions_with_currency(positions)
+      ids = positions.filter_map { |p| p.with_indifferent_access[:symbolId] }.uniq
+      return positions if ids.empty?
+
+      currency_by_id = {}
+      begin
+        resp = questrade_provider.get_symbols(ids: ids)
+        stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+        Array(resp.is_a?(Hash) ? resp[:symbols] : nil).each do |sym|
+          sym = sym.with_indifferent_access
+          currency_by_id[sym[:symbolId]] = sym[:currency]
+        end
+      rescue => e
+        Rails.logger.warn "QuestradeItem::Importer - symbol currency lookup failed: #{e.message}"
+        return positions
+      end
+
+      positions.map do |p|
+        p = p.with_indifferent_access
+        cur = currency_by_id[p[:symbolId]]
+        p[:currency] = cur if cur.present? && p[:currency].blank?
+        p
+      end
+    end
+
+    def import_activities(questrade_account, credentials)
+      Rails.logger.info "QuestradeItem::Importer - Fetching activities for account #{questrade_account.id}"
+
+      begin
+        # Determine date range
+        start_date = calculate_start_date(questrade_account)
+        end_date = Date.current
+
+        response = questrade_provider.get_activities(
+          account_id: questrade_account.questrade_account_id,
+          start_date: start_date,
+          end_date: end_date
+        )
+        activities_data = Array(response.is_a?(Hash) ? response[:activities] : response)
+
+        stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+
+        if activities_data.any?
+          # Convert SDK objects to hashes and merge with existing
+          activities_hashes = activities_data.map { |a| sdk_object_to_hash(a) }
+          merged = merge_activities(questrade_account.raw_activities_payload || [], activities_hashes)
+          questrade_account.upsert_activities_snapshot!(merged)
+          stats["activities_found"] = stats.fetch("activities_found", 0) + activities_data.size
+        elsif fresh_linked_account?(questrade_account)
+          # Fresh account with no activities - schedule background fetch
+          schedule_background_activities_fetch(questrade_account, start_date)
+        end
+      rescue => e
+        Rails.logger.warn "QuestradeItem::Importer - Failed to fetch activities: #{e.message}"
+        register_error(e, context: "activities", account_id: questrade_account.id)
+      end
+    end
+
+    def calculate_start_date(questrade_account)
+      # Use user-specified start date if available
+      user_start = questrade_account.sync_start_date
+      return user_start if user_start.present?
+
+      # For accounts with existing history, use incremental sync
+      existing_count = (questrade_account.raw_activities_payload || []).size
+      if existing_count >= MINIMUM_HISTORY_FOR_INCREMENTAL && questrade_account.last_activities_sync.present?
+        # Incremental: go back 30 days from last sync to catch updates
+        (questrade_account.last_activities_sync - 30.days).to_date
+      else
+        # Full sync: go back up to 3 years
+        (ACTIVITY_CHUNK_DAYS * MAX_ACTIVITY_CHUNKS).days.ago.to_date
+      end
+    end
+
+    def fresh_linked_account?(questrade_account)
+      # Account was just linked and has no activity history yet
+      questrade_account.last_activities_sync.nil? &&
+        (questrade_account.raw_activities_payload || []).empty?
+    end
+
+    def schedule_background_activities_fetch(questrade_account, start_date)
+      return if questrade_account.activities_fetch_pending?
+
+      Rails.logger.info "QuestradeItem::Importer - Scheduling background activities fetch for account #{questrade_account.id}"
+
+      questrade_account.update!(activities_fetch_pending: true)
+      QuestradeActivitiesFetchJob.perform_later(questrade_account, start_date: start_date)
+    end
+
+    def merge_activities(existing, new_activities)
+      # Merge by ID, preferring newer data
+      by_id = {}
+      existing.each { |a| by_id[activity_key(a)] = a }
+      new_activities.each { |a| by_id[activity_key(a)] = a }
+      by_id.values
+    end
+
+    def activity_key(activity)
+      activity = activity.with_indifferent_access if activity.is_a?(Hash)
+      # Questrade activities have no id; key on the immutable fields (same basis
+      # as the processor's synthesized external_id) to dedup across syncs.
+      [ activity[:transactionDate], activity[:action], activity[:symbolId],
+        activity[:netAmount], activity[:description], activity[:currency], activity[:type] ].join("-")
+    end
+
+    def prune_removed_accounts(upstream_account_ids)
+      return if upstream_account_ids.empty?
+
+      # Find accounts that exist locally but not upstream
+      removed = questrade_item.questrade_accounts
+        .where.not(questrade_account_id: upstream_account_ids)
+
+      if removed.any?
+        Rails.logger.info "QuestradeItem::Importer - Pruning #{removed.count} removed accounts"
+        removed.destroy_all
+      end
+    end
+
+    def register_error(error, **context)
+      stats["errors"] ||= []
+      stats["errors"] << {
+        message: error.message,
+        context: context.to_s,
+        timestamp: Time.current.iso8601
+      }
+    end
+end
diff --git a/app/models/questrade_item/provided.rb b/app/models/questrade_item/provided.rb
new file mode 100644
index 000000000..cc7ab86bc
--- /dev/null
+++ b/app/models/questrade_item/provided.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module QuestradeItem::Provided
+  extend ActiveSupport::Concern
+
+  def questrade_provider
+    return nil unless credentials_configured?
+
+    Provider::Questrade.new(
+      refresh_token: refresh_token,
+      api_server: api_server,
+      # Questrade refresh tokens are single-use. Persist the rotated token +
+      # api_server. This runs inside synchronize_exchange's row lock.
+      on_token_refresh: ->(creds) {
+        update!(refresh_token: creds[:refresh_token], api_server: creds[:api_server])
+      },
+      # Serialize the single-use token exchange across workers: take the row
+      # lock, reload to get the freshest persisted token, and hand it to the
+      # SDK to spend. Two concurrent syncs/jobs can no longer burn the same
+      # token (the brief lock is held across the short token-exchange call).
+      synchronize_exchange: ->(&blk) {
+        with_lock do
+          reload
+          blk.call(refresh_token)
+        end
+      }
+    )
+  end
+
+  # Returns credentials hash for API calls that need them passed explicitly
+  def questrade_credentials
+    return nil unless credentials_configured?
+
+    {
+      refresh_token: refresh_token
+    }
+  end
+end
diff --git a/app/models/questrade_item/syncer.rb b/app/models/questrade_item/syncer.rb
new file mode 100644
index 000000000..ef9e8c7c6
--- /dev/null
+++ b/app/models/questrade_item/syncer.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+class QuestradeItem::Syncer
+  include SyncStats::Collector
+
+  attr_reader :questrade_item
+
+  def initialize(questrade_item)
+    @questrade_item = questrade_item
+  end
+
+  def perform_sync(sync)
+    Rails.logger.info "QuestradeItem::Syncer - Starting sync for item #{questrade_item.id}"
+
+    # Phase 1: Import data from provider API
+    update_sync_status(sync, :importing)
+    questrade_item.import_latest_questrade_data(sync: sync)
+
+    # Phase 2: Collect setup statistics
+    finalize_setup_counts(sync)
+
+    # Phase 3: Process data for linked accounts
+    sync_errors = nil
+    linked_questrade_accounts = questrade_item.linked_questrade_accounts.includes(account_provider: :account)
+    if linked_questrade_accounts.any?
+      update_sync_status(sync, :processing)
+      mark_import_started(sync)
+      process_results = questrade_item.process_accounts
+
+      # Phase 4: Schedule balance calculations
+      update_sync_status(sync, :calculating)
+      schedule_results = questrade_item.schedule_account_syncs(
+        parent_sync: sync,
+        window_start_date: sync.window_start_date,
+        window_end_date: sync.window_end_date
+      )
+
+      # Surface per-account processing/scheduling failures in sync health.
+      sync_errors = [ *process_results, *schedule_results ].filter_map do |result|
+        next if result[:success]
+        { message: result[:error], category: "sync_error" }
+      end.presence
+
+      # Phase 5: Collect statistics
+      account_ids = linked_questrade_accounts.filter_map { |pa| pa.current_account&.id }
+      collect_transaction_stats(sync, account_ids: account_ids, source: "questrade")
+      collect_trades_stats(sync, account_ids: account_ids, source: "questrade")
+      collect_holdings_stats(sync, holdings_count: count_holdings, label: "processed")
+    end
+
+    # Mark sync health
+    collect_health_stats(sync, errors: sync_errors)
+  rescue Provider::Questrade::AuthenticationError => e
+    questrade_item.update!(status: :requires_update)
+    collect_health_stats(sync, errors: [ { message: e.message, category: "auth_error" } ])
+    raise
+  rescue => e
+    collect_health_stats(sync, errors: [ { message: e.message, category: "sync_error" } ])
+    raise
+  end
+
+  # Public: called by Sync after finalization
+  def perform_post_sync
+    # Override for post-sync cleanup if needed
+  end
+
+  private
+
+    def count_holdings
+      questrade_item.linked_questrade_accounts.sum { |pa| Array(pa.raw_holdings_payload).size }
+    end
+
+    def update_sync_status(sync, key, **i18n_options)
+      sync.update!(status_text: I18n.t("questrade_items.sync.status.#{key}", **i18n_options)) if sync.respond_to?(:status_text)
+    end
+
+    def mark_import_started(sync)
+      # Mark that we're now processing imported data
+      update_sync_status(sync, :importing_data)
+    end
+
+    def finalize_setup_counts(sync)
+      update_sync_status(sync, :checking_setup)
+
+      unlinked_count = questrade_item.unlinked_accounts_count
+
+      if unlinked_count > 0
+        questrade_item.update!(pending_account_setup: true)
+        update_sync_status(sync, :needs_setup, count: unlinked_count)
+      else
+        questrade_item.update!(pending_account_setup: false)
+      end
+
+      # Collect setup stats
+      collect_setup_stats(sync, provider_accounts: questrade_item.questrade_accounts)
+    end
+end
diff --git a/app/models/questrade_item/unlinking.rb b/app/models/questrade_item/unlinking.rb
new file mode 100644
index 000000000..86bef73fe
--- /dev/null
+++ b/app/models/questrade_item/unlinking.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module QuestradeItem::Unlinking
+  # Concern that encapsulates unlinking logic for a Questrade item.
+  extend ActiveSupport::Concern
+
+  # Idempotently remove all connections between this Questrade item and local accounts.
+  # - Detaches any AccountProvider links for each QuestradeAccount
+  # - Detaches Holdings that point at the AccountProvider links
+  # Returns a per-account result payload for observability
+  def unlink_all!(dry_run: false)
+    results = []
+
+    questrade_accounts.find_each do |provider_account|
+      links = AccountProvider.where(provider_type: "QuestradeAccount", provider_id: provider_account.id).to_a
+      link_ids = links.map(&:id)
+      result = {
+        provider_account_id: provider_account.id,
+        name: provider_account.name,
+        provider_link_ids: link_ids
+      }
+      results << result
+
+      next if dry_run
+
+      begin
+        ActiveRecord::Base.transaction do
+          # Detach holdings for any provider links found
+          if link_ids.any?
+            # Bulk-detach: update_all is intentional (no per-row callbacks needed,
+            # and it avoids loading every Holding into memory).
+            Holding.where(account_provider_id: link_ids).update_all(account_provider_id: nil)
+          end
+
+          # Destroy all provider links
+          links.each do |ap|
+            ap.destroy!
+          end
+        end
+      rescue StandardError => e
+        DebugLogEntry.capture(
+          category: "provider_sync",
+          level: "warn",
+          message: "QuestradeItem: failed to fully unlink provider account #\#{provider_account.id}",
+          source: self.class.name,
+          provider_key: "questrade",
+          family: family,
+          metadata: { provider_account_id: provider_account.id, link_ids: link_ids, error_class: e.class.name, error_message: e.message }
+        )
+        result[:error] = e.message
+      end
+    end
+
+    results
+  end
+end
diff --git a/app/models/recurring_transaction.rb b/app/models/recurring_transaction.rb
index 090d31549..f05df6fcb 100644
--- a/app/models/recurring_transaction.rb
+++ b/app/models/recurring_transaction.rb
@@ -260,29 +260,15 @@ class RecurringTransaction < ApplicationRecord
 
   # Find matching transactions for this recurring pattern
   def matching_transactions
-    # For manual recurring with amount variance, match within range
-    # For automatic recurring, match exact amount
-    base = account.present? ? account.entries : family.entries
+    # Recurring transfers can't be matched by single-account name/amount —
+    # future occurrences carry arbitrary names — so match the Transfer pair.
+    return transfer_matching_transactions if transfer?
 
-    entries = if manual? && has_amount_variance?
-      base
-        .where(entryable_type: "Transaction")
-        .where(currency: currency)
-        .where("entries.amount BETWEEN ? AND ?", expected_amount_min, expected_amount_max)
-        .where("EXTRACT(DAY FROM entries.date) BETWEEN ? AND ?",
-               [ expected_day_of_month - 2, 1 ].max,
-               [ expected_day_of_month + 2, 31 ].min)
-        .order(date: :desc)
-    else
-      base
-        .where(entryable_type: "Transaction")
-        .where(currency: currency)
-        .where("entries.amount = ?", amount)
-        .where("EXTRACT(DAY FROM entries.date) BETWEEN ? AND ?",
-               [ expected_day_of_month - 2, 1 ].max,
-               [ expected_day_of_month + 2, 31 ].min)
-        .order(date: :desc)
-    end
+    # Amount/cadence-scoped Transaction entries on this account (or family).
+    base = account.present? ? account.entries : family.entries
+    entries = day_of_month_scope(
+      amount_window_scope(base.where(entryable_type: "Transaction").where(currency: currency))
+    ).order(date: :desc)
 
     # Filter by merchant or name
     if merchant_id.present?
@@ -401,6 +387,47 @@ class RecurringTransaction < ApplicationRecord
   end
 
   private
+    # Issue #1590: a recurring transfer's future occurrences rarely share the
+    # seed's name (user free-text, importer wording, the auto-matcher's
+    # "Transfer to ..."), so name-based matching returns [] and the Cleaner
+    # would wrongly inactivate a still-active transfer. Match the Transfer
+    # *pair* instead — an outflow on the source account paired with an inflow
+    # on the destination account, within the usual amount/cadence window — and
+    # return the outflow entries (the occurrence-date carrier, consistent with
+    # create_from_transfer).
+    def transfer_matching_transactions
+      return Entry.none unless account && destination_account
+
+      outflow_entries = day_of_month_scope(
+        amount_window_scope(account.entries.where(entryable_type: "Transaction").where(currency: currency))
+      ).order(date: :desc)
+
+      paired_outflow_transaction_ids = Transfer
+        .where(outflow_transaction_id: outflow_entries.select(:entryable_id))
+        .where(inflow_transaction_id:
+          destination_account.entries.where(entryable_type: "Transaction").select(:entryable_id))
+        .pluck(:outflow_transaction_id)
+
+      outflow_entries.where(entryable_id: paired_outflow_transaction_ids)
+    end
+
+    # Transaction entries whose amount fits the pattern: exact, or within the
+    # configured variance band for manual recurring rows.
+    def amount_window_scope(relation)
+      if manual? && has_amount_variance?
+        relation.where("entries.amount BETWEEN ? AND ?", expected_amount_min, expected_amount_max)
+      else
+        relation.where("entries.amount = ?", amount)
+      end
+    end
+
+    # Entries whose day-of-month lands within ±2 days of the expected day.
+    def day_of_month_scope(relation)
+      relation.where("EXTRACT(DAY FROM entries.date) BETWEEN ? AND ?",
+                     [ expected_day_of_month - 2, 1 ].max,
+                     [ expected_day_of_month + 2, 31 ].min)
+    end
+
     def monetizable_currency
       currency
     end
diff --git a/app/models/recurring_transaction/cleaner.rb b/app/models/recurring_transaction/cleaner.rb
index dd22dcb89..ec5dfd917 100644
--- a/app/models/recurring_transaction/cleaner.rb
+++ b/app/models/recurring_transaction/cleaner.rb
@@ -9,18 +9,15 @@ class RecurringTransaction
     # Mark recurring transactions as inactive if they haven't occurred recently
     # Uses 2 months for automatic recurring, 6 months for manual recurring.
     #
-    # Transfer rows (destination_account_id present) are skipped: their
-    # `matching_transactions` helper looks at single-account name/amount
-    # which never matches a Transfer pair, so the Cleaner would
-    # incorrectly mark a still-recurring transfer inactive at the
-    # 6-month threshold. Issue #1590 tracks pair-detection-aware
-    # matching for recurring transfers.
+    # Transfer rows (destination_account_id present) are included: as of issue
+    # #1590, `matching_transactions` detects the Transfer pair, so a still-active
+    # transfer keeps surfacing recent matches and stays active, while one whose
+    # pair has genuinely stopped is correctly retired.
     def cleanup_stale_transactions
       stale_count = 0
 
       family.recurring_transactions
             .active
-            .where(destination_account_id: nil)
             .find_each do |recurring_transaction|
         next unless recurring_transaction.should_be_inactive?
 
diff --git a/app/models/recurring_transaction/identifier.rb b/app/models/recurring_transaction/identifier.rb
index bcb6656d4..9a443df3d 100644
--- a/app/models/recurring_transaction/identifier.rb
+++ b/app/models/recurring_transaction/identifier.rb
@@ -72,7 +72,12 @@ class RecurringTransaction
         end
       end
 
-      # Create or update RecurringTransaction records
+      # Create or update RecurringTransaction records. Load existing rows once
+      # so a busy family does not issue one lookup per detected pattern.
+      existing_recurring_transactions_by_key = family.recurring_transactions
+        .to_a
+        .index_by { |recurring| recurring_transaction_lookup_key(recurring) }
+
       recurring_patterns.each do |pattern|
         # Build find conditions based on whether it's merchant-based or name-based
         find_conditions = {
@@ -90,12 +95,14 @@ class RecurringTransaction
         end
 
         begin
-          recurring_transaction = family.recurring_transactions.find_or_initialize_by(find_conditions)
+          lookup_key = recurring_transaction_lookup_key(find_conditions)
+          recurring_transaction = existing_recurring_transactions_by_key[lookup_key] ||
+                                  family.recurring_transactions.build(find_conditions)
 
           # Handle manual recurring transactions specially
           if recurring_transaction.persisted? && recurring_transaction.manual?
-            # Update variance for manual recurring transactions
-            update_manual_recurring_variance(recurring_transaction, pattern)
+            # Manual recurring variance is recalculated once in the batch pass
+            # after automatic pattern updates finish.
             next
           end
 
@@ -119,6 +126,7 @@ class RecurringTransaction
           )
 
           recurring_transaction.save!
+          existing_recurring_transactions_by_key[lookup_key] = recurring_transaction
         rescue ActiveRecord::RecordNotUnique
           # Race condition: another process created the same record between find and save.
           # Retry with find to get the existing record and update it.
@@ -127,7 +135,8 @@ class RecurringTransaction
 
           # Skip manual recurring transactions
           if recurring_transaction.manual?
-            update_manual_recurring_variance(recurring_transaction, pattern)
+            # Manual recurring variance is recalculated once in the batch pass
+            # after automatic pattern updates finish.
             next
           end
 
@@ -153,21 +162,19 @@ class RecurringTransaction
     # both endpoints rather than the single-account name/merchant match
     # the helper performs. Issue #1590 tracks the proper Cleaner-aware
     # matching for recurring transfers.
-    def update_manual_recurring_transactions(since_date)
-      family.recurring_transactions
-            .where(manual: true, status: "active", destination_account_id: nil)
-            .find_each do |recurring|
-        # Find matching transactions in the recent period
-        matching_entries = RecurringTransaction.find_matching_transaction_entries(
-          family: family,
-          merchant_id: recurring.merchant_id,
-          name: recurring.name,
-          currency: recurring.currency,
-          expected_day: recurring.expected_day_of_month,
-          lookback_months: 6,
-          account: recurring.account
-        )
+    def update_manual_recurring_transactions(_since_date)
+      manual_recurring_transactions = family.recurring_transactions
+        .where(manual: true, status: "active", destination_account_id: nil)
+        .includes(:account)
+        .to_a
 
+      matching_entries_by_recurring_id = matching_entries_by_manual_recurring_id(
+        manual_recurring_transactions,
+        lookback_months: 6
+      )
+
+      manual_recurring_transactions.each do |recurring|
+        matching_entries = matching_entries_by_recurring_id.fetch(recurring.id, [])
         next if matching_entries.empty?
 
         # Extract amounts and dates from all matching entries
@@ -186,38 +193,69 @@ class RecurringTransaction
       end
     end
 
-    # Update variance for a manual recurring transaction when pattern is found
-    def update_manual_recurring_variance(recurring_transaction, pattern)
-      # Check if this transaction's date is more recent
-      if pattern[:last_occurrence_date] > recurring_transaction.last_occurrence_date
-        # Find all matching transactions to recalculate variance
-        matching_entries = RecurringTransaction.find_matching_transaction_entries(
-          family: family,
-          merchant_id: recurring_transaction.merchant_id,
-          name: recurring_transaction.name,
-          currency: recurring_transaction.currency,
-          expected_day: recurring_transaction.expected_day_of_month,
-          lookback_months: 6,
-          account: recurring_transaction.account
-        )
+    private
+      def recurring_transaction_lookup_key(recurring_or_attributes)
+        # Keep this aligned with the non-transfer recurring transaction unique
+        # indexes. Automatic recurring rows are amount-scoped; variable manual
+        # amounts are tracked separately in expected_amount_*.
+        amount = recurring_or_attributes.respond_to?(:amount) ? recurring_or_attributes.amount : recurring_or_attributes[:amount]
+        currency = recurring_or_attributes.respond_to?(:currency) ? recurring_or_attributes.currency : recurring_or_attributes[:currency]
+        account_id = recurring_or_attributes.respond_to?(:account_id) ? recurring_or_attributes.account_id : recurring_or_attributes[:account_id]
+        merchant_id = recurring_or_attributes.respond_to?(:merchant_id) ? recurring_or_attributes.merchant_id : recurring_or_attributes[:merchant_id]
+        name = recurring_or_attributes.respond_to?(:name) ? recurring_or_attributes.name : recurring_or_attributes[:name]
 
-        # Update if we have any matching transactions
-        if matching_entries.any?
-          matching_amounts = matching_entries.map(&:amount)
+        identifier_type = merchant_id.present? ? :merchant : :name
+        identifier_value = merchant_id.presence || name
 
-          recurring_transaction.update!(
-            expected_amount_min: matching_amounts.min,
-            expected_amount_max: matching_amounts.max,
-            expected_amount_avg: matching_amounts.sum / matching_amounts.size,
-            occurrence_count: matching_amounts.size,
-            last_occurrence_date: pattern[:last_occurrence_date],
-            next_expected_date: calculate_next_expected_date(pattern[:last_occurrence_date], recurring_transaction.expected_day_of_month)
-          )
+        [ amount, currency, account_id, identifier_type, identifier_value ]
+      end
+
+      def matching_entries_by_manual_recurring_id(recurring_transactions, lookback_months:)
+        return {} if recurring_transactions.empty?
+
+        lookback_date = lookback_months.months.ago.to_date
+        currencies = recurring_transactions.map(&:currency).uniq
+        account_ids = recurring_transactions.filter_map(&:account_id).uniq
+
+        entries = family.entries
+          .joins("INNER JOIN transactions ON transactions.id = entries.entryable_id AND entries.entryable_type = 'Transaction'")
+          .where(entries: { entryable_type: "Transaction", currency: currencies })
+          .where("entries.date >= ?", lookback_date)
+          .select("entries.*, transactions.merchant_id AS transaction_merchant_id")
+          .order(date: :desc)
+
+        # Legacy manual rows without account_id can match any account in the
+        # family, so only push account filtering into SQL when every row is
+        # account-scoped.
+        if account_ids.any? && recurring_transactions.all? { |recurring| recurring.account_id.present? }
+          entries = entries.where(entries: { account_id: account_ids })
+        end
+
+        candidate_entries = entries.to_a
+
+        recurring_transactions.to_h do |recurring|
+          [
+            recurring.id,
+            candidate_entries.select { |entry| manual_recurring_matches_entry?(recurring, entry) }
+          ]
+        end
+      end
+
+      def manual_recurring_matches_entry?(recurring, entry)
+        return false unless entry.currency == recurring.currency
+        return false if recurring.account_id.present? && entry.account_id != recurring.account_id
+
+        expected_day = [ recurring.expected_day_of_month, entry.date.end_of_month.day ].min
+        day = entry.date.day
+        return false if circular_distance(day, expected_day) > 2
+
+        if recurring.merchant_id.present?
+          entry.read_attribute("transaction_merchant_id") == recurring.merchant_id
+        else
+          entry.name == recurring.name
         end
       end
-    end
 
-    private
       # Check if days cluster together (within ~5 days variance)
       # Uses circular distance to handle month-boundary wrapping (e.g., 28, 29, 30, 31, 1, 2)
       def days_cluster_together?(days)
diff --git a/app/models/redbark_account.rb b/app/models/redbark_account.rb
new file mode 100644
index 000000000..8a54ae4ff
--- /dev/null
+++ b/app/models/redbark_account.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+class RedbarkAccount < ApplicationRecord
+  include CurrencyNormalizable, Encryptable
+  include RedbarkAccount::DataHelpers
+
+  # Encrypt raw payloads if ActiveRecord encryption is configured
+  if encryption_ready?
+    encrypts :raw_payload
+    encrypts :raw_transactions_payload
+  end
+
+  belongs_to :redbark_item
+
+  # Association through account_providers
+  has_one :account_provider, as: :provider, dependent: :destroy
+  has_one :account, through: :account_provider, source: :account
+  has_one :linked_account, through: :account_provider, source: :account
+
+  validates :name, :currency, :redbark_account_id, presence: true
+  validates :redbark_account_id, uniqueness: { scope: :redbark_item_id }
+
+  # Scopes
+  scope :with_linked, -> { joins(:account_provider) }
+  scope :without_linked, -> { left_joins(:account_provider).where(account_providers: { id: nil }) }
+  scope :needs_setup, -> { without_linked.where(ignored: false) }
+  scope :ordered, -> { order(created_at: :desc) }
+
+  # Callbacks
+  after_destroy :enqueue_connection_cleanup
+
+  # Helper to get account using account_providers system
+  def current_account
+    account
+  end
+
+  # Idempotently create or update AccountProvider link
+  # CRITICAL: After creation, reload association to avoid stale nil
+  def ensure_account_provider!(linked_account)
+    return nil unless linked_account
+
+    provider = account_provider || build_account_provider
+    provider.account = linked_account
+    provider.save!
+
+    # Reload to clear cached nil value
+    reload_account_provider
+    account_provider
+  end
+
+  # Redbark accounts endpoint returns:
+  # { id, connectionId, provider, name, type, institutionName, accountNumber, currency }
+  # Balance is not included there - it comes from the balances endpoint and is
+  # written separately by the importer, so it is deliberately not touched here.
+  def upsert_from_redbark!(account_data, connection_data: nil)
+    data = sdk_object_to_hash(account_data).with_indifferent_access
+    connection = connection_data.present? ? sdk_object_to_hash(connection_data).with_indifferent_access : {}
+
+    display_name = if data[:institutionName].present?
+      "#{data[:institutionName]} - #{data[:name]}"
+    else
+      data[:name]
+    end
+
+    update!(
+      redbark_account_id: data[:id]&.to_s,
+      connection_id: data[:connectionId]&.to_s,
+      name: display_name,
+      account_number: data[:accountNumber],
+      currency: extract_currency(data, fallback: parse_currency(currency) || "AUD"),
+      account_status: connection[:status],
+      account_type: data[:type],
+      provider: data[:provider],
+      institution_metadata: {
+        name: data[:institutionName] || connection[:institutionName],
+        logo: connection[:institutionLogo]
+      }.compact,
+      raw_payload: account_data
+    )
+  end
+
+  def upsert_redbark_transactions_snapshot!(transactions_snapshot)
+    assign_attributes(
+      raw_transactions_payload: transactions_snapshot
+    )
+
+    save!
+  end
+
+  private
+
+    def enqueue_connection_cleanup
+      return unless redbark_item
+
+      RedbarkConnectionCleanupJob.perform_later(
+        redbark_item_id: redbark_item.id,
+        account_id: id
+      )
+    end
+
+    def log_invalid_currency(currency_value)
+      Rails.logger.warn("Invalid currency code '#{currency_value}' for Redbark account #{id}, defaulting to AUD")
+    end
+end
diff --git a/app/models/redbark_account/data_helpers.rb b/app/models/redbark_account/data_helpers.rb
new file mode 100644
index 000000000..29bf4b805
--- /dev/null
+++ b/app/models/redbark_account/data_helpers.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module RedbarkAccount::DataHelpers
+  extend ActiveSupport::Concern
+
+  private
+
+    # Convert SDK objects to hashes via JSON round-trip
+    # Many SDKs return objects that don't have proper #to_h methods
+    def sdk_object_to_hash(obj)
+      return obj if obj.is_a?(Hash)
+
+      if obj.respond_to?(:to_json)
+        JSON.parse(obj.to_json)
+      elsif obj.respond_to?(:to_h)
+        obj.to_h
+      else
+        obj
+      end
+    rescue JSON::ParserError, TypeError
+      obj.respond_to?(:to_h) ? obj.to_h : {}
+    end
+
+    def parse_decimal(value)
+      return nil if value.nil?
+
+      case value
+      when BigDecimal
+        value
+      when String
+        BigDecimal(value)
+      when Numeric
+        BigDecimal(value.to_s)
+      else
+        nil
+      end
+    rescue ArgumentError => e
+      Rails.logger.error("RedbarkAccount::DataHelpers - Failed to parse decimal value: #{value.inspect} - #{e.message}")
+      nil
+    end
+
+    def parse_date(date_value)
+      return nil if date_value.nil?
+
+      case date_value
+      when Date
+        date_value
+      when String
+        # Use Time.zone.parse for external timestamps (Rails timezone guidelines)
+        Time.zone.parse(date_value)&.to_date
+      when Time, DateTime, ActiveSupport::TimeWithZone
+        date_value.to_date
+      else
+        nil
+      end
+    rescue ArgumentError, TypeError => e
+      Rails.logger.error("RedbarkAccount::DataHelpers - Failed to parse date: #{date_value.inspect} - #{e.message}")
+      nil
+    end
+
+    # Handle currency as string or object (API inconsistency)
+    def extract_currency(data, fallback: nil)
+      data = data.with_indifferent_access if data.respond_to?(:with_indifferent_access)
+
+      currency_data = data[:currency]
+      return fallback if currency_data.blank?
+
+      if currency_data.is_a?(Hash)
+        currency_data.with_indifferent_access[:code] || fallback
+      elsif currency_data.is_a?(String)
+        currency_data.upcase
+      else
+        fallback
+      end
+    end
+end
diff --git a/app/models/redbark_account/processor.rb b/app/models/redbark_account/processor.rb
new file mode 100644
index 000000000..a136f4ac1
--- /dev/null
+++ b/app/models/redbark_account/processor.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+class RedbarkAccount::Processor
+  include RedbarkAccount::DataHelpers
+
+  attr_reader :redbark_account
+
+  def initialize(redbark_account)
+    @redbark_account = redbark_account
+  end
+
+  def process
+    account = redbark_account.current_account
+    return unless account
+
+    Rails.logger.info "RedbarkAccount::Processor - Processing account #{redbark_account.id} -> Sure account #{account.id}"
+
+    # Update account balance FIRST (before processing transactions/holdings/activities)
+    update_account_balance(account)
+
+    # Process transactions
+    transactions_count = redbark_account.raw_transactions_payload&.size || 0
+    Rails.logger.info "RedbarkAccount::Processor - Transactions payload has #{transactions_count} items"
+
+    if redbark_account.raw_transactions_payload.present?
+      Rails.logger.info "RedbarkAccount::Processor - Processing transactions..."
+      RedbarkAccount::Transactions::Processor.new(redbark_account).process
+    else
+      Rails.logger.warn "RedbarkAccount::Processor - No transactions payload to process"
+    end
+
+    # Trigger immediate UI refresh so entries appear in the activity feed
+    account.broadcast_sync_complete
+    Rails.logger.info "RedbarkAccount::Processor - Broadcast sync complete for account #{account.id}"
+
+    { transactions_processed: transactions_count > 0 }
+  end
+
+  private
+
+    def update_account_balance(account)
+      balance = redbark_account.current_balance
+
+      # A nil current_balance means no balances fetch has succeeded for this
+      # account yet. Writing 0 here would clobber a healthy balance (or the
+      # opening balance the user typed during setup) and anchor a $0
+      # valuation, so leave the account untouched instead.
+      if balance.nil?
+        Rails.logger.warn "RedbarkAccount::Processor - No balance available for redbark_account #{redbark_account.id}, skipping balance update"
+        return
+      end
+
+      # Banking sign convention:
+      # - CreditCard and Loan accounts may need sign inversion
+      # Provider returns negative for positive balance, so we negate it
+      if account.accountable_type == "CreditCard" || account.accountable_type == "Loan"
+        balance = -balance
+      end
+
+      Rails.logger.info "RedbarkAccount::Processor - Balance update: #{balance}"
+
+      account.assign_attributes(
+        balance: balance,
+        cash_balance: balance,
+        currency: redbark_account.currency || account.currency
+      )
+      account.save!
+
+      # Create or update the current balance anchor valuation for linked accounts
+      # This is critical for reverse sync to work correctly
+      account.set_current_balance(balance)
+    end
+end
diff --git a/app/models/redbark_account/transactions/processor.rb b/app/models/redbark_account/transactions/processor.rb
new file mode 100644
index 000000000..6d2ad8e61
--- /dev/null
+++ b/app/models/redbark_account/transactions/processor.rb
@@ -0,0 +1,177 @@
+# frozen_string_literal: true
+
+require "digest"
+
+class RedbarkAccount::Transactions::Processor
+  include RedbarkAccount::DataHelpers
+
+  attr_reader :redbark_account
+
+  def initialize(redbark_account)
+    @redbark_account = redbark_account
+  end
+
+  def process
+    unless redbark_account.raw_transactions_payload.present?
+      Rails.logger.info "RedbarkAccount::Transactions::Processor - No transactions in raw_transactions_payload for redbark_account #{redbark_account.id}"
+      return { success: true, total: 0, imported: 0, skipped: 0, failed: 0, errors: [] }
+    end
+
+    total_count = redbark_account.raw_transactions_payload.count
+    Rails.logger.info "RedbarkAccount::Transactions::Processor - Processing #{total_count} transactions for redbark_account #{redbark_account.id}"
+
+    imported_count = 0
+    skipped_count = 0
+    failed_count = 0
+    errors = []
+
+    # Each entry is processed inside a transaction, but to avoid locking up the DB when
+    # there are hundreds or thousands of transactions, we process them individually.
+    redbark_account.raw_transactions_payload.each_with_index do |transaction_data, index|
+      begin
+        result = process_transaction(transaction_data)
+
+        if result.nil?
+          # Benign skip (no linked account, blank id, unparseable amount/date)
+          skipped_count += 1
+        else
+          imported_count += 1
+        end
+      rescue ArgumentError => e
+        # Validation error - log and continue
+        failed_count += 1
+        transaction_id = transaction_data.try(:[], :id) || transaction_data.try(:[], "id") || "unknown"
+        error_message = "Validation error: #{e.message}"
+        Rails.logger.error "RedbarkAccount::Transactions::Processor - #{error_message} (transaction #{transaction_id})"
+        errors << { index: index, transaction_id: transaction_id, error: error_message }
+      rescue => e
+        # Unexpected error - log with full context and continue
+        failed_count += 1
+        transaction_id = transaction_data.try(:[], :id) || transaction_data.try(:[], "id") || "unknown"
+        error_message = "#{e.class}: #{e.message}"
+        Rails.logger.error "RedbarkAccount::Transactions::Processor - Error processing transaction #{transaction_id}: #{error_message}"
+        Rails.logger.error e.backtrace.join("\n")
+        errors << { index: index, transaction_id: transaction_id, error: error_message }
+      end
+    end
+
+    result = {
+      success: failed_count == 0,
+      total: total_count,
+      imported: imported_count,
+      skipped: skipped_count,
+      failed: failed_count,
+      errors: errors
+    }
+
+    if failed_count > 0 || skipped_count > 0
+      DebugLogEntry.capture(
+        category: "provider_sync",
+        level: failed_count > 0 ? "warn" : "info",
+        message: "Redbark transaction processing completed with skipped or failed rows",
+        source: self.class.name,
+        provider_key: "redbark",
+        family: redbark_account.redbark_item.family,
+        metadata: { redbark_account_id: redbark_account.id, total: total_count, imported: imported_count, skipped: skipped_count, failed: failed_count, errors: errors.first(10) }
+      )
+    end
+
+    if failed_count > 0
+      Rails.logger.warn "RedbarkAccount::Transactions::Processor - Completed with #{failed_count} failures out of #{total_count} transactions"
+    else
+      Rails.logger.info "RedbarkAccount::Transactions::Processor - Successfully processed #{imported_count} transactions (#{skipped_count} skipped)"
+    end
+
+    result
+  end
+
+  private
+
+    def account
+      @redbark_account.current_account
+    end
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    # Redbark transaction shape:
+    # { id, accountId, accountName, status, date, datetime, postDate, description,
+    #   amount, direction, category, merchantName, merchantCategoryCode }
+    def process_transaction(transaction_data)
+      return nil unless account.present?
+
+      data = transaction_data.with_indifferent_access
+
+      redbark_id = data[:id].to_s
+      return nil if redbark_id.blank?
+
+      external_id = "redbark_#{redbark_id}"
+
+      amount = parse_transaction_amount(data)
+      return nil if amount.nil?
+
+      date = parse_date(data[:date] || data[:postDate])
+      return nil if date.nil?
+
+      name = data[:merchantName].presence || data[:description].presence || "Transaction"
+      # Transactions carry no per-item currency; they are in the account's currency
+      currency = account.currency
+
+      extra = build_extra_metadata(data)
+
+      Rails.logger.debug "RedbarkAccount::Transactions::Processor - Importing transaction: id=#{external_id} date=#{date}"
+
+      # Use ProviderImportAdapter for proper deduplication via external_id + source
+      import_adapter.import_transaction(
+        external_id: external_id,
+        amount: amount,
+        currency: currency,
+        date: date,
+        name: name[0..254], # Limit to 255 chars
+        source: "redbark",
+        merchant: merchant_for(data),
+        notes: data[:description].presence,
+        extra: extra
+      )
+    end
+
+    def parse_transaction_amount(data)
+      amount = parse_decimal(data[:amount])
+      return nil if amount.nil?
+
+      # Redbark returns CDR pre-signed amounts: positive = credit (money in),
+      # negative = debit (money out). Sure expects the opposite (positive =
+      # money out), so negate.
+      -amount
+    end
+
+    def merchant_for(data)
+      merchant_name = data[:merchantName].to_s.strip
+      return nil if merchant_name.blank?
+
+      merchant_id = Digest::SHA256.hexdigest(merchant_name.downcase)[0, 32]
+
+      import_adapter.find_or_create_merchant(
+        provider_merchant_id: "redbark_merchant_#{merchant_id}",
+        name: merchant_name,
+        source: "redbark"
+      )
+    rescue ActiveRecord::RecordInvalid => e
+      Rails.logger.error "RedbarkAccount::Transactions::Processor - Failed to create merchant '#{merchant_name}': #{e.message}"
+      nil
+    end
+
+    def build_extra_metadata(data)
+      {
+        "redbark" => {
+          "id" => data[:id],
+          "pending" => data[:status].to_s == "pending",
+          "merchant" => data[:merchantName],
+          "category" => data[:category],
+          "merchant_category_code" => data[:merchantCategoryCode],
+          "direction" => data[:direction]
+        }.compact
+      }
+    end
+end
diff --git a/app/models/redbark_item.rb b/app/models/redbark_item.rb
new file mode 100644
index 000000000..01a4b53b9
--- /dev/null
+++ b/app/models/redbark_item.rb
@@ -0,0 +1,208 @@
+# frozen_string_literal: true
+
+class RedbarkItem < ApplicationRecord
+  include Syncable, Provided, Unlinking, Encryptable
+
+  enum :status, { good: "good", requires_update: "requires_update" }, default: :good
+
+  # Encrypt sensitive credentials and raw payloads if ActiveRecord encryption is configured
+  if encryption_ready?
+    encrypts :api_key, deterministic: true
+    encrypts :raw_payload
+    encrypts :raw_institution_payload
+  end
+
+  validates :name, presence: true
+  # Validate on every save, not just create - an update must never blank the key
+  validates :api_key, presence: true
+
+  belongs_to :family
+  has_one_attached :logo, dependent: :purge_later
+
+  has_many :redbark_accounts, dependent: :destroy
+  has_many :accounts, through: :redbark_accounts
+
+  scope :active, -> { where(scheduled_for_deletion: false) }
+  scope :syncable, -> { active }
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :needs_update, -> { where(status: :requires_update) }
+
+  def syncer
+    RedbarkItem::Syncer.new(self)
+  end
+
+  # Deliberately not transactional - the job must enqueue after the flag commits
+  def destroy_later
+    update!(scheduled_for_deletion: true)
+    DestroyJob.perform_later(self)
+  end
+
+
+  # Import data from provider API
+  def import_latest_redbark_data(sync: nil)
+    provider = redbark_provider
+    unless provider
+      Rails.logger.error "RedbarkItem #{id} - Cannot import: provider is not configured"
+      raise StandardError, I18n.t("redbark_items.errors.provider_not_configured")
+    end
+
+    RedbarkItem::Importer.new(self, redbark_provider: provider, sync: sync).import
+  rescue => e
+    DebugLogEntry.capture(
+      category: "provider_sync",
+      level: "error",
+      message: "Redbark import failed",
+      source: self.class.name,
+      provider_key: "redbark",
+      family: family,
+      metadata: { redbark_item_id: id, error_class: e.class.name, error: e.message }
+    )
+    Rails.logger.error "RedbarkItem #{id} - Failed to import data: #{e.message}"
+    raise
+  end
+
+  # Process linked accounts after data import
+  def process_accounts
+    return [] if redbark_accounts.empty?
+
+    results = []
+    linked_redbark_accounts.includes(account_provider: :account).each do |redbark_account|
+      begin
+        result = RedbarkAccount::Processor.new(redbark_account).process
+        results << { redbark_account_id: redbark_account.id, success: true, result: result }
+      rescue => e
+        DebugLogEntry.capture(
+          category: "provider_sync",
+          level: "error",
+          message: "Failed to process Redbark account",
+          source: self.class.name,
+          provider_key: "redbark",
+          family: family,
+          metadata: { redbark_account_id: redbark_account.id, error_class: e.class.name, error: e.message }
+        )
+        results << { redbark_account_id: redbark_account.id, success: false, error: e.message }
+      end
+    end
+
+    results
+  end
+
+  # Schedule sync jobs for all linked accounts
+  def schedule_account_syncs(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    return [] if accounts.empty?
+
+    results = []
+    accounts.visible.each do |account|
+      begin
+        account.sync_later(
+          parent_sync: parent_sync,
+          window_start_date: window_start_date,
+          window_end_date: window_end_date
+        )
+        results << { account_id: account.id, success: true }
+      rescue => e
+        DebugLogEntry.capture(
+          category: "provider_sync",
+          level: "error",
+          message: "Redbark account sync scheduling failed",
+          source: self.class.name,
+          provider_key: "redbark",
+          family: family,
+          metadata: { redbark_item_id: id, account_id: account.id, error_class: e.class.name, error: e.message }
+        )
+        Rails.logger.error "RedbarkItem #{id} - Failed to schedule sync for account #{account.id}: #{e.message}"
+        results << { account_id: account.id, success: false, error: e.message }
+      end
+    end
+
+    results
+  end
+
+  def upsert_redbark_snapshot!(accounts_snapshot)
+    assign_attributes(
+      raw_payload: accounts_snapshot
+    )
+
+    save!
+  end
+
+  def has_completed_initial_setup?
+    accounts.any?
+  end
+
+  # Linked accounts (have AccountProvider association)
+  def linked_redbark_accounts
+    redbark_accounts.joins(:account_provider)
+  end
+
+  # Unlinked accounts still awaiting setup (no AccountProvider link, not skipped by the user)
+  def unlinked_redbark_accounts
+    redbark_accounts.needs_setup
+  end
+
+  def sync_status_summary
+    if account_counts[:total] == 0
+      I18n.t("redbark_items.sync_status.no_accounts")
+    elsif account_counts[:needs_setup] == 0
+      I18n.t("redbark_items.sync_status.synced", count: account_counts[:linked])
+    else
+      I18n.t("redbark_items.sync_status.synced_with_setup", linked: account_counts[:linked], unlinked: account_counts[:needs_setup])
+    end
+  end
+
+  def linked_accounts_count
+    account_counts[:linked]
+  end
+
+  def unlinked_accounts_count
+    account_counts[:needs_setup]
+  end
+
+  def total_accounts_count
+    account_counts[:total]
+  end
+
+  def institution_display_name
+    institution_name.presence || institution_domain.presence || name
+  end
+
+  def connected_institutions
+    redbark_accounts.includes(:account)
+                  .where.not(institution_metadata: nil)
+                  .map { |acc| acc.institution_metadata }
+                  .uniq { |inst| inst["name"] || inst["institution_name"] }
+  end
+
+  def institution_summary
+    institutions = connected_institutions
+    case institutions.count
+    when 0
+      I18n.t("redbark_items.institution_summary.none")
+    else
+      I18n.t("redbark_items.institution_summary.count", count: institutions.count)
+    end
+  end
+
+  def credentials_configured?
+    api_key.present?
+  end
+
+  private
+
+    # One grouped query instead of separate COUNTs for each of the
+    # linked/unlinked/total figures the accounts index partial reads.
+    def account_counts
+      @account_counts ||= begin
+        rows = redbark_accounts
+          .left_joins(:account_provider)
+          .group(:ignored, Arel.sql("account_providers.id IS NULL"))
+          .count
+
+        {
+          total: rows.values.sum,
+          linked: rows.sum { |(_ignored, unlinked), count| unlinked ? 0 : count },
+          needs_setup: rows.sum { |(ignored, unlinked), count| unlinked && !ignored ? count : 0 }
+        }
+      end
+    end
+end
diff --git a/app/models/redbark_item/importer.rb b/app/models/redbark_item/importer.rb
new file mode 100644
index 000000000..08c8111e6
--- /dev/null
+++ b/app/models/redbark_item/importer.rb
@@ -0,0 +1,356 @@
+# frozen_string_literal: true
+
+class RedbarkItem::Importer
+  include SyncStats::Collector
+  include RedbarkAccount::DataHelpers
+  include CurrencyNormalizable
+
+  attr_reader :redbark_item, :redbark_provider, :sync
+
+  def initialize(redbark_item, redbark_provider:, sync: nil)
+    @redbark_item = redbark_item
+    @redbark_provider = redbark_provider
+    @sync = sync
+  end
+
+  def import
+    Rails.logger.info "RedbarkItem::Importer - Starting import for item #{redbark_item.id}"
+
+    # Step 1: Fetch and store all accounts (with connection metadata for institutions)
+    import_accounts
+
+    # Step 2: For linked accounts only, fetch transactions and balances.
+    # Unlinked accounts just need basic info (name, institution) for the setup modal.
+    linked_accounts = redbark_item.linked_redbark_accounts.to_a
+
+    Rails.logger.info "RedbarkItem::Importer - Found #{linked_accounts.count} linked accounts to process"
+
+    linked_accounts.each do |redbark_account|
+      import_transactions(redbark_account)
+    end
+
+    import_balances(linked_accounts)
+
+    # Store import stats on the item as the raw snapshot
+    redbark_item.upsert_redbark_snapshot!(stats)
+
+    stats
+  rescue Provider::Redbark::AuthenticationError
+    redbark_item.update!(status: :requires_update)
+    raise
+  end
+
+  private
+
+    def stats
+      @stats ||= {}
+    end
+
+    def persist_stats!
+      return unless sync&.respond_to?(:sync_stats)
+      merged = (sync.sync_stats || {}).merge(stats)
+      sync.update_columns(sync_stats: merged)
+    end
+
+    def connections_by_id
+      @connections_by_id ||= begin
+        stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+        redbark_provider.list_connections.index_by { |c| c[:id].to_s }
+      rescue Provider::Redbark::AuthenticationError
+        raise
+      rescue => e
+        capture_failure("Connections fetch failed; institution metadata will be limited", e)
+        {}
+      end
+    end
+
+    def import_accounts
+      Rails.logger.info "RedbarkItem::Importer - Fetching accounts"
+
+      accounts_data = redbark_provider.list_accounts
+
+      stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+      stats["total_accounts"] = accounts_data.size
+
+      # Fetch connections once, before the per-account rescue below - an auth
+      # failure here must propagate and mark the item requires_update, not get
+      # swallowed as N per-account errors
+      connections_by_id
+
+      upstream_account_ids = []
+
+      accounts_data.each do |account_data|
+        begin
+          account_id = account_data[:id]&.to_s
+          next if account_id.blank?
+          next if account_data[:name].blank?
+
+          # Only banking and documents connections carry transactions;
+          # brokerage accounts belong to /v1/trades and are out of scope here
+          connection = connections_by_id[account_data[:connectionId].to_s]
+          next unless transactable_connection?(connection)
+
+          upstream_account_ids << account_id
+
+          redbark_account = redbark_item.redbark_accounts.find_or_initialize_by(
+            redbark_account_id: account_id
+          )
+          redbark_account.upsert_from_redbark!(account_data, connection_data: connection)
+
+          stats["accounts_imported"] = stats.fetch("accounts_imported", 0) + 1
+        rescue => e
+          capture_failure("Account import failed", e, account_id: account_data[:id])
+          stats["accounts_skipped"] = stats.fetch("accounts_skipped", 0) + 1
+          register_error(e, account_id: account_data[:id])
+        end
+      end
+
+      persist_stats!
+
+      @upstream_account_ids = upstream_account_ids
+
+      prune_removed_accounts(upstream_account_ids)
+    end
+
+    def import_transactions(redbark_account)
+      Rails.logger.info "RedbarkItem::Importer - Fetching transactions for account #{redbark_account.id}"
+
+      if redbark_account.connection_id.blank?
+        Rails.logger.warn "RedbarkItem::Importer - Account #{redbark_account.id} has no connection_id, skipping transactions"
+        return
+      end
+
+      # A linked account can still sit on a non-transactable connection
+      # (e.g. brokerage rows linked before this guard existed) - the
+      # transactions endpoint rejects those outright
+      connection = connections_by_id[redbark_account.connection_id.to_s]
+      unless transactable_connection?(connection)
+        Rails.logger.info "RedbarkItem::Importer - Skipping transactions for non-banking account #{redbark_account.id}"
+        return
+      end
+
+      begin
+        start_date = calculate_transaction_start_date(redbark_account)
+
+        transactions_data = redbark_provider.get_transactions(
+          connection_id: redbark_account.connection_id,
+          account_id: redbark_account.redbark_account_id,
+          start_date: start_date,
+          end_date: Date.current,
+          include_pending: Rails.configuration.x.redbark.include_pending
+        )
+
+        stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+
+        if transactions_data.any?
+          transactions_hashes = transactions_data.map { |t| sdk_object_to_hash(t) }
+          merged = merge_transactions(
+            redbark_account.raw_transactions_payload || [],
+            transactions_hashes,
+            window_start: start_date
+          )
+          redbark_account.upsert_redbark_transactions_snapshot!(merged)
+          stats["transactions_found"] = stats.fetch("transactions_found", 0) + transactions_data.size
+        end
+      rescue Provider::Redbark::AuthenticationError
+        raise
+      rescue => e
+        capture_failure("Transactions fetch failed", e, account_id: redbark_account.redbark_account_id)
+        register_error(e, context: "transactions", account_id: redbark_account.id)
+      end
+    end
+
+    # One balances call covers every eligible linked account. A failed fetch
+    # leaves current_balance untouched so the processor keeps the previous
+    # balance instead of writing zeros.
+    def import_balances(linked_accounts)
+      eligible_accounts = balance_eligible_accounts(linked_accounts)
+      account_ids = eligible_accounts.map(&:redbark_account_id).compact
+      return if account_ids.empty?
+
+      begin
+        balances = fetch_balances_with_fallback(account_ids)
+
+        balances_by_id = balances.index_by { |b| b[:accountId].to_s }
+
+        eligible_accounts.each do |redbark_account|
+          balance_data = balances_by_id[redbark_account.redbark_account_id]
+          next unless balance_data
+
+          amount = parse_decimal(balance_data[:currentBalance])
+          next if amount.nil?
+
+          redbark_account.update!(
+            current_balance: amount,
+            currency: extract_currency(balance_data, fallback: redbark_account.currency)
+          )
+          stats["balances_updated"] = stats.fetch("balances_updated", 0) + 1
+        end
+      rescue Provider::Redbark::AuthenticationError
+        raise
+      rescue => e
+        capture_failure("Balances fetch failed; keeping previous balances", e)
+        register_error(e, context: "balances")
+      end
+    end
+
+    # The balances endpoint rejects the WHOLE batch when any requested id is
+    # unknown (404) or non-banking (400), so exclude accounts that no longer
+    # exist upstream and accounts on non-banking connections up front.
+    def balance_eligible_accounts(linked_accounts)
+      linked_accounts.select do |redbark_account|
+        next false if redbark_account.redbark_account_id.blank?
+
+        if @upstream_account_ids.present? && !@upstream_account_ids.include?(redbark_account.redbark_account_id)
+          next false
+        end
+
+        connection = connections_by_id[redbark_account.connection_id.to_s]
+        next true if connection.nil? # no connection metadata - let the fallback sort it out
+
+        category = connection[:category].to_s
+        category.blank? || category == "banking"
+      end
+    end
+
+    # If the batch is still rejected (stale id or category we could not see),
+    # fall back to per-account requests so one bad account cannot freeze
+    # balance updates for the rest of the item.
+    def fetch_balances_with_fallback(account_ids)
+      stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+      redbark_provider.get_balances(account_ids: account_ids)
+    rescue Provider::Redbark::AuthenticationError
+      raise
+    rescue Provider::Redbark::Error => e
+      raise unless %i[not_found bad_request].include?(e.error_type)
+      raise if account_ids.size <= 1
+
+      capture_failure("Batched balances call rejected; retrying per account", e)
+
+      account_ids.flat_map do |account_id|
+        begin
+          stats["api_requests"] = stats.fetch("api_requests", 0) + 1
+          redbark_provider.get_balances(account_ids: [ account_id ])
+        rescue Provider::Redbark::AuthenticationError
+          raise
+        rescue Provider::Redbark::Error => account_error
+          capture_failure("Balance fetch failed for account; keeping previous balance", account_error, account_id: account_id)
+          []
+        end
+      end
+    end
+
+    def calculate_transaction_start_date(redbark_account)
+      has_stored_transactions = (redbark_account.raw_transactions_payload || []).any?
+
+      if has_stored_transactions && redbark_item.last_synced_at.present?
+        # Incremental: go back 7 days from last sync to catch late-posting
+        # transactions. The user's sync_start_date governs the initial
+        # backfill only - re-fetching the whole window every sync would blow
+        # through the API's row ceiling on busy accounts.
+        (redbark_item.last_synced_at - 7.days).to_date
+      elsif redbark_account.sync_start_date.present?
+        redbark_account.sync_start_date
+      else
+        # First sync for this account: pull a 90 day history
+        90.days.ago.to_date
+      end
+    end
+
+    # The snapshot is bounded to the current fetch window - durable history
+    # lives in entries (deduped by external_id), so older rows are dropped
+    # rather than accumulated forever. Rows without a parseable date are kept.
+    # A pending row absent from the refetch has settled (possibly under a new
+    # id) - keeping it would duplicate the posted transaction.
+    def merge_transactions(existing, new_transactions, window_start: nil)
+      new_keys = new_transactions.map { |t| transaction_key(t) }.to_set
+
+      by_id = {}
+      existing.each do |t|
+        next unless within_window?(t, window_start)
+        next if stale_pending?(t, new_keys)
+        by_id[transaction_key(t)] = t
+      end
+      new_transactions.each { |t| by_id[transaction_key(t)] = t }
+      by_id.values
+    end
+
+    def within_window?(transaction, window_start)
+      return true if window_start.nil?
+
+      t = transaction.is_a?(Hash) ? transaction.with_indifferent_access : transaction
+      date = Date.parse(t[:date].to_s) rescue nil
+      date.nil? || date >= window_start
+    end
+
+    def stale_pending?(transaction, new_keys)
+      t = transaction.is_a?(Hash) ? transaction.with_indifferent_access : transaction
+      t[:status].to_s == "pending" && !new_keys.include?(transaction_key(t))
+    end
+
+    def transaction_key(transaction)
+      transaction = transaction.with_indifferent_access if transaction.is_a?(Hash)
+      transaction[:id].presence ||
+        [ transaction[:date], transaction[:amount], transaction[:description] ].join("-")
+    end
+
+    # Removes records that no longer exist upstream and are not linked to any
+    # Account. Guarded to a non-empty upstream list so a transient empty or
+    # failed response can never wipe out all accounts.
+    def prune_removed_accounts(upstream_account_ids)
+      return if upstream_account_ids.empty?
+
+      scope = redbark_item.redbark_accounts.includes(:account_provider)
+      orphaned = scope
+        .where.not(redbark_account_id: upstream_account_ids)
+        .or(scope.where(redbark_account_id: nil))
+
+      orphaned.each do |redbark_account|
+        if redbark_account.account_provider.present?
+          Rails.logger.info "RedbarkItem::Importer - Keeping stale RedbarkAccount #{redbark_account.id} (still linked to an Account)"
+          next
+        end
+
+        begin
+          Rails.logger.info "RedbarkItem::Importer - Pruning orphaned RedbarkAccount #{redbark_account.id} (no longer exists upstream)"
+          redbark_account.destroy
+          stats["accounts_pruned"] = stats.fetch("accounts_pruned", 0) + 1
+        rescue => e
+          capture_failure("Failed to prune orphaned account", e, redbark_account_id: redbark_account.id)
+        end
+      end
+    end
+
+    # Banking and documents connections serve /v1/transactions; anything else
+    # (brokerage) does not. Unknown connections get the benefit of the doubt.
+    def transactable_connection?(connection)
+      return true if connection.nil?
+
+      category = connection[:category].to_s
+      category.blank? || %w[banking documents].include?(category)
+    end
+
+    def register_error(error, **context)
+      stats["errors"] ||= []
+      stats["errors"] << {
+        message: error.message,
+        context: context.to_s,
+        timestamp: Time.current.iso8601
+      }
+    end
+
+    # Surfaces provider failures in the /settings/debug super-admin UI so
+    # support can diagnose without log access
+    def capture_failure(message, error, **metadata)
+      DebugLogEntry.capture(
+        category: "provider_sync",
+        level: "warn",
+        message: message,
+        source: self.class.name,
+        provider_key: "redbark",
+        family: redbark_item.family,
+        metadata: { error_class: error.class.name, error: error.message }.merge(metadata)
+      )
+      Rails.logger.warn "RedbarkItem::Importer - #{message}: #{error.class}: #{error.message}"
+    end
+end
diff --git a/app/models/redbark_item/provided.rb b/app/models/redbark_item/provided.rb
new file mode 100644
index 000000000..f23965d7e
--- /dev/null
+++ b/app/models/redbark_item/provided.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RedbarkItem::Provided
+  extend ActiveSupport::Concern
+
+  def redbark_provider
+    return nil unless credentials_configured?
+
+    Provider::Redbark.new(
+      api_key: api_key
+    )
+  end
+
+  # Returns credentials hash for API calls that need them passed explicitly
+  def redbark_credentials
+    return nil unless credentials_configured?
+
+    {
+      api_key: api_key
+    }
+  end
+end
diff --git a/app/models/redbark_item/sync_complete_event.rb b/app/models/redbark_item/sync_complete_event.rb
new file mode 100644
index 000000000..0049f8ffd
--- /dev/null
+++ b/app/models/redbark_item/sync_complete_event.rb
@@ -0,0 +1,25 @@
+class RedbarkItem::SyncCompleteEvent
+  attr_reader :redbark_item
+
+  def initialize(redbark_item)
+    @redbark_item = redbark_item
+  end
+
+  def broadcast
+    # Update UI with latest account data
+    redbark_item.accounts.each do |account|
+      account.broadcast_sync_complete
+    end
+
+    # Update the Redbark item view
+    redbark_item.broadcast_replace_to(
+      redbark_item.family,
+      target: "redbark_item_#{redbark_item.id}",
+      partial: "redbark_items/redbark_item",
+      locals: { redbark_item: redbark_item }
+    )
+
+    # Let family handle sync notifications
+    redbark_item.family.broadcast_sync_complete
+  end
+end
diff --git a/app/models/redbark_item/syncer.rb b/app/models/redbark_item/syncer.rb
new file mode 100644
index 000000000..e086f3c2d
--- /dev/null
+++ b/app/models/redbark_item/syncer.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class RedbarkItem::Syncer
+  include SyncStats::Collector
+
+  attr_reader :redbark_item
+
+  def initialize(redbark_item)
+    @redbark_item = redbark_item
+  end
+
+  def perform_sync(sync)
+    Rails.logger.info "RedbarkItem::Syncer - Starting sync for item #{redbark_item.id}"
+
+    # Phase 1: Import data from provider API
+    sync.update!(status_text: I18n.t("redbark_items.sync.status.importing")) if sync.respond_to?(:status_text)
+    import_stats = redbark_item.import_latest_redbark_data(sync: sync)
+
+    # Phase 2: Collect setup statistics
+    finalize_setup_counts(sync)
+
+    # Phase 3: Process data for linked accounts
+    linked_redbark_accounts = redbark_item.linked_redbark_accounts.includes(account_provider: :account)
+    if linked_redbark_accounts.any?
+      sync.update!(status_text: I18n.t("redbark_items.sync.status.processing")) if sync.respond_to?(:status_text)
+      mark_import_started(sync)
+      redbark_item.process_accounts
+
+      # Phase 4: Schedule balance calculations
+      sync.update!(status_text: I18n.t("redbark_items.sync.status.calculating")) if sync.respond_to?(:status_text)
+      redbark_item.schedule_account_syncs(
+        parent_sync: sync,
+        window_start_date: sync.window_start_date,
+        window_end_date: sync.window_end_date
+      )
+
+      # Phase 5: Collect statistics
+      account_ids = linked_redbark_accounts.filter_map { |pa| pa.current_account&.id }
+      collect_transaction_stats(sync, account_ids: account_ids, source: "redbark")
+    end
+
+    # Mark sync health, surfacing per-account import errors instead of
+    # unconditionally reporting a clean run
+    import_errors = import_stats.is_a?(Hash) ? import_stats["errors"] : nil
+    collect_health_stats(sync, errors: import_errors.presence)
+  rescue Provider::Redbark::AuthenticationError => e
+    redbark_item.update!(status: :requires_update)
+    collect_health_stats(sync, errors: [ { message: e.message, category: "auth_error" } ])
+    raise
+  rescue => e
+    collect_health_stats(sync, errors: [ { message: e.message, category: "sync_error" } ])
+    raise
+  end
+
+  # Public: called by Sync after finalization
+  def perform_post_sync
+    # Override for post-sync cleanup if needed
+  end
+
+  private
+
+    def mark_import_started(sync)
+      # Mark that we're now processing imported data
+      sync.update!(status_text: I18n.t("redbark_items.sync.status.importing_data")) if sync.respond_to?(:status_text)
+    end
+
+    def finalize_setup_counts(sync)
+      sync.update!(status_text: I18n.t("redbark_items.sync.status.checking_setup")) if sync.respond_to?(:status_text)
+
+      unlinked_count = redbark_item.unlinked_accounts_count
+
+      if unlinked_count > 0
+        redbark_item.update!(pending_account_setup: true)
+        sync.update!(status_text: I18n.t("redbark_items.sync.status.needs_setup", count: unlinked_count)) if sync.respond_to?(:status_text)
+      else
+        redbark_item.update!(pending_account_setup: false)
+      end
+
+      # Collect setup stats
+      collect_setup_stats(sync, provider_accounts: redbark_item.redbark_accounts)
+    end
+end
diff --git a/app/models/redbark_item/unlinking.rb b/app/models/redbark_item/unlinking.rb
new file mode 100644
index 000000000..7fa2b0b36
--- /dev/null
+++ b/app/models/redbark_item/unlinking.rb
@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module RedbarkItem::Unlinking
+  # Concern that encapsulates unlinking logic for a Redbark item.
+  extend ActiveSupport::Concern
+
+  # Idempotently remove all connections between this Redbark item and local accounts.
+  # - Detaches any AccountProvider links for each RedbarkAccount
+  # - Detaches Holdings that point at the AccountProvider links
+  # Returns a per-account result payload for observability
+  def unlink_all!(dry_run: false)
+    results = []
+
+    redbark_accounts.find_each do |provider_account|
+      links = AccountProvider.where(provider_type: "RedbarkAccount", provider_id: provider_account.id).to_a
+      link_ids = links.map(&:id)
+      result = {
+        provider_account_id: provider_account.id,
+        name: provider_account.name,
+        provider_link_ids: link_ids
+      }
+      results << result
+
+      next if dry_run
+
+      begin
+        ActiveRecord::Base.transaction do
+          # Detach holdings for any provider links found
+          if link_ids.any?
+            Holding.where(account_provider_id: link_ids).update_all(account_provider_id: nil)
+          end
+
+          # Destroy all provider links
+          links.each do |ap|
+            ap.destroy!
+          end
+        end
+      rescue StandardError => e
+        DebugLogEntry.capture(
+          category: "provider_sync",
+          level: "error",
+          message: "Failed to fully unlink Redbark provider account",
+          source: "RedbarkItem::Unlinking",
+          provider_key: "redbark",
+          family: family,
+          metadata: { redbark_account_id: provider_account.id, provider_link_ids: link_ids, error_class: e.class.name, error: e.message }
+        )
+        # Record error for observability; continue with other accounts
+        result[:error] = e.message
+      end
+    end
+
+    results
+  end
+end
diff --git a/app/models/rule.rb b/app/models/rule.rb
index d5b89eef0..c45b7ba5d 100644
--- a/app/models/rule.rb
+++ b/app/models/rule.rb
@@ -40,6 +40,14 @@ class Rule < ApplicationRecord
     matching_resources_scope.count
   end
 
+  # Public wrapper around the private matching scope so callers can read the
+  # currently-matching transaction ids WITHOUT running executors (e.g. the
+  # notification baseline pre-seed). Mirrors total_affected_resource_count,
+  # which also reaches matching_resources_scope.
+  def matching_transaction_ids
+    matching_resources_scope.pluck(:id)
+  end
+
   # Creates a categorization rule for the Quick Categorize Wizard.
   # Returns the saved rule, or nil if a duplicate or invalid rule already exists.
   def self.create_from_grouping(family, grouping_key, category, transaction_type: nil)
diff --git a/app/models/rule/action.rb b/app/models/rule/action.rb
index c415c59eb..9cad8a2f8 100644
--- a/app/models/rule/action.rb
+++ b/app/models/rule/action.rb
@@ -3,6 +3,23 @@ class Rule::Action < ApplicationRecord
 
   validates :action_type, presence: true
 
+  # Pre-seed (watermark): when a send_email_notification action is created — on a
+  # new rule OR added to an existing one — record all currently-matching
+  # transactions as already-delivered WITHOUT sending, so the rule only ever
+  # emails about transactions that appear AFTER the action exists.
+  #
+  # Uses after_create_commit (not after_create): nested children persist before
+  # the parent rule commits, and the pre-seed reads the rule's conditions, which
+  # must be committed first.
+  #
+  # after_update_commit covers the edit flow: the action_type select is editable
+  # for persisted actions (see rules_controller#rule_params), so an existing
+  # action can be CHANGED to send_email_notification. Without re-seeding, the
+  # next apply/sync would email every historical match. Guard on the type change
+  # so we only watermark when an action actually becomes email-notify.
+  after_create_commit :seed_notification_baseline
+  after_update_commit :seed_notification_baseline, if: :saved_change_to_action_type?
+
   def apply(resource_scope, ignore_attribute_locks: false, rule_run: nil)
     executor.execute(resource_scope, value: value, ignore_attribute_locks: ignore_attribute_locks, rule_run: rule_run) || 0
   end
@@ -26,4 +43,14 @@ class Rule::Action < ApplicationRecord
   def executor
     rule.registry.get_executor!(action_type)
   end
+
+  private
+    def seed_notification_baseline
+      return unless action_type == "send_email_notification"
+
+      NotificationDelivery.record_for(
+        rule_id: rule_id,
+        transaction_ids: rule.matching_transaction_ids
+      )
+    end
 end
diff --git a/app/models/rule/action_executor/exclude_transaction.rb b/app/models/rule/action_executor/exclude_transaction.rb
index e56edadc5..79f1b0658 100644
--- a/app/models/rule/action_executor/exclude_transaction.rb
+++ b/app/models/rule/action_executor/exclude_transaction.rb
@@ -19,7 +19,8 @@ class Rule::ActionExecutor::ExcludeTransaction < Rule::ActionExecutor
       txn.entry.enrich_attribute(
         :excluded,
         true,
-        source: "rule"
+        source: "rule",
+        ignore_locks: ignore_attribute_locks
       )
     end
   end
diff --git a/app/models/rule/action_executor/send_email_notification.rb b/app/models/rule/action_executor/send_email_notification.rb
new file mode 100644
index 000000000..e979160f8
--- /dev/null
+++ b/app/models/rule/action_executor/send_email_notification.rb
@@ -0,0 +1,30 @@
+class Rule::ActionExecutor::SendEmailNotification < Rule::ActionExecutor
+  def label
+    "Send email notification"
+  end
+
+  # rule_run is accepted for interface compatibility but unused: the digest email
+  # is fire-and-forget and is not tracked as part of RuleRun accounting.
+  def execute(transaction_scope, value: nil, ignore_attribute_locks: false, rule_run: nil)
+    candidate_ids = transaction_scope.pluck(:id)
+
+    # record_for atomically inserts and returns ONLY the ids this run actually
+    # claimed. We enqueue off that result (not the pre-insert candidate list) so
+    # two concurrent runs over the same matches never enqueue duplicate digests:
+    # whichever loses the unique-index race gets those ids back as empty.
+    #
+    # Recording is the dedup boundary, since re-syncs re-apply every active rule
+    # to all in-window matches (not just newly ingested transactions). If the
+    # process crashes after recording but before delivery, the next run suppresses
+    # these ids rather than re-sending — we would rather miss a digest than spam.
+    new_transaction_ids = NotificationDelivery.record_for(rule_id: rule.id, transaction_ids: candidate_ids)
+
+    return 0 if new_transaction_ids.empty?
+
+    RuleEmailNotificationJob.perform_later(rule.id, new_transaction_ids)
+
+    # Synchronous count of newly-notified transactions. The email itself is
+    # delivered out-of-band by the job and is not part of RuleRun accounting.
+    new_transaction_ids.size
+  end
+end
diff --git a/app/models/rule/action_executor/set_investment_activity_label.rb b/app/models/rule/action_executor/set_investment_activity_label.rb
index 21e421292..3ae422518 100644
--- a/app/models/rule/action_executor/set_investment_activity_label.rb
+++ b/app/models/rule/action_executor/set_investment_activity_label.rb
@@ -24,7 +24,8 @@ class Rule::ActionExecutor::SetInvestmentActivityLabel < Rule::ActionExecutor
       txn.enrich_attribute(
         :investment_activity_label,
         value,
-        source: "rule"
+        source: "rule",
+        ignore_locks: ignore_attribute_locks
       )
     end
   end
diff --git a/app/models/rule/action_executor/set_transaction_category.rb b/app/models/rule/action_executor/set_transaction_category.rb
index 790cc8ae2..689372f00 100644
--- a/app/models/rule/action_executor/set_transaction_category.rb
+++ b/app/models/rule/action_executor/set_transaction_category.rb
@@ -22,7 +22,8 @@ class Rule::ActionExecutor::SetTransactionCategory < Rule::ActionExecutor
       txn.enrich_attribute(
         :category_id,
         category.id,
-        source: "rule"
+        source: "rule",
+        ignore_locks: ignore_attribute_locks
       )
     end
   end
diff --git a/app/models/rule/action_executor/set_transaction_merchant.rb b/app/models/rule/action_executor/set_transaction_merchant.rb
index 0b0d43ad3..06bdf1b5d 100644
--- a/app/models/rule/action_executor/set_transaction_merchant.rb
+++ b/app/models/rule/action_executor/set_transaction_merchant.rb
@@ -21,7 +21,8 @@ class Rule::ActionExecutor::SetTransactionMerchant < Rule::ActionExecutor
       txn.enrich_attribute(
         :merchant_id,
         merchant.id,
-        source: "rule"
+        source: "rule",
+        ignore_locks: ignore_attribute_locks
       )
     end
   end
diff --git a/app/models/rule/action_executor/set_transaction_name.rb b/app/models/rule/action_executor/set_transaction_name.rb
index 4d4c84d8a..737c258f0 100644
--- a/app/models/rule/action_executor/set_transaction_name.rb
+++ b/app/models/rule/action_executor/set_transaction_name.rb
@@ -24,7 +24,8 @@ class Rule::ActionExecutor::SetTransactionName < Rule::ActionExecutor
       txn.entry.enrich_attribute(
         :name,
         value,
-        source: "rule"
+        source: "rule",
+        ignore_locks: ignore_attribute_locks
       )
     end
   end
diff --git a/app/models/rule/action_executor/set_transaction_tags.rb b/app/models/rule/action_executor/set_transaction_tags.rb
index 80166950e..00ceff10f 100644
--- a/app/models/rule/action_executor/set_transaction_tags.rb
+++ b/app/models/rule/action_executor/set_transaction_tags.rb
@@ -26,7 +26,8 @@ class Rule::ActionExecutor::SetTransactionTags < Rule::ActionExecutor
       txn.enrich_attribute(
         :tag_ids,
         merged_tag_ids,
-        source: "rule"
+        source: "rule",
+        ignore_locks: ignore_attribute_locks
       )
     end
   end
diff --git a/app/models/rule/registry/transaction_resource.rb b/app/models/rule/registry/transaction_resource.rb
index ee697927c..0a23e4cd3 100644
--- a/app/models/rule/registry/transaction_resource.rb
+++ b/app/models/rule/registry/transaction_resource.rb
@@ -24,7 +24,8 @@ class Rule::Registry::TransactionResource < Rule::Registry
       Rule::ActionExecutor::SetTransactionName.new(rule),
       Rule::ActionExecutor::SetInvestmentActivityLabel.new(rule),
       Rule::ActionExecutor::ExcludeTransaction.new(rule),
-      Rule::ActionExecutor::SetAsTransferOrPayment.new(rule)
+      Rule::ActionExecutor::SetAsTransferOrPayment.new(rule),
+      Rule::ActionExecutor::SendEmailNotification.new(rule)
     ]
 
     if ai_enabled?
diff --git a/app/models/rule_import.rb b/app/models/rule_import.rb
index 31cf4025a..dd946fb66 100644
--- a/app/models/rule_import.rb
+++ b/app/models/rule_import.rb
@@ -7,6 +7,13 @@ class RuleImport < Import
     end
   end
 
+  # Rules hang off the family, not the import — see
+  # Import#committed_by_named_records?. Nameless rows build unconditionally and
+  # carry no stable key, so a file of only nameless rows has no commit signal.
+  def data_committed?
+    committed_by_named_records?(family.rules)
+  end
+
   def column_keys
     %i[name resource_type active effective_date conditions actions]
   end
diff --git a/app/models/security.rb b/app/models/security.rb
index 40ae6b969..46ffd4f12 100644
--- a/app/models/security.rb
+++ b/app/models/security.rb
@@ -87,15 +87,20 @@ class Security < ApplicationRecord
     nil
   end
 
-  # Single source of truth for which logo URL the UI should render. Crypto
-  # and stocks share the same shape: prefer a freshly computed Brandfetch
-  # URL (honors current client_id + size) and fall back to any stored
-  # logo_url for the provider-returns-its-own-URL case (e.g. Tiingo S3).
+  # Single source of truth for which logo URL the UI should render.
+  # - Crypto keeps its dedicated Brandfetch-crypto shape.
+  # - When a website domain is known, Brandfetch (consistent client_id + size)
+  #   wins, falling back to any stored logo_url.
+  # - With no domain, a stored provider logo (e.g. T-Invest's CDN for MOEX
+  #   instruments) is authoritative and beats the ticker-only Brandfetch
+  #   lettermark placeholder.
   def display_logo_url
     if crypto?
       self.class.brandfetch_crypto_url(crypto_base_asset).presence || logo_url.presence
-    else
+    elsif website_url.present?
       brandfetch_icon_url.presence || logo_url.presence
+    else
+      logo_url.presence || brandfetch_icon_url.presence
     end
   end
 
diff --git a/app/models/security/provided.rb b/app/models/security/provided.rb
index 1d7805422..71d517aac 100644
--- a/app/models/security/provided.rb
+++ b/app/models/security/provided.rb
@@ -221,38 +221,80 @@ module Security::Provided
       return
     end
 
-    if self.name.present? && (self.logo_url.present? || self.website_url.present?) && !clear_cache
-      return
-    end
-
-    response = price_data_provider.fetch_security_info(
-      symbol: ticker,
-      exchange_operating_mic: exchange_operating_mic
-    )
-
-    if response.success?
-      # Only overwrite fields the provider actually returned, so providers that
-      # don't support metadata (e.g. Alpha Vantage) won't blank existing values.
-      attrs = {}
-      attrs[:name]        = response.data.name    if response.data.name.present?
-      attrs[:logo_url]    = response.data.logo_url if response.data.logo_url.present?
-      attrs[:website_url] = response.data.links   if response.data.links.present?
-      update(attrs) if attrs.any?
-    else
-      Rails.logger.warn("Failed to fetch security info for #{ticker} from #{price_data_provider.class.name}: #{response.error.message}")
-      DebugLogEntry.capture(
-        category: "security_metadata_fetch",
-        level: "warn",
-        message: "Failed to get security info",
-        source: self.class.name,
-        provider: price_data_provider,
-        metadata: {
-          security_id: self.id,
-          ticker: ticker,
-          provider_error: response.error.message
-        }
+    # Price-provider metadata (name/website/logo). Skip the refetch only when we
+    # already have a name plus a logo or website. This gate must be evaluated
+    # before any brand-logo enrichment, otherwise setting logo_url first would
+    # trip it and skip website_url backfill from providers that return links.
+    unless self.name.present? && (self.logo_url.present? || self.website_url.present?) && !clear_cache
+      response = price_data_provider.fetch_security_info(
+        symbol: ticker,
+        exchange_operating_mic: exchange_operating_mic
       )
+
+      if response.success?
+        # Only overwrite fields the provider actually returned, so providers that
+        # don't support metadata (e.g. Alpha Vantage) won't blank existing values.
+        attrs = {}
+        attrs[:name]        = response.data.name    if response.data.name.present?
+        attrs[:logo_url]    = response.data.logo_url if response.data.logo_url.present?
+        attrs[:website_url] = response.data.links   if response.data.links.present?
+        update(attrs) if attrs.any?
+      else
+        Rails.logger.warn("Failed to fetch security info for #{ticker} from #{price_data_provider.class.name}: #{response.error.message}")
+        DebugLogEntry.capture(
+          category: "security_metadata_fetch",
+          level: "warn",
+          message: "Failed to get security info",
+          source: self.class.name,
+          provider: price_data_provider,
+          metadata: {
+            security_id: self.id,
+            ticker: ticker,
+            provider_error: response.error.message
+          }
+        )
+      end
     end
+
+    # Brand logo, sourced independently of the price provider, so a security
+    # priced by a logo-less provider (e.g. MOEX/ISS) still gets a real logo.
+    # Runs after metadata so it never short-circuits website_url backfill.
+    import_brand_logo(clear_cache: clear_cache)
+  end
+
+  # Enriches the security with a brand logo from a dedicated logo provider
+  # (T-Invest), independent of which provider supplies prices. No-op when the
+  # logo is already set, for crypto (own logo path), or when no logo provider /
+  # token is configured. Runs every details import while the logo is missing.
+  def import_brand_logo(clear_cache: false)
+    return if crypto?
+    return if logo_url.present? && !clear_cache
+
+    provider = brand_logo_provider
+    return unless provider
+
+    response = provider.fetch_security_info(symbol: ticker, exchange_operating_mic: exchange_operating_mic)
+    return unless response.success? && response.data.logo_url.present?
+
+    update(logo_url: response.data.logo_url)
+  rescue => e
+    DebugLogEntry.capture(
+      category: "security_metadata_fetch",
+      level: "warn",
+      message: "Brand logo fetch failed",
+      source: self.class.name,
+      provider: brand_logo_provider,
+      metadata: { security_id: self.id, ticker: ticker, provider_error: e.message }
+    )
+  end
+
+  # The provider consulted for brand logos regardless of price provider. Returns
+  # nil unless a T-Invest token is configured. Uses the class-level lookup so it
+  # doesn't depend on (or interfere with) per-instance Registry expectations.
+  def brand_logo_provider
+    Provider::Registry.get_provider(:tinkoff_invest)
+  rescue Provider::Registry::Error
+    nil
   end
 
   def import_provider_prices(start_date:, end_date:, clear_cache: false)
diff --git a/app/models/setting.rb b/app/models/setting.rb
index e6879ed8d..dde71b960 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -59,6 +59,11 @@ class Setting < RailsSettings::Base
   field :tiingo_api_key, type: :string, default: ENV["TIINGO_API_KEY"]
   field :eodhd_api_key, type: :string, default: ENV["EODHD_API_KEY"]
   field :alpha_vantage_api_key, type: :string, default: ENV["ALPHA_VANTAGE_API_KEY"]
+  field :tinkoff_invest_api_key, type: :string, default: ENV["TINKOFF_INVEST_API_KEY"]
+
+  # Property valuation (AVM) provider API keys
+  field :rentcast_api_key, type: :string, default: ENV["RENTCAST_API_KEY"]
+  field :realie_api_key, type: :string, default: ENV["REALIE_API_KEY"]
 
   # Transparent encryption for API key fields.  The `field` macro defines the
   # raw getter/setter on the class.  By prepending this module we intercept
@@ -73,6 +78,9 @@ class Setting < RailsSettings::Base
       tiingo_api_key
       eodhd_api_key
       alpha_vantage_api_key
+      tinkoff_invest_api_key
+      rentcast_api_key
+      realie_api_key
       openai_access_token
       anthropic_access_token
       external_assistant_token
diff --git a/app/models/simplefin_account.rb b/app/models/simplefin_account.rb
index 049834667..55cc80a91 100644
--- a/app/models/simplefin_account.rb
+++ b/app/models/simplefin_account.rb
@@ -119,19 +119,13 @@ class SimplefinAccount < ApplicationRecord
     end
 
     def parse_balance_date(balance_date_value)
+      parsed = Simplefin::DateUtils.parse_provider_time(balance_date_value)
+      return parsed if parsed.present?
       return nil if balance_date_value.nil?
 
-      case balance_date_value
-      when String
-        Time.parse(balance_date_value)
-      when Numeric
-        Time.at(balance_date_value)
-      when Time, DateTime
-        balance_date_value
-      else
-        nil
-      end
-    rescue ArgumentError, TypeError
+      Rails.logger.warn("Invalid balance date for SimpleFin account: #{balance_date_value}")
+      nil
+    rescue ArgumentError, TypeError, NameError
       Rails.logger.warn("Invalid balance date for SimpleFin account: #{balance_date_value}")
       nil
     end
diff --git a/app/models/simplefin_account/transactions/processor.rb b/app/models/simplefin_account/transactions/processor.rb
index 12fc46fdd..87f448a35 100644
--- a/app/models/simplefin_account/transactions/processor.rb
+++ b/app/models/simplefin_account/transactions/processor.rb
@@ -52,6 +52,11 @@ class SimplefinAccount::Transactions::Processor
 
   private
 
+    # TODO: When SimpleFIN category matching is wired up (SimplefinAccount::Transactions::CategoryMatcher
+    # does not exist yet and this method is currently unused), apply the same
+    # `account&.enable_category_matcher?` guard used in PlaidEntry::Processor#matched_category,
+    # and include SimpleFIN in Account::Linkable#supports_category_matcher? so the toggle
+    # appears for SimpleFIN-linked accounts.
     def category_matcher
       @category_matcher ||= SimplefinAccount::Transactions::CategoryMatcher.new(family_categories)
     end
diff --git a/app/models/simplefin_entry/processor.rb b/app/models/simplefin_entry/processor.rb
index 7cb5f9da9..419fe14bc 100644
--- a/app/models/simplefin_entry/processor.rb
+++ b/app/models/simplefin_entry/processor.rb
@@ -10,7 +10,29 @@ class SimplefinEntry::Processor
     @shared_import_adapter = import_adapter
   end
 
+  # Pending detection: explicit flag OR inferred from posted=0 (epoch) + transacted_at.
+  # Public so callers like the prune_pending rake task share this definition instead of
+  # reimplementing it.
+  def self.pending?(simplefin_transaction)
+    data = simplefin_transaction.with_indifferent_access
+    return true if ActiveModel::Type::Boolean.new.cast(data[:pending])
+
+    posted_val = data[:posted]
+    transacted_val = data[:transacted_at]
+    # Compare against explicit zero representations (mirrors posted_date) rather than
+    # posted_val.to_i.zero?, which would also match non-numeric junk like "unavailable".
+    posted_is_epoch_zero = posted_val == 0 || posted_val == "0"
+    transacted_present = transacted_val.present? && transacted_val.to_i > 0
+    posted_is_epoch_zero && transacted_present
+  end
+
   def process
+    # Skip pending transactions when pending inclusion is disabled. Without this guard
+    # the SIMPLEFIN_INCLUDE_PENDING/syncs_include_pending setting only affects the API
+    # request, while pending rows already stored in raw_transactions_payload would still
+    # be (re)created here on every sync - including ones the user manually deleted.
+    return if pending? && !pending_enabled?
+
     import_adapter.import_transaction(
       external_id: external_id,
       amount: amount,
@@ -27,6 +49,23 @@ class SimplefinEntry::Processor
   private
     attr_reader :simplefin_transaction, :simplefin_account
 
+    # Whether pending transactions should be imported. Mirrors the resolution order used
+    # by SimplefinItem::Importer#fetch_accounts_data: env var (when set) over runtime Setting.
+    def pending_enabled?
+      if ENV["SIMPLEFIN_INCLUDE_PENDING"].present?
+        Rails.configuration.x.simplefin.include_pending
+      else
+        Setting.syncs_include_pending
+      end
+    end
+
+    # We only infer pending from posted=0, NOT from posted=nil/blank, because some
+    # providers omit posted dates even for settled transactions (which would cause
+    # false positives).
+    def pending?
+      self.class.pending?(data)
+    end
+
     def extra_metadata
       sf = {}
       # Preserve raw strings from provider so nothing is lost
@@ -36,27 +75,9 @@ class SimplefinEntry::Processor
       # Include provider-supplied extra hash if present
       sf["extra"] = data[:extra] if data[:extra].is_a?(Hash)
 
-      # Pending detection: explicit flag OR inferred from posted=0 + transacted_at
-      # SimpleFIN indicates pending via:
-      # 1. pending: true (explicit flag)
-      # 2. posted=0 (epoch zero) + transacted_at present (implicit - some banks use this pattern)
-      #
-      # Note: We only infer from posted=0, NOT from posted=nil/blank, because some providers
-      # don't supply posted dates even for settled transactions (would cause false positives).
-      # We always set the key (true or false) to ensure deep_merge overwrites any stale value
-      is_pending = if ActiveModel::Type::Boolean.new.cast(data[:pending])
-        true
-      else
-        # Infer pending ONLY when posted is explicitly 0 (epoch) AND transacted_at is present
-        # posted=nil/blank is NOT treated as pending (some providers omit posted for settled txns)
-        posted_val = data[:posted]
-        transacted_val = data[:transacted_at]
-        posted_is_epoch_zero = posted_val.present? && posted_val.to_i.zero?
-        transacted_present = transacted_val.present? && transacted_val.to_i > 0
-        posted_is_epoch_zero && transacted_present
-      end
-
-      if is_pending
+      # Pending detection handled by #pending?. We always set the key (true or false) to
+      # ensure deep_merge overwrites any stale value.
+      if pending?
         sf["pending"] = true
         Rails.logger.debug("SimpleFIN: flagged pending transaction #{external_id}")
       else
diff --git a/app/models/simplefin_item.rb b/app/models/simplefin_item.rb
index 4483393f4..ee09a8629 100644
--- a/app/models/simplefin_item.rb
+++ b/app/models/simplefin_item.rb
@@ -32,8 +32,7 @@ class SimplefinItem < ApplicationRecord
 
   # Get accounts from both new and legacy systems
   def accounts
-    # Preload associations to avoid N+1 queries
-    simplefin_accounts
+    @accounts ||= simplefin_accounts
       .includes(:account, account_provider: :account)
       .map(&:current_account)
       .compact
@@ -401,18 +400,36 @@ class SimplefinItem < ApplicationRecord
 
   # Check if the SimpleFin connection needs user attention
   def needs_attention?
-    requires_update? || stale_sync_status[:stale] || pending_account_setup?
+    setup_token_update_required? || stale_sync_status[:stale] || pending_account_setup?
   end
 
   # Get a summary of issues requiring attention
   def attention_summary
     issues = []
-    issues << "Connection needs update" if requires_update?
+    issues << "Connection needs update" if setup_token_update_required?
     issues << stale_sync_status[:message] if stale_sync_status[:stale]
     issues << "Accounts need setup" if pending_account_setup?
     issues
   end
 
+  # A SimpleFIN setup token is only needed when the bridge access URL appears
+  # unusable. If the latest sync returned accounts, the access URL still works;
+  # any auth warning in that response belongs to an individual institution.
+  def setup_token_update_required?(latest_sync: nil)
+    return false unless requires_update?
+
+    latest = latest_sync || syncs.ordered.first
+    return true unless latest
+    return false if latest.in_progress?
+
+    stats = parse_sync_stats(latest.sync_stats).to_h.stringify_keys
+    stats["total_accounts"].to_i.zero?
+  end
+
+  def effective_status(latest_sync: nil)
+    setup_token_update_required?(latest_sync: latest_sync) ? status : "good"
+  end
+
   # Get reconciled duplicates count from the last sync
   # Returns { count: N, message: "..." } or { count: 0 } if none
   def last_sync_reconciled_status
diff --git a/app/models/simplefin_item/importer.rb b/app/models/simplefin_item/importer.rb
index 450e7883e..f58af403d 100644
--- a/app/models/simplefin_item/importer.rb
+++ b/app/models/simplefin_item/importer.rb
@@ -46,9 +46,10 @@ class SimplefinItem::Importer
         import_regular_sync
       end
 
-      # Reset status to good if no auth errors occurred in this sync.
-      # This allows the item to recover automatically when a bank's auth issue is resolved
-      # in SimpleFIN Bridge, without requiring the user to manually reconnect.
+      # A successful import proves the SimpleFIN access URL still works, so clear
+      # any lingering item-level requires_update. Per-institution auth errors are
+      # recorded in sync stats but do not mean the access URL itself is dead; a
+      # dead access URL fails the fetch earlier and never reaches this line.
       maybe_clear_requires_update_status
 
       # Detect likely card-replacement scenarios (e.g., fraud replacement).
@@ -107,7 +108,7 @@ class SimplefinItem::Importer
         currency: (account_data[:currency].presence || account_data["currency"].presence || sfa.currency.presence || sfa.current_account&.currency.presence || simplefin_item.family&.currency.presence || "USD"),
         current_balance: account_data[:balance],
         available_balance: account_data[:"available-balance"],
-        balance_date: (account_data["balance-date"] || account_data[:"balance-date"]),
+        balance_date: normalize_balance_date(account_data["balance-date"] || account_data[:"balance-date"]),
         raw_payload: account_data,
         org_data: account_data[:org]
       )
@@ -353,19 +354,17 @@ class SimplefinItem::Importer
       )
     end
 
-    # Reset status to good if no auth errors occurred in this sync.
-    # This allows automatic recovery when a bank's auth issue is resolved in SimpleFIN Bridge.
+    # Reset status to good after a successful import. Per-institution auth
+    # errors are recorded in sync stats, but they do not mean the SimpleFIN
+    # access URL itself is dead.
     def maybe_clear_requires_update_status
       return unless simplefin_item.requires_update?
 
-      auth_errors = stats.dig("error_buckets", "auth").to_i
-      if auth_errors.zero?
-        simplefin_item.update!(status: :good)
-        Rails.logger.info(
-          "SimpleFIN: cleared requires_update status for item ##{simplefin_item.id} " \
-          "(no auth errors in this sync)"
-        )
-      end
+      simplefin_item.update!(status: :good)
+      Rails.logger.info(
+        "SimpleFIN: cleared requires_update status for item ##{simplefin_item.id} " \
+        "after successful import"
+      )
     end
 
     def import_with_chunked_history
@@ -734,6 +733,16 @@ class SimplefinItem::Importer
       simplefin_item.last_synced_at - sync_buffer_period.days
     end
 
+    def normalize_balance_date(value)
+      return nil if value.nil?
+
+      parsed = Simplefin::DateUtils.parse_provider_time(value)
+      return parsed if parsed.present?
+
+      Rails.logger.warn("Invalid balance date for SimpleFin importer: #{value.inspect}")
+      nil
+    end
+
     def import_account(account_data)
       account_id = account_data[:id].to_s
 
@@ -781,7 +790,7 @@ class SimplefinItem::Importer
         currency: (account_data[:currency].presence || account_data["currency"].presence || simplefin_account.currency.presence || simplefin_account.current_account&.currency.presence || simplefin_item.family&.currency.presence || "USD"),
         current_balance: account_data[:balance],
         available_balance: account_data[:"available-balance"],
-        balance_date: (account_data["balance-date"] || account_data[:"balance-date"]),
+        balance_date: normalize_balance_date(account_data["balance-date"] || account_data[:"balance-date"]),
         raw_payload: account_data,
         org_data: account_data[:org]
       }
diff --git a/app/models/simplefin_item/syncer.rb b/app/models/simplefin_item/syncer.rb
index 650ce4b69..b8e184653 100644
--- a/app/models/simplefin_item/syncer.rb
+++ b/app/models/simplefin_item/syncer.rb
@@ -120,14 +120,32 @@ class SimplefinItem::Syncer
     end
 
     def mark_completed(sync)
-      if sync.may_start?
-        sync.start!
+      # Re-read under a row lock before finalizing: this job holds an
+      # in-memory copy loaded before the run, and the sync may have been
+      # cancelled (Sync#request_cancel! finalized it to stale) or otherwise
+      # terminalized while the work ran. An unguarded complete! here would
+      # overwrite that terminal status and resurrect a cancelled sync.
+      finalized = sync.with_lock do
+        if sync.cancel_requested_at? || sync.terminal?
+          false
+        else
+          sync.start! if sync.may_start?
+          sync.complete! if sync.may_complete?
+          true
+        end
       end
-      if sync.may_complete?
-        sync.complete!
-      else
-        # If aasm not used, at least set status text
-        sync.update!(status: :completed) if sync.status != "completed"
+
+      unless finalized
+        DebugLogEntry.capture(
+          category: "provider_sync",
+          level: "info",
+          message: "SimplefinItem::Syncer#mark_completed skipped: sync was #{sync.status} (cancel requested: #{sync.cancel_requested_at.present?})",
+          source: self.class.name,
+          family: simplefin_item.family,
+          provider_key: "simplefin",
+          metadata: { sync_id: sync.id, status: sync.status, cancel_requested_at: sync.cancel_requested_at }
+        )
+        return
       end
 
       # After completion, compute and persist compact post-run stats for the summary panel
diff --git a/app/models/snaptrade_account.rb b/app/models/snaptrade_account.rb
index 54d6f2822..dd3cad25d 100644
--- a/app/models/snaptrade_account.rb
+++ b/app/models/snaptrade_account.rb
@@ -28,6 +28,25 @@ class SnaptradeAccount < ApplicationRecord
     linked_account
   end
 
+  # SnapTrade normalizes provider-specific account types into three categories.
+  # Keep this derived from the raw API payload so existing records immediately
+  # receive a sensible setup default without a data migration.
+  def suggested_account_type
+    payload = raw_payload.to_h.with_indifferent_access
+    raw_type = payload[:raw_type].presence || account_type
+
+    case payload[:account_category]
+    when "DEPOSIT"
+      "Depository"
+    when "LOC"
+      raw_type.to_s.gsub(/[^a-z]/i, "").downcase.include?("card") ? "CreditCard" : "Loan"
+    else
+      # SnapTrade documents INVESTMENT and an unknown category as investment
+      # accounts. The user may still select a more appropriate Sure type.
+      raw_type.to_s.match?(/crypto|bitcoin|ethereum|digital.?asset/i) ? "Crypto" : "Investment"
+    end
+  end
+
   # Ensure there is an AccountProvider link for this SnapTrade account and the given Account.
   # Safe and idempotent; returns the AccountProvider or nil if no account is provided.
   def ensure_account_provider!(account = nil)
@@ -151,10 +170,7 @@ class SnaptradeAccount < ApplicationRecord
   # multi-currency cash isn't discarded (issue #1809). Excludes the actual
   # primary currency — including the USD fallback — to avoid double-counting.
   def non_primary_cash_entries
-    entries = Array(raw_balances_payload).map do |entry|
-      entry.respond_to?(:with_indifferent_access) ? entry.with_indifferent_access : {}
-    end
-
+    entries = normalized_balance_entries
     primary_code = primary_cash_entry(entries)&.dig(:currency, :code)
 
     entries.filter_map do |e|
@@ -166,21 +182,57 @@ class SnaptradeAccount < ApplicationRecord
     end
   end
 
+  # Currency of the amount stored in cash_balance. upsert_balances! falls back
+  # to a USD (or first) balance entry when there is no entry in the account
+  # currency, so the stored cash is not guaranteed to be denominated in
+  # `currency` — cash adjustments must use this instead.
+  def primary_cash_currency
+    primary_cash_entry(normalized_balance_entries)&.dig(:currency, :code) || currency
+  end
+
+  # Total value of positions SnapTrade flags as `cash_equivalent` (usually
+  # money market / sweep funds such as Fidelity's SPAXX) held in the given
+  # currency. Per SnapTrade's docs, these positions are ALSO included in the
+  # balances endpoint's `cash` figure, so cash figures must have this value
+  # removed to avoid double counting the same money. The positions themselves
+  # are still imported as holdings by SnaptradeAccount::HoldingsProcessor.
+  def cash_equivalent_position_value(currency_code = currency)
+    Array(raw_holdings_payload).sum(BigDecimal("0")) do |holding|
+      data = holding.is_a?(Hash) ? holding.with_indifferent_access : {}
+      next BigDecimal("0") unless data[:cash_equivalent] == true
+
+      # Positions without currency metadata deliberately fall back to the
+      # ACCOUNT currency (not currency_code): that's where HoldingsProcessor
+      # books such a position as a holding, so it must be subtracted from that
+      # same bucket — using currency_code here would subtract the position
+      # from every caller's currency bucket.
+      position_currency = extract_currency(data, extract_symbol_data(data), currency)
+      next BigDecimal("0") unless position_currency == currency_code
+
+      units = parse_decimal(data[:units]) || BigDecimal("0")
+      price = parse_decimal(data[:price]) || BigDecimal("0")
+
+      units * price
+    end
+  end
+
   # Get the SnapTrade provider instance via the parent item
   def snaptrade_provider
     snaptrade_item.snaptrade_provider
   end
 
-  # Get SnapTrade credentials for API calls
-  def snaptrade_credentials
-    snaptrade_item.snaptrade_credentials
-  end
-
   private
 
+    def normalized_balance_entries
+      Array(raw_balances_payload).map do |entry|
+        entry.respond_to?(:with_indifferent_access) ? entry.with_indifferent_access : {}
+      end
+    end
+
     # Selects the primary cash entry from a list of indifferent-access balance
     # hashes: account currency first, then USD, then the first entry. Shared by
-    # upsert_balances! and non_primary_cash_entries so both stay in sync.
+    # upsert_balances!, non_primary_cash_entries, and primary_cash_currency so
+    # they stay in sync.
     def primary_cash_entry(entries)
       entries.find { |b| b.dig(:currency, :code) == currency } ||
         entries.find { |b| b.dig(:currency, :code) == "USD" } ||
diff --git a/app/models/snaptrade_account/activities_processor.rb b/app/models/snaptrade_account/activities_processor.rb
index 96b35cbb4..bcce37629 100644
--- a/app/models/snaptrade_account/activities_processor.rb
+++ b/app/models/snaptrade_account/activities_processor.rb
@@ -250,6 +250,15 @@ class SnaptradeAccount::ActivitiesProcessor
         amount.abs   # Money out should be positive in Sure
       when "CONTRIBUTION", "TRANSFER_IN", "DIVIDEND", "DIV", "INTEREST", "CASH"
         -amount.abs  # Money in should be negative in Sure
+      when "TRANSFER"
+        # Direction is not encoded in the type (unlike TRANSFER_IN/TRANSFER_OUT), so the
+        # provider's sign is the only directional signal available. SnapTrade signs these
+        # from the account's perspective (positive = money in), which is the inverse of
+        # Sure's convention, so invert it rather than passing it through unchanged.
+        # Passing it through stored a 401k contribution as a positive amount, which
+        # Entry#classification reads as an expense and ReverseCalculator reads as a
+        # value decrease — a correct current balance with a declining history (issue #2756).
+        -amount
       else
         amount
       end
diff --git a/app/models/snaptrade_account/data_helpers.rb b/app/models/snaptrade_account/data_helpers.rb
index c0f1d4c23..c542e5308 100644
--- a/app/models/snaptrade_account/data_helpers.rb
+++ b/app/models/snaptrade_account/data_helpers.rb
@@ -129,6 +129,14 @@ module SnaptradeAccount::DataHelpers
       end
     end
 
+    # SnapTrade positions nest the security data as holding.symbol.symbol
+    def extract_symbol_data(data)
+      symbol_wrapper = data[:symbol].is_a?(Hash) ? data[:symbol].with_indifferent_access : {}
+      raw_symbol_data = symbol_wrapper[:symbol]
+
+      raw_symbol_data.is_a?(Hash) ? raw_symbol_data.with_indifferent_access : {}
+    end
+
     def extract_currency(data, symbol_data = {}, fallback_currency = nil)
       currency_data = data[:currency] || data["currency"] || symbol_data[:currency] || symbol_data["currency"]
 
diff --git a/app/models/snaptrade_account/holdings_processor.rb b/app/models/snaptrade_account/holdings_processor.rb
index cb59932a0..f036a2007 100644
--- a/app/models/snaptrade_account/holdings_processor.rb
+++ b/app/models/snaptrade_account/holdings_processor.rb
@@ -48,6 +48,12 @@ class SnaptradeAccount::HoldingsProcessor
         amount = parse_decimal(entry[:amount])
         next if amount.nil?
 
+        # SnapTrade's per-currency cash includes money market / sweep funds
+        # that are also reported as `cash_equivalent: true` positions and
+        # imported as holdings — remove the overlap so the synthetic cash
+        # holding doesn't double count them.
+        amount -= @snaptrade_account.cash_equivalent_position_value(entry[:currency])
+
         security = Security.cash_for(account, currency: entry[:currency])
 
         Rails.logger.info "SnaptradeAccount::HoldingsProcessor - Importing #{entry[:currency]} cash holding"
diff --git a/app/models/snaptrade_account/processor.rb b/app/models/snaptrade_account/processor.rb
index 5b9b578fd..27e88e77a 100644
--- a/app/models/snaptrade_account/processor.rb
+++ b/app/models/snaptrade_account/processor.rb
@@ -57,7 +57,7 @@ class SnaptradeAccount::Processor
       total_balance = calculate_total_balance
       cash_balance = calculate_cash_balance
 
-      Rails.logger.info "SnaptradeAccount::Processor - Balance update: total=#{total_balance}, cash=#{cash_balance}"
+      Rails.logger.debug "SnaptradeAccount::Processor - Balance update: total=#{total_balance}, cash=#{cash_balance}"
 
       # Update the cached fields on the account
       account.assign_attributes(
@@ -81,16 +81,16 @@ class SnaptradeAccount::Processor
       # Calculate total from holdings + cash for accuracy
       # SnapTrade's current_balance can sometimes be stale or just the cash value
       holdings_value = calculate_holdings_value
-      cash_value = snaptrade_account.cash_balance || 0
+      cash_value = calculate_cash_balance
 
       calculated_total = holdings_value + cash_value
 
       # Use calculated total if we have holdings, otherwise trust API value
       if holdings_value > 0
-        Rails.logger.info "SnaptradeAccount::Processor - Using calculated total: holdings=#{holdings_value} + cash=#{cash_value} = #{calculated_total}"
+        Rails.logger.debug "SnaptradeAccount::Processor - Using calculated total: holdings=#{holdings_value} + cash=#{cash_value} = #{calculated_total}"
         calculated_total
       elsif snaptrade_account.current_balance.present?
-        Rails.logger.info "SnaptradeAccount::Processor - Using API total: #{snaptrade_account.current_balance}"
+        Rails.logger.debug "SnaptradeAccount::Processor - Using API total: #{snaptrade_account.current_balance}"
         snaptrade_account.current_balance
       else
         calculated_total
@@ -98,11 +98,54 @@ class SnaptradeAccount::Processor
     end
 
     def calculate_cash_balance
-      # Use SnapTrade's cash_balance directly
-      # Note: Can be negative for margin accounts
-      cash = snaptrade_account.cash_balance
-      Rails.logger.info "SnaptradeAccount::Processor - Cash balance from API: #{cash.inspect}"
-      cash || BigDecimal("0")
+      # Memoized: called for both the total and the cash figure, and the
+      # cash-equivalent exclusion should only be recorded once per sync.
+      @calculate_cash_balance ||= begin
+        # Note: Can be negative for margin accounts
+        cash = snaptrade_account.cash_balance
+        Rails.logger.debug "SnaptradeAccount::Processor - Cash balance from API: #{cash.inspect}"
+
+        if cash.nil?
+          BigDecimal("0")
+        else
+          # SnapTrade includes money market / sweep funds (e.g. Fidelity SPAXX) in
+          # the balances endpoint's `cash` figure while ALSO reporting them as
+          # positions with `cash_equivalent: true`. Those positions are imported as
+          # holdings, so their value must come out of cash here — otherwise the
+          # account total counts the same money twice. Subtract in the currency the
+          # stored cash is actually denominated in (upsert_balances! can fall back
+          # to a USD/first entry), not the account currency.
+          cash_currency = snaptrade_account.primary_cash_currency
+          cash_equivalent_value = snaptrade_account.cash_equivalent_position_value(cash_currency)
+
+          # No floor: negative cash is legitimate for margin accounts, and
+          # clamping would silently skew the calculated total. The before/after
+          # values in the debug entry let support distinguish real margin from
+          # a stale holdings snapshot over-subtracting.
+          adjusted_cash = cash - cash_equivalent_value
+
+          if cash_equivalent_value.nonzero?
+            DebugLogEntry.capture(
+              category: "provider_sync",
+              level: "info",
+              message: "Excluded cash-equivalent (money market) positions already counted in SnapTrade cash balance",
+              source: self.class.name,
+              provider_key: "snaptrade",
+              family: snaptrade_account.snaptrade_item.family,
+              account_provider: snaptrade_account.account_provider,
+              metadata: {
+                snaptrade_account_id: snaptrade_account.id,
+                currency: cash_currency,
+                cash_equivalent_value: cash_equivalent_value.to_s("F"),
+                cash_balance_before: cash.to_s("F"),
+                cash_balance_after: adjusted_cash.to_s("F")
+              }
+            )
+          end
+
+          adjusted_cash
+        end
+      end
     end
 
     def calculate_holdings_value
@@ -129,11 +172,4 @@ class SnaptradeAccount::Processor
         extract_currency(data, extract_symbol_data(data), snaptrade_account.currency)
       end.uniq
     end
-
-    def extract_symbol_data(data)
-      symbol_wrapper = data[:symbol].is_a?(Hash) ? data[:symbol].with_indifferent_access : {}
-      raw_symbol_data = symbol_wrapper[:symbol]
-
-      raw_symbol_data.is_a?(Hash) ? raw_symbol_data.with_indifferent_access : {}
-    end
 end
diff --git a/app/models/snaptrade_item.rb b/app/models/snaptrade_item.rb
index 367836e42..7b1094f1a 100644
--- a/app/models/snaptrade_item.rb
+++ b/app/models/snaptrade_item.rb
@@ -20,13 +20,11 @@ class SnaptradeItem < ApplicationRecord
     encrypts :client_id, deterministic: true
     encrypts :consumer_key, deterministic: true
     encrypts :snaptrade_user_secret
+    encrypts :oauth_access_token
+    encrypts :oauth_refresh_token
   end
 
   validates :name, presence: true
-  validates :client_id, presence: true, on: :create
-  validates :consumer_key, presence: true, on: :create
-  # Note: snaptrade_user_id and snaptrade_user_secret are populated after user registration
-  # via ensure_user_registered!, so we don't validate them on create
 
   belongs_to :family
   has_one_attached :logo, dependent: :purge_later
@@ -35,10 +33,10 @@ class SnaptradeItem < ApplicationRecord
   has_many :linked_accounts, through: :snaptrade_accounts
 
   scope :active, -> { where(scheduled_for_deletion: false) }
-  scope :credentials_configured, -> { active.where.not(client_id: [ nil, "" ]).where.not(consumer_key: [ nil, "" ]) }
-  # Syncable = active + fully configured (user registered with SnapTrade API)
-  # Items without user registration will fail sync, so exclude them from auto-sync
-  scope :syncable, -> { active.where.not(snaptrade_user_id: [ nil, "" ]).where.not(snaptrade_user_secret: [ nil, "" ]) }
+  # Syncable = active + authorized via OAuth (has an access token).
+  # oauth_access_token is non-deterministically encrypted, so it can only be
+  # queried with an IS NULL check (never persisted as "" -- see apply_oauth_tokens!).
+  scope :syncable, -> { active.where.not(oauth_access_token: nil) }
   scope :ordered, -> { order(created_at: :desc) }
   scope :needs_update, -> { where(status: :requires_update) }
 
@@ -50,13 +48,8 @@ class SnaptradeItem < ApplicationRecord
   def import_latest_snaptrade_data(sync: nil)
     provider = snaptrade_provider
     unless provider
-      Rails.logger.error "SnaptradeItem #{id} - Cannot import: provider is not configured"
-      raise StandardError, "SnapTrade provider is not configured"
-    end
-
-    unless user_registered?
-      Rails.logger.error "SnaptradeItem #{id} - Cannot import: user not registered"
-      raise StandardError, "SnapTrade user not registered"
+      Rails.logger.error "SnaptradeItem #{id} - Cannot import: OAuth not authorized"
+      raise StandardError, "SnapTrade is not authorized"
     end
 
     SnaptradeItem::Importer.new(self, snaptrade_provider: provider, sync: sync).import
@@ -117,6 +110,20 @@ class SnaptradeItem < ApplicationRecord
     save!
   end
 
+  # Persist an OAuth token payload (string keys, as returned by the token endpoint).
+  # A rotation response may omit refresh_token; keep the existing one in that case.
+  def apply_oauth_tokens!(payload)
+    raise ArgumentError, "OAuth token payload missing access_token" if payload["access_token"].blank?
+
+    update!(
+      oauth_access_token: payload["access_token"],
+      oauth_refresh_token: payload["refresh_token"].presence || oauth_refresh_token,
+      oauth_token_type: payload["token_type"].presence || oauth_token_type,
+      oauth_scope: payload["scope"].presence || oauth_scope,
+      oauth_token_expires_at: payload["expires_in"].present? ? Time.current + payload["expires_in"].to_i.seconds : oauth_token_expires_at
+    )
+  end
+
   def has_completed_initial_setup?
     # Setup is complete if we have any linked accounts
     accounts.any?
@@ -159,6 +166,10 @@ class SnaptradeItem < ApplicationRecord
                   .uniq { |inst| inst["name"] || inst["institution_name"] }
   end
 
+  def oauth_token_active?
+    oauth_access_token.present? && (oauth_token_expires_at.blank? || oauth_token_expires_at.future?)
+  end
+
   def institution_summary
     institutions = connected_institutions
     case institutions.count
@@ -171,19 +182,34 @@ class SnaptradeItem < ApplicationRecord
     end
   end
 
-  def credentials_configured?
-    client_id.present? && consumer_key.present?
+  def oauth_configured?
+    oauth_access_token.present?
+  end
+  alias_method :credentials_configured?, :oauth_configured?
+
+  def fully_configured?
+    oauth_configured?
   end
 
   # Override Syncable#syncing? to also show syncing state when activities are being
   # fetched in the background. This ensures the UI shows the spinner until all data
-  # is truly imported, not just when the main sync job completes.
+  # is truly imported, not just when the main sync job completes. Unlinked
+  # provider records are intentionally retained for relinking, so a stale fetch
+  # flag on one must not keep the whole connection in a syncing state.
   def syncing?
-    super || snaptrade_accounts.where(activities_fetch_pending: true).exists?
+    super || linked_snaptrade_accounts.where(activities_fetch_pending: true).exists?
   end
 
-  def fully_configured?
-    credentials_configured? && user_registered?
+  # Queue a fresh import after an in-flight item sync. This is needed when a
+  # user completes OAuth, adds a brokerage, or links an account midway through
+  # a sync: Syncable#sync_later intentionally reuses the in-flight Sync.
+  def sync_later_with_follow_up
+    active_sync = syncs.visible.ordered.first
+    sync_later
+
+    return unless active_sync&.reload&.in_progress?
+
+    SnaptradeFollowUpSyncJob.set(wait: SnaptradeFollowUpSyncJob::RETRY_DELAY).perform_later(self)
   end
 
   # Get accounts linked via AccountProvider
@@ -193,7 +219,7 @@ class SnaptradeItem < ApplicationRecord
 
   # Get all Sure accounts linked to this SnapTrade item
   def accounts
-    snaptrade_accounts
+    @accounts ||= snaptrade_accounts
       .includes(account_provider: :account)
       .filter_map { |sa| sa.current_account }
       .uniq
diff --git a/app/models/snaptrade_item/importer.rb b/app/models/snaptrade_item/importer.rb
index 478f6c3ac..967839fdf 100644
--- a/app/models/snaptrade_item/importer.rb
+++ b/app/models/snaptrade_item/importer.rb
@@ -18,22 +18,13 @@ class SnaptradeItem::Importer
     @sync = sync
   end
 
-  class CredentialsError < StandardError; end
-
   def import
     Rails.logger.info "SnaptradeItem::Importer - Starting import for item #{snaptrade_item.id}"
 
-    credentials = snaptrade_item.snaptrade_credentials
-    unless credentials
-      raise CredentialsError, "No SnapTrade credentials configured for item #{snaptrade_item.id}"
-    end
-
     # Step 1: Fetch and store all accounts
-    import_accounts(credentials)
+    import_accounts
 
     # Step 2: For LINKED accounts only, fetch holdings and activities
-    # Unlinked accounts just need basic info (name, balance) for the setup modal
-    # Query directly to avoid any association caching issues
     linked_accounts = SnaptradeAccount
       .where(snaptrade_item_id: snaptrade_item.id)
       .joins(:account_provider)
@@ -41,11 +32,9 @@ class SnaptradeItem::Importer
     Rails.logger.info "SnaptradeItem::Importer - Found #{linked_accounts.count} linked accounts to process"
 
     linked_accounts.each do |snaptrade_account|
-      Rails.logger.info "SnaptradeItem::Importer - Processing linked account #{snaptrade_account.id} (#{snaptrade_account.snaptrade_account_id})"
-      import_account_data(snaptrade_account, credentials)
+      import_account_data(snaptrade_account)
     end
 
-    # Update raw payload on the item
     snaptrade_item.upsert_snaptrade_snapshot!(stats)
   rescue Provider::Snaptrade::AuthenticationError => e
     snaptrade_item.update!(status: :requires_update)
@@ -58,13 +47,9 @@ class SnaptradeItem::Importer
     # get_account_activities returns a paginated object with .data accessor
     # This handles both paginated responses and plain arrays
     def extract_activities_from_response(response)
-      if response.respond_to?(:data)
-        # Paginated response (e.g., SnapTrade::PaginatedUniversalActivity)
-        Rails.logger.info "SnaptradeItem::Importer - Paginated response, extracting .data (#{response.data&.size || 0} items)"
-        response.data || []
+      if response.is_a?(Hash)
+        response["data"] || []
       elsif response.is_a?(Array)
-        # Direct array response
-        Rails.logger.info "SnaptradeItem::Importer - Array response (#{response.size} items)"
         response
       else
         Rails.logger.warn "SnaptradeItem::Importer - Unexpected response type: #{response.class}"
@@ -82,13 +67,10 @@ class SnaptradeItem::Importer
       sync.update_columns(sync_stats: merged)
     end
 
-    def import_accounts(credentials)
+    def import_accounts
       Rails.logger.info "SnaptradeItem::Importer - Fetching accounts"
 
-      accounts_data = snaptrade_provider.list_accounts(
-        user_id: credentials[:user_id],
-        user_secret: credentials[:user_secret]
-      )
+      accounts_data = snaptrade_provider.list_accounts
 
       stats["api_requests"] = stats.fetch("api_requests", 0) + 1
       stats["total_accounts"] = accounts_data.size
@@ -98,8 +80,8 @@ class SnaptradeItem::Importer
 
       accounts_data.each do |account_data|
         begin
-          import_account(account_data, credentials)
-          upstream_account_ids << account_data.id.to_s if account_data.id
+          import_account(account_data)
+          upstream_account_ids << account_data["id"].to_s if account_data["id"]
         rescue => e
           Rails.logger.error "SnaptradeItem::Importer - Failed to import account: #{e.message}"
           stats["accounts_skipped"] = stats.fetch("accounts_skipped", 0) + 1
@@ -113,28 +95,24 @@ class SnaptradeItem::Importer
       prune_removed_accounts(upstream_account_ids)
     end
 
-    def import_account(account_data, credentials)
+    def import_account(account_data)
       # Find or create the SnaptradeAccount by SnapTrade's account ID
-      snaptrade_account_id = account_data.id.to_s
+      snaptrade_account_id = account_data["id"].to_s
       return if snaptrade_account_id.blank?
 
       snaptrade_account = snaptrade_item.snaptrade_accounts.find_or_initialize_by(
         snaptrade_account_id: snaptrade_account_id
       )
 
-      # Update from API data - pass raw SDK object, model handles conversion
+      # Update from API data - pass raw hash, model handles conversion
       snaptrade_account.upsert_from_snaptrade!(account_data)
 
       # Fetch and store balances
       begin
-        balances = snaptrade_provider.get_balances(
-          user_id: credentials[:user_id],
-          user_secret: credentials[:user_secret],
-          account_id: snaptrade_account_id
-        )
+        balances = snaptrade_provider.get_balances(account_id: snaptrade_account_id)
         stats["api_requests"] = stats.fetch("api_requests", 0) + 1
 
-        # Pass raw SDK objects - model handles conversion
+        # Pass raw hashes - model handles conversion
         snaptrade_account.upsert_balances!(balances)
       rescue => e
         Rails.logger.warn "SnaptradeItem::Importer - Failed to fetch balances for account #{snaptrade_account_id}: #{e.message}"
@@ -143,26 +121,22 @@ class SnaptradeItem::Importer
       stats["accounts_imported"] = stats.fetch("accounts_imported", 0) + 1
     end
 
-    def import_account_data(snaptrade_account, credentials)
+    def import_account_data(snaptrade_account)
       snaptrade_account_id = snaptrade_account.snaptrade_account_id
       return if snaptrade_account_id.blank?
 
       # Import holdings
-      import_holdings(snaptrade_account, credentials)
+      import_holdings(snaptrade_account)
 
       # Import activities (chunked for history)
-      import_activities(snaptrade_account, credentials)
+      import_activities(snaptrade_account)
     end
 
-    def import_holdings(snaptrade_account, credentials)
+    def import_holdings(snaptrade_account)
       Rails.logger.info "SnaptradeItem::Importer - Fetching holdings for account #{snaptrade_account.id} (#{snaptrade_account.snaptrade_account_id})"
 
       begin
-        holdings = snaptrade_provider.get_positions(
-          user_id: credentials[:user_id],
-          user_secret: credentials[:user_secret],
-          account_id: snaptrade_account.snaptrade_account_id
-        )
+        holdings = snaptrade_provider.get_positions(account_id: snaptrade_account.snaptrade_account_id)
         stats["api_requests"] = stats.fetch("api_requests", 0) + 1
 
         Rails.logger.info "SnaptradeItem::Importer - Got #{holdings.size} holdings from API"
@@ -190,7 +164,7 @@ class SnaptradeItem::Importer
       end
     end
 
-    def import_activities(snaptrade_account, credentials)
+    def import_activities(snaptrade_account)
       Rails.logger.info "SnaptradeItem::Importer - Fetching activities for account #{snaptrade_account.id} (#{snaptrade_account.snaptrade_account_id})"
 
       # Determine date range for fetching activities
@@ -213,7 +187,7 @@ class SnaptradeItem::Importer
         # Respect user's sync_start_date floor
         start_date = [ start_date, user_sync_start ].compact.max
         Rails.logger.info "SnaptradeItem::Importer - Incremental activities fetch from #{start_date} (existing: #{existing_count})"
-        fetch_all_activities(snaptrade_account, credentials, start_date: start_date)
+        fetch_all_activities(snaptrade_account, start_date: start_date)
       else
         # Full history - use user's sync_start_date if set, otherwise first_transaction_date
         # Default to MAX_ACTIVITY_CHUNKS years ago to match chunk size
@@ -222,7 +196,7 @@ class SnaptradeItem::Importer
         Rails.logger.info "SnaptradeItem::Importer - Full history fetch from #{start_date} (user_sync_start: #{user_sync_start || 'none'}, first_tx_date: #{first_tx_date || 'unknown'}, existing: #{existing_count})"
 
         # Try to fetch activities synchronously first
-        fetched_count = fetch_all_activities(snaptrade_account, credentials, start_date: start_date)
+        fetched_count = fetch_all_activities(snaptrade_account, start_date: start_date)
 
         if fetched_count == 0 && existing_count == 0
           # On fresh connection, SnapTrade may need time to sync data from brokerage
@@ -278,7 +252,7 @@ class SnaptradeItem::Importer
 
     # Fetch all activities using per-account endpoint with proper date range
     # Uses get_account_activities which returns paginated data for the specific account
-    def fetch_all_activities(snaptrade_account, credentials, start_date:, end_date: nil)
+    def fetch_all_activities(snaptrade_account, start_date:, end_date: nil)
       # Ensure dates are proper Date objects (not strings or other types)
       start_date = ensure_date(start_date) || 5.years.ago.to_date
       end_date = ensure_date(end_date) || Date.current
@@ -289,8 +263,6 @@ class SnaptradeItem::Importer
       begin
         # Use get_account_activities (per-account endpoint) for better results
         response = snaptrade_provider.get_account_activities(
-          user_id: credentials[:user_id],
-          user_secret: credentials[:user_secret],
           account_id: snaptrade_account.snaptrade_account_id,
           start_date: start_date,
           end_date: end_date
@@ -309,7 +281,7 @@ class SnaptradeItem::Importer
         if activities_data.size < 10 && (end_date - start_date).to_i > 365
           Rails.logger.info "SnaptradeItem::Importer - Few results from per-account endpoint, trying cross-account endpoint"
           cross_account_activities = fetch_via_cross_account_endpoint(
-            snaptrade_account, credentials, start_date: start_date, end_date: end_date
+            snaptrade_account, start_date: start_date, end_date: end_date
           )
 
           if cross_account_activities.size > activities_data.size
@@ -337,10 +309,8 @@ class SnaptradeItem::Importer
     end
 
     # Fallback: try the cross-account endpoint which may work better for some brokerages
-    def fetch_via_cross_account_endpoint(snaptrade_account, credentials, start_date:, end_date:)
+    def fetch_via_cross_account_endpoint(snaptrade_account, start_date:, end_date:)
       activities = snaptrade_provider.get_activities(
-        user_id: credentials[:user_id],
-        user_secret: credentials[:user_secret],
         start_date: start_date,
         end_date: end_date,
         accounts: snaptrade_account.snaptrade_account_id
diff --git a/app/models/snaptrade_item/provided.rb b/app/models/snaptrade_item/provided.rb
index c8d104f43..8756cdd0c 100644
--- a/app/models/snaptrade_item/provided.rb
+++ b/app/models/snaptrade_item/provided.rb
@@ -2,177 +2,56 @@ module SnaptradeItem::Provided
   extend ActiveSupport::Concern
 
   included do
-    before_destroy :delete_snaptrade_user
+    before_destroy :revoke_oauth_tokens
   end
 
   def snaptrade_provider
-    return nil unless credentials_configured?
+    return nil unless oauth_configured?
 
-    Provider::Snaptrade.new(
-      client_id: client_id,
-      consumer_key: consumer_key
+    Provider::Snaptrade.new(self)
+  end
+
+  # Exchange an authorization code for tokens and mark the item usable.
+  def complete_oauth_exchange!(code:, redirect_uri:, code_verifier:)
+    payload = Provider::Snaptrade.exchange_code(
+      code: code,
+      redirect_uri: redirect_uri,
+      code_verifier: code_verifier
     )
-  end
-
-  # Clean up SnapTrade user when item is destroyed
-  def delete_snaptrade_user
-    return unless user_registered?
-
-    provider = snaptrade_provider
-    return unless provider
-
-    Rails.logger.info "SnapTrade: Deleting user #{snaptrade_user_id} for family #{family_id}"
-
-    provider.delete_user(user_id: snaptrade_user_id)
-
-    Rails.logger.info "SnapTrade: Successfully deleted user #{snaptrade_user_id}"
-  rescue => e
-    # Log but don't block deletion - user may not exist or credentials may be invalid
-    Rails.logger.warn "SnapTrade: Failed to delete user #{snaptrade_user_id}: #{e.class} - #{e.message}"
-  end
-
-  # User ID and secret for SnapTrade API calls
-  def snaptrade_credentials
-    return nil unless snaptrade_user_id.present? && snaptrade_user_secret.present?
-
-    {
-      user_id: snaptrade_user_id,
-      user_secret: snaptrade_user_secret
-    }
-  end
-
-  # Check if user is registered with SnapTrade
-  def user_registered?
-    snaptrade_user_id.present? && snaptrade_user_secret.present?
-  end
-
-  # Register user with SnapTrade if not already registered
-  # Returns true if registration succeeded or already registered
-  # If existing credentials are invalid (user was deleted), clears them and re-registers
-  def ensure_user_registered!
-    # If we think we're registered, verify the user still exists
-    if user_registered?
-      if verify_user_exists?
-        return true
-      else
-        # User was deleted from SnapTrade API - clear local credentials and re-register
-        Rails.logger.warn "SnapTrade: User #{snaptrade_user_id} no longer exists, clearing credentials and re-registering"
-        update!(snaptrade_user_id: nil, snaptrade_user_secret: nil)
-      end
-    end
-
-    provider = snaptrade_provider
-    raise StandardError, "SnapTrade provider not configured" unless provider
-
-    # Use family ID with current timestamp to ensure uniqueness (avoids conflicts from previous deletions)
-    unique_user_id = "family_#{family_id}_#{Time.current.to_i}"
-
-    Rails.logger.info "SnapTrade: Registering user #{unique_user_id} for family #{family_id}"
-
-    result = provider.register_user(unique_user_id)
-
-    Rails.logger.info "SnapTrade: Successfully registered user #{result[:user_id]}"
-
-    update!(
-      snaptrade_user_id: result[:user_id],
-      snaptrade_user_secret: result[:user_secret]
-    )
-
-    true
-  rescue Provider::Snaptrade::ApiError => e
-    Rails.logger.error "SnapTrade user registration failed: #{e.class} - #{e.message}"
-    # Log status code but not response_body to avoid credential exposure
-    Rails.logger.error "SnapTrade error details: status=#{e.status_code}" if e.respond_to?(:status_code)
-    Rails.logger.debug { "SnapTrade response body: #{e.response_body&.truncate(500)}" } if e.respond_to?(:response_body)
-
-    # Check if user already exists (shouldn't happen with timestamp suffix, but handle gracefully)
-    if e.message.include?("already registered") || e.message.include?("already exists")
-      Rails.logger.warn "SnapTrade: User already exists. Generating new unique ID."
-      raise StandardError, "User registration conflict. Please try again."
-    end
-
-    raise
-  end
-
-  # Verify that the stored user actually exists in SnapTrade
-  # Returns false if user doesn't exist, credentials are invalid, or verification fails
-  def verify_user_exists?
-    return false unless snaptrade_user_id.present?
-
-    provider = snaptrade_provider
-    return false unless provider
-
-    # Try to list connections - this will fail with 401/403 if user doesn't exist
-    provider.list_connections(
-      user_id: snaptrade_user_id,
-      user_secret: snaptrade_user_secret
-    )
-    true
-  rescue Provider::Snaptrade::AuthenticationError => e
-    Rails.logger.warn "SnapTrade: User verification failed - #{e.message}"
-    false
-  rescue Provider::Snaptrade::ApiError => e
-    # Return false on API errors - caller can retry registration if needed
-    Rails.logger.warn "SnapTrade: User verification error - #{e.message}"
-    false
+    apply_oauth_tokens!(payload)
+    update!(status: :good)
+    payload
   end
 
   # Get the connection portal URL for linking brokerages
   def connection_portal_url(redirect_url:, broker: nil)
-    raise StandardError, "User not registered with SnapTrade" unless user_registered?
-
     provider = snaptrade_provider
-    raise StandardError, "SnapTrade provider not configured" unless provider
+    raise StandardError, "SnapTrade is not authorized" unless provider
 
-    provider.get_connection_url(
-      user_id: snaptrade_user_id,
-      user_secret: snaptrade_user_secret,
-      redirect_url: redirect_url,
-      broker: broker
-    )
+    provider.get_connection_url(redirect_url: redirect_url, broker: broker)
   end
 
-  # Fetch all brokerage connections from SnapTrade API
-  # Returns array of connection objects
+  # Fetch all brokerage connections from SnapTrade API. Returns Array<Hash>.
   def fetch_connections
-    return [] unless credentials_configured? && user_registered?
-
     provider = snaptrade_provider
-    creds = snaptrade_credentials
-    provider.list_connections(user_id: creds[:user_id], user_secret: creds[:user_secret])
+    return [] unless provider
+
+    provider.list_connections
   rescue Provider::Snaptrade::ApiError => e
     Rails.logger.error "SnaptradeItem #{id} - Failed to list connections: #{e.message}"
     raise
   end
 
-  # List all SnapTrade users registered under this client ID
-  def list_all_users
-    return [] unless credentials_configured?
+  private
 
-    snaptrade_provider.list_users
-  rescue Provider::Snaptrade::ApiError => e
-    Rails.logger.error "SnaptradeItem #{id} - Failed to list users: #{e.message}"
-    []
-  end
+    # Best-effort token revocation when the item is destroyed.
+    def revoke_oauth_tokens
+      token = oauth_refresh_token.presence || oauth_access_token
+      return if token.blank?
 
-  # Find orphaned SnapTrade users (registered but not current user)
-  def orphaned_users
-    return [] unless credentials_configured? && user_registered?
-
-    all_users = list_all_users
-    all_users.select { |uid| uid != snaptrade_user_id && uid.start_with?("family_#{family_id}_") }
-  end
-
-  # Delete an orphaned SnapTrade user and all their connections
-  def delete_orphaned_user(user_id)
-    return false unless credentials_configured?
-    return false if user_id == snaptrade_user_id # Don't delete current user
-    return false unless user_id.start_with?("family_#{family_id}_")
-
-    snaptrade_provider.delete_user(user_id: user_id)
-    true
-  rescue Provider::Snaptrade::ApiError => e
-    Rails.logger.error "SnaptradeItem #{id} - Failed to delete orphaned user #{user_id}: #{e.message}"
-    false
-  end
+      Provider::Snaptrade.revoke_token(token: token)
+    rescue => e
+      # Never block deletion on revocation failures
+      Rails.logger.warn "SnapTrade: Failed to revoke tokens for item #{id}: #{e.class} - #{e.message}"
+    end
 end
diff --git a/app/models/snaptrade_item/syncer.rb b/app/models/snaptrade_item/syncer.rb
index 7e69a967f..02118f9e8 100644
--- a/app/models/snaptrade_item/syncer.rb
+++ b/app/models/snaptrade_item/syncer.rb
@@ -10,9 +10,9 @@ class SnaptradeItem::Syncer
   def perform_sync(sync)
     Rails.logger.info "SnaptradeItem::Syncer - Starting sync for item #{snaptrade_item.id}"
 
-    # Verify user is registered
-    unless snaptrade_item.user_registered?
-      raise StandardError, "User not registered with SnapTrade"
+    # Verify the item is authorized
+    unless snaptrade_item.oauth_configured?
+      raise StandardError, "SnapTrade is not authorized"
     end
 
     # Phase 1: Import data from SnapTrade API
@@ -45,6 +45,7 @@ class SnaptradeItem::Syncer
     end
 
     # Mark sync health
+    snaptrade_item.update!(status: :good) if snaptrade_item.requires_update?
     collect_health_stats(sync, errors: nil)
   rescue Provider::Snaptrade::AuthenticationError => e
     snaptrade_item.update!(status: :requires_update)
diff --git a/app/models/sophtron_entry/processor.rb b/app/models/sophtron_entry/processor.rb
index 2ca30c124..6b57ac736 100644
--- a/app/models/sophtron_entry/processor.rb
+++ b/app/models/sophtron_entry/processor.rb
@@ -210,12 +210,15 @@ class SophtronEntry::Processor
     def date
       case data[:date]
       when String
-        Date.parse(data[:date])
+        if data[:date].include?("T") || data[:date].include?(":")
+          Time.parse(data[:date]).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(data[:date])
+        end
       when Integer, Float
-        # Unix timestamp
-        Time.at(data[:date]).to_date
+        Time.at(data[:date]).in_time_zone(account&.family&.timezone).to_date
       when Time, DateTime
-        data[:date].to_date
+        data[:date].in_time_zone(account&.family&.timezone).to_date
       when Date
         data[:date]
       else
diff --git a/app/models/sure_import.rb b/app/models/sure_import.rb
index 0fab88a27..096b3771d 100644
--- a/app/models/sure_import.rb
+++ b/app/models/sure_import.rb
@@ -1,5 +1,10 @@
 class SureImport < Import
-  MAX_NDJSON_SIZE = 10.megabytes
+  NotPublishableError = Class.new(StandardError)
+  PreflightError = Class.new(StandardError)
+
+  DEFAULT_MAX_NDJSON_SIZE_MB = 10
+  DEFAULT_MAX_ROW_COUNT = 100_000
+  MAX_NDJSON_SIZE = DEFAULT_MAX_NDJSON_SIZE_MB.megabytes
   IMPORTABLE_NDJSON_TYPES = {
     "Account" => :accounts,
     "Balance" => :balances,
@@ -30,11 +35,11 @@ class SureImport < Import
 
   class << self
     def max_row_count
-      100_000
+      positive_integer_env("SURE_IMPORT_MAX_ROWS", DEFAULT_MAX_ROW_COUNT)
     end
 
     def max_ndjson_size
-      MAX_NDJSON_SIZE
+      positive_integer_env("SURE_IMPORT_MAX_NDJSON_SIZE_MB", DEFAULT_MAX_NDJSON_SIZE_MB).megabytes
     end
 
     # Counts JSON lines by top-level "type" (used for dry-run summaries and row limits).
@@ -90,6 +95,12 @@ class SureImport < Import
         false
       end
     end
+
+    private
+      def positive_integer_env(name, default)
+        value = ENV[name].to_i
+        value.positive? ? value : default
+      end
   end
 
   def requires_csv_workflow?
@@ -118,21 +129,64 @@ class SureImport < Import
     self.class.dry_run_totals_from_ndjson(ndjson_blob_string)
   end
 
-  def import!
+  def import!(import_session: nil)
     sync_ndjson_counts!
     before_counts = readback_count_snapshot
-    importer = Family::DataImporter.new(family, ndjson_blob_string)
+    importer = Family::DataImporter.new(family, ndjson_blob_string, import_session: import_session, import: self)
     result = importer.import!
 
-    result[:accounts].each { |account| accounts << account }
-    result[:entries].each { |entry| entries << entry }
+    Import.transaction do
+      result[:accounts].each { |account| account.save! if account.new_record? }
+      result[:entries].each { |entry| entry.save! if entry.new_record? }
+
+      account_ids = result[:accounts].filter_map(&:id)
+      entry_ids = result[:entries].filter_map(&:id)
+      existing_account_ids = accounts.where(id: account_ids).pluck(:id)
+      existing_entry_ids = entries.where(id: entry_ids).pluck(:id)
+
+      accounts.concat(result[:accounts].reject { |account| existing_account_ids.include?(account.id) })
+      entries.concat(result[:entries].reject { |entry| existing_entry_ids.include?(entry.id) })
+      update!(summary: result[:summary]) if has_attribute?(:summary)
+    end
 
     record_readback_verification!(before_counts:)
+    result
   rescue => error
     record_failed_readback_verification!(before_counts:, error:)
     raise
   end
 
+  def publish_later
+    raise MaxRowCountExceededError if row_count_exceeded?
+
+    validate_sure_preflight!
+    raise NotPublishableError, "Import was uploaded but has no publishable records." unless publishable?
+
+    previous_status = status
+    update! status: :importing
+
+    begin
+      ImportJob.perform_later(self)
+    rescue StandardError
+      update! status: previous_status
+      raise
+    end
+  end
+
+  def publish
+    raise MaxRowCountExceededError if row_count_exceeded?
+
+    validate_sure_preflight!
+
+    import!
+
+    family.sync_later
+
+    update! status: :complete
+  rescue StandardError => error
+    update! status: :failed, error: error.message
+  end
+
   def uploaded?
     return false unless ndjson_file.attached?
 
@@ -163,6 +217,13 @@ class SureImport < Import
     self.class.max_row_count
   end
 
+  def sure_preflight
+    SureImport::Preflight.new(
+      family: family,
+      content: ndjson_blob_string
+    ).call
+  end
+
   # Row total for max-row enforcement (counts every parsed line with a "type", including unsupported types).
   def sync_ndjson_rows_count!
     return unless ndjson_file.attached?
@@ -302,4 +363,12 @@ class SureImport < Import
       @ndjson_blob_id = blob_id
       @ndjson_blob_string = ndjson_file.download.force_encoding(Encoding::UTF_8)
     end
+
+    def validate_sure_preflight!
+      result = sure_preflight
+      return if result.valid?
+
+      update! status: :failed, error: result.error_message
+      raise PreflightError, result.error_message
+    end
 end
diff --git a/app/models/sure_import/preflight.rb b/app/models/sure_import/preflight.rb
new file mode 100644
index 000000000..d12eac05c
--- /dev/null
+++ b/app/models/sure_import/preflight.rb
@@ -0,0 +1,312 @@
+# frozen_string_literal: true
+
+require "set"
+
+class SureImport::Preflight
+  Result = Struct.new(:errors, :warnings, :stats, keyword_init: true) do
+    def valid? = errors.empty?
+    def error_messages = errors.map { |error| error[:message] }
+    def error_message = valid? ? "" : ([ "Sure import preflight failed:" ] + error_messages).join("\n")
+    def payload = { valid: valid?, stats: stats, errors: errors, warnings: warnings }
+  end
+
+  REQUIRED_FIELDS = {
+    "Account" => %w[id name balance accountable_type],
+    "Balance" => %w[account_id date balance],
+    "Category" => %w[id name],
+    "Tag" => %w[id name],
+    "Merchant" => %w[id name],
+    "RecurringTransaction" => %w[id amount expected_day_of_month last_occurrence_date next_expected_date],
+    "Transaction" => %w[id account_id date amount],
+    "Transfer" => %w[inflow_transaction_id outflow_transaction_id],
+    "RejectedTransfer" => %w[inflow_transaction_id outflow_transaction_id],
+    "Trade" => %w[account_id date amount qty price ticker],
+    "Holding" => %w[account_id date amount qty price ticker],
+    "Valuation" => %w[account_id date amount],
+    "Budget" => %w[id start_date end_date],
+    "BudgetCategory" => %w[budget_id category_id],
+    "Rule" => %w[name]
+  }.freeze
+
+  TAXONOMY_TYPES = { "Category" => :categories, "Tag" => :tags, "Merchant" => :merchants }.freeze
+
+  SOURCE_ID_TYPES = TAXONOMY_TYPES.merge(
+    "Account" => :accounts,
+    "RecurringTransaction" => :recurring_transactions,
+    "Transaction" => :transactions,
+    "Budget" => :budgets
+  ).freeze
+
+  REFERENCE_FIELDS = {
+    "Balance" => { accounts: %w[account_id] },
+    "Category" => { categories: %w[parent_id] },
+    "RecurringTransaction" => { accounts: %w[account_id], merchants: %w[merchant_id] },
+    "Transaction" => { accounts: %w[account_id], categories: %w[category_id], merchants: %w[merchant_id] },
+    "Transfer" => { transactions: %w[inflow_transaction_id outflow_transaction_id] },
+    "RejectedTransfer" => { transactions: %w[inflow_transaction_id outflow_transaction_id] },
+    "Trade" => { accounts: %w[account_id] },
+    "Holding" => { accounts: %w[account_id] },
+    "Valuation" => { accounts: %w[account_id] },
+    "BudgetCategory" => { budgets: %w[budget_id], categories: %w[category_id] }
+  }.freeze
+
+  def initialize(family:, content:)
+    @family = family
+    @content = content.to_s
+    @errors = []
+    @warnings = []
+    @line_counts = Hash.new(0)
+    @records = Hash.new { |hash, key| hash[key] = [] }
+    @source_ids = Hash.new { |hash, key| hash[key] = Set.new }
+    @source_id_locations = Hash.new { |hash, key| hash[key] = Hash.new { |ids, id| ids[id] = [] } }
+    @rows_count = 0
+    @valid_rows_count = 0
+  end
+
+  def call
+    parse_records
+    validate_taxonomy_collisions
+    validate_duplicate_taxonomy_names
+    validate_duplicate_source_ids
+    validate_required_fields
+    validate_accountables
+    validate_split_lines
+    validate_references
+    validate_duplicate_valuations
+    Result.new(
+      errors: @errors,
+      warnings: @warnings,
+      stats: {
+        rows_count: @rows_count,
+        valid_rows_count: @valid_rows_count,
+        invalid_rows_count: @rows_count - @valid_rows_count,
+        entity_counts: SureImport.dry_run_totals_from_line_type_counts(@line_counts),
+        record_type_counts: @line_counts
+      }
+    )
+  end
+
+  private
+    attr_reader :family
+
+    def parse_records
+      @content.each_line.with_index(1) do |line, line_number|
+        next if line.strip.blank?
+        @rows_count += 1
+        record = JSON.parse(line)
+        unless record.is_a?(Hash)
+          add_error(:invalid_ndjson_record, "Line #{line_number} must be a JSON object.")
+          next
+        end
+
+        type = record["type"]
+        data = record["data"]
+        if type.blank? || !record.key?("data")
+          add_error(:invalid_ndjson_record, "Line #{line_number} must include type and data.")
+          next
+        end
+
+        @line_counts[type] += 1
+        unless Family::DataImporter::SUPPORTED_TYPES.include?(type)
+          add_error(:unsupported_record_type, "Line #{line_number} has unsupported record type #{type}.")
+          next
+        end
+
+        unless data.is_a?(Hash)
+          add_error(:invalid_ndjson_record, "Line #{line_number} data must be a JSON object.")
+          next
+        end
+
+        @valid_rows_count += 1
+        @records[type] << { line_number: line_number, data: data }
+        mapping_key = SOURCE_ID_TYPES[type]
+        track_source_id(mapping_key, data["id"], "Line #{line_number} #{type}") if mapping_key && data["id"].present?
+        add_split_line_source_ids(data, line_number) if type == "Transaction"
+      rescue JSON::ParserError => e
+        add_error(:invalid_json, "Line #{line_number} is not valid JSON: #{e.message}")
+      end
+
+      add_error(:no_data_rows, "No data rows were found.") if @rows_count.zero?
+    end
+
+    def track_source_id(mapping_key, id, location)
+      id = id.to_s
+      @source_ids[mapping_key].add(id)
+      @source_id_locations[mapping_key][id] << location
+    end
+
+    def add_split_line_source_ids(data, line_number)
+      split_lines = split_lines_value(data)
+      return unless split_lines.is_a?(Array)
+      split_lines.each_with_index do |split_line, index|
+        next unless split_line.is_a?(Hash) && split_line["id"].present?
+        track_source_id(:transactions, split_line["id"], "Line #{line_number} Transaction split line #{index + 1}")
+      end
+    end
+
+    def validate_taxonomy_collisions
+      TAXONOMY_TYPES.each do |type, association|
+        existing_names = family.public_send(association).pluck(:name).to_set
+        @records[type].each do |record|
+          name = record[:data]["name"].to_s
+          next if name.blank? || !existing_names.include?(name)
+          add_error(
+            :existing_taxonomy_collision,
+            "Line #{record[:line_number]} #{type} name #{name.inspect} already exists in this family."
+          )
+        end
+      end
+    end
+
+    def validate_duplicate_taxonomy_names
+      TAXONOMY_TYPES.each_key do |type|
+        grouped = @records[type].group_by { |record| record[:data]["name"].to_s }
+        grouped.each do |name, records|
+          next if name.blank? || records.one?
+          lines = records.map { |record| record[:line_number] }.join(", ")
+          add_error(:duplicate_taxonomy_name, "#{type} name #{name.inspect} appears more than once in the NDJSON on lines #{lines}.")
+        end
+      end
+    end
+
+    def validate_duplicate_source_ids
+      @source_id_locations.each do |mapping_key, ids|
+        ids.each do |id, locations|
+          next if locations.one?
+          add_error(
+            :duplicate_source_id,
+            "#{mapping_key.to_s.singularize.tr('_', ' ')} source id #{id.inspect} appears more than once (#{locations.join(', ')})."
+          )
+        end
+      end
+    end
+
+    def validate_required_fields
+      @records.each do |type, records|
+        required_fields = REQUIRED_FIELDS.fetch(type, [])
+        records.each do |record|
+          missing = required_fields.select { |field| blank_required_value?(record[:data][field]) }
+          next if missing.empty?
+          add_error(:missing_required_fields, "Line #{record[:line_number]} #{type} is missing required field(s): #{missing.join(', ')}.")
+        end
+      end
+    end
+
+    def validate_accountables
+      @records["Account"].each do |record|
+        data = record[:data]
+        accountable_type = data["accountable_type"].to_s
+        accountable_class = Family::DataImporter.accountable_class_for(accountable_type)
+        unless accountable_class
+          add_error(:invalid_accountable_type, "Line #{record[:line_number]} Account has invalid accountable_type #{accountable_type.inspect}.")
+          next
+        end
+
+        subtype = data.dig("accountable", "subtype").presence || data["subtype"].presence
+        next if subtype.blank?
+        subtype_map = accountable_class.const_defined?(:SUBTYPES) ? accountable_class::SUBTYPES : {}
+        next if subtype_map.blank? || subtype_map.key?(subtype)
+        add_error(:invalid_accountable_subtype, "Line #{record[:line_number]} Account has invalid #{accountable_type} subtype #{subtype.inspect}.")
+      end
+    end
+
+    def validate_split_lines
+      @records["Transaction"].each do |record|
+        split_lines = split_lines_value(record[:data])
+        next if split_lines.blank?
+        unless split_lines.is_a?(Array)
+          add_error(:invalid_split_lines, "Line #{record[:line_number]} Transaction split_lines must be an array.")
+          next
+        end
+
+        complete_amounts = true
+        split_lines.each_with_index do |split_line, index|
+          unless split_line.is_a?(Hash)
+            add_error(:invalid_split_line, "Line #{record[:line_number]} Transaction split line #{index + 1} must be a JSON object.")
+            complete_amounts = false
+            next
+          end
+
+          next unless blank_required_value?(split_line_amount(split_line))
+          add_error(:missing_required_fields, "Line #{record[:line_number]} Transaction split line #{index + 1} is missing required field(s): amount.")
+          complete_amounts = false
+        end
+
+        validate_split_line_total(record, split_lines) if complete_amounts && record[:data]["amount"].present?
+      end
+    end
+
+    def validate_split_line_total(record, split_lines)
+      expected_amount = record[:data]["amount"].to_d
+      split_total = split_lines.sum { |split_line| split_line_amount(split_line).to_d }
+      return if split_total == expected_amount
+      add_error(
+        :split_amount_mismatch,
+        "Line #{record[:line_number]} Transaction split line amounts must sum to transaction amount #{expected_amount.to_s('F')} but sum to #{split_total.to_s('F')}."
+      )
+    end
+
+    def validate_references
+      @records.each do |type, records|
+        reference_fields = REFERENCE_FIELDS.fetch(type, {})
+        records.each do |record|
+          reference_fields.each do |mapping_key, fields|
+            fields.each do |field|
+              validate_reference(record, type, mapping_key, field, record[:data][field])
+            end
+          end
+
+          validate_tag_references(record, type)
+          validate_split_line_references(record) if type == "Transaction"
+        end
+      end
+    end
+
+    def validate_reference(record, type, mapping_key, field, value)
+      return if value.blank?
+      return if @source_ids[mapping_key].include?(value.to_s)
+      add_error(:missing_reference, "Line #{record[:line_number]} #{type} references missing #{field} #{value.inspect}.")
+    end
+
+    def validate_tag_references(record, type)
+      Array(record[:data]["tag_ids"]).each do |tag_id|
+        validate_reference(record, type, :tags, "tag_ids", tag_id)
+      end
+    end
+
+    def validate_split_line_references(record)
+      split_lines = split_lines_value(record[:data])
+      return unless split_lines.is_a?(Array)
+      Array(split_lines).each do |split_line|
+        next unless split_line.is_a?(Hash)
+        validate_reference(record, "Transaction split line", :categories, "category_id", split_line["category_id"])
+        validate_reference(record, "Transaction split line", :merchants, "merchant_id", split_line["merchant_id"])
+        Array(split_line["tag_ids"]).each do |tag_id|
+          validate_reference(record, "Transaction split line", :tags, "tag_ids", tag_id)
+        end
+      end
+    end
+
+    def split_lines_value(data) = data["split_lines"].presence || data["splitLines"].presence || data["splits"].presence
+
+    def split_line_amount(split_line) = split_line["amount"] || split_line["amount_money"] || split_line["amount_decimal"]
+
+    def validate_duplicate_valuations
+      seen = {}
+      @records["Valuation"].each do |record|
+        account_id = record[:data]["account_id"]
+        date = record[:data]["date"]
+        next if account_id.blank? || date.blank?
+        key = [ account_id.to_s, date.to_s ]
+        if seen.key?(key)
+          add_error(:duplicate_valuation, "Line #{record[:line_number]} duplicates valuation for account #{account_id.inspect} on #{date}; first seen on line #{seen[key]}.")
+        else
+          seen[key] = record[:line_number]
+        end
+      end
+    end
+
+    def blank_required_value?(value) = value.blank?
+
+    def add_error(code, message) = @errors << { code: code.to_s, message: message }
+end
diff --git a/app/models/sync.rb b/app/models/sync.rb
index 83cb439ce..310c43e55 100644
--- a/app/models/sync.rb
+++ b/app/models/sync.rb
@@ -17,9 +17,11 @@ class Sync < ApplicationRecord
 
   scope :ordered, -> { order(created_at: :desc, id: :desc) }
   scope :incomplete, -> { where("syncs.status IN (?)", %w[pending syncing]) }
-  scope :visible, -> { incomplete.where("syncs.created_at > ?", VISIBLE_FOR.ago) }
+  # Cancel-requested syncs are excluded so spinners clear immediately and
+  # sync_later stops piggybacking new requests onto a dying sync.
+  scope :visible, -> { incomplete.where("syncs.created_at > ?", VISIBLE_FOR.ago).where(cancel_requested_at: nil) }
 
-  after_commit :update_family_sync_timestamp
+  after_commit :update_family_sync_timestamp, on: [ :create, :update ]
 
   serialize :sync_stats, coder: JSON
 
@@ -71,6 +73,57 @@ class Sync < ApplicationRecord
       query
     end
 
+    def for_syncables(syncables)
+      syncables = Array(syncables).compact
+      return none if syncables.empty?
+
+      scope = none
+      syncables.group_by { |record| record.class.base_class.name }.each do |type, records|
+        ids = records.map(&:id)
+        scope = scope.or(where(syncable_type: type, syncable_id: ids))
+      end
+      scope
+    end
+
+    def latest_by_syncable(syncables)
+      keyed_syncables = syncable_keys(syncables)
+      return {} if keyed_syncables.empty?
+
+      latest = for_syncables(syncables)
+        .select("DISTINCT ON (syncable_type, syncable_id) syncs.*")
+        .order("syncable_type, syncable_id, created_at DESC, id DESC")
+        .includes(:children)
+        .index_by { |sync| [ sync.syncable_type, sync.syncable_id ] }
+
+      keyed_syncables.index_with { |key| latest[key] }
+    end
+
+    def latest_completed_by_syncable(syncables)
+      keyed_syncables = syncable_keys(syncables)
+      return {} if keyed_syncables.empty?
+
+      latest = for_syncables(syncables)
+        .completed
+        .select("DISTINCT ON (syncable_type, syncable_id) syncs.*")
+        .order("syncable_type, syncable_id, created_at DESC, id DESC")
+        .index_by { |sync| [ sync.syncable_type, sync.syncable_id ] }
+
+      keyed_syncables.index_with { |key| latest[key] }
+    end
+
+    def syncing_by_syncable(syncables)
+      keyed_syncables = syncable_keys(syncables)
+      return {} if keyed_syncables.empty?
+
+      syncing_keys = for_syncables(syncables)
+        .visible
+        .distinct
+        .pluck(:syncable_type, :syncable_id)
+        .to_set
+
+      keyed_syncables.index_with { |key| syncing_keys.include?(key) }
+    end
+
     # True iff the family has any pending/syncing Sync — across its own row,
     # its accounts, and every Syncable provider `*_items` association. Built
     # on `for_family` so new provider integrations are picked up automatically
@@ -80,6 +133,11 @@ class Sync < ApplicationRecord
     end
 
     private
+      def syncable_keys(syncables)
+        Array(syncables).compact.uniq { |record| [ record.class.base_class.name, record.id ] }
+          .map { |record| [ record.class.base_class.name, record.id ] }
+      end
+
       def account_syncable_ids(family, resource_owner)
         (resource_owner ? resource_owner.accessible_accounts : family.accounts)
           .where(family_id: family.id)
@@ -100,6 +158,11 @@ class Sync < ApplicationRecord
     pending? || syncing?
   end
 
+  # Mirrors the `visible` scope for in-memory checks on preloaded syncs.
+  def visible?
+    in_progress? && created_at > VISIBLE_FOR.ago
+  end
+
   def terminal?
     completed? || failed? || stale?
   end
@@ -125,7 +188,7 @@ class Sync < ApplicationRecord
       unless syncable.present?
         Rails.logger.warn("Sync #{id} - syncable #{syncable_type}##{syncable_id} no longer exists. Marking as failed.")
         start! if may_start?
-        fail!
+        fail! if may_fail?
         update(error: "Syncable record was deleted")
         return
       end
@@ -134,7 +197,7 @@ class Sync < ApplicationRecord
       if syncable.respond_to?(:scheduled_for_deletion?) && syncable.scheduled_for_deletion?
         Rails.logger.warn("Sync #{id} - syncable #{syncable_type}##{syncable_id} is scheduled for deletion. Skipping sync.")
         start! if may_start?
-        fail!
+        fail! if may_fail?
         update(error: "Syncable record is scheduled for deletion")
         return
       end
@@ -144,7 +207,11 @@ class Sync < ApplicationRecord
       begin
         syncable.perform_sync(self)
       rescue => e
-        fail!
+        # Re-check state under a row lock (with_lock reloads): the sync may
+        # have been terminalized externally (marked stale by SyncCleanerJob)
+        # while this job was still running. An unguarded fail! on the in-memory
+        # record would silently overwrite that terminal status.
+        with_lock { fail! if may_fail? }
         update(error: e.message)
         report_error(e)
       ensure
@@ -153,24 +220,75 @@ class Sync < ApplicationRecord
     end
   end
 
+  # Requests cooperative cancellation of this sync tree. Only this sync
+  # carries the flag: pending descendants are marked stale immediately (their
+  # queued jobs no-op via the may_start? guard), while descendants whose jobs
+  # are already running finish their work honestly — finalization then
+  # resolves this sync to stale instead of completed. Returns false when the
+  # sync is already terminal.
+  def request_cancel!
+    result = with_lock do
+      if pending?
+        # Job hasn't started — safe to resolve immediately; the queued job
+        # will no-op via the may_start? guard.
+        update!(cancel_requested_at: Time.current)
+        mark_stale!
+        :cancelled_before_start
+      elsif syncing?
+        update!(cancel_requested_at: Time.current)
+        :cancel_requested
+      end
+    end
+    return false if result.nil?
+
+    # Both paths cascade: a pending sync resolved above went terminal without
+    # its job ever running, so nothing else will ever call
+    # finalize_if_all_children_finalized for it — without this, a parent
+    # waiting on the cancelled child stays syncing until the 24h sweep.
+    # finalize_if_all_children_finalized re-reads under lock!, so it safely
+    # no-ops on this sync's own branch when already terminal.
+    cancel_pending_descendants!
+    finalize_if_all_children_finalized
+
+    true
+  end
+
+  # Fresh DB read — cancellation is requested from the web process while this
+  # sync's job holds a stale in-memory copy of the record.
+  def cancel_requested?
+    self.class.where(id: id).pick(:cancel_requested_at).present?
+  end
+
   # Finalizes the current sync AND parent (if it exists)
   def finalize_if_all_children_finalized
     Sync.transaction do
       lock!
 
+      # Eagerly load children once so that all_children_finalized? and
+      # has_failed_children? can filter in-memory without additional DB queries.
+      children.load
+
       # If this is the "parent" and there are still children running, don't finalize.
       return unless all_children_finalized?
 
       if syncing?
-        if has_failed_children?
+        if cancel_requested_at?
+          # User asked for cancellation while work was in flight. Whatever
+          # children completed keep their data; the tree resolves to stale
+          # (which also skips post-sync below).
+          mark_stale!
+        elsif has_failed_children?
           fail!
         else
           complete!
         end
       end
 
-      # If we make it here, the sync is finalized.  Run post-sync, regardless of failure/success.
-      perform_post_sync
+      # If we make it here, the sync is finalized.  Run post-sync, regardless of failure/success —
+      # unless the sync was terminalized externally (marked stale by SyncCleanerJob while its job
+      # was still running). A stale sync's job has been written off: re-running transfer matching,
+      # rules, and broadcasts for it would apply side effects for work the system already abandoned.
+      perform_post_sync unless stale?
     end
 
     # If this sync has a parent, try to finalize it so the child status propagates up the chain.
@@ -200,17 +318,25 @@ class Sync < ApplicationRecord
     )
   end
 
+  protected
+    def cancel_pending_descendants!
+      children.incomplete.find_each do |child|
+        child.with_lock { child.mark_stale! if child.pending? }
+        child.cancel_pending_descendants!
+      end
+    end
+
   private
     def log_status_change
       Rails.logger.info("changing from #{aasm.from_state} to #{aasm.to_state} (event: #{aasm.current_event})")
     end
 
     def has_failed_children?
-      children.failed.any?
+      children.any?(&:failed?)
     end
 
     def all_children_finalized?
-      children.incomplete.empty?
+      children.none? { |child| child.pending? || child.syncing? }
     end
 
     def perform_post_sync
@@ -258,12 +384,15 @@ class Sync < ApplicationRecord
     end
 
     def update_family_sync_timestamp
-      return unless family.persisted?
+      return if syncable.nil?
+      return unless family&.persisted?
 
       family.touch(:latest_sync_activity_at)
     end
 
     def family
+      return nil unless syncable
+
       if syncable.is_a?(Family)
         syncable
       else
diff --git a/app/models/trade/create_form.rb b/app/models/trade/create_form.rb
index 37cf3a44e..ce4a984db 100644
--- a/app/models/trade/create_form.rb
+++ b/app/models/trade/create_form.rb
@@ -37,11 +37,19 @@ class Trade::CreateForm
     end
 
     def create_trade
+      sec = security
+
+      unless sec
+        entry = account.entries.build(entryable: Trade.new)
+        entry.errors.add(:base, I18n.t("trades.form.trade_requires_security"))
+        return entry
+      end
+
       signed_qty = type == "sell" ? -qty.to_d : qty.to_d
       signed_amount = signed_qty * price.to_d + fee.to_d
 
       trade_entry = account.entries.new(
-        name: Trade.build_name(type, qty, security.ticker),
+        name: Trade.build_name(type, qty, sec.ticker),
         date: date,
         amount: signed_amount,
         currency: currency,
@@ -50,7 +58,7 @@ class Trade::CreateForm
           price: price,
           fee: fee.to_d,
           currency: currency,
-          security: security,
+          security: sec,
           investment_activity_label: type.capitalize # "buy" → "Buy", "sell" → "Sell"
         )
       )
diff --git a/app/models/trading212_account.rb b/app/models/trading212_account.rb
new file mode 100644
index 000000000..1af578f27
--- /dev/null
+++ b/app/models/trading212_account.rb
@@ -0,0 +1,58 @@
+class Trading212Account < ApplicationRecord
+  include CurrencyNormalizable, Encryptable
+  include Trading212Account::DataHelpers
+
+  if encryption_ready?
+    encrypts :raw_positions_payload
+    encrypts :raw_orders_payload
+    encrypts :raw_dividends_payload
+    encrypts :raw_transactions_payload
+  end
+
+  belongs_to :trading212_item
+
+  has_one :account_provider, as: :provider, dependent: :destroy
+  has_one :account, through: :account_provider, source: :account
+  has_one :linked_account, through: :account_provider, source: :account
+
+  validates :currency, presence: true
+  validates :trading212_account_id, uniqueness: { scope: :trading212_item_id, allow_nil: true }
+
+  def current_account
+    account || linked_account
+  end
+
+  def ensure_account_provider!(account = nil)
+    if account_provider.present?
+      account_provider.update!(account: account) if account && account_provider.account_id != account.id
+      return account_provider
+    end
+
+    acct = account || current_account
+    return nil unless acct
+
+    provider = AccountProvider
+      .find_or_initialize_by(provider_type: "Trading212Account", provider_id: id)
+      .tap do |record|
+        record.account = acct
+        record.save!
+      end
+
+    reload_account_provider
+    provider
+  rescue => e
+    DebugLogEntry.capture(
+      category: "sync",
+      level: "warn",
+      message: "Trading212Account##{id}: failed to ensure AccountProvider link: #{e.class} - #{e.message}",
+      source: "trading212",
+      family: trading212_item.family,
+      provider_key: "trading212"
+    )
+    nil
+  end
+
+  def instruments_map
+    trading212_item.instruments_map
+  end
+end
diff --git a/app/models/trading212_account/activities_processor.rb b/app/models/trading212_account/activities_processor.rb
new file mode 100644
index 000000000..75647e9b0
--- /dev/null
+++ b/app/models/trading212_account/activities_processor.rb
@@ -0,0 +1,221 @@
+class Trading212Account::ActivitiesProcessor
+  include Trading212Account::DataHelpers
+
+  # T212 transaction types that map to cash flows
+  DEPOSIT_TYPE = "DEPOSIT".freeze
+  WITHDRAW_TYPE = "WITHDRAW".freeze
+  INTEREST_TYPE = "INTEREST".freeze
+  FEE_TYPE = "FEE".freeze
+
+  def initialize(trading212_account)
+    @trading212_account = trading212_account
+  end
+
+  def process
+    return { trades: 0, dividends: 0, transactions: 0 } unless account.present?
+
+    trade_count = Array(@trading212_account.raw_orders_payload).sum do |order|
+      process_order(order.with_indifferent_access) ? 1 : 0
+    end
+
+    dividend_count = Array(@trading212_account.raw_dividends_payload).sum do |dividend|
+      process_dividend(dividend.with_indifferent_access) ? 1 : 0
+    end
+
+    transaction_count = Array(@trading212_account.raw_transactions_payload).sum do |transaction|
+      process_cash_transaction(transaction.with_indifferent_access) ? 1 : 0
+    end
+
+    { trades: trade_count, dividends: dividend_count, transactions: transaction_count }
+  end
+
+  private
+
+    def account
+      @trading212_account.current_account
+    end
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    def currency
+      @trading212_account.currency
+    end
+
+    def process_order(raw)
+      # T212 orders response is {order: {...}, fill: {...}}
+      order = (raw[:order] || {}).with_indifferent_access
+      fill  = (raw[:fill]  || {}).with_indifferent_access
+
+      return false unless order[:status].to_s.upcase == "FILLED"
+
+      instrument = (order[:instrument] || {}).with_indifferent_access
+      t212_ticker = instrument[:ticker].presence || order[:ticker].to_s
+      return false if t212_ticker.blank?
+
+      filled_quantity = parse_decimal(fill[:quantity])
+      fill_price      = parse_decimal(fill[:price])
+      net_value       = parse_decimal(fill.dig(:walletImpact, :netValue)) ||
+                        parse_decimal(order[:filledValue])
+
+      return false unless filled_quantity && fill_price
+      return false if filled_quantity.zero?
+
+      isin     = instrument[:isin].presence
+      ticker   = standard_ticker(t212_ticker)
+      name     = instrument[:name].presence || ticker
+      security = resolve_security_direct(isin, ticker, name)
+      return false unless security
+
+      is_buy         = order[:side].to_s.upcase == "BUY"
+      activity_label = is_buy ? "Buy" : "Sell"
+      signed_quantity = is_buy ? filled_quantity : -filled_quantity
+      amount = net_value ? net_value.abs : (fill_price * filled_quantity.abs)
+      amount = is_buy ? amount : -amount
+
+      instrument_ccy = instrument[:currency].presence || currency
+      date           = parse_date(fill[:filledAt] || order[:createdAt]) || Date.current
+      order_id       = (fill[:id] || order[:id]).to_s
+      external_id    = "trading212_order_#{order_id}"
+
+      import_adapter.import_trade(
+        external_id:    external_id,
+        security:       security,
+        quantity:       signed_quantity,
+        price:          fill_price,
+        amount:         amount,
+        currency:       instrument_ccy,
+        date:           date,
+        name:           build_order_name(security.ticker, signed_quantity),
+        source:         "trading212",
+        activity_label: activity_label
+      )
+
+      true
+    rescue => e
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "error",
+        message: "Trading212Account::ActivitiesProcessor - Failed to process order #{raw.dig(:order, :id)}: #{e.message}",
+        source: "trading212",
+        family: @trading212_account.trading212_item.family,
+        provider_key: "trading212",
+        metadata: { order_id: raw.dig(:order, :id), trading212_account_id: @trading212_account.id }
+      )
+      false
+    end
+
+    def process_dividend(dividend)
+      reference = dividend[:reference].to_s
+      return false if reference.blank?
+
+      amount = parse_decimal(dividend[:amount])
+      return false unless amount && amount > 0
+
+      t212_ticker = dividend[:ticker].to_s
+      security = t212_ticker.present? ? resolve_security_for_ticker(t212_ticker) : nil
+
+      date = parse_date(dividend[:paidOn]) || Date.current
+
+
+      import_adapter.import_transaction(
+        external_id: "trading212_dividend_#{reference}",
+        amount: -amount.abs,
+        currency: currency,
+        date: date,
+        name: build_dividend_name(security),
+        source: "trading212",
+        investment_activity_label: "Dividend",
+        extra: {
+          security_id: security&.id,
+          trading212: {
+            reference: reference,
+            ticker: t212_ticker,
+            quantity: dividend[:quantity],
+            gross_amount_per_share: dividend[:grossAmountPerShare],
+            type: dividend[:type]
+          }.compact
+        }
+      )
+
+      true
+    rescue => e
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "error",
+        message: "Trading212Account::ActivitiesProcessor - Failed to process dividend #{dividend[:reference]}: #{e.message}",
+        source: "trading212",
+        family: @trading212_account.trading212_item.family,
+        provider_key: "trading212",
+        metadata: { reference: dividend[:reference], trading212_account_id: @trading212_account.id }
+      )
+      false
+    end
+
+    def process_cash_transaction(transaction)
+      reference = transaction[:reference].to_s
+      return false if reference.blank?
+
+      type = transaction[:type].to_s.upcase
+      amount = parse_decimal(transaction[:amount])
+      return false unless amount && !amount.zero?
+
+      label, signed_amount = classify_transaction(type, amount)
+      return false unless label
+
+      date = parse_date(transaction[:dateTime]) || Date.current
+
+      import_adapter.import_transaction(
+        external_id: "trading212_transaction_#{reference}",
+        amount: signed_amount,
+        currency: currency,
+        date: date,
+        name: label,
+        source: "trading212",
+        investment_activity_label: label,
+        extra: {
+          trading212: {
+            reference: reference,
+            type: type,
+            amount: transaction[:amount]
+          }.compact
+        }
+      )
+
+      true
+    rescue => e
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "error",
+        message: "Trading212Account::ActivitiesProcessor - Failed to process transaction #{transaction[:reference]}: #{e.message}",
+        source: "trading212",
+        family: @trading212_account.trading212_item.family,
+        provider_key: "trading212",
+        metadata: { reference: transaction[:reference], trading212_account_id: @trading212_account.id }
+      )
+      false
+    end
+
+    def classify_transaction(type, amount)
+      case type
+      when DEPOSIT_TYPE
+        [ "Contribution", -amount.abs ]
+      when WITHDRAW_TYPE
+        [ "Withdrawal", amount.abs ]
+      when INTEREST_TYPE
+        [ "Interest", -amount.abs ]
+      when FEE_TYPE
+        [ "Fee", amount.abs ]
+      end
+    end
+
+    def build_order_name(ticker, signed_quantity)
+      action = signed_quantity.negative? ? "Sell" : "Buy"
+      "#{action} #{signed_quantity.abs} shares of #{ticker}"
+    end
+
+    def build_dividend_name(security)
+      security ? "Dividend from #{security.ticker}" : "Dividend"
+    end
+end
diff --git a/app/models/trading212_account/data_helpers.rb b/app/models/trading212_account/data_helpers.rb
new file mode 100644
index 000000000..18b60d049
--- /dev/null
+++ b/app/models/trading212_account/data_helpers.rb
@@ -0,0 +1,80 @@
+module Trading212Account::DataHelpers
+  extend ActiveSupport::Concern
+
+  private
+
+    def instruments_map
+      @trading212_account&.instruments_map || {}
+    end
+
+    def parse_decimal(value)
+      return nil if value.nil?
+
+      normalized = value.is_a?(String) ? value.strip : value.to_s
+      return nil if normalized.blank?
+
+      BigDecimal(normalized)
+    rescue ArgumentError
+      nil
+    end
+
+    def parse_date(value)
+      return nil if value.blank?
+
+      case value
+      when DateTime, Time, ActiveSupport::TimeWithZone
+        value.to_date
+      when Date
+        value
+      else
+        Time.zone.parse(value.to_s)&.to_date || Date.parse(value.to_s)
+      end
+    rescue ArgumentError, TypeError
+      nil
+    end
+
+    # T212 tickers look like "AAPL_US_EQ". Derive a standard ticker by taking
+    # the first segment, which is the instrument symbol on its primary exchange.
+    def standard_ticker(t212_ticker)
+      t212_ticker.to_s.split("_").first&.upcase || ""
+    end
+
+    def resolve_security_for_ticker(t212_ticker)
+      instrument = instruments_map[t212_ticker]
+
+      if instrument
+        resolve_security_from_instrument(instrument, t212_ticker)
+      else
+        ticker = standard_ticker(t212_ticker)
+        Security.find_by(ticker: ticker) || Security.create!(ticker: ticker, name: ticker)
+      end
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+      ticker = standard_ticker(t212_ticker)
+      Security.find_by(ticker: ticker)
+    end
+
+    def resolve_security_from_instrument(instrument, t212_ticker)
+      ticker = standard_ticker(t212_ticker)
+      name = instrument["shortName"].presence || ticker
+
+      Security.find_by(ticker: ticker) ||
+        Security.create!(ticker: ticker, name: name)
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+      Security.find_by(ticker: ticker)
+    end
+
+    # Resolve (or create) a Security when we already have isin/ticker/name in hand,
+    # e.g. from the nested instrument object in positions and orders responses.
+    # Note: the securities table has no isin column; isin is accepted but unused.
+    def resolve_security_direct(isin, ticker, name)
+      Security.find_by(ticker: ticker) ||
+        Security.create!(ticker: ticker, name: name)
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+      Security.find_by(ticker: ticker)
+    end
+
+    def instrument_currency(t212_ticker)
+      instrument = instruments_map[t212_ticker]
+      instrument&.dig("currencyCode").presence || currency
+    end
+end
diff --git a/app/models/trading212_account/holdings_processor.rb b/app/models/trading212_account/holdings_processor.rb
new file mode 100644
index 000000000..6e020f24b
--- /dev/null
+++ b/app/models/trading212_account/holdings_processor.rb
@@ -0,0 +1,76 @@
+class Trading212Account::HoldingsProcessor
+  include Trading212Account::DataHelpers
+
+  def initialize(trading212_account)
+    @trading212_account = trading212_account
+  end
+
+  def process
+    return unless account.present?
+
+    Array(@trading212_account.raw_positions_payload).each do |position|
+      process_position(position.with_indifferent_access)
+    end
+  end
+
+  private
+
+    def account
+      @trading212_account.current_account
+    end
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    def currency
+      @trading212_account.currency
+    end
+
+    def process_position(position)
+      instrument = (position[:instrument] || {}).with_indifferent_access
+      t212_ticker = instrument[:ticker].to_s
+      return if t212_ticker.blank?
+
+      isin         = instrument[:isin].presence
+      ticker       = standard_ticker(t212_ticker)
+      name         = instrument[:name].presence || ticker
+      position_ccy = instrument[:currency].presence || currency
+
+      security = resolve_security_direct(isin, ticker, name)
+      return unless security
+
+      quantity = parse_decimal(position[:quantity])
+      price    = parse_decimal(position[:currentPrice])
+      return unless quantity && price && quantity > 0
+
+      amount = quantity * price
+      date   = Date.current
+
+      external_id = "trading212_position_#{@trading212_account.trading212_account_id}_#{t212_ticker}_#{date}"
+
+      import_adapter.import_holding(
+        security:           security,
+        quantity:           quantity,
+        amount:             amount,
+        currency:           position_ccy,
+        date:               date,
+        price:              price,
+        cost_basis:         parse_decimal(position[:averagePricePaid]),
+        external_id:        external_id,
+        source:             "trading212",
+        account_provider_id: @trading212_account.account_provider&.id,
+        delete_future_holdings: false
+      )
+    rescue => e
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "error",
+        message: "Trading212Account::HoldingsProcessor - Failed to process position #{t212_ticker}: #{e.message}",
+        source: "trading212",
+        family: @trading212_account.trading212_item.family,
+        provider_key: "trading212",
+        metadata: { ticker: t212_ticker, trading212_account_id: @trading212_account.id }
+      )
+    end
+end
diff --git a/app/models/trading212_account/processor.rb b/app/models/trading212_account/processor.rb
new file mode 100644
index 000000000..54f8c6a5e
--- /dev/null
+++ b/app/models/trading212_account/processor.rb
@@ -0,0 +1,36 @@
+class Trading212Account::Processor
+  attr_reader :trading212_account
+
+  def initialize(trading212_account)
+    @trading212_account = trading212_account
+  end
+
+  def process
+    return unless account.present?
+
+    update_account_balance!
+    Trading212Account::HoldingsProcessor.new(trading212_account).process
+    Trading212Account::ActivitiesProcessor.new(trading212_account).process
+
+    account.broadcast_sync_complete
+  end
+
+  private
+
+    def account
+      @account ||= trading212_account.current_account
+    end
+
+    def update_account_balance!
+      total_balance = trading212_account.current_balance || 0
+      cash_balance = trading212_account.cash_balance || 0
+
+      account.assign_attributes(
+        balance: total_balance,
+        cash_balance: cash_balance,
+        currency: trading212_account.currency
+      )
+      account.save!
+      account.set_current_balance(total_balance)
+    end
+end
diff --git a/app/models/trading212_item.rb b/app/models/trading212_item.rb
new file mode 100644
index 000000000..e02f17d5c
--- /dev/null
+++ b/app/models/trading212_item.rb
@@ -0,0 +1,147 @@
+class Trading212Item < ApplicationRecord
+  include Syncable, Provided, Unlinking, Encryptable
+
+  enum :status, { good: "good", requires_update: "requires_update" }, default: :good
+  enum :environment, { live: "live", demo: "demo" }, default: :live
+
+  if encryption_ready?
+    encrypts :api_key, deterministic: true
+    encrypts :api_secret
+    encrypts :raw_instruments_payload
+  end
+
+  belongs_to :family
+  has_many :trading212_accounts, dependent: :destroy
+
+  validates :api_key, presence: true, on: :create
+  validates :api_secret, presence: true, on: :create
+
+  scope :active, -> { where(scheduled_for_deletion: false) }
+  scope :syncable, -> { active.where.not(api_key: [ nil, "" ]) }
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :needs_update, -> { where(status: :requires_update) }
+
+  def destroy_later
+    update!(scheduled_for_deletion: true)
+    DestroyJob.perform_later(self)
+  end
+
+  def credentials_configured?
+    api_key.present? && api_secret.present?
+  end
+
+  def import_latest_data
+    provider = trading212_provider
+    raise StandardError, "Trading 212 provider is not configured" unless provider
+
+    Trading212Item::Importer.new(self, provider: provider).import
+  rescue => e
+    DebugLogEntry.capture(
+      category: "sync",
+      level: "error",
+      message: "Trading212Item #{id} - Failed to import data: #{e.message}",
+      source: "trading212",
+      family: family,
+      provider_key: "trading212"
+    )
+    raise
+  end
+
+  def process_accounts
+    return [] if trading212_accounts.empty?
+
+    linked_trading212_accounts.includes(account_provider: :account).each_with_object([]) do |t212_account, results|
+      account = t212_account.current_account
+      next unless account
+      next if account.pending_deletion? || account.disabled?
+
+      begin
+        result = Trading212Account::Processor.new(t212_account).process
+        results << { trading212_account_id: t212_account.id, success: true, result: result }
+      rescue => e
+        DebugLogEntry.capture(
+          category: "sync",
+          level: "error",
+          message: "Trading212Item #{id} - Failed to process account #{t212_account.id}: #{e.message}",
+          source: "trading212",
+          family: family,
+          provider_key: "trading212",
+          account_provider_id: t212_account.account_provider&.id
+        )
+        results << { trading212_account_id: t212_account.id, success: false, error: e.message }
+      end
+    end
+  end
+
+  def schedule_account_syncs(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    accounts.reject { |account| account.pending_deletion? || account.disabled? }.each_with_object([]) do |account, results|
+      begin
+        account.sync_later(
+          parent_sync: parent_sync,
+          window_start_date: window_start_date,
+          window_end_date: window_end_date
+        )
+        results << { account_id: account.id, success: true }
+      rescue => e
+        DebugLogEntry.capture(
+          category: "sync",
+          level: "error",
+          message: "Trading212Item #{id} - Failed to schedule sync for account #{account.id}: #{e.message}",
+          source: "trading212",
+          family: family,
+          provider_key: "trading212",
+          account_id: account.id
+        )
+        results << { account_id: account.id, success: false, error: e.message }
+      end
+    end
+  end
+
+  def accounts
+    trading212_accounts.includes(account_provider: :account).filter_map(&:current_account).uniq
+  end
+
+  def linked_trading212_accounts
+    trading212_accounts.joins(:account_provider)
+  end
+
+  def linked_accounts_count
+    trading212_accounts.joins(:account_provider).count
+  end
+
+  def unlinked_accounts_count
+    trading212_accounts.left_joins(:account_provider).where(account_providers: { id: nil }).count
+  end
+
+  def total_accounts_count
+    trading212_accounts.count
+  end
+
+  def has_completed_initial_setup?
+    accounts.any?
+  end
+
+  def sync_status_summary
+    total = total_accounts_count
+    linked = linked_accounts_count
+    unlinked = unlinked_accounts_count
+
+    if total.zero?
+      I18n.t("trading212_items.sync_status.no_accounts")
+    elsif unlinked.zero?
+      I18n.t("trading212_items.sync_status.all_linked", count: linked)
+    else
+      I18n.t("trading212_items.sync_status.partial", linked: linked, unlinked: unlinked)
+    end
+  end
+
+  def institution_display_name
+    I18n.t("trading212_items.defaults.name")
+  end
+
+  def instruments_map
+    @instruments_map ||= Array(raw_instruments_payload).each_with_object({}) do |instrument, map|
+      map[instrument["ticker"]] = instrument
+    end
+  end
+end
diff --git a/app/models/trading212_item/importer.rb b/app/models/trading212_item/importer.rb
new file mode 100644
index 000000000..32539f650
--- /dev/null
+++ b/app/models/trading212_item/importer.rb
@@ -0,0 +1,74 @@
+class Trading212Item::Importer
+  attr_reader :trading212_item, :provider
+
+  def initialize(trading212_item, provider:)
+    @trading212_item = trading212_item
+    @provider = provider
+  end
+
+  def import
+    ActiveRecord::Base.transaction do
+      instruments = fetch_instruments
+      trading212_item.update!(raw_instruments_payload: instruments, status: :good)
+
+      summary = provider.fetch_account_summary
+      account_id = summary["id"]&.to_s
+      cash_data = (summary["cash"] || {}).with_indifferent_access
+
+      # T212 account summary structure:
+      #   totalValue                   – total portfolio value (cash + investments)
+      #   cash.availableToTrade        – free cash
+      #   cash.reservedForOrders       – cash locked in pending orders
+      #   investments.currentValue     – current market value of open positions
+      cash_balance = parse_decimal(cash_data[:availableToTrade])
+      current_balance = parse_decimal(summary["totalValue"]) || BigDecimal("0")
+
+      currency = trading212_item.currency.presence || trading212_item.family.currency
+
+      t212_account = trading212_item.trading212_accounts.find_or_initialize_by(trading212_account_id: account_id)
+      t212_account.assign_attributes(
+        name: build_account_name(account_id),
+        currency: currency,
+        current_balance: current_balance,
+        cash_balance: cash_balance,
+        raw_positions_payload: provider.fetch_positions,
+        raw_orders_payload: provider.fetch_all_orders,
+        raw_dividends_payload: provider.fetch_all_dividends,
+        raw_transactions_payload: provider.fetch_all_transactions,
+        last_positions_sync: Time.current,
+        last_orders_sync: Time.current
+      )
+      t212_account.save!
+    end
+
+    { success: true }
+  end
+
+  private
+
+    def fetch_instruments
+      provider.fetch_instruments
+    rescue => e
+      DebugLogEntry.capture(
+        category: "sync",
+        level: "warn",
+        message: "Trading212Item::Importer - Failed to fetch instruments: #{e.message}. Using cached payload.",
+        source: "trading212",
+        family: trading212_item.family,
+        provider_key: "trading212"
+      )
+      Array(trading212_item.raw_instruments_payload)
+    end
+
+    def build_account_name(account_id)
+      base = I18n.t("trading212_items.defaults.name")
+      account_id.present? ? "#{base} (#{account_id})" : base
+    end
+
+    def parse_decimal(value)
+      return BigDecimal("0") if value.nil?
+      BigDecimal(value.to_s)
+    rescue ArgumentError
+      BigDecimal("0")
+    end
+end
diff --git a/app/models/trading212_item/provided.rb b/app/models/trading212_item/provided.rb
new file mode 100644
index 000000000..01950f830
--- /dev/null
+++ b/app/models/trading212_item/provided.rb
@@ -0,0 +1,9 @@
+module Trading212Item::Provided
+  extend ActiveSupport::Concern
+
+  def trading212_provider
+    return nil unless credentials_configured?
+
+    Provider::Trading212.new(api_key: api_key, api_secret: api_secret, environment: environment)
+  end
+end
diff --git a/app/models/trading212_item/sync_complete_event.rb b/app/models/trading212_item/sync_complete_event.rb
new file mode 100644
index 000000000..622199708
--- /dev/null
+++ b/app/models/trading212_item/sync_complete_event.rb
@@ -0,0 +1,22 @@
+class Trading212Item::SyncCompleteEvent
+  attr_reader :trading212_item
+
+  def initialize(trading212_item)
+    @trading212_item = trading212_item
+  end
+
+  def broadcast
+    trading212_item.accounts.each do |account|
+      account.broadcast_sync_complete
+    end
+
+    trading212_item.broadcast_replace_to(
+      trading212_item.family,
+      target: "trading212_item_#{trading212_item.id}",
+      partial: "trading212_items/trading212_item",
+      locals: { trading212_item: trading212_item }
+    )
+
+    trading212_item.family.broadcast_sync_complete
+  end
+end
diff --git a/app/models/trading212_item/syncer.rb b/app/models/trading212_item/syncer.rb
new file mode 100644
index 000000000..75c6e5c67
--- /dev/null
+++ b/app/models/trading212_item/syncer.rb
@@ -0,0 +1,68 @@
+class Trading212Item::Syncer
+  include SyncStats::Collector
+
+  attr_reader :trading212_item
+
+  def initialize(trading212_item)
+    @trading212_item = trading212_item
+  end
+
+  def perform_sync(sync)
+    sync.update!(status_text: I18n.t("trading212_items.sync.status.checking_credentials")) if sync.respond_to?(:status_text)
+    unless trading212_item.credentials_configured?
+      trading212_item.update!(status: :requires_update)
+      raise Provider::Trading212::ConfigurationError, "Trading 212 API key is missing."
+    end
+
+    sync.update!(status_text: I18n.t("trading212_items.sync.status.importing_account")) if sync.respond_to?(:status_text)
+    trading212_item.import_latest_data
+
+    sync.update!(status_text: I18n.t("trading212_items.sync.status.checking_configuration")) if sync.respond_to?(:status_text)
+    collect_setup_stats(sync, provider_accounts: trading212_item.trading212_accounts.to_a)
+
+    unlinked_accounts = trading212_item.trading212_accounts.left_joins(:account_provider).where(account_providers: { id: nil })
+    linked_accounts = trading212_item.trading212_accounts.joins(:account).merge(Account.visible)
+
+    if unlinked_accounts.any?
+      trading212_item.update!(pending_account_setup: true)
+      sync.update!(status_text: I18n.t("trading212_items.sync.status.accounts_need_setup", count: unlinked_accounts.count)) if sync.respond_to?(:status_text)
+    else
+      trading212_item.update!(pending_account_setup: false)
+    end
+
+    if linked_accounts.any?
+      sync.update!(status_text: I18n.t("trading212_items.sync.status.processing_activity")) if sync.respond_to?(:status_text)
+      trading212_item.process_accounts
+
+      sync.update!(status_text: I18n.t("trading212_items.sync.status.calculating_balances")) if sync.respond_to?(:status_text)
+      trading212_item.schedule_account_syncs(
+        parent_sync: sync,
+        window_start_date: sync.window_start_date,
+        window_end_date: sync.window_end_date
+      )
+
+      account_ids = linked_accounts.includes(:account).filter_map { |pa| pa.account&.id }
+      collect_transaction_stats(sync, account_ids: account_ids, source: "trading212") if account_ids.any?
+      collect_trades_stats(sync, account_ids: account_ids, source: "trading212") if account_ids.any?
+      collect_holdings_stats(sync, holdings_count: count_holdings, label: "processed")
+    end
+
+    collect_health_stats(sync, errors: nil)
+  rescue Provider::Trading212::AuthenticationError, Provider::Trading212::ConfigurationError => e
+    trading212_item.update!(status: :requires_update)
+    collect_health_stats(sync, errors: [ { message: e.message, category: "auth_error" } ])
+    raise
+  rescue => e
+    collect_health_stats(sync, errors: [ { message: e.message, category: "sync_error" } ])
+    raise
+  end
+
+  def perform_post_sync
+  end
+
+  private
+
+    def count_holdings
+      trading212_item.trading212_accounts.sum { |acct| Array(acct.raw_positions_payload).size }
+    end
+end
diff --git a/app/models/trading212_item/unlinking.rb b/app/models/trading212_item/unlinking.rb
new file mode 100644
index 000000000..cae88e0b6
--- /dev/null
+++ b/app/models/trading212_item/unlinking.rb
@@ -0,0 +1,40 @@
+module Trading212Item::Unlinking
+  extend ActiveSupport::Concern
+
+  def unlink_all!(dry_run: false)
+    results = []
+
+    trading212_accounts.find_each do |provider_account|
+      links = AccountProvider.where(provider_type: "Trading212Account", provider_id: provider_account.id).to_a
+      link_ids = links.map(&:id)
+      result = {
+        provider_account_id: provider_account.id,
+        name: provider_account.name,
+        provider_link_ids: link_ids
+      }
+      results << result
+
+      next if dry_run
+
+      begin
+        ActiveRecord::Base.transaction do
+          Holding.where(account_provider_id: link_ids).update_all(account_provider_id: nil) if link_ids.any?
+          links.each(&:destroy!)
+        end
+      rescue => e
+        DebugLogEntry.capture(
+          category: "sync",
+          level: "error",
+          message: "Trading212Item Unlinker: failed to fully unlink provider account ##{provider_account.id} " \
+                   "(links=#{link_ids.inspect}): #{e.class} - #{e.message}",
+          source: "trading212",
+          family: family,
+          provider_key: "trading212"
+        )
+        result[:error] = e.message
+      end
+    end
+
+    results
+  end
+end
diff --git a/app/models/transaction.rb b/app/models/transaction.rb
index e564e3ea1..1aec5ef96 100644
--- a/app/models/transaction.rb
+++ b/app/models/transaction.rb
@@ -3,6 +3,7 @@ class Transaction < ApplicationRecord
 
   belongs_to :category, optional: true
   belongs_to :merchant, optional: true
+  belongs_to :transfer, optional: true
 
   has_many :taggings, as: :taggable, dependent: :destroy
   has_many :tags, through: :taggings
@@ -94,7 +95,7 @@ class Transaction < ApplicationRecord
   INTERNAL_MOVEMENT_LABELS = [ "Transfer", "Sweep In", "Sweep Out", "Exchange" ].freeze
 
   # Providers that support pending transaction flags
-  PENDING_PROVIDERS = %w[simplefin plaid lunchflow enable_banking akahu].freeze
+  PENDING_PROVIDERS = %w[simplefin plaid lunchflow enable_banking akahu up mercury redbark].freeze
 
   # Pre-computed SQL fragment for subqueries that check if a transaction (aliased as "t") is pending.
   # Stored as a constant so static analysis can verify it contains no user input.
diff --git a/app/models/transfer.rb b/app/models/transfer.rb
index 9b39d0f7d..60f0f3128 100644
--- a/app/models/transfer.rb
+++ b/app/models/transfer.rb
@@ -2,6 +2,10 @@ class Transfer < ApplicationRecord
   belongs_to :inflow_transaction, class_name: "Transaction"
   belongs_to :outflow_transaction, class_name: "Transaction"
 
+  has_many :fee_transactions, class_name: "Transaction", dependent: :destroy
+
+  attr_accessor :source_fee_amount, :destination_fee_amount
+
   enum :status, { pending: "pending", confirmed: "confirmed" }
 
   validates :inflow_transaction_id, uniqueness: true
@@ -28,53 +32,32 @@ class Transfer < ApplicationRecord
     end
   end
 
-  def reject!
-    Transfer.transaction do
-      RejectedTransfer.find_or_create_by!(inflow_transaction_id: inflow_transaction_id, outflow_transaction_id: outflow_transaction_id)
-      destroy!
-    end
+  def has_source_fee?
+    derived_source_fee_amount > 0
   end
 
-  # Once transfer is destroyed, we need to mark the denormalized kind fields on the transactions
-  def destroy!
-    Transfer.transaction do
-      [ inflow_transaction, outflow_transaction ].each do |transaction|
-        next if transaction.nil?
-        next unless Transaction.exists?(transaction.id)
-        begin
-          transaction.update!(kind: "standard")
-        rescue ActiveRecord::RecordNotFound
-        rescue NoMethodError
-          next
-        end
-      end
-      super
-    end
+  def has_destination_fee?
+    derived_destination_fee_amount > 0
   end
 
-  def confirm!
-    update!(status: "confirmed")
+  def has_fees?
+    has_source_fee? || has_destination_fee?
   end
 
-  def date
-    inflow_transaction.entry.date
+  def total_fee
+    derived_source_fee_amount + derived_destination_fee_amount
   end
 
-  def sync_account_later
-    inflow_transaction&.entry&.sync_account_later
-    outflow_transaction&.entry&.sync_account_later
+  def derived_source_fee_amount
+    fee_transactions.joins(:entry).where(entries: { account_id: from_account.id }).sum("entries.amount")
   end
 
-  def to_account
-    inflow_transaction&.entry&.account
-  end
-
-  def from_account
-    outflow_transaction&.entry&.account
+  def derived_destination_fee_amount
+    fee_transactions.joins(:entry).where(entries: { account_id: to_account.id }).sum("entries.amount")
   end
 
   def amount_abs
-    inflow_transaction&.entry&.amount_money&.abs
+    inflow_transaction&.entry&.amount_money&.abs || Money.new(0, from_account&.currency || "USD")
   end
 
   def name
@@ -112,6 +95,51 @@ class Transfer < ApplicationRecord
     to_account&.accountable_type == "Loan"
   end
 
+  def reject!
+    Transfer.transaction do
+      RejectedTransfer.find_or_create_by!(inflow_transaction_id: inflow_transaction_id, outflow_transaction_id: outflow_transaction_id)
+      destroy!
+    end
+  end
+
+  def destroy!
+    Transfer.transaction do
+      [ inflow_transaction, outflow_transaction ].each do |transaction|
+        next if transaction.nil?
+        next unless Transaction.exists?(transaction.id)
+        begin
+          transaction.update!(kind: "standard")
+        rescue ActiveRecord::RecordNotFound
+        rescue NoMethodError
+          next
+        end
+      end
+      super
+    end
+  end
+
+  def confirm!
+    update!(status: "confirmed")
+  end
+
+  def date
+    inflow_transaction&.entry&.date
+  end
+
+  def sync_account_later
+    inflow_transaction&.entry&.sync_account_later
+    outflow_transaction&.entry&.sync_account_later
+    fee_transactions.each { |t| t.entry&.sync_account_later }
+  end
+
+  def to_account
+    inflow_transaction&.entry&.account
+  end
+
+  def from_account
+    outflow_transaction&.entry&.account
+  end
+
   private
     def transfer_has_different_accounts
       return unless inflow_transaction&.entry && outflow_transaction&.entry
@@ -129,15 +157,13 @@ class Transfer < ApplicationRecord
       inflow_entry = inflow_transaction.entry
       outflow_entry = outflow_transaction.entry
 
-      inflow_amount = inflow_entry.amount
-      outflow_amount = outflow_entry.amount
+      inflow_amount_raw = inflow_entry.amount
+      outflow_amount_raw = outflow_entry.amount
+
+      errors.add(:base, :opposite_amounts) unless inflow_amount_raw.negative? && outflow_amount_raw.positive?
 
       if inflow_entry.currency == outflow_entry.currency
-        # For same currency, amounts must be exactly opposite
-        errors.add(:base, :opposite_amounts) if inflow_amount + outflow_amount != 0
-      else
-        # For different currencies, just check the signs are opposite
-        errors.add(:base, :opposite_amounts) unless inflow_amount.negative? && outflow_amount.positive?
+        errors.add(:base, :opposite_amounts) if inflow_amount_raw + outflow_amount_raw != 0
       end
     end
 
diff --git a/app/models/transfer/creator.rb b/app/models/transfer/creator.rb
index 7aa8bc72c..dd14ac3da 100644
--- a/app/models/transfer/creator.rb
+++ b/app/models/transfer/creator.rb
@@ -1,10 +1,12 @@
 class Transfer::Creator
-  def initialize(family:, source_account_id:, destination_account_id:, date:, amount:, exchange_rate: nil)
+  def initialize(family:, source_account_id:, destination_account_id:, date:, amount:, exchange_rate: nil, source_fee_amount: nil, destination_fee_amount: nil)
     @family = family
     @source_account = family.accounts.find(source_account_id) # early throw if not found
     @destination_account = family.accounts.find(destination_account_id) # early throw if not found
     @date = date
     @amount = amount.to_d
+    @source_fee_amount = source_fee_amount.to_d
+    @destination_fee_amount = destination_fee_amount.to_d
 
     if exchange_rate.present?
       rate_value = exchange_rate.to_d
@@ -16,22 +18,34 @@ class Transfer::Creator
   end
 
   def create
+    raise ArgumentError, "source_fee_amount must be non-negative" if source_fee_amount.negative?
+    raise ArgumentError, "destination_fee_amount must be non-negative" if destination_fee_amount.negative?
+
     transfer = Transfer.new(
       inflow_transaction: inflow_transaction,
       outflow_transaction: outflow_transaction,
-      status: "confirmed"
+      status: "confirmed",
+      amount: amount
     )
 
-    if transfer.save
-      source_account.sync_later
-      destination_account.sync_later
+    Transfer.transaction do
+      if source_fee_amount > 0
+        transfer.fee_transactions << build_source_fee_transaction
+      end
+      if destination_fee_amount > 0
+        transfer.fee_transactions << build_destination_fee_transaction
+      end
+      transfer.save!
     end
 
+    source_account.sync_later
+    destination_account.sync_later
+
     transfer
   end
 
   private
-    attr_reader :family, :source_account, :destination_account, :date, :amount, :exchange_rate
+    attr_reader :family, :source_account, :destination_account, :date, :amount, :exchange_rate, :source_fee_amount, :destination_fee_amount
 
     def outflow_transaction
       name = "#{name_prefix} to #{destination_account.name}"
@@ -41,11 +55,11 @@ class Transfer::Creator
         kind: kind,
         category: (investment_contributions_category if kind == "investment_contribution"),
         entry: source_account.entries.build(
-          amount: amount.abs,
+          amount: amount,
           currency: source_account.currency,
           date: date,
           name: name,
-          user_modified: true, # Protect from provider sync claiming this entry
+          user_modified: true,
         )
       )
     end
@@ -57,30 +71,61 @@ class Transfer::Creator
     def inflow_transaction
       name = "#{name_prefix} from #{source_account.name}"
 
+      net_inflow = inflow_converted_amount
+
       Transaction.new(
         kind: "funds_movement",
         entry: destination_account.entries.build(
-          amount: inflow_converted_money.amount.abs * -1,
+          amount: net_inflow * -1,
           currency: destination_account.currency,
           date: date,
           name: name,
-          user_modified: true, # Protect from provider sync claiming this entry
+          user_modified: true,
         )
       )
     end
 
-    # If destination account has different currency, its transaction should show up as converted
-    # Uses user-provided exchange rate if available, otherwise requires a provider rate
-    def inflow_converted_money
+    def build_source_fee_transaction
+      fee_category = find_or_create_fees_category(source_account.family)
+      Transaction.new(
+        kind: "standard",
+        category: fee_category,
+        entry: source_account.entries.build(
+          amount: source_fee_amount,
+          currency: source_account.currency,
+          date: date,
+          name: "Transfer fee — #{name_prefix} to #{destination_account.name}",
+        )
+      )
+    end
+
+    def build_destination_fee_transaction
+      fee_category = find_or_create_fees_category(destination_account.family)
+      Transaction.new(
+        kind: "standard",
+        category: fee_category,
+        entry: destination_account.entries.build(
+          amount: destination_fee_amount,
+          currency: destination_account.currency,
+          date: date,
+          name: "Transfer fee — #{name_prefix} from #{source_account.name}",
+        )
+      )
+    end
+
+    def find_or_create_fees_category(family)
+      family.categories.find_or_create_by!(name: I18n.t("models.category.defaults.fees"))
+    end
+
+    def inflow_converted_amount
       Money.new(amount.abs, source_account.currency)
            .exchange_to(
              destination_account.currency,
              date: date,
              custom_rate: exchange_rate
-           )
+           ).amount
     end
 
-    # The "expense" side of a transfer is treated different in analytics based on where it goes.
     def outflow_transaction_kind
       if destination_account.loan?
         "loan_payment"
diff --git a/app/models/trend.rb b/app/models/trend.rb
index 33e2014d7..b5bfe0512 100644
--- a/app/models/trend.rb
+++ b/app/models/trend.rb
@@ -52,11 +52,14 @@ class Trend
 
   def percent
     return 0.0 if previous.zero? && current.zero?
-    return Float::INFINITY if previous.zero?
+    return current.negative? ? -Float::INFINITY : Float::INFINITY if previous.zero?
 
     change = (current - previous).to_f
 
-    (change / previous.to_f * 100).round(1)
+    # Divide by the magnitude of the base so the sign of the percentage always
+    # tracks the actual change (and agrees with #direction). Dividing by a signed
+    # negative base would otherwise invert the sign (e.g. net worth -100 -> -50).
+    (change / previous.to_f.abs * 100).round(1)
   end
 
   def percent_formatted
diff --git a/app/models/up_account.rb b/app/models/up_account.rb
new file mode 100644
index 000000000..d88a35c80
--- /dev/null
+++ b/app/models/up_account.rb
@@ -0,0 +1,93 @@
+class UpAccount < ApplicationRecord
+  include CurrencyNormalizable, Encryptable
+
+  # Maps Up `accountType` values to Sure accountable types/subtypes.
+  UP_ACCOUNT_TYPE_MAP = {
+    "TRANSACTIONAL" => { accountable_type: "Depository", subtype: "checking" },
+    "SAVER" => { accountable_type: "Depository", subtype: "savings" },
+    "HOME_LOAN" => { accountable_type: "Loan" }
+  }.freeze
+
+  INSTITUTION_NAME = "Up".freeze
+  INSTITUTION_DOMAIN = "up.com.au".freeze
+
+  if encryption_ready?
+    encrypts :raw_payload
+    encrypts :raw_transactions_payload
+  end
+
+  belongs_to :up_item
+
+  has_one :account_provider, as: :provider, dependent: :destroy
+  has_one :account, through: :account_provider, source: :account
+  has_one :linked_account, through: :account_provider, source: :account
+
+  validates :name, :currency, presence: true
+  validates :account_id, uniqueness: { scope: :up_item_id, allow_nil: true }
+
+  # Up accounts with no linked Sure account.
+  scope :unlinked, -> { left_joins(:account_provider).where(account_providers: { id: nil }) }
+  # Unlinked accounts that still need a setup decision (i.e. not explicitly skipped).
+  scope :needs_setup, -> { unlinked.where(ignored: false) }
+
+  # The linked Sure account, if any.
+  def current_account
+    account
+  end
+
+  # Suggested Sure accountable type derived from Up's account type, or nil.
+  def suggested_account_type
+    UP_ACCOUNT_TYPE_MAP[account_type.to_s.upcase]&.fetch(:accountable_type)
+  end
+
+  # Suggested Sure subtype (e.g. checking/savings) for this Up account, or nil.
+  def suggested_subtype
+    UP_ACCOUNT_TYPE_MAP[account_type.to_s.upcase]&.[](:subtype)
+  end
+
+  # Persist the latest Up account snapshot, normalizing balance/currency/metadata.
+  def upsert_up_snapshot!(account_snapshot)
+    snapshot = account_snapshot.with_indifferent_access
+    balance = snapshot[:balance].is_a?(Hash) ? snapshot[:balance].with_indifferent_access : {}
+
+    assign_attributes(
+      current_balance: parse_balance(balance[:value]),
+      currency: parse_currency(balance[:currencyCode]) || "AUD",
+      name: snapshot[:displayName].presence || I18n.t("up_account.fallback"),
+      account_id: snapshot[:id],
+      account_status: snapshot[:accountType],
+      account_type: snapshot[:accountType],
+      ownership_type: snapshot[:ownershipType],
+      provider: "up",
+      institution_metadata: {
+        name: INSTITUTION_NAME,
+        domain: INSTITUTION_DOMAIN
+      }.compact,
+      raw_payload: account_snapshot
+    )
+
+    save!
+  end
+
+  # Persist the latest raw transactions payload for this account.
+  def upsert_up_transactions_snapshot!(transactions_snapshot)
+    assign_attributes(raw_transactions_payload: transactions_snapshot)
+    save!
+  end
+
+  private
+
+    # Parse an Up balance string into a BigDecimal, defaulting to 0 on bad input.
+    def parse_balance(value)
+      return 0 if value.blank?
+
+      BigDecimal(value.to_s)
+    rescue ArgumentError
+      0
+    end
+
+    # CurrencyNormalizable hook: warn when an Up currency code is unrecognized.
+    def log_invalid_currency(currency_value)
+      Rails.logger.warn("Invalid currency code '#{currency_value}' for Up account #{id}, defaulting to AUD")
+    end
+end
diff --git a/app/models/up_account/processor.rb b/app/models/up_account/processor.rb
new file mode 100644
index 000000000..23d0f578b
--- /dev/null
+++ b/app/models/up_account/processor.rb
@@ -0,0 +1,91 @@
+class UpAccount::Processor
+  include CurrencyNormalizable
+
+  SanitizedProcessingError = Class.new(StandardError)
+
+  attr_reader :up_account
+
+  # Build a processor for the given +up_account+.
+  def initialize(up_account)
+    @up_account = up_account
+  end
+
+  # Sync the linked account's balance and process its transactions. No-op when
+  # the Up account isn't linked to a Sure account.
+  def process
+    unless up_account.current_account.present?
+      Rails.logger.info "UpAccount::Processor - No linked account for up_account #{up_account.id}, skipping processing"
+      return
+    end
+
+    process_account!
+    process_transactions
+  rescue StandardError => e
+    Rails.logger.error "UpAccount::Processor - Failed to process account up_account_id=#{up_account.id} error_class=#{e.class.name}"
+    report_exception(e, "account")
+    raise
+  end
+
+  private
+
+    # Update the linked Sure account's balance/currency from the Up snapshot.
+    def process_account!
+      account = up_account.current_account
+      balance = up_account.current_balance || 0
+
+      # Loan balances are stored as positive debt in Sure regardless of Up's sign.
+      balance = balance.abs if account.accountable_type == "Loan"
+      currency = parse_currency(up_account.currency) || account.currency || "AUD"
+
+      account.update!(
+        balance: balance,
+        cash_balance: balance,
+        currency: currency
+      )
+    end
+
+    # Delegate to the transactions processor, capturing and logging failures.
+    def process_transactions
+      UpAccount::Transactions::Processor.new(up_account).process
+    rescue => e
+      report_exception(e, "transactions")
+      Rails.logger.error "UpAccount::Processor - Failed to process transactions up_account_id=#{up_account.id} error_class=#{e.class.name}"
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Failed to process transactions",
+        source: self.class.name,
+        provider_key: "up",
+        family: up_account.up_item.family,
+        account_provider: up_account.account_provider,
+        metadata: { up_account_id: up_account.id, error_class: e.class.name, error_message: e.message }
+      )
+      { success: false, failed: 1, errors: [ { error: I18n.t("up_item.errors.account_processing_failed") } ] }
+    end
+
+    # Report a processing error to Sentry with a sanitized message and tags.
+    def report_exception(error, context)
+      safe_error = SanitizedProcessingError.new("Up account processing failed")
+
+      Sentry.capture_exception(safe_error) do |scope|
+        scope.set_tags(
+          up_account_id: up_account.id,
+          context: context,
+          error_class: error.class.name
+        )
+        scope.set_context(
+          "up_account_processor",
+          {
+            up_account_id: up_account.id,
+            context: context,
+            error_class: error.class.name
+          }
+        )
+      end
+    end
+
+    # CurrencyNormalizable hook: warn when an Up currency code is unrecognized.
+    def log_invalid_currency(currency_value)
+      Rails.logger.warn("Invalid currency code '#{currency_value}' for Up account #{up_account.id}, falling back to account currency")
+    end
+end
diff --git a/app/models/up_account/transactions/processor.rb b/app/models/up_account/transactions/processor.rb
new file mode 100644
index 000000000..c56fadb4d
--- /dev/null
+++ b/app/models/up_account/transactions/processor.rb
@@ -0,0 +1,91 @@
+class UpAccount::Transactions::Processor
+  attr_reader :up_account
+
+  # Build a transactions processor for the given +up_account+.
+  def initialize(up_account)
+    @up_account = up_account
+  end
+
+  # Process each stored raw transaction into a Sure entry, prune stale pending
+  # entries, and return a stats hash (total/imported/failed/pruned/errors).
+  def process
+    unless up_account.raw_transactions_payload.present?
+      Rails.logger.info "UpAccount::Transactions::Processor - No Up transactions available to process"
+      pruned_count = prune_stale_pending_entries([])
+      return { success: true, total: 0, imported: 0, failed: 0, pruned_pending: pruned_count, errors: [] }
+    end
+
+    total_count = up_account.raw_transactions_payload.count
+    imported_count = 0
+    failed_count = 0
+    errors = []
+    current_pending_external_ids = pending_external_ids
+
+    up_account.raw_transactions_payload.each_with_index do |transaction_data, index|
+      result = UpEntry::Processor.new(
+        transaction_data,
+        up_account: up_account
+      ).process
+
+      if result.nil?
+        failed_count += 1
+        errors << { index: index, transaction_id: transaction_id(transaction_data), error: "No linked account" }
+      else
+        imported_count += 1
+      end
+    rescue ArgumentError => e
+      failed_count += 1
+      errors << { index: index, transaction_id: transaction_id(transaction_data), error: "Validation error: #{e.message}" }
+      Rails.logger.error "UpAccount::Transactions::Processor - Validation error processing transaction #{transaction_id(transaction_data)}: #{e.message}"
+    rescue => e
+      failed_count += 1
+      errors << { index: index, transaction_id: transaction_id(transaction_data), error: "#{e.class}: #{e.message}" }
+      Rails.logger.error "UpAccount::Transactions::Processor - Error processing transaction #{transaction_id(transaction_data)}: #{e.class} - #{e.message}"
+      Rails.logger.error e.backtrace.join("\n")
+    end
+    pruned_count = prune_stale_pending_entries(current_pending_external_ids)
+
+    {
+      success: failed_count.zero?,
+      total: total_count,
+      imported: imported_count,
+      failed: failed_count,
+      pruned_pending: pruned_count,
+      errors: errors
+    }
+  end
+
+  private
+
+    # Extract the Up transaction id from raw data, or "unknown".
+    def transaction_id(transaction_data)
+      transaction_data.try(:[], :id) || transaction_data.try(:[], "id") || "unknown"
+    end
+
+    # Canonical external ids of the currently-HELD (pending) transactions.
+    def pending_external_ids
+      up_account.raw_transactions_payload.filter_map do |transaction_data|
+        next unless transaction_data.is_a?(Hash)
+        next unless UpEntry::Processor.pending?(transaction_data)
+
+        UpEntry::Processor.canonical_external_id(transaction_data)
+      end
+    end
+
+    # Delete previously-imported pending entries no longer present in the latest
+    # fetch (cancelled/settled holds), returning how many were removed.
+    def prune_stale_pending_entries(current_pending_external_ids)
+      account = up_account.current_account
+      return 0 unless account.present?
+
+      stale_pending_entries = account.entries
+        .joins("INNER JOIN transactions ON transactions.id = entries.entryable_id AND entries.entryable_type = 'Transaction'")
+        .where(source: "up")
+        .where("(transactions.extra -> 'up' ->> 'pending')::boolean = true")
+      stale_pending_entries = stale_pending_entries.where.not(external_id: current_pending_external_ids) if current_pending_external_ids.any?
+
+      count = stale_pending_entries.count
+      stale_pending_entries.find_each(&:destroy!) if count.positive?
+      count
+    end
+end
diff --git a/app/models/up_entry/processor.rb b/app/models/up_entry/processor.rb
new file mode 100644
index 000000000..fad499776
--- /dev/null
+++ b/app/models/up_entry/processor.rb
@@ -0,0 +1,223 @@
+require "digest/md5"
+
+class UpEntry::Processor
+  include CurrencyNormalizable
+
+  # Stable external id for a transaction: its Up id when present, else a content
+  # hash so pending entries lacking an id stay deduplicated across syncs.
+  def self.canonical_external_id(up_transaction)
+    data = up_transaction.with_indifferent_access
+    id = data[:id].presence
+    return "up_#{id}" if id.present?
+
+    "up_pending_#{content_hash_for(data)}"
+  end
+
+  # Up marks unsettled transactions with status "HELD"; settled ones are "SETTLED".
+  def self.pending?(up_transaction)
+    data = up_transaction.with_indifferent_access
+    data[:status].to_s.upcase == "HELD"
+  end
+
+  # MD5 of account/date/amount/description, used to identify id-less pendings.
+  def self.content_hash_for(data)
+    amount = data[:amount].is_a?(Hash) ? data[:amount].with_indifferent_access : {}
+    attributes = [
+      data[:account_id],
+      data[:createdAt],
+      amount[:value],
+      data[:description]
+    ].compact.join("|")
+
+    Digest::MD5.hexdigest(attributes)
+  end
+
+  # Build a processor for a single raw Up transaction tied to +up_account+.
+  def initialize(up_transaction, up_account:)
+    @up_transaction = up_transaction
+    @up_account = up_account
+  end
+
+  # Import the transaction into the linked Sure account via the import adapter.
+  # Returns nil when the account isn't linked; re-raises on validation/save errors.
+  def process
+    unless account.present?
+      Rails.logger.warn "UpEntry::Processor - No linked account for up_account #{up_account.id}, skipping transaction #{external_id}"
+      return nil
+    end
+
+    import_adapter.import_transaction(
+      external_id: external_id,
+      amount: amount,
+      currency: currency,
+      date: date,
+      name: name,
+      source: "up",
+      kind: kind,
+      merchant: merchant,
+      notes: notes,
+      extra: extra_metadata
+    )
+  rescue ArgumentError => e
+    Rails.logger.error "UpEntry::Processor - Validation error for transaction #{external_id}: #{e.message}"
+    raise
+  rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+    Rails.logger.error "UpEntry::Processor - Failed to save transaction #{external_id}: #{e.message}"
+    raise StandardError.new("Failed to import transaction: #{e.message}")
+  rescue => e
+    Rails.logger.error "UpEntry::Processor - Unexpected error processing transaction #{external_id}: #{e.class} - #{e.message}"
+    Rails.logger.error e.backtrace.join("\n")
+    raise StandardError.new("Unexpected error importing transaction: #{e.message}")
+  end
+
+  private
+
+    attr_reader :up_transaction, :up_account
+
+    # Memoized adapter that writes provider transactions into the Sure account.
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    # The linked Sure account for this transaction, if any.
+    def account
+      @account ||= up_account.current_account
+    end
+
+    # The raw transaction as an indifferent-access hash.
+    def data
+      @data ||= up_transaction.with_indifferent_access
+    end
+
+    # Canonical external id for this transaction (see .canonical_external_id).
+    def external_id
+      @external_id ||= self.class.canonical_external_id(data)
+    end
+
+    # Display name: the Up description, or a generic fallback.
+    def name
+      data[:description].presence || I18n.t("transactions.unknown_name")
+    end
+
+    # The id of the other account in an internal money movement, if any (see
+    # Provider::Up#flatten_transaction). Present for transfers between the user's own
+    # accounts and for round-ups swept into a Saver; nil for ordinary income/expense.
+    def transfer_account_id
+      data[:transfer_account_id].presence
+    end
+
+    # Mark internal movements as funds_movement so they are excluded from income,
+    # expense, and budget analytics. Two-sided transfers between two linked accounts are
+    # additionally paired into a Transfer by Family#auto_match_transfers!; one-sided moves
+    # (counterpart not linked in Sure) and round-ups rely on this flag, since the matcher
+    # has no opposing entry to pair them with.
+    def kind
+      transfer_account_id ? "funds_movement" : nil
+    end
+
+    # Optional user-entered message attached to the transaction.
+    def notes
+      data[:message].presence
+    end
+
+    # Find or create the merchant for this transaction's description, or nil.
+    def merchant
+      merchant_name = data[:description].to_s.strip.presence
+      return nil unless merchant_name
+
+      provider_merchant_id = "up_merchant_#{Digest::MD5.hexdigest(merchant_name.downcase)}"
+
+      @merchant ||= import_adapter.find_or_create_merchant(
+        provider_merchant_id: provider_merchant_id,
+        name: merchant_name,
+        source: "up"
+      )
+    rescue ActiveRecord::RecordInvalid => e
+      Rails.logger.error "UpEntry::Processor - Failed to create merchant '#{merchant_name}': #{e.message}"
+      nil
+    end
+
+    # Up amounts use banking convention: negative is money out, positive is money in.
+    # Sure stores expenses as positive and income as negative, so the sign is flipped.
+    def amount
+      raw_value = amount_data[:value]
+      parsed_amount = case raw_value
+      when String
+        BigDecimal(raw_value)
+      when Numeric
+        BigDecimal(raw_value.to_s)
+      else
+        BigDecimal("0")
+      end
+
+      -parsed_amount
+    rescue ArgumentError => e
+      Rails.logger.error "Failed to parse Up transaction amount: #{e.class}"
+      raise ArgumentError, "Invalid transaction amount"
+    end
+
+    # Transaction currency, falling back to the account/default currency.
+    def currency
+      parse_currency(amount_data[:currencyCode]) || up_account.currency || account&.currency || "AUD"
+    end
+
+    # Settlement date (or creation date for pendings) as a Date.
+    def date
+      value = data[:settledAt].presence || data[:createdAt].presence
+      case value
+      when String
+        if value.include?("T") || value.include?(":")
+          Time.parse(value).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(value)
+        end
+      when Integer, Float
+        Time.at(value).in_time_zone(account&.family&.timezone).to_date
+      when Time, DateTime
+        value.in_time_zone(account&.family&.timezone).to_date
+      when Date
+        value
+      else
+        Rails.logger.error("Up transaction has no usable date value")
+        raise ArgumentError, "Invalid date format"
+      end
+    rescue ArgumentError, TypeError => e
+      Rails.logger.error("Failed to parse Up transaction date: #{e.class}")
+      raise ArgumentError, "Unable to parse transaction date"
+    end
+
+    # Provider metadata persisted on Transaction#extra (pending/status/fx/etc.).
+    def extra_metadata
+      {
+        "up" => {
+          "pending" => pending?,
+          "status" => data[:status],
+          "category_id" => data[:category_id],
+          "transfer_account_id" => transfer_account_id,
+          "raw_text" => data[:rawText],
+          "fx_from" => foreign_amount_data[:currencyCode],
+          "fx_amount" => foreign_amount_data[:value]
+        }.compact
+      }
+    end
+
+    # Whether this transaction is still HELD (unsettled) on Up.
+    def pending?
+      self.class.pending?(data)
+    end
+
+    # The native amount object ({ value:, currencyCode: }) as a hash.
+    def amount_data
+      @amount_data ||= data[:amount].is_a?(Hash) ? data[:amount].with_indifferent_access : {}
+    end
+
+    # The foreign-currency amount object for FX transactions, or empty hash.
+    def foreign_amount_data
+      @foreign_amount_data ||= data[:foreignAmount].is_a?(Hash) ? data[:foreignAmount].with_indifferent_access : {}
+    end
+
+    # CurrencyNormalizable hook: warn when an Up currency code is unrecognized.
+    def log_invalid_currency(currency_value)
+      Rails.logger.warn("Invalid currency code '#{currency_value}' in Up transaction #{external_id}, falling back to account currency")
+    end
+end
diff --git a/app/models/up_item.rb b/app/models/up_item.rb
new file mode 100644
index 000000000..27c4e6ce9
--- /dev/null
+++ b/app/models/up_item.rb
@@ -0,0 +1,201 @@
+class UpItem < ApplicationRecord
+  include Syncable, Provided, Unlinking, Encryptable
+
+  enum :status, { good: "good", requires_update: "requires_update" }, default: :good
+
+  if encryption_ready?
+    encrypts :access_token, deterministic: true
+    encrypts :raw_payload
+    encrypts :raw_institution_payload
+  end
+
+  belongs_to :family
+  has_one_attached :logo, dependent: :purge_later
+  has_many :up_accounts, dependent: :destroy
+  has_many :accounts, through: :up_accounts
+
+  validates :name, presence: true
+  validates :access_token, presence: true, on: :create
+
+  scope :active, -> { where(scheduled_for_deletion: false) }
+  scope :syncable, -> { active }
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :needs_update, -> { where(status: :requires_update) }
+
+  # Mark the item for deletion and enqueue the background destroy job.
+  def destroy_later
+    update!(scheduled_for_deletion: true)
+    DestroyJob.perform_later(self)
+  end
+
+  # Run the importer to fetch the latest accounts/transactions from Up.
+  def import_latest_up_data
+    provider = up_provider
+    unless provider
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Cannot import: Up provider is not configured",
+        source: self.class.name,
+        provider_key: "up",
+        family: family,
+        metadata: { up_item_id: id }
+      )
+      raise StandardError.new("Up provider is not configured")
+    end
+
+    UpItem::Importer.new(self, up_provider: provider).import
+  rescue => e
+    DebugLogEntry.capture(
+      category: "provider_sync_error",
+      level: "error",
+      message: "Failed to import data",
+      source: self.class.name,
+      provider_key: "up",
+      family: family,
+      metadata: { up_item_id: id, error_class: e.class.name, error_message: e.message }
+    )
+    raise
+  end
+
+  # Process each linked, visible Up account, returning a per-account result array.
+  def process_accounts
+    return [] if up_accounts.empty?
+
+    up_accounts.joins(:account).merge(Account.visible).map do |up_account|
+      result = UpAccount::Processor.new(up_account).process
+      if result.is_a?(Hash) && result.with_indifferent_access[:success] == false
+        { up_account_id: up_account.id, success: false, error: I18n.t("up_item.errors.account_processing_failed") }
+      else
+        { up_account_id: up_account.id, success: true, result: result }
+      end
+    rescue => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Failed to process account",
+        source: self.class.name,
+        provider_key: "up",
+        family: family,
+        account_provider: up_account.account_provider,
+        metadata: { up_item_id: id, up_account_id: up_account.id, error_class: e.class.name, error_message: e.message }
+      )
+      { up_account_id: up_account.id, success: false, error: I18n.t("up_item.errors.account_processing_failed") }
+    end
+  end
+
+  # Enqueue a balance sync for each visible linked account, returning per-account results.
+  def schedule_account_syncs(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    return [] if accounts.empty?
+
+    accounts.visible.map do |account|
+      account.sync_later(
+        parent_sync: parent_sync,
+        window_start_date: window_start_date,
+        window_end_date: window_end_date
+      )
+      { account_id: account.id, success: true }
+    rescue => e
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: "Failed to schedule sync for account",
+        source: self.class.name,
+        provider_key: "up",
+        family: family,
+        account: account,
+        metadata: { up_item_id: id, account_id: account.id, error_class: e.class.name, error_message: e.message }
+      )
+      { account_id: account.id, success: false, error: I18n.t("up_item.errors.account_sync_schedule_failed") }
+    end
+  end
+
+  # Persist the latest raw accounts payload for this item.
+  def upsert_up_snapshot!(accounts_snapshot)
+    assign_attributes(raw_payload: accounts_snapshot)
+    save!
+  end
+
+  # True once at least one Up account has been linked to a Sure account.
+  def has_completed_initial_setup?
+    accounts.any?
+  end
+
+  # Human-readable summary of linked vs. unlinked account counts.
+  def sync_status_summary
+    total_accounts = total_accounts_count
+    linked_count = linked_accounts_count
+    unlinked_count = unlinked_accounts_count
+
+    if total_accounts.zero?
+      I18n.t("up_item.sync_status.no_accounts")
+    elsif unlinked_count.zero?
+      I18n.t("up_item.sync_status.all_synced", count: linked_count)
+    else
+      I18n.t("up_item.sync_status.partial", linked: linked_count, unlinked: unlinked_count)
+    end
+  end
+
+  # Number of Up accounts linked to a Sure account.
+  def linked_accounts_count
+    account_counts[:linked]
+  end
+
+  # Number of unlinked Up accounts still awaiting setup.
+  def unlinked_accounts_count
+    account_counts[:unlinked]
+  end
+
+  # Total number of Up accounts under this item.
+  def total_accounts_count
+    account_counts[:total]
+  end
+
+  # Best available display name for the connected institution.
+  def institution_display_name
+    institution_name.presence || institution_domain.presence || name
+  end
+
+  # Distinct institution metadata across this item's accounts.
+  def connected_institutions
+    up_accounts.includes(:account)
+               .where.not(institution_metadata: nil)
+               .map(&:institution_metadata)
+               .uniq { |inst| inst["name"] || inst["domain"] }
+  end
+
+  # Human-readable summary of connected institutions (none/one/count).
+  def institution_summary
+    institutions = connected_institutions
+    case institutions.count
+    when 0
+      I18n.t("up_item.institution_summary.none")
+    when 1
+      institutions.first["name"].presence || I18n.t("up_item.institution_summary.one")
+    else
+      I18n.t("up_item.institution_summary.count", count: institutions.count)
+    end
+  end
+
+  # True when an access token is present and the item can call the Up API.
+  def credentials_configured?
+    access_token.present?
+  end
+
+  private
+
+    # Single query for all three account counts, reused across sync_status_summary
+    # and the settings partial to avoid 3+ separate COUNT queries per rendered item.
+    def account_counts
+      @account_counts ||= begin
+        rows = up_accounts
+                 .left_joins(:account_provider)
+                 .pluck(Arel.sql("account_providers.id IS NOT NULL"), :ignored)
+
+        linked = rows.count { |has_provider, _ignored| has_provider }
+        unlinked = rows.count { |has_provider, ignored| !has_provider && !ignored }
+
+        { linked: linked, unlinked: unlinked, total: rows.size }
+      end
+    end
+end
diff --git a/app/models/up_item/importer.rb b/app/models/up_item/importer.rb
new file mode 100644
index 000000000..cc4b816ea
--- /dev/null
+++ b/app/models/up_item/importer.rb
@@ -0,0 +1,250 @@
+# Imports Up Bank accounts and transactions for a single UpItem connection.
+# Fetches account snapshots and per-account transaction history from the Up
+# provider, persisting raw snapshots and returning aggregate import statistics.
+class UpItem::Importer
+  attr_reader :up_item, :up_provider
+
+  # Build an importer for the given +up_item+ using the supplied +up_provider+ client.
+  def initialize(up_item, up_provider:)
+    @up_item = up_item
+    @up_provider = up_provider
+  end
+
+  # Run the full import (accounts then transactions) and return a result hash
+  # of success flag and per-entity counts. On a failed accounts fetch, returns
+  # a +failed_result+ with the same shape and zeroed counts.
+  def import
+    Rails.logger.info "UpItem::Importer - Starting import for item #{up_item.id}"
+
+    accounts_data = fetch_accounts_data
+    return failed_result("Failed to fetch accounts data") unless accounts_data
+
+    up_item.upsert_up_snapshot!(accounts_data)
+
+    account_stats = import_accounts(accounts_data)
+    transaction_stats = import_transactions
+
+    Rails.logger.info(
+      "UpItem::Importer - Completed import for item #{up_item.id}: " \
+      "#{account_stats[:updated]} accounts updated, #{account_stats[:created]} new accounts discovered, " \
+      "#{transaction_stats[:imported]} transactions"
+    )
+
+    {
+      success: account_stats[:failed].zero? && transaction_stats[:failed].zero?,
+      accounts_updated: account_stats[:updated],
+      accounts_created: account_stats[:created],
+      accounts_failed: account_stats[:failed],
+      transactions_imported: transaction_stats[:imported],
+      transactions_failed: transaction_stats[:failed]
+    }
+  end
+
+  private
+
+    # Fetch the current account list from Up, returning a hash of +items+ or
+    # +nil+ on any provider/parse error (which is logged and captured).
+    def fetch_accounts_data
+      items = up_provider.get_accounts
+      { items: items }
+    rescue Provider::Up::UpError => e
+      mark_requires_update! if e.error_type.in?([ :unauthorized, :access_forbidden ])
+      Rails.logger.error "UpItem::Importer - Up API error: #{e.error_type}"
+      capture_sync_error("Failed to fetch accounts data", e, error_type: e.error_type)
+      nil
+    rescue JSON::ParserError => e
+      Rails.logger.error "UpItem::Importer - Failed to parse Up API response: #{e.class}"
+      capture_sync_error("Failed to parse Up accounts response", e)
+      nil
+    rescue => e
+      Rails.logger.error "UpItem::Importer - Unexpected error fetching accounts: #{e.class}"
+      Rails.logger.error e.backtrace.join("\n")
+      capture_sync_error("Unexpected error fetching accounts", e)
+      nil
+    end
+
+    # Upsert snapshots for linked accounts and record newly discovered ones,
+    # returning a stats hash of +updated+, +created+, and +failed+ counts.
+    def import_accounts(accounts_data)
+      stats = { updated: 0, created: 0, failed: 0 }
+      accounts = Array(accounts_data[:items])
+      linked_account_ids = up_item.up_accounts.joins(:account_provider).pluck(:account_id).map(&:to_s)
+      all_existing_ids = up_item.up_accounts.pluck(:account_id).map(&:to_s)
+
+      accounts.each do |account_data|
+        account = account_data.with_indifferent_access
+        account_id = account[:id].presence
+        next if account_id.blank?
+        next if account[:displayName].blank?
+
+        if linked_account_ids.include?(account_id.to_s)
+          import_account(account)
+          stats[:updated] += 1
+        elsif !all_existing_ids.include?(account_id.to_s)
+          up_account = up_item.up_accounts.build(account_id: account_id.to_s)
+          up_account.upsert_up_snapshot!(account)
+          stats[:created] += 1
+        end
+      rescue => e
+        stats[:failed] += 1
+        Rails.logger.error "UpItem::Importer - Failed to import account #{account_id}: #{e.message}"
+      end
+
+      stats
+    end
+
+    # Upsert the snapshot for a single already-linked Up account.
+    def import_account(account_data)
+      account = account_data.with_indifferent_access
+      up_account = up_item.up_accounts.find_by(account_id: account[:id].to_s)
+      return unless up_account
+
+      up_account.upsert_up_snapshot!(account)
+    end
+
+    # Fetch and store transactions for every visible linked account, returning
+    # a stats hash of +imported+ and +failed+ counts.
+    def import_transactions
+      stats = { imported: 0, failed: 0 }
+
+      up_item.up_accounts.joins(:account).merge(Account.visible).each do |up_account|
+        result = fetch_and_store_transactions(up_account)
+        if result[:success]
+          stats[:imported] += result[:transactions_count]
+        else
+          stats[:failed] += 1
+        end
+      rescue => e
+        stats[:failed] += 1
+        Rails.logger.error "UpItem::Importer - Failed to fetch/store transactions for Up account #{up_account.id}: #{e.class}"
+      end
+
+      stats
+    end
+
+    # Fetch transactions for +up_account+ since its sync start date and persist
+    # them, returning a result hash with +success+ and +transactions_count+.
+    def fetch_and_store_transactions(up_account)
+      start_date = determine_sync_start_date(up_account)
+      Rails.logger.info "UpItem::Importer - Fetching transactions for Up account #{up_account.id} since #{start_date}"
+
+      transactions = up_provider.get_account_transactions(
+        account_id: up_account.account_id,
+        since: start_date
+      )
+
+      if Rails.configuration.x.up.debug_raw && Rails.env.local?
+        Rails.logger.debug "Up raw transactions response: #{transactions.to_json}"
+      end
+
+      store_transactions(up_account, fresh_transactions: Array(transactions))
+
+      { success: true, transactions_count: Array(transactions).count }
+    rescue Provider::Up::UpError => e
+      mark_requires_update! if e.error_type.in?([ :unauthorized, :access_forbidden ])
+      Rails.logger.error "UpItem::Importer - Up API error for account #{up_account.id}: #{e.error_type}"
+      capture_sync_error("Failed to fetch transactions", e, up_account: up_account, error_type: e.error_type)
+      { success: false, transactions_count: 0, error: I18n.t("up_item.errors.transactions_failed") }
+    rescue JSON::ParserError => e
+      Rails.logger.error "UpItem::Importer - Failed to parse transaction response for account #{up_account.id}: #{e.class}"
+      capture_sync_error("Failed to parse Up transactions response", e, up_account: up_account)
+      { success: false, transactions_count: 0, error: "Failed to parse response" }
+    rescue => e
+      Rails.logger.error "UpItem::Importer - Unexpected error fetching transactions for account #{up_account.id}: #{e.class}"
+      Rails.logger.error e.backtrace.join("\n")
+      capture_sync_error("Unexpected error fetching transactions", e, up_account: up_account)
+      { success: false, transactions_count: 0, error: I18n.t("up_item.errors.transactions_failed") }
+    end
+
+    # Up returns both HELD (pending) and SETTLED transactions from the same endpoint.
+    # Settled history accumulates; HELD transactions are only retained while they remain
+    # present in the latest fetch, so cancelled/settled holds drop out of storage (and the
+    # transactions processor prunes their stale pending entries).
+    def store_transactions(up_account, fresh_transactions:)
+      existing = up_account.raw_transactions_payload.to_a
+      existing_settled = existing.reject { |tx| UpEntry::Processor.pending?(tx) }
+
+      by_id = {}
+      existing_settled.each do |tx|
+        key = transaction_id(tx)
+        by_id[key] = tx if key.present?
+      end
+      fresh_transactions.each do |tx|
+        next unless tx.is_a?(Hash)
+
+        key = transaction_id(tx)
+        by_id[key] = tx if key.present?
+      end
+
+      final_transactions = by_id.values
+
+      if final_transactions != existing
+        Rails.logger.info(
+          "UpItem::Importer - Storing #{final_transactions.count} transactions " \
+          "(#{existing.count} existing) for account #{up_account.account_id}"
+        )
+        up_account.upsert_up_transactions_snapshot!(final_transactions)
+      else
+        Rails.logger.info "UpItem::Importer - No transaction changes for account #{up_account.account_id}"
+      end
+    end
+
+    # Extract the Up transaction id from a raw transaction hash, or +nil+.
+    def transaction_id(transaction)
+      data = transaction.with_indifferent_access
+      data[:id].presence
+    end
+
+    # Resolve the date from which to fetch transactions for +up_account+,
+    # preferring explicit per-account/item start dates, then a recent window.
+    def determine_sync_start_date(up_account)
+      return up_account.sync_start_date if up_account.sync_start_date.present?
+      return up_item.sync_start_date if up_item.sync_start_date.present?
+
+      has_stored_transactions = up_account.raw_transactions_payload.to_a.any?
+      if has_stored_transactions && up_item.last_synced_at
+        up_item.last_synced_at - 7.days
+      else
+        90.days.ago
+      end
+    end
+
+    # Record a provider sync error as a DebugLogEntry with structured metadata
+    # for support, attaching family and account provider when available.
+    def capture_sync_error(message, error, up_account: nil, error_type: nil)
+      metadata = { up_item_id: up_item.id, error_class: error.class.name, error_message: error.message }
+      metadata[:up_account_id] = up_account.id if up_account
+      metadata[:error_type] = error_type if error_type
+
+      DebugLogEntry.capture(
+        category: "provider_sync_error",
+        level: "error",
+        message: message,
+        source: self.class.name,
+        provider_key: "up",
+        family: up_item.family,
+        account_provider: up_account&.account_provider,
+        metadata: metadata
+      )
+    end
+
+    # Flag the item as requiring re-authorization, swallowing update errors.
+    def mark_requires_update!
+      up_item.update!(status: :requires_update)
+    rescue => e
+      Rails.logger.error "UpItem::Importer - Failed to update item status: #{e.message}"
+    end
+
+    # Build a failure result mirroring +import+'s shape with zeroed counts.
+    def failed_result(error)
+      {
+        success: false,
+        error: error,
+        accounts_updated: 0,
+        accounts_created: 0,
+        accounts_failed: 0,
+        transactions_imported: 0,
+        transactions_failed: 0
+      }
+    end
+end
diff --git a/app/models/up_item/provided.rb b/app/models/up_item/provided.rb
new file mode 100644
index 000000000..3efabecb8
--- /dev/null
+++ b/app/models/up_item/provided.rb
@@ -0,0 +1,15 @@
+module UpItem::Provided
+  extend ActiveSupport::Concern
+
+  # Build an Up API client from this item's token, or nil if unconfigured.
+  def up_provider
+    return nil unless credentials_configured?
+
+    Provider::Up.new(access_token)
+  end
+
+  # The syncer responsible for importing and processing this item's data.
+  def syncer
+    UpItem::Syncer.new(self)
+  end
+end
diff --git a/app/models/up_item/sync_complete_event.rb b/app/models/up_item/sync_complete_event.rb
new file mode 100644
index 000000000..5c7d4e8d6
--- /dev/null
+++ b/app/models/up_item/sync_complete_event.rb
@@ -0,0 +1,22 @@
+class UpItem::SyncCompleteEvent
+  attr_reader :up_item
+
+  # Build the event for the given +up_item+.
+  def initialize(up_item)
+    @up_item = up_item
+  end
+
+  # Broadcast sync-complete Turbo updates for the item, its accounts, and family.
+  def broadcast
+    up_item.accounts.each(&:broadcast_sync_complete)
+
+    up_item.broadcast_replace_to(
+      up_item.family,
+      target: "up_item_#{up_item.id}",
+      partial: "up_items/up_item",
+      locals: { up_item: up_item }
+    )
+
+    up_item.family.broadcast_sync_complete
+  end
+end
diff --git a/app/models/up_item/syncer.rb b/app/models/up_item/syncer.rb
new file mode 100644
index 000000000..b488c6078
--- /dev/null
+++ b/app/models/up_item/syncer.rb
@@ -0,0 +1,141 @@
+class UpItem::Syncer
+  include SyncStats::Collector
+
+  SafeSyncError = Class.new(StandardError)
+
+  # Error carrying the structured per-stage sync errors for health reporting.
+  class SyncError < StandardError
+    attr_reader :sync_errors
+
+    # Build the error with a +message+ and the collected +sync_errors+.
+    def initialize(message, sync_errors:)
+      super(message)
+      @sync_errors = sync_errors
+    end
+  end
+
+  attr_reader :up_item
+
+  # Build a syncer for the given +up_item+.
+  def initialize(up_item)
+    @up_item = up_item
+  end
+
+  # Run the full sync: import, account setup detection, transaction processing,
+  # balance sync scheduling, and stats/health collection. Raises on failures.
+  def perform_sync(sync)
+    sync.update!(status_text: "Importing accounts from Up...") if sync.respond_to?(:status_text)
+    import_result = up_item.import_latest_up_data
+    raise_if_failed_result!(import_result, stage: "Up import")
+
+    sync.update!(status_text: "Checking account configuration...") if sync.respond_to?(:status_text)
+    collect_setup_stats(sync, provider_accounts: up_item.up_accounts)
+
+    linked_accounts = up_item.up_accounts.joins(:account_provider)
+    unlinked_accounts = up_item.up_accounts.needs_setup
+
+    if unlinked_accounts.any?
+      up_item.update!(pending_account_setup: true)
+      sync.update!(status_text: "#{unlinked_accounts.count} accounts need setup...") if sync.respond_to?(:status_text)
+    else
+      up_item.update!(pending_account_setup: false)
+    end
+
+    if linked_accounts.any?
+      sync.update!(status_text: "Processing transactions...") if sync.respond_to?(:status_text)
+      mark_import_started(sync)
+      process_results = up_item.process_accounts
+      raise_if_failed_results!(process_results, stage: "Up account processing")
+
+      sync.update!(status_text: "Calculating balances...") if sync.respond_to?(:status_text)
+      schedule_results = up_item.schedule_account_syncs(
+        parent_sync: sync,
+        window_start_date: sync.window_start_date,
+        window_end_date: sync.window_end_date
+      )
+      raise_if_failed_results!(schedule_results, stage: "Up account sync scheduling")
+
+      account_ids = linked_accounts.includes(:account_provider).filter_map { |ua| ua.current_account&.id }
+      collect_transaction_stats(sync, account_ids: account_ids, source: "up")
+    else
+      Rails.logger.info "UpItem::Syncer - No linked accounts to process"
+    end
+
+    collect_health_stats(sync, errors: nil)
+  rescue SyncError => e
+    collect_health_stats(sync, errors: e.sync_errors)
+    raise
+  rescue => e
+    safe_message = I18n.t("up_item.errors.sync_failed")
+    DebugLogEntry.capture(
+      category: "provider_sync_error",
+      level: "error",
+      message: "Unexpected sync error",
+      source: self.class.name,
+      provider_key: "up",
+      family: up_item.family,
+      metadata: { up_item_id: up_item.id, error_class: e.class.name, error_message: e.message }
+    )
+    collect_health_stats(sync, errors: [ { message: safe_message, category: "sync_error" } ])
+    raise SafeSyncError.new(safe_message), cause: nil
+  end
+
+  # Post-sync hook (no work required for Up).
+  def perform_post_sync
+    # no-op
+  end
+
+  private
+
+    # Raise a SyncError if a single result hash indicates failure.
+    def raise_if_failed_result!(result, stage:)
+      return unless failed_result?(result)
+
+      errors = errors_from_result(result, stage: stage)
+      raise SyncError.new(error_message(stage, errors), sync_errors: errors)
+    end
+
+    # Raise a SyncError if any result in the collection indicates failure.
+    def raise_if_failed_results!(results, stage:)
+      errors = Array(results).filter_map do |result|
+        next unless failed_result?(result)
+
+        errors_from_result(result, stage: stage).first
+      end
+
+      return if errors.empty?
+
+      raise SyncError.new(error_message(stage, errors), sync_errors: errors)
+    end
+
+    # True when +result+ is a hash explicitly flagged success: false.
+    def failed_result?(result)
+      result.is_a?(Hash) && result.with_indifferent_access[:success] == false
+    end
+
+    # Normalize a failed result into an array of { message:, category: } errors.
+    def errors_from_result(result, stage:)
+      data = result.with_indifferent_access
+      messages = []
+      messages << data[:error] if data[:error].present?
+      messages << "#{data[:accounts_failed]} accounts failed" if data[:accounts_failed].to_i.positive?
+      messages << "#{data[:transactions_failed]} transactions failed" if data[:transactions_failed].to_i.positive?
+      messages.concat(Array(data[:errors]).map { |error| error_message_value(error) }.compact)
+      messages << "#{stage} failed" if messages.empty?
+
+      messages.map { |message| { message: "#{stage}: #{message}", category: "sync_error" } }
+    end
+
+    # Join the error messages into a single stage summary string.
+    def error_message(stage, errors)
+      messages = errors.map { |error| error[:message] || error["message"] }.compact
+      messages.presence&.join(", ") || "#{stage} failed"
+    end
+
+    # Extract a human-readable message from a heterogeneous error value.
+    def error_message_value(error)
+      return error[:message].presence || error["message"].presence || error[:error].presence || error["error"].presence if error.is_a?(Hash)
+
+      error.to_s.presence
+    end
+end
diff --git a/app/models/up_item/unlinking.rb b/app/models/up_item/unlinking.rb
new file mode 100644
index 000000000..fdd3d63c1
--- /dev/null
+++ b/app/models/up_item/unlinking.rb
@@ -0,0 +1,54 @@
+module UpItem::Unlinking
+  extend ActiveSupport::Concern
+
+  # Unlink every Up account from its Sure account, detaching holdings and
+  # destroying the AccountProvider links. With +dry_run+, only reports what
+  # would be unlinked. Returns a per-account result array (with :error on failure).
+  def unlink_all!(dry_run: false)
+    results = []
+
+    up_accounts.find_each do |provider_account|
+      links = AccountProvider.joins(:account)
+                             .where(provider: provider_account, accounts: { family_id: family_id })
+                             .to_a
+      link_ids = links.map(&:id)
+      result = {
+        provider_account_id: provider_account.id,
+        name: provider_account.name,
+        provider_link_ids: link_ids
+      }
+      results << result
+
+      next if dry_run
+
+      begin
+        ActiveRecord::Base.transaction do
+          links.each do |link|
+            Holding.where(account_id: link.account_id, account_provider_id: link.id).update_all(account_provider_id: nil)
+            link.destroy!
+          end
+        end
+      rescue StandardError => e
+        DebugLogEntry.capture(
+          category: "provider_sync_error",
+          level: "warn",
+          message: "Failed to fully unlink provider account",
+          source: self.class.name,
+          provider_key: "up",
+          family: family,
+          account_provider: links.first,
+          metadata: {
+            up_item_id: id,
+            up_account_id: provider_account.id,
+            link_ids: link_ids,
+            error_class: e.class.name,
+            error_message: e.message
+          }
+        )
+        result[:error] = e.message
+      end
+    end
+
+    results
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index cf1c257c1..efc435b3b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -56,6 +56,16 @@ class User < ApplicationRecord
   normalizes :first_name, :last_name, with: ->(value) { value.strip.presence }
 
   enum :role, { guest: "guest", member: "member", admin: "admin", super_admin: "super_admin" }, validate: true
+
+  # SQL counterpart to #preview_features_enabled?, for callers that filter
+  # users (or their families) in one query instead of loading and iterating.
+  # The `@>` containment operator uses index_users_on_preferences (GIN) and
+  # matches only a JSON boolean true, so it agrees with that predicate's
+  # strict `== true` — a stray "yes" enables neither.
+  scope :with_preview_features, -> {
+    where("preferences @> ?", { preview_features_enabled: true }.to_json)
+  }
+
   attribute :ui_layout, :string
   enum :ui_layout, { dashboard: "dashboard", intro: "intro" }, validate: true, prefix: true
 
@@ -314,6 +324,16 @@ class User < ApplicationRecord
     preferences&.[]("section_order") || default_dashboard_section_order
   end
 
+  # Per-widget height preset override ("compact" | "auto" | "tall"); nil = use default.
+  def dashboard_section_height(section_key)
+    preferences&.dig("dashboard_section_layout", section_key, "height")
+  end
+
+  # Per-widget column-span override ("single" | "full"); nil = use default.
+  def dashboard_section_width(section_key)
+    preferences&.dig("dashboard_section_layout", section_key, "col_span")
+  end
+
   def update_dashboard_preferences(prefs)
     # Use pessimistic locking to ensure atomic read-modify-write
     # This prevents race conditions when multiple sections are collapsed quickly
@@ -324,7 +344,9 @@ class User < ApplicationRecord
       prefs.each do |key, value|
         if value.is_a?(Hash)
           updated_prefs[key] ||= {}
-          updated_prefs[key] = updated_prefs[key].merge(value)
+          # deep_merge so a partial update of one nested dimension (e.g. a widget's
+          # col_span) doesn't clobber a sibling dimension (e.g. its height).
+          updated_prefs[key] = updated_prefs[key].deep_merge(value)
         else
           updated_prefs[key] = value
         end
@@ -375,6 +397,10 @@ class User < ApplicationRecord
     preferences&.dig("dashboard_two_column") == true
   end
 
+  def disable_modal_click_outside?
+    preferences&.dig("disable_modal_click_outside") == true
+  end
+
   def preview_features_enabled?
     preferences&.dig("preview_features_enabled") == true
   end
@@ -440,7 +466,7 @@ class User < ApplicationRecord
     end
 
     def default_dashboard_section_order
-      %w[cashflow_sankey outflows_donut net_worth_chart balance_sheet]
+      %w[insights_feed cashflow_sankey outflows_donut net_worth_chart balance_sheet]
     end
 
     def default_reports_section_order
diff --git a/app/models/vector_store/pgvector.rb b/app/models/vector_store/pgvector.rb
index a434ec1f5..2331bd335 100644
--- a/app/models/vector_store/pgvector.rb
+++ b/app/models/vector_store/pgvector.rb
@@ -15,6 +15,25 @@ class VectorStore::Pgvector < VectorStore::Base
 
   PGVECTOR_SUPPORTED_EXTENSIONS = (VectorStore::Embeddable::TEXT_EXTENSIONS + [ ".pdf" ]).uniq.freeze
 
+  TABLE_NAME = "vector_store_chunks"
+
+  # True when this adapter can actually operate: the chunks table already
+  # exists, or the server has the pgvector extension available so
+  # ensure_schema! can provision it on first use. The Registry consults this
+  # before building the adapter, so an install without pgvector degrades to
+  # the assistant's friendly "provider_not_configured" message instead of
+  # raising raw PG errors mid-chat.
+  def self.available?
+    conn = ActiveRecord::Base.connection
+    return true if conn.table_exists?(TABLE_NAME)
+
+    conn.select_value(
+      "SELECT 1 FROM pg_available_extensions WHERE name = 'vector' LIMIT 1"
+    ).present?
+  rescue StandardError
+    false
+  end
+
   def supported_extensions
     PGVECTOR_SUPPORTED_EXTENSIONS
   end
@@ -27,6 +46,7 @@ class VectorStore::Pgvector < VectorStore::Base
 
   def delete_store(store_id:)
     with_response do
+      ensure_schema!
       connection.exec_delete(
         "DELETE FROM vector_store_chunks WHERE store_id = $1",
         "VectorStore::Pgvector DeleteStore",
@@ -37,6 +57,7 @@ class VectorStore::Pgvector < VectorStore::Base
 
   def upload_file(store_id:, file_content:, filename:)
     with_response do
+      ensure_schema!
       text = extract_text(file_content, filename)
       raise VectorStore::Error, "Could not extract text from #{filename}" if text.blank?
 
@@ -81,6 +102,7 @@ class VectorStore::Pgvector < VectorStore::Base
 
   def remove_file(store_id:, file_id:)
     with_response do
+      ensure_schema!
       connection.exec_delete(
         "DELETE FROM vector_store_chunks WHERE store_id = $1 AND file_id = $2",
         "VectorStore::Pgvector RemoveFile",
@@ -94,6 +116,7 @@ class VectorStore::Pgvector < VectorStore::Base
 
   def search(store_id:, query:, max_results: 10)
     with_response do
+      ensure_schema!
       query_vector = embed(query)
       vector_literal = "[#{query_vector.join(',')}]"
 
@@ -127,6 +150,44 @@ class VectorStore::Pgvector < VectorStore::Base
 
   private
 
+    # Provisions the chunks table on first use, mirroring the
+    # CreateVectorStoreChunks migration. Migrations cover db:migrate
+    # upgrades, but fresh installs go through db:prepare → schema:load
+    # (bin/docker-entrypoint), which marks conditional migrations as applied
+    # without running them — and the table can't live in schema.rb because it
+    # requires the vector extension. Idempotent; memoized per instance.
+    def ensure_schema!
+      return if @schema_ensured
+      if connection.table_exists?(TABLE_NAME)
+        @schema_ensured = true
+        return
+      end
+
+      connection.enable_extension("vector") unless connection.extension_enabled?("vector")
+      # if_not_exists on the DDL (not a Mutex) is the right concurrency guard
+      # here: adapter instances are built per call and never shared across
+      # threads, so the realistic race is two *processes* (e.g. web + Sidekiq)
+      # provisioning at once. IF NOT EXISTS makes the loser's DDL a no-op
+      # instead of a duplicate-relation error.
+      connection.create_table(TABLE_NAME, id: :uuid, if_not_exists: true) do |t|
+        t.string :store_id, null: false
+        t.string :file_id, null: false
+        t.string :filename
+        t.integer :chunk_index, null: false, default: 0
+        t.text :content, null: false
+        t.column :embedding, "vector(#{ENV.fetch('EMBEDDING_DIMENSIONS', '1024')})", null: false
+        t.jsonb :metadata, null: false, default: {}
+        t.timestamps null: false
+      end
+      connection.add_index TABLE_NAME, :store_id, if_not_exists: true
+      connection.add_index TABLE_NAME, :file_id, if_not_exists: true
+      connection.add_index TABLE_NAME, [ :store_id, :file_id, :chunk_index ], unique: true,
+        name: "index_vector_store_chunks_on_store_file_chunk", if_not_exists: true
+      @schema_ensured = true
+    rescue StandardError => e
+      raise VectorStore::Error, "pgvector store unavailable: #{e.message}"
+    end
+
     def connection
       ActiveRecord::Base.connection
     end
diff --git a/app/models/vector_store/registry.rb b/app/models/vector_store/registry.rb
index 10c73d770..fcc470661 100644
--- a/app/models/vector_store/registry.rb
+++ b/app/models/vector_store/registry.rb
@@ -7,8 +7,10 @@ class VectorStore::Registry
 
   class << self
     # Returns the configured adapter instance.
-    # Reads from VECTOR_STORE_PROVIDER env var, falling back to :openai
-    # when OpenAI credentials are present.
+    # Reads from VECTOR_STORE_PROVIDER env var; without an explicit override,
+    # Anthropic installs (Setting.llm_provider == "anthropic") default to
+    # :pgvector, and anything else falls back to :openai when OpenAI
+    # credentials are present.
     def adapter
       name = adapter_name
       return nil unless name
@@ -24,10 +26,27 @@ class VectorStore::Registry
       explicit = ENV["VECTOR_STORE_PROVIDER"].presence
       return explicit.to_sym if explicit && ADAPTERS.key?(explicit.to_sym)
 
-      # Default: use OpenAI when credentials are available
+      # Default routing:
+      #   - When the configured LLM provider is Anthropic (which has no hosted
+      #     vector store), fall back to the local pgvector adapter. The
+      #     Embeddable concern still pulls embeddings from EMBEDDING_URI_BASE /
+      #     OPENAI_ACCESS_TOKEN — Anthropic users typically point this at
+      #     Voyage AI, a local Ollama instance, or OpenAI embeddings.
+      #   - Otherwise, use OpenAI when credentials are available.
+      return :pgvector if Setting.llm_provider == "anthropic"
       :openai if openai_access_token.present?
     end
 
+    # True when pgvector is the effective vector store — whether set explicitly
+    # via VECTOR_STORE_PROVIDER or selected by the Anthropic default above.
+    # Single source of truth shared with the migration that provisions
+    # `vector_store_chunks`, so the table is created exactly when pgvector is in
+    # use (an Anthropic-default install would otherwise skip it and fail on the
+    # missing table).
+    def pgvector_effective?
+      adapter_name == :pgvector
+    end
+
     private
 
       def build_adapter(name)
@@ -53,6 +72,12 @@ class VectorStore::Registry
       end
 
       def build_pgvector
+        # Gate on availability (extension present, or table already created)
+        # so an Anthropic-default install on a Postgres without pgvector
+        # degrades to the assistant's "provider_not_configured" message
+        # instead of raising raw PG errors mid-chat.
+        return nil unless VectorStore::Pgvector.available?
+
         VectorStore::Pgvector.new
       end
 
diff --git a/app/models/wise_account.rb b/app/models/wise_account.rb
new file mode 100644
index 000000000..7869b867a
--- /dev/null
+++ b/app/models/wise_account.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+class WiseAccount < ApplicationRecord
+  include Encryptable
+
+  if encryption_ready?
+    encrypts :raw_payload
+    encrypts :raw_transactions_payload
+  end
+
+  belongs_to :wise_item
+
+  has_one :account_provider, as: :provider, dependent: :destroy
+  has_one :account, through: :account_provider
+
+  validates :balance_id, :currency, presence: true
+  validates :balance_id, uniqueness: { scope: :wise_item_id }
+
+  scope :unlinked, -> { left_joins(:account_provider).where(account_providers: { id: nil }) }
+
+  def current_account
+    account
+  end
+
+  def jar?
+    raw_payload&.dig("type") == "SAVINGS"
+  end
+
+  def account_subtype
+    jar? ? "savings" : Depository::DEFAULT_SUBTYPE
+  end
+
+  def upsert_wise_snapshot!(balance_data, borderless_account_id: nil, recipient_id: nil)
+    data = balance_data.with_indifferent_access
+    payload = balance_data.is_a?(Hash) ? balance_data.dup : balance_data
+    payload = payload.merge("borderless_account_id" => borderless_account_id) if borderless_account_id
+    payload = payload.merge("recipient_id" => recipient_id) if recipient_id
+
+    currency_code = data.dig(:amount, :currency).presence || data[:currency].presence || currency
+    savings = data[:type] == "SAVINGS"
+    balance_value = savings ? data.dig(:totalWorth, :value).to_d : data.dig(:amount, :value).to_d
+    api_name = data[:name].presence
+    default_name = savings ? "Wise JAR #{currency_code}" : "Wise #{currency_code}"
+
+    update!(
+      current_balance: balance_value,
+      reserved_balance: data.dig(:reservedAmount, :value).to_d,
+      currency: currency_code,
+      name: name.presence || api_name || default_name,
+      raw_payload: payload
+    )
+  end
+
+  def upsert_wise_transactions_snapshot!(transactions)
+    update!(raw_transactions_payload: transactions)
+  end
+end
diff --git a/app/models/wise_account/processor.rb b/app/models/wise_account/processor.rb
new file mode 100644
index 000000000..82105a0de
--- /dev/null
+++ b/app/models/wise_account/processor.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class WiseAccount::Processor
+  attr_reader :wise_account
+
+  def initialize(wise_account)
+    @wise_account = wise_account
+  end
+
+  def process
+    unless wise_account.current_account.present?
+      Rails.logger.info "WiseAccount::Processor - No linked account for wise_account #{wise_account.id}, skipping"
+      return
+    end
+
+    process_account!
+    process_transactions
+  rescue StandardError => e
+    Rails.logger.error "WiseAccount::Processor - Failed to process account #{wise_account.id}: #{e.message}"
+    Sentry.capture_exception(e) { |s| s.set_tags(wise_account_id: wise_account.id) }
+    raise
+  end
+
+  private
+
+    def process_account!
+      account = wise_account.current_account
+      balance = wise_account.current_balance || 0
+
+      account.update!(
+        balance: balance,
+        cash_balance: balance,
+        currency: wise_account.currency
+      )
+    end
+
+    def process_transactions
+      WiseAccount::Transactions::Processor.new(wise_account).process
+    rescue StandardError => e
+      Rails.logger.error "WiseAccount::Processor - Failed to process transactions for wise_account #{wise_account.id}: #{e.message}"
+      Rails.logger.error Array(e.backtrace).first(10).join("\n")
+      Sentry.capture_exception(e) { |s| s.set_tags(wise_account_id: wise_account.id) }
+    end
+end
diff --git a/app/models/wise_account/transactions/processor.rb b/app/models/wise_account/transactions/processor.rb
new file mode 100644
index 000000000..d8bd176d2
--- /dev/null
+++ b/app/models/wise_account/transactions/processor.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class WiseAccount::Transactions::Processor
+  attr_reader :wise_account
+
+  def initialize(wise_account)
+    @wise_account = wise_account
+  end
+
+  def process
+    unless wise_account.raw_transactions_payload.present?
+      Rails.logger.info "WiseAccount::Transactions::Processor - No transactions for wise_account #{wise_account.id}"
+      return { success: true, total: 0, imported: 0, skipped: 0, failed: 0, errors: [] }
+    end
+
+    total = wise_account.raw_transactions_payload.count
+    Rails.logger.info "WiseAccount::Transactions::Processor - Processing #{total} transactions for wise_account #{wise_account.id}"
+
+    imported = 0
+    failed = 0
+    skipped = 0
+    errors = []
+
+    wise_account.raw_transactions_payload.each_with_index do |tx_data, index|
+      # Activities (from the Wise activities API) carry a "type" field; transfers do not.
+      processor_class = tx_data["type"].present? ? WiseActivity::Processor : WiseEntry::Processor
+      result = processor_class.new(tx_data, wise_account: wise_account).process
+
+      case result
+      when :skipped
+        skipped += 1
+      when nil
+        failed += 1
+        errors << { index: index, error: "No transaction imported" }
+      else
+        imported += 1
+      end
+    rescue ArgumentError => e
+      failed += 1
+      Rails.logger.error "WiseAccount::Transactions::Processor - Validation error at index #{index}: #{e.message}"
+      errors << { index: index, error: e.message }
+    rescue => e
+      failed += 1
+      Rails.logger.error "WiseAccount::Transactions::Processor - Error at index #{index}: #{e.class} - #{e.message}"
+      Rails.logger.error Array(e.backtrace).first(10).join("\n")
+      errors << { index: index, error: "#{e.class}: #{e.message}" }
+    end
+
+    Rails.logger.info "WiseAccount::Transactions::Processor - Done: #{imported} imported, #{skipped} skipped, #{failed} failed"
+
+    { success: failed == 0, total: total, imported: imported, skipped: skipped, failed: failed, errors: errors }
+  end
+end
diff --git a/app/models/wise_activity/processor.rb b/app/models/wise_activity/processor.rb
new file mode 100644
index 000000000..e58d5c9df
--- /dev/null
+++ b/app/models/wise_activity/processor.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+class WiseActivity::Processor
+  JAR_ACTIVITY_TYPES = %w[INTERBALANCE BALANCE_CASHBACK BALANCE_ASSET_FEE].freeze
+
+  def initialize(activity, wise_account:)
+    @activity = activity.with_indifferent_access
+    @wise_account = wise_account
+  end
+
+  def process
+    unless account.present?
+      Rails.logger.warn "WiseActivity::Processor - No linked account for wise_account #{wise_account.id}, skipping #{safe_id}"
+      return :skipped
+    end
+
+    import_adapter.import_transaction(
+      external_id: external_id,
+      amount: amount,
+      currency: currency,
+      date: date,
+      name: name,
+      source: "wise",
+      extra: extra
+    )
+  rescue ArgumentError => e
+    Rails.logger.error "WiseActivity::Processor - Validation error for activity #{safe_id}: #{e.message}"
+    raise
+  rescue => e
+    Rails.logger.error "WiseActivity::Processor - Error for activity #{safe_id}: #{e.class} - #{e.message}"
+    raise
+  end
+
+  private
+
+    attr_reader :activity, :wise_account
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    def account
+      @account ||= wise_account.current_account
+    end
+
+    # INTERBALANCE uses resource_id so both sides can be matched for Transfer linking.
+    # Other activity types use the opaque activity id.
+    def external_id
+      if activity_type == "INTERBALANCE"
+        side = wise_account.jar? ? "inflow" : "outflow"
+        "wise_interbalance_#{resource_id}_#{side}"
+      else
+        "wise_activity_#{activity[:id]}"
+      end
+    end
+
+    def safe_id
+      activity[:id].presence || "unknown"
+    end
+
+    def activity_type
+      activity[:type].to_s
+    end
+
+    def resource_id
+      activity.dig(:resource, :id).to_s
+    end
+
+    # Expenses (outflow) → positive in Sure.
+    # Incomes (inflow / interest) → negative in Sure.
+    def amount
+      raw = parse_amount
+      case activity_type
+      when "BALANCE_ASSET_FEE"
+        raw.abs   # fee = outflow = positive (expense)
+      when "INTERBALANCE"
+        if wise_account.jar?
+          # JAR perspective: "To Jar" = deposit (income, negative)
+          deposit_direction? ? -raw.abs : raw.abs
+        else
+          # STANDARD perspective: "To Jar" = outflow (expense, positive)
+          deposit_direction? ? raw.abs : -raw.abs
+        end
+      else
+        -raw.abs  # BALANCE_CASHBACK / interest → income (negative)
+      end
+    end
+
+    # True when the activity title indicates money flowing INTO the JAR.
+    def deposit_direction?
+      title = strip_html(activity[:title]).downcase
+      title.start_with?("to") || title.include?("received") || title.include?("added")
+    end
+
+    def currency
+      parse_currency || wise_account.currency
+    end
+
+    def name
+      jar_name = wise_account.jar? ? (wise_account.raw_payload&.dig("name") || "Jar") : nil
+
+      case activity_type
+      when "INTERBALANCE"
+        if wise_account.jar?
+          deposit_direction? ? I18n.t("wise_items.activities.jar_deposit") : I18n.t("wise_items.activities.jar_withdrawal")
+        else
+          deposit_direction? ? I18n.t("wise_items.activities.transfer_to_jar", jar: jar_name_for_standard) : I18n.t("wise_items.activities.transfer_from_jar", jar: jar_name_for_standard)
+        end
+      when "BALANCE_CASHBACK"
+        I18n.t("wise_items.activities.interest")
+      when "BALANCE_ASSET_FEE"
+        I18n.t("wise_items.activities.asset_fee")
+      else
+        strip_html(activity[:title]).strip.presence ||
+          I18n.t("wise_items.activities.default_name")
+      end
+    end
+
+    def jar_name_for_standard
+      activity[:title].to_s.scan(/<strong>([^<]+)<\/strong>/).flatten.last || "Jar"
+    end
+
+    def date
+      raw = activity[:createdOn].presence
+      raise ArgumentError, "Activity missing createdOn" unless raw
+      DateTime.parse(raw).to_date
+    end
+
+    def extra
+      {
+        wise: {
+          activity_id: activity[:id],
+          activity_type: activity_type,
+          resource_type: activity.dig(:resource, :type),
+          resource_id: resource_id.presence
+        }.compact
+      }
+    end
+
+    # Parses the numeric amount from strings like:
+    #   "1,000 EUR"                          → 1000.0
+    #   "<positive>+ 1.12 EUR</positive>"    → 1.12
+    #   "0.83 EUR"                           → 0.83
+    def parse_amount
+      stripped = strip_html(activity[:primaryAmount]).strip
+      stripped.scan(/[\d,]+\.?\d*/).first.to_s.delete(",").to_d
+    end
+
+    def parse_currency
+      activity[:primaryAmount].to_s.scan(/\b[A-Z]{3}\b/).first
+    end
+
+    def strip_html(str)
+      ActionController::Base.helpers.strip_tags(str.to_s)
+    end
+end
diff --git a/app/models/wise_entry/processor.rb b/app/models/wise_entry/processor.rb
new file mode 100644
index 000000000..af4fe2c81
--- /dev/null
+++ b/app/models/wise_entry/processor.rb
@@ -0,0 +1,186 @@
+# frozen_string_literal: true
+
+class WiseEntry::Processor
+  # Statuses Wise uses for outgoing transfers (money leaves the Wise balance).
+  OUTGOING_STATUSES = %w[
+    processing funds_converted outgoing_payment_sent
+    bounced_back funds_refunded
+  ].freeze
+
+  # Statuses Wise uses for incoming transfers (money arrives in the Wise balance).
+  INCOMING_STATUSES = %w[
+    incoming_payment_waiting incoming_payment_received
+    funds_credited credited
+  ].freeze
+
+  def initialize(wise_transaction, wise_account:)
+    @wise_transaction = wise_transaction
+    @wise_account = wise_account
+  end
+
+  def process
+    unless account.present?
+      Rails.logger.warn "WiseEntry::Processor - No linked account for wise_account #{wise_account.id}, skipping #{safe_id}"
+      return :skipped
+    end
+
+    result = import_main_transaction
+
+    if fee > 0
+      begin
+        import_fee_transaction
+      rescue StandardError => e
+        Rails.logger.warn "WiseEntry::Processor - Fee transaction failed for transfer #{safe_id}: #{e.message}"
+      end
+    end
+
+    result
+  rescue ArgumentError => e
+    Rails.logger.error "WiseEntry::Processor - Validation error for transfer #{safe_id}: #{e.message}"
+    raise
+  rescue => e
+    Rails.logger.error "WiseEntry::Processor - Unexpected error for transfer #{safe_id}: #{e.class} - #{e.message}"
+    raise
+  end
+
+  private
+
+    attr_reader :wise_transaction, :wise_account
+
+    def data
+      @data ||= wise_transaction.with_indifferent_access
+    end
+
+    def import_adapter
+      @import_adapter ||= Account::ProviderImportAdapter.new(account)
+    end
+
+    def account
+      @account ||= wise_account.current_account
+    end
+
+    def import_main_transaction
+      import_adapter.import_transaction(
+        external_id: "wise_transfer_#{transfer_id}",
+        amount: main_amount,
+        currency: source_currency,
+        date: date,
+        name: name,
+        source: "wise",
+        extra: extra
+      )
+    end
+
+    def import_fee_transaction
+      import_adapter.import_transaction(
+        external_id: "wise_fee_#{transfer_id}",
+        amount: fee,
+        currency: source_currency,
+        date: date,
+        name: I18n.t("wise_items.entries.fee_name"),
+        source: "wise",
+        extra: { wise: { transfer_id: transfer_id, type: "FEE" } }
+      )
+    end
+
+    def transfer_id
+      data[:id].presence.tap { |id| raise ArgumentError, "Wise transfer missing id" unless id }
+    end
+
+    def safe_id
+      data[:id].presence || "unknown"
+    end
+
+    def name
+      ref = data.dig(:details, :reference).presence || data[:reference].presence
+      ref.present? ? ref : I18n.t("wise_items.entries.default_name")
+    end
+
+    # Expenses (outgoing) → positive amount in Sure convention.
+    # Incomes (incoming)  → negative amount in Sure convention.
+    # Incoming cross-currency transfers use targetValue (what actually arrived) not sourceValue.
+    def main_amount
+      if outgoing?
+        data[:sourceValue].to_d.abs
+      else
+        -(data[:targetValue].to_d.abs)
+      end
+    end
+
+    # Fee is the difference between what was debited and what the recipient received,
+    # only applicable for same-currency transfers.
+    def fee
+      @fee ||= begin
+        return 0 unless source_currency == target_currency
+
+        diff = (data[:sourceValue].to_d - data[:targetValue].to_d).round(4)
+        diff > 0 ? diff : 0
+      end
+    end
+
+    def source_currency
+      data[:sourceCurrency].presence || wise_account.currency
+    end
+
+    def target_currency
+      data[:targetCurrency].presence || wise_account.currency
+    end
+
+    # An expense if targetAccount does NOT match our Wise recipientId
+    # (i.e. money went TO an external account, not to us).
+    # An income if targetAccount == recipientId (money arrived at our Wise account).
+    # Falls back to status-based detection when no recipientId is stored.
+    def outgoing?
+      recipient_id = wise_account.raw_payload&.dig("recipient_id")
+
+      if recipient_id.present?
+        return data[:targetAccount].to_s != recipient_id.to_s
+      end
+
+      # Status-based fallback
+      status = data[:status].to_s.downcase
+      return false if INCOMING_STATUSES.any? { |s| status.include?(s) }
+      return true  if OUTGOING_STATUSES.any? { |s| status.include?(s) }
+
+      true
+    end
+
+    def date
+      raw = data[:created].presence
+      raise ArgumentError, "Wise transfer missing created date" unless raw
+
+      case raw
+      when String
+        if raw.include?("T") || raw.include?(":")
+          Time.parse(raw).in_time_zone(account&.family&.timezone).to_date
+        else
+          Date.parse(raw)
+        end
+      when Time, DateTime
+        raw.in_time_zone(account&.family&.timezone).to_date
+      when Date then raw
+      else raise ArgumentError, "Invalid date format: #{raw.inspect}"
+      end
+    rescue ArgumentError
+      raise
+    rescue => e
+      raise ArgumentError, "Unable to parse date #{raw.inspect}: #{e.message}"
+    end
+
+    def extra
+      {
+        wise: {
+          transfer_id: transfer_id,
+          status: data[:status],
+          direction: outgoing? ? "outgoing" : "incoming",
+          source_currency: source_currency,
+          source_value: data[:sourceValue],
+          target_currency: target_currency,
+          target_value: data[:targetValue],
+          rate: data[:rate],
+          fee: fee > 0 ? fee : nil,
+          reference: data.dig(:details, :reference).presence || data[:reference]
+        }.compact
+      }
+    end
+end
diff --git a/app/models/wise_item.rb b/app/models/wise_item.rb
new file mode 100644
index 000000000..7684f1e6c
--- /dev/null
+++ b/app/models/wise_item.rb
@@ -0,0 +1,166 @@
+# frozen_string_literal: true
+
+class WiseItem < ApplicationRecord
+  include Syncable, Provided, Unlinking, Encryptable
+
+  enum :status, { good: "good", requires_update: "requires_update" }, default: :good
+  enum :profile_type, { personal: "personal", business: "business" }
+
+  if encryption_ready?
+    encrypts :token, deterministic: true
+    encrypts :raw_payload
+  end
+
+  validates :name, :profile_id, :profile_type, presence: true
+  validates :token, presence: true, on: :create
+  validates :profile_id, uniqueness: { scope: :family_id }
+
+  before_validation :normalize_token
+
+  belongs_to :family
+
+  has_many :wise_accounts, dependent: :destroy
+  has_many :accounts, through: :wise_accounts
+
+  scope :active, -> { where(scheduled_for_deletion: false) }
+  scope :syncable, -> { active }
+  scope :ordered, -> { order(created_at: :desc) }
+  scope :needs_update, -> { where(status: :requires_update) }
+
+  def destroy_later
+    update!(scheduled_for_deletion: true)
+    DestroyJob.perform_later(self)
+  end
+
+  def import_latest_wise_data(sync_start_date: nil)
+    provider = wise_provider
+    unless provider
+      Rails.logger.error "WiseItem #{id} - Cannot import: provider not configured"
+      raise Provider::Wise::WiseError.new("Wise provider is not configured", :not_configured)
+    end
+
+    WiseItem::Importer.new(self, wise_provider: provider, sync_start_date: sync_start_date).import
+  rescue => e
+    Rails.logger.error "WiseItem #{id} - Failed to import data: #{e.message}"
+    raise
+  end
+
+  def process_accounts
+    return [] if wise_accounts.empty?
+
+    results = []
+    wise_accounts.joins(:account).merge(Account.visible).each do |wise_account|
+      begin
+        result = WiseAccount::Processor.new(wise_account).process
+        results << { wise_account_id: wise_account.id, success: true, result: result }
+      rescue => e
+        Rails.logger.error "WiseItem #{id} - Failed to process account #{wise_account.id}: #{e.message}"
+        results << { wise_account_id: wise_account.id, success: false, error: e.message }
+      end
+    end
+
+    results
+  end
+
+  # Finds interbalance entry pairs (JAR inflow ↔ STANDARD outflow) and links them as Transfers.
+  def link_jar_transfers!
+    account_ids = accounts.pluck(:id)
+    return if account_ids.empty?
+
+    inflow_entries = Entry.where(source: "wise", account_id: account_ids)
+                         .where("external_id LIKE 'wise_interbalance_%_inflow'")
+
+    inflow_entries.each do |inflow_entry|
+      resource_id = inflow_entry.external_id.sub("wise_interbalance_", "").sub("_inflow", "")
+      outflow_entry = Entry.where(source: "wise", account_id: account_ids,
+                                  external_id: "wise_interbalance_#{resource_id}_outflow").first
+
+      next unless outflow_entry
+      next unless inflow_entry.entryable.is_a?(Transaction) && outflow_entry.entryable.is_a?(Transaction)
+
+      inflow_txn  = inflow_entry.entryable
+      outflow_txn = outflow_entry.entryable
+
+      next if Transfer.exists?(inflow_transaction_id: inflow_txn.id)
+      next if Transfer.exists?(outflow_transaction_id: outflow_txn.id)
+
+      transfer = Transfer.new(inflow_transaction: inflow_txn, outflow_transaction: outflow_txn, status: "confirmed")
+      unless transfer.save
+        Rails.logger.warn "WiseItem #{id} - Could not link interbalance #{resource_id}: #{transfer.errors.full_messages.join(", ")}"
+      end
+    rescue => e
+      Rails.logger.error "WiseItem #{id} - Error linking interbalance #{resource_id}: #{e.message}"
+    end
+  end
+
+  def schedule_account_syncs(parent_sync: nil, window_start_date: nil, window_end_date: nil)
+    return [] if accounts.empty?
+
+    results = []
+    accounts.visible.each do |account|
+      begin
+        account.sync_later(
+          parent_sync: parent_sync,
+          window_start_date: window_start_date,
+          window_end_date: window_end_date
+        )
+        results << { account_id: account.id, success: true }
+      rescue => e
+        Rails.logger.error "WiseItem #{id} - Failed to schedule sync for account #{account.id}: #{e.message}"
+        results << { account_id: account.id, success: false, error: e.message }
+      end
+    end
+
+    results
+  end
+
+  def has_completed_initial_setup?
+    accounts.any?
+  end
+
+  def credentials_configured?
+    token.to_s.strip.present?
+  end
+
+  def sync_status_summary
+    total = total_accounts_count
+    linked = linked_accounts_count
+    unlinked = unlinked_accounts_count
+
+    if total == 0
+      I18n.t("wise_items.sync_status.no_accounts")
+    elsif unlinked == 0
+      I18n.t("wise_items.sync_status.all_synced", count: linked)
+    else
+      I18n.t("wise_items.sync_status.partial_setup", synced: linked, pending: unlinked)
+    end
+  end
+
+  def linked_accounts_count
+    wise_accounts.joins(:account_provider).count
+  end
+
+  def unlinked_accounts_count
+    wise_accounts.left_joins(:account_provider).where(account_providers: { id: nil }).count
+  end
+
+  def total_accounts_count
+    wise_accounts.count
+  end
+
+  def institution_display_name
+    "Wise"
+  end
+
+  def wise_provider
+    return nil unless credentials_configured?
+
+    Provider::Wise.new(token.to_s.strip, base_url: Rails.configuration.x.wise.base_url)
+  end
+
+  private
+
+    def normalize_token
+      self.token = token&.strip
+    end
+end
diff --git a/app/models/wise_item/importer.rb b/app/models/wise_item/importer.rb
new file mode 100644
index 000000000..09ef7d954
--- /dev/null
+++ b/app/models/wise_item/importer.rb
@@ -0,0 +1,331 @@
+# frozen_string_literal: true
+
+class WiseItem::Importer
+  DEFAULT_HISTORY_DAYS = 90
+
+  attr_reader :wise_item, :wise_provider, :sync_start_date
+
+  def initialize(wise_item, wise_provider:, sync_start_date: nil)
+    @wise_item = wise_item
+    @wise_provider = wise_provider
+    @sync_start_date = sync_start_date
+  end
+
+  def import
+    Rails.logger.info "WiseItem::Importer - Starting import for item #{wise_item.id} (profile #{wise_item.profile_id})"
+
+    balances = fetch_balances
+    return failed_result("Failed to fetch balances") if balances.nil?
+
+    savings_balances = fetch_savings_balances
+    all_balances = Array(balances) + Array(savings_balances)
+
+    borderless_accounts = fetch_borderless_accounts
+    account_result = import_balances(all_balances, borderless_accounts: borderless_accounts)
+
+    transfers = fetch_transfers
+    activities = fetch_jar_activities
+    transaction_result = store_transfers_per_account(transfers, activities: activities)
+    @interbalance_activities = activities.select { |a| a["type"] == "INTERBALANCE" }
+
+    wise_item.update!(status: :good) if account_result[:accounts_failed].zero? && transaction_result[:transactions_failed].zero?
+
+    {
+      success: account_result[:accounts_failed].zero? && transaction_result[:transactions_failed].zero?,
+      **account_result,
+      **transaction_result
+    }
+  end
+
+  private
+
+    def fetch_balances
+      wise_provider.get_balances(wise_item.profile_id)
+    rescue Provider::Wise::WiseError => e
+      if e.error_type == :not_found
+        Rails.logger.info "WiseItem::Importer - No balances for profile #{wise_item.profile_id}"
+        return []
+      end
+      mark_requires_update_if_credentials_error(e)
+      Rails.logger.error "WiseItem::Importer - Failed to fetch balances: #{e.message}"
+      nil
+    rescue => e
+      Rails.logger.error "WiseItem::Importer - Unexpected error fetching balances: #{e.class} - #{e.message}"
+      nil
+    end
+
+    def fetch_savings_balances
+      wise_provider.get_savings_balances(wise_item.profile_id)
+    rescue Provider::Wise::WiseError => e
+      Rails.logger.info "WiseItem::Importer - No savings (JAR) balances for profile #{wise_item.profile_id}: #{e.message}"
+      []
+    rescue => e
+      Rails.logger.warn "WiseItem::Importer - Unexpected error fetching savings balances: #{e.message}"
+      []
+    end
+
+    # Returns a map of { balance_id => { borderless_account_id:, recipient_id: } }.
+    # Used in WiseEntry::Processor to distinguish expenses (targetAccount != recipientId)
+    # from incomes (targetAccount == recipientId).
+    def fetch_borderless_accounts
+      result = wise_provider.get_borderless_accounts(wise_item.profile_id)
+      Array(result).each_with_object({}) do |ba, map|
+        borderless_id = ba["id"]
+        recipient_id  = ba["recipientId"]
+        Array(ba["balances"]).each do |b|
+          map[b["id"].to_s] = { borderless_account_id: borderless_id, recipient_id: recipient_id }
+        end
+      end
+    rescue => e
+      Rails.logger.warn "WiseItem::Importer - Could not fetch borderless accounts (#{e.message})"
+      {}
+    end
+
+    def import_balances(balances, borderless_accounts: {})
+      accounts_created = 0
+      accounts_updated = 0
+      accounts_failed = 0
+
+      existing_ids = wise_item.wise_accounts.pluck(:balance_id).map(&:to_s).to_set
+
+      Array(balances).each do |balance_data|
+        data = balance_data.with_indifferent_access
+        balance_id = data[:id].to_s
+        currency = data.dig(:amount, :currency).to_s
+
+        next if balance_id.blank? || currency.blank?
+
+        account_ids = borderless_accounts[balance_id] || {}
+
+        is_savings = data[:type] == "SAVINGS"
+        api_name   = data[:name].presence
+
+        wise_account = wise_item.wise_accounts.find_or_initialize_by(balance_id: balance_id)
+        wise_account.currency ||= currency
+        wise_account.name ||= api_name || (is_savings ? "Wise JAR #{currency}" : "Wise #{currency}")
+        wise_account.upsert_wise_snapshot!(
+          data,
+          borderless_account_id: account_ids[:borderless_account_id],
+          recipient_id: account_ids[:recipient_id]
+        )
+
+        if existing_ids.include?(balance_id)
+          accounts_updated += 1
+        else
+          accounts_created += 1
+          existing_ids << balance_id
+        end
+      rescue => e
+        accounts_failed += 1
+        Rails.logger.error "WiseItem::Importer - Failed to import balance #{balance_id.presence || 'unknown'}: #{e.message}"
+      end
+
+      { accounts_created: accounts_created, accounts_updated: accounts_updated, accounts_failed: accounts_failed }
+    end
+
+    # Fetches all profile activities and keeps only JAR-relevant types.
+    def fetch_jar_activities
+      cutoff = transfer_cutoff
+      activities = []
+      cursor = nil
+
+      loop do
+        result = with_rate_limit_retry { wise_provider.get_activities(wise_item.profile_id, cursor: cursor, size: 100) }
+        batch = Array(result["activities"])
+        break if batch.empty?
+
+        old_ones = batch.select { |a| parse_transfer_date(a["createdOn"]) < cutoff }
+        relevant = (batch - old_ones).select { |a| WiseActivity::Processor::JAR_ACTIVITY_TYPES.include?(a["type"]) }
+        activities.concat(relevant)
+
+        break if old_ones.any? || batch.size < 100
+
+        cursor = result["cursor"]
+        break if cursor.nil?
+      end
+
+      activities.uniq { |a| a["id"] }
+    rescue Provider::Wise::WiseError => e
+      Rails.logger.warn "WiseItem::Importer - Could not fetch activities (#{e.message})"
+      []
+    rescue => e
+      Rails.logger.warn "WiseItem::Importer - Unexpected error fetching activities: #{e.message}"
+      []
+    end
+
+    # Fetches all transfers for the profile, filtered to the sync window.
+    def fetch_transfers
+      cutoff = transfer_cutoff
+      transfers = []
+      offset = 0
+      limit = 100
+
+      loop do
+        page = with_rate_limit_retry { wise_provider.get_transfers(wise_item.profile_id, limit: limit, offset: offset) }
+        batch = Array(page.is_a?(Hash) ? page["content"] : page)
+        break if batch.empty?
+
+        # Wise returns transfers newest-first; stop once we're past the cutoff.
+        old_ones = batch.select { |t| parse_transfer_date(t["created"]) < cutoff }
+        transfers.concat(batch - old_ones)
+        break if old_ones.any? || batch.size < limit
+
+        offset += limit
+      end
+
+      transfers.uniq! { |t| t["id"] }
+      Rails.logger.info "WiseItem::Importer - Fetched #{transfers.size} transfers for profile #{wise_item.profile_id}"
+      transfers
+    rescue Provider::Wise::WiseError => e
+      Rails.logger.warn "WiseItem::Importer - Could not fetch transfers (#{e.message})"
+      []
+    rescue => e
+      Rails.logger.warn "WiseItem::Importer - Unexpected error fetching transfers: #{e.message}"
+      []
+    end
+
+    # Partitions transfers by the currency relevant to each WiseAccount:
+    # - Expenses (outgoing): matched by sourceCurrency
+    # - Incomes (incoming): matched by targetCurrency
+    # Routes transfers to STANDARD accounts and activities to JAR accounts.
+    def store_transfers_per_account(transfers, activities: [])
+      transactions_imported = 0
+      transactions_failed = 0
+
+      wise_item.wise_accounts.find_each do |wise_account|
+        if wise_account.jar?
+          jar_activities = activities.select { |a| activity_for_account?(a, wise_account) }
+          wise_account.upsert_wise_transactions_snapshot!(jar_activities)
+          transactions_imported += jar_activities.size
+        else
+          account_transfers = transfers.select do |t|
+            t["sourceCurrency"] == wise_account.currency ||
+              t["targetCurrency"] == wise_account.currency
+          end
+          # Also include INTERBALANCE activities so the standard account shows outflows to the JAR.
+          interbalance = activities.select { |a| activity_for_account?(a, wise_account) }
+          wise_account.upsert_wise_transactions_snapshot!(account_transfers + interbalance)
+          transactions_imported += account_transfers.size + interbalance.size
+        end
+      rescue => e
+        transactions_failed += 1
+        Rails.logger.error "WiseItem::Importer - Failed to store transactions for wise_account #{wise_account.id}: #{e.message}"
+      end
+
+      { transactions_imported: transactions_imported, transactions_failed: transactions_failed }
+    end
+
+    # Routes an activity to the given WiseAccount.
+    # JAR: receives INTERBALANCE where the activity title's <strong> tag matches the JAR name,
+    #      plus BALANCE_CASHBACK and BALANCE_ASSET_FEE.
+    # STANDARD: receives all INTERBALANCE activities (outflow side of JAR transfers).
+    def activity_for_account?(activity, wise_account)
+      type = activity["type"]
+
+      case type
+      when "INTERBALANCE"
+        if wise_account.jar?
+          jar_name_in_title = activity["title"].to_s.scan(/<strong>([^<]+)<\/strong>/).flatten.last.to_s.strip
+          jar_name_in_title.present? && jar_name_in_title.casecmp?(wise_account.name.to_s.strip)
+        else
+          true
+        end
+      when "BALANCE_ASSET_FEE", "BALANCE_CASHBACK"
+        wise_account.jar?
+      else
+        false
+      end
+    end
+
+    # Called after entries have been created to link interbalance pairs as Sure Transfers.
+    def link_interbalance_transfers!
+      Array(@interbalance_activities).each do |activity|
+        resource_id = activity.dig("resource", "id").to_s
+        next if resource_id.blank?
+
+        inflow_entry  = entry_by_external_id("wise_interbalance_#{resource_id}_inflow")
+        outflow_entry = entry_by_external_id("wise_interbalance_#{resource_id}_outflow")
+
+        next unless inflow_entry && outflow_entry
+
+        inflow_txn  = inflow_entry.entryable
+        outflow_txn = outflow_entry.entryable
+
+        next unless inflow_txn.is_a?(Transaction) && outflow_txn.is_a?(Transaction)
+        next if Transfer.exists?(inflow_transaction_id: inflow_txn.id)
+        next if Transfer.exists?(outflow_transaction_id: outflow_txn.id)
+
+        transfer = Transfer.new(
+          inflow_transaction: inflow_txn,
+          outflow_transaction: outflow_txn,
+          status: "confirmed"
+        )
+
+        unless transfer.save
+          Rails.logger.warn "WiseItem::Importer - Could not link interbalance #{resource_id}: #{transfer.errors.full_messages.join(", ")}"
+        end
+      rescue => e
+        Rails.logger.error "WiseItem::Importer - Error linking interbalance #{resource_id}: #{e.message}"
+      end
+    end
+
+    def entry_by_external_id(external_id)
+      Entry.joins(account: :account_providers)
+           .where(external_id: external_id, source: "wise")
+           .where(account_providers: { provider_type: "WiseAccount" })
+           .joins("INNER JOIN wise_accounts ON wise_accounts.id = account_providers.provider_id")
+           .where(wise_accounts: { wise_item_id: wise_item.id })
+           .first
+    end
+
+    def with_rate_limit_retry(max_retries: 3)
+      retries = 0
+      begin
+        yield
+      rescue Provider::Wise::WiseError => e
+        raise unless e.error_type == :rate_limited && retries < max_retries
+        retries += 1
+        sleep(2 ** retries)
+        retry
+      end
+    end
+
+    def transfer_cutoff
+      # Use last_synced_at only if we actually have stored transfers — otherwise fall back to full history.
+      has_stored_transfers = wise_item.wise_accounts.any? { |wa| wa.raw_transactions_payload.present? }
+
+      if has_stored_transfers && wise_item.last_synced_at.present?
+        wise_item.last_synced_at - 7.days
+      elsif sync_start_date.present?
+        sync_start_date.to_time
+      else
+        DEFAULT_HISTORY_DAYS.days.ago
+      end
+    end
+
+    def parse_transfer_date(raw)
+      DateTime.parse(raw.to_s).to_time
+    rescue
+      Time.current
+    end
+
+    def mark_requires_update_if_credentials_error(error)
+      return unless error.is_a?(Provider::Wise::WiseError) && error.error_type.in?([ :unauthorized, :access_forbidden ])
+
+      wise_item.update!(status: :requires_update)
+    rescue => e
+      Rails.logger.error "WiseItem::Importer - Failed to update item status: #{e.message}"
+    end
+
+    def failed_result(error)
+      {
+        success: false,
+        error: error,
+        accounts_created: 0,
+        accounts_updated: 0,
+        accounts_failed: 0,
+        transactions_imported: 0,
+        transactions_failed: 0
+      }
+    end
+end
diff --git a/app/models/wise_item/provided.rb b/app/models/wise_item/provided.rb
new file mode 100644
index 000000000..db51cb89a
--- /dev/null
+++ b/app/models/wise_item/provided.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module WiseItem::Provided
+  extend ActiveSupport::Concern
+
+  def syncer
+    WiseItem::Syncer.new(self)
+  end
+end
diff --git a/app/models/wise_item/sync_complete_event.rb b/app/models/wise_item/sync_complete_event.rb
new file mode 100644
index 000000000..49d24fa43
--- /dev/null
+++ b/app/models/wise_item/sync_complete_event.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class WiseItem::SyncCompleteEvent
+  attr_reader :wise_item
+
+  def initialize(wise_item)
+    @wise_item = wise_item
+  end
+
+  def broadcast
+    wise_item.accounts.each do |account|
+      account.broadcast_sync_complete
+    end
+
+    wise_item.broadcast_replace_to(
+      wise_item.family,
+      target: dom_id(wise_item),
+      partial: "wise_items/wise_item",
+      locals: { wise_item: wise_item }
+    )
+
+    wise_item.family.broadcast_sync_complete
+  end
+
+  private
+
+    def dom_id(record)
+      "#{record.class.name.underscore}_#{record.id}"
+    end
+end
diff --git a/app/models/wise_item/syncer.rb b/app/models/wise_item/syncer.rb
new file mode 100644
index 000000000..d72f6a27c
--- /dev/null
+++ b/app/models/wise_item/syncer.rb
@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+class WiseItem::Syncer
+  include SyncStats::Collector
+
+  SafeSyncError = Class.new(StandardError)
+
+  attr_reader :wise_item
+
+  def initialize(wise_item)
+    @wise_item = wise_item
+  end
+
+  def perform_sync(sync)
+    sync_errors = []
+
+    # Phase 1: Import balances and transactions from Wise API
+    update_status(sync, :importing_accounts)
+    import_result = wise_item.import_latest_wise_data(sync_start_date: sync.window_start_date)
+    sync_errors.concat(import_result_errors(import_result))
+
+    # Phase 2: Collect setup statistics
+    update_status(sync, :checking_account_configuration)
+
+    linked_count = wise_item.linked_accounts_count
+    unlinked_count = wise_item.unlinked_accounts_count
+    total_count = linked_count + unlinked_count
+
+    collect_wise_setup_stats(sync, total_count: total_count, linked_count: linked_count, unlinked_count: unlinked_count)
+
+    if unlinked_count.positive?
+      wise_item.update!(pending_account_setup: true)
+      update_status(sync, :accounts_need_setup, count: unlinked_count)
+    else
+      wise_item.update!(pending_account_setup: false)
+    end
+
+    # Phase 3: Process transactions for linked accounts
+    if linked_count.positive?
+      update_status(sync, :processing_transactions)
+      mark_import_started(sync)
+      process_results = wise_item.process_accounts
+      sync_errors.concat(result_failure_errors(process_results, category: :account_processing_error, message_key: :account_processing_failed))
+
+      wise_item.link_jar_transfers!
+
+      # Phase 4: Schedule balance calculations
+      update_status(sync, :calculating_balances)
+      schedule_results = wise_item.schedule_account_syncs(
+        parent_sync: sync,
+        window_start_date: sync.window_start_date,
+        window_end_date: sync.window_end_date
+      )
+      sync_errors.concat(result_failure_errors(schedule_results, category: :account_sync_error, message_key: :account_sync_failed))
+
+      # Phase 5: Collect transaction statistics
+      account_ids = wise_item.wise_accounts
+                             .joins(:account_provider)
+                             .includes(account_provider: :account)
+                             .filter_map { |wa| wa.current_account&.id }
+      collect_transaction_stats(sync, account_ids: account_ids, source: "wise")
+    end
+
+    collect_health_stats(sync, errors: sync_errors.presence)
+  rescue => e
+    safe_message = user_safe_error_message(e)
+    Rails.logger.error "WiseItem::Syncer - sync failed for item #{wise_item.id}: #{e.class} - #{e.message}"
+    Rails.logger.error Array(e.backtrace).first(10).join("\n")
+    Sentry.capture_exception(e) { |s| s.set_tags(wise_item_id: wise_item.id) }
+    collect_health_stats(sync, errors: [ { message: safe_message, category: "sync_error" } ])
+    raise SafeSyncError, safe_message
+  end
+
+  def perform_post_sync
+    # no-op
+  end
+
+  private
+
+    def update_status(sync, key, **options)
+      return unless sync.respond_to?(:status_text)
+
+      sync.update!(status_text: I18n.t("wise_items.syncer.#{key}", **options))
+    end
+
+    def collect_wise_setup_stats(sync, total_count:, linked_count:, unlinked_count:)
+      return unless sync.respond_to?(:sync_stats)
+
+      merge_sync_stats(sync, {
+        "total_accounts" => total_count,
+        "linked_accounts" => linked_count,
+        "unlinked_accounts" => unlinked_count
+      })
+    end
+
+    def import_result_errors(result)
+      return [] if result.is_a?(Hash) && result[:success]
+
+      return [ sync_error(:import_error, :import_failed) ] unless result.is_a?(Hash)
+
+      errors = []
+      errors << sync_error(:account_import_error, :accounts_failed, count: result[:accounts_failed]) if result[:accounts_failed].to_i.positive?
+      errors << sync_error(:transaction_import_error, :transactions_failed, count: result[:transactions_failed]) if result[:transactions_failed].to_i.positive?
+      errors << sync_error(:import_error, :import_failed) if errors.empty?
+      errors
+    end
+
+    def result_failure_errors(results, category:, message_key:)
+      failed = Array(results).count { |r| r.is_a?(Hash) && r[:success] == false }
+      return [] unless failed.positive?
+
+      [ sync_error(category, message_key, count: failed) ]
+    end
+
+    def sync_error(category, message_key, **options)
+      {
+        message: I18n.t("wise_items.syncer.#{message_key}", **options),
+        category: category.to_s
+      }
+    end
+
+    def user_safe_error_message(error)
+      if error.is_a?(Provider::Wise::WiseError) && error.error_type.in?([ :unauthorized, :access_forbidden ])
+        I18n.t("wise_items.syncer.credentials_invalid")
+      else
+        I18n.t("wise_items.syncer.failed")
+      end
+    end
+end
diff --git a/app/models/wise_item/unlinking.rb b/app/models/wise_item/unlinking.rb
new file mode 100644
index 000000000..1634b74c9
--- /dev/null
+++ b/app/models/wise_item/unlinking.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module WiseItem::Unlinking
+  extend ActiveSupport::Concern
+
+  def unlink_all!(dry_run: false)
+    results = []
+
+    wise_accounts.find_each do |provider_account|
+      links = AccountProvider.where(provider_type: "WiseAccount", provider_id: provider_account.id).to_a
+      link_ids = links.map(&:id)
+      result = {
+        provider_account_id: provider_account.id,
+        name: provider_account.name,
+        provider_link_ids: link_ids
+      }
+      results << result
+
+      next if dry_run
+
+      begin
+        ActiveRecord::Base.transaction do
+          if link_ids.any?
+            Holding.where(account_provider_id: link_ids).update_all(account_provider_id: nil)
+          end
+
+          links.each(&:destroy!)
+        end
+      rescue StandardError => e
+        Rails.logger.warn(
+          "WiseItem Unlinker: failed to fully unlink provider account ##{provider_account.id} (links=#{link_ids.inspect}): #{e.class} - #{e.message}"
+        )
+        result[:error] = e.message
+        raise
+      end
+    end
+
+    results
+  end
+end
diff --git a/app/models/ynab_import.rb b/app/models/ynab_import.rb
new file mode 100644
index 000000000..01b679df1
--- /dev/null
+++ b/app/models/ynab_import.rb
@@ -0,0 +1,162 @@
+class YnabImport < Import
+  after_create :set_mappings
+
+  DEFAULT_COLUMN_MAPPINGS = {
+    signage_convention: "inflows_positive",
+    date_col_label: "Date",
+    date_format: "%m/%d/%Y",
+    name_col_label: "Payee",
+    account_col_label: "Account",
+    category_col_label: "Category",
+    notes_col_label: "Memo"
+  }.freeze
+
+  # YNAB register exports always use these literal headers; they aren't surfaced as
+  # remappable column labels because the amount and category are derived from them.
+  OUTFLOW_COLUMN = "Outflow".freeze
+  INFLOW_COLUMN = "Inflow".freeze
+  # Modern (web) YNAB carries a pre-combined column plus the split group/leaf pair.
+  COMBINED_CATEGORY_COLUMN = "Category Group/Category".freeze
+  CATEGORY_GROUP_COLUMN = "Category Group".freeze
+  # Legacy YNAB 4 (classic) exports split the category differently.
+  MASTER_CATEGORY_COLUMN = "Master Category".freeze
+  SUB_CATEGORY_COLUMN = "Sub Category".freeze
+
+  def self.default_column_mappings
+    DEFAULT_COLUMN_MAPPINGS
+  end
+
+  def generate_rows_from_csv
+    rows.destroy_all
+
+    mapped_rows = csv_rows.map.with_index(1) do |row, index|
+      {
+        source_row_number: index,
+        account: csv_value(row, account_col_label, "account", "account_name").to_s,
+        date: csv_value(row, date_col_label, "date").to_s,
+        amount: signed_csv_amount(row).to_s,
+        currency: default_currency.to_s,
+        name: row_name(row),
+        category: combined_category(row),
+        notes: csv_value(row, notes_col_label, "notes", "memo").to_s
+      }
+    end
+
+    rows.insert_all!(mapped_rows)
+    update_column(:rows_count, rows.count)
+  end
+
+  def import!
+    transaction do
+      mappings.each(&:create_mappable!)
+
+      rows.each do |row|
+        account = mappings.accounts.mappable_for(row.account)
+        category = mappings.categories.mappable_for(row.category)
+
+        entry = account.entries.build \
+          date: row.date_iso,
+          amount: row.signed_amount,
+          name: row.name,
+          currency: account.currency.presence || family.currency,
+          notes: row.notes,
+          entryable: Transaction.new(category: category),
+          import: self
+
+        entry.save!
+      end
+    end
+  end
+
+  def mapping_steps
+    [ Import::CategoryMapping, Import::AccountMapping ]
+  end
+
+  def required_column_keys
+    %i[date amount]
+  end
+
+  def column_keys
+    %i[date name category account notes]
+  end
+
+  def csv_template
+    template = <<~CSV
+      Account,Flag,Date,Payee,Category Group/Category,Category Group,Category,Memo,Outflow,Inflow,Cleared
+      Checking,,01/01/2024,Employer,Income: Paycheck,Income,Paycheck,Monthly salary,$0.00,$2500.00,Cleared
+      Credit Card,,01/03/2024,Coffee Shop,Dining Out: Coffee,Dining Out,Coffee,Morning coffee,$4.25,$0.00,Uncleared
+    CSV
+
+    CSV.parse(template, headers: true)
+  end
+
+  # YNAB splits money movement across Outflow and Inflow columns (positive
+  # magnitudes) rather than a single signed amount. Combine them into the
+  # "inflows positive" convention the framework expects — Import::Row reverses it
+  # to Sure's internal "outflows positive" signage. A single signed Amount column,
+  # when present, takes precedence (some hand-built exports use one).
+  def signed_csv_amount(csv_row)
+    explicit = csv_value(csv_row, amount_col_label.presence || "Amount")
+    return sanitize_number(explicit).to_d if explicit.present?
+
+    # If the file exposes no recognizable amount source (wrong file or renamed
+    # headers), leave the amount blank so the required-column validation blocks the
+    # import rather than silently creating zero-dollar entries.
+    return nil unless amount_source_columns?
+
+    inflow  = sanitize_number(csv_value(csv_row, INFLOW_COLUMN)).to_d
+    outflow = sanitize_number(csv_value(csv_row, OUTFLOW_COLUMN)).to_d
+
+    inflow - outflow.abs
+  end
+
+  private
+    def set_mappings
+      assign_attributes(self.class.default_column_mappings)
+      save!
+    end
+
+    # True when the uploaded file has at least one column the amount can be derived
+    # from: Outflow, Inflow, or a single signed Amount.
+    def amount_source_columns?
+      header_for(OUTFLOW_COLUMN).present? ||
+        header_for(INFLOW_COLUMN).present? ||
+        header_for(amount_col_label.presence || "Amount").present?
+    end
+
+    # YNAB exports starting-balance / reconciliation rows with a blank Payee. Entry
+    # requires a name, so fall back to the Memo column and finally the generic
+    # default, mirroring the blank-name handling in Import and ActualImport.
+    def row_name(row)
+      csv_value(row, name_col_label, "payee").to_s.presence ||
+        csv_value(row, notes_col_label, "memo").to_s.presence ||
+        default_row_name
+    end
+
+    # Resolve a single category string across YNAB export shapes:
+    #   - modern web YNAB: a pre-combined "Category Group/Category" column
+    #   - modern web YNAB (split): "Category Group" + "Category"
+    #   - legacy YNAB 4: "Master Category" + "Sub Category"
+    #   - simplified exports: a single "Category" column already holding the full value
+    def combined_category(row)
+      combined = csv_value(row, COMBINED_CATEGORY_COLUMN)
+      return combined.to_s.strip if combined.present?
+
+      group = csv_value(row, CATEGORY_GROUP_COLUMN).to_s.strip
+      return join_category(group, csv_value(row, category_col_label, "category")) if group.present?
+
+      master = csv_value(row, MASTER_CATEGORY_COLUMN).to_s.strip
+      sub = csv_value(row, SUB_CATEGORY_COLUMN).to_s.strip
+      return join_category(master, sub) if master.present? || sub.present?
+
+      csv_value(row, category_col_label, "category").to_s.strip
+    end
+
+    def join_category(group, category)
+      category = category.to_s.strip
+      return category if group.blank?
+      return group if category.blank?
+
+      "#{group}: #{category}"
+    end
+end
diff --git a/app/services/api_rate_limiter.rb b/app/services/api_rate_limiter.rb
index d3a771cf5..c635cc943 100644
--- a/app/services/api_rate_limiter.rb
+++ b/app/services/api_rate_limiter.rb
@@ -10,7 +10,7 @@ class ApiRateLimiter
 
   def initialize(api_key)
     @api_key = api_key
-    @redis = Redis.new
+    @redis = Redis.new(url: self.class.redis_url)
   end
 
   # Check if the API key has exceeded its rate limit
@@ -80,6 +80,14 @@ class ApiRateLimiter
     end
   end
 
+  def self.redis_url
+    ENV.fetch("REDIS_URL", "redis://localhost:6379/0")
+  end
+
+  def redis_url
+    self.class.redis_url
+  end
+
   private
 
     def redis_key
diff --git a/app/views/accounts/_account.html.erb b/app/views/accounts/_account.html.erb
index bcc57a68d..4a1c73ca8 100644
--- a/app/views/accounts/_account.html.erb
+++ b/app/views/accounts/_account.html.erb
@@ -21,6 +21,12 @@
           <div class="flex items-center gap-1.5">
             <%= link_to account.name, account, class: [(account.active? ? "text-primary" : "text-subdued"), "text-sm font-medium hover:underline"], data: { turbo_frame: "_top" } %>
 
+            <% if account.exclude_from_reports? %>
+              <%= render DS::Tooltip.new(text: t("accounts.account.excluded_from_reports_indicator"), as: :span) do %>
+                <%= icon("eye-off", class: "w-3.5 h-3.5 text-secondary") %>
+              <% end %>
+            <% end %>
+
             <% if account.shared? %>
               <%= icon("users", class: "w-3.5 h-3.5 text-secondary", title: account.owned_by?(Current.user) ? nil : account.owner&.display_name) %>
             <% end %>
@@ -94,6 +100,12 @@
             <% elsif account.disabled? %>
               <% menu.with_item(variant: "button", text: t("accounts.account.enable"), href: toggle_active_account_path(account), method: :patch, icon: "toggle-left", data: { turbo_frame: :_top }) %>
             <% end %>
+
+            <% if account.exclude_from_reports? %>
+              <% menu.with_item(variant: "button", text: t("accounts.account.include_in_reports"), href: toggle_exclude_from_reports_account_path(account), method: :patch, icon: "eye", data: { turbo_frame: :_top }) %>
+            <% else %>
+              <% menu.with_item(variant: "button", text: t("accounts.account.exclude_from_reports"), href: toggle_exclude_from_reports_account_path(account), method: :patch, icon: "eye-off", data: { turbo_frame: :_top }) %>
+            <% end %>
           <% end %>
 
           <% if is_default %>
diff --git a/app/views/accounts/_account_sidebar_tabs.html.erb b/app/views/accounts/_account_sidebar_tabs.html.erb
index 653a64c85..5469f0c8d 100644
--- a/app/views/accounts/_account_sidebar_tabs.html.erb
+++ b/app/views/accounts/_account_sidebar_tabs.html.erb
@@ -1,24 +1,22 @@
 <%# locals: (family:, active_tab:, mobile: false) %>
 
-<% cache account_sidebar_tabs_cache_key(family: family, active_tab: active_tab, mobile: mobile), expires_in: 12.hours do %>
+<%# skip_digest: this fragment renders DS::* view components, which Rails'
+    ERB dependency tracker mis-parses as a bogus "Ds/D" template dependency
+    and then logs "Couldn't find template for digesting: Ds/D" on every cache
+    miss. The cache key is already manually versioned via
+    account_sidebar_tabs_cache_key ("account_sidebar_tabs_v2",
+    invalidate_on_data_updates: true), so we opt out of automatic template
+    digesting. Bump that version suffix when changing this template or its
+    sidebar dependencies. %>
+<% cache account_sidebar_tabs_cache_key(family: family, active_tab: active_tab, mobile: mobile), expires_in: 12.hours, skip_digest: true do %>
 <div id="account-sidebar-tabs">
   <% if family.missing_data_provider? %>
-    <details class="group bg-yellow-tint-10 rounded-lg p-2 text-yellow-600 mb-3 text-xs">
-      <summary class="flex items-center justify-between gap-2">
-        <div class="flex items-center gap-2">
-          <%= icon "triangle-alert", size: "sm", color: "warning" %>
-          <p class="font-medium"><%= t("accounts.sidebar.missing_data") %></p>
-        </div>
-
-        <%= icon("chevron-down", color: "warning", class: "group-open:transform group-open:rotate-180") %>
-      </summary>
-      <div class="text-xs py-2 space-y-2">
-        <p><%= t("accounts.sidebar.missing_data_description", product: product_name) %></p>
-        <p>
-          <%= link_to t("accounts.sidebar.configure_providers"), settings_hosting_path, class: "text-yellow-600 underline" %>
-        </p>
-      </div>
-    </details>
+    <div class="mb-3">
+      <%= render DS::Alert.new(title: t("accounts.sidebar.missing_data"), variant: :warning) do %>
+        <p class="text-secondary"><%= t("accounts.sidebar.missing_data_description", product: product_name) %></p>
+        <p><%= link_to t("accounts.sidebar.configure_providers"), settings_hosting_path, class: "underline font-medium" %></p>
+      <% end %>
+    </div>
   <% end %>
 
   <%= render DS::Tabs.new(active_tab: active_tab, session_key: "account_sidebar_tab", testid: "account-sidebar-tabs") do |tabs| %>
diff --git a/app/views/accounts/_account_type.html.erb b/app/views/accounts/_account_type.html.erb
index d055156f1..7e631ee8f 100644
--- a/app/views/accounts/_account_type.html.erb
+++ b/app/views/accounts/_account_type.html.erb
@@ -1,11 +1,13 @@
 <%# locals: (accountable:) %>
 
 <%= link_to new_polymorphic_path(accountable, step: "method_select", return_to: params[:return_to]),
-            class: "flex items-center gap-4 w-full text-center focus:outline-hidden hover:bg-surface-hover focus:bg-surface-hover text-primary border border-transparent block px-2 rounded-lg p-2" do %>
+            class: "group flex items-center gap-4 w-full text-center focus:outline-hidden hover:bg-surface-hover focus:bg-surface-hover text-primary border border-transparent block px-2 rounded-lg p-2" do %>
   <%= render DS::FilledIcon.new(
     icon: accountable.icon,
     hex_color: accountable.color,
   ) %>
 
   <%= accountable.singular_display_name %>
+
+  <%= icon("chevron-right", size: "sm", class: "ml-auto shrink-0 text-subdued transition-colors group-hover:text-secondary") %>
 <% end %>
diff --git a/app/views/accounts/_form.html.erb b/app/views/accounts/_form.html.erb
index c29962a79..60be71cdc 100644
--- a/app/views/accounts/_form.html.erb
+++ b/app/views/accounts/_form.html.erb
@@ -24,6 +24,16 @@
 
     <%= yield form %>
 
+    <% if account.persisted? && account.supports_category_matcher? %>
+      <div class="flex items-center justify-between gap-3 py-2">
+        <div class="space-y-1">
+          <p class="text-sm text-primary"><%= t(".enable_category_matcher_label") %></p>
+          <p class="text-secondary text-sm"><%= t(".enable_category_matcher_hint") %></p>
+        </div>
+        <%= form.toggle :enable_category_matcher %>
+      </div>
+    <% end %>
+
     <details class="group">
       <summary class="cursor-pointer text-sm text-secondary hover:text-primary flex items-center gap-1 py-2">
         <%= icon "chevron-right", size: "sm", class: "group-open:rotate-90 transition-transform" %>
@@ -43,6 +53,11 @@
             label: t(".notes_label"),
             placeholder: t(".notes_placeholder"),
             rows: 4 %>
+
+        <div class="flex items-center justify-between gap-2">
+          <span class="text-sm"><%= t(".exclude_from_reports") %></span>
+          <%= form.toggle :exclude_from_reports %>
+        </div>
       </div>
     </details>
   </div>
diff --git a/app/views/accounts/_sync_controls.html.erb b/app/views/accounts/_sync_controls.html.erb
new file mode 100644
index 000000000..1a4ecfc55
--- /dev/null
+++ b/app/views/accounts/_sync_controls.html.erb
@@ -0,0 +1,31 @@
+<%# locals: (family:) %>
+
+<%# Rendered both from a normal request (accounts#index) and from
+    Family::SyncCompleteEvent's broadcast (no Current.family there) — take
+    family as an explicit local and use absolute i18n keys, not lazy `t(".")`
+    lookups, to behave the same in both contexts. %>
+<div id="accounts-sync-controls" class="flex items-center gap-2 shrink-0">
+  <%= icon(
+        family.syncing? ? "loader-circle" : "refresh-cw",
+        as_button: true,
+        size: "sm",
+        href: sync_all_accounts_path,
+        disabled: family.syncing?,
+        class: (family.syncing? ? "animate-spin" : nil),
+        "aria-label": t("accounts.index.sync"),
+        frame: :_top
+      ) %>
+
+  <% if (family_sync = family.syncs.visible.first) %>
+    <%= render DS::Button.new(
+      text: t("accounts.index.cancel_sync"),
+      variant: :ghost,
+      size: :sm,
+      icon: "circle-x",
+      href: cancel_sync_path(family_sync),
+      method: :post,
+      frame: :_top,
+      aria_label: t("accounts.index.cancel_sync")
+    ) %>
+  <% end %>
+</div>
diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb
index 609d757eb..d03813049 100644
--- a/app/views/accounts/index.html.erb
+++ b/app/views/accounts/index.html.erb
@@ -1,13 +1,6 @@
 <%= content_for :page_title, t(".accounts") %>
 <%= content_for :page_actions do %>
-  <%= icon(
-        "refresh-cw",
-        as_button: true,
-        size: "sm",
-        href: sync_all_accounts_path,
-        disabled: Current.family.syncing?,
-        frame: :_top
-      ) %>
+  <%= render "accounts/sync_controls", family: Current.family %>
   <%= render DS::Link.new(
     text: t(".new_account"),
     href: new_account_path(return_to: accounts_path),
@@ -17,7 +10,7 @@
   ) %>
 <% end %>
 
-<% if @manual_accounts.empty? && @plaid_items.empty? && @simplefin_items.empty? && @lunchflow_items.empty? && @akahu_items.empty? && @enable_banking_items.empty? && @coinstats_items.empty? && @coinbase_items.empty? && @mercury_items.empty? && @brex_items.empty? && @ibkr_items.empty? && @snaptrade_items.empty? && @indexa_capital_items.empty? && @sophtron_items.empty? && @binance_items.empty? %>
+<% if @manual_accounts.empty? && @plaid_items.empty? && @simplefin_items.empty? && @lunchflow_items.empty? && @redbark_items.empty? && @akahu_items.empty? && @up_items.empty? && @enable_banking_items.empty? && @coinstats_items.empty? && @coinbase_items.empty? && @mercury_items.empty? && @brex_items.empty? && @ibkr_items.empty? && @snaptrade_items.empty? && @indexa_capital_items.empty? && @sophtron_items.empty? && @binance_items.empty? && @kraken_items.empty? && @questrade_items.empty? && @wise_items.empty? %>
   <%= render "empty" %>
 <% else %>
   <div class="space-y-2">
@@ -33,10 +26,18 @@
       <%= render @lunchflow_items.sort_by(&:created_at) %>
     <% end %>
 
+    <% if @redbark_items.any? %>
+      <%= render @redbark_items.sort_by(&:created_at) %>
+    <% end %>
+
     <% if @akahu_items.any? %>
       <%= render @akahu_items.sort_by(&:created_at) %>
     <% end %>
 
+    <% if @up_items.any? %>
+      <%= render @up_items.sort_by(&:created_at) %>
+    <% end %>
+
     <% if @enable_banking_items.any? %>
       <%= render @enable_banking_items.sort_by(&:created_at) %>
     <% end %>
@@ -65,6 +66,14 @@
       <%= render @binance_items.sort_by(&:created_at) %>
     <% end %>
 
+    <% if @kraken_items.any? %>
+      <%= render @kraken_items.sort_by(&:created_at) %>
+    <% end %>
+
+    <% if @wise_items.any? %>
+      <%= render @wise_items.sort_by(&:created_at) %>
+    <% end %>
+
     <% if @snaptrade_items.any? %>
       <%= render @snaptrade_items.sort_by(&:created_at) %>
     <% end %>
@@ -77,6 +86,10 @@
       <%= render @indexa_capital_items.sort_by(&:created_at) %>
     <% end %>
 
+    <% if @questrade_items.any? %>
+      <%= render @questrade_items.sort_by(&:created_at) %>
+    <% end %>
+
     <% if @manual_accounts.any? %>
       <div id="manual-accounts">
         <%= render "accounts/index/manual_accounts", accounts: @manual_accounts %>
diff --git a/app/views/accounts/index/_account_groups.erb b/app/views/accounts/index/_account_groups.erb
index 79709142e..2f1ecef36 100644
--- a/app/views/accounts/index/_account_groups.erb
+++ b/app/views/accounts/index/_account_groups.erb
@@ -3,7 +3,14 @@
 <% if accounts.any? %>
   <% ActiveRecord::Associations::Preloader.new(
        records: accounts,
-       associations: [ :account_shares, :accountable, :plaid_account, :simplefin_account, { account_providers: :provider } ]
+       associations: [
+         :account_shares,
+         :accountable,
+         :plaid_account,
+         :simplefin_account,
+         { account_providers: :provider },
+         { logo_attachment: :blob }
+       ]
      ).call %>
 <% end %>
 <% accounts.group_by(&:accountable_type).sort_by { |group, _| group }.each do |group, accounts| %>
diff --git a/app/views/accounts/new/_container.html.erb b/app/views/accounts/new/_container.html.erb
index 6c1c16112..594eee67e 100644
--- a/app/views/accounts/new/_container.html.erb
+++ b/app/views/accounts/new/_container.html.erb
@@ -9,14 +9,14 @@
           variant: "icon",
           icon: "arrow-left",
           href: back_path,
-          size: "lg"
+          size: "md"
         ) %>
         <% end %>
 
         <span class="text-primary"><%= title %></span>
       </div>
 
-      <%= icon("x", as_button: true, size: "lg", data: { action: "DS--dialog#close" }) %>
+      <%= icon("x", as_button: true, size: "md", data: { action: "DS--dialog#close" }) %>
     </div>
 
     <div class="p-2 text-subdued">
diff --git a/app/views/accounts/new/_method_selector.html.erb b/app/views/accounts/new/_method_selector.html.erb
index ac3c31909..4bc598a9a 100644
--- a/app/views/accounts/new/_method_selector.html.erb
+++ b/app/views/accounts/new/_method_selector.html.erb
@@ -10,11 +10,12 @@
          <% end %>
        <% end %>>
     <%# Manual entry option %>
-    <%= link_to path, class: "flex items-center gap-4 w-full text-center text-primary focus:outline-hidden focus:bg-surface border border-transparent focus:border focus:border-secondary px-2 hover:bg-surface rounded-lg p-2" do %>
+    <%= link_to path, class: "group flex items-center gap-4 w-full text-center text-primary focus:outline-hidden focus:bg-surface-hover border border-transparent focus:border focus:border-secondary px-2 hover:bg-surface-hover rounded-lg p-2" do %>
       <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
         <%= icon("keyboard") %>
       </span>
       <%= t("accounts.new.method_selector.manual_entry") %>
+      <%= icon("chevron-right", size: "sm", class: "ml-auto shrink-0 text-subdued transition-colors group-hover:text-secondary") %>
     <% end %>
 
     <%# Dynamic provider links - only admins can create provider connections %>
@@ -24,12 +25,12 @@
       <% is_lunchflow = config[:key] == "lunchflow" %>
 
       <%= link_to link_path,
-                  class: "text-primary flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-surface border border-transparent focus:border focus:border-primary px-2 hover:bg-surface rounded-lg p-2",
+                  class: "group text-primary flex items-center gap-4 w-full text-center focus:outline-hidden focus:bg-surface-hover border border-transparent focus:border focus:border-primary px-2 hover:bg-surface-hover rounded-lg p-2",
                   data: is_lunchflow ? {
                     turbo_frame: "modal",
                     turbo_action: "advance",
                     lunchflow_preload_target: "link"
-                  } : { turbo_frame: "modal" } do %>
+                  } : { turbo_frame: "modal", turbo_prefetch: "false" } do %>
         <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
           <%= icon("link-2") %>
         </span>
@@ -43,6 +44,8 @@
         <% else %>
           <%= t("accounts.new.method_selector.link_with_provider", provider: config[:name]) %>
         <% end %>
+
+        <%= icon("chevron-right", size: "sm", class: "ml-auto shrink-0 text-subdued transition-colors group-hover:text-secondary") %>
       <% end %>
     <% end %>
     <% end %>
diff --git a/app/views/accounts/select_provider.html.erb b/app/views/accounts/select_provider.html.erb
index 5d19a966c..f80cdd9c5 100644
--- a/app/views/accounts/select_provider.html.erb
+++ b/app/views/accounts/select_provider.html.erb
@@ -8,7 +8,7 @@
 
     <div class="space-y-2">
       <% @available_providers.each do |provider| %>
-        <%= link_to provider[:path], data: { turbo_frame: :modal }, class: "block p-4 border border-primary rounded-lg hover:bg-container-hover transition-colors" do %>
+        <%= link_to provider[:path], data: { turbo_frame: :modal, turbo_prefetch: "false" }, class: "block p-4 border border-primary rounded-lg hover:bg-container-hover transition-colors" do %>
           <div class="flex items-center justify-between">
             <div>
               <p class="font-medium text-primary"><%= provider[:name] %></p>
diff --git a/app/views/accounts/show/_menu.html.erb b/app/views/accounts/show/_menu.html.erb
index de1b77626..7a231f5a6 100644
--- a/app/views/accounts/show/_menu.html.erb
+++ b/app/views/accounts/show/_menu.html.erb
@@ -9,6 +9,14 @@
   <% menu.with_item(variant: "link", text: t(".statements"), href: account_path(account, tab: "statements"), icon: "archive") %>
 
   <% if permission.in?([ :owner, :full_control ]) %>
+    <% menu.with_item(variant: "divider") %>
+
+    <% if account.exclude_from_reports? %>
+      <% menu.with_item(variant: "button", text: t(".include_in_reports"), href: toggle_exclude_from_reports_account_path(account), method: :patch, icon: "eye", data: { turbo_frame: :_top }) %>
+    <% else %>
+      <% menu.with_item(variant: "button", text: t(".exclude_from_reports"), href: toggle_exclude_from_reports_account_path(account), method: :patch, icon: "eye-off", data: { turbo_frame: :_top }) %>
+    <% end %>
+
     <% if account.supports_trades? %>
       <% menu.with_item(
         variant: "link",
diff --git a/app/views/accounts/show/_statements.html.erb b/app/views/accounts/show/_statements.html.erb
index 3a5d4a11a..6be92fd4e 100644
--- a/app/views/accounts/show/_statements.html.erb
+++ b/app/views/accounts/show/_statements.html.erb
@@ -19,6 +19,7 @@
                           aria: { label: t("account_statements.account_tab.year_label") } %>
         <% end %>
         <%= link_to account_statements_path,
+                    data: { turbo_frame: "_top" },
                     class: "inline-flex items-center gap-2 text-sm font-medium text-primary hover:text-primary-hover" do %>
           <%= icon("inbox", size: "sm") %>
           <%= t("account_statements.account_tab.open_inbox") %>
@@ -75,7 +76,11 @@
             <% statements.each do |statement| %>
               <tr id="<%= dom_id(statement) %>" class="border-b border-subdued hover:bg-surface-hover">
                 <td class="px-3 py-3">
-                  <%= link_to account_statement_path(statement), class: "flex items-center gap-2 min-w-0 text-sm font-medium text-primary hover:underline" do %>
+                  <% file_attached = statement.original_file.attached? %>
+                  <%= link_to file_attached ? rails_blob_path(statement.original_file, disposition: "inline") : account_statement_path(statement),
+                      target: (file_attached ? "_blank" : nil),
+                      data: { turbo_frame: "_top" },
+                      class: "flex items-center gap-2 min-w-0 text-sm font-medium text-primary hover:underline" do %>
                     <%= icon(account_statement_file_icon(statement), size: "sm") %>
                     <span class="truncate"><%= statement.filename %></span>
                   <% end %>
@@ -94,10 +99,25 @@
                 </td>
                 <td class="px-3 py-3">
                   <div class="flex items-center justify-end gap-3">
-                    <%= link_to account_statement_path(statement), aria: { label: t("account_statements.table.view") } do %>
-                      <%= icon("eye", class: "w-5 h-5 text-primary") %>
+                    <%# View: open the actual file inline (PDF) or download (CSV/XLSX) %>
+                    <% if file_attached %>
+                      <%= link_to rails_blob_path(statement.original_file, disposition: "inline"),
+                                  target: "_blank",
+                                  data: { turbo_frame: "_top" },
+                                  aria: { label: t("account_statements.table.view") } do %>
+                        <%= icon("eye", class: "w-5 h-5 text-primary") %>
+                      <% end %>
                     <% end %>
-                    <% if statement.original_file.attached? %>
+
+                    <%# Edit: go to statement details/edit page %>
+                    <%= link_to account_statement_path(statement),
+                                data: { turbo_frame: "_top" },
+                                aria: { label: t("account_statements.table.edit") } do %>
+                      <%= icon("pencil", class: "w-5 h-5 text-primary") %>
+                    <% end %>
+
+                    <%# Download %>
+                    <% if file_attached %>
                       <%= link_to rails_blob_path(statement.original_file, disposition: "attachment"), aria: { label: t("account_statements.table.download") } do %>
                         <%= icon("download", class: "w-5 h-5 text-primary") %>
                       <% end %>
@@ -106,6 +126,7 @@
                       <%= button_to unlink_account_statement_path(statement),
                                     method: :patch,
                                     class: "flex items-center",
+                                    form: { data: { turbo_frame: "_top" } },
                                     aria: { label: t("account_statements.table.unlink") } do %>
                         <%= icon("unlink", class: "w-5 h-5 text-secondary") %>
                       <% end %>
diff --git a/app/views/admin/sso_providers/_form.html.erb b/app/views/admin/sso_providers/_form.html.erb
index 9845bab1a..a49adb22d 100644
--- a/app/views/admin/sso_providers/_form.html.erb
+++ b/app/views/admin/sso_providers/_form.html.erb
@@ -83,7 +83,9 @@
     <%= form.password_field :client_secret,
         label: t("admin.sso_providers.form.client_secret_label"),
         placeholder: sso_provider.persisted? ? t("admin.sso_providers.form.client_secret_placeholder_existing") : t("admin.sso_providers.form.client_secret_placeholder_new"),
-        required: !sso_provider.persisted? %>
+        required: !sso_provider.persisted?,
+        autocomplete: "new-password",
+        value: nil %>
     <% if sso_provider.persisted? %>
       <p class="text-xs text-secondary -mt-2"><%= t("admin.sso_providers.form.client_secret_help_existing") %></p>
     <% end %>
@@ -190,14 +192,18 @@
   <div class="border-t border-primary pt-4 space-y-4">
     <h3 class="font-medium text-primary"><%= t("admin.sso_providers.form.provisioning_title") %></h3>
 
-    <%= form.select "settings[default_role]",
-        options_for_select([
-          [t("admin.sso_providers.form.role_guest", default: "Guest"), "guest"],
-          [t("admin.sso_providers.form.role_member"), "member"],
-          [t("admin.sso_providers.form.role_admin"), "admin"],
-          [t("admin.sso_providers.form.role_super_admin"), "super_admin"]
-        ], sso_provider.settings&.dig("default_role").to_s.presence || "member"),
-        { label: t("admin.sso_providers.form.default_role_label"), include_blank: false } %>
+    <div class="form-field">
+      <%= label_tag "sso_provider_settings_default_role", t("admin.sso_providers.form.default_role_label"), class: "form-field__label" %>
+      <%= select_tag "sso_provider[settings][default_role]",
+          options_for_select([
+            [t("admin.sso_providers.form.role_guest", default: "Guest"), "guest"],
+            [t("admin.sso_providers.form.role_member"), "member"],
+            [t("admin.sso_providers.form.role_admin"), "admin"],
+            [t("admin.sso_providers.form.role_super_admin"), "super_admin"]
+          ], sso_provider.settings&.dig("default_role").to_s.presence || "member"),
+          id: "sso_provider_settings_default_role",
+          class: "form-field__input" %>
+    </div>
     <p class="text-xs text-secondary -mt-2"><%= t("admin.sso_providers.form.default_role_help") %></p>
 
     <details class="mt-4">
@@ -249,22 +255,29 @@
     <h3 class="font-medium text-primary"><%= t("admin.sso_providers.form.advanced_title") %></h3>
 
     <div>
-      <%= form.text_field "settings[scopes]",
-          label: t("admin.sso_providers.form.scopes_label"),
-          value: sso_provider.settings&.dig("scopes"),
-          placeholder: "openid email profile groups" %>
+      <%= label_tag "sso_provider_settings_scopes", t("admin.sso_providers.form.scopes_label"), class: "form-field__label" %>
+      <%= text_field_tag "sso_provider[settings][scopes]",
+          sso_provider.settings&.dig("scopes"),
+          id: "sso_provider_settings_scopes",
+          class: "form-field__input",
+          placeholder: "openid email profile groups",
+          autocomplete: "off" %>
       <p class="text-xs text-secondary mt-1"><%= t("admin.sso_providers.form.scopes_help") %></p>
     </div>
 
-    <%= form.select "settings[prompt]",
-        options_for_select([
-          [t("admin.sso_providers.form.prompt_default"), ""],
-          [t("admin.sso_providers.form.prompt_login"), "login"],
-          [t("admin.sso_providers.form.prompt_consent"), "consent"],
-          [t("admin.sso_providers.form.prompt_select_account"), "select_account"],
-          [t("admin.sso_providers.form.prompt_none"), "none"]
-        ], sso_provider.settings&.dig("prompt")),
-        { label: t("admin.sso_providers.form.prompt_label"), include_blank: false } %>
+    <div class="form-field">
+      <%= label_tag "sso_provider_settings_prompt", t("admin.sso_providers.form.prompt_label"), class: "form-field__label" %>
+      <%= select_tag "sso_provider[settings][prompt]",
+          options_for_select([
+            [t("admin.sso_providers.form.prompt_default"), ""],
+            [t("admin.sso_providers.form.prompt_login"), "login"],
+            [t("admin.sso_providers.form.prompt_consent"), "consent"],
+            [t("admin.sso_providers.form.prompt_select_account"), "select_account"],
+            [t("admin.sso_providers.form.prompt_none"), "none"]
+          ], sso_provider.settings&.dig("prompt")),
+          id: "sso_provider_settings_prompt",
+          class: "form-field__input" %>
+    </div>
     <p class="text-xs text-secondary -mt-2"><%= t("admin.sso_providers.form.prompt_help") %></p>
   </div>
 
diff --git a/app/views/admin/sso_providers/index.html.erb b/app/views/admin/sso_providers/index.html.erb
index c799d374d..8ea545eb5 100644
--- a/app/views/admin/sso_providers/index.html.erb
+++ b/app/views/admin/sso_providers/index.html.erb
@@ -26,7 +26,7 @@
             </div>
             <div class="flex items-center gap-2">
               <% if provider.enabled? %>
-                <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800">
+                <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-100 text-green-800 theme-dark:bg-green-tint-10 theme-dark:text-green-200">
                   <%= t(".enabled") %>
                 </span>
               <% else %>
@@ -64,13 +64,8 @@
 
   <% if @legacy_providers.any? %>
     <%= settings_section title: t("admin.sso_providers.index.legacy_providers_title"), collapsible: true, open: true do %>
-      <div class="bg-amber-50 border border-amber-200 rounded-lg p-3 mb-4">
-        <div class="flex gap-2">
-          <%= icon "alert-triangle", class: "w-5 h-5 text-amber-600 shrink-0" %>
-          <p class="text-sm text-amber-800">
-            <%= t("admin.sso_providers.index.legacy_providers_notice") %>
-          </p>
-        </div>
+      <div class="mb-4">
+        <%= render DS::Alert.new(message: t("admin.sso_providers.index.legacy_providers_notice"), variant: :warning) %>
       </div>
 
       <div class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
@@ -90,9 +85,7 @@
               </div>
             </div>
             <div class="flex items-center gap-2">
-              <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-amber-100 text-amber-800">
-                <%= t("admin.sso_providers.index.env_configured") %>
-              </span>
+              <%= render DS::Pill.new(label: t("admin.sso_providers.index.env_configured"), tone: :warning, marker: false) %>
             </div>
           </div>
         <% end %>
diff --git a/app/views/api/v1/transactions/_transaction.json.jbuilder b/app/views/api/v1/transactions/_transaction.json.jbuilder
index 488ecbe5b..aa8674822 100644
--- a/app/views/api/v1/transactions/_transaction.json.jbuilder
+++ b/app/views/api/v1/transactions/_transaction.json.jbuilder
@@ -58,19 +58,24 @@ json.tags transaction.tags do |tag|
 end
 
 # Transfer information (if this transaction is part of a transfer)
-if transaction.transfer.present?
+transfer = transaction.transfer
+if transfer.present?
   json.transfer do
-    json.id transaction.transfer.id
-    json.amount transaction.transfer.amount_abs.format
-    json.currency transaction.transfer.inflow_transaction.entry.currency
+    json.id transfer.id
 
     # Other transaction in the transfer
-    if transaction.transfer.inflow_transaction == transaction
-      other_transaction = transaction.transfer.outflow_transaction
+    if transfer.inflow_transaction_id == transaction.id
+      inflow_transaction = transaction
+      other_transaction = transfer.outflow_transaction
     else
-      other_transaction = transaction.transfer.inflow_transaction
+      inflow_transaction = transfer.inflow_transaction
+      # When rendering the outflow, the inflow is the counterparty transaction.
+      other_transaction = inflow_transaction
     end
 
+    json.amount inflow_transaction.entry.amount_money.abs.format
+    json.currency inflow_transaction.entry.currency
+
     if other_transaction.present?
       json.other_account do
         json.id other_transaction.entry.account.id
diff --git a/app/views/api/v1/transactions/show.json.jbuilder b/app/views/api/v1/transactions/show.json.jbuilder
index 22dd4f8c8..248198dde 100644
--- a/app/views/api/v1/transactions/show.json.jbuilder
+++ b/app/views/api/v1/transactions/show.json.jbuilder
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.partial! "transaction", transaction: @transaction
+json.partial! "api/v1/transactions/transaction", transaction: @transaction
diff --git a/app/views/api/v1/transfers/_transfer.json.jbuilder b/app/views/api/v1/transfers/_transfer.json.jbuilder
index 1fb27815f..58fb4126f 100644
--- a/app/views/api/v1/transfers/_transfer.json.jbuilder
+++ b/app/views/api/v1/transfers/_transfer.json.jbuilder
@@ -8,6 +8,10 @@ json.amount_cents money_to_minor_units(transfer.amount_abs)
 json.currency transfer.inflow_transaction.entry.currency
 json.transfer_type transfer.transfer_type
 json.notes transfer.notes
+json.source_fee_amount transfer.derived_source_fee_amount.to_s("F")
+json.source_fee_currency transfer.from_account&.currency
+json.destination_fee_amount transfer.derived_destination_fee_amount.to_s("F")
+json.destination_fee_currency transfer.to_account&.currency
 
 json.inflow_transaction do
   json.partial! "api/v1/transfers/transaction_side", transaction: transfer.inflow_transaction
diff --git a/app/views/api/v1/transfers/show.json.jbuilder b/app/views/api/v1/transfers/show.json.jbuilder
index d5c0710f3..cdb2c513d 100644
--- a/app/views/api/v1/transfers/show.json.jbuilder
+++ b/app/views/api/v1/transfers/show.json.jbuilder
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-json.partial! "transfer", transfer: @transfer
+json.partial! "api/v1/transfers/transfer", transfer: @transfer
diff --git a/app/views/assistant_messages/_assistant_message.html.erb b/app/views/assistant_messages/_assistant_message.html.erb
index 6b00a3c2d..85768996c 100644
--- a/app/views/assistant_messages/_assistant_message.html.erb
+++ b/app/views/assistant_messages/_assistant_message.html.erb
@@ -2,7 +2,10 @@
 
 <div id="<%= dom_id(assistant_message) %>">
   <% if assistant_message.pending? %>
-    <div class="flex items-start gap-3 mb-6">
+    <div class="flex items-start gap-3 mb-6"
+         data-chat-target="pendingResponse"
+         data-pending-response-created-at="<%= assistant_message.created_at&.iso8601 %>"
+         data-pending-response-timeout-url="<%= report_timeout_chat_message_path(assistant_message.chat, assistant_message) %>">
       <%= render "chats/ai_avatar" %>
       <p class="text-sm text-secondary animate-pulse"><%= t("chats.thinking") %></p>
     </div>
diff --git a/app/views/assistant_messages/_tool_calls.html.erb b/app/views/assistant_messages/_tool_calls.html.erb
index d2adace6a..b301a5d4a 100644
--- a/app/views/assistant_messages/_tool_calls.html.erb
+++ b/app/views/assistant_messages/_tool_calls.html.erb
@@ -8,7 +8,7 @@
 
   <div class="mt-2">
     <% message.tool_calls.each do |tool_call| %>
-      <div class="bg-blue-50 border-blue-200 px-3 py-2 rounded-lg border mb-2">
+      <div class="bg-blue-50 border-blue-200 px-3 py-2 rounded-lg border mb-2 theme-dark:bg-blue-500/10 theme-dark:border-blue-500/30">
         <p class="text-secondary text-xs"><%= t(".function") %></p>
         <p class="text-primary text-sm font-mono"><%= tool_call.function_name %></p>
         <p class="text-secondary text-xs mt-2"><%= t(".arguments") %></p>
diff --git a/app/views/budget_categories/_budget_category.html.erb b/app/views/budget_categories/_budget_category.html.erb
index ff209f009..699653ce9 100644
--- a/app/views/budget_categories/_budget_category.html.erb
+++ b/app/views/budget_categories/_budget_category.html.erb
@@ -1,5 +1,7 @@
 <%# locals: (budget_category:, show_budget_meta: true) %>
 
+<% category_display_name = budget_category.category.display_name %>
+
 <%= turbo_frame_tag dom_id(budget_category), class: "flex-1 min-w-0 block" do %>
   <%= link_to budget_budget_category_path(budget_category.budget, budget_category), class: "group block w-full px-4 py-2 bg-container", data: { turbo_frame: "drawer" } do %>
 
@@ -17,29 +19,20 @@
             <%= render DS::FilledIcon.new(
               variant: :text,
               hex_color: budget_category.category.color,
-              text: budget_category.category.name,
+              text: category_display_name,
               size: "md",
               rounded: true
             ) %>
           <% end %>
         </div>
-        <h3 class="flex-1 min-w-0 font-medium text-primary truncate"><%= budget_category.category.name %></h3>
+        <h3 class="flex-1 min-w-0 font-medium text-primary truncate"><%= category_display_name %></h3>
         <div class="flex items-center gap-3 flex-shrink-0 ml-auto">
           <% if budget_category.over_budget? %>
-            <span class="inline-flex items-center gap-1 px-2 py-1 bg-red-500/10 text-red-500 text-xs font-medium rounded-full whitespace-nowrap">
-              <%= icon("alert-circle", size: "sm", color: "red") %>
-              <%= t("reports.budget_performance.status.over") %>
-            </span>
+            <%= render DS::Pill.new(label: t("reports.budget_performance.status.over"), tone: :error, marker: false, icon: "alert-circle") %>
           <% elsif budget_category.near_limit? %>
-            <span class="inline-flex items-center gap-1 px-2 py-1 bg-yellow-500/10 text-warning text-xs font-medium rounded-full whitespace-nowrap">
-              <%= icon("alert-triangle", size: "sm", color: "yellow") %>
-              <%= t("reports.budget_performance.status.warning") %>
-            </span>
+            <%= render DS::Pill.new(label: t("reports.budget_performance.status.warning"), tone: :warning, marker: false, icon: "alert-triangle") %>
           <% else %>
-            <span class="inline-flex items-center gap-1 px-2 py-1 bg-green-500/10 text-success text-xs font-medium rounded-full whitespace-nowrap">
-              <%= icon("check-circle", size: "sm", color: "green") %>
-              <%= t("reports.budget_performance.status.good") %>
-            </span>
+            <%= render DS::Pill.new(label: t("reports.budget_performance.status.good"), tone: :success, marker: false, icon: "check-circle") %>
           <% end %>
         </div>
       </div>
@@ -47,7 +40,7 @@
       <%# Progress Bar %>
       <div class="mb-3">
         <div class="h-1.5 bg-container-inset rounded-full overflow-hidden">
-          <% bar_color = budget_category.over_budget? ? "bg-red-500" : (budget_category.near_limit? ? "bg-yellow-500" : "bg-green-500") %>
+          <% bar_color = budget_category.over_budget? ? "bg-destructive" : (budget_category.near_limit? ? "bg-warning" : "bg-success") %>
           <div class="h-full <%= bar_color %> rounded-full transition-all duration-500"
             style="inline-size: <%= budget_category.bar_width_percent %>%"></div>
         </div>
@@ -76,8 +69,7 @@
           <div class="w-full sm:w-auto text-xs text-subdued">
             <%= t("reports.budget_performance.suggested_daily",
               amount: daily_info[:amount].format,
-              days: daily_info[:days_remaining])
-            %>
+              days: daily_info[:days_remaining]) %>
           </div>
         <% end %>
         <% end %>
@@ -106,7 +98,7 @@
             <%= render DS::FilledIcon.new(
               variant: :text,
               hex_color: budget_category.category.color,
-              text: budget_category.category.name,
+              text: category_display_name,
               size: "sm",
               rounded: true
             ) %>
@@ -114,9 +106,9 @@
         </div>
 
         <div class="min-w-0 flex-1">
-          <p class="text-sm font-medium text-primary truncate"><%= budget_category.category.name %></p>
+          <p class="text-sm font-medium text-primary truncate"><%= category_display_name %></p>
           <p class="text-sm text-secondary font-medium privacy-sensitive">
-            <%= budget_category.median_monthly_expense_money.format %> avg
+            <%= t("budget_categories.budget_category_form.monthly_average", amount: budget_category.median_monthly_expense_money.format(precision: 0)) %>
           </p>
         </div>
 
diff --git a/app/views/budget_categories/_budget_category_donut.html.erb b/app/views/budget_categories/_budget_category_donut.html.erb
index 0305d3160..7645e09b1 100644
--- a/app/views/budget_categories/_budget_category_donut.html.erb
+++ b/app/views/budget_categories/_budget_category_donut.html.erb
@@ -16,7 +16,7 @@
         </span>
       <% else %>
         <span class="text-sm uppercase" style="color: <%= budget_category.category.color %>">
-          <%= budget_category.category.name.first.upcase %>
+          <%= budget_category.category.display_name.first.upcase %>
         </span>
       <% end %>
     </div>
diff --git a/app/views/budget_categories/_budget_category_form.html.erb b/app/views/budget_categories/_budget_category_form.html.erb
index 855a0cda8..0d81061b0 100644
--- a/app/views/budget_categories/_budget_category_form.html.erb
+++ b/app/views/budget_categories/_budget_category_form.html.erb
@@ -6,7 +6,7 @@
   <div class="w-1 h-3 rounded-xl mt-1" style="background-color: <%= budget_category.category.color %>"></div>
 
   <div class="text-sm mr-3">
-    <p class="text-primary font-medium mb-0.5"><%= budget_category.category.name %></p>
+    <p class="text-primary font-medium mb-0.5"><%= budget_category.category.display_name %></p>
 
     <p class="text-secondary privacy-sensitive"><%= t("budget_categories.budget_category_form.monthly_average", amount: budget_category.median_monthly_expense_money.format(precision: 0)) %></p>
   </div>
diff --git a/app/views/budget_categories/_uncategorized_budget_category_form.html.erb b/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
index 49e545cb0..290eb5e56 100644
--- a/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
+++ b/app/views/budget_categories/_uncategorized_budget_category_form.html.erb
@@ -6,7 +6,7 @@
   <div class="w-1 h-3 rounded-xl mt-1" style="background-color: <%= budget_category.category.color %>"></div>
 
   <div class="text-sm mr-3">
-    <p class="text-primary font-medium mb-0.5"><%= budget_category.category.name %></p>
+    <p class="text-primary font-medium mb-0.5"><%= budget_category.category.display_name %></p>
     <p class="text-secondary privacy-sensitive"><%= t("budget_categories.budget_category_form.monthly_average", amount: budget_category.avg_monthly_expense_money.format(precision: 0)) %></p>
   </div>
 
diff --git a/app/views/budget_categories/show.html.erb b/app/views/budget_categories/show.html.erb
index 6d8d64ed9..ecf4a2e7e 100644
--- a/app/views/budget_categories/show.html.erb
+++ b/app/views/budget_categories/show.html.erb
@@ -3,7 +3,7 @@
     <div>
       <p class="text-sm text-secondary"><%= t(".category") %></p>
       <h3 class="text-2xl font-medium text-primary">
-        <%= @budget_category.name %>
+        <%= @budget_category.category.display_name %>
       </h3>
 
       <% if @budget_category.budget.initialized? %>
diff --git a/app/views/budgets/_actuals_summary.html.erb b/app/views/budgets/_actuals_summary.html.erb
index 524fb0006..147b9ab56 100644
--- a/app/views/budgets/_actuals_summary.html.erb
+++ b/app/views/budgets/_actuals_summary.html.erb
@@ -20,7 +20,7 @@
           <% budget.income_category_totals.each do |category_total| %>
             <div class="flex items-center gap-1.5">
               <div class="w-2.5 h-2.5 rounded-full shrink-0" style="background-color: <%= category_total.category.color %>"></div>
-              <span class="text-secondary"><%= category_total.category.name %></span>
+              <span class="text-secondary"><%= category_total.category.display_name %></span>
               <span class="text-primary"><%= number_to_percentage(category_total.weight, precision: 0) %></span>
             </div>
           <% end %>
@@ -46,7 +46,7 @@
           <% budget.expense_category_totals.each do |category_total| %>
             <div class="flex items-center gap-1.5">
               <div class="w-2.5 h-2.5 rounded-full shrink-0" style="background-color: <%= category_total.category.color %>"></div>
-              <span class="text-secondary"><%= category_total.category.name %></span>
+              <span class="text-secondary"><%= category_total.category.display_name %></span>
               <span class="text-primary"><%= number_to_percentage(category_total.weight, precision: 0) %></span>
             </div>
           <% end %>
diff --git a/app/views/budgets/_budget_categories.html.erb b/app/views/budgets/_budget_categories.html.erb
index addb349f3..edae68fad 100644
--- a/app/views/budgets/_budget_categories.html.erb
+++ b/app/views/budgets/_budget_categories.html.erb
@@ -28,7 +28,6 @@
     groups: on_track_groups,
     uncategorized: uncategorized_budget_category,
     show_uncategorized: show_on_track_uncategorized,
-    over_budget_mode: false
-  %>
+    over_budget_mode: false %>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/budgets/_budget_donut.html.erb b/app/views/budgets/_budget_donut.html.erb
index 9982c6920..dc268c912 100644
--- a/app/views/budgets/_budget_donut.html.erb
+++ b/app/views/budgets/_budget_donut.html.erb
@@ -39,7 +39,7 @@
         <div class="flex flex-col gap-2 items-center">
           <div class="flex items-center gap-3">
             <div class="w-1 h-3 rounded-xl" style="background-color: <%= bc.category.color %>"></div>
-            <p class="text-sm text-secondary"><%= bc.category.name %></p>
+            <p class="text-sm text-secondary"><%= bc.category.display_name %></p>
           </div>
 
           <p data-donut-chart-target="amount" class="text-3xl font-medium privacy-sensitive whitespace-nowrap <%= bc.available_to_spend.negative? ? "text-destructive" : "text-primary" %>">
diff --git a/app/views/budgets/_budget_header.html.erb b/app/views/budgets/_budget_header.html.erb
index b1df7cee7..a64792732 100644
--- a/app/views/budgets/_budget_header.html.erb
+++ b/app/views/budgets/_budget_header.html.erb
@@ -28,7 +28,7 @@
   </div>
 
   <%= render DS::Popover.new(variant: "button") do |popover| %>
-    <% popover.with_button class: "flex items-center gap-1 hover:bg-alpha-black-25 cursor-pointer rounded-md p-2"  do %>
+    <% popover.with_button class: "flex items-center gap-1 hover:bg-surface-hover cursor-pointer rounded-md p-2"  do %>
       <span class="text-primary font-medium text-lg lg:text-base"><%= @budget.name %></span>
       <%= icon("chevron-down") %>
     <% end %>
diff --git a/app/views/budgets/_budget_tabs.html.erb b/app/views/budgets/_budget_tabs.html.erb
index cdb82ba31..71dd65458 100644
--- a/app/views/budgets/_budget_tabs.html.erb
+++ b/app/views/budgets/_budget_tabs.html.erb
@@ -1,31 +1,19 @@
+<% current_filter = %w[all over_budget on_track].include?(params[:filter]) ? params[:filter] : "all" %>
 <div class="w-full flex justify-center">
-    <div class="max-w-full w-full lg:w-auto overflow-x-auto no-scrollbar">
-        <div class="w-full inline-flex whitespace-nowrap bg-container-inset rounded-lg p-1 text-sm font-medium gap-0.5">
-
-        <button
-            data-action="click->budget-filter#setFilter"
-            data-budget-filter-filter-param="all"
-            data-budget-filter-target="tab"
-            class="w-full inline-flex justify-center items-center text-sm font-medium px-2 py-1 rounded-md transition-colors duration-200 bg-white theme-dark:bg-gray-700 text-primary shadow-sm">
-            <%= t("budgets.show.filter.all") %>
-        </button>
-
-        <button
-            data-action="click->budget-filter#setFilter"
-            data-budget-filter-filter-param="over_budget"
-            data-budget-filter-target="tab"
-            class="w-full inline-flex justify-center items-center text-sm font-medium px-2 py-1 rounded-md transition-colors duration-200 shadow-sm">
-            <%= t("budgets.show.filter.over_budget") %>
-        </button>
-
-        <button
-            data-action="click->budget-filter#setFilter"
-            data-budget-filter-filter-param="on_track"
-            data-budget-filter-target="tab"
-            class="w-full inline-flex justify-center items-center text-sm font-medium px-2 py-1 rounded-md transition-colors duration-200 shadow-sm">
-            <%= t("budgets.show.filter.on_track") %>
-        </button>
-
-        </div>
-    </div>
-</div>
\ No newline at end of file
+  <div class="max-w-full w-full lg:w-auto overflow-x-auto no-scrollbar">
+    <%= render DS::SegmentedControl.new(
+          full_width: true,
+          aria_label: t("budgets.show.filter.aria_label", default: "Filter budget categories"),
+          class: "w-full lg:w-auto") do |sc| %>
+      <% sc.with_segment t("budgets.show.filter.all"),
+           active: current_filter == "all",
+           data: { action: "click->budget-filter#setFilter", budget_filter_filter_param: "all", budget_filter_target: "tab" } %>
+      <% sc.with_segment t("budgets.show.filter.over_budget"),
+           active: current_filter == "over_budget",
+           data: { action: "click->budget-filter#setFilter", budget_filter_filter_param: "over_budget", budget_filter_target: "tab" } %>
+      <% sc.with_segment t("budgets.show.filter.on_track"),
+           active: current_filter == "on_track",
+           data: { action: "click->budget-filter#setFilter", budget_filter_filter_param: "on_track", budget_filter_target: "tab" } %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/budgets/_category_section.html.erb b/app/views/budgets/_category_section.html.erb
index 52d4c4980..1f1c992b1 100644
--- a/app/views/budgets/_category_section.html.erb
+++ b/app/views/budgets/_category_section.html.erb
@@ -53,4 +53,4 @@
     <% end %>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/budgets/_picker.html.erb b/app/views/budgets/_picker.html.erb
index 47e2ba43f..b59a1c650 100644
--- a/app/views/budgets/_picker.html.erb
+++ b/app/views/budgets/_picker.html.erb
@@ -6,7 +6,7 @@
       <% last_month_of_previous_year = Date.new(year - 1, 12, 1) %>
 
       <% if Budget.budget_date_valid?(last_month_of_previous_year, family: family) %>
-        <%= link_to picker_budgets_path(year: year - 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-alpha-black-25 rounded-md" do %>
+        <%= link_to picker_budgets_path(year: year - 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-surface-hover rounded-md" do %>
           <%= icon "chevron-left" %>
         <% end %>
       <% else %>
@@ -22,7 +22,7 @@
       <% first_month_of_next_year = Date.new(year + 1, 1, 1) %>
 
       <% if Budget.budget_date_valid?(first_month_of_next_year, family: family) %>
-        <%= link_to picker_budgets_path(year: year + 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-alpha-black-25 rounded-md" do %>
+        <%= link_to picker_budgets_path(year: year + 1), data: { turbo_frame: "budget_picker" }, class: "p-2 flex items-center justify-center hover:bg-surface-hover rounded-md" do %>
           <%= icon "chevron-right" %>
         <% end %>
       <% else %>
diff --git a/app/views/categories/_badge.html.erb b/app/views/categories/_badge.html.erb
index 5ab8d6c1d..05d91af09 100644
--- a/app/views/categories/_badge.html.erb
+++ b/app/views/categories/_badge.html.erb
@@ -1,17 +1,20 @@
 <%# locals: (category:) %>
 <% category ||= Category.uncategorized %>
 
+<%# Canonical category badge: DS::Pill in badge mode carrying the category's
+    user-chosen hex (custom_color is the sanctioned escape hatch for hues that
+    are data, not design). truncate + this min-w-0 wrapper keep long names
+    ellipsizing inside tight columns (e.g. the transaction row's category
+    cell) instead of overflowing them. %>
 <div class="min-w-0">
-  <span class="flex w-full items-center gap-1 text-sm font-medium rounded-full px-1.5 py-1 border focus-visible:outline-none focus-visible:ring-0"
-        style="
-          background-color: color-mix(in oklab, <%= category.color %> 10%, transparent);
-          border-color: color-mix(in oklab, <%= category.color %> 10%, transparent);
-          color: <%= category.color %>;">
-    <% if category.lucide_icon.present? %>
-      <span class="shrink-0">
-        <%= icon category.lucide_icon, size: "sm", color: "current" %>
-      </span>
-    <% end %>
-    <span class="min-w-0 flex-1 truncate" data-testid="category-name"><%= category.name %></span>
-  </span>
+  <%= render DS::Pill.new(
+        label: category.display_name,
+        custom_color: category.color,
+        icon: category.lucide_icon.presence,
+        icon_size: "sm",
+        marker: false,
+        size: :md,
+        truncate: true,
+        label_testid: "category-name",
+        title: category.display_name) %>
 </div>
diff --git a/app/views/categories/_category.html.erb b/app/views/categories/_category.html.erb
index 1fbea37dc..e110bfd72 100644
--- a/app/views/categories/_category.html.erb
+++ b/app/views/categories/_category.html.erb
@@ -1,10 +1,8 @@
-<%# locals: (category:, subcategories: nil, has_transactions: nil) %>
-<% subcategories ||= category.subcategories.to_a %>
-<% has_transactions = category.transactions.exists? if has_transactions.nil? %>
+<%# locals: (category:, subcategories: [], has_transactions: false) %>
 
-<div id="<%= dom_id(category) %>" class="flex items-center gap-3 px-4 pb-4 <%= "pt-4" unless category.subcategory? %> <%= "pb-4" unless subcategories.any? %> bg-container">
+<div id="<%= dom_id(category) %>" class="flex items-center gap-3 px-4 pb-4 <%= "pt-4" unless category.parent_id.present? %> bg-container">
   <div class="flex min-w-0 flex-1 items-center gap-2.5" data-testid="category-content">
-    <% if category.subcategory? %>
+    <% if category.parent_id.present? %>
       <span style="color: <%= category.color %>">
         <%= icon "corner-down-right", size: "sm", color: "current", class: "ml-2" %>
       </span>
diff --git a/app/views/categories/_category_list_group.html.erb b/app/views/categories/_category_list_group.html.erb
index c498cb48a..7ef2152f1 100644
--- a/app/views/categories/_category_list_group.html.erb
+++ b/app/views/categories/_category_list_group.html.erb
@@ -1,5 +1,12 @@
-<%# locals: (title:, categories:, category_groups: nil, category_ids_with_transactions: nil) %>
+<%# locals: (title:, categories:, family: nil, category_groups: nil, category_ids_with_transactions: nil) %>
 <% category_groups ||= Category::Group.for(categories) %>
+<% if category_ids_with_transactions.nil? %>
+  <% category_ids_with_transactions = if categories.any? && family
+    Category.ids_with_transactions(family: family, category_ids: categories.map(&:id))
+  else
+    {}
+  end %>
+<% end %>
 
 <div class="rounded-xl bg-container-inset space-y-1 p-1">
   <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
@@ -14,13 +21,13 @@
         <%= render "categories/category",
                    category: group.category,
                    subcategories: group.subcategories,
-                   has_transactions: category_ids_with_transactions&.key?(group.category.id) %>
+                   has_transactions: category_ids_with_transactions.key?(group.category.id) %>
 
         <% group.subcategories.each do |subcategory| %>
           <%= render "categories/category",
                      category: subcategory,
                      subcategories: [],
-                     has_transactions: category_ids_with_transactions&.key?(subcategory.id) %>
+                     has_transactions: category_ids_with_transactions.key?(subcategory.id) %>
         <% end %>
 
         <% unless idx == category_groups.count - 1 %>
diff --git a/app/views/categories/_category_name_mobile.html.erb b/app/views/categories/_category_name_mobile.html.erb
index 36c13021c..05404faa9 100644
--- a/app/views/categories/_category_name_mobile.html.erb
+++ b/app/views/categories/_category_name_mobile.html.erb
@@ -1,7 +1,7 @@
 <span id="category_name_mobile_<%= transaction.id %>" class="text-secondary lg:hidden min-w-0 truncate">
   <% if transaction.transfer&.categorizable? || transaction.transfer.nil? %>
-    <%= transaction.category&.name || Category.uncategorized.name %>
+    <%= transaction.category&.display_name || Category.uncategorized.display_name %>
   <% else %>
-    <%= transaction.transfer&.payment? ? payment_category.name :  transfer_category.name %>
+    <%= transaction.transfer&.payment? ? payment_category.display_name :  transfer_category.display_name %>
   <% end %>
 </span>
diff --git a/app/views/categories/_form.html.erb b/app/views/categories/_form.html.erb
index a46284903..b974d191d 100644
--- a/app/views/categories/_form.html.erb
+++ b/app/views/categories/_form.html.erb
@@ -7,6 +7,8 @@
         <%= render partial: "color_avatar", locals: { category: category } %>
 
         <%= render DS::Disclosure.new(
+              variant: :bare,
+              summary_aria_label: t(".trigger_label"),
               summary_class: "cursor-pointer absolute -bottom-2 -right-2 flex justify-center items-center bg-surface-inset hover:bg-surface-inset-hover border-2 w-7 h-7 border-subdued rounded-full text-secondary",
               data: {
                 color_icon_picker_target: "details",
@@ -32,13 +34,13 @@
                   <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" data-color-icon-picker-target="pickerBtn" style="background: conic-gradient(red,orange,yellow,lime,green,teal,cyan,blue,indigo,purple,magenta,pink,red)"></div>
                 </label>
               </div>
-              <div class="flex gap-2 items-center hidden flex-col" data-color-icon-picker-target="paletteSection">
+              <div class="hidden flex-col gap-2" data-color-icon-picker-target="paletteSection">
                 <div class="flex gap-2 items-center w-full">
                   <div class="w-6 h-6 p-4 rounded-full cursor-pointer" style="background-color: <%= category.color %>" data-color-icon-picker-target="colorPreview"></div>
                   <%= f.text_field :color, data: { color_icon_picker_target: "colorInput" }, inline: true, pattern: "^#[0-9A-Fa-f]{6}$" %>
                   <%= icon "palette", size: "2xl", data: { action: "click->color-icon-picker#toggleSections" } %>
                 </div>
-                <div data-color-icon-picker-target="validationMessage" class="hidden self-start flex gap-1 items-center text-xs text-destructive ">
+                <div data-color-icon-picker-target="validationMessage" class="hidden self-start gap-1 items-center text-xs text-destructive">
                   <span><%= t(".poor_contrast") %></span>
                   <button type="button" class="underline cursor-pointer" data-action="color-icon-picker#autoAdjust"><%= t(".auto_adjust") %></button>
                 </div>
diff --git a/app/views/categories/index.html.erb b/app/views/categories/index.html.erb
index f5b13df1c..e9dc57d16 100644
--- a/app/views/categories/index.html.erb
+++ b/app/views/categories/index.html.erb
@@ -31,6 +31,7 @@
       <%= render "categories/category_list_group",
                  title: t(".categories"),
                  categories: @categories,
+                 family: Current.family,
                  category_groups: @category_groups,
                  category_ids_with_transactions: @category_ids_with_transactions %>
     </div>
diff --git a/app/views/categories/merge.html.erb b/app/views/categories/merge.html.erb
index 6d8e83300..330e3ed0f 100644
--- a/app/views/categories/merge.html.erb
+++ b/app/views/categories/merge.html.erb
@@ -4,7 +4,7 @@
     <%= styled_form_with url: perform_merge_categories_path, method: :post, class: "space-y-4" do |f| %>
       <%= f.collection_select :target_id,
             @categories,
-            :id, :name_with_parent,
+            :id, :display_name_with_parent,
             { prompt: t(".select_target"), label: t(".target_label") },
             { required: true } %>
 
@@ -14,7 +14,7 @@
           <% @categories.each do |category| %>
             <label class="flex items-center gap-2 p-2 hover:bg-surface-hover rounded cursor-pointer">
               <%= check_box_tag "source_ids[]", category.id, false, class: "rounded border-secondary" %>
-              <span class="text-sm text-primary"><%= category.name_with_parent %></span>
+              <span class="text-sm text-primary"><%= category.display_name_with_parent %></span>
             </label>
           <% end %>
         </div>
diff --git a/app/views/category/deletions/new.html.erb b/app/views/category/deletions/new.html.erb
index d594dba7a..ee91ebe2f 100644
--- a/app/views/category/deletions/new.html.erb
+++ b/app/views/category/deletions/new.html.erb
@@ -1,29 +1,29 @@
 <%= render DS::Dialog.new do |dialog| %>
-  <% dialog.with_header(title: t(".delete_category"), subtitle: t(".explanation", category_name: @category.name)) %>
+  <% dialog.with_header(title: t(".delete_category"), subtitle: t(".explanation", category_name: @category.display_name)) %>
 
   <% dialog.with_body do %>
     <%= styled_form_with url: category_deletions_path(@category),
                        data: {
                          turbo: false,
                          controller: "deletion",
-                         deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", category_name: @category.name),
-                         deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", category_name: @category.name) } do |f| %>
+                         deletion_submit_text_when_not_replacing_value: t(".delete_and_leave_uncategorized", category_name: @category.display_name),
+                         deletion_submit_text_when_replacing_value: t(".delete_and_recategorize", category_name: @category.display_name) } do |f| %>
       <%= f.collection_select :replacement_category_id,
                             Current.family.categories.alphabetically_by_hierarchy.without(@category),
-                            :id, :name_with_parent,
+                            :id, :display_name_with_parent,
                             { prompt: t(".replacement_category_prompt"), label: t(".category"), container_class: "mb-4" },
                             data: { deletion_target: "replacementField", action: "deletion#chooseSubmitButton" } %>
 
       <%= render DS::Button.new(
         variant: "destructive",
         type: :submit,
-        text: t(".delete_and_leave_uncategorized", category_name: @category.name),
+        text: t(".delete_and_leave_uncategorized", category_name: @category.display_name),
         full_width: true,
         data: { deletion_target: "destructiveSubmitButton" }
       ) %>
 
       <%= render DS::Button.new(
-        text: t(".delete_and_recategorize", category_name: @category.name),
+        text: t(".delete_and_recategorize", category_name: @category.display_name),
         type: :submit,
         data: { deletion_target: "safeSubmitButton" },
         hidden: true,
diff --git a/app/views/category/dropdowns/_row.html.erb b/app/views/category/dropdowns/_row.html.erb
index 067286e24..8f133c14b 100644
--- a/app/views/category/dropdowns/_row.html.erb
+++ b/app/views/category/dropdowns/_row.html.erb
@@ -7,7 +7,7 @@
       aria_selected: is_selected.to_s,
       class: ["filterable-item flex justify-between items-center border-none rounded-lg px-2 py-1 group w-full hover:bg-container-inset-hover",
               { "bg-container-inset": is_selected }],
-      data: { filter_name: category.name } do %>
+      data: { filter_name: category.display_name } do %>
   <%= button_to transaction_category_path(
         @transaction.entry,
         grouped: params[:grouped],
@@ -18,11 +18,13 @@
       ),
       method: :patch,
       data: { turbo_frame: "category_dropdown" },
-      class: "flex w-full items-center gap-1.5 cursor-pointer focus:outline-none" do %>
+      class: "flex w-full items-center gap-1.5 cursor-pointer" do %>
 
-    <%= icon("check") if is_selected %>
+    <span class="flex items-center justify-center w-5 h-5 shrink-0">
+      <% if is_selected %><%= icon("check") %><% end %>
+    </span>
 
-    <% if category.subcategory? %>
+    <% if category.parent_id.present? %>
       <%= icon("corner-down-right", size: "sm") %>
     <% end %>
 
diff --git a/app/views/chats/_worker_health_warning.html.erb b/app/views/chats/_worker_health_warning.html.erb
new file mode 100644
index 000000000..0d36176e8
--- /dev/null
+++ b/app/views/chats/_worker_health_warning.html.erb
@@ -0,0 +1,10 @@
+<%# locals: () %>
+<%# Warns when the background worker that delivers AI responses is down or
+    backed up. Self-hosted only — managed instances run their own workers. %>
+<% if Rails.application.config.app_mode.self_hosted? && Current.user.ai_enabled? && !BackgroundJobHealth.healthy? %>
+  <%= render DS::Alert.new(
+    variant: "warning",
+    message: t("chats.worker_unhealthy_warning"),
+    live: :polite
+  ) %>
+<% end %>
diff --git a/app/views/chats/show.html.erb b/app/views/chats/show.html.erb
index 2b69c1f0d..743f7169b 100644
--- a/app/views/chats/show.html.erb
+++ b/app/views/chats/show.html.erb
@@ -8,6 +8,8 @@
       <div class="md:p-4">
         <%= render "chats/chat_nav", chat: @chat %>
 
+        <%= render "chats/worker_health_warning" %>
+
         <% if show_demo_warning? %>
           <%= render "shared/demo_warning",
             title: t("chats.demo_banner_title"),
diff --git a/app/views/credit_cards/_form.html.erb b/app/views/credit_cards/_form.html.erb
index ef3d5d3d4..7209e118b 100644
--- a/app/views/credit_cards/_form.html.erb
+++ b/app/views/credit_cards/_form.html.erb
@@ -34,5 +34,18 @@
                                         min: 0 %>
       </div>
     <% end %>
+
+    <% enable_banking_account = account.provider_account_for("EnableBankingAccount") if account.persisted? %>
+    <% if enable_banking_account %>
+      <div class="flex items-center justify-between gap-2">
+        <div class="space-y-1">
+          <p class="text-sm" id="enable_banking_balance_toggle_label"><%= t("credit_cards.form.treat_balance_as_available_credit_label") %></p>
+          <p class="text-secondary text-xs"><%= t("credit_cards.form.treat_balance_as_available_credit_description") %></p>
+        </div>
+        <%= form.fields_for :enable_banking, enable_banking_account do |eb_form| %>
+          <%= eb_form.toggle :treat_balance_as_available_credit, "aria-labelledby": "enable_banking_balance_toggle_label" %>
+        <% end %>
+      </div>
+    <% end %>
   </div>
 <% end %>
diff --git a/app/views/cryptos/_form.html.erb b/app/views/cryptos/_form.html.erb
index 7abbc09bc..3174fc190 100644
--- a/app/views/cryptos/_form.html.erb
+++ b/app/views/cryptos/_form.html.erb
@@ -3,7 +3,7 @@
 <%= render "accounts/form", account: account, url: url do |form| %>
   <%= form.fields_for :accountable do |crypto_form| %>
     <%= crypto_form.select :subtype,
-                          Crypto::SUBTYPES.map { |k, v| [v[:long], k] },
+                          Crypto.subtype_options_for_select,
                           { label: t("cryptos.form.subtype_label"), prompt: t("cryptos.form.subtype_prompt"), include_blank: t("cryptos.form.subtype_none") } %>
 
     <%= crypto_form.select :tax_treatment,
diff --git a/app/views/depositories/_form.html.erb b/app/views/depositories/_form.html.erb
index df853e8d9..41a807fcf 100644
--- a/app/views/depositories/_form.html.erb
+++ b/app/views/depositories/_form.html.erb
@@ -2,6 +2,6 @@
 
 <%= render "accounts/form", account: account, url: url do |form| %>
   <%= form.select :subtype,
-                 Depository::SUBTYPES.map { |k, v| [v[:long], k] },
+                 Depository.subtype_options_for_select,
                  { label: true, prompt: t("depositories.form.subtype_prompt"), include_blank: t("depositories.form.none") } %>
 <% end %>
diff --git a/app/views/doorkeeper/authorizations/new.html.erb b/app/views/doorkeeper/authorizations/new.html.erb
index e228dcae8..fd3238314 100644
--- a/app/views/doorkeeper/authorizations/new.html.erb
+++ b/app/views/doorkeeper/authorizations/new.html.erb
@@ -24,7 +24,7 @@
   <% end %>
 
   <div class="space-y-3">
-    <% turbo_disabled = params[:redirect_uri]&.start_with?("sureapp://") || params[:display] == "mobile" %>
+    <% turbo_disabled = params[:redirect_uri]&.start_with?("sureapp://") || params[:display] == "mobile" || !params[:redirect_uri]&.start_with?(root_url) %>
     <%= form_tag oauth_authorization_path, method: :post, class: "w-full", data: { turbo: !turbo_disabled } do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid, id: nil %>
       <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri, id: nil %>
diff --git a/app/views/family_exports/index.html.erb b/app/views/family_exports/index.html.erb
index 9299b4131..69dfbf0db 100644
--- a/app/views/family_exports/index.html.erb
+++ b/app/views/family_exports/index.html.erb
@@ -1,8 +1,7 @@
 <%= content_for :page_title, t(".title") %>
 
-<%= settings_section title: t(".title") do %>
-  <div class="space-y-4">
-    <% has_processing = @exports.any? { |e| e.pending? || e.processing? } %>
+<%= settings_section do %>
+  <% has_processing = @exports.any? { |e| e.pending? || e.processing? } %>
     <%= turbo_frame_tag "family_exports",
         data: has_processing ? {
           controller: "polling",
@@ -18,7 +17,7 @@
           <p><%= @pagy.count %></p>
         </div>
 
-        <div class="bg-container rounded-lg shadow-border-xs overflow-x-auto">
+        <div class="overflow-x-auto">
           <% if @exports.any? %>
             <table class="w-full overflow-x-auto">
               <thead>
@@ -68,6 +67,18 @@
                   <td class="px-2 py-3 text-right">
                     <% if export.processing? || export.pending? %>
                       <div class="flex items-center justify-end gap-2 text-secondary">
+                        <% if export.presumed_lost? %>
+                          <%= button_to cancel_family_export_path(export),
+                                        method: :post,
+                                        class: "flex items-center gap-2 text-secondary hover:text-primary",
+                                        aria: { label: t("family_exports.table.row.actions.mark_failed") },
+                                        data: {
+                                          turbo_confirm: t("family_exports.table.row.actions.confirm_mark_failed"),
+                                          turbo_frame: "_top"
+                                        } do %>
+                            <%= icon "circle-x", class: "w-4 h-4" %>
+                          <% end %>
+                        <% end %>
                         <div class="animate-spin h-4 w-4 border-2 border-secondary border-t-transparent rounded-full"></div>
                         <span class="text-sm"><%= t("family_exports.exporting") %></span>
                       </div>
@@ -135,5 +146,4 @@
       <%= icon("plus") %>
       <%= t(".new") %>
     <% end %>
-  </div>
 <% end %>
diff --git a/app/views/family_exports/new.html.erb b/app/views/family_exports/new.html.erb
index 9433eee2f..b383520a8 100644
--- a/app/views/family_exports/new.html.erb
+++ b/app/views/family_exports/new.html.erb
@@ -25,11 +25,7 @@
         </ul>
       </div>
 
-      <div class="bg-amber-50 border border-amber-200 rounded-lg p-3">
-        <p class="text-sm text-amber-800">
-          <strong><%= t(".note_label") %>:</strong> <%= t(".note_description") %>
-        </p>
-      </div>
+      <%= render DS::Alert.new(title: t(".note_label"), message: t(".note_description"), variant: :warning) %>
 
       <%= form_with url: family_exports_path, method: :post, class: "space-y-4" do |form| %>
         <div class="flex gap-3">
diff --git a/app/views/family_merchants/_family_merchant.html.erb b/app/views/family_merchants/_family_merchant.html.erb
index c0df9dfec..d1c6f8be3 100644
--- a/app/views/family_merchants/_family_merchant.html.erb
+++ b/app/views/family_merchants/_family_merchant.html.erb
@@ -5,7 +5,7 @@
     <div class="flex w-full items-center gap-2.5">
       <% if family_merchant.logo_url %>
         <div class="w-8 h-8 rounded-full flex justify-center items-center">
-          <%= image_tag Setting.transform_brand_fetch_url(family_merchant.logo_url), class: "w-8 h-8 rounded-full" %>
+          <%= image_tag Setting.transform_brand_fetch_url(family_merchant.logo_url), class: "w-8 h-8 rounded-full", loading: "lazy" %>
         </div>
       <% else %>
         <%= render partial: "shared/color_avatar", locals: { name: family_merchant.name, color: family_merchant.color } %>
diff --git a/app/views/family_merchants/_provider_merchant.html.erb b/app/views/family_merchants/_provider_merchant.html.erb
index d466b0cbc..1f33c0317 100644
--- a/app/views/family_merchants/_provider_merchant.html.erb
+++ b/app/views/family_merchants/_provider_merchant.html.erb
@@ -5,7 +5,7 @@
     <div class="flex w-full items-center gap-2.5">
       <% if provider_merchant.logo_url %>
         <div class="w-8 h-8 rounded-full flex justify-center items-center">
-          <%= image_tag Setting.transform_brand_fetch_url(provider_merchant.logo_url), class: "w-8 h-8 rounded-full" %>
+          <%= image_tag Setting.transform_brand_fetch_url(provider_merchant.logo_url), class: "w-8 h-8 rounded-full", loading: "lazy" %>
         </div>
       <% else %>
         <div class="w-8 h-8 rounded-full flex items-center justify-center bg-container-inset text-secondary text-sm font-medium">
diff --git a/app/views/family_merchants/index.html.erb b/app/views/family_merchants/index.html.erb
index 28989178a..0eb163a40 100644
--- a/app/views/family_merchants/index.html.erb
+++ b/app/views/family_merchants/index.html.erb
@@ -7,6 +7,12 @@
         href: merge_family_merchants_path,
         frame: :modal,
         icon: "combine") %>
+    <% menu.with_item(
+        variant: "link",
+        text: t(".import"),
+        href: new_import_path(type: "MerchantImport"),
+        frame: :modal,
+        icon: "upload") %>
   <% end %>
   <%= render DS::Link.new(
     text: t(".new"),
@@ -26,24 +32,47 @@
     </div>
 
     <% if @all_family_merchants.any? %>
-      <div class="rounded-xl bg-container-inset space-y-1 p-1">
-        <div class="bg-container rounded-lg shadow-border-xs overflow-x-auto">
-          <table class="w-full">
-            <thead>
-              <tr class="text-xs uppercase font-medium text-secondary border-b border-divider">
-                <th scope="col" class="text-left py-3 px-4"><%= t(".table.merchant") %></th>
-                <th scope="col" class="text-right py-3 px-4"><%= t(".table.actions") %></th>
-              </tr>
-            </thead>
-            <tbody>
-              <%= render partial: "family_merchants/family_merchant", collection: @family_merchants %>
-            </tbody>
-          </table>
-        </div>
-      </div>
+      <div class="space-y-2">
+        <%= form_tag family_merchants_path, method: :get, data: { controller: "auto-submit-form" } do %>
+          <%= hidden_field_tag :provider_search, params[:provider_search] if params[:provider_search].present? %>
+          <%= hidden_field_tag :provider_page, params[:provider_page] if params[:provider_page].present? %>
+          <%= hidden_field_tag :per_page, params[:per_page] if params[:per_page].present? %>
+          <%= render DS::SearchInput.new(
+            variant: :standalone,
+            name: :family_search,
+            value: params[:family_search],
+            placeholder: t(".search_family_merchants"),
+            data: {
+              auto_submit_form_target: "auto",
+              autosubmit_trigger_event: "input"
+            }
+          ) %>
+        <% end %>
+        <% if @family_merchants.any? %>
+          <div class="rounded-xl bg-container-inset space-y-1 p-1">
+            <div class="bg-container rounded-lg shadow-border-xs overflow-x-auto">
+              <table class="w-full">
+                <thead>
+                  <tr class="text-xs uppercase font-medium text-secondary border-b border-divider">
+                    <th scope="col" class="text-left py-3 px-4"><%= t(".table.merchant") %></th>
+                    <th scope="col" class="text-right py-3 px-4"><%= t(".table.actions") %></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <%= render partial: "family_merchants/family_merchant", collection: @family_merchants %>
+                </tbody>
+              </table>
+            </div>
+          </div>
 
-      <div class="pt-4">
-        <%= render "shared/pagination", pagy: @pagy_family_merchants %>
+          <div class="pt-4">
+            <%= render "shared/pagination", pagy: @pagy_family_merchants %>
+          </div>
+        <% elsif params[:family_search].present? %>
+          <div class="flex justify-center items-center py-8">
+            <p class="text-secondary text-sm"><%= t(".no_family_merchants_found") %></p>
+          </div>
+        <% end %>
       </div>
     <% else %>
       <div class="flex justify-center items-center py-12">
@@ -92,25 +121,48 @@
     <% end %>
 
     <% if @all_provider_merchants.any? %>
-      <div class="rounded-xl bg-container-inset space-y-1 p-1">
-        <div class="bg-container rounded-lg shadow-border-xs overflow-x-auto">
-          <table class="w-full">
-            <thead>
-              <tr class="text-xs uppercase font-medium text-secondary border-b border-divider">
-                <th scope="col" class="text-left py-3 px-4"><%= t(".table.merchant") %></th>
-                <th scope="col" class="text-left py-3 px-4"><%= t(".table.source") %></th>
-                <th scope="col" class="text-right py-3 px-4"><%= t(".table.actions") %></th>
-              </tr>
-            </thead>
-            <tbody>
-              <%= render partial: "family_merchants/provider_merchant", collection: @provider_merchants %>
-            </tbody>
-          </table>
-        </div>
-      </div>
+      <div class="space-y-2">
+        <%= form_tag family_merchants_path, method: :get, data: { controller: "auto-submit-form" } do %>
+          <%= hidden_field_tag :family_search, params[:family_search] if params[:family_search].present? %>
+          <%= hidden_field_tag :family_page, params[:family_page] if params[:family_page].present? %>
+          <%= hidden_field_tag :per_page, params[:per_page] if params[:per_page].present? %>
+          <%= render DS::SearchInput.new(
+            variant: :standalone,
+            name: :provider_search,
+            value: params[:provider_search],
+            placeholder: t(".search_provider_merchants"),
+            data: {
+              auto_submit_form_target: "auto",
+              autosubmit_trigger_event: "input"
+            }
+          ) %>
+        <% end %>
+        <% if @provider_merchants.any? %>
+          <div class="rounded-xl bg-container-inset space-y-1 p-1">
+            <div class="bg-container rounded-lg shadow-border-xs overflow-x-auto">
+              <table class="w-full">
+                <thead>
+                  <tr class="text-xs uppercase font-medium text-secondary border-b border-divider">
+                    <th scope="col" class="text-left py-3 px-4"><%= t(".table.merchant") %></th>
+                    <th scope="col" class="text-left py-3 px-4"><%= t(".table.source") %></th>
+                    <th scope="col" class="text-right py-3 px-4"><%= t(".table.actions") %></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <%= render partial: "family_merchants/provider_merchant", collection: @provider_merchants %>
+                </tbody>
+              </table>
+            </div>
+          </div>
 
-      <div class="pt-4">
-        <%= render "shared/pagination", pagy: @pagy_provider_merchants %>
+          <div class="pt-4">
+            <%= render "shared/pagination", pagy: @pagy_provider_merchants %>
+          </div>
+        <% elsif params[:provider_search].present? %>
+          <div class="flex justify-center items-center py-8">
+            <p class="text-secondary text-sm"><%= t(".no_provider_merchants_found") %></p>
+          </div>
+        <% end %>
       </div>
     <% else %>
       <div class="flex justify-center items-center py-8">
diff --git a/app/views/family_merchants/merge.html.erb b/app/views/family_merchants/merge.html.erb
index 879118d56..5ee222d2d 100644
--- a/app/views/family_merchants/merge.html.erb
+++ b/app/views/family_merchants/merge.html.erb
@@ -5,15 +5,42 @@
       <%= f.collection_select :target_id,
             @merchants,
             :id, :name,
-            { prompt: t(".select_target"), label: t(".target_label") },
+            { prompt: t(".select_target"), label: t(".target_label"), searchable: true, variant: :logo },
             { required: true } %>
 
-      <div class="space-y-2">
+      <div class="space-y-2" data-controller="list-filter">
         <p class="text-sm font-medium text-primary"><%= t(".sources_label") %></p>
-        <div class="max-h-64 overflow-y-auto space-y-1 border border-secondary rounded-lg p-2">
+        <%= render DS::SearchInput.new(
+          variant: :embedded,
+          placeholder: t(".sources_search_placeholder"),
+          data: {
+            list_filter_target: "input",
+            action: "input->list-filter#filter keydown->list-filter#handleKeydown"
+          }
+        ) %>
+        <div data-list-filter-target="list" class="max-h-64 overflow-y-auto space-y-1 border border-secondary rounded-lg p-2">
+          <p class="hidden text-sm text-secondary px-2 py-1" data-list-filter-target="emptyMessage">
+            <%= t(".no_merchants_found") %>
+          </p>
           <% @merchants.each do |merchant| %>
-            <label class="flex items-center gap-2 p-2 hover:bg-surface-hover rounded cursor-pointer">
+            <label class="filterable-item flex items-center gap-2 p-2 hover:bg-surface-hover rounded cursor-pointer"
+                   data-filter-name="<%= merchant.name %>">
               <%= check_box_tag "source_ids[]", merchant.id, false, class: "rounded border-secondary" %>
+              <div class="hidden lg:flex">
+                <% if merchant.logo_url.present? %>
+                  <%= image_tag Setting.transform_brand_fetch_url(merchant.logo_url),
+                      class: "w-6 h-6 rounded-full border border-secondary",
+                      loading: "lazy" %>
+                <% else %>
+                  <%= render DS::FilledIcon.new(
+                    variant: :text,
+                    hex_color: merchant.color,
+                    text: merchant.name,
+                    size: "sm",
+                    rounded: true
+                  ) %>
+                <% end %>
+              </div>
               <span class="text-sm text-primary"><%= merchant.name %></span>
               <% if merchant.is_a?(ProviderMerchant) %>
                 <span class="text-xs text-subdued">(<%= merchant.source&.titleize %>)</span>
diff --git a/app/views/goal_pledges/new.html.erb b/app/views/goal_pledges/new.html.erb
index ac5767c95..a7143a777 100644
--- a/app/views/goal_pledges/new.html.erb
+++ b/app/views/goal_pledges/new.html.erb
@@ -7,7 +7,11 @@
 
     <%
       account_options = @goal.linked_accounts.map do |a|
-        [ a.name, a.id, { data: { manual: a.manual?.to_s } } ]
+        # `manual` drives the "update your manual balance" helper copy. Key it
+        # off the pledge kind actually saved (default_pledge_kind), so a manual
+        # investment account — which pledges via transfer — shows the transfer
+        # helper, not the manual one.
+        [ a.name, a.id, { data: { manual: (a.default_pledge_kind == "manual_save").to_s } } ]
       end
     %>
 
diff --git a/app/views/goals/_color_picker.html.erb b/app/views/goals/_color_picker.html.erb
index fb4d2891a..e178db443 100644
--- a/app/views/goals/_color_picker.html.erb
+++ b/app/views/goals/_color_picker.html.erb
@@ -15,7 +15,9 @@
     </span>
 
     <%= render DS::Disclosure.new(
-          summary_class: "cursor-pointer absolute -bottom-1 -right-1 flex justify-center items-center bg-surface-inset hover:bg-surface-inset-hover border-2 w-6 h-6 border-subdued rounded-full text-secondary",
+          variant: :bare,
+          summary_aria_label: t("goals.color_picker.trigger_label"),
+          summary_class: "list-none cursor-pointer absolute -bottom-1 -right-1 flex justify-center items-center bg-surface-inset hover:bg-surface-inset-hover border-2 w-6 h-6 border-subdued rounded-full text-secondary",
           data: {
             color_icon_picker_target: "details",
             action: "mousedown->color-icon-picker#handleOutsideClick"
@@ -41,13 +43,13 @@
               <div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-alpha-black-500" data-color-icon-picker-target="pickerBtn" style="background: conic-gradient(red,orange,yellow,lime,green,teal,cyan,blue,indigo,purple,magenta,pink,red)"></div>
             </label>
           </div>
-          <div class="flex gap-2 items-center hidden flex-col" data-color-icon-picker-target="paletteSection">
+          <div class="hidden flex-col gap-2" data-color-icon-picker-target="paletteSection">
             <div class="flex gap-2 items-center w-full">
               <div class="w-6 h-6 p-4 rounded-full cursor-pointer" style="background-color: <%= form.object.color %>" data-color-icon-picker-target="colorPreview"></div>
               <%= form.text_field :color, data: { color_icon_picker_target: "colorInput" }, inline: true, pattern: "^#[0-9A-Fa-f]{6}$" %>
               <%= icon "palette", size: "2xl", data: { action: "click->color-icon-picker#toggleSections" } %>
             </div>
-            <div data-color-icon-picker-target="validationMessage" class="hidden self-start flex gap-1 items-center text-xs text-destructive">
+            <div data-color-icon-picker-target="validationMessage" class="hidden self-start gap-1 items-center text-xs text-destructive">
               <span><%= t("goals.color_picker.poor_contrast") %></span>
               <button type="button" class="underline cursor-pointer" data-action="color-icon-picker#autoAdjust"><%= t("goals.color_picker.auto_adjust") %></button>
             </div>
diff --git a/app/views/goals/_form.html.erb b/app/views/goals/_form.html.erb
index ac64c468e..6b53c230d 100644
--- a/app/views/goals/_form.html.erb
+++ b/app/views/goals/_form.html.erb
@@ -2,16 +2,14 @@
 
 <div data-controller="goal-form"
      data-goal-form-currency-value="<%= Current.family.primary_currency_code %>"
+     data-goal-form-require-account-value="<%= !goal.persisted? %>"
      data-goal-form-suggested-with-date-value="<%= t("goals.form.suggested_with_date") %>"
      data-goal-form-suggested-no-date-value="<%= t("goals.form.suggested_no_date") %>">
-  <% if goal.errors[:base].any? %>
-    <%= render "shared/form_errors", model: goal %>
-  <% end %>
-
   <%= styled_form_with model: goal,
                        url: goal.persisted? ? goal_path(goal) : goals_path,
                        method: goal.persisted? ? :patch : :post,
-                       class: "space-y-5" do |f| %>
+                       class: "space-y-5",
+                       data: { action: "submit->goal-form#validateOnSubmit" } do |f| %>
     <div class="flex justify-center">
       <%= render "color_picker", form: f, colors: Goal::COLORS, icons: Goal::ICONS %>
     </div>
@@ -23,17 +21,17 @@
                        required: true,
                        label: t("goals.form.fields.name"),
                        data: { goal_form_target: "nameInput", action: "input->goal-form#nameChanged" } %>
-      <p class="hidden mt-1.5 text-xs text-destructive" data-goal-form-target="nameError"><%= t("goals.form.errors.name_required") %></p>
+      <p class="<%= "hidden" unless goal.errors[:name].any? %> mt-1.5 text-xs text-destructive" data-goal-form-target="nameError"><%= t("goals.form.errors.name_required") %></p>
     </div>
 
-    <div class="grid grid-cols-2 gap-3">
+    <div class="grid grid-cols-2 gap-3 items-start">
       <div>
         <%= f.money_field :target_amount,
                           label: t("goals.form.fields.target_amount"),
                           hide_currency: true,
                           required: true,
                           amount_data: { goal_form_target: "amountInput", action: "input->goal-form#suggestedChanged" } %>
-        <p class="hidden mt-1.5 text-xs text-destructive" data-goal-form-target="amountError"><%= t("goals.form.errors.amount_required") %></p>
+        <p class="<%= "hidden" unless goal.errors[:target_amount].any? %> mt-1.5 text-xs text-destructive" data-goal-form-target="amountError"><%= t("goals.form.errors.amount_required") %></p>
       </div>
       <%= f.date_field :target_date,
                        label: t("goals.form.fields.target_date"),
@@ -46,35 +44,47 @@
       <div class="mb-2">
         <span class="block text-sm font-medium text-primary"><%= t("goals.form.fields.funding_accounts") %></span>
         <p class="text-xs text-secondary mt-0.5"><%= t("goals.form.fields.funding_accounts_hint") %></p>
+        <p class="text-xs text-subdued mt-0.5"><%= t("goals.form.fields.earmark_hint") %></p>
       </div>
       <div class="bg-container-inset rounded-lg p-1">
+        <% linked_allocation_by_account = goal.goal_accounts.index_by(&:account_id) %>
         <% grouped = linkable_accounts.group_by { |a| a.subtype.to_s.presence || "other" } %>
         <% grouped.each_with_index do |(subtype, accts), group_idx| %>
           <div class="px-3 py-2 text-[11px] font-medium uppercase tracking-wide text-secondary"><%= t("goals.form.subtypes.#{subtype}", default: subtype.titleize) %></div>
           <div class="bg-container rounded-md <%= "mb-1" if group_idx < grouped.size - 1 %>">
             <% accts.each_with_index do |account, idx| %>
-              <label class="flex items-center gap-3 px-3 py-2.5 cursor-pointer hover:bg-surface-hover <%= "border-t border-subdued" if idx > 0 %>">
-                <%= check_box_tag "goal[account_ids][]",
-                                  account.id,
-                                  currently_linked_account_ids.include?(account.id.to_s),
-                                  id: "goal_account_ids_#{account.id}",
-                                  class: "checkbox checkbox--light shrink-0",
-                                  data: {
-                                    goal_form_target: "linkedAccountCheckbox",
-                                    action: "change->goal-form#linkedAccountChanged"
-                                  } %>
-                <%= render Goals::AvatarComponent.new(name: account.name, color: Goals::AvatarComponent.color_for(account.name), size: "md") %>
-                <div class="flex-1 min-w-0">
-                  <p class="text-sm font-medium text-primary truncate"><%= account.name %></p>
-                  <p class="text-xs text-secondary"><%= (account.subtype || subtype).titleize %></p>
-                </div>
-                <span class="text-sm text-primary tabular-nums privacy-sensitive"><%= Money.new(account.balance, account.currency).format %></span>
-              </label>
+              <% linked_ga = linked_allocation_by_account[account.id] %>
+              <div class="flex items-center gap-3 px-3 py-2.5 hover:bg-surface-hover <%= "border-t border-subdued" if idx > 0 %>">
+                <label class="flex items-center gap-3 flex-1 min-w-0 cursor-pointer">
+                  <%= check_box_tag "goal[account_ids][]",
+                                    account.id,
+                                    currently_linked_account_ids.include?(account.id.to_s),
+                                    id: "goal_account_ids_#{account.id}",
+                                    class: "checkbox checkbox--light shrink-0",
+                                    data: {
+                                      goal_form_target: "linkedAccountCheckbox",
+                                      action: "change->goal-form#linkedAccountChanged"
+                                    } %>
+                  <%= render Goals::AvatarComponent.new(name: account.name, color: Goals::AvatarComponent.color_for(account.name), size: "md") %>
+                  <div class="min-w-0">
+                    <p class="text-sm font-medium text-primary truncate"><%= account.name %></p>
+                    <% row_subtype = account.subtype.to_s.presence || subtype %>
+                    <p class="text-xs text-secondary tabular-nums privacy-sensitive"><%= t("goals.form.subtypes.#{row_subtype}", default: row_subtype.titleize) %> · <%= Money.new(account.balance, account.currency).format %></p>
+                  </div>
+                </label>
+                <%= text_field_tag "goal[allocations][#{account.id}]",
+                                   linked_ga&.allocated_amount&.to_s("F"),
+                                   placeholder: t("goals.form.fields.whole_balance"),
+                                   inputmode: "decimal",
+                                   autocomplete: "off",
+                                   aria: { label: t("goals.form.fields.earmark_for", account: account.name) },
+                                   class: "shrink-0 w-36 rounded-md border border-primary bg-container px-2.5 py-1.5 text-sm text-right tabular-nums text-primary placeholder:text-subdued focus-ring privacy-sensitive" %>
+              </div>
             <% end %>
           </div>
         <% end %>
       </div>
-      <p class="hidden mt-1.5 text-xs text-destructive" data-goal-form-target="accountsError"><%= t("goals.form.errors.accounts_required") %></p>
+      <p class="<%= "hidden" unless goal.errors[:base].any? %> mt-1.5 text-xs text-destructive" data-goal-form-target="accountsError"><%= t("goals.form.errors.accounts_required") %></p>
     </div>
 
     <%= f.text_area :notes,
@@ -83,7 +93,8 @@
                     placeholder: t("goals.form.fields.notes_placeholder") %>
 
     <div class="flex justify-end pt-2">
-      <%= f.submit goal.persisted? ? t("goals.form.save") : t("goals.form.create") %>
+      <%= f.submit goal.persisted? ? t("goals.form.save") : t("goals.form.create"),
+                   data: { goal_form_target: "submitButton" } %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/goals/_status_callout.html.erb b/app/views/goals/_status_callout.html.erb
index a2c609ad3..a8118fbc9 100644
--- a/app/views/goals/_status_callout.html.erb
+++ b/app/views/goals/_status_callout.html.erb
@@ -4,11 +4,11 @@
 
   variant_classes = case goal.status
                     when :behind
-                      "bg-warning/10 border-warning/20 text-warning"
+                      "bg-warning/10 border-warning/20"
                     when :on_track
-                      "bg-success/10 border-success/20 text-success"
+                      "bg-success/10 border-success/20"
                     else
-                      "bg-surface-inset border-secondary text-secondary"
+                      "bg-surface-inset border-secondary"
                     end
 
   icon_glyph = case goal.status
@@ -18,10 +18,16 @@
                else "info"
                end
 
+  icon_color = case goal.status
+               when :behind then "warning"
+               when :on_track then "success"
+               else "default"
+               end
+
   label = t("goals.status.#{goal.status}", default: goal.status.to_s.titleize)
 %>
-<div class="rounded-lg border px-3 py-2 text-sm flex items-center gap-2 <%= variant_classes %>">
-  <span class="shrink-0"><%= icon(icon_glyph, size: "sm") %></span>
+<div class="rounded-lg border px-3 py-2 text-sm flex items-center gap-2 text-primary <%= variant_classes %>">
+  <span class="shrink-0"><%= icon(icon_glyph, size: "sm", color: icon_color) %></span>
   <span class="font-medium"><%= label %></span>
   <span class="opacity-60">·</span>
   <span class="opacity-90 <%= "privacy-sensitive" if goal.status == :behind %>"><%= context %></span>
diff --git a/app/views/goals/index.html.erb b/app/views/goals/index.html.erb
index 3c3e69b95..10d326a24 100644
--- a/app/views/goals/index.html.erb
+++ b/app/views/goals/index.html.erb
@@ -1,4 +1,8 @@
-<div class="space-y-8 pb-6 lg:pb-12">
+<%# @container so the KPI strip + card grids respond to the actual content
+    width (which shrinks when the account / AI sidebars are open) rather than
+    the viewport. Viewport breakpoints kept 3 columns in a narrow center
+    column and crushed the cards. %>
+<div class="@container space-y-8 pb-6 lg:pb-12">
   <header>
     <div class="flex items-center gap-2">
       <h1 class="text-2xl font-semibold text-primary"><%= t(".title") %></h1>
@@ -11,7 +15,7 @@
     <%= render "empty_state", linkable_account_count: @linkable_account_count %>
   <% else %>
     <%# KPI strip. Contributed last 30d (with prior-30d comparison) / Needs / On track %>
-    <section class="grid grid-cols-1 md:grid-cols-3 gap-3">
+    <section class="grid grid-cols-1 @3xl:grid-cols-3 gap-3">
       <div class="bg-container rounded-xl shadow-border-xs px-5 py-5">
         <p class="text-[11px] font-medium uppercase tracking-wide text-secondary"><%= t(".kpi.contributed_label") %></p>
         <p class="text-3xl font-medium text-primary tabular-nums mt-2 privacy-sensitive">
@@ -95,7 +99,7 @@
              data-goals-filter-empty-both-value="<%= t(".search.empty_with_both", query: "__QUERY__") %>"
              data-goals-filter-empty-default-value="<%= t(".search.empty") %>">
       <% if @linkable_account_count > 0 %>
-        <div class="flex items-center justify-end mb-3">
+        <div class="flex items-center justify-end mb-4">
           <%= render DS::Link.new(
             text: t(".new_goal"),
             variant: "primary",
@@ -117,19 +121,22 @@
                   action: "input->goals-filter#filter"
                 }
               ) %>
-          <div class="inline-flex items-center gap-1 p-1 bg-surface-inset rounded-xl">
+          <%# overflow-x-auto + nowrap chips: the segmented control scrolls
+              horizontally when the column is too narrow for all six chips,
+              rather than wrapping "On track" mid-label or forcing the row
+              wider than the viewport. %>
+          <%= render DS::SegmentedControl.new(aria_label: t(".chips_aria", default: "Filter goals by status"), class: "overflow-x-auto max-w-full") do |sc| %>
             <% %w[all on_track behind no_target_date paused completed].each do |status| %>
-              <% active = status == "all" %>
-              <button type="button"
-                      data-goals-filter-target="chip"
-                      data-action="click->goals-filter#selectChip"
-                      data-status="<%= status %>"
-                      aria-pressed="<%= active %>"
-                      class="px-2.5 py-1 text-xs font-medium rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-100 <%= active ? "bg-container shadow-border-xs text-primary" : "text-secondary" %>">
-                <%= t(".chips.#{status}") %>
-              </button>
+              <% sc.with_segment(t(".chips.#{status}"),
+                   active: status == "all",
+                   class: "shrink-0 whitespace-nowrap",
+                   data: {
+                     "goals-filter-target": "chip",
+                     status: status,
+                     action: "click->goals-filter#selectChip"
+                   }) %>
             <% end %>
-          </div>
+          <% end %>
         </div>
       <% end %>
 
@@ -139,7 +146,7 @@
           <span class="text-subdued">·</span>
           <span class="tabular-nums" data-goals-filter-target="count"><%= @grid_goals.size %></span>
         </div>
-        <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3.5" data-goals-filter-target="grid">
+        <div class="grid grid-cols-1 @2xl:grid-cols-2 @5xl:grid-cols-3 gap-3.5" data-goals-filter-target="grid">
           <% @grid_goals.each do |goal| %>
             <%= render Goals::CardComponent.new(goal: goal) %>
           <% end %>
@@ -179,7 +186,7 @@
               <span class="tabular-nums"><%= @archived_goals.size %></span>
             </span>
           <% end %>
-          <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3.5">
+          <div class="grid grid-cols-1 @2xl:grid-cols-2 @5xl:grid-cols-3 gap-3.5">
             <% @archived_goals.each do |goal| %>
               <%= render Goals::CardComponent.new(goal: goal, filterable: false) %>
             <% end %>
diff --git a/app/views/goals/new.html.erb b/app/views/goals/new.html.erb
index fb4162f45..40bd104b9 100644
--- a/app/views/goals/new.html.erb
+++ b/app/views/goals/new.html.erb
@@ -9,7 +9,7 @@
             <p class="text-sm text-secondary mt-0.5"><%= t(".subtitle") %></p>
           </div>
         </div>
-        <%= render DS::Button.new(variant: "icon", icon: "x", title: t("common.close"), aria_label: t("common.close"), data: { action: "DS--dialog#close" }) %>
+        <%= render DS::Button.new(variant: "icon", icon: "x", title: t("defaults.common.close"), aria_label: t("defaults.common.close"), data: { action: "DS--dialog#close" }) %>
       </div>
     <% end %>
     <% dialog.with_body do %>
diff --git a/app/views/goals/show.html.erb b/app/views/goals/show.html.erb
index 21bc8ec22..7fef99610 100644
--- a/app/views/goals/show.html.erb
+++ b/app/views/goals/show.html.erb
@@ -65,6 +65,9 @@
         <% if @goal.may_unarchive? %>
           <% menu.with_item(variant: "button", text: t(".unarchive"), icon: "archive-restore", href: unarchive_goal_path(@goal), method: :patch) %>
         <% end %>
+        <% if @goal.may_reopen? %>
+          <% menu.with_item(variant: "button", text: t(".reopen"), icon: "rotate-ccw", href: reopen_goal_path(@goal), method: :patch) %>
+        <% end %>
         <% if @goal.archived? %>
           <% menu.with_item(
                variant: "button",
@@ -121,6 +124,9 @@
     <div class="rounded-xl p-5 flex flex-col items-center justify-center text-center">
       <%= render Goals::ProgressRingComponent.new(goal: @goal, size: 180) %>
       <p class="text-xl font-medium text-primary tabular-nums privacy-sensitive mt-4"><%= @goal.current_balance_money.format(precision: 0) %></p>
+      <% if @goal.contributions_basis? %>
+        <p class="text-xs text-secondary tabular-nums mt-0.5 privacy-sensitive"><%= t(".ring.market_value", amount: @goal.market_value_money.format(precision: 0)) %></p>
+      <% end %>
       <% unless @goal.completed? %>
         <p class="text-xs text-subdued tabular-nums mt-0.5 privacy-sensitive"><%= t(".ring.to_go", amount: @goal.remaining_amount_money.format(precision: 0)) %></p>
       <% end %>
@@ -224,14 +230,15 @@
             <% end %>
           </div>
         </div>
-        <div class="flex-1 min-h-[200px]"
+        <div class="flex-1 min-h-[200px] privacy-sensitive"
              data-controller="goal-projection-chart"
              data-goal-projection-chart-data-value="<%= @goal.projection_payload.to_json %>"
              data-goal-projection-chart-aria-label-value="<%= t("goals.show.projection.aria_label", name: @goal.name) %>"
              data-goal-projection-chart-aria-description-value="<%= strip_tags(@goal.projection_summary) %>"
              data-goal-projection-chart-today-label-value="<%= t("goals.show.projection.today_marker") %>"
              data-goal-projection-chart-projected-template-value="<%= t("goals.show.projection.tooltip_projected", amount: "{amount}") %>"
-             data-goal-projection-chart-saved-template-value="<%= t("goals.show.projection.tooltip_saved", amount: "{amount}") %>"></div>
+             data-goal-projection-chart-saved-template-value="<%= t("goals.show.projection.tooltip_saved", amount: "{amount}") %>"
+             data-goal-projection-chart-target-relation-template-value="<%= t("goals.show.projection.tooltip_target_relation", percent: "{percent}", target: "{target}") %>"></div>
         <% if @goal.target_date.nil? %>
           <div class="mt-3 flex items-center gap-2 text-xs text-secondary">
             <span class="text-subdued"><%= icon("calendar-plus", size: "sm") %></span>
diff --git a/app/views/holdings/_missing_price_tooltip.html.erb b/app/views/holdings/_missing_price_tooltip.html.erb
index 94793a882..9ae5b3e55 100644
--- a/app/views/holdings/_missing_price_tooltip.html.erb
+++ b/app/views/holdings/_missing_price_tooltip.html.erb
@@ -3,7 +3,7 @@
     <%= icon "info", size: "sm", color: "current" %>
     <%= tag.span t(".missing_data"), class: "font-normal text-xs" %>
   </div>
-  <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-sm p-2 rounded w-64">
+  <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-sm p-2 rounded-md w-64">
     <div class="text-inverse">
       <%= t(".description") %>
     </div>
diff --git a/app/views/ibkr_items/setup_accounts.html.erb b/app/views/ibkr_items/setup_accounts.html.erb
index 80fb4d1e3..5c85dc0ee 100644
--- a/app/views/ibkr_items/setup_accounts.html.erb
+++ b/app/views/ibkr_items/setup_accounts.html.erb
@@ -123,7 +123,7 @@
                   <p class="text-xs text-primary mb-1"><%= ibkr_account.name %></p>
                   <div class="flex items-center gap-2">
                     <%= link_form.select :account_id,
-                          options_for_select(@linkable_accounts.map { |account| [t(".link_existing.manual_account_option", name: account.name, balance: number_to_currency(account.balance, unit: Money::Currency.new(account.currency || 'USD').symbol)), account.id] }),
+                          options_for_select(@linkable_accounts.map { |account| [t(".link_existing.manual_account_option", name: account.name, balance: number_to_currency(account.balance, unit: Money::Currency.new(account.currency || "USD").symbol)), account.id] }),
                           { prompt: t(".link_existing.select_prompt") },
                           class: "bg-container border border-primary rounded px-2 py-1 text-sm text-primary flex-1 min-w-0" %>
                     <%= render DS::Button.new(
@@ -140,7 +140,7 @@
         <% end %>
 
         <% if @linked_accounts.any? %>
-          <div class="<%= 'border-t border-primary pt-6 mt-4' if @unlinked_accounts.any? %>">
+          <div class="<%= "border-t border-primary pt-6 mt-4" if @unlinked_accounts.any? %>">
             <h3 class="font-medium text-primary mb-4"><%= t(".linked_accounts.title") %></h3>
             <% @linked_accounts.each do |ibkr_account| %>
               <div class="border border-success/20 bg-success/5 rounded-lg p-4 mb-2">
diff --git a/app/views/impersonation_sessions/_super_admin_bar.html.erb b/app/views/impersonation_sessions/_super_admin_bar.html.erb
index 718471b67..a401e3871 100644
--- a/app/views/impersonation_sessions/_super_admin_bar.html.erb
+++ b/app/views/impersonation_sessions/_super_admin_bar.html.erb
@@ -3,9 +3,11 @@
     <%= icon "alert-triangle", size: "lg", color: "current", class: "mr-2" %>
     <span class="text-inverse font-semibold uppercase"><%= t(".super_admin") %></span>
   </div>
-  <div>
-    <%= link_to t(".jobs"), sidekiq_web_url, class: "text-white underline hover:text-gray-100" %>
-  </div>
+  <% if sidekiq_web_available? %>
+    <div>
+      <%= link_to t(".jobs"), sidekiq_web_url, class: "text-inverse underline hover:text-subdued" %>
+    </div>
+  <% end %>
 
   <div class="flex items-center space-x-2 px-2 py-2 text-white">
     <% if Current.session.active_impersonator_session.present? %>
diff --git a/app/views/import/configurations/_merchant_import.html.erb b/app/views/import/configurations/_merchant_import.html.erb
new file mode 100644
index 000000000..b434e5461
--- /dev/null
+++ b/app/views/import/configurations/_merchant_import.html.erb
@@ -0,0 +1,14 @@
+<%# locals: (import:) %>
+
+<div class="space-y-4">
+  <p class="text-sm text-secondary"><%= t("import.configurations.merchant_import.description") %></p>
+
+  <%= styled_form_with model: import,
+                       url: import_configuration_path(import),
+                       scope: :import,
+                       method: :patch,
+                       class: "space-y-3" do |form| %>
+    <p class="text-sm text-secondary"><%= t("import.configurations.merchant_import.instructions") %></p>
+    <%= form.submit t("import.configurations.merchant_import.button_label"), disabled: import.complete? %>
+  <% end %>
+</div>
diff --git a/app/views/import/configurations/_ynab_import.html.erb b/app/views/import/configurations/_ynab_import.html.erb
new file mode 100644
index 000000000..5cd3483aa
--- /dev/null
+++ b/app/views/import/configurations/_ynab_import.html.erb
@@ -0,0 +1,24 @@
+<%# locals: (import:) %>
+
+<div class="flex items-center justify-between border border-secondary rounded-lg bg-success/5 p-5 gap-4 mb-4">
+  <span class="text-success">
+    <%= icon("check-circle", color: "current") %>
+  </span>
+  <p class="text-sm text-primary italic"><%= t(".preconfigured_notice") %></p>
+</div>
+
+<%= styled_form_with model: import, url: import_configuration_path(import), scope: :import, method: :patch, class: "space-y-4" do |form| %>
+  <div class="flex items-center gap-4">
+    <%= form.select :date_col_label, import.csv_headers, { include_blank: t(".leave_empty"), label: t(".date_label") }, required: true, disabled: import.complete? %>
+    <%= form.select :date_format, Family::DATE_FORMATS, { label: t(".date_format_label") }, label: true, required: true, disabled: import.complete? %>
+  </div>
+
+  <p class="text-xs text-secondary"><%= t(".amount_notice") %></p>
+
+  <%= form.select :account_col_label, import.csv_headers, { include_blank: t(".leave_empty"), label: t(".account_label") }, disabled: import.complete? %>
+  <%= form.select :name_col_label, import.csv_headers, { include_blank: t(".leave_empty"), label: t(".name_label") }, disabled: import.complete? %>
+  <%= form.select :category_col_label, import.csv_headers, { include_blank: t(".leave_empty"), label: t(".category_label") }, disabled: import.complete? %>
+  <%= form.select :notes_col_label, import.csv_headers, { include_blank: t(".leave_empty"), label: t(".notes_label") }, disabled: import.complete? %>
+
+  <%= form.submit t(".apply_configuration"), disabled: import.complete? %>
+<% end %>
diff --git a/app/views/import/confirms/_mappings.html.erb b/app/views/import/confirms/_mappings.html.erb
index 2cfb6ab46..9ad032903 100644
--- a/app/views/import/confirms/_mappings.html.erb
+++ b/app/views/import/confirms/_mappings.html.erb
@@ -23,7 +23,7 @@
     <% elsif import.has_unassigned_account? %>
       <div class="w-full max-w-full overflow-hidden mb-4">
         <div class="overflow-x-auto">
-          <div class="flex items-center justify-between p-4 gap-4 text-secondary bg-yellow-100 border border-yellow-200 rounded-lg w-[650px] min-w-0 mx-auto">
+          <div class="flex items-center justify-between p-4 gap-4 text-secondary bg-warning/10 border border-warning/20 rounded-lg w-[650px] min-w-0 mx-auto">
             <%= tag.p t(".unassigned_account"), class: "text-sm" %>
             <%= render DS::Link.new(
               text: t(".create_account"),
diff --git a/app/views/import/uploads/show.html.erb b/app/views/import/uploads/show.html.erb
index 7cf51d651..7d19818c6 100644
--- a/app/views/import/uploads/show.html.erb
+++ b/app/views/import/uploads/show.html.erb
@@ -56,7 +56,7 @@
 
     <%= styled_form_with model: @import, scope: :import, url: import_upload_path(@import), multipart: true, class: "space-y-4" do |form| %>
       <%= form.select :account_id,
-            @import.family.accounts.visible.alphabetically.pluck(:name, :id),
+            Current.user.accessible_accounts.visible.alphabetically.pluck(:name, :id),
             { label: t(".qif_account_label"), include_blank: t(".qif_account_placeholder"), selected: @import.account_id },
             required: true %>
 
@@ -112,7 +112,7 @@
             <%= form.select :col_sep, Import.separator_options, label: true %>
 
             <% if @import.type == "TransactionImport" || @import.type == "TradeImport" %>
-              <%= form.select :account_id, @import.family.accounts.visible.alphabetically.pluck(:name, :id), { label: t(".account_optional_label"), include_blank: t(".multi_account_import"), selected: @import.account_id } %>
+              <%= form.select :account_id, Current.user.accessible_accounts.visible.alphabetically.pluck(:name, :id), { label: t(".account_optional_label"), include_blank: t(".multi_account_import"), selected: @import.account_id } %>
             <% end %>
 
             <label for="import_import_file_csv" class="flex flex-col items-center justify-center w-full h-64 border border-secondary border-dashed rounded-xl cursor-pointer" data-controller="file-upload" data-file-upload-target="uploadArea">
@@ -144,7 +144,7 @@
             <%= form.select :col_sep, Import.separator_options, label: true %>
 
             <% if @import.type == "TransactionImport" || @import.type == "TradeImport" %>
-              <%= form.select :account_id, @import.family.accounts.visible.alphabetically.pluck(:name, :id), { label: t(".account_optional_label"), include_blank: t(".multi_account_import"), selected: @import.account_id } %>
+              <%= form.select :account_id, Current.user.accessible_accounts.visible.alphabetically.pluck(:name, :id), { label: t(".account_optional_label"), include_blank: t(".multi_account_import"), selected: @import.account_id } %>
             <% end %>
 
             <%= form.text_area :raw_file_str,
diff --git a/app/views/imports/_pdf_import.html.erb b/app/views/imports/_pdf_import.html.erb
index 4d82ce324..06f2a6e0e 100644
--- a/app/views/imports/_pdf_import.html.erb
+++ b/app/views/imports/_pdf_import.html.erb
@@ -39,10 +39,10 @@
 
         <div class="space-y-2">
           <h2 class="font-medium text-primary"><%= t("imports.pdf_import.select_account", default: "Import to Account") %></h2>
-          <%= form_with model: import, url: import_path(import), method: :patch, class: "space-y-2" do |f| %>
-            <% accounts = import.family.accounts.manual.alphabetically %>
+          <%= form_with model: import, scope: :import, url: import_path(import), method: :patch, class: "space-y-2" do |f| %>
+            <% accounts = Current.user.accessible_accounts.manual.alphabetically.pluck(:name, :id) %>
             <% if accounts.any? %>
-              <%= f.select :account_id, options_for_select(accounts.map { |a| [a.name, a.id] }, import.account_id), { include_blank: t("imports.pdf_import.select_account_placeholder", default: "Select an account...") }, class: "form-field__input" %>
+              <%= f.select :account_id, options_for_select(accounts, import.account_id), { include_blank: t("imports.pdf_import.select_account_placeholder", default: "Select an account...") }, class: "form-field__input" %>
               <% if import.account.nil? %>
                 <p class="text-xs text-secondary"><%= t("imports.pdf_import.select_account_hint", default: "Choose which account to import these transactions into.") %></p>
               <% end %>
diff --git a/app/views/imports/_table.html.erb b/app/views/imports/_table.html.erb
index 87978afeb..d34baa18d 100644
--- a/app/views/imports/_table.html.erb
+++ b/app/views/imports/_table.html.erb
@@ -8,7 +8,7 @@
       <h2 class="text-sm text-secondary font-medium"><%= caption %></h2>
     </div>
   <% end %>
-  <div class="inline-block min-w-fit sm:w-full rounded-lg shadow-border-xs text-sm bg-container">
+  <div class="w-full overflow-x-auto rounded-lg shadow-border-xs text-sm bg-container">
     <table class="min-w-full">
       <thead>
         <tr>
diff --git a/app/views/imports/index.html.erb b/app/views/imports/index.html.erb
index 6f18c0406..a8f6c6e70 100644
--- a/app/views/imports/index.html.erb
+++ b/app/views/imports/index.html.erb
@@ -1,129 +1,139 @@
 <%= content_for :page_title, t(".title") %>
 
-<%= settings_section title: t(".title") do %>
-  <div class="space-y-4">
-    <div class="rounded-xl bg-container-inset space-y-1 p-1">
-      <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
-        <p>
-          <%= t("imports.table.title") %>
-        </p>
-        <span class="text-subdued">&middot;</span>
-        <p><%= @pagy.count %></p>
-      </div>
-
-      <div class="bg-container rounded-lg shadow-border-xs overflow-x-auto">
-        <% if @imports.any? %>
-          <table class="w-full overflow-x-auto">
-            <thead>
-              <tr class="text-xs uppercase font-medium text-secondary border-b border-divider">
-                <th class="px-2 py-3 text-left min-w-44">
-                  <%= t("imports.table.header.date") %>
-                </th>
-                <th class="px-2 py-3 text-left min-w-32">
-                  <%= t("imports.table.header.operation") %>
-                </th>
-                <th class="px-2 py-3 text-left min-w-24">
-                  <%= t("imports.table.header.status") %>
-                </th>
-                <th class="px-2 py-3 text-right min-w-20">
-                  <%= t("imports.table.header.actions") %>
-                </th>
-              </tr>
-            </thead>
-            <tbody>
-            <% @imports.ordered.each do |import| %>
-              <tr id="<%= dom_id import %>" class="border-b border-subdued hover:bg-surface-hover">
-                <td class="px-2 py-3">
-                  <span class="text-sm text-secondary">
-                    <%= l(import.updated_at, format: :long) %>
-                  </span>
-                </td>
-                <td class="px-2 py-3">
-                  <%= link_to import_path(import), class: "font-medium text-sm text-primary hover:underline" do %>
-                    <% if import.account.present? %>
-                      <%= import.account.name + " " %>
-                    <% end %>
-                    <%= import.type.titleize.gsub(/ Import\z/, "") %>
-                  <% end %>
-                </td>
-                <td class="px-2 py-3">
-                  <% if import.pending? %>
-                    <%= render "shared/badge" do %>
-                      <%= t("imports.table.row.status.in_progress") %>
-                    <% end %>
-                  <% elsif import.importing? %>
-                    <%= render "shared/badge", color: "warning", pulse: true do %>
-                      <%= t("imports.table.row.status.uploading") %>
-                    <% end %>
-                  <% elsif import.failed? %>
-                    <%= render "shared/badge", color: "error" do %>
-                      <%= t("imports.table.row.status.failed") %>
-                    <% end %>
-                  <% elsif import.reverting? %>
-                    <%= render "shared/badge", color: "warning" do %>
-                      <%= t("imports.table.row.status.reverting") %>
-                    <% end %>
-                  <% elsif import.revert_failed? %>
-                    <%= render "shared/badge", color: "error" do %>
-                      <%= t("imports.table.row.status.revert_failed") %>
-                    <% end %>
-                  <% elsif import.complete? %>
-                    <%= render "shared/badge", color: "success" do %>
-                      <%= t("imports.table.row.status.complete") %>
-                    <% end %>
-                  <% end %>
-                </td>
-                <td class="px-2 py-3 text-right">
-                  <div class="flex items-center justify-end gap-2">
-                    <% if import.complete? || import.revert_failed? %>
-                      <%= button_to revert_import_path(import),
-                                    method: :put,
-                                    class: "flex items-center gap-2",
-                                    aria: { label: t("imports.table.row.actions.revert") },
-                                    data: {
-                                      turbo_confirm: t("imports.table.row.actions.confirm_revert")
-                                    } do %>
-                        <%= icon "rotate-ccw", class: "w-5 h-5 text-destructive" %>
-                      <% end %>
-
-                    <% else %>
-                      <%= button_to import_path(import),
-                                    method: :delete,
-                                    class: "flex items-center gap-2 text-destructive hover:text-destructive-hover",
-                                    aria: { label: t("imports.table.row.actions.delete") },
-                                    data: {
-                                      turbo_confirm: CustomConfirm.for_resource_deletion("import")
-                                    } do %>
-                        <%= icon "trash-2", class: "w-5 h-5 text-destructive" %>
-                      <% end %>
-                    <% end %>
-
-                    <%= link_to import_path(import),
-                                aria: { label: t("imports.table.row.actions.view") },
-                                class: "flex items-center gap-2 text-primary hover:text-primary-hover" do %>
-                      <%= icon "eye", class: "w-5 h-5" %>
-                    <% end %>
-                  </div>
-                </td>
-              </tr>
-            <% end %>
-            </tbody>
-          </table>
-        <% else %>
-          <p class="text-sm text-secondary text-center py-8 font-medium">
-            <%= t("imports.table.empty") %>
-          </p>
-        <% end %>
-      </div>
+<%= settings_section do %>
+  <div class="rounded-xl bg-container-inset space-y-1 p-1">
+    <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
+      <p>
+        <%= t("imports.table.title") %>
+      </p>
+      <span class="text-subdued">&middot;</span>
+      <p><%= @pagy.count %></p>
     </div>
 
-    <% if @pagy.pages > 1 %>
-      <div class="mt-4">
-        <%= render "shared/pagination", pagy: @pagy %>
-      </div>
-    <% end %>
+    <div class="overflow-x-auto">
+      <% if @imports.any? %>
+        <table class="w-full overflow-x-auto">
+          <thead>
+            <tr class="text-xs uppercase font-medium text-secondary border-b border-divider">
+              <th class="px-2 py-3 text-left min-w-44">
+                <%= t("imports.table.header.date") %>
+              </th>
+              <th class="px-2 py-3 text-left min-w-32">
+                <%= t("imports.table.header.operation") %>
+              </th>
+              <th class="px-2 py-3 text-left min-w-24">
+                <%= t("imports.table.header.status") %>
+              </th>
+              <th class="px-2 py-3 text-right min-w-20">
+                <%= t("imports.table.header.actions") %>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+          <% @imports.ordered.each do |import| %>
+            <tr id="<%= dom_id import %>" class="border-b border-subdued hover:bg-surface-hover">
+              <td class="px-2 py-3">
+                <span class="text-sm text-secondary">
+                  <%= l(import.updated_at, format: :long) %>
+                </span>
+              </td>
+              <td class="px-2 py-3">
+                <%= link_to import_path(import), class: "font-medium text-sm text-primary hover:underline" do %>
+                  <% if import.account.present? %>
+                    <%= import.account.name + " " %>
+                  <% end %>
+                  <%= import.type.titleize.gsub(/ Import\z/, "") %>
+                <% end %>
+              </td>
+              <td class="px-2 py-3">
+                <% if import.pending? %>
+                  <%= render "shared/badge" do %>
+                    <%= t("imports.table.row.status.in_progress") %>
+                  <% end %>
+                <% elsif import.importing? %>
+                  <%= render "shared/badge", color: "warning", pulse: true do %>
+                    <%= t("imports.table.row.status.uploading") %>
+                  <% end %>
+                <% elsif import.failed? %>
+                  <%= render "shared/badge", color: "error" do %>
+                    <%= t("imports.table.row.status.failed") %>
+                  <% end %>
+                <% elsif import.reverting? %>
+                  <%= render "shared/badge", color: "warning" do %>
+                    <%= t("imports.table.row.status.reverting") %>
+                  <% end %>
+                <% elsif import.revert_failed? %>
+                  <%= render "shared/badge", color: "error" do %>
+                    <%= t("imports.table.row.status.revert_failed") %>
+                  <% end %>
+                <% elsif import.complete? %>
+                  <%= render "shared/badge", color: "success" do %>
+                    <%= t("imports.table.row.status.complete") %>
+                  <% end %>
+                <% end %>
+              </td>
+              <td class="px-2 py-3 text-right">
+                <div class="flex items-center justify-end gap-2">
+                  <% if import.complete? || import.revert_failed? %>
+                    <%= button_to revert_import_path(import),
+                                  method: :put,
+                                  class: "flex items-center gap-2",
+                                  aria: { label: t("imports.table.row.actions.revert") },
+                                  data: {
+                                    turbo_confirm: t("imports.table.row.actions.confirm_revert")
+                                  } do %>
+                      <%= icon "rotate-ccw", class: "w-5 h-5 text-destructive" %>
+                    <% end %>
+
+                  <% else %>
+                    <% if import.presumed_lost? %>
+                      <%= button_to cancel_import_path(import),
+                                    method: :post,
+                                    class: "flex items-center gap-2 text-secondary hover:text-primary",
+                                    aria: { label: t("imports.table.row.actions.mark_failed") },
+                                    data: {
+                                      turbo_confirm: t("imports.table.row.actions.confirm_mark_failed")
+                                    } do %>
+                        <%= icon "circle-x", class: "w-5 h-5" %>
+                      <% end %>
+                    <% end %>
+
+                    <%= button_to import_path(import),
+                                  method: :delete,
+                                  class: "flex items-center gap-2 text-destructive hover:text-destructive-hover",
+                                  aria: { label: t("imports.table.row.actions.delete") },
+                                  data: {
+                                    turbo_confirm: CustomConfirm.for_resource_deletion("import")
+                                  } do %>
+                      <%= icon "trash-2", class: "w-5 h-5 text-destructive" %>
+                    <% end %>
+                  <% end %>
+
+                  <%= link_to import_path(import),
+                              aria: { label: t("imports.table.row.actions.view") },
+                              class: "flex items-center gap-2 text-primary hover:text-primary-hover" do %>
+                    <%= icon "eye", class: "w-5 h-5" %>
+                  <% end %>
+                </div>
+              </td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      <% else %>
+        <p class="text-sm text-secondary text-center py-8 font-medium">
+          <%= t("imports.table.empty") %>
+        </p>
+      <% end %>
+    </div>
   </div>
 
+  <% if @pagy.pages > 1 %>
+    <div class="mt-4">
+      <%= render "shared/pagination", pagy: @pagy %>
+    </div>
+  <% end %>
+
   <%= link_to new_import_path,
               class: "bg-container-inset inline-flex items-center justify-center gap-2 hover:bg-container-inset-hover rounded-lg px-4 py-2 w-full font-medium text-primary text-sm text-center",
               data: { turbo_frame: :modal } do %>
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index 78950bd76..e6765c6c2 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -30,8 +30,9 @@
     <% end %>
 
     <%
+      financial_tool_types = %w[MintImport ActualImport YnabImport QifImport SureImport DocumentImport PdfImport]
       import_type = params[:type].presence || @pending_import&.type
-      active_tab = import_type.present? && !import_type.in?(%w[MintImport ActualImport QifImport SureImport DocumentImport PdfImport]) ? "raw_data" : "financial_tools"
+      active_tab = import_type.present? && !import_type.in?(financial_tool_types) ? "raw_data" : "financial_tools"
     %>
     <%= render DS::Tabs.new(active_tab: active_tab) do |tabs| %>
       <% tabs.with_nav do |nav| %>
@@ -42,7 +43,7 @@
       <% tabs.with_panel(tab_id: "financial_tools") do %>
         <div class="rounded-xl bg-container-inset p-1">
           <ul class="bg-container shadow-border-xs rounded-lg">
-            <% if @pending_import.present? && params[:type].present? && params[:type].in?(%w[MintImport ActualImport QifImport SureImport DocumentImport PdfImport]) %>
+            <% if @pending_import.present? && params[:type].present? && params[:type].in?(financial_tool_types) %>
               <li>
                 <%= link_to import_path(@pending_import), class: "flex items-center justify-between p-4 group cursor-pointer", data: { turbo: false } do %>
                   <div class="flex items-center gap-2">
@@ -119,14 +120,13 @@
                 enabled: true %>
             <% end %>
 
-            <%= render "imports/import_option",
-              type: "TransactionImport",
-              icon_name: "bar-chart-2",
-              icon_bg_class: "bg-surface-inset",
-              icon_text_class: "text-subdued",
-              label: t(".import_ynab"),
-              enabled: false,
-              disabled_message: t(".coming_soon") %>
+            <% if params[:type].nil? || params[:type] == "YnabImport" %>
+              <%= render "imports/import_option",
+                type: "YnabImport",
+                image: "ynab-logo.png",
+                label: t(".import_ynab"),
+                enabled: true %>
+            <% end %>
 
             <% if (params[:type].nil? || params[:type].in?(%w[DocumentImport PdfImport])) && @document_upload_extensions.any? %>
               <li>
@@ -163,7 +163,7 @@
       <% tabs.with_panel(tab_id: "raw_data") do %>
         <div class="rounded-xl bg-container-inset p-1">
           <ul class="bg-container shadow-border-xs rounded-lg">
-            <% if @pending_import.present? && params[:type].present? && !params[:type].in?(%w[MintImport ActualImport QifImport SureImport DocumentImport PdfImport]) %>
+            <% if @pending_import.present? && params[:type].present? && !params[:type].in?(financial_tool_types) %>
               <li>
                 <%= link_to import_path(@pending_import), class: "flex items-center justify-between p-4 group cursor-pointer", data: { turbo: false } do %>
                   <div class="flex items-center gap-2">
@@ -225,6 +225,16 @@
                 enabled: true %>
             <% end %>
 
+            <% if params[:type].nil? || params[:type] == "MerchantImport" %>
+              <%= render "imports/import_option",
+                type: "MerchantImport",
+                icon_name: "store",
+                icon_bg_class: "bg-orange-500/5",
+                icon_text_class: "text-orange-500",
+                label: t(".import_merchants"),
+                enabled: true %>
+            <% end %>
+
             <% if params[:type].nil? || params[:type] == "RuleImport" %>
               <%= render "imports/import_option",
                 type: "RuleImport",
diff --git a/app/views/insights/_insight_card.html.erb b/app/views/insights/_insight_card.html.erb
new file mode 100644
index 000000000..95d211f05
--- /dev/null
+++ b/app/views/insights/_insight_card.html.erb
@@ -0,0 +1,46 @@
+<%# locals: (insight:, unread: false) %>
+
+<div id="<%= dom_id(insight) %>" class="bg-container rounded-xl shadow-border-xs p-4 flex gap-3">
+  <div class="shrink-0 mt-0.5">
+    <%= icon(insight_icon_key(insight), color: insight_icon_color(insight)) %>
+  </div>
+
+  <div class="min-w-0 grow space-y-1">
+    <p class="text-xs text-secondary"><%= insight_meta_line(insight) %></p>
+
+    <div class="flex items-start justify-between gap-3">
+      <h3 class="text-sm font-medium text-primary inline-flex items-center gap-2 min-w-0">
+        <%= insight.title %>
+        <% if unread %>
+          <%= render DS::Pill.new(label: t("insights.card.new"), tone: :info, size: :sm) %>
+        <% end %>
+      </h3>
+
+      <div class="flex items-start gap-1 shrink-0">
+        <% if (figure = insight_key_figure(insight)) %>
+          <div class="text-right mr-1">
+            <p class="text-sm font-mono font-medium privacy-sensitive <%= insight_sentiment(insight) == :positive ? "text-success" : "text-primary" %>"><%= figure.first %></p>
+            <p class="text-xs text-subdued"><%= figure.last %></p>
+          </div>
+        <% end %>
+
+        <%= render DS::Button.new(
+          variant: "icon",
+          icon: "x",
+          href: dismiss_insight_path(insight),
+          method: :patch,
+          title: t("insights.card.dismiss"),
+          aria_label: t("insights.card.dismiss")
+        ) %>
+      </div>
+    </div>
+
+    <p class="text-sm text-secondary"><%= insight.body %></p>
+
+    <% if (action = insight_action(insight)) %>
+      <div class="pt-1">
+        <%= render DS::Link.new(text: action[:text], href: action[:href], variant: "ghost", size: "sm") %>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/insights/_list.html.erb b/app/views/insights/_list.html.erb
new file mode 100644
index 000000000..da1f7c51c
--- /dev/null
+++ b/app/views/insights/_list.html.erb
@@ -0,0 +1,16 @@
+<%# locals: (insights:, unread_ids:) %>
+
+<div id="insights-list" class="space-y-3">
+  <% if insights.any? %>
+    <% insights.each do |insight| %>
+      <%= render "insights/insight_card", insight: insight, unread: unread_ids.include?(insight.id) %>
+    <% end %>
+  <% else %>
+    <%= render DS::EmptyState.new(
+      icon: "icon-assistant",
+      icon_custom: true,
+      title: t("insights.index.empty.title"),
+      description: t("insights.index.empty.description")
+    ) %>
+  <% end %>
+</div>
diff --git a/app/views/insights/_refresh_button.html.erb b/app/views/insights/_refresh_button.html.erb
new file mode 100644
index 000000000..595710548
--- /dev/null
+++ b/app/views/insights/_refresh_button.html.erb
@@ -0,0 +1,20 @@
+<%# locals: (pending: false) %>
+
+<div id="insights-refresh">
+  <% if pending %>
+    <%= render DS::Button.new(
+      text: t("insights.refresh.checking"),
+      variant: "outline",
+      icon: "loader-circle",
+      disabled: true
+    ) %>
+  <% else %>
+    <%= render DS::Button.new(
+      text: t("insights.index.refresh"),
+      variant: "outline",
+      icon: "refresh-cw",
+      href: refresh_insights_path,
+      method: :post
+    ) %>
+  <% end %>
+</div>
diff --git a/app/views/insights/_undo_toast.html.erb b/app/views/insights/_undo_toast.html.erb
new file mode 100644
index 000000000..203f19e77
--- /dev/null
+++ b/app/views/insights/_undo_toast.html.erb
@@ -0,0 +1,19 @@
+<%# locals: (insight:) %>
+
+<div id="<%= dom_id(insight, :undo) %>"
+     class="relative flex items-center gap-3 rounded-lg bg-container p-4 group w-full md:max-w-80 shadow-border-xs"
+     data-controller="element-removal">
+  <p class="text-primary text-sm font-medium grow"><%= t("insights.card.dismissed") %></p>
+
+  <%= render DS::Button.new(
+    text: t("insights.card.undo"),
+    variant: "ghost",
+    size: "sm",
+    href: undismiss_insight_path(insight),
+    method: :patch
+  ) %>
+
+  <%= icon "x",
+        class: "p-0.5 rounded-lg text-subdued hover:text-primary cursor-pointer shrink-0",
+        data: { action: "click->element-removal#remove" } %>
+</div>
diff --git a/app/views/insights/dismiss.turbo_stream.erb b/app/views/insights/dismiss.turbo_stream.erb
new file mode 100644
index 000000000..8b51de929
--- /dev/null
+++ b/app/views/insights/dismiss.turbo_stream.erb
@@ -0,0 +1,5 @@
+<%= turbo_stream.remove dom_id(@insight) %>
+
+<%= turbo_stream.append "notification-tray" do %>
+  <%= render "insights/undo_toast", insight: @insight %>
+<% end %>
diff --git a/app/views/insights/index.html.erb b/app/views/insights/index.html.erb
new file mode 100644
index 000000000..a28d6d7c2
--- /dev/null
+++ b/app/views/insights/index.html.erb
@@ -0,0 +1,17 @@
+<%= turbo_stream_from Current.family, :insights %>
+
+<div class="space-y-6 pb-6">
+  <header class="flex items-start justify-between gap-4">
+    <div>
+      <div class="flex items-center gap-2">
+        <h1 class="text-2xl font-semibold text-primary"><%= t(".title") %></h1>
+        <%= render DS::Pill.new(label: t("shared.preview"), size: :md) %>
+      </div>
+      <p class="text-sm text-secondary mt-1"><%= t(".subtitle") %></p>
+    </div>
+
+    <%= render "insights/refresh_button", pending: false %>
+  </header>
+
+  <%= render "insights/list", insights: @insights, unread_ids: @unread_ids %>
+</div>
diff --git a/app/views/insights/refresh.turbo_stream.erb b/app/views/insights/refresh.turbo_stream.erb
new file mode 100644
index 000000000..02ddb01a9
--- /dev/null
+++ b/app/views/insights/refresh.turbo_stream.erb
@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "insights-refresh" do %>
+  <%= render "insights/refresh_button", pending: true %>
+<% end %>
diff --git a/app/views/insights/undismiss.turbo_stream.erb b/app/views/insights/undismiss.turbo_stream.erb
new file mode 100644
index 000000000..d572c8da3
--- /dev/null
+++ b/app/views/insights/undismiss.turbo_stream.erb
@@ -0,0 +1,5 @@
+<%= turbo_stream.remove dom_id(@insight, :undo) %>
+
+<%= turbo_stream.replace "insights-list" do %>
+  <%= render "insights/list", insights: @insights, unread_ids: @unread_ids %>
+<% end %>
diff --git a/app/views/investments/_value_tooltip.html.erb b/app/views/investments/_value_tooltip.html.erb
index 55619f9ab..510c41acd 100644
--- a/app/views/investments/_value_tooltip.html.erb
+++ b/app/views/investments/_value_tooltip.html.erb
@@ -2,7 +2,7 @@
 
 <div data-controller="tooltip" data-tooltip-placement-value="right" data-tooltip-offset-value=10 data-tooltip-cross-axis-value=50>
   <%= icon("info", size: "sm") %>
-  <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-sm p-2 rounded w-64">
+  <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-sm p-2 rounded-md w-64">
     <div class="text-inverse">
       <%= t(".total_value_tooltip") %>
     </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index bbbecc09a..d41871ccb 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,10 +5,10 @@
 <% expanded_sidebar_class = "w-full" %>
 <% collapsed_sidebar_class = "w-0 overflow-hidden" %>
 
-<%= render "layouts/shared/htmldoc" do %>
+<%= render "layouts/shared/htmldoc", sidebar_aware: true do %>
   <div
     class="flex flex-col lg:flex-row h-full bg-surface"
-    data-controller="app-layout privacy-mode"
+    data-controller="app-layout privacy-mode sidebar-resize"
     data-app-layout-expanded-sidebar-class="<%= expanded_sidebar_class %>"
     data-app-layout-collapsed-sidebar-class="<%= collapsed_sidebar_class %>"
     data-app-layout-user-id-value="<%= Current.user.id %>">
@@ -45,7 +45,7 @@
 
       <div class="flex items-center gap-1">
         <button type="button"
-                class="inline-flex items-center justify-center w-8 h-8 rounded-lg text-secondary hover:text-primary transition-colors"
+                class="inline-flex items-center justify-center w-9 h-9 pointer-coarse:w-11 pointer-coarse:h-11 rounded-lg text-secondary hover:text-primary hover:bg-container-inset-hover transition-colors focus-ring"
                 data-action="click->privacy-mode#toggle"
                 data-privacy-mode-target="toggle"
                 title="<%= t("layouts.application.privacy_mode") %>"
@@ -90,11 +90,13 @@
 
     <%# DESKTOP - Left sidebar %>
     <%= tag.div class: class_names(
-        "hidden lg:block py-4 shrink-0 max-w-[320px] transition-all duration-300 border-divider",
+        "hidden lg:block relative py-4 shrink-0 transition-all duration-300 border-divider",
         Current.user.show_sidebar? ? [expanded_sidebar_class, "border-r"] : [collapsed_sidebar_class, "border-r-0"],
        ),
+       style: "max-width: var(--left-sidebar-width, 320px)",
        inert: !Current.user.show_sidebar?,
-       data: { app_layout_target: "leftSidebar" } do %>
+       data: { app_layout_target: "leftSidebar", sidebar_resize_target: "leftSidebar" } do %>
+      <%= render "layouts/shared/sidebar_resize_handle", side: "left" %>
       <div class="px-4 h-full flex flex-col overflow-y-auto">
         <% if content_for?(:sidebar) %>
           <%= yield :sidebar %>
@@ -128,7 +130,7 @@
     <% end %>
 
     <%# SHARED - Main content %>
-    <%= tag.main id: "main", class: class_names("grow overflow-y-auto px-3 lg:px-10 w-full mx-auto pb-[calc(5rem+env(safe-area-inset-bottom))] lg:pb-0"), data: { app_layout_target: "content", viewport_target: "content" } do %>
+    <%= tag.main id: "main", class: class_names("grow overflow-y-auto px-3 lg:px-10 w-full mx-auto pb-[calc(5rem+env(safe-area-inset-bottom))] lg:pb-0"), data: { app_layout_target: "content", viewport_target: "content", notification_tray_target: "main" } do %>
       <% unless intro_mode %>
         <div class="hidden lg:flex gap-2 items-center justify-between mb-6 sticky top-0 z-10 -mx-3 lg:-mx-10 px-3 lg:px-10 py-4 bg-surface border-b border-tertiary">
           <div class="flex items-center gap-2">
@@ -142,8 +144,29 @@
           </div>
 
           <div class="flex items-center gap-2">
+            <%# Preview-gated. Gating the whole block (rather than just the
+                link) also keeps the unread COUNT off every page render for
+                users who haven't opted in. No preview dot on the icon: the
+                unread badge already occupies that corner. %>
+            <% if Current.family && preview_features_enabled? %>
+              <% unread_insights_count = Current.family.insights.active.count %>
+              <%# Prefetch disabled: /insights marks insights read on real visits
+                  and deliberately skips prefetch requests, so a prefetched
+                  response served on click would never clear the badge. %>
+              <%= link_to insights_path,
+                    class: "relative inline-flex items-center justify-center w-9 h-9 pointer-coarse:w-11 pointer-coarse:h-11 rounded-lg text-secondary hover:text-primary hover:bg-container-inset-hover transition-colors focus-ring",
+                    title: t("layouts.application.insights"),
+                    aria: { label: t("layouts.application.insights") },
+                    data: { turbo_prefetch: false } do %>
+                <%= icon("lightbulb", size: "sm") %>
+                <% if unread_insights_count.positive? %>
+                  <span class="absolute top-1 right-1 min-w-4 h-4 px-1 rounded-full bg-inverse text-inverse text-[10px] font-medium flex items-center justify-center pointer-events-none"><%= unread_insights_count > 9 ? "9+" : unread_insights_count %></span>
+                <% end %>
+              <% end %>
+            <% end %>
+
             <button type="button"
-                    class="inline-flex items-center justify-center w-8 h-8 rounded-lg text-secondary hover:text-primary hover:bg-surface-hover transition-colors"
+                    class="inline-flex items-center justify-center w-9 h-9 pointer-coarse:w-11 pointer-coarse:h-11 rounded-lg text-secondary hover:text-primary hover:bg-container-inset-hover transition-colors focus-ring"
                     data-action="click->privacy-mode#toggle"
                     data-privacy-mode-target="toggle"
                     title="<%= t("layouts.application.privacy_mode") %>"
@@ -167,11 +190,13 @@
 
     <%# DESKTOP - Right sidebar %>
     <%= tag.div class: class_names(
-          "hidden lg:block h-full shrink-0 max-w-[400px] transition-all duration-300 border-divider",
+          "hidden lg:block relative h-full shrink-0 transition-all duration-300 border-divider",
           Current.user.show_ai_sidebar? ? [expanded_sidebar_class, "border-l"] : [collapsed_sidebar_class, "border-l-0"],
         ),
+        style: "max-width: var(--right-sidebar-width, 400px)",
         inert: !Current.user.show_ai_sidebar?,
-        data: { app_layout_target: "rightSidebar" } do %>
+        data: { app_layout_target: "rightSidebar", sidebar_resize_target: "rightSidebar" } do %>
+      <%= render "layouts/shared/sidebar_resize_handle", side: "right" %>
       <%= tag.div id: "chat-container", class: "relative h-full px-4 overflow-y-auto", data: { controller: "chat hotkey", turbo_permanent: true } do %>
         <div class="flex flex-col h-full justify-between shrink-0">
           <%= turbo_frame_tag chat_frame, src: chat_view_path(@chat), loading: "lazy", class: "h-full" do %>
diff --git a/app/views/layouts/auth.html.erb b/app/views/layouts/auth.html.erb
index 271abef83..54d0adf51 100644
--- a/app/views/layouts/auth.html.erb
+++ b/app/views/layouts/auth.html.erb
@@ -7,29 +7,25 @@
             <%= image_tag "logomark.svg", class: "w-16 mb-6" %>
           </div>
           <div class="space-y-2">
-            <% if (controller_name == "sessions" && action_name == "new") || (controller_name == "registrations" && action_name == "new") %>
-              <div class="space-y-3 md:hidden w-full my-4">
+            <% if controller_name.in?(%w[sessions registrations]) && action_name.in?(%w[new create]) %>
+              <%# Determine the active tab from the controller, not current_page?:
+                  a failed POST re-renders :new from #create, where the request
+                  path is the form target (not /sessions/new), so current_page?
+                  would mis-highlight the switch. %>
+              <% on_sign_in = controller_name == "sessions" %>
+              <div class="space-y-3 w-full my-4">
                 <div class="bg-surface-inset rounded-lg p-1 flex">
                   <%= link_to new_session_path,
-      class: "w-1/2 px-2 py-1 rounded-md text-sm text-center font-medium #{current_page?(new_session_path) ? 'bg-surface shadow-sm text-primary' : 'text-secondary'}" do %>
+      class: "w-1/2 px-2 py-1 rounded-md text-sm text-center font-medium #{on_sign_in ? 'bg-surface shadow-sm text-primary' : 'text-secondary'}" do %>
                     <%= t("layouts.auth.sign_in") %>
                   <% end %>
                   <%= link_to new_registration_path,
-      class: "w-1/2 px-2 py-1 rounded-md text-sm text-center font-medium #{!current_page?(new_session_path) ? 'bg-surface shadow-sm text-primary' : 'text-secondary'}" do %>
+      class: "w-1/2 px-2 py-1 rounded-md text-sm text-center font-medium #{!on_sign_in ? 'bg-surface shadow-sm text-primary' : 'text-secondary'}" do %>
                     <%= t("layouts.auth.sign_up") %>
                   <% end %>
                 </div>
               </div>
             <% end %>
-            <% if controller_name == "sessions" %>
-              <p class="text-sm text-center hidden md:block">
-                <%= tag.span t("layouts.auth.no_account", product_name: product_name), class: "text-secondary" %> <%= link_to t("layouts.auth.sign_up"), new_registration_path, class: "font-medium text-primary hover:underline transition" %>
-              </p>
-            <% elsif controller_name == "registrations" %>
-              <p class="text-sm text-center text-secondary hidden md:block">
-                <%= t("layouts.auth.existing_account") %> <%= link_to t("layouts.auth.sign_in"), new_session_path, class: "font-medium text-primary hover:underline transition" %>
-              </p>
-            <% end %>
           </div>
         </div>
 
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index 2d6f8c06d..5ac88337a 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -46,6 +46,22 @@
         margin-top: 32px;
         text-align: center;
       }
+      .email-table {
+        border-collapse: collapse;
+        text-align: left;
+        width: 100%;
+      }
+      .email-table th {
+        border-bottom: 1px solid rgba(11, 11, 11, 0.15); /* border-primary */
+        padding: 8px;
+      }
+      .email-table td {
+        border-bottom: 1px solid rgba(11, 11, 11, 0.1); /* border-secondary */
+        padding: 8px;
+      }
+      .email-table .text-right {
+        text-align: right;
+      }
     </style>
   </head>
 
diff --git a/app/views/layouts/settings.html.erb b/app/views/layouts/settings.html.erb
index 887789332..761203f47 100644
--- a/app/views/layouts/settings.html.erb
+++ b/app/views/layouts/settings.html.erb
@@ -1,17 +1,17 @@
-<%= render "layouts/shared/htmldoc" do %>
+<%= render "layouts/shared/htmldoc", sidebar_aware: true do %>
   <div class="flex flex-col md:flex-row h-full bg-surface pt-[env(safe-area-inset-top)]">
     <%= link_to t("layouts.application.skip_to_main"), "#main",
         class: "sr-only focus:not-sr-only focus:fixed focus:top-2 focus:left-2 focus:z-50 focus:px-3 focus:py-2 focus:rounded-lg focus:bg-container focus:text-primary focus:shadow-border-xs" %>
 
-    <div class="w-full md:w-auto md:min-w-64 shrink-0 md:h-full md:overflow-y-auto border-divider md:border-r">
+    <div id="settings-nav-container" data-controller="preserve-scroll" class="w-full md:w-auto md:min-w-64 shrink-0 md:h-full md:overflow-y-auto border-divider md:border-r">
       <div class="p-4">
         <%= render "settings/settings_nav" %>
       </div>
     </div>
 
-    <main id="main" class="grow flex h-full">
+    <main id="main" class="grow flex h-full" data-notification-tray-target="main">
       <div class="relative max-w-4xl mx-auto flex flex-col w-full h-full">
-        <div class="grow flex flex-col overflow-y-auto overflow-x-hidden overscroll-contain [-webkit-overflow-scrolling:touch]">
+        <div data-controller="settings-scroll" class="grow flex flex-col overflow-y-auto overflow-x-hidden overscroll-contain [-webkit-overflow-scrolling:touch]">
           <div class="sticky top-0 z-10 px-3 md:px-10 pt-1.5 md:pt-3 pb-3 bg-surface border-b border-tertiary shrink-0">
             <% if content_for?(:breadcrumbs) %>
               <%= yield :breadcrumbs %>
diff --git a/app/views/layouts/shared/_htmldoc.html.erb b/app/views/layouts/shared/_htmldoc.html.erb
index ae507fbbf..18ca6e799 100644
--- a/app/views/layouts/shared/_htmldoc.html.erb
+++ b/app/views/layouts/shared/_htmldoc.html.erb
@@ -1,3 +1,4 @@
+<%# locals: (sidebar_aware: false) %>
 <!DOCTYPE html>
 
 <% theme = Current.user&.theme || "system" %>
@@ -13,20 +14,11 @@
     <%= yield :head %>
   </head>
 
-  <body class="h-[var(--app-height)] overflow-hidden antialiased">
+  <body class="h-[var(--app-height)] overflow-hidden antialiased"<% if sidebar_aware %> data-controller="notification-tray"<% end %>>
     <% if Rails.env.development? %>
       <button hidden data-controller="hotkey" data-hotkey="t t /" data-action="theme#toggle"></button>
     <% end %>
 
-    <div class="fixed z-50 top-6 md:top-4 left-1/2 -translate-x-1/2 w-full md:w-80 px-4 md:px-0 mx-auto md:mx-0 md:right-auto pt-[env(safe-area-inset-top)]">
-      <div id="notification-tray" class="space-y-1 w-full">
-        <%= render_flash_notifications %>
-
-        <div id="sync-toast"></div>
-        <div id="cta"></div>
-      </div>
-    </div>
-
     <% if Current.family %>
       <%= turbo_stream_from Current.family %>
     <% end %>
@@ -41,5 +33,17 @@
     <%= render "impersonation_sessions/approval_bar" if Current.true_user&.impersonated_support_sessions&.initiated&.any? %>
 
     <%= yield %>
+
+    <%# `left-1/2 -translate-x-1/2` centers on the viewport by default, correct
+        for every single-column layout. Layouts with a persistent sidebar
+        (settings, application) pass sidebar_aware: true, which wires up
+        notification_tray_controller.js to override `left` with the actual
+        content pane's center instead — see that controller for why a
+        ResizeObserver beats hand-rolled sidebar-width math, and for why it
+        also has to guard that inline style against turbo_refreshes_with's
+        morph reconciliation. %>
+    <div class="fixed z-50 top-6 md:top-4 left-1/2 -translate-x-1/2 w-full md:w-80 px-4 md:px-0 mx-auto md:mx-0 md:right-auto pt-[env(safe-area-inset-top)]"<% if sidebar_aware %> data-notification-tray-target="tray" data-action="turbo:before-morph-attribute->notification-tray#preserveStyle"<% end %>>
+      <%= render "layouts/shared/notification_tray" %>
+    </div>
   </body>
 </html>
diff --git a/app/views/layouts/shared/_nav_item.html.erb b/app/views/layouts/shared/_nav_item.html.erb
index b7b226c42..4f9a0b24d 100644
--- a/app/views/layouts/shared/_nav_item.html.erb
+++ b/app/views/layouts/shared/_nav_item.html.erb
@@ -1,6 +1,6 @@
 <%# locals: (name:, path:, icon:, icon_custom:, active:, mobile_only: false, preview: false) %>
 
-<%= link_to path, class: "space-y-1 group block relative pb-1", aria: { current: ("page" if active) } do %>
+<%= link_to path, class: "space-y-1 group block relative pb-1 focus-ring rounded-lg", aria: { current: ("page" if active) } do %>
   <div class="grow flex flex-col lg:flex-row gap-1 items-center">
     <%= tag.div class: class_names("w-4 h-1 lg:w-1 lg:h-4 rounded-bl-sm rounded-br-sm lg:rounded-tr-sm lg:rounded-br-sm lg:rounded-bl-none", "bg-nav-indicator" => active) %>
 
diff --git a/app/views/layouts/shared/_notification_tray.html.erb b/app/views/layouts/shared/_notification_tray.html.erb
new file mode 100644
index 000000000..7f999bf72
--- /dev/null
+++ b/app/views/layouts/shared/_notification_tray.html.erb
@@ -0,0 +1,9 @@
+<%# Rendered inside the fixed-position wrapper in _htmldoc.html.erb, which
+    floats above the page — see that file for how it centers itself on
+    layouts with a sidebar. %>
+<div id="notification-tray" class="space-y-1 w-full">
+  <%= render_flash_notifications %>
+
+  <div id="sync-toast"></div>
+  <div id="cta"></div>
+</div>
diff --git a/app/views/layouts/shared/_sidebar_resize_handle.html.erb b/app/views/layouts/shared/_sidebar_resize_handle.html.erb
new file mode 100644
index 000000000..3e8fbba7c
--- /dev/null
+++ b/app/views/layouts/shared/_sidebar_resize_handle.html.erb
@@ -0,0 +1,18 @@
+<%# locals: (side:) %>
+<%#
+  Draggable divider for a resizable sidebar.
+  `side` is "left" (accounts) or "right" (assistant). Drives sidebar_resize_controller.
+%>
+<% suffix = side.capitalize %>
+<% edge = side == "left" ? "right-0 translate-x-1/2" : "left-0 -translate-x-1/2" %>
+<%= tag.div(
+  class: class_names("group absolute inset-y-0 z-20 hidden w-2 cursor-col-resize lg:block", edge),
+  role: "separator",
+  tabindex: "0",
+  aria: { orientation: "vertical", label: t("layouts.application.resize_#{side}_sidebar") },
+  data: {
+    action: "pointerdown->sidebar-resize#start#{suffix} keydown->sidebar-resize#key#{suffix} dblclick->sidebar-resize#reset#{suffix}"
+  }
+) do %>
+  <span class="absolute inset-y-0 left-1/2 w-0.5 -translate-x-1/2 rounded-full bg-transparent transition-colors group-hover:bg-loader group-focus-visible:bg-loader"></span>
+<% end %>
diff --git a/app/views/loans/_form.html.erb b/app/views/loans/_form.html.erb
index 646e2fa00..40da6da6f 100644
--- a/app/views/loans/_form.html.erb
+++ b/app/views/loans/_form.html.erb
@@ -31,7 +31,7 @@
 
       <div>
         <%= loan_form.select :subtype,
-                  Loan::SUBTYPES.map { |k, v| [v[:long], k] },
+                  Loan.subtype_options_for_select,
                   { label: true, prompt: t("loans.form.subtype_prompt"), include_blank: t("loans.form.none") } %>
       </div>
     <% end %>
diff --git a/app/views/pages/dashboard.html.erb b/app/views/pages/dashboard.html.erb
index bc1022168..50fbdca2b 100644
--- a/app/views/pages/dashboard.html.erb
+++ b/app/views/pages/dashboard.html.erb
@@ -29,12 +29,21 @@
   </div>
 <% end %>
 
-<div class="grid grid-cols-1 <%= "2xl:grid-cols-2" if Current.user.dashboard_two_column? %> gap-6 pb-6 lg:pb-12" data-controller="dashboard-sortable" data-action="dragover->dashboard-sortable#dragOver drop->dashboard-sortable#drop" role="list" aria-label="Dashboard sections">
+<%= turbo_frame_tag "dashboard_sections", target: "_top" do %>
+  <% if accessible_accounts.any? %>
+    <div class="flex items-center justify-end mb-4">
+      <%= render UI::PeriodPicker.new(selected: @period, url: root_path, frame: "dashboard_sections") %>
+    </div>
+  <% end %>
+
+  <% two_column = Current.user.dashboard_two_column? %>
+  <div class="grid grid-cols-1 <%= "2xl:grid-cols-2 2xl:items-start 2xl:gap-y-0 2xl:[grid-auto-flow:row_dense] 2xl:[grid-auto-rows:1px]" if two_column %> gap-6 pb-6 lg:pb-12" data-controller="dashboard-sortable dashboard-masonry" data-action="dragover->dashboard-sortable#dragOver drop->dashboard-sortable#drop" role="list" aria-label="<%= t("pages.dashboard.sections_aria_label") %>">
   <% if accessible_accounts.any? %>
     <% @dashboard_sections.each do |section| %>
       <% next unless section[:visible] %>
       <section
-        class="bg-container rounded-xl shadow-border-xs transition-all group focus:outline-none focus-visible:ring-2 focus-visible:ring-gray-900 focus-visible:ring-offset-2"
+        class="bg-container rounded-xl shadow-border-xs transition-all group focus:outline-none focus-visible:ring-2 focus-visible:ring-gray-900 focus-visible:ring-offset-2<%= " 2xl:col-span-2" if two_column && section[:layout][:col_span] == "full" %>"
+        style="<%= "--dash-widget-h: #{section[:layout][:height_px]}px;" if section[:layout][:grow] %>"
         data-dashboard-sortable-target="section"
         data-section-key="<%= section[:key] %>"
         data-controller="dashboard-section<%= " cashflow-expand" if section[:key] == "cashflow_sankey" %>"
@@ -57,7 +66,7 @@
           <div class="flex items-center gap-2">
             <button
               type="button"
-              class="text-secondary hover:text-primary transition-colors p-0.5"
+              class="flex items-center justify-center w-6 h-6 rounded-md text-secondary hover:text-primary hover:bg-container-inset-hover transition-colors"
               data-action="click->dashboard-section#toggle keydown->dashboard-section#handleToggleKeydown"
               data-dashboard-section-target="button"
               aria-label="<%= t("pages.dashboard.toggle_section") %>"
@@ -72,15 +81,71 @@
             <% if section[:key] == "cashflow_sankey" && section[:locals][:sankey_data][:links].present? %>
               <button
                 type="button"
-                class="text-secondary hover:text-primary transition-colors opacity-100 lg:opacity-0 lg:group-hover:opacity-100 flex items-center justify-center w-5 h-5 ml-auto lg:ml-0"
+                class="flex items-center justify-center w-6 h-6 rounded-md text-secondary hover:text-primary hover:bg-container-inset-hover transition-colors opacity-100 lg:opacity-0 lg:group-hover:opacity-100 ml-auto lg:ml-0"
                 data-action="click->cashflow-expand#open"
                 aria-label="<%= t("global.expand") %>">
                 <%= icon("maximize-2", size: "sm", class: "!w-3.5 !h-3.5") %>
               </button>
             <% end %>
+            <% layout = section[:layout] %>
+            <% show_width = layout[:width_toggle] && two_column %>
+            <% if layout[:grow] || show_width %>
+              <details
+                class="relative hidden lg:block"
+                data-controller="dashboard-widget-size"
+                data-dashboard-widget-size-section-key-value="<%= section[:key] %>"
+                data-action="keydown->dashboard-widget-size#stopKeydown">
+                <summary
+                  class="focus-ring list-none cursor-pointer flex items-center justify-center w-6 h-6 rounded-md text-secondary hover:text-primary hover:bg-container-inset-hover transition-colors opacity-0 group-hover:opacity-100 [&::-webkit-details-marker]:hidden"
+                  aria-label="<%= t("pages.dashboard.widget_size.label") %>">
+                  <%= icon("sliders-horizontal", size: "sm", class: "!w-3.5 !h-3.5") %>
+                </summary>
+                <div class="absolute right-0 top-full mt-1.5 z-10 w-48 p-2.5 space-y-2.5 bg-surface rounded-xl shadow-border-xs border border-primary">
+                  <% if show_width %>
+                    <div class="space-y-1.5">
+                      <p class="flex items-center gap-1.5 text-xs font-medium text-secondary">
+                        <%= icon("move-horizontal", size: "xs") %>
+                        <%= t("pages.dashboard.widget_size.width_label") %>
+                      </p>
+                      <%= render DS::SegmentedControl.new(full_width: true, aria_label: t("pages.dashboard.widget_size.width_label")) do |sc| %>
+                        <% { "single" => "half", "full" => "full" }.each do |value, i18n_key| %>
+                          <% sc.with_segment(
+                               t("pages.dashboard.widget_size.#{i18n_key}"),
+                               active: layout[:col_span] == value,
+                               data: { action: "dashboard-widget-size#selectWidth", col_span: value }
+                             ) %>
+                        <% end %>
+                      <% end %>
+                    </div>
+                  <% end %>
+                  <% if layout[:grow] %>
+                    <div class="space-y-1.5">
+                      <p class="flex items-center gap-1.5 text-xs font-medium text-secondary">
+                        <%= icon("move-vertical", size: "xs") %>
+                        <%= t("pages.dashboard.widget_size.height_label") %>
+                      </p>
+                      <%= render DS::SegmentedControl.new(full_width: true, aria_label: t("pages.dashboard.widget_size.height_label")) do |sc| %>
+                        <% PagesController::DASHBOARD_HEIGHT_PRESETS.each do |preset, px| %>
+                          <% sc.with_segment(
+                               t("pages.dashboard.widget_size.#{preset}"),
+                               active: layout[:height_preset] == preset,
+                               data: { action: "dashboard-widget-size#selectHeight", preset: preset, height: px }
+                             ) %>
+                        <% end %>
+                      <% end %>
+                    </div>
+                  <% end %>
+                </div>
+              </details>
+            <% end %>
+            <%# A grab surface, not a button — clicking it does nothing. It keeps
+                cursor-grab and the colour shift, and deliberately skips the hover
+                background the other header controls use: a filled hover state
+                reads as "clickable" and would promise a click that never lands.
+                Still sized to the same 24px box so the icons stay aligned. %>
             <button
               type="button"
-              class="cursor-grab active:cursor-grabbing text-secondary hover:text-primary transition-colors p-0.5 opacity-0 group-hover:opacity-100 hidden lg:block"
+              class="cursor-grab active:cursor-grabbing hidden lg:flex items-center justify-center w-6 h-6 text-secondary hover:text-primary transition-colors opacity-0 group-hover:opacity-100"
               aria-label="<%= t("pages.dashboard.drag_to_reorder") %>">
               <%= icon("grip-vertical", size: "sm") %>
             </button>
@@ -96,4 +161,5 @@
       <%= render "pages/dashboard/no_accounts_graph_placeholder" %>
     </section>
   <% end %>
-</div>
+  </div>
+<% end %>
diff --git a/app/views/pages/dashboard/_balance_sheet.html.erb b/app/views/pages/dashboard/_balance_sheet.html.erb
index 1c104fa28..5d2d476f4 100644
--- a/app/views/pages/dashboard/_balance_sheet.html.erb
+++ b/app/views/pages/dashboard/_balance_sheet.html.erb
@@ -82,7 +82,7 @@
                       </div>
 
                       <div class="ml-auto flex items-center text-right gap-2">
-                        <div class="w-14 shrink-0 flex items-center justify-end gap-2">
+                        <div class="w-20 shrink-0 flex items-center justify-end gap-2">
                           <%
                               # Calculate weight as percentage of classification total
                               classification_total = classification_group.total_money.amount
diff --git a/app/views/pages/dashboard/_cashflow_sankey.html.erb b/app/views/pages/dashboard/_cashflow_sankey.html.erb
index 201e0c8b9..fa244cd61 100644
--- a/app/views/pages/dashboard/_cashflow_sankey.html.erb
+++ b/app/views/pages/dashboard/_cashflow_sankey.html.erb
@@ -1,23 +1,14 @@
 <%# locals: (sankey_data:, period:) %>
 <div id="cashflow-sankey-chart">
-  <div class="flex justify-end items-center gap-4 px-4 mb-4">
-    <%= form_with url: root_path, method: :get, data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %>
-      <%= form.select :period,
-                Period.as_options,
-                { selected: period.key },
-                data: { "auto-submit-form-target": "auto" },
-                class: "bg-container border border-secondary font-medium rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
-    <% end %>
-  </div>
   <% if sankey_data[:links].present? %>
     <div class="w-full h-96">
-      <%= render "pages/dashboard/cashflow_sankey_chart", sankey_data: sankey_data %>
+      <%= render "pages/dashboard/cashflow_sankey_chart", sankey_data: sankey_data, period: period %>
     </div>
     <%= render DS::Dialog.new(id: "cashflow-expanded-dialog", auto_open: false, width: "custom", disable_frame: true, content_class: "!w-[96vw] max-w-[1650px]", data: { action: "close->cashflow-expand#restore" }) do |dialog| %>
       <% dialog.with_header(title: t("pages.dashboard.cashflow_sankey.title")) %>
       <% dialog.with_body do %>
         <div class="w-full h-[85dvh] max-h-[90dvh] overflow-y-auto overscroll-contain">
-          <%= render "pages/dashboard/cashflow_sankey_chart", sankey_data: sankey_data %>
+          <%= render "pages/dashboard/cashflow_sankey_chart", sankey_data: sankey_data, period: period %>
         </div>
       <% end %>
     <% end %>
diff --git a/app/views/pages/dashboard/_cashflow_sankey_chart.html.erb b/app/views/pages/dashboard/_cashflow_sankey_chart.html.erb
index d22b305ce..d924b09f5 100644
--- a/app/views/pages/dashboard/_cashflow_sankey_chart.html.erb
+++ b/app/views/pages/dashboard/_cashflow_sankey_chart.html.erb
@@ -1,10 +1,12 @@
-<%# locals: (sankey_data:) %>
+<%# locals: (sankey_data:, period:) %>
 <div
   data-controller="sankey-chart"
   data-sankey-chart-data-value="<%= sankey_data.to_json %>"
   data-sankey-chart-currency-symbol-value="<%= sankey_data[:currency_symbol] %>"
+  data-sankey-chart-start-date-value="<%= period.start_date&.iso8601 %>"
+  data-sankey-chart-end-date-value="<%= period.end_date&.iso8601 %>"
   class="w-full h-full privacy-sensitive flex flex-col gap-2">
-  <div class="flex justify-start">
+  <div class="flex justify-start px-4">
     <%= render DS::Button.new(
       variant: :icon,
       icon: "arrow-left",
diff --git a/app/views/pages/dashboard/_group_weight.html.erb b/app/views/pages/dashboard/_group_weight.html.erb
index 4cf5e827d..8a319ef93 100644
--- a/app/views/pages/dashboard/_group_weight.html.erb
+++ b/app/views/pages/dashboard/_group_weight.html.erb
@@ -8,5 +8,5 @@
       <div class="w-0.5 h-2.5 rounded-lg <%= i < (effective_weight / 20.0).ceil ? "" : "opacity-20" %>" style="background-color: <%= color %>;"></div>
     <% end %>
   </div>
-  <p class="text-sm privacy-sensitive"><%= number_to_percentage(effective_weight, precision: 0) %></p>
+  <p class="text-sm whitespace-nowrap privacy-sensitive"><%= number_to_percentage(effective_weight, precision: 0) %></p>
 </div>
diff --git a/app/views/pages/dashboard/_insights_feed.html.erb b/app/views/pages/dashboard/_insights_feed.html.erb
new file mode 100644
index 000000000..f2772ee60
--- /dev/null
+++ b/app/views/pages/dashboard/_insights_feed.html.erb
@@ -0,0 +1,67 @@
+<%# locals: (insights:, **args) %>
+
+<%# Mirrors the outflows/balance-sheet list idiom: an inset well with an
+    uppercase mini-header, white rows inside, tinted icon circles, and
+    right-aligned figures. Dismissal lives on /insights; here each row just
+    links through. Prefetch is disabled because Turbo would serve the
+    hover-prefetched response on click, skipping the mark-as-read in
+    InsightsController#index (it deliberately ignores prefetch requests). %>
+<%# -mt-2 evens the frame: the section shell gives 24px above the content but
+    only 16px at the sides and bottom, and with the well as the sole content
+    the asymmetry shows. %>
+<div id="insights-feed" class="px-4 -mt-2">
+  <div class="bg-container-inset rounded-xl p-1 space-y-1">
+    <div class="px-4 py-2 flex items-center justify-between uppercase text-xs font-medium text-secondary">
+      <% new_count = insights.count(&:active?) %>
+      <div class="flex items-center gap-2">
+        <% if new_count.positive? %>
+          <p><%= t("insights.feed.header_new") %><span class="text-subdued mx-1">&middot;</span><%= new_count %></p>
+        <% else %>
+          <p><%= t("insights.feed.header") %></p>
+        <% end %>
+        <%= render DS::Pill.new(label: t("shared.preview")) %>
+      </div>
+
+      <%= render DS::Link.new(
+        text: t("insights.feed.view_all"),
+        href: insights_path,
+        variant: "ghost",
+        size: "sm",
+        class: "normal-case",
+        data: { turbo_prefetch: false }
+      ) %>
+    </div>
+
+    <div class="py-1.5 shadow-border-xs rounded-lg bg-container text-sm">
+      <% insights.each do |insight| %>
+        <%# No hover background, matching the outflows rows — the affordance is
+            the cursor plus the icon's gentle scale. %>
+        <%= link_to insights_path,
+              data: { turbo_prefetch: false },
+              class: "flex items-center mx-3 px-3 py-2.5 rounded-lg gap-3 cursor-pointer group" do %>
+          <div class="h-7 w-7 shrink-0 rounded-full flex justify-center items-center group-hover:scale-105 transition-all duration-300"
+               style="background-color: color-mix(in oklab, <%= insight_icon_css_color(insight) %> 10%, transparent); color: <%= insight_icon_css_color(insight) %>;">
+            <%= icon(insight_icon_key(insight), color: "current", size: "sm") %>
+          </div>
+
+          <div class="min-w-0 grow">
+            <div class="flex items-center gap-2">
+              <span class="text-sm font-medium text-primary truncate"><%= insight.title %></span>
+              <% if insight.active? %>
+                <%= render DS::Pill.new(label: t("insights.card.new"), tone: :info, size: :sm) %>
+              <% end %>
+            </div>
+            <p class="text-sm text-secondary truncate"><%= insight.body %></p>
+          </div>
+
+          <% if (figure = insight_key_figure(insight)) %>
+            <div class="text-right shrink-0">
+              <p class="text-sm font-medium whitespace-nowrap privacy-sensitive <%= insight_sentiment(insight) == :positive ? "text-success" : "text-primary" %>"><%= figure.first %></p>
+              <p class="text-xs text-secondary whitespace-nowrap"><%= figure.last %></p>
+            </div>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/pages/dashboard/_investment_summary.html.erb b/app/views/pages/dashboard/_investment_summary.html.erb
index 8509bfe08..b38c2f901 100644
--- a/app/views/pages/dashboard/_investment_summary.html.erb
+++ b/app/views/pages/dashboard/_investment_summary.html.erb
@@ -97,7 +97,7 @@
               </div>
               <div>
                 <p class="text-xs text-secondary"><%= t(".contributions") %></p>
-                <p class="font-medium text-green-600 privacy-sensitive"><%= format_money(totals.contributions) %></p>
+                <p class="font-medium text-primary privacy-sensitive"><%= format_money(totals.contributions) %></p>
               </div>
             </div>
             <div class="flex items-center gap-2">
@@ -106,7 +106,7 @@
               </div>
               <div>
                 <p class="text-xs text-secondary"><%= t(".withdrawals") %></p>
-                <p class="font-medium text-orange-600 privacy-sensitive"><%= format_money(totals.withdrawals) %></p>
+                <p class="font-medium text-primary privacy-sensitive"><%= format_money(totals.withdrawals) %></p>
               </div>
             </div>
             <div class="flex items-center gap-2">
diff --git a/app/views/pages/dashboard/_money_flow.html.erb b/app/views/pages/dashboard/_money_flow.html.erb
new file mode 100644
index 000000000..297df3225
--- /dev/null
+++ b/app/views/pages/dashboard/_money_flow.html.erb
@@ -0,0 +1,137 @@
+<%# locals: (money_flow_data:, accounts:, col_span: "single") %>
+<%
+  pill_button_class = "inline-flex items-center gap-1.5 bg-container border border-secondary font-medium rounded-lg pl-3 pr-2 py-2 text-sm cursor-pointer text-primary hover:bg-container-inset-hover focus:outline-hidden focus:ring-0 whitespace-nowrap"
+  selected_account_ids = money_flow_data[:account_ids] || accounts.map { |a| a.id.to_s }
+  all_accounts_selected = selected_account_ids.size == accounts.size
+  period = money_flow_data[:period]
+  # At full width the chart and summary sit side by side; at single/half width
+  # they stack so the chart gets the full column and the month labels don't crowd.
+  stacked = col_span != "full"
+%>
+<div id="money-flow-section" class="px-4 space-y-4">
+  <div class="flex flex-col lg:flex-row lg:items-start lg:justify-between gap-3">
+    <p class="text-sm text-secondary">
+      <%= t(".date_range", start_date: l(period.date_range.begin, format: :long), end_date: l(period.date_range.end, format: :long)) %>
+    </p>
+
+    <div class="flex items-center gap-2">
+      <%= render DS::Tooltip.new(text: t(".period_scope_hint"), placement: "top-start") %>
+
+      <%= render DS::Menu.new(variant: :button, placement: "bottom-end", max_height: "18rem") do |menu| %>
+        <% menu.with_button(type: "button", class: pill_button_class, aria: { label: t(".month_picker_aria_label") }) do %>
+          <span class="capitalize"><%= I18n.l(money_flow_data[:month], format: :month_year) %></span>
+          <%= icon("chevron-down", size: "sm") %>
+        <% end %>
+
+        <% (0..11).each do |i| %>
+          <% month = Date.current.beginning_of_month - i.months %>
+          <% menu.with_item(
+               variant: :link,
+               text: I18n.l(month, format: :month_year).capitalize,
+               href: root_path({ money_flow_month: month.iso8601, money_flow_account_ids: money_flow_data[:account_ids] }.compact),
+               frame: "dashboard_sections",
+               selected: month == money_flow_data[:month]
+             ) %>
+        <% end %>
+      <% end %>
+
+      <%= render DS::Popover.new(variant: :button, no_padding: true) do |popover| %>
+        <% popover.with_button(
+             type: "button",
+             text: all_accounts_selected ? t(".filter_accounts_all") : t(".filter_accounts", count: selected_account_ids.size),
+             variant: "outline",
+             icon: "list-filter"
+           ) %>
+
+        <% popover.with_custom_content do %>
+          <%= form_with url: root_path, method: :get, data: { turbo_frame: "dashboard_sections" }, class: "p-3 w-56 space-y-2" do %>
+            <%= hidden_field_tag :money_flow_month, money_flow_data[:month].iso8601 %>
+
+            <div data-controller="list-filter">
+              <%= render DS::SearchInput.new(
+                    variant: :embedded,
+                    placeholder: t(".search_accounts"),
+                    aria_label: t(".search_accounts"),
+                    data: { list_filter_target: "input", action: "input->list-filter#filter" }
+                  ) %>
+
+              <div class="my-2 max-h-64 overflow-y-auto space-y-1" data-list-filter-target="list">
+                <% accounts.each do |account| %>
+                  <label class="filterable-item flex items-center gap-2 p-1.5 rounded-md hover:bg-container-inset-hover cursor-pointer" data-filter-name="<%= account.name %>">
+                    <%= check_box_tag "money_flow_account_ids[]", account.id, selected_account_ids.include?(account.id.to_s), id: nil, class: "checkbox checkbox--light" %>
+                    <span class="text-sm text-primary truncate"><%= account.name %></span>
+                  </label>
+                <% end %>
+              </div>
+            </div>
+
+            <%= render DS::Button.new(type: "submit", text: t(".apply"), variant: "primary", full_width: true) %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  </div>
+
+  <div class="flex flex-col gap-6<%= " xl:flex-row" unless stacked %>">
+    <div class="w-full space-y-2<%= " xl:w-3/5" unless stacked %>">
+      <div class="flex items-center justify-between gap-4 px-1">
+        <div class="flex items-center gap-4">
+          <span class="flex items-center gap-1.5 text-xs text-secondary">
+            <span class="w-2 h-2 rounded-full bg-success"></span>
+            <%= t(".income") %>
+          </span>
+          <span class="flex items-center gap-1.5 text-xs text-secondary">
+            <span class="w-2 h-2 rounded-full bg-gray-400"></span>
+            <%= t(".expenses") %>
+          </span>
+        </div>
+        <span class="text-xs text-secondary"><%= t(".chart_span", count: money_flow_data[:bars].size) %></span>
+      </div>
+
+      <div class="w-full h-44 privacy-sensitive"
+        data-controller="bar-chart"
+        data-bar-chart-data-value="<%= money_flow_data[:bars].to_json %>"
+        data-bar-chart-currency-value="<%= Current.family.currency %>"
+        data-bar-chart-income-label-value="<%= t(".income") %>"
+        data-bar-chart-expense-label-value="<%= t(".expenses") %>">
+      </div>
+    </div>
+
+    <div class="w-full space-y-4<%= " xl:w-2/5" unless stacked %>">
+      <p class="text-sm font-medium text-primary capitalize"><%= I18n.l(money_flow_data[:month], format: :month_year) %></p>
+
+      <div class="flex items-center justify-between text-sm">
+        <span class="text-secondary"><%= t(".balance") %></span>
+        <span class="font-medium text-lg tabular-nums privacy-sensitive <%= money_flow_data[:balance].negative? ? "text-destructive" : (money_flow_data[:balance].zero? ? "text-primary" : "text-success") %>">
+          <%= format_money money_flow_data[:balance] %>
+        </span>
+      </div>
+
+      <%= link_to transactions_path(q: { types: [ "income" ], status: [ "confirmed" ], start_date: period.date_range.begin, end_date: period.date_range.end, account_ids: selected_account_ids }.compact),
+            class: "flex items-center justify-between p-3 border border-secondary rounded-lg hover:bg-container-inset-hover transition-colors group",
+            data: { turbo_frame: "_top" } do %>
+        <span class="flex items-center gap-2 text-sm text-primary">
+          <span class="w-2.5 h-2.5 rounded-full bg-success"></span>
+          <%= t(".income") %>
+        </span>
+        <span class="flex items-center gap-2">
+          <span class="font-medium tabular-nums text-success privacy-sensitive"><%= format_money money_flow_data[:income] %></span>
+          <%= icon("chevron-right", size: "sm", class: "text-secondary group-hover:text-primary transition-colors") %>
+        </span>
+      <% end %>
+
+      <%= link_to transactions_path(q: { types: [ "expense" ], status: [ "confirmed" ], start_date: period.date_range.begin, end_date: period.date_range.end, account_ids: selected_account_ids }.compact),
+            class: "flex items-center justify-between p-3 border border-secondary rounded-lg hover:bg-container-inset-hover transition-colors group",
+            data: { turbo_frame: "_top" } do %>
+        <span class="flex items-center gap-2 text-sm text-primary">
+          <span class="w-2.5 h-2.5 rounded-full bg-gray-400"></span>
+          <%= t(".expenses") %>
+        </span>
+        <span class="flex items-center gap-2">
+          <span class="font-medium tabular-nums text-primary privacy-sensitive"><%= format_money money_flow_data[:expense] %></span>
+          <%= icon("chevron-right", size: "sm", class: "text-secondary group-hover:text-primary transition-colors") %>
+        </span>
+      <% end %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/pages/dashboard/_net_worth_chart.html.erb b/app/views/pages/dashboard/_net_worth_chart.html.erb
index 1a5f81d68..e858f199a 100644
--- a/app/views/pages/dashboard/_net_worth_chart.html.erb
+++ b/app/views/pages/dashboard/_net_worth_chart.html.erb
@@ -13,20 +13,13 @@
         <p class="text-sm text-secondary"><%= t(".data_not_available") %></p>
       <% end %>
     </div>
-
-    <%= form_with url: root_path, method: :get, data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %>
-      <%= form.select :period,
-                    Period.as_options,
-                    { selected: period.key },
-                    data: { "auto-submit-form-target": "auto" },
-                    class: "bg-container border border-secondary font-medium rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
-    <% end %>
   </div>
 
   <% if series.any? %>
     <div
     id="netWorthChart"
-    class="w-full flex-1 min-h-52 privacy-sensitive"
+    class="w-full min-h-52 privacy-sensitive"
+    style="height: var(--dash-widget-h, 13rem);"
     data-controller="time-series-chart"
     data-time-series-chart-data-value="<%= series.to_json %>"></div>
   <% else %>
diff --git a/app/views/pages/dashboard/_outflows_donut.html.erb b/app/views/pages/dashboard/_outflows_donut.html.erb
index 633689980..2e430da53 100644
--- a/app/views/pages/dashboard/_outflows_donut.html.erb
+++ b/app/views/pages/dashboard/_outflows_donut.html.erb
@@ -1,15 +1,5 @@
 <%# locals: (outflows_data:, period:) %>
 <div id="outflows-donut-section" class="@container">
-  <div class="flex justify-end items-center gap-4 px-4 mb-4">
-    <%= form_with url: root_path, method: :get, data: { controller: "auto-submit-form", turbo_frame: "_top" } do |form| %>
-      <%= form.select :period,
-                Period.as_options,
-                { selected: period.key },
-                data: { "auto-submit-form-target": "auto" },
-                class: "bg-container border border-secondary font-medium rounded-lg px-3 py-2 text-sm pr-7 cursor-pointer text-primary focus:outline-hidden focus:ring-0" %>
-    <% end %>
-  </div>
-
   <div class="px-4">
     <div class="flex flex-col @2xl:flex-row gap-8 items-center">
       <!-- Donut Chart -->
diff --git a/app/views/pages/redis_configuration_error.html.erb b/app/views/pages/redis_configuration_error.html.erb
index 8a1a6411f..7ed0fb2e7 100644
--- a/app/views/pages/redis_configuration_error.html.erb
+++ b/app/views/pages/redis_configuration_error.html.erb
@@ -14,14 +14,8 @@
 
       <!-- Explanation -->
       <div class="mb-8">
-        <div class="bg-amber-50 border border-amber-200 rounded-lg p-4 mb-6">
-          <div class="flex items-start">
-            <%= icon "info", class: "w-5 h-5 text-amber-600 mt-0.5 mr-3 flex-shrink-0" %>
-            <div class="text-sm text-amber-800">
-              <p><strong><%= t(".why_required_title") %></strong></p>
-              <p class="mt-1"><%= t(".why_required_body") %></p>
-            </div>
-          </div>
+        <div class="mb-6">
+          <%= render DS::Alert.new(title: t(".why_required_title"), message: t(".why_required_body"), variant: :warning) %>
         </div>
 
         <!-- Primary CTA -->
diff --git a/app/views/properties/_avm_form.html.erb b/app/views/properties/_avm_form.html.erb
new file mode 100644
index 000000000..fe81ebbcb
--- /dev/null
+++ b/app/views/properties/_avm_form.html.erb
@@ -0,0 +1,57 @@
+<%# locals: (account:, provider_key:) %>
+
+<% provider_name = t("properties.avm_providers.#{provider_key}") %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t("properties.new.avm_title", provider: provider_name)) %>
+  <% dialog.with_body do %>
+    <%= styled_form_with model: account, url: properties_path do |form| %>
+      <div class="flex flex-col gap-2 min-h-80">
+        <%= render "properties/form_alert", notice: nil, error: @error_message %>
+
+        <p class="text-sm text-secondary"><%= t("properties.new.avm_description", provider: provider_name) %></p>
+
+        <%= hidden_field_tag :avm_provider, provider_key %>
+        <%= form.hidden_field :accountable_type, value: "Property" %>
+
+        <%= form.text_field :name,
+                        label: t("properties.overview_fields.name_label"),
+                        placeholder: t("properties.overview_fields.name_placeholder"),
+                        required: true %>
+
+        <%= form.fields_for :address, (@avm_address || Address.new) do |address_form| %>
+          <%= address_form.text_field :line1,
+                                      label: t("properties.form.address_line1"),
+                                      placeholder: t("properties.form.address_line1_placeholder"),
+                                      required: true %>
+          <div class="flex items-center gap-2">
+            <%= address_form.text_field :locality,
+                                      label: t("properties.form.locality"),
+                                      placeholder: t("properties.form.locality_placeholder"),
+                                      required: true %>
+            <%= address_form.text_field :region,
+                                      label: t("properties.form.region"),
+                                      placeholder: t("properties.form.region_placeholder"),
+                                      required: true %>
+          </div>
+          <div class="flex items-center gap-2">
+            <%= address_form.text_field :postal_code,
+                                        label: t("properties.form.postal_code"),
+                                        placeholder: t("properties.form.postal_code_placeholder"),
+                                        required: true %>
+          </div>
+        <% end %>
+
+        <p class="text-sm text-secondary"><%= t("properties.new.avm_us_only", provider: provider_name) %></p>
+      </div>
+
+      <div class="flex justify-end mt-4">
+        <%= render DS::Button.new(
+          text: t("properties.new.avm_submit"),
+          variant: "primary",
+          type: :submit,
+        ) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/properties/_avm_method_option.html.erb b/app/views/properties/_avm_method_option.html.erb
new file mode 100644
index 000000000..8cf763b7d
--- /dev/null
+++ b/app/views/properties/_avm_method_option.html.erb
@@ -0,0 +1,9 @@
+<%# locals: (path:, icon_name:, label:) %>
+
+<%= link_to path, class: "group flex items-center gap-4 w-full text-center text-primary focus:outline-hidden focus:bg-surface-hover border border-transparent focus:border focus:border-secondary px-2 hover:bg-surface-hover rounded-lg p-2" do %>
+  <span class="flex w-8 h-8 shrink-0 grow-0 items-center justify-center rounded-lg bg-alpha-black-50 shadow-[inset_0_0_0_1px_rgba(0,0,0,0.02)]">
+    <%= icon(icon_name) %>
+  </span>
+  <%= label %>
+  <%= icon("chevron-right", size: "sm", class: "ml-auto shrink-0 text-subdued transition-colors group-hover:text-secondary") %>
+<% end %>
diff --git a/app/views/properties/_avm_method_selector.html.erb b/app/views/properties/_avm_method_selector.html.erb
new file mode 100644
index 000000000..ff49f1e93
--- /dev/null
+++ b/app/views/properties/_avm_method_selector.html.erb
@@ -0,0 +1,17 @@
+<%# locals: (avm_providers:) %>
+
+<%= render layout: "accounts/new/container", locals: { title: t("accounts.new.method_selector.title"), back_path: new_account_path } do %>
+  <div class="text-sm">
+    <%= render "properties/avm_method_option",
+               path: new_property_path(return_to: params[:return_to]),
+               icon_name: "keyboard",
+               label: t("accounts.new.method_selector.manual_entry") %>
+
+    <% avm_providers.each do |provider_key| %>
+      <%= render "properties/avm_method_option",
+                 path: new_property_path(method: provider_key, return_to: params[:return_to]),
+                 icon_name: "map-pin",
+                 label: t("properties.new.avm_option", provider: t("properties.avm_providers.#{provider_key}")) %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/properties/_avm_preview.html.erb b/app/views/properties/_avm_preview.html.erb
new file mode 100644
index 000000000..b8b1173c3
--- /dev/null
+++ b/app/views/properties/_avm_preview.html.erb
@@ -0,0 +1,66 @@
+<%# locals: (account:, provider_key:, preview:, address:) %>
+
+<% provider_name = t("properties.avm_providers.#{provider_key}") %>
+<% unknown = t("properties.overview.unknown") %>
+<% no_property_record = preview.property_type.nil? && preview.year_built.nil? && preview.area_value.nil? %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t("properties.new.avm_preview_title", provider: provider_name)) %>
+  <% dialog.with_body do %>
+    <div class="flex flex-col gap-4 min-h-80">
+      <p class="text-sm text-secondary"><%= t("properties.new.avm_preview_description", provider: provider_name) %></p>
+
+      <div class="flex flex-col gap-2 text-sm">
+        <div class="flex justify-between gap-2">
+          <span class="text-secondary"><%= t("properties.overview_fields.name_label") %></span>
+          <span class="text-primary font-medium"><%= account.name %></span>
+        </div>
+        <div class="flex justify-between gap-2">
+          <span class="text-secondary"><%= t("properties.form.address_line1") %></span>
+          <span class="text-primary font-medium text-right"><%= [ address.line1, address.locality, address.region, address.postal_code ].map(&:presence).compact.join(", ") %></span>
+        </div>
+        <%= render "shared/ruler", classes: "my-1" %>
+        <div class="flex justify-between gap-2">
+          <span class="text-secondary"><%= t("properties.overview_fields.property_type_label") %></span>
+          <span class="text-primary font-medium"><%= preview.property_type ? Property::SUBTYPES.dig(preview.property_type, :long) : unknown %></span>
+        </div>
+        <div class="flex justify-between gap-2">
+          <span class="text-secondary"><%= t("properties.overview.year_built") %></span>
+          <span class="text-primary font-medium"><%= preview.year_built || unknown %></span>
+        </div>
+        <div class="flex justify-between gap-2">
+          <span class="text-secondary"><%= t("properties.overview.living_area") %></span>
+          <span class="text-primary font-medium"><%= preview.area_value ? "#{preview.area_value} #{preview.area_unit}" : unknown %></span>
+        </div>
+        <div class="flex justify-between gap-2">
+          <span class="text-secondary"><%= t("properties.overview.market_value") %></span>
+          <span class="text-primary font-medium privacy-sensitive"><%= format_money(Money.new(preview.valuation, preview.currency)) %></span>
+        </div>
+      </div>
+
+      <% if no_property_record %>
+        <p class="text-sm text-secondary"><%= t("properties.new.avm_preview_no_record", provider: provider_name) %></p>
+      <% end %>
+    </div>
+
+    <%# The confirm step rebuilds everything from the signed token, proving
+        the lookup ran; only routing params travel as plain fields. %>
+    <%= styled_form_with model: account, url: properties_path do |form| %>
+      <%= hidden_field_tag :avm_provider, provider_key %>
+      <%= hidden_field_tag :avm_step, "confirm" %>
+      <%= hidden_field_tag :avm_preview_token, @avm_preview_token %>
+      <%= form.hidden_field :accountable_type, value: "Property" %>
+
+      <div class="flex justify-between items-center mt-4">
+        <%= link_to t("properties.new.avm_preview_back"),
+                    new_property_path(method: provider_key, return_to: params[:return_to]),
+                    class: "text-sm text-secondary hover:text-primary underline" %>
+        <%= render DS::Button.new(
+          text: t("properties.new.avm_preview_confirm"),
+          variant: "primary",
+          type: :submit,
+        ) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/properties/_form.html.erb b/app/views/properties/_form.html.erb
index 7dc2b8b58..e81b38b75 100644
--- a/app/views/properties/_form.html.erb
+++ b/app/views/properties/_form.html.erb
@@ -2,7 +2,7 @@
 
 <%= render "accounts/form", account: account, url: url do |form| %>
   <%= form.select :subtype,
-                 Property::SUBTYPES.map { |k, v| [v[:long], k] },
+                 Property.subtype_options_for_select,
                  { label: true, prompt: t("properties.form.subtype_prompt"), include_blank: t("properties.form.none") } %>
 
   <%= render "shared/ruler", classes: "my-4" %>
@@ -23,7 +23,7 @@
                                        placeholder: t("properties.form.area_placeholder"),
                                        min: 0 %>
         <%= property_form.select :area_unit,
-                                 [["Square Feet", "sqft"], ["Square Meters", "sqm"]],
+                                 [[t("properties.overview_fields.square_feet"), "sqft"], [t("properties.overview_fields.square_meters"), "sqm"]],
                                  { label: t("properties.form.area_unit") } %>
       </div>
 
diff --git a/app/views/properties/_overview_fields.html.erb b/app/views/properties/_overview_fields.html.erb
index d641c7bdf..41d079f2d 100644
--- a/app/views/properties/_overview_fields.html.erb
+++ b/app/views/properties/_overview_fields.html.erb
@@ -10,7 +10,7 @@
 
   <%= form.fields_for :accountable do |property_form| %>
     <%= property_form.select :subtype,
-                Property::SUBTYPES.map { |k, v| [v[:long], k] },
+                Property.subtype_options_for_select,
                 { prompt: t(".subtype_prompt"), label: t(".property_type_label") }, required: true %>
 
     <div class="flex items-center gap-2">
diff --git a/app/views/properties/new.html.erb b/app/views/properties/new.html.erb
index 5e790cce0..a62e2eda8 100644
--- a/app/views/properties/new.html.erb
+++ b/app/views/properties/new.html.erb
@@ -1,28 +1,38 @@
-<%= render DS::Dialog.new do |dialog| %>
-  <% dialog.with_header(title: t(".title")) %>
-  <% dialog.with_body do %>
-    <div class="flex gap-4">
-      <!-- Left sidebar with tabs -->
-      <%= render "properties/form_tabs", account: @account, active_tab: "overview" %>
+<% avm_provider_key = @avm_provider_key || params[:method] %>
 
-      <!-- Right content area with form -->
-      <div class="flex-1">
-        <%= styled_form_with model: @account, url: properties_path do |form| %>
-          <div class="flex flex-col gap-2 min-h-[320px]">
-            <%= render "properties/form_alert", notice: @success_message, error: @error_message %>
-            <%= render "properties/overview_fields", form: form %>
-          </div>
+<% if @avm_preview.present? %>
+  <%= render "properties/avm_preview", account: @account, provider_key: @avm_provider_key, preview: @avm_preview, address: @avm_address %>
+<% elsif params[:step] == "method_select" && @avm_providers.present? %>
+  <%= render "properties/avm_method_selector", avm_providers: @avm_providers %>
+<% elsif avm_provider_key.present? && @avm_providers&.map(&:to_s)&.include?(avm_provider_key.to_s) %>
+  <%= render "properties/avm_form", account: @account, provider_key: avm_provider_key %>
+<% else %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <div class="flex gap-4">
+        <!-- Left sidebar with tabs -->
+        <%= render "properties/form_tabs", account: @account, active_tab: "overview" %>
 
-          <!-- Create button -->
-          <div class="flex justify-end mt-4">
-            <%= render DS::Button.new(
-              text: t(".next"),
-              variant: "primary",
-              type: :submit,
-            ) %>
-          </div>
-        <% end %>
+        <!-- Right content area with form -->
+        <div class="flex-1">
+          <%= styled_form_with model: @account, url: properties_path do |form| %>
+            <div class="flex flex-col gap-2 min-h-[320px]">
+              <%= render "properties/form_alert", notice: @success_message, error: @error_message %>
+              <%= render "properties/overview_fields", form: form %>
+            </div>
+
+            <!-- Create button -->
+            <div class="flex justify-end mt-4">
+              <%= render DS::Button.new(
+                text: t(".next"),
+                variant: "primary",
+                type: :submit,
+              ) %>
+            </div>
+          <% end %>
+        </div>
       </div>
-    </div>
+    <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/questrade_items/_questrade_item.html.erb b/app/views/questrade_items/_questrade_item.html.erb
new file mode 100644
index 000000000..07f2d50ae
--- /dev/null
+++ b/app/views/questrade_items/_questrade_item.html.erb
@@ -0,0 +1,109 @@
+<%# locals: (questrade_item:) %>
+
+<%= tag.div id: dom_id(questrade_item) do %>
+  <%= render DS::Disclosure.new(variant: :card, open: true) do |disclosure| %>
+    <% disclosure.with_summary_content do %>
+      <div class="flex items-center justify-between gap-2">
+        <div class="flex items-center gap-2">
+          <%= icon "chevron-right", class: "group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
+
+          <div class="flex items-center justify-center h-8 w-8 bg-surface rounded-full">
+            <% if questrade_item.logo.attached? %>
+              <%= image_tag questrade_item.logo, class: "rounded-full h-full w-full", loading: "lazy" %>
+            <% else %>
+              <%= tag.p "Q", class: "text-primary text-xs font-medium" %>
+            <% end %>
+          </div>
+
+          <div class="pl-1 text-sm">
+            <div class="flex items-center gap-2">
+              <%= tag.p "Questrade", class: "font-medium text-primary" %>
+              <% if questrade_item.scheduled_for_deletion? %>
+                <p class="text-destructive text-sm animate-pulse"><%= t(".deletion_in_progress", default: "Removing…") %></p>
+              <% end %>
+            </div>
+            <p class="text-xs text-secondary"><%= t(".kind", default: "Brokerage") %></p>
+            <% if questrade_item.syncing? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= icon "loader", size: "sm", class: "animate-spin" %>
+                <%= tag.span t(".syncing", default: "Syncing…") %>
+              </div>
+            <% elsif questrade_item.sync_error.present? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= render DS::Tooltip.new(text: questrade_item.sync_error, icon: "alert-circle", size: "sm", color: "destructive", as: :span) %>
+                <%= tag.span t(".error", default: "Sync error"), class: "text-destructive" %>
+              </div>
+            <% else %>
+              <p class="text-secondary">
+                <% if questrade_item.last_synced_at %>
+                  <% if questrade_item.sync_status_summary %>
+                    <%= t(".status_with_summary", default: "Synced %{timestamp} ago · %{summary}", timestamp: time_ago_in_words(questrade_item.last_synced_at), summary: questrade_item.sync_status_summary) %>
+                  <% else %>
+                    <%= t(".status", default: "Synced %{timestamp} ago", timestamp: time_ago_in_words(questrade_item.last_synced_at)) %>
+                  <% end %>
+                <% else %>
+                  <%= t(".status_never", default: "Not synced yet") %>
+                <% end %>
+              </p>
+            <% end %>
+          </div>
+        </div>
+
+        <% if Current.user&.admin? %>
+          <div class="flex items-center gap-2">
+            <%= icon("refresh-cw", as_button: true, href: sync_questrade_item_path(questrade_item), disabled: questrade_item.syncing?) %>
+
+            <%= render DS::Menu.new do |menu| %>
+              <% menu.with_item(
+                variant: "button",
+                text: t(".delete", default: "Delete"),
+                icon: "trash-2",
+                href: questrade_item_path(questrade_item),
+                method: :delete,
+                confirm: CustomConfirm.for_resource_deletion("Questrade", high_severity: true)
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% unless questrade_item.scheduled_for_deletion? %>
+      <div class="space-y-4 mt-4">
+        <% if questrade_item.accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: questrade_item.accounts %>
+        <% end %>
+
+        <% stats = if defined?(@questrade_sync_stats_map) && @questrade_sync_stats_map
+             @questrade_sync_stats_map[questrade_item.id] || {}
+           else
+             questrade_item.syncs.ordered.first&.sync_stats || {}
+           end %>
+        <%= render ProviderSyncSummary.new(
+          stats: stats,
+          provider_item: questrade_item,
+          institutions_count: questrade_item.connected_institutions.size
+        ) %>
+
+        <% counts = defined?(@questrade_account_counts_map) && @questrade_account_counts_map ? @questrade_account_counts_map[questrade_item.id] : nil %>
+        <% unlinked_count = counts ? counts[:unlinked] : questrade_item.unlinked_accounts_count %>
+        <% linked_count = counts ? counts[:linked] : questrade_item.linked_accounts_count %>
+        <% total_count = counts ? counts[:total] : questrade_item.total_accounts_count %>
+
+        <% if unlinked_count > 0 %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".setup_needed", default: "Accounts need setup") %></p>
+            <p class="text-secondary text-sm"><%= t(".setup_description", default: "%{linked} of %{total} accounts linked", linked: linked_count, total: total_count) %></p>
+            <%= render DS::Link.new(text: t(".setup_action", default: "Set up accounts"), icon: "settings", variant: "primary", href: setup_accounts_questrade_item_path(questrade_item), frame: :modal) %>
+          </div>
+        <% elsif questrade_item.accounts.empty? && total_count == 0 %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title", default: "No accounts found") %></p>
+            <p class="text-secondary text-sm"><%= t(".no_accounts_description", default: "We could not find any Questrade accounts to import.") %></p>
+            <%= render DS::Link.new(text: t(".setup_action", default: "Set up accounts"), icon: "settings", variant: "primary", href: setup_accounts_questrade_item_path(questrade_item), frame: :modal) %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/questrade_items/_setup_required.html.erb b/app/views/questrade_items/_setup_required.html.erb
new file mode 100644
index 000000000..b55f42a6f
--- /dev/null
+++ b/app/views/questrade_items/_setup_required.html.erb
@@ -0,0 +1,23 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <div class="space-y-4">
+        <%= render DS::Alert.new(
+              title: t(".not_configured_title"),
+              message: t(".not_configured_description"),
+              variant: :warning
+            ) %>
+
+        <div class="flex justify-end">
+          <%= render DS::Link.new(
+                text: t(".go_to_provider_settings"),
+                href: settings_providers_path,
+                variant: :primary,
+                data: { turbo: false }
+              ) %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/questrade_items/select_existing_account.html.erb b/app/views/questrade_items/select_existing_account.html.erb
new file mode 100644
index 000000000..b1298b929
--- /dev/null
+++ b/app/views/questrade_items/select_existing_account.html.erb
@@ -0,0 +1,46 @@
+<% content_for :title, t(".page_title", default: "Link a Questrade account") %>
+
+<%= render DS::Dialog.new(disable_click_outside: true) do |dialog| %>
+  <% dialog.with_header(title: t(".dialog_title", default: "Link to a Questrade account")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "link", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle", default: "Connect this account to one of your Questrade accounts") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <div class="space-y-6">
+      <div class="bg-surface border border-primary p-4 rounded-lg">
+        <p class="text-sm text-secondary"><%= t(".linking_label", default: "Linking") %></p>
+        <p class="font-medium text-primary"><%= @account.name %></p>
+      </div>
+
+      <% if @questrade_accounts.blank? %>
+        <div class="flex flex-col items-center justify-center py-6 space-y-3">
+          <%= icon "alert-circle", size: "lg", class: "text-warning" %>
+          <p class="text-primary text-center font-medium"><%= t(".none_available", default: "No unlinked Questrade accounts available.") %></p>
+          <%= render DS::Link.new(text: t(".buttons.cancel", default: "Cancel"), variant: "secondary", href: account_path(@account), frame: "_top") %>
+        </div>
+      <% else %>
+        <div class="space-y-2">
+          <% @questrade_accounts.each do |questrade_account| %>
+            <%= form_with url: link_existing_account_questrade_items_path, method: :post, data: { turbo_frame: "_top" },
+                          class: "flex items-center justify-between gap-3 border border-primary rounded-lg p-3" do |form| %>
+              <%= form.hidden_field :account_id, value: @account.id %>
+              <%= form.hidden_field :questrade_account_id, value: questrade_account.id %>
+              <div>
+                <p class="font-medium text-primary"><%= questrade_account.name %></p>
+                <p class="text-xs text-secondary"><%= [ questrade_account.account_type, questrade_account.currency ].compact.join(" · ") %></p>
+              </div>
+              <%= render DS::Button.new(text: t(".buttons.link", default: "Link"), variant: "secondary", size: "sm", type: "submit") %>
+            <% end %>
+          <% end %>
+        </div>
+
+        <div class="flex justify-end">
+          <%= render DS::Link.new(text: t(".buttons.cancel", default: "Cancel"), variant: "ghost", href: account_path(@account), frame: "_top") %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/questrade_items/setup_accounts.html.erb b/app/views/questrade_items/setup_accounts.html.erb
new file mode 100644
index 000000000..4b8b4616b
--- /dev/null
+++ b/app/views/questrade_items/setup_accounts.html.erb
@@ -0,0 +1,57 @@
+<% content_for :title, t(".page_title", default: "Set up Questrade accounts") %>
+
+<%= render DS::Dialog.new(disable_click_outside: true) do |dialog| %>
+  <% dialog.with_header(title: t(".dialog_title", default: "Set up your Questrade accounts")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "chart-line", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle", default: "Choose how to import each account") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <div class="space-y-6">
+      <% if @unlinked_accounts.blank? %>
+        <div class="flex flex-col items-center justify-center py-6 space-y-3">
+          <%= icon "check-circle", size: "lg", class: "text-success" %>
+          <p class="text-primary text-center font-medium"><%= t(".all_linked", default: "All Questrade accounts are already linked.") %></p>
+          <%= render DS::Link.new(text: t(".buttons.done", default: "Done"), variant: "primary", href: accounts_path, frame: "_top") %>
+        </div>
+      <% else %>
+        <%= form_with url: complete_account_setup_questrade_item_path(@questrade_item), method: :post, data: { turbo_frame: "_top" }, class: "space-y-6" do %>
+          <div class="space-y-4">
+            <% @unlinked_accounts.each do |questrade_account| %>
+              <div class="border border-primary rounded-lg p-4">
+                <h4 class="font-medium text-primary"><%= questrade_account.name %></h4>
+                <p class="text-xs text-secondary mb-3">
+                  <%= [ questrade_account.account_type, questrade_account.currency ].compact.join(" · ") %>
+                </p>
+
+                <label class="block text-sm text-secondary mb-1" for="account_type_<%= questrade_account.id %>">
+                  <%= t(".import_as", default: "Import as") %>
+                </label>
+                <select id="account_type_<%= questrade_account.id %>"
+                        name="accounts[<%= questrade_account.id %>][account_type]"
+                        class="bg-container border border-primary rounded px-2 py-1 text-sm text-primary w-full">
+                  <option value="investment" selected><%= t(".types.investment", default: "Investment") %></option>
+                  <option value="depository"><%= t(".types.depository", default: "Cash / Depository") %></option>
+                  <option value="skip"><%= t(".types.skip", default: "Skip this account") %></option>
+                </select>
+              </div>
+            <% end %>
+          </div>
+
+          <div class="flex gap-3">
+            <%= render DS::Button.new(
+              text: t(".buttons.create", default: "Create accounts"),
+              variant: "primary",
+              icon: "plus",
+              type: "submit",
+              class: "flex-1"
+            ) %>
+            <%= render DS::Link.new(text: t(".buttons.cancel", default: "Cancel"), variant: "secondary", href: accounts_path, frame: "_top") %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/recurring_transactions/index.html.erb b/app/views/recurring_transactions/index.html.erb
index 96b29d4a1..03384a141 100644
--- a/app/views/recurring_transactions/index.html.erb
+++ b/app/views/recurring_transactions/index.html.erb
@@ -58,20 +58,21 @@
 
     <div class="bg-container rounded-xl shadow-border-xs p-4">
       <% if @recurring_transactions.empty? %>
-        <div class="text-center py-12">
-          <div class="flex justify-center text-secondary mb-4">
-            <%= icon "repeat", size: "xl" %>
-          </div>
-          <p class="text-primary font-medium mb-2"><%= t("recurring_transactions.empty.title") %></p>
-          <p class="text-secondary text-sm mb-4"><%= t("recurring_transactions.empty.description") %></p>
-          <%= render DS::Link.new(
-            text: t("recurring_transactions.identify_patterns"),
-            icon: "search",
-            variant: "primary",
-            href: identify_recurring_transactions_path,
-            method: :post
-          ) %>
-        </div>
+        <%= render DS::EmptyState.new(
+          icon: "repeat",
+          title: t("recurring_transactions.empty.title"),
+          description: t("recurring_transactions.empty.description")
+        ) do |empty| %>
+          <% empty.with_action do %>
+            <%= render DS::Link.new(
+              text: t("recurring_transactions.identify_patterns"),
+              icon: "search",
+              variant: "primary",
+              href: identify_recurring_transactions_path,
+              method: :post
+            ) %>
+          <% end %>
+        <% end %>
       <% else %>
       <div class="rounded-xl bg-container-inset space-y-1 p-1">
         <div class="flex items-center gap-1.5 px-4 py-2 text-xs font-medium text-secondary uppercase">
@@ -155,7 +156,7 @@
                 </td>
                 <td class="py-3 px-2 text-sm">
                   <% if recurring_transaction.active? %>
-                    <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-50 text-success">
+                    <span class="inline-flex items-center px-2 py-0.5 rounded text-xs font-medium bg-green-50 text-success theme-dark:bg-green-tint-10">
                       <%= t("recurring_transactions.status.active") %>
                     </span>
                   <% else %>
diff --git a/app/views/redbark_items/_redbark_item.html.erb b/app/views/redbark_items/_redbark_item.html.erb
new file mode 100644
index 000000000..3a8a1c44f
--- /dev/null
+++ b/app/views/redbark_items/_redbark_item.html.erb
@@ -0,0 +1,133 @@
+<%# locals: (redbark_item:) %>
+
+<%= tag.div id: dom_id(redbark_item) do %>
+  <details open class="group bg-container p-4 shadow-border-xs rounded-xl">
+    <summary class="flex items-center justify-between gap-2 focus-visible:outline-hidden">
+      <div class="flex items-center gap-2">
+        <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
+
+        <div class="flex items-center justify-center h-8 w-8 bg-primary/10 rounded-full">
+          <div class="flex items-center justify-center">
+            <%= tag.p redbark_item.name.first.upcase, class: "text-primary text-xs font-medium" %>
+          </div>
+        </div>
+
+        <div class="pl-1 text-sm">
+          <div class="flex items-center gap-2">
+            <%= tag.p redbark_item.name, class: "font-medium text-primary" %>
+            <% if redbark_item.scheduled_for_deletion? %>
+              <p class="text-destructive text-sm animate-pulse"><%= t(".deletion_in_progress") %></p>
+            <% end %>
+          </div>
+          <p class="text-xs text-secondary"><%= t(".provider_name") %></p>
+          <% if redbark_item.syncing? %>
+            <div class="text-secondary flex items-center gap-1">
+              <%= icon "loader", size: "sm", class: "animate-spin" %>
+              <%= tag.span t(".syncing") %>
+            </div>
+          <% elsif redbark_item.requires_update? %>
+            <div class="text-warning flex items-center gap-1">
+              <%= icon "alert-triangle", size: "sm", color: "warning" %>
+              <%= tag.span t(".requires_update") %>
+            </div>
+          <% else %>
+            <p class="text-secondary">
+              <% if redbark_item.last_synced_at %>
+                <% if redbark_item.sync_status_summary %>
+                  <%= t(".status_with_summary", timestamp: time_ago_in_words(redbark_item.last_synced_at), summary: redbark_item.sync_status_summary) %>
+                <% else %>
+                  <%= t(".status", timestamp: time_ago_in_words(redbark_item.last_synced_at)) %>
+                <% end %>
+              <% else %>
+                <%= t(".status_never") %>
+              <% end %>
+            </p>
+          <% end %>
+        </div>
+      </div>
+
+      <div class="flex items-center gap-2">
+        <% if redbark_item.requires_update? %>
+          <%= render DS::Link.new(
+            text: t(".update_credentials"),
+            icon: "refresh-cw",
+            variant: "secondary",
+            href: settings_providers_path,
+            frame: "_top"
+          ) %>
+        <% else %>
+          <%= icon(
+            "refresh-cw",
+            as_button: true,
+            href: sync_redbark_item_path(redbark_item),
+            disabled: redbark_item.syncing?
+          ) %>
+        <% end %>
+
+        <%= render DS::Menu.new do |menu| %>
+          <% menu.with_item(
+            variant: "button",
+            text: t(".delete"),
+            icon: "trash-2",
+            href: redbark_item_path(redbark_item),
+            method: :delete,
+            confirm: CustomConfirm.for_resource_deletion(redbark_item.name, high_severity: true)
+          ) %>
+        <% end %>
+      </div>
+    </summary>
+
+    <% unless redbark_item.scheduled_for_deletion? %>
+      <div class="space-y-4 mt-4">
+        <% if redbark_item.accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: redbark_item.accounts %>
+        <% end %>
+
+        <%# Sync summary (collapsible) - using shared ProviderSyncSummary component %>
+        <% stats = if defined?(@redbark_sync_stats_map) && @redbark_sync_stats_map
+             @redbark_sync_stats_map[redbark_item.id] || {}
+           else
+             redbark_item.syncs.ordered.first&.sync_stats || {}
+           end %>
+        <%= render ProviderSyncSummary.new(
+          stats: stats,
+          provider_item: redbark_item
+        ) %>
+
+        <%# Compute unlinked accounts (no AccountProvider link) %>
+        <% unlinked_count = redbark_item.unlinked_accounts_count %>
+
+        <% if unlinked_count.to_i > 0 && redbark_item.accounts.empty? %>
+          <%# No accounts imported yet - show prominent setup prompt %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".setup_needed") %></p>
+            <p class="text-secondary text-sm"><%= t(".setup_description", linked: redbark_item.linked_accounts_count, total: redbark_item.total_accounts_count) %></p>
+            <%= render DS::Link.new(
+              text: t(".setup_action"),
+              icon: "plus",
+              variant: "primary",
+              href: setup_accounts_redbark_item_path(redbark_item),
+              frame: :modal
+            ) %>
+          </div>
+        <% elsif unlinked_count.to_i > 0 %>
+          <%# Some accounts imported, more available - show subtle link %>
+          <div class="pt-2 border-t border-primary">
+            <%= link_to setup_accounts_redbark_item_path(redbark_item),
+                        data: { turbo_frame: :modal },
+                        class: "flex items-center gap-2 text-sm text-secondary hover:text-primary transition-colors" do %>
+              <%= icon "plus", size: "sm" %>
+              <span><%= t(".more_accounts_available", count: unlinked_count) %></span>
+            <% end %>
+          </div>
+        <% elsif redbark_item.accounts.empty? && redbark_item.redbark_accounts.none? %>
+          <%# No provider accounts at all - waiting for sync %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title") %></p>
+            <p class="text-secondary text-sm"><%= t(".no_accounts_description") %></p>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </details>
+<% end %>
diff --git a/app/views/redbark_items/_setup_required.html.erb b/app/views/redbark_items/_setup_required.html.erb
new file mode 100644
index 000000000..b55f42a6f
--- /dev/null
+++ b/app/views/redbark_items/_setup_required.html.erb
@@ -0,0 +1,23 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+    <% dialog.with_body do %>
+      <div class="space-y-4">
+        <%= render DS::Alert.new(
+              title: t(".not_configured_title"),
+              message: t(".not_configured_description"),
+              variant: :warning
+            ) %>
+
+        <div class="flex justify-end">
+          <%= render DS::Link.new(
+                text: t(".go_to_provider_settings"),
+                href: settings_providers_path,
+                variant: :primary,
+                data: { turbo: false }
+              ) %>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/redbark_items/select_existing_account.html.erb b/app/views/redbark_items/select_existing_account.html.erb
new file mode 100644
index 000000000..f5bd296ff
--- /dev/null
+++ b/app/views/redbark_items/select_existing_account.html.erb
@@ -0,0 +1,64 @@
+<% content_for :title, t("redbark_items.select_existing_account.title") %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t("redbark_items.select_existing_account.header")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "link", class: "text-primary" %>
+      <span class="text-primary"><%= t("redbark_items.select_existing_account.subtitle", account_name: @account.name) %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <% if @redbark_accounts.blank? %>
+      <div class="text-center py-8">
+        <%= icon "alert-circle", class: "text-warning mx-auto mb-4", size: "lg" %>
+        <p class="text-secondary"><%= t("redbark_items.select_existing_account.no_accounts") %></p>
+        <p class="text-sm text-secondary mt-2"><%= t("redbark_items.select_existing_account.connect_hint") %></p>
+        <%= link_to t("redbark_items.select_existing_account.settings_link"), settings_providers_path, class: "btn btn--primary btn--sm mt-4" %>
+      </div>
+    <% else %>
+      <div class="space-y-4">
+        <div class="bg-surface border border-primary p-4 rounded-lg mb-4">
+          <p class="text-sm text-primary">
+            <strong><%= t("redbark_items.select_existing_account.linking_to") %></strong>
+            <%= @account.name %>
+          </p>
+        </div>
+
+        <% @redbark_accounts.each do |redbark_account| %>
+          <%= form_with url: link_existing_account_redbark_items_path,
+                        method: :post,
+                        local: true,
+                        class: "border border-primary rounded-lg p-4 hover:bg-surface transition-colors" do |form| %>
+            <%= hidden_field_tag :account_id, @account.id %>
+            <%= hidden_field_tag :redbark_account_id, redbark_account.id %>
+
+            <div class="flex items-center justify-between">
+              <div>
+                <h4 class="font-medium text-primary"><%= redbark_account.name %></h4>
+                <p class="text-sm text-secondary">
+                  <%= t("redbark_items.select_existing_account.balance_label") %>
+                  <%= number_to_currency(redbark_account.current_balance || 0, unit: Money::Currency.new(redbark_account.currency || "USD").symbol) %>
+                </p>
+              </div>
+              <%= render DS::Button.new(
+                text: t("redbark_items.select_existing_account.link_button"),
+                variant: "primary",
+                size: "sm",
+                type: "submit"
+              ) %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+
+      <div class="mt-6">
+        <%= render DS::Link.new(
+          text: t("redbark_items.select_existing_account.cancel_button"),
+          variant: "secondary",
+          href: account_path(@account)
+        ) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/redbark_items/setup_accounts.html.erb b/app/views/redbark_items/setup_accounts.html.erb
new file mode 100644
index 000000000..d2c74faa5
--- /dev/null
+++ b/app/views/redbark_items/setup_accounts.html.erb
@@ -0,0 +1,75 @@
+<% content_for :title, t(".title") %>
+
+<%= render DS::Dialog.new(disable_click_outside: true) do |dialog| %>
+  <% dialog.with_header(title: t(".title")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "landmark", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <div class="space-y-6">
+      <% if @api_error.present? %>
+        <%= render DS::Alert.new(
+              title: t(".fetch_failed"),
+              message: @api_error,
+              variant: :error
+            ) %>
+      <% end %>
+
+      <% if @unlinked_accounts.blank? %>
+        <div class="flex flex-col items-center justify-center py-6 space-y-3">
+          <% if @api_error.blank? %>
+            <%= icon "check-circle", size: "lg", class: "text-success" %>
+            <p class="text-primary text-center font-medium"><%= t(".all_accounts_linked") %></p>
+          <% end %>
+          <%= render DS::Link.new(text: t(".done"), variant: "primary", href: accounts_path, frame: "_top") %>
+        </div>
+      <% else %>
+        <%= form_with url: complete_account_setup_redbark_item_path(@redbark_item), method: :post, data: { turbo_frame: "_top" }, class: "space-y-6" do %>
+          <div class="bg-surface border border-primary p-4 rounded-lg">
+            <div class="flex items-start gap-3">
+              <%= icon "info", size: "sm", class: "text-primary mt-0.5 flex-shrink-0" %>
+              <p class="text-sm text-primary"><%= t(".choose_account_type") %></p>
+            </div>
+          </div>
+
+          <div class="space-y-4 max-h-96 overflow-y-auto">
+            <% @unlinked_accounts.each do |redbark_account| %>
+              <div class="border border-primary rounded-lg p-4">
+                <h4 class="font-medium text-primary"><%= redbark_account.name %></h4>
+                <p class="text-xs text-secondary mb-3">
+                  <%= [ redbark_account.account_type&.titleize, redbark_account.currency ].compact.join(" · ") %>
+                </p>
+
+                <label class="block text-sm text-secondary mb-1" for="account_type_<%= redbark_account.id %>">
+                  <%= t(".account_type_label") %>
+                </label>
+                <select id="account_type_<%= redbark_account.id %>"
+                        name="accounts[<%= redbark_account.id %>][account_type]"
+                        class="bg-container border border-primary rounded px-2 py-1 text-sm text-primary w-full">
+                  <option value="depository" selected><%= t(".account_types.depository") %></option>
+                  <option value="credit_card"><%= t(".account_types.credit_card") %></option>
+                  <option value="loan"><%= t(".account_types.loan") %></option>
+                  <option value="skip"><%= t(".account_types.skip") %></option>
+                </select>
+              </div>
+            <% end %>
+          </div>
+
+          <div class="flex gap-3">
+            <%= render DS::Button.new(
+              text: t(".create_accounts"),
+              variant: "primary",
+              icon: "plus",
+              type: "submit",
+              class: "flex-1"
+            ) %>
+            <%= render DS::Link.new(text: t(".cancel"), variant: "secondary", href: accounts_path, frame: "_top") %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb
index 7d9a7b25e..46edc712d 100644
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -53,7 +53,7 @@
             action: "input->password-validator#validate"
           } %>
       <button type="button"
-              class="absolute right-3 top-1/2 -translate-y-1/2 text-secondary hover:text-primary focus:outline-none"
+              class="absolute right-3 top-1/2 -translate-y-1/2 text-secondary hover:text-primary"
               data-action="click->password-visibility#toggle">
         <div data-password-visibility-target="showIcon">
           <%= icon("eye") %>
diff --git a/app/views/reports/_breakdown_table.html.erb b/app/views/reports/_breakdown_table.html.erb
index ff3141557..95fbfab1b 100644
--- a/app/views/reports/_breakdown_table.html.erb
+++ b/app/views/reports/_breakdown_table.html.erb
@@ -2,7 +2,7 @@
 <%# Local variables: groups, total, type (:income or :expense), amount_sort_params, current_sort_by, current_sort_direction %>
 
 <%
-  color_class = type == :income ? "text-success" : "text-destructive"
+  color_class = type == :income ? "text-success" : "text-primary"
   icon_name = type == :income ? "trending-up" : "trending-down"
   title_key = type == :income ? "reports.transactions_breakdown.table.income" : "reports.transactions_breakdown.table.expense"
 %>
diff --git a/app/views/reports/_investment_performance.html.erb b/app/views/reports/_investment_performance.html.erb
index 96f9fc8e6..efa215a2c 100644
--- a/app/views/reports/_investment_performance.html.erb
+++ b/app/views/reports/_investment_performance.html.erb
@@ -164,14 +164,16 @@
                 </p>
               <% end %>
 
-              <details class="group">
-                <summary class="cursor-pointer text-xs text-secondary hover:text-primary flex items-center gap-1">
-                  <%= icon "chevron-right", size: "sm", class: "group-open:rotate-90 transition-transform" %>
-                  <%= t("reports.investment_performance.view_details") %>
-                  (<%= t("reports.investment_performance.holdings_count", count: data[:holdings].count) %>, <%= t("reports.investment_performance.sells_count", count: data[:sell_trades].count) %>)
-                </summary>
+              <%= render DS::Disclosure.new(variant: :inline) do |disclosure| %>
+                <% disclosure.with_summary_content do %>
+                  <span class="flex items-center gap-1 text-xs text-secondary hover:text-primary">
+                    <%= icon "chevron-right", size: "sm", class: "group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
+                    <%= t("reports.investment_performance.view_details") %>
+                    (<%= t("reports.investment_performance.holdings_count", count: data[:holdings].count) %>, <%= t("reports.investment_performance.sells_count", count: data[:sell_trades].count) %>)
+                  </span>
+                <% end %>
 
-                <div class="mt-2 space-y-2 text-xs">
+                <div class="space-y-2 text-xs">
                   <% if data[:holdings].any? %>
                     <div class="space-y-1">
                       <p class="text-secondary font-medium"><%= t("reports.investment_performance.holdings") %></p>
@@ -207,7 +209,7 @@
                     </div>
                   <% end %>
                 </div>
-              </details>
+              <% end %>
             </div>
           <% end %>
         </div>
diff --git a/app/views/reports/_net_worth.html.erb b/app/views/reports/_net_worth.html.erb
index 492d636b6..0d6bc74b0 100644
--- a/app/views/reports/_net_worth.html.erb
+++ b/app/views/reports/_net_worth.html.erb
@@ -29,13 +29,25 @@
     <div class="p-4 bg-surface-inset rounded-lg">
       <p class="text-sm text-secondary mb-2"><%= t("reports.net_worth.assets_vs_liabilities") %></p>
       <div class="flex items-baseline gap-2 flex-wrap">
-        <span class="text-lg font-semibold text-success break-words privacy-sensitive"><%= net_worth_metrics[:total_assets].format %></span>
+        <span class="text-lg font-semibold text-primary break-words privacy-sensitive"><%= net_worth_metrics[:total_assets].format %></span>
         <span class="text-xs text-subdued shrink-0">-</span>
-        <span class="text-lg font-semibold text-destructive break-words privacy-sensitive"><%= net_worth_metrics[:total_liabilities].format %></span>
+        <span class="text-lg font-semibold text-primary break-words privacy-sensitive"><%= net_worth_metrics[:total_liabilities].format %></span>
       </div>
     </div>
   </div>
 
+  <%# Net Worth Over Time chart %>
+  <% breakdown_series = net_worth_metrics[:breakdown_series] %>
+  <% if breakdown_series && breakdown_series[:values].size >= 2 %>
+    <div
+      id="reportsNetWorthChart"
+      class="w-full h-72 privacy-sensitive"
+      data-controller="net-worth-chart"
+      data-net-worth-chart-data-value="<%= breakdown_series.to_json %>"
+      data-net-worth-chart-assets-label-value="<%= t("reports.net_worth.total_assets") %>"
+      data-net-worth-chart-liabilities-label-value="<%= t("reports.net_worth.total_liabilities") %>"></div>
+  <% end %>
+
   <%# Asset/Liability Breakdown %>
   <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
     <%# Assets Summary %>
@@ -52,7 +64,7 @@
           <% net_worth_metrics[:asset_groups].each_with_index do |group, idx| %>
             <tr class="<%= idx < net_worth_metrics[:asset_groups].size - 1 ? "table-divider" : "" %>">
               <td class="py-3 px-4 lg:px-6 text-sm font-medium text-secondary"><%= group[:name] %></td>
-              <td class="py-3 px-4 lg:px-6 text-sm font-medium text-right text-success privacy-sensitive"><%= group[:total].format %></td>
+              <td class="py-3 px-4 lg:px-6 text-sm font-medium text-right text-primary privacy-sensitive"><%= group[:total].format %></td>
             </tr>
           <% end %>
           <% if net_worth_metrics[:asset_groups].empty? %>
@@ -79,7 +91,7 @@
           <% net_worth_metrics[:liability_groups].each_with_index do |group, idx| %>
             <tr class="<%= idx < net_worth_metrics[:liability_groups].size - 1 ? "table-divider" : "" %>">
               <td class="py-3 px-4 lg:px-6 text-sm font-medium text-secondary"><%= group[:name] %></td>
-              <td class="py-3 px-4 lg:px-6 text-sm font-medium text-right text-destructive privacy-sensitive"><%= group[:total].format %></td>
+              <td class="py-3 px-4 lg:px-6 text-sm font-medium text-right text-primary privacy-sensitive"><%= group[:total].format %></td>
             </tr>
           <% end %>
           <% if net_worth_metrics[:liability_groups].empty? %>
diff --git a/app/views/reports/_period_picker.html.erb b/app/views/reports/_period_picker.html.erb
index 764c95616..f5937f8aa 100644
--- a/app/views/reports/_period_picker.html.erb
+++ b/app/views/reports/_period_picker.html.erb
@@ -147,4 +147,4 @@
       </div>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/reports/_trends_insights.html.erb b/app/views/reports/_trends_insights.html.erb
index f3106ea60..c74ab704f 100644
--- a/app/views/reports/_trends_insights.html.erb
+++ b/app/views/reports/_trends_insights.html.erb
@@ -66,7 +66,7 @@
 
           <div class="p-4 bg-surface-inset rounded-lg">
             <p class="text-sm text-secondary mb-1"><%= t("reports.trends.avg_monthly_expenses") %></p>
-            <p class="text-lg font-semibold text-destructive privacy-sensitive">
+            <p class="text-lg font-semibold text-primary privacy-sensitive">
               <%= Money.new(avg_expenses, Current.family.currency).format %>
             </p>
           </div>
diff --git a/app/views/reports/google_sheets_instructions.html.erb b/app/views/reports/google_sheets_instructions.html.erb
index ba8e79a9f..3eb8f4bb2 100644
--- a/app/views/reports/google_sheets_instructions.html.erb
+++ b/app/views/reports/google_sheets_instructions.html.erb
@@ -51,7 +51,7 @@
             text: t("reports.google_sheets_instructions.go_to_api_keys"),
             variant: "primary",
             full_width: true,
-            href: settings_api_key_path,
+            href: settings_api_keys_path,
             frame: "_top"
           ) %>
         <% end %>
diff --git a/app/views/reports/index.html.erb b/app/views/reports/index.html.erb
index f66ce7788..a01f68cc4 100644
--- a/app/views/reports/index.html.erb
+++ b/app/views/reports/index.html.erb
@@ -30,38 +30,14 @@
 
     <%# Period Navigation Tabs %>
     <div class="flex items-center justify-between gap-4">
-      <div class="flex items-center gap-2 overflow-x-auto no-scrollbar">
-        <%= render DS::Link.new(
-          text: t("reports.index.periods.monthly"),
-          variant: @period_type == :monthly ? "secondary" : "ghost",
-          href: reports_path(period_type: :monthly),
-          size: :sm
-        ) %>
-        <%= render DS::Link.new(
-          text: t("reports.index.periods.quarterly"),
-          variant: @period_type == :quarterly ? "secondary" : "ghost",
-          href: reports_path(period_type: :quarterly),
-          size: :sm
-        ) %>
-        <%= render DS::Link.new(
-          text: t("reports.index.periods.ytd"),
-          variant: @period_type == :ytd ? "secondary" : "ghost",
-          href: reports_path(period_type: :ytd),
-          size: :sm
-        ) %>
-        <%= render DS::Link.new(
-          text: t("reports.index.periods.last_6_months"),
-          variant: @period_type == :last_6_months ? "secondary" : "ghost",
-          href: reports_path(period_type: :last_6_months),
-          size: :sm
-        ) %>
-        <%= render DS::Link.new(
-          text: t("reports.index.periods.custom"),
-          variant: @period_type == :custom ? "secondary" : "ghost",
-          href: reports_path(period_type: :custom),
-          size: :sm
-        ) %>
-      </div>
+      <%= render DS::SegmentedControl.new(aria_label: t("reports.index.period_aria", default: "Report period"), class: "overflow-x-auto no-scrollbar") do |sc| %>
+        <% %i[monthly quarterly ytd last_6_months custom].each do |ptype| %>
+          <% sc.with_segment(t("reports.index.periods.#{ptype}"),
+               active: @period_type == ptype,
+               href: reports_path(period_type: ptype),
+               class: "whitespace-nowrap") %>
+        <% end %>
+      <% end %>
     </div>
 
     <%# Custom Date Range Picker (only shown when custom is selected) %>
@@ -101,7 +77,7 @@
           ) %>
 
           <% if @nav[:at_latest] %>
-            <button disabled aria-label="<%= t('reports.index.next_period') %>" class="text-subdued inline-flex items-center justify-center w-9 h-9 rounded-lg cursor-not-allowed">
+            <button disabled aria-label="<%= t("reports.index.next_period") %>" class="text-subdued inline-flex items-center justify-center w-9 h-9 rounded-lg cursor-not-allowed">
               <%= icon("chevron-right", color: "current") %>
             </button>
           <% else %>
@@ -116,7 +92,7 @@
 
         <% if [:monthly, :quarterly, :ytd].include?(@period_type) %>
           <%= render DS::Popover.new(variant: "button") do |popover| %>
-            <% popover.with_button class: "flex items-center gap-1 hover:bg-alpha-black-25 cursor-pointer rounded-md p-2" do %>
+            <% popover.with_button class: "flex items-center gap-1 hover:bg-surface-hover cursor-pointer rounded-md p-2" do %>
               <span class="text-primary font-medium text-lg lg:text-base"><%= @nav[:label] %></span>
               <%= icon("chevron-down") %>
             <% end %>
diff --git a/app/views/rule_notification_mailer/digest.html.erb b/app/views/rule_notification_mailer/digest.html.erb
new file mode 100644
index 000000000..8bac4cf53
--- /dev/null
+++ b/app/views/rule_notification_mailer/digest.html.erb
@@ -0,0 +1,28 @@
+<h1><%= t(".heading", count: @transactions.size) %></h1>
+
+<p><%= t(".intro", rule: @rule.name.presence || @rule.primary_condition_title) %></p>
+
+<table class="email-table">
+  <thead>
+    <tr>
+      <th><%= t(".date") %></th>
+      <th><%= t(".name") %></th>
+      <th><%= t(".account") %></th>
+      <th class="text-right"><%= t(".amount") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @transactions.each do |txn| %>
+      <tr>
+        <td><%= I18n.l(txn.entry.date, format: :long) %></td>
+        <td><%= txn.entry.name %></td>
+        <td><%= txn.entry.account.name %></td>
+        <td class="text-right"><%= txn.entry.amount_money.format %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<p style="margin-top: 16px;">
+  <%= link_to t(".cta"), @transactions_url, class: "button" %>
+</p>
diff --git a/app/views/rule_notification_mailer/digest.text.erb b/app/views/rule_notification_mailer/digest.text.erb
new file mode 100644
index 000000000..af0d03e86
--- /dev/null
+++ b/app/views/rule_notification_mailer/digest.text.erb
@@ -0,0 +1,9 @@
+<%= t(".heading", count: @transactions.size) %>
+
+<%= t(".intro", rule: @rule.name.presence || @rule.primary_condition_title) %>
+
+<% @transactions.each do |txn| %>
+- <%= I18n.l(txn.entry.date, format: :long) %> | <%= txn.entry.name %> | <%= txn.entry.account.name %> | <%= txn.entry.amount_money.format %>
+<% end %>
+
+<%= t(".cta") %>: <%= @transactions_url %>
diff --git a/app/views/rules/index.html.erb b/app/views/rules/index.html.erb
index 05c5361dd..847c04204 100644
--- a/app/views/rules/index.html.erb
+++ b/app/views/rules/index.html.erb
@@ -109,7 +109,7 @@
 
     <div class="overflow-x-auto">
       <table class="w-full">
-        <thead class="bg-surface-default border-b border-primary">
+        <thead class="bg-surface border-b border-primary">
           <tr>
             <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase tracking-wider">
               <%= t("rules.recent_runs.columns.date_time") %>
@@ -133,9 +133,9 @@
             </th>
           </tr>
         </thead>
-        <tbody class="divide-y divide-gray-100">
+        <tbody class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
           <% @recent_runs.each do |run| %>
-            <tr class="<%= "bg-red-50 theme-dark:bg-red-950/30" if run.failed? %>">
+            <tr class="<%= "bg-red-tint-5 theme-dark:bg-red-tint-10" if run.failed? %>">
               <td class="px-4 py-3 text-sm text-primary whitespace-nowrap">
                 <%= run.executed_at.strftime("%b %d, %Y %I:%M %p") %>
               </td>
@@ -147,21 +147,15 @@
               <td class="px-4 py-3 text-sm text-center">
                 <div class="flex items-center justify-center gap-2">
                   <% if run.pending? %>
-                    <span class="inline-flex items-center px-2 py-1 rounded-md text-xs font-medium bg-yellow-50 text-yellow-700 theme-dark:bg-yellow-950/30 theme-dark:text-yellow-400">
-                      <%= t("rules.recent_runs.statuses.#{run.status}") %>
-                    </span>
+                    <%= render DS::Pill.new(label: t("rules.recent_runs.statuses.#{run.status}"), tone: :warning, marker: false) %>
                   <% elsif run.success? %>
-                    <span class="inline-flex items-center px-2 py-1 rounded-md text-xs font-medium bg-green-50 text-green-700 theme-dark:bg-green-950/30 theme-dark:text-green-400">
-                      <%= t("rules.recent_runs.statuses.#{run.status}") %>
-                    </span>
+                    <%= render DS::Pill.new(label: t("rules.recent_runs.statuses.#{run.status}"), tone: :success, marker: false) %>
                   <% else %>
-                    <span class="inline-flex items-center px-2 py-1 rounded-md text-xs font-medium bg-red-50 text-red-700 theme-dark:bg-red-950/30 theme-dark:text-red-400">
-                      <%= t("rules.recent_runs.statuses.#{run.status}") %>
-                    </span>
+                    <%= render DS::Pill.new(label: t("rules.recent_runs.statuses.#{run.status}"), tone: :error, marker: false) %>
                   <% end %>
                   <% if run.failed? && run.error_message.present? %>
                     <div data-controller="tooltip" data-tooltip-content-value="<%= run.error_message %>">
-                      <%= icon("info", size: "sm", class: "text-red-500") %>
+                      <%= icon("info", size: "sm", color: "destructive") %>
                     </div>
                   <% end %>
                 </div>
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index c51f4977a..774e73f3e 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -55,38 +55,31 @@
     <% providers.each do |provider| %>
       <% provider_id = provider[:id].to_s %>
       <% provider_name = provider[:name].to_s %>
+      <% is_google = provider_id == "google" || provider[:strategy].to_s == "google_oauth2" %>
+      <% default_label = is_google ? t(".google_auth_connect") : t(".#{provider_id}", default: provider[:name].to_s.titleize) %>
 
-      <% if provider_id == "google" || provider[:strategy].to_s == "google_oauth2" %>
-        <div class="text-center">
-          <%= button_to "/auth/#{provider_name}", method: :post, form: { data: { turbo: false } }, class: "gsi-material-button w-full" do %>
-            <div class="gsi-material-button-state"></div>
-            <div class="gsi-material-button-content-wrapper">
-              <div class="gsi-material-button-icon">
-                <svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: block;">
-                  <path fill="#EA4335" d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"></path>
-                  <path fill="#4285F4" d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"></path>
-                  <path fill="#FBBC05" d="M10.53 28.59c-.48-1.45-.76-2.99-.76-4.59s.27-3.14.76-4.59l-7.98-6.19C.92 16.46 0 20.12 0 24c0 3.88.92 7.54 2.56 10.78l7.97-6.19z"></path>
-                  <path fill="#34A853" d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"></path>
-                  <path fill="none" d="M0 0h48v48H0z"></path>
-                </svg>
-              </div>
-              <span class="gsi-material-button-contents"><%= provider[:label].presence || t(".google_auth_connect") %></span>
-              <span style="display: none;"><%= provider[:label].presence || t(".google_auth_connect") %></span>
-            </div>
-          <% end %>
-        </div>
-      <% else %>
-        <%= button_to "/auth/#{provider_name}", method: :post, form: { data: { turbo: false } }, class: "w-full inline-flex items-center justify-center gap-2 rounded-md border border-secondary bg-container px-4 py-2 text-sm font-medium text-primary hover:bg-secondary transition" do %>
-          <% if provider[:icon].present? %>
-            <%= icon provider[:icon], size: "sm" %>
-          <% end %>
-          <span><%= provider[:label].presence || t(".#{provider_id}", default: provider[:name].to_s.titleize) %></span>
-        <% end %>
-      <% end %>
+      <%#
+        SSO buttons use the design-system outline button so they stay consistent
+        with each other and read as secondary to the primary email "Log in" CTA.
+        Google keeps its official multi-color "G" mark + "Sign in with Google"
+        wording (brand-compliant) via the custom-icon asset, so no bespoke CSS.
+      %>
+      <%= render DS::Button.new(
+            href: "/auth/#{provider_name}",
+            method: :post,
+            variant: :outline,
+            size: :md,
+            full_width: true,
+            icon: is_google ? "google-icon" : provider[:icon].presence,
+            icon_custom: is_google,
+            text: provider[:label].presence || default_label,
+            class: "gap-2",
+            form: { data: { turbo: false } }
+          ) %>
     <% end %>
   </div>
 <% elsif !AuthConfig.local_login_form_visible? %>
-  <div class="mt-6 rounded-lg border border-amber-200 bg-amber-50 p-4 text-sm text-amber-800">
-    <%= t(".no_auth_methods_enabled") %>
+  <div class="mt-6">
+    <%= render DS::Alert.new(message: t(".no_auth_methods_enabled"), variant: :warning) %>
   </div>
 <% end %>
diff --git a/app/views/settings/_section.html.erb b/app/views/settings/_section.html.erb
index 14ef45a61..cf29aeaff 100644
--- a/app/views/settings/_section.html.erb
+++ b/app/views/settings/_section.html.erb
@@ -36,12 +36,14 @@
   <% end %>
 <% else %>
   <section class="bg-container shadow-border-xs rounded-xl p-4 space-y-4">
-    <div>
-      <h2 class="text-lg font-medium text-primary"><%= title %></h2>
-      <% if subtitle.present? %>
-        <p class="text-secondary text-sm mt-1"><%= subtitle %></p>
-      <% end %>
-    </div>
+    <% if title.present? %>
+      <div>
+        <h2 class="text-lg font-medium text-primary"><%= title %></h2>
+        <% if subtitle.present? %>
+          <p class="text-secondary text-sm mt-1"><%= subtitle %></p>
+        <% end %>
+      </div>
+    <% end %>
     <div class="space-y-4">
       <%= content %>
     </div>
diff --git a/app/views/settings/_settings_nav.html.erb b/app/views/settings/_settings_nav.html.erb
index 71cf9ff42..50fd37e58 100644
--- a/app/views/settings/_settings_nav.html.erb
+++ b/app/views/settings/_settings_nav.html.erb
@@ -29,8 +29,10 @@ nav_sections = [
       items: [
         { label: t(".ai_prompts_label"), path: settings_ai_prompts_path, icon: "bot" },
         { label: t(".llm_usage_label"), path: settings_llm_usage_path, icon: "activity" },
-        { label: t(".api_keys_label"), path: settings_api_key_path, icon: "key" },
+        { label: t(".api_keys_label"), path: settings_api_keys_path, icon: "key" },
+        { label: t(".mcp_label"), path: settings_mcp_path, icon: "plug" },
         { label: t(".debug_label", default: "Debug"), path: settings_debug_path, icon: "bug", if: Current.user&.super_admin? },
+        { label: t(".background_jobs_label"), path: settings_background_jobs_path, icon: "list-checks", if: Current.user&.super_admin? },
         { label: t(".self_hosting_label"), path: settings_hosting_path, icon: "database", if: self_hosted? },
         { label: t(".imports_label"), path: imports_path, icon: "download" },
         { label: t(".exports_label"), path: family_exports_path, icon: "upload" },
diff --git a/app/views/settings/_settings_nav_item.html.erb b/app/views/settings/_settings_nav_item.html.erb
index cbf513113..7ac31724c 100644
--- a/app/views/settings/_settings_nav_item.html.erb
+++ b/app/views/settings/_settings_nav_item.html.erb
@@ -1,7 +1,7 @@
 <%# locals: (name:, path:, icon:) %>
 
 <%= link_to path, class: class_names(
-  "flex items-center gap-2 whitespace-nowrap px-3 py-2 rounded-lg text-sm",
+  "flex items-center gap-2 whitespace-nowrap px-3 py-2 rounded-lg text-sm focus-ring",
   page_active?(path) ? "text-primary bg-container shadow-border-xs" : "text-secondary hover:bg-surface-hover border-transparent"
 ), aria: { current: ("page" if page_active?(path)) } do %>
   <%= icon(icon) if icon %>
diff --git a/app/views/settings/ai_prompts/show.html.erb b/app/views/settings/ai_prompts/show.html.erb
index 60e11c9bb..bd4e1baa2 100644
--- a/app/views/settings/ai_prompts/show.html.erb
+++ b/app/views/settings/ai_prompts/show.html.erb
@@ -40,7 +40,7 @@
                 <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
               </summary>
               <pre class="whitespace-pre-wrap text-xs font-mono text-primary">[<%= Provider::Openai::DEFAULT_MODEL %>]</pre>
-              <div class="mt-2 px-3 py-2 bg-surface-default border border-primary rounded-lg">
+              <div class="mt-2 px-3 py-2 bg-surface border border-primary rounded-lg">
                 <pre class="whitespace-pre-wrap text-xs font-mono text-primary"><%= @assistant_config[:instructions] %></pre>
               </div>
             </details>
@@ -68,7 +68,7 @@
                 <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
               </summary>
               <pre class="whitespace-pre-wrap text-xs font-mono text-primary">[<%= Provider::Openai::DEFAULT_MODEL %>]</pre>
-              <div class="mt-2 px-3 py-2 bg-surface-default border border-primary rounded-lg">
+              <div class="mt-2 px-3 py-2 bg-surface border border-primary rounded-lg">
                 <pre class="whitespace-pre-wrap text-xs font-mono text-primary"><%= @assistant_config[:auto_categorizer]&.instructions || Provider::Openai::AutoCategorizer.new(nil).instructions %></pre>
               </div>
             </details>
@@ -96,7 +96,7 @@
                 <%= icon "chevron-right", class: "group-open:transform group-open:rotate-90" %>
               </summary>
               <pre class="whitespace-pre-wrap text-xs font-mono text-primary">[<%= Provider::Openai::DEFAULT_MODEL %>]</pre>
-              <div class="mt-2 px-3 py-2 bg-surface-default border border-primary rounded-lg">
+              <div class="mt-2 px-3 py-2 bg-surface border border-primary rounded-lg">
                 <pre class="whitespace-pre-wrap text-xs font-mono text-primary"><%= @assistant_config[:auto_merchant]&.instructions || Provider::Openai::AutoMerchantDetector.new(nil, model: "", transactions: [], user_merchants: []).instructions %></pre>
               </div>
             </details>
diff --git a/app/views/settings/api_keys/_key_meta.html.erb b/app/views/settings/api_keys/_key_meta.html.erb
new file mode 100644
index 000000000..df515e7dc
--- /dev/null
+++ b/app/views/settings/api_keys/_key_meta.html.erb
@@ -0,0 +1,9 @@
+<%# locals: (api_key:) %>
+<p class="text-secondary">
+  <%= t("settings.api_keys.shared.created_ago", time: time_ago_in_words(api_key.created_at)) %>
+  <% if api_key.last_used_at %>
+    • <%= t("settings.api_keys.shared.last_used_ago", time: time_ago_in_words(api_key.last_used_at)) %>
+  <% else %>
+    • <%= t("settings.api_keys.shared.never_used") %>
+  <% end %>
+</p>
diff --git a/app/views/settings/api_keys/_key_reveal.html.erb b/app/views/settings/api_keys/_key_reveal.html.erb
new file mode 100644
index 000000000..8852b0021
--- /dev/null
+++ b/app/views/settings/api_keys/_key_reveal.html.erb
@@ -0,0 +1,17 @@
+<%# locals: (api_key:, heading:, description:, copy_label:) %>
+<div class="bg-surface-inset rounded-xl p-4">
+  <h4 class="font-medium text-primary mb-3"><%= heading %></h4>
+  <p class="text-secondary text-sm mb-3"><%= description %></p>
+
+  <div class="@container bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
+    <div class="flex flex-col items-start gap-3 @lg:flex-row @lg:items-center @lg:justify-between">
+      <code class="font-mono text-sm text-primary break-all min-w-0" data-clipboard-target="source"><%= api_key.plain_key %></code>
+      <%= render DS::Button.new(
+        text: copy_label,
+        variant: "ghost",
+        icon: "copy",
+        data: { action: "clipboard#copy" }
+      ) %>
+    </div>
+  </div>
+</div>
diff --git a/app/views/settings/api_keys/_scope_badges.html.erb b/app/views/settings/api_keys/_scope_badges.html.erb
new file mode 100644
index 000000000..bb7ef4ecd
--- /dev/null
+++ b/app/views/settings/api_keys/_scope_badges.html.erb
@@ -0,0 +1,11 @@
+<%# locals: (scopes:) %>
+<div class="flex flex-wrap gap-2">
+  <% scopes.each do |scope| %>
+    <% label = case scope
+               when "read" then t("settings.api_keys.shared.scope_read_only")
+               when "read_write" then t("settings.api_keys.shared.scope_read_write")
+               else t("settings.api_keys.shared.scopes.#{scope}", default: scope.humanize)
+               end %>
+    <%= render DS::Pill.new(label: label, icon: "shield-check", tone: :indigo, style: :soft, marker: false) %>
+  <% end %>
+</div>
diff --git a/app/views/settings/api_keys/_status_indicator.html.erb b/app/views/settings/api_keys/_status_indicator.html.erb
new file mode 100644
index 000000000..ec4bedc3e
--- /dev/null
+++ b/app/views/settings/api_keys/_status_indicator.html.erb
@@ -0,0 +1 @@
+<%= render DS::Pill.new(label: t("settings.api_keys.shared.active"), tone: :success, show_dot: true, marker: false) %>
diff --git a/app/views/settings/api_keys/_usage.html.erb b/app/views/settings/api_keys/_usage.html.erb
new file mode 100644
index 000000000..2b1f41602
--- /dev/null
+++ b/app/views/settings/api_keys/_usage.html.erb
@@ -0,0 +1,8 @@
+<%# locals: (api_key:, title:, description:) %>
+<div class="bg-surface-inset rounded-xl p-4">
+  <h4 class="font-medium text-primary mb-3"><%= title %></h4>
+  <p class="text-secondary text-sm mb-3"><%= description %></p>
+  <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary break-all">
+    curl -H "X-Api-Key: <%= api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
+  </div>
+</div>
diff --git a/app/views/settings/api_keys/created.html.erb b/app/views/settings/api_keys/created.html.erb
deleted file mode 100644
index d0c4e7bca..000000000
--- a/app/views/settings/api_keys/created.html.erb
+++ /dev/null
@@ -1,87 +0,0 @@
-<%= content_for :page_title, t(".page_title") %>
-
-<%= settings_section title: t(".success_title"), subtitle: t(".success_description") do %>
-  <div class="space-y-4">
-    <div class="p-3 shadow-border-xs bg-container rounded-lg">
-      <div class="flex items-start gap-3">
-        <%= render DS::FilledIcon.new(
-          icon: "check-circle",
-          rounded: true,
-          size: "lg",
-          variant: :success
-        ) %>
-        <div class="flex-1">
-          <h3 class="font-medium text-primary"><%= t(".success_title") %></h3>
-          <p class="text-secondary text-sm mt-1"><%= t(".key_ready", name: @api_key.name) %></p>
-        </div>
-      </div>
-    </div>
-
-    <div class="bg-surface-inset rounded-xl p-4">
-      <h4 class="font-medium text-primary mb-3"><%= t(".your_api_key") %></h4>
-      <p class="text-secondary text-sm mb-3"><%= t(".copy_store_securely") %></p>
-
-      <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
-        <div class="flex items-center justify-between gap-3">
-          <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @api_key.plain_key %></code>
-          <%= render DS::Button.new(
-            text: t(".copy_key"),
-            variant: "ghost",
-            icon: "copy",
-            data: { action: "clipboard#copy" }
-          ) %>
-        </div>
-      </div>
-    </div>
-
-    <div class="bg-surface-inset rounded-xl p-4">
-      <h4 class="font-medium text-primary mb-3"><%= t(".key_details_title") %></h4>
-      <div class="space-y-2 text-sm">
-        <div class="flex justify-between">
-          <span class="text-secondary"><%= t(".key_name_label") %></span>
-          <span class="text-primary font-medium"><%= @api_key.name %></span>
-        </div>
-        <div class="flex justify-between">
-          <span class="text-secondary"><%= t(".permissions_label") %></span>
-          <span class="text-primary">
-            <%= @api_key.scopes.map { |scope|
-              case scope
-              when "read_accounts" then t("settings.api_keys_controller.scope_descriptions.read_accounts")
-              when "read_transactions" then t("settings.api_keys_controller.scope_descriptions.read_transactions")
-              when "read_balances" then t("settings.api_keys_controller.scope_descriptions.read_balances")
-              when "write_transactions" then t("settings.api_keys_controller.scope_descriptions.write_transactions")
-              else scope.humanize
-              end
-            }.join(", ") %>
-          </span>
-        </div>
-        <div class="flex justify-between">
-          <span class="text-secondary"><%= t(".created_label") %></span>
-          <span class="text-primary"><%= @api_key.created_at.strftime("%B %d, %Y at %I:%M %p") %></span>
-        </div>
-      </div>
-    </div>
-
-    <%= render DS::Alert.new(title: t(".security_note_title"), variant: :warning) do %>
-      <p>
-        <%= t(".security_note_body") %>
-      </p>
-    <% end %>
-
-    <div class="bg-surface-inset rounded-xl p-4">
-      <h4 class="font-medium text-primary mb-3"><%= t(".usage_instructions_title") %></h4>
-      <p class="text-secondary text-sm mb-3"><%= t("settings.api_keys.show.current_api_key.usage_instructions", product_name: product_name) %></p>
-      <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
-        curl -H "X-Api-Key: <%= @api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
-      </div>
-    </div>
-
-    <div class="flex justify-end pt-4 border-t border-primary">
-      <%= render DS::Link.new(
-        text: t(".continue"),
-        href: settings_api_key_path,
-        variant: "primary"
-      ) %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/settings/api_keys/created.turbo_stream.erb b/app/views/settings/api_keys/created.turbo_stream.erb
deleted file mode 100644
index f187a6d31..000000000
--- a/app/views/settings/api_keys/created.turbo_stream.erb
+++ /dev/null
@@ -1,95 +0,0 @@
-<%= turbo_stream.update "main" do %>
-  <div class="relative max-w-4xl mx-auto flex flex-col w-full h-full">
-    <div class="grow space-y-4 overflow-y-auto -mx-1 px-1 pb-12">
-      <h1 class="text-primary text-3xl md:text-xl font-medium">
-        <%= t("settings.api_keys.created.page_title") %>
-      </h1>
-
-      <%= settings_section title: t("settings.api_keys.created.success_title"), subtitle: t("settings.api_keys.created.success_description") do %>
-        <div class="space-y-4">
-          <div class="p-3 shadow-border-xs bg-container rounded-lg">
-            <div class="flex items-start gap-3">
-              <%= render DS::FilledIcon.new(
-                icon: "check-circle",
-                rounded: true,
-                size: "lg",
-                variant: :success
-              ) %>
-              <div class="flex-1">
-                <h3 class="font-medium text-primary"><%= t("settings.api_keys.created.success_title") %></h3>
-                <p class="text-secondary text-sm mt-1"><%= t("settings.api_keys.created.key_ready", name: @api_key.name) %></p>
-              </div>
-            </div>
-          </div>
-
-          <div class="bg-surface-inset rounded-xl p-4">
-            <h4 class="font-medium text-primary mb-3"><%= t("settings.api_keys.created.your_api_key") %></h4>
-            <p class="text-secondary text-sm mb-3"><%= t("settings.api_keys.created.copy_store_securely") %></p>
-
-            <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
-              <div class="flex items-center justify-between gap-3">
-                <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @api_key.plain_key %></code>
-                <%= render DS::Button.new(
-                  text: t("settings.api_keys.created.copy_key"),
-                  variant: "ghost",
-                  icon: "copy",
-                  data: { action: "clipboard#copy" }
-                ) %>
-              </div>
-            </div>
-          </div>
-
-          <div class="bg-surface-inset rounded-xl p-4">
-            <h4 class="font-medium text-primary mb-3"><%= t("settings.api_keys.created.key_details_title") %></h4>
-            <div class="space-y-2 text-sm">
-              <div class="flex justify-between">
-                <span class="text-secondary"><%= t("settings.api_keys.created.key_name_label") %></span>
-                <span class="text-primary font-medium"><%= @api_key.name %></span>
-              </div>
-              <div class="flex justify-between">
-                <span class="text-secondary"><%= t("settings.api_keys.created.permissions_label") %></span>
-                <span class="text-primary">
-                  <%= @api_key.scopes.map { |scope|
-                    case scope
-                    when "read_accounts" then t("settings.api_keys_controller.scope_descriptions.read_accounts")
-                    when "read_transactions" then t("settings.api_keys_controller.scope_descriptions.read_transactions")
-                    when "read_balances" then t("settings.api_keys_controller.scope_descriptions.read_balances")
-                    when "write_transactions" then t("settings.api_keys_controller.scope_descriptions.write_transactions")
-                    else scope.humanize
-                    end
-                  }.join(", ") %>
-                </span>
-              </div>
-              <div class="flex justify-between">
-                <span class="text-secondary"><%= t("settings.api_keys.created.created_label") %></span>
-                <span class="text-primary"><%= @api_key.created_at.strftime("%B %d, %Y at %I:%M %p") %></span>
-              </div>
-            </div>
-          </div>
-
-          <%= render DS::Alert.new(title: t("settings.api_keys.created.security_note_title"), variant: :warning) do %>
-            <p>
-              <%= t("settings.api_keys.created.security_note_body") %>
-            </p>
-          <% end %>
-
-          <div class="bg-surface-inset rounded-xl p-4">
-            <h4 class="font-medium text-primary mb-3"><%= t("settings.api_keys.created.usage_instructions_title") %></h4>
-            <p class="text-secondary text-sm mb-3"><%= t("settings.api_keys.show.current_api_key.usage_instructions", product_name: product_name) %></p>
-            <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
-              curl -H "X-Api-Key: <%= @api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
-            </div>
-          </div>
-
-          <div class="flex justify-end pt-4 border-t border-primary">
-            <%= render DS::Link.new(
-              text: t("settings.api_keys.created.continue"),
-              href: settings_api_key_path,
-              variant: "primary"
-            ) %>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  </div>
-<% end %>
diff --git a/app/views/settings/api_keys/index.html.erb b/app/views/settings/api_keys/index.html.erb
new file mode 100644
index 000000000..7a6cbd2a4
--- /dev/null
+++ b/app/views/settings/api_keys/index.html.erb
@@ -0,0 +1,72 @@
+<%= content_for :page_title, t(".title") %>
+<% unless @api_keys.empty? %>
+  <%= content_for :page_actions do %>
+    <%= render DS::Link.new(
+      text: t(".new_key"),
+      href: new_settings_api_key_path,
+      variant: "primary",
+      icon: "plus"
+    ) %>
+  <% end %>
+<% end %>
+
+<% if @api_keys.empty? %>
+  <div class="bg-container rounded-xl shadow-border-xs p-4">
+    <div class="bg-surface-inset rounded-xl p-8 text-center">
+      <div class="flex justify-center mb-4">
+        <%= render DS::FilledIcon.new(
+          icon: "key",
+          rounded: true,
+          size: "lg"
+        ) %>
+      </div>
+      <h3 class="font-medium text-primary"><%= t(".empty_heading") %></h3>
+      <p class="text-secondary text-sm mt-1 mb-4"><%= t(".empty_description") %></p>
+      <div class="flex justify-center">
+        <%= render DS::Link.new(
+          text: t(".new_key"),
+          href: new_settings_api_key_path,
+          variant: "primary",
+          icon: "plus"
+        ) %>
+      </div>
+    </div>
+  </div>
+<% else %>
+  <div class="space-y-3">
+    <% @api_keys.each do |api_key| %>
+      <div class="bg-container rounded-xl shadow-border-xs p-4">
+        <div class="flex items-start justify-between gap-3">
+          <div class="flex items-start gap-3 min-w-0">
+            <%= render DS::FilledIcon.new(
+              icon: "key",
+              rounded: true,
+              size: "lg"
+            ) %>
+            <div class="text-sm space-y-1 min-w-0">
+              <%= link_to api_key.name, settings_api_key_path(api_key), class: "text-primary font-medium hover:underline break-all" %>
+              <%= render "settings/api_keys/key_meta", api_key: api_key %>
+              <div class="pt-1">
+                <%= render "settings/api_keys/scope_badges", scopes: api_key.scopes %>
+              </div>
+            </div>
+          </div>
+
+          <div class="flex items-center gap-3 shrink-0">
+            <%= render "settings/api_keys/status_indicator" %>
+            <%= render DS::Button.new(
+              text: t(".revoke_key"),
+              href: settings_api_key_path(api_key),
+              method: :delete,
+              variant: "destructive",
+              size: "sm",
+              data: {
+                turbo_confirm: t(".revoke_confirmation", name: api_key.name)
+              }
+            ) %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/settings/api_keys/new.html.erb b/app/views/settings/api_keys/new.html.erb
index d37a24f70..656640436 100644
--- a/app/views/settings/api_keys/new.html.erb
+++ b/app/views/settings/api_keys/new.html.erb
@@ -1,7 +1,7 @@
 <%= content_for :page_title, t(".create_new_api_key") %>
 
 <%= settings_section title: nil, subtitle: t(".subtitle") do %>
-  <%= styled_form_with model: @api_key, url: settings_api_key_path, class: "space-y-4" do |form| %>
+  <%= styled_form_with model: @api_key, url: settings_api_keys_path, class: "space-y-4" do |form| %>
     <%= form.text_field :name,
         placeholder: t(".name_placeholder"),
         label: t(".name_label"),
@@ -39,7 +39,7 @@
     <div class="flex justify-end gap-3 pt-4 border-t border-primary">
       <%= render DS::Link.new(
         text: t(".cancel"),
-        href: settings_api_key_path,
+        href: settings_api_keys_path,
         variant: "ghost"
       ) %>
 
diff --git a/app/views/settings/api_keys/show.html.erb b/app/views/settings/api_keys/show.html.erb
index c32e87349..f27dc4166 100644
--- a/app/views/settings/api_keys/show.html.erb
+++ b/app/views/settings/api_keys/show.html.erb
@@ -1,4 +1,13 @@
-<% if @newly_created && @plain_key %>
+<%= content_for :page_actions do %>
+  <%= render DS::Link.new(
+    text: t(".current_api_key.back_to_keys"),
+    href: settings_api_keys_path,
+    variant: "secondary",
+    icon: "chevron-left"
+  ) %>
+<% end %>
+
+<% if @newly_created %>
   <%= content_for :page_title, t(".newly_created.page_title") %>
 
   <div class="bg-container rounded-xl shadow-border-xs p-4">
@@ -13,54 +22,33 @@
           ) %>
           <div class="flex-1">
             <h3 class="font-medium text-primary"><%= t(".newly_created.heading") %></h3>
-            <p class="text-secondary text-sm mt-1"><%= t(".newly_created.key_ready", name: @current_api_key.name) %></p>
+            <p class="text-secondary text-sm mt-1"><%= t(".newly_created.key_ready", name: @api_key.name) %></p>
           </div>
         </div>
       </div>
 
-      <div class="bg-surface-inset rounded-xl p-4">
-        <h4 class="font-medium text-primary mb-3"><%= t(".newly_created.your_api_key") %></h4>
-        <p class="text-secondary text-sm mb-3"><%= t(".newly_created.copy_store_securely") %></p>
+      <%= render "settings/api_keys/key_reveal",
+          api_key: @api_key,
+          heading: t(".newly_created.your_api_key"),
+          description: t(".newly_created.copy_store_securely"),
+          copy_label: t(".newly_created.copy_api_key") %>
 
-        <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
-          <div class="flex items-center justify-between gap-3">
-            <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @current_api_key.plain_key %></code>
-            <%= render DS::Button.new(
-              text: t(".newly_created.copy_api_key"),
-              variant: "ghost",
-              icon: "copy",
-              data: { action: "clipboard#copy" }
-            ) %>
-          </div>
-        </div>
-      </div>
-
-      <div class="bg-surface-inset rounded-xl p-4">
-        <h4 class="font-medium text-primary mb-3"><%= t(".newly_created.how_to_use") %></h4>
-        <p class="text-secondary text-sm mb-3"><%= t(".current_api_key.usage_instructions", product_name: product_name) %></p>
-        <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
-          curl -H "X-Api-Key: <%= @current_api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
-        </div>
-      </div>
+      <%= render "settings/api_keys/usage",
+          api_key: @api_key,
+          title: t(".newly_created.how_to_use"),
+          description: t(".current_api_key.usage_instructions", product_name: product_name) %>
 
       <div class="flex justify-end pt-4 border-t border-primary">
         <%= render DS::Link.new(
           text: t(".newly_created.continue"),
-          href: settings_api_key_path,
+          href: settings_api_keys_path,
           variant: "primary"
         ) %>
       </div>
     </div>
   </div>
-<% elsif @current_api_key %>
+<% else %>
   <%= content_for :page_title, t(".current_api_key.title") %>
-  <%= content_for :page_actions do %>
-    <%= render DS::Link.new(
-      text: t(".current_api_key.regenerate_key"),
-      href: new_settings_api_key_path(regenerate: true),
-      variant: "secondary"
-    ) %>
-  <% end %>
 
   <div class="bg-container rounded-xl shadow-border-xs p-4">
     <div class="space-y-4">
@@ -73,68 +61,34 @@
           ) %>
 
           <div class="text-sm space-y-1">
-            <p class="text-primary font-medium"><%= @current_api_key.name %></p>
-            <p class="text-secondary">
-              <%= t(".current_api_key.created_ago", time: time_ago_in_words(@current_api_key.created_at)) %>
-              <% if @current_api_key.last_used_at %>
-                • <%= t(".current_api_key.last_used_ago", time: time_ago_in_words(@current_api_key.last_used_at)) %>
-              <% else %>
-                • <%= t(".current_api_key.never_used") %>
-              <% end %>
-            </p>
+            <p class="text-primary font-medium"><%= @api_key.name %></p>
+            <%= render "settings/api_keys/key_meta", api_key: @api_key %>
           </div>
         </div>
 
-        <div class="rounded-md bg-success px-2 py-1">
-          <p class="text-success-foreground font-medium text-xs"><%= t(".current_api_key.active") %></p>
-        </div>
+        <%= render "settings/api_keys/status_indicator" %>
       </div>
 
       <div class="bg-surface-inset rounded-xl p-4">
         <h4 class="font-medium text-primary mb-3"><%= t(".current_api_key.permissions") %></h4>
-        <div class="flex flex-wrap gap-2">
-          <% @current_api_key.scopes.each do |scope| %>
-            <span class="inline-flex items-center gap-1 px-2 py-1 button-bg-primary text-inverse rounded-full text-xs font-medium">
-              <%= icon("shield-check", class: "w-3 h-3") %>
-              <%= case scope
-                  when "read" then t(".current_api_key.scope_read_only")
-                  when "read_write" then t(".current_api_key.scope_read_write")
-                  else scope.humanize
-                  end %>
-            </span>
-          <% end %>
-        </div>
+        <%= render "settings/api_keys/scope_badges", scopes: @api_key.scopes %>
       </div>
 
-      <div class="bg-surface-inset rounded-xl p-4">
-        <h4 class="font-medium text-primary mb-3"><%= t(".current_api_key.title") %></h4>
-        <p class="text-secondary text-sm mb-3"><%= t(".current_api_key.copy_store_securely") %></p>
+      <%= render "settings/api_keys/key_reveal",
+          api_key: @api_key,
+          heading: t(".current_api_key.title"),
+          description: t(".current_api_key.copy_store_securely"),
+          copy_label: t(".current_api_key.copy_api_key") %>
 
-        <div class="bg-container rounded-lg p-3 border border-primary" data-controller="clipboard">
-          <div class="flex items-center justify-between gap-3">
-            <code id="api-key-display" class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @current_api_key.plain_key %></code>
-            <%= render DS::Button.new(
-              text: t(".current_api_key.copy_api_key"),
-              variant: "ghost",
-              icon: "copy",
-              data: { action: "clipboard#copy" }
-            ) %>
-          </div>
-        </div>
-      </div>
-
-      <div class="bg-surface-inset rounded-xl p-4">
-        <h4 class="font-medium text-primary mb-3"><%= t(".current_api_key.usage_instructions_title") %></h4>
-        <p class="text-secondary text-sm mb-3"><%= t(".current_api_key.usage_instructions", product_name: product_name) %></p>
-        <div class="bg-container rounded-lg p-3 font-mono text-sm text-primary border border-primary">
-          curl -H "X-Api-Key: <%= @current_api_key.plain_key %>" <%= request.base_url %>/api/v1/accounts
-        </div>
-      </div>
+      <%= render "settings/api_keys/usage",
+          api_key: @api_key,
+          title: t(".current_api_key.usage_instructions_title"),
+          description: t(".current_api_key.usage_instructions", product_name: product_name) %>
 
       <div class="flex justify-end pt-4 border-t border-primary">
         <%= render DS::Button.new(
           text: t(".current_api_key.revoke_key"),
-          href: settings_api_key_path,
+          href: settings_api_key_path(@api_key),
           method: :delete,
           variant: "destructive",
           data: {
@@ -144,54 +98,4 @@
       </div>
     </div>
   </div>
-<% else %>
-  <%= content_for :page_title, t(".no_api_key.title") %>
-  <%= content_for :page_actions do %>
-    <%= render DS::Link.new(
-      text: t(".no_api_key.create_api_key"),
-      href: new_settings_api_key_path,
-      variant: "primary"
-    ) %>
-  <% end %>
-
-  <div class="bg-container rounded-xl shadow-border-xs p-4">
-    <div class="space-y-4">
-      <div class="p-3 shadow-border-xs bg-container rounded-lg">
-        <div class="flex items-start gap-3">
-          <%= render DS::FilledIcon.new(
-            icon: "key",
-            rounded: true,
-            size: "lg"
-          ) %>
-          <div class="flex-1">
-            <h3 class="font-medium text-primary"><%= t(".no_api_key.heading", product_name: product_name) %></h3>
-            <p class="text-secondary text-sm mt-1"><%= t(".no_api_key.description") %></p>
-          </div>
-        </div>
-      </div>
-
-      <div class="bg-surface-inset rounded-xl p-4">
-        <h4 class="font-medium text-primary mb-3"><%= t(".no_api_key.what_you_can_do") %></h4>
-        <ul class="space-y-2 text-sm text-secondary">
-          <li class="flex items-start gap-2">
-            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
-            <span><%= t(".no_api_key.feature_1") %></span>
-          </li>
-          <li class="flex items-start gap-2">
-            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
-            <span><%= t(".no_api_key.feature_2") %></span>
-          </li>
-          <li class="flex items-start gap-2">
-            <%= icon("check", class: "w-4 h-4 text-primary mt-0.5") %>
-            <span><%= t(".no_api_key.feature_3") %></span>
-          </li>
-        </ul>
-      </div>
-
-      <div class="bg-surface-inset rounded-xl p-4">
-        <h4 class="font-medium text-primary mb-2"><%= t(".no_api_key.security_note_title") %></h4>
-        <p class="text-secondary text-sm"><%= t(".no_api_key.security_note") %></p>
-      </div>
-    </div>
-  </div>
 <% end %>
diff --git a/app/views/settings/appearances/show.html.erb b/app/views/settings/appearances/show.html.erb
index f22096236..230c5e92a 100644
--- a/app/views/settings/appearances/show.html.erb
+++ b/app/views/settings/appearances/show.html.erb
@@ -35,7 +35,7 @@
           data: { controller: "auto-submit-form" } do |f| %>
       <div class="flex cursor-pointer items-center gap-4 justify-between">
         <div class="text-sm space-y-1">
-          <h4 class="text-primary"><%= t(".dashboard_two_column_title") %></h4>
+          <p class="text-primary font-medium"><%= t(".dashboard_two_column_title") %></p>
           <p class="text-secondary"><%= t(".dashboard_two_column_description") %></p>
         </div>
         <%= render DS::Toggle.new(
@@ -49,6 +49,27 @@
   </div>
 <% end %>
 
+<%= settings_section title: t(".modals_title"), subtitle: t(".modals_subtitle") do %>
+  <div>
+    <%= form_with url: settings_appearance_path, method: :patch,
+          class: "p-3",
+          data: { controller: "auto-submit-form" } do |f| %>
+      <div class="flex cursor-pointer items-center gap-4 justify-between">
+        <div class="text-sm space-y-1">
+          <h4 class="text-primary"><%= t(".disable_modal_click_outside_title") %></h4>
+          <p class="text-secondary"><%= t(".disable_modal_click_outside_description") %></p>
+        </div>
+        <%= render DS::Toggle.new(
+              id: "user_disable_modal_click_outside",
+              name: "user[disable_modal_click_outside]",
+              checked: @user.disable_modal_click_outside?,
+              data: { auto_submit_form_target: "auto" }
+        ) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
 <%= settings_section title: t(".transactions_title"), subtitle: t(".transactions_subtitle") do %>
   <div>
     <%= form_with url: settings_appearance_path, method: :patch,
@@ -56,7 +77,7 @@
           data: { controller: "auto-submit-form" } do |f| %>
       <div class="flex cursor-pointer items-center gap-4 justify-between">
         <div class="text-sm space-y-1">
-          <h4 class="text-primary"><%= t(".split_grouped_title") %></h4>
+          <p class="text-primary font-medium"><%= t(".split_grouped_title") %></p>
           <p class="text-secondary"><%= t(".split_grouped_description") %></p>
         </div>
         <%= render DS::Toggle.new(
diff --git a/app/views/settings/background_jobs/_operation.html.erb b/app/views/settings/background_jobs/_operation.html.erb
new file mode 100644
index 000000000..68b37c284
--- /dev/null
+++ b/app/views/settings/background_jobs/_operation.html.erb
@@ -0,0 +1,49 @@
+<% family = BackgroundJobConsole.family_for(operation) %>
+<% running = console.running?(operation) %>
+<tr>
+  <td class="px-4 py-3 text-sm text-primary whitespace-nowrap">
+    <%= operation.is_a?(Sync) ? t(".sync_label", type: operation.syncable_type) : operation.class.name %>
+    <p class="text-xs text-secondary font-mono" title="<%= operation.id %>"><%= operation.id.to_s.split("-").first %></p>
+  </td>
+  <td class="px-4 py-3 text-sm text-primary whitespace-nowrap"><%= family&.name || t(".missing_value") %></td>
+  <td class="px-4 py-3 text-sm text-primary whitespace-nowrap"><%= operation.status %></td>
+  <td class="px-4 py-3 text-sm text-secondary whitespace-nowrap">
+    <%= t(".ago", time: time_ago_in_words(operation.updated_at)) %>
+  </td>
+  <td class="px-4 py-3 text-sm whitespace-nowrap">
+    <% if running %>
+      <span class="flex items-center gap-2 text-primary">
+        <span class="animate-spin h-3 w-3 border-2 border-secondary border-t-transparent rounded-full"></span>
+        <%= t(".running") %>
+      </span>
+    <% elsif console.redis_error? %>
+      <span class="text-secondary"><%= t(".unknown") %></span>
+    <% elsif console.enqueued?(operation) %>
+      <span class="text-secondary"><%= t(".queued") %></span>
+    <% elsif operation.updated_at > BackgroundJobConsole::STUCK_AFTER.ago %>
+      <span class="text-secondary"><%= t(".recent") %></span>
+    <% else %>
+      <span class="flex items-center gap-2 text-primary">
+        <%= icon "alert-triangle", class: "w-4 h-4 text-warning" %>
+        <%= t(".stuck") %>
+      </span>
+    <% end %>
+  </td>
+  <td class="px-4 py-3 text-sm whitespace-nowrap text-right">
+    <% if console.cancellable?(operation) %>
+      <% action_key = case operation
+         when Sync then "mark_stale"
+         when PdfImport then "release_claim"
+         else "mark_failed"
+         end %>
+      <%= button_to cancel_settings_background_jobs_path(record_type: operation.class.base_class.name, id: operation.id),
+                    method: :post,
+                    class: "text-sm text-destructive hover:underline",
+                    data: { turbo_confirm: t(".confirm"), turbo_frame: "_top" } do %>
+        <%= t(".actions.#{action_key}") %>
+      <% end %>
+    <% else %>
+      <span class="text-xs text-secondary"><%= t(".missing_value") %></span>
+    <% end %>
+  </td>
+</tr>
diff --git a/app/views/settings/background_jobs/show.html.erb b/app/views/settings/background_jobs/show.html.erb
new file mode 100644
index 000000000..c3f7e50f1
--- /dev/null
+++ b/app/views/settings/background_jobs/show.html.erb
@@ -0,0 +1,68 @@
+<%= content_for :page_title, t(".page_title") %>
+
+<%= turbo_frame_tag "background_jobs_console",
+    data: {
+      controller: "polling",
+      polling_url_value: settings_background_jobs_path,
+      polling_interval_value: 10000
+    } do %>
+  <div class="space-y-4">
+    <%= settings_section title: t(".title"), subtitle: t(".subtitle") do %>
+      <% if @console.redis_error? || @console.stats.nil? %>
+        <%= render DS::Alert.new(variant: :warning, message: t(".redis_unreachable")) %>
+      <% else %>
+        <div class="space-y-3">
+          <div class="grid grid-cols-2 sm:grid-cols-3 lg:grid-cols-6 gap-3">
+            <% {
+              workers: @console.stats.processes,
+              busy: @console.stats.busy,
+              enqueued: @console.stats.enqueued,
+              retries: @console.stats.retry_size,
+              scheduled: @console.stats.scheduled_size,
+              dead: @console.stats.dead_size
+            }.each do |label, value| %>
+              <div class="rounded-lg bg-container-inset p-3">
+                <p class="text-xs text-secondary uppercase"><%= t(".stats.#{label}") %></p>
+                <p class="text-lg font-medium text-primary"><%= value %></p>
+              </div>
+            <% end %>
+          </div>
+
+          <div class="flex flex-wrap gap-2">
+            <% @console.stats.queues.each do |queue| %>
+              <span class="rounded-full bg-container-inset px-3 py-1 text-xs text-secondary font-mono">
+                <%= queue[:name] %>: <%= queue[:size] %> · <%= t(".stats.latency", value: queue[:latency]) %>
+              </span>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+    <% end %>
+
+    <%= settings_section title: t(".operations_title"), subtitle: t(".operations_subtitle") do %>
+      <% if @operations.any? %>
+        <div class="overflow-x-auto">
+          <table class="w-full">
+            <thead class="bg-surface border-b border-primary">
+              <tr>
+                <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.type") %></th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.family") %></th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.status") %></th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.last_activity") %></th>
+                <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".table.liveness") %></th>
+                <th class="px-4 py-3 text-right text-xs font-medium text-secondary uppercase"><%= t(".table.action") %></th>
+              </tr>
+            </thead>
+            <tbody class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
+              <% @operations.each do |operation| %>
+                <%= render "settings/background_jobs/operation", operation: operation, console: @console %>
+              <% end %>
+            </tbody>
+          </table>
+        </div>
+      <% else %>
+        <div class="p-8 text-center text-secondary"><%= t(".empty") %></div>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/app/views/settings/debugs/show.html.erb b/app/views/settings/debugs/show.html.erb
index d55c4ce46..921171a14 100644
--- a/app/views/settings/debugs/show.html.erb
+++ b/app/views/settings/debugs/show.html.erb
@@ -1,12 +1,7 @@
 <%= content_for :page_title, t(".page_title") %>
 
 <div class="space-y-6">
-  <div class="bg-container rounded-xl shadow-border-xs p-4">
-    <h1 class="text-lg font-semibold text-primary"><%= t(".title") %></h1>
-    <p class="text-sm text-secondary mt-1"><%= t(".subtitle") %></p>
-  </div>
-
-  <div class="bg-container rounded-xl shadow-border-xs p-4">
+  <%= settings_section title: t(".title"), subtitle: t(".subtitle") do %>
     <%= form_with url: settings_debug_path, method: :get, class: "grid grid-cols-1 md:grid-cols-2 xl:grid-cols-4 gap-4 items-end" do |f| %>
       <div>
         <%= f.label :category, t(".filters.category"), class: "block text-sm font-medium text-primary mb-1" %>
@@ -53,7 +48,7 @@
         <%= render DS::Link.new(text: t(".filters.reset"), href: settings_debug_path, variant: "ghost") %>
       </div>
     <% end %>
-  </div>
+  <% end %>
 
   <div class="bg-container rounded-xl shadow-border-xs overflow-hidden">
     <% if @debug_log_entries.any? %>
diff --git a/app/views/settings/guides/show.html.erb b/app/views/settings/guides/show.html.erb
index c6e08bbb5..12d07f405 100644
--- a/app/views/settings/guides/show.html.erb
+++ b/app/views/settings/guides/show.html.erb
@@ -1,5 +1,7 @@
-<%= content_for :page_title, "Guides" %>
+<%= content_for :page_title, t(".page_title") %>
 
-<div class="bg-container rounded-xl shadow-border-xs p-4 prose prose-sm max-w-none">
-  <%= @guide_content.html_safe %>
-</div>
+<%= settings_section do %>
+  <div class="prose prose-sm max-w-none">
+    <%= @guide_content.html_safe %>
+  </div>
+<% end %>
diff --git a/app/views/settings/hostings/_anthropic_settings.html.erb b/app/views/settings/hostings/_anthropic_settings.html.erb
new file mode 100644
index 000000000..34d851d2e
--- /dev/null
+++ b/app/views/settings/hostings/_anthropic_settings.html.erb
@@ -0,0 +1,53 @@
+<div class="space-y-4">
+  <div>
+    <h2 class="font-medium mb-1"><%= t(".title") %></h2>
+    <% if ENV["ANTHROPIC_ACCESS_TOKEN"].present? || ENV["ANTHROPIC_API_KEY"].present? %>
+      <p class="text-sm text-secondary"><%= t(".env_configured_message") %></p>
+    <% else %>
+      <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
+    <% end %>
+  </div>
+
+  <%= styled_form_with model: Setting.new,
+                       url: settings_hosting_path,
+                       method: :patch,
+                       class: "space-y-4",
+                       data: {
+                         controller: "auto-submit-form",
+                         "auto-submit-form-trigger-event-value": "blur"
+                       } do |form| %>
+    <%= form.password_field :anthropic_access_token,
+                            label: t(".access_token_label"),
+                            placeholder: t(".access_token_placeholder"),
+                            value: (Setting.anthropic_access_token.present? ? "********" : nil),
+                            autocomplete: "off",
+                            autocapitalize: "none",
+                            spellcheck: "false",
+                            inputmode: "text",
+                            disabled: ENV["ANTHROPIC_ACCESS_TOKEN"].present? || ENV["ANTHROPIC_API_KEY"].present?,
+                            data: { "auto-submit-form-target": "auto" } %>
+
+    <%= form.text_field :anthropic_base_url,
+                        label: t(".base_url_label"),
+                        placeholder: t(".base_url_placeholder"),
+                        value: @anthropic_base_url_input || Setting.anthropic_base_url,
+                        autocomplete: "off",
+                        autocapitalize: "none",
+                        spellcheck: "false",
+                        inputmode: "url",
+                        disabled: ENV["ANTHROPIC_BASE_URL"].present?,
+                        data: { "auto-submit-form-target": "auto" } %>
+
+    <%= form.text_field :anthropic_model,
+                        label: t(".model_label"),
+                        placeholder: t(".model_placeholder"),
+                        value: @anthropic_model_input || Setting.anthropic_model,
+                        autocomplete: "off",
+                        autocapitalize: "none",
+                        spellcheck: "false",
+                        inputmode: "text",
+                        disabled: ENV["ANTHROPIC_MODEL"].present?,
+                        data: { "auto-submit-form-target": "auto" } %>
+    <p class="text-xs text-secondary mt-1"><%= t(".model_help") %></p>
+  <% end %>
+</div>
diff --git a/app/views/settings/hostings/_llm_provider_selector.html.erb b/app/views/settings/hostings/_llm_provider_selector.html.erb
new file mode 100644
index 000000000..22b0c67b8
--- /dev/null
+++ b/app/views/settings/hostings/_llm_provider_selector.html.erb
@@ -0,0 +1,61 @@
+<%
+  active = Setting.llm_provider.to_s.downcase == "anthropic" ? "anthropic" : "openai"
+  locked = ENV["LLM_PROVIDER"].present?
+  providers = [ [ "openai", t(".provider_openai") ], [ "anthropic", t(".provider_anthropic") ] ]
+  active_configured = active == "anthropic" ? Provider::Anthropic.configured? : Provider::Openai.configured?
+%>
+
+<div class="space-y-3">
+  <div>
+    <h2 class="font-medium mb-1"><%= t(".title") %></h2>
+    <% if locked %>
+      <p class="text-sm text-secondary"><%= t(".env_configured_message") %></p>
+    <% else %>
+      <p class="text-secondary text-sm"><%= t(".description") %></p>
+    <% end %>
+  </div>
+
+  <%= styled_form_with model: Setting.new,
+                       url: settings_hosting_path,
+                       method: :patch,
+                       data: { "provider-settings-target": "form" } do |form| %>
+    <%# Mobile: native picker. The segmented tabs overflow < sm once there are
+        3+ providers, so below sm we fall back to a <select> — which is also the
+        submitted field (the desktop tabs set its value via the controller). %>
+    <div class="sm:hidden">
+      <%= form.select :llm_provider,
+                      options_for_select(providers.map { |key, label| [ label, key ] }, active),
+                      { label: t(".provider_label") },
+                      { disabled: locked,
+                        data: { "provider-settings-target": "field",
+                                action: (locked ? nil : "change->provider-settings#select") } } %>
+    </div>
+
+    <%# Desktop / tablet: segmented tabs (room to spare up to ~5 providers). %>
+    <div class="hidden sm:block">
+      <%= render DS::SegmentedControl.new(full_width: true, aria_label: t(".provider_label")) do |sc| %>
+        <% providers.each do |key, label| %>
+          <% sc.with_segment(label,
+               active: active == key,
+               disabled: locked,
+               data: {
+                 "provider-settings-target": "segment",
+                 provider: key,
+                 action: (locked ? nil : "click->provider-settings#select")
+               }) %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <p class="text-xs text-secondary"><%= t(".provider_help") %></p>
+
+  <% if !locked && !active_configured %>
+    <p class="text-xs text-warning"><%= t(".not_configured_hint", provider: t(".provider_#{active}")) %></p>
+  <% end %>
+
+  <div class="rounded-md border border-secondary p-3 bg-container-inset text-xs text-secondary space-y-1">
+    <p class="font-medium text-primary"><%= t(".data_retention_heading") %></p>
+    <p><%= t(".data_retention") %></p>
+  </div>
+</div>
diff --git a/app/views/settings/hostings/_provider_selection.html.erb b/app/views/settings/hostings/_provider_selection.html.erb
index 4e38bb38f..0c5c4476c 100644
--- a/app/views/settings/hostings/_provider_selection.html.erb
+++ b/app/views/settings/hostings/_provider_selection.html.erb
@@ -14,7 +14,9 @@
       <%= form.select :exchange_rate_provider,
                       [
                         [t(".providers.twelve_data"), "twelve_data"],
-                        [t(".providers.yahoo_finance"), "yahoo_finance"]
+                        [t(".providers.yahoo_finance"), "yahoo_finance"],
+                        [t(".providers.moex_public"), "moex_public"],
+                        [t(".providers.frankfurter"), "frankfurter"]
                       ],
                       { label: t(".exchange_rate_provider_label") },
                       {
@@ -51,12 +53,14 @@
           ["alpha_vantage", t(".providers.alpha_vantage"), t(".requires_api_key_alpha_vantage")],
           ["mfapi", t(".providers.mfapi"), t(".mfapi_hint")],
           ["binance_public", t(".providers.binance_public"), t(".binance_public_hint")],
+          ["moex_public", t(".providers.moex_public"), t(".moex_public_hint")],
+          ["tinkoff_invest", t(".providers.tinkoff_invest"), t(".tinkoff_invest_hint")],
         ].each do |value, label, hint| %>
           <label class="flex items-center gap-2 cursor-pointer">
             <input type="checkbox"
                    name="setting[securities_providers][]"
                    value="<%= value %>"
-                   class="rounded border-primary text-primary focus:ring-primary"
+                   class="checkbox checkbox--light"
                    <%= "checked" if enabled_providers.include?(value) %>
                    <%= "disabled" if disabled %>
                    data-auto-submit-form-target="auto">
diff --git a/app/views/settings/hostings/_realie_settings.html.erb b/app/views/settings/hostings/_realie_settings.html.erb
new file mode 100644
index 000000000..ae5b3ff74
--- /dev/null
+++ b/app/views/settings/hostings/_realie_settings.html.erb
@@ -0,0 +1,30 @@
+<div class="space-y-4">
+  <div>
+    <h2 class="font-medium mb-1"><%= t(".title") %></h2>
+    <% if ENV["REALIE_API_KEY"].present? %>
+      <p class="text-sm text-secondary"><%= t(".env_configured_message") %></p>
+    <% else %>
+      <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
+    <% end %>
+    <% if @realie_usage&.success? %>
+      <p class="text-sm text-secondary"><%= t(".usage", used: @realie_usage.data.used, limit: @realie_usage.data.limit) %></p>
+    <% end %>
+  </div>
+
+  <%= styled_form_with model: Setting.new,
+                       url: settings_hosting_path,
+                       method: :patch,
+                       data: {
+                         controller: "auto-submit-form",
+                         "auto-submit-form-trigger-event-value": "blur"
+                       } do |form| %>
+    <% has_key = ENV["REALIE_API_KEY"].present? || Setting.realie_api_key.present? %>
+    <%= form.text_field :realie_api_key,
+                        label: t(".label"),
+                        type: "password",
+                        placeholder: t(".placeholder"),
+                        value: has_key ? "********" : "",
+                        disabled: ENV["REALIE_API_KEY"].present?,
+                        data: { "auto-submit-form-target": "auto" } %>
+  <% end %>
+</div>
diff --git a/app/views/settings/hostings/_rentcast_settings.html.erb b/app/views/settings/hostings/_rentcast_settings.html.erb
new file mode 100644
index 000000000..c88c30680
--- /dev/null
+++ b/app/views/settings/hostings/_rentcast_settings.html.erb
@@ -0,0 +1,30 @@
+<div class="space-y-4">
+  <div>
+    <h2 class="font-medium mb-1"><%= t(".title") %></h2>
+    <% if ENV["RENTCAST_API_KEY"].present? %>
+      <p class="text-sm text-secondary"><%= t(".env_configured_message") %></p>
+    <% else %>
+      <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
+    <% end %>
+    <% if @rentcast_usage&.success? %>
+      <p class="text-sm text-secondary"><%= t(".usage", used: @rentcast_usage.data.used, limit: @rentcast_usage.data.limit) %></p>
+    <% end %>
+  </div>
+
+  <%= styled_form_with model: Setting.new,
+                       url: settings_hosting_path,
+                       method: :patch,
+                       data: {
+                         controller: "auto-submit-form",
+                         "auto-submit-form-trigger-event-value": "blur"
+                       } do |form| %>
+    <% has_key = ENV["RENTCAST_API_KEY"].present? || Setting.rentcast_api_key.present? %>
+    <%= form.text_field :rentcast_api_key,
+                        label: t(".label"),
+                        type: "password",
+                        placeholder: t(".placeholder"),
+                        value: has_key ? "********" : "",
+                        disabled: ENV["RENTCAST_API_KEY"].present?,
+                        data: { "auto-submit-form-target": "auto" } %>
+  <% end %>
+</div>
diff --git a/app/views/settings/hostings/_sync_settings.html.erb b/app/views/settings/hostings/_sync_settings.html.erb
index 82cfb86ef..44abd18cb 100644
--- a/app/views/settings/hostings/_sync_settings.html.erb
+++ b/app/views/settings/hostings/_sync_settings.html.erb
@@ -52,13 +52,6 @@
   </div>
 
   <% if env_configured %>
-    <div class="bg-warning-50 border border-warning-200 rounded-lg p-3">
-      <div class="flex items-start gap-2">
-        <%= icon("alert-circle", class: "w-5 h-5 text-warning-600 mt-0.5 shrink-0") %>
-        <p class="text-sm text-warning-800">
-          <%= t(".env_configured_message") %>
-        </p>
-      </div>
-    </div>
+    <%= render DS::Alert.new(message: t(".env_configured_message"), variant: :warning) %>
   <% end %>
 </div>
diff --git a/app/views/settings/hostings/_tinkoff_invest_settings.html.erb b/app/views/settings/hostings/_tinkoff_invest_settings.html.erb
new file mode 100644
index 000000000..670c5d1da
--- /dev/null
+++ b/app/views/settings/hostings/_tinkoff_invest_settings.html.erb
@@ -0,0 +1,39 @@
+<div class="space-y-4">
+  <div>
+    <h2 class="font-medium mb-1"><%= t(".title") %></h2>
+    <% if ENV["TINKOFF_INVEST_API_KEY"].present? %>
+      <p class="text-sm text-secondary"><%= t(".env_configured_message") %></p>
+    <% else %>
+      <div class="text-secondary text-sm mb-4">
+        <span><%= t(".description") %></span>
+        <%= render DS::Disclosure.new(variant: :inline) do |disclosure| %>
+          <% disclosure.with_summary_content do %>
+            <span class="font-medium text-secondary underline"><%= t(".show_details") %></span>
+          <% end %>
+          <ol class="text-sm text-secondary mt-2 list-decimal ml-6 space-y-2">
+            <li><%= t(".step_1") %></li>
+            <li><%= t(".step_2") %></li>
+            <li><%= t(".step_3") %></li>
+          </ol>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= styled_form_with model: Setting.new,
+                       url: settings_hosting_path,
+                       method: :patch,
+                       data: {
+                         controller: "auto-submit-form",
+                         "auto-submit-form-trigger-event-value": "blur"
+                       } do |form| %>
+    <% has_key = ENV["TINKOFF_INVEST_API_KEY"].present? || Setting.tinkoff_invest_api_key.present? %>
+    <%= form.text_field :tinkoff_invest_api_key,
+                        label: t(".label"),
+                        type: "password",
+                        placeholder: t(".placeholder"),
+                        value: has_key ? "********" : "",
+                        disabled: ENV["TINKOFF_INVEST_API_KEY"].present?,
+                        data: { "auto-submit-form-target": "auto" } %>
+  <% end %>
+</div>
diff --git a/app/views/settings/hostings/_yahoo_finance_settings.html.erb b/app/views/settings/hostings/_yahoo_finance_settings.html.erb
index 1ed8044b6..2007f2a4e 100644
--- a/app/views/settings/hostings/_yahoo_finance_settings.html.erb
+++ b/app/views/settings/hostings/_yahoo_finance_settings.html.erb
@@ -3,28 +3,20 @@
     <h2 class="font-medium mb-1"><%= t(".title") %></h2>
     <p class="text-secondary text-sm mb-4"><%= t(".description") %></p>
   </div>
-  <% if @yahoo_finance_provider&.healthy? %>
-    <div class="space-y-4">
-      <div class="flex items-center space-x-3">
-        <div class="w-3 h-3 bg-success rounded-full"></div>
-        <p class="text-sm text-secondary">
-          <%= t(".status_active") %>
-        </p>
-      </div>
+  <% health = yahoo_finance_health_presentation(@yahoo_finance_health_status) %>
+  <div class="space-y-4">
+    <div class="flex items-center space-x-3">
+      <div class="w-3 h-3 <%= health[:status_class] %> rounded-full"></div>
+      <p class="text-sm text-secondary">
+        <%= health[:status_text] %>
+      </p>
     </div>
-  <% else %>
-    <div class="space-y-4">
-      <div class="flex items-center space-x-3">
-        <div class="w-3 h-3 bg-destructive rounded-full"></div>
-        <p class="text-sm text-secondary">
-          <%= t(".status_inactive") %>
-        </p>
-      </div>
+    <% if health[:alert] %>
       <%= render DS::Alert.new(
-        title: t(".connection_failed"),
-        message: t(".troubleshooting"),
-        variant: :warning
+        title: health.dig(:alert, :title),
+        message: health.dig(:alert, :message),
+        variant: health.dig(:alert, :variant)
       ) %>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/settings/hostings/show.html.erb b/app/views/settings/hostings/show.html.erb
index 6312f900e..44970a9af 100644
--- a/app/views/settings/hostings/show.html.erb
+++ b/app/views/settings/hostings/show.html.erb
@@ -3,8 +3,18 @@
   <%= render "settings/hostings/assistant_settings" %>
 <% end %>
 <%= settings_section title: t(".general") do %>
-    <div class="space-y-6">
-    <%= render "settings/hostings/openai_settings" %>
+  <div class="space-y-6"
+       data-controller="provider-settings"
+       data-provider-settings-active-value="<%= Setting.llm_provider %>">
+    <%= render "settings/hostings/llm_provider_selector" %>
+    <%= tag.div data: { "provider-settings-target": "panel", provider: "openai" },
+                hidden: Setting.llm_provider != "openai" do %>
+      <%= render "settings/hostings/openai_settings" %>
+    <% end %>
+    <%= tag.div data: { "provider-settings-target": "panel", provider: "anthropic" },
+                hidden: Setting.llm_provider != "anthropic" do %>
+      <%= render "settings/hostings/anthropic_settings" %>
+    <% end %>
     <%= render "settings/hostings/brand_fetch_settings" %>
   </div>
 <% end %>
@@ -26,6 +36,15 @@
     <% if @show_alpha_vantage_settings %>
       <%= render "settings/hostings/alpha_vantage_settings" %>
     <% end %>
+    <% if @show_tinkoff_invest_settings %>
+      <%= render "settings/hostings/tinkoff_invest_settings" %>
+    <% end %>
+  </div>
+<% end %>
+<%= settings_section title: t(".property_valuation_providers") do %>
+  <div class="space-y-6">
+    <%= render "settings/hostings/rentcast_settings" %>
+    <%= render "settings/hostings/realie_settings" %>
   </div>
 <% end %>
 <%= settings_section title: t(".sync_settings") do %>
diff --git a/app/views/settings/llm_usages/show.html.erb b/app/views/settings/llm_usages/show.html.erb
index 39929a55b..681aa2341 100644
--- a/app/views/settings/llm_usages/show.html.erb
+++ b/app/views/settings/llm_usages/show.html.erb
@@ -103,10 +103,10 @@
   <!-- Recent Usage Table -->
   <div>
     <h2 class="text-lg font-semibold text-primary mb-3"><%= t(".recent_usage") %></h2>
-    <div class="bg-container-inset rounded-lg overflow-hidden">
+    <div class="table-scroll rounded-lg" tabindex="0" role="region" aria-label="<%= t(".recent_usage") %>">
       <% if @llm_usages.any? %>
         <table class="w-full">
-          <thead class="bg-surface-default border-b border-primary">
+          <thead class="bg-surface border-b border-primary">
             <tr>
               <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".col_date") %></th>
               <th class="px-4 py-3 text-left text-xs font-medium text-secondary uppercase"><%= t(".col_operation") %></th>
@@ -115,9 +115,9 @@
               <th class="px-4 py-3 text-right text-xs font-medium text-secondary uppercase"><%= t(".col_cost") %></th>
             </tr>
           </thead>
-          <tbody class="divide-y divide-gray-100">
+          <tbody class="divide-y divide-alpha-black-200 theme-dark:divide-alpha-white-200">
             <% @llm_usages.each do |usage| %>
-              <tr class="<%= "bg-red-50 theme-dark:bg-red-950/30" if usage.failed? %>">
+              <tr class="<%= "bg-red-tint-5 theme-dark:bg-red-tint-10" if usage.failed? %>">
                 <td class="px-4 py-3 text-sm text-primary whitespace-nowrap">
                   <%= usage.created_at.strftime("%b %d, %Y %I:%M %p") %>
                 </td>
@@ -131,10 +131,10 @@
                   <% if usage.failed? %>
                     <div data-controller="tooltip" class="inline-flex justify-end">
                       <div class="inline-flex items-center gap-1 cursor-help">
-                        <%= icon "alert-circle", class: "w-4 h-4 text-red-600 theme-dark:text-red-400" %>
-                        <span class="text-red-600 theme-dark:text-red-400 font-medium"><%= t(".failed") %></span>
+                        <%= icon "alert-circle", size: "sm", color: "destructive" %>
+                        <span class="text-destructive font-medium"><%= t(".failed") %></span>
                       </div>
-                      <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-sm p-3 rounded w-72 text-left break-words whitespace-normal shadow-lg hidden">
+                      <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-sm p-2 rounded-md w-64 text-left break-words whitespace-normal hidden">
                         <div class="text-inverse">
                           <% if usage.http_status_code.present? %>
                             <p class="text-xs mt-1 text-inverse opacity-70">HTTP Status: <%= usage.http_status_code %></p>
diff --git a/app/views/settings/mcp/show.html.erb b/app/views/settings/mcp/show.html.erb
new file mode 100644
index 000000000..b39e3c052
--- /dev/null
+++ b/app/views/settings/mcp/show.html.erb
@@ -0,0 +1,79 @@
+<%= content_for :page_title, t(".page_title") %>
+
+<div class="space-y-4">
+  <div class="bg-container rounded-xl shadow-border-xs p-4">
+    <div class="space-y-4">
+      <div class="space-y-1">
+        <h3 class="text-sm font-medium text-primary"><%= t(".connect_title") %></h3>
+        <p class="text-sm text-secondary"><%= t(".connect_subtitle") %></p>
+      </div>
+
+      <div class="bg-surface-inset rounded-lg p-3" data-controller="clipboard" data-clipboard-copied-text-value="<%= t(".copied") %>">
+        <div class="flex items-center justify-between gap-3">
+          <code class="font-mono text-sm text-primary break-all" data-clipboard-target="source"><%= @mcp_url %></code>
+          <%= render DS::Button.new(
+            text: t(".copy_url"),
+            variant: :ghost,
+            icon: "copy",
+            size: :sm,
+            data: { action: "clipboard#copy" }
+          ) %>
+        </div>
+      </div>
+
+      <div class="space-y-2">
+        <h4 class="text-sm font-medium text-primary"><%= t(".how_to_connect_title") %></h4>
+        <ol class="space-y-2 text-sm text-secondary">
+          <li class="flex items-start gap-2">
+            <span class="flex-shrink-0 w-5 h-5 rounded-full bg-surface-inset text-primary text-xs font-medium flex items-center justify-center mt-0.5">1</span>
+            <span><%= t(".step_1") %></span>
+          </li>
+          <li class="flex items-start gap-2">
+            <span class="flex-shrink-0 w-5 h-5 rounded-full bg-surface-inset text-primary text-xs font-medium flex items-center justify-center mt-0.5">2</span>
+            <span><%= t(".step_2") %></span>
+          </li>
+          <li class="flex items-start gap-2">
+            <span class="flex-shrink-0 w-5 h-5 rounded-full bg-surface-inset text-primary text-xs font-medium flex items-center justify-center mt-0.5">3</span>
+            <span><%= t(".step_3") %></span>
+          </li>
+          <li class="flex items-start gap-2">
+            <span class="flex-shrink-0 w-5 h-5 rounded-full bg-surface-inset text-primary text-xs font-medium flex items-center justify-center mt-0.5">4</span>
+            <span><%= t(".step_4") %></span>
+          </li>
+        </ol>
+      </div>
+    </div>
+  </div>
+
+  <% if @connected_tokens.any? %>
+    <div class="bg-container rounded-xl shadow-border-xs p-4">
+      <div class="space-y-3">
+        <div class="space-y-1">
+          <h3 class="text-sm font-medium text-primary"><%= t(".connected_title") %></h3>
+          <p class="text-sm text-secondary"><%= t(".connected_subtitle") %></p>
+        </div>
+        <ul class="space-y-2">
+          <% @connected_tokens.each do |token| %>
+            <li class="flex items-center justify-between gap-3 p-3 bg-surface-inset rounded-lg">
+              <div class="flex items-center gap-3">
+                <%= render DS::FilledIcon.new(icon: "plug", size: "md", rounded: true) %>
+                <div class="text-sm space-y-0.5">
+                  <p class="font-medium text-primary"><%= token.application&.name || t(".unknown_client") %></p>
+                  <p class="text-secondary"><%= t(".connected_ago", time: time_ago_in_words(token.created_at)) %></p>
+                </div>
+              </div>
+              <%= render DS::Button.new(
+                text: t(".revoke"),
+                href: revoke_token_settings_mcp_path(token_id: token.id),
+                method: :delete,
+                variant: :ghost,
+                size: :sm,
+                data: { turbo_confirm: t(".revoke_confirm") }
+              ) %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/settings/payments/show.html.erb b/app/views/settings/payments/show.html.erb
index 0768440cd..dcddbbb07 100644
--- a/app/views/settings/payments/show.html.erb
+++ b/app/views/settings/payments/show.html.erb
@@ -2,7 +2,7 @@
 
 <%= settings_section title: t(".subscription_title"), subtitle: t(".subscription_subtitle") do %>
   <div class="space-y-4">
-    <div class="p-3 shadow-border-xs bg-container rounded-lg flex justify-between items-center">
+    <div class="p-4 bg-container-inset rounded-lg flex justify-between items-center">
       <div class="flex items-center gap-3">
         <%= render DS::FilledIcon.new(
           icon: "gem",
diff --git a/app/views/settings/preferences/show.html.erb b/app/views/settings/preferences/show.html.erb
index 8c6649f2a..b5260b9fb 100644
--- a/app/views/settings/preferences/show.html.erb
+++ b/app/views/settings/preferences/show.html.erb
@@ -29,9 +29,7 @@
             { label: t(".month_start_day"), hint: t(".month_start_day_hint") },
             { data: { auto_submit_form_target: "auto" } } %>
         <% if @user.family.uses_custom_month_start? %>
-          <div class="text-sm text-warning bg-warning/10 p-3 rounded-lg">
-            <%= t(".month_start_day_warning") %>
-          </div>
+          <%= render DS::Alert.new(message: t(".month_start_day_warning"), variant: :warning) %>
         <% end %>
         <p class="text-xs italic pl-2 text-secondary"><%= t(".translations_notice") %></p>
       <% end %>
@@ -162,7 +160,7 @@
                           <div class="flex items-center gap-2">
                             <span class="text-sm font-medium text-primary"><%= currency.iso_code %></span>
                             <% if base_currency %>
-                              <span class="inline-flex items-center rounded-full bg-surface px-2 py-0.5 text-[11px] font-medium text-secondary">
+                              <span class="inline-flex items-center rounded-full bg-surface px-2 py-0.5 text-xs font-medium text-secondary">
                                 <%= t(".base_currency_badge") %>
                               </span>
                             <% end %>
@@ -207,7 +205,7 @@
     toggle row is the entire surface. Posts directly to
     settings#preferences#update via the Settings::PreferencesController,
     matching the auto-submit pattern used on the Appearance page. %>
-<section class="bg-container shadow-border-xs rounded-xl p-4">
+<%= settings_section do %>
   <%= form_with url: settings_preferences_path, method: :patch,
         data: { controller: "auto-submit-form" } do |f| %>
     <%# Wrapping the row in <label for=…> makes the title + description
@@ -215,7 +213,7 @@
         affordance on the container is honest. %>
     <label for="user_preview_features_enabled" class="flex cursor-pointer items-center gap-4 justify-between">
       <div class="text-sm space-y-1">
-        <h4 class="text-primary"><%= t(".preview.title") %></h4>
+        <p class="text-primary font-medium"><%= t(".preview.title") %></p>
         <p class="text-secondary"><%= t(".preview.description") %></p>
       </div>
       <%= render DS::Toggle.new(
@@ -257,3 +255,4 @@
     </div>
   <% end %>
 </section>
+<% end %>
diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb
index 5c431449d..6a08fd33c 100644
--- a/app/views/settings/profiles/show.html.erb
+++ b/app/views/settings/profiles/show.html.erb
@@ -9,7 +9,9 @@
 
       <% if @user.unconfirmed_email.present? %>
         <p class="mt-2 text-sm text-secondary">
-          You have requested to change your email to <%= @user.unconfirmed_email %>. Please go to your email and confirm for the change to take effect. If you haven't received the email, please check your spam folder, or <%= link_to "request a new confirmation email", resend_confirmation_email_user_path(@user), class: "hover:underline text-secondary" %>.
+          <%= t(".unconfirmed_email_notice_html",
+                email: @user.unconfirmed_email,
+                resend_link: link_to(t(".resend_confirmation_link"), resend_confirmation_email_user_path(@user), class: "hover:underline text-secondary")) %>
         </p>
       <% end %>
 
@@ -49,9 +51,7 @@
               <%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials %>
             </div>
             <p class="text-primary font-medium text-sm"><%= user.display_name %></p>
-            <div class="rounded-md bg-surface px-1.5 py-0.5">
-              <p class="uppercase text-secondary font-medium text-xs"><%= t("users.roles.#{user.role}", default: user.role.humanize) %></p>
-            </div>
+            <%= render DS::Pill.new(label: t("users.roles.#{user.role}", default: user.role.humanize), tone: :gray, marker: false, size: :sm) %>
             <% if Current.user.admin? && user != Current.user %>
               <div class="ml-auto">
                 <%= render DS::Button.new(
@@ -67,16 +67,14 @@
         <% end %>
         <% if @pending_invitations.any? %>
           <% @pending_invitations.each do |invitation| %>
-            <div class="flex gap-2 items-center justify-between bg-container p-4 border border-alpha-black-25 rounded-lg">
+            <div class="flex gap-2 items-center justify-between bg-container p-4 shadow-border-xs rounded-lg">
               <div class="flex gap-2 items-center">
                 <div class="w-9 h-9 shrink-0">
                   <div class="text-inverse w-full h-full bg-surface-inset rounded-full flex items-center justify-center text-lg uppercase"><%= invitation.email[0] %></div>
                 </div>
-                <div class="flex">
+                <div class="flex items-center gap-2">
                   <p class="text-primary font-medium text-sm"><%= invitation.email %></p>
-                  <div class="rounded-md bg-surface px-1.5 py-0.5">
-                    <p class="uppercase text-secondary font-medium text-xs"><%= t(".pending") %></p>
-                  </div>
+                  <%= render DS::Pill.new(label: t(".pending"), tone: :gray, marker: false, size: :sm) %>
                 </div>
               </div>
               <div class="flex items-center gap-4">
diff --git a/app/views/settings/providers/_ibkr_panel.html.erb b/app/views/settings/providers/_ibkr_panel.html.erb
index 7e9e686d9..3fe9424bc 100644
--- a/app/views/settings/providers/_ibkr_panel.html.erb
+++ b/app/views/settings/providers/_ibkr_panel.html.erb
@@ -145,7 +145,7 @@
         <%= t(".status_configured_suffix") %>
       </p>
     <% else %>
-      <div class="w-2 h-2 bg-gray-400 rounded-full"></div>
+      <div class="w-2 h-2 bg-surface-inset rounded-full"></div>
       <p class="text-sm text-secondary"><%= t(".not_configured") %></p>
     <% end %>
   </div>
diff --git a/app/views/settings/providers/_mercury_panel.html.erb b/app/views/settings/providers/_mercury_panel.html.erb
index c653ed66a..3d90fa76d 100644
--- a/app/views/settings/providers/_mercury_panel.html.erb
+++ b/app/views/settings/providers/_mercury_panel.html.erb
@@ -23,8 +23,8 @@
           <% disclosure.with_summary_content do %>
             <div class="flex items-center justify-between gap-2 w-full">
               <div class="flex items-center gap-3">
-                <div class="flex items-center justify-center h-8 w-8 bg-blue-600/10 rounded-full">
-                  <p class="text-blue-600 text-xs font-medium"><%= item.name.to_s.first.to_s.upcase %></p>
+                <div class="flex items-center justify-center h-8 w-8 bg-surface rounded-full">
+                  <p class="text-primary text-xs font-medium"><%= item.name.to_s.first.to_s.upcase %></p>
                 </div>
                 <div>
                   <p class="font-medium text-primary"><%= item.name %></p>
diff --git a/app/views/settings/providers/_questrade_panel.html.erb b/app/views/settings/providers/_questrade_panel.html.erb
new file mode 100644
index 000000000..08f8d7f68
--- /dev/null
+++ b/app/views/settings/providers/_questrade_panel.html.erb
@@ -0,0 +1,82 @@
+<div class="space-y-4">
+  <% items = local_assigns[:questrade_items] || @questrade_items || Current.family.questrade_items.where.not(refresh_token: nil) %>
+  <% connected = items.present? && items.any? %>
+
+  <% unless connected %>
+    <%= render "settings/providers/setup_steps",
+               eyebrow: t("questrade_items.panel.eyebrow", default: "Setup · desktop only"),
+               steps: [
+                 t("questrade_items.panel.steps.s1_html", default: %q{Sign in to the <a href="https://my.questrade.com" target="_blank" rel="noopener noreferrer" class="text-primary font-medium underline">Questrade portal</a> on a desktop browser. The API settings are not available in the mobile app.}).html_safe,
+                 t("questrade_items.panel.steps.s2", default: "Open Settings, and under General settings edit the IQ API settings."),
+                 t("questrade_items.panel.steps.s3_html", default: %q{In the API access modal, click <strong>Manage</strong> under <strong>My applications</strong>.}).html_safe,
+                 t("questrade_items.panel.steps.s4", default: "Register a personal app with a name and description, then save."),
+                 t("questrade_items.panel.steps.s5", default: "Add a new device and generate a token."),
+                 t("questrade_items.panel.steps.s6", default: "Paste the generated token below and save.")
+               ],
+               help: { url: "https://www.questrade.com/api/documentation/getting-started", text: t("questrade_items.panel.help_text", default: "Questrade API docs") } %>
+  <% end %>
+
+  <% error_msg = local_assigns[:error_message] || @error_message %>
+  <% if error_msg.present? %>
+    <%= render DS::Alert.new(message: error_msg, variant: :error) %>
+  <% end %>
+
+  <% if connected %>
+    <div class="flex items-center gap-2">
+      <div class="w-2 h-2 bg-success rounded-full shrink-0"></div>
+      <p class="text-sm text-secondary"><%= t("questrade_items.panel.status_configured_html", accounts_path: accounts_path).html_safe %></p>
+    </div>
+
+    <div class="mt-4 space-y-3">
+      <p class="text-xs text-secondary"><%= t("questrade_items.panel.token_refresh_hint") %></p>
+
+      <%= styled_form_with model: items.first,
+                           url: questrade_item_path(items.first),
+                           scope: :questrade_item,
+                           method: :patch,
+                           data: { turbo: true },
+                           class: "space-y-3" do |form| %>
+        <%= form.text_field :refresh_token,
+                            label: t("questrade_items.panel.fields.refresh_token.label"),
+                            placeholder: t("questrade_items.panel.fields.refresh_token.placeholder_update"),
+                            type: :password,
+                            value: nil %>
+
+        <div class="flex justify-end">
+          <%= render DS::Button.new(text: t("questrade_items.panel.update_button"), type: "submit") %>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="flex items-center gap-2 mt-4">
+      <%= render DS::Button.new(
+        text: t("questrade_items.panel.disconnect", default: "Disconnect"),
+        icon: "trash-2",
+        variant: :outline_destructive,
+        size: :sm,
+        href: questrade_item_path(items.first),
+        method: :delete,
+        data: { turbo_frame: "_top", turbo_confirm: t("questrade_items.panel.disconnect_confirm", default: "Disconnect Questrade? This removes the connection and unlinks its synced accounts.") }
+      ) %>
+    </div>
+  <% else %>
+    <%
+      questrade_item = Current.family.questrade_items.first_or_initialize(name: "Questrade Connection")
+    %>
+    <%= styled_form_with model: questrade_item,
+                         url: questrade_items_path,
+                         scope: :questrade_item,
+                         method: :post,
+                         data: { turbo: true },
+                         class: "space-y-3" do |form| %>
+      <%= form.text_field :refresh_token,
+                          label: t("questrade_items.panel.fields.refresh_token.label"),
+                          placeholder: t("questrade_items.panel.fields.refresh_token.placeholder_new"),
+                          type: :password %>
+
+      <div class="flex justify-end">
+        <%= render DS::Button.new(text: t("questrade_items.panel.save_button"), type: "submit") %>
+      </div>
+    <% end %>
+  <% end %>
+</div>
diff --git a/app/views/settings/providers/_redbark_panel.html.erb b/app/views/settings/providers/_redbark_panel.html.erb
new file mode 100644
index 000000000..a80a2f169
--- /dev/null
+++ b/app/views/settings/providers/_redbark_panel.html.erb
@@ -0,0 +1,60 @@
+<div id="redbark-providers-panel" class="space-y-4">
+  <div class="prose prose-sm text-secondary">
+    <p class="text-primary font-medium"><%= t("redbark_items.panel.setup_instructions") %></p>
+    <ol>
+      <li><%= t("redbark_items.panel.step_1") %></li>
+      <li><%= t("redbark_items.panel.step_2") %></li>
+      <li><%= t("redbark_items.panel.step_3") %></li>
+    </ol>
+
+    <p class="text-primary font-medium"><%= t("redbark_items.panel.field_descriptions") %></p>
+    <ul>
+      <li><strong><%= t("redbark_items.panel.fields.api_key.label") %>:</strong> <%= t("redbark_items.panel.fields.api_key.description") %> <%= t("redbark_items.panel.required") %></li>
+    </ul>
+  </div>
+
+  <% error_msg = local_assigns[:error_message] || @error_message %>
+  <% if error_msg.present? %>
+    <div class="p-2 rounded-md bg-destructive/10 text-destructive text-sm overflow-hidden">
+      <p class="line-clamp-3" title="<%= error_msg %>"><%= error_msg %></p>
+    </div>
+  <% end %>
+
+  <%
+    # Get or initialize a redbark_item for this family
+    # - If family has an item WITH credentials, use it (for updates)
+    # - If family has an item WITHOUT credentials, use it (to add credentials)
+    # - If family has no items at all, create a new one
+    redbark_item = Current.family.redbark_items.first_or_initialize(name: t("redbark_items.default_name"))
+    is_new_record = redbark_item.new_record?
+  %>
+
+  <%= styled_form_with model: redbark_item,
+                       url: is_new_record ? redbark_items_path : redbark_item_path(redbark_item),
+                       scope: :redbark_item,
+                       method: is_new_record ? :post : :patch,
+                       data: { turbo: true },
+                       class: "space-y-3" do |form| %>
+    <%= form.text_field :api_key,
+                        label: t("redbark_items.panel.fields.api_key.label"),
+                        placeholder: is_new_record ? t("redbark_items.panel.fields.api_key.placeholder_new") : t("redbark_items.panel.fields.api_key.placeholder_update"),
+                        type: :password,
+                        value: nil %>
+
+    <div class="flex justify-end">
+      <%= form.submit is_new_record ? t("redbark_items.panel.save_button") : t("redbark_items.panel.update_button"),
+                      class: "inline-flex items-center justify-center rounded-lg px-4 py-2 text-sm font-medium btn btn--primary" %>
+    </div>
+  <% end %>
+
+  <% items = local_assigns[:redbark_items] || @redbark_items || Current.family.redbark_items.where.not(api_key: [nil, ""]) %>
+  <div class="flex items-center gap-2">
+    <% if items&.any? %>
+      <div class="w-2 h-2 bg-success rounded-full"></div>
+      <p class="text-sm text-secondary"><%= t("redbark_items.panel.status_configured_html", accounts_path: accounts_path).html_safe %></p>
+    <% else %>
+      <div class="w-2 h-2 bg-surface-inset rounded-full"></div>
+      <p class="text-sm text-secondary"><%= t("redbark_items.panel.status_not_configured") %></p>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/settings/providers/_search_filters.html.erb b/app/views/settings/providers/_search_filters.html.erb
index 30c36b172..54d28f33f 100644
--- a/app/views/settings/providers/_search_filters.html.erb
+++ b/app/views/settings/providers/_search_filters.html.erb
@@ -8,17 +8,15 @@
       action: "input->providers-filter#filter"
     }
   ) %>
-  <div class="inline-flex items-center gap-1 p-1 bg-surface-inset rounded-xl">
+  <%= render DS::SegmentedControl.new(aria_label: t("settings.providers.search_filters.aria_label")) do |sc| %>
     <% %w[all bank crypto investment].each do |kind| %>
-      <% active = kind == "all" %>
-      <button type="button"
-              data-providers-filter-target="chip"
-              data-action="click->providers-filter#selectChip"
-              data-kind="<%= kind %>"
-              aria-pressed="<%= active %>"
-              class="px-2.5 py-1 text-xs font-medium rounded-lg transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-alpha-black-100 <%= active ? "bg-container shadow-border-xs text-primary" : "text-secondary" %>">
-        <%= t("settings.providers.search_filters.chips.#{kind}") %>
-      </button>
+      <% sc.with_segment(t("settings.providers.search_filters.chips.#{kind}"),
+           active: kind == "all",
+           data: {
+             "providers-filter-target": "chip",
+             kind: kind,
+             action: "click->providers-filter#selectChip"
+           }) %>
     <% end %>
-  </div>
+  <% end %>
 </div>
diff --git a/app/views/settings/providers/_snaptrade_panel.html.erb b/app/views/settings/providers/_snaptrade_panel.html.erb
index 1c814b234..ff45d08d4 100644
--- a/app/views/settings/providers/_snaptrade_panel.html.erb
+++ b/app/views/settings/providers/_snaptrade_panel.html.erb
@@ -1,98 +1,93 @@
 <div class="space-y-4">
   <%= render DS::Alert.new(message: t("providers.snaptrade.free_tier_warning"), variant: :warning) %>
 
-  <%= render "settings/providers/setup_steps",
-             steps: [
-               t("providers.snaptrade.step_1_html").html_safe,
-               t("providers.snaptrade.step_2"),
-               t("providers.snaptrade.step_3"),
-               t("providers.snaptrade.step_4")
-             ] %>
-
   <% error_msg = local_assigns[:error_message] || @error_message %>
   <% if error_msg.present? %>
     <%= render DS::Alert.new(message: error_msg, variant: :error) %>
   <% end %>
 
   <%
-    snaptrade_item = Current.family.snaptrade_items.first_or_initialize(name: "SnapTrade Connection")
-    is_new_record = snaptrade_item.new_record?
-    is_configured = snaptrade_item.persisted? && snaptrade_item.credentials_configured?
-    is_registered = snaptrade_item.persisted? && snaptrade_item.user_registered?
+    items = local_assigns[:snaptrade_items] || @snaptrade_items || Current.family.snaptrade_items.active.ordered
+    snaptrade_item = items.reject(&:scheduled_for_deletion?).first
+    oauth_env_configured = Provider::Snaptrade.oauth_configured?
+    oauth_active = snaptrade_item&.oauth_token_active?
   %>
 
-  <%= styled_form_with model: snaptrade_item,
-                       url: is_new_record ? snaptrade_items_path : snaptrade_item_path(snaptrade_item),
-                       scope: :snaptrade_item,
-                       method: is_new_record ? :post : :patch,
-                       data: { turbo: true },
-                       class: "space-y-3" do |form| %>
-    <%= form.text_field :client_id,
-                        label: t("providers.snaptrade.client_id_label"),
-                        placeholder: is_new_record ? t("providers.snaptrade.client_id_placeholder") : t("providers.snaptrade.client_id_update_placeholder"),
-                        type: :password %>
+  <% if !oauth_env_configured %>
+    <%= render "settings/providers/setup_steps",
+               steps: [
+                 t("providers.snaptrade.oauth_setup_step_1_html").html_safe,
+                 t("providers.snaptrade.oauth_setup_step_2_html", callback_url: oauth_callback_snaptrade_items_url).html_safe,
+                 t("providers.snaptrade.oauth_setup_step_3")
+               ] %>
+  <% else %>
+    <div class="bg-surface-inset rounded-xl p-4 space-y-3">
+      <div class="flex items-start gap-3">
+        <span class="w-9 h-9 rounded-lg bg-success/10 flex items-center justify-center shrink-0">
+          <%= icon "key-round", class: "w-4 h-4 text-success" %>
+        </span>
+        <div class="min-w-0">
+          <p class="text-sm font-medium text-primary"><%= t("providers.snaptrade.oauth_title") %></p>
+          <p class="text-sm text-secondary">
+            <% if oauth_active %>
+              <%= t("providers.snaptrade.oauth_status_authorized") %>
+            <% else %>
+              <%= t("providers.snaptrade.oauth_status_ready") %>
+            <% end %>
+          </p>
+        </div>
+      </div>
 
-    <%= form.text_field :consumer_key,
-                        label: t("providers.snaptrade.consumer_key_label"),
-                        placeholder: is_new_record ? t("providers.snaptrade.consumer_key_placeholder") : t("providers.snaptrade.consumer_key_update_placeholder"),
-                        type: :password %>
-
-    <div class="flex justify-end">
-      <%= form.submit is_new_record ? t("providers.snaptrade.save_button") : t("providers.snaptrade.update_button") %>
+      <%= render DS::Link.new(
+        text: oauth_active ? t("providers.snaptrade.oauth_reauthorize_button") : t("providers.snaptrade.oauth_connect_button"),
+        icon: "external-link",
+        variant: :primary,
+        full_width: true,
+        href: snaptrade_item&.persisted? ?
+          oauth_authorize_snaptrade_items_path(item_id: snaptrade_item.id) :
+          oauth_authorize_snaptrade_items_path
+      ) %>
     </div>
-  <% end %>
 
-  <% items = local_assigns[:snaptrade_items] || @snaptrade_items || Current.family.snaptrade_items.where.not(client_id: [nil, ""]) %>
+    <% if snaptrade_item&.persisted? && snaptrade_item.oauth_configured? %>
+      <div class="border-t border-primary pt-4 mt-4">
+        <%= render DS::Disclosure.new(
+          variant: :inline,
+          data: {
+            controller: "lazy-load",
+            action: "toggle->lazy-load#toggled",
+            lazy_load_url_value: connections_snaptrade_item_path(snaptrade_item),
+            lazy_load_auto_open_param_value: "manage"
+          }
+        ) do |disclosure| %>
+          <% disclosure.with_summary_content do %>
+            <div class="flex items-center justify-between">
+              <div class="flex items-center gap-2">
+                <p class="text-sm text-secondary">
+                  <%= t("providers.snaptrade.status_connected", count: snaptrade_item.snaptrade_accounts.count) %>
+                  <% if snaptrade_item.unlinked_accounts_count > 0 %>
+                    <span class="text-warning">(<%= t("providers.snaptrade.needs_setup", count: snaptrade_item.unlinked_accounts_count) %>)</span>
+                  <% end %>
+                </p>
+              </div>
+              <span class="flex items-center gap-1 text-sm text-secondary hover:text-primary">
+                <%= t("providers.snaptrade.manage_connections") %>
+                <%= icon "chevron-right", class: "w-3 h-3 group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
+              </span>
+            </div>
+          <% end %>
 
-  <% if items&.any? %>
-    <% item = items.first %>
-    <% unless item.user_registered? %>
-      <div class="flex items-center gap-2 border-t border-primary pt-4 mt-4">
-        <span class="w-2 h-2 bg-warning rounded-full"></span>
-        <p class="text-sm text-secondary"><%= t("providers.snaptrade.status_needs_registration") %></p>
+          <div class="mt-3 space-y-3" data-lazy-load-target="content">
+            <div data-lazy-load-target="loading" class="flex items-center gap-2 text-sm text-secondary py-2">
+              <%= icon "loader-2", class: "w-4 h-4 animate-spin" %>
+              <%= t("providers.snaptrade.loading_connections") %>
+            </div>
+
+            <div data-lazy-load-target="frame">
+            </div>
+          </div>
+        <% end %>
       </div>
     <% end %>
   <% end %>
-
-  <% if items&.any? && items.first.user_registered? %>
-    <% item = items.first %>
-    <div class="border-t border-primary pt-4 mt-4">
-      <%= render DS::Disclosure.new(
-        variant: :inline,
-        data: {
-          controller: "lazy-load",
-          action: "toggle->lazy-load#toggled",
-          lazy_load_url_value: connections_snaptrade_item_path(item),
-          lazy_load_auto_open_param_value: "manage"
-        }
-      ) do |disclosure| %>
-        <% disclosure.with_summary_content do %>
-          <div class="flex items-center justify-between">
-            <div class="flex items-center gap-2">
-              <p class="text-sm text-secondary">
-                <%= t("providers.snaptrade.status_connected", count: item.snaptrade_accounts.count) %>
-                <% if item.unlinked_accounts_count > 0 %>
-                  <span class="text-warning">(<%= t("providers.snaptrade.needs_setup", count: item.unlinked_accounts_count) %>)</span>
-                <% end %>
-              </p>
-            </div>
-            <span class="flex items-center gap-1 text-sm text-secondary hover:text-primary">
-              <%= t("providers.snaptrade.manage_connections") %>
-              <%= icon "chevron-right", class: "w-3 h-3 group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
-            </span>
-          </div>
-        <% end %>
-
-        <div class="mt-3 space-y-3" data-lazy-load-target="content">
-          <div data-lazy-load-target="loading" class="flex items-center gap-2 text-sm text-secondary py-2">
-            <%= icon "loader-2", class: "w-4 h-4 animate-spin" %>
-            <%= t("providers.snaptrade.loading_connections") %>
-          </div>
-
-          <div data-lazy-load-target="frame">
-          </div>
-        </div>
-      <% end %>
-    </div>
-  <% end %>
 </div>
diff --git a/app/views/settings/providers/_status_pill.html.erb b/app/views/settings/providers/_status_pill.html.erb
index efabfd989..e0fefc018 100644
--- a/app/views/settings/providers/_status_pill.html.erb
+++ b/app/views/settings/providers/_status_pill.html.erb
@@ -7,9 +7,12 @@
          else :neutral
          end
 %>
+<%# Provider connection state is genuine live status — keep the indicator dot
+    (badge mode is dot-less by default; this is a deliberate opt-in). %>
 <%= render DS::Pill.new(
   label: t("settings.providers.status.#{status}"),
   tone: tone,
   marker: false,
+  show_dot: true,
   size: :sm
 ) %>
diff --git a/app/views/settings/providers/_trading212_panel.html.erb b/app/views/settings/providers/_trading212_panel.html.erb
new file mode 100644
index 000000000..0d0a5eae5
--- /dev/null
+++ b/app/views/settings/providers/_trading212_panel.html.erb
@@ -0,0 +1,82 @@
+<div id="trading212-providers-panel" class="space-y-4">
+  <% error_msg = local_assigns[:error_message] || @error_message %>
+  <% if error_msg.present? %>
+    <%= render DS::Alert.new(message: error_msg, variant: :error) %>
+  <% end %>
+
+  <%= render "settings/providers/setup_steps",
+             steps: [
+               t(".steps.step_1"),
+               t(".steps.step_2"),
+               t(".steps.step_3")
+             ] %>
+
+  <%
+    trading212_item = Current.family.trading212_items.first_or_initialize
+    is_new_record = trading212_item.new_record?
+  %>
+
+  <% if trading212_item.persisted? %>
+    <div class="flex flex-wrap justify-end gap-2">
+      <%= button_to sync_trading212_item_path(trading212_item),
+                    method: :post,
+                    class: "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-secondary hover:text-primary border border-secondary rounded-lg hover:border-primary",
+                    disabled: trading212_item.syncing? do %>
+        <%= icon "refresh-cw", size: "sm" %>
+        <%= t(".sync") %>
+      <% end %>
+
+      <%= button_to trading212_item_path(trading212_item),
+                    method: :delete,
+                    class: "inline-flex items-center gap-1 px-3 py-1.5 text-sm font-medium text-destructive hover:bg-destructive/10 rounded-lg",
+                    data: { turbo_confirm: t(".disconnect_confirm") } do %>
+        <%= icon "trash-2", size: "sm" %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <%= styled_form_with model: trading212_item,
+                       url: is_new_record ? trading212_items_path : trading212_item_path(trading212_item),
+                       scope: :trading212_item,
+                       method: is_new_record ? :post : :patch,
+                       data: { turbo: true },
+                       class: "space-y-3" do |form| %>
+    <%= form.text_field :api_key,
+                        label: t(".api_key_label"),
+                        placeholder: is_new_record ? t(".api_key_placeholder_new") : t(".api_key_placeholder_existing"),
+                        type: :password,
+                        value: nil %>
+
+    <%= form.text_field :api_secret,
+                        label: t(".api_secret_label"),
+                        placeholder: is_new_record ? t(".api_secret_placeholder_new") : t(".api_secret_placeholder_existing"),
+                        type: :password,
+                        value: nil %>
+
+    <%= form.select :environment,
+                    [ [ t(".environment_live"), "live" ], [ t(".environment_demo"), "demo" ] ],
+                    { label: t(".environment_label"), selected: trading212_item.environment || "live" } %>
+
+    <%= form.select :currency,
+                    Money::Currency.as_options.map { |c| [ "#{c.name} (#{c.iso_code})", c.iso_code ] },
+                    { label: t(".currency_label"), selected: trading212_item.currency.presence || Current.family.currency } %>
+
+    <div class="flex flex-wrap justify-end gap-2">
+      <%= form.submit(is_new_record ? t(".save_configuration") : t(".update_configuration")) %>
+    </div>
+  <% end %>
+
+  <div class="flex items-center gap-2">
+    <% if trading212_item.persisted? && trading212_item.credentials_configured? %>
+      <div class="w-2 h-2 bg-success rounded-full"></div>
+      <p class="text-sm text-secondary">
+        <%= t(".status_configured_prefix", summary: trading212_item.sync_status_summary) %>
+        <%= link_to t(".accounts_tab"), accounts_path, class: "link" %>
+        <%= t(".status_configured_suffix") %>
+      </p>
+    <% else %>
+      <div class="w-2 h-2 bg-surface-inset rounded-full"></div>
+      <p class="text-sm text-secondary"><%= t(".not_configured") %></p>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/settings/providers/_up_panel.html.erb b/app/views/settings/providers/_up_panel.html.erb
new file mode 100644
index 000000000..e11604811
--- /dev/null
+++ b/app/views/settings/providers/_up_panel.html.erb
@@ -0,0 +1,123 @@
+<div id="up-providers-panel" class="space-y-4">
+  <% active_items = local_assigns[:up_items] || @up_items || Current.family.up_items.active.ordered %>
+
+  <%= render "settings/providers/setup_steps",
+             steps: [
+               t("settings.providers.up_panel.step_1_html", link: link_to(t("providers.up.name"), "https://api.up.com.au", target: "_blank", rel: "noopener noreferrer", class: "text-primary font-medium underline")),
+               t("settings.providers.up_panel.step_2"),
+               t("settings.providers.up_panel.step_3")
+             ] %>
+
+  <% error_msg = local_assigns[:error_message] || @error_message %>
+  <% if error_msg.present? %>
+    <%= render DS::Alert.new(message: error_msg, variant: :error) %>
+  <% end %>
+
+  <% if active_items.any? %>
+    <div class="space-y-3">
+      <% active_items.each do |item| %>
+        <%= render DS::Disclosure.new(variant: :card) do |disclosure| %>
+          <% disclosure.with_summary_content do %>
+            <div class="flex items-center justify-between gap-2 w-full">
+              <div class="flex items-center gap-3">
+                <div class="flex items-center justify-center h-8 w-8 bg-surface rounded-full">
+                  <p class="text-primary text-xs font-medium"><%= item.name.to_s.first.to_s.upcase %></p>
+                </div>
+                <div>
+                  <p class="font-medium text-primary"><%= item.name %></p>
+                  <p class="text-xs text-secondary"><%= item.sync_status_summary %></p>
+                </div>
+              </div>
+            </div>
+          <% end %>
+
+          <div class="mt-4 space-y-4">
+            <div class="flex items-center gap-2">
+              <%= render DS::Button.new(
+                text: t("up_items.provider_panel.sync"),
+                icon: "refresh-cw",
+                variant: :outline,
+                size: :sm,
+                href: sync_up_item_path(item),
+                method: :post,
+                disabled: item.syncing?
+              ) %>
+              <%= render DS::Button.new(
+                text: t("up_items.provider_panel.disconnect"),
+                icon: "trash-2",
+                variant: :outline_destructive,
+                size: :sm,
+                href: up_item_path(item),
+                method: :delete,
+                data: { turbo_confirm: t("up_items.provider_panel.disconnect_confirm", name: item.name) }
+              ) %>
+            </div>
+
+            <%= styled_form_with model: item,
+                                 url: up_item_path(item),
+                                 scope: :up_item,
+                                 method: :patch,
+                                 data: { turbo: true },
+                                 class: "space-y-3" do |form| %>
+              <%= form.text_field :name,
+                                  label: t("up_items.provider_panel.connection_name_label"),
+                                  placeholder: t("up_items.provider_panel.connection_name_placeholder") %>
+
+              <%= form.text_field :access_token,
+                                  label: t("up_items.provider_panel.access_token_label"),
+                                  placeholder: t("up_items.provider_panel.keep_access_token_placeholder"),
+                                  type: :password,
+                                  value: nil %>
+
+              <div class="flex flex-wrap justify-end gap-2">
+                <%= render DS::Link.new(
+                  text: t("up_items.provider_panel.setup_accounts"),
+                  icon: "settings",
+                  variant: "secondary",
+                  href: setup_accounts_up_item_path(item),
+                  frame: :modal
+                ) %>
+                <%= render DS::Button.new(
+                  text: t("up_items.provider_panel.update_connection"),
+                  type: "submit"
+                ) %>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% up_item = Current.family.up_items.build(name: t("up_items.provider_panel.default_connection_name")) %>
+  <% if active_items.any? %>
+    <h3 class="flex items-center gap-2 text-sm font-medium text-primary mt-4">
+      <%= icon "plus", size: "sm" %>
+      <%= t("up_items.provider_panel.add_connection") %>
+    </h3>
+  <% end %>
+
+  <%= styled_form_with model: up_item,
+                       url: up_items_path,
+                       scope: :up_item,
+                       method: :post,
+                       data: { turbo: true },
+                       class: "space-y-3" do |form| %>
+    <%= form.text_field :name,
+                        label: t("up_items.provider_panel.connection_name_label"),
+                        placeholder: t("up_items.provider_panel.connection_name_placeholder") %>
+
+    <%= form.text_field :access_token,
+                        label: t("up_items.provider_panel.access_token_label"),
+                        placeholder: t("up_items.provider_panel.access_token_placeholder"),
+                        type: :password,
+                        value: nil %>
+
+    <div class="flex justify-end">
+      <%= render DS::Button.new(
+        text: t("up_items.provider_panel.add_connection"),
+        type: "submit"
+      ) %>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/settings/providers/_wise_panel.html.erb b/app/views/settings/providers/_wise_panel.html.erb
new file mode 100644
index 000000000..a656675c0
--- /dev/null
+++ b/app/views/settings/providers/_wise_panel.html.erb
@@ -0,0 +1,143 @@
+<div id="wise-providers-panel" class="space-y-4">
+  <% active_items = local_assigns[:wise_items] || @wise_items || Current.family.wise_items.active.ordered %>
+
+  <div class="prose prose-sm text-secondary">
+    <p class="text-primary font-medium"><%= t("wise_items.provider_panel.setup_title") %></p>
+    <ol>
+      <li><%= t("wise_items.provider_panel.instructions.sign_in_html", link: link_to("Wise", "https://wise.com", target: "_blank", rel: "noopener noreferrer", class: "link")).html_safe %></li>
+      <li><%= t("wise_items.provider_panel.instructions.open_tokens") %></li>
+      <li><%= t("wise_items.provider_panel.instructions.create_token") %></li>
+      <li><%= t("wise_items.provider_panel.instructions.copy_token_html").html_safe %></li>
+    </ol>
+  </div>
+
+  <% unless WiseItem.encryption_ready? %>
+    <div class="p-3 rounded-md bg-warning/10 text-warning text-sm">
+      <div class="flex items-start gap-2">
+        <%= icon "shield-alert", size: "sm", class: "mt-0.5 shrink-0" %>
+        <div>
+          <p class="font-medium"><%= t("wise_items.provider_panel.encryption_warning.title") %></p>
+          <p class="mt-1"><%= t("wise_items.provider_panel.encryption_warning.message") %></p>
+        </div>
+      </div>
+    </div>
+  <% end %>
+
+  <% error_msg = local_assigns[:error_message] || @error_message %>
+  <% if error_msg.present? %>
+    <div class="p-2 rounded-md bg-destructive/10 text-destructive text-sm overflow-hidden">
+      <p class="line-clamp-3" title="<%= error_msg %>"><%= error_msg %></p>
+    </div>
+  <% end %>
+
+  <% if active_items.any? %>
+    <div class="space-y-3">
+      <% active_items.each do |item| %>
+        <%= render DS::Disclosure.new(variant: :card) do |disclosure| %>
+          <% disclosure.with_summary_content do %>
+            <div class="flex items-center justify-between gap-2 w-full">
+              <div class="flex items-center gap-3">
+                <div class="flex items-center justify-center h-8 w-8 bg-container-inset rounded-full">
+                  <p class="text-primary text-xs font-medium">WI</p>
+                </div>
+                <div>
+                  <p class="font-medium text-primary"><%= item.name %></p>
+                  <p class="text-xs text-secondary"><%= item.sync_status_summary %></p>
+                </div>
+              </div>
+            </div>
+          <% end %>
+
+          <div class="mt-4 space-y-4">
+            <div class="flex items-center gap-2">
+              <%= render DS::Button.new(
+                text: t("wise_items.provider_panel.sync"),
+                icon: "refresh-cw",
+                variant: :outline,
+                size: :sm,
+                href: sync_wise_item_path(item),
+                method: :post,
+                disabled: item.syncing?
+              ) %>
+              <%= render DS::Button.new(
+                text: t("wise_items.provider_panel.disconnect"),
+                icon: "trash-2",
+                variant: :outline_destructive,
+                size: :sm,
+                href: wise_item_path(item),
+                method: :delete,
+                aria: { label: t("wise_items.provider_panel.disconnect_label", name: item.name) },
+                confirm: t("wise_items.provider_panel.disconnect_confirm", name: item.name)
+              ) %>
+            </div>
+
+            <%= styled_form_with model: item,
+                                 url: wise_item_path(item),
+                                 scope: :wise_item,
+                                 method: :patch,
+                                 data: { turbo: true },
+                                 class: "space-y-3" do |form| %>
+              <%= form.text_field :name,
+                                  label: t("wise_items.provider_panel.connection_name_label"),
+                                  placeholder: t("wise_items.provider_panel.connection_name_placeholder") %>
+
+              <%= form.text_field :token,
+                                  label: t("wise_items.provider_panel.token_label"),
+                                  placeholder: t("wise_items.provider_panel.keep_token_placeholder"),
+                                  type: :password,
+                                  value: nil %>
+
+              <div class="flex flex-wrap justify-end gap-2">
+                <%= render DS::Link.new(
+                  text: t("wise_items.provider_panel.setup_accounts"),
+                  icon: "settings",
+                  variant: "secondary",
+                  href: setup_accounts_wise_item_path(item),
+                  frame: :modal
+                ) %>
+                <%= form.submit t("wise_items.provider_panel.update_connection") %>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <%= render DS::Disclosure.new(variant: :card, open: active_items.none?) do |disclosure| %>
+    <% disclosure.with_summary_content do %>
+      <div class="flex items-center gap-2 text-sm font-medium text-primary">
+        <%= icon "plus" %>
+        <%= t("wise_items.provider_panel.add_connection") %>
+      </div>
+    <% end %>
+
+    <%= styled_form_with url: wise_items_path,
+                         scope: :wise_item,
+                         method: :post,
+                         data: { turbo: true },
+                         class: "space-y-3 mt-4" do |form| %>
+      <%= form.text_field :token,
+                          label: t("wise_items.provider_panel.token_label"),
+                          placeholder: t("wise_items.provider_panel.token_placeholder"),
+                          type: :password,
+                          value: nil %>
+
+      <p class="text-xs text-secondary px-1 -mt-1"><%= t("wise_items.provider_panel.sandbox_note_html").html_safe %></p>
+
+      <div class="flex justify-end">
+        <%= form.submit t("wise_items.provider_panel.connect") %>
+      </div>
+    <% end %>
+  <% end %>
+
+  <div class="flex items-center gap-2">
+    <% if active_items.any? %>
+      <div class="w-2 h-2 bg-success rounded-full"></div>
+      <p class="text-sm text-secondary"><%= t("wise_items.provider_panel.configured_html", accounts_link: link_to(t("wise_items.provider_panel.accounts_link"), accounts_path, class: "link")).html_safe %></p>
+    <% else %>
+      <div class="w-2 h-2 bg-surface-inset rounded-full"></div>
+      <p class="text-sm text-secondary"><%= t("wise_items.provider_panel.not_configured") %></p>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/settings/securities/show.html.erb b/app/views/settings/securities/show.html.erb
index c0482ac98..4ec0d554a 100644
--- a/app/views/settings/securities/show.html.erb
+++ b/app/views/settings/securities/show.html.erb
@@ -1,5 +1,19 @@
 <%= content_for :page_title, t(".page_title") %>
 
+<% if @encryption_unconfigured %>
+  <div class="mb-4">
+    <%= render DS::Alert.new(variant: :warning, title: t(".encryption_warning.title")) do %>
+      <p><%= t(".encryption_warning.intro") %></p>
+      <ul class="list-disc pl-5">
+        <% t(".encryption_warning.keys").each do |key| %>
+          <li><%= key %></li>
+        <% end %>
+      </ul>
+      <p><%= t(".encryption_warning.generate") %></p>
+    <% end %>
+  </div>
+<% end %>
+
 <%= settings_section title: t(".mfa_title"), subtitle: t(".mfa_description") do %>
   <div class="space-y-4">
     <div class="p-3 shadow-border-xs bg-container rounded-lg md:flex md:justify-between md:items-center">
@@ -160,11 +174,8 @@
         <% end %>
       </div>
       <% if @oidc_identities.count == 1 && Current.user.password_digest.blank? %>
-        <div class="mt-4 p-3 bg-amber-50 border border-amber-200 rounded-lg">
-          <div class="flex items-start gap-2">
-            <%= icon "alert-triangle", class: "w-5 h-5 text-amber-600 shrink-0 mt-0.5" %>
-            <p class="text-sm text-amber-800"><%= t(".sso_warning_message") %></p>
-          </div>
+        <div class="mt-4">
+          <%= render DS::Alert.new(message: t(".sso_warning_message"), variant: :warning) %>
         </div>
       <% end %>
     <% else %>
diff --git a/app/views/shared/_money_field.html.erb b/app/views/shared/_money_field.html.erb
index 21c773da8..67e135c6c 100644
--- a/app/views/shared/_money_field.html.erb
+++ b/app/views/shared/_money_field.html.erb
@@ -22,7 +22,7 @@
       <div class="form-field__actions">
         <div data-controller="tooltip">
           <%= icon "help-circle", size: "sm", color: "default", class: "cursor-help" %>
-          <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-inverse text-sm p-2 rounded w-64">
+          <div role="tooltip" data-tooltip-target="tooltip" class="tooltip bg-inverse text-inverse text-sm p-2 rounded-md w-64">
             <%= options[:label_tooltip] %>
           </div>
         </div>
@@ -75,8 +75,7 @@
              }.compact)
              # Preserve any existing action and append money-field handler
              existing_action = currency_data.delete("action")
-             currency_data["action"] = ["change->money-field#handleCurrencyChange", existing_action].compact.join(" ")
-          %>
+             currency_data["action"] = ["change->money-field#handleCurrencyChange", existing_action].compact.join(" ") %>
           <%= form.select currency_method,
                         currency_picker_options_for_family(extra: currency.iso_code),
                         { inline: true, selected: currency.iso_code },
diff --git a/app/views/shared/_transaction_type_tabs.html.erb b/app/views/shared/_transaction_type_tabs.html.erb
index dbb1f6b55..43b60a0da 100644
--- a/app/views/shared/_transaction_type_tabs.html.erb
+++ b/app/views/shared/_transaction_type_tabs.html.erb
@@ -1,30 +1,24 @@
 <%# locals: (active_tab:, account_id: nil) %>
 
-<fieldset class="bg-surface-inset rounded-lg p-1 flex flex-wrap gap-2">
-  <%= link_to new_transaction_path(nature: "outflow", account_id: account_id),
-              data: { turbo_frame: :modal, action: "click->transaction-type-tabs#selectTab", nature: "outflow", "transaction-type-tabs-target": "tab" },
-              class: "flex-1 min-w-0 flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-sm #{active_tab == 'expense' ? 'bg-container text-primary shadow-sm' : 'hover:bg-container text-subdued hover:text-primary hover:shadow-sm'}" do %>
-    <%= icon "minus-circle" %>
-    <%= tag.span class: "truncate" do %>
-      <%= t("shared.transaction_tabs.expense") %>
-    <% end %>
-  <% end %>
+<%= render DS::SegmentedControl.new(full_width: true, aria_label: t("shared.transaction_tabs.aria", default: "Transaction type")) do |sc| %>
+  <% sc.with_segment(
+       safe_join([ icon("minus-circle"), tag.span(t("shared.transaction_tabs.expense"), class: "truncate") ]),
+       active: active_tab == "expense",
+       href: new_transaction_path(nature: "outflow", account_id: account_id),
+       class: "min-w-0 gap-2",
+       data: { turbo_frame: :modal, action: "click->transaction-type-tabs#selectTab", nature: "outflow", "transaction-type-tabs-target": "tab" }) %>
 
-  <%= link_to new_transaction_path(nature: "inflow", account_id: account_id),
-              data: { turbo_frame: :modal, action: "click->transaction-type-tabs#selectTab", nature: "inflow", "transaction-type-tabs-target": "tab" },
-              class: "flex-1 min-w-0 flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-sm #{active_tab == 'income' ? 'bg-container text-primary shadow-sm' : 'hover:bg-container text-subdued hover:text-primary hover:shadow-sm'}" do %>
-    <%= icon "plus-circle" %>
-    <%= tag.span class: "truncate" do %>
-      <%= t("shared.transaction_tabs.income") %>
-    <% end %>
-  <% end %>
+  <% sc.with_segment(
+       safe_join([ icon("plus-circle"), tag.span(t("shared.transaction_tabs.income"), class: "truncate") ]),
+       active: active_tab == "income",
+       href: new_transaction_path(nature: "inflow", account_id: account_id),
+       class: "min-w-0 gap-2",
+       data: { turbo_frame: :modal, action: "click->transaction-type-tabs#selectTab", nature: "inflow", "transaction-type-tabs-target": "tab" }) %>
 
-  <%= link_to new_transfer_path(from_account_id: account_id),
-              data: { turbo_frame: :modal },
-              class: "flex-1 min-w-0 flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-sm #{active_tab == 'transfer' ? 'bg-container text-primary shadow-sm' : 'hover:bg-container text-subdued hover:text-primary hover:shadow-sm'}" do %>
-    <%= icon "arrow-right-left" %>
-    <%= tag.span class: "truncate" do %>
-      <%= t("shared.transaction_tabs.transfer") %>
-    <% end %>
-  <% end %>
-</fieldset>
+  <% sc.with_segment(
+       safe_join([ icon("arrow-right-left"), tag.span(t("shared.transaction_tabs.transfer"), class: "truncate") ]),
+       active: active_tab == "transfer",
+       href: new_transfer_path(from_account_id: account_id),
+       class: "min-w-0 gap-2",
+       data: { turbo_frame: :modal }) %>
+<% end %>
diff --git a/app/views/shared/notifications/_notice.html.erb b/app/views/shared/notifications/_notice.html.erb
index a715f674e..6eabe16e7 100644
--- a/app/views/shared/notifications/_notice.html.erb
+++ b/app/views/shared/notifications/_notice.html.erb
@@ -31,6 +31,6 @@
   </div>
 
   <div class="absolute -top-2 -right-2">
-    <%= icon "x", class: "p-0.5 hidden group-hover:inline-block border border-alpha-black-50 border-solid rounded-lg bg-container text-subdued cursor-pointer", data: { action: "click->element-removal#remove" } %>
+    <%= icon "x", class: "p-0.5 hidden group-hover:inline-block rounded-lg bg-container shadow-xs text-subdued hover:text-primary cursor-pointer", data: { action: "click->element-removal#remove" } %>
   </div>
 <% end %>
diff --git a/app/views/shared/notifications/_sync_toast.html.erb b/app/views/shared/notifications/_sync_toast.html.erb
index 763a6557f..4bd4efbe7 100644
--- a/app/views/shared/notifications/_sync_toast.html.erb
+++ b/app/views/shared/notifications/_sync_toast.html.erb
@@ -1,23 +1,34 @@
 <div id="sync-toast"
+     role="status"
+     aria-live="polite"
      data-controller="sync-toast element-removal"
-     class="relative flex gap-3 rounded-lg bg-container p-4 group w-full md:max-w-80 shadow-border-xs">
+     class="relative flex gap-3 rounded-lg bg-container p-4 w-full md:max-w-80 shadow-border-xs">
   <div class="h-5 w-5 shrink-0 p-px text-primary">
     <div class="flex h-full items-center justify-center rounded-full bg-info">
-      <%= icon "refresh-cw", size: "xs", color: "inverse" %>
+      <%= icon "refresh-cw", size: "xs", color: "white" %>
     </div>
   </div>
 
-  <div class="space-y-1 flex-1">
+  <div class="space-y-2 flex-1 min-w-0">
     <p class="text-primary text-sm font-medium"><%= t("shared.sync_toast.message") %></p>
-    <button type="button" class="text-xs text-info underline hover:opacity-80 transition-opacity"
-            data-action="click->sync-toast#refresh">
-      <%= t("shared.sync_toast.refresh") %>
-    </button>
+    <%= render DS::Button.new(
+      text: t("shared.sync_toast.refresh"),
+      variant: "secondary",
+      size: "sm",
+      icon: "refresh-cw",
+      type: "button",
+      data: { action: "sync-toast#refresh" }
+    ) %>
   </div>
 
-  <div class="absolute -top-2 -right-2">
-    <button type="button" class="p-0.5 hidden group-hover:inline-block border border-alpha-black-50 border-solid rounded-lg bg-container text-subdued cursor-pointer" aria-label="<%= t('defaults.common.close') %>" data-action="click->element-removal#remove">
-      <%= icon "x" %>
-    </button>
+  <div class="absolute top-1 right-1">
+    <%= render DS::Button.new(
+      variant: "icon",
+      size: "sm",
+      icon: "x",
+      type: "button",
+      "aria-label": t("defaults.common.close"),
+      data: { action: "click->element-removal#remove" }
+    ) %>
   </div>
 </div>
diff --git a/app/views/simplefin_items/_replacement_prompt.html.erb b/app/views/simplefin_items/_replacement_prompt.html.erb
index 4337a8f69..095601f9e 100644
--- a/app/views/simplefin_items/_replacement_prompt.html.erb
+++ b/app/views/simplefin_items/_replacement_prompt.html.erb
@@ -20,7 +20,7 @@
     <% dismissal_key = "#{old_sfa.id}:#{new_sfa.id}" %>
     <% next if dismissed_ids.include?(dismissal_key) %>
 
-    <div class="bg-yellow-50 theme-dark:bg-yellow-900/20 border border-yellow-200 theme-dark:border-yellow-800 rounded-lg p-4">
+    <div class="bg-warning/10 border border-warning/20 rounded-lg p-4">
       <div class="flex items-start gap-3">
         <%= icon "credit-card", size: "sm", color: "warning", class: "shrink-0 mt-0.5" %>
         <div class="flex-1 space-y-2">
@@ -33,7 +33,7 @@
                          params: { dormant_sfa_id: old_sfa.id, active_sfa_id: new_sfa.id },
                          method: :post,
                          form: { class: "inline shrink-0" },
-                         class: "-mt-1 -mr-1 p-1 rounded hover:bg-yellow-100 theme-dark:hover:bg-yellow-900/40 text-secondary",
+                         class: "-mt-1 -mr-1 p-1 rounded hover:bg-warning/20 text-secondary",
                          aria: { label: t("simplefin_items.replacement_prompt.dismiss_aria") } do %>
               <%= icon "x", size: "sm" %>
             <% end %>
diff --git a/app/views/simplefin_items/_simplefin_item.html.erb b/app/views/simplefin_items/_simplefin_item.html.erb
index 8c632113f..93dc2dcfe 100644
--- a/app/views/simplefin_items/_simplefin_item.html.erb
+++ b/app/views/simplefin_items/_simplefin_item.html.erb
@@ -1,6 +1,7 @@
 <%# locals: (simplefin_item:) %>
 
 <%= tag.div id: dom_id(simplefin_item) do %>
+  <% accounts = simplefin_item.accounts %>
   <%# Compute unlinked count early so it's available for both menu and bottom section %>
   <% unlinked_count = if defined?(@simplefin_unlinked_count_map) && @simplefin_unlinked_count_map
        @simplefin_unlinked_count_map[simplefin_item.id] || 0
@@ -15,6 +16,7 @@
          0
        end
      end %>
+  <% setup_token_update_required = simplefin_item.setup_token_update_required? %>
 
   <%= render DS::Disclosure.new(variant: :card, open: true) do |disclosure| %>
     <% disclosure.with_summary_content do %>
@@ -39,7 +41,7 @@
                 <p class="text-destructive text-sm animate-pulse"><%= t(".deletion_in_progress") %></p>
               <% end %>
             </div>
-            <% if simplefin_item.accounts.any? %>
+            <% if accounts.any? %>
               <p class="text-xs text-secondary">
                 <%= simplefin_item.institution_summary %>
               </p>
@@ -85,7 +87,7 @@
                 <%= icon "loader", size: "sm", class: "animate-spin" %>
                 <%= tag.span t(".syncing") %>
               </div>
-            <% elsif simplefin_item.requires_update? %>
+            <% elsif setup_token_update_required %>
               <div class="text-warning flex items-center gap-1">
                 <%= icon "alert-triangle", size: "sm", color: "warning" %>
                 <%= tag.span t(".requires_update") %>
@@ -147,7 +149,7 @@
 
         <% if Current.user&.admin? %>
           <div class="flex items-center gap-2">
-            <% if simplefin_item.requires_update? %>
+            <% if setup_token_update_required %>
               <%= render DS::Link.new(
                 text: t(".update"),
                 icon: "refresh-cw",
@@ -199,8 +201,8 @@
                      suggestions: suggestions %>
         <% end %>
 
-        <% if simplefin_item.accounts.any? %>
-          <%= render "accounts/index/account_groups", accounts: simplefin_item.accounts %>
+        <% if accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: accounts %>
         <% end %>
 
         <%# Sync summary (collapsible) - using shared ProviderSyncSummary component
@@ -218,7 +220,7 @@
           institutions_count: simplefin_item.connected_institutions.size
         ) %>
 
-        <% if unlinked_count.to_i > 0 && simplefin_item.accounts.empty? %>
+        <% if unlinked_count.to_i > 0 && accounts.empty? %>
           <%# No accounts imported yet - show prominent setup prompt %>
           <div class="p-4 flex flex-col gap-3 items-center justify-center">
             <p class="text-primary font-medium text-sm"><%= t(".setup_needed") %></p>
@@ -231,7 +233,7 @@
               frame: :modal
             ) %>
           </div>
-        <% elsif simplefin_item.accounts.empty? %>
+        <% elsif accounts.empty? %>
           <div class="p-4 flex flex-col gap-3 items-center justify-center">
             <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title") %></p>
             <p class="text-secondary text-sm"><%= t(".no_accounts_description") %></p>
diff --git a/app/views/snaptrade_items/_connections_list.html.erb b/app/views/snaptrade_items/_connections_list.html.erb
index 3b329a7e6..b9118584c 100644
--- a/app/views/snaptrade_items/_connections_list.html.erb
+++ b/app/views/snaptrade_items/_connections_list.html.erb
@@ -1,10 +1,10 @@
-<%# locals: (connections:, orphaned_users: [], snaptrade_item:, error: nil) %>
+<%# locals: (connections:, snaptrade_item:, error: nil) %>
 
 <% if error.present? %>
   <div class="p-3 rounded-lg bg-destructive/10 text-destructive text-sm">
     <%= t("providers.snaptrade.connections_error", message: error) %>
   </div>
-<% elsif connections.empty? && orphaned_users.empty? %>
+<% elsif connections.empty? %>
   <p class="text-sm text-secondary py-2">
     <%= t("providers.snaptrade.no_connections") %>
   </p>
@@ -65,50 +65,14 @@
       </div>
     <% end %>
 
-    <%# Orphaned users (from previous registrations) %>
-    <% if orphaned_users.any? %>
-      <div class="border-t border-secondary pt-3 mt-3">
-        <p class="text-xs text-warning font-medium mb-2">
-          <%= icon "alert-triangle", size: "xs", class: "inline-block mr-1" %>
-          <%= t("providers.snaptrade.orphaned_users_title", count: orphaned_users.size) %>
-        </p>
-        <p class="text-xs text-secondary mb-3">
-          <%= t("providers.snaptrade.orphaned_users_description") %>
-        </p>
-
-        <% orphaned_users.each do |orphan| %>
-          <div id="orphaned_user_<%= orphan[:user_id].parameterize %>"
-               class="border rounded-lg p-3 border-warning/50 bg-warning/5 mb-2">
-            <div class="flex items-center justify-between gap-3">
-              <div class="min-w-0 flex-1">
-                <p class="text-sm font-medium text-warning">
-                  <%= t("providers.snaptrade.orphaned_user") %>
-                </p>
-                <p class="text-xs text-secondary font-mono truncate" title="<%= orphan[:user_id] %>">
-                  <%= orphan[:display_name] %>
-                </p>
-              </div>
-
-              <%= render DS::Menu.new do |menu| %>
-                <% menu.with_item(
-                  variant: "button",
-                  text: t("providers.snaptrade.delete_orphaned_user"),
-                  icon: "trash-2",
-                  href: delete_orphaned_user_snaptrade_item_path(snaptrade_item, user_id: orphan[:user_id]),
-                  method: :delete,
-                  confirm: CustomConfirm.new(
-                    title: t("providers.snaptrade.delete_orphaned_user_title"),
-                    body: t("providers.snaptrade.delete_orphaned_user_body"),
-                    btn_text: t("providers.snaptrade.delete_orphaned_user_confirm"),
-                    destructive: true,
-                    high_severity: true
-                  )
-                ) %>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
+    <div class="border-t border-secondary pt-3 mt-3">
+      <%= render DS::Link.new(
+        text: t("providers.snaptrade.manage_at_snaptrade"),
+        icon: "external-link",
+        variant: :ghost,
+        href: Provider::Snaptrade::DASHBOARD_URL,
+        target: "_blank"
+      ) %>
+    </div>
   </div>
 <% end %>
diff --git a/app/views/snaptrade_items/_snaptrade_item.html.erb b/app/views/snaptrade_items/_snaptrade_item.html.erb
index 4314200c8..233b30df5 100644
--- a/app/views/snaptrade_items/_snaptrade_item.html.erb
+++ b/app/views/snaptrade_items/_snaptrade_item.html.erb
@@ -2,6 +2,10 @@
 
 <%= tag.div id: dom_id(snaptrade_item) do %>
   <% unlinked_count = snaptrade_item.unlinked_accounts_count %>
+  <% snaptrade_registered = snaptrade_item.oauth_configured? %>
+  <% brokerage_connect_href = snaptrade_registered ? connect_snaptrade_item_path(snaptrade_item) : oauth_authorize_snaptrade_items_path(item_id: snaptrade_item.id) %>
+  <% brokerage_connect_frame = snaptrade_registered ? "_top" : :drawer %>
+  <% reconnect_href = oauth_authorize_snaptrade_items_path(item_id: snaptrade_item.id) %>
 
   <%= render DS::Disclosure.new(variant: :card, open: true) do |disclosure| %>
     <% disclosure.with_summary_content do %>
@@ -60,12 +64,13 @@
 
         <% if Current.user&.admin? %>
           <div class="flex items-center gap-2">
-            <% if snaptrade_item.requires_update? || !snaptrade_item.user_registered? %>
+            <% if snaptrade_item.requires_update? || !snaptrade_registered %>
               <%= render DS::Link.new(
                 text: t(".reconnect"),
                 icon: "link",
                 variant: "secondary",
-                href: connect_snaptrade_item_path(snaptrade_item)
+                href: reconnect_href,
+                frame: "_top"
               ) %>
             <% else %>
               <%= icon(
@@ -81,7 +86,8 @@
                 variant: "link",
                 text: t(".connect_brokerage"),
                 icon: "plus",
-                href: connect_snaptrade_item_path(snaptrade_item)
+                href: brokerage_connect_href,
+                frame: brokerage_connect_frame
               ) %>
               <% if unlinked_count > 0 %>
                 <% menu.with_item(
@@ -150,7 +156,8 @@
                 text: t(".connect_brokerage"),
                 icon: "link",
                 variant: "primary",
-                href: connect_snaptrade_item_path(snaptrade_item)
+                href: brokerage_connect_href,
+                frame: brokerage_connect_frame
               ) %>
             </div>
           <% end %>
diff --git a/app/views/snaptrade_items/setup_accounts.html.erb b/app/views/snaptrade_items/setup_accounts.html.erb
index 363626feb..aa886315c 100644
--- a/app/views/snaptrade_items/setup_accounts.html.erb
+++ b/app/views/snaptrade_items/setup_accounts.html.erb
@@ -26,7 +26,7 @@
             </ul>
             <p class="text-xs text-warning mt-2">
               <%= icon "alert-triangle", size: "xs", class: "inline-block mr-1" %>
-              <%= t("snaptrade_items.setup_accounts.free_tier_note", default: "SnapTrade free tier allows 5 brokerage connections. Check your SnapTrade dashboard for current usage.") %>
+              <%= t("snaptrade_items.setup_accounts.free_tier_note", default: "SnapTrade free tier allows 20 brokerage connections.") %>
             </p>
           </div>
         </div>
@@ -70,11 +70,27 @@
           </p>
         </div>
         <div class="flex gap-3 justify-center">
+          <%
+            brokerage_connect_href = if @snaptrade_item.oauth_configured?
+              connect_snaptrade_item_path(
+                @snaptrade_item,
+                return_to: "setup_accounts",
+                accountable_type: params[:accountable_type]
+              )
+            else
+              oauth_authorize_snaptrade_items_path(
+                item_id: @snaptrade_item.id,
+                accountable_type: params[:accountable_type],
+                return_to: params[:return_to]
+              )
+            end
+            brokerage_connect_frame = @snaptrade_item.oauth_configured? ? "_top" : "drawer"
+          %>
           <%= render DS::Link.new(
             text: t("snaptrade_items.setup_accounts.try_again", default: "Connect Brokerage"),
             variant: "primary",
-            href: connect_snaptrade_item_path(@snaptrade_item),
-            frame: "_top"
+            href: brokerage_connect_href,
+            frame: brokerage_connect_frame
           ) %>
           <%= render DS::Link.new(
             text: t("snaptrade_items.setup_accounts.back_to_settings", default: "Back to Settings"),
@@ -124,6 +140,13 @@
                     </label>
                   </div>
                   <div class="mt-3 pl-7" onclick="event.stopPropagation();">
+                    <%= render DS::Select.new(
+                      form: form,
+                      method: "account_types[#{snaptrade_account.id}]",
+                      items: @account_type_options.map { |label, value| { label: label, value: value } },
+                      selected: snaptrade_account.suggested_account_type,
+                      label: t("snaptrade_items.setup_accounts.account_type_label")
+                    ) %>
                     <label for="sync_start_<%= snaptrade_account.id %>" class="block text-xs text-secondary mb-1">
                       <%= t("snaptrade_items.setup_accounts.sync_start_date_label", default: "Import transactions from:") %>
                     </label>
diff --git a/app/views/splits/_category_select.html.erb b/app/views/splits/_category_select.html.erb
index 033a0915a..93cd022f9 100644
--- a/app/views/splits/_category_select.html.erb
+++ b/app/views/splits/_category_select.html.erb
@@ -26,7 +26,7 @@
         <% else %>
           <span class="size-1.5 rounded-full" style="background-color: <%= hex_color %>;"></span>
         <% end %>
-        <%= selected_category.name %>
+        <%= selected_category.display_name %>
       </span>
     <% else %>
       <%= t("splits.new.uncategorized") %>
@@ -68,7 +68,7 @@
              aria-selected="<%= is_selected %>"
              data-action="click->select#select"
              data-value="<%= category.id %>"
-             data-filter-name="<%= category.name %>">
+             data-filter-name="<%= category.display_name %>">
           <span class="check-icon <%= "hidden" unless is_selected %>">
             <%= icon("check") %>
           </span>
@@ -79,7 +79,7 @@
             <% else %>
               <span class="size-1.5 rounded-full" style="background-color: <%= hex_color %>;"></span>
             <% end %>
-            <%= category.name %>
+            <%= category.display_name %>
           </span>
         </div>
       <% end %>
diff --git a/app/views/splits/edit.html.erb b/app/views/splits/edit.html.erb
index da8c8f087..2d7e669a8 100644
--- a/app/views/splits/edit.html.erb
+++ b/app/views/splits/edit.html.erb
@@ -8,7 +8,7 @@
           <% if (category = @entry.entryable.try(:category)) %>
             <span class="text-secondary">&middot;</span>
             <span style="color: <%= category.color %>"><%= icon category.lucide_icon, size: "xs", color: "current" %></span>
-            <span><%= category.name %></span>
+            <span><%= category.display_name %></span>
           <% end %>
         </p>
       </div>
diff --git a/app/views/splits/new.html.erb b/app/views/splits/new.html.erb
index 7b93a71d3..164cc3357 100644
--- a/app/views/splits/new.html.erb
+++ b/app/views/splits/new.html.erb
@@ -8,7 +8,7 @@
           <% if (category = @entry.entryable.try(:category)) %>
             <span class="text-secondary">&middot;</span>
             <span style="color: <%= category.color %>"><%= icon category.lucide_icon, size: "xs", color: "current" %></span>
-            <span><%= category.name %></span>
+            <span><%= category.display_name %></span>
           <% end %>
         </p>
       </div>
diff --git a/app/views/trades/_form.html.erb b/app/views/trades/_form.html.erb
index 9bcf2d392..85c307e11 100644
--- a/app/views/trades/_form.html.erb
+++ b/app/views/trades/_form.html.erb
@@ -2,7 +2,7 @@
 
 <% type = params[:type] || "buy" %>
 
-<%= styled_form_with url: trades_path(account_id: account&.id), scope: :model, data: { controller: "trade-form" } do |form| %>
+<%= styled_form_with url: trades_path(account_id: account&.id), scope: :model, data: { controller: "trade-form", trade_type: type } do |form| %>
   <div class="space-y-4">
     <% if model.errors.any? %>
       <%= render "shared/form_errors", model: model %>
diff --git a/app/views/trading212_items/_trading212_item.html.erb b/app/views/trading212_items/_trading212_item.html.erb
new file mode 100644
index 000000000..70888978a
--- /dev/null
+++ b/app/views/trading212_items/_trading212_item.html.erb
@@ -0,0 +1,116 @@
+<%# locals: (trading212_item:) %>
+
+<%= tag.div id: dom_id(trading212_item) do %>
+  <% unlinked_count = trading212_item.unlinked_accounts_count %>
+
+  <%= render DS::Disclosure.new(variant: :card, open: true) do |disclosure| %>
+    <% disclosure.with_summary_content do %>
+      <div class="flex items-center justify-between gap-2">
+        <div class="flex items-center gap-2">
+          <%= icon "chevron-right", class: "group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
+
+          <div class="flex items-center justify-center h-8 w-8 rounded-full bg-teal-600/10">
+            <span class="text-teal-600 text-xs font-medium">T2</span>
+          </div>
+
+          <div class="pl-1 text-sm">
+            <div class="flex items-center gap-2">
+              <%= tag.p trading212_item.institution_display_name, class: "font-medium text-primary" %>
+              <% if trading212_item.scheduled_for_deletion? %>
+                <p class="text-destructive text-sm animate-pulse"><%= t(".deletion_in_progress") %></p>
+              <% end %>
+            </div>
+            <p class="text-xs text-secondary"><%= t(".environment_label_#{trading212_item.environment}") %></p>
+            <% if trading212_item.syncing? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= icon "loader", size: "sm", class: "animate-spin" %>
+                <%= tag.span t(".syncing") %>
+              </div>
+            <% elsif trading212_item.requires_update? %>
+              <div class="text-warning flex items-center gap-1">
+                <%= icon "alert-triangle", size: "sm", color: "warning" %>
+                <%= tag.span t(".requires_update") %>
+              </div>
+            <% elsif trading212_item.sync_error.present? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= render DS::Tooltip.new(text: trading212_item.sync_error, icon: "alert-circle", size: "sm", color: "destructive", as: :span) %>
+                <%= tag.span t(".error"), class: "text-destructive" %>
+              </div>
+            <% else %>
+              <p class="text-secondary">
+                <% if trading212_item.last_synced_at %>
+                  <%= t(".synced", time: time_ago_in_words(trading212_item.last_synced_at), summary: trading212_item.sync_status_summary) %>
+                <% else %>
+                  <%= t(".never_synced") %>
+                <% end %>
+              </p>
+            <% end %>
+          </div>
+        </div>
+
+        <% if Current.user&.admin? %>
+          <div class="flex items-center gap-2">
+            <%= icon(
+              "refresh-cw",
+              as_button: true,
+              href: sync_trading212_item_path(trading212_item),
+              disabled: trading212_item.syncing?
+            ) %>
+
+            <%= render DS::Menu.new do |menu| %>
+              <% if unlinked_count > 0 %>
+                <% menu.with_item(
+                  variant: "link",
+                  text: t(".setup_accounts"),
+                  icon: "settings",
+                  href: setup_accounts_trading212_item_path(trading212_item),
+                  frame: :modal
+                ) %>
+              <% end %>
+              <% menu.with_item(
+                variant: "button",
+                text: t(".delete"),
+                icon: "trash-2",
+                href: trading212_item_path(trading212_item),
+                method: :delete,
+                confirm: CustomConfirm.for_resource_deletion(trading212_item.institution_display_name, high_severity: true)
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% unless trading212_item.scheduled_for_deletion? %>
+      <div class="space-y-4 mt-4">
+        <% if trading212_item.accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: trading212_item.accounts %>
+        <% end %>
+
+        <% stats = trading212_item.syncs.ordered.first&.sync_stats || {} %>
+        <%= render ProviderSyncSummary.new(stats: stats, provider_item: trading212_item) %>
+
+        <% if Current.user&.admin? %>
+          <% if unlinked_count > 0 && trading212_item.accounts.empty? %>
+            <div class="p-4 flex flex-col gap-3 items-center justify-center">
+              <p class="text-primary font-medium text-sm"><%= t(".accounts_need_setup") %></p>
+              <p class="text-secondary text-sm"><%= t(".accounts_need_setup_description") %></p>
+              <%= render DS::Link.new(
+                text: t(".setup_accounts"),
+                icon: "settings",
+                variant: "primary",
+                href: setup_accounts_trading212_item_path(trading212_item),
+                frame: :modal
+              ) %>
+            </div>
+          <% elsif trading212_item.trading212_accounts.none? %>
+            <div class="p-4 flex flex-col gap-3 items-center justify-center">
+              <p class="text-primary font-medium text-sm"><%= t(".no_accounts_discovered") %></p>
+              <p class="text-secondary text-sm"><%= t(".no_accounts_discovered_description") %></p>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/trading212_items/select_existing_account.html.erb b/app/views/trading212_items/select_existing_account.html.erb
new file mode 100644
index 000000000..8180dbb1a
--- /dev/null
+++ b/app/views/trading212_items/select_existing_account.html.erb
@@ -0,0 +1,39 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+
+    <% dialog.with_body do %>
+      <% if @available_trading212_accounts.blank? %>
+        <div class="p-4 text-sm text-secondary">
+          <p class="mb-2"><%= t(".no_accounts_available") %></p>
+          <ul class="list-disc list-inside space-y-1">
+            <li><%= t(".run_sync_hint") %></li>
+            <li><%= t(".wait_for_sync") %></li>
+          </ul>
+        </div>
+      <% else %>
+        <%= form_with url: link_existing_account_trading212_items_path, method: :post, data: { turbo_frame: "_top" }, class: "space-y-4" do %>
+          <%= hidden_field_tag :account_id, @account.id %>
+          <div class="space-y-2 max-h-64 overflow-auto">
+            <% @available_trading212_accounts.each do |t212_account| %>
+              <label class="flex items-center gap-3 p-2 rounded border border-secondary hover:border-primary cursor-pointer">
+                <%= radio_button_tag :trading212_account_id, t212_account.id, false %>
+                <div class="flex flex-col">
+                  <span class="text-sm text-primary font-medium"><%= t212_account.name.presence || t212_account.trading212_account_id %></span>
+                  <span class="text-xs text-secondary">
+                    <%= t212_account.currency %> • <%= t(".balance") %>: <%= number_to_currency((t212_account.current_balance || 0), unit: Money::Currency.new(t212_account.currency.presence || Current.family.currency).symbol) %>
+                  </span>
+                </div>
+              </label>
+            <% end %>
+          </div>
+
+          <div class="flex items-center justify-end gap-2">
+            <%= render DS::Button.new(text: t(".link"), variant: :primary, icon: "link-2", type: :submit) %>
+            <%= render DS::Link.new(text: t(".cancel"), variant: :secondary, href: accounts_path, data: { turbo_frame: "_top" }) %>
+          </div>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/trading212_items/setup_accounts.html.erb b/app/views/trading212_items/setup_accounts.html.erb
new file mode 100644
index 000000000..2db6088e2
--- /dev/null
+++ b/app/views/trading212_items/setup_accounts.html.erb
@@ -0,0 +1,170 @@
+<% content_for :title, t(".page_title") %>
+
+<%= render DS::Dialog.new(disable_click_outside: true) do |dialog| %>
+  <% dialog.with_header(title: t(".dialog_title")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "chart-line", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <div class="space-y-6">
+      <div class="bg-surface border border-primary p-4 rounded-lg">
+        <div class="flex items-start gap-3">
+          <%= icon "info", size: "sm", class: "text-primary mt-0.5 flex-shrink-0" %>
+          <div>
+            <p class="text-sm text-primary mb-2"><strong><%= t(".info_box.title") %></strong></p>
+            <ul class="text-xs text-secondary space-y-1 list-disc list-inside">
+              <li><%= t(".info_box.items.item_1") %></li>
+              <li><%= t(".info_box.items.item_2") %></li>
+              <li><%= t(".info_box.items.item_3") %></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+
+      <% if @waiting_for_sync %>
+        <div class="flex flex-col items-center justify-center py-6 space-y-3">
+          <div class="animate-spin rounded-full h-6 w-6 border-b-2 border-primary"></div>
+          <p class="text-secondary text-center"><%= t(".status.fetching_accounts") %></p>
+        </div>
+        <div class="flex gap-3 justify-center">
+          <%= render DS::Link.new(
+            text: t(".buttons.refresh"),
+            variant: "secondary",
+            icon: "refresh-cw",
+            href: setup_accounts_trading212_item_path(@trading212_item),
+            frame: "_top"
+          ) %>
+          <%= render DS::Link.new(
+            text: t(".buttons.cancel"),
+            variant: "ghost",
+            href: accounts_path,
+            frame: "_top"
+          ) %>
+        </div>
+      <% elsif @no_accounts_found %>
+        <div class="flex flex-col items-center justify-center py-6 space-y-3">
+          <%= icon "alert-circle", size: "lg", class: "text-warning" %>
+          <p class="text-primary text-center font-medium"><%= t(".status.no_accounts_found_title") %></p>
+          <p class="text-secondary text-center text-sm"><%= t(".status.no_accounts_found_description") %></p>
+        </div>
+        <div class="flex gap-3 justify-center">
+          <%= render DS::Link.new(
+            text: t(".buttons.back_to_settings"),
+            variant: "secondary",
+            href: settings_providers_path,
+            frame: "_top"
+          ) %>
+        </div>
+      <% else %>
+        <%= form_with url: complete_account_setup_trading212_item_path(@trading212_item), method: :post, data: { turbo_frame: "_top" } do %>
+          <% if @unlinked_accounts.any? %>
+            <div class="space-y-4">
+              <h3 class="font-medium text-primary"><%= t(".available_accounts.title") %></h3>
+
+              <% @unlinked_accounts.each do |t212_account| %>
+                <div class="border border-primary rounded-lg p-4 hover:bg-surface transition-colors">
+                  <div class="flex items-center gap-3">
+                    <input type="checkbox"
+                           id="account_<%= t212_account.id %>"
+                           name="account_ids[]"
+                           value="<%= t212_account.id %>"
+                           checked
+                           class="cursor-pointer">
+                    <label for="account_<%= t212_account.id %>" class="flex-1 cursor-pointer">
+                      <h4 class="font-medium text-primary"><%= t212_account.name %></h4>
+                      <p class="text-sm text-secondary">
+                        <%= t(
+                          ".available_accounts.account_summary",
+                          account_type: t(".available_accounts.account_type_investment"),
+                          balance: number_to_currency(t212_account.current_balance || 0, unit: Money::Currency.new(t212_account.currency.presence || Current.family.currency).symbol)
+                        ) %>
+                      </p>
+                      <% if t212_account.trading212_account_id.present? %>
+                        <p class="text-xs text-secondary"><%= t(".available_accounts.account_id", account_id: t212_account.trading212_account_id) %></p>
+                      <% end %>
+                    </label>
+                  </div>
+                </div>
+              <% end %>
+            </div>
+
+            <div class="flex gap-3 mt-6">
+              <%= render DS::Button.new(
+                text: t(".buttons.create_selected_accounts"),
+                variant: "primary",
+                icon: "plus",
+                type: "submit",
+                class: "flex-1"
+              ) %>
+              <%= render DS::Link.new(
+                text: t(".buttons.cancel"),
+                variant: "secondary",
+                href: accounts_path,
+                frame: "_top"
+              ) %>
+            </div>
+          <% end %>
+        <% end %>
+
+        <% if @unlinked_accounts.any? && @linkable_accounts.any? %>
+          <div class="border-t border-secondary pt-4 mt-2">
+            <p class="text-xs text-secondary mb-3"><%= t(".link_existing.description") %></p>
+            <div class="space-y-2">
+              <% @unlinked_accounts.each do |t212_account| %>
+                <%= form_with url: link_existing_account_trading212_items_path, method: :post, data: { turbo_frame: "_top" } do |link_form| %>
+                  <%= link_form.hidden_field :trading212_account_id, value: t212_account.id %>
+                  <p class="text-xs text-primary mb-1"><%= t212_account.name %></p>
+                  <div class="flex items-center gap-2">
+                    <%= link_form.select :account_id,
+                          options_for_select(@linkable_accounts.map { |a| [ t(".link_existing.manual_account_option", name: a.name, balance: number_to_currency(a.balance, unit: Money::Currency.new(a.currency.presence || Current.family.currency).symbol)), a.id ] }),
+                          { prompt: t(".link_existing.select_prompt") },
+                          class: "bg-container border border-primary rounded px-2 py-1 text-sm text-primary flex-1 min-w-0" %>
+                    <%= render DS::Button.new(
+                      text: t(".buttons.link"),
+                      variant: "secondary",
+                      size: "sm",
+                      type: "submit"
+                    ) %>
+                  </div>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+
+        <% if @linked_accounts.any? %>
+          <div class="<%= 'border-t border-primary pt-6 mt-4' if @unlinked_accounts.any? %>">
+            <h3 class="font-medium text-primary mb-4"><%= t(".linked_accounts.title") %></h3>
+            <% @linked_accounts.each do |t212_account| %>
+              <div class="border border-success/20 bg-success/5 rounded-lg p-4 mb-2">
+                <div class="flex items-center justify-between">
+                  <div class="flex items-center gap-3">
+                    <%= icon "check-circle", class: "text-success" %>
+                    <div>
+                      <h4 class="font-medium text-primary"><%= t212_account.name %></h4>
+                      <p class="text-sm text-secondary"><%= t(".linked_accounts.linked_to_html", account: link_to(t212_account.current_account.name, account_path(t212_account.current_account), class: "link")) %></p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            <% end %>
+
+            <% if @unlinked_accounts.blank? %>
+              <div class="flex justify-end mt-4">
+                <%= render DS::Link.new(
+                  text: t(".buttons.done"),
+                  variant: "primary",
+                  href: accounts_path,
+                  frame: "_top"
+                ) %>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/transactions/_form.html.erb b/app/views/transactions/_form.html.erb
index 1064da60f..acf69714f 100644
--- a/app/views/transactions/_form.html.erb
+++ b/app/views/transactions/_form.html.erb
@@ -1,7 +1,6 @@
-<%# locals: (entry:, categories:) %>
+<%# locals: (entry:, account_currencies:, manual_accounts:, categories:, merchants:, tags:) %>
 
-<% account_currencies = Current.family.accounts.map { |a| [a.id, a.currency] }.to_h.to_json %>
-<%= styled_form_with model: entry, url: transactions_path, class: "space-y-4", data: { controller: "transaction-form", transaction_form_exchange_rate_url_value: exchange_rate_path, transaction_form_account_currencies_value: account_currencies } do |f| %>
+<%= styled_form_with model: entry, url: transactions_path, class: "space-y-4", data: { controller: "transaction-form", transaction_form_exchange_rate_url_value: exchange_rate_path, transaction_form_account_currencies_value: account_currencies.to_json } do |f| %>
   <% if entry.errors.any? %>
     <%= render "shared/form_errors", model: entry %>
   <% end %>
@@ -19,7 +18,7 @@
     <% if @entry.account_id %>
       <%= f.hidden_field :account_id, data: { transaction_form_target: "account" } %>
     <% else %>
-      <%= f.collection_select :account_id, accessible_accounts.manual.active.alphabetically, :id, :name, { prompt: t(".account_prompt"), label: t(".account"), selected: Current.user.default_account_for_transactions&.id, variant: :logo }, required: true, class: "form-field__input text-ellipsis", data: { transaction_form_target: "account", action: "change->transaction-form#checkCurrencyDifference" } %>
+      <%= f.collection_select :account_id, manual_accounts, :id, :name, { prompt: t(".account_prompt"), label: t(".account"), selected: Current.user.default_account_for_transactions&.id, variant: :logo }, required: true, class: "form-field__input text-ellipsis", data: { transaction_form_target: "account", action: "change->transaction-form#checkCurrencyDifference" } %>
     <% end %>
 
     <%= f.money_field :amount,
@@ -87,7 +86,7 @@
     <section class="space-y-2">
       <%= f.fields_for :entryable do |ef| %>
         <%= ef.collection_select :merchant_id,
-                  Current.family.available_merchants_for(Current.user).alphabetically,
+                  merchants,
                   :id, :name,
                   { include_blank: t(".none"),
                     label: t(".merchant_label"),
@@ -96,7 +95,7 @@
                     menu_placement: :auto } %>
         <%= render DS::TagSelect.new(
               form: ef,
-              tags: Current.family.tags.alphabetically,
+              tags: tags,
               selected_ids: ef.object.tag_ids
             ) %>
       <% end %>
diff --git a/app/views/transactions/_transaction.html.erb b/app/views/transactions/_transaction.html.erb
index 9aff39d03..213e11964 100644
--- a/app/views/transactions/_transaction.html.erb
+++ b/app/views/transactions/_transaction.html.erb
@@ -7,7 +7,7 @@
   <%= turbo_frame_tag dom_id(transaction) do %>
     <div class="group flex lg:grid lg:grid-cols-12 items-center text-primary text-sm font-medium p-3 lg:p-4 <%= "pl-8 lg:pl-12" if in_split_group %>">
 
-      <div class="pr-4 lg:pr-10 flex items-center gap-3 lg:gap-4 col-span-8 min-w-0">
+      <div class="pr-4 lg:pr-10 flex items-center gap-3 lg:gap-4 col-span-7 min-w-0">
         <%= check_box_tag dom_id(entry, "selection"),
             disabled: transaction.transfer.present?,
             class: "checkbox checkbox--light hidden lg:block",
@@ -153,7 +153,21 @@
                 <div class="text-secondary text-xs font-normal">
                   <% if transaction.transfer? %>
                     <span class="text-secondary">
-                      <%= transaction.loan_payment? ? t("transactions.show.loan_payment") : t("transactions.show.transfer") %> • <%= entry.account.name %>
+                      <%= transaction.loan_payment? ? t("transactions.show.loan_payment") : t("transactions.show.transfer") %> •
+                      <% if transaction.transfer.present? %>
+                        <% counterpart = transaction.transfer_as_outflow.present? ? transaction.transfer.to_account : transaction.transfer.from_account %>
+                        <% if counterpart.present? && @accessible_account_ids&.include?(counterpart.id) %>
+                          <% if transaction.transfer_as_outflow.present? %>
+                            <%= entry.account.name %> → <%= counterpart.name %>
+                          <% else %>
+                            <%= entry.account.name %> ← <%= counterpart.name %>
+                          <% end %>
+                        <% else %>
+                          <%= entry.account.name %>
+                        <% end %>
+                      <% else %>
+                        <%= entry.account.name %>
+                      <% end %>
                     </span>
                   <% else %>
                     <% if transaction.merchant&.present? %>
@@ -179,7 +193,7 @@
         </div>
       </div>
 
-      <div class="hidden md:flex min-w-0 items-center gap-1 col-span-2">
+      <div class="hidden md:flex min-w-0 items-center gap-1 col-span-3">
         <% if entry.account.supports_trades? && !transaction.transfer? %>
           <%# For investment/crypto accounts, show activity label instead of category %>
           <%= render "investment_activity/quick_edit_badge", entry: entry, entryable: transaction %>
diff --git a/app/views/transactions/bulk_updates/new.html.erb b/app/views/transactions/bulk_updates/new.html.erb
index 47b38bf3f..f899da713 100644
--- a/app/views/transactions/bulk_updates/new.html.erb
+++ b/app/views/transactions/bulk_updates/new.html.erb
@@ -11,7 +11,7 @@
         <%= render DS::Disclosure.new(title: t(".transactions_section"), open: true) do %>
           <div class="space-y-2">
             <%= form.text_field :name, label: t(".name_label"), placeholder: t(".name_placeholder") %>
-            <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_prompt"), label: t(".category_label"), class: "text-subdued" } %>
+            <%= form.collection_select :category_id, Current.family.categories.alphabetically, :id, :name, { prompt: t(".category_prompt"), label: t(".category_label"), class: "text-subdued", variant: :badge, searchable: true } %>
             <%= form.collection_select :merchant_id, Current.family.available_merchants_for(Current.user).alphabetically, :id, :name, { prompt: t(".merchant_prompt"), label: t(".merchant_label"), class: "text-subdued" } %>
             <%= form.select :tag_ids, Current.family.tags.alphabetically.pluck(:name, :id), { include_blank: t(".none"), multiple: true, label: t(".tags_label"), include_hidden: false } %>
             <%= form.text_area :notes, label: t(".notes_label"), placeholder: t(".notes_placeholder"), rows: 5 %>
diff --git a/app/views/transactions/categorizes/_entry_row.html.erb b/app/views/transactions/categorizes/_entry_row.html.erb
index daba95b7f..16180bdc3 100644
--- a/app/views/transactions/categorizes/_entry_row.html.erb
+++ b/app/views/transactions/categorizes/_entry_row.html.erb
@@ -6,7 +6,7 @@
            aria-label="<%= t("transactions.categorizes.entry_row.include_checkbox", name: entry.name) %>"
            data-action="change->categorize#uncheckRule">
     <span class="min-w-0 font-medium text-primary truncate"><%= entry.name %></span>
-    <span class="text-secondary whitespace-nowrap"><%= l(entry.date, format: :short) %></span>
+    <span class="text-secondary whitespace-nowrap"><%= format_date(entry.date) %></span>
     <span class="privacy-sensitive font-medium text-right whitespace-nowrap <%= entry.amount.negative? ? "text-green-600" : "text-primary" %>">
       <%= format_money(entry.amount_money.abs) %>
     </span>
diff --git a/app/views/transactions/categorizes/_group_title.html.erb b/app/views/transactions/categorizes/_group_title.html.erb
index 948b504ac..a23ab1961 100644
--- a/app/views/transactions/categorizes/_group_title.html.erb
+++ b/app/views/transactions/categorizes/_group_title.html.erb
@@ -2,7 +2,7 @@
   <div class="flex items-center gap-2">
     <h2 class="text-lg font-semibold text-primary"><%= display_name %></h2>
     <% if transaction_type == "income" %>
-      <span class="text-xs font-medium px-1.5 py-0.5 rounded-full bg-green-100 text-green-700"><%= t("transactions.categorizes.show.type_income") %></span>
+      <span class="text-xs font-medium px-1.5 py-0.5 rounded-full bg-green-100 text-green-700 theme-dark:bg-green-tint-10 theme-dark:text-green-200"><%= t("transactions.categorizes.show.type_income") %></span>
     <% elsif transaction_type == "expense" %>
       <span class="text-xs font-medium px-1.5 py-0.5 rounded-full bg-surface text-secondary border border-primary"><%= t("transactions.categorizes.show.type_expense") %></span>
     <% end %>
diff --git a/app/views/transactions/categorizes/show.html.erb b/app/views/transactions/categorizes/show.html.erb
index 778cc7780..f7ec1093c 100644
--- a/app/views/transactions/categorizes/show.html.erb
+++ b/app/views/transactions/categorizes/show.html.erb
@@ -128,11 +128,11 @@
                         style="background-color: color-mix(in oklab, <%= category.color %> 10%, transparent);
                                border-color: color-mix(in oklab, <%= category.color %> 20%, transparent);
                                color: <%= category.color %>;"
-                        data-filter-name="<%= category.name %>">
+                        data-filter-name="<%= category.display_name %>">
                   <% if category.lucide_icon.present? %>
                     <%= icon(category.lucide_icon, size: "sm", color: "current") %>
                   <% end %>
-                  <%= category.name %>
+                  <%= category.display_name %>
                 </button>
               <% end %>
             </div>
diff --git a/app/views/transactions/convert_to_trade.html.erb b/app/views/transactions/convert_to_trade.html.erb
index b7e04524d..45da63027 100644
--- a/app/views/transactions/convert_to_trade.html.erb
+++ b/app/views/transactions/convert_to_trade.html.erb
@@ -132,12 +132,12 @@
         </div>
 
         <!-- Price mismatch warning -->
-        <div class="hidden p-3 bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-lg" data-convert-to-trade-target="priceWarning">
+        <div class="hidden p-3 bg-warning/10 border border-warning/20 rounded-lg" data-convert-to-trade-target="priceWarning">
           <div class="flex items-start gap-2">
-            <%= icon "alert-triangle", size: "sm", class: "text-yellow-600 dark:text-yellow-500 mt-0.5 shrink-0" %>
+            <%= icon "alert-triangle", size: "sm", color: "warning", class: "mt-0.5 shrink-0" %>
             <div class="text-sm">
-              <p class="font-medium text-yellow-800 dark:text-yellow-200"><%= t(".price_mismatch_title") %></p>
-              <p class="text-yellow-700 dark:text-yellow-300" data-convert-to-trade-target="priceWarningMessage"></p>
+              <p class="font-medium text-primary"><%= t(".price_mismatch_title") %></p>
+              <p class="text-secondary" data-convert-to-trade-target="priceWarningMessage"></p>
             </div>
           </div>
         </div>
diff --git a/app/views/transactions/new.html.erb b/app/views/transactions/new.html.erb
index 3d612c0a8..1e13162cd 100644
--- a/app/views/transactions/new.html.erb
+++ b/app/views/transactions/new.html.erb
@@ -1,6 +1,12 @@
 <%= render DS::Dialog.new(scrollable: false, content_class: "lg:max-h-none lg:overflow-y-auto") do |dialog| %>
   <% dialog.with_header(title: t(".new_transaction")) %>
   <% dialog.with_body do %>
-    <%= render "form", entry: @entry, categories: @categories %>
+    <%= render "form",
+               entry: @entry,
+               account_currencies: @account_currencies,
+               manual_accounts: @manual_accounts,
+               categories: @categories,
+               merchants: @merchants,
+               tags: @tags %>
   <% end %>
 <% end %>
diff --git a/app/views/transactions/searches/filters/_category_filter.html.erb b/app/views/transactions/searches/filters/_category_filter.html.erb
index 649651ff1..080bbe3ce 100644
--- a/app/views/transactions/searches/filters/_category_filter.html.erb
+++ b/app/views/transactions/searches/filters/_category_filter.html.erb
@@ -11,7 +11,7 @@
       ) %>
   <div class="my-2" id="list" data-list-filter-target="list">
     <% family_categories.each do |category| %>
-      <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= category.name %>">
+      <div class="filterable-item flex items-center gap-2 p-2" data-filter-name="<%= category.display_name %>">
         <%= form.check_box :categories,
                            {
                              multiple: true,
@@ -20,7 +20,7 @@
                            },
                            category.name,
                            nil %>
-        <%= form.label :categories, category.name, value: category.name, class: "text-sm text-primary cursor-pointer" do %>
+        <%= form.label :categories, category.display_name, value: category.name, class: "text-sm text-primary cursor-pointer" do %>
           <%= render partial: "categories/badge", locals: { category: category } %>
         <% end %>
       </div>
diff --git a/app/views/transfers/_form.html.erb b/app/views/transfers/_form.html.erb
index a7696692a..69a727448 100644
--- a/app/views/transfers/_form.html.erb
+++ b/app/views/transfers/_form.html.erb
@@ -30,11 +30,11 @@
   <section class="space-y-2">
     <%= f.collection_select :from_account_id, @accounts, :id, :name, { prompt: t(".select_account"), label: t(".from"), selected: @from_account_id, variant: :logo }, { required: true, data: { transfer_form_target: "fromAccount", action: "change->transfer-form#checkCurrencyDifference" } } %>
     <%= f.collection_select :to_account_id, @accounts, :id, :name, { prompt: t(".select_account"), label: t(".to"), variant: :logo }, { required: true, data: { transfer_form_target: "toAccount", action: "change->transfer-form#checkCurrencyDifference" } } %>
-    
+
     <%= f.date_field :date, value: transfer.inflow_transaction&.entry&.date || Date.current, label: t(".date"), required: true, max: Date.current, data: { transfer_form_target: "date", action: "change->transfer-form#checkCurrencyDifference" } %>
-    
+
     <%= f.number_field :amount, label: t(".source_amount"), required: true, min: 0, placeholder: "100", step: 0.00000001, data: { transfer_form_target: "amount", action: "input->transfer-form#onSourceAmountChange" } %>
-    
+
     <% convert_input = capture do %>
       <%= f.number_field :exchange_rate,
         label: t("shared.exchange_rate_tabs.exchange_rate"),
@@ -73,6 +73,26 @@
       destination_input: destination_input %>
   </section>
 
+  <section>
+    <%= render DS::Disclosure.new(title: t(".bank_charges"), open: false, variant: :inline) do %>
+      <div class="space-y-2 pt-2">
+        <%= f.number_field :source_fee_amount,
+              label: t(".outgoing_fee"),
+              min: 0,
+              placeholder: "0.00",
+              step: "any",
+              data: { transfer_form_target: "sourceFee" } %>
+
+        <%= f.number_field :destination_fee_amount,
+              label: t(".incoming_fee"),
+              min: 0,
+              placeholder: "0.00",
+              step: "any",
+              data: { transfer_form_target: "destinationFee" } %>
+      </div>
+    <% end %>
+  </section>
+
   <section>
     <%= f.submit t(".submit") %>
   </section>
diff --git a/app/views/transfers/show.html.erb b/app/views/transfers/show.html.erb
index 3512fe592..aeaec2106 100644
--- a/app/views/transfers/show.html.erb
+++ b/app/views/transfers/show.html.erb
@@ -34,9 +34,21 @@
             <dd class="font-medium"><%= l(@transfer.outflow_transaction.entry.date, format: :long) %></dd>
           </dl>
           <dl class="flex items-center gap-2 justify-between">
-            <dt class="text-secondary"><%= t(".amount") %></dt>
-            <dd class="font-medium text-red-500 privacy-sensitive"><%= format_money @transfer.outflow_transaction.entry.amount_money * -1 %></dd>
+            <dt class="text-secondary"><%= t(".transfer_amount") %></dt>
+            <dd class="font-medium text-destructive privacy-sensitive"><%= format_money @transfer.outflow_transaction.entry.amount_money * -1 %></dd>
           </dl>
+          <% if @transfer.has_source_fee? %>
+            <dl class="flex items-center gap-2 justify-between">
+              <dt class="text-secondary"><%= t(".source_fee") %></dt>
+              <dd class="font-medium text-destructive privacy-sensitive"><%= format_money Money.new(@transfer.derived_source_fee_amount, @transfer.from_account.currency) * -1 %></dd>
+            </dl>
+            <dl class="flex items-center gap-2 justify-between pt-1 border-t border-alpha-black-50">
+              <dt class="text-secondary font-medium"><%= t(".total") %></dt>
+              <dd class="font-medium text-destructive privacy-sensitive">
+                <%= format_money (@transfer.outflow_transaction.entry.amount_money + Money.new(@transfer.derived_source_fee_amount, @transfer.from_account.currency)) * -1 %>
+              </dd>
+            </dl>
+          <% end %>
         </div>
         <%= render "shared/ruler", classes: "my-2" %>
         <div class="space-y-3">
@@ -52,9 +64,19 @@
             <dd class="font-medium"><%= l(@transfer.inflow_transaction.entry.date, format: :long) %></dd>
           </dl>
           <dl class="flex items-center gap-2 justify-between">
-            <dt class="text-secondary"><%= t(".amount") %></dt>
-            <dd class="font-medium text-green-500 privacy-sensitive">+<%= format_money @transfer.inflow_transaction.entry.amount_money * -1 %></dd>
+            <dt class="text-secondary"><%= t(".transfer_amount") %></dt>
+            <dd class="font-medium text-success privacy-sensitive">+<%= format_money @transfer.inflow_transaction.entry.amount_money * -1 %></dd>
           </dl>
+          <% if @transfer.has_destination_fee? %>
+            <dl class="flex items-center gap-2 justify-between">
+              <dt class="text-secondary"><%= t(".destination_fee") %></dt>
+              <dd class="font-medium text-destructive privacy-sensitive"><%= format_money Money.new(@transfer.derived_destination_fee_amount, @transfer.to_account.currency) * -1 %></dd>
+            </dl>
+            <dl class="flex items-center gap-2 justify-between pt-1 border-t border-alpha-black-50">
+              <dt class="text-secondary font-medium"><%= t(".total") %></dt>
+              <dd class="font-medium text-success privacy-sensitive">+<%= format_money (@transfer.inflow_transaction.entry.amount_money * -1) - Money.new(@transfer.derived_destination_fee_amount, @transfer.to_account.currency) %></dd>
+            </dl>
+          <% end %>
         </div>
       </div>
     <% end %>
@@ -62,7 +84,7 @@
       <%= styled_form_with model: @transfer,
               data: { controller: "auto-submit-form" }, class: "space-y-2" do |f| %>
         <% if @transfer.categorizable? %>
-          <%= f.collection_select :category_id, @categories.alphabetically, :id, :name, { label: t(".category"), include_blank: t(".uncategorized"), selected: @transfer.outflow_transaction.category&.id }, "data-auto-submit-form-target": "auto" %>
+          <%= f.collection_select :category_id, @categories.alphabetically, :id, :name, { label: t(".category"), include_blank: t(".uncategorized"), selected: @transfer.outflow_transaction.category&.id, variant: :badge, searchable: true }, "data-auto-submit-form-target": "auto" %>
         <% end %>
         <%= f.text_area :notes,
                   label: t(".note_label"),
@@ -94,12 +116,19 @@
             <h4 class="text-primary"><%= t(".delete_title") %></h4>
             <p class="text-secondary"><%= t(".delete_subtitle") %></p>
           </div>
-          <%= button_to t(".delete"),
-                transfer_path(@transfer),
+          <%= render DS::Button.new(
+                text: t(".delete"),
+                variant: :outline_destructive,
+                size: :md,
+                href: transfer_path(@transfer),
                 method: :delete,
-                class:  "rounded-lg px-3 py-2 whitespace-nowrap text-red-500 text-sm
-                          font-medium border border-secondary",
-                data:   { turbo_confirm: true, turbo_frame: "_top" } %>
+                confirm: CustomConfirm.new(
+                  title: t(".delete_title"),
+                  body: t(".delete_subtitle"),
+                  destructive: true
+                ),
+                frame: "_top"
+              ) %>
         </div>
       </div>
     <% end %>
diff --git a/app/views/up_items/_up_item.html.erb b/app/views/up_items/_up_item.html.erb
new file mode 100644
index 000000000..ddd637c9f
--- /dev/null
+++ b/app/views/up_items/_up_item.html.erb
@@ -0,0 +1,114 @@
+<%# locals: (up_item:) %>
+
+<%= tag.div id: dom_id(up_item) do %>
+  <%= render DS::Disclosure.new(variant: :card, open: true) do |disclosure| %>
+    <% disclosure.with_summary_content do %>
+      <div class="flex items-center justify-between gap-2 w-full">
+        <div class="flex items-center gap-2">
+          <%= icon "chevron-right", class: "group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
+
+          <div class="flex items-center justify-center h-8 w-8 bg-surface rounded-full">
+            <p class="text-primary text-xs font-medium"><%= up_item.name.to_s.first.to_s.upcase %></p>
+          </div>
+
+          <div class="pl-1 text-sm">
+            <div class="flex items-center gap-2">
+              <%= tag.p up_item.name, class: "font-medium text-primary" %>
+              <% if up_item.scheduled_for_deletion? %>
+                <p class="text-destructive text-sm animate-pulse"><%= t(".deletion_in_progress") %></p>
+              <% end %>
+            </div>
+
+            <% if up_item.accounts.any? %>
+              <p class="text-xs text-secondary"><%= up_item.institution_summary %></p>
+            <% end %>
+
+            <% if up_item.syncing? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= icon "loader", size: "sm", class: "animate-spin" %>
+                <%= tag.span t(".syncing") %>
+              </div>
+            <% elsif up_item.sync_error.present? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= render DS::Tooltip.new(text: up_item.sync_error, icon: "alert-circle", size: "sm", color: "destructive", as: :span) %>
+                <%= tag.span t(".error"), class: "text-destructive" %>
+              </div>
+            <% else %>
+              <p class="text-secondary">
+                <% if up_item.last_synced_at %>
+                  <%= t(".status_with_summary", timestamp: time_ago_in_words(up_item.last_synced_at), summary: up_item.sync_status_summary) %>
+                <% else %>
+                  <%= t(".status_never") %>
+                <% end %>
+              </p>
+            <% end %>
+          </div>
+        </div>
+
+        <% if Current.user&.admin? %>
+          <div class="flex items-center gap-2">
+            <%= render DS::Menu.new do |menu| %>
+              <% menu.with_item(
+                variant: "button",
+                text: t(".delete"),
+                icon: "trash-2",
+                href: up_item_path(up_item),
+                method: :delete,
+                confirm: CustomConfirm.for_resource_deletion(up_item.name, high_severity: true)
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% unless up_item.scheduled_for_deletion? %>
+      <div class="space-y-4 mt-4">
+        <% if up_item.accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: up_item.accounts %>
+        <% end %>
+
+        <% stats = if defined?(@up_sync_stats_map) && @up_sync_stats_map
+             @up_sync_stats_map[up_item.id] || {}
+           else
+             up_item.syncs.ordered.first&.sync_stats || {}
+           end %>
+        <%= render ProviderSyncSummary.new(
+          stats: stats,
+          provider_item: up_item,
+          institutions_count: up_item.connected_institutions.size
+        ) %>
+
+        <% unlinked_count = up_item.unlinked_accounts_count %>
+        <% linked_count = up_item.linked_accounts_count %>
+        <% total_count = up_item.total_accounts_count %>
+
+        <% if unlinked_count > 0 %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".setup_needed") %></p>
+            <p class="text-secondary text-sm"><%= t(".setup_description", linked: linked_count, total: total_count) %></p>
+            <%= render DS::Link.new(
+              text: t(".setup_action"),
+              icon: "settings",
+              variant: "primary",
+              href: setup_accounts_up_item_path(up_item),
+              frame: :modal
+            ) %>
+          </div>
+        <% elsif up_item.accounts.empty? && total_count == 0 %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title") %></p>
+            <p class="text-secondary text-sm"><%= t(".no_accounts_description") %></p>
+            <%= render DS::Link.new(
+              text: t(".setup_action"),
+              icon: "settings",
+              variant: "primary",
+              href: setup_accounts_up_item_path(up_item),
+              frame: :modal
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/up_items/select_accounts.html.erb b/app/views/up_items/select_accounts.html.erb
new file mode 100644
index 000000000..f9a602a86
--- /dev/null
+++ b/app/views/up_items/select_accounts.html.erb
@@ -0,0 +1,50 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+
+    <% dialog.with_body do %>
+      <div class="space-y-4">
+        <% if @api_error.present? %>
+          <%= render DS::Alert.new(message: @api_error, variant: :error) %>
+        <% elsif @up_accounts.empty? %>
+          <p class="text-sm text-secondary"><%= t(".no_accounts_found") %></p>
+        <% else %>
+          <p class="text-sm text-secondary"><%= t(".description") %></p>
+
+          <%= form_with url: link_accounts_up_items_path,
+                        method: :post,
+                        data: { turbo_frame: "_top" },
+                        class: "space-y-4" do %>
+            <%= hidden_field_tag :up_item_id, @up_item.id %>
+            <%= hidden_field_tag :accountable_type, @accountable_type %>
+            <%= hidden_field_tag :return_to, @return_to %>
+
+            <div class="space-y-2">
+              <% @up_accounts.each do |up_account| %>
+                <label class="flex items-start gap-3 p-3 border border-primary rounded-lg hover:bg-surface cursor-pointer transition-colors">
+                  <%= check_box_tag "account_ids[]", up_account.id, false, class: "mt-1" %>
+                  <div class="flex-1">
+                    <div class="font-medium text-sm text-primary"><%= up_account.name %></div>
+                    <div class="text-xs text-secondary mt-1">
+                      <%= [up_account.currency, up_account.account_type].compact.join(" · ") %>
+                    </div>
+                  </div>
+                </label>
+              <% end %>
+            </div>
+
+            <div class="flex gap-2 justify-end pt-4">
+              <%= render DS::Link.new(
+                text: t(".cancel"),
+                href: @return_to || accounts_path,
+                variant: :secondary,
+                data: { turbo_frame: "_top", action: "DS--dialog#close" }
+              ) %>
+              <%= render DS::Button.new(text: t(".link_accounts"), type: "submit") %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/up_items/select_existing_account.html.erb b/app/views/up_items/select_existing_account.html.erb
new file mode 100644
index 000000000..913a59be9
--- /dev/null
+++ b/app/views/up_items/select_existing_account.html.erb
@@ -0,0 +1,50 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title", account_name: @account.name)) %>
+
+    <% dialog.with_body do %>
+      <div class="space-y-4">
+        <% if @api_error.present? %>
+          <%= render DS::Alert.new(message: @api_error, variant: :error) %>
+        <% elsif @up_accounts.empty? %>
+          <p class="text-sm text-secondary"><%= t(".no_accounts_found") %></p>
+        <% else %>
+          <p class="text-sm text-secondary"><%= t(".description") %></p>
+
+          <%= form_with url: link_existing_account_up_items_path,
+                        method: :post,
+                        data: { turbo_frame: "_top" },
+                        class: "space-y-4" do %>
+            <%= hidden_field_tag :up_item_id, @up_item.id %>
+            <%= hidden_field_tag :account_id, @account.id %>
+            <%= hidden_field_tag :return_to, @return_to %>
+
+            <div class="space-y-2">
+              <% @up_accounts.each do |up_account| %>
+                <label class="flex items-start gap-3 p-3 border border-primary rounded-lg hover:bg-surface cursor-pointer transition-colors">
+                  <%= radio_button_tag "up_account_id", up_account.id, false, class: "mt-1", required: true %>
+                  <div class="flex-1">
+                    <div class="font-medium text-sm text-primary"><%= up_account.name %></div>
+                    <div class="text-xs text-secondary mt-1">
+                      <%= [up_account.currency, up_account.account_type].compact.join(" · ") %>
+                    </div>
+                  </div>
+                </label>
+              <% end %>
+            </div>
+
+            <div class="flex gap-2 justify-end pt-4">
+              <%= render DS::Link.new(
+                text: t(".cancel"),
+                href: @return_to || accounts_path,
+                variant: :secondary,
+                data: { turbo_frame: "_top", action: "DS--dialog#close" }
+              ) %>
+              <%= render DS::Button.new(text: t(".link_account"), type: "submit") %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/up_items/setup_accounts.html.erb b/app/views/up_items/setup_accounts.html.erb
new file mode 100644
index 000000000..09b916862
--- /dev/null
+++ b/app/views/up_items/setup_accounts.html.erb
@@ -0,0 +1,72 @@
+<% content_for :title, t(".title") %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "landmark", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <%= form_with url: complete_account_setup_up_item_path(@up_item),
+                  method: :post,
+                  local: true,
+                  data: { turbo_frame: "_top" },
+                  class: "space-y-6" do %>
+      <div class="space-y-4">
+        <% if @api_error.present? %>
+          <div class="p-8 flex flex-col gap-3 items-center justify-center text-center">
+            <%= icon "alert-circle", size: "lg", class: "text-destructive" %>
+            <p class="text-primary font-medium"><%= t(".fetch_failed") %></p>
+            <p class="text-destructive text-sm"><%= @api_error %></p>
+          </div>
+        <% elsif @up_accounts.empty? %>
+          <div class="p-8 flex flex-col gap-3 items-center justify-center text-center">
+            <%= icon "check-circle", size: "lg", class: "text-success" %>
+            <p class="text-primary font-medium"><%= t(".no_accounts_to_setup") %></p>
+            <p class="text-secondary text-sm"><%= t(".all_accounts_linked") %></p>
+          </div>
+        <% else %>
+          <div class="bg-surface border border-primary p-4 rounded-lg">
+            <p class="text-sm text-primary"><strong><%= t(".choose_account_type") %></strong></p>
+            <p class="text-xs text-secondary mt-1"><%= t(".choose_account_type_description") %></p>
+          </div>
+
+          <% @up_accounts.each do |up_account| %>
+            <div class="border border-primary rounded-lg p-4">
+              <div class="mb-3">
+                <h3 class="font-medium text-primary"><%= up_account.name %></h3>
+                <p class="text-xs text-secondary">
+                  <%= [up_account.currency, up_account.account_type].compact.join(" · ") %>
+                </p>
+              </div>
+
+              <%= label_tag "account_types[#{up_account.id}]", t(".account_type_label"),
+                            class: "block text-sm font-medium text-primary mb-2" %>
+              <%= select_tag "account_types[#{up_account.id}]",
+                             options_for_select(@account_type_options, @up_account_type_suggestions.fetch(up_account.id, "skip")),
+                             class: "appearance-none bg-container border border-primary rounded-md px-3 py-2 text-sm leading-6 text-primary focus:border-primary focus:ring-1 focus:ring-primary focus:outline-none w-full" %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+
+      <div class="flex gap-3">
+        <%= render DS::Button.new(
+          text: t(".create_accounts"),
+          variant: "primary",
+          icon: "plus",
+          type: "submit",
+          class: "flex-1",
+          disabled: @api_error.present? || @up_accounts.empty?
+        ) %>
+        <%= render DS::Link.new(
+          text: t(".cancel"),
+          variant: "secondary",
+          href: accounts_path
+        ) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/wise_items/_wise_item.html.erb b/app/views/wise_items/_wise_item.html.erb
new file mode 100644
index 000000000..edd95f580
--- /dev/null
+++ b/app/views/wise_items/_wise_item.html.erb
@@ -0,0 +1,101 @@
+<%# locals: (wise_item:) %>
+
+<%= tag.div id: dom_id(wise_item) do %>
+  <%= render DS::Disclosure.new(variant: :card, open: true) do |disclosure| %>
+    <% disclosure.with_summary_content do %>
+      <div class="flex items-center justify-between gap-2">
+        <div class="flex items-center gap-2">
+          <%= icon "chevron-right", class: "group-open:rotate-90 motion-safe:transition-transform motion-safe:duration-150" %>
+
+          <div class="flex items-center justify-center h-8 w-8 bg-container-inset rounded-full">
+            <p class="text-primary text-xs font-bold">WI</p>
+          </div>
+
+          <div class="pl-1 text-sm">
+            <div class="flex items-center gap-2">
+              <%= tag.p wise_item.name, class: "font-medium text-primary" %>
+              <span class="text-xs px-1.5 py-0.5 rounded bg-surface-inset text-secondary">
+                <%= t("wise_items.profile_types.#{wise_item.profile_type}") %>
+              </span>
+              <% if wise_item.scheduled_for_deletion? %>
+                <%= tag.p t(".deletion_in_progress"), class: "text-destructive text-sm animate-pulse" %>
+              <% end %>
+            </div>
+            <% if wise_item.syncing? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= icon "loader", size: "sm", class: "animate-spin" %>
+                <%= tag.span t(".syncing") %>
+              </div>
+            <% elsif wise_item.sync_error.present? %>
+              <div class="text-secondary flex items-center gap-1">
+                <%= render DS::Tooltip.new(text: wise_item.sync_error, icon: "alert-circle", size: "sm", color: "destructive", as: :span) %>
+                <%= tag.span t(".error"), class: "text-destructive" %>
+              </div>
+            <% else %>
+              <p class="text-secondary">
+                <% if wise_item.last_synced_at %>
+                  <%= t(".status_with_summary", timestamp: time_ago_in_words(wise_item.last_synced_at), summary: wise_item.sync_status_summary) %>
+                <% else %>
+                  <%= t(".status_never") %>
+                <% end %>
+              </p>
+            <% end %>
+          </div>
+        </div>
+
+        <% if Current.user&.admin? %>
+          <div class="flex items-center gap-2">
+            <%= render DS::Menu.new do |menu| %>
+              <% menu.with_item(
+                variant: "button",
+                text: t(".delete"),
+                icon: "trash-2",
+                href: wise_item_path(wise_item),
+                method: :delete,
+                confirm: CustomConfirm.for_resource_deletion(wise_item.name, high_severity: true)
+              ) %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+
+    <% unless wise_item.scheduled_for_deletion? %>
+      <div class="space-y-4 mt-4">
+        <% if wise_item.accounts.any? %>
+          <%= render "accounts/index/account_groups", accounts: wise_item.accounts %>
+        <% end %>
+
+        <% unlinked = wise_item.unlinked_accounts_count %>
+        <% total = wise_item.total_accounts_count %>
+        <% linked = wise_item.linked_accounts_count %>
+
+        <% if unlinked > 0 %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".setup_needed") %></p>
+            <p class="text-secondary text-sm"><%= t(".setup_description", linked: linked, total: total) %></p>
+            <%= render DS::Link.new(
+              text: t(".setup_action"),
+              icon: "settings",
+              variant: "primary",
+              href: setup_accounts_wise_item_path(wise_item),
+              frame: :modal
+            ) %>
+          </div>
+        <% elsif wise_item.accounts.empty? && total == 0 %>
+          <div class="p-4 flex flex-col gap-3 items-center justify-center">
+            <p class="text-primary font-medium text-sm"><%= t(".no_accounts_title") %></p>
+            <p class="text-secondary text-sm"><%= t(".no_accounts_description") %></p>
+            <%= render DS::Link.new(
+              text: t(".setup_action"),
+              icon: "settings",
+              variant: "primary",
+              href: setup_accounts_wise_item_path(wise_item),
+              frame: :modal
+            ) %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/wise_items/select_accounts.html.erb b/app/views/wise_items/select_accounts.html.erb
new file mode 100644
index 000000000..2c1a25b0f
--- /dev/null
+++ b/app/views/wise_items/select_accounts.html.erb
@@ -0,0 +1,65 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title")) %>
+
+    <% dialog.with_body do %>
+      <div class="space-y-4">
+        <p class="text-sm text-secondary"><%= t(".description", product_name: product_name) %></p>
+
+        <% if @available_accounts.empty? %>
+          <div class="p-6 flex flex-col gap-3 items-center justify-center text-center">
+            <%= icon "check-circle", size: "lg", class: "text-success" %>
+            <p class="text-primary font-medium"><%= t(".no_accounts_found") %></p>
+          </div>
+          <div class="flex justify-end">
+            <%= render DS::Link.new(
+              text: t(".cancel"),
+              variant: :secondary,
+              href: @return_to || new_account_path,
+              frame: "_top"
+            ) %>
+          </div>
+        <% else %>
+          <%= form_with url: link_accounts_wise_items_path,
+                        method: :post,
+                        data: { turbo_frame: "_top" },
+                        class: "space-y-4" do %>
+            <%= hidden_field_tag :wise_item_id, @wise_item.id %>
+            <%= hidden_field_tag :accountable_type, @accountable_type %>
+            <%= hidden_field_tag :return_to, @return_to %>
+
+            <div class="space-y-2">
+              <% @available_accounts.each do |wise_account| %>
+                <label class="flex items-start gap-3 p-3 border border-primary rounded-lg hover:bg-subtle cursor-pointer transition-colors">
+                  <%= radio_button_tag "wise_account_id", wise_account.id, false, class: "mt-1" %>
+                  <div class="flex-1">
+                    <p class="font-medium text-sm text-primary"><%= wise_account.name %></p>
+                    <p class="text-xs text-secondary mt-0.5">
+                      <%= format_money(Money.new(wise_account.current_balance || 0, wise_account.currency)) %>
+                      &nbsp;·&nbsp;
+                      <%= wise_account.currency %>
+                    </p>
+                  </div>
+                </label>
+              <% end %>
+            </div>
+
+            <div class="flex gap-2 justify-end pt-4">
+              <%= render DS::Link.new(
+                text: t(".cancel"),
+                variant: :secondary,
+                href: @return_to || new_account_path,
+                frame: "_top"
+              ) %>
+              <%= render DS::Button.new(
+                text: t(".link_account"),
+                variant: :primary,
+                type: :submit
+              ) %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/wise_items/select_existing_account.html.erb b/app/views/wise_items/select_existing_account.html.erb
new file mode 100644
index 000000000..ac7d521ea
--- /dev/null
+++ b/app/views/wise_items/select_existing_account.html.erb
@@ -0,0 +1,65 @@
+<%= turbo_frame_tag "modal" do %>
+  <%= render DS::Dialog.new do |dialog| %>
+    <% dialog.with_header(title: t(".title", account_name: @account.name)) %>
+
+    <% dialog.with_body do %>
+      <div class="space-y-4">
+        <p class="text-sm text-secondary"><%= t(".description") %></p>
+
+        <% if @available_accounts.empty? %>
+          <div class="p-6 flex flex-col gap-3 items-center justify-center text-center">
+            <%= icon "check-circle", size: "lg", class: "text-success" %>
+            <p class="text-primary font-medium"><%= t(".no_accounts_found") %></p>
+          </div>
+          <div class="flex justify-end">
+            <%= render DS::Link.new(
+              text: t(".cancel"),
+              variant: :secondary,
+              href: @return_to || accounts_path,
+              frame: "_top"
+            ) %>
+          </div>
+        <% else %>
+          <%= form_with url: link_existing_account_wise_items_path,
+                        method: :post,
+                        data: { turbo_frame: "_top" },
+                        class: "space-y-4" do %>
+            <%= hidden_field_tag :wise_item_id, @wise_item&.id %>
+            <%= hidden_field_tag :account_id, @account.id %>
+            <%= hidden_field_tag :return_to, @return_to %>
+
+            <div class="space-y-2">
+              <% @available_accounts.each do |wise_account| %>
+                <label class="flex items-start gap-3 p-3 border border-primary rounded-lg hover:bg-subtle cursor-pointer transition-colors">
+                  <%= radio_button_tag "wise_account_id", wise_account.id, false, class: "mt-1" %>
+                  <div class="flex-1">
+                    <p class="font-medium text-sm text-primary"><%= wise_account.name %></p>
+                    <p class="text-xs text-secondary mt-0.5">
+                      <%= format_money(Money.new(wise_account.current_balance || 0, wise_account.currency)) %>
+                      &nbsp;·&nbsp;
+                      <%= wise_account.currency %>
+                    </p>
+                  </div>
+                </label>
+              <% end %>
+            </div>
+
+            <div class="flex gap-2 justify-end pt-4">
+              <%= render DS::Link.new(
+                text: t(".cancel"),
+                variant: :secondary,
+                href: @return_to || accounts_path,
+                frame: "_top"
+              ) %>
+              <%= render DS::Button.new(
+                text: t(".link_account"),
+                variant: :primary,
+                type: :submit
+              ) %>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/wise_items/select_profiles.html.erb b/app/views/wise_items/select_profiles.html.erb
new file mode 100644
index 000000000..440ea9d82
--- /dev/null
+++ b/app/views/wise_items/select_profiles.html.erb
@@ -0,0 +1,66 @@
+<% content_for :title, t(".title") %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "globe", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <%= form_with url: link_profiles_wise_items_path,
+                  method: :post,
+                  local: true,
+                  data: { turbo_frame: "_top" },
+                  class: "space-y-6" do |form| %>
+
+      <%= hidden_field_tag :encrypted_pending_token, @encrypted_pending_token %>
+
+      <p class="text-sm text-secondary"><%= t(".description") %></p>
+
+      <div class="space-y-3">
+        <% @pending_profiles.each do |profile| %>
+          <% profile_id = profile["id"].to_s %>
+          <% already_connected = @existing_profile_ids.include?(profile_id) %>
+          <% profile_type = profile["type"] == "business" ? "business" : "personal" %>
+          <% details = profile["details"] || {} %>
+          <% display_name = details["name"].presence || [ details["firstName"], details["lastName"] ].compact.join(" ") %>
+
+          <label class="flex items-start gap-3 p-3 border <%= already_connected ? "border-secondary opacity-60 cursor-not-allowed" : "border-primary hover:bg-subtle cursor-pointer" %> rounded-lg transition-colors">
+            <%= check_box_tag "profile_ids[]", profile_id, !already_connected, disabled: already_connected, class: "mt-1" %>
+            <div class="flex-1">
+              <div class="flex items-center gap-2">
+                <span class="font-medium text-sm text-primary"><%= display_name.presence || t(".unnamed_profile") %></span>
+                <span class="text-xs px-1.5 py-0.5 rounded bg-surface-inset text-secondary">
+                  <%= t("wise_items.profile_types.#{profile_type}") %>
+                </span>
+                <% if already_connected %>
+                  <span class="text-xs text-secondary"><%= t(".already_connected_label") %></span>
+                <% end %>
+              </div>
+              <% if details["email"].present? %>
+                <p class="text-xs text-secondary mt-0.5"><%= details["email"] %></p>
+              <% end %>
+            </div>
+          </label>
+        <% end %>
+      </div>
+
+      <div class="flex gap-3">
+        <%= render DS::Button.new(
+          text: t(".connect"),
+          variant: "primary",
+          icon: "link",
+          type: "submit",
+          class: "flex-1"
+        ) %>
+        <%= render DS::Link.new(
+          text: t(".cancel"),
+          variant: "secondary",
+          href: settings_providers_path
+        ) %>
+      </div>
+    <% end %>
+  <% end %>
+<% end %>
diff --git a/app/views/wise_items/setup_accounts.html.erb b/app/views/wise_items/setup_accounts.html.erb
new file mode 100644
index 000000000..9913c04ec
--- /dev/null
+++ b/app/views/wise_items/setup_accounts.html.erb
@@ -0,0 +1,52 @@
+<% content_for :title, t(".title") %>
+
+<%= render DS::Dialog.new do |dialog| %>
+  <% dialog.with_header(title: t(".title")) do %>
+    <div class="flex items-center gap-2">
+      <%= icon "wallet", class: "text-primary" %>
+      <span class="text-primary"><%= t(".subtitle") %></span>
+    </div>
+  <% end %>
+
+  <% dialog.with_body do %>
+    <div class="space-y-6">
+      <% if @wise_accounts.empty? %>
+        <div class="p-8 flex flex-col gap-3 items-center justify-center text-center">
+          <%= icon "check-circle", size: "lg", class: "text-success" %>
+          <p class="text-primary font-medium"><%= t(".no_accounts_to_setup") %></p>
+          <p class="text-secondary text-sm"><%= t(".all_accounts_linked") %></p>
+        </div>
+        <%= render DS::Link.new(text: t(".done"), variant: "primary", href: accounts_path) %>
+      <% else %>
+        <p class="text-sm text-secondary"><%= t(".description") %></p>
+
+        <div class="space-y-3">
+          <% @wise_accounts.each do |wise_account| %>
+            <div class="border border-primary rounded-lg p-4 flex items-center justify-between gap-4">
+              <div>
+                <p class="font-medium text-primary text-sm"><%= wise_account.name %></p>
+                <p class="text-xs text-secondary mt-0.5">
+                  <%= format_money(Money.new(wise_account.current_balance || 0, wise_account.currency)) %>
+                  &nbsp;·&nbsp;
+                  <%= wise_account.currency %>
+                </p>
+              </div>
+              <%= render DS::Button.new(
+                text: t(".create_account"),
+                icon: "plus",
+                variant: :outline,
+                size: :sm,
+                href: complete_account_setup_wise_item_path(@wise_item),
+                method: :post,
+                params: { wise_account_id: wise_account.id },
+                frame: "_top"
+              ) %>
+            </div>
+          <% end %>
+        </div>
+
+        <%= render DS::Link.new(text: t(".done"), variant: "secondary", href: accounts_path) %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/bin/preview_deploy_security_check.rb b/bin/preview_deploy_security_check.rb
index 5b4b5b3b1..e7fedb0ca 100644
--- a/bin/preview_deploy_security_check.rb
+++ b/bin/preview_deploy_security_check.rb
@@ -8,13 +8,15 @@ PREVIEW_WORKFLOW_PATH = File.join(ROOT, ".github/workflows/preview-deploy.yml")
 PR_WORKFLOW_PATH = File.join(ROOT, ".github/workflows/pr.yml")
 LOCKFILE_PATH = File.join(ROOT, "workers/preview/package-lock.json")
 RESOLVER_PATH = File.join(ROOT, "workers/preview/deploy/resolve_preview_request.cjs")
+CONFIG_RENDERER_PATH = File.join(ROOT, "workers/preview/deploy/render_preview_config.cjs")
+REDACTION_HELPER_PATH = File.join(ROOT, "workers/preview/deploy/redact_preview_log.sh")
 PREVIEW_WORKER_PATH = File.join(ROOT, "workers/preview/src/index.ts")
 PREVIEW_DOCKERFILE_PATH = File.join(ROOT, "Dockerfile.preview")
 PINNED_ACTION = /\A[^@\s]+@[a-f0-9]{40}\z/
 EXPECTED_ACTION_PINS = {
   "actions/checkout" => "93cb6efe18208431cddfb8368fd83d5badbf9bfd", # v5
   "actions/download-artifact" => "018cc2cf5baa6db3ef3c5f8a56943fffe632ef53", # v6
-  "actions/github-script" => "f28e40c7f34bde8b3046d885e986cb6290c5673b", # v7
+  "actions/github-script" => "ed597411d8f924073f98dfc5c65a23a2325f34cd", # v8
   "actions/setup-node" => "48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e", # v6
   "actions/upload-artifact" => "b7c566a772e6b6bfb58ed0dc250532a479d7789f" # v6
 }.freeze
@@ -51,14 +53,22 @@ EXPECTED_COMMENT_PERMISSIONS = {
 }.freeze
 EXPECTED_DEPLOY_SECRET_ENV = %w[CLOUDFLARE_ACCOUNT_ID CLOUDFLARE_API_TOKEN CLOUDFLARE_WORKERS_SUBDOMAIN].freeze
 EXPECTED_PUSH_SECRET_ENV = %w[CLOUDFLARE_ACCOUNT_ID CLOUDFLARE_API_TOKEN].freeze
+EXPECTED_DIAGNOSTICS_PATH = "${{ runner.temp }}/preview-diagnostics"
+EXPECTED_FAILURE_DIAGNOSTICS_PATH = "${{ runner.temp }}/preview-failure-diagnostics"
+EXPECTED_CLEANUP_METADATA_PATH = "${{ runner.temp }}/preview-cleanup-metadata/wrangler.toml"
 REQUIRED_PREPARE_LINES = [
   'cp trusted/workers/preview/package.json "$preview_dir/package.json"',
   'cp trusted/workers/preview/package-lock.json "$preview_dir/package-lock.json"',
   'cp trusted/workers/preview/tsconfig.json "$preview_dir/tsconfig.json"',
   'cp trusted/workers/preview/wrangler.toml "$preview_dir/wrangler.toml"',
   'cp -R trusted/workers/preview/src "$preview_dir/src"',
+  'mkdir -p "$preview_dir/deploy"',
+  'cp trusted/workers/preview/deploy/redact_preview_log.sh "$preview_dir/deploy/redact_preview_log.sh"',
+  'cp trusted/workers/preview/deploy/render_preview_config.cjs "$preview_dir/deploy/render_preview_config.cjs"',
+  'chmod 0755 "$preview_dir/deploy/redact_preview_log.sh"',
   'diagnostics_nonce="$(openssl rand -hex 32)"',
   'sed -i "s/\${PREVIEW_DIAGNOSTICS_NONCE}/${diagnostics_nonce}/g" "$preview_dir/src/index.ts"',
+  'cp "$preview_dir/wrangler.toml" "$preview_dir/wrangler.source.toml"',
   "Preview diagnostics nonce placeholder was not replaced",
   "npm ci --ignore-scripts --no-audit --no-fund"
 ].freeze
@@ -154,6 +164,8 @@ preview_workflow = YAML.safe_load_file(PREVIEW_WORKFLOW_PATH, aliases: true)
 pr_workflow = YAML.safe_load_file(PR_WORKFLOW_PATH, aliases: true)
 lockfile = JSON.parse(File.read(LOCKFILE_PATH))
 resolver_script = File.read(RESOLVER_PATH)
+config_renderer_script = File.read(CONFIG_RENDERER_PATH)
+redaction_helper_script = File.read(REDACTION_HELPER_PATH)
 preview_worker_script = File.read(PREVIEW_WORKER_PATH)
 preview_dockerfile = File.read(PREVIEW_DOCKERFILE_PATH)
 
@@ -195,6 +207,10 @@ deploy = step!(deploy_steps, "Deploy to Cloudflare Containers")
 warm_preview = step!(deploy_steps, "Warm preview container")
 collect_diagnostics = step!(deploy_steps, "Collect preview diagnostics")
 upload_diagnostics = step!(deploy_steps, "Upload preview diagnostics")
+collect_failure_diagnostics = step!(deploy_steps, "Collect preview failure diagnostics")
+upload_failure_diagnostics = step!(deploy_steps, "Upload preview failure diagnostics")
+prepare_cleanup_metadata = step!(deploy_steps, "Prepare cleanup metadata")
+store_cleanup_metadata = step!(deploy_steps, "Store cleanup metadata")
 update_deployment_status = step!(deployment_status_steps, "Update Deployment Status")
 comment_on_pr = step!(preview_comment_steps, "Comment on PR")
 
@@ -215,6 +231,7 @@ comment_on_pr = step!(preview_comment_steps, "Comment on PR")
   [ "preview gate head output", gate_job.dig("outputs", "head_sha"), "${{ steps.preview.outputs.head_sha }}" ],
   [ "preview gate fork output", gate_job.dig("outputs", "is_fork"), "${{ steps.preview.outputs.is_fork }}" ],
   [ "preview gate PR output", gate_job.dig("outputs", "pr_number"), "${{ steps.preview.outputs.pr_number }}" ],
+  [ "preview gate resolution source output", gate_job.dig("outputs", "resolution_source"), "${{ steps.preview.outputs.resolution_source }}" ],
   [ "preview image needs", image_job.fetch("needs"), "ci" ],
   [ "preview image permissions", image_job.fetch("permissions"), EXPECTED_IMAGE_PERMISSIONS ],
   [ "preview image timeout", image_job.fetch("timeout-minutes"), 30 ],
@@ -240,6 +257,7 @@ comment_on_pr = step!(preview_comment_steps, "Comment on PR")
   [ "deploy HEAD_SHA env", deploy_job.dig("env", "HEAD_SHA"), "${{ needs.preview-gate.outputs.head_sha }}" ],
   [ "deploy IS_FORK env", deploy_job.dig("env", "IS_FORK"), "${{ needs.preview-gate.outputs.is_fork }}" ],
   [ "deploy PR_NUMBER env", deploy_job.dig("env", "PR_NUMBER"), "${{ needs.preview-gate.outputs.pr_number }}" ],
+  [ "deploy RESOLUTION_SOURCE env", deploy_job.dig("env", "RESOLUTION_SOURCE"), "${{ needs.preview-gate.outputs.resolution_source }}" ],
   [ "deployment status needs", deployment_status_job.fetch("needs"), [ "preview-gate", "deployment_record", "deploy-preview" ] ],
   [ "deployment status permissions", deployment_status_job.fetch("permissions"), EXPECTED_DEPLOYMENT_PERMISSIONS ],
   [ "deployment status timeout", deployment_status_job.fetch("timeout-minutes"), 5 ],
@@ -269,8 +287,18 @@ comment_on_pr = step!(preview_comment_steps, "Comment on PR")
   [ "fork deployment record guard", create_deployment.fetch("if"), "env.IS_FORK == 'false'" ],
   [ "diagnostics upload if", upload_diagnostics.fetch("if"), "always() && steps.deploy.outputs.preview_url != ''" ],
   [ "diagnostics upload name", upload_diagnostics.dig("with", "name"), "preview-diagnostics-pr-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}" ],
-  [ "diagnostics upload path", upload_diagnostics.dig("with", "path"), "${{ runner.temp }}/preview-diagnostics.json" ],
+  [ "diagnostics upload path", upload_diagnostics.dig("with", "path"), EXPECTED_DIAGNOSTICS_PATH ],
   [ "diagnostics upload retention", upload_diagnostics.dig("with", "retention-days"), 3 ],
+  [ "failure diagnostics collect if", collect_failure_diagnostics.fetch("if"), "failure()" ],
+  [ "failure diagnostics upload if", upload_failure_diagnostics.fetch("if"), "failure()" ],
+  [ "failure diagnostics upload name", upload_failure_diagnostics.dig("with", "name"), "preview-failure-diagnostics-pr-${{ env.PR_NUMBER }}-${{ env.HEAD_SHA }}" ],
+  [ "failure diagnostics upload path", upload_failure_diagnostics.dig("with", "path"), EXPECTED_FAILURE_DIAGNOSTICS_PATH ],
+  [ "failure diagnostics upload retention", upload_failure_diagnostics.dig("with", "retention-days"), 3 ],
+  [ "cleanup metadata prepare if", prepare_cleanup_metadata.fetch("if"), "success()" ],
+  [ "cleanup metadata upload if", store_cleanup_metadata.fetch("if"), "success()" ],
+  [ "cleanup metadata upload name", store_cleanup_metadata.dig("with", "name"), "preview-cleanup-pr-${{ env.PR_NUMBER }}" ],
+  [ "cleanup metadata upload path", store_cleanup_metadata.dig("with", "path"), EXPECTED_CLEANUP_METADATA_PATH ],
+  [ "cleanup metadata upload retention", store_cleanup_metadata.dig("with", "retention-days"), 2 ],
   [ "Wrangler binary", wrangler.dig("bin", "wrangler"), "bin/wrangler.js" ]
 ].each { |label, actual, expected| assert(actual == expected, "#{label}: expected #{actual.inspect} to equal #{expected.inspect}") }
 
@@ -298,7 +326,28 @@ assert(gate_trusted_checkout.dig("with", "sparse-checkout").to_s.include?("worke
 assert(trusted_checkout.dig("with", "sparse-checkout").to_s.include?("workers/preview"), "trusted checkout must include preview tooling")
 assert(deploy_step_names.compact.uniq == deploy_step_names.compact, "workflow step names must stay unique for security checks")
 assert([ gate_trusted_checkout, resolve_preview ].map { |step| gate_steps.index(step) }.each_cons(2).all? { |left, right| left < right }, "gate workflow steps must checkout trusted resolver before use")
-assert([ trusted_checkout, download_artifact, verify_checksum, prepare, load_image, push_image, configure_image, deploy, warm_preview, collect_diagnostics, upload_diagnostics ].map { |step| deploy_steps.index(step) }.each_cons(2).all? { |left, right| left < right }, "deploy workflow steps must preserve safe cross-run artifact deploy order")
+required_deploy_order = [
+  trusted_checkout,
+  download_artifact,
+  verify_checksum,
+  prepare,
+  load_image,
+  push_image,
+  configure_image,
+  deploy,
+  warm_preview,
+  collect_diagnostics,
+  upload_diagnostics,
+  collect_failure_diagnostics,
+  upload_failure_diagnostics,
+  prepare_cleanup_metadata,
+  store_cleanup_metadata
+]
+assert(
+  required_deploy_order.map { |step| deploy_steps.index(step) }
+    .each_cons(2).all? { |left, right| left < right },
+  "deploy workflow steps must preserve safe cross-run artifact deploy order"
+)
 assert(deploy_steps.none? { |step| step["name"] == "Checkout PR code" }, "privileged deploy job must not checkout PR code")
 assert(env_hash(deploy_job).keys.none? { |name| name.start_with?("CLOUDFLARE_") }, "Cloudflare secrets must not be job-wide")
 assert(env_hash(gate_job).keys.none? { |name| name.start_with?("CLOUDFLARE_") }, "preview gate must not receive Cloudflare secrets")
@@ -344,6 +393,9 @@ assert_run_includes(
   "workflowRun.pull_requests?.[0]",
   "github.rest.repos.listPullRequestsAssociatedWithCommit",
   "parsePreviewArtifactName",
+  "artifactPullRequestNumbers.length === 1",
+  "conflicts with workflow_run PR",
+  "conflicts with commit-associated PRs",
   "pullRequest.head.sha !== headSha",
   "is stale for PR",
   "preview-cf",
@@ -352,9 +404,42 @@ assert_run_includes(
   "!item.expired",
   "core.setOutput(\"artifact_name\", artifactName)",
   "core.setOutput(\"is_fork\", String(isFork))",
+  "core.setOutput(\"resolution_source\", selected.source)",
   "core.setOutput(\"should_deploy\", \"true\")"
 ].each { |needle| assert(resolver_script.include?(needle), "preview resolver must include #{needle.inspect}") }
 
+artifact_resolution_index = resolver_script.index("artifactPullRequestNumbers.length === 1")
+workflow_run_fallback_index = resolver_script.index("if (workflowRunPullRequestNumber)")
+assert(artifact_resolution_index, "preview resolver must inspect exact preview artifacts")
+assert(workflow_run_fallback_index, "preview resolver must retain workflow_run PR fallback")
+assert(
+  artifact_resolution_index < workflow_run_fallback_index,
+  "preview resolver must prefer exact preview artifacts before workflow_run PR metadata"
+)
+assert(File.executable?(REDACTION_HELPER_PATH), "preview log redaction helper must be executable")
+[
+  "registry\\.cloudflare\\.com/[^/]+/",
+  "Authorization|Proxy-Authorization",
+  "X-Auth-Key|X-Auth-Email|X-Api-Key|Api-Key",
+  "api_key|access_token|refresh_token|auth_token|key|private_key",
+  "CLOUDFLARE_ACCOUNT_ID=",
+  "CLOUDFLARE_API_TOKEN|API_KEY|ACCESS_TOKEN|REFRESH_TOKEN|AUTH_TOKEN|PRIVATE_KEY",
+  "<redacted-token>",
+  "<redacted-account>"
+].each { |needle| assert(redaction_helper_script.include?(needle), "preview log redaction helper must include #{needle.inspect}") }
+
+[
+  "REGISTRY_IMAGE_REF_PATTERN",
+  "REGISTRY_IMAGE_REF_SCAN_PATTERN",
+  "function validateRegistryImageRef",
+  "function renderPreviewConfig",
+  "function findRegistryImageRef",
+  "Expected wrangler.toml source to contain exactly one image entry",
+  "Cloudflare registry image reference does not match this preview artifact",
+  "Cloudflare registry image reference account does not match this workflow",
+  "module.exports"
+].each { |needle| assert(config_renderer_script.include?(needle), "preview config renderer must include #{needle.inspect}") }
+
 prepare_run = assert_run_includes(prepare, *REQUIRED_PREPARE_LINES)
 assert(!prepare_run.include?("npm install"), "prepare step must not use npm install")
 assert(!prepare_run.include?("CLOUDFLARE_API_TOKEN"), "prepare step must not receive Cloudflare secrets")
@@ -371,24 +456,40 @@ assert_run_includes(load_image, 'gzip -dc "$image_archive" | docker load', 'dock
 push_image_run = assert_run_includes(
   push_image,
   "./node_modules/.bin/wrangler containers push",
-  "registry\\.cloudflare\\.com/",
+  "registry.cloudflare.com/${CLOUDFLARE_ACCOUNT_ID}/${image_tag}",
   "image_ref=",
+  'source_config="$RUNNER_TEMP/sure-preview-worker/wrangler.source.toml"',
   'config_path="$RUNNER_TEMP/sure-preview-worker/wrangler.toml"',
-  'LOCAL_IMAGE_TAG="$image_tag" node - "$config_path"',
-  "Expected local preview image tag for wrangler containers push",
-  "Expected wrangler.toml to contain an image entry to rewrite before push"
+  'temporary_image_ref="registry.cloudflare.com/${CLOUDFLARE_ACCOUNT_ID}/${image_tag}"',
+  'PREVIEW_IMAGE_REF="$temporary_image_ref" node ./deploy/render_preview_config.cjs render "$source_config" "$config_path"',
+  'cp "$config_path" "$RUNNER_TEMP/wrangler-push.toml"',
+  'image_ref="$(node ./deploy/render_preview_config.cjs find "$clean_log")"'
 )
-push_rewrite_index = push_image_run.index('LOCAL_IMAGE_TAG="$image_tag" node - "$config_path"')
+push_rewrite_index = push_image_run.index('PREVIEW_IMAGE_REF="$temporary_image_ref" node ./deploy/render_preview_config.cjs render "$source_config" "$config_path"')
 push_command_index = push_image_run.index("./node_modules/.bin/wrangler containers push")
 assert(
   push_rewrite_index < push_command_index,
-  "push step must rewrite wrangler.toml to the loaded local image tag before wrangler validates it"
+  "push step must rewrite wrangler.toml to a registry-shaped image ref before wrangler validates it"
 )
-assert_run_includes(configure_image, "imageRef.startsWith('registry.cloudflare.com/')", 'const original = fs.readFileSync', 'const updated = original.replace(/image = "[^"]+"/', "updated === original", "Expected wrangler.toml to contain an image entry to rewrite", "JSON.stringify(imageRef)")
+assert(push_image_run.index('wrangler.source.toml') < push_rewrite_index, "push step must render from the preserved trusted source config")
+assert(!push_image_run.include?("LOCAL_IMAGE_TAG"), "push step must not write a local Docker tag into wrangler.toml")
+assert(!push_image_run.include?("Expected local preview image tag"), "push step must not accept local Docker tags as wrangler config image refs")
+assert_run_includes(push_image, 'tee "$push_log" | ./deploy/redact_preview_log.sh', "push_status=${PIPESTATUS[0]}")
+configure_image_run = assert_run_includes(
+  configure_image,
+  'source_config="$RUNNER_TEMP/sure-preview-worker/wrangler.source.toml"',
+  'PREVIEW_IMAGE_REF="$IMAGE_REF" node "$RUNNER_TEMP/sure-preview-worker/deploy/render_preview_config.cjs" render "$source_config" "$config_path"',
+  'cp "$config_path" "$RUNNER_TEMP/wrangler-final.toml"',
+  "preserved trusted source template",
+  'redact_preview_log.sh" < "$config_path"'
+)
+assert(!configure_image_run.include?('const updated = original.replace(/image = "[^"]+"/'), "final image configuration must use the tested renderer instead of inline regex replacement")
 assert_run_includes(create_deployment, "github.rest.repos.createDeployment", "ref: headSha", "preview-pr-${prNumber}")
-assert_run_includes(deploy, 'cd "$RUNNER_TEMP/sure-preview-worker"', "deploy_once()", "./node_modules/.bin/wrangler deploy --config wrangler.toml", '--var "PR_NUMBER:${PR_NUMBER}"', "associated with a different durable object namespace", 'if ! ./node_modules/.bin/wrangler delete --name "sure-preview-${PR_NUMBER}" --force', "Preview Worker delete failed", "retrying once")
+assert_run_includes(deploy, 'cd "$RUNNER_TEMP/sure-preview-worker"', "deploy_once()", "./node_modules/.bin/wrangler deploy --config wrangler.toml", '--var "PR_NUMBER:${PR_NUMBER}"', 'tee "$deploy_log" | ./deploy/redact_preview_log.sh', "deploy_status=${PIPESTATUS[0]}", "associated with a different durable object namespace", 'if ! ./node_modules/.bin/wrangler delete --name "sure-preview-${PR_NUMBER}" --force', "Preview Worker delete failed", "retrying once")
 assert_run_includes(warm_preview, "$PREVIEW_URL/_container_status", "--connect-timeout 5", "--max-time 15")
-assert_run_includes(collect_diagnostics, "$PREVIEW_URL/_container_status", "--connect-timeout 5", "--max-time 15", "seq 1 40", "preview-diagnostics.json", "jq -e '.previewReady == true or .previewFailed == true'", "jq -e '.previewFailed == true'", "Preview diagnostics from _container_status reported previewFailed=true", "jq -e '.previewReady == true'", "Preview diagnostics from _container_status did not reach previewReady=true", ".timings.previewReadyAt != null and .timings.secondsToPreviewReady != null", "Preview diagnostics are missing readiness timing fields", "exit 1")
+assert_run_includes(collect_diagnostics, "$PREVIEW_URL/_container_status", "--connect-timeout 5", "--max-time 15", "seq 1 100", "preview-diagnostics", "preview-diagnostics.json", "latest-metrics.json", "metrics-polls.log", "summary.md", '! jq -e . "$diagnostics_file"', 'raw_snippet="$(head -c 2048 "$diagnostics_file")"', 'latest_metrics_snapshot="$(head -c 2048 "$latest_metrics_file")"', "rawSnippet", "latestMetrics", "jq -e '.previewReady == true or .previewFailed == true'", "jq -e '.previewFailed == true'", "Preview diagnostics from _container_status reported previewFailed=true", "jq -e '.previewReady == true'", "Preview diagnostics from _container_status did not reach previewReady=true", ".timings.previewReadyAt != null and .timings.secondsToPreviewReady != null", "Preview diagnostics are missing readiness timing fields", "exit 1")
+assert_run_includes(collect_failure_diagnostics, "preview-failure-diagnostics", "preview-request.json", "preview-image-manifest.json", "wrangler-source.toml", "wrangler-push.toml", "wrangler-final.toml", "wrangler.toml", "wrangler-containers-push.log", "wrangler-deploy.log", "redaction_helper=", 'sanitize_copy "$RUNNER_TEMP/sure-preview-worker/wrangler.source.toml"', 'sanitize_copy "$RUNNER_TEMP/wrangler-push.toml"', 'sanitize_copy "$RUNNER_TEMP/wrangler-final.toml"', "wrangler-deploy.clean.log", "resolutionSource")
+assert_run_includes(prepare_cleanup_metadata, "preview-cleanup-metadata", "redact_preview_log.sh", "$RUNNER_TEMP/sure-preview-worker/wrangler.toml", "$metadata_dir/wrangler.toml")
 assert_run_includes(update_deployment_status, "github.rest.repos.createDeploymentStatus", "process.env.DEPLOY_RESULT === 'success'", "deployment_id: Number(process.env.DEPLOYMENT_ID)")
 assert_run_includes(comment_on_pr, "github.rest.issues.listComments", "github.rest.issues.updateComment", "github.rest.issues.createComment", "Preview Deployment Ready")
 
diff --git a/charts/sure/CHANGELOG.md b/charts/sure/CHANGELOG.md
index 490cbe136..7b3afe88b 100644
--- a/charts/sure/CHANGELOG.md
+++ b/charts/sure/CHANGELOG.md
@@ -5,6 +5,17 @@ All notable changes to the Sure Helm chart will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Changed
+- Bumped `pipelock.image.tag` from `2.5.0` to `2.8.0`, picking up default-on flight recorder receipts, safe-by-default receipt verification, MCP `defer` authorization, `pipelock explain`, `pipelock keys status`, `pipelock support bundle`, verified self-update, and inert-exemption diagnostics.
+- Refreshed Pipelock docs across Docker, MCP, AI, and chart setup to distinguish scanning from verifiable receipt evidence.
+- Enabled `pipelock.requestBodyScanning` by default with `action: warn`, matching Pipelock's current balanced preset so outbound prompt bodies and sensitive headers are scanned.
+
+### Added
+- `pipelock.flightRecorder`: structured Helm values for rendering `flight_recorder.enabled`, `require_receipts`, `redact`, `dir`, and `signing_key_path`.
+- `pipelock.extraVolumes` and `pipelock.extraVolumeMounts`: mount receipt evidence storage and receipt-signing keys without duplicating the Pipelock deployment template.
+
 ## [0.7.1] - 2026-05-31]
 
 ### Changed
diff --git a/charts/sure/Chart.yaml b/charts/sure/Chart.yaml
index 028a2ca59..ffaa47a01 100644
--- a/charts/sure/Chart.yaml
+++ b/charts/sure/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: sure
 description: Official Helm chart for deploying the Sure Rails app (web + Sidekiq) on Kubernetes with optional HA PostgreSQL (CloudNativePG) and Redis.
 type: application
-version: 0.7.2-alpha.3
-appVersion: "0.7.2-alpha.3"
+version: 0.7.3-alpha.7
+appVersion: "0.7.3-alpha.7"
 
 kubeVersion: ">=1.25.0-0"
 
diff --git a/charts/sure/README.md b/charts/sure/README.md
index 42a6688c8..a7581cc99 100644
--- a/charts/sure/README.md
+++ b/charts/sure/README.md
@@ -645,7 +645,7 @@ hpa:
 - **Forward proxy** (port 8888): Scans outbound HTTPS from Faraday-based AI clients. Auto-injected via `HTTPS_PROXY` env vars when enabled.
 - **MCP reverse proxy** (port 8889): Scans inbound MCP traffic from external AI assistants.
 
-Recent pipelock releases add the Audit Packet v0 schema and language-portable verifiers (Go, TypeScript, Rust), request-body prompt-injection blocking, SPIFFE-strict inbound mediation envelopes, scanner attribution on MCP block receipts, enhanced tool poisoning detection, per-read kill switch preemption, trusted domain allowlisting, MCP tool redirect profiles, signed action receipts, per-pattern DLP warn mode, learn-and-lock behavioural contracts, the wedge-detection health watchdog, and the `pipelock posture verify` / `pipelock session` / `pipelock doctor` CLIs. Browser Shield, process sandboxing, and attack simulation are available via `extraConfig` and CLI. See the [pipelock changelog](https://github.com/luckyPipewrench/pipelock/releases) for details.
+Recent Pipelock releases add default-on flight recorder receipts, safe-by-default receipt verification, MCP `defer` authorization, request-policy scoring, request-body prompt-injection blocking, SPIFFE-strict inbound mediation envelopes, scanner attribution on MCP block receipts, trusted domain allowlisting, MCP tool redirect profiles, learn-and-lock behavioural contracts, the wedge-detection health watchdog, `pipelock explain`, `pipelock keys status`, `pipelock support bundle`, verified `pipelock update`, and `pipelock doctor` checks for inert exemptions. Browser Shield, process sandboxing, request policy, redaction, and attack assessment are available via `extraConfig` and CLI. See the [Pipelock changelog](https://github.com/luckyPipewrench/pipelock/releases) for details.
 
 ### Enabling Pipelock
 
@@ -653,7 +653,7 @@ Recent pipelock releases add the Audit Packet v0 schema and language-portable ve
 pipelock:
   enabled: true
   image:
-    tag: "2.5.0"
+    tag: "2.8.0"
   mode: balanced   # strict, balanced, or audit
 ```
 
@@ -702,7 +702,7 @@ pipelock:
     headerMode: sensitive # "sensitive" or "all"
 ```
 
-Disabled by default. Roll out with `action: warn` first to observe findings in logs without blocking, then flip to `action: block` once the false-positive rate is acceptable.
+Enabled by default with `action: warn`, matching Pipelock's balanced preset. Review findings in logs before flipping to `action: block`.
 
 ### Health watchdog
 
@@ -716,19 +716,72 @@ pipelock:
     exposeSubsystems: true  # adds per-subsystem boolean map to /health
 ```
 
-### Validating your config
+### Signed action receipts
 
-Pipelock includes CLI tools for config validation:
+The flight recorder writes hash-chained, Ed25519-signed action receipts. The chart renders the `flight_recorder` config, but recording is inert until you mount a writable evidence directory and the signing key named by `signingKeyPath`.
+
+Generate the receipt key once:
 
 ```bash
-# Run 24 synthetic attack scenarios against your config
-pipelock simulate --config pipelock.yaml
+# --out must be an absolute path; "$PWD/..." writes the key into the current directory.
+pipelock signing key generate --purpose receipt-signing --out "$PWD/flight-recorder-signing.key" --id sure-k8s
+kubectl create secret generic sure-pipelock-receipts \
+  --namespace sure \
+  --from-file=flight-recorder-signing.key=./flight-recorder-signing.key
+```
+
+If you do not have the `pipelock` binary installed, generate the key with the image instead: `docker run --rm -v "$PWD:/out" ghcr.io/luckypipewrench/pipelock:2.8.0 signing key generate --purpose receipt-signing --out /out/flight-recorder-signing.key --id sure-k8s`.
+
+Then mount persistent evidence storage and the key:
+
+```yaml
+pipelock:
+  flightRecorder:
+    enabled: true
+    dir: /var/lib/pipelock/evidence
+    signingKeyPath: /run/secrets/pipelock/flight-recorder-signing.key
+    requireReceipts: false
+    redact: true
+  extraVolumes:
+    - name: pipelock-evidence
+      persistentVolumeClaim:
+        claimName: sure-pipelock-evidence
+    - name: pipelock-receipt-key
+      secret:
+        secretName: sure-pipelock-receipts
+        # 0440 (group-read), not 0400: the chart runs Pipelock as uid 1000 with
+        # fsGroup 1000, so the secret file is owned root:1000. A 0400 file would
+        # be unreadable by the non-root process and Pipelock would crash on
+        # startup with a key-load error. 0440 lets the fsGroup read it.
+        defaultMode: 0440
+  extraVolumeMounts:
+    - name: pipelock-evidence
+      mountPath: /var/lib/pipelock/evidence
+    - name: pipelock-receipt-key
+      # Do not mount this under /etc/pipelock; the chart already mounts the
+      # Pipelock ConfigMap there.
+      mountPath: /run/secrets/pipelock
+      readOnly: true
+```
+
+Only set `requireReceipts: true` after confirming receipts are being written. With it enabled, allow-path traffic fails closed if Pipelock cannot sign or persist the receipt.
+
+### Validating your config
+
+Pipelock includes CLI tools for config validation and deployment diagnostics:
+
+```bash
+# Create and run a broader assessment workspace
+pipelock assess init --config pipelock.yaml
 
 # Score your config's security posture (0-100)
 pipelock audit score --config pipelock.yaml
 
 # Report whether configured protections are actually enforceable
 pipelock doctor
+
+# Explain a block and the exact config knob that scanner reads
+pipelock explain --config pipelock.yaml "https://example.com/path"
 ```
 
 ### Exposing MCP to external AI assistants
@@ -795,7 +848,7 @@ pipelock:
 
 ### Extra config (escape hatch)
 
-For Pipelock config sections not covered by structured values (session profiling, data budgets, kill switch, sandbox, reverse proxy, adaptive enforcement, etc.), use `extraConfig`:
+For Pipelock config sections not covered by structured values (session profiling, data budgets, kill switch, sandbox, reverse proxy, adaptive enforcement, request policy, redaction, etc.), use `extraConfig`:
 
 ```yaml
 pipelock:
@@ -847,7 +900,7 @@ See `values.yaml` for the complete configuration surface, including:
 - `migrations.*`: strategy job or initContainer
 - `simplefin.encryption.*`: enable + backfill options
 - `cronjobs.*`: custom CronJobs
-- `pipelock.*`: AI agent security proxy (forward proxy, MCP reverse proxy, DLP, injection scanning, request-body scanning, health watchdog, trusted domains, tool redirect profiles, logging, serviceMonitor, ingress, PDB, extraConfig)
+- `pipelock.*`: AI agent security proxy (forward proxy, MCP reverse proxy, DLP, injection scanning, request-body scanning, health watchdog, signed receipts, trusted domains, tool redirect profiles, logging, serviceMonitor, ingress, PDB, extraVolumes, extraVolumeMounts, extraConfig)
 - `service.*`, `ingress.*`, `serviceMonitor.*`, `hpa.*`
 
 ## Helm tests
diff --git a/charts/sure/templates/_helpers.tpl b/charts/sure/templates/_helpers.tpl
index d36105db9..539401d5e 100644
--- a/charts/sure/templates/_helpers.tpl
+++ b/charts/sure/templates/_helpers.tpl
@@ -161,7 +161,7 @@ true
 {{/* Pipelock image string */}}
 {{- define "sure.pipelockImage" -}}
 {{- $repo := "ghcr.io/luckypipewrench/pipelock" -}}
-{{- $tag := "latest" -}}
+{{- $tag := "2.8.0" -}}
 {{- if .Values.pipelock.image -}}
 {{- $repo = .Values.pipelock.image.repository | default $repo -}}
 {{- $tag = .Values.pipelock.image.tag | default $tag -}}
diff --git a/charts/sure/templates/pipelock-configmap.yaml b/charts/sure/templates/pipelock-configmap.yaml
index c77ee68ba..e49c27004 100644
--- a/charts/sure/templates/pipelock-configmap.yaml
+++ b/charts/sure/templates/pipelock-configmap.yaml
@@ -65,7 +65,7 @@
 {{- $chainWindow = int (.Values.pipelock.toolChainDetection.windowSize | default 20) -}}
 {{- $chainGap = int (.Values.pipelock.toolChainDetection.maxGap | default 3) -}}
 {{- end -}}
-{{- $rbsEnabled := false -}}
+{{- $rbsEnabled := true -}}
 {{- $rbsAction := "warn" -}}
 {{- $rbsMaxBytes := 5242880 -}}
 {{- $rbsScanHeaders := true -}}
@@ -93,6 +93,24 @@
 {{- $hwExpose = .Values.pipelock.healthWatchdog.exposeSubsystems -}}
 {{- end -}}
 {{- end -}}
+{{- $frEnabled := true -}}
+{{- $frRequireReceipts := false -}}
+{{- $frRedact := true -}}
+{{- $frDir := "" -}}
+{{- $frSigningKeyPath := "" -}}
+{{- if .Values.pipelock.flightRecorder -}}
+{{- if hasKey .Values.pipelock.flightRecorder "enabled" -}}
+{{- $frEnabled = .Values.pipelock.flightRecorder.enabled -}}
+{{- end -}}
+{{- if hasKey .Values.pipelock.flightRecorder "requireReceipts" -}}
+{{- $frRequireReceipts = .Values.pipelock.flightRecorder.requireReceipts -}}
+{{- end -}}
+{{- if hasKey .Values.pipelock.flightRecorder "redact" -}}
+{{- $frRedact = .Values.pipelock.flightRecorder.redact -}}
+{{- end -}}
+{{- $frDir = .Values.pipelock.flightRecorder.dir | default "" -}}
+{{- $frSigningKeyPath = .Values.pipelock.flightRecorder.signingKeyPath | default "" -}}
+{{- end -}}
 {{- $logFormat := "json" -}}
 {{- $logOutput := "stdout" -}}
 {{- $logIncludeAllowed := false -}}
@@ -197,6 +215,16 @@ data:
       enabled: {{ $hwEnabled }}
       interval_seconds: {{ $hwInterval }}
       expose_subsystems: {{ $hwExpose }}
+    flight_recorder:
+      enabled: {{ $frEnabled }}
+      require_receipts: {{ $frRequireReceipts }}
+      redact: {{ $frRedact }}
+{{- if $frDir }}
+      dir: {{ $frDir | quote }}
+{{- end }}
+{{- if $frSigningKeyPath }}
+      signing_key_path: {{ $frSigningKeyPath | quote }}
+{{- end }}
     logging:
       format: {{ $logFormat }}
       output: {{ $logOutput }}
diff --git a/charts/sure/templates/pipelock-deployment.yaml b/charts/sure/templates/pipelock-deployment.yaml
index bf57ec8ab..f1b1ea223 100644
--- a/charts/sure/templates/pipelock-deployment.yaml
+++ b/charts/sure/templates/pipelock-deployment.yaml
@@ -45,6 +45,9 @@ spec:
         - name: config
           configMap:
             name: {{ include "sure.fullname" . }}-pipelock
+        {{- with .Values.pipelock.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       containers:
         - name: pipelock
           image: {{ include "sure.pipelockImage" . }}
@@ -63,6 +66,9 @@ spec:
             - name: config
               mountPath: /etc/pipelock
               readOnly: true
+            {{- with .Values.pipelock.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           ports:
             - name: proxy
               containerPort: {{ $fwdPort }}
diff --git a/charts/sure/values.yaml b/charts/sure/values.yaml
index d01d0dc5e..193fa2b69 100644
--- a/charts/sure/values.yaml
+++ b/charts/sure/values.yaml
@@ -497,7 +497,7 @@ pipelock:
   enabled: false
   image:
     repository: ghcr.io/luckypipewrench/pipelock
-    tag: "2.5.0"
+    tag: "2.8.0"
     pullPolicy: IfNotPresent
     imagePullSecrets: []
   replicas: 1
@@ -565,7 +565,7 @@ pipelock:
   # destinations even when action is "warn"; trusted provider hosts (OpenAI,
   # Anthropic, etc.) remain exempt via the response_scanning exemption list.
   requestBodyScanning:
-    enabled: false
+    enabled: true
     action: warn               # warn or block
     maxBodyBytes: 5242880      # 5 MB; fail-closed above this
     scanHeaders: true          # scan request headers for DLP
@@ -577,6 +577,16 @@ pipelock:
     enabled: true
     intervalSeconds: 2
     exposeSubsystems: false    # include per-subsystem map in /health response
+  # Flight recorder: signed, hash-chained action receipts. Enabled by default in
+  # Pipelock, but inert until both dir and signingKeyPath are set and mounted.
+  # Use extraVolumes/extraVolumeMounts below to mount persistent storage and a
+  # Secret containing the signing key.
+  flightRecorder:
+    enabled: true
+    requireReceipts: false      # true = fail closed if allow-path receipt cannot be emitted
+    redact: true                # redact DLP-shaped content before writing receipts
+    dir: ""                     # e.g. /var/lib/pipelock/evidence
+    signingKeyPath: ""          # e.g. /run/secrets/pipelock/flight-recorder-signing.key
   service:
     type: ClusterIP
   resources:
@@ -590,6 +600,8 @@ pipelock:
   tolerations: []
   affinity: {}
   topologySpreadConstraints: []
+  extraVolumes: []
+  extraVolumeMounts: []
 
   # Prometheus Operator ServiceMonitor for /metrics on the proxy port
   serviceMonitor:
diff --git a/compose.example.ai.yml b/compose.example.ai.yml
index 48a696f38..c09fe1b39 100644
--- a/compose.example.ai.yml
+++ b/compose.example.ai.yml
@@ -112,12 +112,33 @@ x-rails-env: &rails_env
 
 services:
   pipelock:
-    image: ghcr.io/luckypipewrench/pipelock:latest  # pin to a specific version (e.g., :2.5.0) for production
+    image: ghcr.io/luckypipewrench/pipelock:2.8.0
+    user: "${PIPELOCK_UID:-1000}:${PIPELOCK_GID:-1000}"
     container_name: pipelock
     hostname: pipelock
     restart: unless-stopped
     volumes:
       - ./pipelock.example.yaml:/etc/pipelock/pipelock.yaml:ro
+      # Optional signed receipts (flight recorder). Off until you create the
+      # dirs, generate a key, uncomment the two mounts below, and uncomment
+      # flight_recorder.dir + signing_key_path in pipelock.example.yaml.
+      # Create the dirs yourself first so they are owned by your host user
+      # (Docker would otherwise create missing bind-mount paths as root, which
+      # the uid-1000 Pipelock process cannot write to):
+      #   mkdir -p ./pipelock-evidence ./pipelock-keys
+      # Generate the receipt-signing key via the image (no host binary needed;
+      # --out must be an absolute path inside the container):
+      #   docker run --rm -v "$PWD/pipelock-keys:/keys" ghcr.io/luckypipewrench/pipelock:2.8.0 \
+      #     signing key generate --purpose receipt-signing --out /keys/flight-recorder-signing.key --id sure-compose
+      # The key is written 0600 owned by uid 1000 (Pipelock's default user). If
+      # your host user is not uid 1000, use this variant instead:
+      #   export PIPELOCK_UID="$(id -u)" PIPELOCK_GID="$(id -g)"
+      #   docker run --rm --user "$PIPELOCK_UID:$PIPELOCK_GID" -v "$PWD/pipelock-keys:/keys" ghcr.io/luckypipewrench/pipelock:2.8.0 \
+      #     signing key generate --purpose receipt-signing --out /keys/flight-recorder-signing.key --id sure-compose
+      # That makes the key and evidence directory readable/writable by the same
+      # uid/gid the compose service uses.
+      # - ./pipelock-evidence:/var/lib/pipelock/evidence
+      # - ./pipelock-keys:/etc/pipelock/keys:ro
     command:
       - "run"
       - "--config"
diff --git a/compose.example.yml b/compose.example.yml
index 108fd6b9a..b93219624 100644
--- a/compose.example.yml
+++ b/compose.example.yml
@@ -58,6 +58,10 @@ x-rails-env: &rails_env
   REDIS_URL: redis://redis:6379/1
   # NOTE: enabling OpenAI will incur costs when you use AI-related features in the app (chat, rules).  Make sure you have set appropriate spend limits on your account before adding this.
   OPENAI_ACCESS_TOKEN: ${OPENAI_ACCESS_TOKEN}
+  OPENAI_MODEL: ${OPENAI_MODEL:-}
+  OPENAI_URI_BASE: ${OPENAI_URI_BASE:-}
+  LLM_CONTEXT_WINDOW: ${LLM_CONTEXT_WINDOW:-}
+  OPENAI_REQUEST_TIMEOUT: ${OPENAI_REQUEST_TIMEOUT:-60}
 
 services:
   web:
diff --git a/config/application.rb b/config/application.rb
index cba92a83c..d8a9f1d05 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module Sure
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 7.2
+    config.load_defaults 8.1
 
     # Please, add to the `ignore` list any other `lib` subdirectories that do
     # not contain `.rb` files, or that should not be reloaded or eager loaded.
diff --git a/config/brakeman.ignore b/config/brakeman.ignore
index d6b23c8f8..df46de563 100644
--- a/config/brakeman.ignore
+++ b/config/brakeman.ignore
@@ -3,25 +3,48 @@
     {
       "warning_type": "Redirect",
       "warning_code": 18,
-      "fingerprint": "556f2fdd1f091ed50811cb2cce28dd2b987cd0a2eed4d19bea138c8c083a3a5d",
+      "fingerprint": "6d0cf62d5751106cd05dd3b4622beacaba9bdf91aaf798c2003a2a65e6bb903c",
       "check_name": "Redirect",
       "message": "Possible unprotected redirect",
       "file": "app/controllers/snaptrade_items_controller.rb",
-      "line": 125,
+      "line": 36,
       "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
-      "code": "redirect_to(Current.family.snaptrade_items.find(params[:id]).connection_portal_url(:redirect_url => callback_snaptrade_items_url(:item_id => Current.family.snaptrade_items.find(params[:id]).id)), :allow_other_host => true)",
+      "code": "redirect_to(Current.family.snaptrade_items.find(params[:id]).connection_portal_url(:redirect_url => callback_snaptrade_items_url(:item_id => Current.family.snaptrade_items.find(params[:id]).id, :return_to => params[:return_to], :accountable_type => params[:accountable_type])), :allow_other_host => true)",
       "render_path": null,
       "location": {
         "type": "method",
         "class": "SnaptradeItemsController",
         "method": "connect"
       },
-      "user_input": "Current.family.snaptrade_items.find(params[:id]).connection_portal_url(:redirect_url => callback_snaptrade_items_url(:item_id => Current.family.snaptrade_items.find(params[:id]).id))",
+      "user_input": "Current.family.snaptrade_items.find(params[:id]).connection_portal_url(:redirect_url => callback_snaptrade_items_url(:item_id => Current.family.snaptrade_items.find(params[:id]).id, :return_to => params[:return_to], :accountable_type => params[:accountable_type]))",
       "confidence": "Weak",
       "cwe_id": [
         601
       ],
-      "note": "Intentional redirect to SnapTrade's external OAuth portal for brokerage connection"
+      "note": "Intentional redirect to SnapTrade's external OAuth portal for brokerage connection. return_to/accountable_type are only used to route the user back to setup_accounts after the portal callback and are echoed verbatim, not used to build the redirect target itself."
+    },
+    {
+      "warning_type": "Redirect",
+      "warning_code": 18,
+      "fingerprint": "fc14dec97ce908f7483a8eb1f3aa6ea38f4369b8f9fe656e089c91a91c01a125",
+      "check_name": "Redirect",
+      "message": "Possible unprotected redirect",
+      "file": "app/controllers/snaptrade_items_controller.rb",
+      "line": 201,
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
+      "code": "redirect_to(Provider::Snaptrade.authorize_url(:redirect_uri => oauth_callback_snaptrade_items_url, :state => SecureRandom.hex(32), :code_challenge => Provider::Snaptrade.generate_pkce[:challenge]), :allow_other_host => true)",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "SnaptradeItemsController",
+        "method": "oauth_authorize"
+      },
+      "user_input": "Provider::Snaptrade.authorize_url(:redirect_uri => oauth_callback_snaptrade_items_url, :state => SecureRandom.hex(32), :code_challenge => Provider::Snaptrade.generate_pkce[:challenge])",
+      "confidence": "Weak",
+      "cwe_id": [
+        601
+      ],
+      "note": "Intentional redirect to SnapTrade's external OAuth authorize endpoint. URL is built entirely from Provider::Snaptrade::AUTHORIZE_URL (hardcoded constant), server-side oauth_client_id config, the internal oauth_callback_snaptrade_items_url named route, and locally generated SecureRandom state/PKCE values -- no request params are interpolated into the redirect target."
     },
     {
       "warning_type": "Redirect",
@@ -49,13 +72,13 @@
     {
       "warning_type": "Mass Assignment",
       "warning_code": 105,
-      "fingerprint": "d770e95392c6c69b364dcc0c99faa1c8f4f0cceb085bcc55630213d0b7b8b87f",
+      "fingerprint": "81c63f2c375da309440b9308df3ae9d1fcbada7043a26919898b08f3a38b29f6",
       "check_name": "PermitAttributes",
       "message": "Potentially dangerous key allowed for mass assignment",
       "file": "app/controllers/api/v1/trades_controller.rb",
-      "line": 165,
+      "line": 159,
       "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
-      "code": "params.require(:trade).permit(:account_id, :date, :qty, :price, :currency, :security_id, :ticker, :manual_ticker, :investment_activity_label, :category_id)",
+      "code": "params.require(:trade).permit(:account_id, :date, :qty, :price, :currency, :security_id, :ticker, :manual_ticker, :investment_activity_label, :category_id, :fee, :type, :amount, :transfer_account_id)",
       "render_path": null,
       "location": {
         "type": "method",
@@ -67,7 +90,7 @@
       "cwe_id": [
         915
       ],
-      "note": "account_id and security_id validated in create/update: account via family.accounts.find and supports_trades?, security via resolve_security"
+      "note": "account_id validated in create action (line 42: family.accounts.visible.find ensures family membership; lines 44-48: supports_trades? check); security_id validated via Security.find (line 290); transfer_account_id validated in Transfer::Creator where family.accounts.find scopes both source and destination accounts to the family (app/models/transfer/creator.rb lines 4-5); type validated in build_create_form_params against allowed values: buy, sell, dividend, deposit, withdrawal, interest (line 217)"
     },
     {
       "warning_type": "Mass Assignment",
@@ -118,13 +141,13 @@
     {
       "warning_type": "Dangerous Eval",
       "warning_code": 13,
-      "fingerprint": "c154514a0f86341473e4abf35e77721495b326c7855e4967d284b4942371819c",
+      "fingerprint": "ad8e31fe9321feba741d551654a6fb0c0c7cfe8abee81822e6143404817bff5b",
       "check_name": "Evaluation",
       "message": "Dynamic string evaluated as code",
       "file": "app/helpers/styled_form_builder.rb",
-      "line": 5,
+      "line": 10,
       "link": "https://brakemanscanner.org/docs/warning_types/dangerous_eval/",
-      "code": "class_eval(\"      def #{selector}(method, options = {})\\n        form_options = options.slice(:label, :label_tooltip, :inline, :container_class, :required)\\n        html_options = options.except(:label, :label_tooltip, :inline, :container_class)\\n\\n        build_field(method, form_options, html_options) do |merged_options|\\n          super(method, merged_options)\\n        end\\n      end\\n\", \"app/helpers/styled_form_builder.rb\", (5 + 1))",
+      "code": "class_eval(\"      def #{selector}(method, options = {})\\n        form_options = options.slice(:label, :label_tooltip, :inline, :container_class, :required)\\n        html_options = options.except(:label, :label_tooltip, :inline, :container_class)\\n\\n        build_field(method, form_options, html_options) do |merged_options|\\n          super(method, merged_options)\\n        end\\n      end\\n\", \"app/helpers/styled_form_builder.rb\", (10 + 1))",
       "render_path": null,
       "location": {
         "type": "method",
diff --git a/config/exchanges.yml b/config/exchanges.yml
index dfd9c89db..dd15ebdb6 100644
--- a/config/exchanges.yml
+++ b/config/exchanges.yml
@@ -316,3 +316,8 @@ XSAU:
 XJSE:
   name: Johannesburg
   country: ZA
+
+# Russia - Moscow Exchange (Operating MIC: MISX)
+MISX:
+  name: Moscow Exchange
+  country: RU
diff --git a/config/importmap.rb b/config/importmap.rb
index 308591cbd..e47127f12 100644
--- a/config/importmap.rb
+++ b/config/importmap.rb
@@ -9,6 +9,7 @@ pin_all_from "app/components", under: "controllers", to: ""
 pin_all_from "app/javascript/services", under: "services", to: "services"
 pin_all_from "app/javascript/utils", under: "utils", to: "utils"
 pin "utils/sankey_zoom", to: "utils/sankey_zoom.mjs"
+pin "utils/transactions_filter_url", to: "utils/transactions_filter_url.mjs"
 pin "@github/hotkey", to: "@github--hotkey.js" # @3.1.1
 pin "@simonwep/pickr", to: "@simonwep--pickr.js" # @1.9.1
 
diff --git a/config/initializers/dialog_defaults.rb b/config/initializers/dialog_defaults.rb
new file mode 100644
index 000000000..39f977777
--- /dev/null
+++ b/config/initializers/dialog_defaults.rb
@@ -0,0 +1,5 @@
+Rails.application.config.after_initialize do
+  DS::Dialog.defaults_provider = -> {
+    { disable_click_outside: Current.user&.disable_modal_click_outside? || false }
+  }
+end
diff --git a/config/initializers/encryption_warning.rb b/config/initializers/encryption_warning.rb
new file mode 100644
index 000000000..31d19b4aa
--- /dev/null
+++ b/config/initializers/encryption_warning.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+# Warn self-hosted operators when ActiveRecord Encryption is NOT configured.
+#
+# This emits a clear startup warning so plaintext-at-rest is never silent.
+require Rails.root.join("lib/active_record_encryption_config").to_s
+
+Rails.application.config.after_initialize do
+  app_mode = Rails.application.config.app_mode
+  if app_mode.self_hosted? && !ActiveRecordEncryptionConfig.explicitly_configured?
+    Rails.logger.warn(<<~WARN)
+      [SECURITY] ActiveRecord Encryption is NOT configured. Sensitive data
+      (API keys, provider/bank tokens, MFA secrets, and PII) are being stored
+      UNENCRYPTED at rest. To enable encryption, set the following keys in your Rails credentials or environment variables:
+        ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+        ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+        ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+      Generate a set with: bin/rails db:encryption:init
+    WARN
+  end
+end
diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb
index 5e4690a35..0db59bec4 100644
--- a/config/initializers/filter_parameter_logging.rb
+++ b/config/initializers/filter_parameter_logging.rb
@@ -6,5 +6,6 @@
 Rails.application.config.filter_parameters += [
   :passw, :email, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn, :openai_access_token,
   :client_id, :consumer_key, :snaptrade_user_id, :snaptrade_user_secret,
+  :oauth_access_token, :oauth_refresh_token, :code_verifier, :code_challenge,
   :bank_username, :bank_password, :security_answers, :captcha_input
 ]
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index b72785933..8261b8c7e 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -38,64 +38,17 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 
     case strategy
     when "openid_connect"
-      # Support per-provider credentials from config or fall back to global ENV vars
-      issuer = cfg[:issuer].presence || ENV["OIDC_ISSUER"].presence
-      client_id = cfg[:client_id].presence || ENV["OIDC_CLIENT_ID"].presence
-      client_secret = cfg[:client_secret].presence || ENV["OIDC_CLIENT_SECRET"].presence
-      redirect_uri = cfg[:redirect_uri].presence || ENV["OIDC_REDIRECT_URI"].presence
+      oidc_options = Oidc::ProviderOptionsBuilder.call(cfg)
 
-      # In test environment, use test values if nothing is configured
-      if Rails.env.test?
-        issuer ||= "https://test.example.com"
-        client_id ||= "test_client_id"
-        client_secret ||= "test_client_secret"
-        redirect_uri ||= "http://test.example.com/callback"
-      end
-
-      # Skip if required fields are missing (except in test)
-      unless issuer.present? && client_id.present? && client_secret.present? && redirect_uri.present?
+      unless oidc_options.present?
         Rails.logger.warn("[OmniAuth] Skipping OIDC provider '#{name}' - missing required configuration")
         next
       end
 
-      # Custom scopes: parse from settings if provided, otherwise use defaults
-      custom_scopes = cfg.dig(:settings, :scopes).presence
-      scopes = if custom_scopes.present?
-        custom_scopes.to_s.split(/\s+/).map(&:to_sym)
-      else
-        %i[openid email profile]
-      end
-
-      # Build provider options
-      oidc_options = {
-        name: name.to_sym,
-        scope: scopes,
-        response_type: :code,
-        issuer: issuer.to_s.strip,
-        discovery: true,
-        pkce: true,
-        client_options: {
-          identifier: client_id,
-          secret: client_secret,
-          redirect_uri: redirect_uri,
-          ssl: begin
-                 ssl_config = Rails.configuration.x.ssl
-                 ssl_opts = {}
-                 ssl_opts[:ca_file] = ssl_config.ca_file if ssl_config&.ca_file.present?
-                 ssl_opts[:verify] = false if ssl_config&.verify == false
-                 ssl_opts
-               end
-        }
-      }
-
-      # Add prompt parameter if configured
-      prompt = cfg.dig(:settings, :prompt).presence
-      oidc_options[:prompt] = prompt if prompt.present?
-
       provider :openid_connect, oidc_options
 
       Rails.configuration.x.auth.oidc_enabled = true
-      Rails.configuration.x.auth.sso_providers << cfg.merge(name: name, issuer: issuer)
+      Rails.configuration.x.auth.sso_providers << cfg.merge(name: name, issuer: oidc_options[:issuer])
 
     when "google_oauth2"
       client_id = cfg[:client_id].presence || ENV["GOOGLE_OAUTH_CLIENT_ID"].presence
diff --git a/config/initializers/openid_connect_http_discovery.rb b/config/initializers/openid_connect_http_discovery.rb
new file mode 100644
index 000000000..884ec730d
--- /dev/null
+++ b/config/initializers/openid_connect_http_discovery.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+# Patch: honor the issuer's scheme during OIDC discovery.
+#
+# The openid_connect/swd gems hardcode discovery to HTTPS (SWD.url_builder defaults to
+# URI::HTTPS, and Config::Resource drops the issuer's scheme), so an http:// issuer -
+# a self-hosted IdP without SSL - is upgraded to https:443 and fails to connect.
+#
+# Only the discovery request is affected: the endpoints it returns are absolute, and
+# rack-oauth2 keeps a scheme that is already present, so the rest of the flow follows.
+# The port and cache-key handling below are also made scheme-aware so an http:// issuer
+# never drops an explicit port or reuses an https:// issuer's cached metadata.
+#
+# Verified against openid_connect 2.3.1 / swd 2.0.3 - revisit if those are upgraded.
+# See https://github.com/we-promise/sure/issues/2844.
+require "openid_connect"
+
+module OpenIDConnect
+  module Discovery
+    module Provider
+      class Config
+        class Resource
+          def initialize(uri)
+            @scheme = uri.scheme
+            @host = uri.host
+            # Only omit the scheme's own default port, so an explicitly configured
+            # non-default port (e.g. http on 443, https on 80) is preserved.
+            @port = uri.port unless uri.port == uri.default_port
+            @path = File.join uri.path, ".well-known/openid-configuration"
+            attr_missing!
+          end
+
+          def endpoint
+            url_builder = @scheme == "http" ? URI::HTTP : URI::HTTPS
+            url_builder.build [ nil, host, port, path, nil, nil ]
+          rescue URI::Error => e
+            raise SWD::Exception.new(e.message)
+          end
+
+          private
+
+            # The gem keys the discovery cache on host alone. Now that a single host
+            # can be reached over more than one scheme/port/path, include those so an
+            # http:// issuer never reuses an https:// issuer's cached metadata.
+            def cache_key
+              digest = OpenSSL::Digest::SHA256.hexdigest [ @scheme, host, port, path ].join(" ")
+              "swd:resource:opneid-conf:#{digest}"
+            end
+        end
+      end
+    end
+  end
+end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index 8918e6f76..1b2eb680a 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -10,6 +10,10 @@ class Rack::Attack
     request.ip if request.path == "/oauth/token"
   end
 
+  throttle("oauth/register", limit: 10, period: 1.minute) do |request|
+    request.ip if request.post? && request.path == "/register"
+  end
+
   # Throttle unauthenticated WebAuthn MFA ceremonies similarly to sign-in
   # endpoints; registration remains behind normal application authentication.
   throttle("mfa/webauthn", limit: 10, period: 1.minute) do |request|
@@ -24,6 +28,13 @@ class Rack::Attack
     request.ip if request.path.start_with?("/admin/")
   end
 
+  # The background jobs console lives under /settings (so its polling GET
+  # isn't throttled), but its mutation is destructive and super-admin only —
+  # rate limit it independently.
+  throttle("background_jobs_console/ip", limit: 30, period: 1.minute) do |request|
+    request.ip if request.post? && request.path == "/settings/background_jobs/cancel"
+  end
+
   # Determine limits based on self-hosted mode
   self_hosted = Rails.application.config.app_mode.self_hosted?
 
@@ -33,7 +44,7 @@ class Rack::Attack
       # Extract access token from Authorization header
       auth_header = request.get_header("HTTP_AUTHORIZATION")
       if auth_header&.start_with?("Bearer ")
-        token = auth_header.split(" ").last
+        token = auth_header.delete_prefix("Bearer ").strip # pipelock:ignore
         "api_token:#{Digest::SHA256.hexdigest(token)}"
       else
         # Fall back to IP-based limiting for unauthenticated requests
diff --git a/config/initializers/redbark.rb b/config/initializers/redbark.rb
new file mode 100644
index 000000000..e9a2b30a6
--- /dev/null
+++ b/config/initializers/redbark.rb
@@ -0,0 +1,7 @@
+# Redbark integration runtime configuration
+Rails.application.configure do
+  # Controls whether pending transactions are included in Redbark syncs
+  # When true, adds includePending=true to transaction fetch requests
+  # Default: false (only posted transactions)
+  config.x.redbark.include_pending = ENV["REDBARK_INCLUDE_PENDING"].to_s.strip.downcase.in?(%w[1 true yes])
+end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 1338491a4..b8292c651 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,9 +1,13 @@
 require "sidekiq/web"
 
-if Rails.env.production?
+# Optional second authentication layer for /sidekiq. The route itself only
+# exists for signed-in super admins (see SuperAdminConstraint in routes.rb);
+# basic auth is layered on top ONLY when both variables are explicitly set.
+# There are deliberately no default credentials.
+if ENV["SIDEKIQ_WEB_USERNAME"].present? && ENV["SIDEKIQ_WEB_PASSWORD"].present?
   Sidekiq::Web.use(Rack::Auth::Basic) do |username, password|
-    configured_username = ::Digest::SHA256.hexdigest(ENV.fetch("SIDEKIQ_WEB_USERNAME", "sure"))
-    configured_password = ::Digest::SHA256.hexdigest(ENV.fetch("SIDEKIQ_WEB_PASSWORD", "sure"))
+    configured_username = ::Digest::SHA256.hexdigest(ENV["SIDEKIQ_WEB_USERNAME"])
+    configured_password = ::Digest::SHA256.hexdigest(ENV["SIDEKIQ_WEB_PASSWORD"])
 
     ActiveSupport::SecurityUtils.secure_compare(::Digest::SHA256.hexdigest(username), configured_username) &
       ActiveSupport::SecurityUtils.secure_compare(::Digest::SHA256.hexdigest(password), configured_password)
diff --git a/config/initializers/snaptrade.rb b/config/initializers/snaptrade.rb
new file mode 100644
index 000000000..25e55c08e
--- /dev/null
+++ b/config/initializers/snaptrade.rb
@@ -0,0 +1,7 @@
+Rails.application.configure do
+  config.x.snaptrade ||= ActiveSupport::OrderedOptions.new
+  config.x.snaptrade.oauth_client_id = ENV["SNAPTRADE_OAUTH_CLIENT_ID"].presence ||
+                                      Rails.application.credentials.dig(:snaptrade, :oauth_client_id)
+  config.x.snaptrade.oauth_client_secret = ENV["SNAPTRADE_OAUTH_CLIENT_SECRET"].presence ||
+                                          Rails.application.credentials.dig(:snaptrade, :oauth_client_secret)
+end
diff --git a/config/initializers/trading212.rb b/config/initializers/trading212.rb
new file mode 100644
index 000000000..d287e9dd7
--- /dev/null
+++ b/config/initializers/trading212.rb
@@ -0,0 +1,9 @@
+Rails.application.configure do
+  truthy = %w[1 true yes on]
+
+  config.x.trading212 ||= ActiveSupport::OrderedOptions.new
+  # Enable raw payload debug logging for Trading 212 API responses.
+  # DEV-ONLY: the dump may contain PII and is gated to local environments,
+  # so it never logs in managed/production.
+  config.x.trading212.debug_raw = Rails.env.local? && truthy.include?(ENV["TRADING212_DEBUG_RAW"].to_s.strip.downcase)
+end
diff --git a/config/initializers/up.rb b/config/initializers/up.rb
new file mode 100644
index 000000000..8eb414d51
--- /dev/null
+++ b/config/initializers/up.rb
@@ -0,0 +1,9 @@
+# Up Bank integration runtime configuration
+Rails.application.configure do
+  # Debug logging for raw Up API responses.
+  # When enabled, logs the full raw payload returned by the Up API.
+  # DEVELOPMENT-ONLY: the raw dump contains PII (merchant names, amounts, account IDs)
+  # and is gated to local environments so it never fires in managed/production.
+  # Default: false (only log summary info)
+  config.x.up.debug_raw = ENV["UP_DEBUG_RAW"].to_s.strip.downcase.in?(%w[1 true yes])
+end
diff --git a/config/initializers/wise.rb b/config/initializers/wise.rb
new file mode 100644
index 000000000..91fafcf53
--- /dev/null
+++ b/config/initializers/wise.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Rails.configuration.x.wise.tap do |wise|
+  wise.base_url = ENV.fetch("WISE_BASE_URL", "https://api.wise.com")
+  wise.include_pending = ENV.fetch("WISE_INCLUDE_PENDING", "true") == "true"
+end
diff --git a/config/locales/breadcrumbs/en.yml b/config/locales/breadcrumbs/en.yml
index c6f1ba1d8..400fc31b7 100644
--- a/config/locales/breadcrumbs/en.yml
+++ b/config/locales/breadcrumbs/en.yml
@@ -46,6 +46,7 @@ en:
     llm_usages: LLM Usage
     loans: Loans
     lunchflow_items: Lunch Flow
+    mcp: MCP Server
     merchants: Merchants
     mercury_items: Mercury
     messages: Messages
@@ -63,6 +64,7 @@ en:
     properties: Properties
     providers: Providers
     recurring_transactions: Recurring
+    redbark_items: Redbark
     registrations: Sign up
     reports: Reports
     rules: Rules
diff --git a/config/locales/breadcrumbs/fr.yml b/config/locales/breadcrumbs/fr.yml
index 7652e4afd..d5524f2c7 100644
--- a/config/locales/breadcrumbs/fr.yml
+++ b/config/locales/breadcrumbs/fr.yml
@@ -1,8 +1,88 @@
 ---
 fr:
   breadcrumbs:
+    account_sharings: Partage de compte
+    account_statements: Coffre-fort de relevés
+    accounts: Comptes
+    ai_prompts: Invites IA
+    api_key: Clé API
+    api_keys: Clés API
+    appearance: Apparence
+    appearances: Apparence
+    bank_sync: Synchronisation bancaire
+    binance_items: Binance
+    brex_items: Brex
+    budget_categories: Catégories budgétaires
+    budgets: Budgets
+    categories: Catégories
     categorize: Catégoriser
+    chats: Discussions
+    coinbase_items: Coinbase
+    coinstats_items: CoinStats
+    credit_cards: Cartes de crédit
+    cryptos: Cryptomonnaie
+    dashboard: Tableau de bord
+    debug: Débogage
+    debugs: Débogage
+    depositories: Comptes espèces
+    enable_banking_items: Activer les services bancaires
     exports: Exports
+    family_exports: Exportations
+    family_merchants: Marchands
+    guides: Guides
+    holdings: Holdings
     home: Accueil
+    hostings: Auto-hébergement
+    ibkr_items: Courtiers interactifs
+    impersonation_sessions: Usurpations d'identité
     imports: Imports
+    indexa_capital_items: Indexa Capital
+    intro: Introduction
+    investments: Investissements
+    invitations: Invitations
+    invite_codes: Codes d'invitation
+    kraken_items: Kraken
+    llm_usage: Utilisation du LLM
+    llm_usages: Utilisation du LLM
+    loans: Prêts
+    lunchflow_items: Lunch Flow
+    mcp: Serveur MCP
+    merchants: Marchands
+    mercury_items: Mercure
+    messages: Messages
+    mfa: Authentification à deux facteurs
+    oidc_accounts: Comptes SSO
+    onboardings: Intégration
+    other_assets: Autres actifs
+    other_liabilities: Autres passifs
+    payments: Paiements
+    pending_duplicate_merges: Avis en double
+    plaid_items: Plaid
+    preferences: Préférences
+    profile: Informations sur le profil
+    profiles: Informations sur le profil
+    properties: Propriétés
+    providers: Fournisseurs
+    recurring_transactions: Récurrent
+    registrations: Inscrivez-vous
+    reports: Rapports
+    rules: Règles
+    securities: Sécurité
+    security: Sécurité
+    self_hosting: Auto-hébergement
+    sessions: Connectez-vous
+    simplefin_items: SimpleFIN
+    snaptrade_items: SnapTrade
+    sophtron_items: Sophtron
+    splits: Diviser
+    sso_identities: Connexions SSO
+    sso_providers: Fournisseurs SSO
+    subscriptions: Abonnement
+    tags: Balises
+    trades: Métiers
     transactions: Transactions
+    transfer_matches: Matchs de transfert
+    transfers: Transferts
+    users: Utilisateurs
+    valuations: Évaluations
+    vehicles: Véhicules
diff --git a/config/locales/breadcrumbs/it.yml b/config/locales/breadcrumbs/it.yml
new file mode 100644
index 000000000..2194c6c2d
--- /dev/null
+++ b/config/locales/breadcrumbs/it.yml
@@ -0,0 +1,88 @@
+---
+it:
+  breadcrumbs:
+    account_sharings: Condivisione conto
+    account_statements: Archivio estratti
+    accounts: Conti
+    ai_prompts: Prompt AI
+    api_key: Chiave API
+    api_keys: Chiavi API
+    appearance: Aspetto
+    appearances: Aspetto
+    bank_sync: Sincronizzazione bancaria
+    binance_items: Binance
+    brex_items: Brex
+    budget_categories: Categorie budget
+    budgets: Budget
+    categories: Categorie
+    categorize: Categorizza
+    chats: Chat
+    coinbase_items: Coinbase
+    coinstats_items: CoinStats
+    credit_cards: Carte di credito
+    cryptos: Crypto
+    dashboard: Dashboard
+    debug: Debug
+    debugs: Debug
+    depositories: Conti correnti
+    enable_banking_items: Enable Banking
+    exports: Esportazioni
+    family_exports: Esportazioni
+    family_merchants: Esercenti
+    guides: Guide
+    holdings: Portafoglio
+    home: Home
+    hostings: Self-Hosting
+    ibkr_items: Interactive Brokers
+    impersonation_sessions: Impersonazioni
+    imports: Importazioni
+    indexa_capital_items: Indexa Capital
+    intro: Introduzione
+    investments: Investimenti
+    invitations: Inviti
+    invite_codes: Codici invito
+    kraken_items: Kraken
+    llm_usage: Utilizzo LLM
+    llm_usages: Utilizzo LLM
+    loans: Prestiti
+    lunchflow_items: Lunch Flow
+    mcp: Server MCP
+    merchants: Esercenti
+    mercury_items: Mercury
+    messages: Messaggi
+    mfa: Autenticazione a due fattori
+    oidc_accounts: Account SSO
+    onboardings: Configurazione iniziale
+    other_assets: Altri asset
+    other_liabilities: Altre passività
+    payments: Pagamenti
+    pending_duplicate_merges: Revisione duplicati
+    plaid_items: Plaid
+    preferences: Preferenze
+    profile: Informazioni profilo
+    profiles: Informazioni profilo
+    properties: Proprietà
+    providers: Provider
+    recurring_transactions: Ricorrenti
+    registrations: Registrazione
+    reports: Rapporti
+    rules: Regole
+    securities: Titoli
+    security: Sicurezza
+    self_hosting: Self-Hosting
+    sessions: Accedi
+    simplefin_items: SimpleFIN
+    snaptrade_items: SnapTrade
+    sophtron_items: Sophtron
+    splits: Suddivisione
+    sso_identities: Connessioni SSO
+    sso_providers: Provider SSO
+    subscriptions: Abbonamento
+    tags: Etichette
+    trades: Operazioni
+    transactions: Transazioni
+    transfer_matches: Corrispondenze bonifici
+    transfers: Bonifici
+    users: Utenti
+    valuations: Valutazioni
+    vehicles: Veicoli
diff --git a/config/locales/breadcrumbs/ru.yml b/config/locales/breadcrumbs/ru.yml
new file mode 100644
index 000000000..e01ab31b0
--- /dev/null
+++ b/config/locales/breadcrumbs/ru.yml
@@ -0,0 +1,88 @@
+---
+ru:
+  breadcrumbs:
+    account_sharings: Совместное использование счёта
+    account_statements: Хранилище выписок
+    accounts: Счета
+    ai_prompts: Подсказки ИИ
+    api_key: API ключ
+    api_keys: API ключи
+    appearance: Внешний вид
+    appearances: Внешний вид
+    bank_sync: Синхронизация с банком
+    binance_items: Binance
+    brex_items: Brex
+    budget_categories: Категории бюджета
+    budgets: Бюджеты
+    categories: Категории
+    categorize: Категоризация
+    chats: Чаты
+    coinbase_items: Coinbase
+    coinstats_items: CoinStats
+    credit_cards: Кредитные карты
+    cryptos: Криптовалюта
+    dashboard: Панель управления
+    debug: Отладка
+    debugs: Отладка
+    depositories: Денежные счета
+    enable_banking_items: Включить банковские функции
+    exports: Экспорт
+    family_exports: Экспорт
+    family_merchants: Продавцы
+    guides: Руководства
+    holdings: Активы
+    home: Главная
+    hostings: Самостоятельный хостинг
+    ibkr_items: Interactive Brokers
+    impersonation_sessions: Сеансы имитации
+    imports: Импорт
+    indexa_capital_items: Indexa Capital
+    intro: Введение
+    investments: Инвестиции
+    invitations: Приглашения
+    invite_codes: Коды приглашений
+    kraken_items: Kraken
+    llm_usage: Использование LLM
+    llm_usages: Использование LLM
+    loans: Кредиты
+    lunchflow_items: Lunch Flow
+    mcp: MCP Сервер
+    merchants: Продавцы
+    mercury_items: Mercury
+    messages: Сообщения
+    mfa: Двухфакторная аутентификация
+    oidc_accounts: Учетные записи SSO
+    onboardings: Онбординг
+    other_assets: Прочие активы
+    other_liabilities: Прочие обязательства
+    payments: Платежи
+    pending_duplicate_merges: Обзор дубликатов
+    plaid_items: Plaid
+    preferences: Настройки
+    profile: Информация профиля
+    profiles: Информация профиля
+    properties: Имущество
+    providers: Провайдеры
+    recurring_transactions: Регулярные операции
+    registrations: Регистрация
+    reports: Отчёты
+    rules: Правила
+    securities: Ценные бумаги
+    security: Безопасность
+    self_hosting: Самостоятельный хостинг
+    sessions: Вход
+    simplefin_items: SimpleFIN
+    snaptrade_items: SnapTrade
+    sophtron_items: Sophtron
+    splits: Разделение
+    sso_identities: Подключения SSO
+    sso_providers: Провайдеры SSO
+    subscriptions: Подписка
+    tags: Теги
+    trades: Сделки
+    transactions: Операции
+    transfer_matches: Соответствия переводов
+    transfers: Переводы
+    users: Пользователи
+    valuations: Оценки
+    vehicles: Транспортные средства
diff --git a/config/locales/breadcrumbs/tr.yml b/config/locales/breadcrumbs/tr.yml
index 08dea8ecd..94de67124 100644
--- a/config/locales/breadcrumbs/tr.yml
+++ b/config/locales/breadcrumbs/tr.yml
@@ -1,6 +1,88 @@
 ---
 tr:
   breadcrumbs:
+    account_sharings: Hesap paylaşımı
+    account_statements: Ekstre kasası
+    accounts: Hesaplar
+    ai_prompts: AI İstemleri
+    api_key: API Anahtarı
+    api_keys: API Anahtarları
+    appearance: Görünüm
+    appearances: Görünüm
+    bank_sync: Banka Senkronizasyonu
+    binance_items: Binance
+    brex_items: Brex
+    budget_categories: Bütçe kategorileri
+    budgets: Bütçeler
+    categories: Kategoriler
+    categorize: Kategorize et
+    chats: Sohbetler
+    coinbase_items: Coinbase
+    coinstats_items: CoinStats
+    credit_cards: Kredi kartları
+    cryptos: Kripto
+    dashboard: Panel
+    debug: Hata Ayıklama
+    debugs: Hata Ayıklama
+    depositories: Nakit hesaplar
+    enable_banking_items: Enable Banking
     exports: Dışa Aktarmalar
+    family_exports: Dışa Aktarmalar
+    family_merchants: Satıcılar
+    guides: Kılavuzlar
+    holdings: Varlıklar
     home: Ana Sayfa
+    hostings: Kendi Barındırma
+    ibkr_items: Interactive Brokers
+    impersonation_sessions: Taklit Oturumları
     imports: İçe Aktarmalar
+    indexa_capital_items: Indexa Capital
+    intro: Giriş
+    investments: Yatırımlar
+    invitations: Davetler
+    invite_codes: Davet kodları
+    kraken_items: Kraken
+    llm_usage: LLM Kullanımı
+    llm_usages: LLM Kullanımı
+    loans: Krediler
+    lunchflow_items: Lunch Flow
+    mcp: MCP Sunucusu
+    merchants: Satıcılar
+    mercury_items: Mercury
+    messages: Mesajlar
+    mfa: İki faktörlü kimlik doğrulama
+    oidc_accounts: SSO hesapları
+    onboardings: Kurulum
+    other_assets: Diğer varlıklar
+    other_liabilities: Diğer borçlar
+    payments: Ödemeler
+    pending_duplicate_merges: Kopya inceleme
+    plaid_items: Plaid
+    preferences: Tercihler
+    profile: Profil Bilgisi
+    profiles: Profil Bilgisi
+    properties: Mülkler
+    providers: Sağlayıcılar
+    recurring_transactions: Yinelenen
+    registrations: Hesap oluştur
+    reports: Raporlar
+    rules: Kurallar
+    securities: Güvenlik
+    security: Güvenlik
+    self_hosting: Kendi Barındırma
+    sessions: Giriş yap
+    simplefin_items: SimpleFIN
+    snaptrade_items: SnapTrade
+    sophtron_items: Sophtron
+    splits: Bölme
+    sso_identities: SSO bağlantıları
+    sso_providers: SSO sağlayıcıları
+    subscriptions: Abonelik
+    tags: Etiketler
+    trades: Alım Satımlar
+    transactions: İşlemler
+    transfer_matches: Transfer eşleşmeleri
+    transfers: Transferler
+    users: Kullanıcılar
+    valuations: Değerlemeler
+    vehicles: Araçlar
diff --git a/config/locales/defaults/fr.yml b/config/locales/defaults/fr.yml
index 1c3ea8d5b..5b5147c94 100644
--- a/config/locales/defaults/fr.yml
+++ b/config/locales/defaults/fr.yml
@@ -1,8 +1,5 @@
 ---
 fr:
-  defaults:
-    brand_name: "%{brand_name}"
-    product_name: "%{product_name}"
   activerecord:
     errors:
       messages:
@@ -46,7 +43,9 @@ fr:
     formats:
       default: "%d/%m/%Y"
       long: "%-d %B %Y"
+      month_year: "%B %Y"
       short: "%-d %b"
+      short_month_year: "%b %Y"
     month_names:
     -
     - janvier
@@ -113,6 +112,11 @@ fr:
       month: Mois
       second: Seconde
       year: Année
+  defaults:
+    brand_name: "%{brand_name}"
+    common:
+      close: Fermer
+    product_name: "%{product_name}"
   errors:
     format: "%{attribute} %{message}"
     messages:
@@ -156,8 +160,8 @@ fr:
     expand: Développer
   helpers:
     select:
-      prompt: Veuillez sélectionner
       default_label: Sélectionner…
+      prompt: Veuillez sélectionner
       search_placeholder: Rechercher
     submit:
       create: Créer un(e) %{model}
@@ -166,13 +170,8 @@ fr:
   number:
     currency:
       format:
-        delimiter: " "
-        format: "%n %u"
-        precision: 2
-        separator: ","
         significant: false
         strip_insignificant_zeros: false
-        unit: "€"
     format:
       delimiter: " "
       precision: 3
diff --git a/config/locales/defaults/it.yml b/config/locales/defaults/it.yml
index bdbe7f94d..5cb863464 100644
--- a/config/locales/defaults/it.yml
+++ b/config/locales/defaults/it.yml
@@ -1,13 +1,20 @@
 ---
 it:
+  defaults:
+    brand_name: "%{brand_name}"
+    product_name: "%{product_name}"
+    common:
+      close: "Chiudi"
+  global:
+    expand: "Espandi"
   activerecord:
     errors:
       messages:
         record_invalid: 'Validazione fallita: %{errors}'
         restrict_dependent_destroy:
-          has_many: Il record non può essere cancellato perchè esistono %{record}
+          has_many: Il record non può essere cancellato perché esistono %{record}
             dipendenti
-          has_one: Il record non può essere cancellato perchè esiste un %{record}
+          has_one: Il record non può essere cancellato perché esiste un %{record}
             dipendente
   date:
     abbr_day_names:
@@ -44,6 +51,8 @@ it:
       default: "%d/%m/%Y"
       long: "%d %B %Y"
       short: "%d %b"
+      month_year: "%B %Y"
+      short_month_year: "%b %Y"
     month_names:
     -
     - gennaio
@@ -129,6 +138,7 @@ it:
       not_an_integer: non è un numero intero
       odd: deve essere dispari
       other_than: devono essere di numero diverso da %{count}
+      in: deve essere in %{count}
       present: deve essere lasciato in bianco
       required: deve esistere
       taken: è già presente
@@ -149,9 +159,11 @@ it:
   helpers:
     select:
       prompt: Seleziona...
+      search_placeholder: "Cerca"
+      default_label: "Seleziona..."
     submit:
       create: Crea %{model}
-      submit: Invia %{model}
+      submit: Salva %{model}
       update: Aggiorna %{model}
   number:
     currency:
@@ -166,6 +178,7 @@ it:
     format:
       delimiter: "."
       precision: 2
+      round_mode: default
       separator: ","
       significant: false
       strip_insignificant_zeros: false
@@ -174,10 +187,14 @@ it:
         format: "%n %u"
         units:
           billion: Miliardi
-          million: Milioni
+          million:
+            one: Milione
+            other: Milioni
           quadrillion: Biliardi
           thousand: Mila
-          trillion: Bilioni
+          trillion:
+            one: Bilione
+            other: Bilioni
           unit: ''
       format:
         delimiter: ''
diff --git a/config/locales/defaults/ru.yml b/config/locales/defaults/ru.yml
index 218043d8a..a0b8608fe 100644
--- a/config/locales/defaults/ru.yml
+++ b/config/locales/defaults/ru.yml
@@ -41,7 +41,9 @@ ru:
     formats:
       default: "%d.%m.%Y"
       long: "%-d %B %Y"
+      month_year: "%B %Y"
       short: "%-d %b"
+      short_month_year: "%b %Y"
     month_names:
     -
     - января
@@ -130,6 +132,11 @@ ru:
       month: Месяц
       second: Секунда
       year: Год
+  defaults:
+    brand_name: "%{brand_name}"
+    common:
+      close: Закрыть
+    product_name: "%{product_name}"
   errors:
     format: "%{attribute} %{message}"
     messages:
@@ -177,9 +184,13 @@ ru:
         many: "%{model}: сохранение не удалось из-за %{count} ошибок"
         one: "%{model}: сохранение не удалось из-за %{count} ошибки"
         other: "%{model}: сохранение не удалось из-за %{count} ошибки"
+  global:
+    expand: Развернуть
   helpers:
     select:
+      default_label: Выберите...
       prompt: 'Выберите: '
+      search_placeholder: Поиск
     submit:
       create: Создать %{model}
       submit: Сохранить %{model}
@@ -187,13 +198,8 @@ ru:
   number:
     currency:
       format:
-        delimiter: " "
-        format: "%n %u"
-        precision: 2
-        separator: ","
         significant: false
         strip_insignificant_zeros: false
-        unit: руб.
     format:
       delimiter: " "
       precision: 3
diff --git a/config/locales/defaults/tr.yml b/config/locales/defaults/tr.yml
index 82b1c6671..a27e21cd4 100644
--- a/config/locales/defaults/tr.yml
+++ b/config/locales/defaults/tr.yml
@@ -1,8 +1,5 @@
 ---
 tr:
-  defaults:
-    brand_name: "%{brand_name}"
-    product_name: "%{product_name}"
   activerecord:
     errors:
       messages:
@@ -44,7 +41,9 @@ tr:
     formats:
       default: "%d.%m.%Y"
       long: "%e %B %Y %A"
+      month_year: "%B %Y"
       short: "%e %b"
+      short_month_year: "%b %Y"
     month_names:
     -
     - Ocak
@@ -109,6 +108,11 @@ tr:
       month: Ay
       second: Saniye
       year: Yıl
+  defaults:
+    brand_name: "%{brand_name}"
+    common:
+      close: Kapat
+    product_name: "%{product_name}"
   errors:
     format: "%{attribute} %{message}"
     messages:
@@ -121,6 +125,7 @@ tr:
       exclusion: kullanılamaz
       greater_than: "%{count} sayısından büyük olmalı"
       greater_than_or_equal_to: "%{count} sayısına eşit veya büyük olmalı"
+      in: "%{count} içinde olmalı"
       inclusion: kabul edilen bir kelime değil
       invalid: geçersiz
       less_than: "%{count} sayısından küçük olmalı"
@@ -147,9 +152,13 @@ tr:
       header:
         one: "%{count} hata oluştuğu için %{model} kaydedilemedi"
         other: "%{count} hata oluştuğu için %{model} kaydedilemedi"
+  global:
+    expand: Genişlet
   helpers:
     select:
+      default_label: Seç...
       prompt: Lütfen seçiniz
+      search_placeholder: Ara
     submit:
       create: "%{model} Ekle"
       submit: "%{model} Kaydet"
@@ -167,6 +176,7 @@ tr:
     format:
       delimiter: "."
       precision: 2
+      round_mode: default
       separator: ","
       significant: false
       strip_insignificant_zeros: false
@@ -191,9 +201,11 @@ tr:
           byte:
             one: Bayt
             other: Bayt
+          eb: EB
           gb: GB
           kb: KB
           mb: MB
+          pb: PB
           tb: TB
     percentage:
       format:
diff --git a/config/locales/defaults/zh-CN.yml b/config/locales/defaults/zh-CN.yml
index 370d0833a..395922fc0 100644
--- a/config/locales/defaults/zh-CN.yml
+++ b/config/locales/defaults/zh-CN.yml
@@ -48,7 +48,9 @@ zh-CN:
     formats:
       default: "%Y-%m-%d"
       long: "%Y年%m月%d日"
+      month_year: "%Y年%m月"
       short: "%m月%d日"
+      short_month_year: "%Y年%m月"
     month_names:
     -
     - 一月
@@ -83,7 +85,7 @@ zh-CN:
         other: 接近%{count}年
       half_a_minute: 半分钟
       less_than_x_minutes:
-        one: 不到%{count}分钟
+        one: 不到 1 分钟
         other: 不到%{count}分钟
       less_than_x_seconds:
         one: 不到%{count}秒
diff --git a/config/locales/doorkepper.de.yml b/config/locales/doorkeeper.de.yml
similarity index 100%
rename from config/locales/doorkepper.de.yml
rename to config/locales/doorkeeper.de.yml
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 412266539..431294dbd 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -3,154 +3,168 @@ fr:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: 'Nom'
-        redirect_uri: 'URI de redirection'
+        name: Nom
+        redirect_uri: URI de redirection
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: 'ne peut pas contenir de fragment.'
-              invalid_uri: 'doit être une URI valide.'
-              unspecified_scheme: 'doit spécifier un schéma.'
-              relative_uri: 'doit être une URI absolue.'
-              secured_uri: 'doit être une URI HTTPS/SSL.'
-              forbidden_uri: 'est interdit par le serveur.'
+              forbidden_uri: est interdit par le serveur.
+              fragment_present: ne peut pas contenir de fragment.
+              invalid_uri: doit être une URI valide.
+              relative_uri: doit être une URI absolue.
+              secured_uri: doit être une URI HTTPS/SSL.
+              unspecified_scheme: doit spécifier un schéma.
             scopes:
-              not_match_configured: "ne correspond pas à ceux configurés sur le serveur."
-
+              not_match_configured: ne correspond pas à ceux configurés sur le serveur.
   doorkeeper:
     applications:
-      confirmations:
-        destroy: 'Êtes-vous sûr ?'
       buttons:
-        edit: 'Modifier'
-        destroy: 'Supprimer'
-        submit: 'Envoyer'
-        cancel: 'Annuler'
-        authorize: 'Autoriser'
-      form:
-        error: 'Oups ! Vérifiez votre formulaire pour d''éventuelles erreurs'
-      help:
-        confidential: 'L''application sera utilisée dans un contexte où le client secret peut être gardé confidentiel. Les applications mobiles natives et les applications monopage (SPA) sont considérées comme non confidentielles.'
-        redirect_uri: 'Utilisez une ligne par URI'
-        blank_redirect_uri: "Laissez vide si vous avez configuré votre fournisseur pour utiliser les identifiants client (Client Credentials), le mot de passe du propriétaire de la ressource (Resource Owner Password Credentials) ou tout autre type d'octroi qui ne nécessite pas d'URI de redirection."
-        scopes: 'Séparez les scopes par des espaces. Laissez vide pour utiliser les scopes par défaut.'
+        authorize: Autoriser
+        cancel: Annuler
+        destroy: Supprimer
+        edit: Modifier
+        submit: Envoyer
+      confirmations:
+        destroy: Êtes-vous sûr ?
       edit:
-        title: 'Modifier l''application'
+        title: Modifier l'application
+      form:
+        error: Oups ! Vérifiez votre formulaire pour d'éventuelles erreurs
+      help:
+        blank_redirect_uri: Laissez vide si vous avez configuré votre fournisseur
+          pour utiliser les identifiants client (Client Credentials), le mot de passe
+          du propriétaire de la ressource (Resource Owner Password Credentials) ou
+          tout autre type d'octroi qui ne nécessite pas d'URI de redirection.
+        confidential: L'application sera utilisée dans un contexte où le client secret
+          peut être gardé confidentiel. Les applications mobiles natives et les applications
+          monopage (SPA) sont considérées comme non confidentielles.
+        redirect_uri: Utilisez une ligne par URI
+        scopes: Séparez les scopes par des espaces. Laissez vide pour utiliser les
+          scopes par défaut.
       index:
-        title: 'Vos applications'
-        new: 'Nouvelle application'
-        name: 'Nom'
-        callback_url: 'URL de rappel'
-        confidential: 'Confidentielle ?'
-        actions: 'Actions'
+        actions: Actions
+        callback_url: URL de rappel
+        confidential: Confidentielle ?
         confidentiality:
-          'yes': 'Oui'
-          'no': 'Non'
+          'no': Non
+          'yes': Oui
+        name: Nom
+        new: Nouvelle application
+        title: Vos applications
       new:
-        title: 'Nouvelle application'
+        title: Nouvelle application
       show:
+        actions: Actions
+        application_id: UID
+        callback_urls: URL de rappel
+        confidential: Confidentielle
+        not_defined: Non défini
+        scopes: Scopes
+        secret: Secret
+        secret_hashed: Secret haché
         title: 'Application : %{name}'
-        application_id: 'UID'
-        secret: 'Secret'
-        secret_hashed: 'Secret haché'
-        scopes: 'Scopes'
-        confidential: 'Confidentielle'
-        callback_urls: 'URL de rappel'
-        actions: 'Actions'
-        not_defined: 'Non défini'
-
     authorizations:
       buttons:
-        authorize: 'Autoriser'
-        deny: 'Refuser'
+        authorize: Autoriser
+        deny: Refuser
       error:
-        title: 'Une erreur s''est produite'
-      new:
-        title: 'Autorisation requise'
-        prompt: 'Autoriser %{client_name} à utiliser votre compte ?'
-        able_to: 'Cette application pourra'
-      show:
-        title: 'Code d''autorisation'
+        go_back: Retourner
+        title: Une erreur s'est produite
       form_post:
-        title: 'Envoyer ce formulaire'
-
+        title: Envoyer ce formulaire
+      new:
+        able_to: Cette application pourra
+        prompt: Autoriser %{client_name} à utiliser votre compte ?
+        title: Autorisation requise
+      show:
+        authorization_code_label: 'Code d''autorisation :'
+        copy_instructions: Copiez ce code et collez-le dans l'application.
+        title: Code d'autorisation
     authorized_applications:
-      confirmations:
-        revoke: 'Êtes-vous sûr ?'
       buttons:
-        revoke: 'Révoquer'
+        revoke: Révoquer
+      confirmations:
+        revoke: Êtes-vous sûr ?
       index:
-        title: 'Vos applications autorisées'
-        application: 'Application'
-        created_at: 'Créée le'
-        date_format: '%d/%m/%Y %H:%M:%S'
-
-    pre_authorization:
-      status: 'Pré-autorisation'
-
+        application: Application
+        created_at: Créée le
+        date_format: "%d/%m/%Y %H:%M:%S"
+        title: Vos applications autorisées
     errors:
       messages:
-        # Common error messages
-        invalid_request:
-          unknown: 'La requête ne comporte pas un paramètre obligatoire, inclut une valeur de paramètre non prise en charge ou est malformée d''une autre manière.'
-          missing_param: 'Paramètre obligatoire manquant : %{value}.'
-          request_not_authorized: 'La requête doit être autorisée. Le paramètre obligatoire pour autoriser la requête est manquant ou invalide.'
-          invalid_code_challenge: 'Le code challenge est obligatoire.'
-        invalid_redirect_uri: "L'URI de redirection demandée est malformée ou ne correspond pas à l'URI de redirection du client."
-        unauthorized_client: 'Le client n''est pas autorisé à effectuer cette requête avec cette méthode.'
-        access_denied: 'Le propriétaire de la ressource ou le serveur d''autorisation a refusé la requête.'
-        invalid_scope: 'Le scope demandé est invalide, inconnu ou malformé.'
-        invalid_code_challenge_method:
-          zero: 'Le serveur d''autorisation ne prend pas en charge PKCE car aucune valeur de code_challenge_method n''est acceptée.'
-          one: 'Le code_challenge_method doit être %{challenge_methods}.'
-          other: 'Le code_challenge_method doit être l''un des suivants : %{challenge_methods}.'
-        server_error: 'Le serveur d''autorisation a rencontré une condition inattendue qui l''a empêché de traiter la requête.'
-        temporarily_unavailable: 'Le serveur d''autorisation est actuellement incapable de traiter la requête en raison d''une surcharge temporaire ou d''une maintenance du serveur.'
-
-        # Configuration error messages
-        credential_flow_not_configured: 'Le flux Resource Owner Password Credentials a échoué car Doorkeeper.configure.resource_owner_from_credentials n''est pas configuré.'
-        resource_owner_authenticator_not_configured: 'La recherche de Resource Owner a échoué car Doorkeeper.configure.resource_owner_authenticator n''est pas configuré.'
-        admin_authenticator_not_configured: 'L''accès au panneau d''administration est interdit car Doorkeeper.configure.admin_authenticator n''est pas configuré.'
-
-        # Access grant errors
-        unsupported_response_type: 'Le serveur d''autorisation ne prend pas en charge ce type de réponse.'
-        unsupported_response_mode: 'Le serveur d''autorisation ne prend pas en charge ce mode de réponse.'
-
-        # Access token errors
-        invalid_client: 'L''authentification du client a échoué en raison d''un client inconnu, d''une authentification client manquante ou d''une méthode d''authentification non prise en charge.'
-        invalid_grant: 'L''octroi d''autorisation fourni est invalide, expiré, révoqué, ne correspond pas à l''URI de redirection utilisée dans la requête d''autorisation, ou a été émis pour un autre client.'
-        unsupported_grant_type: 'Le type d''octroi d''autorisation n''est pas pris en charge par le serveur d''autorisation.'
-
-        invalid_token:
-          revoked: "Le jeton d'accès a été révoqué"
-          expired: "Le jeton d'accès a expiré"
-          unknown: "Le jeton d'accès est invalide"
-        revoke:
-          unauthorized: "Vous n'êtes pas autorisé à révoquer ce jeton"
-
+        access_denied: Le propriétaire de la ressource ou le serveur d'autorisation
+          a refusé la requête.
+        admin_authenticator_not_configured: L'accès au panneau d'administration est
+          interdit car Doorkeeper.configure.admin_authenticator n'est pas configuré.
+        credential_flow_not_configured: Le flux Resource Owner Password Credentials
+          a échoué car Doorkeeper.configure.resource_owner_from_credentials n'est
+          pas configuré.
         forbidden_token:
-          missing_scope: 'L''accès à cette ressource requiert le scope "%{oauth_scopes}".'
-
+          missing_scope: L'accès à cette ressource requiert le scope "%{oauth_scopes}".
+        invalid_client: L'authentification du client a échoué en raison d'un client
+          inconnu, d'une authentification client manquante ou d'une méthode d'authentification
+          non prise en charge.
+        invalid_code_challenge_method:
+          one: Le code_challenge_method doit être %{challenge_methods}.
+          other: 'Le code_challenge_method doit être l''un des suivants : %{challenge_methods}.'
+          zero: Le serveur d'autorisation ne prend pas en charge PKCE car aucune valeur
+            de code_challenge_method n'est acceptée.
+        invalid_grant: L'octroi d'autorisation fourni est invalide, expiré, révoqué,
+          ne correspond pas à l'URI de redirection utilisée dans la requête d'autorisation,
+          ou a été émis pour un autre client.
+        invalid_redirect_uri: L'URI de redirection demandée est malformée ou ne correspond
+          pas à l'URI de redirection du client.
+        invalid_request:
+          invalid_code_challenge: Le code challenge est obligatoire.
+          missing_param: 'Paramètre obligatoire manquant : %{value}.'
+          request_not_authorized: La requête doit être autorisée. Le paramètre obligatoire
+            pour autoriser la requête est manquant ou invalide.
+          unknown: La requête ne comporte pas un paramètre obligatoire, inclut une
+            valeur de paramètre non prise en charge ou est malformée d'une autre manière.
+        invalid_scope: Le scope demandé est invalide, inconnu ou malformé.
+        invalid_token:
+          expired: Le jeton d'accès a expiré
+          revoked: Le jeton d'accès a été révoqué
+          unknown: Le jeton d'accès est invalide
+        resource_owner_authenticator_not_configured: La recherche de Resource Owner
+          a échoué car Doorkeeper.configure.resource_owner_authenticator n'est pas
+          configuré.
+        revoke:
+          unauthorized: Vous n'êtes pas autorisé à révoquer ce jeton
+        server_error: Le serveur d'autorisation a rencontré une condition inattendue
+          qui l'a empêché de traiter la requête.
+        temporarily_unavailable: Le serveur d'autorisation est actuellement incapable
+          de traiter la requête en raison d'une surcharge temporaire ou d'une maintenance
+          du serveur.
+        unauthorized_client: Le client n'est pas autorisé à effectuer cette requête
+          avec cette méthode.
+        unsupported_grant_type: Le type d'octroi d'autorisation n'est pas pris en
+          charge par le serveur d'autorisation.
+        unsupported_response_mode: Le serveur d'autorisation ne prend pas en charge
+          ce mode de réponse.
+        unsupported_response_type: Le serveur d'autorisation ne prend pas en charge
+          ce type de réponse.
     flash:
       applications:
         create:
-          notice: 'Application créée.'
+          notice: Application créée.
         destroy:
-          notice: 'Application supprimée.'
+          notice: Application supprimée.
         update:
-          notice: 'Application mise à jour.'
+          notice: Application mise à jour.
       authorized_applications:
         destroy:
-          notice: 'Application révoquée.'
-
+          notice: Application révoquée.
     layouts:
       admin:
-        title: 'Doorkeeper'
         nav:
-          oauth2_provider: 'Fournisseur OAuth2'
-          applications: 'Applications'
-          home: 'Accueil'
+          applications: Applications
+          home: Accueil
+          oauth2_provider: Fournisseur OAuth2
+        title: Doorkeeper
       application:
-        title: 'Autorisation OAuth requise'
+        title: Autorisation OAuth requise
+    pre_authorization:
+      status: Pré-autorisation
diff --git a/config/locales/doorkeeper.it.yml b/config/locales/doorkeeper.it.yml
new file mode 100644
index 000000000..926dcd664
--- /dev/null
+++ b/config/locales/doorkeeper.it.yml
@@ -0,0 +1,149 @@
+it:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: 'Nome'
+        redirect_uri: 'URI di reindirizzamento'
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: 'non può contenere un frammento.'
+              invalid_uri: 'deve essere un URI valido.'
+              unspecified_scheme: 'deve specificare uno schema.'
+              relative_uri: 'deve essere un URI assoluto.'
+              secured_uri: 'deve essere un URI HTTPS/SSL.'
+              forbidden_uri: 'è vietato dal server.'
+            scopes:
+              not_match_configured: "non corrisponde alla configurazione del server."
+
+  doorkeeper:
+    applications:
+      confirmations:
+        destroy: 'Sei sicuro?'
+      buttons:
+        edit: 'Modifica'
+        destroy: 'Elimina'
+        submit: 'Invia'
+        cancel: 'Annulla'
+        authorize: 'Autorizza'
+      form:
+        error: 'Ops! Controlla il modulo per eventuali errori'
+      help:
+        confidential: "L'applicazione verrà utilizzata in contesti in cui il client secret può essere mantenuto riservato. Le app mobile native e le Single Page App sono considerate non riservate."
+        redirect_uri: 'Inserisci un URI per riga'
+        blank_redirect_uri: "Lascia vuoto se hai configurato il provider per usare Client Credentials, Resource Owner Password Credentials o altri grant type che non richiedono URI di reindirizzamento."
+        scopes: 'Separa gli scope con spazi. Lascia vuoto per usare gli scope predefiniti.'
+      edit:
+        title: 'Modifica applicazione'
+      index:
+        title: 'Le tue applicazioni'
+        new: 'Nuova applicazione'
+        name: 'Nome'
+        callback_url: 'URL di callback'
+        confidential: 'Riservata?'
+        actions: 'Azioni'
+        confidentiality:
+          'yes': 'Sì'
+          'no': 'No'
+      new:
+        title: 'Nuova applicazione'
+      show:
+        title: 'Applicazione: %{name}'
+        application_id: 'UID'
+        secret: 'Secret'
+        secret_hashed: 'Secret con hash'
+        scopes: 'Scope'
+        confidential: 'Riservata'
+        callback_urls: 'URL di callback'
+        actions: 'Azioni'
+        not_defined: 'Non definito'
+
+    authorizations:
+      buttons:
+        authorize: 'Autorizza'
+        deny: 'Nega'
+      error:
+        title: "Si è verificato un errore"
+        go_back: 'Torna indietro'
+      new:
+        title: 'Autorizzazione richiesta'
+        prompt: 'Autorizzare %{client_name} ad accedere al tuo account?'
+        able_to: 'Questa applicazione potrà'
+      show:
+        title: 'Codice di autorizzazione'
+        authorization_code_label: 'Codice di autorizzazione:'
+        copy_instructions: 'Copia questo codice e incollalo nell''applicazione.'
+      form_post:
+        title: 'Invia questo modulo'
+
+    authorized_applications:
+      confirmations:
+        revoke: 'Sei sicuro?'
+      buttons:
+        revoke: 'Revoca'
+      index:
+        title: 'Le tue applicazioni autorizzate'
+        application: 'Applicazione'
+        created_at: 'Creata il'
+        date_format: '%d/%m/%Y %H:%M:%S'
+
+    pre_authorization:
+      status: 'Pre-autorizzazione'
+
+    errors:
+      messages:
+        invalid_request:
+          unknown: 'La richiesta è priva di un parametro obbligatorio, include un valore di parametro non supportato o è comunque malformata.'
+          missing_param: 'Parametro obbligatorio mancante: %{value}.'
+          request_not_authorized: 'La richiesta deve essere autorizzata. Il parametro obbligatorio per autorizzare la richiesta è mancante o non valido.'
+          invalid_code_challenge: 'Il code challenge è obbligatorio.'
+        invalid_redirect_uri: "L'URI di reindirizzamento richiesto è malformato o non corrisponde all'URI del client."
+        unauthorized_client: 'Il client non è autorizzato a eseguire questa richiesta con questo metodo.'
+        access_denied: 'Il proprietario della risorsa o il server di autorizzazione ha negato la richiesta.'
+        invalid_scope: 'Lo scope richiesto non è valido, sconosciuto o malformato.'
+        invalid_code_challenge_method:
+          zero: "Il server di autorizzazione non supporta PKCE poiché non ci sono valori accettati per code_challenge_method."
+          one: 'Il code_challenge_method deve essere %{challenge_methods}.'
+          other: 'Il code_challenge_method deve essere uno tra %{challenge_methods}.'
+        server_error: 'Il server di autorizzazione ha incontrato una condizione imprevista che gli ha impedito di soddisfare la richiesta.'
+        temporarily_unavailable: 'Il server di autorizzazione non è attualmente in grado di gestire la richiesta a causa di un sovraccarico temporaneo o di manutenzione.'
+        credential_flow_not_configured: 'Il flusso Resource Owner Password Credentials è fallito perché Doorkeeper.configure.resource_owner_from_credentials non è configurato.'
+        resource_owner_authenticator_not_configured: 'Ricerca del Resource Owner fallita perché Doorkeeper.configure.resource_owner_authenticator non è configurato.'
+        admin_authenticator_not_configured: "L'accesso al pannello amministrativo è vietato perché Doorkeeper.configure.admin_authenticator non è configurato."
+        unsupported_response_type: 'Il server di autorizzazione non supporta questo tipo di risposta.'
+        unsupported_response_mode: 'Il server di autorizzazione non supporta questa modalità di risposta.'
+        invalid_client: "L'autenticazione del client è fallita a causa di client sconosciuto, nessuna autenticazione inclusa o metodo di autenticazione non supportato."
+        invalid_grant: "La concessione di autorizzazione fornita non è valida, è scaduta, è stata revocata, non corrisponde all'URI di reindirizzamento usato nella richiesta di autorizzazione o è stata emessa per un altro client."
+        unsupported_grant_type: 'Il tipo di concessione di autorizzazione non è supportato dal server di autorizzazione.'
+        invalid_token:
+          revoked: "Il token di accesso è stato revocato"
+          expired: "Il token di accesso è scaduto"
+          unknown: "Il token di accesso non è valido"
+        revoke:
+          unauthorized: "Non sei autorizzato a revocare questo token"
+        forbidden_token:
+          missing_scope: 'L''accesso a questa risorsa richiede lo scope "%{oauth_scopes}".'
+
+    flash:
+      applications:
+        create:
+          notice: 'Applicazione creata.'
+        destroy:
+          notice: 'Applicazione eliminata.'
+        update:
+          notice: 'Applicazione aggiornata.'
+      authorized_applications:
+        destroy:
+          notice: 'Applicazione revocata.'
+
+    layouts:
+      admin:
+        title: 'Doorkeeper'
+        nav:
+          oauth2_provider: 'Provider OAuth2'
+          applications: 'Applicazioni'
+          home: 'Home'
+      application:
+        title: 'Autorizzazione OAuth richiesta'
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
new file mode 100644
index 000000000..a4e869a51
--- /dev/null
+++ b/config/locales/doorkeeper.ru.yml
@@ -0,0 +1,164 @@
+---
+ru:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Название
+        redirect_uri: URI перенаправления
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              forbidden_uri: запрещён сервером.
+              fragment_present: не может содержать фрагмент.
+              invalid_uri: должен быть допустимым URI.
+              relative_uri: должен быть абсолютным URI.
+              secured_uri: должен быть HTTPS/SSL URI.
+              unspecified_scheme: должен указать схему.
+            scopes:
+              not_match_configured: не соответствует настроенному на сервере.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Авторизовать
+        cancel: Отмена
+        destroy: Удалить
+        edit: Редактировать
+        submit: Отправить
+      confirmations:
+        destroy: Вы уверены?
+      edit:
+        title: Редактировать приложение
+      form:
+        error: Упс! Проверьте форму на наличие ошибок
+      help:
+        blank_redirect_uri: Оставьте пустым, если вы настроили своего провайдера на
+          использование Client Credentials, Resource Owner Password Credentials или
+          любого другого типа гранта, который не требует URI перенаправления.
+        confidential: Приложение будет использоваться там, где секрет клиента может
+          быть сохранён конфиденциально. Нативные мобильные приложения и одностраничные
+          приложения считаются неконфиденциальными.
+        redirect_uri: Используйте одну строку на каждый URI
+        scopes: Разделяйте области пробелами. Оставьте пустым для использования областей
+          по умолчанию.
+      index:
+        actions: Действия
+        callback_url: URL обратного вызова
+        confidential: Конфиденциально?
+        confidentiality:
+          'no': Нет
+          'yes': Да
+        name: Название
+        new: Новое приложение
+        title: Ваши приложения
+      new:
+        title: Новое приложение
+      show:
+        actions: Действия
+        application_id: UID
+        callback_urls: URL-ы обратного вызова
+        confidential: Конфиденциально
+        not_defined: Не определено
+        scopes: Области
+        secret: Секрет
+        secret_hashed: Хэшированный секрет
+        title: 'Приложение: %{name}'
+    authorizations:
+      buttons:
+        authorize: Авторизовать
+        deny: Отклонить
+      error:
+        go_back: Вернуться назад
+        title: Произошла ошибка
+      form_post:
+        title: Отправьте эту форму
+      new:
+        able_to: Это приложение сможет
+        prompt: Авторизовать %{client_name} для использования вашего счёта?
+        title: Требуется авторизация
+      show:
+        authorization_code_label: 'Код авторизации:'
+        copy_instructions: Скопируйте этот код и вставьте его в приложение.
+        title: Код авторизации
+    authorized_applications:
+      buttons:
+        revoke: Отозвать
+      confirmations:
+        revoke: Вы уверены?
+      index:
+        application: Приложение
+        created_at: Создано
+        date_format: "%d.%m.%Y %H:%M:%S"
+        title: Ваши авторизованные приложения
+    errors:
+      messages:
+        access_denied: Владелец ресурса или сервер авторизации отклонил запрос.
+        admin_authenticator_not_configured: Доступ к админ-панели запрещён из-за ненастроенного
+          Doorkeeper.configure.admin_authenticator.
+        credential_flow_not_configured: Поток Resource Owner Password Credentials
+          не настроен из-за ненастроенного Doorkeeper.configure.resource_owner_from_credentials.
+        forbidden_token:
+          missing_scope: Доступ к этому ресурсу требует области "%{oauth_scopes}".
+        invalid_client: Аутентификация клиента не удалась из-за неизвестного клиента,
+          отсутствия аутентификации клиента или неподдерживаемого метода аутентификации.
+        invalid_code_challenge_method:
+          few: Параметр code_challenge_method должен быть одним из %{challenge_methods}.
+          many: Параметр code_challenge_method должен быть одним из %{challenge_methods}.
+          one: Параметр code_challenge_method должен быть %{challenge_methods}.
+          other: Параметр code_challenge_method должен быть одним из %{challenge_methods}.
+          zero: Сервер авторизации не поддерживает PKCE, так как нет допустимых значений
+            code_challenge_method.
+        invalid_grant: Предоставленный грант авторизации недействителен, истёк, отозван,
+          не соответствует URI перенаправления, использованному в запросе авторизации,
+          или был выдан другому клиенту.
+        invalid_redirect_uri: Запрашиваемый URI перенаправления некорректен или не
+          соответствует URI перенаправления клиента.
+        invalid_request:
+          invalid_code_challenge: Требуется код вызова.
+          missing_param: 'Отсутствует обязательный параметр: %{value}.'
+          request_not_authorized: Запрос должен быть авторизован. Отсутствует или
+            недействителен обязательный параметр для авторизации запроса.
+          unknown: Запрос отсутствует обязательный параметр, включает неподдерживаемое
+            значение параметра или иным образом некорректен.
+        invalid_scope: Запрашиваемая область недействительна, неизвестна или некорректна.
+        invalid_token:
+          expired: Токен доступа истёк
+          revoked: Токен доступа был отозван
+          unknown: Токен доступа недействителен
+        resource_owner_authenticator_not_configured: Поиск владельца ресурса не удался
+          из-за ненастроенного Doorkeeper.configure.resource_owner_authenticator.
+        revoke:
+          unauthorized: Вы не авторизованы для отзыва этого токена
+        server_error: Сервер авторизации столкнулся с неожиданной проблемой, которая
+          помешала ему выполнить запрос.
+        temporarily_unavailable: Сервер авторизации временно не может обработать запрос
+          из-за перегрузки или обслуживания сервера.
+        unauthorized_client: Клиент не авторизован для выполнения этого запроса с
+          использованием этого метода.
+        unsupported_grant_type: Тип гранта авторизации не поддерживается сервером
+          авторизации.
+        unsupported_response_mode: Сервер авторизации не поддерживает этот режим ответа.
+        unsupported_response_type: Сервер авторизации не поддерживает этот тип ответа.
+    flash:
+      applications:
+        create:
+          notice: Приложение создано.
+        destroy:
+          notice: Приложение удалено.
+        update:
+          notice: Приложение обновлено.
+      authorized_applications:
+        destroy:
+          notice: Приложение отозвано.
+    layouts:
+      admin:
+        nav:
+          applications: Приложения
+          home: Главная
+          oauth2_provider: Провайдер OAuth2
+        title: Doorkeeper
+      application:
+        title: Требуется авторизация OAuth
+    pre_authorization:
+      status: Предварительная авторизация
diff --git a/config/locales/doorkeeper.tr.yml b/config/locales/doorkeeper.tr.yml
index 039f35ce2..517ed9bdc 100644
--- a/config/locales/doorkeeper.tr.yml
+++ b/config/locales/doorkeeper.tr.yml
@@ -1,155 +1,164 @@
+---
 tr:
   activerecord:
     attributes:
       doorkeeper/application:
-        name: 'İsim'
-        redirect_uri: 'Yönlendirme URI'
+        name: İsim
+        redirect_uri: Yönlendirme URI
     errors:
       models:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: 'bir parça (fragment) içeremez.'
-              invalid_uri: 'geçerli bir URI olmalı.'
-              unspecified_scheme: 'bir şema belirtilmeli.'
-              relative_uri: 'mutlak bir URI olmalı.'
-              secured_uri: 'HTTPS/SSL URI olmalı.'
-              forbidden_uri: 'sunucu tarafından yasaklandı.'
+              forbidden_uri: sunucu tarafından yasaklandı.
+              fragment_present: bir parça (fragment) içeremez.
+              invalid_uri: geçerli bir URI olmalı.
+              relative_uri: mutlak bir URI olmalı.
+              secured_uri: HTTPS/SSL URI olmalı.
+              unspecified_scheme: bir şema belirtilmeli.
             scopes:
-              not_match_configured: "sunucuda yapılandırılan ile eşleşmiyor."
-
+              not_match_configured: sunucuda yapılandırılan ile eşleşmiyor.
   doorkeeper:
     applications:
-      confirmations:
-        destroy: 'Emin misiniz?'
       buttons:
-        edit: 'Düzenle'
-        destroy: 'Sil'
-        submit: 'Gönder'
-        cancel: 'İptal'
-        authorize: 'Yetkilendir'
-      form:
-        error: 'Hata! Formunuzu olası hatalar için kontrol edin'
-      help:
-        confidential: 'Uygulama, istemci sırrının gizli tutulabileceği yerlerde kullanılacaktır. Yerel mobil uygulamalar ve Tek Sayfa Uygulamaları gizli olmayan olarak kabul edilir.'
-        redirect_uri: 'Her URI için bir satır kullanın'
-        blank_redirect_uri: "Sağlayıcınızı İstemci Kimlik Bilgileri, Kaynak Sahibi Parola Kimlik Bilgileri veya yönlendirme URI'si gerektirmeyen başka bir yetkilendirme türüyle yapılandırdıysanız boş bırakın."
-        scopes: 'Kapsamları boşluk ile ayırın. Varsayılan kapsamları kullanmak için boş bırakın.'
+        authorize: Yetkilendir
+        cancel: İptal
+        destroy: Sil
+        edit: Düzenle
+        submit: Gönder
+      confirmations:
+        destroy: Emin misiniz?
       edit:
-        title: 'Uygulamayı düzenle'
+        title: Uygulamayı düzenle
+      form:
+        error: Hata! Formunuzu olası hatalar için kontrol edin
+      help:
+        blank_redirect_uri: Sağlayıcınızı İstemci Kimlik Bilgileri, Kaynak Sahibi
+          Parola Kimlik Bilgileri veya yönlendirme URI'si gerektirmeyen başka bir
+          yetkilendirme türüyle yapılandırdıysanız boş bırakın.
+        confidential: Uygulama, istemci sırrının gizli tutulabileceği yerlerde kullanılacaktır.
+          Yerel mobil uygulamalar ve Tek Sayfa Uygulamaları gizli olmayan olarak kabul
+          edilir.
+        redirect_uri: Her URI için bir satır kullanın
+        scopes: Kapsamları boşluk ile ayırın. Varsayılan kapsamları kullanmak için
+          boş bırakın.
       index:
-        title: 'Uygulamalarınız'
-        new: 'Yeni Uygulama'
-        name: 'İsim'
-        callback_url: 'Geri Çağırma URL’si'
-        confidential: 'Gizli mi?'
-        actions: 'Eylemler'
+        actions: Eylemler
+        callback_url: Geri Çağırma URL’si
+        confidential: Gizli mi?
         confidentiality:
-          'yes': 'Evet'
-          'no': 'Hayır'
+          'no': Hayır
+          'yes': Evet
+        name: İsim
+        new: Yeni Uygulama
+        title: Uygulamalarınız
       new:
-        title: 'Yeni Uygulama'
+        title: Yeni Uygulama
       show:
+        actions: Eylemler
+        application_id: UID
+        callback_urls: Geri çağırma URL’leri
+        confidential: Gizli
+        not_defined: Tanımlanmadı
+        scopes: Kapsamlar
+        secret: Gizli Anahtar
+        secret_hashed: Gizli anahtar hashlenmiş
         title: 'Uygulama: %{name}'
-        application_id: 'UID'
-        secret: 'Gizli Anahtar'
-        secret_hashed: 'Gizli anahtar hashlenmiş'
-        scopes: 'Kapsamlar'
-        confidential: 'Gizli'
-        callback_urls: 'Geri çağırma URL’leri'
-        actions: 'Eylemler'
-        not_defined: 'Tanımlanmadı'
-
     authorizations:
       buttons:
-        authorize: 'Yetkilendir'
-        deny: 'Reddet'
+        authorize: Yetkilendir
+        deny: Reddet
       error:
-        title: 'Bir hata oluştu'
-      new:
-        title: 'Yetkilendirme gerekli'
-        prompt: '%{client_name} uygulamasının hesabınızı kullanmasına izin verilsin mi?'
-        able_to: 'Bu uygulama şunları yapabilecek'
-      show:
-        title: 'Yetkilendirme kodu'
+        go_back: Geri dön
+        title: Bir hata oluştu
       form_post:
-        title: 'Bu formu gönder'
-
+        title: Bu formu gönder
+      new:
+        able_to: Bu uygulama şunları yapabilecek
+        prompt: "%{client_name} uygulamasının hesabınızı kullanmasına izin verilsin
+          mi?"
+        title: Yetkilendirme gerekli
+      show:
+        authorization_code_label: 'Yetkilendirme Kodu:'
+        copy_instructions: Bu kodu kopyalayın ve uygulamaya yapıştırın.
+        title: Yetkilendirme kodu
     authorized_applications:
-      confirmations:
-        revoke: 'Emin misiniz?'
       buttons:
-        revoke: 'Geri Al'
+        revoke: Geri Al
+      confirmations:
+        revoke: Emin misiniz?
       index:
-        title: 'Yetkilendirilmiş uygulamalarınız'
-        application: 'Uygulama'
-        created_at: 'Oluşturulma Tarihi'
-        date_format: '%Y-%m-%d %H:%M:%S'
-
-    pre_authorization:
-      status: 'Ön yetkilendirme'
-
+        application: Uygulama
+        created_at: Oluşturulma Tarihi
+        date_format: "%d.%m.%Y %H:%M:%S"
+        title: Yetkilendirilmiş uygulamalarınız
     errors:
       messages:
-        # Ortak hata mesajları
-        invalid_request:
-          unknown: 'İstek, gerekli bir parametreyi içermiyor, desteklenmeyen bir parametre değeri içeriyor veya başka bir şekilde hatalı.'
-          missing_param: 'Gerekli parametre eksik: %{value}.'
-          request_not_authorized: 'İstek yetkilendirilmeli. Yetkilendirme için gerekli parametre eksik veya geçersiz.'
-          invalid_code_challenge: 'Kod doğrulama (code challenge) gerekli.'
-        invalid_redirect_uri: "İstenen yönlendirme URI'si hatalı veya istemci yönlendirme URI'siyle eşleşmiyor."
-        unauthorized_client: 'İstemcinin bu isteği bu yöntemle gerçekleştirme yetkisi yok.'
-        access_denied: 'Kaynak sahibi veya yetkilendirme sunucusu isteği reddetti.'
-        invalid_scope: 'İstenen kapsam geçersiz, bilinmiyor veya hatalı.'
-        invalid_code_challenge_method:
-          zero: 'Yetkilendirme sunucusu PKCE desteklemiyor çünkü kabul edilen code_challenge_method değeri yok.'
-          one: 'code_challenge_method %{challenge_methods} olmalı.'
-          other: 'code_challenge_method şu değerlerden biri olmalı: %{challenge_methods}.'
-        server_error: 'Yetkilendirme sunucusu, isteği yerine getirmesini engelleyen beklenmedik bir durumla karşılaştı.'
-        temporarily_unavailable: 'Yetkilendirme sunucusu şu anda geçici bir aşırı yüklenme veya bakım nedeniyle isteği işleyemiyor.'
-
-        # Yapılandırma hata mesajları
-        credential_flow_not_configured: 'Resource Owner Password Credentials akışı, Doorkeeper.configure.resource_owner_from_credentials yapılandırılmadığı için başarısız oldu.'
-        resource_owner_authenticator_not_configured: 'Kaynak sahibi bulma işlemi, Doorkeeper.configure.resource_owner_authenticator yapılandırılmadığı için başarısız oldu.'
-        admin_authenticator_not_configured: 'Yönetici paneline erişim, Doorkeeper.configure.admin_authenticator yapılandırılmadığı için yasaklandı.'
-
-        # Erişim izni hataları
-        unsupported_response_type: 'Yetkilendirme sunucusu bu yanıt türünü desteklemiyor.'
-        unsupported_response_mode: 'Yetkilendirme sunucusu bu yanıt modunu desteklemiyor.'
-
-        # Erişim anahtarı hataları
-        invalid_client: 'İstemci kimlik doğrulaması, bilinmeyen istemci, kimlik doğrulama eksik veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.'
-        invalid_grant: 'Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URI’siyle eşleşmiyor veya başka bir istemciye verilmiş.'
-        unsupported_grant_type: 'Yetkilendirme izni türü yetkilendirme sunucusu tarafından desteklenmiyor.'
-
-        invalid_token:
-          revoked: "Erişim anahtarı iptal edildi"
-          expired: "Erişim anahtarının süresi doldu"
-          unknown: "Erişim anahtarı geçersiz"
-        revoke:
-          unauthorized: "Bu anahtarı iptal etme yetkiniz yok"
-
+        access_denied: Kaynak sahibi veya yetkilendirme sunucusu isteği reddetti.
+        admin_authenticator_not_configured: Yönetici paneline erişim, Doorkeeper.configure.admin_authenticator
+          yapılandırılmadığı için yasaklandı.
+        credential_flow_not_configured: Resource Owner Password Credentials akışı,
+          Doorkeeper.configure.resource_owner_from_credentials yapılandırılmadığı
+          için başarısız oldu.
         forbidden_token:
-          missing_scope: 'Bu kaynağa erişmek için "%{oauth_scopes}" kapsamı gereklidir.'
-
+          missing_scope: Bu kaynağa erişmek için "%{oauth_scopes}" kapsamı gereklidir.
+        invalid_client: İstemci kimlik doğrulaması, bilinmeyen istemci, kimlik doğrulama
+          eksik veya desteklenmeyen kimlik doğrulama yöntemi nedeniyle başarısız oldu.
+        invalid_code_challenge_method:
+          one: code_challenge_method %{challenge_methods} olmalı.
+          other: 'code_challenge_method şu değerlerden biri olmalı: %{challenge_methods}.'
+          zero: Yetkilendirme sunucusu PKCE desteklemiyor çünkü kabul edilen code_challenge_method
+            değeri yok.
+        invalid_grant: Sağlanan yetkilendirme izni geçersiz, süresi dolmuş, iptal
+          edilmiş, yetkilendirme isteğinde kullanılan yönlendirme URI’siyle eşleşmiyor
+          veya başka bir istemciye verilmiş.
+        invalid_redirect_uri: İstenen yönlendirme URI'si hatalı veya istemci yönlendirme
+          URI'siyle eşleşmiyor.
+        invalid_request:
+          invalid_code_challenge: Kod doğrulama (code challenge) gerekli.
+          missing_param: 'Gerekli parametre eksik: %{value}.'
+          request_not_authorized: İstek yetkilendirilmeli. Yetkilendirme için gerekli
+            parametre eksik veya geçersiz.
+          unknown: İstek, gerekli bir parametreyi içermiyor, desteklenmeyen bir parametre
+            değeri içeriyor veya başka bir şekilde hatalı.
+        invalid_scope: İstenen kapsam geçersiz, bilinmiyor veya hatalı.
+        invalid_token:
+          expired: Erişim anahtarının süresi doldu
+          revoked: Erişim anahtarı iptal edildi
+          unknown: Erişim anahtarı geçersiz
+        resource_owner_authenticator_not_configured: Kaynak sahibi bulma işlemi, Doorkeeper.configure.resource_owner_authenticator
+          yapılandırılmadığı için başarısız oldu.
+        revoke:
+          unauthorized: Bu anahtarı iptal etme yetkiniz yok
+        server_error: Yetkilendirme sunucusu, isteği yerine getirmesini engelleyen
+          beklenmedik bir durumla karşılaştı.
+        temporarily_unavailable: Yetkilendirme sunucusu şu anda geçici bir aşırı yüklenme
+          veya bakım nedeniyle isteği işleyemiyor.
+        unauthorized_client: İstemcinin bu isteği bu yöntemle gerçekleştirme yetkisi
+          yok.
+        unsupported_grant_type: Yetkilendirme izni türü yetkilendirme sunucusu tarafından
+          desteklenmiyor.
+        unsupported_response_mode: Yetkilendirme sunucusu bu yanıt modunu desteklemiyor.
+        unsupported_response_type: Yetkilendirme sunucusu bu yanıt türünü desteklemiyor.
     flash:
       applications:
         create:
-          notice: 'Uygulama oluşturuldu.'
+          notice: Uygulama oluşturuldu.
         destroy:
-          notice: 'Uygulama silindi.'
+          notice: Uygulama silindi.
         update:
-          notice: 'Uygulama güncellendi.'
+          notice: Uygulama güncellendi.
       authorized_applications:
         destroy:
-          notice: 'Uygulamanın yetkisi kaldırıldı.'
-
+          notice: Uygulamanın yetkisi kaldırıldı.
     layouts:
       admin:
-        title: 'Doorkeeper'
         nav:
-          oauth2_provider: 'OAuth2 Sağlayıcı'
-          applications: 'Uygulamalar'
-          home: 'Ana Sayfa'
+          applications: Uygulamalar
+          home: Ana Sayfa
+          oauth2_provider: OAuth2 Sağlayıcı
+        title: Doorkeeper
       application:
-        title: 'OAuth yetkilendirmesi gerekli'
+        title: OAuth yetkilendirmesi gerekli
+    pre_authorization:
+      status: Ön yetkilendirme
diff --git a/config/locales/mailers/invitation_mailer/fr.yml b/config/locales/mailers/invitation_mailer/fr.yml
index 4224d30bb..75aa1194f 100644
--- a/config/locales/mailers/invitation_mailer/fr.yml
+++ b/config/locales/mailers/invitation_mailer/fr.yml
@@ -2,4 +2,5 @@
 fr:
   invitation_mailer:
     invite_email:
-      subject: "%{inviter} vous a invité à rejoindre sa famille sur %{product_name} !"
+      subject: "%{inviter} vous a invité à rejoindre sa famille sur %{product_name}
+        !"
diff --git a/config/locales/mailers/invitation_mailer/it.yml b/config/locales/mailers/invitation_mailer/it.yml
new file mode 100644
index 000000000..be88fe19d
--- /dev/null
+++ b/config/locales/mailers/invitation_mailer/it.yml
@@ -0,0 +1,5 @@
+---
+it:
+  invitation_mailer:
+    invite_email:
+      subject: "%{inviter} ti ha invitato a unirti alla sua famiglia su %{product_name}!"
diff --git a/config/locales/mailers/invitation_mailer/ru.yml b/config/locales/mailers/invitation_mailer/ru.yml
new file mode 100644
index 000000000..e5d7787f9
--- /dev/null
+++ b/config/locales/mailers/invitation_mailer/ru.yml
@@ -0,0 +1,5 @@
+---
+ru:
+  invitation_mailer:
+    invite_email:
+      subject: "%{inviter} пригласил вас присоединиться к их домохозяйству в %{product_name}!"
diff --git a/config/locales/mailers/invitation_mailer/tr.yml b/config/locales/mailers/invitation_mailer/tr.yml
index 43ad11b80..319f48d5f 100644
--- a/config/locales/mailers/invitation_mailer/tr.yml
+++ b/config/locales/mailers/invitation_mailer/tr.yml
@@ -2,4 +2,5 @@
 tr:
   invitation_mailer:
     invite_email:
-      subject: "%{inviter} seni %{product_name}'de kendi ailesine katılmaya davet etti!"
+      subject: "%{inviter} seni %{product_name}'de kendi ailesine katılmaya davet
+        etti!"
diff --git a/config/locales/mailers/pdf_import_mailer/fr.yml b/config/locales/mailers/pdf_import_mailer/fr.yml
index 63188c132..28a6140f7 100644
--- a/config/locales/mailers/pdf_import_mailer/fr.yml
+++ b/config/locales/mailers/pdf_import_mailer/fr.yml
@@ -2,4 +2,4 @@
 fr:
   pdf_import_mailer:
     next_steps:
-      subject: "Votre document PDF a été analysé - %{product_name}"
+      subject: Votre document PDF a été analysé - %{product_name}
diff --git a/config/locales/mailers/pdf_import_mailer/it.yml b/config/locales/mailers/pdf_import_mailer/it.yml
new file mode 100644
index 000000000..f39b9b6fc
--- /dev/null
+++ b/config/locales/mailers/pdf_import_mailer/it.yml
@@ -0,0 +1,5 @@
+---
+it:
+  pdf_import_mailer:
+    next_steps:
+      subject: "Il tuo documento PDF è stato analizzato - %{product_name}"
diff --git a/config/locales/mailers/pdf_import_mailer/ru.yml b/config/locales/mailers/pdf_import_mailer/ru.yml
new file mode 100644
index 000000000..3828543c2
--- /dev/null
+++ b/config/locales/mailers/pdf_import_mailer/ru.yml
@@ -0,0 +1,5 @@
+---
+ru:
+  pdf_import_mailer:
+    next_steps:
+      subject: Ваш PDF-документ был проанализирован - %{product_name}
diff --git a/config/locales/mailers/pdf_import_mailer/tr.yml b/config/locales/mailers/pdf_import_mailer/tr.yml
new file mode 100644
index 000000000..8b85a1785
--- /dev/null
+++ b/config/locales/mailers/pdf_import_mailer/tr.yml
@@ -0,0 +1,5 @@
+---
+tr:
+  pdf_import_mailer:
+    next_steps:
+      subject: PDF belgeniz analiz edildi - %{product_name}
diff --git a/config/locales/mailers/rule_notification_mailer/en.yml b/config/locales/mailers/rule_notification_mailer/en.yml
new file mode 100644
index 000000000..e8046a339
--- /dev/null
+++ b/config/locales/mailers/rule_notification_mailer/en.yml
@@ -0,0 +1,16 @@
+---
+en:
+  rule_notification_mailer:
+    digest:
+      subject:
+        one: "1 new transaction matched your rule on %{product_name}"
+        other: "%{count} new transactions matched your rule on %{product_name}"
+      heading:
+        one: "1 new transaction matched your rule"
+        other: "%{count} new transactions matched your rule"
+      intro: 'These transactions matched the rule "%{rule}":'
+      date: "Date"
+      name: "Name"
+      account: "Account"
+      amount: "Amount"
+      cta: "View transactions"
diff --git a/config/locales/mailers/rule_notification_mailer/pl.yml b/config/locales/mailers/rule_notification_mailer/pl.yml
new file mode 100644
index 000000000..86055f3e8
--- /dev/null
+++ b/config/locales/mailers/rule_notification_mailer/pl.yml
@@ -0,0 +1,20 @@
+---
+pl:
+  rule_notification_mailer:
+    digest:
+      subject:
+        few: "%{count} nowe transakcje pasują do Twojej reguły w %{product_name}"
+        many: "%{count} nowych transakcji pasuje do Twojej reguły w %{product_name}"
+        one: "1 nowa transakcja pasuje do Twojej reguły w %{product_name}"
+        other: "%{count} nowych transakcji pasuje do Twojej reguły w %{product_name}"
+      heading:
+        few: "%{count} nowe transakcje pasują do Twojej reguły"
+        many: "%{count} nowych transakcji pasuje do Twojej reguły"
+        one: "1 nowa transakcja pasuje do Twojej reguły"
+        other: "%{count} nowych transakcji pasuje do Twojej reguły"
+      intro: "Te transakcje pasują do reguły \"%{rule}\":"
+      date: "Data"
+      name: "Nazwa"
+      account: "Konto"
+      amount: "Kwota"
+      cta: "Zobacz transakcje"
diff --git a/config/locales/mailers/rule_notification_mailer/tr.yml b/config/locales/mailers/rule_notification_mailer/tr.yml
new file mode 100644
index 000000000..9173bb0fc
--- /dev/null
+++ b/config/locales/mailers/rule_notification_mailer/tr.yml
@@ -0,0 +1,16 @@
+---
+tr:
+  rule_notification_mailer:
+    digest:
+      account: Hesap
+      amount: Tutar
+      cta: İşlemleri görüntüle
+      date: Tarih
+      heading:
+        one: Kuralınızla eşleşen 1 yeni işlem var
+        other: Kuralınızla eşleşen %{count} yeni işlem var
+      intro: '"%{rule}" kuralıyla eşleşen işlemler:'
+      name: Ad
+      subject:
+        one: "%{product_name} üzerinde kuralınızla eşleşen 1 yeni işlem var"
+        other: "%{product_name} üzerinde kuralınızla eşleşen %{count} yeni işlem var"
diff --git a/config/locales/models/account/fr.yml b/config/locales/models/account/fr.yml
index dc0dca702..55ce2ed98 100644
--- a/config/locales/models/account/fr.yml
+++ b/config/locales/models/account/fr.yml
@@ -1,5 +1,18 @@
 ---
 fr:
+  account_order:
+    balance_asc:
+      label: Solde (de bas en haut)
+      label_short: Solde ↑
+    balance_desc:
+      label: Solde (haut à bas)
+      label_short: Solde ↓
+    name_asc:
+      label: Nom (A-Z)
+      label_short: Nom ↑
+    name_desc:
+      label: Nom (Z-A)
+      label_short: Nom ↓
   activerecord:
     attributes:
       account:
@@ -12,6 +25,7 @@ fr:
     models:
       account: Compte
       account/credit: Carte de Crédit
+      account/crypto: Cryptomonnaie
       account/depository: Compte Bancaire
       account/investment: Investissement
       account/loan: Prêt
@@ -19,4 +33,3 @@ fr:
       account/other_liability: Autre Passif
       account/property: Immobilier
       account/vehicle: Véhicule
-      account/crypto: Cryptomonnaie
diff --git a/config/locales/models/account/it.yml b/config/locales/models/account/it.yml
new file mode 100644
index 000000000..bf83b1365
--- /dev/null
+++ b/config/locales/models/account/it.yml
@@ -0,0 +1,34 @@
+---
+it:
+  account_order:
+    balance_asc:
+      label: Saldo (dal più basso)
+      label_short: Saldo ↑
+    balance_desc:
+      label: Saldo (dal più alto)
+      label_short: Saldo ↓
+    name_asc:
+      label: Nome (A-Z)
+      label_short: Nome ↑
+    name_desc:
+      label: Nome (Z-A)
+      label_short: Nome ↓
+  activerecord:
+    attributes:
+      account:
+        balance: Saldo
+        currency: Valuta
+        family: "%{moniker}"
+        family_id: "%{moniker}"
+        name: Nome
+        subtype: Sottotipo
+    models:
+      account: Conto
+      account/credit: Carta di credito
+      account/depository: Conto bancario
+      account/investment: Investimento
+      account/loan: Prestito
+      account/other_asset: Altro asset
+      account/other_liability: Altra passività
+      account/property: Immobile
+      account/vehicle: Veicolo
diff --git a/config/locales/models/account/ru.yml b/config/locales/models/account/ru.yml
new file mode 100644
index 000000000..06415f570
--- /dev/null
+++ b/config/locales/models/account/ru.yml
@@ -0,0 +1,34 @@
+---
+ru:
+  account_order:
+    balance_asc:
+      label: Баланс (по возрастанию)
+      label_short: Баланс ↑
+    balance_desc:
+      label: Баланс (по убыванию)
+      label_short: Баланс ↓
+    name_asc:
+      label: Имя (А-Я)
+      label_short: Имя ↑
+    name_desc:
+      label: Имя (Я-А)
+      label_short: Имя ↓
+  activerecord:
+    attributes:
+      account:
+        balance: Баланс
+        currency: Валюта
+        family: "%{moniker}"
+        family_id: "%{moniker}"
+        name: Имя
+        subtype: Подтип
+    models:
+      account: Счёт
+      account/credit: Кредитная карта
+      account/depository: Банковский счёт
+      account/investment: Инвестиции
+      account/loan: Кредит
+      account/other_asset: Прочий актив
+      account/other_liability: Прочее обязательство
+      account/property: Недвижимость
+      account/vehicle: Транспортное средство
diff --git a/config/locales/models/account/tr.yml b/config/locales/models/account/tr.yml
index 319a06e3a..54928e6c8 100644
--- a/config/locales/models/account/tr.yml
+++ b/config/locales/models/account/tr.yml
@@ -1,12 +1,25 @@
 ---
 tr:
+  account_order:
+    balance_asc:
+      label: Bakiye (Düşükten Yükseğe)
+      label_short: Bakiye ↑
+    balance_desc:
+      label: Bakiye (Yüksekten Düşüğe)
+      label_short: Bakiye ↓
+    name_asc:
+      label: Ad (A-Z)
+      label_short: Ad ↑
+    name_desc:
+      label: Ad (Z-A)
+      label_short: Ad ↓
   activerecord:
     attributes:
       account:
         balance: Bakiye
         currency: Para Birimi
-        family: Aile
-        family_id: Aile
+        family: "%{moniker}"
+        family_id: "%{moniker}"
         name: Ad
         subtype: Alt Tür
     models:
@@ -18,4 +31,4 @@ tr:
       account/other_asset: Diğer Varlık
       account/other_liability: Diğer Yükümlülük
       account/property: Gayrimenkul
-      account/vehicle: Araç
\ No newline at end of file
+      account/vehicle: Araç
diff --git a/config/locales/models/account/zh-CN.yml b/config/locales/models/account/zh-CN.yml
index 97b168276..8e2407ff8 100644
--- a/config/locales/models/account/zh-CN.yml
+++ b/config/locales/models/account/zh-CN.yml
@@ -5,8 +5,8 @@ zh-CN:
       account:
         balance: 余额
         currency: 币种
-        family: 家庭
-        family_id: 家庭
+        family: "%{moniker}"
+        family_id: "%{moniker}"
         name: 名称
         subtype: 子类型
     models:
@@ -19,3 +19,16 @@ zh-CN:
       account/other_liability: 其他负债
       account/property: 房产/房地产
       account/vehicle: 车辆
+  account_order:
+    balance_asc:
+      label: 余额（从低到高）
+      label_short: 余额 ↑
+    balance_desc:
+      label: 余额（从高到低）
+      label_short: 余额 ↓
+    name_asc:
+      label: 名称（A-Z）
+      label_short: 名称 ↑
+    name_desc:
+      label: 名称（Z-A）
+      label_short: 名称 ↓
diff --git a/config/locales/models/account_statement/fr.yml b/config/locales/models/account_statement/fr.yml
new file mode 100644
index 000000000..a77d390b7
--- /dev/null
+++ b/config/locales/models/account_statement/fr.yml
@@ -0,0 +1,30 @@
+---
+fr:
+  activerecord:
+    attributes:
+      account_statement:
+        account: Compte
+        account_last4_hint: Compte quatre derniers
+        account_name_hint: Indice de nom de compte
+        closing_balance: Solde de clôture
+        content_sha256: Résumé du contenu
+        currency: Devise
+        filename: Nom du fichier
+        institution_name_hint: Indice d'établissement
+        opening_balance: Solde d'ouverture
+        original_file: Dossier de relevé
+        period_end_on: Fin de période
+        period_start_on: Début des règles
+    errors:
+      models:
+        account_statement:
+          attributes:
+            checksum:
+              duplicate_statement_file: a déjà été téléchargé pour cette famille
+            content_sha256:
+              duplicate_statement_file: a déjà été téléchargé pour cette famille
+            original_file:
+              invalid_format: doit être un fichier PDF, CSV ou XLSX
+              too_large: est trop grand. La taille maximale est de %{max_mb} Mo.
+            period_end_on:
+              on_or_after_start: doit être au plus tard au début des règles
diff --git a/config/locales/models/account_statement/it.yml b/config/locales/models/account_statement/it.yml
new file mode 100644
index 000000000..2dfb75dfc
--- /dev/null
+++ b/config/locales/models/account_statement/it.yml
@@ -0,0 +1,30 @@
+---
+it:
+  activerecord:
+    attributes:
+      account_statement:
+        account: Conto
+        account_last4_hint: Ultime quattro cifre conto
+        account_name_hint: Suggerimento nome conto
+        closing_balance: Saldo di chiusura
+        content_sha256: Digest contenuto
+        currency: Valuta
+        filename: Nome file
+        institution_name_hint: Suggerimento istituzione
+        opening_balance: Saldo iniziale
+        original_file: File estratto conto
+        period_end_on: Fine periodo
+        period_start_on: Inizio periodo
+    errors:
+      models:
+        account_statement:
+          attributes:
+            checksum:
+              duplicate_statement_file: è già stato caricato per questa famiglia
+            content_sha256:
+              duplicate_statement_file: è già stato caricato per questa famiglia
+            original_file:
+              invalid_format: deve essere un file PDF, CSV o XLSX
+              too_large: è troppo grande. La dimensione massima è %{max_mb}MB
+            period_end_on:
+              on_or_after_start: deve essere uguale o successivo all'inizio del periodo
diff --git a/config/locales/models/account_statement/pl.yml b/config/locales/models/account_statement/pl.yml
new file mode 100644
index 000000000..e24d35e91
--- /dev/null
+++ b/config/locales/models/account_statement/pl.yml
@@ -0,0 +1,30 @@
+---
+pl:
+  activerecord:
+    attributes:
+      account_statement:
+        account: Konto
+        account_last4_hint: Ostatnie cztery cyfry konta
+        account_name_hint: Podpowiedź nazwy konta
+        closing_balance: Saldo końcowe
+        content_sha256: Skrót zawartości
+        currency: Waluta
+        filename: Nazwa pliku
+        institution_name_hint: Podpowiedź instytucji
+        opening_balance: Saldo początkowe
+        original_file: Plik wyciągu
+        period_end_on: Koniec okresu
+        period_start_on: Początek okresu
+    errors:
+      models:
+        account_statement:
+          attributes:
+            checksum:
+              duplicate_statement_file: został już przesłany dla tej rodziny
+            content_sha256:
+              duplicate_statement_file: został już przesłany dla tej rodziny
+            original_file:
+              invalid_format: musi być plikiem PDF, CSV lub XLSX
+              too_large: jest za duży. Maksymalny rozmiar to %{max_mb} MB
+            period_end_on:
+              on_or_after_start: musi być nie wcześniej niż początek okresu
diff --git a/config/locales/models/account_statement/ru.yml b/config/locales/models/account_statement/ru.yml
new file mode 100644
index 000000000..cf2333263
--- /dev/null
+++ b/config/locales/models/account_statement/ru.yml
@@ -0,0 +1,30 @@
+---
+ru:
+  activerecord:
+    attributes:
+      account_statement:
+        account: Счёт
+        account_last4_hint: Последние четыре цифры счёта
+        account_name_hint: Подсказка по названию счёта
+        closing_balance: Закрывающий баланс
+        content_sha256: Контрольная сумма содержимого
+        currency: Валюта
+        filename: Имя файла
+        institution_name_hint: Подсказка по учреждению
+        opening_balance: Начальный баланс
+        original_file: Файл выписки
+        period_end_on: Конец периода
+        period_start_on: Начало периода
+    errors:
+      models:
+        account_statement:
+          attributes:
+            checksum:
+              duplicate_statement_file: уже загружен для этой семьи
+            content_sha256:
+              duplicate_statement_file: уже загружен для этой семьи
+            original_file:
+              invalid_format: должен быть в формате PDF, CSV или XLSX
+              too_large: слишком большой. Максимальный размер %{max_mb}MB
+            period_end_on:
+              on_or_after_start: должен быть не раньше начала периода
diff --git a/config/locales/models/account_statement/tr.yml b/config/locales/models/account_statement/tr.yml
new file mode 100644
index 000000000..595d8e2c9
--- /dev/null
+++ b/config/locales/models/account_statement/tr.yml
@@ -0,0 +1,30 @@
+---
+tr:
+  activerecord:
+    attributes:
+      account_statement:
+        account: Hesap
+        account_last4_hint: Hesabın son dört hanesi
+        account_name_hint: Hesap adı ipucu
+        closing_balance: Kapanış bakiyesi
+        content_sha256: İçerik özeti
+        currency: Para Birimi
+        filename: Dosya adı
+        institution_name_hint: Kurum ipucu
+        opening_balance: Açılış bakiyesi
+        original_file: Ekstre dosyası
+        period_end_on: Dönem bitişi
+        period_start_on: Dönem başlangıcı
+    errors:
+      models:
+        account_statement:
+          attributes:
+            checksum:
+              duplicate_statement_file: bu aile için zaten yüklenmiş
+            content_sha256:
+              duplicate_statement_file: bu aile için zaten yüklenmiş
+            original_file:
+              invalid_format: PDF, CSV veya XLSX dosyası olmalıdır
+              too_large: çok büyük. Maksimum boyut %{max_mb}MB
+            period_end_on:
+              on_or_after_start: dönem başlangıcıyla aynı veya sonraki bir tarih olmalıdır
diff --git a/config/locales/models/address/it.yml b/config/locales/models/address/it.yml
new file mode 100644
index 000000000..9b6746059
--- /dev/null
+++ b/config/locales/models/address/it.yml
@@ -0,0 +1,11 @@
+---
+it:
+  address:
+    attributes:
+      country: Paese
+      line1: Indirizzo riga 1
+      line2: Indirizzo riga 2
+      locality: Comune
+      postal_code: CAP
+      region: Regione/Provincia
+    format: "%{line1} %{line2}, %{locality}, %{region} %{postal_code} %{country}"
diff --git a/config/locales/models/address/ru.yml b/config/locales/models/address/ru.yml
new file mode 100644
index 000000000..00125cc72
--- /dev/null
+++ b/config/locales/models/address/ru.yml
@@ -0,0 +1,11 @@
+---
+ru:
+  address:
+    attributes:
+      country: Страна
+      line1: Адрес, строка 1
+      line2: Адрес, строка 2
+      locality: Населённый пункт
+      postal_code: Почтовый индекс
+      region: Регион
+    format: "%{line1} %{line2}, %{locality}, %{region} %{postal_code} %{country}"
diff --git a/config/locales/models/address/tr.yml b/config/locales/models/address/tr.yml
index 98b70fe34..9842ff8fc 100644
--- a/config/locales/models/address/tr.yml
+++ b/config/locales/models/address/tr.yml
@@ -8,4 +8,4 @@ tr:
       locality: İlçe/Semt
       postal_code: Posta Kodu
       region: Bölge/İl
-    format: "%{line1} %{line2}, %{locality}, %{region} %{postal_code} %{country}"
\ No newline at end of file
+    format: "%{line1} %{line2}, %{locality}, %{region} %{postal_code} %{country}"
diff --git a/config/locales/models/api_key/fr.yml b/config/locales/models/api_key/fr.yml
new file mode 100644
index 000000000..72591522d
--- /dev/null
+++ b/config/locales/models/api_key/fr.yml
@@ -0,0 +1,8 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        api_key:
+          cannot_destroy_demo_key: Impossible de détruire la clé API de surveillance
+            de la démonstration
diff --git a/config/locales/models/api_key/it.yml b/config/locales/models/api_key/it.yml
new file mode 100644
index 000000000..2c4bf9c16
--- /dev/null
+++ b/config/locales/models/api_key/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        api_key:
+          cannot_destroy_demo_key: "Impossibile eliminare la chiave API di monitoraggio demo"
diff --git a/config/locales/models/api_key/pl.yml b/config/locales/models/api_key/pl.yml
new file mode 100644
index 000000000..8d39bc787
--- /dev/null
+++ b/config/locales/models/api_key/pl.yml
@@ -0,0 +1,7 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        api_key:
+          cannot_destroy_demo_key: "Nie można usunąć demonstracyjnego klucza API monitorowania"
diff --git a/config/locales/models/api_key/ru.yml b/config/locales/models/api_key/ru.yml
new file mode 100644
index 000000000..687cb2328
--- /dev/null
+++ b/config/locales/models/api_key/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        api_key:
+          cannot_destroy_demo_key: Невозможно удалить демонстрационный ключ API мониторинга
diff --git a/config/locales/models/api_key/tr.yml b/config/locales/models/api_key/tr.yml
new file mode 100644
index 000000000..b896ef713
--- /dev/null
+++ b/config/locales/models/api_key/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        api_key:
+          cannot_destroy_demo_key: Demo izleme API anahtarı silinemez
diff --git a/config/locales/models/brex_item/fr.yml b/config/locales/models/brex_item/fr.yml
new file mode 100644
index 000000000..a2f836d67
--- /dev/null
+++ b/config/locales/models/brex_item/fr.yml
@@ -0,0 +1,14 @@
+---
+fr:
+  activerecord:
+    attributes:
+      brex_item:
+        base_url: URL de base
+        name: Nom de la connexion
+        token: Jeton
+    errors:
+      models:
+        brex_item:
+          attributes:
+            base_url:
+              official_hosts_only: doit être vide, https://api.brex.com ou https://api-staging.brex.com
diff --git a/config/locales/models/brex_item/it.yml b/config/locales/models/brex_item/it.yml
new file mode 100644
index 000000000..b99d7fd1d
--- /dev/null
+++ b/config/locales/models/brex_item/it.yml
@@ -0,0 +1,14 @@
+---
+it:
+  activerecord:
+    attributes:
+      brex_item:
+        base_url: URL base
+        name: Nome connessione
+        token: Token
+    errors:
+      models:
+        brex_item:
+          attributes:
+            base_url:
+              official_hosts_only: deve essere vuoto, https://api.brex.com, o https://api-staging.brex.com
diff --git a/config/locales/models/brex_item/pl.yml b/config/locales/models/brex_item/pl.yml
new file mode 100644
index 000000000..0c3c24d07
--- /dev/null
+++ b/config/locales/models/brex_item/pl.yml
@@ -0,0 +1,14 @@
+---
+pl:
+  activerecord:
+    attributes:
+      brex_item:
+        base_url: Bazowy URL
+        name: Nazwa połączenia
+        token: Token
+    errors:
+      models:
+        brex_item:
+          attributes:
+            base_url:
+              official_hosts_only: musi być pusty, https://api.brex.com lub https://api-staging.brex.com
diff --git a/config/locales/models/brex_item/ru.yml b/config/locales/models/brex_item/ru.yml
new file mode 100644
index 000000000..5430d64a4
--- /dev/null
+++ b/config/locales/models/brex_item/ru.yml
@@ -0,0 +1,14 @@
+---
+ru:
+  activerecord:
+    attributes:
+      brex_item:
+        base_url: Базовый URL
+        name: Название подключения
+        token: Токен
+    errors:
+      models:
+        brex_item:
+          attributes:
+            base_url:
+              official_hosts_only: должно быть пустым, https://api.brex.com или https://api-staging.brex.com
diff --git a/config/locales/models/brex_item/tr.yml b/config/locales/models/brex_item/tr.yml
new file mode 100644
index 000000000..2efb975e1
--- /dev/null
+++ b/config/locales/models/brex_item/tr.yml
@@ -0,0 +1,15 @@
+---
+tr:
+  activerecord:
+    attributes:
+      brex_item:
+        base_url: Temel URL
+        name: Bağlantı adı
+        token: Token
+    errors:
+      models:
+        brex_item:
+          attributes:
+            base_url:
+              official_hosts_only: boş bırakılamaz; https://api.brex.com ya da https://api-staging.brex.com
+                olmalıdır
diff --git a/config/locales/models/category/fr.yml b/config/locales/models/category/fr.yml
index eef81bda0..3d88abf17 100644
--- a/config/locales/models/category/fr.yml
+++ b/config/locales/models/category/fr.yml
@@ -2,6 +2,28 @@
 fr:
   models:
     category:
-      uncategorized: Non catégorisé
-      other_investments: Autres investissements
+      defaults:
+        entertainment: Divertissement
+        fees: Frais
+        food_and_drink: Nourriture et boissons
+        gifts_and_donations: Cadeaux et dons
+        groceries: Épicerie
+        healthcare: Soins de santé
+        home_improvement: Amélioration de l'habitat
+        income: Revenu
+        insurance: Assurance
+        loan_payments: Paiements du prêt
+        mortgage_rent: Hypothèque / Loyer
+        personal_care: Soins personnels
+        savings_and_investments: Épargne et investissements
+        services: Prestations
+        shopping: Achats
+        sports_and_fitness: Sports et remise en forme
+        subscriptions: Abonnements
+        taxes: Impôts
+        transportation: Transport
+        travel: Voyage
+        utilities: Utilitaires
       investment_contributions: Contributions aux investissements
+      other_investments: Autres investissements
+      uncategorized: Non catégorisé
diff --git a/config/locales/models/category/it.yml b/config/locales/models/category/it.yml
new file mode 100644
index 000000000..f2ad58125
--- /dev/null
+++ b/config/locales/models/category/it.yml
@@ -0,0 +1,29 @@
+---
+it:
+  models:
+    category:
+      uncategorized: Non categorizzata
+      other_investments: Altri investimenti
+      investment_contributions: Contributi investimento
+      defaults:
+        income: Entrate
+        food_and_drink: Cibo e bevande
+        groceries: Spesa alimentare
+        shopping: Shopping
+        transportation: Trasporti
+        travel: Viaggi
+        entertainment: Intrattenimento
+        healthcare: Salute
+        personal_care: Cura personale
+        home_improvement: Miglioramento casa
+        mortgage_rent: Mutuo / Affitto
+        utilities: Utenze
+        subscriptions: Abbonamenti
+        insurance: Assicurazioni
+        sports_and_fitness: Sport e fitness
+        gifts_and_donations: Regali e donazioni
+        taxes: Tasse
+        loan_payments: Rate prestiti
+        services: Servizi
+        fees: Commissioni
+        savings_and_investments: Risparmi e investimenti
diff --git a/config/locales/models/category/ru.yml b/config/locales/models/category/ru.yml
new file mode 100644
index 000000000..d19e36ded
--- /dev/null
+++ b/config/locales/models/category/ru.yml
@@ -0,0 +1,29 @@
+---
+ru:
+  models:
+    category:
+      defaults:
+        entertainment: Развлечения
+        fees: Комиссии
+        food_and_drink: Еда и напитки
+        gifts_and_donations: Подарки и пожертвования
+        groceries: Продукты
+        healthcare: Здравоохранение
+        home_improvement: Ремонт дома
+        income: Доход
+        insurance: Страхование
+        loan_payments: Платежи по кредитам
+        mortgage_rent: Ипотека / Аренда
+        personal_care: Личная гигиена
+        savings_and_investments: Сбережения и инвестиции
+        services: Услуги
+        shopping: Покупки
+        sports_and_fitness: Спорт и фитнес
+        subscriptions: Подписки
+        taxes: Налоги
+        transportation: Транспорт
+        travel: Путешествия
+        utilities: Коммунальные услуги
+      investment_contributions: Взносы в инвестиции
+      other_investments: Прочие инвестиции
+      uncategorized: Без категории
diff --git a/config/locales/models/category/tr.yml b/config/locales/models/category/tr.yml
new file mode 100644
index 000000000..19eff5883
--- /dev/null
+++ b/config/locales/models/category/tr.yml
@@ -0,0 +1,29 @@
+---
+tr:
+  models:
+    category:
+      defaults:
+        entertainment: Eğlence
+        fees: Ücretler
+        food_and_drink: Yiyecek ve İçecek
+        gifts_and_donations: Hediye ve Bağışlar
+        groceries: Market
+        healthcare: Sağlık
+        home_improvement: Ev Geliştirme
+        income: Gelir
+        insurance: Sigorta
+        loan_payments: Kredi Ödemeleri
+        mortgage_rent: İpotek / Kira
+        personal_care: Kişisel Bakım
+        savings_and_investments: Tasarruf ve Yatırımlar
+        services: Hizmetler
+        shopping: Alışveriş
+        sports_and_fitness: Spor ve Fitness
+        subscriptions: Abonelikler
+        taxes: Vergiler
+        transportation: Ulaşım
+        travel: Seyahat
+        utilities: Faturalar
+      investment_contributions: Yatırım Katkıları
+      other_investments: Diğer Yatırımlar
+      uncategorized: Kategorisiz
diff --git a/config/locales/models/category_import/fr.yml b/config/locales/models/category_import/fr.yml
new file mode 100644
index 000000000..cde44515f
--- /dev/null
+++ b/config/locales/models/category_import/fr.yml
@@ -0,0 +1,8 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        category_import:
+          missing_columns: 'Colonnes obligatoires manquantes : %{columns}'
+          own_parent: La catégorie '%{name}' ne peut pas être son propre parent
diff --git a/config/locales/models/category_import/it.yml b/config/locales/models/category_import/it.yml
new file mode 100644
index 000000000..fb82a8b3d
--- /dev/null
+++ b/config/locales/models/category_import/it.yml
@@ -0,0 +1,8 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        category_import:
+          own_parent: "La categoria '%{name}' non può essere il proprio genitore"
+          missing_columns: "Colonne obbligatorie mancanti: %{columns}"
diff --git a/config/locales/models/category_import/pl.yml b/config/locales/models/category_import/pl.yml
new file mode 100644
index 000000000..d38691356
--- /dev/null
+++ b/config/locales/models/category_import/pl.yml
@@ -0,0 +1,8 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        category_import:
+          own_parent: "Kategoria '%{name}' nie może być swoim własnym rodzicem"
+          missing_columns: "Brakujące wymagane kolumny: %{columns}"
diff --git a/config/locales/models/category_import/ru.yml b/config/locales/models/category_import/ru.yml
new file mode 100644
index 000000000..6cd78c862
--- /dev/null
+++ b/config/locales/models/category_import/ru.yml
@@ -0,0 +1,9 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        category_import:
+          missing_columns: 'Отсутствуют необходимые столбцы: %{columns}'
+          own_parent: Категория '%{name}' не может быть своей собственной родительской
+            категорией
diff --git a/config/locales/models/category_import/tr.yml b/config/locales/models/category_import/tr.yml
new file mode 100644
index 000000000..125f86401
--- /dev/null
+++ b/config/locales/models/category_import/tr.yml
@@ -0,0 +1,8 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        category_import:
+          missing_columns: 'Eksik zorunlu sütunlar: %{columns}'
+          own_parent: "'%{name}' kategorisi kendi üst kategorisi olamaz"
diff --git a/config/locales/models/chat/en.yml b/config/locales/models/chat/en.yml
index 705495c78..d0a69e892 100644
--- a/config/locales/models/chat/en.yml
+++ b/config/locales/models/chat/en.yml
@@ -5,4 +5,5 @@ en:
       rate_limited: "The AI provider is rate limited right now. Please try again in a few minutes."
       temporarily_unavailable: "The AI provider is temporarily unavailable right now. Please try again in a few minutes."
       misconfigured: "The AI provider is not configured correctly. Please contact your administrator."
+      no_response: "The assistant didn't respond. The background worker may be down or AI may not be fully configured. Please try again."
       default: "Failed to generate a response. Please try again."
diff --git a/config/locales/models/chat/fr.yml b/config/locales/models/chat/fr.yml
new file mode 100644
index 000000000..c151dc430
--- /dev/null
+++ b/config/locales/models/chat/fr.yml
@@ -0,0 +1,9 @@
+---
+fr:
+  chat:
+    errors:
+      default: Échec de la génération d'une réponse. Veuillez réessayer.
+      misconfigured: Le fournisseur AI n’est pas configuré correctement. Veuillez contacter votre administrateur.
+      no_response: L'assistant n'a pas répondu. Le worker en arrière-plan est peut-être arrêté ou l'IA n'est pas complètement configurée. Veuillez réessayer.
+      rate_limited: Le fournisseur d’IA est actuellement limité en termes de tarifs. Veuillez réessayer dans quelques minutes.
+      temporarily_unavailable: Le fournisseur d’IA est temporairement indisponible pour le moment. Veuillez réessayer dans quelques minutes.
diff --git a/config/locales/models/chat/it.yml b/config/locales/models/chat/it.yml
new file mode 100644
index 000000000..7a0d945ff
--- /dev/null
+++ b/config/locales/models/chat/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  chat:
+    errors:
+      rate_limited: "Il provider AI ha raggiunto il limite di frequenza. Riprova tra qualche minuto."
+      temporarily_unavailable: "Il provider AI è temporaneamente non disponibile. Riprova tra qualche minuto."
+      misconfigured: "Il provider AI non è configurato correttamente. Contatta il tuo amministratore."
+      no_response: "L'assistente non ha risposto. Il worker in background potrebbe non essere attivo o l'AI potrebbe non essere configurata correttamente. Riprova."
+      default: "Impossibile generare una risposta. Riprova."
diff --git a/config/locales/models/chat/pl.yml b/config/locales/models/chat/pl.yml
new file mode 100644
index 000000000..47d2c10b5
--- /dev/null
+++ b/config/locales/models/chat/pl.yml
@@ -0,0 +1,9 @@
+---
+pl:
+  chat:
+    errors:
+      rate_limited: "Dostawca AI ma obecnie ograniczenie szybkości. Spróbuj ponownie za kilka minut."
+      temporarily_unavailable: "Dostawca AI jest tymczasowo niedostępny. Spróbuj ponownie za kilka minut."
+      misconfigured: "Dostawca AI nie jest poprawnie skonfigurowany. Skontaktuj się z administratorem."
+      no_response: "Asystent nie odpowiedział. Pracownik w tle może być wyłączony lub AI może nie być w pełni skonfigurowane. Spróbuj ponownie."
+      default: "Nie udało się wygenerować odpowiedzi. Spróbuj ponownie."
diff --git a/config/locales/models/chat/ru.yml b/config/locales/models/chat/ru.yml
new file mode 100644
index 000000000..a1a1a99c4
--- /dev/null
+++ b/config/locales/models/chat/ru.yml
@@ -0,0 +1,13 @@
+---
+ru:
+  chat:
+    errors:
+      default: Не удалось сгенерировать ответ. Пожалуйста, попробуйте снова.
+      misconfigured: Поставщик ИИ настроен неправильно. Пожалуйста, свяжитесь с вашим
+        администратором.
+      no_response: Ассистент не ответил. Возможно, фоновый процесс не запущен или 
+         ИИ настроен не полностью. Попробуйте ещё раз.
+      rate_limited: Поставщик ИИ временно ограничил доступ. Пожалуйста, попробуйте
+        снова через несколько минут.
+      temporarily_unavailable: Поставщик ИИ временно недоступен. Пожалуйста, попробуйте
+        снова через несколько минут.
diff --git a/config/locales/models/chat/tr.yml b/config/locales/models/chat/tr.yml
new file mode 100644
index 000000000..210f2fa3e
--- /dev/null
+++ b/config/locales/models/chat/tr.yml
@@ -0,0 +1,13 @@
+---
+tr:
+  chat:
+    errors:
+      default: Yanıt oluşturulamadı. Lütfen tekrar deneyin.
+      misconfigured: Yapay zeka sağlayıcısı doğru yapılandırılmamış. Lütfen yöneticinizle
+        iletişime geçin.
+      no_response: Asistan yanıt vermedi. Arka plan işleyicisi çalışmıyor olabilir
+        veya yapay zeka tam olarak yapılandırılmamış olabilir. Lütfen tekrar deneyin.
+      rate_limited: Yapay zeka sağlayıcısı şu anda hız sınırına takıldı. Lütfen birkaç
+        dakika sonra tekrar deneyin.
+      temporarily_unavailable: Yapay zeka sağlayıcısı şu anda geçici olarak kullanılamıyor.
+        Lütfen birkaç dakika sonra tekrar deneyin.
diff --git a/config/locales/models/coinbase_account/fr.yml b/config/locales/models/coinbase_account/fr.yml
index ea8844097..bff8eb1ce 100644
--- a/config/locales/models/coinbase_account/fr.yml
+++ b/config/locales/models/coinbase_account/fr.yml
@@ -2,4 +2,4 @@
 fr:
   coinbase:
     processor:
-      paid_via: "Payé via %{method}"
+      paid_via: Payé via %{method}
diff --git a/config/locales/models/coinbase_account/it.yml b/config/locales/models/coinbase_account/it.yml
new file mode 100644
index 000000000..d6d2778c5
--- /dev/null
+++ b/config/locales/models/coinbase_account/it.yml
@@ -0,0 +1,5 @@
+---
+it:
+  coinbase:
+    processor:
+      paid_via: "Pagato tramite %{method}"
diff --git a/config/locales/models/coinbase_account/ru.yml b/config/locales/models/coinbase_account/ru.yml
new file mode 100644
index 000000000..2f2468b0d
--- /dev/null
+++ b/config/locales/models/coinbase_account/ru.yml
@@ -0,0 +1,5 @@
+---
+ru:
+  coinbase:
+    processor:
+      paid_via: Оплачено через %{method}
diff --git a/config/locales/models/coinbase_account/tr.yml b/config/locales/models/coinbase_account/tr.yml
new file mode 100644
index 000000000..61d1047ba
--- /dev/null
+++ b/config/locales/models/coinbase_account/tr.yml
@@ -0,0 +1,5 @@
+---
+tr:
+  coinbase:
+    processor:
+      paid_via: "%{method} ile ödendi"
diff --git a/config/locales/models/coinstats_item/fr.yml b/config/locales/models/coinstats_item/fr.yml
index 629865687..76f904b3d 100644
--- a/config/locales/models/coinstats_item/fr.yml
+++ b/config/locales/models/coinstats_item/fr.yml
@@ -3,8 +3,8 @@ fr:
   models:
     coinstats_item:
       syncer:
-        importing_wallets: Importation des portefeuilles depuis CoinStats...
-        checking_configuration: Vérification de la configuration du portefeuille...
-        wallets_need_setup: "%{count} portefeuilles doivent être configurés..."
-        processing_holdings: Traitement des avoirs...
         calculating_balances: Calcul des soldes...
+        checking_configuration: Vérification de la configuration du portefeuille...
+        importing_wallets: Importation des portefeuilles depuis CoinStats...
+        processing_holdings: Traitement des holdings...
+        wallets_need_setup: "%{count} portefeuilles doivent être configurés..."
diff --git a/config/locales/models/coinstats_item/it.yml b/config/locales/models/coinstats_item/it.yml
new file mode 100644
index 000000000..6b95e85fa
--- /dev/null
+++ b/config/locales/models/coinstats_item/it.yml
@@ -0,0 +1,10 @@
+---
+it:
+  models:
+    coinstats_item:
+      syncer:
+        importing_wallets: Importazione conti crypto da CoinStats...
+        checking_configuration: Verifica configurazione account CoinStats...
+        wallets_need_setup: "%{count} conti crypto richiedono configurazione..."
+        processing_holdings: Elaborazione posizioni...
+        calculating_balances: Calcolo saldi...
diff --git a/config/locales/models/coinstats_item/ru.yml b/config/locales/models/coinstats_item/ru.yml
new file mode 100644
index 000000000..7039ad4e2
--- /dev/null
+++ b/config/locales/models/coinstats_item/ru.yml
@@ -0,0 +1,14 @@
+---
+ru:
+  models:
+    coinstats_item:
+      syncer:
+        calculating_balances: Расчёт балансов...
+        checking_configuration: Проверка конфигурации аккаунта CoinStats...
+        importing_wallets: Импорт криптосчетов из CoinStats...
+        processing_holdings: Обработка активов...
+        wallets_need_setup:
+          few: "%{count} криптосчёта требуют настройки..."
+          many: "%{count} криптосчетов требуют настройки..."
+          one: "%{count} криптосчёт требует настройки..."
+          other: "%{count} криптосчёта требуют настройки..."
diff --git a/config/locales/models/coinstats_item/tr.yml b/config/locales/models/coinstats_item/tr.yml
new file mode 100644
index 000000000..93f257d14
--- /dev/null
+++ b/config/locales/models/coinstats_item/tr.yml
@@ -0,0 +1,10 @@
+---
+tr:
+  models:
+    coinstats_item:
+      syncer:
+        calculating_balances: Bakiyeler hesaplanıyor...
+        checking_configuration: CoinStats hesap yapılandırması kontrol ediliyor...
+        importing_wallets: CoinStats'tan kripto hesapları içe aktarılıyor...
+        processing_holdings: Pozisyonlar işleniyor...
+        wallets_need_setup: "%{count} kripto hesabı kurulum gerektiriyor..."
diff --git a/config/locales/models/entry/fr.yml b/config/locales/models/entry/fr.yml
index 651570f22..7ec497209 100644
--- a/config/locales/models/entry/fr.yml
+++ b/config/locales/models/entry/fr.yml
@@ -6,5 +6,5 @@ fr:
         entry:
           attributes:
             base:
-              invalid_sell_quantity: Vous ne pouvez pas vendre %{sell_qty} actions de %{ticker} car
-                vous n'en détenez que %{current_qty}
+              invalid_sell_quantity: Vous ne pouvez pas vendre %{sell_qty} actions
+                de %{ticker} car vous n'en détenez que %{current_qty}
diff --git a/config/locales/models/entry/it.yml b/config/locales/models/entry/it.yml
new file mode 100644
index 000000000..bde28cefa
--- /dev/null
+++ b/config/locales/models/entry/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        entry:
+          attributes:
+            base:
+              invalid_sell_quantity: impossibile vendere %{sell_qty} azioni di %{ticker} perché possiedi solo %{current_qty} azioni
diff --git a/config/locales/models/entry/ru.yml b/config/locales/models/entry/ru.yml
new file mode 100644
index 000000000..a1ced0594
--- /dev/null
+++ b/config/locales/models/entry/ru.yml
@@ -0,0 +1,10 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        entry:
+          attributes:
+            base:
+              invalid_sell_quantity: невозможно продать %{sell_qty} акций %{ticker},
+                так как у вас только %{current_qty} акций
diff --git a/config/locales/models/entry/tr.yml b/config/locales/models/entry/tr.yml
index 9d08bdda0..61afafe7f 100644
--- a/config/locales/models/entry/tr.yml
+++ b/config/locales/models/entry/tr.yml
@@ -6,4 +6,5 @@ tr:
         entry:
           attributes:
             base:
-              invalid_sell_quantity: "%{ticker} için %{sell_qty} adet hisse satılamaz çünkü elinizde sadece %{current_qty} adet hisse var"
\ No newline at end of file
+              invalid_sell_quantity: "%{ticker} için %{sell_qty} adet hisse satılamaz
+                çünkü elinizde sadece %{current_qty} adet hisse var"
diff --git a/config/locales/models/goal/en.yml b/config/locales/models/goal/en.yml
index 1df923657..cbe2b28a9 100644
--- a/config/locales/models/goal/en.yml
+++ b/config/locales/models/goal/en.yml
@@ -16,9 +16,9 @@ en:
         goal:
           attributes:
             base:
-              at_least_one_linked_account_required: Pick at least one depository account to fund this goal.
+              at_least_one_linked_account_required: Pick at least one account to fund this goal.
             linked_accounts:
-              must_be_depository: All linked accounts must be depository (checking, savings, HSA, CD, money-market).
+              must_be_fundable: All linked accounts must be cash or investment accounts.
               currency_mismatch: All linked accounts must share the same currency.
               must_belong_to_family: Linked accounts must belong to the same family as the goal.
             currency:
diff --git a/config/locales/models/goal/fr.yml b/config/locales/models/goal/fr.yml
new file mode 100644
index 000000000..64cb7aa1d
--- /dev/null
+++ b/config/locales/models/goal/fr.yml
@@ -0,0 +1,25 @@
+---
+fr:
+  activerecord:
+    attributes:
+      goal:
+        color: Couleur
+        currency: Devise
+        linked_accounts: Comptes liés
+        name: Nom
+        notes: Notes
+        state: État
+        target_amount: Montant cible
+        target_date: Date cible
+    errors:
+      models:
+        goal:
+          attributes:
+            base:
+              at_least_one_linked_account_required: Sélectionnez au moins un compte pour financer cet objectif.
+            currency:
+              locked_after_linked: Impossible de modifier la devise après que l'objectif a été lié à des comptes.
+            linked_accounts:
+              currency_mismatch: Tous les comptes liés doivent partager la même devise.
+              must_be_fundable: Tous les comptes liés doivent être des comptes de trésorerie ou d'investissement.
+              must_belong_to_family: Les comptes liés doivent appartenir au même foyer que l'objectif.
diff --git a/config/locales/models/goal/it.yml b/config/locales/models/goal/it.yml
new file mode 100644
index 000000000..a7e1d01ab
--- /dev/null
+++ b/config/locales/models/goal/it.yml
@@ -0,0 +1,25 @@
+---
+it:
+  activerecord:
+    attributes:
+      goal:
+        name: Nome
+        target_amount: Importo obiettivo
+        currency: Valuta
+        target_date: Data obiettivo
+        color: Colore
+        notes: Note
+        state: Stato
+        linked_accounts: Conti collegati
+    errors:
+      models:
+        goal:
+          attributes:
+            base:
+              at_least_one_linked_account_required: Scegli almeno un conto per finanziare questo obiettivo.
+            linked_accounts:
+              must_be_fundable: Tutti i conti collegati devono essere conti correnti o conti di investimento.
+              currency_mismatch: Tutti i conti collegati devono avere la stessa valuta.
+              must_belong_to_family: I conti collegati devono appartenere alla stessa famiglia dell'obiettivo.
+            currency:
+              locked_after_linked: Impossibile cambiare la valuta dopo che l'obiettivo è stato collegato ai conti.
diff --git a/config/locales/models/goal/pl.yml b/config/locales/models/goal/pl.yml
new file mode 100644
index 000000000..ad66f8cfc
--- /dev/null
+++ b/config/locales/models/goal/pl.yml
@@ -0,0 +1,25 @@
+---
+pl:
+  activerecord:
+    attributes:
+      goal:
+        name: Nazwa
+        target_amount: Kwota docelowa
+        currency: Waluta
+        target_date: Data docelowa
+        color: Kolor
+        notes: Notatki
+        state: Stan
+        linked_accounts: Połączone konta
+    errors:
+      models:
+        goal:
+          attributes:
+            base:
+              at_least_one_linked_account_required: Wybierz co najmniej jedno konto do finansowania tego celu.
+            linked_accounts:
+              must_be_fundable: Wszystkie połączone konta muszą być kontami gotówkowymi lub inwestycyjnymi.
+              currency_mismatch: Wszystkie połączone konta muszą mieć tę samą walutę.
+              must_belong_to_family: Połączone konta muszą należeć do tej samej rodziny co cel.
+            currency:
+              locked_after_linked: Nie można zmienić waluty po połączeniu celu z kontami.
diff --git a/config/locales/models/goal/ru.yml b/config/locales/models/goal/ru.yml
new file mode 100644
index 000000000..2e7e3a623
--- /dev/null
+++ b/config/locales/models/goal/ru.yml
@@ -0,0 +1,28 @@
+---
+ru:
+  activerecord:
+    attributes:
+      goal:
+        color: Цвет
+        currency: Валюта
+        linked_accounts: Связанные счета
+        name: Название
+        notes: Заметки
+        state: Статус
+        target_amount: Целевая сумма
+        target_date: Дата достижения
+    errors:
+      models:
+        goal:
+          attributes:
+            base:
+              at_least_one_linked_account_required: Выберите хотя бы один счёт для
+                накоплений.
+            currency:
+              locked_after_linked: Нельзя изменить валюту после привязки счетов к цели.
+            linked_accounts:
+              currency_mismatch: Все связанные счета должны быть в одной валюте.
+              must_be_fundable: Все связанные счета должны быть денежными или 
+                инвестиционными.
+              must_belong_to_family: Связанные счета должны принадлежать той же группе, 
+                что и цель.
\ No newline at end of file
diff --git a/config/locales/models/goal/tr.yml b/config/locales/models/goal/tr.yml
new file mode 100644
index 000000000..b7bae5ea7
--- /dev/null
+++ b/config/locales/models/goal/tr.yml
@@ -0,0 +1,27 @@
+---
+tr:
+  activerecord:
+    attributes:
+      goal:
+        color: Renk
+        currency: Para Birimi
+        linked_accounts: Bağlı hesaplar
+        name: Ad
+        notes: Notlar
+        state: Durum
+        target_amount: Hedef tutar
+        target_date: Hedef tarih
+    errors:
+      models:
+        goal:
+          attributes:
+            base:
+              at_least_one_linked_account_required: Bu hedefi finanse etmek için en
+                az bir hesap seçin.
+            currency:
+              locked_after_linked: Hedef hesaplara bağlandıktan sonra para birimi
+                değiştirilemez.
+            linked_accounts:
+              currency_mismatch: Bağlı tüm hesaplar aynı para birimini kullanmalıdır.
+              must_be_fundable: Bağlı tüm hesaplar nakit veya yatırım hesabı olmalıdır.
+              must_belong_to_family: Bağlı hesaplar, hedefle aynı aileye ait olmalıdır.
diff --git a/config/locales/models/goal/zh-CN.yml b/config/locales/models/goal/zh-CN.yml
new file mode 100644
index 000000000..a49e8fdde
--- /dev/null
+++ b/config/locales/models/goal/zh-CN.yml
@@ -0,0 +1,25 @@
+---
+zh-CN:
+  activerecord:
+    attributes:
+      goal:
+        name: 名称
+        target_amount: 目标金额
+        currency: 货币
+        target_date: 目标日期
+        color: 颜色
+        notes: 备注
+        state: 状态
+        linked_accounts: 关联账户
+    errors:
+      models:
+        goal:
+          attributes:
+            base:
+              at_least_one_linked_account_required: 请至少选择一个账户为此目标提供资金。
+            linked_accounts:
+              must_be_fundable: 所有关联账户必须是现金或投资账户。
+              currency_mismatch: 所有关联账户必须使用同一货币。
+              must_belong_to_family: 关联账户必须属于与目标相同的家庭。
+            currency:
+              locked_after_linked: 目标关联账户后不能更改货币。
diff --git a/config/locales/models/goal_pledge/fr.yml b/config/locales/models/goal_pledge/fr.yml
new file mode 100644
index 000000000..b933a4271
--- /dev/null
+++ b/config/locales/models/goal_pledge/fr.yml
@@ -0,0 +1,20 @@
+---
+fr:
+  activerecord:
+    attributes:
+      goal_pledge:
+        account: Compte
+        amount: Montant
+        currency: Devise
+        expires_at: Expire le
+        kind: Type
+        status: Statut
+    errors:
+      models:
+        goal_pledge:
+          attributes:
+            account:
+              must_be_linked_to_goal: Sélectionnez l'un des comptes liés à l'objectif.
+            currency:
+              must_match_goal: La devise de la promesse doit correspondre à celle de l'objectif.
+          duplicate_open_pledge: Vous avez déjà une promesse en cours pour ce montant sur ce compte. Annulez ou prolongez la promesse existante avant d'en enregistrer une autre.
diff --git a/config/locales/models/goal_pledge/it.yml b/config/locales/models/goal_pledge/it.yml
new file mode 100644
index 000000000..3b69c0410
--- /dev/null
+++ b/config/locales/models/goal_pledge/it.yml
@@ -0,0 +1,20 @@
+---
+it:
+  activerecord:
+    attributes:
+      goal_pledge:
+        amount: Importo
+        currency: Valuta
+        account: Conto
+        kind: Tipo
+        status: Stato
+        expires_at: Scade il
+    errors:
+      models:
+        goal_pledge:
+          attributes:
+            account:
+              must_be_linked_to_goal: Scegli uno dei conti collegati all'obiettivo.
+            currency:
+              must_match_goal: La valuta dell'impegno deve corrispondere alla valuta dell'obiettivo.
+          duplicate_open_pledge: Hai già un impegno aperto per questo importo su questo conto. Annulla o estendi quello esistente prima di registrarne un altro.
diff --git a/config/locales/models/goal_pledge/pl.yml b/config/locales/models/goal_pledge/pl.yml
new file mode 100644
index 000000000..a153c5016
--- /dev/null
+++ b/config/locales/models/goal_pledge/pl.yml
@@ -0,0 +1,20 @@
+---
+pl:
+  activerecord:
+    attributes:
+      goal_pledge:
+        amount: Kwota
+        currency: Waluta
+        account: Konto
+        kind: Rodzaj
+        status: Status
+        expires_at: Wygasa
+    errors:
+      models:
+        goal_pledge:
+          attributes:
+            account:
+              must_be_linked_to_goal: Wybierz jedno z połączonych kont celu.
+            currency:
+              must_match_goal: Waluta zobowiązania musi być zgodna z walutą celu.
+          duplicate_open_pledge: Masz już otwarte zobowiązanie na tę kwotę na tym koncie. Anuluj lub przedłuż istniejące przed dodaniem kolejnego.
diff --git a/config/locales/models/goal_pledge/ru.yml b/config/locales/models/goal_pledge/ru.yml
new file mode 100644
index 000000000..22cd5172f
--- /dev/null
+++ b/config/locales/models/goal_pledge/ru.yml
@@ -0,0 +1,21 @@
+---
+ru:
+  activerecord:
+    attributes:
+      goal_pledge:
+        account: Account
+        amount: Amount
+        currency: Currency
+        expires_at: Expires at
+        kind: Kind
+        status: Status
+    errors:
+      models:
+        goal_pledge:
+          attributes:
+            account:
+              must_be_linked_to_goal: Pick one of the goal's linked accounts.
+            currency:
+              must_match_goal: Pledge currency must match the goal currency.
+          duplicate_open_pledge: You already have an open pledge for this amount on
+            this account. Cancel or extend the existing one before recording another.
diff --git a/config/locales/models/goal_pledge/tr.yml b/config/locales/models/goal_pledge/tr.yml
new file mode 100644
index 000000000..8238b8075
--- /dev/null
+++ b/config/locales/models/goal_pledge/tr.yml
@@ -0,0 +1,21 @@
+---
+tr:
+  activerecord:
+    attributes:
+      goal_pledge:
+        account: Hesap
+        amount: Tutar
+        currency: Para Birimi
+        expires_at: Son geçerlilik tarihi
+        kind: Tür
+        status: Durum
+    errors:
+      models:
+        goal_pledge:
+          attributes:
+            account:
+              must_be_linked_to_goal: Hedefe bağlı hesaplardan birini seçin.
+            currency:
+              must_match_goal: Taahhüt para birimi, hedefin para birimiyle eşleşmelidir.
+          duplicate_open_pledge: Bu hesapta bu tutar için zaten açık bir taahhüdünüz
+            var. Yeni bir taahhüt kaydetmeden önce mevcut olanı iptal edin veya uzatın.
diff --git a/config/locales/models/goal_pledge/zh-CN.yml b/config/locales/models/goal_pledge/zh-CN.yml
new file mode 100644
index 000000000..902ae9872
--- /dev/null
+++ b/config/locales/models/goal_pledge/zh-CN.yml
@@ -0,0 +1,20 @@
+---
+zh-CN:
+  activerecord:
+    attributes:
+      goal_pledge:
+        amount: 金额
+        currency: 货币
+        account: 账户
+        kind: 类型
+        status: 状态
+        expires_at: 过期时间
+    errors:
+      models:
+        goal_pledge:
+          attributes:
+            account:
+              must_be_linked_to_goal: 请选择该目标的一个关联账户。
+            currency:
+              must_match_goal: 承诺货币必须与目标货币一致。
+          duplicate_open_pledge: 此账户已有相同金额的未完成承诺。记录新的承诺前，请先取消或延长现有承诺。
diff --git a/config/locales/models/import/fr.yml b/config/locales/models/import/fr.yml
index a1233c8ae..6f09aa604 100644
--- a/config/locales/models/import/fr.yml
+++ b/config/locales/models/import/fr.yml
@@ -3,6 +3,10 @@ fr:
   activerecord:
     attributes:
       import:
+        col_sep: Séparateur de colonnes
+        col_seps:
+          comma: Virgule (,)
+          semicolon: Point-virgule (;)
         currency: Devise
         number_format: Format numérique
     errors:
@@ -11,3 +15,5 @@ fr:
           attributes:
             raw_file_str:
               invalid_csv_format: n'est pas un format CSV valide
+          duplicate_headers: 'Les en-têtes CSV sont normalisés pour dupliquer les
+            colonnes : %{columns}'
diff --git a/config/locales/models/import/it.yml b/config/locales/models/import/it.yml
new file mode 100644
index 000000000..a3620ac6c
--- /dev/null
+++ b/config/locales/models/import/it.yml
@@ -0,0 +1,18 @@
+---
+it:
+  activerecord:
+    attributes:
+      import:
+        col_sep: Separatore colonne
+        col_seps:
+          comma: Virgola (,)
+          semicolon: Punto e virgola (;)
+        currency: Valuta
+        number_format: Formato numeri
+    errors:
+      models:
+        import:
+          duplicate_headers: "Le intestazioni CSV si normalizzano in colonne duplicate: %{columns}"
+          attributes:
+            raw_file_str:
+              invalid_csv_format: non è un formato CSV valido
diff --git a/config/locales/models/import/ru.yml b/config/locales/models/import/ru.yml
new file mode 100644
index 000000000..e7d4c1d0f
--- /dev/null
+++ b/config/locales/models/import/ru.yml
@@ -0,0 +1,19 @@
+---
+ru:
+  activerecord:
+    attributes:
+      import:
+        col_sep: Разделитель столбцов
+        col_seps:
+          comma: Запятая (,)
+          semicolon: Точка с запятой (;)
+        currency: Валюта
+        number_format: Формат числа
+    errors:
+      models:
+        import:
+          attributes:
+            raw_file_str:
+              invalid_csv_format: не является допустимым форматом CSV
+          duplicate_headers: 'Заголовки CSV нормализуются до дублирующихся столбцов:
+            %{columns}'
diff --git a/config/locales/models/import/tr.yml b/config/locales/models/import/tr.yml
index cf85710f2..f7cbc1ac3 100644
--- a/config/locales/models/import/tr.yml
+++ b/config/locales/models/import/tr.yml
@@ -3,6 +3,10 @@ tr:
   activerecord:
     attributes:
       import:
+        col_sep: Sütun ayracı
+        col_seps:
+          comma: Virgül (,)
+          semicolon: Noktalı virgül (;)
         currency: Para Birimi
         number_format: Sayı Formatı
     errors:
@@ -10,4 +14,6 @@ tr:
         import:
           attributes:
             raw_file_str:
-              invalid_csv_format: Geçerli bir CSV formatı değil
\ No newline at end of file
+              invalid_csv_format: Geçerli bir CSV formatı değil
+          duplicate_headers: 'CSV başlıkları normalleştirildiğinde yinelenen sütunlara
+            dönüşüyor: %{columns}'
diff --git a/config/locales/models/import/zh-CN.yml b/config/locales/models/import/zh-CN.yml
index 5be74fe23..7561d6f1c 100644
--- a/config/locales/models/import/zh-CN.yml
+++ b/config/locales/models/import/zh-CN.yml
@@ -5,9 +5,14 @@ zh-CN:
       import:
         currency: 货币
         number_format: 数字格式
+        col_sep: 列分隔符
+        col_seps:
+          comma: 逗号（,）
+          semicolon: 分号（;）
     errors:
       models:
         import:
           attributes:
             raw_file_str:
               invalid_csv_format: 格式无效，不是合法的CSV格式
+          duplicate_headers: CSV 表头规范化后出现重复列：%{columns}
diff --git a/config/locales/models/indexa_capital_item/fr.yml b/config/locales/models/indexa_capital_item/fr.yml
new file mode 100644
index 000000000..9f0ec51d5
--- /dev/null
+++ b/config/locales/models/indexa_capital_item/fr.yml
@@ -0,0 +1,9 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        indexa_capital_item:
+          credentials_required: La variable d'environnement INDEXA_API_TOKEN ou les
+            informations d'identification nom d'utilisateur/document/mot de passe
+            sont requises
diff --git a/config/locales/models/indexa_capital_item/it.yml b/config/locales/models/indexa_capital_item/it.yml
new file mode 100644
index 000000000..064495ae4
--- /dev/null
+++ b/config/locales/models/indexa_capital_item/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        indexa_capital_item:
+          credentials_required: "È necessaria la variabile d'ambiente INDEXA_API_TOKEN o le credenziali username/documento/password"
diff --git a/config/locales/models/indexa_capital_item/pl.yml b/config/locales/models/indexa_capital_item/pl.yml
new file mode 100644
index 000000000..edad355da
--- /dev/null
+++ b/config/locales/models/indexa_capital_item/pl.yml
@@ -0,0 +1,7 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        indexa_capital_item:
+          credentials_required: "Wymagana jest zmienna środowiskowa INDEXA_API_TOKEN lub dane uwierzytelniające (nazwa użytkownika/dokument/hasło)"
diff --git a/config/locales/models/indexa_capital_item/ru.yml b/config/locales/models/indexa_capital_item/ru.yml
new file mode 100644
index 000000000..2912981c6
--- /dev/null
+++ b/config/locales/models/indexa_capital_item/ru.yml
@@ -0,0 +1,8 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        indexa_capital_item:
+          credentials_required: 'Требуется либо переменная окружения INDEXA_API_TOKEN,
+            либо учетные данные: имя пользователя/документ/пароль'
diff --git a/config/locales/models/indexa_capital_item/tr.yml b/config/locales/models/indexa_capital_item/tr.yml
new file mode 100644
index 000000000..8005dd3bb
--- /dev/null
+++ b/config/locales/models/indexa_capital_item/tr.yml
@@ -0,0 +1,8 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        indexa_capital_item:
+          credentials_required: INDEXA_API_TOKEN ortam değişkeni veya kullanıcı adı/belge/parola
+            kimlik bilgilerinden biri gereklidir
diff --git a/config/locales/models/merchant_import/en.yml b/config/locales/models/merchant_import/en.yml
new file mode 100644
index 000000000..5cebc7ab4
--- /dev/null
+++ b/config/locales/models/merchant_import/en.yml
@@ -0,0 +1,8 @@
+---
+en:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          missing_columns: "Missing required columns: %{columns}"
+          duplicate_columns: "Duplicate column names after normalization: %{columns}"
diff --git a/config/locales/models/merchant_import/fr.yml b/config/locales/models/merchant_import/fr.yml
new file mode 100644
index 000000000..044ef5fdb
--- /dev/null
+++ b/config/locales/models/merchant_import/fr.yml
@@ -0,0 +1,8 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          duplicate_columns: 'Noms de colonnes en double après normalisation : %{columns}'
+          missing_columns: 'Colonnes requises manquantes : %{columns}'
diff --git a/config/locales/models/merchant_import/it.yml b/config/locales/models/merchant_import/it.yml
new file mode 100644
index 000000000..ea57775bb
--- /dev/null
+++ b/config/locales/models/merchant_import/it.yml
@@ -0,0 +1,8 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          missing_columns: "Colonne obbligatorie mancanti: %{columns}"
+          duplicate_columns: "Nomi colonne duplicati dopo la normalizzazione: %{columns}"
diff --git a/config/locales/models/merchant_import/pl.yml b/config/locales/models/merchant_import/pl.yml
new file mode 100644
index 000000000..70fda22b3
--- /dev/null
+++ b/config/locales/models/merchant_import/pl.yml
@@ -0,0 +1,8 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          missing_columns: "Brakujące wymagane kolumny: %{columns}"
+          duplicate_columns: "Zduplikowane nazwy kolumn po normalizacji: %{columns}"
diff --git a/config/locales/models/merchant_import/ru.yml b/config/locales/models/merchant_import/ru.yml
new file mode 100644
index 000000000..28104822e
--- /dev/null
+++ b/config/locales/models/merchant_import/ru.yml
@@ -0,0 +1,8 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          duplicate_columns: 'Duplicate column names after normalization: %{columns}'
+          missing_columns: 'Missing required columns: %{columns}'
diff --git a/config/locales/models/merchant_import/tr.yml b/config/locales/models/merchant_import/tr.yml
new file mode 100644
index 000000000..6754cd328
--- /dev/null
+++ b/config/locales/models/merchant_import/tr.yml
@@ -0,0 +1,8 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          duplicate_columns: 'Normalleştirmeden sonra yinelenen sütun adları: %{columns}'
+          missing_columns: 'Eksik zorunlu sütunlar: %{columns}'
diff --git a/config/locales/models/merchant_import/zh-CN.yml b/config/locales/models/merchant_import/zh-CN.yml
new file mode 100644
index 000000000..5129e4a43
--- /dev/null
+++ b/config/locales/models/merchant_import/zh-CN.yml
@@ -0,0 +1,8 @@
+---
+zh-CN:
+  activerecord:
+    errors:
+      models:
+        merchant_import:
+          missing_columns: 缺少必填列：%{columns}
+          duplicate_columns: 规范化后列名重复：%{columns}
diff --git a/config/locales/models/period/fr.yml b/config/locales/models/period/fr.yml
new file mode 100644
index 000000000..61fb8ea54
--- /dev/null
+++ b/config/locales/models/period/fr.yml
@@ -0,0 +1,54 @@
+---
+fr:
+  period:
+    all_time:
+      comparison_label: vs début
+      label: Tout le temps
+      label_short: Tout
+    current_month:
+      comparison_label: vs. début du mois
+      label: Mois en cours
+      label_short: MC
+    current_week:
+      comparison_label: vs. début de la semaine
+      label: Semaine en cours
+      label_short: SC
+    current_year:
+      comparison_label: vs. début de l'année
+      label: Année en cours
+      label_short: AC
+    custom:
+      label: Période personnalisée
+      label_short: Personnalisé
+    last_10_years:
+      comparison_label: vs il y a 10 ans
+      label: 10 dernières années
+      label_short: 10A
+    last_30_days:
+      comparison_label: vs. 30 derniers jours
+      label: 30 derniers jours
+      label_short: 30J
+    last_365_days:
+      comparison_label: contre il y a 1 an
+      label: 365 derniers jours
+      label_short: 365J
+    last_5_years:
+      comparison_label: vs il y a 5 ans
+      label: 5 dernières années
+      label_short: 5A
+    last_7_days:
+      comparison_label: vs. dernière semaine
+      label: 7 derniers jours
+      label_short: 7J
+    last_90_days:
+      comparison_label: vs. dernier trimestre
+      label: 90 derniers jours
+      label_short: 90J
+    last_day:
+      comparison_label: vs hier
+      label: Dernier jour
+      label_short: 1J
+    last_month:
+      comparison_label: vs. mois dernier
+      label: Le mois dernier
+      label_short: LM
diff --git a/config/locales/models/period/it.yml b/config/locales/models/period/it.yml
new file mode 100644
index 000000000..e92c92f6d
--- /dev/null
+++ b/config/locales/models/period/it.yml
@@ -0,0 +1,54 @@
+---
+it:
+  period:
+    last_day:
+      label_short: "1G"
+      label: "Ultimo giorno"
+      comparison_label: "vs. ieri"
+    current_week:
+      label_short: "SDI"
+      label: "Settimana corrente"
+      comparison_label: "vs. inizio settimana"
+    last_7_days:
+      label_short: "7G"
+      label: "Ultimi 7 giorni"
+      comparison_label: "vs. settimana scorsa"
+    current_month:
+      label_short: "MDI"
+      label: "Mese corrente"
+      comparison_label: "vs. inizio mese"
+    last_month:
+      label_short: "MS"
+      label: "Mese scorso"
+      comparison_label: "vs. mese scorso"
+    last_30_days:
+      label_short: "30G"
+      label: "Ultimi 30 giorni"
+      comparison_label: "vs. ultimi 30 giorni"
+    last_90_days:
+      label_short: "90G"
+      label: "Ultimi 90 giorni"
+      comparison_label: "vs. ultimo trimestre"
+    current_year:
+      label_short: "ADI"
+      label: "Anno corrente"
+      comparison_label: "vs. inizio anno"
+    last_365_days:
+      label_short: "365G"
+      label: "Ultimi 365 giorni"
+      comparison_label: "vs. 1 anno fa"
+    last_5_years:
+      label_short: "5A"
+      label: "Ultimi 5 anni"
+      comparison_label: "vs. 5 anni fa"
+    last_10_years:
+      label_short: "10A"
+      label: "Ultimi 10 anni"
+      comparison_label: "vs. 10 anni fa"
+    all_time:
+      label_short: "Tutto"
+      label: "Tutto il periodo"
+      comparison_label: "vs. inizio"
+    custom:
+      label_short: "Person."
+      label: "Periodo personalizzato"
diff --git a/config/locales/models/period/pl.yml b/config/locales/models/period/pl.yml
new file mode 100644
index 000000000..86485b17e
--- /dev/null
+++ b/config/locales/models/period/pl.yml
@@ -0,0 +1,54 @@
+---
+pl:
+  period:
+    last_day:
+      label_short: "1D"
+      label: "Ostatni dzień"
+      comparison_label: "vs. wczoraj"
+    current_week:
+      label_short: "WTD"
+      label: "Bieżący tydzień"
+      comparison_label: "vs. początek tygodnia"
+    last_7_days:
+      label_short: "7D"
+      label: "Ostatnie 7 dni"
+      comparison_label: "vs. poprzedni tydzień"
+    current_month:
+      label_short: "MTD"
+      label: "Bieżący miesiąc"
+      comparison_label: "vs. początek miesiąca"
+    last_month:
+      label_short: "LM"
+      label: "Poprzedni miesiąc"
+      comparison_label: "vs. poprzedni miesiąc"
+    last_30_days:
+      label_short: "30D"
+      label: "Ostatnie 30 dni"
+      comparison_label: "vs. ostatnie 30 dni"
+    last_90_days:
+      label_short: "90D"
+      label: "Ostatnie 90 dni"
+      comparison_label: "vs. poprzedni kwartał"
+    current_year:
+      label_short: "YTD"
+      label: "Bieżący rok"
+      comparison_label: "vs. początek roku"
+    last_365_days:
+      label_short: "365D"
+      label: "Ostatnie 365 dni"
+      comparison_label: "vs. 1 rok temu"
+    last_5_years:
+      label_short: "5Y"
+      label: "Ostatnie 5 lat"
+      comparison_label: "vs. 5 lat temu"
+    last_10_years:
+      label_short: "10Y"
+      label: "Ostatnie 10 lat"
+      comparison_label: "vs. 10 lat temu"
+    all_time:
+      label_short: "Cały"
+      label: "Cały czas"
+      comparison_label: "vs. początek"
+    custom:
+      label_short: "Niest."
+      label: "Okres niestandardowy"
diff --git a/config/locales/models/period/ru.yml b/config/locales/models/period/ru.yml
new file mode 100644
index 000000000..316a232e9
--- /dev/null
+++ b/config/locales/models/period/ru.yml
@@ -0,0 +1,54 @@
+---
+ru:
+  period:
+    all_time:
+      comparison_label: по сравнению с началом
+      label: Всё время
+      label_short: Все
+    current_month:
+      comparison_label: по сравнению с началом месяца
+      label: Текущий месяц
+      label_short: ТМ
+    current_week:
+      comparison_label: по сравнению с началом недели
+      label: Текущая неделя
+      label_short: ТН
+    current_year:
+      comparison_label: по сравнению с началом года
+      label: Текущий год
+      label_short: ТГ
+    custom:
+      label: Свой период
+      label_short: Свой
+    last_10_years:
+      comparison_label: по сравнению с 10 лет назад
+      label: Последние 10 лет
+      label_short: 10Л
+    last_30_days:
+      comparison_label: по сравнению с последними 30 днями
+      label: Последние 30 дней
+      label_short: 30Д
+    last_365_days:
+      comparison_label: по сравнению с год назад
+      label: Последние 365 дней
+      label_short: 365Д
+    last_5_years:
+      comparison_label: по сравнению с 5 лет назад
+      label: Последние 5 лет
+      label_short: 5Л
+    last_7_days:
+      comparison_label: по сравнению с прошлой неделей
+      label: Последние 7 дней
+      label_short: 7Д
+    last_90_days:
+      comparison_label: по сравнению с прошлым кварталом
+      label: Последние 90 дней
+      label_short: 90Д
+    last_day:
+      comparison_label: по сравнению со вчера
+      label: Последний день
+      label_short: 1Д
+    last_month:
+      comparison_label: по сравнению с прошлым месяцем
+      label: Прошлый месяц
+      label_short: ПМ
diff --git a/config/locales/models/period/tr.yml b/config/locales/models/period/tr.yml
new file mode 100644
index 000000000..704342e18
--- /dev/null
+++ b/config/locales/models/period/tr.yml
@@ -0,0 +1,54 @@
+---
+tr:
+  period:
+    all_time:
+      comparison_label: Başlangıca göre
+      label: Tüm Zamanlar
+      label_short: Tümü
+    current_month:
+      comparison_label: Ay başına göre
+      label: Bu Ay
+      label_short: BA
+    current_week:
+      comparison_label: Hafta başına göre
+      label: Bu Hafta
+      label_short: BH
+    current_year:
+      comparison_label: Yıl başına göre
+      label: Bu Yıl
+      label_short: BY
+    custom:
+      label: Özel Dönem
+      label_short: Özel
+    last_10_years:
+      comparison_label: 10 yıl öncesine göre
+      label: Son 10 Yıl
+      label_short: 10Y
+    last_30_days:
+      comparison_label: Son 30 güne göre
+      label: Son 30 Gün
+      label_short: 30G
+    last_365_days:
+      comparison_label: 1 yıl öncesine göre
+      label: Son 365 Gün
+      label_short: 365G
+    last_5_years:
+      comparison_label: 5 yıl öncesine göre
+      label: Son 5 Yıl
+      label_short: 5Y
+    last_7_days:
+      comparison_label: Geçen haftaya göre
+      label: Son 7 Gün
+      label_short: 7G
+    last_90_days:
+      comparison_label: Geçen çeyreğe göre
+      label: Son 90 Gün
+      label_short: 90G
+    last_day:
+      comparison_label: Düne göre
+      label: Son Gün
+      label_short: 1G
+    last_month:
+      comparison_label: Geçen aya göre
+      label: Geçen Ay
+      label_short: GA
diff --git a/config/locales/models/plaid_account/fr.yml b/config/locales/models/plaid_account/fr.yml
new file mode 100644
index 000000000..93dcfd353
--- /dev/null
+++ b/config/locales/models/plaid_account/fr.yml
@@ -0,0 +1,7 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        plaid_account:
+          no_balance: Le compte Plaid doit avoir un solde actuel ou disponible
diff --git a/config/locales/models/plaid_account/it.yml b/config/locales/models/plaid_account/it.yml
new file mode 100644
index 000000000..fa5cd652e
--- /dev/null
+++ b/config/locales/models/plaid_account/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        plaid_account:
+          no_balance: "Il conto Plaid deve avere un saldo corrente o disponibile"
diff --git a/config/locales/models/plaid_account/pl.yml b/config/locales/models/plaid_account/pl.yml
new file mode 100644
index 000000000..eee4dcc76
--- /dev/null
+++ b/config/locales/models/plaid_account/pl.yml
@@ -0,0 +1,7 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        plaid_account:
+          no_balance: "Konto Plaid musi mieć saldo bieżące lub dostępne"
diff --git a/config/locales/models/plaid_account/ru.yml b/config/locales/models/plaid_account/ru.yml
new file mode 100644
index 000000000..91a62379a
--- /dev/null
+++ b/config/locales/models/plaid_account/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        plaid_account:
+          no_balance: У счёта Plaid должен быть либо текущий, либо доступный баланс
diff --git a/config/locales/models/plaid_account/tr.yml b/config/locales/models/plaid_account/tr.yml
new file mode 100644
index 000000000..c715fd824
--- /dev/null
+++ b/config/locales/models/plaid_account/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        plaid_account:
+          no_balance: Plaid hesabının güncel veya kullanılabilir bakiyesi olmalıdır
diff --git a/config/locales/models/provider/en.yml b/config/locales/models/provider/en.yml
new file mode 100644
index 000000000..4e0a08dac
--- /dev/null
+++ b/config/locales/models/provider/en.yml
@@ -0,0 +1,17 @@
+---
+en:
+  providers:
+    property_valuation:
+      not_configured: This property data provider is not configured.
+      missing_fields: Please provide a name and a complete US address (street, city, state, and ZIP code).
+      preview_expired: This property preview has expired — please look up the address again.
+    rentcast:
+      errors:
+        no_valuation: RentCast did not return a value estimate for this address.
+        not_found: RentCast could not find a property matching this address.
+    realie:
+      errors:
+        no_property: Realie did not return a property for this address.
+        no_valuation: Realie did not return a valuation for this property.
+        not_found: Realie could not find a property matching this address.
+        location_mismatch: Realie matched a property in a different city or ZIP code. Please double-check the address.
diff --git a/config/locales/models/provider_warnings/fr.yml b/config/locales/models/provider_warnings/fr.yml
index 3ced05340..3e48c0086 100644
--- a/config/locales/models/provider_warnings/fr.yml
+++ b/config/locales/models/provider_warnings/fr.yml
@@ -1,4 +1,7 @@
 ---
 fr:
   provider_warnings:
-    limited_investment_data: "Les données d'investissement de ce fournisseur sont limitées. Les étiquettes d'activité (Achat, Vente, Dividende) ne sont pas disponibles, ce qui peut affecter la précision du budget. Pensez à créer des règles pour exclure ou catégoriser les transactions d'investissement."
+    limited_investment_data: Les données d'investissement de ce fournisseur sont limitées.
+      Les étiquettes d'activité (Achat, Vente, Dividende) ne sont pas disponibles,
+      ce qui peut affecter la précision du budget. Pensez à créer des règles pour
+      exclure ou catégoriser les transactions d'investissement.
diff --git a/config/locales/models/provider_warnings/it.yml b/config/locales/models/provider_warnings/it.yml
new file mode 100644
index 000000000..09d45b55a
--- /dev/null
+++ b/config/locales/models/provider_warnings/it.yml
@@ -0,0 +1,4 @@
+---
+it:
+  provider_warnings:
+    limited_investment_data: "I dati di investimento da questo provider sono limitati. Le etichette delle attività (Acquisto, Vendita, Dividendo) non sono disponibili, il che potrebbe influire sull'accuratezza del budget. Considera la creazione di regole per escludere o categorizzare le transazioni di investimento."
diff --git a/config/locales/models/provider_warnings/ru.yml b/config/locales/models/provider_warnings/ru.yml
new file mode 100644
index 000000000..ace3353f8
--- /dev/null
+++ b/config/locales/models/provider_warnings/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  provider_warnings:
+    limited_investment_data: Данные об инвестициях от этого поставщика ограничены.
+      Метки активности (Покупка, Продажа, Дивиденд) недоступны, что может повлиять
+      на точность бюджета. Рассмотрите возможность создания правил для исключения
+      или категоризации инвестиционных операций.
diff --git a/config/locales/models/provider_warnings/tr.yml b/config/locales/models/provider_warnings/tr.yml
index a69cf9114..c8b4ea4c4 100644
--- a/config/locales/models/provider_warnings/tr.yml
+++ b/config/locales/models/provider_warnings/tr.yml
@@ -1,4 +1,7 @@
 ---
 tr:
   provider_warnings:
-    limited_investment_data: "Bu sağlayıcıdan alınan yatırım verileri sınırlıdır. İşlem etiketleri (Al, Sat, Temettü) mevcut olmadığından bütçe doğruluğu etkilenebilir. Yatırım işlemlerini hariç tutmak veya kategorize etmek için kurallar oluşturmayı düşünün."
+    limited_investment_data: Bu sağlayıcıdan alınan yatırım verileri sınırlıdır. İşlem
+      etiketleri (Al, Sat, Temettü) mevcut olmadığından bütçe doğruluğu etkilenebilir.
+      Yatırım işlemlerini hariç tutmak veya kategorize etmek için kurallar oluşturmayı
+      düşünün.
diff --git a/config/locales/models/recurring_transaction/fr.yml b/config/locales/models/recurring_transaction/fr.yml
new file mode 100644
index 000000000..143320f9a
--- /dev/null
+++ b/config/locales/models/recurring_transaction/fr.yml
@@ -0,0 +1,7 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        recurring_transaction:
+          merchant_or_name_required: Le commerçant ou le nom doit être présent
diff --git a/config/locales/models/recurring_transaction/it.yml b/config/locales/models/recurring_transaction/it.yml
new file mode 100644
index 000000000..81a72b8a0
--- /dev/null
+++ b/config/locales/models/recurring_transaction/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        recurring_transaction:
+          merchant_or_name_required: "È necessario indicare l'esercente o il nome"
diff --git a/config/locales/models/recurring_transaction/pl.yml b/config/locales/models/recurring_transaction/pl.yml
new file mode 100644
index 000000000..000a2ffe7
--- /dev/null
+++ b/config/locales/models/recurring_transaction/pl.yml
@@ -0,0 +1,7 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        recurring_transaction:
+          merchant_or_name_required: "Kontrahent lub nazwa muszą być obecne"
diff --git a/config/locales/models/recurring_transaction/ru.yml b/config/locales/models/recurring_transaction/ru.yml
new file mode 100644
index 000000000..ddc4e671d
--- /dev/null
+++ b/config/locales/models/recurring_transaction/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        recurring_transaction:
+          merchant_or_name_required: Необходимо указать либо продавца, либо название
diff --git a/config/locales/models/recurring_transaction/tr.yml b/config/locales/models/recurring_transaction/tr.yml
new file mode 100644
index 000000000..c580f9c11
--- /dev/null
+++ b/config/locales/models/recurring_transaction/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        recurring_transaction:
+          merchant_or_name_required: Satıcı veya ad bilgisinden biri mutlaka bulunmalıdır
diff --git a/config/locales/models/rule/fr.yml b/config/locales/models/rule/fr.yml
new file mode 100644
index 000000000..0f365688f
--- /dev/null
+++ b/config/locales/models/rule/fr.yml
@@ -0,0 +1,9 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        rule:
+          duplicate_actions: La règle ne peut pas avoir d'actions en double %{types}
+          min_actions: doit avoir au moins une action
+          nested_conditions: Les conditions composées ne peuvent pas être imbriquées
diff --git a/config/locales/models/rule/it.yml b/config/locales/models/rule/it.yml
new file mode 100644
index 000000000..519a5e082
--- /dev/null
+++ b/config/locales/models/rule/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        rule:
+          min_actions: "deve avere almeno un'azione"
+          duplicate_actions: "La regola non può avere azioni duplicate %{types}"
+          nested_conditions: "Le condizioni composte non possono essere nidificate"
diff --git a/config/locales/models/rule/pl.yml b/config/locales/models/rule/pl.yml
new file mode 100644
index 000000000..bf92cd623
--- /dev/null
+++ b/config/locales/models/rule/pl.yml
@@ -0,0 +1,9 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        rule:
+          min_actions: "musi mieć co najmniej jedną akcję"
+          duplicate_actions: "Reguła nie może mieć zduplikowanych akcji %{types}"
+          nested_conditions: "Warunki złożone nie mogą być zagnieżdżone"
diff --git a/config/locales/models/rule/ru.yml b/config/locales/models/rule/ru.yml
new file mode 100644
index 000000000..9be207cd3
--- /dev/null
+++ b/config/locales/models/rule/ru.yml
@@ -0,0 +1,9 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        rule:
+          duplicate_actions: Правило не может содержать дублирующиеся действия %{types}
+          min_actions: должно содержать как минимум одно действие
+          nested_conditions: Составные условия не могут быть вложенными
diff --git a/config/locales/models/rule/tr.yml b/config/locales/models/rule/tr.yml
new file mode 100644
index 000000000..190a2c11e
--- /dev/null
+++ b/config/locales/models/rule/tr.yml
@@ -0,0 +1,9 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        rule:
+          duplicate_actions: Kural, %{types} işlemlerini yinelenen olarak içeremez
+          min_actions: en az bir işlem içermelidir
+          nested_conditions: Bileşik koşullar iç içe olamaz
diff --git a/config/locales/models/rule_import/fr.yml b/config/locales/models/rule_import/fr.yml
new file mode 100644
index 000000000..4efeb6d46
--- /dev/null
+++ b/config/locales/models/rule_import/fr.yml
@@ -0,0 +1,9 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        rule_import:
+          invalid_json: 'JSON non valide dans les conditions ou actions : %{message}'
+          min_actions: La règle doit avoir au moins une action
+          unsupported_resource_type: 'Type de ressource non pris en charge : %{resource_type}'
diff --git a/config/locales/models/rule_import/it.yml b/config/locales/models/rule_import/it.yml
new file mode 100644
index 000000000..d9a6a27d5
--- /dev/null
+++ b/config/locales/models/rule_import/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        rule_import:
+          unsupported_resource_type: "Tipo di risorsa non supportato: %{resource_type}"
+          invalid_json: "JSON non valido nelle condizioni o nelle azioni: %{message}"
+          min_actions: "La regola deve avere almeno un'azione"
diff --git a/config/locales/models/rule_import/pl.yml b/config/locales/models/rule_import/pl.yml
new file mode 100644
index 000000000..2546d1bba
--- /dev/null
+++ b/config/locales/models/rule_import/pl.yml
@@ -0,0 +1,9 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        rule_import:
+          unsupported_resource_type: "Nieobsługiwany typ zasobu: %{resource_type}"
+          invalid_json: "Nieprawidłowy JSON w warunkach lub akcjach: %{message}"
+          min_actions: "Reguła musi mieć co najmniej jedną akcję"
diff --git a/config/locales/models/rule_import/ru.yml b/config/locales/models/rule_import/ru.yml
new file mode 100644
index 000000000..2657dc4a0
--- /dev/null
+++ b/config/locales/models/rule_import/ru.yml
@@ -0,0 +1,9 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        rule_import:
+          invalid_json: 'Некорректный JSON в условиях или действиях: %{message}'
+          min_actions: Правило должно содержать как минимум одно действие
+          unsupported_resource_type: 'Неподдерживаемый тип ресурса: %{resource_type}'
diff --git a/config/locales/models/rule_import/tr.yml b/config/locales/models/rule_import/tr.yml
new file mode 100644
index 000000000..c681dcb0f
--- /dev/null
+++ b/config/locales/models/rule_import/tr.yml
@@ -0,0 +1,9 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        rule_import:
+          invalid_json: 'Koşullar veya eylemlerde geçersiz JSON: %{message}'
+          min_actions: Kuralın en az bir eylemi olmalıdır
+          unsupported_resource_type: 'Desteklenmeyen kaynak türü: %{resource_type}'
diff --git a/config/locales/models/simplefin_account/fr.yml b/config/locales/models/simplefin_account/fr.yml
new file mode 100644
index 000000000..e3a85a91d
--- /dev/null
+++ b/config/locales/models/simplefin_account/fr.yml
@@ -0,0 +1,7 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        simplefin_account:
+          no_balance: Le compte SimpleFin doit avoir un solde actuel ou disponible
diff --git a/config/locales/models/simplefin_account/it.yml b/config/locales/models/simplefin_account/it.yml
new file mode 100644
index 000000000..295c8b369
--- /dev/null
+++ b/config/locales/models/simplefin_account/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        simplefin_account:
+          no_balance: "Il conto SimpleFIN deve avere un saldo corrente o disponibile"
diff --git a/config/locales/models/simplefin_account/pl.yml b/config/locales/models/simplefin_account/pl.yml
new file mode 100644
index 000000000..f9ae2cc18
--- /dev/null
+++ b/config/locales/models/simplefin_account/pl.yml
@@ -0,0 +1,7 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        simplefin_account:
+          no_balance: "Konto SimpleFin musi mieć saldo bieżące lub dostępne"
diff --git a/config/locales/models/simplefin_account/ru.yml b/config/locales/models/simplefin_account/ru.yml
new file mode 100644
index 000000000..85abade7e
--- /dev/null
+++ b/config/locales/models/simplefin_account/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        simplefin_account:
+          no_balance: У счёта SimpleFIN должен быть либо текущий, либо доступный баланс
diff --git a/config/locales/models/simplefin_account/tr.yml b/config/locales/models/simplefin_account/tr.yml
new file mode 100644
index 000000000..8d942e419
--- /dev/null
+++ b/config/locales/models/simplefin_account/tr.yml
@@ -0,0 +1,8 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        simplefin_account:
+          no_balance: SimpleFIN hesabında güncel veya kullanılabilir bakiyeden en
+            az biri bulunmalıdır
diff --git a/config/locales/models/sophtron_account/fr.yml b/config/locales/models/sophtron_account/fr.yml
new file mode 100644
index 000000000..b940a92ff
--- /dev/null
+++ b/config/locales/models/sophtron_account/fr.yml
@@ -0,0 +1,7 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        sophtron_account:
+          no_balance: Le compte Sophtron doit avoir un solde actuel ou disponible
diff --git a/config/locales/models/sophtron_account/it.yml b/config/locales/models/sophtron_account/it.yml
new file mode 100644
index 000000000..38552d2d5
--- /dev/null
+++ b/config/locales/models/sophtron_account/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        sophtron_account:
+          no_balance: "Il conto Sophtron deve avere un saldo corrente o disponibile"
diff --git a/config/locales/models/sophtron_account/pl.yml b/config/locales/models/sophtron_account/pl.yml
new file mode 100644
index 000000000..b65255cc1
--- /dev/null
+++ b/config/locales/models/sophtron_account/pl.yml
@@ -0,0 +1,7 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        sophtron_account:
+          no_balance: "Konto Sophtron musi mieć saldo bieżące lub dostępne"
diff --git a/config/locales/models/sophtron_account/ru.yml b/config/locales/models/sophtron_account/ru.yml
new file mode 100644
index 000000000..b1fe3f000
--- /dev/null
+++ b/config/locales/models/sophtron_account/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        sophtron_account:
+          no_balance: У счёта Sophtron должен быть либо текущий, либо доступный баланс
diff --git a/config/locales/models/sophtron_account/tr.yml b/config/locales/models/sophtron_account/tr.yml
new file mode 100644
index 000000000..aaf7e1c8e
--- /dev/null
+++ b/config/locales/models/sophtron_account/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        sophtron_account:
+          no_balance: Sophtron hesabının güncel veya kullanılabilir bakiyesi olmalıdır
diff --git a/config/locales/models/sso_provider/fr.yml b/config/locales/models/sso_provider/fr.yml
new file mode 100644
index 000000000..3dd3a542d
--- /dev/null
+++ b/config/locales/models/sso_provider/fr.yml
@@ -0,0 +1,14 @@
+---
+fr:
+  activerecord:
+    errors:
+      models:
+        sso_provider:
+          attributes:
+            settings:
+              metadata_url_invalid: L'URL des métadonnées IdP doit être une URL valide
+              saml_cert_required: Un certificat IdP ou une empreinte digitale de certificat
+                est requis lorsque vous n'utilisez pas l'URL de métadonnées.
+              saml_url_required: L'URL de métadonnées IdP ou l'URL SSO IdP est requise
+                pour les fournisseurs SAML.
+              sso_url_invalid: L'URL SSO de l'IdP doit être une URL valide
diff --git a/config/locales/models/sso_provider/it.yml b/config/locales/models/sso_provider/it.yml
new file mode 100644
index 000000000..c02b484d1
--- /dev/null
+++ b/config/locales/models/sso_provider/it.yml
@@ -0,0 +1,12 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        sso_provider:
+          attributes:
+            settings:
+              saml_url_required: "Per i provider SAML è necessario l'URL dei metadati IdP o l'URL SSO IdP"
+              saml_cert_required: "Il certificato IdP o l'impronta digitale del certificato è richiesto quando non si usa l'URL dei metadati"
+              metadata_url_invalid: "L'URL dei metadati IdP deve essere un URL valido"
+              sso_url_invalid: "L'URL SSO IdP deve essere un URL valido"
diff --git a/config/locales/models/sso_provider/pl.yml b/config/locales/models/sso_provider/pl.yml
new file mode 100644
index 000000000..1e00f86ed
--- /dev/null
+++ b/config/locales/models/sso_provider/pl.yml
@@ -0,0 +1,12 @@
+---
+pl:
+  activerecord:
+    errors:
+      models:
+        sso_provider:
+          attributes:
+            settings:
+              saml_url_required: "Adres URL metadanych IdP lub adres URL SSO IdP jest wymagany dla dostawców SAML"
+              saml_cert_required: "Certyfikat IdP lub odcisk palca certyfikatu jest wymagany, gdy nie używano adresu URL metadanych"
+              metadata_url_invalid: "Adres URL metadanych IdP musi być prawidłowym adresem URL"
+              sso_url_invalid: "Adres URL SSO IdP musi być prawidłowym adresem URL"
diff --git a/config/locales/models/sso_provider/ru.yml b/config/locales/models/sso_provider/ru.yml
new file mode 100644
index 000000000..2cdc85ae5
--- /dev/null
+++ b/config/locales/models/sso_provider/ru.yml
@@ -0,0 +1,15 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        sso_provider:
+          attributes:
+            settings:
+              metadata_url_invalid: URL метаданных IdP должен быть действительным
+                URL
+              saml_cert_required: Требуется либо сертификат IdP, либо отпечаток сертификата,
+                если не используется URL метаданных
+              saml_url_required: Для SAML-провайдеров требуется либо URL метаданных
+                IdP, либо URL SSO IdP
+              sso_url_invalid: URL SSO IdP должен быть действительным URL
diff --git a/config/locales/models/sso_provider/tr.yml b/config/locales/models/sso_provider/tr.yml
new file mode 100644
index 000000000..e2bdaeee1
--- /dev/null
+++ b/config/locales/models/sso_provider/tr.yml
@@ -0,0 +1,14 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        sso_provider:
+          attributes:
+            settings:
+              metadata_url_invalid: IdP Metadata URL'si geçerli bir URL olmalıdır
+              saml_cert_required: Metadata URL kullanılmıyorsa IdP Sertifikası veya
+                Sertifika Parmak İzi gereklidir
+              saml_url_required: SAML sağlayıcıları için IdP Metadata URL'si veya
+                IdP SSO URL'si gereklidir
+              sso_url_invalid: IdP SSO URL'si geçerli bir URL olmalıdır
diff --git a/config/locales/models/time_series/value/it.yml b/config/locales/models/time_series/value/it.yml
new file mode 100644
index 000000000..1b8d90419
--- /dev/null
+++ b/config/locales/models/time_series/value/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  activemodel:
+    errors:
+      models:
+        time_series/value:
+          attributes:
+            value:
+              must_be_a_money_or_numeric: deve essere di tipo Money o Numerico
diff --git a/config/locales/models/time_series/value/ru.yml b/config/locales/models/time_series/value/ru.yml
new file mode 100644
index 000000000..1dada2541
--- /dev/null
+++ b/config/locales/models/time_series/value/ru.yml
@@ -0,0 +1,9 @@
+---
+ru:
+  activemodel:
+    errors:
+      models:
+        time_series/value:
+          attributes:
+            value:
+              must_be_a_money_or_numeric: должно быть денежным значением или числом
diff --git a/config/locales/models/time_series/value/tr.yml b/config/locales/models/time_series/value/tr.yml
index 3f75329b7..b0d687166 100644
--- a/config/locales/models/time_series/value/tr.yml
+++ b/config/locales/models/time_series/value/tr.yml
@@ -6,4 +6,4 @@ tr:
         time_series/value:
           attributes:
             value:
-              must_be_a_money_or_numeric: Bir Money veya Sayısal bir değer olmalı
\ No newline at end of file
+              must_be_a_money_or_numeric: Bir Money veya Sayısal bir değer olmalı
diff --git a/config/locales/models/transaction/fr.yml b/config/locales/models/transaction/fr.yml
index 786013d1a..930859771 100644
--- a/config/locales/models/transaction/fr.yml
+++ b/config/locales/models/transaction/fr.yml
@@ -6,6 +6,7 @@ fr:
         transaction:
           attributes:
             attachments:
-              too_many: "ne peut pas dépasser %{max} fichiers par transaction"
-              too_large: "le fichier %{index} est trop volumineux (maximum %{max_mb} Mo)"
-              invalid_format: "le fichier %{index} a un format non pris en charge (%{file_format})"
+              invalid_format: le fichier %{index} a un format non pris en charge (%{file_format})
+              too_large: le fichier %{index} est trop volumineux (maximum %{max_mb}
+                Mo)
+              too_many: ne peut pas dépasser %{max} fichiers par transaction
diff --git a/config/locales/models/transaction/it.yml b/config/locales/models/transaction/it.yml
new file mode 100644
index 000000000..83c43518c
--- /dev/null
+++ b/config/locales/models/transaction/it.yml
@@ -0,0 +1,11 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        transaction:
+          attributes:
+            attachments:
+              too_many: "non può superare %{max} file per transazione"
+              too_large: "il file %{index} è troppo grande (massimo %{max_mb}MB)"
+              invalid_format: "il file %{index} ha un formato non supportato (%{file_format})"
diff --git a/config/locales/models/transaction/ru.yml b/config/locales/models/transaction/ru.yml
new file mode 100644
index 000000000..a8dfce207
--- /dev/null
+++ b/config/locales/models/transaction/ru.yml
@@ -0,0 +1,11 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        transaction:
+          attributes:
+            attachments:
+              invalid_format: файл %{index} имеет неподдерживаемый формат (%{file_format})
+              too_large: файл %{index} слишком большой (максимум %{max_mb}МБ)
+              too_many: не может превышать %{max} файлов на операцию
diff --git a/config/locales/models/transaction/tr.yml b/config/locales/models/transaction/tr.yml
new file mode 100644
index 000000000..fda1b11ff
--- /dev/null
+++ b/config/locales/models/transaction/tr.yml
@@ -0,0 +1,11 @@
+---
+tr:
+  activerecord:
+    errors:
+      models:
+        transaction:
+          attributes:
+            attachments:
+              invalid_format: "%{index} numaralı dosyanın biçimi desteklenmiyor (%{file_format})"
+              too_large: "%{index} numaralı dosya çok büyük (maksimum %{max_mb}MB)"
+              too_many: işlem başına %{max} dosyayı aşamaz
diff --git a/config/locales/models/transfer/fr.yml b/config/locales/models/transfer/fr.yml
index 89d431e67..e055d176a 100644
--- a/config/locales/models/transfer/fr.yml
+++ b/config/locales/models/transfer/fr.yml
@@ -6,17 +6,22 @@ fr:
         transfer:
           attributes:
             base:
-              inflow_cannot_be_in_multiple_transfers: La transaction d'entrée ne peut pas faire
-                partie de plusieurs transferts
-              must_be_from_different_accounts: Le transfert doit avoir des comptes différents
+              inflow_cannot_be_in_multiple_transfers: La transaction d'entrée ne peut
+                pas faire partie de plusieurs transferts
+              must_be_from_different_accounts: Le transfert doit avoir des comptes
+                différents
               must_be_from_same_family: Le transfert doit provenir de la même famille
-              must_be_within_date_range: Les dates des transactions du transfert doivent être
-                espacées de moins de 4 jours
-              must_have_opposite_amounts: Les transactions de transfert doivent avoir des montants
-                opposés
+              must_be_within_date_range: Les dates des transactions du transfert doivent
+                être espacées de moins de 4 jours
+              must_have_opposite_amounts: Les transactions de transfert doivent avoir
+                des montants opposés
               must_have_single_currency: Le transfert doit avoir une seule devise
-              outflow_cannot_be_in_multiple_transfers: La transaction de dépense ne peut pas faire
-                partie de plusieurs transferts
+              outflow_cannot_be_in_multiple_transfers: La transaction de dépense ne
+                peut pas faire partie de plusieurs transferts
+          different_accounts: Doit provenir de comptes différents
+          opposite_amounts: Doit avoir des montants opposés
+          same_family: Doit être de la même famille
+          within_days: Doit être dans les %{count} jours
   transfer:
     name: Transfert vers %{to_account}
     payment_name: Paiement vers %{to_account}
diff --git a/config/locales/models/transfer/it.yml b/config/locales/models/transfer/it.yml
new file mode 100644
index 000000000..ae825fa92
--- /dev/null
+++ b/config/locales/models/transfer/it.yml
@@ -0,0 +1,22 @@
+---
+it:
+  activerecord:
+    errors:
+      models:
+        transfer:
+          attributes:
+            base:
+              inflow_cannot_be_in_multiple_transfers: La transazione in entrata non può far parte di più bonifici
+              must_be_from_different_accounts: Il bonifico deve avere conti diversi
+              must_be_from_same_family: Il bonifico deve essere dalla stessa famiglia
+              must_be_within_date_range: Le date delle transazioni del bonifico devono essere entro 4 giorni l'una dall'altra
+              must_have_opposite_amounts: Le transazioni del bonifico devono avere importi opposti
+              must_have_single_currency: Il bonifico deve avere una singola valuta
+              outflow_cannot_be_in_multiple_transfers: La transazione in uscita non può far parte di più bonifici
+          different_accounts: "Deve essere da conti diversi"
+          same_family: "Deve essere dalla stessa famiglia"
+          opposite_amounts: "Deve avere importi opposti"
+          within_days: "Deve essere entro %{count} giorni"
+  transfer:
+    name: Bonifico a %{to_account}
+    payment_name: Pagamento a %{to_account}
diff --git a/config/locales/models/transfer/ru.yml b/config/locales/models/transfer/ru.yml
new file mode 100644
index 000000000..ec6b0b07b
--- /dev/null
+++ b/config/locales/models/transfer/ru.yml
@@ -0,0 +1,25 @@
+---
+ru:
+  activerecord:
+    errors:
+      models:
+        transfer:
+          attributes:
+            base:
+              inflow_cannot_be_in_multiple_transfers: Входящая операция не может быть
+                частью нескольких переводов
+              must_be_from_different_accounts: Перевод должен быть между разными счетами
+              must_be_from_same_family: Перевод должен быть в пределах одной семьи
+              must_be_within_date_range: Даты операций перевода должны быть в пределах
+                4 дней друг от друга
+              must_have_opposite_amounts: Суммы операций перевода должны быть противоположными
+              must_have_single_currency: Перевод должен быть в одной валюте
+              outflow_cannot_be_in_multiple_transfers: Исходящая операция не может
+                быть частью нескольких переводов
+          different_accounts: Должен быть между разными счетами
+          opposite_amounts: Должен иметь противоположные суммы
+          same_family: Должен быть в пределах одной семьи
+          within_days: Должен быть в пределах %{count} дней
+  transfer:
+    name: Перевод на %{to_account}
+    payment_name: Платеж на %{to_account}
diff --git a/config/locales/models/transfer/tr.yml b/config/locales/models/transfer/tr.yml
index aa1b2625a..0f3130275 100644
--- a/config/locales/models/transfer/tr.yml
+++ b/config/locales/models/transfer/tr.yml
@@ -6,13 +6,20 @@ tr:
         transfer:
           attributes:
             base:
-              inflow_cannot_be_in_multiple_transfers: Giriş işlemi birden fazla transferin parçası olamaz
+              inflow_cannot_be_in_multiple_transfers: Giriş işlemi birden fazla transferin
+                parçası olamaz
               must_be_from_different_accounts: Transfer farklı hesaplar arasında olmalıdır
               must_be_from_same_family: Transfer aynı aileden olmalıdır
-              must_be_within_date_range: Transfer işlemlerinin tarihleri birbirine en fazla 4 gün uzaklıkta olmalıdır
+              must_be_within_date_range: Transfer işlemlerinin tarihleri birbirine
+                en fazla 4 gün uzaklıkta olmalıdır
               must_have_opposite_amounts: Transfer işlemlerinin tutarları zıt olmalıdır
               must_have_single_currency: Transfer tek bir para biriminde olmalıdır
-              outflow_cannot_be_in_multiple_transfers: Çıkış işlemi birden fazla transferin parçası olamaz
+              outflow_cannot_be_in_multiple_transfers: Çıkış işlemi birden fazla transferin
+                parçası olamaz
+          different_accounts: Farklı hesaplardan olmalıdır
+          opposite_amounts: Zıt tutarlara sahip olmalıdır
+          same_family: Aynı aileden olmalıdır
+          within_days: "%{count} gün içinde olmalıdır"
   transfer:
     name: "%{to_account} hesabına transfer"
-    payment_name: "%{to_account} hesabına ödeme"
\ No newline at end of file
+    payment_name: "%{to_account} hesabına ödeme"
diff --git a/config/locales/models/transfer/zh-CN.yml b/config/locales/models/transfer/zh-CN.yml
index b1f6113dd..f1dfe610d 100644
--- a/config/locales/models/transfer/zh-CN.yml
+++ b/config/locales/models/transfer/zh-CN.yml
@@ -13,6 +13,10 @@ zh-CN:
               must_have_opposite_amounts: 转账交易的金额必须互为相反数
               must_have_single_currency: 转账必须使用单一货币
               outflow_cannot_be_in_multiple_transfers: 出账交易不能参与多次转账
+          different_accounts: 必须来自不同账户
+          same_family: 必须来自同一家庭
+          opposite_amounts: 金额必须方向相反
+          within_days: 必须在 %{count} 天内
   transfer:
     name: 转账至 %{to_account}
     payment_name: 付款至 %{to_account}
diff --git a/config/locales/models/trend/fr.yml b/config/locales/models/trend/fr.yml
index 87483c8ed..cce133870 100644
--- a/config/locales/models/trend/fr.yml
+++ b/config/locales/models/trend/fr.yml
@@ -6,7 +6,8 @@ fr:
         trend:
           attributes:
             current:
-              must_be_of_the_same_type_as_previous: doit être du même type que le précédent
+              must_be_of_the_same_type_as_previous: doit être du même type que le
+                précédent
               must_be_of_type_money_numeric_or_nil: doit être de type Money, Numeric,
                 ou nil
             previous:
diff --git a/config/locales/models/trend/it.yml b/config/locales/models/trend/it.yml
new file mode 100644
index 000000000..57aa8c613
--- /dev/null
+++ b/config/locales/models/trend/it.yml
@@ -0,0 +1,13 @@
+---
+it:
+  activemodel:
+    errors:
+      models:
+        trend:
+          attributes:
+            current:
+              must_be_of_the_same_type_as_previous: deve essere dello stesso tipo del valore precedente
+              must_be_of_type_money_numeric_or_nil: deve essere di tipo Money, Numerico o nil
+            previous:
+              must_be_of_the_same_type_as_current: deve essere dello stesso tipo del valore corrente
+              must_be_of_type_money_numeric_or_nil: deve essere di tipo Money, Numerico o nil
diff --git a/config/locales/models/trend/ru.yml b/config/locales/models/trend/ru.yml
new file mode 100644
index 000000000..20b2eec09
--- /dev/null
+++ b/config/locales/models/trend/ru.yml
@@ -0,0 +1,17 @@
+---
+ru:
+  activemodel:
+    errors:
+      models:
+        trend:
+          attributes:
+            current:
+              must_be_of_the_same_type_as_previous: должен быть того же типа, что
+                и предыдущий
+              must_be_of_type_money_numeric_or_nil: должен быть типа Деньги, Числовой
+                или nil
+            previous:
+              must_be_of_the_same_type_as_current: должен быть того же типа, что и
+                текущий
+              must_be_of_type_money_numeric_or_nil: должен быть типа Деньги, Числовой
+                или nil
diff --git a/config/locales/models/trend/tr.yml b/config/locales/models/trend/tr.yml
index c98ecee12..569219ef0 100644
--- a/config/locales/models/trend/tr.yml
+++ b/config/locales/models/trend/tr.yml
@@ -7,7 +7,9 @@ tr:
           attributes:
             current:
               must_be_of_the_same_type_as_previous: Öncekiyle aynı türde olmalı
-              must_be_of_type_money_numeric_or_nil: Money, Sayısal veya boş (nil) olmalı
+              must_be_of_type_money_numeric_or_nil: Money, Sayısal veya boş (nil)
+                olmalı
             previous:
               must_be_of_the_same_type_as_current: Şimdikiyle aynı türde olmalı
-              must_be_of_type_money_numeric_or_nil: Money, Sayısal veya boş (nil) olmalı
\ No newline at end of file
+              must_be_of_type_money_numeric_or_nil: Money, Sayısal veya boş (nil)
+                olmalı
diff --git a/config/locales/models/user/fr.yml b/config/locales/models/user/fr.yml
index d3f2d6c3a..de95b70b4 100644
--- a/config/locales/models/user/fr.yml
+++ b/config/locales/models/user/fr.yml
@@ -15,8 +15,9 @@ fr:
         user:
           attributes:
             base:
-              cannot_deactivate_admin_with_other_users: Un administrateur ne peut pas
-                désactiver son compte tant que d'autres utilisateurs sont présents.
+              cannot_deactivate_admin_with_other_users: Un administrateur ne peut
+                pas désactiver son compte tant que d'autres utilisateurs sont présents.
                 Veuillez d’abord supprimer tous les membres.
             profile_image:
-              invalid_file_size: La taille du fichier doit être inférieure à %{max_megabytes} Mo
+              invalid_file_size: La taille du fichier doit être inférieure à %{max_megabytes}
+                Mo
diff --git a/config/locales/models/user/it.yml b/config/locales/models/user/it.yml
new file mode 100644
index 000000000..9e4d9dc16
--- /dev/null
+++ b/config/locales/models/user/it.yml
@@ -0,0 +1,20 @@
+---
+it:
+  activerecord:
+    attributes:
+      user:
+        email: Email
+        family: "%{moniker}"
+        family_id: "%{moniker}"
+        first_name: Nome
+        last_name: Cognome
+        password: Password
+        password_confirmation: Conferma password
+    errors:
+      models:
+        user:
+          attributes:
+            base:
+              cannot_deactivate_admin_with_other_users: L'amministratore non può eliminare l'account mentre altri utenti sono presenti. Elimina prima tutti i membri.
+            profile_image:
+              invalid_file_size: la dimensione del file deve essere inferiore a %{max_megabytes}MB
diff --git a/config/locales/models/user/ru.yml b/config/locales/models/user/ru.yml
new file mode 100644
index 000000000..81380d728
--- /dev/null
+++ b/config/locales/models/user/ru.yml
@@ -0,0 +1,22 @@
+---
+ru:
+  activerecord:
+    attributes:
+      user:
+        email: Электронная почта
+        family: "%{moniker}"
+        family_id: "%{moniker}"
+        first_name: Имя
+        last_name: Фамилия
+        password: Пароль
+        password_confirmation: Подтверждение пароля
+    errors:
+      models:
+        user:
+          attributes:
+            base:
+              cannot_deactivate_admin_with_other_users: Администратор не может удалить
+                аккаунт, пока есть другие пользователи. Пожалуйста, сначала удалите
+                всех участников.
+            profile_image:
+              invalid_file_size: размер файла должен быть меньше %{max_megabytes}МБ
diff --git a/config/locales/models/user/tr.yml b/config/locales/models/user/tr.yml
index 26bfda35a..fc7325cb1 100644
--- a/config/locales/models/user/tr.yml
+++ b/config/locales/models/user/tr.yml
@@ -4,8 +4,8 @@ tr:
     attributes:
       user:
         email: E-posta
-        family: Aile
-        family_id: Aile
+        family: "%{moniker}"
+        family_id: "%{moniker}"
         first_name: Ad
         last_name: Soyad
         password: Şifre
@@ -15,6 +15,7 @@ tr:
         user:
           attributes:
             base:
-              cannot_deactivate_admin_with_other_users: Diğer kullanıcılar varken yönetici hesabı silinemez. Lütfen önce tüm üyeleri silin.
+              cannot_deactivate_admin_with_other_users: Diğer kullanıcılar varken
+                yönetici hesabı silinemez. Lütfen önce tüm üyeleri silin.
             profile_image:
-              invalid_file_size: dosya boyutu %{max_megabytes}MB'den küçük olmalıdır
\ No newline at end of file
+              invalid_file_size: dosya boyutu %{max_megabytes}MB'den küçük olmalıdır
diff --git a/config/locales/views/account_sharings/de.yml b/config/locales/views/account_sharings/de.yml
new file mode 100644
index 000000000..f770ce305
--- /dev/null
+++ b/config/locales/views/account_sharings/de.yml
@@ -0,0 +1,29 @@
+---
+de:
+  account_sharings:
+    show:
+      title: Kontofreigabe
+      subtitle: Legen Sie fest, wer dieses Konto sehen und damit interagieren kann
+      member: Mitglied
+      permission: Berechtigung
+      shared: Freigegeben
+      no_members: Keine weiteren Mitglieder in Ihrem %{moniker} zum Teilen
+      permissions:
+        full_control: Volle Kontrolle
+        full_control_description: Kann Transaktionen ansehen, bearbeiten und verwalten
+        read_write: Kann kommentieren
+        read_write_description: Kann kategorisieren, mit Tags versehen und Notizen hinzufügen
+        read_only: Nur ansehen
+        read_only_description: Kann nur Kontodaten ansehen
+      save: Freigabeeinstellungen speichern
+      owner_label: "Eigentümer: %{name}"
+      shared_with_count:
+        one: Mit 1 Mitglied geteilt
+        other: "Mit %{count} Mitgliedern geteilt"
+      include_in_finances: In meine Budgets & Berichte einbeziehen
+      exclude_from_finances: Von meinen Budgets & Berichten ausschließen
+      finance_toggle_description: Dieses Konto in Ihrem Nettovermögen, Budgets und Berichten berücksichtigen
+    update:
+      success: Freigabeeinstellungen aktualisiert
+      not_owner: Nur der Kontoeigentümer kann die Freigabe verwalten
+      finance_toggle_success: Einstellung zur Finanzberücksichtigung aktualisiert
diff --git a/config/locales/views/account_sharings/es.yml b/config/locales/views/account_sharings/es.yml
new file mode 100644
index 000000000..c05fe3015
--- /dev/null
+++ b/config/locales/views/account_sharings/es.yml
@@ -0,0 +1,29 @@
+---
+es:
+  account_sharings:
+    show:
+      title: Compartir cuenta
+      subtitle: Controla quién puede ver esta cuenta e interactuar con ella
+      member: Miembro
+      permission: Permiso
+      shared: Compartida
+      no_members: No hay otros miembros en tu %{moniker} con quienes compartir
+      permissions:
+        full_control: Control total
+        full_control_description: Puede ver, editar y gestionar transacciones
+        read_write: Puede anotar
+        read_write_description: Puede categorizar, etiquetar y añadir notas
+        read_only: Solo lectura
+        read_only_description: Solo puede ver los datos de la cuenta
+      save: Guardar ajustes de uso compartido
+      owner_label: "Propietario: %{name}"
+      shared_with_count:
+        one: Compartida con 1 miembro
+        other: "Compartida con %{count} miembros"
+      include_in_finances: Incluir en mis presupuestos e informes
+      exclude_from_finances: Excluir de mis presupuestos e informes
+      finance_toggle_description: Tener en cuenta esta cuenta en tu patrimonio neto, presupuestos e informes
+    update:
+      success: Ajustes de uso compartido actualizados
+      not_owner: Solo el propietario de la cuenta puede gestionar el uso compartido
+      finance_toggle_success: Preferencia de inclusión financiera actualizada
diff --git a/config/locales/views/account_sharings/fr.yml b/config/locales/views/account_sharings/fr.yml
index 66cb86ead..6c275c408 100644
--- a/config/locales/views/account_sharings/fr.yml
+++ b/config/locales/views/account_sharings/fr.yml
@@ -2,28 +2,29 @@
 fr:
   account_sharings:
     show:
-      title: Partage de compte
-      subtitle: Contrôlez qui peut voir ce compte et interagir avec lui
+      exclude_from_finances: Exclure de mes budgets et rapports
+      finance_toggle_description: Compter ce compte dans votre patrimoine net, vos
+        budgets et vos rapports
+      include_in_finances: Inclure dans mes budgets et rapports
       member: Membre
-      permission: Permission
-      shared: Partagé
       no_members: Aucun autre membre dans votre %{moniker} avec qui partager
+      owner_label: 'Propriétaire : %{name}'
+      permission: Permission
       permissions:
         full_control: Contrôle total
         full_control_description: Peut voir, modifier et gérer les transactions
-        read_write: Peut annoter
-        read_write_description: Peut catégoriser, étiqueter et ajouter des notes
         read_only: Lecture seule
         read_only_description: Peut uniquement voir les données du compte
+        read_write: Peut annoter
+        read_write_description: Peut catégoriser, étiqueter et ajouter des notes
       save: Enregistrer les paramètres de partage
-      owner_label: "Propriétaire : %{name}"
+      shared: Partagé
       shared_with_count:
         one: Partagé avec 1 membre
-        other: "Partagé avec %{count} membres"
-      include_in_finances: Inclure dans mes budgets et rapports
-      exclude_from_finances: Exclure de mes budgets et rapports
-      finance_toggle_description: Compter ce compte dans votre patrimoine net, vos budgets et vos rapports
+        other: Partagé avec %{count} membres
+      subtitle: Contrôlez qui peut voir ce compte et interagir avec lui
+      title: Partage de compte
     update:
-      success: Paramètres de partage mis à jour
-      not_owner: Seul le propriétaire du compte peut gérer le partage
       finance_toggle_success: Préférence d'inclusion financière mise à jour
+      not_owner: Seul le propriétaire du compte peut gérer le partage
+      success: Paramètres de partage mis à jour
diff --git a/config/locales/views/account_sharings/it.yml b/config/locales/views/account_sharings/it.yml
new file mode 100644
index 000000000..ba4a14feb
--- /dev/null
+++ b/config/locales/views/account_sharings/it.yml
@@ -0,0 +1,29 @@
+---
+it:
+  account_sharings:
+    show:
+      title: Condivisione conto
+      subtitle: Controlla chi può vedere e interagire con questo conto
+      member: Membro
+      permission: Permesso
+      shared: Condiviso
+      no_members: Nessun altro membro nel tuo %{moniker} con cui condividere
+      permissions:
+        full_control: Controllo completo
+        full_control_description: Può visualizzare, modificare e gestire le transazioni
+        read_write: Può annotare
+        read_write_description: Può categorizzare, etichettare e aggiungere note
+        read_only: Solo visualizzazione
+        read_only_description: Può solo visualizzare i dati del conto
+      save: Salva impostazioni di condivisione
+      owner_label: "Proprietario: %{name}"
+      shared_with_count:
+        one: Condiviso con 1 membro
+        other: "Condiviso con %{count} membri"
+      include_in_finances: Includi nei miei budget e rapporti
+      exclude_from_finances: Escludi dai miei budget e rapporti
+      finance_toggle_description: Conta questo conto nel tuo patrimonio netto, budget e rapporti
+    update:
+      success: Impostazioni di condivisione aggiornate
+      not_owner: Solo il proprietario del conto può gestire la condivisione
+      finance_toggle_success: Preferenza di inclusione finanziaria aggiornata
diff --git a/config/locales/views/account_sharings/nl.yml b/config/locales/views/account_sharings/nl.yml
new file mode 100644
index 000000000..3aea7a0a7
--- /dev/null
+++ b/config/locales/views/account_sharings/nl.yml
@@ -0,0 +1,29 @@
+---
+nl:
+  account_sharings:
+    show:
+      title: Account delen
+      subtitle: Bepaal wie dit account kan zien en ermee kan werken
+      member: Lid
+      permission: Toestemming
+      shared: Gedeeld
+      no_members: Geen andere leden in uw %{moniker} om mee te delen
+      permissions:
+        full_control: Volledige controle
+        full_control_description: Kan transacties bekijken, bewerken en beheren
+        read_write: Kan annoteren
+        read_write_description: Kan categoriseren, taggen en notities toevoegen
+        read_only: Alleen weergeven
+        read_only_description: Kan alleen accountgegevens bekijken
+      save: Deelinstellingen opslaan
+      owner_label: "Eigenaar: %{name}"
+      shared_with_count:
+        one: Gedeeld met 1 lid
+        other: "Gedeeld met %{count} leden"
+      include_in_finances: Opnemen in mijn budgetten en rapporten
+      exclude_from_finances: Uitsluiten van mijn budgetten en rapporten
+      finance_toggle_description: Dit account meetellen in uw vermogen, budgetten en rapporten
+    update:
+      success: Deelinstellingen bijgewerkt
+      not_owner: Alleen de accounteigenaar kan het delen beheren
+      finance_toggle_success: Voorkeur voor financiële opname bijgewerkt
diff --git a/config/locales/views/account_sharings/ru.yml b/config/locales/views/account_sharings/ru.yml
new file mode 100644
index 000000000..73fa0b807
--- /dev/null
+++ b/config/locales/views/account_sharings/ru.yml
@@ -0,0 +1,32 @@
+---
+ru:
+  account_sharings:
+    show:
+      exclude_from_finances: Исключить из моих бюджетов и отчётов
+      finance_toggle_description: Учитывать этот счёт в вашей чистой стоимости, бюджетах
+        и отчётах
+      include_in_finances: Включить в мои бюджеты и отчёты
+      member: Участник
+      no_members: Нет других участников в вашем %{moniker} для совместного использования
+      owner_label: 'Владелец: %{name}'
+      permission: Разрешение
+      permissions:
+        full_control: Полный доступ
+        full_control_description: Может просматривать, редактировать и управлять операциями
+        read_only: Только просмотр
+        read_only_description: Может только просматривать данные счёта
+        read_write: Комментирование
+        read_write_description: Может категоризировать, добавлять теги и заметки
+      save: Сохранить настройки доступа
+      shared: Совместно
+      shared_with_count:
+        few: Совместно с %{count} участниками
+        many: Совместно с %{count} участниками
+        one: Совместно с 1 участником
+        other: Совместно с %{count} участниками
+      subtitle: Управляйте тем, кто может видеть и взаимодействовать с этим счётом
+      title: Совместное использование счёта
+    update:
+      finance_toggle_success: Предпочтение включения в финансы обновлено
+      not_owner: Только владелец счёта может управлять доступом
+      success: Настройки доступа обновлены
diff --git a/config/locales/views/account_sharings/tr.yml b/config/locales/views/account_sharings/tr.yml
new file mode 100644
index 000000000..0a2f95137
--- /dev/null
+++ b/config/locales/views/account_sharings/tr.yml
@@ -0,0 +1,30 @@
+---
+tr:
+  account_sharings:
+    show:
+      exclude_from_finances: Bütçelerimden ve raporlarımdan hariç tut
+      finance_toggle_description: Bu hesabı net değerinizde, bütçelerinizde ve raporlarınızda
+        sayın
+      include_in_finances: Bütçelerime ve raporlarıma dahil et
+      member: Üye
+      no_members: "%{moniker} hesabınızda paylaşacak başka üye yok"
+      owner_label: 'Sahip: %{name}'
+      permission: İzin
+      permissions:
+        full_control: Tam kontrol
+        full_control_description: İşlemleri görüntüleyebilir, düzenleyebilir ve yönetebilir
+        read_only: Yalnızca görüntüleme
+        read_only_description: Yalnızca hesap verilerini görüntüleyebilir
+        read_write: Not ekleyebilir
+        read_write_description: Kategorilendirebilir, etiketleyebilir ve not ekleyebilir
+      save: Paylaşım ayarlarını kaydet
+      shared: Paylaşıldı
+      shared_with_count:
+        one: 1 üyeyle paylaşıldı
+        other: "%{count} üyeyle paylaşıldı"
+      subtitle: Bu hesabı kimlerin görüp etkileşime girebileceğini kontrol edin
+      title: Hesap Paylaşımı
+    update:
+      finance_toggle_success: Finansal dahil etme tercihi güncellendi
+      not_owner: Paylaşımı yalnızca hesap sahibi yönetebilir
+      success: Paylaşım ayarları güncellendi
diff --git a/config/locales/views/account_statements/ca.yml b/config/locales/views/account_statements/ca.yml
index 84f732424..d4e0df21f 100644
--- a/config/locales/views/account_statements/ca.yml
+++ b/config/locales/views/account_statements/ca.yml
@@ -105,6 +105,7 @@ ca:
       account: Compte
       actions: Accions
       download: Descarrega
+      edit: Edita
       file: Fitxer
       link_suggestion: Suggeriment d'enllaç
       period: Període
diff --git a/config/locales/views/account_statements/de.yml b/config/locales/views/account_statements/de.yml
new file mode 100644
index 000000000..47d372156
--- /dev/null
+++ b/config/locales/views/account_statements/de.yml
@@ -0,0 +1,117 @@
+---
+de:
+  account_statements:
+    account_tab:
+      coverage_title: Kontoauszug-Abdeckung
+      coverage_description: Historische Monate, die durch hochgeladene Kontoauszüge und Saldoprüfungen belegt sind.
+      coverage_range: "%{start} - %{end}"
+      empty: Diesem Konto sind noch keine Kontoauszüge zugeordnet.
+      open_inbox: Posteingang
+      statements_title: Kontoauszüge
+      year_label: Abdeckungsjahr
+    balance:
+      unknown: Unbekannt
+    coverage:
+      status:
+        ambiguous: Mehrdeutig
+        covered: Abgedeckt
+        duplicate: Duplikat
+        mismatched: Abweichend
+        missing: Fehlend
+        not_expected: Nicht erwartet
+    create:
+      duplicates:
+        one: 1 doppelter Kontoauszug wurde übersprungen.
+        other: "%{count} doppelte Kontoauszüge wurden übersprungen."
+      invalid_file_type: Laden Sie einen Kontoauszug als PDF, CSV oder XLSX innerhalb der Größenbeschränkung hoch.
+      no_files: Wählen Sie mindestens eine Kontoauszugsdatei aus.
+      success:
+        one: 1 Kontoauszug hochgeladen.
+        other: "%{count} Kontoauszüge hochgeladen."
+    destroy:
+      failure: Kontoauszug konnte nicht gelöscht werden.
+      success: Kontoauszug gelöscht.
+    form:
+      account_upload: Kontoauszug hochladen
+      files_hint: PDF, CSV oder XLSX. Max. %{max_size} MB pro Datei.
+      files_label: Kontoauszugsdateien
+      inbox_upload: Hochladen
+    index:
+      account_label: Konto
+      confidence: "%{confidence} Übereinstimmung"
+      empty_linked: Noch keine verknüpften Kontoauszüge.
+      empty_unmatched: Der Kontoauszug-Posteingang ist leer.
+      leave_unmatched: Nicht zugeordnet lassen
+      linked_title: Verknüpfte Kontoauszüge
+      no_suggestion: Kein Vorschlag
+      storage_used: Belegter Speicher
+      title: Kontoauszug-Tresor
+      unmatched_title: Nicht zugeordneter Posteingang
+      upload_description: Laden Sie Kontoauszüge in den Posteingang hoch oder wählen Sie ein Konto zur sofortigen Verknüpfung.
+      upload_title: Kontoauszüge hochladen
+    link:
+      no_account: Wählen Sie ein Konto aus, bevor Sie diesen Kontoauszug verknüpfen.
+      success: Kontoauszug mit %{account} verknüpft.
+    period:
+      unknown: Zeitraum unbekannt
+    reconciliation:
+      checks:
+        closing_balance: Schlusssaldo
+        opening_balance: Anfangssaldo
+        period_movement: Bewegung im Zeitraum
+        unknown_check: Unbekannte Prüfung
+      matched: Übereinstimmend
+      mismatched: Abweichend
+      unavailable: Nicht geprüft
+    reject:
+      success: Kontoauszug-Zuordnung abgelehnt.
+    show:
+      account_label: Konto
+      account_last4_hint: Letzte vier Ziffern des Kontos
+      account_name_hint: Hinweis zum Kontonamen
+      closing_balance: Schlusssaldo
+      currency: Währung
+      delete: Löschen
+      difference: Differenz
+      download: Herunterladen
+      institution_name_hint: Hinweis zum Institut
+      ledger_amount: Sure-Buchung
+      linked_to: Verknüpft mit %{account}.
+      linking_title: Kontoverknüpfung
+      link_suggestion: Verknüpfungsvorschlag
+      metadata_title: Kontoauszug-Metadaten
+      no_suggestion: Noch kein Kontovorschlag.
+      opening_balance: Anfangssaldo
+      period_end_on: Ende des Zeitraums
+      period_start_on: Beginn des Zeitraums
+      reconciliation_title: Abgleich
+      reconciliation_unavailable: Fügen Sie einen Kontoauszugszeitraum und einen Anfangs- oder Schlusssaldo hinzu und stellen Sie sicher, dass Sure für diese Daten einen Saldoverlauf hat.
+      reject: Ablehnen
+      save: Kontoauszug speichern
+      statement_amount: Kontoauszug
+      suggested_account: Vorgeschlagenes Konto ist %{account} (%{confidence} Konfidenz).
+      title: Kontoauszug
+      unlink: Verknüpfung aufheben
+      unmatched_account: Nicht zugeordneter Posteingang
+      unknown_value: Unbekannt
+    status:
+      linked: Verknüpft
+      rejected: Abgelehnt
+      unmatched: Nicht zugeordnet
+    table:
+      account: Konto
+      actions: Aktionen
+      download: Herunterladen
+      edit: Bearbeiten
+      file: Datei
+      link_suggestion: Verknüpfungsvorschlag
+      period: Zeitraum
+      reconciliation: Abgleich
+      reject: Vorschlag ablehnen
+      suggestion: Vorschlag
+      unlink: Verknüpfung aufheben
+      view: Ansehen
+    unlink:
+      success: Kontoauszug zurück in den nicht zugeordneten Posteingang verschoben.
+    update:
+      success: Kontoauszug aktualisiert.
diff --git a/config/locales/views/account_statements/en.yml b/config/locales/views/account_statements/en.yml
index 78e21ae57..6a4062d47 100644
--- a/config/locales/views/account_statements/en.yml
+++ b/config/locales/views/account_statements/en.yml
@@ -102,6 +102,7 @@ en:
       account: Account
       actions: Actions
       download: Download
+      edit: Edit
       file: File
       link_suggestion: Link suggestion
       period: Period
diff --git a/config/locales/views/account_statements/es.yml b/config/locales/views/account_statements/es.yml
new file mode 100644
index 000000000..8572eb718
--- /dev/null
+++ b/config/locales/views/account_statements/es.yml
@@ -0,0 +1,117 @@
+---
+es:
+  account_statements:
+    account_tab:
+      coverage_title: Cobertura de extractos
+      coverage_description: Meses históricos respaldados por extractos subidos y comprobaciones de saldo.
+      coverage_range: "%{start} - %{end}"
+      empty: Aún no hay extractos vinculados a esta cuenta.
+      open_inbox: Bandeja de entrada
+      statements_title: Extractos
+      year_label: Año de cobertura
+    balance:
+      unknown: Desconocido
+    coverage:
+      status:
+        ambiguous: Ambiguo
+        covered: Cubierto
+        duplicate: Duplicado
+        mismatched: No coincide
+        missing: Faltante
+        not_expected: No esperado
+    create:
+      duplicates:
+        one: Se omitió 1 extracto duplicado.
+        other: "Se omitieron %{count} extractos duplicados."
+      invalid_file_type: Sube un extracto en PDF, CSV o XLSX que no supere el límite de tamaño.
+      no_files: Selecciona al menos un archivo de extracto.
+      success:
+        one: 1 extracto subido.
+        other: "%{count} extractos subidos."
+    destroy:
+      failure: No se pudo eliminar el extracto.
+      success: Extracto eliminado.
+    form:
+      account_upload: Subir extracto
+      files_hint: PDF, CSV o XLSX. Máximo %{max_size} MB por archivo.
+      files_label: Archivos de extracto
+      inbox_upload: Subir
+    index:
+      account_label: Cuenta
+      confidence: "Coincidencia del %{confidence}"
+      empty_linked: Aún no hay extractos vinculados.
+      empty_unmatched: La bandeja de entrada de extractos está vacía.
+      leave_unmatched: Dejar sin asignar
+      linked_title: Extractos vinculados
+      no_suggestion: Sin sugerencia
+      storage_used: Almacenamiento usado
+      title: Bóveda de extractos
+      unmatched_title: Bandeja de entrada sin asignar
+      upload_description: Sube extractos a la bandeja de entrada o elige una cuenta para vincularlos de inmediato.
+      upload_title: Subir extractos
+    link:
+      no_account: Elige una cuenta antes de vincular este extracto.
+      success: Extracto vinculado a %{account}.
+    period:
+      unknown: Periodo desconocido
+    reconciliation:
+      checks:
+        closing_balance: Saldo de cierre
+        opening_balance: Saldo de apertura
+        period_movement: Movimiento del periodo
+        unknown_check: Comprobación desconocida
+      matched: Coincide
+      mismatched: No coincide
+      unavailable: Sin comprobar
+    reject:
+      success: Coincidencia de extracto rechazada.
+    show:
+      account_label: Cuenta
+      account_last4_hint: Últimos cuatro dígitos de la cuenta
+      account_name_hint: Pista del nombre de la cuenta
+      closing_balance: Saldo de cierre
+      currency: Moneda
+      delete: Eliminar
+      difference: Diferencia
+      download: Descargar
+      institution_name_hint: Pista de la entidad
+      ledger_amount: Registro de Sure
+      linked_to: Vinculado a %{account}.
+      linking_title: Vínculo de cuenta
+      link_suggestion: Sugerencia de vínculo
+      metadata_title: Metadatos del extracto
+      no_suggestion: Aún no hay sugerencia de cuenta.
+      opening_balance: Saldo de apertura
+      period_end_on: Fin del periodo
+      period_start_on: Inicio del periodo
+      reconciliation_title: Conciliación
+      reconciliation_unavailable: Añade un periodo de extracto y un saldo de apertura o cierre, y asegúrate de que Sure tenga historial de saldos para esas fechas.
+      reject: Rechazar
+      save: Guardar extracto
+      statement_amount: Extracto
+      suggested_account: La cuenta sugerida es %{account} (confianza del %{confidence}).
+      title: Extracto
+      unlink: Desvincular
+      unmatched_account: Bandeja de entrada sin asignar
+      unknown_value: Desconocido
+    status:
+      linked: Vinculado
+      rejected: Rechazado
+      unmatched: Sin asignar
+    table:
+      account: Cuenta
+      actions: Acciones
+      download: Descargar
+      edit: Editar
+      file: Archivo
+      link_suggestion: Sugerencia de vínculo
+      period: Periodo
+      reconciliation: Conciliación
+      reject: Rechazar sugerencia
+      suggestion: Sugerencia
+      unlink: Desvincular
+      view: Ver
+    unlink:
+      success: Extracto devuelto a la bandeja de entrada sin asignar.
+    update:
+      success: Extracto actualizado.
diff --git a/config/locales/views/account_statements/fr.yml b/config/locales/views/account_statements/fr.yml
new file mode 100644
index 000000000..b2b026537
--- /dev/null
+++ b/config/locales/views/account_statements/fr.yml
@@ -0,0 +1,122 @@
+---
+fr:
+  account_statements:
+    account_tab:
+      coverage_description: Mois historiques soutenus par des relevés téléchargés
+        et des vérifications de solde.
+      coverage_range: "%{start} - %{end}"
+      coverage_title: Couverture du relevé
+      empty: Aucun relevé lié à ce compte pour l'instant.
+      open_inbox: Boîte de réception
+      statements_title: Déclarations
+      year_label: Année de couverture
+    balance:
+      unknown: Inconnu
+    coverage:
+      status:
+        ambiguous: Ambigu
+        covered: Couvert
+        duplicate: Dupliqué
+        mismatched: Incompatibilité
+        missing: Manquant
+        not_expected: Pas prévu
+    create:
+      duplicates:
+        one: 1 instruction en double a été ignorée.
+        other: "%{count} instructions en double ont été ignorées."
+      invalid_file_type: Téléchargez une déclaration PDF, CSV ou XLSX en respectant
+        la taille limite.
+      no_files: Sélectionnez au moins un fichier de relevé.
+      success:
+        one: 1 déclaration téléchargée.
+        other: "%{count} relevés téléchargés."
+    destroy:
+      failure: La déclaration n'a pas pu être supprimée.
+      success: Déclaration supprimée.
+    form:
+      account_upload: Télécharger la déclaration
+      files_hint: PDF, CSV ou XLSX. %{max_size}Mo maximum par fichier.
+      files_label: Fichiers de relevés
+      inbox_upload: Télécharger
+    index:
+      account_label: Compte
+      confidence: "%{confidence} correspond"
+      empty_linked: Aucune déclaration liée pour l'instant.
+      empty_unmatched: La boîte de réception des déclarations est vide.
+      leave_unmatched: Laisser non lié
+      linked_title: Déclarations liées
+      no_suggestion: Aucune suggestion
+      storage_used: Stockage utilisé
+      title: Coffre-fort de relevés
+      unmatched_title: Boîte de réception non liée
+      upload_description: Téléchargez des relevés dans la boîte de réception ou choisissez
+        un compte à associer immédiatement.
+      upload_title: Télécharger des relevés
+    link:
+      no_account: Choisissez un compte avant de lier ce relevé.
+      success: Instruction liée à %{account}.
+    period:
+      unknown: Période inconnue
+    reconciliation:
+      checks:
+        closing_balance: Solde de clôture
+        opening_balance: Solde d'ouverture
+        period_movement: Mouvements de la période
+        unknown_check: Chèque inconnu
+      matched: Correspondant
+      mismatched: Incompatibilité
+      unavailable: Non vérifié
+    reject:
+      success: Correspondance de déclaration rejetée.
+    show:
+      account_label: Compte
+      account_last4_hint: Compte quatre derniers
+      account_name_hint: Indice de nom de compte
+      closing_balance: Solde de clôture
+      currency: Devise
+      delete: Supprimer
+      difference: Différence
+      download: Télécharger
+      institution_name_hint: Indice d'établissement
+      ledger_amount: Solde Sure
+      link_suggestion: Suggestion de lien
+      linked_to: Lié à %{account}.
+      linking_title: Lien du compte
+      metadata_title: Métadonnées de la déclaration
+      no_suggestion: Aucune suggestion de compte pour l'instant.
+      opening_balance: Solde d'ouverture
+      period_end_on: Fin de période
+      period_start_on: Début de période
+      reconciliation_title: Réconciliation
+      reconciliation_unavailable: Ajoutez une période de relevé et un solde d’ouverture
+        ou de clôture, puis assurez-vous que Sure dispose d’un historique de solde
+        pour ces dates.
+      reject: Rejeter
+      save: Enregistrer l'instruction
+      statement_amount: Déclaration
+      suggested_account: Le compte suggéré est %{account} (confiance %{confidence}).
+      title: Déclaration
+      unknown_value: Inconnu
+      unlink: Dissocier
+      unmatched_account: Compte non lié
+    status:
+      linked: Lié
+      rejected: Rejeté
+      unmatched: non lié
+    table:
+      account: Compte
+      actions: Actions
+      download: Télécharger
+      edit: Modifier
+      file: Fichier
+      link_suggestion: Suggestion de lien
+      period: Période
+      reconciliation: Réconciliation
+      reject: Rejeter la suggestion
+      suggestion: Suggestions
+      unlink: Dissocier
+      view: Voir
+    unlink:
+      success: La déclaration a été renvoyée dans la boîte de réception non liée.
+    update:
+      success: Déclaration mise à jour.
diff --git a/config/locales/views/account_statements/hu.yml b/config/locales/views/account_statements/hu.yml
index 0a3fc5966..8a9201114 100644
--- a/config/locales/views/account_statements/hu.yml
+++ b/config/locales/views/account_statements/hu.yml
@@ -102,6 +102,7 @@ hu:
       account: Számla
       actions: Műveletek
       download: Letöltés
+      edit: Szerkesztés
       file: Fájl
       link_suggestion: Kapcsolati javaslat
       period: Időszak
diff --git a/config/locales/views/account_statements/it.yml b/config/locales/views/account_statements/it.yml
new file mode 100644
index 000000000..8e6bc9e88
--- /dev/null
+++ b/config/locales/views/account_statements/it.yml
@@ -0,0 +1,116 @@
+---
+it:
+  account_statements:
+    account_tab:
+      coverage_title: Copertura estratti conto
+      coverage_description: Mesi storici supportati da estratti conto caricati e verifiche del saldo.
+      coverage_range: "%{start} - %{end}"
+      empty: Nessun estratto conto collegato a questo conto ancora.
+      open_inbox: Posta in arrivo
+      statements_title: Estratti conto
+      year_label: Anno di copertura
+    balance:
+      unknown: Sconosciuto
+    coverage:
+      status:
+        ambiguous: Ambiguo
+        covered: Coperto
+        duplicate: Duplicato
+        mismatched: Non corrispondente
+        missing: Mancante
+        not_expected: Non atteso
+    create:
+      duplicates:
+        one: 1 estratto conto duplicato è stato ignorato.
+        other: "%{count} estratti conto duplicati sono stati ignorati."
+      invalid_file_type: Carica un estratto conto PDF, CSV o XLSX entro il limite di dimensione.
+      no_files: Seleziona almeno un file di estratto conto.
+      success:
+        one: 1 estratto conto caricato.
+        other: "%{count} estratti conto caricati."
+    destroy:
+      failure: Impossibile eliminare l'estratto conto.
+      success: Estratto conto eliminato.
+    form:
+      account_upload: Carica estratto conto
+      files_hint: PDF, CSV o XLSX. Max %{max_size}MB per file.
+      files_label: File estratti conto
+      inbox_upload: Carica
+    index:
+      account_label: Conto
+      confidence: "Corrispondenza %{confidence}"
+      empty_linked: Nessun estratto conto collegato ancora.
+      empty_unmatched: La posta in arrivo degli estratti conto è vuota.
+      leave_unmatched: Lascia non abbinato
+      linked_title: Estratti conto collegati
+      no_suggestion: Nessun suggerimento
+      storage_used: Spazio utilizzato
+      title: Archivio estratti conto
+      unmatched_title: Posta in arrivo non abbinata
+      upload_description: Carica estratti conto nella posta in arrivo, oppure scegli un conto per collegarli subito.
+      upload_title: Carica estratti conto
+    link:
+      no_account: Scegli un conto prima di collegare questo estratto conto.
+      success: Estratto conto collegato a %{account}.
+    period:
+      unknown: Periodo sconosciuto
+    reconciliation:
+      checks:
+        closing_balance: Saldo di chiusura
+        opening_balance: Saldo iniziale
+        period_movement: Movimento del periodo
+        unknown_check: Verifica sconosciuta
+      matched: Corrispondente
+      mismatched: Non corrispondente
+      unavailable: Non verificato
+    reject:
+      success: Corrispondenza estratto conto rifiutata.
+    show:
+      account_label: Conto
+      account_last4_hint: Ultime quattro cifre del conto
+      account_name_hint: Suggerimento nome conto
+      closing_balance: Saldo di chiusura
+      currency: Valuta
+      delete: Elimina
+      difference: Differenza
+      download: Scarica
+      institution_name_hint: Suggerimento istituzione
+      ledger_amount: Libro contabile Sure
+      linked_to: Collegato a %{account}.
+      linking_title: Collegamento conto
+      link_suggestion: Suggerimento collegamento
+      metadata_title: Metadati estratto conto
+      no_suggestion: Nessun suggerimento di conto ancora.
+      opening_balance: Saldo iniziale
+      period_end_on: Fine periodo
+      period_start_on: Inizio periodo
+      reconciliation_title: Riconciliazione
+      reconciliation_unavailable: Aggiungi un periodo e il saldo iniziale o finale dell'estratto, poi assicurati che Sure abbia la cronologia saldi per quelle date.
+      reject: Rifiuta
+      save: Salva estratto conto
+      statement_amount: Estratto conto
+      suggested_account: Il conto suggerito è %{account} (confidenza %{confidence}).
+      title: Estratto conto
+      unlink: Scollega
+      unmatched_account: Posta in arrivo non abbinata
+      unknown_value: Sconosciuto
+    status:
+      linked: Collegato
+      rejected: Rifiutato
+      unmatched: Non abbinato
+    table:
+      account: Conto
+      actions: Azioni
+      download: Scarica
+      file: File
+      link_suggestion: Suggerimento collegamento
+      period: Periodo
+      reconciliation: Riconciliazione
+      reject: Rifiuta suggerimento
+      suggestion: Suggerimento
+      unlink: Scollega
+      view: Visualizza
+    unlink:
+      success: Estratto conto spostato nella posta in arrivo non abbinata.
+    update:
+      success: Estratto conto aggiornato.
diff --git a/config/locales/views/account_statements/nl.yml b/config/locales/views/account_statements/nl.yml
new file mode 100644
index 000000000..35e302f6e
--- /dev/null
+++ b/config/locales/views/account_statements/nl.yml
@@ -0,0 +1,117 @@
+---
+nl:
+  account_statements:
+    account_tab:
+      coverage_title: Dekking van afschriften
+      coverage_description: Historische maanden onderbouwd door geüploade afschriften en saldocontroles.
+      coverage_range: "%{start} - %{end}"
+      empty: Nog geen afschriften gekoppeld aan dit account.
+      open_inbox: Inbox
+      statements_title: Afschriften
+      year_label: Dekkingsjaar
+    balance:
+      unknown: Onbekend
+    coverage:
+      status:
+        ambiguous: Dubbelzinnig
+        covered: Gedekt
+        duplicate: Duplicaat
+        mismatched: Komt niet overeen
+        missing: Ontbreekt
+        not_expected: Niet verwacht
+    create:
+      duplicates:
+        one: 1 dubbel afschrift is overgeslagen.
+        other: "%{count} dubbele afschriften zijn overgeslagen."
+      invalid_file_type: Upload een afschrift als PDF, CSV of XLSX binnen de groottelimiet.
+      no_files: Selecteer ten minste één afschriftbestand.
+      success:
+        one: 1 afschrift geüpload.
+        other: "%{count} afschriften geüpload."
+    destroy:
+      failure: Afschrift kon niet worden verwijderd.
+      success: Afschrift verwijderd.
+    form:
+      account_upload: Afschrift uploaden
+      files_hint: PDF, CSV of XLSX. Max. %{max_size} MB per bestand.
+      files_label: Afschriftbestanden
+      inbox_upload: Uploaden
+    index:
+      account_label: Account
+      confidence: "%{confidence} overeenkomst"
+      empty_linked: Nog geen gekoppelde afschriften.
+      empty_unmatched: De afschriften-inbox is leeg.
+      leave_unmatched: Niet-toegewezen laten
+      linked_title: Gekoppelde afschriften
+      no_suggestion: Geen suggestie
+      storage_used: Gebruikte opslag
+      title: Afschriftenkluis
+      unmatched_title: Niet-toegewezen inbox
+      upload_description: Upload afschriften naar de inbox of kies een account om ze meteen te koppelen.
+      upload_title: Afschriften uploaden
+    link:
+      no_account: Kies een account voordat u dit afschrift koppelt.
+      success: Afschrift gekoppeld aan %{account}.
+    period:
+      unknown: Periode onbekend
+    reconciliation:
+      checks:
+        closing_balance: Eindsaldo
+        opening_balance: Beginsaldo
+        period_movement: Mutatie in periode
+        unknown_check: Onbekende controle
+      matched: Komt overeen
+      mismatched: Komt niet overeen
+      unavailable: Niet gecontroleerd
+    reject:
+      success: Afschriftkoppeling afgewezen.
+    show:
+      account_label: Account
+      account_last4_hint: Laatste vier cijfers van het account
+      account_name_hint: Hint voor accountnaam
+      closing_balance: Eindsaldo
+      currency: Valuta
+      delete: Verwijderen
+      difference: Verschil
+      download: Downloaden
+      institution_name_hint: Hint voor instelling
+      ledger_amount: Sure-grootboek
+      linked_to: Gekoppeld aan %{account}.
+      linking_title: Accountkoppeling
+      link_suggestion: Koppelsuggestie
+      metadata_title: Afschriftmetagegevens
+      no_suggestion: Nog geen accountsuggestie.
+      opening_balance: Beginsaldo
+      period_end_on: Einde periode
+      period_start_on: Begin periode
+      reconciliation_title: Afstemming
+      reconciliation_unavailable: Voeg een afschriftperiode en een begin- of eindsaldo toe en zorg ervoor dat Sure een saldogeschiedenis heeft voor die datums.
+      reject: Afwijzen
+      save: Afschrift opslaan
+      statement_amount: Afschrift
+      suggested_account: Voorgesteld account is %{account} (%{confidence} betrouwbaarheid).
+      title: Afschrift
+      unlink: Ontkoppelen
+      unmatched_account: Niet-toegewezen inbox
+      unknown_value: Onbekend
+    status:
+      linked: Gekoppeld
+      rejected: Afgewezen
+      unmatched: Niet-toegewezen
+    table:
+      account: Account
+      actions: Acties
+      download: Downloaden
+      edit: Bewerken
+      file: Bestand
+      link_suggestion: Koppelsuggestie
+      period: Periode
+      reconciliation: Afstemming
+      reject: Suggestie afwijzen
+      suggestion: Suggestie
+      unlink: Ontkoppelen
+      view: Bekijken
+    unlink:
+      success: Afschrift teruggezet naar de niet-toegewezen inbox.
+    update:
+      success: Afschrift bijgewerkt.
diff --git a/config/locales/views/account_statements/pl.yml b/config/locales/views/account_statements/pl.yml
new file mode 100644
index 000000000..b1a1138e6
--- /dev/null
+++ b/config/locales/views/account_statements/pl.yml
@@ -0,0 +1,121 @@
+---
+pl:
+  account_statements:
+    account_tab:
+      coverage_title: Pokrycie wyciągami
+      coverage_description: Historyczne miesiące poparte przesłanymi wyciągami i uzgodnieniami sald.
+      coverage_range: "%{start} - %{end}"
+      empty: Brak wyciągów powiązanych z tym kontem.
+      open_inbox: Skrzynka odbiorcza
+      statements_title: Wyciągi
+      year_label: Rok pokrycia
+    balance:
+      unknown: Nieznane
+    coverage:
+      status:
+        ambiguous: Niejednoznaczny
+        covered: Pokryty
+        duplicate: Duplikat
+        mismatched: Niezgodny
+        missing: Brakujący
+        not_expected: Niespodziewany
+    create:
+      duplicates:
+        few: "Pominięto %{count} duplikaty wyciągów."
+        many: "Pominięto %{count} duplikatów wyciągów."
+        one: Pominięto 1 duplikat wyciągu.
+        other: "Pominięto %{count} duplikatów wyciągów."
+      invalid_file_type: Prześlij wyciąg w formacie PDF, CSV lub XLSX poniżej limitu rozmiaru.
+      no_files: Wybierz co najmniej jeden plik wyciągu.
+      success:
+        few: "Przesłano %{count} wyciągi."
+        many: "Przesłano %{count} wyciągów."
+        one: Przesłano 1 wyciąg.
+        other: "Przesłano %{count} wyciągów."
+    destroy:
+      failure: Nie można usunąć wyciągu.
+      success: Wyciąg usunięty.
+    form:
+      account_upload: Prześlij wyciąg
+      files_hint: "PDF, CSV lub XLSX. Maks. %{max_size} MB na plik."
+      files_label: Pliki wyciągów
+      inbox_upload: Prześlij
+    index:
+      account_label: Konto
+      confidence: "Zgodność %{confidence}"
+      empty_linked: Brak powiązanych wyciągów.
+      empty_unmatched: Skrzynka odbiorcza wyciągów jest pusta.
+      leave_unmatched: Pozostaw niedopasowane
+      linked_title: Powiązane wyciągi
+      no_suggestion: Brak sugestii
+      storage_used: Użyte miejsce
+      title: Magazyn wyciągów
+      unmatched_title: Niedopasowane
+      upload_description: Prześlij wyciągi do skrzynki odbiorczej lub wybierz konto, aby natychmiast powiązać.
+      upload_title: Prześlij wyciągi
+    link:
+      no_account: Wybierz konto przed powiązaniem tego wyciągu.
+      success: "Powiązano wyciąg z %{account}."
+    period:
+      unknown: Nieznany okres
+    reconciliation:
+      checks:
+        closing_balance: Saldo końcowe
+        opening_balance: Saldo początkowe
+        period_movement: Ruch w okresie
+        unknown_check: Nieznana kontrola
+      matched: Zgodne
+      mismatched: Niezgodne
+      unavailable: Niesprawdzone
+    reject:
+      success: Odrzucono dopasowanie wyciągu.
+    show:
+      account_label: Konto
+      account_last4_hint: Ostatnie cztery cyfry konta
+      account_name_hint: Podpowiedź nazwy konta
+      closing_balance: Saldo końcowe
+      currency: Waluta
+      delete: Usuń
+      difference: Różnica
+      download: Pobierz
+      institution_name_hint: Podpowiedź instytucji
+      ledger_amount: Księga Sure
+      linked_to: "Powiązane z %{account}."
+      linking_title: Powiązanie konta
+      link_suggestion: Sugestia powiązania
+      metadata_title: Metadane wyciągu
+      no_suggestion: Brak sugestii konta.
+      opening_balance: Saldo początkowe
+      period_end_on: Koniec okresu
+      period_start_on: Początek okresu
+      reconciliation_title: Uzgodnienie
+      reconciliation_unavailable: Dodaj okres wyciągu oraz saldo początkowe lub końcowe, a następnie upewnij się, że Sure ma historię sald dla tych dat.
+      reject: Odrzuć
+      save: Zapisz wyciąg
+      statement_amount: Wyciąg
+      suggested_account: "Sugerowane konto to %{account} (ufność: %{confidence})."
+      title: Wyciąg
+      unlink: Odłącz
+      unmatched_account: Niedopasowane
+      unknown_value: Nieznane
+    status:
+      linked: Powiązany
+      rejected: Odrzucony
+      unmatched: Niedopasowany
+    table:
+      account: Konto
+      actions: Akcje
+      download: Pobierz
+      edit: Edytuj
+      file: Plik
+      link_suggestion: Sugestia powiązania
+      period: Okres
+      reconciliation: Uzgodnienie
+      reject: Odrzuć sugestię
+      suggestion: Sugestia
+      unlink: Odłącz
+      view: Podgląd
+    unlink:
+      success: Wyciąg przeniesiono z powrotem do skrzynki odbiorczej.
+    update:
+      success: Wyciąg zaktualizowany.
diff --git a/config/locales/views/account_statements/pt-BR.yml b/config/locales/views/account_statements/pt-BR.yml
new file mode 100644
index 000000000..5a44e1cb7
--- /dev/null
+++ b/config/locales/views/account_statements/pt-BR.yml
@@ -0,0 +1,117 @@
+---
+pt-BR:
+  account_statements:
+    account_tab:
+      coverage_title: Cobertura de extratos
+      coverage_description: Meses históricos respaldados por extratos enviados e verificações de saldo.
+      coverage_range: "%{start} - %{end}"
+      empty: Ainda não há extratos vinculados a esta conta.
+      open_inbox: Caixa de entrada
+      statements_title: Extratos
+      year_label: Ano de cobertura
+    balance:
+      unknown: Desconhecido
+    coverage:
+      status:
+        ambiguous: Ambíguo
+        covered: Coberto
+        duplicate: Duplicado
+        mismatched: Divergente
+        missing: Ausente
+        not_expected: Não esperado
+    create:
+      duplicates:
+        one: 1 extrato duplicado foi ignorado.
+        other: "%{count} extratos duplicados foram ignorados."
+      invalid_file_type: Envie um extrato em PDF, CSV ou XLSX dentro do limite de tamanho.
+      no_files: Selecione pelo menos um arquivo de extrato.
+      success:
+        one: 1 extrato enviado.
+        other: "%{count} extratos enviados."
+    destroy:
+      failure: Não foi possível excluir o extrato.
+      success: Extrato excluído.
+    form:
+      account_upload: Enviar extrato
+      files_hint: PDF, CSV ou XLSX. Máximo de %{max_size} MB por arquivo.
+      files_label: Arquivos de extrato
+      inbox_upload: Enviar
+    index:
+      account_label: Conta
+      confidence: "%{confidence} de correspondência"
+      empty_linked: Ainda não há extratos vinculados.
+      empty_unmatched: A caixa de entrada de extratos está vazia.
+      leave_unmatched: Deixar sem atribuição
+      linked_title: Extratos vinculados
+      no_suggestion: Sem sugestão
+      storage_used: Armazenamento usado
+      title: Cofre de extratos
+      unmatched_title: Caixa de entrada sem atribuição
+      upload_description: Envie extratos para a caixa de entrada ou escolha uma conta para vinculá-los imediatamente.
+      upload_title: Enviar extratos
+    link:
+      no_account: Escolha uma conta antes de vincular este extrato.
+      success: Extrato vinculado a %{account}.
+    period:
+      unknown: Período desconhecido
+    reconciliation:
+      checks:
+        closing_balance: Saldo de fechamento
+        opening_balance: Saldo de abertura
+        period_movement: Movimentação do período
+        unknown_check: Verificação desconhecida
+      matched: Correspondente
+      mismatched: Divergente
+      unavailable: Não verificado
+    reject:
+      success: Correspondência de extrato rejeitada.
+    show:
+      account_label: Conta
+      account_last4_hint: Últimos quatro dígitos da conta
+      account_name_hint: Dica do nome da conta
+      closing_balance: Saldo de fechamento
+      currency: Moeda
+      delete: Excluir
+      difference: Diferença
+      download: Baixar
+      institution_name_hint: Dica da instituição
+      ledger_amount: Registro do Sure
+      linked_to: Vinculado a %{account}.
+      linking_title: Vínculo de conta
+      link_suggestion: Sugestão de vínculo
+      metadata_title: Metadados do extrato
+      no_suggestion: Ainda não há sugestão de conta.
+      opening_balance: Saldo de abertura
+      period_end_on: Fim do período
+      period_start_on: Início do período
+      reconciliation_title: Conciliação
+      reconciliation_unavailable: Adicione um período de extrato e um saldo de abertura ou fechamento e verifique se o Sure tem histórico de saldos para essas datas.
+      reject: Rejeitar
+      save: Salvar extrato
+      statement_amount: Extrato
+      suggested_account: A conta sugerida é %{account} (confiança de %{confidence}).
+      title: Extrato
+      unlink: Desvincular
+      unmatched_account: Caixa de entrada sem atribuição
+      unknown_value: Desconhecido
+    status:
+      linked: Vinculado
+      rejected: Rejeitado
+      unmatched: Sem atribuição
+    table:
+      account: Conta
+      actions: Ações
+      download: Baixar
+      edit: Editar
+      file: Arquivo
+      link_suggestion: Sugestão de vínculo
+      period: Período
+      reconciliation: Conciliação
+      reject: Rejeitar sugestão
+      suggestion: Sugestão
+      unlink: Desvincular
+      view: Visualizar
+    unlink:
+      success: Extrato devolvido à caixa de entrada sem atribuição.
+    update:
+      success: Extrato atualizado.
diff --git a/config/locales/views/account_statements/ru.yml b/config/locales/views/account_statements/ru.yml
new file mode 100644
index 000000000..6a33009f2
--- /dev/null
+++ b/config/locales/views/account_statements/ru.yml
@@ -0,0 +1,125 @@
+---
+ru:
+  account_statements:
+    account_tab:
+      coverage_description: Исторические месяцы, подтвержденные загруженными выписками
+        и проверками баланса.
+      coverage_range: "%{start} - %{end}"
+      coverage_title: Покрытие выписок
+      empty: Пока нет выписок, связанных с этим счётом.
+      open_inbox: Входящие
+      statements_title: Выписки
+      year_label: Год покрытия
+    balance:
+      unknown: Неизвестно
+    coverage:
+      status:
+        ambiguous: Неоднозначно
+        covered: Покрыто
+        duplicate: Дубликат
+        mismatched: Несоответствие
+        missing: Отсутствует
+        not_expected: Не ожидается
+    create:
+      duplicates:
+        few: "%{count} дубликата выписки были пропущены."
+        many: "%{count} дубликатов выписок были пропущены."
+        one: 1 дубликат выписки был пропущен.
+        other: "%{count} дубликата выписки были пропущены."
+      invalid_file_type: Загрузите выписку в формате PDF, CSV или XLSX, не превышающую
+        допустимый размер.
+      no_files: Выберите хотя бы один файл выписки.
+      success:
+        few: "%{count} выписки загружены."
+        many: "%{count} выписок загружено."
+        one: 1 выписка загружена.
+        other: "%{count} выписки загружены."
+    destroy:
+      failure: Не удалось удалить выписку.
+      success: Выписка удалена.
+    form:
+      account_upload: Загрузить выписку
+      files_hint: PDF, CSV или XLSX. Максимум %{max_size}МБ на файл.
+      files_label: Файлы выписок
+      inbox_upload: Загрузить
+    index:
+      account_label: Счёт
+      confidence: "%{confidence} совпадение"
+      empty_linked: Пока нет связанных выписок.
+      empty_unmatched: Входящие выписки пусты.
+      leave_unmatched: Оставить несоответствующие
+      linked_title: Связанные выписки
+      no_suggestion: Нет предложений
+      storage_used: Использовано места
+      title: Хранилище выписок
+      unmatched_title: Несоответствующие входящие
+      upload_description: Загрузите выписки во входящие или выберите счёт для немедленной
+        привязки.
+      upload_title: Загрузить выписки
+    link:
+      no_account: Выберите счёт перед привязкой этой выписки.
+      success: Выписка привязана к %{account}.
+    period:
+      unknown: Период неизвестен
+    reconciliation:
+      checks:
+        closing_balance: Закрывающий баланс
+        opening_balance: Начальный баланс
+        period_movement: Движение за период
+        unknown_check: Неизвестная проверка
+      matched: Совпадает
+      mismatched: Несоответствие
+      unavailable: Не проверено
+    reject:
+      success: Совпадение выписки отклонено.
+    show:
+      account_label: Счёт
+      account_last4_hint: Последние четыре цифры счёта
+      account_name_hint: Подсказка имени счёта
+      closing_balance: Закрывающий баланс
+      currency: Валюта
+      delete: Удалить
+      difference: Разница
+      download: Скачать
+      institution_name_hint: Подсказка учреждения
+      ledger_amount: Книга Sure
+      link_suggestion: Предложение привязки
+      linked_to: Привязано к %{account}.
+      linking_title: Привязка счёта
+      metadata_title: Метаданные выписки
+      no_suggestion: Пока нет предложений счёта.
+      opening_balance: Начальный баланс
+      period_end_on: Конец периода
+      period_start_on: Начало периода
+      reconciliation_title: Сверка
+      reconciliation_unavailable: Добавьте период выписки и начальный или закрывающий
+        баланс, затем убедитесь, что Sure имеет историю баланса за эти даты.
+      reject: Отклонить
+      save: Сохранить выписку
+      statement_amount: Выписка
+      suggested_account: Предлагаемый счёт — %{account} (%{confidence} уверенность).
+      title: Выписка
+      unknown_value: Неизвестно
+      unlink: Отвязать
+      unmatched_account: Несоответствующие входящие
+    status:
+      linked: Привязано
+      rejected: Отклонено
+      unmatched: Несоответствующее
+    table:
+      account: Счёт
+      actions: Действия
+      download: Скачать
+      edit: Редактировать
+      file: Файл
+      link_suggestion: Предложение привязки
+      period: Период
+      reconciliation: Сверка
+      reject: Отклонить предложение
+      suggestion: Предложение
+      unlink: Отвязать
+      view: Просмотр
+    unlink:
+      success: Выписка перемещена обратно в несоответствующие входящие.
+    update:
+      success: Выписка обновлена.
diff --git a/config/locales/views/account_statements/tr.yml b/config/locales/views/account_statements/tr.yml
new file mode 100644
index 000000000..8bea661e3
--- /dev/null
+++ b/config/locales/views/account_statements/tr.yml
@@ -0,0 +1,121 @@
+---
+tr:
+  account_statements:
+    account_tab:
+      coverage_description: Yüklenen ekstreler ve bakiye kontrolleriyle desteklenen
+        geçmiş aylar.
+      coverage_range: "%{start} - %{end}"
+      coverage_title: Ekstre kapsamı
+      empty: Bu hesaba henüz bağlı ekstre yok.
+      open_inbox: Gelen kutusu
+      statements_title: Ekstreler
+      year_label: Kapsam yılı
+    balance:
+      unknown: Bilinmiyor
+    coverage:
+      status:
+        ambiguous: Belirsiz
+        covered: Kapsandı
+        duplicate: Kopya
+        mismatched: Uyuşmuyor
+        missing: Eksik
+        not_expected: Beklenmiyor
+    create:
+      duplicates:
+        one: 1 kopya ekstre atlandı.
+        other: "%{count} kopya ekstre atlandı."
+      invalid_file_type: Boyut sınırının altında bir PDF, CSV veya XLSX ekstre yükleyin.
+      no_files: En az bir ekstre dosyası seçin.
+      success:
+        one: 1 ekstre yüklendi.
+        other: "%{count} ekstre yüklendi."
+    destroy:
+      failure: Ekstre silinemedi.
+      success: Ekstre silindi.
+    form:
+      account_upload: Ekstre yükle
+      files_hint: PDF, CSV veya XLSX. Dosya başına en fazla %{max_size}MB.
+      files_label: Ekstre dosyaları
+      inbox_upload: Yükle
+    index:
+      account_label: Hesap
+      confidence: "%{confidence} eşleşme"
+      empty_linked: Henüz bağlı ekstre yok.
+      empty_unmatched: Ekstre gelen kutusu temiz.
+      leave_unmatched: Eşleşmemiş bırak
+      linked_title: Bağlı ekstreler
+      no_suggestion: Öneri yok
+      storage_used: Kullanılan depolama
+      title: Ekstre Kasası
+      unmatched_title: Eşleşmemiş gelen kutusu
+      upload_description: Ekstreleri gelen kutusuna yükleyin veya hemen bağlamak için
+        bir hesap seçin.
+      upload_title: Ekstreleri yükle
+    link:
+      no_account: Bu ekstreyi bağlamadan önce bir hesap seçin.
+      success: Ekstre %{account} hesabına bağlandı.
+    period:
+      unknown: Dönem bilinmiyor
+    reconciliation:
+      checks:
+        closing_balance: Kapanış bakiyesi
+        opening_balance: Açılış bakiyesi
+        period_movement: Dönem hareketi
+        unknown_check: Bilinmeyen kontrol
+      matched: Eşleşti
+      mismatched: Uyuşmuyor
+      unavailable: Kontrol edilmedi
+    reject:
+      success: Ekstre eşleşmesi reddedildi.
+    show:
+      account_label: Hesap
+      account_last4_hint: Hesabın son dört hanesi
+      account_name_hint: Hesap adı ipucu
+      closing_balance: Kapanış bakiyesi
+      currency: Para Birimi
+      delete: Sil
+      difference: Fark
+      download: İndir
+      institution_name_hint: Kurum ipucu
+      ledger_amount: Sure defteri
+      link_suggestion: Bağlama önerisi
+      linked_to: "%{account} hesabına bağlandı."
+      linking_title: Hesap bağlantısı
+      metadata_title: Ekstre meta verisi
+      no_suggestion: Henüz hesap önerisi yok.
+      opening_balance: Açılış bakiyesi
+      period_end_on: Dönem bitişi
+      period_start_on: Dönem başlangıcı
+      reconciliation_title: Mutabakat
+      reconciliation_unavailable: Bir ekstre dönemi ile açılış veya kapanış bakiyesi
+        ekleyin, ardından Sure'un bu tarihler için bakiye geçmişine sahip olduğundan
+        emin olun.
+      reject: Reddet
+      save: Ekstreyi kaydet
+      statement_amount: Ekstre
+      suggested_account: Önerilen hesap %{account} (%{confidence} güven).
+      title: Ekstre
+      unknown_value: Bilinmiyor
+      unlink: Bağlantıyı kaldır
+      unmatched_account: Eşleşmemiş gelen kutusu
+    status:
+      linked: Bağlı
+      rejected: Reddedildi
+      unmatched: Eşleşmemiş
+    table:
+      account: Hesap
+      actions: İşlemler
+      download: İndir
+      edit: Düzenle
+      file: Dosya
+      link_suggestion: Bağlama önerisi
+      period: Dönem
+      reconciliation: Mutabakat
+      reject: Öneriyi reddet
+      suggestion: Öneri
+      unlink: Bağlantıyı kaldır
+      view: Görüntüle
+    unlink:
+      success: Ekstre eşleşmemiş gelen kutusuna geri taşındı.
+    update:
+      success: Ekstre güncellendi.
diff --git a/config/locales/views/account_statements/vi.yml b/config/locales/views/account_statements/vi.yml
index 709ca0c45..b68ed162b 100644
--- a/config/locales/views/account_statements/vi.yml
+++ b/config/locales/views/account_statements/vi.yml
@@ -102,6 +102,7 @@ vi:
       account: Tài khoản
       actions: Hành động
       download: Tải xuống
+      edit: Chỉnh sửa
       file: Tệp
       link_suggestion: Gợi ý liên kết
       period: Kỳ
diff --git a/config/locales/views/account_statements/zh-CN.yml b/config/locales/views/account_statements/zh-CN.yml
index 73e27a513..96001b493 100644
--- a/config/locales/views/account_statements/zh-CN.yml
+++ b/config/locales/views/account_statements/zh-CN.yml
@@ -102,6 +102,7 @@ zh-CN:
       account: 账户
       actions: 操作
       download: 下载
+      edit: 编辑
       file: 文件
       link_suggestion: 关联建议
       period: 周期
diff --git a/config/locales/views/accounts/ca.yml b/config/locales/views/accounts/ca.yml
index ed1919ea0..0b7486259 100644
--- a/config/locales/views/accounts/ca.yml
+++ b/config/locales/views/accounts/ca.yml
@@ -59,6 +59,7 @@ ca:
       opening_balance_date_label: Data del saldo inicial
     index:
       accounts: Comptes
+      cancel_sync: Cancel·la la sincronització
       manual_accounts:
         other_accounts: Altres comptes
       new_account: Nou compte
@@ -146,7 +147,7 @@ ca:
         tipus de canvi històrics, preus de valors i més. Aquestes dades són necessàries
         per calcular saldos històrics precisos dels comptes."
       new_account: Nou compte
-      new_account_group: Nou %{account_group}
+      new_account_group: Afegeix %{account_group}
       new_asset: Nou actiu
       new_debt: Nou deute
       tabs:
diff --git a/config/locales/views/accounts/en.yml b/config/locales/views/accounts/en.yml
index a18a3de41..c5433efe7 100644
--- a/config/locales/views/accounts/en.yml
+++ b/config/locales/views/accounts/en.yml
@@ -16,6 +16,9 @@ en:
       troubleshoot: Troubleshoot
       enable: Enable account
       disable: Disable account
+      exclude_from_reports: Exclude from all reports
+      include_in_reports: Include in reports
+      excluded_from_reports_indicator: Excluded from reports
       set_default: Set as default
       remove_default: Unset default
       default_label: Default
@@ -47,8 +50,12 @@ en:
       institution_domain_placeholder: e.g., chase.com
       notes_label: Notes
       notes_placeholder: Store additional information like account numbers, sort codes, IBAN, routing numbers, etc.
+      exclude_from_reports: Exclude from all reports
+      enable_category_matcher_label: Enable category matcher
+      enable_category_matcher_hint: When enabled, the provider's suggested category is applied to imported transactions. Disable to leave new transactions uncategorized.
     index:
       accounts: Accounts
+      cancel_sync: Cancel sync
       manual_accounts:
         other_accounts: Other accounts
       new_account: New account
@@ -118,6 +125,8 @@ en:
         manage: Manage accounts
         sharing: Sharing
         statements: Statements
+        exclude_from_reports: Exclude from all reports
+        include_in_reports: Include in reports
     update:
       success: "%{type} account updated"
     sidebar:
diff --git a/config/locales/views/accounts/fr.yml b/config/locales/views/accounts/fr.yml
index 6c153edcb..f2c3e850a 100644
--- a/config/locales/views/accounts/fr.yml
+++ b/config/locales/views/accounts/fr.yml
@@ -1,67 +1,91 @@
 ---
 fr:
+  account:
+    entries:
+      destroy:
+        success: Entrée supprimée avec succès.
   accounts:
-    not_authorized: "Vous n'avez pas la permission de gérer ce compte"
     account:
-      edit: Modifier
-      link_lunchflow: Lier avec Lunch Flow
-      link_provider: Lier avec un fournisseur
-      unlink_provider: Délier du fournisseur
       change_simplefin_account: Changer le compte SimpleFIN
-      troubleshoot: Dépannage
-      enable: Activer le compte
-      disable: Désactiver le compte
-      set_default: Définir par défaut
-      remove_default: Retirer par défaut
+      complete_setup: Configuration complète
       default_label: Par défaut
       delete: Supprimer le compte
+      disable: Désactiver le compte
+      edit: Modifier
+      enable: Activer le compte
+      exclude_from_reports: Exclure de tous les rapports
+      excluded_from_reports_indicator: Exclu des rapports
+      include_in_reports: Inclure dans les rapports
+      link_lunchflow: Lier avec Lunch Flow
+      link_provider: Lier avec un fournisseur
+      remove_default: Retirer par défaut
+      set_default: Définir par défaut
       sharing: Partage
+      troubleshoot: Dépannage
+      unlink_provider: Délier du fournisseur
     chart:
       data_not_available: Données non disponibles pour la période sélectionnée
+    confirm_unlink:
+      confirm_button: Confirmer et délier
+      description_html: Vous êtes sur le point de délier <strong>%{account_name}</strong> de <strong>%{provider_name}</strong>. Cela le convertira en compte manuel.
+      title: Délier le compte du fournisseur ?
+      warning_can_delete: Après la déliaison, vous pourrez supprimer le compte si nécessaire
+      warning_manual_updates: Vous devrez ajouter des transactions et mettre à jour les soldes manuellement
+      warning_no_sync: Le compte ne se synchronisera plus automatiquement avec votre fournisseur
+      warning_title: Ce que cela signifie
+      warning_transactions_kept: Toutes les transactions et soldes existants seront conservés
     create:
-      success: "Compte %{type} créé"
-    set_default:
-      depository_only: "Seuls les comptes de liquidités et de carte de crédit peuvent être définis par défaut."
+      success: Compte %{type} créé
     destroy:
-      success: "Le compte %{type} a été préparé à la suppression"
-      cannot_delete_linked: "Impossible de supprimer un compte lié. Veuillez d'abord le délier."
-      failed: "La suppression de la ressource a échoué. Veuillez réessayer plus tard."
+      cannot_delete_linked: Impossible de supprimer un compte lié. Veuillez d'abord le délier.
+      failed: La suppression de la ressource a échoué. Veuillez réessayer plus tard.
+      success: Le compte %{type} a été préparé à la suppression
     empty:
       empty_message: Ajoutez un compte via une connexion, une importation ou en entrant manuellement.
       new_account: Nouveau compte
       no_accounts: Aucun compte pour l'instant
     form:
-      balance: "Solde à la date :"
-      opening_balance_date_label: Date du solde d'ouverture
-      name_label: Nom du compte
-      name_placeholder: Nom de compte d'exemple
       additional_details: Détails supplémentaires
-      institution_name_label: Nom de l'institution
-      institution_name_placeholder: ex., Banque Populaire
+      balance: 'Solde à la date :'
+      exclude_from_reports: Exclure de tous les rapports
       institution_domain_label: Domaine de l'institution
       institution_domain_placeholder: ex., banquepopulaire.fr
+      institution_name_label: Nom de l'institution
+      institution_name_placeholder: ex., Banque Populaire
+      name_label: Nom du compte
+      name_placeholder: Nom de compte d'exemple
       notes_label: Notes
       notes_placeholder: Stockez des informations supplémentaires comme les numéros de compte, codes de tri, IBAN, numéros de routage, etc.
+      opening_balance_date_label: Date du solde d'ouverture
     index:
       accounts: Comptes
       manual_accounts:
         other_accounts: Autres comptes
       new_account: Nouveau compte
       sync: Tout synchroniser
-    sync_all:
-      syncing: "Synchronisation des comptes…"
     new:
+      container:
+        close: Fermer
+        navigate: Naviguer
+        select: Sélectionnez
       import_accounts: Importer des comptes
       method_selector:
         connected_entry: Lier un compte
         connected_entry_eu: Lier un compte européen
-        link_with_provider: "Lier avec %{provider}"
+        link_with_provider: Lier avec %{provider}
         lunchflow_entry: Lier un compte Lunch Flow
         manual_entry: Saisir le solde du compte
         title: Comment voulez-vous l'ajouter ?
       title: Que voulez-vous ajouter ?
+    not_authorized: Vous n'avez pas la permission de gérer ce compte
+    select_provider:
+      already_linked: Le compte est déjà lié à un fournisseur
+      description: Choisissez le fournisseur que vous souhaitez utiliser pour lier %{account_name}
+      no_providers: Aucun fournisseur n'est actuellement configuré
+      title: Sélectionner un fournisseur à lier
+    set_default:
+      depository_only: Seuls les comptes de liquidités et de carte de crédit peuvent être définis par défaut.
     show:
-      limited_fx_history_warning: "L'historique des taux de change n'est disponible qu'à partir du %{date}. Les transactions antérieures à cette date utilisent des conversions de devises approximatives — cela peut se produire lorsque le fournisseur FX n'offre qu'une fenêtre historique limitée."
       activity:
         amount: Montant
         balance: Solde
@@ -80,82 +104,93 @@ fr:
         pending: En attente
         search:
           placeholder: Rechercher des entrées par nom
+        search_placeholder: Rechercher des entrées par nom
         status: Statut
         title: Activité
       chart:
         balance: Solde
         owed: Montant dû
+      header:
+        complete_setup: Configuration complète
+      limited_fx_history_warning: L'historique des taux de change n'est disponible qu'à partir du %{date}. Les transactions antérieures à cette date utilisent des conversions de devises approximatives — cela peut se produire lorsque le fournisseur FX n'offre qu'une fenêtre historique limitée.
       menu:
         confirm_accept: Supprimer "%{name}"
-        confirm_body_html: "<p>En supprimant ce compte, vous effacerez son historique de valeur,
-          affectant divers aspects de votre solde global. Cette action aura un impact direct sur vos calculs de valeur nette et les graphiques des comptes.</p><br /> <p>Après la suppression, il n'y a aucun moyen de restaurer l'information du compte car vous aurez besoin d'en ajouter un nouveau.</p>"
+        confirm_body_html: "<p>En supprimant ce compte, vous effacerez son historique de valeur, affectant divers aspects de votre solde global. Cette action aura un impact direct sur vos calculs de valeur nette et les graphiques des comptes.</p><br /> <p>Après la suppression, il n'y a aucun moyen de restaurer l'information du compte car vous aurez besoin d'en ajouter un nouveau.</p>"
         confirm_title: Supprimer le compte ?
+        delete_account: Supprimer le compte
         edit: Modifier
+        exclude_from_reports: Exclure de tous les rapports
         import: Importer des transactions
         import_trades: Importer des transactions boursières
         import_transactions: Importer des transactions
+        include_in_reports: Inclure dans les rapports
         manage: Gérer les comptes
-    update:
-      success: "Compte %{type} mis à jour"
+        sharing: Partage
+        statements: Déclarations
+      tabs:
+        activity: Activité
+        holdings: Holdings
+        overview: Aperçu
+        statements: Déclarations
     sidebar:
+      configure_providers: Configurez vos fournisseurs ici.
       missing_data: Données historiques manquantes
       missing_data_description: "%{product} utilise des fournisseurs tiers pour récupérer l'historique des taux de change, des cours des titres, etc. Ces données sont nécessaires au calcul précis des soldes historiques des comptes."
-      configure_providers: Configurez vos fournisseurs ici.
+      new_account: Nouveau compte
+      new_account_group: Nouveau %{account_group}
+      new_asset: Nouvel actif
+      new_debt: Nouvelle dette
       tabs:
         all: Tout
         assets: Actifs
         debts: Dettes
-      new_asset: Nouvel actif
-      new_debt: Nouvelle dette
-      new_account: Nouveau compte
-      new_account_group: "Nouveau %{account_group}"
-    types:
-      depository: Liquidités
-      investment: Investissement
-      crypto: Crypto
-      property: Bien immobilier
-      vehicle: Véhicule
-      other_asset: Autre actif
-      credit_card: Carte de crédit
-      loan: Prêt
-      other_liability: Autre passif
-    tax_treatments:
-      taxable: Imposable
-      tax_deferred: Imposition différée
-      tax_exempt: Exonéré d'impôt
-      tax_advantaged: Fiscalement avantagé
-    tax_treatment_descriptions:
-      taxable: Gains imposés lors de leur réalisation
-      tax_deferred: Contributions déductibles, imposées au retrait
-      tax_exempt: Contributions après impôt, gains non imposés
-      tax_advantaged: Avantages fiscaux particuliers sous conditions
     subtype_regions:
-      us: États-Unis
-      uk: Royaume-Uni
-      ca: Canada
       au: Australie
+      ca: Canada
       eu: Europe
       generic: Général
-    confirm_unlink:
-      title: Délier le compte du fournisseur ?
-      description_html: "Vous êtes sur le point de délier <strong>%{account_name}</strong> de <strong>%{provider_name}</strong>. Cela le convertira en compte manuel."
-      warning_title: Ce que cela signifie
-      warning_no_sync: Le compte ne se synchronisera plus automatiquement avec votre fournisseur
-      warning_manual_updates: Vous devrez ajouter des transactions et mettre à jour les soldes manuellement
-      warning_transactions_kept: Toutes les transactions et soldes existants seront conservés
-      warning_can_delete: Après la déliaison, vous pourrez supprimer le compte si nécessaire
-      confirm_button: Confirmer et délier
+      in: Inde
+      uk: Royaume-Uni
+      us: États-Unis
+    sync_all:
+      syncing: Synchronisation des comptes…
+    tax_treatment_descriptions:
+      tax_advantaged: Avantages fiscaux particuliers sous conditions
+      tax_deferred: Contributions déductibles, imposées au retrait
+      tax_exempt: Contributions après impôt, gains non imposés
+      taxable: Gains imposés lors de leur réalisation
+    tax_treatments:
+      tax_advantaged: Fiscalement avantagé
+      tax_deferred: Imposition différée
+      tax_exempt: Exonéré d'impôt
+      taxable: Imposable
+    types:
+      credit_card: Carte de crédit
+      crypto: Crypto
+      depository: Liquidités
+      investment: Investissement
+      loan: Prêt
+      other_asset: Autre actif
+      other_liability: Autre passif
+      property: Bien immobilier
+      vehicle: Véhicule
+    types_plural:
+      credit_card: Cartes de crédit
+      crypto: Cryptomonnaies
+      depository: Espèces
+      investment: Investissements
+      loan: Prêts
+      other_asset: Autres actifs
+      other_liability: Autres passifs
+      property: Propriétés
+      vehicle: Véhicules
     unlink:
-      success: "Compte délié avec succès. C'est maintenant un compte manuel."
-      not_linked: "Le compte n'est pas lié à un fournisseur"
-      error: "Échec de la déliaison du compte : %{error}"
-      generic_error: "Une erreur inattendue s'est produite. Veuillez réessayer."
-    select_provider:
-      title: Sélectionner un fournisseur à lier
-      description: "Choisissez le fournisseur que vous souhaitez utiliser pour lier %{account_name}"
-      already_linked: "Le compte est déjà lié à un fournisseur"
-      no_providers: "Aucun fournisseur n'est actuellement configuré"
-
+      error: 'Échec de la déliaison du compte : %{error}'
+      generic_error: Une erreur inattendue s'est produite. Veuillez réessayer.
+      not_linked: Le compte n'est pas lié à un fournisseur
+      success: Compte délié avec succès. C'est maintenant un compte manuel.
+    update:
+      success: Compte %{type} mis à jour
   email_confirmations:
     new:
       invalid_token: Lien de confirmation invalide ou expiré.
diff --git a/config/locales/views/accounts/it.yml b/config/locales/views/accounts/it.yml
new file mode 100644
index 000000000..c847aaf18
--- /dev/null
+++ b/config/locales/views/accounts/it.yml
@@ -0,0 +1,198 @@
+---
+it:
+  account:
+    entries:
+      destroy:
+        success: "Voce eliminata con successo."
+  accounts:
+    not_authorized: "Non hai i permessi per gestire questo conto"
+    account:
+      complete_setup: Completa configurazione
+      edit: Modifica
+      link_lunchflow: Collega con Lunch Flow
+      link_provider: Collega con provider
+      unlink_provider: Scollega dal provider
+      change_simplefin_account: Cambia conto SimpleFIN
+      troubleshoot: Risoluzione problemi
+      enable: Abilita conto
+      disable: Disabilita conto
+      exclude_from_reports: Escludi da tutti i report
+      include_in_reports: Includi nei report
+      excluded_from_reports_indicator: Escluso dai report
+      set_default: Imposta come predefinito
+      remove_default: Rimuovi predefinito
+      default_label: Predefinito
+      delete: Elimina conto
+      sharing: Condivisione
+    chart:
+      data_not_available: Dati non disponibili per il periodo selezionato
+    create:
+      success: "Conto %{type} creato"
+    set_default:
+      depository_only: "Solo i conti correnti e le carte di credito possono essere impostati come predefiniti."
+    destroy:
+      success: "Conto %{type} pianificato per l'eliminazione"
+      cannot_delete_linked: "Impossibile eliminare un conto collegato. Prima scollega il provider."
+      failed: "Eliminazione della risorsa fallita. Riprova più tardi."
+    empty:
+      empty_message: Aggiungi un conto tramite connessione, importazione o inserimento manuale.
+      new_account: Nuovo conto
+      no_accounts: Nessun conto ancora
+    form:
+      balance: "Saldo alla data:"
+      opening_balance_date_label: Data saldo iniziale
+      name_label: Nome conto
+      name_placeholder: Nome conto di esempio
+      additional_details: Dettagli aggiuntivi
+      institution_name_label: Nome istituzione
+      institution_name_placeholder: es. Banca Intesa
+      institution_domain_label: Dominio istituzione
+      institution_domain_placeholder: es. intesasanpaolo.com
+      notes_label: Note
+      notes_placeholder: Conserva informazioni aggiuntive come numeri di conto, IBAN, codici ABI/CAB, ecc.
+      exclude_from_reports: Escludi da tutti i report
+    index:
+      accounts: Conti
+      manual_accounts:
+        other_accounts: Altri conti
+      new_account: Nuovo conto
+      sync: Sincronizza tutti
+    sync_all:
+      syncing: "Sincronizzazione conti in corso..."
+    new:
+      import_accounts: Importa conti
+      container:
+        select: Seleziona
+        navigate: Naviga
+        close: Chiudi
+      method_selector:
+        connected_entry: Collega conto
+        connected_entry_eu: Collega conto EU
+        link_with_provider: "Collega con %{provider}"
+        lunchflow_entry: Collega conto Lunch Flow
+        manual_entry: Inserisci saldo conto
+        title: Come vuoi aggiungerlo?
+      title: Cosa vuoi aggiungere?
+    show:
+      limited_fx_history_warning: "La cronologia dei tassi di cambio è disponibile solo dal %{date} in poi. Le transazioni precedenti a questa data usano conversioni valutarie approssimate — questo può accadere quando il provider FX offre solo una finestra storica limitata."
+      tabs:
+        activity: Attività
+        holdings: Portafoglio
+        overview: Panoramica
+        statements: Estratti conto
+      activity:
+        amount: Importo
+        balance: Saldo
+        confirmed: Confermato
+        date: Data
+        entries: voci
+        entry: voce
+        filter: Filtra
+        new: Nuovo
+        new_activity: Nuova attività
+        new_balance: Nuovo saldo
+        new_trade: Nuova operazione
+        new_transaction: Nuova transazione
+        new_transfer: Nuovo bonifico
+        no_entries: Nessuna voce trovata
+        pending: In attesa
+        search:
+          placeholder: Cerca voci per nome
+        search_placeholder: Cerca voci per nome
+        status: Stato
+        title: Attività
+      chart:
+        balance: Saldo
+        owed: Importo dovuto
+      header:
+        complete_setup: Completa configurazione
+      menu:
+        confirm_accept: Elimina "%{name}"
+        confirm_body_html: "<p>Eliminando questo conto, cancellerai la sua cronologia del valore, influenzando vari aspetti del tuo conto complessivo. Questa azione avrà un impatto diretto sui tuoi calcoli del patrimonio netto e sui grafici del conto.</p><br /> <p>Dopo l'eliminazione, non potrai ripristinare le informazioni del conto perché dovrai aggiungerlo come nuovo conto.</p>"
+        confirm_title: Eliminare il conto?
+        delete_account: Elimina conto
+        edit: Modifica
+        exclude_from_reports: Escludi da tutti i report
+        include_in_reports: Includi nei report
+        import: Importa transazioni
+        import_trades: Importa operazioni
+        import_transactions: Importa transazioni
+        manage: Gestisci conti
+        sharing: Condivisione
+        statements: Estratti conto
+    update:
+      success: "Conto %{type} aggiornato"
+    sidebar:
+      missing_data: Dati storici mancanti
+      missing_data_description: "%{product} utilizza provider di terze parti per recuperare tassi di cambio storici, prezzi dei titoli e altro. Questi dati sono necessari per calcolare i saldi storici accurati del conto."
+      configure_providers: Configura i tuoi provider qui.
+      tabs:
+        all: Tutti
+        assets: Attività
+        debts: Passività
+      new_asset: Nuova attività
+      new_debt: Nuova passività
+      new_account: Nuovo conto
+      new_account_group: "Nuovo %{account_group}"
+    types:
+      depository: Liquidità
+      investment: Investimento
+      crypto: Crypto
+      property: Proprietà
+      vehicle: Veicolo
+      other_asset: Altro asset
+      credit_card: Carta di credito
+      loan: Prestito
+      other_liability: Altra passività
+    types_plural:
+      depository: Liquidità
+      investment: Investimenti
+      crypto: Crypto
+      property: Proprietà
+      vehicle: Veicoli
+      other_asset: Altri asset
+      credit_card: Carte di credito
+      loan: Prestiti
+      other_liability: Altre passività
+    tax_treatments:
+      taxable: Imponibile
+      tax_deferred: Fiscalmente differito
+      tax_exempt: Esente da imposte
+      tax_advantaged: Fiscalmente agevolato
+    tax_treatment_descriptions:
+      taxable: Plusvalenze tassate alla realizzazione
+      tax_deferred: Contributi deducibili, tassati al prelievo
+      tax_exempt: Contributi al netto delle imposte, plusvalenze non tassate
+      tax_advantaged: Benefici fiscali speciali con condizioni
+    subtype_regions:
+      us: Stati Uniti
+      uk: Regno Unito
+      ca: Canada
+      au: Australia
+      eu: Europa
+      in: India
+      generic: Generale
+    confirm_unlink:
+      title: Scollegare il conto dal provider?
+      description_html: "Stai per scollegare <strong>%{account_name}</strong> da <strong>%{provider_name}</strong>. Questo lo convertirà in un conto manuale."
+      warning_title: Cosa significa
+      warning_no_sync: Il conto non si sincronizzerà più automaticamente con il tuo provider
+      warning_manual_updates: Dovrai aggiungere transazioni e aggiornare i saldi manualmente
+      warning_transactions_kept: Tutte le transazioni e i saldi esistenti verranno conservati
+      warning_can_delete: Dopo lo scollegamento, potrai eliminare il conto se necessario
+      confirm_button: Conferma e scollega
+    unlink:
+      success: "Conto scollegato con successo. È ora un conto manuale."
+      not_linked: "Il conto non è collegato a nessun provider"
+      error: "Impossibile scollegare il conto: %{error}"
+      generic_error: "Si è verificato un errore imprevisto. Riprova."
+    select_provider:
+      title: Seleziona un provider da collegare
+      description: "Scegli quale provider vuoi usare per collegare %{account_name}"
+      already_linked: "Il conto è già collegato a un provider"
+      no_providers: "Nessun provider attualmente configurato"
+
+  email_confirmations:
+    new:
+      invalid_token: Link di conferma non valido o scaduto.
+      success_login: La tua email è stata confermata. Accedi con il tuo nuovo indirizzo email.
diff --git a/config/locales/views/accounts/ru.yml b/config/locales/views/accounts/ru.yml
new file mode 100644
index 000000000..dbee888bb
--- /dev/null
+++ b/config/locales/views/accounts/ru.yml
@@ -0,0 +1,212 @@
+---
+ru:
+  account:
+    entries:
+      destroy:
+        success: Запись успешно удалена.
+  accounts:
+    account:
+      change_simplefin_account: Изменить счёт SimpleFIN
+      complete_setup: Завершить настройку
+      default_label: По умолчанию
+      delete: Удалить счёт
+      disable: Отключить счёт
+      edit: Редактировать
+      enable: Включить счёт
+      exclude_from_reports: Исключить из всех отчётов
+      excluded_from_reports_indicator: Исключено из отчётов
+      include_in_reports: Включить в отчёты
+      link_lunchflow: Связать с Lunch Flow
+      link_provider: Связать с провайдером
+      remove_default: Снять с умолчания
+      set_default: Установить по умолчанию
+      sharing: Совместное использование
+      troubleshoot: Устранение неполадок
+      unlink_provider: Отвязать от провайдера
+    chart:
+      data_not_available: Данные недоступны за выбранный период
+    confirm_unlink:
+      confirm_button: Подтвердить и отвязать
+      description_html: Вы собираетесь отвязать <strong>%{account_name}</strong> от
+        <strong>%{provider_name}</strong>. Это превратит его в ручной счёт.
+      title: Отвязать счёт от провайдера?
+      warning_can_delete: После отвязки вы сможете удалить счёт, если это необходимо
+      warning_manual_updates: Вам нужно будет добавлять операции и обновлять балансы
+        вручную
+      warning_no_sync: Счёт больше не будет автоматически синхронизироваться с вашим
+        провайдером
+      warning_title: Что это значит
+      warning_transactions_kept: Все существующие операции и балансы будут сохранены
+    create:
+      success: Счёт %{type} создан
+    destroy:
+      cannot_delete_linked: Невозможно удалить связанный счёт. Пожалуйста, сначала
+        отвяжите его.
+      failed: Не удалось удалить ресурс. Попробуйте позже.
+      success: Счёт %{type} запланирован на удаление
+    empty:
+      empty_message: Добавьте счёт через подключение, импорт или ввод вручную.
+      new_account: Новый счёт
+      no_accounts: Пока нет счетов
+    form:
+      additional_details: Дополнительные детали
+      balance: 'Баланс на дату:'
+      exclude_from_reports: Исключить из всех отчётов
+      institution_domain_label: Домен учреждения
+      institution_domain_placeholder: например, sberbank.ru
+      institution_name_label: Название учреждения
+      institution_name_placeholder: например, Сбербанк
+      name_label: Название счёта
+      name_placeholder: Пример названия счёта
+      notes_label: Заметки
+      notes_placeholder: Сохраните дополнительную информацию, такую как номера счетов,
+        коды сортировки, IBAN, маршрутизационные номера и т.д.
+      opening_balance_date_label: Дата начального баланса
+    index:
+      accounts: Счета
+      manual_accounts:
+        other_accounts: Другие счета
+      new_account: Новый счёт
+      sync: Синхронизировать все
+    new:
+      container:
+        close: Закрыть
+        navigate: Перейти
+        select: Выбрать
+      import_accounts: Импортировать счета
+      method_selector:
+        connected_entry: Связать счёт
+        connected_entry_eu: Связать счёт ЕС
+        link_with_provider: Связать с %{provider}
+        lunchflow_entry: Связать счёт Lunch Flow
+        manual_entry: Ввести баланс счёта
+        title: Как вы хотите добавить это?
+      title: Что вы хотите добавить?
+    not_authorized: У вас нет прав для управления этим счётом
+    select_provider:
+      already_linked: Счёт уже связан с провайдером
+      description: Выберите, какого провайдера вы хотите использовать для связи %{account_name}
+      no_providers: В настоящее время провайдеры не настроены
+      title: Выберите провайдера для связи
+    set_default:
+      depository_only: Только наличные и кредитные счета могут быть установлены по
+        умолчанию.
+    show:
+      activity:
+        amount: Сумма
+        balance: Баланс
+        confirmed: Подтверждено
+        date: Дата
+        entries: записи
+        entry: запись
+        filter: Фильтр
+        new: Новая
+        new_activity: Новая активность
+        new_balance: Новый баланс
+        new_trade: Новая сделка
+        new_transaction: Новая операция
+        new_transfer: Новый перевод
+        no_entries: Записи не найдены
+        pending: В ожидании
+        search:
+          placeholder: Поиск записей по названию
+        search_placeholder: Поиск записей по названию
+        status: Статус
+        title: Активность
+      chart:
+        balance: Баланс
+        owed: Сумма задолженности
+      header:
+        complete_setup: Завершить настройку
+      limited_fx_history_warning: История обменных курсов доступна только с %{date}.
+        Операции до этой даты используют приблизительные валютные конверсии — это
+        может произойти, когда провайдер FX предлагает ограниченное историческое окно.
+      menu:
+        confirm_accept: Удалить "%{name}"
+        confirm_body_html: "<p>Удаляя этот счёт, вы стираете его историю значений,
+          что повлияет на различные аспекты вашего общего счёта. Это действие напрямую
+          повлияет на расчёты вашего собственного капитала и графики счёта.</p><br
+          /> <p>После удаления вы не сможете восстановить информацию о счёте, так
+          как вам нужно будет добавить его как новый счёт.</p>"
+        confirm_title: Удалить счёт?
+        delete_account: Удалить счёт
+        edit: Редактировать
+        exclude_from_reports: Исключить из всех отчётов
+        import: Импортировать операции
+        import_trades: Импортировать сделки
+        import_transactions: Импортировать операции
+        include_in_reports: Включить в отчёты
+        manage: Управление счетами
+        sharing: Совместное использование
+        statements: Выписки
+      tabs:
+        activity: Активность
+        holdings: Активы
+        overview: Обзор
+        statements: Выписки
+    sidebar:
+      configure_providers: Настройте ваших провайдеров здесь.
+      missing_data: Отсутствуют исторические данные
+      missing_data_description: "%{product} использует сторонних провайдеров для получения
+        исторических обменных курсов, цен на ценные бумаги и прочего. Эти данные необходимы
+        для точного расчёта исторических балансов счетов."
+      new_account: Новый счёт
+      new_account_group: Новая %{account_group}
+      new_asset: Новый актив
+      new_debt: Новый долг
+      tabs:
+        all: Все
+        assets: Активы
+        debts: Долги
+    subtype_regions:
+      au: Австралия
+      ca: Канада
+      eu: Европа
+      generic: Общий
+      in: Индия
+      uk: Великобритания
+      us: Соединённые Штаты
+    sync_all:
+      syncing: Синхронизация счетов...
+    tax_treatment_descriptions:
+      tax_advantaged: Специальные налоговые льготы с условиями
+      tax_deferred: Взносы вычитаются, облагаются налогом при снятии
+      tax_exempt: Взносы после налогообложения, доходы не облагаются налогом
+      taxable: Доходы облагаются налогом при реализации
+    tax_treatments:
+      tax_advantaged: Налоговые льготы
+      tax_deferred: Отложенный налог
+      tax_exempt: Не облагаемый налогом
+      taxable: Облагаемый налогом
+    types:
+      credit_card: Кредитная карта
+      crypto: Крипто
+      depository: Наличность
+      investment: Инвестиция
+      loan: Кредит
+      other_asset: Другой актив
+      other_liability: Другое обязательство
+      property: Недвижимость
+      vehicle: Транспорт
+    types_plural:
+      credit_card: Кредитные карты
+      crypto: Крипто
+      depository: Наличные
+      investment: Инвестиции
+      loan: Кредиты
+      other_asset: Другие активы
+      other_liability: Другие обязательства
+      property: Недвижимость
+      vehicle: Транспорт
+    unlink:
+      error: 'Не удалось отвязать счёт: %{error}'
+      generic_error: Произошла непредвиденная ошибка. Пожалуйста, попробуйте снова.
+      not_linked: Счёт не связан с провайдером
+      success: Счёт успешно отвязан. Теперь это ручной счёт.
+    update:
+      success: Счёт %{type} обновлён
+  email_confirmations:
+    new:
+      invalid_token: Неверная или истекшая ссылка подтверждения.
+      success_login: Ваш email подтверждён. Пожалуйста, войдите с вашим новым адресом
+        электронной почты.
diff --git a/config/locales/views/accounts/tr.yml b/config/locales/views/accounts/tr.yml
index daee9867b..c22359f63 100644
--- a/config/locales/views/accounts/tr.yml
+++ b/config/locales/views/accounts/tr.yml
@@ -1,62 +1,216 @@
 ---
 tr:
+  account:
+    entries:
+      destroy:
+        success: Kayıt başarıyla silindi.
   accounts:
     account:
+      change_simplefin_account: SimpleFIN hesabını değiştir
+      complete_setup: Kurulumu tamamla
+      default_label: Varsayılan
+      delete: Hesabı sil
+      disable: Hesabı devre dışı bırak
+      edit: Düzenle
+      enable: Hesabı etkinleştir
+      exclude_from_reports: Tüm raporlardan hariç tut
+      excluded_from_reports_indicator: Raporlardan hariç tutuldu
+      include_in_reports: Raporlara dahil et
+      link_lunchflow: Lunch Flow ile bağla
+      link_provider: Sağlayıcı ile bağla
+      remove_default: Varsayılanı kaldır
+      set_default: Varsayılan olarak ayarla
+      sharing: Paylaşım
       troubleshoot: Sorun Gider
+      unlink_provider: Sağlayıcı ile bağlantıyı kes
     chart:
       data_not_available: Seçilen dönem için veri mevcut değil
+    confirm_unlink:
+      confirm_button: Onayla ve bağlantıyı kes
+      description_html: "<strong>%{account_name}</strong> hesabının <strong>%{provider_name}</strong>
+        ile bağlantısını kesmek üzeresiniz. Bu işlem hesabı manuel bir hesaba dönüştürecektir."
+      title: Hesabın sağlayıcı ile bağlantısı kesilsin mi?
+      warning_can_delete: Bağlantı kesildikten sonra, gerekirse hesabı silebilirsiniz
+      warning_manual_updates: İşlemleri ve bakiyeleri manuel olarak eklemeniz ve güncellemeniz
+        gerekecek
+      warning_no_sync: Hesap artık sağlayıcınızla otomatik olarak senkronize edilmeyecek
+      warning_title: Bunun anlamı
+      warning_transactions_kept: Mevcut tüm işlemler ve bakiyeler korunacaktır
     create:
       success: "%{type} hesabı oluşturuldu"
     destroy:
+      cannot_delete_linked: Bağlı bir hesap silinemez. Lütfen önce bağlantısını kesin.
+      failed: Kaynak silinemedi. Daha sonra tekrar deneyin.
       success: "%{type} hesabı silinmek üzere planlandı"
     empty:
       empty_message: Bir hesabı bağlantı, içe aktarma veya manuel olarak ekleyin.
       new_account: Yeni hesap
       no_accounts: Henüz hesap yok
     form:
+      additional_details: Ek detaylar
       balance: Güncel bakiye
+      enable_category_matcher_hint: Etkinleştirildiğinde, sağlayıcının önerdiği kategori
+        içe aktarılan işlemlere uygulanır. Yeni işlemleri kategorisiz bırakmak için
+        devre dışı bırakın.
+      enable_category_matcher_label: Kategori eşleştiriciyi etkinleştir
+      exclude_from_reports: Tüm raporlardan hariç tut
+      institution_domain_label: Kurum alan adı
+      institution_domain_placeholder: örn. chase.com
+      institution_name_label: Kurum adı
+      institution_name_placeholder: örn. Chase Bank
       name_label: Hesap adı
       name_placeholder: Örnek hesap adı
+      notes_label: Notlar
+      notes_placeholder: Hesap numaraları, sort code, IBAN, routing numarası gibi
+        ek bilgileri saklayın.
+      opening_balance_date_label: Açılış bakiyesi tarihi
     index:
       accounts: Hesaplar
+      cancel_sync: Senkronizasyonu iptal et
       manual_accounts:
         other_accounts: Diğer hesaplar
       new_account: Yeni hesap
       sync: Tümünü senkronize et
     new:
+      container:
+        close: Kapat
+        navigate: Gezin
+        select: Seç
       import_accounts: Hesapları içe aktar
       method_selector:
         connected_entry: Hesabı bağla
         connected_entry_eu: AB hesabı bağla
         link_with_provider: "%{provider} ile bağla"
+        lunchflow_entry: Lunch Flow hesabı bağla
         manual_entry: Hesap bakiyesi gir
         title: Nasıl eklemek istersiniz?
       title: Ne eklemek istersiniz?
+    not_authorized: Bu hesabı yönetme izniniz yok
+    select_provider:
+      already_linked: Hesap zaten bir sağlayıcıya bağlı
+      description: "%{account_name} hesabını bağlamak için kullanmak istediğiniz sağlayıcıyı
+        seçin"
+      no_providers: Şu anda yapılandırılmış sağlayıcı yok
+      title: Bağlamak için bir sağlayıcı seçin
+    set_default:
+      depository_only: Yalnızca nakit ve kredi kartı hesapları varsayılan olarak ayarlanabilir.
     show:
       activity:
         amount: Tutar
         balance: Bakiye
+        confirmed: Onaylandı
         date: Tarih
         entries: girişler
         entry: giriş
+        filter: Filtrele
         new: Yeni
+        new_activity: Yeni aktivite
         new_balance: Yeni bakiye
+        new_trade: Yeni alım satım
         new_transaction: Yeni işlem
+        new_transfer: Yeni transfer
         no_entries: Kayıt bulunamadı
+        pending: Beklemede
+        search:
+          placeholder: Kayıtları isme göre ara
+        search_placeholder: Kayıtları isme göre ara
+        status: Durum
         title: Aktivite
       chart:
         balance: Bakiye
         owed: Borç miktarı
+      header:
+        complete_setup: Kurulumu tamamla
+      limited_fx_history_warning: Döviz kuru geçmişi yalnızca %{date} tarihinden itibaren
+        mevcuttur. Bu tarihten önceki işlemler yaklaşık kur dönüşümleri kullanır —
+        bu durum, döviz sağlayıcısının sınırlı bir geçmiş veri aralığı sunması nedeniyle
+        oluşabilir.
       menu:
         confirm_accept: "%{name} hesabını sil"
-        confirm_body_html: "<p>Bu hesabı silerek, değer geçmişini silmiş olacaksınız ve bu, genel hesabınızın çeşitli yönlerini etkileyecektir. Bu işlem, net değer hesaplamalarınızı ve hesap grafiklerinizi doğrudan etkileyecektir.</p><br /> <p>Silme işleminden sonra, hesabı yeni bir hesap olarak eklemeniz gerekeceğinden, hesap bilgilerini geri yüklemenin bir yolu olmayacaktır.</p>"
+        confirm_body_html: "<p>Bu hesabı silerek, değer geçmişini silmiş olacaksınız
+          ve bu, genel hesabınızın çeşitli yönlerini etkileyecektir. Bu işlem, net
+          değer hesaplamalarınızı ve hesap grafiklerinizi doğrudan etkileyecektir.</p><br
+          /> <p>Silme işleminden sonra, hesabı yeni bir hesap olarak eklemeniz gerekeceğinden,
+          hesap bilgilerini geri yüklemenin bir yolu olmayacaktır.</p>"
         confirm_title: Hesap silinsin mi?
+        delete_account: Hesabı sil
         edit: Düzenle
+        exclude_from_reports: Tüm raporlardan hariç tut
         import: İşlemleri içe aktar
+        import_trades: Alım satımları içe aktar
+        import_transactions: İşlemleri içe aktar
+        include_in_reports: Raporlara dahil et
         manage: Hesapları yönet
+        sharing: Paylaşım
+        statements: Ekstreler
+      tabs:
+        activity: Aktivite
+        holdings: Varlıklar
+        overview: Genel Bakış
+        statements: Ekstreler
+    sidebar:
+      configure_providers: Sağlayıcılarınızı buradan yapılandırın.
+      missing_data: Eksik geçmiş veri
+      missing_data_description: "%{product}, geçmiş döviz kurlarını, menkul kıymet
+        fiyatlarını ve daha fazlasını almak için üçüncü taraf sağlayıcılar kullanır.
+        Bu veriler, doğru geçmiş hesap bakiyelerini hesaplamak için gereklidir."
+      new_account: Yeni hesap
+      new_account_group: Yeni %{account_group}
+      new_asset: Yeni varlık
+      new_debt: Yeni borç
+      tabs:
+        all: Tümü
+        assets: Varlıklar
+        debts: Borçlar
+    subtype_regions:
+      au: Avustralya
+      ca: Kanada
+      eu: Avrupa
+      generic: Genel
+      in: Hindistan
+      uk: Birleşik Krallık
+      us: Amerika Birleşik Devletleri
+    sync_all:
+      syncing: Hesaplar senkronize ediliyor...
+    tax_treatment_descriptions:
+      tax_advantaged: Koşullu özel vergi avantajları
+      tax_deferred: Katkılar vergiden düşülebilir, çekilirken vergilendirilir
+      tax_exempt: Katkılar vergi sonrası yapılır, kazançlar vergilendirilmez
+      taxable: Kazançlar gerçekleştiğinde vergilendirilir
+    tax_treatments:
+      tax_advantaged: Vergi Avantajlı
+      tax_deferred: Vergi Ertelemeli
+      tax_exempt: Vergiden Muaf
+      taxable: Vergiye Tabi
+    types:
+      credit_card: Kredi Kartı
+      crypto: Kripto
+      depository: Nakit
+      investment: Yatırım
+      loan: Kredi
+      other_asset: Diğer Varlık
+      other_liability: Diğer Borç
+      property: Mülk
+      vehicle: Araç
+    types_plural:
+      credit_card: Kredi Kartları
+      crypto: Kripto
+      depository: Nakit
+      investment: Yatırımlar
+      loan: Krediler
+      other_asset: Diğer Varlıklar
+      other_liability: Diğer Borçlar
+      property: Mülkler
+      vehicle: Araçlar
+    unlink:
+      error: 'Hesap bağlantısı kesilemedi: %{error}'
+      generic_error: Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.
+      not_linked: Hesap bir sağlayıcıya bağlı değil
+      success: Hesap bağlantısı başarıyla kesildi. Artık manuel bir hesap.
     update:
       success: "%{type} hesabı güncellendi"
   email_confirmations:
     new:
       invalid_token: Geçersiz veya süresi dolmuş onay bağlantısı.
-      success_login: E-posta adresiniz onaylandı. Lütfen yeni e-posta adresinizle giriş yapın.
\ No newline at end of file
+      success_login: E-posta adresiniz onaylandı. Lütfen yeni e-posta adresinizle
+        giriş yapın.
diff --git a/config/locales/views/admin/invitations/fr.yml b/config/locales/views/admin/invitations/fr.yml
new file mode 100644
index 000000000..60edf3ce3
--- /dev/null
+++ b/config/locales/views/admin/invitations/fr.yml
@@ -0,0 +1,8 @@
+---
+fr:
+  admin:
+    invitations:
+      destroy:
+        success: Invitation supprimée.
+      destroy_all:
+        success: Toutes les invitations pour cette famille ont été supprimées.
diff --git a/config/locales/views/admin/invitations/it.yml b/config/locales/views/admin/invitations/it.yml
new file mode 100644
index 000000000..068127528
--- /dev/null
+++ b/config/locales/views/admin/invitations/it.yml
@@ -0,0 +1,8 @@
+---
+it:
+  admin:
+    invitations:
+      destroy:
+        success: "Invito eliminato."
+      destroy_all:
+        success: "Tutti gli inviti per questa famiglia sono stati eliminati."
diff --git a/config/locales/views/admin/invitations/ru.yml b/config/locales/views/admin/invitations/ru.yml
new file mode 100644
index 000000000..0f12b81db
--- /dev/null
+++ b/config/locales/views/admin/invitations/ru.yml
@@ -0,0 +1,8 @@
+---
+ru:
+  admin:
+    invitations:
+      destroy:
+        success: Приглашение удалено.
+      destroy_all:
+        success: Все приглашения для этой семьи удалены.
diff --git a/config/locales/views/admin/invitations/tr.yml b/config/locales/views/admin/invitations/tr.yml
new file mode 100644
index 000000000..61b44af2f
--- /dev/null
+++ b/config/locales/views/admin/invitations/tr.yml
@@ -0,0 +1,8 @@
+---
+tr:
+  admin:
+    invitations:
+      destroy:
+        success: Davet silindi.
+      destroy_all:
+        success: Bu aileye ait tüm davetler silindi.
diff --git a/config/locales/views/admin/sso_providers/fr.yml b/config/locales/views/admin/sso_providers/fr.yml
index 28e1337a6..5137f46bd 100644
--- a/config/locales/views/admin/sso_providers/fr.yml
+++ b/config/locales/views/admin/sso_providers/fr.yml
@@ -1,115 +1,138 @@
 ---
 fr:
   admin:
-    unauthorized: "Vous n'êtes pas autorisé(e) à accéder à cette zone."
     sso_providers:
-      index:
-        title: "Fournisseurs SSO"
-        description: "Gérez les fournisseurs d'authentification unique pour votre instance"
-        add_provider: "Ajouter un fournisseur"
-        no_providers_title: "Aucun fournisseur SSO"
-        no_providers_message: "Commencez par ajouter votre premier fournisseur SSO."
-        note: "Les modifications des fournisseurs SSO nécessitent un redémarrage du serveur pour prendre effet. Vous pouvez également activer le flag AUTH_PROVIDERS_SOURCE=db pour charger les fournisseurs depuis la base de données dynamiquement."
-        table:
-          name: "Nom"
-          strategy: "Stratégie"
-          status: "Statut"
-          issuer: "Émetteur"
-          actions: "Actions"
-          enabled: "Activé"
-          disabled: "Désactivé"
-        legacy_providers_title: "Fournisseurs configurés par environnement"
-        legacy_providers_notice: "Ces fournisseurs sont configurés via des variables d'environnement ou YAML et ne peuvent pas être gérés via cette interface. Pour les gérer ici, migrez-les vers des fournisseurs sauvegardés en base de données en activant AUTH_PROVIDERS_SOURCE=db et en les recréant dans l'interface."
-        env_configured: "Env/YAML"
-      new:
-        title: "Ajouter un fournisseur SSO"
-        description: "Configurer un nouveau fournisseur d'authentification unique"
-      edit:
-        title: "Modifier le fournisseur SSO"
-        description: "Mettre à jour la configuration pour %{label}"
       create:
-        success: "Fournisseur SSO créé avec succès."
-      update:
-        success: "Fournisseur SSO mis à jour avec succès."
+        success: Fournisseur SSO créé avec succès.
       destroy:
-        success: "Fournisseur SSO supprimé avec succès."
-        confirm: "Êtes-vous sûr(e) de vouloir supprimer ce fournisseur ? Cette action ne peut pas être annulée."
-      toggle:
-        success_enabled: "Fournisseur SSO activé avec succès."
-        success_disabled: "Fournisseur SSO désactivé avec succès."
-        confirm_enable: "Êtes-vous sûr(e) de vouloir activer ce fournisseur ?"
-        confirm_disable: "Êtes-vous sûr(e) de vouloir désactiver ce fournisseur ?"
+        confirm: Êtes-vous sûr(e) de vouloir supprimer ce fournisseur ? Cette action ne peut pas être annulée.
+        success: Fournisseur SSO supprimé avec succès.
+      edit:
+        description: Mettre à jour la configuration pour %{label}
+        title: Modifier le fournisseur SSO
       form:
-        basic_information: "Informations de base"
-        oauth_configuration: "Configuration OAuth/OIDC"
-        strategy_label: "Stratégie"
-        strategy_help: "La stratégie d'authentification à utiliser"
-        name_label: "Nom"
-        name_placeholder: "ex., openid_connect, keycloak, authentik"
-        name_help: "Identifiant unique (minuscules, chiffres, underscores uniquement)"
-        label_label: "Libellé"
-        label_placeholder: "ex., Se connecter avec Keycloak"
-        label_help: "Texte du bouton affiché aux utilisateurs"
-        icon_label: "Icône"
-        icon_placeholder: "ex., key, google, github"
-        icon_help: "Nom de l'icône Lucide (optionnel)"
-        enabled_label: "Activer ce fournisseur"
-        enabled_help: "Les utilisateurs peuvent se connecter avec ce fournisseur lorsqu'il est activé"
-        issuer_label: "Émetteur"
-        issuer_placeholder: "https://accounts.google.com"
-        issuer_help: "URL de l'émetteur OIDC (validera le endpoint .well-known/openid-configuration)"
-        client_id_label: "ID Client"
-        client_id_placeholder: "votre-id-client"
-        client_id_help: "ID client OAuth de votre fournisseur d'identité"
-        client_secret_label: "Secret Client"
-        client_secret_placeholder_new: "votre-secret-client"
-        client_secret_placeholder_existing: "••••••••••••••••"
-        client_secret_help: "Secret client OAuth (chiffré en base de données)"
+        admin_groups: Groupes Admin
+        advanced_title: Paramètres OIDC avancés
+        basic_information: Informations de base
+        cancel: Annuler
+        client_id_help: ID client OAuth de votre fournisseur d'identité
+        client_id_label: ID Client
+        client_id_placeholder: votre-id-client
+        client_secret_help: Secret client OAuth (chiffré en base de données)
         client_secret_help_existing: " - laisser vide pour conserver l'existant"
-        redirect_uri_label: "URI de redirection"
-        redirect_uri_placeholder: "https://votredomaine.com/auth/openid_connect/callback"
-        redirect_uri_help: "URL de callback à configurer chez votre fournisseur d'identité"
-        copy_button: "Copier"
-        cancel: "Annuler"
-        submit: "Enregistrer le fournisseur"
-        errors_title: "%{count} erreur(s) ont empêché l'enregistrement de ce fournisseur :"
-        provisioning_title: "Provisionnement des utilisateurs"
-        default_role_label: "Rôle par défaut pour les nouveaux utilisateurs"
-        default_role_help: "Rôle attribué aux utilisateurs créés via le provisionnement SSO juste-à-temps (JIT). Par défaut : Membre."
-        role_guest: "Invité"
-        role_member: "Membre"
-        role_admin: "Administrateur"
-        role_super_admin: "Super Administrateur"
-        role_mapping_title: "Mappage groupe vers rôle (Optionnel)"
-        role_mapping_help: "Mappez les groupes/claims IdP aux rôles de l'application. Les utilisateurs se voient attribuer le rôle correspondant le plus élevé. Laisser vide pour utiliser le rôle par défaut ci-dessus."
-        super_admin_groups: "Groupes Super Admin"
-        admin_groups: "Groupes Admin"
-        guest_groups: "Groupes Invité"
-        member_groups: "Groupes Membre"
-        groups_help: "Liste de noms de groupes IdP séparés par des virgules. Utilisez * pour correspondre à tous les groupes."
-        advanced_title: "Paramètres OIDC avancés"
-        scopes_label: "Scopes personnalisés"
-        scopes_help: "Liste de scopes OIDC séparés par des espaces. Laisser vide pour les valeurs par défaut (openid email profile). Ajouter 'groups' pour récupérer les claims de groupe."
-        prompt_label: "Invite d'authentification"
-        prompt_default: "Par défaut (l'IdP décide)"
-        prompt_login: "Forcer la connexion (ré-authentifier)"
-        prompt_consent: "Forcer le consentement (ré-autoriser)"
-        prompt_select_account: "Sélection de compte (choisir un compte)"
-        prompt_none: "Pas d'invite (auth silencieuse)"
-        prompt_help: "Contrôle comment l'IdP invite l'utilisateur pendant l'authentification."
-        test_connection: "Tester la connexion"
-        saml_configuration: "Configuration SAML"
-        idp_metadata_url: "URL des métadonnées IdP"
-        idp_metadata_url_help: "URL vers les métadonnées SAML de votre IdP. Si fournie, les autres paramètres SAML seront auto-configurés."
-        manual_saml_config: "Configuration manuelle (si vous n'utilisez pas l'URL de métadonnées)"
-        manual_saml_help: "N'utilisez ces paramètres que si votre IdP ne fournit pas d'URL de métadonnées."
-        idp_sso_url: "URL SSO IdP"
-        idp_slo_url: "URL SLO IdP (optionnel)"
-        idp_certificate: "Certificat IdP"
-        idp_certificate_help: "Certificat X.509 au format PEM. Requis si vous n'utilisez pas l'URL de métadonnées."
-        idp_cert_fingerprint: "Empreinte du certificat (alternative)"
-        name_id_format: "Format NameID"
-        name_id_email: "Adresse email (par défaut)"
-        name_id_persistent: "Persistant"
-        name_id_transient: "Transitoire"
-        name_id_unspecified: "Non spécifié"
+        client_secret_label: Secret Client
+        client_secret_placeholder_existing: "••••••••••••••••"
+        client_secret_placeholder_new: votre-secret-client
+        copy_button: Copier
+        create_provider: Créer un fournisseur
+        default_role_help: 'Rôle attribué aux utilisateurs créés via le provisionnement SSO juste-à-temps (JIT). Par défaut : Membre.'
+        default_role_label: Rôle par défaut pour les nouveaux utilisateurs
+        enabled_help: Les utilisateurs peuvent se connecter avec ce fournisseur lorsqu'il est activé
+        enabled_label: Activer ce fournisseur
+        errors_title:
+          one: 'Une erreur a empêché la sauvegarde de ce fournisseur :'
+          other: "%{count} erreurs ont empêché la sauvegarde de ce fournisseur :"
+        groups_help: Liste de noms de groupes IdP séparés par des virgules. Utilisez * pour correspondre à tous les groupes.
+        guest_groups: Groupes Invité
+        icon_help: Nom de l'icône Lucide (optionnel)
+        icon_label: Icône
+        icon_placeholder: ex., key, google, github
+        idp_cert_fingerprint: Empreinte du certificat (alternative)
+        idp_certificate: Certificat IdP
+        idp_certificate_help: Certificat X.509 au format PEM. Requis si vous n'utilisez pas l'URL de métadonnées.
+        idp_metadata_url: URL des métadonnées IdP
+        idp_metadata_url_help: URL vers les métadonnées SAML de votre IdP. Si fournie, les autres paramètres SAML seront auto-configurés.
+        idp_slo_url: URL SLO IdP (optionnel)
+        idp_sso_url: URL SSO IdP
+        issuer_help: URL de l'émetteur OIDC (validera le endpoint .well-known/openid-configuration)
+        issuer_label: Émetteur
+        issuer_placeholder: https://accounts.google.com
+        label_help: Texte du bouton affiché aux utilisateurs
+        label_label: Libellé
+        label_placeholder: ex., Se connecter avec Keycloak
+        manual_saml_config: Configuration manuelle (si vous n'utilisez pas l'URL de métadonnées)
+        manual_saml_help: N'utilisez ces paramètres que si votre IdP ne fournit pas d'URL de métadonnées.
+        member_groups: Groupes Membre
+        name_help: Identifiant unique (minuscules, chiffres, underscores uniquement)
+        name_id_email: Adresse email (par défaut)
+        name_id_format: Format NameID
+        name_id_persistent: Persistant
+        name_id_transient: Transitoire
+        name_id_unspecified: Non spécifié
+        name_label: Nom
+        name_placeholder: ex., openid_connect, keycloak, authentik
+        oauth_configuration: Configuration OAuth/OIDC
+        prompt_consent: Forcer le consentement (ré-autoriser)
+        prompt_default: Par défaut (l'IdP décide)
+        prompt_help: Contrôle comment l'IdP invite l'utilisateur pendant l'authentification.
+        prompt_label: Invite d'authentification
+        prompt_login: Forcer la connexion (ré-authentifier)
+        prompt_none: Pas d'invite (auth silencieuse)
+        prompt_select_account: Sélection de compte (choisir un compte)
+        provisioning_title: Provisionnement des utilisateurs
+        redirect_uri_help: URL de callback à configurer chez votre fournisseur d'identité
+        redirect_uri_label: URI de redirection
+        redirect_uri_placeholder: https://votredomaine.com/auth/openid_connect/callback
+        role_admin: Administrateur
+        role_guest: Invité
+        role_mapping_help: Mappez les groupes/claims IdP aux rôles de l'application. Les utilisateurs se voient attribuer le rôle correspondant le plus élevé. Laisser vide pour utiliser le rôle par défaut ci-dessus.
+        role_mapping_title: Mappage groupe vers rôle (Optionnel)
+        role_member: Membre
+        role_super_admin: Super Administrateur
+        saml_configuration: Configuration SAML
+        saml_sp_callback_url_help: Configurez cette URL en tant qu'URL du service de consommation d'assertion dans votre IdP.
+        saml_sp_callback_url_label: URL de rappel SP (URL ACS)
+        scopes_help: Liste de scopes OIDC séparés par des espaces. Laisser vide pour les valeurs par défaut (openid email profile). Ajouter 'groups' pour récupérer les claims de groupe.
+        scopes_label: Scopes personnalisés
+        strategy_github: GitHub
+        strategy_google_oauth2: Google OAuth2
+        strategy_help: La stratégie d'authentification à utiliser
+        strategy_label: Stratégie
+        strategy_openid_connect: Connexion OpenID
+        strategy_saml: SAML2.0
+        submit: Enregistrer le fournisseur
+        super_admin_groups: Groupes Super Admin
+        test_connection: Tester la connexion
+        update_provider: Fournisseur de mise à jour
+      index:
+        add_provider: Ajouter un fournisseur
+        configuration_mode: Mode de configuration
+        configured_providers: Fournisseurs configurés
+        db_backed_providers: Fournisseurs basés sur des bases de données
+        db_backed_providers_description: Charger les fournisseurs à partir de la base de données au lieu de la configuration YAML
+        db_backed_providers_help_html: Définissez <code class="bg-surface px-1 py-0.5 round text-xs">AUTH_PROVIDERS_SOURCE=db</code> pour activer les fournisseurs basés sur une base de données. Cela permet des modifications sans redémarrage du serveur.
+        delete: Supprimer
+        description: Gérez les fournisseurs d'authentification unique pour votre instance
+        disable: Désactiver
+        disabled: Désactivé
+        edit: Modifier
+        enable: Activer
+        enabled: Activé
+        env_configured: Env/YAML
+        legacy_providers_notice: Ces fournisseurs sont configurés via des variables d'environnement ou YAML et ne peuvent pas être gérés via cette interface. Pour les gérer ici, migrez-les vers des fournisseurs sauvegardés en base de données en activant AUTH_PROVIDERS_SOURCE=db et en les recréant dans l'interface.
+        legacy_providers_title: Fournisseurs configurés par environnement
+        no_providers_message: Commencez par ajouter votre premier fournisseur SSO.
+        no_providers_title: Aucun fournisseur SSO
+        note: Les modifications des fournisseurs SSO nécessitent un redémarrage du serveur pour prendre effet. Vous pouvez également activer le flag AUTH_PROVIDERS_SOURCE=db pour charger les fournisseurs depuis la base de données dynamiquement.
+        page_title: Fournisseurs SSO
+        restart_required: Les modifications nécessitent un redémarrage du serveur pour prendre effet.
+        table:
+          actions: Actions
+          disabled: Désactivé
+          enabled: Activé
+          issuer: Émetteur
+          name: Nom
+          status: Statut
+          strategy: Stratégie
+        title: Fournisseurs SSO
+      new:
+        description: Configurer un nouveau fournisseur d'authentification unique
+        title: Ajouter un fournisseur SSO
+      toggle:
+        confirm_disable: Êtes-vous sûr(e) de vouloir désactiver ce fournisseur ?
+        confirm_enable: Êtes-vous sûr(e) de vouloir activer ce fournisseur ?
+        success_disabled: Fournisseur SSO désactivé avec succès.
+        success_enabled: Fournisseur SSO activé avec succès.
+      update:
+        success: Fournisseur SSO mis à jour avec succès.
+    unauthorized: Vous n'êtes pas autorisé(e) à accéder à cette zone.
diff --git a/config/locales/views/admin/sso_providers/it.yml b/config/locales/views/admin/sso_providers/it.yml
new file mode 100644
index 000000000..834469df9
--- /dev/null
+++ b/config/locales/views/admin/sso_providers/it.yml
@@ -0,0 +1,138 @@
+---
+it:
+  admin:
+    unauthorized: "Non sei autorizzato ad accedere a quest'area."
+    sso_providers:
+      index:
+        page_title: "Provider SSO"
+        title: "Provider SSO"
+        description: "Gestisci i provider di autenticazione single sign-on per la tua istanza."
+        restart_required: "Le modifiche richiedono un riavvio del server per avere effetto."
+        configured_providers: "Provider configurati"
+        add_provider: "Aggiungi provider"
+        no_providers_title: "Nessun provider SSO"
+        no_providers_message: "Nessun provider SSO configurato ancora."
+        note: "Le modifiche ai provider SSO richiedono un riavvio del server per avere effetto. In alternativa, abilita il flag AUTH_PROVIDERS_SOURCE=db per caricare i provider dal database dinamicamente."
+        enabled: "Abilitato"
+        disabled: "Disabilitato"
+        edit: "Modifica"
+        enable: "Abilita"
+        disable: "Disabilita"
+        delete: "Elimina"
+        configuration_mode: "Modalità configurazione"
+        db_backed_providers: "Provider basati su database"
+        db_backed_providers_description: "Carica provider dal database invece della configurazione YAML"
+        db_backed_providers_help_html: "Imposta <code class=\"bg-surface px-1 py-0.5 rounded text-xs\">AUTH_PROVIDERS_SOURCE=db</code> per abilitare i provider basati su database. Questo consente modifiche senza riavvii del server."
+        table:
+          name: "Nome"
+          strategy: "Strategia"
+          status: "Stato"
+          issuer: "Emittente"
+          actions: "Azioni"
+          enabled: "Abilitato"
+          disabled: "Disabilitato"
+        legacy_providers_title: "Provider configurati tramite ambiente"
+        legacy_providers_notice: "Questi provider sono configurati tramite variabili d'ambiente o YAML e non possono essere gestiti tramite questa interfaccia. Per gestirli qui, migrarli ai provider basati su database abilitando AUTH_PROVIDERS_SOURCE=db e ricreandoli nell'UI."
+        env_configured: "Env/YAML"
+      new:
+        title: "Aggiungi provider SSO"
+        description: "Configura un nuovo provider di autenticazione single sign-on"
+      edit:
+        title: "Modifica provider SSO"
+        description: "Aggiorna la configurazione per %{label}"
+      create:
+        success: "Il provider SSO è stato creato con successo."
+      update:
+        success: "Il provider SSO è stato aggiornato con successo."
+      destroy:
+        success: "Il provider SSO è stato eliminato con successo."
+        confirm: "Sei sicuro di voler eliminare questo provider? Questa azione non può essere annullata."
+      toggle:
+        success_enabled: "Il provider SSO è stato abilitato con successo."
+        success_disabled: "Il provider SSO è stato disabilitato con successo."
+        confirm_enable: "Sei sicuro di voler abilitare questo provider?"
+        confirm_disable: "Sei sicuro di voler disabilitare questo provider?"
+      form:
+        basic_information: "Informazioni di base"
+        oauth_configuration: "Configurazione OAuth/OIDC"
+        strategy_label: "Strategia"
+        strategy_help: "La strategia di autenticazione da usare"
+        strategy_openid_connect: "OpenID Connect"
+        strategy_saml: "SAML 2.0"
+        strategy_google_oauth2: "Google OAuth2"
+        strategy_github: "GitHub"
+        name_label: "Nome"
+        name_placeholder: "es., keycloak, authentik"
+        name_help: "Identificatore univoco (solo lettere minuscole, numeri, underscore)"
+        label_label: "Etichetta pulsante"
+        label_placeholder: "es., Accedi con Keycloak"
+        label_help: "Testo del pulsante mostrato agli utenti"
+        icon_label: "Icona (facoltativo)"
+        icon_placeholder: "es., key, shield"
+        icon_help: "Nome dell'icona Lucide per il pulsante di accesso"
+        enabled_label: "Abilita questo provider"
+        enabled_help: "Gli utenti possono accedere con questo provider quando è abilitato"
+        issuer_label: "URL emittente"
+        issuer_placeholder: "https://your-idp.example.com/realms/your-realm"
+        issuer_help: "URL emittente OIDC (valida .well-known/openid-configuration)"
+        client_id_label: "Client ID"
+        client_id_placeholder: "il-tuo-client-id"
+        client_id_help: "Client ID OAuth dal tuo provider di identità"
+        client_secret_label: "Client Secret"
+        client_secret_placeholder_new: "il-tuo-client-secret"
+        client_secret_placeholder_existing: "••••••••"
+        client_secret_help: "Client Secret OAuth (cifrato nel database)"
+        client_secret_help_existing: "Lascia vuoto per mantenere il segreto esistente"
+        redirect_uri_label: "URL callback"
+        redirect_uri_placeholder: "https://tuodominio.com/auth/openid_connect/callback"
+        redirect_uri_help: "Configura questo URL nel tuo provider di identità"
+        saml_sp_callback_url_label: "URL callback SP (ACS URL)"
+        saml_sp_callback_url_help: "Configura questo URL come URL del servizio di asserzione del consumatore nel tuo IdP"
+        copy_button: "Copia"
+        cancel: "Annulla"
+        submit: "Salva provider"
+        create_provider: "Crea provider"
+        update_provider: "Aggiorna provider"
+        errors_title:
+          one: "Un errore ha impedito il salvataggio di questo provider:"
+          other: "%{count} errori hanno impedito il salvataggio di questo provider:"
+        provisioning_title: "Provisioning utenti"
+        default_role_label: "Ruolo predefinito per i nuovi utenti"
+        default_role_help: "Ruolo assegnato agli utenti creati tramite provisioning SSO just-in-time (JIT). Predefinito: Membro."
+        role_guest: "Ospite"
+        role_member: "Membro"
+        role_admin: "Amministratore"
+        role_super_admin: "Super amministratore"
+        role_mapping_title: "Mappatura gruppo → ruolo (facoltativo)"
+        role_mapping_help: "Mappa gruppi/claim IdP a ruoli dell'applicazione. Agli utenti viene assegnato il ruolo corrispondente più alto. Lascia vuoto per usare il ruolo predefinito sopra."
+        super_admin_groups: "Gruppi super amministratore"
+        admin_groups: "Gruppi amministratore"
+        guest_groups: "Gruppi ospite"
+        member_groups: "Gruppi membro"
+        groups_help: "Elenco separato da virgole di nomi di gruppi IdP. Usa * per corrispondere a tutti i gruppi."
+        advanced_title: "Impostazioni OIDC avanzate"
+        scopes_label: "Scope personalizzati"
+        scopes_help: "Elenco di scope OIDC separati da spazi. Lascia vuoto per i predefiniti (openid email profile). Aggiungi 'groups' per recuperare i claim di gruppo."
+        prompt_label: "Prompt di autenticazione"
+        prompt_default: "Predefinito (decide l'IdP)"
+        prompt_login: "Forza accesso (ri-autenticazione)"
+        prompt_consent: "Forza consenso (ri-autorizzazione)"
+        prompt_select_account: "Selezione account (scegli account)"
+        prompt_none: "Nessun prompt (autenticazione silenziosa)"
+        prompt_help: "Controlla come l'IdP richiede all'utente durante l'autenticazione."
+        test_connection: "Testa connessione"
+        saml_configuration: "Configurazione SAML"
+        idp_metadata_url: "URL metadati IdP"
+        idp_metadata_url_help: "URL ai metadati SAML del tuo IdP. Se fornito, altre impostazioni SAML verranno auto-configurate."
+        manual_saml_config: "Configurazione manuale (se non si usa l'URL dei metadati)"
+        manual_saml_help: "Usa queste impostazioni solo se il tuo IdP non fornisce un URL dei metadati."
+        idp_sso_url: "URL SSO IdP"
+        idp_slo_url: "URL SLO IdP (facoltativo)"
+        idp_certificate: "Certificato IdP"
+        idp_certificate_help: "Certificato X.509 in formato PEM. Obbligatorio se non si usa l'URL dei metadati."
+        idp_cert_fingerprint: "Impronta digitale certificato (alternativa)"
+        name_id_format: "Formato NameID"
+        name_id_email: "Indirizzo email (predefinito)"
+        name_id_persistent: "Persistente"
+        name_id_transient: "Temporaneo"
+        name_id_unspecified: "Non specificato"
diff --git a/config/locales/views/admin/sso_providers/ru.yml b/config/locales/views/admin/sso_providers/ru.yml
new file mode 100644
index 000000000..d657ab2bc
--- /dev/null
+++ b/config/locales/views/admin/sso_providers/ru.yml
@@ -0,0 +1,161 @@
+---
+ru:
+  admin:
+    sso_providers:
+      create:
+        success: Поставщик SSO успешно создан.
+      destroy:
+        confirm: Вы уверены, что хотите удалить этого поставщика? Это действие нельзя
+          отменить.
+        success: Поставщик SSO успешно удалён.
+      edit:
+        description: Обновите конфигурацию для %{label}
+        title: Редактировать поставщика SSO
+      form:
+        admin_groups: Группы администраторов
+        advanced_title: Расширенные настройки OIDC
+        basic_information: Основная информация
+        cancel: Отмена
+        client_id_help: ID клиента OAuth от вашего поставщика идентификации
+        client_id_label: ID клиента
+        client_id_placeholder: ваш-client-id
+        client_secret_help: Секрет клиента OAuth (зашифрован в базе данных)
+        client_secret_help_existing: Оставьте пустым, чтобы сохранить существующий
+          секрет
+        client_secret_label: Секрет клиента
+        client_secret_placeholder_existing: "••••••••"
+        client_secret_placeholder_new: ваш-client-secret
+        copy_button: Копировать
+        create_provider: Создать поставщика
+        default_role_help: Роль, назначаемая пользователям, созданным через JIT предоставление
+          учётных записей SSO. По умолчанию — Участник.
+        default_role_label: Роль по умолчанию для новых пользователей
+        enabled_help: Пользователи могут войти через этого поставщика, когда он включён
+        enabled_label: Включить этого поставщика
+        errors_title:
+          few: "%{count} ошибки не позволили сохранить этого поставщика:"
+          many: "%{count} ошибок не позволили сохранить этого поставщика:"
+          one: 'Ошибка не позволила сохранить этого поставщика:'
+          other: "%{count} ошибки не позволили сохранить этого поставщика:"
+        groups_help: Список имён групп IdP, разделённых запятыми. Используйте * для
+          соответствия всем группам.
+        guest_groups: Группы гостей
+        icon_help: Имя иконки Lucide для кнопки входа
+        icon_label: Иконка (необязательно)
+        icon_placeholder: например, ключ, щит
+        idp_cert_fingerprint: Отпечаток сертификата (альтернатива)
+        idp_certificate: Сертификат IdP
+        idp_certificate_help: Сертификат X.509 в формате PEM. Требуется, если не используется
+          URL метаданных.
+        idp_metadata_url: URL метаданных IdP
+        idp_metadata_url_help: URL метаданных SAML вашего IdP. Если указано, другие
+          настройки SAML будут настроены автоматически.
+        idp_slo_url: URL SLO IdP (необязательно)
+        idp_sso_url: URL SSO IdP
+        issuer_help: URL эмитента OIDC (проверяет .well-known/openid-configuration)
+        issuer_label: URL эмитента
+        issuer_placeholder: https://your-idp.example.com/realms/your-realm
+        label_help: Текст кнопки, показываемый пользователям
+        label_label: Надпись на кнопке
+        label_placeholder: например, Войти через Keycloak
+        manual_saml_config: Ручная конфигурация (если не используется URL метаданных)
+        manual_saml_help: Используйте эти настройки только в том случае, если ваш
+          IdP не предоставляет URL метаданных.
+        member_groups: Группы участников
+        name_help: Уникальный идентификатор (только строчные буквы, цифры, подчеркивания)
+        name_id_email: Адрес электронной почты (по умолчанию)
+        name_id_format: Формат NameID
+        name_id_persistent: Постоянный
+        name_id_transient: Временный
+        name_id_unspecified: Не указан
+        name_label: Имя
+        name_placeholder: например, keycloak, authentik
+        oauth_configuration: Конфигурация OAuth/OIDC
+        prompt_consent: Принудительное согласие (повторное разрешение)
+        prompt_default: По умолчанию (решает IdP)
+        prompt_help: Управляет тем, как IdP запрашивает пользователя во время аутентификации.
+        prompt_label: Запрос аутентификации
+        prompt_login: Принудительный вход (повторная аутентификация)
+        prompt_none: Без запроса (тихая аутентификация)
+        prompt_select_account: Выбор учётной записи (выбор учётной записи)
+        provisioning_title: Предоставление пользователей
+        redirect_uri_help: Настройте этот URL у вашего поставщика идентификации
+        redirect_uri_label: URL обратного вызова
+        redirect_uri_placeholder: https://yourdomain.com/auth/openid_connect/callback
+        role_admin: Администратор
+        role_guest: Гость
+        role_mapping_help: Сопоставьте группы/утверждения IdP с ролями приложения.
+          Пользователям назначается наивысшая соответствующая роль. Оставьте пустым,
+          чтобы использовать роль по умолчанию выше.
+        role_mapping_title: Сопоставление группы с ролью (необязательно)
+        role_member: Участник
+        role_super_admin: Супер Администратор
+        saml_configuration: Конфигурация SAML
+        saml_sp_callback_url_help: Настройте этот URL как URL службы потребления утверждений
+          у вашего IdP
+        saml_sp_callback_url_label: URL обратного вызова SP (URL ACS)
+        scopes_help: Список областей OIDC, разделённых пробелами. Оставьте пустым
+          для значений по умолчанию (openid email profile). Добавьте 'groups', чтобы
+          получить утверждения группы.
+        scopes_label: Пользовательские области
+        strategy_github: GitHub
+        strategy_google_oauth2: Google OAuth2
+        strategy_help: Стратегия аутентификации для использования
+        strategy_label: Стратегия
+        strategy_openid_connect: OpenID Connect
+        strategy_saml: SAML 2.0
+        submit: Сохранить поставщика
+        super_admin_groups: Группы супер администраторов
+        test_connection: Проверить соединение
+        update_provider: Обновить поставщика
+      index:
+        add_provider: Добавить поставщика
+        configuration_mode: Режим конфигурации
+        configured_providers: Настроенные поставщики
+        db_backed_providers: Поставщики на основе базы данных
+        db_backed_providers_description: Загружать поставщиков из базы данных вместо
+          конфигурации YAML
+        db_backed_providers_help_html: Установите <code class="bg-surface px-1 py-0.5
+          rounded text-xs">AUTH_PROVIDERS_SOURCE=db</code>, чтобы включить поставщиков
+          на основе базы данных. Это позволяет вносить изменения без перезапуска сервера.
+        delete: Удалить
+        description: Управляйте поставщиками аутентификации единого входа для вашего
+          экземпляра.
+        disable: Отключить
+        disabled: Отключено
+        edit: Редактировать
+        enable: Включить
+        enabled: Включено
+        env_configured: Окружение/YAML
+        legacy_providers_notice: Эти поставщики настроены через переменные окружения
+          или YAML и не могут управляться через этот интерфейс. Чтобы управлять ими
+          здесь, перенесите их в поставщики на основе базы данных, включив AUTH_PROVIDERS_SOURCE=db
+          и воссоздав их в интерфейсе.
+        legacy_providers_title: Поставщики, настроенные через окружение
+        no_providers_message: Поставщики SSO еще не настроены.
+        no_providers_title: Нет поставщиков SSO
+        note: Изменения в поставщиках SSO требуют перезапуска сервера для вступления
+          в силу. В качестве альтернативы включите флаг функции AUTH_PROVIDERS_SOURCE=db,
+          чтобы загружать поставщиков из базы данных динамически.
+        page_title: Поставщики SSO
+        restart_required: Изменения требуют перезапуска сервера для вступления в силу.
+        table:
+          actions: Действия
+          disabled: Отключено
+          enabled: Включено
+          issuer: Эмитент
+          name: Имя
+          status: Статус
+          strategy: Стратегия
+        title: Поставщики SSO
+      new:
+        description: Настройте нового поставщика аутентификации единого входа
+        title: Добавить поставщика SSO
+      toggle:
+        confirm_disable: Вы уверены, что хотите отключить этого поставщика?
+        confirm_enable: Вы уверены, что хотите включить этого поставщика?
+        success_disabled: Поставщик SSO успешно отключён.
+        success_enabled: Поставщик SSO успешно включён.
+      update:
+        success: Поставщик SSO успешно обновлён.
+    unauthorized: У вас нет прав доступа к этой области.
diff --git a/config/locales/views/admin/sso_providers/tr.yml b/config/locales/views/admin/sso_providers/tr.yml
new file mode 100644
index 000000000..a32e4a562
--- /dev/null
+++ b/config/locales/views/admin/sso_providers/tr.yml
@@ -0,0 +1,162 @@
+---
+tr:
+  admin:
+    sso_providers:
+      create:
+        success: SSO sağlayıcısı başarıyla oluşturuldu.
+      destroy:
+        confirm: Bu sağlayıcıyı silmek istediğinizden emin misiniz? Bu işlem geri
+          alınamaz.
+        success: SSO sağlayıcısı başarıyla silindi.
+      edit:
+        description: "%{label} için yapılandırmayı güncelle"
+        title: SSO Sağlayıcısını Düzenle
+      form:
+        admin_groups: Yönetici Grupları
+        advanced_title: Gelişmiş OIDC Ayarları
+        basic_information: Temel Bilgiler
+        cancel: İptal
+        client_id_help: Kimlik sağlayıcınızdan alınan OAuth istemci kimliği
+        client_id_label: İstemci Kimliği
+        client_id_placeholder: istemci-kimliginiz
+        client_secret_help: OAuth istemci gizli anahtarı (veritabanında şifrelenir)
+        client_secret_help_existing: Mevcut gizli anahtarı korumak için boş bırakın
+        client_secret_label: İstemci Gizli Anahtarı
+        client_secret_placeholder_existing: "••••••••"
+        client_secret_placeholder_new: istemci-gizli-anahtariniz
+        copy_button: Kopyala
+        create_provider: Sağlayıcı Oluştur
+        default_role_help: Anlık (JIT) SSO hesap oluşturma yoluyla oluşturulan kullanıcılara
+          atanan rol. Varsayılan olarak Üye.
+        default_role_label: Yeni Kullanıcılar İçin Varsayılan Rol
+        enabled_help: Etkinleştirildiğinde kullanıcılar bu sağlayıcıyla giriş yapabilir
+        enabled_label: Bu sağlayıcıyı etkinleştir
+        errors_title:
+          one: 'Bir hata nedeniyle bu sağlayıcı kaydedilemedi:'
+          other: "%{count} hata nedeniyle bu sağlayıcı kaydedilemedi:"
+        groups_help: Virgülle ayrılmış IdP grup adları listesi. Tüm gruplarla eşleşmesi
+          için * kullanın.
+        guest_groups: Misafir Grupları
+        icon_help: Giriş düğmesi için Lucide simge adı
+        icon_label: Simge (isteğe bağlı)
+        icon_placeholder: örn. key, shield
+        idp_cert_fingerprint: Sertifika Parmak İzi (alternatif)
+        idp_certificate: IdP Sertifikası
+        idp_certificate_help: PEM biçiminde X.509 sertifikası. Metadata URL'si kullanılmıyorsa
+          zorunludur.
+        idp_metadata_url: IdP Metadata URL'si
+        idp_metadata_url_help: IdP'nizin SAML metadata'sının URL'si. Belirtilirse
+          diğer SAML ayarları otomatik olarak yapılandırılır.
+        idp_slo_url: IdP SLO URL'si (isteğe bağlı)
+        idp_sso_url: IdP SSO URL'si
+        issuer_help: OIDC issuer URL'si (.well-known/openid-configuration doğrular)
+        issuer_label: Issuer URL'si
+        issuer_placeholder: https://your-idp.example.com/realms/your-realm
+        label_help: Kullanıcılara gösterilen düğme metni
+        label_label: Düğme Etiketi
+        label_placeholder: örn. Keycloak ile giriş yap
+        manual_saml_config: Manuel Yapılandırma (metadata URL'si kullanılmıyorsa)
+        manual_saml_help: Bu ayarları yalnızca IdP'niz bir metadata URL'si sağlamıyorsa
+          kullanın.
+        member_groups: Üye Grupları
+        name_help: Benzersiz tanımlayıcı (yalnızca küçük harf, rakam, alt çizgi)
+        name_id_email: E-posta Adresi (varsayılan)
+        name_id_format: NameID Biçimi
+        name_id_persistent: Kalıcı
+        name_id_transient: Geçici
+        name_id_unspecified: Belirtilmemiş
+        name_label: Ad
+        name_placeholder: örn. keycloak, authentik
+        oauth_configuration: OAuth/OIDC Yapılandırması
+        prompt_consent: Onayı Zorunlu Kıl (yeniden yetkilendir)
+        prompt_default: Varsayılan (IdP karar verir)
+        prompt_help: IdP'nin kimlik doğrulama sırasında kullanıcıyı nasıl yönlendireceğini
+          kontrol eder.
+        prompt_label: Kimlik Doğrulama İstemi
+        prompt_login: Girişi Zorunlu Kıl (yeniden kimlik doğrula)
+        prompt_none: İstem Yok (sessiz kimlik doğrulama)
+        prompt_select_account: Hesap Seçimi (hesap seç)
+        provisioning_title: Kullanıcı Oluşturma
+        redirect_uri_help: Bu URL'yi kimlik sağlayıcınızda yapılandırın
+        redirect_uri_label: Geri Çağırma URL'si
+        redirect_uri_placeholder: https://yourdomain.com/auth/openid_connect/callback
+        role_admin: Yönetici
+        role_guest: Misafir
+        role_mapping_help: IdP gruplarını/taleplerini uygulama rollerine eşleyin.
+          Kullanıcılara eşleşen en yüksek rol atanır. Yukarıdaki varsayılan rolü kullanmak
+          için boş bırakın.
+        role_mapping_title: Grup - Rol Eşlemesi (İsteğe Bağlı)
+        role_member: Üye
+        role_super_admin: Süper Yönetici
+        saml_configuration: SAML Yapılandırması
+        saml_sp_callback_url_help: Bu URL'yi IdP'nizde Assertion Consumer Service
+          URL'si olarak yapılandırın
+        saml_sp_callback_url_label: SP Geri Çağırma URL'si (ACS URL'si)
+        scopes_help: Boşlukla ayrılmış OIDC kapsamları listesi. Varsayılanlar için
+          boş bırakın (openid email profile). Grup taleplerini almak için 'groups'
+          ekleyin.
+        scopes_label: Özel Kapsamlar
+        strategy_github: GitHub
+        strategy_google_oauth2: Google OAuth2
+        strategy_help: Kullanılacak kimlik doğrulama stratejisi
+        strategy_label: Strateji
+        strategy_openid_connect: OpenID Connect
+        strategy_saml: SAML 2.0
+        submit: Sağlayıcıyı Kaydet
+        super_admin_groups: Süper Yönetici Grupları
+        test_connection: Bağlantıyı Test Et
+        update_provider: Sağlayıcıyı Güncelle
+      index:
+        add_provider: Sağlayıcı Ekle
+        configuration_mode: Yapılandırma Modu
+        configured_providers: Yapılandırılmış Sağlayıcılar
+        db_backed_providers: Veritabanı tabanlı sağlayıcılar
+        db_backed_providers_description: Sağlayıcıları YAML yapılandırması yerine
+          veritabanından yükle
+        db_backed_providers_help_html: Veritabanı tabanlı sağlayıcıları etkinleştirmek
+          için <code class="bg-surface px-1 py-0.5 rounded text-xs">AUTH_PROVIDERS_SOURCE=db</code>
+          ayarlayın. Bu, sunucu yeniden başlatmadan değişiklik yapılmasına olanak
+          tanır.
+        delete: Sil
+        description: Örneğiniz için tek oturum açma kimlik doğrulama sağlayıcılarını
+          yönetin.
+        disable: Devre dışı bırak
+        disabled: Devre dışı
+        edit: Düzenle
+        enable: Etkinleştir
+        enabled: Etkin
+        env_configured: Ortam/YAML
+        legacy_providers_notice: Bu sağlayıcılar ortam değişkenleri veya YAML aracılığıyla
+          yapılandırılmıştır ve bu arayüzden yönetilemez. Bunları burada yönetmek
+          için AUTH_PROVIDERS_SOURCE=db özelliğini etkinleştirerek veritabanı tabanlı
+          sağlayıcılara taşıyın ve arayüzde yeniden oluşturun.
+        legacy_providers_title: Ortamda Yapılandırılmış Sağlayıcılar
+        no_providers_message: Henüz yapılandırılmış SSO sağlayıcısı yok.
+        no_providers_title: SSO Sağlayıcısı Yok
+        note: SSO sağlayıcılarındaki değişikliklerin etkili olması için sunucunun
+          yeniden başlatılması gerekir. Alternatif olarak, sağlayıcıları veritabanından
+          dinamik olarak yüklemek için AUTH_PROVIDERS_SOURCE=db özellik bayrağını
+          etkinleştirin.
+        page_title: SSO Sağlayıcıları
+        restart_required: Değişikliklerin etkili olması için sunucunun yeniden başlatılması
+          gerekir.
+        table:
+          actions: İşlemler
+          disabled: Devre dışı
+          enabled: Etkin
+          issuer: Issuer
+          name: Ad
+          status: Durum
+          strategy: Strateji
+        title: SSO Sağlayıcıları
+      new:
+        description: Yeni bir tek oturum açma kimlik doğrulama sağlayıcısı yapılandırın
+        title: SSO Sağlayıcısı Ekle
+      toggle:
+        confirm_disable: Bu sağlayıcıyı devre dışı bırakmak istediğinizden emin misiniz?
+        confirm_enable: Bu sağlayıcıyı etkinleştirmek istediğinizden emin misiniz?
+        success_disabled: SSO sağlayıcısı başarıyla devre dışı bırakıldı.
+        success_enabled: SSO sağlayıcısı başarıyla etkinleştirildi.
+      update:
+        success: SSO sağlayıcısı başarıyla güncellendi.
+    unauthorized: Bu alana erişim yetkiniz yok.
diff --git a/config/locales/views/admin/users/fr.yml b/config/locales/views/admin/users/fr.yml
index 41ca3c2a8..9389bcdfe 100644
--- a/config/locales/views/admin/users/fr.yml
+++ b/config/locales/views/admin/users/fr.yml
@@ -3,51 +3,59 @@ fr:
   admin:
     users:
       index:
-        title: "Gestion des utilisateurs"
-        description: "Gérez les rôles des utilisateurs pour votre instance. Les super administrateurs peuvent accéder aux paramètres des fournisseurs SSO et à la gestion des utilisateurs."
-        section_title: "Familles / Groupes"
-        you: "(Vous)"
-        trial_ends_at: "Fin de l'essai"
-        not_available: "n/a"
-        no_users: "Aucun utilisateur trouvé."
-        unnamed_family: "Famille/Groupe sans nom"
-        no_subscription: "Aucun abonnement"
-        family_summary: "%{members} membres · %{accounts} comptes · %{transactions} transactions"
+        description: Gérez les rôles des utilisateurs pour votre instance. Les super
+          administrateurs peuvent accéder aux paramètres des fournisseurs SSO et à
+          la gestion des utilisateurs.
+        family_summary: "%{members} membres · %{accounts} comptes · %{transactions}
+          transactions"
         filters:
-          role: "Rôle"
-          role_all: "Tous les rôles"
-          trial_status: "Statut de l'essai"
-          trial_all: "Tous"
-          trial_expiring_soon: "Expire dans 7 jours"
-          trial_trialing: "En essai"
-          submit: "Filtrer"
-        summary:
-          trials_expiring_7_days: "Essais expirant dans les 7 prochains jours"
-        table:
-          user: "Utilisateur"
-          trial_ends_at: "Fin de l'essai"
-          family_accounts: "Comptes de la famille"
-          family_transactions: "Transactions de la famille"
-          last_login: "Dernière connexion"
-          session_count: "Nombre de sessions"
-          never: "Jamais"
-          role: "Rôle"
-        role_descriptions_title: "Description des rôles"
-        roles:
-          guest: "Invité"
-          member: "Membre"
-          admin: "Administrateur"
-          super_admin: "Super Administrateur"
-        role_descriptions:
-          guest: "Expérience axée sur l'assistant avec des permissions volontairement restreintes pour les parcours d'introduction."
-          member: "Accès utilisateur de base. Peut gérer ses propres comptes, transactions et paramètres."
-          admin: "Administrateur familial. Peut accéder aux paramètres avancés comme les clés API, les importations et les prompts IA."
-          super_admin: "Administrateur de l'instance. Peut gérer les fournisseurs SSO, les rôles des utilisateurs et usurper l'identité des utilisateurs pour le support."
+          role: Rôle
+          role_all: Tous les rôles
+          submit: Filtrer
+          trial_all: Tous
+          trial_expiring_soon: Expire dans 7 jours
+          trial_status: Statut de l'essai
+          trial_trialing: En essai
         invitations:
-          pending_label: "Invité (en attente)"
-          expires: "Expire le %{date}"
-          delete: "Supprimer"
-          delete_all: "Tout supprimer"
+          delete: Supprimer
+          delete_all: Tout supprimer
+          expires: Expire le %{date}
+          pending_label: Invité (en attente)
+        no_subscription: Aucun abonnement
+        no_users: Aucun utilisateur trouvé.
+        not_available: n/a
+        role_descriptions:
+          admin: Administrateur familial. Peut accéder aux paramètres avancés comme
+            les clés API, les importations et les prompts IA.
+          guest: Expérience axée sur l'assistant avec des permissions volontairement
+            restreintes pour les parcours d'introduction.
+          member: Accès utilisateur de base. Peut gérer ses propres comptes, transactions
+            et paramètres.
+          super_admin: Administrateur de l'instance. Peut gérer les fournisseurs SSO,
+            les rôles des utilisateurs et usurper l'identité des utilisateurs pour
+            le support.
+        role_descriptions_title: Description des rôles
+        roles:
+          admin: Administrateur
+          guest: Invité
+          member: Membre
+          super_admin: Super Administrateur
+        section_title: Familles / Groupes
+        summary:
+          trials_expiring_7_days: Essais expirant dans les 7 prochains jours
+        table:
+          family_accounts: Comptes de la famille
+          family_transactions: Transactions de la famille
+          last_login: Dernière connexion
+          never: Jamais
+          role: Rôle
+          session_count: Nombre de sessions
+          trial_ends_at: Fin de l'essai
+          user: Utilisateur
+        title: Gestion des utilisateurs
+        trial_ends_at: Fin de l'essai
+        unnamed_family: Famille/Groupe sans nom
+        you: "(Vous)"
       update:
-        success: "Rôle de l'utilisateur mis à jour avec succès."
-        failure: "Échec de la mise à jour du rôle de l'utilisateur."
+        failure: Échec de la mise à jour du rôle de l'utilisateur.
+        success: Rôle de l'utilisateur mis à jour avec succès.
diff --git a/config/locales/views/admin/users/it.yml b/config/locales/views/admin/users/it.yml
new file mode 100644
index 000000000..995c166dc
--- /dev/null
+++ b/config/locales/views/admin/users/it.yml
@@ -0,0 +1,53 @@
+---
+it:
+  admin:
+    users:
+      index:
+        title: "Gestione utenti"
+        description: "Gestisci i ruoli utente per la tua istanza. I super amministratori possono accedere alle impostazioni del provider SSO e alla gestione utenti."
+        section_title: "Famiglie / Gruppi"
+        you: "(Tu)"
+        trial_ends_at: "Prova scade"
+        not_available: "n/d"
+        no_users: "Nessun utente trovato."
+        unnamed_family: "Famiglia/Gruppo senza nome"
+        no_subscription: "Nessun abbonamento"
+        family_summary: "%{members} membri · %{accounts} conti · %{transactions} transazioni"
+        filters:
+          role: "Ruolo"
+          role_all: "Tutti i ruoli"
+          trial_status: "Stato prova"
+          trial_all: "Tutti"
+          trial_expiring_soon: "In scadenza in 7 giorni"
+          trial_trialing: "In prova"
+          submit: "Filtra"
+        summary:
+          trials_expiring_7_days: "Prove in scadenza nei prossimi 7 giorni"
+        table:
+          user: "Utente"
+          trial_ends_at: "Prova scade"
+          family_accounts: "Conti famiglia"
+          family_transactions: "Transazioni famiglia"
+          last_login: "Ultimo accesso"
+          session_count: "Numero sessioni"
+          never: "Mai"
+          role: "Ruolo"
+        role_descriptions_title: "Descrizioni ruoli"
+        roles:
+          guest: "Ospite"
+          member: "Membro"
+          admin: "Amministratore"
+          super_admin: "Super amministratore"
+        role_descriptions:
+          guest: "Esperienza assistente-first con permessi volutamente limitati per i flussi di introduzione."
+          member: "Accesso utente base. Può gestire i propri conti, transazioni e impostazioni."
+          admin: "Amministratore famiglia. Può accedere alle impostazioni avanzate come chiavi API, importazioni e prompt AI."
+          super_admin: "Amministratore istanza. Può gestire provider SSO, ruoli utente e impersonare utenti per supporto."
+        invitations:
+          pending_label: "Invitato (in attesa)"
+          expires: "Scade %{date}"
+          delete: "Elimina"
+          delete_all: "Elimina tutto"
+      update:
+        success: "Ruolo utente aggiornato con successo."
+        failure: "Aggiornamento ruolo utente fallito."
diff --git a/config/locales/views/admin/users/ru.yml b/config/locales/views/admin/users/ru.yml
new file mode 100644
index 000000000..9b73c9c6e
--- /dev/null
+++ b/config/locales/views/admin/users/ru.yml
@@ -0,0 +1,59 @@
+---
+ru:
+  admin:
+    users:
+      index:
+        description: Управляйте ролями пользователей для вашей инстанции. Суперадминистраторы
+          могут получить доступ к настройкам провайдера SSO и управлению пользователями.
+        family_summary: "%{members} участников · %{accounts} счетов · %{transactions}
+          операций"
+        filters:
+          role: Роль
+          role_all: Все роли
+          submit: Фильтр
+          trial_all: Все
+          trial_expiring_soon: Истекает через 7 дней
+          trial_status: Статус пробного периода
+          trial_trialing: На пробном периоде
+        invitations:
+          delete: Удалить
+          delete_all: Удалить все
+          expires: Истекает %{date}
+          pending_label: Приглашён (в ожидании)
+        no_subscription: Без подписки
+        no_users: Пользователи не найдены.
+        not_available: н/д
+        role_descriptions:
+          admin: Администратор семьи. Может получить доступ к расширенным настройкам,
+            таким как API-ключи, импорт и подсказки AI.
+          guest: Опыт работы с ассистентом с намеренно ограниченными правами для вводных
+            процессов.
+          member: Базовый доступ пользователя. Может управлять своими счетами, операциями
+            и настройками.
+          super_admin: Администратор инстанции. Может управлять провайдерами SSO,
+            ролями пользователей и имитировать пользователей для поддержки.
+        role_descriptions_title: Описание ролей
+        roles:
+          admin: Администратор
+          guest: Гость
+          member: Участник
+          super_admin: Суперадминистратор
+        section_title: Семьи / Группы
+        summary:
+          trials_expiring_7_days: Пробные периоды истекают в течение 7 дней
+        table:
+          family_accounts: Семейные счета
+          family_transactions: Семейные операции
+          last_login: Последний вход
+          never: Никогда
+          role: Роль
+          session_count: Количество сессий
+          trial_ends_at: Пробный период заканчивается
+          user: Пользователь
+        title: Управление пользователями
+        trial_ends_at: Пробный период заканчивается
+        unnamed_family: Безымянная семья/группа
+        you: "(Вы)"
+      update:
+        failure: Не удалось обновить роль пользователя.
+        success: Роль пользователя успешно обновлена.
diff --git a/config/locales/views/admin/users/tr.yml b/config/locales/views/admin/users/tr.yml
new file mode 100644
index 000000000..6b21d10cf
--- /dev/null
+++ b/config/locales/views/admin/users/tr.yml
@@ -0,0 +1,58 @@
+---
+tr:
+  admin:
+    users:
+      index:
+        description: Örneğiniz için kullanıcı rollerini yönetin. Süper yöneticiler
+          SSO sağlayıcı ayarlarına ve kullanıcı yönetimine erişebilir.
+        family_summary: "%{members} üye · %{accounts} hesap · %{transactions} işlem"
+        filters:
+          role: Rol
+          role_all: Tüm roller
+          submit: Filtrele
+          trial_all: Tümü
+          trial_expiring_soon: 7 gün içinde sona erecek
+          trial_status: Deneme durumu
+          trial_trialing: Deneme sürümünde
+        invitations:
+          delete: Sil
+          delete_all: Tümünü Sil
+          expires: "%{date} tarihinde sona erecek"
+          pending_label: Davet edildi (beklemede)
+        no_subscription: Abonelik yok
+        no_users: Kullanıcı bulunamadı.
+        not_available: yok
+        role_descriptions:
+          admin: Aile yöneticisi. API anahtarları, içe aktarmalar ve AI komutları
+            gibi gelişmiş ayarlara erişebilir.
+          guest: Giriş iş akışları için kasıtlı olarak kısıtlanmış izinlere sahip
+            asistan öncelikli deneyim.
+          member: Temel kullanıcı erişimi. Kendi hesaplarını, işlemlerini ve ayarlarını
+            yönetebilir.
+          super_admin: Örnek yöneticisi. SSO sağlayıcılarını, kullanıcı rollerini
+            yönetebilir ve destek için kullanıcı kimliğine bürünebilir.
+        role_descriptions_title: Rol Açıklamaları
+        roles:
+          admin: Yönetici
+          guest: Misafir
+          member: Üye
+          super_admin: Süper Yönetici
+        section_title: Aileler / Gruplar
+        summary:
+          trials_expiring_7_days: Önümüzdeki 7 gün içinde sona erecek denemeler
+        table:
+          family_accounts: Aile hesapları
+          family_transactions: Aile işlemleri
+          last_login: Son giriş
+          never: Hiç
+          role: Rol
+          session_count: Oturum sayısı
+          trial_ends_at: Deneme bitişi
+          user: Kullanıcı
+        title: Kullanıcı Yönetimi
+        trial_ends_at: Deneme bitişi
+        unnamed_family: İsimsiz Aile/Grup
+        you: "(Siz)"
+      update:
+        failure: Kullanıcı rolü güncellenemedi.
+        success: Kullanıcı rolü başarıyla güncellendi.
diff --git a/config/locales/views/akahu_items/fr.yml b/config/locales/views/akahu_items/fr.yml
new file mode 100644
index 000000000..41ea45cff
--- /dev/null
+++ b/config/locales/views/akahu_items/fr.yml
@@ -0,0 +1,127 @@
+---
+fr:
+  akahu_account:
+    fallback: Compte Akahu
+  akahu_entry:
+    notes:
+      code: Code
+      other_account: Autre compte
+      particulars: Détails
+      reference: Référence
+  akahu_item:
+    errors:
+      account_processing_failed: Impossible de synchroniser le compte Akahu
+      account_sync_schedule_failed: Impossible de planifier la synchronisation du compte Akahu
+      pending_transactions_failed: Impossible de récupérer les transactions Akahu en attente
+      sync_failed: Impossible de synchroniser la connexion Akahu
+      transactions_failed: Impossible de récupérer les transactions Akahu
+    institution_summary:
+      count:
+        one: 1 institution
+        other: "%{count} institutions"
+      none: Aucune institution connectée
+      one: 1 institution
+    sync_status:
+      all_synced:
+        one: 1 compte synchronisé
+        other: "%{count} comptes synchronisés"
+      no_accounts: Aucun compte trouvé
+      partial: "%{linked} synchronisés, %{unlinked} à configurer"
+  akahu_items:
+    akahu_item:
+      delete: Supprimer
+      deletion_in_progress: Suppression en cours
+      error: Erreur
+      no_accounts_description: Récupérez les comptes Akahu et choisissez ceux à lier.
+      no_accounts_title: Aucun compte importé pour l'instant
+      setup_action: Configurer les comptes
+      setup_description: "%{linked} sur %{total} comptes liés."
+      setup_needed: Configuration requise
+      status_never: Jamais synchronisé
+      status_with_summary: Synchronisé il y a %{timestamp} · %{summary}
+      syncing: Synchronisation
+    complete_account_setup:
+      all_skipped: Aucun compte Akahu n'a été créé.
+      creation_failed: Impossible de créer les comptes Akahu.
+      no_accounts: Aucun compte Akahu n'a été sélectionné.
+      success:
+        one: 1 compte Akahu créé.
+        other: "%{count} comptes Akahu créés."
+    create:
+      success: Connexion Akahu enregistrée.
+    destroy:
+      success: Suppression de la connexion Akahu planifiée.
+      unlink_failed: Impossible de déconnecter la connexion Akahu
+    link_accounts:
+      link_failed: Aucun compte n'a été lié.
+      no_accounts_selected: Sélectionnez au moins un compte.
+      no_credentials_configured: Configurez d'abord Akahu dans les paramètres des fournisseurs.
+      success:
+        one: 1 compte Akahu lié.
+        other: "%{count} comptes Akahu liés."
+      unsupported_account_type: Akahu ne prend pas en charge ce type de compte.
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur.
+      akahu_account_already_linked: Ce compte Akahu est déjà lié.
+      success: Compte Akahu lié à %{account_name}.
+    provider_panel:
+      add_connection: Ajouter une connexion Akahu
+      app_token_label: Jeton d'application
+      app_token_placeholder: Collez votre jeton d'application Akahu
+      connection_name_label: Nom de la connexion
+      connection_name_placeholder: Akahu principal
+      default_connection_name: Connexion Akahu
+      disconnect: Déconnecter
+      disconnect_confirm: Voulez-vous vraiment déconnecter %{name} ?
+      keep_app_token_placeholder: Laissez vide pour conserver le jeton d'application existant
+      keep_user_token_placeholder: Laissez vide pour conserver le jeton utilisateur existant
+      setup_accounts: Configurer les comptes
+      sync: Synchroniser
+      syncing: Synchronisation...
+      update_connection: Mettre à jour la connexion
+      user_token_label: Jeton utilisateur
+      user_token_placeholder: Collez votre jeton utilisateur Akahu
+    select_accounts:
+      cancel: Annuler
+      description: Choisissez les comptes Akahu à ajouter.
+      link_accounts: Lier les comptes
+      no_accounts_found: Aucun compte Akahu non lié n'a été trouvé.
+      no_credentials_configured: Configurez d'abord Akahu dans les paramètres des fournisseurs.
+      title: Lier les comptes Akahu
+    select_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur.
+      cancel: Annuler
+      description: Choisissez un compte Akahu non lié pour le connecter à ce compte.
+      link_account: Lier le compte
+      no_accounts_found: Aucun compte Akahu non lié n'a été trouvé.
+      no_credentials_configured: Configurez d'abord Akahu dans les paramètres des fournisseurs.
+      title: Lier le compte Akahu à %{account_name}
+    setup_accounts:
+      account_type_label: Type de compte
+      account_types:
+        credit_card: Carte de crédit
+        depository: Trésorerie
+        investment: Investissement
+        loan: Emprunt
+        skip: Ignorer
+      all_accounts_linked: Tous les comptes Akahu sont déjà liés.
+      api_error: Impossible de récupérer les comptes Akahu.
+      cancel: Annuler
+      choose_account_type: Choisissez un type de compte
+      choose_account_type_description: Ignorez les comptes que vous ne souhaitez pas suivre.
+      create_accounts: Créer les comptes
+      fetch_failed: Impossible de récupérer les comptes
+      no_accounts_to_setup: Aucun compte à configurer
+      no_credentials: Configurez d'abord les identifiants Akahu.
+      subtitle: Choisissez comment chaque compte Akahu doit apparaître dans Sure.
+      title: Configurer les comptes Akahu
+    update:
+      success: Connexion Akahu mise à jour.
+  family:
+    akahu:
+      create_akahu_item:
+        default_name: Connexion Akahu
+  providers:
+    akahu:
+      description: Connectez des comptes bancaires néo-zélandais via Akahu
+      name: Akahu
diff --git a/config/locales/views/akahu_items/it.yml b/config/locales/views/akahu_items/it.yml
new file mode 100644
index 000000000..81e2884f3
--- /dev/null
+++ b/config/locales/views/akahu_items/it.yml
@@ -0,0 +1,127 @@
+---
+it:
+  providers:
+    akahu:
+      name: Akahu
+      description: Connetti conti bancari neozelandesi tramite Akahu
+  family:
+    akahu:
+      create_akahu_item:
+        default_name: Connessione Akahu
+  akahu_account:
+    fallback: Conto Akahu
+  akahu_entry:
+    notes:
+      reference: Riferimento
+      particulars: Particolari
+      code: Codice
+      other_account: Altro conto
+  akahu_item:
+    errors:
+      account_processing_failed: Impossibile sincronizzare il conto Akahu
+      account_sync_schedule_failed: Impossibile pianificare la sincronizzazione del conto Akahu
+      pending_transactions_failed: Impossibile recuperare le transazioni in sospeso di Akahu
+      transactions_failed: Impossibile recuperare le transazioni Akahu
+      sync_failed: Impossibile sincronizzare la connessione Akahu
+    sync_status:
+      no_accounts: Nessun conto trovato
+      all_synced:
+        one: 1 conto sincronizzato
+        other: "%{count} conti sincronizzati"
+      partial: "%{linked} sincronizzati, %{unlinked} da configurare"
+    institution_summary:
+      none: Nessuna istituzione connessa
+      one: 1 istituzione
+      count:
+        one: 1 istituzione
+        other: "%{count} istituzioni"
+  akahu_items:
+    provider_panel:
+      default_connection_name: Connessione Akahu
+      add_connection: Aggiungi connessione Akahu
+      update_connection: Aggiorna connessione
+      connection_name_label: Nome connessione
+      connection_name_placeholder: Akahu principale
+      app_token_label: Token app
+      app_token_placeholder: Incolla il tuo token app Akahu
+      keep_app_token_placeholder: Lascia vuoto per mantenere il token app esistente
+      user_token_label: Token utente
+      user_token_placeholder: Incolla il tuo token utente Akahu
+      keep_user_token_placeholder: Lascia vuoto per mantenere il token utente esistente
+      setup_accounts: Configura conti
+      syncing: Sincronizzazione in corso...
+      sync: Sincronizza
+      disconnect: Disconnetti
+      disconnect_confirm: "Sei sicuro di voler disconnettere %{name}?"
+    create:
+      success: Connessione Akahu salvata.
+    update:
+      success: Connessione Akahu aggiornata.
+    destroy:
+      success: Connessione Akahu pianificata per l'eliminazione.
+      unlink_failed: Impossibile disconnettere la connessione Akahu
+    select_accounts:
+      title: Collega conti Akahu
+      description: Scegli i conti Akahu da aggiungere.
+      no_accounts_found: Nessun conto Akahu non collegato trovato.
+      no_credentials_configured: Configura prima Akahu nelle impostazioni provider.
+      cancel: Annulla
+      link_accounts: Collega conti
+    link_accounts:
+      success:
+        one: Collegato 1 conto Akahu.
+        other: "Collegati %{count} conti Akahu."
+      no_accounts_selected: Seleziona almeno un conto.
+      no_credentials_configured: Configura prima Akahu nelle impostazioni provider.
+      unsupported_account_type: Akahu non supporta quel tipo di conto.
+      link_failed: Nessun conto è stato collegato.
+    select_existing_account:
+      title: "Collega conto Akahu a %{account_name}"
+      description: Scegli un conto Akahu non collegato da connettere a questo conto.
+      no_accounts_found: Nessun conto Akahu non collegato trovato.
+      no_credentials_configured: Configura prima Akahu nelle impostazioni provider.
+      account_already_linked: Questo conto è già collegato a un provider.
+      cancel: Annulla
+      link_account: Collega conto
+    link_existing_account:
+      success: "Conto Akahu collegato a %{account_name}."
+      account_already_linked: Questo conto è già collegato a un provider.
+      akahu_account_already_linked: Questo conto Akahu è già collegato.
+    setup_accounts:
+      title: Configura conti Akahu
+      subtitle: Scegli come ogni conto Akahu deve apparire in Sure.
+      no_credentials: Configura prima le credenziali Akahu.
+      api_error: Impossibile recuperare i conti Akahu.
+      fetch_failed: Impossibile recuperare i conti
+      no_accounts_to_setup: Nessun conto da configurare
+      all_accounts_linked: Tutti i conti Akahu sono già collegati.
+      choose_account_type: Scegli un tipo di conto
+      choose_account_type_description: Salta i conti che non vuoi tracciare.
+      account_type_label: Tipo di conto
+      account_types:
+        skip: Salta
+        depository: Liquidità
+        credit_card: Carta di credito
+        investment: Investimento
+        loan: Prestito
+      create_accounts: Crea conti
+      cancel: Annulla
+    complete_account_setup:
+      success:
+        one: Creato 1 conto Akahu.
+        other: "Creati %{count} conti Akahu."
+      all_skipped: Nessun conto Akahu è stato creato.
+      no_accounts: Nessun conto Akahu è stato selezionato.
+      creation_failed: Impossibile creare i conti Akahu.
+    akahu_item:
+      deletion_in_progress: Eliminazione in corso
+      syncing: Sincronizzazione in corso
+      error: Errore
+      status_with_summary: "Sincronizzato %{timestamp} fa · %{summary}"
+      status_never: Mai sincronizzato
+      delete: Elimina
+      setup_needed: Configurazione conto necessaria
+      setup_description: "%{linked} di %{total} conti collegati."
+      setup_action: Configura conti
+      no_accounts_title: Nessun conto importato ancora
+      no_accounts_description: Recupera i conti Akahu e scegli quali collegare.
diff --git a/config/locales/views/akahu_items/pl.yml b/config/locales/views/akahu_items/pl.yml
new file mode 100644
index 000000000..8226ea053
--- /dev/null
+++ b/config/locales/views/akahu_items/pl.yml
@@ -0,0 +1,135 @@
+---
+pl:
+  providers:
+    akahu:
+      name: Akahu
+      description: Połącz nowozelandzkie konta bankowe przez Akahu
+  family:
+    akahu:
+      create_akahu_item:
+        default_name: Połączenie Akahu
+  akahu_account:
+    fallback: Konto Akahu
+  akahu_entry:
+    notes:
+      reference: Referencja
+      particulars: Szczegóły
+      code: Kod
+      other_account: Inne konto
+  akahu_item:
+    errors:
+      account_processing_failed: Nie można zsynchronizować konta Akahu
+      account_sync_schedule_failed: Nie można zaplanować synchronizacji konta Akahu
+      pending_transactions_failed: Nie można pobrać oczekujących transakcji Akahu
+      transactions_failed: Nie można pobrać transakcji Akahu
+      sync_failed: Nie można zsynchronizować połączenia Akahu
+    sync_status:
+      no_accounts: Nie znaleziono kont
+      all_synced:
+        few: "%{count} konta zsynchronizowane"
+        many: "%{count} kont zsynchronizowanych"
+        one: 1 konto zsynchronizowane
+        other: "%{count} kont zsynchronizowanych"
+      partial: "%{linked} zsynchronizowanych, %{unlinked} wymaga konfiguracji"
+    institution_summary:
+      none: Brak połączonych instytucji
+      one: 1 instytucja
+      count:
+        few: "%{count} instytucje"
+        many: "%{count} instytucji"
+        one: 1 instytucja
+        other: "%{count} instytucji"
+  akahu_items:
+    provider_panel:
+      default_connection_name: Połączenie Akahu
+      add_connection: Dodaj połączenie Akahu
+      update_connection: Aktualizuj połączenie
+      connection_name_label: Nazwa połączenia
+      connection_name_placeholder: Główne Akahu
+      app_token_label: Token aplikacji
+      app_token_placeholder: Wklej swój token aplikacji Akahu
+      keep_app_token_placeholder: Pozostaw puste, aby zachować istniejący token aplikacji
+      user_token_label: Token użytkownika
+      user_token_placeholder: Wklej swój token użytkownika Akahu
+      keep_user_token_placeholder: Pozostaw puste, aby zachować istniejący token użytkownika
+      setup_accounts: Konfiguruj konta
+      syncing: Synchronizowanie...
+      sync: Synchronizuj
+      disconnect: Rozłącz
+      disconnect_confirm: "Czy na pewno chcesz rozłączyć %{name}?"
+    create:
+      success: Połączenie Akahu zapisane.
+    update:
+      success: Połączenie Akahu zaktualizowane.
+    destroy:
+      success: Zaplanowano usunięcie połączenia Akahu.
+      unlink_failed: Nie można rozłączyć połączenia Akahu
+    select_accounts:
+      title: Połącz konta Akahu
+      description: Wybierz konta Akahu do dodania.
+      no_accounts_found: Nie znaleziono niepołączonych kont Akahu.
+      no_credentials_configured: Skonfiguruj Akahu w ustawieniach dostawcy.
+      cancel: Anuluj
+      link_accounts: Połącz konta
+    link_accounts:
+      success:
+        few: "Połączono %{count} konta Akahu."
+        many: "Połączono %{count} kont Akahu."
+        one: Połączono 1 konto Akahu.
+        other: "Połączono %{count} kont Akahu."
+      no_accounts_selected: Wybierz co najmniej jedno konto.
+      no_credentials_configured: Skonfiguruj Akahu w ustawieniach dostawcy.
+      unsupported_account_type: Akahu nie obsługuje tego typu konta.
+      link_failed: Nie połączono żadnych kont.
+    select_existing_account:
+      title: "Połącz konto Akahu z %{account_name}"
+      description: Wybierz niepołączone konto Akahu do połączenia z tym kontem.
+      no_accounts_found: Nie znaleziono niepołączonych kont Akahu.
+      no_credentials_configured: Skonfiguruj Akahu w ustawieniach dostawcy.
+      account_already_linked: To konto jest już połączone z dostawcą.
+      cancel: Anuluj
+      link_account: Połącz konto
+    link_existing_account:
+      success: "Połączono konto Akahu z %{account_name}."
+      account_already_linked: To konto jest już połączone z dostawcą.
+      akahu_account_already_linked: To konto Akahu jest już połączone.
+    setup_accounts:
+      title: Konfiguruj konta Akahu
+      subtitle: Wybierz, jak każde konto Akahu ma być wyświetlane w Sure.
+      no_credentials: Najpierw skonfiguruj dane uwierzytelniające Akahu.
+      api_error: Nie można pobrać kont Akahu.
+      fetch_failed: Nie można pobrać kont
+      no_accounts_to_setup: Brak kont do skonfigurowania
+      all_accounts_linked: Wszystkie konta Akahu są już połączone.
+      choose_account_type: Wybierz typ konta
+      choose_account_type_description: Pomiń konta, których nie chcesz śledzić.
+      account_type_label: Typ konta
+      account_types:
+        skip: Pomiń
+        depository: Gotówkowe
+        credit_card: Karta kredytowa
+        investment: Inwestycyjne
+        loan: Pożyczka
+      create_accounts: Utwórz konta
+      cancel: Anuluj
+    complete_account_setup:
+      success:
+        few: "Utworzono %{count} konta Akahu."
+        many: "Utworzono %{count} kont Akahu."
+        one: Utworzono 1 konto Akahu.
+        other: "Utworzono %{count} kont Akahu."
+      all_skipped: Nie utworzono żadnych kont Akahu.
+      no_accounts: Nie wybrano żadnych kont Akahu.
+      creation_failed: Nie można utworzyć kont Akahu.
+    akahu_item:
+      deletion_in_progress: Trwa usuwanie
+      syncing: Synchronizowanie
+      error: Błąd
+      status_with_summary: "Zsynchronizowano %{timestamp} temu · %{summary}"
+      status_never: Nigdy nie synchronizowano
+      delete: Usuń
+      setup_needed: Wymagana konfiguracja konta
+      setup_description: "%{linked} z %{total} kont połączonych."
+      setup_action: Konfiguruj konta
+      no_accounts_title: Brak zaimportowanych kont
+      no_accounts_description: Pobierz konta Akahu i wybierz, które połączyć.
diff --git a/config/locales/views/akahu_items/ru.yml b/config/locales/views/akahu_items/ru.yml
new file mode 100644
index 000000000..4d8a5b723
--- /dev/null
+++ b/config/locales/views/akahu_items/ru.yml
@@ -0,0 +1,127 @@
+---
+ru:
+  akahu_account:
+    fallback: Akahu account
+  akahu_entry:
+    notes:
+      code: Code
+      other_account: Other account
+      particulars: Particulars
+      reference: Reference
+  akahu_item:
+    errors:
+      account_processing_failed: Could not sync Akahu account
+      account_sync_schedule_failed: Could not schedule Akahu account sync
+      pending_transactions_failed: Could not fetch Akahu pending transactions
+      sync_failed: Could not sync Akahu connection
+      transactions_failed: Could not fetch Akahu transactions
+    institution_summary:
+      count:
+        one: 1 institution
+        other: "%{count} institutions"
+      none: No institutions connected
+      one: 1 institution
+    sync_status:
+      all_synced:
+        one: 1 account synced
+        other: "%{count} accounts synced"
+      no_accounts: No accounts found
+      partial: "%{linked} synced, %{unlinked} need setup"
+  akahu_items:
+    akahu_item:
+      delete: Delete
+      deletion_in_progress: Deletion in progress
+      error: Error
+      no_accounts_description: Fetch Akahu accounts and choose which ones to link.
+      no_accounts_title: No accounts imported yet
+      setup_action: Setup accounts
+      setup_description: "%{linked} of %{total} accounts linked."
+      setup_needed: Account setup needed
+      status_never: Never synced
+      status_with_summary: Synced %{timestamp} ago · %{summary}
+      syncing: Syncing
+    complete_account_setup:
+      all_skipped: No Akahu accounts were created.
+      creation_failed: Could not create Akahu accounts.
+      no_accounts: No Akahu accounts were selected.
+      success:
+        one: Created 1 Akahu account.
+        other: Created %{count} Akahu accounts.
+    create:
+      success: Akahu connection saved.
+    destroy:
+      success: Scheduled Akahu connection for deletion.
+      unlink_failed: Could not disconnect Akahu connection
+    link_accounts:
+      link_failed: No accounts were linked.
+      no_accounts_selected: Select at least one account.
+      no_credentials_configured: Configure Akahu in provider settings first.
+      success:
+        one: Linked 1 Akahu account.
+        other: Linked %{count} Akahu accounts.
+      unsupported_account_type: Akahu does not support that account type.
+    link_existing_account:
+      account_already_linked: This account is already linked to a provider.
+      akahu_account_already_linked: This Akahu account is already linked.
+      success: Linked Akahu account to %{account_name}.
+    provider_panel:
+      add_connection: Add Akahu connection
+      app_token_label: App Token
+      app_token_placeholder: Paste your Akahu app token
+      connection_name_label: Connection name
+      connection_name_placeholder: Main Akahu
+      default_connection_name: Akahu Connection
+      disconnect: Disconnect
+      disconnect_confirm: Are you sure you want to disconnect %{name}?
+      keep_app_token_placeholder: Leave blank to keep the existing app token
+      keep_user_token_placeholder: Leave blank to keep the existing user token
+      setup_accounts: Setup accounts
+      sync: Sync
+      syncing: Syncing...
+      update_connection: Update connection
+      user_token_label: User Token
+      user_token_placeholder: Paste your Akahu user token
+    select_accounts:
+      cancel: Cancel
+      description: Choose the Akahu accounts to add.
+      link_accounts: Link accounts
+      no_accounts_found: No unlinked Akahu accounts were found.
+      no_credentials_configured: Configure Akahu in provider settings first.
+      title: Link Akahu accounts
+    select_existing_account:
+      account_already_linked: This account is already linked to a provider.
+      cancel: Cancel
+      description: Choose an unlinked Akahu account to connect to this account.
+      link_account: Link account
+      no_accounts_found: No unlinked Akahu accounts were found.
+      no_credentials_configured: Configure Akahu in provider settings first.
+      title: Link Akahu account to %{account_name}
+    setup_accounts:
+      account_type_label: Account type
+      account_types:
+        credit_card: Credit Card
+        depository: Cash
+        investment: Investment
+        loan: Loan
+        skip: Skip
+      all_accounts_linked: All Akahu accounts are already linked.
+      api_error: Could not fetch Akahu accounts.
+      cancel: Cancel
+      choose_account_type: Choose an account type
+      choose_account_type_description: Skip accounts you do not want to track.
+      create_accounts: Create accounts
+      fetch_failed: Could not fetch accounts
+      no_accounts_to_setup: No accounts to set up
+      no_credentials: Configure Akahu credentials first.
+      subtitle: Choose how each Akahu account should appear in Sure.
+      title: Set Up Akahu Accounts
+    update:
+      success: Akahu connection updated.
+  family:
+    akahu:
+      create_akahu_item:
+        default_name: Akahu Connection
+  providers:
+    akahu:
+      description: Connect New Zealand bank accounts via Akahu
+      name: Akahu
diff --git a/config/locales/views/akahu_items/tr.yml b/config/locales/views/akahu_items/tr.yml
new file mode 100644
index 000000000..168970561
--- /dev/null
+++ b/config/locales/views/akahu_items/tr.yml
@@ -0,0 +1,128 @@
+---
+tr:
+  akahu_account:
+    fallback: Akahu hesabı
+  akahu_entry:
+    notes:
+      code: Kod
+      other_account: Diğer hesap
+      particulars: Ayrıntılar
+      reference: Referans
+  akahu_item:
+    errors:
+      account_processing_failed: Akahu hesabı senkronize edilemedi
+      account_sync_schedule_failed: Akahu hesap senkronizasyonu zamanlanamadı
+      pending_transactions_failed: Bekleyen Akahu işlemleri alınamadı
+      sync_failed: Akahu bağlantısı senkronize edilemedi
+      transactions_failed: Akahu işlemleri alınamadı
+    institution_summary:
+      count:
+        one: 1 kurum
+        other: "%{count} kurum"
+      none: Bağlı kurum yok
+      one: 1 kurum
+    sync_status:
+      all_synced:
+        one: 1 hesap senkronize edildi
+        other: "%{count} hesap senkronize edildi"
+      no_accounts: Hesap bulunamadı
+      partial: "%{linked} senkronize edildi, %{unlinked} kurulum gerektiriyor"
+  akahu_items:
+    akahu_item:
+      delete: Sil
+      deletion_in_progress: Silme işlemi devam ediyor
+      error: Hata
+      no_accounts_description: Akahu hesaplarını getirin ve bağlamak istediklerinizi
+        seçin.
+      no_accounts_title: Henüz içe aktarılmış hesap yok
+      setup_action: Hesapları kur
+      setup_description: "%{total} hesaptan %{linked} tanesi bağlandı."
+      setup_needed: Hesap kurulumu gerekiyor
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: 'Senkronize edildi: %{timestamp} önce · %{summary}'
+      syncing: Senkronize ediliyor
+    complete_account_setup:
+      all_skipped: Hiç Akahu hesabı oluşturulmadı.
+      creation_failed: Akahu hesapları oluşturulamadı.
+      no_accounts: Hiç Akahu hesabı seçilmedi.
+      success:
+        one: 1 Akahu hesabı oluşturuldu.
+        other: "%{count} Akahu hesabı oluşturuldu."
+    create:
+      success: Akahu bağlantısı kaydedildi.
+    destroy:
+      success: Akahu bağlantısı silinmek üzere zamanlandı.
+      unlink_failed: Akahu bağlantısı kesilemedi
+    link_accounts:
+      link_failed: Hiç hesap bağlanmadı.
+      no_accounts_selected: En az bir hesap seçin.
+      no_credentials_configured: Önce sağlayıcı ayarlarında Akahu'yu yapılandırın.
+      success:
+        one: 1 Akahu hesabı bağlandı.
+        other: "%{count} Akahu hesabı bağlandı."
+      unsupported_account_type: Akahu bu hesap türünü desteklemiyor.
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı.
+      akahu_account_already_linked: Bu Akahu hesabı zaten bağlı.
+      success: Akahu hesabı %{account_name} ile bağlandı.
+    provider_panel:
+      add_connection: Akahu bağlantısı ekle
+      app_token_label: Uygulama Jetonu
+      app_token_placeholder: Akahu uygulama jetonunuzu yapıştırın
+      connection_name_label: Bağlantı adı
+      connection_name_placeholder: Ana Akahu
+      default_connection_name: Akahu Bağlantısı
+      disconnect: Bağlantıyı kes
+      disconnect_confirm: "%{name} bağlantısını kesmek istediğinizden emin misiniz?"
+      keep_app_token_placeholder: Mevcut uygulama jetonunu korumak için boş bırakın
+      keep_user_token_placeholder: Mevcut kullanıcı jetonunu korumak için boş bırakın
+      setup_accounts: Hesapları kur
+      sync: Senkronize et
+      syncing: Senkronize ediliyor...
+      update_connection: Bağlantıyı güncelle
+      user_token_label: Kullanıcı Jetonu
+      user_token_placeholder: Akahu kullanıcı jetonunuzu yapıştırın
+    select_accounts:
+      cancel: İptal
+      description: Eklemek istediğiniz Akahu hesaplarını seçin.
+      link_accounts: Hesapları bağla
+      no_accounts_found: Bağlı olmayan Akahu hesabı bulunamadı.
+      no_credentials_configured: Önce sağlayıcı ayarlarında Akahu'yu yapılandırın.
+      title: Akahu hesaplarını bağla
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı.
+      cancel: İptal
+      description: Bu hesaba bağlamak için bağlı olmayan bir Akahu hesabı seçin.
+      link_account: Hesabı bağla
+      no_accounts_found: Bağlı olmayan Akahu hesabı bulunamadı.
+      no_credentials_configured: Önce sağlayıcı ayarlarında Akahu'yu yapılandırın.
+      title: Akahu hesabını %{account_name} ile bağla
+    setup_accounts:
+      account_type_label: Hesap türü
+      account_types:
+        credit_card: Kredi Kartı
+        depository: Nakit
+        investment: Yatırım
+        loan: Kredi
+        skip: Atla
+      all_accounts_linked: Tüm Akahu hesapları zaten bağlı.
+      api_error: Akahu hesapları alınamadı.
+      cancel: İptal
+      choose_account_type: Bir hesap türü seçin
+      choose_account_type_description: Takip etmek istemediğiniz hesapları atlayın.
+      create_accounts: Hesapları oluştur
+      fetch_failed: Hesaplar alınamadı
+      no_accounts_to_setup: Kurulacak hesap yok
+      no_credentials: Önce Akahu kimlik bilgilerini yapılandırın.
+      subtitle: Her Akahu hesabının Sure'da nasıl görüneceğini seçin.
+      title: Akahu Hesaplarını Kurun
+    update:
+      success: Akahu bağlantısı güncellendi.
+  family:
+    akahu:
+      create_akahu_item:
+        default_name: Akahu Bağlantısı
+  providers:
+    akahu:
+      description: Akahu üzerinden Yeni Zelanda banka hesaplarınızı bağlayın
+      name: Akahu
diff --git a/config/locales/views/akahu_items/zh-CN.yml b/config/locales/views/akahu_items/zh-CN.yml
new file mode 100644
index 000000000..26776b065
--- /dev/null
+++ b/config/locales/views/akahu_items/zh-CN.yml
@@ -0,0 +1,127 @@
+---
+zh-CN:
+  providers:
+    akahu:
+      name: Akahu
+      description: 通过 Akahu 连接新西兰银行账户
+  family:
+    akahu:
+      create_akahu_item:
+        default_name: Akahu 连接
+  akahu_account:
+    fallback: Akahu 账户
+  akahu_entry:
+    notes:
+      reference: 参考号
+      particulars: 明细
+      code: 代码
+      other_account: 其他账户
+  akahu_item:
+    errors:
+      account_processing_failed: 无法同步 Akahu 账户
+      account_sync_schedule_failed: 无法安排 Akahu 账户同步
+      pending_transactions_failed: 无法获取 Akahu 待处理交易
+      transactions_failed: 无法获取 Akahu 交易
+      sync_failed: 无法同步 Akahu 连接
+    sync_status:
+      no_accounts: 未找到账户
+      all_synced:
+        one: 已同步 1 个账户
+        other: 已同步 %{count} 个账户
+      partial: 已同步 %{linked} 个，%{unlinked} 个需要设置
+    institution_summary:
+      none: 没有已连接的机构
+      one: 1 个机构
+      count:
+        one: 1 个机构
+        other: "%{count} 个机构"
+  akahu_items:
+    provider_panel:
+      default_connection_name: Akahu 连接
+      add_connection: 添加 Akahu 连接
+      update_connection: 更新 连接
+      connection_name_label: 连接名称
+      connection_name_placeholder: 主 Akahu 连接
+      app_token_label: App Token
+      app_token_placeholder: 粘贴 Akahu App Token
+      keep_app_token_placeholder: 留空以保留现有 App Token
+      user_token_label: 用户 令牌
+      user_token_placeholder: 粘贴 Akahu User Token
+      keep_user_token_placeholder: 留空以保留现有 User Token
+      setup_accounts: 设置账户
+      syncing: 正在同步...
+      sync: 同步
+      disconnect: 断开连接
+      disconnect_confirm: 确定要断开 %{name}？
+    create:
+      success: Akahu 连接已保存。
+    update:
+      success: Akahu 连接已更新。
+    destroy:
+      success: 已安排删除 Akahu 连接。
+      unlink_failed: 无法断开 Akahu 连接
+    select_accounts:
+      title: 关联 Akahu 账户
+      description: 选择要添加的 Akahu 账户。
+      no_accounts_found: 未找到未关联的 Akahu 账户。
+      no_credentials_configured: 请先在提供商设置中配置 Akahu。
+      cancel: 取消
+      link_accounts: 链接 账户
+    link_accounts:
+      success:
+        one: 已关联 1 个 Akahu 账户。
+        other: 已关联 %{count} 个 Akahu 账户。
+      no_accounts_selected: 请选择至少一个账户。
+      no_credentials_configured: 请先在提供商设置中配置 Akahu。
+      unsupported_account_type: Akahu 不支持该账户类型。
+      link_failed: 没有账户被关联。
+    select_existing_account:
+      title: 将 Akahu 账户关联到 %{account_name}
+      description: 选择一个未关联的 Akahu 账户连接到此账户。
+      no_accounts_found: 未找到未关联的 Akahu 账户。
+      no_credentials_configured: 请先在提供商设置中配置 Akahu。
+      account_already_linked: 此账户已关联到提供商。
+      cancel: 取消
+      link_account: 链接 账户
+    link_existing_account:
+      success: 已将 Akahu 账户关联到 %{account_name}。
+      account_already_linked: 此账户已关联到提供商。
+      akahu_account_already_linked: 此 Akahu 账户已关联。
+    setup_accounts:
+      title: 设置 Akahu 账户
+      subtitle: 选择每个 Akahu 账户在 Sure 中的显示方式。
+      no_credentials: 请先配置 Akahu 凭据。
+      api_error: 无法获取 Akahu 账户。
+      fetch_failed: 无法获取账户
+      no_accounts_to_setup: 没有需要设置的账户
+      all_accounts_linked: 所有 Akahu 账户都已关联。
+      choose_account_type: 选择账户类型
+      choose_account_type_description: 跳过不想跟踪的账户。
+      account_type_label: 账户类型
+      account_types:
+        skip: 跳过
+        depository: 现金
+        credit_card: 信用卡
+        investment: 投资
+        loan: 贷款
+      create_accounts: 创建账户
+      cancel: 取消
+    complete_account_setup:
+      success:
+        one: 已创建 1 个 Akahu 账户。
+        other: 已创建 %{count} 个 Akahu 账户。
+      all_skipped: 没有创建 Akahu 账户。
+      no_accounts: 没有选择 Akahu 账户。
+      creation_failed: 无法创建 Akahu 账户。
+    akahu_item:
+      deletion_in_progress: 正在删除
+      syncing: 正在同步
+      error: 错误
+      status_with_summary: "%{timestamp} 前已同步 · %{summary}"
+      status_never: 从未同步
+      delete: 删除
+      setup_needed: 需要设置账户
+      setup_description: 已关联 %{linked}/%{total} 个账户。
+      setup_action: 设置账户
+      no_accounts_title: 尚未导入账户
+      no_accounts_description: 获取 Akahu 账户并选择要关联的账户。
diff --git a/config/locales/views/application/fr.yml b/config/locales/views/application/fr.yml
index dd2daf2b3..3b1d8e977 100644
--- a/config/locales/views/application/fr.yml
+++ b/config/locales/views/application/fr.yml
@@ -1,5 +1,18 @@
 ---
 fr:
+  import:
+    uploads:
+      handle_qif_upload:
+        qif_uploaded: Aucun
+  lunchflow_items:
+    link_accounts:
+      no_api_key: Aucun
+    link_existing_account:
+      no_api_key: Aucun
+    select_accounts:
+      no_credentials_configured: Aucun
+    select_existing_account:
+      no_credentials_configured: Aucun
   number:
     currency:
       format:
@@ -8,3 +21,254 @@ fr:
         precision: 2
         separator: ","
         unit: "€"
+  settings:
+    hostings:
+      ensure_admin:
+        not_authorized: Aucun
+    providers:
+      binance_panel:
+        no_withdraw_body: N'activez pas les autorisations de retrait lors de la création
+          de votre clé API Binance. Bien sûr, il suffit d'un accès en lecture.
+        no_withdraw_title: Clé en lecture seule uniquement
+      clear_filter: Effacer les filtres
+      connect: Se connecter
+      drawer_trust_statement: Accès en lecture seule. Bien sûr, vous ne pourrez jamais
+        transférer d’argent et vos informations d’identification sont stockées cryptées.
+      empty_filter: Aucun fournisseur ne correspond à votre filtre.
+      enable_banking_panel:
+        add_connection: Ajouter une connexion
+        application_id_label: Identifiant de la demande
+        application_id_placeholder_new: Entrez l'ID de la demande
+        application_id_placeholder_update: Entrez le nouvel identifiant à mettre à
+          jour
+        client_certificate_label: Certificat client (avec clé privée)
+        config_locked_message: Déconnectez toutes les banques liées avant de modifier
+          ces informations d'identification.
+        config_locked_title: Configuration verrouillée
+        configured: Configuré
+        connect_bank: Connecter la banque
+        connected_bank: Banque connectée
+        connection: Connexion
+        country_label: Pays
+        ready_to_link: Prêt à lier des comptes
+        reconnect: Reconnecter
+        remove: Supprimer
+        remove_confirm: Êtes-vous sûr de vouloir supprimer cette connexion ?
+        save_and_connect: Enregistrez et connectez-vous
+        select_country: Sélectionnez le pays...
+        session_expired_reconnect: Session expirée - reconnectez-vous
+        session_expires: 'Expiration de la session : %{date}'
+        step_1_html: Accédez à %{link} et récupérez vos informations d'identification
+          de développeur.
+        step_2: Choisissez votre pays et collez l'ID d'application + le certificat
+          client ci-dessous.
+        step_3: Enregistrez, puis utilisez Ajouter une connexion pour lier votre banque.
+        sync: Synchroniser
+        syncing: Synchronisation
+        unknown: Inconnu
+        update_connection: Mettre à jour la connexion
+      groups:
+        available: Disponible
+        empty_available: Tous les fournisseurs disponibles sont connectés.
+        your_connections: Vos connexions
+      health_strip:
+        accounts_syncing: synchronisation des comptes
+        connected: connecté
+        last_synced: Dernière synchronisation il y a %{time}
+        needs_attention: a besoin d'attention
+      ibkr_panel:
+        accounts_tab: Comptes
+        configuration:
+          all_other_options: 'Toutes les autres options de configuration : "Non"'
+          date_format: 'Format de date : aaaa-MM-jj'
+          date_time_separator: Séparateur date/heure : ; (point-virgule)
+          format: 'Format : XML'
+          models: Modèles : facultatif
+          period: 'Période : 365 derniers jours calendaires'
+          profit_and_loss: Profits et pertes : par défaut
+          time_format: Format de l'heure : HH : mm : ss
+        disconnect_confirm: Déconnecter Interactive Brokers ?
+        flex_query_details:
+          configuration_heading: Définir ces options de requête
+          eyebrow: Requête flexible
+          sections_heading: Activer ces sections et champs
+          summary: Développez pour voir les sections, champs et paramètres exacts
+            que votre requête IBKR Activity Flex doit inclure.
+          title: Sections, champs et configuration
+        not_configured: Non configuré.
+        query_id_label: ID de requête
+        query_id_placeholder_existing: Laissez vide pour conserver l'ID de requête
+          actuel
+        query_id_placeholder_new: Entrez votre ID de requête IBKR Flex
+        report_window_note: Les rapports IBKR Flex sont limités à la fenêtre de requête
+          que vous avez configurée dans IBKR. Bien sûr, l'intégralité des fonds actuels
+          ainsi que les 365 derniers jours d'activité de ce rapport seront importés.
+        save_configuration: Enregistrer la configuration
+        sections:
+          account_information: 'Informations sur le compte : identifiant de compte,
+            devise'
+          cash_report: 'Rapport de caisse :'
+          cash_report_fields: 'Champs : Devise, Liquidités de fin'
+          cash_report_options: 'Options : Aucune'
+          cash_transactions: 'Opérations en espèces :'
+          cash_transactions_fields: 'Champs : Montant, Conid, Devise, Taux de change
+            par rapport à la base, Date du rapport, ID de transaction, Type'
+          cash_transactions_options: 'Options : Dividendes, Dépôts et retraits, Détail'
+          change_in_position_value_summary: 'Récapitulatif des modifications de la
+            valeur de position : devise, valeur de fin de période'
+          net_asset_value: 'Valeur Liquidative (VNI) en Base :'
+          net_asset_value_fields: 'Champs : Devise, Date du rapport, Total'
+          net_asset_value_options: 'Options : Aucune'
+          open_positions: 'Postes ouverts :'
+          open_positions_fields: 'Champs : Classe d''actifs, Conid, Prix de base,
+            Devise, Taux de change par rapport à la base, Prix de référence, Quantité,
+            Date du rapport, ID de titre, Type d''ID de titre, Côté, Symbole'
+          open_positions_options: Options : Résumé
+          trades: 'Métiers :'
+          trades_fields: 'Champs : Classe d''actifs, Achat/Vente, Conid, Devise, Taux
+            de change à la base, Commission IB, Devise de la Commission IB, Quantité,
+            Symbole, Date de transaction, ID de transaction, TradePrice, ID de transaction'
+          trades_options: 'Options : Exécution'
+        status_configured_prefix: "%{summary}. Visitez le"
+        status_configured_suffix: onglet pour gérer les comptes découverts.
+        steps:
+          step_1: Dans votre portail client IBKR, accédez à « Performances et rapports
+            » > « Requêtes flexibles ».
+          step_2: Cliquez sur l'icône "+" dans la section "Activity Flex Query" pour
+            créer une nouvelle requête.
+          step_3: Nommez votre requête (par exemple, « Sure Sync »), puis examinez
+            les détails de la requête Flex ci-dessous et activez les sections, champs
+            et options de configuration répertoriés.
+          step_4: Enregistrez la requête, notez votre « ID de requête », puis utilisez
+            l'icône d'engrenage dans la section « Configuration du service Web Flex
+            » pour générer un jeton d'accès.
+          step_5: Collez votre ID de requête et votre jeton ci-dessous, enregistrez
+            la configuration, puis accédez à Comptes pour lier les comptes IBKR découverts.
+        sync: Synchroniser
+        token_label: Jeton
+        token_placeholder_existing: Laisser vide pour conserver le jeton actuel
+        token_placeholder_new: Entrez votre jeton de service Web IBKR Flex
+        update_configuration: Mettre à jour la configuration
+      kraken_panel:
+        add_connection: Ajouter une connexion Kraken
+        api_key_label: Clé API
+        api_key_placeholder: Collez votre clé API Kraken
+        api_secret_label: Clé privée
+        api_secret_placeholder: Collez votre clé privée Kraken
+        connection_name_label: Nom de la connexion
+        connection_name_placeholder: Kraken principal
+        default_connection_name: Kraken
+        disconnect: Déconnecter
+        disconnect_confirm: Êtes-vous sûr de vouloir déconnecter %{name} ?
+        keep_api_key_placeholder: Laissez vide pour conserver la clé API existante
+        keep_api_secret_placeholder: Laisser vide pour conserver la clé privée existante
+        read_only_body: N’accordez pas d’autorisations de négociation, d’annulation,
+          de retrait, d’exportation, de grand livre, de gain, de jalonnement ou de
+          transfert. Bien sûr, n'importe que les soldes, les holdings et les transactions
+          au comptant.
+        read_only_title: Synchronisation d'échange en lecture seule uniquement
+        setup_accounts: Configurer le compte
+        step1_html: Accédez aux <a href="https://pro.kraken.com/app/settings/api"
+          target="_blank" rel="noopener noreferrer" class="underline">Paramètres de
+          l'API Kraken</a>
+        step2: Créez une clé API avec Query Funds et Query Closed Orders & Trades
+          uniquement.
+        step3: Collez la clé API et la clé privée ci-dessous.
+        sync: Synchroniser
+        syncing: Synchronisation...
+        update_connection: Mettre à jour la connexion
+      lunchflow_panel:
+        api_key_label: Clé API
+        api_key_placeholder_new: Collez la clé API ici
+        api_key_placeholder_update: Saisissez la nouvelle clé API à mettre à jour
+        base_url_label: URL de base (facultatif)
+        base_url_placeholder: https://lunchflow.app/api/v1 (par défaut)
+        save_and_connect: Enregistrez et connectez-vous
+        step_1_html: Accédez à %{link} et créez une clé API.
+        step_2: Collez votre clé ci-dessous et connectez-vous.
+        step_3: Dirigez-vous ensuite vers Comptes pour lier vos comptes synchronisés.
+        update_connection: Mettre à jour la connexion
+      maturity:
+        alpha: Alpha
+        beta: Bêta
+      meta:
+        last_synced: Synchronisé il y a %{time}
+        no_recent_sync: Synchronisation en retard
+        reconsent_needed:
+          one: Re-consentement nécessaire dans 1 jour
+          other: Renouvellement du consentement requis dans %{count} jours
+        reconsent_required: Re-consentement requis
+        sync_error: Erreur de synchronisation
+      not_found: Fournisseur introuvable.
+      plaid_eu_panel:
+        step_1_html: Ouvrez le %{link} et copiez votre identifiant client européen
+          et votre clé secrète.
+      plaid_panel:
+        step_1_html: Ouvrez le %{link} et copiez votre identifiant client et votre
+          clé secrète.
+        step_2: Choisissez un environnement. Utilisez le bac à sable pour les tests
+          et la production de comptes réels.
+        step_3: Collez vos identifiants ci-dessous et connectez-vous.
+      provider_form:
+        save_and_connect: Enregistrez et connectez-vous
+      recently_synced: Synchronisé récemment. Réessayez dans un instant.
+      search_filters:
+        aria_label: Fournisseurs de recherche
+        chips:
+          all: Tout
+          bank: Banques
+          crypto: Cryptomonnaie
+          investment: Investissements
+        placeholder: Fournisseurs de recherche
+      setup_steps:
+        eyebrow: Configuration
+        need_help: Besoin d'aide ?
+      simplefin_panel:
+        save_and_connect: Enregistrez et connectez-vous
+        setup_token_label: Jeton de configuration
+        setup_token_placeholder: Coller le jeton de configuration SimpleFIN
+        step_1_html: Accédez à %{link} pour un jeton de configuration unique.
+        step_2: Collez le jeton ci-dessous et connectez-vous.
+        step_3: Dirigez-vous ensuite vers Comptes pour lier vos comptes synchronisés.
+      status:
+        'false': Non configuré
+      sync_all: Synchroniser tout
+      sync_all_in_progress: Synchronisation de tous les fournisseurs connectés…
+      sync_all_recently: Synchronisation déjà en cours. Réessayez dans un instant.
+      sync_provider: Synchronisez maintenant
+      sync_provider_in_progress: La synchronisation a commencé.
+      sync_provider_no_items: Aucune connexion disponible pour synchroniser.
+      taglines:
+        binance: Synchronisez vos soldes spot Binance à l'aide d'une clé API en lecture
+          seule.
+        brex: Synchronisez l'activité des espèces Brex et des cartes d'entreprise
+          avec un accès en lecture seule.
+        coinbase: Importez vos holdings cryptographiques Coinbase et suivez les performances.
+        coinstats: Suivez l’intégralité de votre portefeuille de crypto-monnaies sur
+          les portefeuilles et les échanges.
+        enable_banking: Synchronisez les comptes bancaires européens via l'open banking
+          PSD2.
+        ibkr: Synchronisez les comptes d'investissement Interactive Brokers via les
+          importations Flex Query.
+        indexa_capital: Suivez votre portefeuille d'investissement automatisé Indexa
+          Capital.
+        kraken: Synchronisez les soldes Kraken et les transactions au comptant à l'aide
+          d'une clé API en lecture seule.
+        lunchflow: Connectez plus de 20 000 banques dans plus de 40 pays (Royaume-Uni,
+          UE, États-Unis et plus !)
+        mercury: Synchronisez automatiquement vos comptes bancaires professionnels
+          Mercury.
+        plaid: Connectez des milliers d'institutions financières américaines via Plaid.
+        plaid_eu: Connectez les institutions financières européennes via Plaid (PSD2
+          / Open Banking).
+        simplefin: Connectez les comptes bancaires américains via le protocole ouvert
+          SimpleFIN.
+        snaptrade: Connectez les comptes de courtage via le réseau d'agrégation SnapTrade.
+        sophtron: Connectez les banques et les services publics américains et canadiens.
+  simplefin_items:
+    select_existing_account:
+      check_provider_health: Aucun
+  valuations:
+    new:
+      amount: Aucun
+      submit: Aucun
diff --git a/config/locales/views/application/it.yml b/config/locales/views/application/it.yml
new file mode 100644
index 000000000..8885b4962
--- /dev/null
+++ b/config/locales/views/application/it.yml
@@ -0,0 +1,10 @@
+---
+it:
+  number:
+    currency:
+      format:
+        delimiter: "."
+        format: "%n %u"
+        precision: 2
+        separator: ","
+        unit: "€"
diff --git a/config/locales/views/application/ru.yml b/config/locales/views/application/ru.yml
new file mode 100644
index 000000000..2c203dcf2
--- /dev/null
+++ b/config/locales/views/application/ru.yml
@@ -0,0 +1,10 @@
+---
+ru:
+  number:
+    currency:
+      format:
+        delimiter: " "
+        format: "%n %u"
+        precision: 2
+        separator: ","
+        unit: "₽"
diff --git a/config/locales/views/application/tr.yml b/config/locales/views/application/tr.yml
index c35d748f0..31158f508 100644
--- a/config/locales/views/application/tr.yml
+++ b/config/locales/views/application/tr.yml
@@ -7,4 +7,4 @@ tr:
         format: "%n %u"
         precision: 2
         separator: ","
-        unit: "₺"
\ No newline at end of file
+        unit: "₺"
diff --git a/config/locales/views/binance_items/de.yml b/config/locales/views/binance_items/de.yml
new file mode 100644
index 000000000..52c731826
--- /dev/null
+++ b/config/locales/views/binance_items/de.yml
@@ -0,0 +1,75 @@
+---
+de:
+  binance_items:
+    create:
+      default_name: Binance
+      success: Erfolgreich mit Binance verbunden! Ihr Konto wird synchronisiert.
+    update:
+      success: Binance-Konfiguration wurde erfolgreich aktualisiert.
+    destroy:
+      success: Binance-Verbindung wurde zur Löschung vorgemerkt.
+    setup_accounts:
+      title: Binance-Konto importieren
+      subtitle: Wählen Sie die zu verfolgenden Portfolios
+      instructions: Wählen Sie die Binance-Portfolios aus, die Sie importieren möchten. Es werden nur Portfolios mit Salden angezeigt.
+      no_accounts: Alle Konten wurden bereits importiert.
+      accounts_count:
+        one: "%{count} Konto verfügbar"
+        other: "%{count} Konten verfügbar"
+      select_all: Alle auswählen
+      import_selected: Ausgewählte importieren
+      cancel: Abbrechen
+      creating: Importiere...
+    complete_account_setup:
+      success:
+        one: "%{count} Konto importiert"
+        other: "%{count} Konten importiert"
+      none_selected: Keine Konten ausgewählt
+      no_accounts: Keine Konten zum Import
+    binance_item:
+      provider_name: Binance
+      syncing: Synchronisiere...
+      reconnect: Zugangsdaten müssen aktualisiert werden
+      deletion_in_progress: Wird gelöscht...
+      sync_status:
+        no_accounts: Keine Konten gefunden
+        all_synced:
+          one: "%{count} Konto synchronisiert"
+          other: "%{count} Konten synchronisiert"
+        partial_sync: "%{linked_count} synchronisiert, %{unlinked_count} müssen eingerichtet werden"
+      status: "Zuletzt synchronisiert vor %{timestamp}"
+      status_with_summary: "Zuletzt synchronisiert vor %{timestamp} – %{summary}"
+      status_never: Noch nie synchronisiert
+      update_credentials: Zugangsdaten aktualisieren
+      delete: Löschen
+      no_accounts_title: Keine Konten gefunden
+      no_accounts_message: Ihr Binance-Portfolio erscheint hier nach der Synchronisierung.
+      setup_needed: Konto bereit zum Import
+      setup_description: Wählen Sie die Binance-Portfolios, die Sie verfolgen möchten.
+      setup_action: Konto importieren
+      import_accounts_menu: Konto importieren
+      stale_rate_warning: "Der Saldo ist ein Näherungswert – der genaue Wechselkurs für %{date} war nicht verfügbar. Er wird bei der nächsten Synchronisierung aktualisiert."
+    select_existing_account:
+      title: Binance-Konto verknüpfen
+      no_accounts_found: Keine Binance-Konten gefunden.
+      wait_for_sync: Warten Sie, bis Binance die Synchronisierung abgeschlossen hat
+      check_provider_health: Prüfen Sie, ob Ihre Binance-API-Zugangsdaten gültig sind
+      currently_linked_to: "Aktuell verknüpft mit: %{account_name}"
+      link: Verknüpfen
+      cancel: Abbrechen
+    link_existing_account:
+      success: Erfolgreich mit Binance-Konto verknüpft
+      errors:
+        only_manual: Nur manuelle Konten können mit Binance verknüpft werden
+        invalid_binance_account: Ungültiges Binance-Konto
+  binance_item:
+    syncer:
+      checking_credentials: Zugangsdaten werden geprüft...
+      credentials_invalid: Ungültige API-Zugangsdaten. Bitte überprüfen Sie Ihren API-Schlüssel und Ihr Secret.
+      importing_accounts: Konten werden von Binance importiert...
+      checking_configuration: Kontokonfiguration wird geprüft...
+      accounts_need_setup:
+        one: "%{count} Konto muss eingerichtet werden"
+        other: "%{count} Konten müssen eingerichtet werden"
+      processing_accounts: Kontodaten werden verarbeitet...
+      calculating_balances: Salden werden berechnet...
diff --git a/config/locales/views/binance_items/es.yml b/config/locales/views/binance_items/es.yml
new file mode 100644
index 000000000..2b83aa0bd
--- /dev/null
+++ b/config/locales/views/binance_items/es.yml
@@ -0,0 +1,75 @@
+---
+es:
+  binance_items:
+    create:
+      default_name: Binance
+      success: ¡Conexión con Binance establecida con éxito! Tu cuenta se está sincronizando.
+    update:
+      success: Configuración de Binance actualizada correctamente.
+    destroy:
+      success: Conexión de Binance programada para su eliminación.
+    setup_accounts:
+      title: Importar cuenta de Binance
+      subtitle: Selecciona qué carteras quieres seguir
+      instructions: Selecciona las carteras de Binance que quieres importar. Solo se muestran las carteras con saldos.
+      no_accounts: Se han importado todas las cuentas.
+      accounts_count:
+        one: "%{count} cuenta disponible"
+        other: "%{count} cuentas disponibles"
+      select_all: Seleccionar todas
+      import_selected: Importar seleccionadas
+      cancel: Cancelar
+      creating: Importando...
+    complete_account_setup:
+      success:
+        one: "Se ha importado %{count} cuenta"
+        other: "Se han importado %{count} cuentas"
+      none_selected: No se ha seleccionado ninguna cuenta
+      no_accounts: No hay cuentas para importar
+    binance_item:
+      provider_name: Binance
+      syncing: Sincronizando...
+      reconnect: Es necesario actualizar las credenciales
+      deletion_in_progress: Eliminando...
+      sync_status:
+        no_accounts: No se han encontrado cuentas
+        all_synced:
+          one: "%{count} cuenta sincronizada"
+          other: "%{count} cuentas sincronizadas"
+        partial_sync: "%{linked_count} sincronizadas, %{unlinked_count} necesitan configuración"
+      status: "Sincronizado hace %{timestamp}"
+      status_with_summary: "Sincronizado hace %{timestamp} - %{summary}"
+      status_never: Nunca sincronizado
+      update_credentials: Actualizar credenciales
+      delete: Eliminar
+      no_accounts_title: No se han encontrado cuentas
+      no_accounts_message: Tu cartera de Binance aparecerá aquí después de la sincronización.
+      setup_needed: Cuenta lista para importar
+      setup_description: Selecciona qué carteras de Binance quieres seguir.
+      setup_action: Importar cuenta
+      import_accounts_menu: Importar cuenta
+      stale_rate_warning: "El saldo es aproximado: el tipo de cambio exacto para %{date} no estaba disponible. Se actualizará en la próxima sincronización."
+    select_existing_account:
+      title: Vincular cuenta de Binance
+      no_accounts_found: No se han encontrado cuentas de Binance.
+      wait_for_sync: Espera a que Binance termine de sincronizar
+      check_provider_health: Comprueba que tus credenciales de la API de Binance sean válidas
+      currently_linked_to: "Actualmente vinculada a: %{account_name}"
+      link: Vincular
+      cancel: Cancelar
+    link_existing_account:
+      success: Vinculado correctamente a la cuenta de Binance
+      errors:
+        only_manual: Solo las cuentas manuales pueden vincularse a Binance
+        invalid_binance_account: Cuenta de Binance no válida
+  binance_item:
+    syncer:
+      checking_credentials: Comprobando credenciales...
+      credentials_invalid: Credenciales de la API no válidas. Comprueba tu clave de API y tu secreto.
+      importing_accounts: Importando cuentas desde Binance...
+      checking_configuration: Comprobando la configuración de la cuenta...
+      accounts_need_setup:
+        one: "%{count} cuenta necesita configuración"
+        other: "%{count} cuentas necesitan configuración"
+      processing_accounts: Procesando los datos de la cuenta...
+      calculating_balances: Calculando saldos...
diff --git a/config/locales/views/binance_items/fr.yml b/config/locales/views/binance_items/fr.yml
index 9ec085aa4..3bab2b20f 100644
--- a/config/locales/views/binance_items/fr.yml
+++ b/config/locales/views/binance_items/fr.yml
@@ -1,75 +1,79 @@
 ---
 fr:
-  binance_items:
-    create:
-      default_name: Binance
-      success: Connexion à Binance réussie. Votre compte est en cours de synchronisation.
-    update:
-      success: Configuration Binance mise à jour.
-    destroy:
-      success: Connexion Binance mise en file d'attente pour suppression.
-    setup_accounts:
-      title: Importer le compte Binance
-      subtitle: Sélectionnez les portefeuilles à suivre
-      instructions: Sélectionnez les portefeuilles Binance que vous souhaitez importer. Seuls les portefeuilles avec un solde sont affichés.
-      no_accounts: Tous les comptes ont été importés.
-      accounts_count:
-        one: "%{count} compte disponible"
-        other: "%{count} comptes disponibles"
-      select_all: Tout sélectionner
-      import_selected: Importer la sélection
-      cancel: Annuler
-      creating: Importation…
-    complete_account_setup:
-      success:
-        one: "%{count} compte importé"
-        other: "%{count} comptes importés"
-      none_selected: Aucun compte sélectionné
-      no_accounts: Aucun compte à importer
-    binance_item:
-      provider_name: Binance
-      syncing: Synchronisation…
-      reconnect: Identifiants à mettre à jour
-      deletion_in_progress: Suppression…
-      sync_status:
-        no_accounts: Aucun compte trouvé
-        all_synced:
-          one: "%{count} compte synchronisé"
-          other: "%{count} comptes synchronisés"
-        partial_sync: "%{linked_count} synchronisé(s), %{unlinked_count} à configurer"
-      status: "Dernière synchronisation il y a %{timestamp}"
-      status_with_summary: "Dernière synchronisation il y a %{timestamp} - %{summary}"
-      status_never: Jamais synchronisé
-      update_credentials: Mettre à jour les identifiants
-      delete: Supprimer
-      no_accounts_title: Aucun compte trouvé
-      no_accounts_message: Votre portefeuille Binance apparaîtra ici après la synchronisation.
-      setup_needed: Compte prêt à être importé
-      setup_description: Sélectionnez les portefeuilles Binance que vous souhaitez suivre.
-      setup_action: Importer le compte
-      import_accounts_menu: Importer le compte
-      stale_rate_warning: "Solde approximatif — le taux de change exact du %{date} n'était pas disponible. Il sera mis à jour lors de la prochaine synchronisation."
-    select_existing_account:
-      title: Lier un compte Binance
-      no_accounts_found: Aucun compte Binance trouvé.
-      wait_for_sync: Attendez que Binance termine la synchronisation
-      check_provider_health: Vérifiez que vos identifiants API Binance sont valides
-      currently_linked_to: "Actuellement lié à : %{account_name}"
-      link: Lier
-      cancel: Annuler
-    link_existing_account:
-      success: Compte Binance lié avec succès
-      errors:
-        only_manual: Seuls les comptes manuels peuvent être liés à Binance
-        invalid_binance_account: Compte Binance invalide
   binance_item:
     syncer:
-      checking_credentials: Vérification des identifiants…
-      credentials_invalid: Identifiants API invalides. Veuillez vérifier votre clé API et votre secret.
-      importing_accounts: Importation des comptes depuis Binance…
-      checking_configuration: Vérification de la configuration du compte…
       accounts_need_setup:
         one: "%{count} compte à configurer"
         other: "%{count} comptes à configurer"
-      processing_accounts: Traitement des données du compte…
       calculating_balances: Calcul des soldes…
+      checking_configuration: Vérification de la configuration du compte…
+      checking_credentials: Vérification des identifiants…
+      credentials_invalid: Identifiants API invalides. Veuillez vérifier votre clé
+        API et votre secret.
+      importing_accounts: Importation des comptes depuis Binance…
+      processing_accounts: Traitement des données du compte…
+  binance_items:
+    binance_item:
+      delete: Supprimer
+      deletion_in_progress: Suppression…
+      import_accounts_menu: Importer le compte
+      no_accounts_message: Votre portefeuille Binance apparaîtra ici après la synchronisation.
+      no_accounts_title: Aucun compte trouvé
+      provider_name: Binance
+      reconnect: Identifiants à mettre à jour
+      setup_action: Importer le compte
+      setup_description: Sélectionnez les portefeuilles Binance que vous souhaitez
+        suivre.
+      setup_needed: Compte prêt à être importé
+      stale_rate_warning: Solde approximatif — le taux de change exact du %{date}
+        n'était pas disponible. Il sera mis à jour lors de la prochaine synchronisation.
+      status: Dernière synchronisation il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} - %{summary}
+      sync_status:
+        all_synced:
+          one: "%{count} compte synchronisé"
+          other: "%{count} comptes synchronisés"
+        no_accounts: Aucun compte trouvé
+        partial_sync: "%{linked_count} synchronisé(s), %{unlinked_count} à configurer"
+      syncing: Synchronisation…
+      update_credentials: Mettre à jour les identifiants
+    complete_account_setup:
+      no_accounts: Aucun compte à importer
+      none_selected: Aucun compte sélectionné
+      success:
+        one: "%{count} compte importé"
+        other: "%{count} comptes importés"
+    create:
+      default_name: Binance
+      success: Connexion à Binance réussie. Votre compte est en cours de synchronisation.
+    destroy:
+      success: Connexion Binance mise en file d'attente pour suppression.
+    link_existing_account:
+      errors:
+        invalid_binance_account: Compte Binance invalide
+        only_manual: Seuls les comptes manuels peuvent être liés à Binance
+      success: Compte Binance lié avec succès
+    select_existing_account:
+      cancel: Annuler
+      check_provider_health: Vérifiez que vos identifiants API Binance sont valides
+      currently_linked_to: 'Actuellement lié à : %{account_name}'
+      link: Lier
+      no_accounts_found: Aucun compte Binance trouvé.
+      title: Lier un compte Binance
+      wait_for_sync: Attendez que Binance termine la synchronisation
+    setup_accounts:
+      accounts_count:
+        one: "%{count} compte disponible"
+        other: "%{count} comptes disponibles"
+      cancel: Annuler
+      creating: Importation…
+      import_selected: Importer la sélection
+      instructions: Sélectionnez les portefeuilles Binance que vous souhaitez importer.
+        Seuls les portefeuilles avec un solde sont affichés.
+      no_accounts: Tous les comptes ont été importés.
+      select_all: Tout sélectionner
+      subtitle: Sélectionnez les portefeuilles à suivre
+      title: Importer le compte Binance
+    update:
+      success: Configuration Binance mise à jour.
diff --git a/config/locales/views/binance_items/it.yml b/config/locales/views/binance_items/it.yml
new file mode 100644
index 000000000..14cb5e753
--- /dev/null
+++ b/config/locales/views/binance_items/it.yml
@@ -0,0 +1,75 @@
+---
+it:
+  binance_items:
+    create:
+      default_name: Binance
+      success: Connessione a Binance riuscita! Il tuo conto viene sincronizzato.
+    update:
+      success: Configurazione Binance aggiornata con successo.
+    destroy:
+      success: Connessione Binance pianificata per l'eliminazione.
+    setup_accounts:
+      title: Importa conto Binance
+      subtitle: Seleziona quali portafogli tracciare
+      instructions: Seleziona i portafogli Binance che vuoi importare. Vengono mostrati solo i portafogli con saldi.
+      no_accounts: Tutti i conti sono stati importati.
+      accounts_count:
+        one: "%{count} conto disponibile"
+        other: "%{count} conti disponibili"
+      select_all: Seleziona tutto
+      import_selected: Importa selezionati
+      cancel: Annulla
+      creating: Importazione in corso...
+    complete_account_setup:
+      success:
+        one: "Importato %{count} conto"
+        other: "Importati %{count} conti"
+      none_selected: Nessun conto selezionato
+      no_accounts: Nessun conto da importare
+    binance_item:
+      provider_name: Binance
+      syncing: Sincronizzazione in corso...
+      reconnect: Le credenziali devono essere aggiornate
+      deletion_in_progress: Eliminazione in corso...
+      sync_status:
+        no_accounts: Nessun conto trovato
+        all_synced:
+          one: "%{count} conto sincronizzato"
+          other: "%{count} conti sincronizzati"
+        partial_sync: "%{linked_count} sincronizzati, %{unlinked_count} da configurare"
+      status: "Ultima sincronizzazione %{timestamp} fa"
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      status_never: Mai sincronizzato
+      update_credentials: Aggiorna credenziali
+      delete: Elimina
+      no_accounts_title: Nessun conto trovato
+      no_accounts_message: Il tuo portafoglio Binance apparirà qui dopo la sincronizzazione.
+      setup_needed: Conto pronto per l'importazione
+      setup_description: Seleziona quali portafogli Binance vuoi tracciare.
+      setup_action: Importa conto
+      import_accounts_menu: Importa conto
+      stale_rate_warning: "Il saldo è approssimativo — il tasso di cambio esatto per %{date} non era disponibile. Verrà aggiornato alla prossima sincronizzazione."
+    select_existing_account:
+      title: Collega conto Binance
+      no_accounts_found: Nessun conto Binance trovato.
+      wait_for_sync: Attendi il completamento della sincronizzazione Binance
+      check_provider_health: Verifica che le tue credenziali API Binance siano valide
+      currently_linked_to: "Attualmente collegato a: %{account_name}"
+      link: Collega
+      cancel: Annulla
+    link_existing_account:
+      success: Collegato con successo al conto Binance
+      errors:
+        only_manual: Solo i conti manuali possono essere collegati a Binance
+        invalid_binance_account: Conto Binance non valido
+  binance_item:
+    syncer:
+      checking_credentials: Verifica credenziali...
+      credentials_invalid: Credenziali API non valide. Controlla la tua chiave API e il segreto.
+      importing_accounts: Importazione conti da Binance...
+      checking_configuration: Verifica configurazione conto...
+      accounts_need_setup:
+        one: "%{count} conto da configurare"
+        other: "%{count} conti da configurare"
+      processing_accounts: Elaborazione dati conto...
+      calculating_balances: Calcolo saldi...
diff --git a/config/locales/views/binance_items/nl.yml b/config/locales/views/binance_items/nl.yml
new file mode 100644
index 000000000..22ee29759
--- /dev/null
+++ b/config/locales/views/binance_items/nl.yml
@@ -0,0 +1,75 @@
+---
+nl:
+  binance_items:
+    create:
+      default_name: Binance
+      success: Succesvol verbonden met Binance! Uw account wordt gesynchroniseerd.
+    update:
+      success: Binance-configuratie succesvol bijgewerkt.
+    destroy:
+      success: Binance-verbinding is in de wachtrij voor verwijdering geplaatst.
+    setup_accounts:
+      title: Binance-account importeren
+      subtitle: Selecteer welke portefeuilles u wilt volgen
+      instructions: Selecteer de Binance-portefeuilles die u wilt importeren. Alleen portefeuilles met saldo worden weergegeven.
+      no_accounts: Alle accounts zijn geïmporteerd.
+      accounts_count:
+        one: "%{count} account beschikbaar"
+        other: "%{count} accounts beschikbaar"
+      select_all: Alles selecteren
+      import_selected: Geselecteerde importeren
+      cancel: Annuleren
+      creating: Importeren...
+    complete_account_setup:
+      success:
+        one: "%{count} account geïmporteerd"
+        other: "%{count} accounts geïmporteerd"
+      none_selected: Geen accounts geselecteerd
+      no_accounts: Geen accounts om te importeren
+    binance_item:
+      provider_name: Binance
+      syncing: Synchroniseren...
+      reconnect: Inloggegevens moeten worden bijgewerkt
+      deletion_in_progress: Verwijderen...
+      sync_status:
+        no_accounts: Geen accounts gevonden
+        all_synced:
+          one: "%{count} account gesynchroniseerd"
+          other: "%{count} accounts gesynchroniseerd"
+        partial_sync: "%{linked_count} gesynchroniseerd, %{unlinked_count} moeten worden ingesteld"
+      status: "Laatst gesynchroniseerd %{timestamp} geleden"
+      status_with_summary: "Laatst gesynchroniseerd %{timestamp} geleden - %{summary}"
+      status_never: Nooit gesynchroniseerd
+      update_credentials: Inloggegevens bijwerken
+      delete: Verwijderen
+      no_accounts_title: Geen accounts gevonden
+      no_accounts_message: Uw Binance-portefeuille verschijnt hier na de synchronisatie.
+      setup_needed: Account klaar om te importeren
+      setup_description: Selecteer welke Binance-portefeuilles u wilt volgen.
+      setup_action: Account importeren
+      import_accounts_menu: Account importeren
+      stale_rate_warning: "Het saldo is bij benadering — de exacte wisselkoers voor %{date} was niet beschikbaar. Wordt bijgewerkt bij de volgende synchronisatie."
+    select_existing_account:
+      title: Binance-account koppelen
+      no_accounts_found: Geen Binance-accounts gevonden.
+      wait_for_sync: Wacht tot Binance klaar is met synchroniseren
+      check_provider_health: Controleer of uw Binance-API-inloggegevens geldig zijn
+      currently_linked_to: "Momenteel gekoppeld aan: %{account_name}"
+      link: Koppelen
+      cancel: Annuleren
+    link_existing_account:
+      success: Succesvol gekoppeld aan Binance-account
+      errors:
+        only_manual: Alleen handmatige accounts kunnen aan Binance worden gekoppeld
+        invalid_binance_account: Ongeldig Binance-account
+  binance_item:
+    syncer:
+      checking_credentials: Inloggegevens controleren...
+      credentials_invalid: Ongeldige API-inloggegevens. Controleer uw API-sleutel en secret.
+      importing_accounts: Accounts importeren vanuit Binance...
+      checking_configuration: Accountconfiguratie controleren...
+      accounts_need_setup:
+        one: "%{count} account moet worden ingesteld"
+        other: "%{count} accounts moeten worden ingesteld"
+      processing_accounts: Accountgegevens verwerken...
+      calculating_balances: Saldi berekenen...
diff --git a/config/locales/views/binance_items/pl.yml b/config/locales/views/binance_items/pl.yml
new file mode 100644
index 000000000..d3e7d6d3e
--- /dev/null
+++ b/config/locales/views/binance_items/pl.yml
@@ -0,0 +1,83 @@
+---
+pl:
+  binance_items:
+    create:
+      default_name: Binance
+      success: Połączono z Binance! Twoje konto jest synchronizowane.
+    update:
+      success: Zaktualizowano konfigurację Binance.
+    destroy:
+      success: Zaplanowano usunięcie połączenia Binance.
+    setup_accounts:
+      title: Importuj konto Binance
+      subtitle: Wybierz portfele do śledzenia
+      instructions: Wybierz portfele Binance, które chcesz zaimportować. Wyświetlane są tylko portfele z saldem.
+      no_accounts: Wszystkie konta zostały zaimportowane.
+      accounts_count:
+        few: "%{count} konta dostępne"
+        many: "%{count} kont dostępnych"
+        one: "%{count} konto dostępne"
+        other: "%{count} kont dostępnych"
+      select_all: Zaznacz wszystkie
+      import_selected: Importuj zaznaczone
+      cancel: Anuluj
+      creating: Importowanie...
+    complete_account_setup:
+      success:
+        few: "Zaimportowano %{count} konta"
+        many: "Zaimportowano %{count} kont"
+        one: "Zaimportowano %{count} konto"
+        other: "Zaimportowano %{count} kont"
+      none_selected: Nie wybrano kont
+      no_accounts: Brak kont do zaimportowania
+    binance_item:
+      provider_name: Binance
+      syncing: Synchronizowanie...
+      reconnect: Wymagana aktualizacja danych uwierzytelniających
+      deletion_in_progress: Usuwanie...
+      sync_status:
+        no_accounts: Nie znaleziono kont
+        all_synced:
+          few: "%{count} konta zsynchronizowane"
+          many: "%{count} kont zsynchronizowanych"
+          one: "%{count} konto zsynchronizowane"
+          other: "%{count} kont zsynchronizowanych"
+        partial_sync: "%{linked_count} zsynchronizowanych, %{unlinked_count} wymaga konfiguracji"
+      status: "Ostatnia synchronizacja %{timestamp} temu"
+      status_with_summary: "Ostatnia synchronizacja %{timestamp} temu - %{summary}"
+      status_never: Nigdy nie synchronizowano
+      update_credentials: Aktualizuj dane uwierzytelniające
+      delete: Usuń
+      no_accounts_title: Nie znaleziono kont
+      no_accounts_message: Twój portfel Binance pojawi się tutaj po synchronizacji.
+      setup_needed: Konto gotowe do importu
+      setup_description: Wybierz, które portfele Binance chcesz śledzić.
+      setup_action: Importuj konto
+      import_accounts_menu: Importuj konto
+      stale_rate_warning: "Saldo jest przybliżone - dokładny kurs wymiany z %{date} był niedostępny. Zaktualizuje się przy następnej synchronizacji."
+    select_existing_account:
+      title: Połącz konto Binance
+      no_accounts_found: Nie znaleziono kont Binance.
+      wait_for_sync: Poczekaj na zakończenie synchronizacji Binance
+      check_provider_health: Sprawdź, czy dane uwierzytelniające API Binance są prawidłowe
+      currently_linked_to: "Obecnie połączone z: %{account_name}"
+      link: Połącz
+      cancel: Anuluj
+    link_existing_account:
+      success: Połączono z kontem Binance
+      errors:
+        only_manual: Tylko konta ręczne mogą być połączone z Binance
+        invalid_binance_account: Nieprawidłowe konto Binance
+  binance_item:
+    syncer:
+      checking_credentials: Sprawdzanie danych uwierzytelniających...
+      credentials_invalid: Nieprawidłowe dane uwierzytelniające API. Sprawdź swój klucz API i sekret.
+      importing_accounts: Importowanie kont z Binance...
+      checking_configuration: Sprawdzanie konfiguracji konta...
+      accounts_need_setup:
+        few: "%{count} konta wymagają konfiguracji"
+        many: "%{count} kont wymaga konfiguracji"
+        one: "%{count} konto wymaga konfiguracji"
+        other: "%{count} kont wymaga konfiguracji"
+      processing_accounts: Przetwarzanie danych kont...
+      calculating_balances: Obliczanie sald...
diff --git a/config/locales/views/binance_items/pt-BR.yml b/config/locales/views/binance_items/pt-BR.yml
new file mode 100644
index 000000000..a022996db
--- /dev/null
+++ b/config/locales/views/binance_items/pt-BR.yml
@@ -0,0 +1,75 @@
+---
+pt-BR:
+  binance_items:
+    create:
+      default_name: Binance
+      success: Conexão com a Binance estabelecida com sucesso! Sua conta está sendo sincronizada.
+    update:
+      success: Configuração da Binance atualizada com sucesso.
+    destroy:
+      success: Conexão da Binance programada para exclusão.
+    setup_accounts:
+      title: Importar conta da Binance
+      subtitle: Selecione quais carteiras você quer acompanhar
+      instructions: Selecione as carteiras da Binance que você quer importar. Apenas carteiras com saldo são exibidas.
+      no_accounts: Todas as contas foram importadas.
+      accounts_count:
+        one: "%{count} conta disponível"
+        other: "%{count} contas disponíveis"
+      select_all: Selecionar todas
+      import_selected: Importar selecionadas
+      cancel: Cancelar
+      creating: Importando...
+    complete_account_setup:
+      success:
+        one: "%{count} conta importada"
+        other: "%{count} contas importadas"
+      none_selected: Nenhuma conta selecionada
+      no_accounts: Nenhuma conta para importar
+    binance_item:
+      provider_name: Binance
+      syncing: Sincronizando...
+      reconnect: As credenciais precisam ser atualizadas
+      deletion_in_progress: Excluindo...
+      sync_status:
+        no_accounts: Nenhuma conta encontrada
+        all_synced:
+          one: "%{count} conta sincronizada"
+          other: "%{count} contas sincronizadas"
+        partial_sync: "%{linked_count} sincronizadas, %{unlinked_count} precisam de configuração"
+      status: "Sincronizado há %{timestamp}"
+      status_with_summary: "Sincronizado há %{timestamp} - %{summary}"
+      status_never: Nunca sincronizado
+      update_credentials: Atualizar credenciais
+      delete: Excluir
+      no_accounts_title: Nenhuma conta encontrada
+      no_accounts_message: Sua carteira da Binance aparecerá aqui após a sincronização.
+      setup_needed: Conta pronta para importar
+      setup_description: Selecione quais carteiras da Binance você quer acompanhar.
+      setup_action: Importar conta
+      import_accounts_menu: Importar conta
+      stale_rate_warning: "O saldo é aproximado — a taxa de câmbio exata para %{date} não estava disponível. Será atualizado na próxima sincronização."
+    select_existing_account:
+      title: Vincular conta da Binance
+      no_accounts_found: Nenhuma conta da Binance encontrada.
+      wait_for_sync: Aguarde a Binance concluir a sincronização
+      check_provider_health: Verifique se suas credenciais da API da Binance são válidas
+      currently_linked_to: "Atualmente vinculada a: %{account_name}"
+      link: Vincular
+      cancel: Cancelar
+    link_existing_account:
+      success: Vinculado com sucesso à conta da Binance
+      errors:
+        only_manual: Apenas contas manuais podem ser vinculadas à Binance
+        invalid_binance_account: Conta da Binance inválida
+  binance_item:
+    syncer:
+      checking_credentials: Verificando credenciais...
+      credentials_invalid: Credenciais da API inválidas. Verifique sua chave de API e seu segredo.
+      importing_accounts: Importando contas da Binance...
+      checking_configuration: Verificando a configuração da conta...
+      accounts_need_setup:
+        one: "%{count} conta precisa de configuração"
+        other: "%{count} contas precisam de configuração"
+      processing_accounts: Processando os dados da conta...
+      calculating_balances: Calculando saldos...
diff --git a/config/locales/views/binance_items/ru.yml b/config/locales/views/binance_items/ru.yml
new file mode 100644
index 000000000..a10a62740
--- /dev/null
+++ b/config/locales/views/binance_items/ru.yml
@@ -0,0 +1,88 @@
+---
+ru:
+  binance_item:
+    syncer:
+      accounts_need_setup:
+        few: "%{count} подключения требуют настройки"
+        many: "%{count} подключений требуют настройки"
+        one: "%{count} подключение требует настройки"
+        other: "%{count} подключения требуют настройки"
+      calculating_balances: Расчёт балансов...
+      checking_configuration: Проверка конфигурации подключения...
+      checking_credentials: Проверка данных...
+      credentials_invalid: Недействительные API-данные. Пожалуйста, проверьте ваш
+        API-ключ и секрет.
+      importing_accounts: Импортирование счетов из Binance...
+      processing_accounts: Обработка данных счёта...
+  binance_items:
+    binance_item:
+      delete: Удалить
+      deletion_in_progress: Удаление...
+      import_accounts_menu: Импортировать счёт
+      no_accounts_message: Ваш портфель Binance появится здесь после синхронизации.
+      no_accounts_title: Счета не найдены
+      provider_name: Binance
+      reconnect: Требуется обновление данных
+      setup_action: Импортировать счёт
+      setup_description: Выберите, какие портфели Binance вы хотите отслеживать.
+      setup_needed: Счёт готов к импорту
+      stale_rate_warning: Баланс приблизительный — точный курс обмена на %{date} недоступен.
+        Обновится при следующей синхронизации.
+      status: Последняя синхронизация %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад - %{summary}
+      sync_status:
+        all_synced:
+          few: Синхронизированы %{count} счёта
+          many: Синхронизировано %{count} счетов
+          one: Синхронизирован %{count} счёт
+          other: Синхронизированы %{count} счёта
+        no_accounts: Счета не найдены
+        partial_sync: "%{linked_count} синхронизировано, %{unlinked_count} требуют
+          настройки"
+      syncing: Синхронизация...
+      update_credentials: Обновить данные
+    complete_account_setup:
+      no_accounts: Нет счетов для импорта
+      none_selected: Счета не выбраны
+      success:
+        few: Импортированы %{count} счёта
+        many: Импортировано %{count} счетов
+        one: Импортирован %{count} счёт
+        other: Импортированы %{count} счёта
+    create:
+      default_name: Binance
+      success: Успешно подключено к Binance! Ваш счёт синхронизируется.
+    destroy:
+      success: Подключение к Binance запланировано на удаление.
+    link_existing_account:
+      errors:
+        invalid_binance_account: Недействительный счёт Binance
+        only_manual: Только ручные счета могут быть связаны с Binance
+      success: Успешно связано с счётом Binance
+    select_existing_account:
+      cancel: Отмена
+      check_provider_health: Проверьте, действительны ли ваши API-данные Binance
+      currently_linked_to: 'В настоящее время связано с: %{account_name}'
+      link: Связать
+      no_accounts_found: Счета Binance не найдены.
+      title: Связать счёт Binance
+      wait_for_sync: Подождите, пока Binance завершит синхронизацию
+    setup_accounts:
+      accounts_count:
+        few: Доступно %{count} счёта
+        many: Доступно %{count} счетов
+        one: Доступен %{count} счёт
+        other: Доступно %{count} счёта
+      cancel: Отмена
+      creating: Импортирование...
+      historical_import: Исторический импорт
+      import_selected: Импортировать выбранные
+      instructions: Выберите портфели Binance, которые хотите импортировать. Показаны
+        только портфели с балансами.
+      no_accounts: Все счета импортированы.
+      select_all: Выбрать все
+      subtitle: Выберите портфели для отслеживания
+      title: Импортировать счёт Binance
+    update:
+      success: Конфигурация Binance успешно обновлена.
diff --git a/config/locales/views/binance_items/tr.yml b/config/locales/views/binance_items/tr.yml
new file mode 100644
index 000000000..d621ca929
--- /dev/null
+++ b/config/locales/views/binance_items/tr.yml
@@ -0,0 +1,81 @@
+---
+tr:
+  binance_item:
+    syncer:
+      accounts_need_setup:
+        one: "%{count} hesap kurulum gerektiriyor"
+        other: "%{count} hesap kurulum gerektiriyor"
+      calculating_balances: Bakiyeler hesaplanıyor...
+      checking_configuration: Hesap yapılandırması kontrol ediliyor...
+      checking_credentials: Kimlik bilgileri kontrol ediliyor...
+      credentials_invalid: Geçersiz API kimlik bilgileri. Lütfen API anahtarınızı
+        ve gizli anahtarınızı kontrol edin.
+      importing_accounts: Binance'tan hesaplar içe aktarılıyor...
+      processing_accounts: Hesap verileri işleniyor...
+  binance_items:
+    binance_item:
+      delete: Sil
+      deletion_in_progress: Siliniyor...
+      import_accounts_menu: Hesap İçe Aktar
+      no_accounts_message: Binance portföyünüz senkronizasyondan sonra burada görünecek.
+      no_accounts_title: Hesap bulunamadı
+      provider_name: Binance
+      reconnect: Kimlik bilgileri güncellenmeli
+      setup_action: Hesap İçe Aktar
+      setup_description: Takip etmek istediğiniz Binance portföylerini seçin.
+      setup_needed: Hesap içe aktarmaya hazır
+      stale_rate_warning: Bakiye yaklaşık bir değerdir — %{date} tarihi için kesin
+        döviz kuru mevcut değildi. Bir sonraki senkronizasyonda güncellenecektir.
+      status: Son senkronizasyon %{timestamp} önce
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: Son senkronizasyon %{timestamp} önce - %{summary}
+      sync_status:
+        all_synced:
+          one: "%{count} hesap senkronize edildi"
+          other: "%{count} hesap senkronize edildi"
+        no_accounts: Hesap bulunamadı
+        partial_sync: "%{linked_count} senkronize edildi, %{unlinked_count} kurulum
+          gerektiriyor"
+      syncing: Senkronize ediliyor...
+      update_credentials: Kimlik bilgilerini güncelle
+    complete_account_setup:
+      no_accounts: İçe aktarılacak hesap yok
+      none_selected: Hiç hesap seçilmedi
+      success:
+        one: "%{count} hesap içe aktarıldı"
+        other: "%{count} hesap içe aktarıldı"
+    create:
+      default_name: Binance
+      success: Binance'a başarıyla bağlandı! Hesabınız senkronize ediliyor.
+    destroy:
+      success: Binance bağlantısı silinmek üzere zamanlandı.
+    link_existing_account:
+      errors:
+        invalid_binance_account: Geçersiz Binance hesabı
+        only_manual: Yalnızca manuel hesaplar Binance'a bağlanabilir
+      success: Binance hesabına başarıyla bağlandı
+    select_existing_account:
+      cancel: İptal
+      check_provider_health: Binance API kimlik bilgilerinizin geçerli olduğunu kontrol
+        edin
+      currently_linked_to: 'Şu anda bağlı: %{account_name}'
+      link: Bağla
+      no_accounts_found: Binance hesabı bulunamadı.
+      title: Binance Hesabını Bağla
+      wait_for_sync: Binance'ın senkronizasyonu bitirmesini bekleyin
+    setup_accounts:
+      accounts_count:
+        one: "%{count} hesap mevcut"
+        other: "%{count} hesap mevcut"
+      cancel: İptal
+      creating: İçe aktarılıyor...
+      historical_import: ''
+      import_selected: Seçilenleri İçe Aktar
+      instructions: İçe aktarmak istediğiniz Binance portföylerini seçin. Yalnızca
+        bakiyesi olan portföyler gösterilir.
+      no_accounts: Tüm hesaplar içe aktarıldı.
+      select_all: Tümünü seç
+      subtitle: Takip edilecek portföyleri seçin
+      title: Binance Hesabını İçe Aktar
+    update:
+      success: Binance yapılandırması başarıyla güncellendi.
diff --git a/config/locales/views/binance_items/zh-CN.yml b/config/locales/views/binance_items/zh-CN.yml
index 9e62db4bc..702449929 100644
--- a/config/locales/views/binance_items/zh-CN.yml
+++ b/config/locales/views/binance_items/zh-CN.yml
@@ -20,6 +20,7 @@ zh-CN:
       import_selected: 导入所选
       cancel: 取消
       creating: 正在导入...
+      historical_import: 历史导入
     complete_account_setup:
       success:
         one: 已导入 %{count} 个账户
diff --git a/config/locales/views/brex_items/de.yml b/config/locales/views/brex_items/de.yml
new file mode 100644
index 000000000..a724c2cf5
--- /dev/null
+++ b/config/locales/views/brex_items/de.yml
@@ -0,0 +1,277 @@
+---
+de:
+  brex_items:
+    default_connection_name: Brex-Verbindung
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    kinds:
+      cash: Bargeld
+      card: Karte
+    statuses:
+      ACTIVE: Aktiv
+      active: Aktiv
+      CLOSED: Geschlossen
+      closed: Geschlossen
+      frozen: Eingefroren
+      FROZEN: Eingefroren
+    create:
+      success: Brex-Verbindung erfolgreich erstellt
+    default_card_name: Brex-Karte
+    default_cash_name: "Brex Cash %{id}"
+    destroy:
+      success: Brex-Verbindung entfernt
+    index:
+      title: Brex-Verbindungen
+    institution_summary:
+      none: Keine Institute verbunden
+      one: "%{name}"
+      count:
+        one: "%{count} Institut"
+        other: "%{count} Institute"
+    sync_status:
+      no_accounts: Keine Konten gefunden
+      all_synced:
+        one: "%{count} Konto synchronisiert"
+        other: "%{count} Konten synchronisiert"
+      partial_setup: "%{synced} synchronisiert, %{pending} müssen eingerichtet werden"
+    api_error:
+      common_issues: "Häufige Probleme:"
+      expired_credentials: Erstellen Sie ein neues API-Token bei Brex.
+      expired_credentials_label: "Abgelaufene Zugangsdaten:"
+      heading: Verbindung zu Brex nicht möglich
+      invalid_token: Überprüfen Sie Ihr API-Token in den Anbietereinstellungen.
+      invalid_token_label: "Ungültiges API-Token:"
+      network: Überprüfen Sie Ihre Internetverbindung.
+      network_label: "Netzwerkproblem:"
+      permissions: Stellen Sie sicher, dass Ihr Token über die erforderlichen schreibgeschützten Konto- und Transaktions-Scopes verfügt.
+      permissions_label: "Unzureichende Berechtigungen:"
+      service: Die Brex-API ist möglicherweise vorübergehend nicht verfügbar.
+      service_label: "Dienst nicht verfügbar:"
+      settings_link: Anbietereinstellungen prüfen
+      title: Brex-Verbindungsfehler
+    errors:
+      unexpected_error: Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.
+    entries:
+      default_name: Brex-Transaktion
+    loading:
+      loading_message: Brex-Konten werden geladen...
+      loading_title: Wird geladen
+    link_accounts:
+      all_already_linked:
+        one: "Das ausgewählte Konto (%{names}) ist bereits verknüpft"
+        other: "Alle %{count} ausgewählten Konten sind bereits verknüpft: %{names}"
+      api_error: "API-Fehler: %{message}"
+      invalid_account_names:
+        one: "Konto mit leerem Namen kann nicht verknüpft werden"
+        other: "%{count} Konten mit leeren Namen können nicht verknüpft werden"
+      invalid_account_type: Nicht unterstützter Brex-Kontotyp
+      link_failed: Konten konnten nicht verknüpft werden
+      no_accounts_selected: Bitte wählen Sie mindestens ein Konto aus
+      no_api_token: Brex-API-Token nicht gefunden. Bitte konfigurieren Sie es in den Anbietereinstellungen.
+      partial_invalid: "%{created_count} Konto(en) erfolgreich verknüpft, %{already_linked_count} Konto(en) waren bereits verknüpft, %{invalid_count} Konto(en) hatten ungültige Namen"
+      partial_success: "%{created_count} Konto(en) erfolgreich verknüpft. %{already_linked_count} Konto(en) waren bereits verknüpft: %{already_linked_names}"
+      select_connection: Wählen Sie eine Brex-Verbindung aus, bevor Sie Konten verknüpfen.
+      success:
+        one: "%{count} Konto erfolgreich verknüpft"
+        other: "%{count} Konten erfolgreich verknüpft"
+    brex_item:
+      accounts_need_setup: Konten müssen eingerichtet werden
+      delete: Verbindung löschen
+      deletion_in_progress: Löschung läuft...
+      error: Fehler
+      no_accounts_description: Diese Verbindung hat noch keine verknüpften Konten.
+      no_accounts_title: Keine Konten
+      setup_action: Neue Konten einrichten
+      setup_description: "%{linked} von %{total} Konten verknüpft. Wählen Sie Kontotypen für Ihre neu importierten Brex-Konten."
+      setup_needed: Neue Konten bereit zur Einrichtung
+      status: "Vor %{timestamp} synchronisiert"
+      status_never: Noch nie synchronisiert
+      status_with_summary: "Zuletzt synchronisiert vor %{timestamp} – %{summary}"
+      syncing: Synchronisiere...
+      total: Gesamt
+      unlinked: Nicht verknüpft
+    provider_panel:
+      accounts_link: Konten
+      add_connection: Brex-Verbindung hinzufügen
+      base_url_label: Basis-URL (optional)
+      base_url_placeholder: https://api.brex.com
+      configured_html: "Konfiguriert und einsatzbereit. Besuchen Sie den Tab %{accounts_link}, um Konten zu verwalten und einzurichten."
+      connection_name_label: Verbindungsname
+      connection_name_placeholder: Geschäftskonto
+      default_connection_name: Brex-Verbindung
+      disconnect_label: "%{name} trennen"
+      disconnect_confirm: "%{name} trennen?"
+      encryption_warning:
+        title: Datenbankverschlüsselung ist nicht konfiguriert
+        message: Konfigurieren Sie die Active Record-Verschlüsselungsschlüssel, bevor Sie Brex-Tokens in der Produktion hinzufügen. Ohne Verschlüsselungsschlüssel speichert Sure die Brex-Anbieter-Zugangsdaten und Snapshots im Klartext, wie bei anderen Anbieterdatensätzen.
+      instructions:
+        copy_token_html: "Kopieren Sie das Token und fügen Sie es unten als benannte Verbindung hinzu. Sure speichert das Token nur zur Synchronisierung dieser Familie."
+        create_token: "Erstellen Sie ein API-Token mit diesen schreibgeschützten Scopes: accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly"
+        open_tokens: Gehen Sie zu den Brex-Entwickler-/API-Token-Einstellungen für das Unternehmen, das Sie verbinden möchten
+        sign_in_html: "Besuchen Sie %{link} und melden Sie sich bei dem Konto an, das Sie verbinden möchten"
+      keep_token_placeholder: Leer lassen, um das aktuelle Token beizubehalten
+      not_configured: Nicht konfiguriert
+      sandbox_note_html: "Verwenden Sie für jedes Brex-Unternehmen/API-Token, das Sie synchronisieren möchten, eine separate benannte Verbindung. Lassen Sie die Basis-URL für die Produktion leer. Staging ist auf von Brex genehmigte Tests beschränkt und funktioniert nicht mit Kunden-Tokens."
+      setup_accounts: Konten einrichten
+      setup_title: "Einrichtungsanweisungen:"
+      sync: Synchronisieren
+      token_label: Token
+      token_placeholder: Token hier einfügen
+      update_connection: Verbindung aktualisieren
+    provider_connection:
+      default_description: Mit Ihrem Brex-Konto verbinden
+      default_name: Brex
+      description: "Verbinden mit %{name}"
+      name: "Brex - %{name}"
+    select_accounts:
+      accounts_selected: Konten ausgewählt
+      api_error: "API-Fehler: %{message}"
+      cancel: Abbrechen
+      configure_name_in_brex: Import nicht möglich – bitte konfigurieren Sie den Kontonamen in Brex
+      description: Wählen Sie die Konten aus, die Sie mit Ihrem %{product_name}-Konto verknüpfen möchten.
+      link_accounts: Ausgewählte Konten verknüpfen
+      no_accounts_found: Keine Konten gefunden. Bitte überprüfen Sie Ihre API-Token-Konfiguration.
+      no_api_token: Brex-API-Token nicht gefunden. Bitte konfigurieren Sie es in den Anbietereinstellungen.
+      no_credentials_configured: Bitte konfigurieren Sie zuerst Ihr Brex-API-Token in den Anbietereinstellungen.
+      no_name_placeholder: "(Kein Name)"
+      select_connection: Wählen Sie in den Anbietereinstellungen eine Brex-Verbindung aus.
+      title: Brex-Konten auswählen
+      unexpected_error: Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.
+    select_existing_account:
+      account_already_linked: Dieses Konto ist bereits mit einem Anbieter verknüpft
+      all_accounts_already_linked: Alle Brex-Konten sind bereits verknüpft
+      api_error: "API-Fehler: %{message}"
+      cancel: Abbrechen
+      configure_name_in_brex: Import nicht möglich – bitte konfigurieren Sie den Kontonamen in Brex
+      description: Wählen Sie ein Brex-Konto aus, das mit diesem Konto verknüpft werden soll. Transaktionen werden automatisch synchronisiert und dedupliziert.
+      link_account: Konto verknüpfen
+      no_account_specified: Kein Konto angegeben
+      no_accounts_found: Keine Brex-Konten gefunden. Bitte überprüfen Sie Ihre API-Token-Konfiguration.
+      no_api_token: Brex-API-Token nicht gefunden. Bitte konfigurieren Sie es in den Anbietereinstellungen.
+      no_credentials_configured: Bitte konfigurieren Sie zuerst Ihr Brex-API-Token in den Anbietereinstellungen.
+      no_name_placeholder: "(Kein Name)"
+      select_connection: Wählen Sie in den Anbietereinstellungen eine Brex-Verbindung aus.
+      title: "%{account_name} mit Brex verknüpfen"
+      unexpected_error: Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.
+    setup_required:
+      description: Bevor Sie Brex-Konten verknüpfen können, müssen Sie Ihr Brex-API-Token konfigurieren.
+      heading: API-Token nicht konfiguriert
+      settings_link: Zu den Anbietereinstellungen
+      setup_steps: "Einrichtungsschritte:"
+      steps:
+        enter_token: Geben Sie Ihr Brex-API-Token ein
+        find_section_html: "Suchen Sie den Bereich <strong>Brex</strong>"
+        open_settings_html: "Gehen Sie zu <strong>Einstellungen > Anbieter</strong>"
+        return_to_link: Kehren Sie hierher zurück, um Ihre Konten zu verknüpfen
+      title: Brex-Einrichtung erforderlich
+    subtype_select:
+      placeholder:
+        subtype: Untertyp auswählen
+        type: Typ auswählen
+    link_existing_account:
+      account_already_linked: Dieses Konto ist bereits mit einem Anbieter verknüpft
+      api_error: "API-Fehler: %{message}"
+      invalid_account_name: Konto mit leerem Namen kann nicht verknüpft werden
+      missing_parameters: Erforderliche Parameter fehlen
+      no_account_specified: Kein Konto angegeben
+      no_api_token: Brex-API-Token nicht gefunden. Bitte konfigurieren Sie es in den Anbietereinstellungen.
+      provider_account_already_linked: Dieses Brex-Konto ist bereits mit einem anderen Konto verknüpft
+      provider_account_not_found: Brex-Konto nicht gefunden
+      select_connection: Wählen Sie eine Brex-Verbindung aus, bevor Sie Konten verknüpfen.
+      success: "%{account_name} erfolgreich mit Brex verknüpft"
+    setup_accounts:
+      account_type_label: "Kontotyp:"
+      all_accounts_linked: "Alle Ihre Brex-Konten wurden bereits eingerichtet."
+      api_error: "API-Fehler: %{message}"
+      fetch_failed: "Konten konnten nicht abgerufen werden"
+      no_accounts_to_setup: "Keine Konten zum Einrichten"
+      no_api_token: Brex-API-Token nicht gefunden. Bitte konfigurieren Sie es in den Anbietereinstellungen.
+      account_types:
+        skip: Dieses Konto überspringen
+        depository: Giro- oder Sparkonto
+        credit_card: Kreditkarte
+        investment: Investmentkonto
+        loan: Darlehen oder Hypothek
+        other_asset: Sonstiger Vermögenswert
+      subtype_labels:
+        depository: "Kontountertyp:"
+        credit_card: ""
+        investment: "Investmenttyp:"
+        loan: "Darlehenstyp:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Kreditkarten werden automatisch als Kreditkartenkonten eingerichtet."
+        other_asset: "Für sonstige Vermögenswerte sind keine zusätzlichen Optionen erforderlich."
+      subtypes:
+        depository:
+          checking: Girokonto
+          savings: Sparkonto
+          hsa: Gesundheitssparkonto
+          cd: Festgeld
+          money_market: Geldmarktkonto
+        investment:
+          brokerage: Brokerage
+          pension: Rente
+          retirement: Altersvorsorge
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "529-Plan"
+          hsa: Gesundheitssparkonto
+          mutual_fund: Investmentfonds
+          ira: Traditionelle IRA
+          roth_ira: Roth IRA
+          angel: Angel
+        loan:
+          mortgage: Hypothek
+          student: Studienkredit
+          auto: Autokredit
+          other: Sonstiges Darlehen
+      balance: Saldo
+      cancel: Abbrechen
+      choose_account_type: "Wählen Sie den richtigen Kontotyp für jedes Brex-Konto:"
+      create_accounts: Konten erstellen
+      creating_accounts: Konten werden erstellt...
+      historical_data_range: "Historischer Datenbereich:"
+      subtitle: Wählen Sie die richtigen Kontotypen für Ihre importierten Konten
+      sync_start_date_help: Wählen Sie aus, wie weit zurück Sie den Transaktionsverlauf synchronisieren möchten. Maximal 3 Jahre Verlauf verfügbar.
+      sync_start_date_label: "Transaktionen synchronisieren ab:"
+      title: Richten Sie Ihre Brex-Konten ein
+    complete_account_setup:
+      all_skipped: "Alle Konten wurden übersprungen. Es wurden keine Konten erstellt."
+      creation_failed: "Konten konnten nicht erstellt werden: %{error}"
+      creation_failed_count: "%{count} Konto(en) konnten nicht erstellt werden."
+      no_accounts: "Keine Konten zum Einrichten."
+      partial_skipped: "%{created_count} Konto(en) erfolgreich erstellt; %{skipped_count} Konto(en) wurden übersprungen."
+      partial_success: "%{created_count} Konto(en) erfolgreich erstellt, aber %{failed_count} Konto(en) sind fehlgeschlagen."
+      success: "%{count} Konto(en) erfolgreich erstellt."
+      unexpected_error: Ein unerwarteter Fehler ist aufgetreten.
+    sync:
+      success: Synchronisierung gestartet
+    syncer:
+      account_processing_failed:
+        one: "%{count} Brex-Konto ist bei der Verarbeitung fehlgeschlagen."
+        other: "%{count} Brex-Konten sind bei der Verarbeitung fehlgeschlagen."
+      account_sync_failed:
+        one: "%{count} Brex-Kontosynchronisierung konnte nicht geplant werden."
+        other: "%{count} Brex-Kontosynchronisierungen konnten nicht geplant werden."
+      accounts_need_setup:
+        one: "%{count} Konto muss eingerichtet werden..."
+        other: "%{count} Konten müssen eingerichtet werden..."
+      accounts_failed:
+        one: "%{count} Brex-Konto konnte nicht importiert werden."
+        other: "%{count} Brex-Konten konnten nicht importiert werden."
+      calculating_balances: Salden werden berechnet...
+      checking_account_configuration: Kontokonfiguration wird geprüft...
+      credentials_invalid: Ungültiges Brex-API-Token oder ungültige Kontoberechtigungen
+      failed: Synchronisierung fehlgeschlagen. Bitte versuchen Sie es erneut oder wenden Sie sich an den Support.
+      import_failed: Brex-Import fehlgeschlagen.
+      importing_accounts: Konten werden von Brex importiert...
+      processing_transactions: Transaktionen werden verarbeitet...
+      transactions_failed:
+        one: "%{count} Brex-Konto hatte Fehler beim Transaktionsimport."
+        other: "%{count} Brex-Konten hatten Fehler beim Transaktionsimport."
+    update:
+      success: Brex-Verbindung aktualisiert
diff --git a/config/locales/views/brex_items/es.yml b/config/locales/views/brex_items/es.yml
new file mode 100644
index 000000000..f2f3949a2
--- /dev/null
+++ b/config/locales/views/brex_items/es.yml
@@ -0,0 +1,277 @@
+---
+es:
+  brex_items:
+    default_connection_name: Conexión de Brex
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    kinds:
+      cash: Efectivo
+      card: Tarjeta
+    statuses:
+      ACTIVE: Activa
+      active: Activa
+      CLOSED: Cerrada
+      closed: Cerrada
+      frozen: Congelada
+      FROZEN: Congelada
+    create:
+      success: Conexión de Brex creada correctamente
+    default_card_name: Tarjeta Brex
+    default_cash_name: "Brex Cash %{id}"
+    destroy:
+      success: Conexión de Brex eliminada
+    index:
+      title: Conexiones de Brex
+    institution_summary:
+      none: No hay entidades conectadas
+      one: "%{name}"
+      count:
+        one: "%{count} entidad"
+        other: "%{count} entidades"
+    sync_status:
+      no_accounts: No se han encontrado cuentas
+      all_synced:
+        one: "%{count} cuenta sincronizada"
+        other: "%{count} cuentas sincronizadas"
+      partial_setup: "%{synced} sincronizadas, %{pending} necesitan configuración"
+    api_error:
+      common_issues: "Problemas habituales:"
+      expired_credentials: Genera un nuevo token de API en Brex.
+      expired_credentials_label: "Credenciales caducadas:"
+      heading: No se puede conectar con Brex
+      invalid_token: Comprueba tu token de API en los Ajustes del proveedor.
+      invalid_token_label: "Token de API no válido:"
+      network: Comprueba tu conexión a internet.
+      network_label: "Problema de red:"
+      permissions: Asegúrate de que tu token tenga los ámbitos de solo lectura necesarios para cuentas y transacciones.
+      permissions_label: "Permisos insuficientes:"
+      service: Es posible que la API de Brex no esté disponible temporalmente.
+      service_label: "Servicio caído:"
+      settings_link: Comprobar los Ajustes del proveedor
+      title: Error de conexión con Brex
+    errors:
+      unexpected_error: Se ha producido un error inesperado. Inténtalo de nuevo más tarde.
+    entries:
+      default_name: Transacción de Brex
+    loading:
+      loading_message: Cargando cuentas de Brex...
+      loading_title: Cargando
+    link_accounts:
+      all_already_linked:
+        one: "La cuenta seleccionada (%{names}) ya está vinculada"
+        other: "Las %{count} cuentas seleccionadas ya están vinculadas: %{names}"
+      api_error: "Error de la API: %{message}"
+      invalid_account_names:
+        one: "No se puede vincular una cuenta con el nombre en blanco"
+        other: "No se pueden vincular %{count} cuentas con los nombres en blanco"
+      invalid_account_type: Tipo de cuenta de Brex no admitido
+      link_failed: No se pudieron vincular las cuentas
+      no_accounts_selected: Selecciona al menos una cuenta
+      no_api_token: No se ha encontrado el token de API de Brex. Configúralo en los Ajustes del proveedor.
+      partial_invalid: "Se vincularon %{created_count} cuenta(s) correctamente, %{already_linked_count} cuenta(s) ya estaban vinculadas, %{invalid_count} cuenta(s) tenían nombres no válidos"
+      partial_success: "Se vincularon %{created_count} cuenta(s) correctamente. %{already_linked_count} cuenta(s) ya estaban vinculadas: %{already_linked_names}"
+      select_connection: Elige una conexión de Brex antes de vincular cuentas.
+      success:
+        one: "Se ha vinculado %{count} cuenta correctamente"
+        other: "Se han vinculado %{count} cuentas correctamente"
+    brex_item:
+      accounts_need_setup: Las cuentas necesitan configuración
+      delete: Eliminar conexión
+      deletion_in_progress: eliminación en curso...
+      error: Error
+      no_accounts_description: Esta conexión aún no tiene cuentas vinculadas.
+      no_accounts_title: Sin cuentas
+      setup_action: Configurar nuevas cuentas
+      setup_description: "%{linked} de %{total} cuentas vinculadas. Elige los tipos de cuenta para tus cuentas de Brex recién importadas."
+      setup_needed: Nuevas cuentas listas para configurar
+      status: "Sincronizado hace %{timestamp}"
+      status_never: Nunca sincronizado
+      status_with_summary: "Sincronizado hace %{timestamp} - %{summary}"
+      syncing: Sincronizando...
+      total: Total
+      unlinked: Sin vincular
+    provider_panel:
+      accounts_link: Cuentas
+      add_connection: Añadir conexión de Brex
+      base_url_label: URL base (opcional)
+      base_url_placeholder: https://api.brex.com
+      configured_html: "Configurado y listo para usar. Visita la pestaña %{accounts_link} para gestionar y configurar las cuentas."
+      connection_name_label: Nombre de la conexión
+      connection_name_placeholder: Cuenta corriente de empresa
+      default_connection_name: Conexión de Brex
+      disconnect_label: "Desconectar %{name}"
+      disconnect_confirm: "¿Desconectar %{name}?"
+      encryption_warning:
+        title: El cifrado de la base de datos no está configurado
+        message: Configura las claves de cifrado de Active Record antes de añadir tokens de Brex en producción. Sin claves de cifrado, Sure almacena las credenciales y las instantáneas del proveedor Brex en texto plano, como ocurre con otros registros de proveedores.
+      instructions:
+        copy_token_html: "Copia el token y añádelo abajo como una conexión con nombre. Sure almacena el token únicamente para sincronizar esta familia."
+        create_token: "Crea un token de API con estos ámbitos de solo lectura: accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly"
+        open_tokens: Ve a los ajustes de tokens de desarrollador/API de Brex de la empresa que quieres conectar
+        sign_in_html: "Visita %{link} e inicia sesión en la cuenta que quieres conectar"
+      keep_token_placeholder: Déjalo en blanco para conservar el token actual
+      not_configured: No configurado
+      sandbox_note_html: "Usa una conexión con nombre distinta para cada empresa/token de API de Brex que quieras sincronizar. Deja la URL base en blanco para producción. El entorno de staging está limitado a pruebas aprobadas por Brex y no funciona con tokens de clientes."
+      setup_accounts: Configurar cuentas
+      setup_title: "Instrucciones de configuración:"
+      sync: Sincronizar
+      token_label: Token
+      token_placeholder: Pega el token aquí
+      update_connection: Actualizar conexión
+    provider_connection:
+      default_description: Conectar a tu cuenta de Brex
+      default_name: Brex
+      description: "Conectar mediante %{name}"
+      name: "Brex - %{name}"
+    select_accounts:
+      accounts_selected: cuentas seleccionadas
+      api_error: "Error de la API: %{message}"
+      cancel: Cancelar
+      configure_name_in_brex: "No se puede importar: configura el nombre de la cuenta en Brex"
+      description: Selecciona las cuentas que quieres vincular a tu cuenta de %{product_name}.
+      link_accounts: Vincular cuentas seleccionadas
+      no_accounts_found: No se han encontrado cuentas. Comprueba la configuración de tu token de API.
+      no_api_token: No se ha encontrado el token de API de Brex. Configúralo en los Ajustes del proveedor.
+      no_credentials_configured: Configura primero tu token de API de Brex en los Ajustes del proveedor.
+      no_name_placeholder: "(Sin nombre)"
+      select_connection: Elige una conexión de Brex en los Ajustes del proveedor.
+      title: Seleccionar cuentas de Brex
+      unexpected_error: Se ha producido un error inesperado. Inténtalo de nuevo más tarde.
+    select_existing_account:
+      account_already_linked: Esta cuenta ya está vinculada a un proveedor
+      all_accounts_already_linked: Todas las cuentas de Brex ya están vinculadas
+      api_error: "Error de la API: %{message}"
+      cancel: Cancelar
+      configure_name_in_brex: "No se puede importar: configura el nombre de la cuenta en Brex"
+      description: Selecciona una cuenta de Brex para vincularla a esta cuenta. Las transacciones se sincronizarán y se eliminarán los duplicados automáticamente.
+      link_account: Vincular cuenta
+      no_account_specified: No se ha especificado ninguna cuenta
+      no_accounts_found: No se han encontrado cuentas de Brex. Comprueba la configuración de tu token de API.
+      no_api_token: No se ha encontrado el token de API de Brex. Configúralo en los Ajustes del proveedor.
+      no_credentials_configured: Configura primero tu token de API de Brex en los Ajustes del proveedor.
+      no_name_placeholder: "(Sin nombre)"
+      select_connection: Elige una conexión de Brex en los Ajustes del proveedor.
+      title: "Vincular %{account_name} con Brex"
+      unexpected_error: Se ha producido un error inesperado. Inténtalo de nuevo más tarde.
+    setup_required:
+      description: Antes de poder vincular cuentas de Brex, debes configurar tu token de API de Brex.
+      heading: Token de API no configurado
+      settings_link: Ir a los Ajustes del proveedor
+      setup_steps: "Pasos de configuración:"
+      steps:
+        enter_token: Introduce tu token de API de Brex
+        find_section_html: "Busca la sección <strong>Brex</strong>"
+        open_settings_html: "Ve a <strong>Ajustes > Proveedores</strong>"
+        return_to_link: Vuelve aquí para vincular tus cuentas
+      title: Configuración de Brex necesaria
+    subtype_select:
+      placeholder:
+        subtype: Selecciona el subtipo
+        type: Selecciona el tipo
+    link_existing_account:
+      account_already_linked: Esta cuenta ya está vinculada a un proveedor
+      api_error: "Error de la API: %{message}"
+      invalid_account_name: No se puede vincular una cuenta con el nombre en blanco
+      missing_parameters: Faltan parámetros obligatorios
+      no_account_specified: No se ha especificado ninguna cuenta
+      no_api_token: No se ha encontrado el token de API de Brex. Configúralo en los Ajustes del proveedor.
+      provider_account_already_linked: Esta cuenta de Brex ya está vinculada a otra cuenta
+      provider_account_not_found: No se ha encontrado la cuenta de Brex
+      select_connection: Elige una conexión de Brex antes de vincular cuentas.
+      success: "%{account_name} vinculada correctamente con Brex"
+    setup_accounts:
+      account_type_label: "Tipo de cuenta:"
+      all_accounts_linked: "Todas tus cuentas de Brex ya se han configurado."
+      api_error: "Error de la API: %{message}"
+      fetch_failed: "No se pudieron obtener las cuentas"
+      no_accounts_to_setup: "No hay cuentas para configurar"
+      no_api_token: No se ha encontrado el token de API de Brex. Configúralo en los Ajustes del proveedor.
+      account_types:
+        skip: Omitir esta cuenta
+        depository: Cuenta corriente o de ahorros
+        credit_card: Tarjeta de crédito
+        investment: Cuenta de inversión
+        loan: Préstamo o hipoteca
+        other_asset: Otro activo
+      subtype_labels:
+        depository: "Subtipo de cuenta:"
+        credit_card: ""
+        investment: "Tipo de inversión:"
+        loan: "Tipo de préstamo:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Las tarjetas de crédito se configurarán automáticamente como cuentas de tarjeta de crédito."
+        other_asset: "No se necesitan opciones adicionales para Otros activos."
+      subtypes:
+        depository:
+          checking: Cuenta corriente
+          savings: Cuenta de ahorros
+          hsa: Cuenta de ahorro para la salud
+          cd: Certificado de depósito
+          money_market: Cuenta del mercado monetario
+        investment:
+          brokerage: Cuenta de bróker
+          pension: Pensión
+          retirement: Jubilación
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "Plan 529"
+          hsa: Cuenta de ahorro para la salud
+          mutual_fund: Fondo de inversión
+          ira: IRA tradicional
+          roth_ira: Roth IRA
+          angel: Inversión ángel
+        loan:
+          mortgage: Hipoteca
+          student: Préstamo estudiantil
+          auto: Préstamo para automóvil
+          other: Otro préstamo
+      balance: Saldo
+      cancel: Cancelar
+      choose_account_type: "Elige el tipo de cuenta correcto para cada cuenta de Brex:"
+      create_accounts: Crear cuentas
+      creating_accounts: Creando cuentas...
+      historical_data_range: "Rango de datos históricos:"
+      subtitle: Elige los tipos de cuenta correctos para tus cuentas importadas
+      sync_start_date_help: Selecciona hasta qué fecha quieres sincronizar el historial de transacciones. Hay un máximo de 3 años de historial disponible.
+      sync_start_date_label: "Empezar a sincronizar transacciones desde:"
+      title: Configura tus cuentas de Brex
+    complete_account_setup:
+      all_skipped: "Se omitieron todas las cuentas. No se ha creado ninguna cuenta."
+      creation_failed: "No se pudieron crear las cuentas: %{error}"
+      creation_failed_count: "No se pudieron crear %{count} cuenta(s)."
+      no_accounts: "No hay cuentas para configurar."
+      partial_skipped: "Se crearon %{created_count} cuenta(s) correctamente; se omitieron %{skipped_count} cuenta(s)."
+      partial_success: "Se crearon %{created_count} cuenta(s) correctamente, pero %{failed_count} cuenta(s) fallaron."
+      success: "Se han creado %{count} cuenta(s) correctamente."
+      unexpected_error: Se ha producido un error inesperado.
+    sync:
+      success: Sincronización iniciada
+    syncer:
+      account_processing_failed:
+        one: "%{count} cuenta de Brex falló durante el procesamiento."
+        other: "%{count} cuentas de Brex fallaron durante el procesamiento."
+      account_sync_failed:
+        one: "No se pudo programar la sincronización de %{count} cuenta de Brex."
+        other: "No se pudo programar la sincronización de %{count} cuentas de Brex."
+      accounts_need_setup:
+        one: "%{count} cuenta necesita configuración..."
+        other: "%{count} cuentas necesitan configuración..."
+      accounts_failed:
+        one: "No se pudo importar %{count} cuenta de Brex."
+        other: "No se pudieron importar %{count} cuentas de Brex."
+      calculating_balances: Calculando saldos...
+      checking_account_configuration: Comprobando la configuración de la cuenta...
+      credentials_invalid: Token de API de Brex no válido o permisos de cuenta insuficientes
+      failed: La sincronización ha fallado. Inténtalo de nuevo o ponte en contacto con el soporte.
+      import_failed: La importación de Brex ha fallado.
+      importing_accounts: Importando cuentas desde Brex...
+      processing_transactions: Procesando transacciones...
+      transactions_failed:
+        one: "%{count} cuenta de Brex tuvo fallos al importar transacciones."
+        other: "%{count} cuentas de Brex tuvieron fallos al importar transacciones."
+    update:
+      success: Conexión de Brex actualizada
diff --git a/config/locales/views/brex_items/fr.yml b/config/locales/views/brex_items/fr.yml
new file mode 100644
index 000000000..52f481972
--- /dev/null
+++ b/config/locales/views/brex_items/fr.yml
@@ -0,0 +1,317 @@
+---
+fr:
+  brex_items:
+    account_metadata:
+      provider: Brex
+      separator: "•"
+    api_error:
+      common_issues: 'Problèmes courants :'
+      expired_credentials: Générez un nouveau jeton API depuis Brex.
+      expired_credentials_label: 'Identifiants expirés :'
+      heading: Impossible de se connecter au Brex
+      invalid_token: Vérifiez votre jeton API dans les paramètres du fournisseur.
+      invalid_token_label: 'Jeton API non valide :'
+      network: Vérifiez votre connexion Internet.
+      network_label: 'Problème de réseau :'
+      permissions: Assurez-vous que votre jeton dispose des étendues de compte et
+        de transaction en lecture seule requises.
+      permissions_label: 'Autorisations insuffisantes :'
+      service: L'API Brex peut être temporairement indisponible.
+      service_label: 'Service en panne :'
+      settings_link: Vérifier les paramètres du fournisseur
+      title: Erreur de connexion Brex
+    brex_item:
+      accounts_need_setup: Les comptes doivent être configurés
+      delete: Supprimer la connexion
+      deletion_in_progress: suppression en cours...
+      error: Erreur
+      no_accounts_description: Cette connexion n'a pas encore de compte associé.
+      no_accounts_title: Aucun compte
+      setup_action: Créer de nouveaux comptes
+      setup_description: "%{linked} comptes sur %{total} associés. Choisissez les
+        types de comptes pour vos comptes Brex nouvellement importés."
+      setup_needed: Nouveaux comptes prêts à être créés
+      status: Synchronisé il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} - %{summary}
+      syncing: Synchronisation...
+      total: Total
+      unlinked: Sans lien
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      creation_failed: 'Échec de la création des comptes : %{error}'
+      creation_failed_count: Échec de la création du ou des comptes %{count}.
+      no_accounts: Aucun compte à créer.
+      partial_skipped: Compte(s) %{created_count} créé avec succès ; %{skipped_count} compte(s)
+        ont été ignorés.
+      partial_success: "%{created_count} compte(s) a été créé avec succès, mais %{failed_count}
+        compte(s) a échoué."
+      success: Compte(s) %{count} créé avec succès.
+      unexpected_error: Une erreur inattendue s'est produite.
+    create:
+      success: Connexion Brex créée avec succès
+    default_card_name: Carte Brex
+    default_cash_name: Brex Cash %{id}
+    default_connection_name: Connexion Brex
+    destroy:
+      success: Connexion Brex supprimée
+    entries:
+      default_name: Opération Brex
+    errors:
+      unexpected_error: Une erreur inattendue s'est produite. Veuillez réessayer plus
+        tard.
+    index:
+      title: Connexions Brex
+    institution_summary:
+      count:
+        one: "%{count} établissement"
+        other: "%{count} établissements"
+      none: Aucune institution connectée
+      one: "%{name}"
+    kinds:
+      card: Carte
+      cash: Espèces
+    link_accounts:
+      all_already_linked:
+        one: Le compte sélectionné (%{names}) est déjà associé
+        other: 'Tous les %{count} comptes sélectionnés sont déjà associés : %{names}'
+      api_error: 'Erreur API : %{message}'
+      invalid_account_names:
+        one: Impossible de lier un compte avec un nom vide
+        other: Impossible d'associer les comptes %{count} avec des noms vides
+      invalid_account_type: Type de compte Brex non pris en charge
+      link_failed: Échec de l'association des comptes
+      no_accounts_selected: Veuillez sélectionner au moins un compte
+      no_api_token: Jeton API Brex introuvable. Veuillez le configurer dans les paramètres
+        du fournisseur.
+      partial_invalid: "%{created_count} comptes ont été associés avec succès, %{already_linked_count}
+        comptes étaient déjà associés, %{invalid_count} comptes avaient des noms non
+        valides"
+      partial_success: 'Compte(s) %{created_count} associé(s) avec succès. %{already_linked_count}
+        comptes étaient déjà associés : %{already_linked_names}'
+      select_connection: Choisissez une connexion Brex avant de lier des comptes.
+      success:
+        one: Compte %{count} associé avec succès
+        other: Comptes %{count} associés avec succès
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      api_error: 'Erreur API : %{message}'
+      invalid_account_name: Impossible de lier un compte avec un nom vide
+      missing_parameters: Paramètres requis manquants
+      no_account_specified: Aucun compte spécifié
+      no_api_token: Jeton API Brex introuvable. Veuillez le configurer dans les paramètres
+        du fournisseur.
+      provider_account_already_linked: Ce compte Brex est déjà lié à un autre compte
+      provider_account_not_found: Compte Brex introuvable
+      select_connection: Choisissez une connexion Brex avant de lier des comptes.
+      success: Liaison réussie de %{account_name} avec le Brex
+    loading:
+      loading_message: Chargement des comptes Brex...
+      loading_title: Chargement
+    provider_connection:
+      default_description: Connectez-vous à votre compte Brex
+      default_name: Brex
+      description: Connectez-vous en utilisant %{name}
+      name: Brex-%{name}
+    provider_panel:
+      accounts_link: Comptes
+      add_connection: Ajouter une connexion Brex
+      base_url_label: URL de base (facultatif)
+      base_url_placeholder: https://api.brex.com
+      configured_html: Configuré et prêt à l'emploi. Visitez l'onglet %{accounts_link}
+        pour gérer et configurer des comptes.
+      connection_name_label: Nom de la connexion
+      connection_name_placeholder: Vérification commerciale
+      default_connection_name: Connexion Brex
+      disconnect_confirm: Déconnecter %{name} ?
+      disconnect_label: Déconnecter %{name}
+      encryption_warning:
+        message: Configurez les clés de chiffrement Active Record avant d’ajouter
+          des jetons Brex en production. Sans clés de chiffrement, Sure stocke les
+          informations d’identification et les instantanés du fournisseur Brex en
+          texte brut, comme les enregistrements des autres fournisseurs.
+        title: Le chiffrement de la base de données n'est pas configuré
+      instructions:
+        copy_token_html: Copiez le jeton et ajoutez-le en tant que connexion nommée
+          ci-dessous. Bien sûr, stocke le jeton uniquement pour synchroniser cette
+          famille.
+        create_token: 'Créez un jeton API avec ces étendues en lecture seule : comptes.cash.readonly,
+          comptes.card.readonly, transactions.cash.readonly, transactions.card.readonly'
+        open_tokens: Accédez aux paramètres du développeur Brex/du jeton API de l'entreprise
+          que vous souhaitez connecter.
+        sign_in_html: Visitez %{link} et connectez-vous au compte que vous souhaitez
+          connecter
+      keep_token_placeholder: Laisser vide pour conserver le jeton actuel
+      not_configured: Non configuré
+      sandbox_note_html: Utilisez une connexion nommée distincte pour chaque jeton
+        d'entreprise/API Brex que vous souhaitez synchroniser. Laissez l’URL de base
+        vide pour la production. La mise en scène est limitée aux tests approuvés
+        par le Brex et ne fonctionne pas avec les jetons client.
+      setup_accounts: Configurer des comptes
+      setup_title: 'Instructions de configuration :'
+      sync: Synchroniser
+      token_label: Jeton
+      token_placeholder: Collez le jeton ici
+      update_connection: Mettre à jour la connexion
+    select_accounts:
+      accounts_selected: comptes sélectionnés
+      api_error: 'Erreur API : %{message}'
+      cancel: Annuler
+      configure_name_in_brex: Impossible d'importer - veuillez configurer le nom du
+        compte dans Brex
+      description: Sélectionnez les comptes que vous souhaitez associer à votre compte
+        %{product_name}.
+      link_accounts: Associer les comptes sélectionnés
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de
+        votre jeton API.
+      no_api_token: Jeton API Brex introuvable. Veuillez le configurer dans les paramètres
+        du fournisseur.
+      no_credentials_configured: Veuillez d'abord configurer votre jeton API Brex
+        dans les paramètres du fournisseur.
+      no_name_placeholder: "(Pas de nom)"
+      select_connection: Choisissez une connexion Brex dans les paramètres du fournisseur.
+      title: Sélectionnez les comptes Brex
+      unexpected_error: Une erreur inattendue s'est produite. Veuillez réessayer plus
+        tard.
+    select_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      all_accounts_already_linked: Tous les comptes Brex sont déjà liés
+      api_error: 'Erreur API : %{message}'
+      cancel: Annuler
+      configure_name_in_brex: Impossible d'importer - veuillez configurer le nom du
+        compte dans Brex
+      description: Sélectionnez un compte Brex à associer à ce compte. Les transactions
+        seront synchronisées et dédupliquées automatiquement.
+      link_account: Lier le compte
+      no_account_specified: Aucun compte spécifié
+      no_accounts_found: Aucun compte Brex trouvé. Veuillez vérifier la configuration
+        de votre jeton API.
+      no_api_token: Jeton API Brex introuvable. Veuillez le configurer dans les paramètres
+        du fournisseur.
+      no_credentials_configured: Veuillez d'abord configurer votre jeton API Brex
+        dans les paramètres du fournisseur.
+      no_name_placeholder: "(Pas de nom)"
+      select_connection: Choisissez une connexion Brex dans les paramètres du fournisseur.
+      title: Lier %{account_name} au Brex
+      unexpected_error: Une erreur inattendue s'est produite. Veuillez réessayer plus
+        tard.
+    setup_accounts:
+      account_type_label: 'Type de compte :'
+      account_types:
+        credit_card: Carte de crédit
+        depository: Compte chèque ou compte d'épargne
+        investment: Compte d'investissement
+        loan: Prêt ou hypothèque
+        other_asset: Autre actif
+        skip: Ignorer ce compte
+      all_accounts_linked: Tous vos comptes Brex ont déjà été créés.
+      api_error: 'Erreur API : %{message}'
+      balance: Solde
+      cancel: Annuler
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        Brex :'
+      create_accounts: Créer des comptes
+      creating_accounts: Création de comptes...
+      fetch_failed: Échec de la récupération des comptes
+      historical_data_range: 'Plage de données historiques :'
+      no_accounts_to_setup: Aucun compte à configurer
+      no_api_token: Jeton API Brex introuvable. Veuillez le configurer dans les paramètres
+        du fournisseur.
+      subtitle: Choisissez les types de comptes corrects pour vos comptes importés
+      subtype_labels:
+        credit_card: ''
+        depository: 'Sous-type de compte :'
+        investment: 'Type d''investissement :'
+        loan: 'Type de prêt :'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Les cartes de crédit seront automatiquement configurées en tant
+          que comptes de carte de crédit.
+        other_asset: Aucune option supplémentaire n'est nécessaire pour les autres
+          actifs.
+      subtypes:
+        depository:
+          cd: Certificat de dépôt
+          checking: Vérification
+          hsa: Compte d'épargne santé
+          money_market: Marché monétaire
+          savings: Économies
+        investment:
+          401k: 401(k)
+          403b: 403b)
+          529_plan: Régime 529
+          angel: Ange
+          brokerage: Courtage
+          hsa: Compte d'épargne santé
+          ira: IRA traditionnel
+          mutual_fund: Fonds commun de placement
+          pension: Pension
+          retirement: Retraite
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Plan d'épargne-épargne
+        loan:
+          auto: Prêt automobile
+          mortgage: Hypothèque
+          other: Autre prêt
+          student: Prêt étudiant
+      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions. Maximum 3 ans d’historique disponible.
+      sync_start_date_label: 'Commencez à synchroniser les transactions à partir de :'
+      title: Configurez vos comptes Brex
+    setup_required:
+      description: Avant de pouvoir lier des comptes Brex, vous devez configurer votre
+        jeton API Brex.
+      heading: Jeton API non configuré
+      settings_link: Accédez aux paramètres du fournisseur
+      setup_steps: 'Étapes de configuration :'
+      steps:
+        enter_token: Entrez votre jeton API Brex
+        find_section_html: Retrouvez la rubrique <strong>Brex</strong>
+        open_settings_html: Accédez à <strong>Paramètres > Fournisseurs</strong>.
+        return_to_link: Revenez ici pour lier vos comptes
+      title: Configuration Brex requise
+    statuses:
+      ACTIVE: Actif
+      CLOSED: Fermé
+      FROZEN: Congelé
+      active: Actif
+      closed: Fermé
+      frozen: Congelé
+    subtype_select:
+      placeholder:
+        subtype: Sélectionnez le sous-type
+        type: Sélectionnez le type
+    sync:
+      success: La synchronisation a commencé
+    sync_status:
+      all_synced:
+        one: Compte %{count} synchronisé
+        other: "%{count} comptes synchronisés"
+      no_accounts: Aucun compte trouvé
+      partial_setup: "%{synced} synchronisé, %{pending} doit être configuré"
+    syncer:
+      account_processing_failed:
+        one: "%{count} Le compte Brex a échoué lors du traitement."
+        other: "%{count} Les comptes Brex ont échoué lors du traitement."
+      account_sync_failed:
+        one: "%{count} La synchronisation du compte Brex n'a pas pu être planifiée."
+        other: "%{count} Les synchronisations des comptes Brex n'ont pas pu être planifiées."
+      accounts_failed:
+        one: L'importation du compte Brex %{count} a échoué.
+        other: "%{count} L'importation des comptes Brex a échoué."
+      accounts_need_setup:
+        one: Le compte %{count} doit être configuré...
+        other: Les comptes %{count} doivent être configurés...
+      calculating_balances: Calcul des soldes...
+      checking_account_configuration: Vérification de la configuration du compte...
+      credentials_invalid: Jeton API Brex ou autorisations de compte non valides
+      failed: La synchronisation a échoué. Veuillez réessayer ou contacter l'assistance.
+      import_failed: L’importation Brex a échoué.
+      importing_accounts: Importation de comptes depuis le Brex...
+      processing_transactions: Traitement des transactions...
+      transactions_failed:
+        one: Le compte %{count} Brex a connu des échecs d'importation de transactions.
+        other: "%{count} Les comptes Brex ont connu des échecs d'importation de transactions."
+    update:
+      success: Connexion Brex mise à jour
diff --git a/config/locales/views/brex_items/it.yml b/config/locales/views/brex_items/it.yml
new file mode 100644
index 000000000..414869823
--- /dev/null
+++ b/config/locales/views/brex_items/it.yml
@@ -0,0 +1,277 @@
+---
+it:
+  brex_items:
+    default_connection_name: Connessione Brex
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    kinds:
+      cash: Liquidità
+      card: Carta
+    statuses:
+      ACTIVE: Attivo
+      active: Attivo
+      CLOSED: Chiuso
+      closed: Chiuso
+      frozen: Bloccato
+      FROZEN: Bloccato
+    create:
+      success: Connessione Brex creata con successo
+    default_card_name: Carta Brex
+    default_cash_name: "Liquidità Brex %{id}"
+    destroy:
+      success: Connessione Brex rimossa
+    index:
+      title: Connessioni Brex
+    institution_summary:
+      none: Nessuna istituzione connessa
+      one: "%{name}"
+      count:
+        one: "%{count} istituzione"
+        other: "%{count} istituzioni"
+    sync_status:
+      no_accounts: Nessun conto trovato
+      all_synced:
+        one: "%{count} conto sincronizzato"
+        other: "%{count} conti sincronizzati"
+      partial_setup: "%{synced} sincronizzati, %{pending} da configurare"
+    api_error:
+      common_issues: "Problemi comuni:"
+      expired_credentials: Genera un nuovo token API da Brex.
+      expired_credentials_label: "Credenziali scadute:"
+      heading: Impossibile connettersi a Brex
+      invalid_token: Controlla il tuo token API nelle Impostazioni provider.
+      invalid_token_label: "Token API non valido:"
+      network: Controlla la tua connessione internet.
+      network_label: "Problema di rete:"
+      permissions: Assicurati che il tuo token abbia gli scope di account e transazioni in sola lettura richiesti.
+      permissions_label: "Permessi insufficienti:"
+      service: L'API Brex potrebbe essere temporaneamente non disponibile.
+      service_label: "Servizio non disponibile:"
+      settings_link: Controlla Impostazioni provider
+      title: Errore di connessione Brex
+    errors:
+      unexpected_error: Si è verificato un errore imprevisto. Riprova più tardi.
+    entries:
+      default_name: Transazione Brex
+    loading:
+      loading_message: Caricamento conti Brex...
+      loading_title: Caricamento
+    link_accounts:
+      all_already_linked:
+        one: "Il conto selezionato (%{names}) è già collegato"
+        other: "Tutti i %{count} conti selezionati sono già collegati: %{names}"
+      api_error: "Errore API: %{message}"
+      invalid_account_names:
+        one: "Impossibile collegare un conto senza nome"
+        other: "Impossibile collegare %{count} conti senza nome"
+      invalid_account_type: Tipo di conto Brex non supportato
+      link_failed: Collegamento conti fallito
+      no_accounts_selected: Seleziona almeno un conto
+      no_api_token: Token API Brex non trovato. Configuralo nelle Impostazioni provider.
+      partial_invalid: "Collegati con successo %{created_count} conto/i, %{already_linked_count} conto/i erano già collegati, %{invalid_count} conto/i aveva nomi non validi"
+      partial_success: "Collegati con successo %{created_count} conto/i. %{already_linked_count} conto/i erano già collegati: %{already_linked_names}"
+      select_connection: Scegli una connessione Brex prima di collegare i conti.
+      success:
+        one: "Collegato con successo %{count} conto"
+        other: "Collegati con successo %{count} conti"
+    brex_item:
+      accounts_need_setup: I conti devono essere configurati
+      delete: Elimina connessione
+      deletion_in_progress: eliminazione in corso...
+      error: Errore
+      no_accounts_description: Questa connessione non ha ancora conti collegati.
+      no_accounts_title: Nessun conto
+      setup_action: Configura nuovi conti
+      setup_description: "%{linked} di %{total} conti collegati. Scegli i tipi di conto per i tuoi nuovi conti Brex importati."
+      setup_needed: Nuovi conti pronti per la configurazione
+      status: "Sincronizzato %{timestamp} fa"
+      status_never: Mai sincronizzato
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      syncing: Sincronizzazione in corso...
+      total: Totale
+      unlinked: Non collegati
+    provider_panel:
+      accounts_link: Conti
+      add_connection: Aggiungi connessione Brex
+      base_url_label: URL base (facoltativo)
+      base_url_placeholder: https://api.brex.com
+      connection_name_label: Nome connessione
+      connection_name_placeholder: Conto aziendale
+      configured_html: "Configurato e pronto all'uso. Visita la scheda %{accounts_link} per gestire e configurare i conti."
+      default_connection_name: Connessione Brex
+      disconnect_label: "Disconnetti %{name}"
+      disconnect_confirm: "Disconnettere %{name}?"
+      encryption_warning:
+        title: La crittografia del database non è configurata
+        message: Configura le chiavi di crittografia di Active Record prima di aggiungere token Brex in produzione. Senza chiavi di crittografia, Sure archivia le credenziali del provider Brex in chiaro.
+      instructions:
+        copy_token_html: "Copia il token e aggiungilo come connessione nominata qui sotto. Sure memorizza il token solo per sincronizzare questa famiglia."
+        create_token: "Crea un token API con questi scope in sola lettura: accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly"
+        open_tokens: Vai alle impostazioni sviluppatore/token API Brex per l'azienda che vuoi connettere
+        sign_in_html: "Visita %{link} e accedi all'account che vuoi connettere"
+      keep_token_placeholder: Lascia vuoto per mantenere il token attuale
+      not_configured: Non configurato
+      sandbox_note_html: "Usa una connessione nominata separata per ogni azienda/token API Brex che vuoi sincronizzare. Lascia l'URL base vuoto per la produzione. L'ambiente staging è limitato ai test approvati da Brex."
+      setup_accounts: Configura conti
+      setup_title: "Istruzioni di configurazione:"
+      sync: Sincronizza
+      token_label: Token
+      token_placeholder: Incolla il token qui
+      update_connection: Aggiorna connessione
+    provider_connection:
+      default_description: Connetti al tuo account Brex
+      default_name: Brex
+      description: "Connetti usando %{name}"
+      name: "Brex - %{name}"
+    select_accounts:
+      accounts_selected: conti selezionati
+      api_error: "Errore API: %{message}"
+      cancel: Annulla
+      configure_name_in_brex: Impossibile importare - configura il nome del conto in Brex
+      description: Seleziona i conti che vuoi collegare al tuo account %{product_name}.
+      link_accounts: Collega i conti selezionati
+      no_accounts_found: Nessun conto trovato. Controlla la configurazione del tuo token API.
+      no_api_token: Token API Brex non trovato. Configuralo nelle Impostazioni provider.
+      no_credentials_configured: Configura prima il tuo token API Brex nelle Impostazioni provider.
+      no_name_placeholder: "(Nessun nome)"
+      select_connection: Scegli una connessione Brex nelle Impostazioni provider.
+      title: Seleziona conti Brex
+      unexpected_error: Si è verificato un errore imprevisto. Riprova più tardi.
+    select_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      all_accounts_already_linked: Tutti i conti Brex sono già collegati
+      api_error: "Errore API: %{message}"
+      cancel: Annulla
+      configure_name_in_brex: Impossibile importare - configura il nome del conto in Brex
+      description: Seleziona un conto Brex da collegare a questo conto. Le transazioni verranno sincronizzate e deduplicate automaticamente.
+      link_account: Collega conto
+      no_account_specified: Nessun conto specificato
+      no_accounts_found: Nessun conto Brex trovato. Controlla la configurazione del token API.
+      no_api_token: Token API Brex non trovato. Configuralo nelle Impostazioni provider.
+      no_credentials_configured: Configura prima il tuo token API Brex nelle Impostazioni provider.
+      no_name_placeholder: "(Nessun nome)"
+      select_connection: Scegli una connessione Brex nelle Impostazioni provider.
+      title: "Collega %{account_name} con Brex"
+      unexpected_error: Si è verificato un errore imprevisto. Riprova più tardi.
+    setup_required:
+      description: Prima di poter collegare i conti Brex, devi configurare il tuo token API Brex.
+      heading: Token API non configurato
+      settings_link: Vai alle Impostazioni provider
+      setup_steps: "Passaggi di configurazione:"
+      steps:
+        enter_token: Inserisci il tuo token API Brex
+        find_section_html: "Trova la sezione <strong>Brex</strong>"
+        open_settings_html: "Vai su <strong>Impostazioni > Provider</strong>"
+        return_to_link: Torna qui per collegare i tuoi conti
+      title: Configurazione Brex richiesta
+    subtype_select:
+      placeholder:
+        subtype: Seleziona sottotipo
+        type: Seleziona tipo
+    link_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      api_error: "Errore API: %{message}"
+      invalid_account_name: Impossibile collegare un conto senza nome
+      missing_parameters: Parametri obbligatori mancanti
+      no_account_specified: Nessun conto specificato
+      no_api_token: Token API Brex non trovato. Configuralo nelle Impostazioni provider.
+      provider_account_already_linked: Questo conto Brex è già collegato a un altro conto
+      provider_account_not_found: Conto Brex non trovato
+      select_connection: Scegli una connessione Brex prima di collegare i conti.
+      success: "Collegato con successo %{account_name} con Brex"
+    setup_accounts:
+      account_type_label: "Tipo di conto:"
+      all_accounts_linked: "Tutti i tuoi conti Brex sono già stati configurati."
+      api_error: "Errore API: %{message}"
+      fetch_failed: "Recupero conti fallito"
+      no_accounts_to_setup: "Nessun conto da configurare"
+      no_api_token: Token API Brex non trovato. Configuralo nelle Impostazioni provider.
+      account_types:
+        skip: Salta questo conto
+        depository: Conto Corrente o Risparmio
+        credit_card: Carta di credito
+        investment: Conto investimento
+        loan: Prestito o Mutuo
+        other_asset: Altro attivo
+      subtype_labels:
+        depository: "Sottotipo conto:"
+        credit_card: ""
+        investment: "Tipo investimento:"
+        loan: "Tipo prestito:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Le carte di credito saranno configurate automaticamente come conti carta di credito."
+        other_asset: "Nessuna opzione aggiuntiva necessaria per gli altri attivi."
+      subtypes:
+        depository:
+          checking: Conto Corrente
+          savings: Risparmio
+          hsa: Health Savings Account
+          cd: Certificato di Deposito
+          money_market: Mercato Monetario
+        investment:
+          brokerage: Intermediazione
+          pension: Pensione
+          retirement: Previdenza
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "Piano 529"
+          hsa: Health Savings Account
+          mutual_fund: Fondo comune
+          ira: IRA Tradizionale
+          roth_ira: Roth IRA
+          angel: Angel
+        loan:
+          mortgage: Mutuo
+          student: Prestito studentesco
+          auto: Prestito auto
+          other: Altro prestito
+      balance: Saldo
+      cancel: Annulla
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto Brex:"
+      create_accounts: Crea conti
+      creating_accounts: Creazione conti in corso...
+      historical_data_range: "Intervallo dati storici:"
+      subtitle: Scegli i tipi di conto corretti per i tuoi conti importati
+      sync_start_date_help: Seleziona fino a quando vuoi sincronizzare la cronologia delle transazioni. Disponibili fino a 3 anni di cronologia.
+      sync_start_date_label: "Inizia a sincronizzare le transazioni da:"
+      title: Configura i tuoi conti Brex
+    complete_account_setup:
+      all_skipped: "Tutti i conti sono stati saltati. Nessun conto è stato creato."
+      creation_failed: "Creazione conti fallita: %{error}"
+      creation_failed_count: "Creazione di %{count} conto/i fallita."
+      no_accounts: "Nessun conto da configurare."
+      partial_skipped: "Creati con successo %{created_count} conto/i; %{skipped_count} conto/i sono stati saltati."
+      partial_success: "Creati con successo %{created_count} conto/i, ma %{failed_count} conto/i hanno fallito."
+      success: "Creati con successo %{count} conto/i."
+      unexpected_error: Si è verificato un errore imprevisto.
+    sync:
+      success: Sincronizzazione avviata
+    syncer:
+      account_processing_failed:
+        one: "%{count} conto Brex ha fallito durante l'elaborazione."
+        other: "%{count} conti Brex hanno fallito durante l'elaborazione."
+      account_sync_failed:
+        one: "La sincronizzazione di %{count} conto Brex non è stata pianificata."
+        other: "Le sincronizzazioni di %{count} conti Brex non sono state pianificate."
+      accounts_need_setup:
+        one: "%{count} conto da configurare..."
+        other: "%{count} conti da configurare..."
+      accounts_failed:
+        one: "%{count} conto Brex non è stato importato."
+        other: "%{count} conti Brex non sono stati importati."
+      calculating_balances: Calcolo saldi...
+      checking_account_configuration: Verifica configurazione conti...
+      credentials_invalid: Token API Brex o permessi account non validi
+      failed: Sincronizzazione fallita. Riprova o contatta il supporto.
+      import_failed: Importazione Brex fallita.
+      importing_accounts: Importazione conti da Brex...
+      processing_transactions: Elaborazione transazioni...
+      transactions_failed:
+        one: "%{count} conto Brex ha avuto errori nell'importazione delle transazioni."
+        other: "%{count} conti Brex hanno avuto errori nell'importazione delle transazioni."
+    update:
+      success: Connessione Brex aggiornata
diff --git a/config/locales/views/brex_items/nl.yml b/config/locales/views/brex_items/nl.yml
new file mode 100644
index 000000000..081147174
--- /dev/null
+++ b/config/locales/views/brex_items/nl.yml
@@ -0,0 +1,277 @@
+---
+nl:
+  brex_items:
+    default_connection_name: Brex-verbinding
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    kinds:
+      cash: Contant
+      card: Kaart
+    statuses:
+      ACTIVE: Actief
+      active: Actief
+      CLOSED: Gesloten
+      closed: Gesloten
+      frozen: Bevroren
+      FROZEN: Bevroren
+    create:
+      success: Brex-verbinding succesvol aangemaakt
+    default_card_name: Brex-kaart
+    default_cash_name: "Brex Cash %{id}"
+    destroy:
+      success: Brex-verbinding verwijderd
+    index:
+      title: Brex-verbindingen
+    institution_summary:
+      none: Geen instellingen verbonden
+      one: "%{name}"
+      count:
+        one: "%{count} instelling"
+        other: "%{count} instellingen"
+    sync_status:
+      no_accounts: Geen accounts gevonden
+      all_synced:
+        one: "%{count} account gesynchroniseerd"
+        other: "%{count} accounts gesynchroniseerd"
+      partial_setup: "%{synced} gesynchroniseerd, %{pending} moeten worden ingesteld"
+    api_error:
+      common_issues: "Veelvoorkomende problemen:"
+      expired_credentials: Genereer een nieuw API-token bij Brex.
+      expired_credentials_label: "Verlopen inloggegevens:"
+      heading: Kan geen verbinding maken met Brex
+      invalid_token: Controleer uw API-token in de Provider-instellingen.
+      invalid_token_label: "Ongeldig API-token:"
+      network: Controleer uw internetverbinding.
+      network_label: "Netwerkprobleem:"
+      permissions: Zorg ervoor dat uw token over de vereiste alleen-lezen-scopes voor account en transacties beschikt.
+      permissions_label: "Onvoldoende rechten:"
+      service: De Brex-API is mogelijk tijdelijk niet beschikbaar.
+      service_label: "Dienst niet beschikbaar:"
+      settings_link: Provider-instellingen controleren
+      title: Brex-verbindingsfout
+    errors:
+      unexpected_error: Er is een onverwachte fout opgetreden. Probeer het later opnieuw.
+    entries:
+      default_name: Brex-transactie
+    loading:
+      loading_message: Brex-accounts laden...
+      loading_title: Laden
+    link_accounts:
+      all_already_linked:
+        one: "Het geselecteerde account (%{names}) is al gekoppeld"
+        other: "Alle %{count} geselecteerde accounts zijn al gekoppeld: %{names}"
+      api_error: "API-fout: %{message}"
+      invalid_account_names:
+        one: "Kan account met lege naam niet koppelen"
+        other: "Kan %{count} accounts met lege namen niet koppelen"
+      invalid_account_type: Niet-ondersteund Brex-accounttype
+      link_failed: Accounts koppelen mislukt
+      no_accounts_selected: Selecteer ten minste één account
+      no_api_token: Brex-API-token niet gevonden. Configureer het in de Provider-instellingen.
+      partial_invalid: "%{created_count} account(s) succesvol gekoppeld, %{already_linked_count} account(s) waren al gekoppeld, %{invalid_count} account(s) hadden ongeldige namen"
+      partial_success: "%{created_count} account(s) succesvol gekoppeld. %{already_linked_count} account(s) waren al gekoppeld: %{already_linked_names}"
+      select_connection: Kies een Brex-verbinding voordat u accounts koppelt.
+      success:
+        one: "%{count} account succesvol gekoppeld"
+        other: "%{count} accounts succesvol gekoppeld"
+    brex_item:
+      accounts_need_setup: Accounts moeten worden ingesteld
+      delete: Verbinding verwijderen
+      deletion_in_progress: verwijderen bezig...
+      error: Fout
+      no_accounts_description: Deze verbinding heeft nog geen gekoppelde accounts.
+      no_accounts_title: Geen accounts
+      setup_action: Nieuwe accounts instellen
+      setup_description: "%{linked} van %{total} accounts gekoppeld. Kies accounttypes voor uw nieuw geïmporteerde Brex-accounts."
+      setup_needed: Nieuwe accounts klaar om in te stellen
+      status: "Gesynchroniseerd %{timestamp} geleden"
+      status_never: Nooit gesynchroniseerd
+      status_with_summary: "Laatst gesynchroniseerd %{timestamp} geleden - %{summary}"
+      syncing: Synchroniseren...
+      total: Totaal
+      unlinked: Niet gekoppeld
+    provider_panel:
+      accounts_link: Accounts
+      add_connection: Brex-verbinding toevoegen
+      base_url_label: Basis-URL (optioneel)
+      base_url_placeholder: https://api.brex.com
+      configured_html: "Geconfigureerd en klaar voor gebruik. Ga naar het tabblad %{accounts_link} om accounts te beheren en in te stellen."
+      connection_name_label: Verbindingsnaam
+      connection_name_placeholder: Zakelijke betaalrekening
+      default_connection_name: Brex-verbinding
+      disconnect_label: "%{name} loskoppelen"
+      disconnect_confirm: "%{name} loskoppelen?"
+      encryption_warning:
+        title: Databaseversleuteling is niet geconfigureerd
+        message: Configureer de Active Record-versleutelingssleutels voordat u Brex-tokens in productie toevoegt. Zonder versleutelingssleutels slaat Sure de Brex-provider-inloggegevens en momentopnamen op in platte tekst, net als andere providerrecords.
+      instructions:
+        copy_token_html: "Kopieer het token en voeg het hieronder toe als een benoemde verbinding. Sure bewaart het token alleen om dit gezin te synchroniseren."
+        create_token: "Maak een API-token met deze alleen-lezen-scopes: accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly"
+        open_tokens: Ga naar de Brex-instellingen voor ontwikkelaars-/API-tokens voor het bedrijf dat u wilt verbinden
+        sign_in_html: "Ga naar %{link} en log in op het account dat u wilt verbinden"
+      keep_token_placeholder: Laat leeg om het huidige token te behouden
+      not_configured: Niet geconfigureerd
+      sandbox_note_html: "Gebruik een aparte benoemde verbinding voor elk Brex-bedrijf/API-token dat u wilt synchroniseren. Laat de Basis-URL leeg voor productie. Staging is beperkt tot door Brex goedgekeurde tests en werkt niet met klanttokens."
+      setup_accounts: Accounts instellen
+      setup_title: "Installatie-instructies:"
+      sync: Synchroniseren
+      token_label: Token
+      token_placeholder: Plak het token hier
+      update_connection: Verbinding bijwerken
+    provider_connection:
+      default_description: Verbinden met uw Brex-account
+      default_name: Brex
+      description: "Verbinden via %{name}"
+      name: "Brex - %{name}"
+    select_accounts:
+      accounts_selected: accounts geselecteerd
+      api_error: "API-fout: %{message}"
+      cancel: Annuleren
+      configure_name_in_brex: "Kan niet importeren - configureer de accountnaam in Brex"
+      description: Selecteer de accounts die u wilt koppelen aan uw %{product_name}-account.
+      link_accounts: Geselecteerde accounts koppelen
+      no_accounts_found: Geen accounts gevonden. Controleer uw API-tokenconfiguratie.
+      no_api_token: Brex-API-token niet gevonden. Configureer het in de Provider-instellingen.
+      no_credentials_configured: Configureer eerst uw Brex-API-token in de Provider-instellingen.
+      no_name_placeholder: "(Geen naam)"
+      select_connection: Kies een Brex-verbinding in de Provider-instellingen.
+      title: Brex-accounts selecteren
+      unexpected_error: Er is een onverwachte fout opgetreden. Probeer het later opnieuw.
+    select_existing_account:
+      account_already_linked: Dit account is al gekoppeld aan een provider
+      all_accounts_already_linked: Alle Brex-accounts zijn al gekoppeld
+      api_error: "API-fout: %{message}"
+      cancel: Annuleren
+      configure_name_in_brex: "Kan niet importeren - configureer de accountnaam in Brex"
+      description: Selecteer een Brex-account om aan dit account te koppelen. Transacties worden automatisch gesynchroniseerd en ontdubbeld.
+      link_account: Account koppelen
+      no_account_specified: Geen account opgegeven
+      no_accounts_found: Geen Brex-accounts gevonden. Controleer uw API-tokenconfiguratie.
+      no_api_token: Brex-API-token niet gevonden. Configureer het in de Provider-instellingen.
+      no_credentials_configured: Configureer eerst uw Brex-API-token in de Provider-instellingen.
+      no_name_placeholder: "(Geen naam)"
+      select_connection: Kies een Brex-verbinding in de Provider-instellingen.
+      title: "%{account_name} koppelen aan Brex"
+      unexpected_error: Er is een onverwachte fout opgetreden. Probeer het later opnieuw.
+    setup_required:
+      description: Voordat u Brex-accounts kunt koppelen, moet u uw Brex-API-token configureren.
+      heading: API-token niet geconfigureerd
+      settings_link: Ga naar Provider-instellingen
+      setup_steps: "Installatiestappen:"
+      steps:
+        enter_token: Voer uw Brex-API-token in
+        find_section_html: "Zoek het gedeelte <strong>Brex</strong>"
+        open_settings_html: "Ga naar <strong>Instellingen > Providers</strong>"
+        return_to_link: Kom hier terug om uw accounts te koppelen
+      title: Brex-installatie vereist
+    subtype_select:
+      placeholder:
+        subtype: Selecteer subtype
+        type: Selecteer type
+    link_existing_account:
+      account_already_linked: Dit account is al gekoppeld aan een provider
+      api_error: "API-fout: %{message}"
+      invalid_account_name: Kan account met lege naam niet koppelen
+      missing_parameters: Vereiste parameters ontbreken
+      no_account_specified: Geen account opgegeven
+      no_api_token: Brex-API-token niet gevonden. Configureer het in de Provider-instellingen.
+      provider_account_already_linked: Dit Brex-account is al gekoppeld aan een ander account
+      provider_account_not_found: Brex-account niet gevonden
+      select_connection: Kies een Brex-verbinding voordat u accounts koppelt.
+      success: "%{account_name} succesvol gekoppeld aan Brex"
+    setup_accounts:
+      account_type_label: "Accounttype:"
+      all_accounts_linked: "Al uw Brex-accounts zijn al ingesteld."
+      api_error: "API-fout: %{message}"
+      fetch_failed: "Accounts ophalen mislukt"
+      no_accounts_to_setup: "Geen accounts om in te stellen"
+      no_api_token: Brex-API-token niet gevonden. Configureer het in de Provider-instellingen.
+      account_types:
+        skip: Dit account overslaan
+        depository: Betaal- of spaarrekening
+        credit_card: Creditcard
+        investment: Beleggingsaccount
+        loan: Lening of hypotheek
+        other_asset: Overig actief
+      subtype_labels:
+        depository: "Accountsubtype:"
+        credit_card: ""
+        investment: "Beleggingstype:"
+        loan: "Leningtype:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Creditcards worden automatisch ingesteld als creditcardaccounts."
+        other_asset: "Voor overige activa zijn geen aanvullende opties nodig."
+      subtypes:
+        depository:
+          checking: Betaalrekening
+          savings: Spaarrekening
+          hsa: Zorgspaarrekening
+          cd: Termijndeposito
+          money_market: Geldmarktrekening
+        investment:
+          brokerage: Effectenrekening
+          pension: Pensioen
+          retirement: Pensioenvoorziening
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "529-plan"
+          hsa: Zorgspaarrekening
+          mutual_fund: Beleggingsfonds
+          ira: Traditionele IRA
+          roth_ira: Roth IRA
+          angel: Angel
+        loan:
+          mortgage: Hypotheek
+          student: Studielening
+          auto: Autolening
+          other: Overige lening
+      balance: Saldo
+      cancel: Annuleren
+      choose_account_type: "Kies het juiste accounttype voor elk Brex-account:"
+      create_accounts: Accounts aanmaken
+      creating_accounts: Accounts aanmaken...
+      historical_data_range: "Historisch gegevensbereik:"
+      subtitle: Kies de juiste accounttypes voor uw geïmporteerde accounts
+      sync_start_date_help: Selecteer hoe ver terug u de transactiegeschiedenis wilt synchroniseren. Maximaal 3 jaar geschiedenis beschikbaar.
+      sync_start_date_label: "Transacties synchroniseren vanaf:"
+      title: Stel uw Brex-accounts in
+    complete_account_setup:
+      all_skipped: "Alle accounts zijn overgeslagen. Er zijn geen accounts aangemaakt."
+      creation_failed: "Accounts konden niet worden aangemaakt: %{error}"
+      creation_failed_count: "%{count} account(s) konden niet worden aangemaakt."
+      no_accounts: "Geen accounts om in te stellen."
+      partial_skipped: "%{created_count} account(s) succesvol aangemaakt; %{skipped_count} account(s) zijn overgeslagen."
+      partial_success: "%{created_count} account(s) succesvol aangemaakt, maar %{failed_count} account(s) mislukten."
+      success: "%{count} account(s) succesvol aangemaakt."
+      unexpected_error: Er is een onverwachte fout opgetreden.
+    sync:
+      success: Synchronisatie gestart
+    syncer:
+      account_processing_failed:
+        one: "%{count} Brex-account mislukte tijdens de verwerking."
+        other: "%{count} Brex-accounts mislukten tijdens de verwerking."
+      account_sync_failed:
+        one: "%{count} Brex-accountsynchronisatie kon niet worden ingepland."
+        other: "%{count} Brex-accountsynchronisaties konden niet worden ingepland."
+      accounts_need_setup:
+        one: "%{count} account moet worden ingesteld..."
+        other: "%{count} accounts moeten worden ingesteld..."
+      accounts_failed:
+        one: "%{count} Brex-account kon niet worden geïmporteerd."
+        other: "%{count} Brex-accounts konden niet worden geïmporteerd."
+      calculating_balances: Saldi berekenen...
+      checking_account_configuration: Accountconfiguratie controleren...
+      credentials_invalid: Ongeldig Brex-API-token of onvoldoende accountrechten
+      failed: Synchronisatie mislukt. Probeer het opnieuw of neem contact op met de ondersteuning.
+      import_failed: Brex-import mislukt.
+      importing_accounts: Accounts importeren vanuit Brex...
+      processing_transactions: Transacties verwerken...
+      transactions_failed:
+        one: "%{count} Brex-account had fouten bij het importeren van transacties."
+        other: "%{count} Brex-accounts hadden fouten bij het importeren van transacties."
+    update:
+      success: Brex-verbinding bijgewerkt
diff --git a/config/locales/views/brex_items/pl.yml b/config/locales/views/brex_items/pl.yml
new file mode 100644
index 000000000..3fde5a5f0
--- /dev/null
+++ b/config/locales/views/brex_items/pl.yml
@@ -0,0 +1,305 @@
+---
+pl:
+  brex_items:
+    default_connection_name: Połączenie Brex
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    kinds:
+      cash: Gotówka
+      card: Karta
+    statuses:
+      ACTIVE: Aktywne
+      active: Aktywne
+      CLOSED: Zamknięte
+      closed: Zamknięte
+      frozen: Zablokowane
+      FROZEN: Zablokowane
+    create:
+      success: Połączenie Brex utworzone pomyślnie
+    default_card_name: Karta Brex
+    default_cash_name: "Brex Gotówka %{id}"
+    destroy:
+      success: Połączenie Brex usunięte
+    index:
+      title: Połączenia Brex
+    institution_summary:
+      none: Brak połączonych instytucji
+      one: "%{name}"
+      count:
+        few: "%{count} instytucje"
+        many: "%{count} instytucji"
+        one: "%{count} instytucja"
+        other: "%{count} instytucji"
+    sync_status:
+      no_accounts: Nie znaleziono kont
+      all_synced:
+        few: "%{count} konta zsynchronizowane"
+        many: "%{count} kont zsynchronizowanych"
+        one: "%{count} konto zsynchronizowane"
+        other: "%{count} kont zsynchronizowanych"
+      partial_setup: "%{synced} zsynchronizowanych, %{pending} wymaga konfiguracji"
+    api_error:
+      common_issues: "Najczęstsze problemy:"
+      expired_credentials: Wygeneruj nowy token API w Brex.
+      expired_credentials_label: "Wygasłe dane uwierzytelniające:"
+      heading: Nie można połączyć z Brex
+      invalid_token: Sprawdź swój token API w ustawieniach dostawcy.
+      invalid_token_label: "Nieprawidłowy token API:"
+      network: Sprawdź swoje połączenie internetowe.
+      network_label: "Problem z siecią:"
+      permissions: Upewnij się, że token ma wymagane zakresy tylko do odczytu kont i transakcji.
+      permissions_label: "Niewystarczające uprawnienia:"
+      service: API Brex może być tymczasowo niedostępne.
+      service_label: "Usługa niedostępna:"
+      settings_link: Sprawdź ustawienia dostawcy
+      title: Błąd połączenia Brex
+    errors:
+      unexpected_error: Wystąpił nieoczekiwany błąd. Spróbuj ponownie później.
+    entries:
+      default_name: Transakcja Brex
+    loading:
+      loading_message: Ładowanie kont Brex...
+      loading_title: Ładowanie
+    link_accounts:
+      all_already_linked:
+        few: "Wszystkie %{count} wybrane konta są już połączone: %{names}"
+        many: "Wszystkie %{count} wybranych kont jest już połączonych: %{names}"
+        one: "Wybrane konto (%{names}) jest już połączone"
+        other: "Wszystkie %{count} wybranych kont jest już połączonych: %{names}"
+      api_error: "Błąd API: %{message}"
+      invalid_account_names:
+        few: "Nie można połączyć %{count} kont z pustymi nazwami"
+        many: "Nie można połączyć %{count} kont z pustymi nazwami"
+        one: "Nie można połączyć konta z pustą nazwą"
+        other: "Nie można połączyć %{count} kont z pustymi nazwami"
+      invalid_account_type: Nieobsługiwany typ konta Brex
+      link_failed: Nie można połączyć kont
+      no_accounts_selected: Wybierz co najmniej jedno konto
+      no_api_token: Nie znaleziono tokenu API Brex. Skonfiguruj go w ustawieniach dostawcy.
+      partial_invalid: "Połączono %{created_count}, %{already_linked_count} było już połączonych, %{invalid_count} miało nieprawidłowe nazwy"
+      partial_success: "Połączono %{created_count}. %{already_linked_count} było już połączonych: %{already_linked_names}"
+      select_connection: Wybierz połączenie Brex przed połączeniem kont.
+      success:
+        few: "Połączono %{count} konta"
+        many: "Połączono %{count} kont"
+        one: "Połączono %{count} konto"
+        other: "Połączono %{count} kont"
+    brex_item:
+      accounts_need_setup: Konta wymagają konfiguracji
+      delete: Usuń połączenie
+      deletion_in_progress: trwa usuwanie...
+      error: Błąd
+      no_accounts_description: To połączenie nie ma jeszcze połączonych kont.
+      no_accounts_title: Brak kont
+      setup_action: Skonfiguruj nowe konta
+      setup_description: "%{linked} z %{total} kont połączonych. Wybierz typy kont dla nowo zaimportowanych kont Brex."
+      setup_needed: Nowe konta gotowe do konfiguracji
+      status: "Zsynchronizowano %{timestamp} temu"
+      status_never: Nigdy nie synchronizowano
+      status_with_summary: "Ostatnia synchronizacja %{timestamp} temu - %{summary}"
+      syncing: Synchronizowanie...
+      total: Łącznie
+      unlinked: Niepołączone
+    provider_panel:
+      accounts_link: Konta
+      add_connection: Dodaj połączenie Brex
+      base_url_label: Bazowy URL (opcjonalnie)
+      base_url_placeholder: https://api.brex.com
+      configured_html: "Skonfigurowane i gotowe do użycia. Przejdź do zakładki %{accounts_link}, aby zarządzać kontami."
+      connection_name_label: Nazwa połączenia
+      connection_name_placeholder: Firmowe konto
+      default_connection_name: Połączenie Brex
+      disconnect_label: "Rozłącz %{name}"
+      disconnect_confirm: "Rozłączyć %{name}?"
+      encryption_warning:
+        title: Szyfrowanie bazy danych nie jest skonfigurowane
+        message: Skonfiguruj klucze szyfrowania Active Record przed dodaniem tokenów Brex w produkcji. Bez kluczy szyfrowania Sure przechowuje dane uwierzytelniające Brex w postaci zwykłego tekstu.
+      instructions:
+        copy_token_html: "Skopiuj token i dodaj go jako nazwane połączenie poniżej. Sure przechowuje token wyłącznie do synchronizacji tej rodziny."
+        create_token: "Utwórz token API z następującymi zakresami tylko do odczytu: accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly"
+        open_tokens: Przejdź do ustawień tokenów API Brex dla firmy, którą chcesz połączyć
+        sign_in_html: "Odwiedź %{link} i zaloguj się na konto, które chcesz połączyć"
+      keep_token_placeholder: Pozostaw puste, aby zachować bieżący token
+      not_configured: Nieskonfigurowane
+      sandbox_note_html: "Użyj osobnego nazwanego połączenia dla każdej firmy/tokenu API Brex. Pozostaw bazowy URL pusty dla produkcji. Staging jest ograniczony do zatwierdzonych testów Brex."
+      setup_accounts: Konfiguruj konta
+      setup_title: "Instrukcje konfiguracji:"
+      sync: Synchronizuj
+      token_label: Token
+      token_placeholder: Wklej token tutaj
+      update_connection: Aktualizuj połączenie
+    provider_connection:
+      default_description: Połącz się ze swoim kontem Brex
+      default_name: Brex
+      description: "Połącz przez %{name}"
+      name: "Brex - %{name}"
+    select_accounts:
+      accounts_selected: wybrane konta
+      api_error: "Błąd API: %{message}"
+      cancel: Anuluj
+      configure_name_in_brex: Nie można zaimportować - skonfiguruj nazwę konta w Brex
+      description: Wybierz konta, które chcesz połączyć ze swoim kontem %{product_name}.
+      link_accounts: Połącz wybrane konta
+      no_accounts_found: Nie znaleziono kont. Sprawdź konfigurację tokenu API.
+      no_api_token: Nie znaleziono tokenu API Brex. Skonfiguruj go w ustawieniach dostawcy.
+      no_credentials_configured: Najpierw skonfiguruj token API Brex w ustawieniach dostawcy.
+      no_name_placeholder: "(Bez nazwy)"
+      select_connection: Wybierz połączenie Brex w ustawieniach dostawcy.
+      title: Wybierz konta Brex
+      unexpected_error: Wystąpił nieoczekiwany błąd. Spróbuj ponownie później.
+    select_existing_account:
+      account_already_linked: To konto jest już połączone z dostawcą
+      all_accounts_already_linked: Wszystkie konta Brex są już połączone
+      api_error: "Błąd API: %{message}"
+      cancel: Anuluj
+      configure_name_in_brex: Nie można zaimportować - skonfiguruj nazwę konta w Brex
+      description: Wybierz konto Brex do połączenia z tym kontem. Transakcje będą synchronizowane i deduplikowane automatycznie.
+      link_account: Połącz konto
+      no_account_specified: Nie określono konta
+      no_accounts_found: Nie znaleziono kont Brex. Sprawdź konfigurację tokenu API.
+      no_api_token: Nie znaleziono tokenu API Brex. Skonfiguruj go w ustawieniach dostawcy.
+      no_credentials_configured: Najpierw skonfiguruj token API Brex w ustawieniach dostawcy.
+      no_name_placeholder: "(Bez nazwy)"
+      select_connection: Wybierz połączenie Brex w ustawieniach dostawcy.
+      title: "Połącz %{account_name} z Brex"
+      unexpected_error: Wystąpił nieoczekiwany błąd. Spróbuj ponownie później.
+    setup_required:
+      description: Aby połączyć konta Brex, musisz najpierw skonfigurować token API Brex.
+      heading: Token API nie jest skonfigurowany
+      settings_link: Przejdź do ustawień dostawcy
+      setup_steps: "Kroki konfiguracji:"
+      steps:
+        enter_token: Wprowadź swój token API Brex
+        find_section_html: "Znajdź sekcję <strong>Brex</strong>"
+        open_settings_html: "Przejdź do <strong>Ustawienia > Dostawcy</strong>"
+        return_to_link: Wróć tutaj, aby połączyć konta
+      title: Wymagana konfiguracja Brex
+    subtype_select:
+      placeholder:
+        subtype: Wybierz podtyp
+        type: Wybierz typ
+    link_existing_account:
+      account_already_linked: To konto jest już połączone z dostawcą
+      api_error: "Błąd API: %{message}"
+      invalid_account_name: Nie można połączyć konta z pustą nazwą
+      missing_parameters: Brak wymaganych parametrów
+      no_account_specified: Nie określono konta
+      no_api_token: Nie znaleziono tokenu API Brex. Skonfiguruj go w ustawieniach dostawcy.
+      provider_account_already_linked: To konto Brex jest już połączone z innym kontem
+      provider_account_not_found: Nie znaleziono konta Brex
+      select_connection: Wybierz połączenie Brex przed połączeniem kont.
+      success: "Połączono %{account_name} z Brex"
+    setup_accounts:
+      account_type_label: "Typ konta:"
+      all_accounts_linked: "Wszystkie konta Brex zostały już skonfigurowane."
+      api_error: "Błąd API: %{message}"
+      fetch_failed: "Nie można pobrać kont"
+      no_accounts_to_setup: "Brak kont do skonfigurowania"
+      no_api_token: Nie znaleziono tokenu API Brex. Skonfiguruj go w ustawieniach dostawcy.
+      account_types:
+        skip: Pomiń to konto
+        depository: Konto czekowe lub oszczędnościowe
+        credit_card: Karta kredytowa
+        investment: Konto inwestycyjne
+        loan: Pożyczka lub hipoteka
+        other_asset: Inny składnik aktywów
+      subtype_labels:
+        depository: "Podtyp konta:"
+        credit_card: ""
+        investment: "Typ inwestycji:"
+        loan: "Typ pożyczki:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Karty kredytowe zostaną automatycznie skonfigurowane jako konta kart kredytowych."
+        other_asset: "Nie są wymagane żadne dodatkowe opcje dla innych aktywów."
+      subtypes:
+        depository:
+          checking: Czekowe
+          savings: Oszczędnościowe
+          hsa: Konto oszczędnościowe zdrowotne
+          cd: Certyfikat depozytowy
+          money_market: Rynek pieniężny
+        investment:
+          brokerage: Maklerskie
+          pension: Emerytalne
+          retirement: Emerytalne
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "Plan 529"
+          hsa: Konto oszczędnościowe zdrowotne
+          mutual_fund: Fundusz powierniczy
+          ira: Tradycyjne IRA
+          roth_ira: Roth IRA
+          angel: Anioł biznesu
+        loan:
+          mortgage: Hipoteczna
+          student: Pożyczka studencka
+          auto: Pożyczka samochodowa
+          other: Inna pożyczka
+      balance: Saldo
+      cancel: Anuluj
+      choose_account_type: "Wybierz odpowiedni typ konta dla każdego konta Brex:"
+      create_accounts: Utwórz konta
+      creating_accounts: Tworzenie kont...
+      historical_data_range: "Zakres danych historycznych:"
+      subtitle: Wybierz odpowiednie typy kont dla zaimportowanych kont
+      sync_start_date_help: Wybierz, jak daleko wstecz chcesz synchronizować historię transakcji. Dostępne maksymalnie 3 lata historii.
+      sync_start_date_label: "Rozpocznij synchronizację transakcji od:"
+      title: Skonfiguruj konta Brex
+    complete_account_setup:
+      all_skipped: "Wszystkie konta zostały pominięte. Nie utworzono żadnych kont."
+      creation_failed: "Nie utworzono kont: %{error}"
+      creation_failed_count:
+        one: "Nie utworzono %{count} konta."
+        few: "Nie utworzono %{count} kont."
+        many: "Nie utworzono %{count} kont."
+        other: "Nie utworzono %{count} kont."
+      no_accounts: "Brak kont do skonfigurowania."
+      partial_skipped: "Utworzono %{created_count}; pominięto %{skipped_count}."
+      partial_success: "Utworzono %{created_count}, ale %{failed_count} się nie powiodło."
+      success:
+        one: "Utworzono %{count} konto."
+        few: "Utworzono %{count} konta."
+        many: "Utworzono %{count} kont."
+        other: "Utworzono %{count} kont."
+      unexpected_error: Wystąpił nieoczekiwany błąd.
+    sync:
+      success: Synchronizacja rozpoczęta
+    syncer:
+      account_processing_failed:
+        few: "%{count} konta Brex nie powiodły się podczas przetwarzania."
+        many: "%{count} kont Brex nie powiodło się podczas przetwarzania."
+        one: "%{count} konto Brex nie powiodło się podczas przetwarzania."
+        other: "%{count} kont Brex nie powiodło się podczas przetwarzania."
+      account_sync_failed:
+        few: "Nie można zaplanować synchronizacji %{count} kont Brex."
+        many: "Nie można zaplanować synchronizacji %{count} kont Brex."
+        one: "Nie można zaplanować synchronizacji %{count} konta Brex."
+        other: "Nie można zaplanować synchronizacji %{count} kont Brex."
+      accounts_need_setup:
+        few: "%{count} konta wymagają konfiguracji..."
+        many: "%{count} kont wymaga konfiguracji..."
+        one: "%{count} konto wymaga konfiguracji..."
+        other: "%{count} kont wymaga konfiguracji..."
+      accounts_failed:
+        few: "Nie zaimportowano %{count} konta Brex."
+        many: "Nie zaimportowano %{count} kont Brex."
+        one: "Nie zaimportowano %{count} konta Brex."
+        other: "Nie zaimportowano %{count} kont Brex."
+      calculating_balances: Obliczanie sald...
+      checking_account_configuration: Sprawdzanie konfiguracji konta...
+      credentials_invalid: Nieprawidłowy token API Brex lub uprawnienia konta
+      failed: Synchronizacja nie powiodła się. Spróbuj ponownie lub skontaktuj się z pomocą techniczną.
+      import_failed: Import Brex nie powiódł się.
+      importing_accounts: Importowanie kont z Brex...
+      processing_transactions: Przetwarzanie transakcji...
+      transactions_failed:
+        few: "%{count} konta Brex miały błędy importu transakcji."
+        many: "%{count} kont Brex miało błędy importu transakcji."
+        one: "%{count} konto Brex miało błędy importu transakcji."
+        other: "%{count} kont Brex miało błędy importu transakcji."
+    update:
+      success: Połączenie Brex zaktualizowane
diff --git a/config/locales/views/brex_items/pt-BR.yml b/config/locales/views/brex_items/pt-BR.yml
new file mode 100644
index 000000000..ae1df3e8e
--- /dev/null
+++ b/config/locales/views/brex_items/pt-BR.yml
@@ -0,0 +1,277 @@
+---
+pt-BR:
+  brex_items:
+    default_connection_name: Conexão da Brex
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    kinds:
+      cash: Dinheiro
+      card: Cartão
+    statuses:
+      ACTIVE: Ativa
+      active: Ativa
+      CLOSED: Fechada
+      closed: Fechada
+      frozen: Congelada
+      FROZEN: Congelada
+    create:
+      success: Conexão da Brex criada com sucesso
+    default_card_name: Cartão Brex
+    default_cash_name: "Brex Cash %{id}"
+    destroy:
+      success: Conexão da Brex removida
+    index:
+      title: Conexões da Brex
+    institution_summary:
+      none: Nenhuma instituição conectada
+      one: "%{name}"
+      count:
+        one: "%{count} instituição"
+        other: "%{count} instituições"
+    sync_status:
+      no_accounts: Nenhuma conta encontrada
+      all_synced:
+        one: "%{count} conta sincronizada"
+        other: "%{count} contas sincronizadas"
+      partial_setup: "%{synced} sincronizadas, %{pending} precisam de configuração"
+    api_error:
+      common_issues: "Problemas comuns:"
+      expired_credentials: Gere um novo token de API na Brex.
+      expired_credentials_label: "Credenciais expiradas:"
+      heading: Não é possível conectar à Brex
+      invalid_token: Verifique seu token de API nas Configurações do provedor.
+      invalid_token_label: "Token de API inválido:"
+      network: Verifique sua conexão com a internet.
+      network_label: "Problema de rede:"
+      permissions: Certifique-se de que seu token tenha os escopos de somente leitura necessários para conta e transações.
+      permissions_label: "Permissões insuficientes:"
+      service: A API da Brex pode estar temporariamente indisponível.
+      service_label: "Serviço indisponível:"
+      settings_link: Verificar Configurações do provedor
+      title: Erro de conexão com a Brex
+    errors:
+      unexpected_error: Ocorreu um erro inesperado. Tente novamente mais tarde.
+    entries:
+      default_name: Transação da Brex
+    loading:
+      loading_message: Carregando contas da Brex...
+      loading_title: Carregando
+    link_accounts:
+      all_already_linked:
+        one: "A conta selecionada (%{names}) já está vinculada"
+        other: "Todas as %{count} contas selecionadas já estão vinculadas: %{names}"
+      api_error: "Erro da API: %{message}"
+      invalid_account_names:
+        one: "Não é possível vincular uma conta com o nome em branco"
+        other: "Não é possível vincular %{count} contas com os nomes em branco"
+      invalid_account_type: Tipo de conta da Brex não suportado
+      link_failed: Não foi possível vincular as contas
+      no_accounts_selected: Selecione pelo menos uma conta
+      no_api_token: Token de API da Brex não encontrado. Configure-o nas Configurações do provedor.
+      partial_invalid: "%{created_count} conta(s) vinculada(s) com sucesso, %{already_linked_count} conta(s) já estavam vinculadas, %{invalid_count} conta(s) tinham nomes inválidos"
+      partial_success: "%{created_count} conta(s) vinculada(s) com sucesso. %{already_linked_count} conta(s) já estavam vinculadas: %{already_linked_names}"
+      select_connection: Escolha uma conexão da Brex antes de vincular contas.
+      success:
+        one: "%{count} conta vinculada com sucesso"
+        other: "%{count} contas vinculadas com sucesso"
+    brex_item:
+      accounts_need_setup: As contas precisam de configuração
+      delete: Excluir conexão
+      deletion_in_progress: exclusão em andamento...
+      error: Erro
+      no_accounts_description: Esta conexão ainda não tem contas vinculadas.
+      no_accounts_title: Sem contas
+      setup_action: Configurar novas contas
+      setup_description: "%{linked} de %{total} contas vinculadas. Escolha os tipos de conta para suas contas da Brex recém-importadas."
+      setup_needed: Novas contas prontas para configurar
+      status: "Sincronizado há %{timestamp}"
+      status_never: Nunca sincronizado
+      status_with_summary: "Sincronizado há %{timestamp} - %{summary}"
+      syncing: Sincronizando...
+      total: Total
+      unlinked: Não vinculada
+    provider_panel:
+      accounts_link: Contas
+      add_connection: Adicionar conexão da Brex
+      base_url_label: URL base (opcional)
+      base_url_placeholder: https://api.brex.com
+      configured_html: "Configurado e pronto para uso. Acesse a aba %{accounts_link} para gerenciar e configurar contas."
+      connection_name_label: Nome da conexão
+      connection_name_placeholder: Conta corrente empresarial
+      default_connection_name: Conexão da Brex
+      disconnect_label: "Desconectar %{name}"
+      disconnect_confirm: "Desconectar %{name}?"
+      encryption_warning:
+        title: A criptografia do banco de dados não está configurada
+        message: Configure as chaves de criptografia do Active Record antes de adicionar tokens da Brex em produção. Sem chaves de criptografia, o Sure armazena as credenciais e os instantâneos do provedor Brex em texto não criptografado, assim como outros registros de provedores.
+      instructions:
+        copy_token_html: "Copie o token e adicione-o abaixo como uma conexão nomeada. O Sure armazena o token apenas para sincronizar esta família."
+        create_token: "Crie um token de API com estes escopos de somente leitura: accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly"
+        open_tokens: Acesse as configurações de tokens de desenvolvedor/API da Brex da empresa que você quer conectar
+        sign_in_html: "Acesse %{link} e faça login na conta que você quer conectar"
+      keep_token_placeholder: Deixe em branco para manter o token atual
+      not_configured: Não configurado
+      sandbox_note_html: "Use uma conexão nomeada separada para cada empresa/token de API da Brex que você quer sincronizar. Deixe a URL base em branco para produção. O ambiente de staging é limitado a testes aprovados pela Brex e não funciona com tokens de clientes."
+      setup_accounts: Configurar contas
+      setup_title: "Instruções de configuração:"
+      sync: Sincronizar
+      token_label: Token
+      token_placeholder: Cole o token aqui
+      update_connection: Atualizar conexão
+    provider_connection:
+      default_description: Conectar à sua conta da Brex
+      default_name: Brex
+      description: "Conectar via %{name}"
+      name: "Brex - %{name}"
+    select_accounts:
+      accounts_selected: contas selecionadas
+      api_error: "Erro da API: %{message}"
+      cancel: Cancelar
+      configure_name_in_brex: "Não é possível importar - configure o nome da conta na Brex"
+      description: Selecione as contas que você quer vincular à sua conta do %{product_name}.
+      link_accounts: Vincular contas selecionadas
+      no_accounts_found: Nenhuma conta encontrada. Verifique a configuração do seu token de API.
+      no_api_token: Token de API da Brex não encontrado. Configure-o nas Configurações do provedor.
+      no_credentials_configured: Configure primeiro seu token de API da Brex nas Configurações do provedor.
+      no_name_placeholder: "(Sem nome)"
+      select_connection: Escolha uma conexão da Brex nas Configurações do provedor.
+      title: Selecionar contas da Brex
+      unexpected_error: Ocorreu um erro inesperado. Tente novamente mais tarde.
+    select_existing_account:
+      account_already_linked: Esta conta já está vinculada a um provedor
+      all_accounts_already_linked: Todas as contas da Brex já estão vinculadas
+      api_error: "Erro da API: %{message}"
+      cancel: Cancelar
+      configure_name_in_brex: "Não é possível importar - configure o nome da conta na Brex"
+      description: Selecione uma conta da Brex para vincular a esta conta. As transações serão sincronizadas e desduplicadas automaticamente.
+      link_account: Vincular conta
+      no_account_specified: Nenhuma conta especificada
+      no_accounts_found: Nenhuma conta da Brex encontrada. Verifique a configuração do seu token de API.
+      no_api_token: Token de API da Brex não encontrado. Configure-o nas Configurações do provedor.
+      no_credentials_configured: Configure primeiro seu token de API da Brex nas Configurações do provedor.
+      no_name_placeholder: "(Sem nome)"
+      select_connection: Escolha uma conexão da Brex nas Configurações do provedor.
+      title: "Vincular %{account_name} à Brex"
+      unexpected_error: Ocorreu um erro inesperado. Tente novamente mais tarde.
+    setup_required:
+      description: Antes de poder vincular contas da Brex, você precisa configurar seu token de API da Brex.
+      heading: Token de API não configurado
+      settings_link: Ir para Configurações do provedor
+      setup_steps: "Etapas de configuração:"
+      steps:
+        enter_token: Insira seu token de API da Brex
+        find_section_html: "Encontre a seção <strong>Brex</strong>"
+        open_settings_html: "Acesse <strong>Configurações > Provedores</strong>"
+        return_to_link: Volte aqui para vincular suas contas
+      title: Configuração da Brex necessária
+    subtype_select:
+      placeholder:
+        subtype: Selecione o subtipo
+        type: Selecione o tipo
+    link_existing_account:
+      account_already_linked: Esta conta já está vinculada a um provedor
+      api_error: "Erro da API: %{message}"
+      invalid_account_name: Não é possível vincular uma conta com o nome em branco
+      missing_parameters: Parâmetros obrigatórios ausentes
+      no_account_specified: Nenhuma conta especificada
+      no_api_token: Token de API da Brex não encontrado. Configure-o nas Configurações do provedor.
+      provider_account_already_linked: Esta conta da Brex já está vinculada a outra conta
+      provider_account_not_found: Conta da Brex não encontrada
+      select_connection: Escolha uma conexão da Brex antes de vincular contas.
+      success: "%{account_name} vinculada com sucesso à Brex"
+    setup_accounts:
+      account_type_label: "Tipo de conta:"
+      all_accounts_linked: "Todas as suas contas da Brex já foram configuradas."
+      api_error: "Erro da API: %{message}"
+      fetch_failed: "Não foi possível buscar as contas"
+      no_accounts_to_setup: "Nenhuma conta para configurar"
+      no_api_token: Token de API da Brex não encontrado. Configure-o nas Configurações do provedor.
+      account_types:
+        skip: Ignorar esta conta
+        depository: Conta corrente ou poupança
+        credit_card: Cartão de crédito
+        investment: Conta de investimento
+        loan: Empréstimo ou financiamento
+        other_asset: Outro ativo
+      subtype_labels:
+        depository: "Subtipo de conta:"
+        credit_card: ""
+        investment: "Tipo de investimento:"
+        loan: "Tipo de empréstimo:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Os cartões de crédito serão configurados automaticamente como contas de cartão de crédito."
+        other_asset: "Não são necessárias opções adicionais para Outros ativos."
+      subtypes:
+        depository:
+          checking: Conta corrente
+          savings: Conta poupança
+          hsa: Conta poupança de saúde
+          cd: Certificado de depósito
+          money_market: Conta do mercado monetário
+        investment:
+          brokerage: Conta de corretagem
+          pension: Pensão
+          retirement: Aposentadoria
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "Plano 529"
+          hsa: Conta poupança de saúde
+          mutual_fund: Fundo de investimento
+          ira: IRA tradicional
+          roth_ira: Roth IRA
+          angel: Investimento-anjo
+        loan:
+          mortgage: Financiamento imobiliário
+          student: Empréstimo estudantil
+          auto: Financiamento de veículo
+          other: Outro empréstimo
+      balance: Saldo
+      cancel: Cancelar
+      choose_account_type: "Escolha o tipo de conta correto para cada conta da Brex:"
+      create_accounts: Criar contas
+      creating_accounts: Criando contas...
+      historical_data_range: "Intervalo de dados históricos:"
+      subtitle: Escolha os tipos de conta corretos para suas contas importadas
+      sync_start_date_help: Selecione até que ponto no passado você quer sincronizar o histórico de transações. Há no máximo 3 anos de histórico disponíveis.
+      sync_start_date_label: "Começar a sincronizar transações a partir de:"
+      title: Configure suas contas da Brex
+    complete_account_setup:
+      all_skipped: "Todas as contas foram ignoradas. Nenhuma conta foi criada."
+      creation_failed: "Não foi possível criar as contas: %{error}"
+      creation_failed_count: "Não foi possível criar %{count} conta(s)."
+      no_accounts: "Nenhuma conta para configurar."
+      partial_skipped: "%{created_count} conta(s) criada(s) com sucesso; %{skipped_count} conta(s) foram ignoradas."
+      partial_success: "%{created_count} conta(s) criada(s) com sucesso, mas %{failed_count} conta(s) falharam."
+      success: "%{count} conta(s) criada(s) com sucesso."
+      unexpected_error: Ocorreu um erro inesperado.
+    sync:
+      success: Sincronização iniciada
+    syncer:
+      account_processing_failed:
+        one: "%{count} conta da Brex falhou durante o processamento."
+        other: "%{count} contas da Brex falharam durante o processamento."
+      account_sync_failed:
+        one: "Não foi possível agendar a sincronização de %{count} conta da Brex."
+        other: "Não foi possível agendar a sincronização de %{count} contas da Brex."
+      accounts_need_setup:
+        one: "%{count} conta precisa de configuração..."
+        other: "%{count} contas precisam de configuração..."
+      accounts_failed:
+        one: "Não foi possível importar %{count} conta da Brex."
+        other: "Não foi possível importar %{count} contas da Brex."
+      calculating_balances: Calculando saldos...
+      checking_account_configuration: Verificando a configuração da conta...
+      credentials_invalid: Token de API da Brex inválido ou permissões de conta insuficientes
+      failed: A sincronização falhou. Tente novamente ou entre em contato com o suporte.
+      import_failed: A importação da Brex falhou.
+      importing_accounts: Importando contas da Brex...
+      processing_transactions: Processando transações...
+      transactions_failed:
+        one: "%{count} conta da Brex teve falhas na importação de transações."
+        other: "%{count} contas da Brex tiveram falhas na importação de transações."
+    update:
+      success: Conexão da Brex atualizada
diff --git a/config/locales/views/brex_items/ru.yml b/config/locales/views/brex_items/ru.yml
new file mode 100644
index 000000000..b1eb9fc4d
--- /dev/null
+++ b/config/locales/views/brex_items/ru.yml
@@ -0,0 +1,327 @@
+---
+ru:
+  brex_items:
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    api_error:
+      common_issues: 'Общие проблемы:'
+      expired_credentials: Создайте новый API токен в Brex.
+      expired_credentials_label: 'Истёкшие учётные данные:'
+      heading: Не удалось подключиться к Brex
+      invalid_token: Проверьте ваш API токен в настройках провайдера.
+      invalid_token_label: 'Неверный API токен:'
+      network: Проверьте ваше интернет-соединение.
+      network_label: 'Проблема с сетью:'
+      permissions: Убедитесь, что ваш токен имеет необходимые права только для чтения
+        счетов и операций.
+      permissions_label: 'Недостаточно прав:'
+      service: API Brex может быть временно недоступен.
+      service_label: 'Сервис недоступен:'
+      settings_link: Проверьте настройки провайдера
+      title: Ошибка подключения Brex
+    brex_item:
+      accounts_need_setup: Счета требуют настройки
+      delete: Удалить подключение
+      deletion_in_progress: удаление в процессе...
+      error: Ошибка
+      no_accounts_description: Это подключение ещё не имеет связанных счетов.
+      no_accounts_title: Нет счетов
+      setup_action: Настроить новые счета
+      setup_description: "%{linked} из %{total} счетов связаны. Выберите типы счетов
+        для ваших новых импортированных счетов Brex."
+      setup_needed: Новые счета готовы к настройке
+      status: Синхронизировано %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад - %{summary}
+      syncing: Синхронизация...
+      total: Всего
+      unlinked: Несвязанные
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Счета не были созданы.
+      creation_failed: 'Не удалось создать счета: %{error}'
+      creation_failed_count: Не удалось создать %{count} счёт(ов).
+      no_accounts: Нет счетов для настройки.
+      partial_skipped: Успешно создано %{created_count} счёт(ов); %{skipped_count}
+        счёт(ов) были пропущены.
+      partial_success: Успешно создано %{created_count} счёт(ов), но %{failed_count}
+        счёт(ов) не удалось создать.
+      success: Успешно создано %{count} счёт(ов).
+      unexpected_error: Произошла непредвиденная ошибка.
+    create:
+      success: Подключение Brex успешно создано
+    default_card_name: Карта Brex
+    default_cash_name: Наличные Brex %{id}
+    default_connection_name: Подключение Brex
+    destroy:
+      success: Подключение Brex удалено
+    entries:
+      default_name: Операция Brex
+    errors:
+      unexpected_error: Произошла непредвиденная ошибка. Пожалуйста, попробуйте позже.
+    index:
+      title: Подключения Brex
+    institution_summary:
+      count:
+        few: "%{count} учреждения"
+        many: "%{count} учреждений"
+        one: "%{count} учреждение"
+        other: "%{count} учреждения"
+      none: Нет подключённых учреждений
+      one: "%{name}"
+    kinds:
+      card: Карта
+      cash: Наличные
+    link_accounts:
+      all_already_linked:
+        few: "%{count} выбранных счёта уже связаны: %{names}"
+        many: "%{count} выбранных счетов уже связаны: %{names}"
+        one: Выбранный счёт (%{names}) уже связан
+        other: "%{count} выбранных счёта уже связаны: %{names}"
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_names:
+        few: Невозможно связать %{count} счёта с пустыми именами
+        many: Невозможно связать %{count} счетов с пустыми именами
+        one: Невозможно связать счёт с пустым именем
+        other: Невозможно связать %{count} счёта с пустыми именами
+      invalid_account_type: Неподдерживаемый тип счёта Brex
+      link_failed: Не удалось связать счета
+      no_accounts_selected: Пожалуйста, выберите хотя бы один счёт
+      no_api_token: API токен Brex не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      partial_invalid: Успешно связано %{created_count} счёт(ов), %{already_linked_count}
+        счёт(ов) уже были связаны, %{invalid_count} счёт(ов) имели недопустимые имена
+      partial_success: 'Успешно связано %{created_count} счёт(ов). %{already_linked_count}
+        счёт(ов) уже были связаны: %{already_linked_names}'
+      select_connection: Выберите подключение Brex перед связыванием счетов.
+      success:
+        few: Успешно связаны %{count} счёта
+        many: Успешно связано %{count} счетов
+        one: Успешно связан %{count} счёт
+        other: Успешно связаны %{count} счёта
+    link_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_name: Невозможно связать счёт с пустым именем
+      missing_parameters: Отсутствуют необходимые параметры
+      no_account_specified: Счёт не указан
+      no_api_token: API токен Brex не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      provider_account_already_linked: Этот счёт Brex уже связан с другим счётом
+      provider_account_not_found: Счёт Brex не найден
+      select_connection: Выберите подключение Brex перед связыванием счетов.
+      success: Успешно связан %{account_name} с Brex
+    loading:
+      loading_message: Загрузка счетов Brex...
+      loading_title: Загрузка
+    provider_connection:
+      default_description: Подключитесь к вашему аккаунту Brex
+      default_name: Brex
+      description: Подключитесь, используя %{name}
+      name: Brex - %{name}
+    provider_panel:
+      accounts_link: Счета
+      add_connection: Добавить подключение Brex
+      base_url_label: Базовый URL (необязательно)
+      base_url_placeholder: https://api.brex.com
+      configured_html: Настроено и готово к использованию. Посетите вкладку %{accounts_link}
+        для управления и настройки счетов.
+      connection_name_label: Имя подключения
+      connection_name_placeholder: Бизнес-счёт
+      default_connection_name: Подключение Brex
+      disconnect_confirm: Отключить %{name}?
+      disconnect_label: Отключить %{name}
+      encryption_warning:
+        message: Настройте ключи шифрования Active Record перед добавлением токенов
+          Brex в продакшн. Без ключей шифрования Sure хранит учётные данные провайдера
+          Brex и снимки в открытом виде, как и другие записи провайдера.
+        title: Шифрование базы данных не настроено
+      instructions:
+        copy_token_html: Скопируйте токен и добавьте его как именованное подключение
+          ниже. Sure хранит токен только для синхронизации этой семьи.
+        create_token: 'Создайте API токен с этими правами только для чтения: accounts.cash.readonly,
+          accounts.card.readonly, transactions.cash.readonly, transactions.card.readonly'
+        open_tokens: Перейдите в настройки разработчика/API токена Brex для компании,
+          которую хотите подключить
+        sign_in_html: Посетите %{link} и войдите в аккаунт, который хотите подключить
+      keep_token_placeholder: Оставьте пустым, чтобы сохранить текущий токен
+      not_configured: Не настроено
+      sandbox_note_html: Используйте отдельное именованное подключение для каждой
+        компании Brex/API токена, который вы хотите синхронизировать. Оставьте базовый
+        URL пустым для продакшн. Стадия ограничена тестированием, одобренным Brex,
+        и не работает с клиентскими токенами.
+      setup_accounts: Настроить счета
+      setup_title: 'Инструкции по настройке:'
+      sync: Синхронизировать
+      token_label: Токен
+      token_placeholder: Вставьте токен здесь
+      update_connection: Обновить подключение
+    select_accounts:
+      accounts_selected: выбрано счетов
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_brex: Невозможно импортировать - пожалуйста, настройте имя
+        счёта в Brex
+      description: Выберите счета, которые вы хотите связать с вашим аккаунтом %{product_name}.
+      link_accounts: Связать выбранные счета
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте конфигурацию вашего
+        API токена.
+      no_api_token: API токен Brex не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      no_credentials_configured: Пожалуйста, сначала настройте ваш API токен Brex
+        в настройках провайдера.
+      no_name_placeholder: "(Без имени)"
+      select_connection: Выберите подключение Brex в настройках провайдера.
+      title: Выберите счета Brex
+      unexpected_error: Произошла непредвиденная ошибка. Пожалуйста, попробуйте позже.
+    select_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      all_accounts_already_linked: Все счета Brex уже связаны
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_brex: Невозможно импортировать - пожалуйста, настройте имя
+        счёта в Brex
+      description: Выберите счёт Brex для связывания с этим счётом. Операции будут
+        синхронизированы и дубли удалены автоматически.
+      link_account: Связать счёт
+      no_account_specified: Счёт не указан
+      no_accounts_found: Счета Brex не найдены. Пожалуйста, проверьте конфигурацию
+        вашего API токена.
+      no_api_token: API токен Brex не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      no_credentials_configured: Пожалуйста, сначала настройте ваш API токен Brex
+        в настройках провайдера.
+      no_name_placeholder: "(Без имени)"
+      select_connection: Выберите подключение Brex в настройках провайдера.
+      title: Связать %{account_name} с Brex
+      unexpected_error: Произошла непредвиденная ошибка. Пожалуйста, попробуйте позже.
+    setup_accounts:
+      account_type_label: 'Тип счёта:'
+      account_types:
+        credit_card: Кредитная карта
+        depository: Расчётный или сберегательный счёт
+        investment: Инвестиционный счёт
+        loan: Кредит или ипотека
+        other_asset: Другой актив
+        skip: Пропустить этот счёт
+      all_accounts_linked: Все ваши счета Brex уже настроены.
+      api_error: 'Ошибка API: %{message}'
+      balance: Баланс
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип счёта для каждого счёта Brex:'
+      create_accounts: Создать счета
+      creating_accounts: Создание счетов...
+      fetch_failed: Не удалось получить счета
+      historical_data_range: 'Диапазон исторических данных:'
+      no_accounts_to_setup: Нет счетов для настройки
+      no_api_token: API токен Brex не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      subtitle: Выберите правильные типы счетов для ваших импортированных счетов
+      subtype_labels:
+        credit_card: ''
+        depository: 'Подтип счёта:'
+        investment: 'Тип инвестиции:'
+        loan: 'Тип кредита:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Кредитные карты будут автоматически настроены как кредитные счета.
+        other_asset: Дополнительные параметры для других активов не требуются.
+      subtypes:
+        depository:
+          cd: Депозитный сертификат
+          checking: Расчётный
+          hsa: Счёт медицинских сбережений
+          money_market: Денежный рынок
+          savings: Сберегательный
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: План 529
+          angel: Ангельский
+          brokerage: Брокерский
+          hsa: Счёт медицинских сбережений
+          ira: Традиционная IRA
+          mutual_fund: Паевой инвестиционный фонд
+          pension: Пенсионный
+          retirement: Пенсионный
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: План сбережений
+        loan:
+          auto: Автокредит
+          mortgage: Ипотека
+          other: Другой кредит
+          student: Студенческий кредит
+      sync_start_date_help: Выберите, насколько далеко назад вы хотите синхронизировать
+        историю операций. Максимум доступно 3 года истории.
+      sync_start_date_label: 'Начать синхронизацию операций с:'
+      title: Настройте ваши счета Brex
+    setup_required:
+      description: Прежде чем вы сможете связать счета Brex, вам нужно настроить ваш
+        API токен Brex.
+      heading: API токен не настроен
+      settings_link: Перейти в настройки провайдера
+      setup_steps: 'Шаги настройки:'
+      steps:
+        enter_token: Введите ваш API токен Brex
+        find_section_html: Найдите раздел <strong>Brex</strong>
+        open_settings_html: Перейдите в <strong>Настройки > Провайдеры</strong>
+        return_to_link: Вернитесь сюда, чтобы связать ваши счета
+      title: Требуется настройка Brex
+    statuses:
+      ACTIVE: Активен
+      CLOSED: Закрыт
+      FROZEN: Заморожен
+      active: Активен
+      closed: Закрыт
+      frozen: Заморожен
+    subtype_select:
+      placeholder:
+        subtype: Выберите подтип
+        type: Выберите тип
+    sync:
+      success: Синхронизация начата
+    sync_status:
+      all_synced:
+        few: Синхронизированы %{count} счёта
+        many: Синхронизировано %{count} счетов
+        one: Синхронизирован %{count} счёт
+        other: Синхронизированы %{count} счёта
+      no_accounts: Счета не найдены
+      partial_setup: "%{synced} синхронизировано, %{pending} требует настройки"
+    syncer:
+      account_processing_failed:
+        few: "%{count} счёта Brex не удалось обработать."
+        many: "%{count} счетов Brex не удалось обработать."
+        one: "%{count} счёт Brex не удалось обработать."
+        other: "%{count} счёта Brex не удалось обработать."
+      account_sync_failed:
+        few: Синхронизацию %{count} счёта Brex не удалось запланировать.
+        many: Синхронизацию %{count} счетов Brex не удалось запланировать.
+        one: Синхронизацию %{count} счёта Brex не удалось запланировать.
+        other: Синхронизацию %{count} счёта Brex не удалось запланировать.
+      accounts_failed:
+        few: "%{count} счёта Brex не удалось импортировать."
+        many: "%{count} счетов Brex не удалось импортировать."
+        one: "%{count} счёт Brex не удалось импортировать."
+        other: "%{count} счёта Brex не удалось импортировать."
+      accounts_need_setup:
+        few: "%{count} счёта требуют настройки..."
+        many: "%{count} счетов требуют настройки..."
+        one: "%{count} счёт требует настройки..."
+        other: "%{count} счёта требуют настройки..."
+      calculating_balances: Расчёт балансов...
+      checking_account_configuration: Проверка конфигурации счёта...
+      credentials_invalid: Неверный API токен Brex или права доступа к счёту
+      failed: Синхронизация не удалась. Пожалуйста, попробуйте снова или свяжитесь
+        с поддержкой.
+      import_failed: Импорт Brex не удался.
+      importing_accounts: Импорт счетов из Brex...
+      processing_transactions: Обработка операций...
+      transactions_failed:
+        few: У %{count} счетов Brex произошли ошибки импорта операций.
+        many: У %{count} счетов Brex произошли ошибки импорта операций.
+        one: У %{count} счёта Brex произошла ошибка импорта операций.
+        other: У %{count} счетов Brex произошли ошибки импорта операций.
+    update:
+      success: Подключение Brex обновлено
diff --git a/config/locales/views/brex_items/tr.yml b/config/locales/views/brex_items/tr.yml
new file mode 100644
index 000000000..c8fa51a2a
--- /dev/null
+++ b/config/locales/views/brex_items/tr.yml
@@ -0,0 +1,304 @@
+---
+tr:
+  brex_items:
+    account_metadata:
+      provider: Brex
+      separator: " • "
+    api_error:
+      common_issues: 'Sık karşılaşılan sorunlar:'
+      expired_credentials: Brex'ten yeni bir API anahtarı oluşturun.
+      expired_credentials_label: 'Süresi dolmuş kimlik bilgileri:'
+      heading: Brex'e bağlanılamıyor
+      invalid_token: API anahtarınızı Sağlayıcı Ayarları'nda kontrol edin.
+      invalid_token_label: 'Geçersiz API anahtarı:'
+      network: İnternet bağlantınızı kontrol edin.
+      network_label: 'Ağ sorunu:'
+      permissions: Anahtarınızın gerekli salt okunur hesap ve işlem kapsamlarına sahip
+        olduğundan emin olun.
+      permissions_label: 'Yetersiz izinler:'
+      service: Brex API geçici olarak kullanılamıyor olabilir.
+      service_label: 'Hizmet kapalı:'
+      settings_link: Sağlayıcı Ayarlarını Kontrol Et
+      title: Brex Bağlantı Hatası
+    brex_item:
+      accounts_need_setup: Hesapların kurulması gerekiyor
+      delete: Bağlantıyı sil
+      deletion_in_progress: siliniyor...
+      error: Hata
+      no_accounts_description: Bu bağlantıda henüz bağlı hesap yok.
+      no_accounts_title: Hesap yok
+      setup_action: Yeni Hesapları Kur
+      setup_description: "%{total} hesabın %{linked} tanesi bağlı. Yeni içe aktarılan
+        Brex hesaplarınız için hesap türlerini seçin."
+      setup_needed: Yeni hesaplar kurulmaya hazır
+      status: "%{timestamp} önce senkronize edildi"
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: 'Son senkronizasyon: %{timestamp} önce - %{summary}'
+      syncing: Senkronize ediliyor...
+      total: Toplam
+      unlinked: Bağlı değil
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hesap oluşturulmadı.
+      creation_failed: 'Hesaplar oluşturulamadı: %{error}'
+      creation_failed_count: "%{count} hesap oluşturulamadı."
+      no_accounts: Kurulacak hesap yok.
+      partial_skipped: "%{created_count} hesap başarıyla oluşturuldu; %{skipped_count}
+        hesap atlandı."
+      partial_success: "%{created_count} hesap başarıyla oluşturuldu, ancak %{failed_count}
+        hesap başarısız oldu."
+      success: "%{count} hesap başarıyla oluşturuldu."
+      unexpected_error: Beklenmeyen bir hata oluştu.
+    create:
+      success: Brex bağlantısı başarıyla oluşturuldu
+    default_card_name: Brex Kartı
+    default_cash_name: Brex Nakit %{id}
+    default_connection_name: Brex Bağlantısı
+    destroy:
+      success: Brex bağlantısı kaldırıldı
+    entries:
+      default_name: Brex işlemi
+    errors:
+      unexpected_error: Beklenmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyin.
+    index:
+      title: Brex Bağlantıları
+    institution_summary:
+      count:
+        one: "%{count} kurum"
+        other: "%{count} kurum"
+      none: Bağlı kurum yok
+      one: "%{name}"
+    kinds:
+      card: Kart
+      cash: Nakit
+    link_accounts:
+      all_already_linked:
+        one: Seçilen hesap (%{names}) zaten bağlı
+        other: 'Seçilen %{count} hesabın tümü zaten bağlı: %{names}'
+      api_error: 'API hatası: %{message}'
+      invalid_account_names:
+        one: Adı boş olan hesap bağlanamaz
+        other: Adı boş olan %{count} hesap bağlanamaz
+      invalid_account_type: Desteklenmeyen Brex hesap türü
+      link_failed: Hesaplar bağlanamadı
+      no_accounts_selected: Lütfen en az bir hesap seçin
+      no_api_token: Brex API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda yapılandırın.
+      partial_invalid: "%{created_count} hesap başarıyla bağlandı, %{already_linked_count}
+        hesap zaten bağlıydı, %{invalid_count} hesabın adı geçersizdi"
+      partial_success: "%{created_count} hesap başarıyla bağlandı. %{already_linked_count}
+        hesap zaten bağlıydı: %{already_linked_names}"
+      select_connection: Hesapları bağlamadan önce bir Brex bağlantısı seçin.
+      success:
+        one: "%{count} hesap başarıyla bağlandı"
+        other: "%{count} hesap başarıyla bağlandı"
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      api_error: 'API hatası: %{message}'
+      invalid_account_name: Adı boş olan hesap bağlanamaz
+      missing_parameters: Gerekli parametreler eksik
+      no_account_specified: Hesap belirtilmedi
+      no_api_token: Brex API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda yapılandırın.
+      provider_account_already_linked: Bu Brex hesabı zaten başka bir hesaba bağlı
+      provider_account_not_found: Brex hesabı bulunamadı
+      select_connection: Hesapları bağlamadan önce bir Brex bağlantısı seçin.
+      success: "%{account_name} Brex ile başarıyla bağlandı"
+    loading:
+      loading_message: Brex hesapları yükleniyor...
+      loading_title: Yükleniyor
+    provider_connection:
+      default_description: Brex hesabınıza bağlanın
+      default_name: Brex
+      description: "%{name} kullanarak bağlanın"
+      name: Brex - %{name}
+    provider_panel:
+      accounts_link: Hesaplar
+      add_connection: Brex bağlantısı ekle
+      base_url_label: Temel URL (isteğe bağlı)
+      base_url_placeholder: https://api.brex.com
+      configured_html: Yapılandırıldı ve kullanıma hazır. Hesapları yönetmek ve kurmak
+        için %{accounts_link} sekmesini ziyaret edin.
+      connection_name_label: Bağlantı adı
+      connection_name_placeholder: İşletme vadesiz hesabı
+      default_connection_name: Brex Bağlantısı
+      disconnect_confirm: "%{name} bağlantısı kesilsin mi?"
+      disconnect_label: "%{name} bağlantısını kes"
+      encryption_warning:
+        message: Üretimde Brex anahtarlarını eklemeden önce Active Record şifreleme
+          anahtarlarını yapılandırın. Şifreleme anahtarları olmadan Sure, Brex sağlayıcı
+          kimlik bilgilerini ve anlık görüntülerini diğer sağlayıcı kayıtları gibi
+          düz metin olarak saklar.
+        title: Veritabanı şifrelemesi yapılandırılmamış
+      instructions:
+        copy_token_html: Anahtarı kopyalayın ve aşağıda adlandırılmış bir bağlantı
+          olarak ekleyin. Sure, anahtarı yalnızca bu aileyi senkronize etmek için
+          saklar.
+        create_token: 'Şu salt okunur kapsamlara sahip bir API anahtarı oluşturun:
+          accounts.cash.readonly, accounts.card.readonly, transactions.cash.readonly,
+          transactions.card.readonly'
+        open_tokens: Bağlanmak istediğiniz şirket için Brex geliştirici/API anahtarı
+          ayarlarına gidin
+        sign_in_html: "%{link} adresini ziyaret edin ve bağlanmak istediğiniz hesapla
+          oturum açın"
+      keep_token_placeholder: Mevcut anahtarı korumak için boş bırakın
+      not_configured: Yapılandırılmadı
+      sandbox_note_html: Senkronize etmek istediğiniz her Brex şirket/API anahtarı
+        için ayrı bir adlandırılmış bağlantı kullanın. Üretim için Temel URL'yi boş
+        bırakın. Hazırlık ortamı yalnızca Brex onaylı testlerle sınırlıdır ve müşteri
+        anahtarlarıyla çalışmaz.
+      setup_accounts: Hesapları kur
+      setup_title: 'Kurulum talimatları:'
+      sync: Senkronize et
+      token_label: Anahtar
+      token_placeholder: Anahtarı buraya yapıştırın
+      update_connection: Bağlantıyı güncelle
+    select_accounts:
+      accounts_selected: hesap seçildi
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_brex: İçe aktarılamıyor - lütfen Brex'te hesap adını yapılandırın
+      description: "%{product_name} hesabınıza bağlamak istediğiniz hesapları seçin."
+      link_accounts: Seçili hesapları bağla
+      no_accounts_found: Hesap bulunamadı. Lütfen API anahtar yapılandırmanızı kontrol
+        edin.
+      no_api_token: Brex API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda yapılandırın.
+      no_credentials_configured: Önce Brex API anahtarınızı Sağlayıcı Ayarları'nda
+        yapılandırın.
+      no_name_placeholder: "(Adsız)"
+      select_connection: Sağlayıcı Ayarları'nda bir Brex bağlantısı seçin.
+      title: Brex Hesaplarını Seç
+      unexpected_error: Beklenmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyin.
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      all_accounts_already_linked: Tüm Brex hesapları zaten bağlı
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_brex: İçe aktarılamıyor - lütfen Brex'te hesap adını yapılandırın
+      description: Bu hesaba bağlamak için bir Brex hesabı seçin. İşlemler otomatik
+        olarak senkronize edilir ve tekilleştirilir.
+      link_account: Hesabı bağla
+      no_account_specified: Hesap belirtilmedi
+      no_accounts_found: Brex hesabı bulunamadı. Lütfen API anahtar yapılandırmanızı
+        kontrol edin.
+      no_api_token: Brex API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda yapılandırın.
+      no_credentials_configured: Önce Brex API anahtarınızı Sağlayıcı Ayarları'nda
+        yapılandırın.
+      no_name_placeholder: "(Adsız)"
+      select_connection: Sağlayıcı Ayarları'nda bir Brex bağlantısı seçin.
+      title: "%{account_name} hesabını Brex ile bağla"
+      unexpected_error: Beklenmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyin.
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      account_types:
+        credit_card: Kredi Kartı
+        depository: Vadesiz veya Tasarruf Hesabı
+        investment: Yatırım Hesabı
+        loan: Kredi veya İpotek
+        other_asset: Diğer Varlık
+        skip: Bu hesabı atla
+      all_accounts_linked: Tüm Brex hesaplarınız zaten kuruldu.
+      api_error: 'API hatası: %{message}'
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her Brex hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating_accounts: Hesaplar Oluşturuluyor...
+      fetch_failed: Hesaplar Getirilemedi
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      no_accounts_to_setup: Kurulacak Hesap Yok
+      no_api_token: Brex API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda yapılandırın.
+      subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      subtype_labels:
+        credit_card: ''
+        depository: 'Hesap Alt Türü:'
+        investment: 'Yatırım Türü:'
+        loan: 'Kredi Türü:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Kredi kartları otomatik olarak kredi kartı hesapları olarak kurulacaktır.
+        other_asset: Diğer Varlıklar için ek seçenek gerekmez.
+      subtypes:
+        depository:
+          cd: Vadeli Mevduat Sertifikası
+          checking: Vadesiz
+          hsa: Sağlık Tasarruf Hesabı
+          money_market: Para Piyasası
+          savings: Tasarruf
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: 529 Planı
+          angel: Melek
+          brokerage: Aracılık
+          hsa: Sağlık Tasarruf Hesabı
+          ira: Geleneksel IRA
+          mutual_fund: Yatırım Fonu
+          pension: Emeklilik
+          retirement: Emeklilik
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Tasarruf Planı
+        loan:
+          auto: Araç Kredisi
+          mortgage: İpotek
+          other: Diğer Kredi
+          student: Öğrenci Kredisi
+      sync_start_date_help: İşlem geçmişinizin ne kadar geriye senkronize edilmesini
+        istediğinizi seçin. En fazla 3 yıllık geçmiş kullanılabilir.
+      sync_start_date_label: 'İşlemleri şu tarihten itibaren senkronize et:'
+      title: Brex Hesaplarınızı Kurun
+    setup_required:
+      description: Brex hesaplarını bağlamadan önce Brex API anahtarınızı yapılandırmanız
+        gerekir.
+      heading: API Anahtarı Yapılandırılmamış
+      settings_link: Sağlayıcı Ayarlarına Git
+      setup_steps: 'Kurulum adımları:'
+      steps:
+        enter_token: Brex API anahtarınızı girin
+        find_section_html: "<strong>Brex</strong> bölümünü bulun"
+        open_settings_html: "<strong>Ayarlar > Sağlayıcılar</strong> bölümüne gidin"
+        return_to_link: Hesaplarınızı bağlamak için buraya dönün
+      title: Brex Kurulumu Gerekli
+    statuses:
+      ACTIVE: Aktif
+      CLOSED: Kapalı
+      FROZEN: Dondurulmuş
+      active: Aktif
+      closed: Kapalı
+      frozen: Dondurulmuş
+    subtype_select:
+      placeholder:
+        subtype: Alt türü seçin
+        type: Tür seçin
+    sync:
+      success: Senkronizasyon başladı
+    sync_status:
+      all_synced:
+        one: "%{count} hesap senkronize edildi"
+        other: "%{count} hesap senkronize edildi"
+      no_accounts: Hesap bulunamadı
+      partial_setup: "%{synced} senkronize edildi, %{pending} kurulmayı bekliyor"
+    syncer:
+      account_processing_failed:
+        one: "%{count} Brex hesabı işlenirken başarısız oldu."
+        other: "%{count} Brex hesabı işlenirken başarısız oldu."
+      account_sync_failed:
+        one: "%{count} Brex hesap senkronizasyonu zamanlanamadı."
+        other: "%{count} Brex hesap senkronizasyonu zamanlanamadı."
+      accounts_failed:
+        one: "%{count} Brex hesabı içe aktarılamadı."
+        other: "%{count} Brex hesabı içe aktarılamadı."
+      accounts_need_setup:
+        one: "%{count} hesabın kurulması gerekiyor..."
+        other: "%{count} hesabın kurulması gerekiyor..."
+      calculating_balances: Bakiyeler hesaplanıyor...
+      checking_account_configuration: Hesap yapılandırması kontrol ediliyor...
+      credentials_invalid: Geçersiz Brex API anahtarı veya hesap izinleri
+      failed: Senkronizasyon başarısız oldu. Lütfen tekrar deneyin veya destekle iletişime
+        geçin.
+      import_failed: Brex içe aktarımı başarısız.
+      importing_accounts: Brex'ten hesaplar içe aktarılıyor...
+      processing_transactions: İşlemler işleniyor...
+      transactions_failed:
+        one: "%{count} Brex hesabında işlem içe aktarımı başarısız oldu."
+        other: "%{count} Brex hesabında işlem içe aktarımı başarısız oldu."
+    update:
+      success: Brex bağlantısı güncellendi
diff --git a/config/locales/views/brex_items/zh-CN.yml b/config/locales/views/brex_items/zh-CN.yml
index fa8ec0a6c..7cd3752aa 100644
--- a/config/locales/views/brex_items/zh-CN.yml
+++ b/config/locales/views/brex_items/zh-CN.yml
@@ -239,3 +239,39 @@ zh-CN:
       sync_start_date_help: 选择您希望向前同步交易历史的时间范围。最多可用 3 年历史记录。
       sync_start_date_label: "从以下日期开始同步交易："
       title: 设置您的 Brex 账户
+    complete_account_setup:
+      all_skipped: 所有账户都已跳过，未创建账户。
+      creation_failed: 创建账户失败：%{error}
+      creation_failed_count: "%{count} 个账户创建失败。"
+      no_accounts: 没有需要设置的账户。
+      partial_skipped: 已成功创建 %{created_count} 个账户；已跳过 %{skipped_count} 个账户。
+      partial_success: 已成功创建 %{created_count} 个账户，但 %{failed_count} 个账户失败。
+      success: 已成功创建 %{count} 个账户。
+      unexpected_error: 出现意外错误。
+    sync:
+      success: 同步已开始
+    syncer:
+      account_processing_failed:
+        one: "%{count} 个 Brex 账户处理失败。"
+        other: "%{count} 个 Brex 账户处理失败。"
+      account_sync_failed:
+        one: "%{count} 个 Brex 账户同步无法安排。"
+        other: "%{count} 个 Brex 账户同步无法安排。"
+      accounts_need_setup:
+        one: "%{count} 个账户需要设置..."
+        other: "%{count} 个账户需要设置..."
+      accounts_failed:
+        one: "%{count} 个 Brex 账户导入失败。"
+        other: "%{count} 个 Brex 账户导入失败。"
+      calculating_balances: 正在计算余额...
+      checking_account_configuration: 正在检查账户配置...
+      credentials_invalid: Brex 凭据无效。
+      failed: 同步失败。请重试或联系支持。
+      import_failed: Brex 导入失败。
+      importing_accounts: 正在从 Brex 导入账户...
+      processing_transactions: 正在处理交易...
+      transactions_failed:
+        one: "%{count} 个 Brex 账户存在交易导入失败。"
+        other: "%{count} 个 Brex 账户存在交易导入失败。"
+    update:
+      success: Brex 连接已更新
diff --git a/config/locales/views/budgets/en.yml b/config/locales/views/budgets/en.yml
index 04f745c61..072fc4773 100644
--- a/config/locales/views/budgets/en.yml
+++ b/config/locales/views/budgets/en.yml
@@ -48,6 +48,7 @@ en:
         title: Over Budget
       filter:
         all: All
+        aria_label: Filter budget categories
         on_track: On Track
         over_budget: Over Budget
       tabs:
diff --git a/config/locales/views/budgets/fr.yml b/config/locales/views/budgets/fr.yml
index cf0fe89f6..42cab3ed4 100644
--- a/config/locales/views/budgets/fr.yml
+++ b/config/locales/views/budgets/fr.yml
@@ -1,33 +1,98 @@
 ---
 fr:
+  budget_categories:
+    allocation_progress:
+      budget_exceeded_html: Budget dépassé par <span class="text-red-500 Privacy-sensitive">%{amount}</span>
+      left_to_allocate: reste à attribuer
+      over_set: "> 100 % réglé"
+      percent_set: "%{percent} défini"
+    budget_category_form:
+      monthly_average: "%{amount}/mois en moyenne"
+      shared_placeholder: Partagé
+      shared_title: Laisser vide pour partager le budget des parents
+    confirm_button:
+      confirm: Confirmer
+    index:
+      description: Ajustez les budgets des catégories pour fixer des limites de dépenses. Les fonds non alloués seront automatiquement attribués comme non classés.
+      title: Modifiez vos budgets de catégorie
+    no_categories:
+      new_category: Nouvelle catégorie
+      no_categories_message: Vous n'avez pas encore créé ou attribué de catégories de dépenses à vos transactions.
+      oops: Oups !
+      use_defaults: Utiliser les valeurs par défaut (recommandé)
+    show:
+      budgeted: Budgétisé
+      category: Catégorie
+      left: à gauche
+      monthly_average_spending: Dépenses moyennes mensuelles
+      monthly_median_spending: Dépenses médianes mensuelles
+      no_transactions: Aucune transaction trouvée pour cette période budgétaire.
+      overspent: trop dépensé
+      overview: Aperçu
+      recent_transactions: Transactions récentes
+      spending: "%{date} dépenses"
+      status: Statut
+      view_all_transactions: Voir toutes les transactions de catégorie
   budgets:
+    actuals_summary:
+      expenses: Dépenses
+      income: Revenu
+    budget_donut:
+      new_budget: Nouveau budget
+      of_budget: de %{amount}
+      spent: Dépensé
+      unused: Inutilisé
+    budget_header:
+      today: Aujourd'hui
+    budget_nav:
+      categories: Catégories
+      setup: Configuration
+    budgeted_summary:
+      budgeted: Budgétisé
+      earned: "%{amount} gagné"
+      expected_income: Revenu attendu
+      left: "%{amount} restant"
+      over: "%{amount} terminé"
+      spent: "%{amount} dépensé"
+    copy_previous:
+      already_initialized: Ce budget a déjà été configuré
+      no_source: Aucun budget précédent trouvé à copier
+      success: Budget copié depuis %{source_name}
+    copy_previous_prompt:
+      copy_button: Copier depuis %{source_name}
+      description: Vous pouvez copier votre budget depuis %{source_name} ou repartir de zéro.
+      fresh_button: Repartir de zéro
+      title: Configurez votre budget
+    edit:
+      autosuggest_description: Cela sera basé sur l’historique des transactions. L'IA peut faire des erreurs, vérifiez avant de continuer.
+      autosuggest_title: Suggestion automatique de revenus et de budget de dépenses
+      budgeted_spending: Dépenses budgétisées
+      continue: Continuer
+      expected_income: Revenu attendu
+      setup_description: Entrez vos revenus mensuels et vos dépenses prévues ci-dessous pour configurer votre budget.
+      setup_title: Configurez votre budget
     name:
       custom_range: "%{start} - %{end_date}"
       month_year: "%{month}"
+    over_allocation_warning:
+      fix_allocations: Corriger les allocations
+      over_allocated_message: Vous avez surutilisé votre budget. Veuillez corriger vos allocations.
     show:
       categories:
         amount: Montant
         edit: Modifier
         title: Catégories
+      filter:
+        all: Tous
+        aria_label: Filtrer les catégories de budget
+        on_track: Dans les clous
+        over_budget: Budget dépassé
       on_track_categories:
         short_title: Dans les clous
         title: Dans les clous
       over_budget_categories:
         short_title: Dépassement
         title: Budget dépassé
-      filter:
-        all: Tous
-        on_track: Dans les clous
-        over_budget: Budget dépassé
       tabs:
         actual: Réel
         budgeted: Budgété
-    copy_previous_prompt:
-      title: "Configurez votre budget"
-      description: "Vous pouvez copier votre budget depuis %{source_name} ou repartir de zéro."
-      copy_button: "Copier depuis %{source_name}"
-      fresh_button: "Repartir de zéro"
-    copy_previous:
-      success: "Budget copié depuis %{source_name}"
-      no_source: "Aucun budget précédent trouvé à copier"
-      already_initialized: "Ce budget a déjà été configuré"
diff --git a/config/locales/views/budgets/it.yml b/config/locales/views/budgets/it.yml
new file mode 100644
index 000000000..5348e84b4
--- /dev/null
+++ b/config/locales/views/budgets/it.yml
@@ -0,0 +1,98 @@
+---
+it:
+  budgets:
+    budget_donut:
+      spent: "Speso"
+      new_budget: "Nuovo budget"
+      of_budget: "di %{amount}"
+      unused: "Non utilizzato"
+    budget_header:
+      today: "Oggi"
+    budget_nav:
+      categories: Categorie
+      setup: Configurazione
+    over_allocation_warning:
+      over_allocated_message: "Hai superato l'allocazione del budget. Correggi le allocazioni."
+      fix_allocations: "Correggi allocazioni"
+    actuals_summary:
+      income: "Entrate"
+      expenses: "Spese"
+    budgeted_summary:
+      expected_income: "Entrate previste"
+      budgeted: "Pianificato"
+      earned: "%{amount} guadagnato"
+      over: "%{amount} in eccesso"
+      left: "%{amount} rimasto"
+      spent: "%{amount} speso"
+    edit:
+      setup_title: "Configura il tuo budget"
+      setup_description: "Inserisci le tue entrate mensili e le spese pianificate per configurare il budget."
+      budgeted_spending: "Spese pianificate"
+      expected_income: "Entrate previste"
+      autosuggest_title: "Suggerisci automaticamente entrate e spese"
+      autosuggest_description: "Si baserà sulla cronologia delle transazioni. L'AI può commettere errori, verifica prima di continuare."
+      continue: "Continua"
+    name:
+      custom_range: "%{start} - %{end_date}"
+      month_year: "%{month}"
+    show:
+      categories:
+        amount: Importo
+        edit: Modifica
+        title: Categorie
+      on_track_categories:
+        short_title: In regola
+        title: In regola
+      over_budget_categories:
+        short_title: Oltre il budget
+        title: Oltre il budget
+      filter:
+        all: Tutti
+        aria_label: Filtra categorie budget
+        on_track: In regola
+        over_budget: Oltre il budget
+      tabs:
+        actual: Effettivo
+        budgeted: Pianificato
+    copy_previous_prompt:
+      title: "Configura il tuo budget"
+      description: "Puoi copiare il budget da %{source_name} o ricominciare da zero."
+      copy_button: "Copia da %{source_name}"
+      fresh_button: "Ricomincia da zero"
+    copy_previous:
+      success: "Budget copiato da %{source_name}"
+      no_source: "Nessun budget precedente trovato da copiare"
+      already_initialized: "Questo budget è già stato configurato"
+  budget_categories:
+    allocation_progress:
+      budget_exceeded_html: 'Budget superato di <span class="text-red-500 privacy-sensitive">%{amount}</span>'
+      left_to_allocate: da allocare
+      over_set: "> 100% impostato"
+      percent_set: "%{percent} impostato"
+    budget_category_form:
+      monthly_average: "%{amount}/mese medio"
+      shared_placeholder: Condiviso
+      shared_title: Lascia vuoto per condividere il budget del genitore
+    confirm_button:
+      confirm: "Conferma"
+    no_categories:
+      oops: "Ops!"
+      no_categories_message: "Non hai ancora creato o assegnato categorie di spesa alle tue transazioni."
+      use_defaults: "Usa predefiniti (consigliato)"
+      new_category: "Nuova categoria"
+    index:
+      title: "Modifica i tuoi budget per categoria"
+      description: "Regola i budget per categoria per impostare limiti di spesa. I fondi non allocati verranno automaticamente assegnati come non categorizzati."
+    show:
+      category: "Categoria"
+      overview: "Panoramica"
+      spending: "Spese %{date}"
+      status: "Stato"
+      overspent: "speso in eccesso"
+      left: "rimasto"
+      budgeted: "Pianificato"
+      monthly_average_spending: "Spesa media mensile"
+      monthly_median_spending: "Spesa mediana mensile"
+      recent_transactions: "Transazioni recenti"
+      view_all_transactions: "Vedi tutte le transazioni della categoria"
+      no_transactions: "Nessuna transazione trovata per questo periodo di budget."
diff --git a/config/locales/views/budgets/ru.yml b/config/locales/views/budgets/ru.yml
new file mode 100644
index 000000000..af442d871
--- /dev/null
+++ b/config/locales/views/budgets/ru.yml
@@ -0,0 +1,104 @@
+---
+ru:
+  budget_categories:
+    allocation_progress:
+      budget_exceeded_html: Бюджет превышен на <span class="text-destructive privacy-sensitive">%{amount}</span>
+      left_to_allocate: осталось распределить
+      over_set: "> 100% установлено"
+      percent_set: "%{percent} установлено"
+    budget_category_form:
+      monthly_average: "%{amount}/мес среднее"
+      shared_placeholder: Общий
+      shared_title: Оставьте пустым, чтобы использовать бюджет родителя
+    confirm_button:
+      confirm: Подтвердить
+    index:
+      description: Настройте бюджеты категорий, чтобы установить лимиты расходов.
+        Нераспределенные средства будут автоматически отнесены к некатегоризированным.
+      title: Редактировать бюджеты категорий
+    no_categories:
+      new_category: Новая категория
+      no_categories_message: Вы еще не создали или не назначили категории расходов
+        для ваших операций.
+      oops: Упс!
+      use_defaults: Использовать по умолчанию (рекомендуется)
+    show:
+      budgeted: Запланировано
+      category: Категория
+      left: осталось
+      monthly_average_spending: Среднемесячные расходы
+      monthly_median_spending: Медианные месячные расходы
+      no_transactions: Операции за этот период бюджета не найдены.
+      overspent: перерасход
+      overview: Обзор
+      recent_transactions: Недавние операции
+      spending: Расходы за %{date}
+      status: Статус
+      view_all_transactions: Просмотреть все операции по категории
+  budgets:
+    actuals_summary:
+      expenses: Расходы
+      income: Доход
+    budget_donut:
+      new_budget: Новый бюджет
+      of_budget: из %{amount}
+      spent: Потрачено
+      unused: Неиспользовано
+    budget_header:
+      today: Сегодня
+    budget_nav:
+      categories: Категории
+      setup: Настройка
+    budgeted_summary:
+      budgeted: Запланировано
+      earned: "%{amount} заработано"
+      expected_income: Ожидаемый доход
+      left: "%{amount} осталось"
+      over: "%{amount} превышение"
+      spent: "%{amount} потрачено"
+    copy_previous:
+      already_initialized: Этот бюджет уже настроен
+      no_source: Не найдено предыдущего бюджета для копирования
+      success: Бюджет скопирован из %{source_name}
+    copy_previous_prompt:
+      copy_button: Скопировать из %{source_name}
+      description: Вы можете скопировать ваш бюджет из %{source_name} или начать с
+        нуля.
+      fresh_button: Начать с нуля
+      title: Настройте ваш бюджет
+    edit:
+      autosuggest_description: Это будет основано на истории операций. ИИ может ошибаться,
+        проверьте перед продолжением.
+      autosuggest_title: Автоподсказка дохода и бюджета расходов
+      budgeted_spending: Запланированные расходы
+      continue: Продолжить
+      expected_income: Ожидаемый доход
+      setup_description: Введите ваш ежемесячный доход и планируемые расходы ниже,
+        чтобы настроить бюджет.
+      setup_title: Настройка бюджета
+    name:
+      custom_range: "%{start} - %{end_date}"
+      month_year: "%{month}"
+    over_allocation_warning:
+      fix_allocations: Исправить распределение
+      over_allocated_message: Вы перераспределили свой бюджет. Пожалуйста, исправьте
+        распределение.
+    show:
+      categories:
+        amount: Сумма
+        edit: Редактировать
+        title: Категории
+      filter:
+        all: Все
+        aria_label: Фильтр категорий бюджета
+        on_track: В пределах
+        over_budget: Превышение
+      on_track_categories:
+        short_title: В пределах
+        title: В пределах
+      over_budget_categories:
+        short_title: Превышение
+        title: Превышение
+      tabs:
+        actual: Фактический
+        budgeted: Запланированный
diff --git a/config/locales/views/budgets/tr.yml b/config/locales/views/budgets/tr.yml
new file mode 100644
index 000000000..df889611c
--- /dev/null
+++ b/config/locales/views/budgets/tr.yml
@@ -0,0 +1,105 @@
+---
+tr:
+  budget_categories:
+    allocation_progress:
+      budget_exceeded_html: Bütçe <span class="text-red-500 privacy-sensitive">%{amount}</span>
+        kadar aşıldı
+      left_to_allocate: tahsis edilmeyi bekliyor
+      over_set: "> %100 ayarlandı"
+      percent_set: "%{percent} ayarlandı"
+    budget_category_form:
+      monthly_average: "%{amount}/ay ort."
+      shared_placeholder: Paylaşılan
+      shared_title: Üst kategorinin bütçesini paylaşmak için boş bırakın
+    confirm_button:
+      confirm: Onayla
+    index:
+      description: Harcama limitlerini belirlemek için kategori bütçelerini ayarlayın.
+        Tahsis edilmeyen tutarlar otomatik olarak kategorisiz olarak atanacaktır.
+      title: Kategori bütçelerinizi düzenleyin
+    no_categories:
+      new_category: Yeni kategori
+      no_categories_message: Henüz işlemlerinize herhangi bir gider kategorisi oluşturmadınız
+        veya atamadınız.
+      oops: Hata!
+      use_defaults: Varsayılanları kullan (önerilir)
+    show:
+      budgeted: Bütçelenen
+      category: Kategori
+      left: kaldı
+      monthly_average_spending: Aylık ortalama harcama
+      monthly_median_spending: Aylık medyan harcama
+      no_transactions: Bu bütçe dönemi için işlem bulunamadı.
+      overspent: aşıldı
+      overview: Genel Bakış
+      recent_transactions: Son İşlemler
+      spending: "%{date} harcaması"
+      status: Durum
+      view_all_transactions: Tüm kategori işlemlerini görüntüle
+  budgets:
+    actuals_summary:
+      expenses: Giderler
+      income: Gelir
+    budget_donut:
+      new_budget: Yeni bütçe
+      of_budget: "%{amount} üzerinden"
+      spent: Harcanan
+      unused: Kullanılmayan
+    budget_header:
+      today: Bugün
+    budget_nav:
+      categories: Kategoriler
+      setup: Kurulum
+    budgeted_summary:
+      budgeted: Bütçelenen
+      earned: "%{amount} kazanıldı"
+      expected_income: Beklenen gelir
+      left: "%{amount} kaldı"
+      over: "%{amount} aşıldı"
+      spent: "%{amount} harcandı"
+    copy_previous:
+      already_initialized: Bu bütçe zaten kuruldu
+      no_source: Kopyalanacak önceki bütçe bulunamadı
+      success: Bütçe %{source_name} kaynağından kopyalandı
+    copy_previous_prompt:
+      copy_button: "%{source_name} kaynağından kopyala"
+      description: Bütçenizi %{source_name} kaynağından kopyalayabilir veya sıfırdan
+        başlayabilirsiniz.
+      fresh_button: Sıfırdan başla
+      title: Bütçenizi kurun
+    edit:
+      autosuggest_description: Bu, işlem geçmişinize dayanacaktır. Yapay zeka hata
+        yapabilir, devam etmeden önce doğrulayın.
+      autosuggest_title: Gelir ve harcama bütçesini otomatik öner
+      budgeted_spending: Bütçelenen harcama
+      continue: Devam et
+      expected_income: Beklenen gelir
+      setup_description: Bütçenizi kurmak için aşağıya aylık kazancınızı ve planlanan
+        harcamanızı girin.
+      setup_title: Bütçenizi kurun
+    name:
+      custom_range: "%{start} - %{end_date}"
+      month_year: "%{month}"
+    over_allocation_warning:
+      fix_allocations: Tahsisleri düzelt
+      over_allocated_message: Bütçenizi fazla tahsis ettiniz. Lütfen tahsislerinizi
+        düzeltin.
+    show:
+      categories:
+        amount: Tutar
+        edit: Düzenle
+        title: Kategoriler
+      filter:
+        all: Tümü
+        aria_label: Bütçe kategorilerini filtrele
+        on_track: Yolunda
+        over_budget: Bütçe Aşıldı
+      on_track_categories:
+        short_title: Yolunda
+        title: Yolunda
+      over_budget_categories:
+        short_title: Bütçe Aşıldı
+        title: Bütçe Aşıldı
+      tabs:
+        actual: Gerçekleşen
+        budgeted: Bütçelenen
diff --git a/config/locales/views/budgets/zh-CN.yml b/config/locales/views/budgets/zh-CN.yml
index e32bfb743..142185174 100644
--- a/config/locales/views/budgets/zh-CN.yml
+++ b/config/locales/views/budgets/zh-CN.yml
@@ -50,6 +50,7 @@ zh-CN:
         all: 全部
         on_track: 正常
         over_budget: 超支
+        aria_label: 筛选预算分类
       tabs:
         actual: 实际
         budgeted: 预算
diff --git a/config/locales/views/categories/ca.yml b/config/locales/views/categories/ca.yml
index f57ac01e7..275c6b6b7 100644
--- a/config/locales/views/categories/ca.yml
+++ b/config/locales/views/categories/ca.yml
@@ -15,6 +15,7 @@ ca:
     edit:
       edit: Edita la categoria
     form:
+      trigger_label: Tria color i icona
       color: Color
       icon: Icona
       name_label: Nom
diff --git a/config/locales/views/categories/en.yml b/config/locales/views/categories/en.yml
index 18ae3170e..7f985e418 100644
--- a/config/locales/views/categories/en.yml
+++ b/config/locales/views/categories/en.yml
@@ -17,6 +17,7 @@ en:
       name_label: Name
       unassigned: "(unassigned)"
       parent_category_label: "Parent category (optional)"
+      trigger_label: Choose color and icon
       color: Color
       icon: Icon
       auto_adjust: auto-adjust.
diff --git a/config/locales/views/categories/fr.yml b/config/locales/views/categories/fr.yml
index fb128e309..398a25405 100644
--- a/config/locales/views/categories/fr.yml
+++ b/config/locales/views/categories/fr.yml
@@ -10,25 +10,61 @@ fr:
       success: Catégorie créée avec succès
     destroy:
       success: Catégorie supprimée avec succès
+    destroy_all:
+      success: Toutes les catégories supprimées
     edit:
       edit: Éditer la catégorie
     form:
+      auto_adjust: réglage automatique.
+      trigger_label: Choisir la couleur et l'icône
+      color: Couleur
+      icon: Icône
+      name_label: Nom
+      parent_category_label: Catégorie parent (facultatif)
       placeholder: Nom de la catégorie
+      poor_contrast: Mauvais contraste, choisissez une couleur plus foncée ou
+      unassigned: "(non attribué)"
     index:
       bootstrap: Utiliser les valeurs par défaut (recommandé)
       categories: Catégories
       categories_expenses: Catégories de dépenses
       categories_incomes: Catégories de revenus
+      delete_all: Supprimer tout
       empty: Aucune catégorie trouvée
+      merge: Fusionner les catégories
       new: Nouvelle catégorie
     menu:
       loading: Chargement...
+    merge:
+      description: Sélectionnez une catégorie cible et les catégories à y fusionner. Les transactions et lignes budgétaires correspondantes seront déplacées vers la cible.
+      select_target: Sélectionner la catégorie cible...
+      sources_hint: Les catégories sélectionnées seront supprimées une fois leurs transactions et lignes budgétaires déplacées vers la cible. Ne sélectionnez pas la cible comme source.
+      sources_label: Catégories à fusionner
+      submit: Fusionner la sélection
+      target_label: Fusionner dans (cible)
+      title: Fusionner les catégories
     new:
       new_category: Nouvelle catégorie
+    perform_merge:
+      invalid_categories: Catégories sélectionnées invalides
+      no_categories_selected: Aucune catégorie sélectionnée à fusionner
+      success:
+        one: Catégorie fusionnée avec succès
+        other: "%{count} catégories fusionnées avec succès"
+      target_not_found: Catégorie cible non trouvée
+      target_selected_as_source: Choisissez des catégories différentes pour la cible et les sources.
     update:
       success: Catégorie mise à jour avec succès
+    virtual:
+      payment: Paiement
+      trade: Commerce
+      transfer: Transfert
   category:
     dropdowns:
       show:
         bootstrap: Générer les catégories par défaut
         empty: Aucune catégorie trouvée
+        expense: dépense
+        income: revenu
+        match_transfer: Correspondance transfert/paiement
+        one_time: "%{type} unique"
diff --git a/config/locales/views/categories/hu.yml b/config/locales/views/categories/hu.yml
index a10c00072..1410c25fd 100644
--- a/config/locales/views/categories/hu.yml
+++ b/config/locales/views/categories/hu.yml
@@ -17,6 +17,7 @@ hu:
       name_label: Név
       unassigned: "(nincs hozzárendelve)"
       parent_category_label: "Szülőkategória (nem kötelező)"
+      trigger_label: Szín és ikon választása
       color: Szín
       icon: Ikon
       poor_contrast: "Gyenge kontraszt, válassz sötétebb színt vagy"
diff --git a/config/locales/views/categories/it.yml b/config/locales/views/categories/it.yml
new file mode 100644
index 000000000..d91281cc9
--- /dev/null
+++ b/config/locales/views/categories/it.yml
@@ -0,0 +1,70 @@
+---
+it:
+  categories:
+    bootstrap:
+      success: Categorie predefinite create con successo
+    category:
+      delete: Elimina categoria
+      edit: Modifica categoria
+    create:
+      success: Categoria creata con successo
+    destroy:
+      success: Categoria eliminata con successo
+    edit:
+      edit: Modifica categoria
+    form:
+      placeholder: Nome categoria
+      name_label: Nome
+      unassigned: "(non assegnata)"
+      parent_category_label: "Categoria genitore (opzionale)"
+      trigger_label: Scegli colore e icona
+      color: Colore
+      icon: Icona
+      auto_adjust: adattamento automatico.
+      poor_contrast: "Contrasto scarso, scegli un colore più scuro o"
+    destroy_all:
+      success: Tutte le categorie eliminate
+    index:
+      bootstrap: Usa predefiniti (consigliato)
+      categories: Categorie
+      categories_expenses: Categorie di spesa
+      categories_incomes: Categorie di entrata
+      delete_all: Elimina tutte
+      empty: Nessuna categoria trovata
+      merge: Unisci categorie
+      new: Nuova categoria
+    merge:
+      title: Unisci categorie
+      description: Seleziona una categoria di destinazione e le categorie da unire in essa. Le transazioni e le righe di budget corrispondenti si sposteranno nella destinazione.
+      target_label: Unisci in (destinazione)
+      select_target: Seleziona categoria di destinazione...
+      sources_label: Categorie da unire
+      sources_hint: Le categorie selezionate verranno eliminate dopo che le loro transazioni e righe di budget si saranno spostate nella destinazione. Non selezionare la destinazione come sorgente.
+      submit: Unisci selezionate
+    menu:
+      loading: Caricamento...
+    new:
+      new_category: Nuova categoria
+    perform_merge:
+      success:
+        one: Unita con successo %{count} categoria
+        other: Unite con successo %{count} categorie
+      no_categories_selected: Nessuna categoria selezionata da unire
+      target_not_found: Categoria di destinazione non trovata
+      invalid_categories: Categorie non valide selezionate
+      target_selected_as_source: Scegli categorie diverse per la destinazione e le sorgenti.
+    update:
+      success: Categoria aggiornata con successo
+    virtual:
+      transfer: Bonifico
+      payment: Pagamento
+      trade: Operazione
+  category:
+    dropdowns:
+      show:
+        bootstrap: Genera categorie predefinite
+        empty: Nessuna categoria trovata
+        match_transfer: "Abbina bonifico/pagamento"
+        one_time: "%{type} una tantum"
+        income: "entrata"
+        expense: "spesa"
diff --git a/config/locales/views/categories/ru.yml b/config/locales/views/categories/ru.yml
new file mode 100644
index 000000000..d8e381f59
--- /dev/null
+++ b/config/locales/views/categories/ru.yml
@@ -0,0 +1,74 @@
+---
+ru:
+  categories:
+    bootstrap:
+      success: Стандартные категории успешно созданы
+    category:
+      delete: Удалить категорию
+      edit: Редактировать категорию
+    create:
+      success: Категория успешно создана
+    destroy:
+      success: Категория успешно удалена
+    destroy_all:
+      success: Все категории удалены
+    edit:
+      edit: Редактировать категорию
+    form:
+      auto_adjust: авто-настройка.
+      trigger_label: Выбрать цвет и иконку
+      color: Цвет
+      icon: Иконка
+      name_label: Название
+      parent_category_label: Родительская категория (необязательно)
+      placeholder: Название категории
+      poor_contrast: Плохой контраст, выберите более тёмный цвет или
+      unassigned: "(не назначено)"
+    index:
+      bootstrap: Использовать стандартные (рекомендуется)
+      categories: Категории
+      categories_expenses: Категории расходов
+      categories_incomes: Категории доходов
+      delete_all: Удалить все
+      empty: Категории не найдены
+      merge: Объединить категории
+      new: Новая категория
+    menu:
+      loading: Загрузка...
+    merge:
+      description: Выберите целевую категорию и категории, которые нужно в неё объединить.
+        Соответствующие операции и строки бюджета будут перемещены.
+      select_target: Выберите целевую категорию...
+      sources_hint: Выбранные категории будут удалены после перемещения операций и
+        бюджетных строк в целевую. Не выбирайте целевую категорию как источник.
+      sources_label: Категории для объединения
+      submit: Объединить выбранные
+      target_label: Объединить в (целевая)
+      title: Объединение категорий
+    new:
+      new_category: Новая категория
+    perform_merge:
+      invalid_categories: Выбраны некорректные категории
+      no_categories_selected: Не выбрано ни одной категории для объединения
+      success:
+        few: Успешно объединены %{count} категории
+        many: Успешно объединено %{count} категорий
+        one: Успешно объединена %{count} категория
+        other: Успешно объединены %{count} категории
+      target_not_found: Целевая категория не найдена
+      target_selected_as_source: Выберите разные категории для цели и источников.
+    update:
+      success: Категория успешно обновлена
+    virtual:
+      payment: Платёж
+      trade: Сделка
+      transfer: Перевод
+  category:
+    dropdowns:
+      show:
+        bootstrap: Создать стандартные категории
+        empty: Категории не найдены
+        expense: расход
+        income: доход
+        match_transfer: Соответствие переводу/платежу
+        one_time: Одноразовый %{type}
diff --git a/config/locales/views/categories/tr.yml b/config/locales/views/categories/tr.yml
index ecc1849b1..286520d13 100644
--- a/config/locales/views/categories/tr.yml
+++ b/config/locales/views/categories/tr.yml
@@ -10,25 +10,62 @@ tr:
       success: Kategori başarıyla oluşturuldu
     destroy:
       success: Kategori başarıyla silindi
+    destroy_all:
+      success: Tüm kategoriler silindi
     edit:
       edit: Kategoriyi düzenle
     form:
+      auto_adjust: otomatik ayarla.
+      color: Renk
+      icon: Simge
+      name_label: Ad
+      parent_category_label: Üst kategori (isteğe bağlı)
       placeholder: Kategori adı
+      poor_contrast: Zayıf kontrast, daha koyu bir renk seçin veya
+      unassigned: "(atanmamış)"
     index:
       bootstrap: Varsayılanları kullan (önerilir)
       categories: Kategoriler
       categories_expenses: Gider kategorileri
       categories_incomes: Gelir kategorileri
+      delete_all: Tümünü sil
       empty: Hiç kategori bulunamadı
+      merge: Kategorileri birleştir
       new: Yeni kategori
     menu:
       loading: Yükleniyor...
+    merge:
+      description: Hedef bir kategori ve bu kategoriyle birleştirilecek kategorileri
+        seçin. Eşleşen işlemler ve bütçe satırları hedefe taşınacaktır.
+      select_target: Hedef kategori seçin...
+      sources_hint: Seçilen kategoriler, işlemleri ve bütçe satırları hedefe taşındıktan
+        sonra silinecektir. Hedefi kaynak olarak seçmeyin.
+      sources_label: Birleştirilecek kategoriler
+      submit: Seçilenleri birleştir
+      target_label: Şu kategoriyle birleştir (hedef)
+      title: Kategorileri birleştir
     new:
       new_category: Yeni kategori
+    perform_merge:
+      invalid_categories: Geçersiz kategoriler seçildi
+      no_categories_selected: Birleştirmek için kategori seçilmedi
+      success:
+        one: "%{count} kategori başarıyla birleştirildi"
+        other: "%{count} kategori başarıyla birleştirildi"
+      target_not_found: Hedef kategori bulunamadı
+      target_selected_as_source: Hedef ve kaynaklar için farklı kategoriler seçin.
     update:
       success: Kategori başarıyla güncellendi
+    virtual:
+      payment: Ödeme
+      trade: Alım/Satım
+      transfer: Transfer
   category:
     dropdowns:
       show:
         bootstrap: Varsayılan kategorileri oluştur
-        empty: Hiç kategori bulunamadı
\ No newline at end of file
+        empty: Hiç kategori bulunamadı
+        expense: gider
+        income: gelir
+        match_transfer: Eşleşen transfer/ödeme
+        one_time: Tek seferlik %{type}
diff --git a/config/locales/views/categories/vi.yml b/config/locales/views/categories/vi.yml
index 596f848d8..63439dcbc 100644
--- a/config/locales/views/categories/vi.yml
+++ b/config/locales/views/categories/vi.yml
@@ -17,6 +17,7 @@ vi:
       name_label: Tên
       unassigned: "(chưa gán)"
       parent_category_label: "Danh mục cha (tùy chọn)"
+      trigger_label: Chọn màu và biểu tượng
       color: Màu sắc
       icon: Biểu tượng
       auto_adjust: tự động điều chỉnh.
diff --git a/config/locales/views/categories/zh-CN.yml b/config/locales/views/categories/zh-CN.yml
index 785587249..26a7decb5 100644
--- a/config/locales/views/categories/zh-CN.yml
+++ b/config/locales/views/categories/zh-CN.yml
@@ -17,6 +17,7 @@ zh-CN:
       name_label: 名称
       unassigned: （未分配）
       parent_category_label: 父分类（可选）
+      trigger_label: 选择颜色和图标
       color: 颜色
       icon: 图标
       auto_adjust: 自动调整。
@@ -31,6 +32,7 @@ zh-CN:
       delete_all: 全部删除
       empty: 未找到分类
       new: 新建分类
+      merge: 合并分类
     menu:
       loading: 正在加载...
     new:
@@ -41,6 +43,22 @@ zh-CN:
       transfer: 转账
       payment: 付款
       trade: 交易
+    merge:
+      title: 合并分类
+      description: 选择要合并的分类，并指定保留的目标分类。
+      target_label: 合并到（目标）
+      select_target: 选择目标分类...
+      sources_label: 要合并的分类
+      sources_hint: 这些分类会被合并到目标分类中。
+      submit: 合并所选分类
+    perform_merge:
+      success:
+        one: 已成功合并 %{count} 个分类。
+        other: 已成功合并 %{count} 个分类。
+      no_categories_selected: 请选择要合并的分类。
+      target_not_found: 找不到目标分类。
+      invalid_categories: 选择的分类无效。
+      target_selected_as_source: 目标分类不能同时作为来源分类。
   category:
     dropdowns:
       show:
diff --git a/config/locales/views/category/deletions/fr.yml b/config/locales/views/category/deletions/fr.yml
index e82b7cbbb..def0cf070 100644
--- a/config/locales/views/category/deletions/fr.yml
+++ b/config/locales/views/category/deletions/fr.yml
@@ -6,9 +6,12 @@ fr:
         success: Catégorie de transaction supprimée avec succès
       new:
         category: Catégorie
-        delete_and_leave_uncategorized: Supprimer "%{category_name}" et laisser non catégorisée
-        delete_and_recategorize: Supprimer "%{category_name}" et attribuer une nouvelle catégorie
+        delete_and_leave_uncategorized: Supprimer "%{category_name}" et laisser non
+          catégorisée
+        delete_and_recategorize: Supprimer "%{category_name}" et attribuer une nouvelle
+          catégorie
         delete_category: Supprimer la catégorie ?
-        explanation: En supprimant cette catégorie, chaque transaction qui a la catégorie "%{category_name}"
-          sera non catégorisée. Au lieu de les laisser non catégorisées, vous pouvez également attribuer une nouvelle catégorie ci-dessous.
+        explanation: En supprimant cette catégorie, chaque transaction qui a la catégorie
+          "%{category_name}" sera non catégorisée. Au lieu de les laisser non catégorisées,
+          vous pouvez également attribuer une nouvelle catégorie ci-dessous.
         replacement_category_prompt: Sélectionnez la catégorie
diff --git a/config/locales/views/category/deletions/it.yml b/config/locales/views/category/deletions/it.yml
new file mode 100644
index 000000000..503f3efd1
--- /dev/null
+++ b/config/locales/views/category/deletions/it.yml
@@ -0,0 +1,13 @@
+---
+it:
+  category:
+    deletions:
+      create:
+        success: Categoria transazione eliminata con successo
+      new:
+        category: Categoria
+        delete_and_leave_uncategorized: Elimina "%{category_name}" e lascia senza categoria
+        delete_and_recategorize: Elimina "%{category_name}" e assegna nuova categoria
+        delete_category: Eliminare la categoria?
+        explanation: Eliminando questa categoria, ogni transazione con la categoria "%{category_name}" non verrà categorizzata. Invece di lasciarle senza categoria, puoi anche assegnare una nuova categoria qui sotto.
+        replacement_category_prompt: Seleziona categoria
diff --git a/config/locales/views/category/deletions/ru.yml b/config/locales/views/category/deletions/ru.yml
new file mode 100644
index 000000000..e368911a1
--- /dev/null
+++ b/config/locales/views/category/deletions/ru.yml
@@ -0,0 +1,16 @@
+---
+ru:
+  category:
+    deletions:
+      create:
+        success: Категория операций успешно удалена
+      new:
+        category: Категория
+        delete_and_leave_uncategorized: Удалить "%{category_name}" и оставить без
+          категории
+        delete_and_recategorize: Удалить "%{category_name}" и назначить новую категорию
+        delete_category: Удалить категорию?
+        explanation: При удалении этой категории, каждая операция с категорией "%{category_name}"
+          останется без категории. Вместо этого, вы можете назначить новую категорию
+          ниже.
+        replacement_category_prompt: Выберите категорию
diff --git a/config/locales/views/category/deletions/tr.yml b/config/locales/views/category/deletions/tr.yml
index bc94f46eb..aed39bfb5 100644
--- a/config/locales/views/category/deletions/tr.yml
+++ b/config/locales/views/category/deletions/tr.yml
@@ -6,8 +6,12 @@ tr:
         success: İşlem kategorisi başarıyla silindi
       new:
         category: Kategori
-        delete_and_leave_uncategorized: "%{category_name} kategorisini sil ve kategorisiz bırak"
-        delete_and_recategorize: "%{category_name} kategorisini sil ve yeni bir kategori ata"
+        delete_and_leave_uncategorized: "%{category_name} kategorisini silin ve kategorisiz
+          bırakın"
+        delete_and_recategorize: "%{category_name} kategorisini silin ve yeni bir kategori
+          atayın"
         delete_category: Kategori silinsin mi?
-        explanation: Bu kategoriyi sildiğinde, "%{category_name}" kategorisine sahip tüm işlemler kategorisiz kalacak. Onları kategorisiz bırakmak yerine aşağıdan yeni bir kategori de atayabilirsin.
+        explanation: Bu kategoriyi sildiğinizde, "%{category_name}" kategorisine sahip
+          tüm işlemler kategorisiz kalacak. Onları kategorisiz bırakmak yerine aşağıdan
+          yeni bir kategori de atayabilirsiniz.
         replacement_category_prompt: Kategori seç
diff --git a/config/locales/views/category/dropdowns/it.yml b/config/locales/views/category/dropdowns/it.yml
new file mode 100644
index 000000000..9e7b7bcc2
--- /dev/null
+++ b/config/locales/views/category/dropdowns/it.yml
@@ -0,0 +1,11 @@
+---
+it:
+  category:
+    dropdowns:
+      row:
+        delete: Elimina categoria
+        edit: Modifica categoria
+      show:
+        clear: Cancella categoria
+        no_categories: Nessuna categoria trovata
+        search_placeholder: Cerca
diff --git a/config/locales/views/category/dropdowns/ru.yml b/config/locales/views/category/dropdowns/ru.yml
new file mode 100644
index 000000000..a0f008f82
--- /dev/null
+++ b/config/locales/views/category/dropdowns/ru.yml
@@ -0,0 +1,11 @@
+---
+ru:
+  category:
+    dropdowns:
+      row:
+        delete: Удалить категорию
+        edit: Редактировать категорию
+      show:
+        clear: Очистить категорию
+        no_categories: Категории не найдены
+        search_placeholder: Поиск
diff --git a/config/locales/views/chats/en.yml b/config/locales/views/chats/en.yml
index df4fe0fde..261b41d4f 100644
--- a/config/locales/views/chats/en.yml
+++ b/config/locales/views/chats/en.yml
@@ -4,6 +4,7 @@ en:
     demo_banner_title: "Demo Mode Active"
     demo_banner_message: "You are using LLMs via credits provided by Cloudflare Workers AI.  Results may vary since the codebase was tested on `gpt-4.1` but your tokens don't go anywhere else to be trained with! 🤖"
     thinking: "Thinking ..."
+    worker_unhealthy_warning: "AI responses may not be delivered right now — the background worker appears to be down or backed up. Check that your Sidekiq worker is running."
     ai_greeting:
       greeting: "Hey %{name}! I'm an AI/large-language-model that can help with your finances. I have access to the web and your account data."
       there: "there"
diff --git a/config/locales/views/chats/fr.yml b/config/locales/views/chats/fr.yml
index bb7a4d7e4..34b217292 100644
--- a/config/locales/views/chats/fr.yml
+++ b/config/locales/views/chats/fr.yml
@@ -1,6 +1,45 @@
 ---
 fr:
+  assistant_messages:
+    assistant_message:
+      assistant_reasoning: Assistant de raisonnement
+    tool_calls:
+      arguments: 'Arguments :'
+      function: 'Fonction :'
+      tool_calls: Appels d'outils
   chats:
-    demo_banner_title: "Mode Démo Actif"
-    demo_banner_message: "Vous utilisez un LLM Qwen3 open-weights avec des crédits fournis par Cloudflare Workers AI. Les résultats peuvent varier car le code a été principalement testé sur `gpt-4.1` mais vos tokens ne sont envoyés nulle part ailleurs pour être entraînés !"
-    thinking: "Traitement en cours ..."
+    ai_consent:
+      available_description: Le chat IA peut répondre aux questions financières et fournir des informations basées sur vos données. Pour utiliser cette fonctionnalité, vous devrez l'activer explicitement.
+      disable_note: Désactivez à tout moment. Toutes les données envoyées à nos prestataires LLM sont anonymisées.
+      enable_button: Activer les discussions IA
+      title: Activer les discussions IA
+      unavailable_description_html: Pour utiliser l'assistant AI, vous devez définir la variable d'environnement <code class="bg-surface-inset px-1 py-0.5 round font-mono text-xs">OPENAI_ACCESS_TOKEN</code> ou la configurer dans les paramètres d'auto-hébergement de votre instance.
+    ai_greeting:
+      commands_hint_html: Vous pouvez utiliser <span class="bg-container border border-secondary px-1.5 py-0.5 round font-mono text-xs">/</span> pour accéder aux commandes
+      evaluate_portfolio: Évaluer le portefeuille d'investissement
+      greeting: Hé %{name} ! Je suis un modèle d'IA/grand langage qui peut vous aider avec vos finances. J'ai accès au Web et aux données de votre compte.
+      questions_intro: 'Voici quelques questions que vous pouvez poser :'
+      spending_insights: Afficher des informations sur les dépenses
+      there: là
+      unusual_patterns: Trouver des modèles inhabituels
+    chat:
+      delete_chat: Supprimer le chat
+      edit_chat_title: Modifier le titre du chat
+    chat_nav:
+      all_chats: Toutes les discussions
+      delete_chat: Supprimer le chat
+      edit_chat_title: Modifier le titre du chat
+      start_new_chat: Démarrer une nouvelle discussion
+    demo_banner_message: Vous utilisez un LLM Qwen3 open-weights avec des crédits fournis par Cloudflare Workers AI. Les résultats peuvent varier car le code a été principalement testé sur `gpt-4.1` mais vos tokens ne sont envoyés nulle part ailleurs pour être entraînés !
+    demo_banner_title: Mode Démo Actif
+    destroy:
+      notice: Le chat a été supprimé avec succès
+    error:
+      retry: Réessayer
+    index:
+      chats: Discussions
+      new_chat: Nouvelle discussion
+    thinking: Traitement en cours ...
+    update:
+      success: Chat mis à jour
+    worker_unhealthy_warning: Les réponses de l'IA peuvent ne pas être distribuées actuellement — le worker en arrière-plan semble arrêté ou surchargé. Vérifiez que votre worker Sidekiq est bien démarré.
diff --git a/config/locales/views/chats/it.yml b/config/locales/views/chats/it.yml
new file mode 100644
index 000000000..2d39d8f52
--- /dev/null
+++ b/config/locales/views/chats/it.yml
@@ -0,0 +1,45 @@
+---
+it:
+  chats:
+    demo_banner_title: "Modalità Demo Attiva"
+    demo_banner_message: "Stai utilizzando LLM tramite crediti forniti da Cloudflare Workers AI. I risultati possono variare poiché il codice è stato testato su `gpt-4.1` ma i tuoi token non vengono utilizzati per addestrare modelli! 🤖"
+    thinking: "Sto elaborando ..."
+    worker_unhealthy_warning: "Le risposte dell'IA potrebbero non arrivare in questo momento — il worker in background sembra non essere attivo o essere in ritardo. Verifica che il tuo worker Sidekiq sia in esecuzione."
+    ai_greeting:
+      greeting: "Ciao %{name}! Sono un assistente IA che può aiutarti con le tue finanze. Ho accesso al web e ai dati del tuo conto."
+      there: "lì"
+      commands_hint_html: "Puoi usare <span class=\"bg-container border border-secondary px-1.5 py-0.5 rounded font-mono text-xs\">/</span> per accedere ai comandi"
+      questions_intro: "Ecco alcune domande che puoi fare:"
+      evaluate_portfolio: "Valuta il portafoglio investimenti"
+      spending_insights: "Mostra analisi delle spese"
+      unusual_patterns: "Trova schemi insoliti"
+    chat:
+      edit_chat_title: "Modifica titolo chat"
+      delete_chat: "Elimina chat"
+    chat_nav:
+      all_chats: "Tutte le chat"
+      start_new_chat: "Inizia nuova chat"
+      edit_chat_title: "Modifica titolo chat"
+      delete_chat: "Elimina chat"
+    error:
+      retry: "Riprova"
+    destroy:
+      notice: "Chat eliminata con successo"
+    index:
+      chats: "Chat"
+      new_chat: "Nuova chat"
+    update:
+      success: "Chat aggiornata"
+    ai_consent:
+      title: "Abilita chat IA"
+      available_description: "La chat IA può rispondere a domande finanziarie e fornire analisi basate sui tuoi dati. Per usare questa funzione devi abilitarla esplicitamente."
+      unavailable_description_html: "Per usare l'assistente IA, devi impostare la variabile d'ambiente <code class=\"bg-surface-inset px-1 py-0.5 rounded font-mono text-xs\">OPENAI_ACCESS_TOKEN</code> o configurarla nelle impostazioni di self-hosting della tua istanza."
+      enable_button: "Abilita chat IA"
+      disable_note: "Disabilita in qualsiasi momento. Tutti i dati inviati ai provider LLM sono anonimizzati."
+  assistant_messages:
+    assistant_message:
+      assistant_reasoning: "Ragionamento assistente"
+    tool_calls:
+      tool_calls: "Chiamate strumenti"
+      function: "Funzione:"
+      arguments: "Argomenti:"
diff --git a/config/locales/views/chats/ru.yml b/config/locales/views/chats/ru.yml
new file mode 100644
index 000000000..aae21cd5a
--- /dev/null
+++ b/config/locales/views/chats/ru.yml
@@ -0,0 +1,58 @@
+---
+ru:
+  assistant_messages:
+    assistant_message:
+      assistant_reasoning: Обоснование ассистента
+    tool_calls:
+      arguments: 'Аргументы:'
+      function: 'Функция:'
+      tool_calls: Вызовы инструментов
+  chats:
+    ai_consent:
+      available_description: ИИ-чат может отвечать на финансовые вопросы и предоставлять
+        анализ на основе ваших данных. Чтобы использовать эту функцию, вам нужно явно
+        её включить.
+      disable_note: Отключить в любое время. Все данные, отправляемые нашим поставщикам
+        LLM, анонимизируются.
+      enable_button: Включить ИИ-чаты
+      title: Включить ИИ-чаты
+      unavailable_description_html: Чтобы использовать ИИ-ассистента, вам нужно установить
+        переменную окружения <code class="bg-surface-inset px-1 py-0.5 rounded font-mono
+        text-xs">OPENAI_ACCESS_TOKEN</code> или настроить её в параметрах самохостинга
+        вашей инстанции.
+    ai_greeting:
+      commands_hint_html: Вы можете использовать <span class="bg-container border
+        border-secondary px-1.5 py-0.5 rounded font-mono text-xs">/</span> для доступа
+        к командам
+      evaluate_portfolio: Оценить инвестиционный портфель
+      greeting: Привет, %{name}! Я ИИ/модель обработки естественного языка, которая
+        может помочь с вашими финансами. У меня есть доступ к интернету и данным вашего
+        счёта.
+      questions_intro: 'Вот несколько вопросов, которые вы можете задать:'
+      spending_insights: Показать анализ расходов
+      there: здесь
+      unusual_patterns: Найти необычные шаблоны
+    chat:
+      delete_chat: Удалить чат
+      edit_chat_title: Редактировать название чата
+    chat_nav:
+      all_chats: Все чаты
+      delete_chat: Удалить чат
+      edit_chat_title: Редактировать название чата
+      start_new_chat: Начать новый чат
+    demo_banner_message: "Вы используете LLM через кредиты, предоставленные Cloudflare
+      Workers AI. Результаты могут варьироваться, так как кодовая база тестировалась
+      на `gpt-4.1`, но ваши токены никуда не отправляются для обучения! 🤖"
+    demo_banner_title: Демо-режим активен
+    destroy:
+      notice: Чат успешно удалён
+    error:
+      retry: Повторить
+    index:
+      chats: Чаты
+      new_chat: Новый чат
+    thinking: Думаю ...
+    update:
+      success: Чат обновлён
+    worker_unhealthy_warning: Ответы ИИ могут временно не приходить — фоновый процесс не 
+      запущен или перегружен. Проверьте, что Sidekiq работает.
diff --git a/config/locales/views/chats/tr.yml b/config/locales/views/chats/tr.yml
new file mode 100644
index 000000000..01e965797
--- /dev/null
+++ b/config/locales/views/chats/tr.yml
@@ -0,0 +1,58 @@
+---
+tr:
+  assistant_messages:
+    assistant_message:
+      assistant_reasoning: Asistan gerekçesi
+    tool_calls:
+      arguments: 'Argümanlar:'
+      function: 'Fonksiyon:'
+      tool_calls: Araç Çağrıları
+  chats:
+    ai_consent:
+      available_description: Yapay zeka sohbeti finansal sorularınızı yanıtlayabilir
+        ve verilerinize dayalı öngörüler sunabilir. Bu özelliği kullanmak için açıkça
+        etkinleştirmeniz gerekir.
+      disable_note: İstediğiniz zaman devre dışı bırakabilirsiniz. LLM sağlayıcılarımıza
+        gönderilen tüm veriler anonimleştirilir.
+      enable_button: Yapay Zeka Sohbetlerini Etkinleştir
+      title: Yapay Zeka Sohbetlerini Etkinleştir
+      unavailable_description_html: Yapay zeka asistanını kullanmak için <code class="bg-surface-inset
+        px-1 py-0.5 rounded font-mono text-xs">OPENAI_ACCESS_TOKEN</code> ortam değişkenini
+        ayarlamanız veya bunu örneğinizin Kendi Sunucunuzda Barındırma ayarlarında
+        yapılandırmanız gerekir.
+    ai_greeting:
+      commands_hint_html: Komutlara erişmek için <span class="bg-container border
+        border-secondary px-1.5 py-0.5 rounded font-mono text-xs">/</span> kullanabilirsiniz
+      evaluate_portfolio: Yatırım portföyünü değerlendir
+      greeting: Merhaba %{name}! Finansal konularınızda yardımcı olabilecek bir yapay
+        zeka/büyük dil modeliyim. Web'e ve hesap verilerinize erişimim var.
+      questions_intro: 'Sorabileceğiniz birkaç örnek soru:'
+      spending_insights: Harcama öngörülerini göster
+      there: değerli kullanıcı
+      unusual_patterns: Olağandışı örüntüleri bul
+    chat:
+      delete_chat: Sohbeti sil
+      edit_chat_title: Sohbet başlığını düzenle
+    chat_nav:
+      all_chats: Tüm sohbetler
+      delete_chat: Sohbeti sil
+      edit_chat_title: Sohbet başlığını düzenle
+      start_new_chat: Yeni sohbet başlat
+    demo_banner_message: "Cloudflare Workers AI tarafından sağlanan krediler aracılığıyla
+      LLM'ler kullanıyorsunuz. Kod tabanı `gpt-4.1` ile test edildiğinden sonuçlar
+      farklılık gösterebilir, ancak jetonlarınız eğitim için başka hiçbir yere gitmez!
+      🤖"
+    demo_banner_title: Demo Modu Aktif
+    destroy:
+      notice: Sohbet başarıyla silindi
+    error:
+      retry: Yeniden dene
+    index:
+      chats: Sohbetler
+      new_chat: Yeni sohbet
+    thinking: Düşünüyor ...
+    update:
+      success: Sohbet güncellendi
+    worker_unhealthy_warning: Yapay zeka yanıtları şu anda iletilemeyebilir — arka
+      plan çalışanı kapalı veya birikmiş görünüyor. Sidekiq çalışanınızın çalıştığından
+      emin olun.
diff --git a/config/locales/views/coinbase_items/fr.yml b/config/locales/views/coinbase_items/fr.yml
index 28fc47638..ed45f40b5 100644
--- a/config/locales/views/coinbase_items/fr.yml
+++ b/config/locales/views/coinbase_items/fr.yml
@@ -1,78 +1,82 @@
 ---
 fr:
+  coinbase_item:
+    syncer:
+      accounts_need_setup:
+        one: "%{count} compte à configurer"
+        other: "%{count} comptes à configurer"
+      calculating_balances: Calcul des soldes…
+      checking_configuration: Vérification de la configuration du compte…
+      checking_credentials: Vérification des identifiants…
+      credentials_invalid: Identifiants API invalides. Veuillez vérifier votre clé
+        API et votre secret.
+      importing_accounts: Importation des comptes depuis Coinbase…
+      processing_accounts: Traitement des données du compte…
   coinbase_items:
-    create:
-      default_name: Coinbase
-      success: Connexion à Coinbase réussie. Vos comptes sont en cours de synchronisation.
-    update:
-      success: Configuration Coinbase mise à jour.
-    destroy:
-      success: Connexion Coinbase mise en file d'attente pour suppression.
-    setup_accounts:
-      title: Importer les portefeuilles Coinbase
-      subtitle: Sélectionnez les portefeuilles à suivre
-      instructions: Sélectionnez les portefeuilles que vous souhaitez importer. Les portefeuilles non sélectionnés resteront disponibles si vous souhaitez les ajouter plus tard.
-      no_accounts: Tous les portefeuilles ont été importés.
-      accounts_count:
-        one: "%{count} portefeuille disponible"
-        other: "%{count} portefeuilles disponibles"
-      select_all: Tout sélectionner
-      import_selected: Importer la sélection
-      cancel: Annuler
-      creating: Importation…
-    complete_account_setup:
-      success:
-        one: "%{count} portefeuille importé"
-        other: "%{count} portefeuilles importés"
-      none_selected: Aucun portefeuille sélectionné
-      no_accounts: Aucun portefeuille à importer
     coinbase_item:
-      provider_name: Coinbase
-      syncing: Synchronisation…
-      reconnect: Identifiants à mettre à jour
-      deletion_in_progress: Suppression…
-      sync_status:
-        no_accounts: Aucun compte trouvé
-        all_synced:
-          one: "%{count} compte synchronisé"
-          other: "%{count} comptes synchronisés"
-        partial_sync: "%{linked_count} synchronisé(s), %{unlinked_count} à configurer"
-      status: "Dernière synchronisation il y a %{timestamp}"
-      status_with_summary: "Dernière synchronisation il y a %{timestamp} - %{summary}"
-      status_never: Jamais synchronisé
-      update_credentials: Mettre à jour les identifiants
       delete: Supprimer
-      no_accounts_title: Aucun compte trouvé
-      no_accounts_message: Vos portefeuilles Coinbase apparaîtront ici après la synchronisation.
-      setup_needed: Portefeuilles prêts à être importés
-      setup_description: Sélectionnez les portefeuilles Coinbase que vous souhaitez suivre.
-      setup_action: Importer les portefeuilles
+      deletion_in_progress: Suppression…
       import_wallets_menu: Importer les portefeuilles
       more_wallets_available:
         one: "%{count} portefeuille supplémentaire disponible à l'importation"
         other: "%{count} portefeuilles supplémentaires disponibles à l'importation"
-    select_existing_account:
-      title: Lier un compte Coinbase
-      no_accounts_found: Aucun compte Coinbase trouvé.
-      wait_for_sync: Attendez que Coinbase termine la synchronisation
-      check_provider_health: Vérifiez que vos identifiants API Coinbase sont valides
-      balance: Solde
-      currently_linked_to: "Actuellement lié à : %{account_name}"
-      link: Lier
-      cancel: Annuler
+      no_accounts_message: Vos portefeuilles Coinbase apparaîtront ici après la synchronisation.
+      no_accounts_title: Aucun compte trouvé
+      provider_name: Coinbase
+      reconnect: Identifiants à mettre à jour
+      setup_action: Importer les portefeuilles
+      setup_description: Sélectionnez les portefeuilles Coinbase que vous souhaitez
+        suivre.
+      setup_needed: Portefeuilles prêts à être importés
+      status: Dernière synchronisation il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} - %{summary}
+      sync_status:
+        all_synced:
+          one: "%{count} compte synchronisé"
+          other: "%{count} comptes synchronisés"
+        no_accounts: Aucun compte trouvé
+        partial_sync: "%{linked_count} synchronisé(s), %{unlinked_count} à configurer"
+      syncing: Synchronisation…
+      update_credentials: Mettre à jour les identifiants
+    complete_account_setup:
+      no_accounts: Aucun portefeuille à importer
+      none_selected: Aucun portefeuille sélectionné
+      success:
+        one: "%{count} portefeuille importé"
+        other: "%{count} portefeuilles importés"
+    create:
+      default_name: Coinbase
+      success: Connexion à Coinbase réussie. Vos comptes sont en cours de synchronisation.
+    destroy:
+      success: Connexion Coinbase mise en file d'attente pour suppression.
     link_existing_account:
-      success: Compte Coinbase lié avec succès
       errors:
-        only_manual: Seuls les comptes manuels peuvent être liés à Coinbase
         invalid_coinbase_account: Compte Coinbase invalide
-  coinbase_item:
-    syncer:
-      checking_credentials: Vérification des identifiants…
-      credentials_invalid: Identifiants API invalides. Veuillez vérifier votre clé API et votre secret.
-      importing_accounts: Importation des comptes depuis Coinbase…
-      checking_configuration: Vérification de la configuration du compte…
-      accounts_need_setup:
-        one: "%{count} compte à configurer"
-        other: "%{count} comptes à configurer"
-      processing_accounts: Traitement des données du compte…
-      calculating_balances: Calcul des soldes…
+        only_manual: Seuls les comptes manuels peuvent être liés à Coinbase
+      success: Compte Coinbase lié avec succès
+    select_existing_account:
+      balance: Solde
+      cancel: Annuler
+      check_provider_health: Vérifiez que vos identifiants API Coinbase sont valides
+      currently_linked_to: 'Actuellement lié à : %{account_name}'
+      link: Lier
+      no_accounts_found: Aucun compte Coinbase trouvé.
+      title: Lier un compte Coinbase
+      wait_for_sync: Attendez que Coinbase termine la synchronisation
+    setup_accounts:
+      accounts_count:
+        one: "%{count} portefeuille disponible"
+        other: "%{count} portefeuilles disponibles"
+      cancel: Annuler
+      creating: Importation…
+      import_selected: Importer la sélection
+      instructions: Sélectionnez les portefeuilles que vous souhaitez importer. Les
+        portefeuilles non sélectionnés resteront disponibles si vous souhaitez les
+        ajouter plus tard.
+      no_accounts: Tous les portefeuilles ont été importés.
+      select_all: Tout sélectionner
+      subtitle: Sélectionnez les portefeuilles à suivre
+      title: Importer les portefeuilles Coinbase
+    update:
+      success: Configuration Coinbase mise à jour.
diff --git a/config/locales/views/coinbase_items/it.yml b/config/locales/views/coinbase_items/it.yml
new file mode 100644
index 000000000..fd6c9badf
--- /dev/null
+++ b/config/locales/views/coinbase_items/it.yml
@@ -0,0 +1,78 @@
+---
+it:
+  coinbase_items:
+    create:
+      default_name: Coinbase
+      success: Connessione a Coinbase riuscita! I tuoi conti vengono sincronizzati.
+    update:
+      success: Configurazione Coinbase aggiornata con successo.
+    destroy:
+      success: Connessione Coinbase pianificata per l'eliminazione.
+    setup_accounts:
+      title: Importa portafogli Coinbase
+      subtitle: Seleziona quali portafogli tracciare
+      instructions: Seleziona i portafogli che vuoi importare. I portafogli non selezionati rimarranno disponibili se vuoi aggiungerli in seguito.
+      no_accounts: Tutti i portafogli sono stati importati.
+      accounts_count:
+        one: "%{count} portafoglio disponibile"
+        other: "%{count} portafogli disponibili"
+      select_all: Seleziona tutto
+      import_selected: Importa selezionati
+      cancel: Annulla
+      creating: Importazione in corso...
+    complete_account_setup:
+      success:
+        one: "Importato %{count} portafoglio"
+        other: "Importati %{count} portafogli"
+      none_selected: Nessun portafoglio selezionato
+      no_accounts: Nessun portafoglio da importare
+    coinbase_item:
+      provider_name: Coinbase
+      syncing: Sincronizzazione in corso...
+      reconnect: Le credenziali devono essere aggiornate
+      deletion_in_progress: Eliminazione in corso...
+      sync_status:
+        no_accounts: Nessun conto trovato
+        all_synced:
+          one: "%{count} conto sincronizzato"
+          other: "%{count} conti sincronizzati"
+        partial_sync: "%{linked_count} sincronizzati, %{unlinked_count} da configurare"
+      status: "Ultima sincronizzazione %{timestamp} fa"
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      status_never: Mai sincronizzato
+      update_credentials: Aggiorna credenziali
+      delete: Elimina
+      no_accounts_title: Nessun conto trovato
+      no_accounts_message: I tuoi portafogli Coinbase appariranno qui dopo la sincronizzazione.
+      setup_needed: Portafogli pronti per l'importazione
+      setup_description: Seleziona quali portafogli Coinbase vuoi tracciare.
+      setup_action: Importa portafogli
+      import_wallets_menu: Importa portafogli
+      more_wallets_available:
+        one: "%{count} altro portafoglio disponibile da importare"
+        other: "%{count} altri portafogli disponibili da importare"
+    select_existing_account:
+      title: Collega conto Coinbase
+      no_accounts_found: Nessun conto Coinbase trovato.
+      wait_for_sync: Attendi il completamento della sincronizzazione Coinbase
+      check_provider_health: Verifica che le tue credenziali API Coinbase siano valide
+      balance: Saldo
+      currently_linked_to: "Attualmente collegato a: %{account_name}"
+      link: Collega
+      cancel: Annulla
+    link_existing_account:
+      success: Collegato con successo al conto Coinbase
+      errors:
+        only_manual: Solo i conti manuali possono essere collegati a Coinbase
+        invalid_coinbase_account: Conto Coinbase non valido
+  coinbase_item:
+    syncer:
+      checking_credentials: Verifica credenziali...
+      credentials_invalid: Credenziali API non valide. Controlla la tua chiave API e il segreto.
+      importing_accounts: Importazione conti da Coinbase...
+      checking_configuration: Verifica configurazione conto...
+      accounts_need_setup:
+        one: "%{count} conto da configurare"
+        other: "%{count} conti da configurare"
+      processing_accounts: Elaborazione dati conto...
+      calculating_balances: Calcolo saldi...
diff --git a/config/locales/views/coinbase_items/ru.yml b/config/locales/views/coinbase_items/ru.yml
new file mode 100644
index 000000000..33f13ed14
--- /dev/null
+++ b/config/locales/views/coinbase_items/ru.yml
@@ -0,0 +1,91 @@
+---
+ru:
+  coinbase_item:
+    syncer:
+      accounts_need_setup:
+        few: "%{count} счёта требуют настройки"
+        many: "%{count} счетов требуют настройки"
+        one: "%{count} счёт требует настройки"
+        other: "%{count} счёта требуют настройки"
+      calculating_balances: Расчёт балансов...
+      checking_configuration: Проверка конфигурации счетов...
+      checking_credentials: Проверка данных...
+      credentials_invalid: Недействительные API-данные. Пожалуйста, проверьте ваш
+        API-ключ и секрет.
+      importing_accounts: Импорт счетов из Coinbase...
+      processing_accounts: Обработка данных счетов...
+  coinbase_items:
+    coinbase_item:
+      delete: Удалить
+      deletion_in_progress: Удаление...
+      import_wallets_menu: Импортировать кошельки
+      more_wallets_available:
+        few: Доступно для импорта ещё %{count} кошелька
+        many: Доступно для импорта ещё %{count} кошельков
+        one: Доступен для импорта ещё %{count} кошелёк
+        other: Доступно для импорта ещё %{count} кошелька
+      no_accounts_message: Ваши кошельки Coinbase появятся здесь после синхронизации.
+      no_accounts_title: Счета не найдены
+      provider_name: Coinbase
+      reconnect: Необходимо обновить данные
+      setup_action: Импортировать кошельки
+      setup_description: Выберите, какие кошельки Coinbase вы хотите отслеживать.
+      setup_needed: Кошельки готовы к импорту
+      status: Последняя синхронизация %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад - %{summary}
+      sync_status:
+        all_synced:
+          few: Синхронизированы %{count} счёта
+          many: Синхронизировано %{count} счетов
+          one: Синхронизирован %{count} счёт
+          other: Синхронизированы %{count} счёта
+        no_accounts: Счета не найдены
+        partial_sync: "%{linked_count} синхронизировано, %{unlinked_count} требуют
+          настройки"
+      syncing: Синхронизация...
+      update_credentials: Обновить данные
+    complete_account_setup:
+      no_accounts: Нет кошельков для импорта
+      none_selected: Кошельки не выбраны
+      success:
+        few: Импортированы %{count} кошелька
+        many: Импортировано %{count} кошельков
+        one: Импортирован %{count} кошелёк
+        other: Импортированы %{count} кошелька
+    create:
+      default_name: Coinbase
+      success: Успешно подключено к Coinbase! Ваши счета синхронизируются.
+    destroy:
+      success: Подключение к Coinbase запланировано на удаление.
+    link_existing_account:
+      errors:
+        invalid_coinbase_account: Недействительный аккаунт Coinbase
+        only_manual: Только ручные счета могут быть связаны с Coinbase
+      success: Успешно связан с аккаунтом Coinbase
+    select_existing_account:
+      balance: Баланс
+      cancel: Отмена
+      check_provider_health: Проверьте, действительны ли ваши API-данные Coinbase
+      currently_linked_to: 'Текущая связь с: %{account_name}'
+      link: Связать
+      no_accounts_found: Аккаунты Coinbase не найдены.
+      title: Связать аккаунт Coinbase
+      wait_for_sync: Подождите, пока Coinbase завершит синхронизацию
+    setup_accounts:
+      accounts_count:
+        few: Доступно %{count} кошелька
+        many: Доступно %{count} кошельков
+        one: Доступен %{count} кошелёк
+        other: Доступно %{count} кошелька
+      cancel: Отмена
+      creating: Импорт...
+      import_selected: Импортировать выбранные
+      instructions: Выберите кошельки, которые хотите импортировать. Невыбранные кошельки
+        останутся доступными для добавления позже.
+      no_accounts: Все кошельки импортированы.
+      select_all: Выбрать все
+      subtitle: Выберите кошельки для отслеживания
+      title: Импорт кошельков Coinbase
+    update:
+      success: Конфигурация Coinbase успешно обновлена.
diff --git a/config/locales/views/coinbase_items/tr.yml b/config/locales/views/coinbase_items/tr.yml
new file mode 100644
index 000000000..670200c64
--- /dev/null
+++ b/config/locales/views/coinbase_items/tr.yml
@@ -0,0 +1,82 @@
+---
+tr:
+  coinbase_item:
+    syncer:
+      accounts_need_setup:
+        one: "%{count} hesabın kurulumu gerekiyor"
+        other: "%{count} hesabın kurulumu gerekiyor"
+      calculating_balances: Bakiyeler hesaplanıyor...
+      checking_configuration: Hesap yapılandırması kontrol ediliyor...
+      checking_credentials: Kimlik bilgileri kontrol ediliyor...
+      credentials_invalid: Geçersiz API kimlik bilgileri. Lütfen API anahtarınızı
+        ve gizli anahtarınızı kontrol edin.
+      importing_accounts: Hesaplar Coinbase'den içe aktarılıyor...
+      processing_accounts: Hesap verileri işleniyor...
+  coinbase_items:
+    coinbase_item:
+      delete: Sil
+      deletion_in_progress: Siliniyor...
+      import_wallets_menu: Cüzdanları İçe Aktar
+      more_wallets_available:
+        one: İçe aktarılabilecek %{count} cüzdan daha var
+        other: İçe aktarılabilecek %{count} cüzdan daha var
+      no_accounts_message: Coinbase cüzdanlarınız senkronizasyondan sonra burada görünecektir.
+      no_accounts_title: Hesap bulunamadı
+      provider_name: Coinbase
+      reconnect: Kimlik bilgilerinin güncellenmesi gerekiyor
+      setup_action: Cüzdanları İçe Aktar
+      setup_description: Takip etmek istediğiniz Coinbase cüzdanlarını seçin.
+      setup_needed: İçe aktarılmaya hazır cüzdanlar
+      status: Son senkronizasyon %{timestamp} önce
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: Son senkronizasyon %{timestamp} önce - %{summary}
+      sync_status:
+        all_synced:
+          one: "%{count} hesap senkronize edildi"
+          other: "%{count} hesap senkronize edildi"
+        no_accounts: Hesap bulunamadı
+        partial_sync: "%{linked_count} senkronize edildi, %{unlinked_count} kurulum
+          gerekiyor"
+      syncing: Senkronize ediliyor...
+      update_credentials: Kimlik bilgilerini güncelle
+    complete_account_setup:
+      no_accounts: İçe aktarılacak cüzdan yok
+      none_selected: Cüzdan seçilmedi
+      success:
+        one: "%{count} cüzdan içe aktarıldı"
+        other: "%{count} cüzdan içe aktarıldı"
+    create:
+      default_name: Coinbase
+      success: Coinbase'e başarıyla bağlanıldı! Hesaplarınız senkronize ediliyor.
+    destroy:
+      success: Coinbase bağlantısı silinmek üzere planlandı.
+    link_existing_account:
+      errors:
+        invalid_coinbase_account: Geçersiz Coinbase hesabı
+        only_manual: Yalnızca manuel hesaplar Coinbase'e bağlanabilir
+      success: Coinbase hesabına başarıyla bağlanıldı
+    select_existing_account:
+      balance: Bakiye
+      cancel: İptal
+      check_provider_health: Coinbase API kimlik bilgilerinizin geçerli olduğunu kontrol
+        edin
+      currently_linked_to: 'Şu anda bağlı olduğu hesap: %{account_name}'
+      link: Bağla
+      no_accounts_found: Coinbase hesabı bulunamadı.
+      title: Coinbase Hesabını Bağla
+      wait_for_sync: Coinbase'in senkronizasyonu bitirmesini bekleyin
+    setup_accounts:
+      accounts_count:
+        one: "%{count} cüzdan mevcut"
+        other: "%{count} cüzdan mevcut"
+      cancel: İptal
+      creating: İçe aktarılıyor...
+      import_selected: Seçilenleri İçe Aktar
+      instructions: İçe aktarmak istediğiniz cüzdanları seçin. Seçilmeyen cüzdanlar,
+        daha sonra eklemek isterseniz kullanılabilir olarak kalacaktır.
+      no_accounts: Tüm cüzdanlar içe aktarıldı.
+      select_all: Tümünü seç
+      subtitle: Takip edilecek cüzdanları seçin
+      title: Coinbase Cüzdanlarını İçe Aktar
+    update:
+      success: Coinbase yapılandırması başarıyla güncellendi.
diff --git a/config/locales/views/coinstats_items/fr.yml b/config/locales/views/coinstats_items/fr.yml
index 84a89d621..3fc08aafe 100644
--- a/config/locales/views/coinstats_items/fr.yml
+++ b/config/locales/views/coinstats_items/fr.yml
@@ -1,75 +1,89 @@
 ---
 fr:
   coinstats_items:
-    create:
-      success: Connexion au fournisseur CoinStats configurée avec succès.
-      default_name: Connexion CoinStats
-      errors:
-        validation_failed: "Validation échouée : %{message}."
-    update:
-      success: Connexion au fournisseur CoinStats mise à jour avec succès.
-      errors:
-        validation_failed: "Validation échouée : %{message}."
-    destroy:
-      success: Connexion au fournisseur CoinStats planifiée pour suppression.
-    link_wallet:
-      success: "%{count} portefeuille(s) crypto lié(s) avec succès."
-      missing_params: "Paramètres requis manquants : adresse et blockchain."
-      failed: Échec de la liaison du portefeuille crypto.
-      error: "Échec de la liaison du portefeuille crypto : %{message}."
-    link_exchange:
-      success: "Plateforme d'échange %{name} liée."
-      missing_params: La plateforme d'échange et les identifiants sont requis.
-      invalid_exchange: La plateforme d'échange sélectionnée n'est plus prise en charge.
-      failed: Échec de la liaison de la plateforme d'échange.
-      error: "Échec de la liaison de la plateforme d'échange : %{message}."
-    new:
-      title: Lier un portefeuille crypto avec CoinStats
-      blockchain_fetch_error: Échec du chargement des blockchains. Veuillez réessayer plus tard.
-      link_wallet_title: Lier une adresse de portefeuille
-      link_wallet_description: Suivez un portefeuille en auto-conservation ou une adresse on-chain unique via CoinStats.
-      address_label: Adresse
-      address_placeholder: Requis
-      blockchain_label: Blockchain
-      blockchain_placeholder: Requis
-      blockchain_select_blank: Sélectionnez une blockchain
-      link_wallet_submit: Lier le portefeuille crypto
-      link_exchange_title: Lier l'API d'une plateforme d'échange
-      link_exchange_description: Utilisez une clé API de plateforme d'échange en lecture seule pour que CoinStats puisse synchroniser les soldes et les transactions depuis Bitvavo, Binance et d'autres plateformes prises en charge.
-      link_exchange_note: Si votre plateforme d'échange nécessite l'activation de la clé API ou la confirmation par e-mail, effectuez cette étape avant de la lier ici.
-      exchange_select_blank: Sélectionnez une plateforme d'échange
-      exchange_label: Plateforme d'échange
-      link_exchange_submit: Lier la plateforme d'échange
-      not_configured_title: Connexion au fournisseur CoinStats non configurée
-      not_configured_message: Pour lier un portefeuille crypto ou une plateforme d'échange, vous devez d'abord configurer la connexion au fournisseur CoinStats.
-      not_configured_step1_html: Allez dans <strong>Paramètres → Fournisseurs</strong>
-      not_configured_step2_html: Localisez le fournisseur <strong>CoinStats</strong>
-      not_configured_step3_html: Suivez les <strong>instructions de configuration</strong> fournies pour terminer la configuration du fournisseur
-      go_to_settings: Aller aux paramètres du fournisseur
-      setup_instructions: "Instructions de configuration :"
-      step1_html: Visitez le <a href="https://openapi.coinstats.app/" class="link" target="_blank" rel="noopener noreferrer">tableau de bord de l'API publique CoinStats</a> pour obtenir une clé API.
-      step2: Entrez votre clé API ci-dessous et cliquez sur Configurer.
-      step3_html: Après une connexion réussie, visitez l'onglet <a href="%{accounts_url}" class="link" data-turbo-frame="_top">Comptes</a> pour configurer les portefeuilles crypto.
-      api_key_label: Clé API
-      api_key_placeholder: Requis
-      configure: Configurer
-      update_configuration: Reconfigurer
-      default_name: Connexion CoinStats
     coinstats_item:
+      delete: Supprimer
       deletion_in_progress: Les données du portefeuille crypto sont en cours de suppression…
+      no_wallets_message: Aucun portefeuille crypto n'est actuellement connecté à
+        CoinStats.
+      no_wallets_title: Aucun portefeuille crypto connecté
       provider_name: CoinStats
-      syncing: Synchronisation…
-      sync_status:
-        no_accounts: Aucun portefeuille crypto trouvé
-        all_synced:
-          one: "%{count} portefeuille crypto synchronisé"
-          other: "%{count} portefeuilles crypto synchronisés"
-        partial_sync: "%{linked_count} portefeuilles crypto synchronisés, %{unlinked_count} nécessitent une configuration"
       reconnect: Reconnecter
       status: Dernière synchronisation il y a %{timestamp}
       status_never: Jamais synchronisé
-      status_with_summary: "Dernière synchronisation il y a %{timestamp} • %{summary}"
+      status_with_summary: Dernière synchronisation il y a %{timestamp} • %{summary}
+      sync_status:
+        all_synced:
+          one: "%{count} portefeuille crypto synchronisé"
+          other: "%{count} portefeuilles crypto synchronisés"
+        no_accounts: Aucun portefeuille crypto trouvé
+        partial_sync: "%{linked_count} portefeuilles crypto synchronisés, %{unlinked_count}
+          nécessitent une configuration"
+      syncing: Synchronisation…
       update_api_key: Mettre à jour la clé API
-      delete: Supprimer
-      no_wallets_title: Aucun portefeuille crypto connecté
-      no_wallets_message: Aucun portefeuille crypto n'est actuellement connecté à CoinStats.
+    create:
+      default_name: Connexion CoinStats
+      errors:
+        validation_failed: 'Validation échouée : %{message}.'
+      success: Connexion au fournisseur CoinStats configurée avec succès.
+    destroy:
+      success: Connexion au fournisseur CoinStats planifiée pour suppression.
+    link_exchange:
+      error: 'Échec de la liaison de la plateforme d''échange : %{message}.'
+      failed: Échec de la liaison de la plateforme d'échange.
+      invalid_exchange: La plateforme d'échange sélectionnée n'est plus prise en charge.
+      missing_params: La plateforme d'échange et les identifiants sont requis.
+      success: Plateforme d'échange %{name} liée.
+    link_wallet:
+      error: 'Échec de la liaison du portefeuille crypto : %{message}.'
+      failed: Échec de la liaison du portefeuille crypto.
+      missing_params: 'Paramètres requis manquants : adresse et blockchain.'
+      success: "%{count} portefeuille(s) crypto lié(s) avec succès."
+    new:
+      address_label: Adresse
+      address_placeholder: Requis
+      api_key_label: Clé API
+      api_key_placeholder: Requis
+      blockchain_fetch_error: Échec du chargement des blockchains. Veuillez réessayer
+        plus tard.
+      blockchain_label: Blockchain
+      blockchain_placeholder: Requis
+      blockchain_select_blank: Sélectionnez une blockchain
+      configure: Configurer
+      default_name: Connexion CoinStats
+      exchange_label: Plateforme d'échange
+      exchange_select_blank: Sélectionnez une plateforme d'échange
+      go_to_settings: Aller aux paramètres du fournisseur
+      link_exchange_description: Utilisez une clé API de plateforme d'échange en lecture
+        seule pour que CoinStats puisse synchroniser les soldes et les transactions
+        depuis Bitvavo, Binance et d'autres plateformes prises en charge.
+      link_exchange_note: Si votre plateforme d'échange nécessite l'activation de
+        la clé API ou la confirmation par e-mail, effectuez cette étape avant de la
+        lier ici.
+      link_exchange_submit: Lier la plateforme d'échange
+      link_exchange_title: Lier l'API d'une plateforme d'échange
+      link_wallet_description: Suivez un portefeuille en auto-conservation ou une
+        adresse on-chain unique via CoinStats.
+      link_wallet_submit: Lier le portefeuille crypto
+      link_wallet_title: Lier une adresse de portefeuille
+      not_configured_message: Pour lier un portefeuille crypto ou une plateforme d'échange,
+        vous devez d'abord configurer la connexion au fournisseur CoinStats.
+      not_configured_step1_html: Allez dans <strong>Paramètres → Fournisseurs</strong>
+      not_configured_step2_html: Localisez le fournisseur <strong>CoinStats</strong>
+      not_configured_step3_html: Suivez les <strong>instructions de configuration</strong>
+        fournies pour terminer la configuration du fournisseur
+      not_configured_title: Connexion au fournisseur CoinStats non configurée
+      setup_instructions: 'Instructions de configuration :'
+      step1_html: Visitez le <a href="https://openapi.coinstats.app/" class="link"
+        target="_blank" rel="noopener noreferrer">tableau de bord de l'API publique
+        CoinStats</a> pour obtenir une clé API.
+      step2: Entrez votre clé API ci-dessous et cliquez sur Configurer.
+      step3_html: Après une connexion réussie, visitez l'onglet <a href="%{accounts_url}"
+        class="link" data-turbo-frame="_top">Comptes</a> pour configurer les portefeuilles
+        crypto.
+      title: Lier un portefeuille crypto avec CoinStats
+      update_configuration: Reconfigurer
+    update:
+      errors:
+        validation_failed: 'Validation échouée : %{message}.'
+      success: Connexion au fournisseur CoinStats mise à jour avec succès.
diff --git a/config/locales/views/coinstats_items/it.yml b/config/locales/views/coinstats_items/it.yml
new file mode 100644
index 000000000..5fc6cb4f7
--- /dev/null
+++ b/config/locales/views/coinstats_items/it.yml
@@ -0,0 +1,75 @@
+---
+it:
+  coinstats_items:
+    create:
+      success: Connessione provider CoinStats configurata con successo.
+      default_name: Connessione CoinStats
+      errors:
+        validation_failed: "Validazione fallita: %{message}."
+    update:
+      success: Connessione provider CoinStats aggiornata con successo.
+      errors:
+        validation_failed: "Validazione fallita: %{message}."
+    destroy:
+      success: Connessione provider CoinStats pianificata per l'eliminazione.
+    link_wallet:
+      success: "%{count} portafoglio/i crypto collegato/i con successo."
+      missing_params: "Parametri obbligatori mancanti: indirizzo e blockchain."
+      failed: Collegamento portafoglio crypto fallito.
+      error: "Collegamento portafoglio crypto fallito: %{message}."
+    link_exchange:
+      success: "Exchange %{name} collegato."
+      missing_params: Exchange e credenziali sono obbligatori.
+      invalid_exchange: L'exchange selezionato non è più supportato.
+      failed: Collegamento exchange fallito.
+      error: "Collegamento exchange fallito: %{message}."
+    new:
+      title: Collega Crypto con CoinStats
+      blockchain_fetch_error: Caricamento blockchain fallito. Riprova più tardi.
+      link_wallet_title: Collega indirizzo portafoglio
+      link_wallet_description: Traccia un portafoglio self-custody o un singolo indirizzo on-chain tramite CoinStats.
+      address_label: Indirizzo
+      address_placeholder: Obbligatorio
+      blockchain_label: Blockchain
+      blockchain_placeholder: Obbligatorio
+      blockchain_select_blank: Seleziona una Blockchain
+      link_wallet_submit: Collega portafoglio Crypto
+      link_exchange_title: Collega API Exchange
+      link_exchange_description: Usa una chiave API di exchange in sola lettura così CoinStats può sincronizzare saldi e transazioni da Bitvavo, Binance e altri exchange supportati.
+      link_exchange_note: Se il tuo exchange richiede l'attivazione della chiave API o la conferma email, completa quel passaggio prima di collegarti qui.
+      exchange_select_blank: Seleziona un exchange
+      exchange_label: Exchange
+      link_exchange_submit: Collega Exchange
+      not_configured_title: Connessione provider CoinStats non configurata
+      not_configured_message: Per collegare un portafoglio crypto o exchange, devi prima configurare la connessione provider CoinStats.
+      not_configured_step1_html: Vai su <strong>Impostazioni → Provider</strong>
+      not_configured_step2_html: Trova il provider <strong>CoinStats</strong>
+      not_configured_step3_html: Segui le <strong>istruzioni di configurazione</strong> fornite per completare la configurazione del provider
+      go_to_settings: Vai alle Impostazioni provider
+      setup_instructions: "Istruzioni di configurazione:"
+      step1_html: Visita la <a href="https://openapi.coinstats.app/" class="link" target="_blank" rel="noopener noreferrer">Dashboard API pubblica CoinStats</a> per ottenere una chiave API.
+      step2: Inserisci la tua chiave API qui sotto e clicca Configura.
+      step3_html: Dopo una connessione riuscita, visita la scheda <a href="%{accounts_url}" class="link" data-turbo-frame="_top">Conti</a> per configurare i tuoi conti crypto.
+      api_key_label: Chiave API
+      api_key_placeholder: Obbligatorio
+      configure: Configura
+      update_configuration: Riconfigura
+      default_name: Connessione CoinStats
+    coinstats_item:
+      deletion_in_progress: I dati del portafoglio crypto vengono eliminati…
+      provider_name: CoinStats
+      syncing: Sincronizzazione in corso…
+      sync_status:
+        no_accounts: Nessun portafoglio crypto trovato
+        all_synced:
+          one: "%{count} portafoglio crypto sincronizzato"
+          other: "%{count} portafogli crypto sincronizzati"
+        partial_sync: "%{linked_count} portafogli crypto sincronizzati, %{unlinked_count} da configurare"
+      reconnect: Riconnetti
+      status: Ultima sincronizzazione %{timestamp} fa
+      status_never: Mai sincronizzato
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa • %{summary}"
+      update_api_key: Aggiorna chiave API
+      delete: Elimina
+      no_wallets_title: Nessun portafoglio crypto connesso
+      no_wallets_message: Nessun portafoglio crypto è attualmente connesso a CoinStats.
diff --git a/config/locales/views/coinstats_items/ru.yml b/config/locales/views/coinstats_items/ru.yml
new file mode 100644
index 000000000..a7ee70c46
--- /dev/null
+++ b/config/locales/views/coinstats_items/ru.yml
@@ -0,0 +1,92 @@
+---
+ru:
+  coinstats_items:
+    coinstats_item:
+      delete: Удалить
+      deletion_in_progress: Данные криптокошелька удаляются…
+      no_wallets_message: В настоящее время к CoinStats не подключены криптокошельки.
+      no_wallets_title: Криптокошельки не подключены
+      provider_name: CoinStats
+      reconnect: Переподключить
+      status: Последняя синхронизация %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад • %{summary}
+      sync_status:
+        all_synced:
+          few: Синхронизированы %{count} криптокошелька
+          many: Синхронизировано %{count} криптокошельков
+          one: Синхронизирован %{count} криптокошелёк
+          other: Синхронизированы %{count} криптокошелька
+        no_accounts: Криптокошельки не найдены
+        partial_sync: Синхронизировано %{linked_count} криптокошельков, %{unlinked_count}
+          требуют настройки
+      syncing: Синхронизация…
+      update_api_key: Обновить API-ключ
+    create:
+      default_name: Подключение CoinStats
+      errors:
+        validation_failed: 'Ошибка проверки: %{message}.'
+      success: Подключение к CoinStats успешно настроено.
+    destroy:
+      success: Подключение к CoinStats запланировано на удаление.
+    link_exchange:
+      error: 'Ошибка подключения биржи: %{message}.'
+      failed: Не удалось подключить биржу.
+      invalid_exchange: Выбранная биржа больше не поддерживается.
+      missing_params: Требуются биржа и учетные данные.
+      success: "%{name} биржа подключена."
+    link_wallet:
+      error: 'Ошибка подключения криптокошелька: %{message}.'
+      failed: Не удалось подключить криптокошелёк.
+      missing_params: 'Отсутствуют необходимые параметры: адрес и блокчейн.'
+      success:
+        few: "%{count} криптокошелька успешно подключены."
+        many: "%{count} криптокошельков успешно подключены."
+        one: "%{count} криптокошелёк успешно подключён."
+        other: "%{count} криптокошелька успешно подключены."
+    new:
+      address_label: Адрес
+      address_placeholder: Обязательно
+      api_key_label: API-ключ
+      api_key_placeholder: Обязательно
+      blockchain_fetch_error: Не удалось загрузить блокчейны. Пожалуйста, попробуйте
+        позже.
+      blockchain_label: Блокчейн
+      blockchain_placeholder: Обязательно
+      blockchain_select_blank: Выберите блокчейн
+      configure: Настроить
+      default_name: Подключение CoinStats
+      exchange_label: Биржа
+      exchange_select_blank: Выберите биржу
+      go_to_settings: Перейти к настройкам провайдера
+      link_exchange_description: Используйте API-ключ биржи только для чтения, чтобы
+        CoinStats мог синхронизировать балансы и операции с Bitvavo, Binance и другими
+        поддерживаемыми биржами.
+      link_exchange_note: Если ваша биржа требует активации API-ключа или подтверждения
+        по электронной почте, завершите этот шаг перед подключением здесь.
+      link_exchange_submit: Подключить биржу
+      link_exchange_title: Подключение API биржи
+      link_wallet_description: Отслеживайте кошелёк с самостоятельным хранением или
+        отдельный адрес в блокчейне через CoinStats.
+      link_wallet_submit: Подключить криптокошелёк
+      link_wallet_title: Подключение адреса кошелька
+      not_configured_message: Чтобы подключить криптокошелёк или биржу, сначала необходимо
+        настроить подключение к CoinStats.
+      not_configured_step1_html: Перейдите в <strong>Настройки → Провайдеры</strong>
+      not_configured_step2_html: Найдите провайдера <strong>CoinStats</strong>
+      not_configured_step3_html: Следуйте предоставленным <strong>инструкциям по настройке</strong>
+        для завершения конфигурации провайдера
+      not_configured_title: Подключение к CoinStats не настроено
+      setup_instructions: 'Инструкции по настройке:'
+      step1_html: Посетите <a href="https://openapi.coinstats.app/" class="link" target="_blank"
+        rel="noopener noreferrer">Панель управления публичным API CoinStats</a>, чтобы
+        получить API-ключ.
+      step2: Введите ваш API-ключ ниже и нажмите Настроить.
+      step3_html: После успешного подключения перейдите на вкладку <a href="%{accounts_url}"
+        class="link" data-turbo-frame="_top">Счета</a>, чтобы настроить ваши криптосчета.
+      title: Подключение криптовалюты через CoinStats
+      update_configuration: Перенастроить
+    update:
+      errors:
+        validation_failed: 'Ошибка проверки: %{message}.'
+      success: Подключение к CoinStats успешно обновлено.
diff --git a/config/locales/views/coinstats_items/tr.yml b/config/locales/views/coinstats_items/tr.yml
new file mode 100644
index 000000000..a2cf8756a
--- /dev/null
+++ b/config/locales/views/coinstats_items/tr.yml
@@ -0,0 +1,87 @@
+---
+tr:
+  coinstats_items:
+    coinstats_item:
+      delete: Sil
+      deletion_in_progress: Kripto cüzdan verileri siliniyor…
+      no_wallets_message: Şu anda CoinStats'a bağlı kripto cüzdanı yok.
+      no_wallets_title: Bağlı kripto cüzdanı yok
+      provider_name: CoinStats
+      reconnect: Yeniden bağlan
+      status: Son senkronizasyon %{timestamp} önce
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: Son senkronizasyon %{timestamp} önce • %{summary}
+      sync_status:
+        all_synced:
+          one: "%{count} kripto cüzdanı senkronize edildi"
+          other: "%{count} kripto cüzdanı senkronize edildi"
+        no_accounts: Kripto cüzdanı bulunamadı
+        partial_sync: "%{linked_count} kripto cüzdanı senkronize edildi, %{unlinked_count}
+          kurulum gerektiriyor"
+      syncing: Senkronize ediliyor…
+      update_api_key: API Anahtarını Güncelle
+    create:
+      default_name: CoinStats Bağlantısı
+      errors:
+        validation_failed: 'Doğrulama başarısız: %{message}.'
+      success: CoinStats sağlayıcı bağlantısı başarıyla yapılandırıldı.
+    destroy:
+      success: CoinStats sağlayıcı bağlantısı silinmek üzere planlandı.
+    link_exchange:
+      error: 'Borsa bağlanamadı: %{message}.'
+      failed: Borsa bağlanamadı.
+      invalid_exchange: Seçilen borsa artık desteklenmiyor.
+      missing_params: Borsa ve kimlik bilgileri gereklidir.
+      success: "%{name} borsası bağlandı."
+    link_wallet:
+      error: 'Kripto cüzdan bağlantısı başarısız oldu: %{message}.'
+      failed: Kripto cüzdan bağlantısı başarısız oldu.
+      missing_params: 'Eksik gerekli parametreler: adres ve blok zinciri.'
+      success: "%{count} kripto cüzdanı başarıyla bağlandı."
+    new:
+      address_label: Adres
+      address_placeholder: Zorunlu
+      api_key_label: API Anahtarı
+      api_key_placeholder: Zorunlu
+      blockchain_fetch_error: Blok zincirleri yüklenemedi. Lütfen daha sonra tekrar
+        deneyin.
+      blockchain_label: Blok Zinciri
+      blockchain_placeholder: Zorunlu
+      blockchain_select_blank: Bir Blok Zinciri Seçin
+      configure: Yapılandır
+      default_name: CoinStats Bağlantısı
+      exchange_label: Borsa
+      exchange_select_blank: Bir borsa seçin
+      go_to_settings: Sağlayıcı Ayarlarına Git
+      link_exchange_description: CoinStats'ın Bitvavo, Binance ve diğer desteklenen
+        borsalardan bakiye ve işlemleri senkronize edebilmesi için salt okunur bir
+        borsa API anahtarı kullanın.
+      link_exchange_note: Borsanız API anahtarı etkinleştirmesi veya e-posta onayı
+        gerektiriyorsa, buradan bağlamadan önce bu adımı tamamlayın.
+      link_exchange_submit: Borsayı Bağla
+      link_exchange_title: Borsa API'sini Bağla
+      link_wallet_description: CoinStats üzerinden kendi kontrolünüzdeki bir cüzdanı
+        veya tek bir zincir üstü adresi takip edin.
+      link_wallet_submit: Kripto Cüzdanı Bağla
+      link_wallet_title: Cüzdan Adresini Bağla
+      not_configured_message: Bir kripto cüzdanı veya borsa bağlamak için önce CoinStats
+        sağlayıcı bağlantısını yapılandırmanız gerekir.
+      not_configured_step1_html: "<strong>Ayarlar → Sağlayıcılar</strong>'a gidin"
+      not_configured_step2_html: "<strong>CoinStats</strong> sağlayıcısını bulun"
+      not_configured_step3_html: Sağlayıcı yapılandırmasını tamamlamak için verilen
+        <strong>kurulum talimatlarını</strong> izleyin
+      not_configured_title: CoinStats sağlayıcı bağlantısı yapılandırılmamış
+      setup_instructions: 'Kurulum Talimatları:'
+      step1_html: API anahtarı almak için <a href="https://openapi.coinstats.app/"
+        class="link" target="_blank" rel="noopener noreferrer">CoinStats Genel API
+        Panosunu</a> ziyaret edin.
+      step2: API anahtarınızı aşağıya girin ve Yapılandır'a tıklayın.
+      step3_html: Bağlantı başarılı olduktan sonra, kripto hesaplarınızı ayarlamak
+        için <a href="%{accounts_url}" class="link" data-turbo-frame="_top">Hesaplar</a>
+        sekmesini ziyaret edin.
+      title: CoinStats ile Kripto Bağla
+      update_configuration: Yeniden Yapılandır
+    update:
+      errors:
+        validation_failed: 'Doğrulama başarısız: %{message}.'
+      success: CoinStats sağlayıcı bağlantısı başarıyla güncellendi.
diff --git a/config/locales/views/components/en.yml b/config/locales/views/components/en.yml
index e0dfca1ab..dabd8fce5 100644
--- a/config/locales/views/components/en.yml
+++ b/config/locales/views/components/en.yml
@@ -1,6 +1,8 @@
 ---
 en:
   UI:
+    period_picker:
+      aria_label: "Time period: %{period}"
     account:
       activity_feed:
         toggle_selection_checkboxes: Toggle selection
@@ -68,8 +70,10 @@ en:
           holdings_value: Holdings value
           remaining_principal_balance: Remaining principal balance
           total_account_value: Total account value
+          total_gains: Total gains
         views:
           cash: Cash
+          gains: Gains / ROI
           holdings: Holdings
           total_value: Total value
         vs_available_history: vs. available history
diff --git a/config/locales/views/components/fr.yml b/config/locales/views/components/fr.yml
index 7774ddd38..84f6dc08a 100644
--- a/config/locales/views/components/fr.yml
+++ b/config/locales/views/components/fr.yml
@@ -1,67 +1,164 @@
 ---
 fr:
+  UI:
+    account:
+      activity_date:
+        balance_tooltip: Le solde de fin de journée, après toutes les transactions et ajustements
+        no_balance_data: Aucune donnée de solde disponible pour cette date
+      activity_feed:
+        toggle_selection_checkboxes: Basculer la sélection
+      balance_reconciliation:
+        labels:
+          adjustments: Ajustements
+          buys: Achète
+          change_in_brokerage_cash: Variation des liquidités de courtage
+          change_in_holdings_market: Variation des holdings (activité des prix du marché)
+          change_in_holdings_trades: Evolution des holdings (achats/ventes)
+          charges: Frais
+          end_balance: Fin du solde
+          end_principal: Fin du principal
+          end_value: Valeur finale
+          final_balance: Solde final
+          final_principal: Principal final
+          final_value: Valeur finale
+          market_changes: Changements du marché
+          net_cash_flow: Flux de trésorerie net
+          net_principal_change: Variation nette du capital
+          net_value_change: Variation de la valeur nette
+          payments: Paiements
+          sells: Vend
+          start_balance: Début du solde
+          start_principal: Démarrer le principal
+          start_value: Valeur de départ
+        tooltips:
+          adjustments: Rapprochements manuels ou autres ajustements
+          adjustments_asset: Corrections de valeur ou expertises manuelles
+          buys: Achats de crypto pendant la journée
+          change_in_brokerage_cash: Variation nette des liquidités provenant des dépôts, des retraits et des transactions
+          change_in_holdings_market: Variation de la valeur des holdings en raison des mouvements des prix du marché
+          change_in_holdings_trades: Impact sur les holdings de l'achat et de la vente de titres
+          charges: Nouvelles charges effectuées dans la journée
+          end_balance: Le solde calculé après toutes les transactions
+          end_balance_investment: Le solde calculé après toute activité
+          end_principal: Le principal calculé après toutes les transactions
+          end_value: La valeur calculée après tous les changements
+          final_balance: Le solde final du compte pour la journée
+          final_balance_credit: Le solde final dû pour la journée
+          final_balance_crypto: La valeur finale des holdings cryptographiques pour la journée
+          final_balance_investment: La valeur finale du portefeuille pour la journée
+          final_principal: Le solde principal final de la journée
+          final_value: La valeur finale de l'actif pour la journée
+          market_changes: Changements de valeur dus aux mouvements des prix du marché
+          net_cash_flow: Variation nette du solde de toutes les transactions de la journée
+          net_principal_change: Remboursements du capital et nouveaux emprunts dans la journée
+          net_value_change: Tous les changements de valeur, y compris les améliorations et la dépréciation
+          payments: Paiements effectués sur la carte pendant la journée
+          sells: Ventes de crypto en journée
+          start_balance: Le solde du compte au début de cette journée
+          start_balance_credit: Le solde dû en début de journée
+          start_balance_crypto: La valeur des holdings cryptographiques au début de cette journée
+          start_balance_investment: La valeur totale du portefeuille au début de cette journée
+          start_principal: Le solde principal au début de cette journée
+          start_value: La valeur de l'actif au début de cette journée
+      chart:
+        no_data_available: Aucune donnée disponible
+        title:
+          balance: Solde
+          cash_value: Valeur de rachat
+          debt_balance: Solde de la dette
+          estimated_property_value: Valeur estimée de la propriété
+          estimated_vehicle_value: Valeur estimée du véhicule
+          holdings_value: Valeur des holdings
+          remaining_principal_balance: Solde principal restant
+          total_account_value: Valeur totale du compte
+        views:
+          cash: Espèces
+          holdings: Holdings
+          total_value: Valeur totale
+        vs_available_history: par rapport à l'historique disponible
+    period_picker:
+      aria_label: 'Période : %{period}'
+  ds:
+    alert:
+      variants:
+        destructive: Erreur
+        error: Erreur
+        info: Informations
+        success: Succès
+        warning: Avertissement
+    dialog:
+      close: Fermer
+    link:
+      opens_in_new_tab: "(ouvre dans un nouvel onglet)"
+    pill:
+      aria_label: "%{label}"
+      default_label: Aperçu
+    popover:
+      avatar_default_label: Ouvrir le menu
+    tooltip:
+      trigger_label: Plus d'informations
   provider_sync_summary:
-    title: Résumé de la synchronisation
-    last_sync: "Dernière synchronisation : il y a %{time_ago}"
     accounts:
+      institutions: 'Institutions : %{count}'
+      linked: 'Liés : %{count}'
       title: Comptes
-      total: "Total : %{count}"
-      linked: "Liés : %{count}"
-      unlinked: "Non liés : %{count}"
-      institutions: "Institutions : %{count}"
-    transactions:
-      title: Transactions
-      seen: "Vues : %{count}"
-      imported: "Importées : %{count}"
-      updated: "Mises à jour : %{count}"
-      skipped: "Ignorées : %{count}"
-      fetching: "Récupération depuis le courtier…"
-      protected:
-        one: "%{count} entrée protégée (non écrasée)"
-        other: "%{count} entrées protégées (non écrasées)"
-      view_protected: Voir les entrées protégées
-    skip_reasons:
-      excluded: Exclu
-      user_modified: Modifié par l'utilisateur
-      import_locked: Import CSV
-      protected: Protégé
-    holdings:
-      title: Avoirs
-      found: "Trouvés : %{count}"
-      processed: "Traités : %{count}"
-    trades:
-      title: Transactions boursières
-      imported: "Importées : %{count}"
-      skipped: "Ignorées : %{count}"
-      fetching: "Récupération des activités depuis le courtier…"
+      total: 'Total : %{count}'
+      unlinked: 'Non liés : %{count}'
     health:
-      title: Santé
-      view_error_details: Voir les détails de l'erreur
-      rate_limited: "Limité %{time_ago}"
-      recently: récemment
-      errors: "Erreurs : %{count}"
-      pending_reconciled:
-        one: "%{count} transaction en attente dupliquée réconciliée"
-        other: "%{count} transactions en attente dupliquées réconciliées"
-      view_reconciled: Voir les transactions réconciliées
+      data_warnings: 'Avertissements de données : %{count}'
       duplicate_suggestions:
         one: "%{count} doublon possible nécessite une vérification"
         other: "%{count} doublons possibles nécessitent une vérification"
-      view_duplicate_suggestions: Voir les doublons suggérés
+      errors: 'Erreurs : %{count}'
+      notices: 'Notifications : %{count}'
+      pending_reconciled:
+        one: "%{count} transaction en attente dupliquée réconciliée"
+        other: "%{count} transactions en attente dupliquées réconciliées"
+      rate_limited: Limité %{time_ago}
+      recently: récemment
       stale_pending:
         one: "%{count} transaction en attente obsolète (exclue des budgets)"
         other: "%{count} transactions en attente obsolètes (exclues des budgets)"
-      view_stale_pending: Voir les comptes affectés
       stale_pending_count:
         one: "%{count} transaction"
         other: "%{count} transactions"
       stale_unmatched:
         one: "%{count} transaction en attente nécessite une vérification manuelle"
         other: "%{count} transactions en attente nécessitent une vérification manuelle"
-      view_stale_unmatched: Voir les transactions à vérifier
       stale_unmatched_count:
         one: "%{count} transaction"
         other: "%{count} transactions"
-      data_warnings: "Avertissements de données : %{count}"
-      notices: "Notifications : %{count}"
+      title: Santé
       view_data_quality: Voir les détails de qualité des données
+      view_duplicate_suggestions: Voir les doublons suggérés
+      view_error_details: Voir les détails de l'erreur
+      view_reconciled: Voir les transactions réconciliées
+      view_stale_pending: Voir les comptes affectés
+      view_stale_unmatched: Voir les transactions à vérifier
+    holdings:
+      found: 'Trouvés : %{count}'
+      processed: 'Traités : %{count}'
+      title: Holdings
+    last_sync: 'Dernière synchronisation : il y a %{time_ago}'
+    skip_reasons:
+      excluded: Exclu
+      import_locked: Import CSV
+      protected: Protégé
+      user_modified: Modifié par l'utilisateur
+    title: Résumé de la synchronisation
+    trades:
+      fetching: Récupération des activités depuis le courtier…
+      imported: 'Importées : %{count}'
+      skipped: 'Ignorées : %{count}'
+      title: Transactions boursières
+    transactions:
+      fetching: Récupération depuis le courtier…
+      imported: 'Importées : %{count}'
+      protected:
+        one: "%{count} entrée protégée (non écrasée)"
+        other: "%{count} entrées protégées (non écrasées)"
+      seen: 'Vues : %{count}'
+      skipped: 'Ignorées : %{count}'
+      title: Transactions
+      updated: 'Mises à jour : %{count}'
+      view_protected: Voir les entrées protégées
diff --git a/config/locales/views/components/it.yml b/config/locales/views/components/it.yml
new file mode 100644
index 000000000..4c538877b
--- /dev/null
+++ b/config/locales/views/components/it.yml
@@ -0,0 +1,164 @@
+---
+it:
+  UI:
+    period_picker:
+      aria_label: "Periodo: %{period}"
+    account:
+      activity_feed:
+        toggle_selection_checkboxes: Attiva/disattiva selezione
+      balance_reconciliation:
+        labels:
+          adjustments: Rettifiche
+          buys: Acquisti
+          change_in_brokerage_cash: Variazione liquidità broker
+          change_in_holdings_market: Variazione posizioni (prezzo di mercato)
+          change_in_holdings_trades: Variazione posizioni (acquisti/vendite)
+          charges: Addebiti
+          end_balance: Saldo finale
+          end_principal: Capitale finale
+          end_value: Valore finale
+          final_balance: Saldo definitivo
+          final_principal: Capitale definitivo
+          final_value: Valore definitivo
+          market_changes: Variazioni di mercato
+          net_cash_flow: Flusso di cassa netto
+          net_principal_change: Variazione netta del capitale
+          net_value_change: Variazione netta del valore
+          payments: Pagamenti
+          sells: Vendite
+          start_balance: Saldo iniziale
+          start_principal: Capitale iniziale
+          start_value: Valore iniziale
+        tooltips:
+          adjustments: Riconciliazioni manuali o altre rettifiche
+          adjustments_asset: Rettifiche manuali del valore o perizie
+          buys: Acquisti di crypto durante il giorno
+          change_in_brokerage_cash: Variazione netta della liquidità da depositi, prelievi e operazioni
+          change_in_holdings_market: Variazione del valore delle posizioni dai movimenti del prezzo di mercato
+          change_in_holdings_trades: Impatto sulle posizioni dall'acquisto e dalla vendita di titoli
+          charges: Nuovi addebiti effettuati durante il giorno
+          end_balance: Il saldo calcolato dopo tutte le transazioni
+          end_balance_investment: Il saldo calcolato dopo tutte le attività
+          end_principal: Il capitale calcolato dopo tutte le transazioni
+          end_value: Il valore calcolato dopo tutte le variazioni
+          final_balance: Il saldo finale del conto per il giorno
+          final_balance_credit: Il saldo finale dovuto per il giorno
+          final_balance_crypto: Il valore finale delle posizioni crypto per il giorno
+          final_balance_investment: Il valore finale del portafoglio per il giorno
+          final_principal: Il saldo del capitale finale per il giorno
+          final_value: Il valore dell'asset finale per il giorno
+          market_changes: Variazioni di valore dai movimenti del prezzo di mercato
+          net_cash_flow: Variazione netta del saldo da tutte le transazioni durante il giorno
+          net_principal_change: Pagamenti del capitale e nuovi prestiti durante il giorno
+          net_value_change: Tutte le variazioni di valore inclusi miglioramenti e deprezzamento
+          payments: Pagamenti effettuati alla carta durante il giorno
+          sells: Vendite di crypto durante il giorno
+          start_balance: Il saldo del conto all'inizio di questo giorno
+          start_balance_credit: Il saldo dovuto all'inizio di questo giorno
+          start_balance_crypto: Il valore delle posizioni crypto all'inizio di questo giorno
+          start_balance_investment: Il valore totale del portafoglio all'inizio di questo giorno
+          start_principal: Il saldo del capitale all'inizio di questo giorno
+          start_value: Il valore dell'asset all'inizio di questo giorno
+      chart:
+        no_data_available: "Nessun dato disponibile"
+        title:
+          balance: Saldo
+          cash_value: Valore in liquidità
+          debt_balance: Saldo del debito
+          estimated_property_value: Valore stimato proprietà
+          estimated_vehicle_value: Valore stimato veicolo
+          holdings_value: Valore posizioni
+          remaining_principal_balance: Saldo capitale residuo
+          total_account_value: Valore totale del conto
+        views:
+          cash: Liquidità
+          holdings: Posizioni
+          total_value: Valore totale
+        vs_available_history: vs. cronologia disponibile
+      activity_date:
+        balance_tooltip: "Il saldo a fine giornata, dopo tutte le transazioni e rettifiche"
+        no_balance_data: "Nessun dato di saldo disponibile per questa data"
+  ds:
+    alert:
+      variants:
+        info: Info
+        success: Successo
+        warning: Avviso
+        error: Errore
+        destructive: Errore
+    pill:
+      aria_label: "%{label}"
+      default_label: Anteprima
+    dialog:
+      close: Chiudi
+    popover:
+      avatar_default_label: Apri menu
+    tooltip:
+      trigger_label: Ulteriori informazioni
+    link:
+      opens_in_new_tab: (si apre in una nuova scheda)
+  provider_sync_summary:
+    title: Riepilogo sincronizzazione
+    last_sync: "Ultima sincronizzazione: %{time_ago} fa"
+    accounts:
+      title: Conti
+      total: "Totale: %{count}"
+      linked: "Collegati: %{count}"
+      unlinked: "Scollegati: %{count}"
+      institutions: "Istituti: %{count}"
+    transactions:
+      title: Transazioni
+      seen: "Viste: %{count}"
+      imported: "Importate: %{count}"
+      updated: "Aggiornate: %{count}"
+      skipped: "Saltate: %{count}"
+      fetching: "Recupero dal broker..."
+      protected:
+        one: "%{count} voce protetta (non sovrascritta)"
+        other: "%{count} voci protette (non sovrascritte)"
+      view_protected: Vedi voci protette
+    skip_reasons:
+      excluded: Esclusa
+      user_modified: Modificata dall'utente
+      import_locked: Importazione CSV
+      protected: Protetta
+    holdings:
+      title: Posizioni
+      found: "Trovate: %{count}"
+      processed: "Elaborate: %{count}"
+    trades:
+      title: Operazioni
+      imported: "Importate: %{count}"
+      skipped: "Saltate: %{count}"
+      fetching: "Recupero attività dal broker..."
+    health:
+      title: Salute
+      view_error_details: Vedi dettagli errori
+      rate_limited: "Limite di frequenza raggiunto %{time_ago} fa"
+      recently: di recente
+      errors: "Errori: %{count}"
+      pending_reconciled:
+        one: "%{count} transazione in attesa duplicata riconciliata"
+        other: "%{count} transazioni in attesa duplicate riconciliate"
+      view_reconciled: Vedi transazioni riconciliate
+      duplicate_suggestions:
+        one: "%{count} possibile duplicato da rivedere"
+        other: "%{count} possibili duplicati da rivedere"
+      view_duplicate_suggestions: Vedi duplicati suggeriti
+      stale_pending:
+        one: "%{count} transazione in attesa obsoleta (esclusa dai budget)"
+        other: "%{count} transazioni in attesa obsolete (escluse dai budget)"
+      view_stale_pending: Vedi conti interessati
+      stale_pending_count:
+        one: "%{count} transazione"
+        other: "%{count} transazioni"
+      stale_unmatched:
+        one: "%{count} transazione in attesa richiede revisione manuale"
+        other: "%{count} transazioni in attesa richiedono revisione manuale"
+      view_stale_unmatched: Vedi transazioni che richiedono revisione
+      stale_unmatched_count:
+        one: "%{count} transazione"
+        other: "%{count} transazioni"
+      data_warnings: "Avvisi dati: %{count}"
+      notices: "Avvisi: %{count}"
+      view_data_quality: Vedi dettagli qualità dati
diff --git a/config/locales/views/components/ru.yml b/config/locales/views/components/ru.yml
new file mode 100644
index 000000000..5556eda4c
--- /dev/null
+++ b/config/locales/views/components/ru.yml
@@ -0,0 +1,181 @@
+---
+ru:
+  UI:
+    account:
+      activity_date:
+        balance_tooltip: Баланс на конец дня, после всех операций и корректировок
+        no_balance_data: Нет данных о балансе на эту дату
+      activity_feed:
+        toggle_selection_checkboxes: Переключить выбор
+      balance_reconciliation:
+        labels:
+          adjustments: Корректировки
+          buys: Покупки
+          change_in_brokerage_cash: Изменение наличных в брокерском счёте
+          change_in_holdings_market: Изменение активов (рыночная цена)
+          change_in_holdings_trades: Изменение активов (покупки/продажи)
+          charges: Сборы
+          end_balance: Конечный баланс
+          end_principal: Конечный основной долг
+          end_value: Конечная стоимость
+          final_balance: Итоговый баланс
+          final_principal: Итоговый основной долг
+          final_value: Итоговая стоимость
+          market_changes: Рыночные изменения
+          net_cash_flow: Чистый денежный поток
+          net_principal_change: Изменение основного долга
+          net_value_change: Изменение стоимости
+          payments: Платежи
+          sells: Продажи
+          start_balance: Начальный баланс
+          start_principal: Начальный основной долг
+          start_value: Начальная стоимость
+        tooltips:
+          adjustments: Ручные корректировки или другие изменения
+          adjustments_asset: Ручные корректировки стоимости или оценки
+          buys: Покупки криптовалюты в течение дня
+          change_in_brokerage_cash: Чистое изменение наличных от депозитов, снятий
+            и сделок
+          change_in_holdings_market: Изменение стоимости активов из-за рыночных колебаний
+          change_in_holdings_trades: Влияние на активы от покупок и продаж ценных
+            бумаг
+          charges: Новые сборы за день
+          end_balance: Рассчитанный баланс после всех операций
+          end_balance_investment: Рассчитанный баланс после всей активности
+          end_principal: Рассчитанный основной долг после всех операций
+          end_value: Рассчитанная стоимость после всех изменений
+          final_balance: Итоговый баланс счёта за день
+          final_balance_credit: Итоговая задолженность за день
+          final_balance_crypto: Итоговая стоимость криптоактивов за день
+          final_balance_investment: Итоговая стоимость портфеля за день
+          final_principal: Итоговый основной долг за день
+          final_value: Итоговая стоимость активов за день
+          market_changes: Изменения стоимости из-за рыночных колебаний
+          net_cash_flow: Чистое изменение баланса от всех операций за день
+          net_principal_change: Платежи по основному долгу и новые заимствования за
+            день
+          net_value_change: Все изменения стоимости, включая улучшения и амортизацию
+          payments: Платежи по карте за день
+          sells: Продажи криптовалюты в течение дня
+          start_balance: Баланс счёта на начало дня
+          start_balance_credit: Задолженность на начало дня
+          start_balance_crypto: Стоимость криптоактивов на начало дня
+          start_balance_investment: Общая стоимость портфеля на начало дня
+          start_principal: Основной долг на начало дня
+          start_value: Стоимость активов на начало дня
+      chart:
+        no_data_available: Нет данных
+        title:
+          balance: Баланс
+          cash_value: Стоимость наличных
+          debt_balance: Баланс задолженности
+          estimated_property_value: Оценочная стоимость недвижимости
+          estimated_vehicle_value: Оценочная стоимость транспортных средств
+          holdings_value: Стоимость активов
+          remaining_principal_balance: Остаток основного долга
+          total_account_value: Общая стоимость счёта
+        views:
+          cash: Наличные
+          holdings: Активы
+          total_value: Общая стоимость
+        vs_available_history: по сравнению с доступной историей
+    period_picker:
+      aria_label: "Период: %{period}"
+  ds:
+    alert:
+      variants:
+        destructive: Ошибка
+        error: Ошибка
+        info: Информация
+        success: Успех
+        warning: Предупреждение
+    dialog:
+      close: Закрыть
+    link:
+      opens_in_new_tab: "(открывается в новой вкладке)"
+    pill:
+      aria_label: "%{label}"
+      default_label: Предпросмотр
+    popover:
+      avatar_default_label: Открыть меню
+    tooltip:
+      trigger_label: Подробнее
+  provider_sync_summary:
+    accounts:
+      institutions: 'Учреждения: %{count}'
+      linked: 'Связано: %{count}'
+      title: Счета
+      total: 'Всего: %{count}'
+      unlinked: 'Не связано: %{count}'
+    health:
+      data_warnings: 'Предупреждения о данных: %{count}'
+      duplicate_suggestions:
+        few: "%{count} возможных дубликата требуют проверки"
+        many: "%{count} возможных дубликатов требуют проверки"
+        one: "%{count} возможный дубликат требует проверки"
+        other: "%{count} возможных дубликата требуют проверки"
+      errors: 'Ошибки: %{count}'
+      notices: 'Уведомления: %{count}'
+      pending_reconciled:
+        few: "%{count} дублирующиеся ожидающие операции согласованы"
+        many: "%{count} дублирующихся ожидающих операций согласовано"
+        one: "%{count} дублирующаяся ожидающая операция согласована"
+        other: "%{count} дублирующиеся ожидающие операции согласованы"
+      rate_limited: Ограничение скорости %{time_ago}
+      recently: недавно
+      stale_pending:
+        few: "%{count} устаревшие ожидающие операции (исключены из бюджета)"
+        many: "%{count} устаревших ожидающих операций (исключены из бюджета)"
+        one: "%{count} устаревшая ожидающая операция (исключена из бюджета)"
+        other: "%{count} устаревшие ожидающие операции (исключены из бюджета)"
+      stale_pending_count:
+        few: "%{count} операции"
+        many: "%{count} операций"
+        one: "%{count} операция"
+        other: "%{count} операции"
+      stale_unmatched:
+        few: "%{count} ожидающие операции требуют ручной проверки"
+        many: "%{count} ожидающих операций требуют ручной проверки"
+        one: "%{count} ожидающая операция требует ручной проверки"
+        other: "%{count} ожидающие операции требуют ручной проверки"
+      stale_unmatched_count:
+        few: "%{count} операции"
+        many: "%{count} операций"
+        one: "%{count} операция"
+        other: "%{count} операции"
+      title: Состояние
+      view_data_quality: Просмотр качества данных
+      view_duplicate_suggestions: Просмотр предложенных дубликатов
+      view_error_details: Просмотр деталей ошибок
+      view_reconciled: Просмотр согласованных операций
+      view_stale_pending: Просмотр затронутых счетов
+      view_stale_unmatched: Просмотр операций, требующих проверки
+    holdings:
+      found: 'Найдено: %{count}'
+      processed: 'Обработано: %{count}'
+      title: Активы
+    last_sync: 'Последняя синхронизация: %{time_ago} назад'
+    skip_reasons:
+      excluded: Исключено
+      import_locked: Импорт CSV
+      protected: Защищено
+      user_modified: Изменено пользователем
+    title: Сводка синхронизации
+    trades:
+      fetching: Получение данных о сделках от брокера...
+      imported: 'Импортировано: %{count}'
+      skipped: 'Пропущено: %{count}'
+      title: Сделки
+    transactions:
+      fetching: Получение данных от брокера...
+      imported: 'Импортировано: %{count}'
+      protected:
+        few: "%{count} записи защищены (не перезаписаны)"
+        many: "%{count} записей защищено (не перезаписаны)"
+        one: "%{count} запись защищена (не перезаписана)"
+        other: "%{count} записи защищены (не перезаписаны)"
+      seen: 'Просмотрено: %{count}'
+      skipped: 'Пропущено: %{count}'
+      title: Операции
+      updated: 'Обновлено: %{count}'
+      view_protected: Просмотр защищённых записей
diff --git a/config/locales/views/components/tr.yml b/config/locales/views/components/tr.yml
new file mode 100644
index 000000000..d2fed15ba
--- /dev/null
+++ b/config/locales/views/components/tr.yml
@@ -0,0 +1,167 @@
+---
+tr:
+  UI:
+    account:
+      activity_date:
+        balance_tooltip: Tüm işlemler ve düzeltmelerden sonraki gün sonu bakiyesi
+        no_balance_data: Bu tarih için bakiye verisi yok
+      activity_feed:
+        toggle_selection_checkboxes: Seçimi değiştir
+      balance_reconciliation:
+        labels:
+          adjustments: Düzeltmeler
+          buys: Alımlar
+          change_in_brokerage_cash: Aracı kurum nakdindeki değişim
+          change_in_holdings_market: Varlıklardaki değişim (piyasa fiyatı hareketi)
+          change_in_holdings_trades: Varlıklardaki değişim (alım/satım)
+          charges: Harcamalar
+          end_balance: Bitiş bakiyesi
+          end_principal: Bitiş anaparası
+          end_value: Bitiş değeri
+          final_balance: Nihai bakiye
+          final_principal: Nihai anapara
+          final_value: Nihai değer
+          market_changes: Piyasa değişimleri
+          net_cash_flow: Net nakit akışı
+          net_principal_change: Net anapara değişimi
+          net_value_change: Net değer değişimi
+          payments: Ödemeler
+          sells: Satışlar
+          start_balance: Başlangıç bakiyesi
+          start_principal: Başlangıç anaparası
+          start_value: Başlangıç değeri
+        tooltips:
+          adjustments: Manuel uzlaştırmalar veya diğer düzeltmeler
+          adjustments_asset: Manuel değer düzeltmeleri veya değerlemeler
+          buys: Gün içindeki kripto alımları
+          change_in_brokerage_cash: Yatırma, çekme ve işlemlerden kaynaklanan net
+            nakit değişimi
+          change_in_holdings_market: Piyasa fiyatı hareketlerinden kaynaklanan varlık
+            değeri değişimi
+          change_in_holdings_trades: Menkul kıymet alım satımının varlıklar üzerindeki
+            etkisi
+          charges: Gün içinde yapılan yeni harcamalar
+          end_balance: Tüm işlemlerden sonra hesaplanan bakiye
+          end_balance_investment: Tüm hareketlerden sonra hesaplanan bakiye
+          end_principal: Tüm işlemlerden sonra hesaplanan anapara
+          end_value: Tüm değişikliklerden sonra hesaplanan değer
+          final_balance: Günün nihai hesap bakiyesi
+          final_balance_credit: Günün nihai borç bakiyesi
+          final_balance_crypto: Günün nihai kripto varlık değeri
+          final_balance_investment: Günün nihai portföy değeri
+          final_principal: Günün nihai anapara bakiyesi
+          final_value: Günün nihai varlık değeri
+          market_changes: Piyasa fiyatı hareketlerinden kaynaklanan değer değişimleri
+          net_cash_flow: Gün içindeki tüm işlemlerden kaynaklanan net bakiye değişimi
+          net_principal_change: Gün içindeki anapara ödemeleri ve yeni borçlanmalar
+          net_value_change: İyileştirmeler ve amortisman dahil tüm değer değişimleri
+          payments: Gün içinde karta yapılan ödemeler
+          sells: Gün içindeki kripto satışları
+          start_balance: Bu günün başındaki hesap bakiyesi
+          start_balance_credit: Bu günün başındaki borç bakiyesi
+          start_balance_crypto: Bu günün başındaki kripto varlık değeri
+          start_balance_investment: Bu günün başındaki toplam portföy değeri
+          start_principal: Bu günün başındaki anapara bakiyesi
+          start_value: Bu günün başındaki varlık değeri
+      chart:
+        no_data_available: Veri bulunmuyor
+        title:
+          balance: Bakiye
+          cash_value: Nakit değeri
+          debt_balance: Borç bakiyesi
+          estimated_property_value: Tahmini mülk değeri
+          estimated_vehicle_value: Tahmini araç değeri
+          holdings_value: Varlık değeri
+          remaining_principal_balance: Kalan anapara bakiyesi
+          total_account_value: Toplam hesap değeri
+        views:
+          cash: Nakit
+          holdings: Varlıklar
+          total_value: Toplam değer
+        vs_available_history: mevcut geçmişe göre
+    period_picker:
+      aria_label: 'Zaman aralığı: %{period}'
+  ds:
+    alert:
+      variants:
+        destructive: Hata
+        error: Hata
+        info: Bilgi
+        success: Başarılı
+        warning: Uyarı
+    dialog:
+      close: Kapat
+    link:
+      opens_in_new_tab: "(yeni sekmede açılır)"
+    pill:
+      aria_label: "%{label}"
+      default_label: Önizleme
+    popover:
+      avatar_default_label: Menüyü aç
+    tooltip:
+      trigger_label: Daha fazla bilgi
+  provider_sync_summary:
+    accounts:
+      institutions: 'Kurumlar: %{count}'
+      linked: 'Bağlı: %{count}'
+      title: Hesaplar
+      total: 'Toplam: %{count}'
+      unlinked: 'Bağlı değil: %{count}'
+    health:
+      data_warnings: 'Veri uyarıları: %{count}'
+      duplicate_suggestions:
+        one: "%{count} olası yinelenen işlem incelenmeli"
+        other: "%{count} olası yinelenen işlem incelenmeli"
+      errors: 'Hatalar: %{count}'
+      notices: 'Bildirimler: %{count}'
+      pending_reconciled:
+        one: "%{count} yinelenen bekleyen işlem uzlaştırıldı"
+        other: "%{count} yinelenen bekleyen işlem uzlaştırıldı"
+      rate_limited: "%{time_ago} önce hız sınırlamasına takıldı"
+      recently: yakın zamanda
+      stale_pending:
+        one: "%{count} eski bekleyen işlem (bütçelerden hariç tutuldu)"
+        other: "%{count} eski bekleyen işlem (bütçelerden hariç tutuldu)"
+      stale_pending_count:
+        one: "%{count} işlem"
+        other: "%{count} işlem"
+      stale_unmatched:
+        one: "%{count} bekleyen işlem manuel inceleme gerektiriyor"
+        other: "%{count} bekleyen işlem manuel inceleme gerektiriyor"
+      stale_unmatched_count:
+        one: "%{count} işlem"
+        other: "%{count} işlem"
+      title: Sağlık
+      view_data_quality: Veri kalitesi ayrıntılarını görüntüle
+      view_duplicate_suggestions: Önerilen yinelenenleri görüntüle
+      view_error_details: Hata ayrıntılarını görüntüle
+      view_reconciled: Uzlaştırılan işlemleri görüntüle
+      view_stale_pending: Etkilenen hesapları görüntüle
+      view_stale_unmatched: İncelenmesi gereken işlemleri görüntüle
+    holdings:
+      found: 'Bulunan: %{count}'
+      processed: 'İşlenen: %{count}'
+      title: Varlıklar
+    last_sync: 'Son eşitleme: %{time_ago} önce'
+    skip_reasons:
+      excluded: Hariç tutuldu
+      import_locked: CSV içe aktarma
+      protected: Korumalı
+      user_modified: Kullanıcı tarafından değiştirildi
+    title: Eşitleme özeti
+    trades:
+      fetching: Aracı kurumdan işlemler alınıyor...
+      imported: 'İçe aktarılan: %{count}'
+      skipped: 'Atlanan: %{count}'
+      title: Alım Satımlar
+    transactions:
+      fetching: Aracı kurumdan alınıyor...
+      imported: 'İçe aktarılan: %{count}'
+      protected:
+        one: "%{count} kayıt korundu (üzerine yazılmadı)"
+        other: "%{count} kayıt korundu (üzerine yazılmadı)"
+      seen: 'Görülen: %{count}'
+      skipped: 'Atlanan: %{count}'
+      title: İşlemler
+      updated: 'Güncellenen: %{count}'
+      view_protected: Korunan kayıtları görüntüle
diff --git a/config/locales/views/components/zh-CN.yml b/config/locales/views/components/zh-CN.yml
index 4f8f2189b..b92eaf475 100644
--- a/config/locales/views/components/zh-CN.yml
+++ b/config/locales/views/components/zh-CN.yml
@@ -160,3 +160,89 @@ zh-CN:
         data_warnings: "数据警告：%{count}"
         notices: "通知：%{count}"
         view_data_quality: 查看数据质量详情
+    period_picker:
+      aria_label: 时间范围：%{period}
+  ds:
+    alert:
+      variants:
+        info: 信息
+        success: 成功
+        warning: 警告
+        error: 错误
+        destructive: 错误
+    pill:
+      aria_label: "%{label}"
+      default_label: 预览
+    dialog:
+      close: 关闭
+    popover:
+      avatar_default_label: 打开菜单
+    tooltip:
+      trigger_label: 更多信息
+    link:
+      opens_in_new_tab: "（在新标签页打开）"
+  provider_sync_summary:
+    title: 同步摘要
+    last_sync: 上次同步：%{time_ago} 前
+    accounts:
+      title: 账户
+      total: 总计：%{count}
+      linked: 已关联：%{count}
+      unlinked: 未关联：%{count}
+      institutions: 机构：%{count}
+    transactions:
+      title: 交易
+      seen: 已看到：%{count}
+      imported: 已导入：%{count}
+      updated: 已更新：%{count}
+      skipped: 已跳过：%{count}
+      fetching: 正在从券商获取...
+      protected:
+        one: "%{count} 条记录受保护（未覆盖）"
+        other: "%{count} 条记录受保护（未覆盖）"
+      view_protected: 查看受保护记录
+    skip_reasons:
+      excluded: 已排除
+      user_modified: 用户已修改
+      import_locked: CSV 导入
+      protected: 受保护
+    holdings:
+      title: 持仓
+      found: 已找到：%{count}
+      processed: 已处理：%{count}
+    trades:
+      title: 交易
+      imported: 已导入：%{count}
+      skipped: 已跳过：%{count}
+      fetching: 正在从券商获取活动...
+    health:
+      title: 健康状况
+      view_error_details: 查看错误详情
+      rate_limited: "%{time_ago} 前触发限流"
+      recently: 最近
+      errors: 错误：%{count}
+      pending_reconciled:
+        one: 已核对 %{count} 笔重复待处理交易
+        other: 已核对 %{count} 笔重复待处理交易
+      view_reconciled: 查看已核对交易
+      duplicate_suggestions:
+        one: "%{count} 条可能重复记录需要查看"
+        other: "%{count} 条可能重复记录需要查看"
+      view_duplicate_suggestions: 查看建议的重复项
+      stale_pending:
+        one: "%{count} 笔过期待处理交易（已从预算中排除）"
+        other: "%{count} 笔过期待处理交易（已从预算中排除）"
+      view_stale_pending: 查看受影响账户
+      stale_pending_count:
+        one: "%{count} 笔交易"
+        other: "%{count} 笔交易"
+      stale_unmatched:
+        one: "%{count} 笔待处理交易需要手动审核"
+        other: "%{count} 笔待处理交易需要手动审核"
+      view_stale_unmatched: 查看需要审核的交易
+      stale_unmatched_count:
+        one: "%{count} 笔交易"
+        other: "%{count} 笔交易"
+      data_warnings: 数据警告：%{count}
+      notices: 通知：%{count}
+      view_data_quality: 查看数据质量详情
diff --git a/config/locales/views/credit_cards/en.yml b/config/locales/views/credit_cards/en.yml
index ac5871982..486b4ab34 100644
--- a/config/locales/views/credit_cards/en.yml
+++ b/config/locales/views/credit_cards/en.yml
@@ -13,6 +13,12 @@ en:
       expiration_date: Expiration date
       minimum_payment: Minimum payment
       minimum_payment_placeholder: '100'
+      treat_balance_as_available_credit_description: Enable if your bank reports
+        this card's balance as remaining available credit instead of the amount
+        owed. The debt is then derived from the credit limit reported by your
+        bank, or from the Available credit field if your bank does not provide
+        one.
+      treat_balance_as_available_credit_label: Balance is available credit
     new:
       title: Enter credit card details
     overview:
diff --git a/config/locales/views/credit_cards/fr.yml b/config/locales/views/credit_cards/fr.yml
index 106ce0c5a..826bc814e 100644
--- a/config/locales/views/credit_cards/fr.yml
+++ b/config/locales/views/credit_cards/fr.yml
@@ -20,6 +20,7 @@ fr:
       annual_fee: Frais annuels
       apr: TAEG
       available_credit: Crédit disponible
+      edit_account_details: Modifier les détails du compte
       expiration_date: Date d'expiration
       minimum_payment: Paiement minimum
       unknown: Inconnu
diff --git a/config/locales/views/credit_cards/it.yml b/config/locales/views/credit_cards/it.yml
new file mode 100644
index 000000000..dcc0aa323
--- /dev/null
+++ b/config/locales/views/credit_cards/it.yml
@@ -0,0 +1,26 @@
+---
+it:
+  credit_cards:
+    edit:
+      edit: Modifica %{account}
+    form:
+      annual_fee: Quota annuale
+      annual_fee_placeholder: '99'
+      apr: TAEG
+      apr_placeholder: '15.99'
+      available_credit: Credito disponibile
+      available_credit_placeholder: '10000'
+      expiration_date: Data di scadenza
+      minimum_payment: Pagamento minimo
+      minimum_payment_placeholder: '100'
+    new:
+      title: Inserisci i dettagli della carta di credito
+    overview:
+      amount_owed: Importo Dovuto
+      annual_fee: Quota Annuale
+      apr: TAEG
+      available_credit: Credito Disponibile
+      edit_account_details: Modifica dettagli conto
+      expiration_date: Data di Scadenza
+      minimum_payment: Pagamento Minimo
+      unknown: Sconosciuto
diff --git a/config/locales/views/credit_cards/ru.yml b/config/locales/views/credit_cards/ru.yml
new file mode 100644
index 000000000..bb8a8101c
--- /dev/null
+++ b/config/locales/views/credit_cards/ru.yml
@@ -0,0 +1,26 @@
+---
+ru:
+  credit_cards:
+    edit:
+      edit: Изменить %{account}
+    form:
+      annual_fee: Годовая плата
+      annual_fee_placeholder: '99'
+      apr: Годовая процентная ставка (APR)
+      apr_placeholder: '15.99'
+      available_credit: Доступный кредит
+      available_credit_placeholder: '10000'
+      expiration_date: Дата окончания
+      minimum_payment: Минимальный платёж
+      minimum_payment_placeholder: '100'
+    new:
+      title: Введите данные кредитной карты
+    overview:
+      amount_owed: Задолженность
+      annual_fee: Годовая плата
+      apr: Годовая процентная ставка (APR)
+      available_credit: Доступный кредит
+      edit_account_details: Изменить данные счёта
+      expiration_date: Дата окончания
+      minimum_payment: Минимальный платёж
+      unknown: Неизвестно
diff --git a/config/locales/views/credit_cards/tr.yml b/config/locales/views/credit_cards/tr.yml
index 7d1d5795f..38d0fd2b9 100644
--- a/config/locales/views/credit_cards/tr.yml
+++ b/config/locales/views/credit_cards/tr.yml
@@ -20,6 +20,7 @@ tr:
       annual_fee: Yıllık Ücret
       apr: Yıllık Faiz Oranı (APR)
       available_credit: Kullanılabilir Kredi
+      edit_account_details: Hesap ayrıntılarını düzenle
       expiration_date: Son Kullanma Tarihi
       minimum_payment: Asgari Ödeme
-      unknown: Bilinmiyor
\ No newline at end of file
+      unknown: Bilinmiyor
diff --git a/config/locales/views/credit_cards/zh-CN.yml b/config/locales/views/credit_cards/zh-CN.yml
index 493b85034..4e785d97b 100644
--- a/config/locales/views/credit_cards/zh-CN.yml
+++ b/config/locales/views/credit_cards/zh-CN.yml
@@ -23,3 +23,4 @@ zh-CN:
       expiration_date: 到期日期
       minimum_payment: 最低还款额
       unknown: 未知
+      edit_account_details: 编辑账户详情
diff --git a/config/locales/views/cryptos/fr.yml b/config/locales/views/cryptos/fr.yml
index acef7c30a..2191919e1 100644
--- a/config/locales/views/cryptos/fr.yml
+++ b/config/locales/views/cryptos/fr.yml
@@ -5,16 +5,18 @@ fr:
       edit: Éditer %{account}
     form:
       subtype_label: Type de compte
-      subtype_prompt: Sélectionner un type de compte
       subtype_none: Aucun
+      subtype_prompt: Sélectionner un type de compte
+      tax_treatment_hint: La plupart des cryptomonnaies sont détenues dans des comptes
+        imposables. Sélectionnez une autre option si elles sont détenues dans un compte
+        fiscalement avantageux.
       tax_treatment_label: Traitement fiscal
-      tax_treatment_hint: La plupart des cryptomonnaies sont détenues dans des comptes imposables. Sélectionnez une autre option si elles sont détenues dans un compte fiscalement avantageux.
     new:
       title: Saisir le solde du compte
     subtypes:
-      wallet:
-        short: Portefeuille
-        long: Portefeuille crypto
       exchange:
-        short: Plateforme d'échange
         long: Plateforme d'échange crypto
+        short: Plateforme d'échange
+      wallet:
+        long: Portefeuille crypto
+        short: Portefeuille
diff --git a/config/locales/views/cryptos/it.yml b/config/locales/views/cryptos/it.yml
new file mode 100644
index 000000000..8ecce745e
--- /dev/null
+++ b/config/locales/views/cryptos/it.yml
@@ -0,0 +1,20 @@
+---
+it:
+  cryptos:
+    edit:
+      edit: Modifica %{account}
+    form:
+      subtype_label: Tipo di conto
+      subtype_prompt: Seleziona tipo di conto
+      subtype_none: Nessuno
+      tax_treatment_label: Trattamento fiscale
+      tax_treatment_hint: La maggior parte delle criptovalute è detenuta in conti imponibili. Seleziona un'opzione diversa se detenuta in un conto a vantaggio fiscale.
+    new:
+      title: Inserisci il saldo del conto
+    subtypes:
+      wallet:
+        short: Portafoglio
+        long: Portafoglio Crypto
+      exchange:
+        short: Exchange
+        long: Exchange Crypto
diff --git a/config/locales/views/cryptos/ru.yml b/config/locales/views/cryptos/ru.yml
new file mode 100644
index 000000000..f30cc0c22
--- /dev/null
+++ b/config/locales/views/cryptos/ru.yml
@@ -0,0 +1,22 @@
+---
+ru:
+  cryptos:
+    edit:
+      edit: Изменить %{account}
+    form:
+      subtype_label: Тип счёта
+      subtype_none: Нет
+      subtype_prompt: Выберите тип счёта
+      tax_treatment_hint: Большинство криптовалют хранится на облагаемых налогом счетах.
+        Выберите другой вариант, если криптовалюта хранится на счёте с налоговыми
+        льготами.
+      tax_treatment_label: Налогообложение
+    new:
+      title: Введите баланс счёта
+    subtypes:
+      exchange:
+        long: Криптобиржа
+        short: Биржа
+      wallet:
+        long: Криптокошелёк
+        short: Кошелёк
diff --git a/config/locales/views/cryptos/tr.yml b/config/locales/views/cryptos/tr.yml
index 2ad610f39..40d3a86c9 100644
--- a/config/locales/views/cryptos/tr.yml
+++ b/config/locales/views/cryptos/tr.yml
@@ -3,5 +3,19 @@ tr:
   cryptos:
     edit:
       edit: "%{account} hesabını düzenle"
+    form:
+      subtype_label: Hesap türü
+      subtype_none: Yok
+      subtype_prompt: Hesap türünü seçin
+      tax_treatment_hint: Çoğu kripto para vergiye tabi hesaplarda tutulur. Vergi
+        avantajlı bir hesapta tutuluyorsa farklı bir seçenek belirleyin.
+      tax_treatment_label: Vergi Muamelesi
     new:
-      title: Hesap bakiyesini gir
\ No newline at end of file
+      title: Hesap bakiyesini gir
+    subtypes:
+      exchange:
+        long: Kripto Borsası
+        short: Borsa
+      wallet:
+        long: Kripto Cüzdanı
+        short: Cüzdan
diff --git a/config/locales/views/cryptos/zh-CN.yml b/config/locales/views/cryptos/zh-CN.yml
index 4b19e0d1b..298d38c73 100644
--- a/config/locales/views/cryptos/zh-CN.yml
+++ b/config/locales/views/cryptos/zh-CN.yml
@@ -5,3 +5,16 @@ zh-CN:
       edit: 编辑%{account}
     new:
       title: 请输入账户余额
+    form:
+      subtype_label: 账户类型
+      subtype_prompt: 选择账户类型
+      subtype_none: 无
+      tax_treatment_label: 税务处理
+      tax_treatment_hint: 大多数加密资产属于应税账户。若持有在税收优惠账户中，请选择其他选项。
+    subtypes:
+      wallet:
+        short: 钱包
+        long: 加密钱包
+      exchange:
+        short: 交易所
+        long: 加密交易所
diff --git a/config/locales/views/depositories/fr.yml b/config/locales/views/depositories/fr.yml
index 0a3d2eae6..d5a84a114 100644
--- a/config/locales/views/depositories/fr.yml
+++ b/config/locales/views/depositories/fr.yml
@@ -8,3 +8,19 @@ fr:
       subtype_prompt: Sélectionnez le type de compte
     new:
       title: Saisir le solde du compte
+    subtypes:
+      cd:
+        long: Certificat de dépôt
+        short: CD
+      checking:
+        long: Compte courant
+        short: Compte courant
+      hsa:
+        long: Compte d'épargne santé
+        short: HSA
+      money_market:
+        long: Marché monétaire
+        short: MM
+      savings:
+        long: Compte d'épargne
+        short: Compte d'épargne
diff --git a/config/locales/views/depositories/it.yml b/config/locales/views/depositories/it.yml
new file mode 100644
index 000000000..1c7e2b4ce
--- /dev/null
+++ b/config/locales/views/depositories/it.yml
@@ -0,0 +1,26 @@
+---
+it:
+  depositories:
+    edit:
+      edit: Modifica %{account}
+    form:
+      none: Nessuno
+      subtype_prompt: Seleziona tipo di conto
+    new:
+      title: Inserisci il saldo del conto
+    subtypes:
+      cd:
+        long: Certificato di Deposito
+        short: CD
+      checking:
+        long: Conto Corrente
+        short: Corrente
+      hsa:
+        long: Conto Risparmio Sanitario
+        short: HSA
+      money_market:
+        long: Mercato Monetario
+        short: MM
+      savings:
+        long: Conto Risparmio
+        short: Risparmio
diff --git a/config/locales/views/depositories/ru.yml b/config/locales/views/depositories/ru.yml
new file mode 100644
index 000000000..03b3adcd2
--- /dev/null
+++ b/config/locales/views/depositories/ru.yml
@@ -0,0 +1,26 @@
+---
+ru:
+  depositories:
+    edit:
+      edit: Изменить %{account}
+    form:
+      none: Нет
+      subtype_prompt: Выберите тип счёта
+    new:
+      title: Введите баланс счёта
+    subtypes:
+      cd:
+        long: Срочный вклад
+        short: Срочный
+      checking:
+        long: Расчётный счёт
+        short: Расчётный
+      hsa:
+        long: Медицинский сберегательный счёт
+        short: Медицинский
+      money_market:
+        long: Накопительный счёт
+        short: Накопительный
+      savings:
+        long: Сберегательный счёт
+        short: Сберегательный
diff --git a/config/locales/views/depositories/tr.yml b/config/locales/views/depositories/tr.yml
index 27483f8dc..ef54539a8 100644
--- a/config/locales/views/depositories/tr.yml
+++ b/config/locales/views/depositories/tr.yml
@@ -7,4 +7,20 @@ tr:
       none: Hiçbiri
       subtype_prompt: Hesap türünü seçin
     new:
-      title: Hesap bakiyesini girin
\ No newline at end of file
+      title: Hesap bakiyesini girin
+    subtypes:
+      cd:
+        long: Mevduat Sertifikası
+        short: CD
+      checking:
+        long: Vadesiz Hesap
+        short: Vadesiz Hesap
+      hsa:
+        long: Sağlık Tasarruf Hesabı
+        short: HSA
+      money_market:
+        long: Para Piyasası
+        short: Para Piyasası
+      savings:
+        long: Tasarruf Hesabı
+        short: Tasarruf Hesabı
diff --git a/config/locales/views/depositories/zh-CN.yml b/config/locales/views/depositories/zh-CN.yml
index bf317fa93..4deeccb8d 100644
--- a/config/locales/views/depositories/zh-CN.yml
+++ b/config/locales/views/depositories/zh-CN.yml
@@ -8,3 +8,19 @@ zh-CN:
       subtype_prompt: 选择账户类型
     new:
       title: 请输入账户余额
+    subtypes:
+      cd:
+        long: 定期存单
+        short: 定期存单
+      checking:
+        long: 支票账户
+        short: 支票账户
+      hsa:
+        long: 健康储蓄账户
+        short: HSA
+      money_market:
+        long: 货币市场
+        short: 货币市场
+      savings:
+        long: 储蓄账户
+        short: 储蓄账户
diff --git a/config/locales/views/email_confirmation_mailer/fr.yml b/config/locales/views/email_confirmation_mailer/fr.yml
index d32cc9b99..54bbab831 100644
--- a/config/locales/views/email_confirmation_mailer/fr.yml
+++ b/config/locales/views/email_confirmation_mailer/fr.yml
@@ -2,8 +2,9 @@
 fr:
   email_confirmation_mailer:
     confirmation_email:
-      body: Vous avez récemment demandé à modifier votre adresse e-mail. Cliquez sur le bouton ci-dessous pour confirmer cette modification.
+      body: Vous avez récemment demandé à modifier votre adresse e-mail. Cliquez sur
+        le bouton ci-dessous pour confirmer cette modification.
       cta: Confirmer la modification de l'e-mail
       expiry_notice: Ce lien expirera dans %{hours} heures.
       greeting: Bonjour !
-      subject: '%{product_name} : Confirmez le changement de votre adresse mail'
+      subject: "%{product_name} : Confirmez le changement de votre adresse mail"
diff --git a/config/locales/views/email_confirmation_mailer/it.yml b/config/locales/views/email_confirmation_mailer/it.yml
new file mode 100644
index 000000000..8b678014e
--- /dev/null
+++ b/config/locales/views/email_confirmation_mailer/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  email_confirmation_mailer:
+    confirmation_email:
+      body: Hai recentemente richiesto di cambiare il tuo indirizzo email. Clicca il pulsante qui sotto per confermare questa modifica.
+      cta: Conferma cambio email
+      expiry_notice: Questo link scadrà tra %{hours} ore.
+      greeting: Ciao!
+      subject: '%{product_name}: Conferma il cambio email'
diff --git a/config/locales/views/email_confirmation_mailer/ru.yml b/config/locales/views/email_confirmation_mailer/ru.yml
new file mode 100644
index 000000000..45ca07f56
--- /dev/null
+++ b/config/locales/views/email_confirmation_mailer/ru.yml
@@ -0,0 +1,10 @@
+---
+ru:
+  email_confirmation_mailer:
+    confirmation_email:
+      body: Вы недавно запросили изменение адреса электронной почты. Нажмите кнопку
+        ниже, чтобы подтвердить это изменение.
+      cta: Подтвердить изменение почты
+      expiry_notice: Эта ссылка истечет через %{hours} часов.
+      greeting: Здравствуйте!
+      subject: "%{product_name}: Подтвердите изменение почты"
diff --git a/config/locales/views/email_confirmation_mailer/tr.yml b/config/locales/views/email_confirmation_mailer/tr.yml
index 07b801ab5..e435c7762 100644
--- a/config/locales/views/email_confirmation_mailer/tr.yml
+++ b/config/locales/views/email_confirmation_mailer/tr.yml
@@ -2,8 +2,9 @@
 tr:
   email_confirmation_mailer:
     confirmation_email:
-      body: Yakın zamanda e-posta adresinizi değiştirmek için bir talepte bulundunuz. Bu değişikliği onaylamak için aşağıdaki butona tıklayın.
+      body: Yakın zamanda e-posta adresinizi değiştirmek için bir talepte bulundunuz.
+        Bu değişikliği onaylamak için aşağıdaki butona tıklayın.
       cta: E-posta değişikliğini onayla
       expiry_notice: Bu bağlantı %{hours} saat içinde geçerliliğini yitirecek.
       greeting: Merhaba!
-      subject: '%{product_name}: E-posta değişikliğinizi onaylayın'
+      subject: "%{product_name}: E-posta değişikliğinizi onaylayın"
diff --git a/config/locales/views/enable_banking_items/ca.yml b/config/locales/views/enable_banking_items/ca.yml
index 432240782..f05a0386f 100644
--- a/config/locales/views/enable_banking_items/ca.yml
+++ b/config/locales/views/enable_banking_items/ca.yml
@@ -4,8 +4,6 @@ ca:
     authorize:
       authorization_failed: 'No s''ha pogut iniciar l''autorització: %{message}'
       bank_required: Selecciona un banc.
-      decoupled_not_supported: Aquest banc utilitza un mètode d'autenticació amb dispositiu
-        separat que encara no està admès. Afegeix aquest compte manualment.
       invalid_redirect: L'URL d'autorització rebuda no és vàlida. Torna-ho a provar.
       redirect_uri_not_allowed: Redirecció no permesa. Configura `%{callback_url}`
         a la configuració de la teva aplicació Enable Banking.
diff --git a/config/locales/views/enable_banking_items/en.yml b/config/locales/views/enable_banking_items/en.yml
index ab6061433..b3eb1f15f 100644
--- a/config/locales/views/enable_banking_items/en.yml
+++ b/config/locales/views/enable_banking_items/en.yml
@@ -9,7 +9,6 @@ en:
     authorize:
       authorization_failed: "Failed to initiate authorization: %{message}"
       bank_required: Please select a bank.
-      decoupled_not_supported: This bank uses a separate device authentication method which is not yet supported. Please add this account manually.
       invalid_redirect: The authorization URL received is invalid. Please try again.
       redirect_uri_not_allowed: Redirect not allowed. Please configure `%{callback_url}` in your Enable Banking app settings.
       unexpected_error: An unexpected error occurred. Please try again.
diff --git a/config/locales/views/enable_banking_items/fr.yml b/config/locales/views/enable_banking_items/fr.yml
index 1c6684aac..82d7fa5d0 100644
--- a/config/locales/views/enable_banking_items/fr.yml
+++ b/config/locales/views/enable_banking_items/fr.yml
@@ -1,17 +1,13 @@
 ---
 fr:
   enable_banking_items:
-    errors:
-      api_error: "Erreur de communication avec la banque."
-      network_unreachable: "Le service bancaire est temporairement injoignable. Veuillez réessayer plus tard."
-      session_invalid: "Session expirée. Veuillez reconnecter votre banque."
-      unexpected: "Une erreur inattendue est survenue lors de la synchronisation."
     authorize:
       authorization_failed: Échec de l'initiation de l'autorisation
       bank_required: Veuillez sélectionner une banque.
-      decoupled_not_supported: Cette banque utilise une méthode d'authentification sur un appareil séparé qui n'est pas encore prise en charge. Veuillez ajouter ce compte manuellement.
       invalid_redirect: L'URL d'autorisation reçue est invalide. Veuillez réessayer.
-      redirect_uri_not_allowed: Redirection non autorisée. Veuillez configurer `%{callback_url}` dans les paramètres de votre application Enable Banking.
+      redirect_uri_not_allowed:
+        Redirection non autorisée. Veuillez configurer `%{callback_url}`
+        dans les paramètres de votre application Enable Banking.
       unexpected_error: Une erreur inattendue s'est produite. Veuillez réessayer.
     callback:
       authorization_error: Échec de l'autorisation
@@ -21,26 +17,78 @@ fr:
       success: Connexion réussie à votre banque. Vos comptes sont en cours de synchronisation.
       unexpected_error: Une erreur inattendue s'est produite. Veuillez réessayer.
     complete_account_setup:
-      all_skipped: Tous les comptes ont été ignorés. Vous pouvez les configurer plus tard sur la page des comptes.
+      all_skipped:
+        Tous les comptes ont été ignorés. Vous pouvez les configurer plus
+        tard sur la page des comptes.
       no_accounts: Aucun compte disponible à configurer.
       success: "%{count} compte(s) créé(s) avec succès !"
     create:
       success: Configuration d'Enable Banking réussie.
     destroy:
       success: La connexion Enable Banking a été mise en file d'attente pour suppression.
+    enable_banking_item:
+      delete: Supprimer
+      deletion_in_progress: Suppression en cours
+      last_synced: Dernière synchronisation il y a %{time}
+      never_synced: Jamais synchronisé
+      no_accounts_found: Aucun compte trouvé
+      no_accounts_found_description:
+        Aucun compte n'a été trouvé à partir d'Enable
+        Banking. Essayez à nouveau de synchroniser.
+      provider_name: Enable Banking
+      reconnect: Reconnecter
+      set_up_accounts: Configurer des comptes
+      setup_needed: Configuration nécessaire
+      setup_needed_description:
+        one: 1 compte importé depuis Enable Banking doit être configuré
+        other: "%{count} comptes importés depuis Enable Banking doivent être configurés"
+      syncing: Synchronisation...
+      update: Mise à jour
+    errors:
+      api_error: Erreur de communication avec la banque.
+      network_unreachable:
+        Le service bancaire est temporairement injoignable. Veuillez
+        réessayer plus tard.
+      session_invalid: Session expirée. Veuillez reconnecter votre banque.
+      unexpected: Une erreur inattendue est survenue lors de la synchronisation.
     link_accounts:
       already_linked: Les comptes sélectionnés sont déjà liés.
       link_failed: Échec de la liaison des comptes
       no_accounts_selected: Aucun compte sélectionné.
-      no_session: Aucune connexion Enable Banking active. Veuillez d'abord vous connecter à une banque.
+      no_session:
+        Aucune connexion Enable Banking active. Veuillez d'abord vous connecter
+        à une banque.
       success: "%{count} compte(s) lié(s) avec succès."
     link_existing_account:
-      success: Compte lié avec succès à Enable Banking
       errors:
-        only_manual: Seuls les comptes manuels peuvent être liés
         invalid_enable_banking_account: Compte Enable Banking sélectionné invalide
+        only_manual: Seuls les comptes manuels peuvent être liés
+      success: Compte lié avec succès à Enable Banking
     new:
+      add_connection: Ajouter une connexion
+      configured: Configuré
+      connect_bank: Connecter la banque
+      connected_bank: Banque connectée
+      connection: Connexion
+      go_to_provider_settings: Accédez aux paramètres du fournisseur
       link_enable_banking_title: Lier Enable Banking
+      not_configured: Connexion Enable Banking non configurée
+      not_configured_description:
+        Avant de pouvoir associer des comptes Enable Banking,
+        vous devez configurer votre connexion Enable Banking.
+      ready_to_connect: Prêt à connecter une banque
+      reconnect: Reconnecter
+      remove: Supprimer
+      remove_confirm: Êtes-vous sûr de vouloir supprimer cette connexion ?
+      session_expired: Session expirée - réautorisation requise
+      session_expires: La session expire
+      setup_step_1_html: Accédez à <strong>Paramètres → Fournisseurs</strong>.
+      setup_step_2_html: Recherchez la section <strong>Enable Banking</strong>.
+      setup_step_3: Entrez vos identifiants Enable Banking
+      setup_step_4: Revenez ici pour lier vos comptes
+      setup_steps_title: "Étapes de configuration :"
+      sync: Synchroniser
+      unknown: Inconnu
     reauthorize:
       invalid_redirect: L'URL d'autorisation reçue est invalide. Veuillez réessayer.
       reauthorization_failed: Échec de la réautorisation
@@ -51,11 +99,42 @@ fr:
       credentials_required: Veuillez d'abord configurer vos identifiants Enable Banking.
       description: Sélectionnez la banque que vous souhaitez connecter à vos comptes.
       no_banks: Aucune banque disponible pour ce pays/région.
-      no_search_results: "Aucun établissement ne correspond à votre recherche."
+      no_search_results: Aucun établissement ne correspond à votre recherche.
+      search_label: Rechercher votre banque
       search_placeholder: Recherchez votre banque...
-      search_label: "Rechercher votre banque"
       title: Sélectionnez votre banque
+    select_existing_account:
+      all_linked: Tous les comptes Enable Banking semblent déjà liés.
+      balance: Solde
+      cancel: Annuler
+      link: Lier
+      title: Lier le compte Enable Banking
+      try_after_sync:
+        Si vous venez de vous connecter ou de synchroniser, réessayez
+        une fois la synchronisation terminée.
+      unlink_to_move:
+        Pour associer un autre compte, dissociez-le d'abord à partir
+        du menu d'actions du compte.
     setup_accounts:
-      psd2_savings_notice: "Remarque : Certains comptes d'épargne réglementés français (Livret A, PEL, LEP, LDDS) peuvent avoir un accès limité ou inexistant via l'Open Banking (DSP2). Si un compte d'épargne est manquant, vous pouvez l'ajouter manuellement."
+      account_type_label: "Type de compte :"
+      balance: Solde
+      cancel: Annuler
+      choose_account_type:
+        "Choisissez le type de compte correct pour chaque compte
+        Enable Banking :"
+      create_accounts: Créer des comptes
+      creating_accounts: Création de comptes...
+      header_subtitle: Choisissez les types de comptes corrects pour vos comptes importés
+      historical_data_range: "Plage de données historiques :"
+      psd2_savings_notice:
+        "Remarque : Certains comptes d'épargne réglementés français
+        (Livret A, PEL, LEP, LDDS) peuvent avoir un accès limité ou inexistant via
+        l'Open Banking (DSP2). Si un compte d'épargne est manquant, vous pouvez
+        l'ajouter manuellement."
+      sync_start_date_help:
+        Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions. Maximum 2 ans d'historique disponible.
+      sync_start_date_label: "Commencez à synchroniser les transactions à partir de :"
+      title: Configurer vos comptes Enable Banking
     update:
       success: Configuration d'Enable Banking mise à jour.
diff --git a/config/locales/views/enable_banking_items/hu.yml b/config/locales/views/enable_banking_items/hu.yml
index 79a3282f0..634c44f3c 100644
--- a/config/locales/views/enable_banking_items/hu.yml
+++ b/config/locales/views/enable_banking_items/hu.yml
@@ -9,7 +9,6 @@ hu:
     authorize:
       authorization_failed: "Nem sikerült elindítani az engedélyezést: %{message}"
       bank_required: Kérjük, válassz bankot.
-      decoupled_not_supported: Ez a bank egy különálló eszközös hitelesítési módszert használ, amely jelenleg nem támogatott. Kérjük, add hozzá ezt a számlát manuálisan.
       invalid_redirect: A kapott engedélyezési URL érvénytelen. Kérjük, próbáld újra.
       redirect_uri_not_allowed: Az átirányítás nem engedélyezett. Kérjük, konfiguráld a `%{callback_url}` címet az Enable Banking alkalmazás beállításaiban.
       unexpected_error: Váratlan hiba történt. Kérjük, próbáld újra.
diff --git a/config/locales/views/enable_banking_items/it.yml b/config/locales/views/enable_banking_items/it.yml
new file mode 100644
index 000000000..42b5bb9e4
--- /dev/null
+++ b/config/locales/views/enable_banking_items/it.yml
@@ -0,0 +1,115 @@
+---
+it:
+  enable_banking_items:
+    errors:
+      api_error: "Si è verificato un errore di comunicazione con la banca."
+      network_unreachable: "Il servizio bancario è temporaneamente irraggiungibile. Riprova più tardi."
+      session_invalid: "Sessione scaduta. Riconnetti la tua banca."
+      unexpected: "Si è verificato un errore imprevisto durante la sincronizzazione."
+    authorize:
+      authorization_failed: "Impossibile avviare l'autorizzazione: %{message}"
+      bank_required: Seleziona una banca.
+      invalid_redirect: L'URL di autorizzazione ricevuto non è valido. Riprova.
+      redirect_uri_not_allowed: Reindirizzamento non consentito. Configura `%{callback_url}` nelle impostazioni dell'app Enable Banking.
+      unexpected_error: Si è verificato un errore imprevisto. Riprova.
+    callback:
+      authorization_error: Autorizzazione fallita
+      invalid_callback: Parametri di callback non validi.
+      item_not_found: Connessione non trovata.
+      session_failed: Impossibile completare l'autorizzazione
+      success: Connessione alla banca riuscita. I tuoi conti vengono sincronizzati.
+      unexpected_error: Si è verificato un errore imprevisto. Riprova.
+    complete_account_setup:
+      all_skipped: Tutti i conti sono stati saltati. Puoi configurarli in seguito nella pagina dei conti.
+      no_accounts: Nessun conto disponibile da configurare.
+      success: Creati con successo %{count} conti!
+    create:
+      success: Configurazione Enable Banking riuscita.
+    destroy:
+      success: La connessione Enable Banking è stata messa in coda per l'eliminazione.
+    link_accounts:
+      already_linked: I conti selezionati sono già collegati.
+      link_failed: Collegamento conti fallito
+      no_accounts_selected: Nessun conto selezionato.
+      no_session: Nessuna connessione Enable Banking attiva. Connettiti prima a una banca.
+      success: Collegati con successo %{count} conti.
+    link_existing_account:
+      success: Conto collegato con successo a Enable Banking
+      errors:
+        only_manual: Solo i conti manuali possono essere collegati
+        invalid_enable_banking_account: Conto Enable Banking selezionato non valido
+    enable_banking_item:
+      deletion_in_progress: Eliminazione in corso
+      provider_name: Enable Banking
+      syncing: Sincronizzazione in corso...
+      reconnect: Riconnetti
+      last_synced: Ultima sincronizzazione %{time} fa
+      never_synced: Mai sincronizzato
+      update: Aggiorna
+      delete: Elimina
+      setup_needed: Configurazione necessaria
+      setup_needed_description:
+        one: 1 conto importato da Enable Banking deve essere configurato
+        other: "%{count} conti importati da Enable Banking devono essere configurati"
+      set_up_accounts: Configura conti
+      no_accounts_found: Nessun conto trovato
+      no_accounts_found_description: Nessun conto trovato da Enable Banking. Prova a sincronizzare di nuovo.
+    select_existing_account:
+      title: Collega conto Enable Banking
+      all_linked: Tutti i conti Enable Banking sembrano già collegati.
+      try_after_sync: Se hai appena connesso o sincronizzato, riprova dopo il completamento della sincronizzazione.
+      unlink_to_move: Per collegare un conto diverso, prima scollegalo dal menu azioni del conto.
+      balance: Saldo
+      link: Collega
+      cancel: Annulla
+    setup_accounts:
+      title: Configura i tuoi conti Enable Banking
+      header_subtitle: Scegli i tipi di conto corretti per i conti importati
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto Enable Banking:"
+      historical_data_range: "Intervallo dati storici:"
+      sync_start_date_label: "Inizia la sincronizzazione delle transazioni dal:"
+      sync_start_date_help: Seleziona quanto indietro vuoi sincronizzare la cronologia delle transazioni. Massimo 2 anni di cronologia disponibile.
+      account_type_label: "Tipo di conto:"
+      balance: Saldo
+      create_accounts: Crea conti
+      creating_accounts: Creazione conti in corso...
+      cancel: Annulla
+    new:
+      link_enable_banking_title: Collega Enable Banking
+      session_expired: Sessione scaduta - è necessaria la riautorizzazione
+      connected_bank: Banca connessa
+      session_expires: "Sessione scade"
+      unknown: Sconosciuto
+      connection: Connessione
+      configured: Configurato
+      ready_to_connect: Pronto per connettere una banca
+      sync: Sincronizza
+      reconnect: Riconnetti
+      connect_bank: Connetti banca
+      remove_confirm: Sei sicuro di voler rimuovere questa connessione?
+      remove: Rimuovi
+      add_connection: Aggiungi connessione
+      not_configured: Connessione Enable Banking non configurata
+      not_configured_description: Prima di poter collegare i conti Enable Banking, devi configurare la tua connessione Enable Banking.
+      setup_steps_title: "Passi di configurazione:"
+      setup_step_1_html: "Vai su <strong>Impostazioni → Provider</strong>"
+      setup_step_2_html: "Trova la sezione <strong>Enable Banking</strong>"
+      setup_step_3: Inserisci le tue credenziali Enable Banking
+      setup_step_4: Torna qui per collegare i tuoi conti
+      go_to_provider_settings: Vai alle Impostazioni provider
+    reauthorize:
+      invalid_redirect: L'URL di autorizzazione ricevuto non è valido. Riprova.
+      reauthorization_failed: Riautorizzazione fallita
+    select_bank:
+      beta_label: Beta
+      cancel: Annulla
+      check_country: Controlla le impostazioni del tuo codice paese.
+      credentials_required: Configura prima le tue credenziali Enable Banking.
+      description: Seleziona la banca che vuoi connettere ai tuoi conti.
+      no_banks: Nessuna banca disponibile per questo paese/regione.
+      no_search_results: Nessuna banca corrisponde alla ricerca.
+      search_label: Cerca la tua banca
+      search_placeholder: Cerca la tua banca...
+      title: Seleziona la tua banca
+    update:
+      success: Configurazione Enable Banking aggiornata.
diff --git a/config/locales/views/enable_banking_items/ru.yml b/config/locales/views/enable_banking_items/ru.yml
new file mode 100644
index 000000000..ad9950b53
--- /dev/null
+++ b/config/locales/views/enable_banking_items/ru.yml
@@ -0,0 +1,134 @@
+---
+ru:
+  enable_banking_items:
+    authorize:
+      authorization_failed: 'Не удалось инициировать авторизацию: %{message}'
+      bank_required: Пожалуйста, выберите банк.
+      decoupled_not_supported: Этот банк использует метод аутентификации на отдельном
+        устройстве, который пока не поддерживается. Пожалуйста, добавьте этот счёт
+        вручную.
+      invalid_redirect: Полученный URL для авторизации недействителен. Пожалуйста,
+        попробуйте снова.
+      redirect_uri_not_allowed: Перенаправление не разрешено. Пожалуйста, настройте
+        `%{callback_url}` в настройках вашего приложения Enable Banking.
+      unexpected_error: Произошла непредвиденная ошибка. Пожалуйста, попробуйте снова.
+    callback:
+      authorization_error: Авторизация не удалась
+      invalid_callback: Недействительные параметры обратного вызова.
+      item_not_found: Подключение не найдено.
+      session_failed: Не удалось завершить авторизацию
+      success: Успешно подключено к вашему банку. Ваши счета синхронизируются.
+      unexpected_error: Произошла непредвиденная ошибка. Пожалуйста, попробуйте снова.
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Вы можете настроить их позже на странице
+        счетов.
+      no_accounts: Нет доступных счетов для настройки.
+      success: Успешно создано %{count} счетов!
+    create:
+      success: Конфигурация Enable Banking успешно выполнена.
+    destroy:
+      success: Подключение Enable Banking поставлено в очередь на удаление.
+    enable_banking_item:
+      delete: Удалить
+      deletion_in_progress: Удаление в процессе
+      last_synced: Последняя синхронизация %{time} назад
+      never_synced: Никогда не синхронизировалось
+      no_accounts_found: Счета не найдены
+      no_accounts_found_description: Счета из Enable Banking не найдены. Попробуйте
+        синхронизировать снова.
+      provider_name: Enable Banking
+      reconnect: Переподключить
+      set_up_accounts: Настроить счета
+      setup_needed: Требуется настройка
+      setup_needed_description:
+        few: "%{count} счёта, импортированные из Enable Banking, требуют настройки"
+        many: "%{count} счетов, импортированных из Enable Banking, требуют настройки"
+        one: "%{count} счёт, импортированный из Enable Banking, требует настройки"
+        other: "%{count} счёта, импортированные из Enable Banking, требуют настройки"
+      syncing: Синхронизация...
+      update: Обновить
+    errors:
+      api_error: Произошла ошибка связи с банком.
+      network_unreachable: Сервис банков временно недоступен. Пожалуйста, попробуйте
+        позже.
+      session_invalid: Сессия истекла. Пожалуйста, переподключите ваш банк.
+      unexpected: Произошла непредвиденная ошибка во время синхронизации.
+    link_accounts:
+      already_linked: Выбранные счета уже связаны.
+      link_failed: Не удалось связать счета
+      no_accounts_selected: Счета не выбраны.
+      no_session: Нет активного подключения Enable Banking. Пожалуйста, сначала подключитесь
+        к банку.
+      success: Успешно связаны %{count} счетов.
+    link_existing_account:
+      errors:
+        invalid_enable_banking_account: Выбран недействительный счёт Enable Banking
+        only_manual: Можно связать только вручную добавленные счета
+      success: Счёт успешно связан с Enable Banking
+    new:
+      add_connection: Добавить подключение
+      configured: Настроено
+      connect_bank: Подключить банк
+      connected_bank: Подключённый банк
+      connection: Подключение
+      go_to_provider_settings: Перейти в настройки провайдера
+      link_enable_banking_title: Связать Enable Banking
+      not_configured: Подключение Enable Banking не настроено
+      not_configured_description: Прежде чем вы сможете связать счета Enable Banking,
+        вам нужно настроить подключение Enable Banking.
+      ready_to_connect: Готово к подключению банка
+      reconnect: Переподключить
+      remove: Удалить
+      remove_confirm: Вы уверены, что хотите удалить это подключение?
+      session_expired: Сессия истекла - требуется повторная авторизация
+      session_expires: Сессия истекает
+      setup_step_1_html: Перейдите в <strong>Настройки → Провайдеры</strong>
+      setup_step_2_html: Найдите раздел <strong>Enable Banking</strong>
+      setup_step_3: Введите ваши учетные данные Enable Banking
+      setup_step_4: Вернитесь сюда, чтобы связать ваши счета
+      setup_steps_title: 'Шаги настройки:'
+      sync: Синхронизировать
+      unknown: Неизвестно
+    reauthorize:
+      invalid_redirect: Полученный URL для авторизации недействителен. Пожалуйста,
+        попробуйте снова.
+      reauthorization_failed: Повторная авторизация не удалась
+    select_bank:
+      beta_label: Бета
+      cancel: Отмена
+      check_country: Пожалуйста, проверьте настройки кода вашей страны.
+      credentials_required: Пожалуйста, сначала настройте ваши учетные данные Enable
+        Banking.
+      description: Выберите банк, который вы хотите подключить к вашим счетам.
+      no_banks: Нет доступных банков для этой страны/региона.
+      no_search_results: Банки, соответствующие вашему запросу, не найдены.
+      search_label: Найдите ваш банк
+      search_placeholder: Найдите ваш банк...
+      title: Выберите ваш банк
+    select_existing_account:
+      all_linked: Все счета Enable Banking, похоже, уже связаны.
+      balance: Баланс
+      cancel: Отмена
+      link: Связать
+      title: Связать счёт Enable Banking
+      try_after_sync: Если вы только что подключились или синхронизировались, попробуйте
+        снова после завершения синхронизации.
+      unlink_to_move: Чтобы связать другой счёт, сначала отвяжите его в меню действий
+        счёта.
+    setup_accounts:
+      account_type_label: 'Тип счёта:'
+      balance: Баланс
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип счёта для каждого счёта Enable
+        Banking:'
+      create_accounts: Создать счета
+      creating_accounts: Создание счетов...
+      header_subtitle: Выберите правильные типы счетов для ваших импортированных счетов
+      historical_data_range: 'Диапазон исторических данных:'
+      psd2_savings_notice: Уведомление о сберегательных счетах Psd2
+      sync_start_date_help: Выберите, насколько далеко назад вы хотите синхронизировать
+        историю операций. Максимум доступно 2 года истории.
+      sync_start_date_label: 'Начать синхронизацию операций с:'
+      title: Настройте ваши счета Enable Banking
+    update:
+      success: Конфигурация Enable Banking обновлена.
diff --git a/config/locales/views/enable_banking_items/tr.yml b/config/locales/views/enable_banking_items/tr.yml
new file mode 100644
index 000000000..ab06fba8b
--- /dev/null
+++ b/config/locales/views/enable_banking_items/tr.yml
@@ -0,0 +1,124 @@
+---
+tr:
+  enable_banking_items:
+    authorize:
+      authorization_failed: 'Yetkilendirme başlatılamadı: %{message}'
+      bank_required: Lütfen bir banka seçin.
+      invalid_redirect: Alınan yetkilendirme URL'si geçersiz. Lütfen tekrar deneyin.
+      redirect_uri_not_allowed: Yönlendirmeye izin verilmiyor. Lütfen Enable Banking
+        uygulama ayarlarınızda `%{callback_url}` adresini yapılandırın.
+      unexpected_error: Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.
+    callback:
+      authorization_error: Yetkilendirme başarısız oldu
+      invalid_callback: Geçersiz geri çağırma parametreleri.
+      item_not_found: Bağlantı bulunamadı.
+      session_failed: Yetkilendirme tamamlanamadı
+      success: Bankanızla başarıyla bağlantı kuruldu. Hesaplarınız eşitleniyor.
+      unexpected_error: Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Bunları daha sonra hesaplar sayfasından kurabilirsiniz.
+      no_accounts: Kurulacak hesap bulunmuyor.
+      success: "%{count} hesap başarıyla oluşturuldu!"
+    create:
+      success: Enable Banking yapılandırması başarılı.
+    destroy:
+      success: Enable Banking bağlantısı silinmek üzere kuyruğa alındı.
+    enable_banking_item:
+      delete: Sil
+      deletion_in_progress: Silme işlemi devam ediyor
+      last_synced: Son eşitleme %{time} önce
+      never_synced: Hiç eşitlenmedi
+      no_accounts_found: Hesap bulunamadı
+      no_accounts_found_description: Enable Banking'den hesap bulunamadı. Tekrar eşitlemeyi
+        deneyin.
+      provider_name: Enable Banking
+      reconnect: Yeniden bağlan
+      set_up_accounts: Hesapları kur
+      setup_needed: Kurulum gerekli
+      setup_needed_description:
+        one: Enable Banking'den içe aktarılan 1 hesabın kurulumu yapılmalı
+        other: Enable Banking'den içe aktarılan %{count} hesabın kurulumu yapılmalı
+      syncing: Eşitleniyor...
+      update: Güncelle
+    errors:
+      api_error: Bankayla iletişim hatası oluştu.
+      network_unreachable: Bankacılık hizmetine geçici olarak ulaşılamıyor. Lütfen
+        daha sonra tekrar deneyin.
+      session_invalid: Oturum süresi doldu. Lütfen bankanızla yeniden bağlantı kurun.
+      unexpected: Eşitleme sırasında beklenmeyen bir hata oluştu.
+    link_accounts:
+      already_linked: Seçilen hesaplar zaten bağlı.
+      link_failed: Hesaplar bağlanamadı
+      no_accounts_selected: Hesap seçilmedi.
+      no_session: Aktif bir Enable Banking bağlantısı yok. Lütfen önce bir bankaya
+        bağlanın.
+      success: "%{count} hesap başarıyla bağlandı."
+    link_existing_account:
+      errors:
+        invalid_enable_banking_account: Geçersiz Enable Banking hesabı seçildi
+        only_manual: Yalnızca manuel hesaplar bağlanabilir
+      success: Hesap Enable Banking'e başarıyla bağlandı
+    new:
+      add_connection: Bağlantı Ekle
+      configured: Yapılandırıldı
+      connect_bank: Banka Bağla
+      connected_bank: Bağlı Banka
+      connection: Bağlantı
+      go_to_provider_settings: Sağlayıcı Ayarlarına Git
+      link_enable_banking_title: Enable Banking Bağla
+      not_configured: Enable Banking bağlantısı yapılandırılmadı
+      not_configured_description: Enable Banking hesaplarını bağlayabilmeniz için
+        önce Enable Banking bağlantınızı yapılandırmanız gerekir.
+      ready_to_connect: Bir bankaya bağlanmaya hazır
+      reconnect: Yeniden bağlan
+      remove: Kaldır
+      remove_confirm: Bu bağlantıyı kaldırmak istediğinizden emin misiniz?
+      session_expired: Oturum süresi doldu - yeniden yetkilendirme gerekli
+      session_expires: Oturum sona eriyor
+      setup_step_1_html: "<strong>Ayarlar → Sağlayıcılar</strong> bölümüne gidin"
+      setup_step_2_html: "<strong>Enable Banking</strong> bölümünü bulun"
+      setup_step_3: Enable Banking kimlik bilgilerinizi girin
+      setup_step_4: Hesaplarınızı bağlamak için buraya dönün
+      setup_steps_title: 'Kurulum Adımları:'
+      sync: Eşitle
+      unknown: Bilinmiyor
+    reauthorize:
+      invalid_redirect: Alınan yetkilendirme URL'si geçersiz. Lütfen tekrar deneyin.
+      reauthorization_failed: Yeniden yetkilendirme başarısız oldu
+    select_bank:
+      beta_label: Beta
+      cancel: İptal
+      check_country: Lütfen ülke kodu ayarlarınızı kontrol edin.
+      credentials_required: Lütfen önce Enable Banking kimlik bilgilerinizi yapılandırın.
+      description: Hesaplarınıza bağlamak istediğiniz bankayı seçin.
+      no_banks: Bu ülke/bölge için kullanılabilir banka yok.
+      no_search_results: Aramanızla eşleşen banka yok.
+      search_label: Bankanızı arayın
+      search_placeholder: Bankanızı arayın...
+      title: Bankanızı Seçin
+    select_existing_account:
+      all_linked: Tüm Enable Banking hesapları zaten bağlı görünüyor.
+      balance: Bakiye
+      cancel: İptal
+      link: Bağla
+      title: Enable Banking hesabını bağla
+      try_after_sync: Yeni bağlandıysanız veya eşitlediyseniz, eşitleme tamamlandıktan
+        sonra tekrar deneyin.
+      unlink_to_move: Farklı bir hesap bağlamak için önce hesabın işlemler menüsünden
+        bağlantıyı kaldırın.
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her Enable Banking hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating_accounts: Hesaplar Oluşturuluyor...
+      header_subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      psd2_savings_notice: ''
+      sync_start_date_help: İşlem geçmişini ne kadar geriye kadar eşitlemek istediğinizi
+        seçin. En fazla 2 yıllık geçmiş kullanılabilir.
+      sync_start_date_label: 'İşlemleri şu tarihten itibaren eşitlemeye başla:'
+      title: Enable Banking Hesaplarınızı Kurun
+    update:
+      success: Enable Banking yapılandırması güncellendi.
diff --git a/config/locales/views/enable_banking_items/vi.yml b/config/locales/views/enable_banking_items/vi.yml
index 138ba872d..8d395d14f 100644
--- a/config/locales/views/enable_banking_items/vi.yml
+++ b/config/locales/views/enable_banking_items/vi.yml
@@ -9,7 +9,6 @@ vi:
     authorize:
       authorization_failed: "Không thể khởi tạo ủy quyền: %{message}"
       bank_required: Vui lòng chọn ngân hàng.
-      decoupled_not_supported: Ngân hàng này sử dụng phương thức xác thực thiết bị riêng biệt chưa được hỗ trợ. Vui lòng thêm tài khoản này thủ công.
       invalid_redirect: URL ủy quyền nhận được không hợp lệ. Vui lòng thử lại.
       redirect_uri_not_allowed: Chuyển hướng không được phép. Vui lòng cấu hình `%{callback_url}` trong cài đặt ứng dụng Enable Banking của bạn.
       unexpected_error: Đã xảy ra lỗi không mong muốn. Vui lòng thử lại.
diff --git a/config/locales/views/enable_banking_items/zh-CN.yml b/config/locales/views/enable_banking_items/zh-CN.yml
index 3bf277767..a44e64a96 100644
--- a/config/locales/views/enable_banking_items/zh-CN.yml
+++ b/config/locales/views/enable_banking_items/zh-CN.yml
@@ -9,7 +9,6 @@ zh-CN:
     authorize:
       authorization_failed: 启动授权失败：%{message}
       bank_required: 请选择一家银行。
-      decoupled_not_supported: 该银行使用独立设备认证方式，目前尚不支持。请手动添加此账户。
       invalid_redirect: 收到的授权 URL 无效。请重试。
       redirect_uri_not_allowed: 不允许重定向。请在 Enable Banking 应用设置中配置 `%{callback_url}`。
       unexpected_error: 发生意外错误。请重试。
@@ -75,6 +74,7 @@ zh-CN:
       create_accounts: 创建账户
       creating_accounts: 正在创建账户...
       cancel: 取消
+      psd2_savings_notice: 根据 PSD2 规则，部分储蓄账户可能需要额外授权。
     new:
       link_enable_banking_title: 连接 Enable Banking
       session_expired: 会话已过期 - 需要重新授权
diff --git a/config/locales/views/entries/fr.yml b/config/locales/views/entries/fr.yml
index 9130dcba3..5c37f859f 100644
--- a/config/locales/views/entries/fr.yml
+++ b/config/locales/views/entries/fr.yml
@@ -6,18 +6,22 @@ fr:
     destroy:
       success: Entrée supprimée
     empty:
-      description: Essayez d'ajouter une entrée, de modifier les filtres ou d'affiner votre recherche
+      description: Essayez d'ajouter une entrée, de modifier les filtres ou d'affiner
+        votre recherche
       title: Aucune entrée trouvée
     loading:
       loading: Chargement des entrées...
+    protection:
+      description: Vos modifications sur cette entrée ne seront pas écrasées par la
+        synchronisation du fournisseur.
+      locked_fields_label: 'Champs verrouillés :'
+      title: Protégée contre la synchronisation
+      tooltip: Protégée contre la synchronisation
+      unlock_button: Autoriser la mise à jour par la synchronisation
+      unlock_confirm: Autoriser la synchronisation à mettre à jour cette entrée ?
+        Vos modifications pourraient être écrasées lors de la prochaine synchronisation.
+    unlock:
+      success: Entrée déverrouillée. Elle pourra être mise à jour lors de la prochaine
+        synchronisation.
     update:
       success: Entrée mise à jour
-    unlock:
-      success: Entrée déverrouillée. Elle pourra être mise à jour lors de la prochaine synchronisation.
-    protection:
-      tooltip: Protégée contre la synchronisation
-      title: Protégée contre la synchronisation
-      description: Vos modifications sur cette entrée ne seront pas écrasées par la synchronisation du fournisseur.
-      locked_fields_label: "Champs verrouillés :"
-      unlock_button: Autoriser la mise à jour par la synchronisation
-      unlock_confirm: Autoriser la synchronisation à mettre à jour cette entrée ? Vos modifications pourraient être écrasées lors de la prochaine synchronisation.
diff --git a/config/locales/views/entries/it.yml b/config/locales/views/entries/it.yml
new file mode 100644
index 000000000..bc3156748
--- /dev/null
+++ b/config/locales/views/entries/it.yml
@@ -0,0 +1,23 @@
+---
+it:
+  entries:
+    create:
+      success: Voce creata
+    destroy:
+      success: Voce eliminata
+    empty:
+      description: Prova ad aggiungere una voce, modificare i filtri o affinare la ricerca
+      title: Nessuna voce trovata
+    loading:
+      loading: Caricamento voci...
+    update:
+      success: Voce aggiornata
+    unlock:
+      success: Voce sbloccata. Potrebbe essere aggiornata alla prossima sincronizzazione.
+    protection:
+      tooltip: Protetta dalla sincronizzazione
+      title: Protetta dalla sincronizzazione
+      description: Le tue modifiche a questa voce non verranno sovrascritte dalla sincronizzazione del provider.
+      locked_fields_label: "Campi bloccati:"
+      unlock_button: Consenti aggiornamento dalla sincronizzazione
+      unlock_confirm: Consentire alla sincronizzazione di aggiornare questa voce? Le tue modifiche potrebbero essere sovrascritte alla prossima sincronizzazione.
diff --git a/config/locales/views/entries/ru.yml b/config/locales/views/entries/ru.yml
new file mode 100644
index 000000000..3be4de426
--- /dev/null
+++ b/config/locales/views/entries/ru.yml
@@ -0,0 +1,25 @@
+---
+ru:
+  entries:
+    create:
+      success: Запись создана
+    destroy:
+      success: Запись удалена
+    empty:
+      description: Попробуйте добавить запись, изменить фильтры или уточнить поиск
+      title: Записи не найдены
+    loading:
+      loading: Загрузка записей...
+    protection:
+      description: Ваши изменения в этой записи не будут перезаписаны синхронизацией
+        с провайдером.
+      locked_fields_label: 'Заблокированные поля:'
+      title: Защищено от синхронизации
+      tooltip: Защищено от синхронизации
+      unlock_button: Разрешить обновление синхронизацией
+      unlock_confirm: Разрешить обновление этой записи синхронизацией? Ваши изменения
+        могут быть перезаписаны при следующей синхронизации.
+    unlock:
+      success: Запись разблокирована. Она может быть обновлена при следующей синхронизации.
+    update:
+      success: Запись обновлена
diff --git a/config/locales/views/entries/tr.yml b/config/locales/views/entries/tr.yml
index ffe956b63..66acd14be 100644
--- a/config/locales/views/entries/tr.yml
+++ b/config/locales/views/entries/tr.yml
@@ -6,9 +6,21 @@ tr:
     destroy:
       success: Kayıt silindi
     empty:
-      description: Bir kayıt eklemeyi, filtreleri düzenlemeyi veya aramanızı geliştirmeyi deneyin
+      description: Bir kayıt eklemeyi, filtreleri düzenlemeyi veya aramanızı geliştirmeyi
+        deneyin
       title: Kayıt bulunamadı
     loading:
       loading: Kayıtlar yükleniyor...
+    protection:
+      description: Bu kayıttaki düzenlemeleriniz sağlayıcı senkronizasyonu tarafından
+        üzerine yazılmayacaktır.
+      locked_fields_label: 'Kilitli alanlar:'
+      title: Senkronizasyondan korunuyor
+      tooltip: Senkronizasyondan korunuyor
+      unlock_button: Senkronizasyonun güncellemesine izin ver
+      unlock_confirm: Senkronizasyonun bu kaydı güncellemesine izin verilsin mi? Değişiklikleriniz
+        bir sonraki senkronizasyonda üzerine yazılabilir.
+    unlock:
+      success: Kayıt kilidi açıldı. Bir sonraki senkronizasyonda güncellenebilir.
     update:
-      success: Kayıt güncellendi
\ No newline at end of file
+      success: Kayıt güncellendi
diff --git a/config/locales/views/entries/zh-CN.yml b/config/locales/views/entries/zh-CN.yml
index e40ed45a3..633ebb105 100644
--- a/config/locales/views/entries/zh-CN.yml
+++ b/config/locales/views/entries/zh-CN.yml
@@ -12,3 +12,12 @@ zh-CN:
       loading: 正在加载记录...
     update:
       success: 记录已更新
+    unlock:
+      success: 记录解除锁定成功
+    protection:
+      tooltip: 受同步保护
+      title: 受同步保护
+      description: 你对此记录的编辑不会被提供商同步覆盖。
+      locked_fields_label: 锁定字段：
+      unlock_button: 允许同步更新
+      unlock_confirm: 允许同步更新此记录？下次同步时你的更改可能会被覆盖。
diff --git a/config/locales/views/family_exports/en.yml b/config/locales/views/family_exports/en.yml
index f81c29b49..12f614449 100644
--- a/config/locales/views/family_exports/en.yml
+++ b/config/locales/views/family_exports/en.yml
@@ -6,6 +6,9 @@ en:
       success: Export started. You'll be able to download it shortly.
     delete_confirmation: Are you sure you want to delete this export? This action cannot be undone.
     delete_failed_confirmation: Are you sure you want to delete this failed export?
+    cancel:
+      cancelled: Export marked as failed. You can create a new export right away.
+      not_cancellable: This export can't be marked as failed right now — its job may still be running. Try again once it has been inactive for an hour.
     destroy:
       success: Export deleted successfully
     export_not_ready: Export not ready for download
@@ -40,4 +43,6 @@ en:
         actions:
           delete: Delete
           download: Download
+          mark_failed: Mark as failed
+          confirm_mark_failed: This export has been inactive for a while and its background job was likely interrupted. Mark it as failed? You can create a new export right away.
       empty: No exports yet.
diff --git a/config/locales/views/family_exports/fr.yml b/config/locales/views/family_exports/fr.yml
index 1d5b4b601..9b979fc6d 100644
--- a/config/locales/views/family_exports/fr.yml
+++ b/config/locales/views/family_exports/fr.yml
@@ -4,28 +4,46 @@ fr:
     access_denied: Accès refusé
     create:
       success: L'exportation a commencé. Vous pourrez bientôt la télécharger.
-    delete_confirmation: Êtes-vous sûr de vouloir supprimer cette exportation ? Cette action est irréversible.
-    delete_failed_confirmation: Êtes-vous sûr de vouloir supprimer cette exportation qui a échoué ?
+    delete_confirmation: Êtes-vous sûr de vouloir supprimer cette exportation ? Cette
+      action est irréversible.
+    delete_failed_confirmation: Êtes-vous sûr de vouloir supprimer cette exportation
+      qui a échoué ?
     destroy:
       success: Exportation supprimée avec succès
     export_not_ready: Exportation non prête pour le téléchargement
     exporting: Exporte...
     index:
-      title: Exportations
       new: Nouvelle exportation
-    table:
       title: Exportations
+    new:
+      accounts_and_balances: Tous les comptes et soldes
+      cancel: Annuler
+      categories_tags_rules: Catégories, balises et règles
+      dialog_subtitle: Téléchargez toutes vos données financières
+      dialog_title: Exportez vos données
+      export_data: Exporter des données
+      investment_trades: Métiers d'investissement
+      note_description: Cette exportation inclut toutes vos données, mais seules certaines
+        d'entre elles peuvent être réimportées via la fonction d'importation CSV.
+        Nous prenons en charge les importations de comptes, de transactions (avec
+        catégorie et balises) et commerciales. Les autres données du compte ne peuvent
+        pas être importées et sont uniquement destinées à vos dossiers.
+      note_label: Remarque
+      transaction_history: Historique des transactions
+      whats_included: 'Ce qui est inclus :'
+    table:
+      empty: Aucune exportation pour l'instant.
       header:
+        actions: Actions
         date: Date
         filename: Nom de fichier
         status: Statut
-        actions: Actions
       row:
-        status:
-          in_progress: En cours
-          complete: Terminé
-          failed: Échoué
         actions:
           delete: Supprimer
           download: Télécharger
-      empty: Aucune exportation pour l'instant.
+        status:
+          complete: Terminé
+          failed: Échoué
+          in_progress: En cours
+      title: Exportations
diff --git a/config/locales/views/family_exports/it.yml b/config/locales/views/family_exports/it.yml
new file mode 100644
index 000000000..2f68152db
--- /dev/null
+++ b/config/locales/views/family_exports/it.yml
@@ -0,0 +1,43 @@
+---
+it:
+  family_exports:
+    access_denied: Accesso negato
+    create:
+      success: Esportazione avviata. Potrai scaricarla a breve.
+    delete_confirmation: Sei sicuro di voler eliminare questa esportazione? Questa azione non può essere annullata.
+    delete_failed_confirmation: Sei sicuro di voler eliminare questa esportazione fallita?
+    destroy:
+      success: Esportazione eliminata con successo
+    export_not_ready: Esportazione non pronta per il download
+    exporting: Esportazione in corso...
+    new:
+      dialog_title: Esporta i tuoi dati
+      dialog_subtitle: Scarica tutti i tuoi dati finanziari
+      whats_included: "Cosa è incluso:"
+      accounts_and_balances: Tutti i conti e i saldi
+      transaction_history: Cronologia transazioni
+      investment_trades: Movimenti di investimento
+      categories_tags_rules: Categorie, etichette e regole
+      note_label: Nota
+      note_description: Questa esportazione include tutti i tuoi dati, ma solo alcuni possono essere reimportati tramite la funzione di importazione CSV. Supportiamo l'importazione di conti, transazioni (con categoria ed etichette) e movimenti. Altri dati del conto non possono essere importati e sono solo per i tuoi archivi.
+      cancel: Annulla
+      export_data: Esporta dati
+    index:
+      title: Esportazioni
+      new: Nuova esportazione
+    table:
+      title: Esportazioni
+      header:
+        date: Data
+        filename: Nome file
+        status: Stato
+        actions: Azioni
+      row:
+        status:
+          in_progress: In corso
+          complete: Completata
+          failed: Fallita
+        actions:
+          delete: Elimina
+          download: Scarica
+      empty: Nessuna esportazione ancora.
diff --git a/config/locales/views/family_exports/ru.yml b/config/locales/views/family_exports/ru.yml
new file mode 100644
index 000000000..3063ad798
--- /dev/null
+++ b/config/locales/views/family_exports/ru.yml
@@ -0,0 +1,47 @@
+---
+ru:
+  family_exports:
+    access_denied: Доступ запрещён
+    create:
+      success: Экспорт начат. Вы сможете скачать его в ближайшее время.
+    delete_confirmation: Вы уверены, что хотите удалить этот экспорт? Это действие
+      нельзя отменить.
+    delete_failed_confirmation: Вы уверены, что хотите удалить этот неудавшийся экспорт?
+    destroy:
+      success: Экспорт успешно удалён
+    export_not_ready: Экспорт не готов для загрузки
+    exporting: Экспортирование...
+    index:
+      new: Новый экспорт
+      title: Экспорты
+    new:
+      accounts_and_balances: Все счета и балансы
+      cancel: Отмена
+      categories_tags_rules: Категории, теги и правила
+      dialog_subtitle: Скачайте все ваши финансовые данные
+      dialog_title: Экспорт ваших данных
+      export_data: Экспортировать данные
+      investment_trades: Инвестиционные сделки
+      note_description: Этот экспорт включает все ваши данные, но только часть из
+        них может быть импортирована обратно через функцию импорта CSV. Мы поддерживаем
+        импорт счетов, операций (с категориями и тегами) и сделок. Другие данные счетов
+        не могут быть импортированы и предназначены только для вашего ознакомления.
+      note_label: Примечание
+      transaction_history: История операций
+      whats_included: 'Что включено:'
+    table:
+      empty: Экспортов пока нет.
+      header:
+        actions: Действия
+        date: Дата
+        filename: Имя файла
+        status: Статус
+      row:
+        actions:
+          delete: Удалить
+          download: Скачать
+        status:
+          complete: Завершено
+          failed: Неудача
+          in_progress: В процессе
+      title: Экспорты
diff --git a/config/locales/views/family_exports/tr.yml b/config/locales/views/family_exports/tr.yml
index 0995686a5..2f68737c0 100644
--- a/config/locales/views/family_exports/tr.yml
+++ b/config/locales/views/family_exports/tr.yml
@@ -2,30 +2,56 @@
 tr:
   family_exports:
     access_denied: Erişim reddedildi
+    cancel:
+      cancelled: Dışa aktarma başarısız olarak işaretlendi. Hemen yeni bir dışa aktarma
+        oluşturabilirsiniz.
+      not_cancellable: Bu dışa aktarma şu anda başarısız olarak işaretlenemez — işi
+        hâlâ çalışıyor olabilir. Bir saat boyunca etkin olmadıktan sonra tekrar deneyin.
     create:
       success: Dışa aktarma başladı. Kısa süre içinde indirebileceksiniz.
-    delete_confirmation: Bu dışa aktarma işlemini silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.
-    delete_failed_confirmation: Bu başarısız dışa aktarma işlemini silmek istediğinizden emin misiniz?
+    delete_confirmation: Bu dışa aktarma işlemini silmek istediğinizden emin misiniz?
+      Bu işlem geri alınamaz.
+    delete_failed_confirmation: Bu başarısız dışa aktarma işlemini silmek istediğinizden
+      emin misiniz?
     destroy:
       success: Dışa aktarma başarıyla silindi
     export_not_ready: Dışa aktarma henüz indirmeye hazır değil
     exporting: Dışa aktarılıyor...
     index:
-      title: Dışa aktarmalar
       new: Yeni Dışa Aktarma
-    table:
       title: Dışa aktarmalar
+    new:
+      accounts_and_balances: Tüm hesaplar ve bakiyeler
+      cancel: İptal
+      categories_tags_rules: Kategoriler, etiketler ve kurallar
+      dialog_subtitle: Tüm finansal verilerinizi indirin
+      dialog_title: Verilerinizi dışa aktarın
+      export_data: Verileri dışa aktar
+      investment_trades: Yatırım işlemleri
+      note_description: Bu dışa aktarma tüm verilerinizi içerir, ancak yalnızca bazı
+        veriler CSV içe aktarma özelliği ile geri içe aktarılabilir. Hesap, işlem
+        (kategori ve etiketlerle birlikte) ve alım satım içe aktarımlarını destekliyoruz.
+        Diğer hesap verileri içe aktarılamaz ve yalnızca kayıtlarınız içindir.
+      note_label: Not
+      transaction_history: İşlem geçmişi
+      whats_included: 'Neler dahil:'
+    table:
+      empty: Henüz hiç dışa aktarma yok.
       header:
+        actions: Eylemler
         date: Tarih
         filename: Dosya adı
         status: Durum
-        actions: Eylemler
       row:
+        actions:
+          confirm_mark_failed: Bu dışa aktarma bir süredir etkin değil ve arka plan
+            işi büyük olasılıkla kesintiye uğradı. Başarısız olarak işaretlensin mi?
+            Hemen yeni bir dışa aktarma oluşturabilirsiniz.
+          delete: Sil
+          download: İndir
+          mark_failed: Başarısız olarak işaretle
         status:
-          in_progress: Devam ediyor
           complete: Tamamlandı
           failed: Başarısız
-        actions:
-          delete: Sil
-          download: İndirmek
-      empty: Henüz hiç dışa aktarma yok.
+          in_progress: Devam ediyor
+      title: Dışa aktarmalar
diff --git a/config/locales/views/family_exports/zh-CN.yml b/config/locales/views/family_exports/zh-CN.yml
index 1f58f5dd4..b1e5c015e 100644
--- a/config/locales/views/family_exports/zh-CN.yml
+++ b/config/locales/views/family_exports/zh-CN.yml
@@ -29,3 +29,15 @@ zh-CN:
           delete: 删除
           download: 下载
       empty: 暂无导出记录
+    new:
+      dialog_title: 导出你的数据
+      dialog_subtitle: 下载此家庭的财务数据副本。
+      whats_included: 包含内容：
+      accounts_and_balances: 所有账户和余额
+      transaction_history: 交易历史
+      investment_trades: 投资交易
+      categories_tags_rules: 分类、标签和规则
+      note_label: 说明
+      note_description: 导出文件可能包含敏感财务信息，请妥善保管。
+      cancel: 取消
+      export_data: 导出数据
diff --git a/config/locales/views/goal_pledges/fr.yml b/config/locales/views/goal_pledges/fr.yml
new file mode 100644
index 000000000..93a6ab3c6
--- /dev/null
+++ b/config/locales/views/goal_pledges/fr.yml
@@ -0,0 +1,20 @@
+---
+fr:
+  goal_pledges:
+    create:
+      success: Promesse enregistrée. Sure la confirmera lors de la prochaine synchronisation.
+    destroy:
+      not_open: Seules les promesses en cours peuvent être annulées.
+      success: Promesse annulée.
+    new:
+      account_label: Sur le compte
+      amount_label: Montant
+      helper_manual: Sure enregistrera cela lors de votre prochaine modification manuelle de solde et confirmera la contribution.
+      helper_transfer: Sure recherchera un dépôt correspondant sur votre compte lié. La promesse reste en attente pendant 7 jours, puis se confirme automatiquement dès que Sure le détecte.
+      preview_nonzero: Atteindra {percent}%, {newTotal} sur {target}.
+      preview_reached: Atteint votre objectif de {target}. Objectif atteint !
+      preview_zero: Actuellement {current} sur {target} enregistrés.
+      submit: Enregistrer la promesse
+    renew:
+      not_open: Seules les promesses en cours peuvent être prolongées.
+      success: Fenêtre de promesse prolongée de 7 jours.
diff --git a/config/locales/views/goal_pledges/it.yml b/config/locales/views/goal_pledges/it.yml
new file mode 100644
index 000000000..c5e41144e
--- /dev/null
+++ b/config/locales/views/goal_pledges/it.yml
@@ -0,0 +1,20 @@
+---
+it:
+  goal_pledges:
+    new:
+      helper_transfer: Sure cercherà un deposito corrispondente nel tuo conto collegato. L'impegno rimane in attesa per 7 giorni, poi si conferma automaticamente quando Sure lo rileva.
+      helper_manual: Sure lo registrerà alla tua prossima modifica manuale del saldo e confermerà il contributo.
+      amount_label: Importo
+      account_label: Nel conto
+      submit: Registra impegno
+      preview_zero: "Attualmente {current} di {target} risparmiati."
+      preview_nonzero: "Raggiunge {percent}%, {newTotal} di {target}."
+      preview_reached: "Raggiunge il tuo obiettivo di {target}. Obiettivo raggiunto."
+    create:
+      success: Impegno registrato. Sure lo confermerà alla prossima sincronizzazione.
+    renew:
+      success: Finestra impegno estesa di 7 giorni.
+      not_open: Solo gli impegni aperti possono essere estesi.
+    destroy:
+      success: Impegno annullato.
+      not_open: Solo gli impegni aperti possono essere annullati.
diff --git a/config/locales/views/goal_pledges/pl.yml b/config/locales/views/goal_pledges/pl.yml
new file mode 100644
index 000000000..c77b5079e
--- /dev/null
+++ b/config/locales/views/goal_pledges/pl.yml
@@ -0,0 +1,20 @@
+---
+pl:
+  goal_pledges:
+    new:
+      helper_transfer: Sure będzie szukać pasującego depozytu na twoim koncie. Zobowiązanie pozostaje oczekujące przez 7 dni, a następnie automatycznie potwierdza się, gdy Sure je wykryje.
+      helper_manual: Sure odnotuje to przy następnej ręcznej edycji salda i potwierdzi wpłatę.
+      amount_label: Kwota
+      account_label: Na konto
+      submit: Zapisz zobowiązanie
+      preview_zero: "Obecnie zaoszczędzono {current} z {target}."
+      preview_nonzero: "Osiąga {percent}%, {newTotal} z {target}."
+      preview_reached: "Osiąga cel {target}. Cel osiągnięty."
+    create:
+      success: Zobowiązanie zapisane. Sure potwierdzi je przy następnej synchronizacji.
+    renew:
+      success: Okno zobowiązania przedłużone o 7 dni.
+      not_open: Tylko otwarte zobowiązania mogą być przedłużane.
+    destroy:
+      success: Zobowiązanie anulowane.
+      not_open: Tylko otwarte zobowiązania mogą być anulowane.
diff --git a/config/locales/views/goal_pledges/ru.yml b/config/locales/views/goal_pledges/ru.yml
new file mode 100644
index 000000000..6ab3f4631
--- /dev/null
+++ b/config/locales/views/goal_pledges/ru.yml
@@ -0,0 +1,22 @@
+---
+ru:
+  goal_pledges:
+    create:
+      success: Pledge recorded. Sure will confirm it on the next sync.
+    destroy:
+      not_open: Only open pledges can be cancelled.
+      success: Pledge cancelled.
+    new:
+      account_label: Into account
+      amount_label: Amount
+      helper_manual: Sure will record this on your next manual balance edit and confirm
+        the contribution.
+      helper_transfer: Sure will look for a matching deposit in your linked account.
+        The pledge stays pending for 7 days, then auto-confirms once Sure spots it.
+      preview_nonzero: Reaches {percent}%, {newTotal} of {target}.
+      preview_reached: Hits your {target} target. Goal reached.
+      preview_zero: Currently {current} of {target} saved.
+      submit: Record pledge
+    renew:
+      not_open: Only open pledges can be extended.
+      success: Pledge window extended 7 days.
diff --git a/config/locales/views/goal_pledges/tr.yml b/config/locales/views/goal_pledges/tr.yml
new file mode 100644
index 000000000..408cf11aa
--- /dev/null
+++ b/config/locales/views/goal_pledges/tr.yml
@@ -0,0 +1,23 @@
+---
+tr:
+  goal_pledges:
+    create:
+      success: Taahhüt kaydedildi. Sure bir sonraki senkronizasyonda bunu onaylayacak.
+    destroy:
+      not_open: Yalnızca açık taahhütler iptal edilebilir.
+      success: Taahhüt iptal edildi.
+    new:
+      account_label: Hesaba
+      amount_label: Tutar
+      helper_manual: Sure bunu bir sonraki manuel bakiye düzenlemenizde kaydedecek
+        ve katkıyı onaylayacaktır.
+      helper_transfer: Sure, bağlı hesabınızda eşleşen bir yatırma işlemi arayacaktır.
+        Taahhüt 7 gün boyunca beklemede kalır, Sure onu tespit ettiğinde otomatik
+        olarak onaylanır.
+      preview_nonzero: "{target} hedefinin yüzde {percent}'ine ulaşılıyor, {newTotal}."
+      preview_reached: "{target} hedefinize ulaşıldı. Hedef tamamlandı."
+      preview_zero: Şu anda {target} hedefinin {current} kısmı biriktirildi.
+      submit: Taahhüdü kaydet
+    renew:
+      not_open: Yalnızca açık taahhütler uzatılabilir.
+      success: Taahhüt süresi 7 gün uzatıldı.
diff --git a/config/locales/views/goal_pledges/zh-CN.yml b/config/locales/views/goal_pledges/zh-CN.yml
new file mode 100644
index 000000000..09f87ff4e
--- /dev/null
+++ b/config/locales/views/goal_pledges/zh-CN.yml
@@ -0,0 +1,20 @@
+---
+zh-CN:
+  goal_pledges:
+    new:
+      helper_transfer: 记录一次已完成的转账，系统会在同步后匹配。
+      helper_manual: 记录一次你手动留出的资金。
+      amount_label: 金额
+      account_label: 存入账户
+      submit: 记录承诺
+      preview_zero: 当前已存 {current}/{target}。
+      preview_nonzero: 将达到 {percent}%，即 {newTotal}/{target}。
+      preview_reached: 将达到目标 {target}。
+    create:
+      success: 目标承诺成功
+    renew:
+      success: 承诺已续期。
+      not_open: 只有待处理的承诺可以续期。
+    destroy:
+      success: 承诺已取消。
+      not_open: 只有待处理的承诺可以取消。
diff --git a/config/locales/views/goals/en.yml b/config/locales/views/goals/en.yml
index 031633272..15469ef82 100644
--- a/config/locales/views/goals/en.yml
+++ b/config/locales/views/goals/en.yml
@@ -2,6 +2,7 @@
 en:
   goals:
     color_picker:
+      trigger_label: Choose color and icon
       color_heading: Color
       icon_heading: Icon
       poor_contrast: Poor contrast, choose darker color or
@@ -91,6 +92,9 @@ en:
     unarchive:
       success: Goal restored.
       invalid_transition: Goal can't be restored from its current state.
+    reopen:
+      success: Goal reopened.
+      invalid_transition: Goal can't be reopened from its current state.
     show:
       edit: Edit
       pause: Pause
@@ -98,12 +102,14 @@ en:
       complete: Mark complete
       archive: Archive
       unarchive: Restore
+      reopen: Reopen goal
       delete: Delete permanently
       record_pledge_cta: Record pledge
       pledge_just_transferred: Log a transfer you made
       pledge_just_saved: Log money you set aside
       funding_accounts_heading: Funding accounts
       funding_accounts:
+        earmarked_of: "%{earmarked} earmarked of %{balance}"
         empty:
           heading: No funding accounts linked yet
           body: Edit the goal to link the depository accounts you save into.
@@ -137,6 +143,7 @@ en:
         of: "of %{target}"
         to_go: "%{amount} to go"
         of_target: of target
+        market_value: "Market value %{amount}"
         aria_label: "Goal %{percent}% complete. %{amount} of %{target} saved."
       projection:
         heading: Projection
@@ -152,6 +159,7 @@ en:
         today_marker: Today
         tooltip_projected: "Projected: %{amount}"
         tooltip_saved: "Saved: %{amount}"
+        tooltip_target_relation: "%{percent}% of %{target} target"
       catch_up:
         title: "Save %{amount}/mo more to catch up"
         body: "Current pace %{avg}/mo · required %{required}/mo to hit your target."
@@ -222,9 +230,6 @@ en:
       days_left:
         one: 1 day left
         other: "%{count} days left"
-      days_left_by:
-        one: 1 day left · by %{date}
-        other: "%{count} days left · by %{date}"
       pace_with_target: "%{avg}/mo · target %{target}/mo"
       pace_no_target: "%{avg}/mo avg"
       footer_paused: Paused
@@ -259,7 +264,10 @@ en:
         notes: Notes (optional)
         notes_placeholder: A reminder for future you…
         funding_accounts: Funding accounts
-        funding_accounts_hint: This goal's balance is the balance of these accounts.
+        funding_accounts_hint: This goal's balance is the balance (or earmarked portion) of these accounts.
+        whole_balance: Whole balance
+        earmark_for: Earmark amount for %{account}
+        earmark_hint: Leave an amount blank to dedicate that account's whole balance.
       subtypes:
         checking: Checking
         savings: Savings
diff --git a/config/locales/views/goals/fr.yml b/config/locales/views/goals/fr.yml
new file mode 100644
index 000000000..840659ef9
--- /dev/null
+++ b/config/locales/views/goals/fr.yml
@@ -0,0 +1,277 @@
+---
+fr:
+  goals:
+    archive:
+      invalid_transition: L'objectif ne peut pas être archivé dans son état actuel.
+      success: Objectif archivé.
+    color_picker:
+      auto_adjust: ajustement automatique.
+      color_heading: Couleur
+      icon_heading: Icône
+      poor_contrast: Contraste faible, choisissez une couleur plus sombre ou
+      trigger_label: Choisir la couleur et l'icône
+    complete:
+      invalid_transition: L'objectif ne peut pas être marqué comme terminé dans son état actuel.
+      success: Objectif marqué comme terminé.
+    create:
+      success: Objectif créé.
+    destroy:
+      archive_first: Archivez l'objectif avant de le supprimer.
+      success: Objectif supprimé.
+    edit:
+      heading: Modifier l'objectif
+      save: Enregistrer les modifications
+    empty_state:
+      add_account: Ajouter un compte
+      body: Définissez un objectif, liez les comptes sur lesquels vous épargnez et suivez vos progrès.
+      heading: Aucun objectif pour le moment
+      new_goal: Créer votre premier objectif
+      no_depository_accounts: Vous devez posséder au moins un compte de dépôt (chèque, épargne, HSA, compte à terme) avant de créer un objectif.
+      subtitle: Définissez un objectif et commencez à épargner pour l'atteindre.
+    errors:
+      not_found: Cet objectif n'a pas pu être trouvé. Il a peut-être été supprimé.
+    form:
+      create: Créer l'objectif
+      errors:
+        accounts_required: Sélectionnez au moins un compte de financement.
+        amount_required: Définissez une cible supérieure à zéro.
+        name_required: Donnez un nom à votre objectif.
+      fields:
+        color: Couleur
+        earmark_for: Affecter un montant pour %{account}
+        earmark_hint: Laissez le montant vide pour dédier la totalité du solde de ce compte.
+        funding_accounts: Comptes de financement
+        funding_accounts_hint: Le solde de cet objectif correspond au solde (ou à la part affectée) de ces comptes.
+        name: Nom
+        name_placeholder: Fonds d'urgence, Apport maison…
+        notes: Notes (facultatif)
+        notes_placeholder: Un rappel pour plus tard…
+        target_amount: Montant cible
+        target_date: Date cible
+        whole_balance: Solde total
+      save: Enregistrer les modifications
+      subtypes:
+        cd: Compte à terme
+        checking: Compte courant
+        hsa: HSA
+        money_market: Marché monétaire
+        other: Autre
+        savings: Épargne
+      suggested_no_date: Définissez une date cible pour projeter la fin.
+      suggested_with_date: Épargnez {monthly}/mois sur {accounts} pour l'atteindre à temps.
+    goal_card:
+      accounts:
+        one: 1 compte
+        other: "%{count} comptes"
+      aria_progress: "%{percent}% sur %{target}"
+      completed: Terminé
+      days_left:
+        one: 1 jour restant
+        other: "%{count} jours restants"
+      footer_archived: Archivé
+      footer_catch_up: Épargnez %{amount}/mois pour rattraper
+      footer_last_days:
+        one: Dernière promesse rapprochée il y a 1 jour
+        other: Dernière promesse rapprochée il y a %{count} jours
+      footer_last_today: Dernière promesse rapprochée aujourd'hui
+      footer_no_deadline: Ouvert
+      footer_no_pledges: Aucune promesse rapprochée
+      footer_paused: En pause
+      footer_reached: Objectif atteint
+      left: restant
+      n_accounts: "%{first} +%{count}"
+      no_accounts: Aucun compte lié
+      no_target_date: Ouvert
+      pace_no_target: Moy. %{avg}/mois
+      pace_with_target: "%{avg}/mois · cible %{target}/mois"
+      past_due: Échu
+      pending_count:
+        one: 1 en attente
+        other: "%{count} en en attente"
+      pending_pledge: Promesse en attente
+    index:
+      archived_section:
+        heading: Archivés
+      chips:
+        all: Tous
+        behind: En retard
+        completed: Terminé
+        no_target_date: Ouvert
+        on_track: En bonne voie
+        paused: En pause
+      empty_filtered: Aucun objectif ne correspond.
+      goals_section:
+        heading: Objectifs
+        subtitle: Épargnez pour ce qui compte.
+      kpi:
+        contributed_label: Contribué · 30 derniers jours
+        needs_this_month_label: Requis ce mois-ci
+        needs_this_month_sub:
+          one: 1 objectif en retard
+          other: "%{count} objectifs en retard"
+        needs_this_month_zero_sub: Aucun objectif en retard
+        on_track_all_caught_up: À jour
+        on_track_label: Objectifs en bonne voie
+        on_track_sub_all_good: Tous les objectifs actifs sont en bonne voie
+        on_track_sub_parts:
+          behind:
+            one: 1 en retard
+            other: "%{count} en retard"
+          no_date:
+            one: 1 sans date limite
+            other: "%{count} sans date limite"
+          paused:
+            one: 1 en pause
+            other: "%{count} en pause"
+          reached:
+            one: 1 atteint
+            other: "%{count} atteints"
+        on_track_value: "%{on_track} sur %{total}"
+        velocity_delta_down: "↓ %{percent}%% vs 30 jours précédents"
+        velocity_delta_flat: vs 30 jours précédents
+        velocity_delta_up: "↑ %{percent}%% vs 30 jours précédents"
+        velocity_delta_zero_base: Premiers 30 jours d'activité
+      new_goal: Nouvel objectif
+      ongoing_section:
+        heading: Objectifs
+      pending_pledges_callout: Vous avez des promesses en attente. Sure les confirmera lors de la prochaine synchronisation.
+      search:
+        aria_label: Rechercher des objectifs
+        clear_search: Effacer la recherche
+        empty: Aucun objectif ne correspond.
+        empty_with_both: Aucun objectif ne correspond à "%{query}" avec ce filtre.
+        empty_with_filter: Aucun objectif ne correspond à ce filtre.
+        empty_with_query: Aucun objectif ne correspond à "%{query}".
+        placeholder: Rechercher des objectifs…
+        show_all: Tout afficher
+      subtitle: Épargnez pour ce qui compte.
+      title: Objectifs
+    new:
+      heading: Nouvel objectif
+      subtitle: Épargnez pour un projet spécifique.
+    pause:
+      invalid_transition: L'objectif ne peut pas être mis en pause dans son état actuel.
+      success: Objectif mis en pause.
+    reopen:
+      invalid_transition: L'objectif ne peut pas être réouvert dans son état actuel.
+      success: Objectif réouvert.
+    resume:
+      invalid_transition: L'objectif ne peut pas être repris dans son état actuel.
+      success: Objectif repris.
+    show:
+      archive: Archiver
+      archived_banner:
+        body: Restaurez-le pour continuer à y contribuer, ou conservez-le comme archive.
+        restore_cta: Restaurer l'objectif
+        title: Cet objectif est archivé
+      catch_up:
+        adjust_target_cta: Ajuster l'objectif à la place
+        body: Rythme actuel %{avg}/mois · requis %{required}/mois pour atteindre votre objectif.
+        title: Épargnez %{amount}/mois de plus pour rattraper le retard
+      celebration:
+        archive_cta: Archiver l'objectif
+        body: Objectif clôturé à %{saved} sur %{target}. Conservez-le, ou archivez-le dès maintenant.
+        heading: Objectif atteint. Bon travail !
+      complete: Marquer comme terminé
+      confirm_archive_body: Les objectifs archivés disparaissent de la liste principale. Vous pourrez les restaurer plus tard.
+      confirm_archive_cta: Archiver
+      confirm_archive_title: Archiver cet objectif ?
+      confirm_complete_body: Il quittera la liste En cours. Vous pourrez toujours l'archiver ou le restaurer plus tard.
+      confirm_complete_body_short: Vous êtes à %{progress}%, %{saved} sur %{target}. Marquer comme terminé enregistrera cela comme votre réussite à la place de l'objectif initial. Continuer, ou fermer ceci et ajuster l'objectif à la place ?
+      confirm_complete_cta: Marquer comme terminé
+      confirm_complete_title: Marquer cet objectif comme terminé ?
+      delete: Supprimer définitivement
+      edit: Modifier
+      empty:
+        body: Effectuez un virement sur votre compte lié. Sure le détectera lors de la prochaine synchronisation. Ou mettez à jour manuellement le solde du compte.
+        heading: Aucun dépôt pour l'instant
+      funding_accounts:
+        earmarked_of: "%{earmarked} affectés sur %{balance}"
+        empty:
+          body: Modifiez l'objectif pour lier les comptes de dépôt sur lesquels vous épargnez.
+          heading: Aucun compte de financement lié pour l'instant
+      funding_accounts_heading: Comptes de financement
+      funding_last_30d: 30 derniers jours
+      funding_last_90d: 90 derniers jours
+      header:
+        target: 'Cible : %{amount}'
+        target_by: 'Objectif : %{amount} d''ici le %{date}'
+        target_by_past: 'Objectif : %{amount} · attendu le %{date}'
+      inactive:
+        body: "%{saved} sur %{target} épargnés pour l'instant."
+        heading_archived: Cet objectif est archivé
+        heading_paused: Cet objectif est en pause
+      no_target_date:
+        body: Définissez une date limite pour projeter une fin et suivre le rythme requis.
+        cta: Définir la date cible
+        heading: Ajouter une date cible
+      notes: Notes
+      pause: Pause
+      paused_banner:
+        body: Reprenez-le pour continuer à suivre vos progrès.
+        resume_cta: Reprendre l'objectif
+        title: Cet objectif est en pause
+      pending_pledge:
+        body_manual: Se confirme lors de votre prochaine modification manuelle de solde.
+        body_transfer: Se confirme automatiquement lorsque Sure détecte un dépôt correspondant lors de la prochaine synchronisation.
+        cancel: Annuler
+        confirm_cancel_body: La promesse de %{amount} sera supprimée. Vous pourrez en enregistrer une nouvelle à tout moment.
+        confirm_cancel_cta: Annuler la promesse
+        confirm_cancel_title: Annuler cette promesse ?
+        extend: Prolonger de 7 jours
+        pledged_at: Promesse faite il y a %{time_ago}
+        title:
+          one: 'En attente : %{amount} vers %{account} · 1 jour restant'
+          other: 'En attente : %{amount} vers %{account} · %{count} jours restants'
+          zero: 'En attente : %{amount} vers %{account} · expire aujourd''hui'
+      pledge_just_saved: Enregistrer l'argent mis de côté
+      pledge_just_transferred: Enregistrer un virement effectué
+      projection:
+        aria_label: Graphique de projection pour %{name}
+        behind: Insuffisant au rythme actuel.
+        heading: Projection
+        legend_projection: Projection
+        legend_required: Requis
+        legend_saved: Épargné
+        no_pace: Aucun dépôt pour le moment. Ajoutez de l'argent sur un compte lié pour démarrer la projection.
+        no_target_date: Aucune date cible définie. Définissez-en une pour projeter la fin.
+        on_track_html: Au rythme actuel, vous atteindrez cet objectif vers le <strong class="text-primary whitespace-nowrap">%{date}</strong>.
+        reached: Vous avez atteint l'objectif. Aucune projection nécessaire.
+        today_marker: Aujourd'hui
+        tooltip_projected: 'Projeté : %{amount}'
+        tooltip_saved: 'Épargné : %{amount}'
+        tooltip_target_relation: "%{percent}% de la cible de %{target}"
+      record_pledge_cta: Enregistrer une promesse
+      reopen: Réouvrir l'objectif
+      resume: Reprendre
+      ring:
+        aria_label: Objectif complété à %{percent}%. %{amount} sur %{target} épargnés.
+        market_value: Valeur de marché %{amount}
+        of: sur %{target}
+        of_target: de l'objectif
+        saved: Épargné
+        to_go: "%{amount} restant(s)"
+      status_callout:
+        behind: épargnez %{amount}/mois de plus pour rattraper le retard
+        behind_covered: les promesses en attente comblent le retard
+        no_target_date: définissez une date cible pour projeter une date de fin
+        on_track: atteindra l'objectif vers %{date}
+      unarchive: Restaurer
+    states:
+      active: Actif
+      archived: Archivé
+      completed: Terminé
+      paused: En pause
+    status:
+      archived: Archivé
+      behind: En retard
+      completed: Terminé
+      no_target_date: Ouvert
+      on_track: En bonne voie
+      paused: En pause
+      reached: Atteint
+    unarchive:
+      invalid_transition: L'objectif ne peut pas être restauré dans son état actuel.
+      success: Objectif restauré.
+    update:
+      success: Objectif mis à jour.
diff --git a/config/locales/views/goals/it.yml b/config/locales/views/goals/it.yml
new file mode 100644
index 000000000..71b8531fd
--- /dev/null
+++ b/config/locales/views/goals/it.yml
@@ -0,0 +1,277 @@
+---
+it:
+  goals:
+    color_picker:
+      trigger_label: Scegli colore e icona
+      color_heading: Colore
+      icon_heading: Icona
+      poor_contrast: Contrasto scarso, scegli un colore più scuro o
+      auto_adjust: adattamento automatico.
+    index:
+      title: Obiettivi
+      subtitle: Risparmia per ciò che conta.
+      new_goal: Nuovo obiettivo
+      empty_filtered: Nessun obiettivo corrisponde.
+      pending_pledges_callout: Hai impegni in sospeso. L'app li confermerà alla prossima sincronizzazione.
+      kpi:
+        contributed_label: Contribuito · ultimi 30gg
+        velocity_delta_up: "↑ %{percent}%% vs. 30gg precedenti"
+        velocity_delta_down: "↓ %{percent}%% vs. 30gg precedenti"
+        velocity_delta_flat: vs. 30gg precedenti
+        velocity_delta_zero_base: Primi 30gg di attività
+        needs_this_month_label: Necessario questo mese
+        needs_this_month_sub:
+          one: 1 obiettivo indietro rispetto al piano
+          other: "%{count} obiettivi indietro rispetto al piano"
+        needs_this_month_zero_sub: Nessun obiettivo indietro rispetto al piano
+        on_track_label: Obiettivi in regola
+        on_track_value: "%{on_track} di %{total}"
+        on_track_sub_parts:
+          reached:
+            one: 1 raggiunto
+            other: "%{count} raggiunti"
+          behind:
+            one: 1 in ritardo
+            other: "%{count} in ritardo"
+          no_date:
+            one: 1 senza scadenza
+            other: "%{count} senza scadenza"
+          paused:
+            one: 1 in pausa
+            other: "%{count} in pausa"
+        on_track_sub_all_good: Tutti gli obiettivi attivi in regola
+        on_track_all_caught_up: Tutto in pari
+      goals_section:
+        heading: Obiettivi
+        subtitle: Risparmia per ciò che conta.
+      ongoing_section:
+        heading: Obiettivi
+      archived_section:
+        heading: Archiviati
+      search:
+        placeholder: Cerca obiettivi…
+        aria_label: Cerca obiettivi
+        empty: Nessun obiettivo corrisponde.
+        empty_with_query: "Nessun obiettivo corrisponde a \"%{query}\"."
+        empty_with_filter: Nessun obiettivo corrisponde a questo filtro.
+        empty_with_both: "Nessun obiettivo corrisponde a \"%{query}\" con questo filtro."
+        clear_search: Cancella ricerca
+        show_all: Mostra tutti
+      chips:
+        all: Tutti
+        on_track: In regola
+        behind: In ritardo
+        no_target_date: Aperto
+        paused: In pausa
+        completed: Completato
+    new:
+      heading: Nuovo obiettivo
+      subtitle: Risparmia per qualcosa di specifico.
+    edit:
+      heading: Modifica obiettivo
+      save: Salva modifiche
+    create:
+      success: Obiettivo creato.
+    update:
+      success: Obiettivo aggiornato.
+    destroy:
+      success: Obiettivo eliminato.
+      archive_first: Archivia l'obiettivo prima di eliminarlo.
+    pause:
+      success: Obiettivo messo in pausa.
+      invalid_transition: L'obiettivo non può essere messo in pausa dal suo stato attuale.
+    resume:
+      success: Obiettivo ripreso.
+      invalid_transition: L'obiettivo non può essere ripreso dal suo stato attuale.
+    complete:
+      success: Obiettivo contrassegnato come completato.
+      invalid_transition: L'obiettivo non può essere completato dal suo stato attuale.
+    archive:
+      success: Obiettivo archiviato.
+      invalid_transition: L'obiettivo non può essere archiviato dal suo stato attuale.
+    unarchive:
+      success: Obiettivo ripristinato.
+      invalid_transition: L'obiettivo non può essere ripristinato dal suo stato attuale.
+    reopen:
+      success: Obiettivo riaperto.
+      invalid_transition: L'obiettivo non può essere riaperto dal suo stato attuale.
+    show:
+      edit: Modifica
+      pause: Metti in pausa
+      resume: Riprendi
+      complete: Segna come completato
+      archive: Archivia
+      unarchive: Ripristina
+      reopen: Riapri obiettivo
+      delete: Elimina definitivamente
+      record_pledge_cta: Registra impegno
+      pledge_just_transferred: Registra un trasferimento effettuato
+      pledge_just_saved: Registra denaro messo da parte
+      funding_accounts_heading: Conti di finanziamento
+      funding_accounts:
+        earmarked_of: "%{earmarked} accantonati di %{balance}"
+        empty:
+          heading: Nessun conto di finanziamento collegato
+          body: Modifica l'obiettivo per collegare i conti correnti in cui risparmi.
+      notes: Note
+      funding_last_30d: ultimi 30gg
+      funding_last_90d: ultimi 90gg
+      status_callout:
+        behind: "risparmia %{amount}/mese in più per recuperare"
+        behind_covered: "gli impegni in sospeso colmano il divario"
+        on_track: "raggiunge l'obiettivo intorno al %{date}"
+        no_target_date: "imposta una data obiettivo per proiettare un traguardo"
+      pending_pledge:
+        title:
+          zero: "In sospeso: %{amount} in %{account} · scade oggi"
+          one: "In sospeso: %{amount} in %{account} · 1 giorno rimanente"
+          other: "In sospeso: %{amount} in %{account} · %{count} giorni rimanenti"
+        body_transfer: Si conferma automaticamente quando l'app rileva un deposito corrispondente alla prossima sincronizzazione.
+        body_manual: Si conferma alla prossima modifica manuale del saldo.
+        pledged_at: "Impegnato %{time_ago} fa"
+        extend: Estendi di 7 giorni
+        cancel: Annulla
+        confirm_cancel_title: Annullare questo impegno?
+        confirm_cancel_body: "L'impegno di %{amount} verrà rimosso. Puoi registrarne uno nuovo in qualsiasi momento."
+        confirm_cancel_cta: Annulla impegno
+      header:
+        target: "Obiettivo %{amount}"
+        target_by: "Obiettivo %{amount} entro il %{date}"
+        target_by_past: "Obiettivo %{amount} · scaduto il %{date}"
+      ring:
+        saved: Risparmiato
+        of: "di %{target}"
+        to_go: "%{amount} mancanti"
+        of_target: dell'obiettivo
+        market_value: "Valore di mercato %{amount}"
+        aria_label: "Obiettivo %{percent}%% completato. %{amount} di %{target} risparmiati."
+      projection:
+        heading: Proiezione
+        legend_saved: Risparmiato
+        legend_projection: Proiezione
+        legend_required: Richiesto
+        reached: Hai raggiunto l'obiettivo. Nessuna proiezione necessaria.
+        no_target_date: Nessuna data obiettivo impostata. Impostane una per proiettare un traguardo.
+        no_pace: Nessun deposito ancora. Aggiungi denaro a un conto collegato per iniziare una proiezione.
+        behind: In ritardo al ritmo attuale.
+        on_track_html: Al tuo ritmo attuale, raggiungerai questo obiettivo intorno al <strong class="text-primary whitespace-nowrap">%{date}</strong>.
+        aria_label: "Grafico di proiezione per %{name}"
+        today_marker: Oggi
+        tooltip_projected: "Proiettato: %{amount}"
+        tooltip_saved: "Risparmiato: %{amount}"
+        tooltip_target_relation: "%{percent}%% di %{target} obiettivo"
+      catch_up:
+        title: "Risparmia %{amount}/mese in più per recuperare"
+        body: "Ritmo attuale %{avg}/mese · necessario %{required}/mese per raggiungere l'obiettivo."
+        adjust_target_cta: Modifica l'obiettivo invece
+      confirm_complete_title: Contrassegnare questo obiettivo come completato?
+      confirm_complete_body: Uscirà dalla lista In corso. Puoi ancora archiviarlo o ripristinarlo in seguito.
+      confirm_complete_body_short: "Sei al %{progress}%%, %{saved} di %{target}. Contrassegnare come completato registra questo come il tuo risultato invece dell'obiettivo originale. Continua, o chiudi e modifica l'obiettivo invece?"
+      confirm_complete_cta: Segna come completato
+      confirm_archive_title: Archiviare questo obiettivo?
+      confirm_archive_body: Gli obiettivi archiviati scompaiono dalla lista principale. Puoi ripristinarli in seguito.
+      confirm_archive_cta: Archivia
+      paused_banner:
+        title: Questo obiettivo è in pausa
+        body: Riprendi per continuare a monitorare i tuoi progressi.
+        resume_cta: Riprendi obiettivo
+      archived_banner:
+        title: Questo obiettivo è archiviato
+        body: Ripristinalo per continuare a contribuire, o lascialo come registro.
+        restore_cta: Ripristina obiettivo
+      celebration:
+        heading: Obiettivo raggiunto. Ottimo lavoro.
+        body: "Obiettivo chiuso a %{saved} di %{target}. Tienilo come registro o archivialo ora."
+        archive_cta: Archivia obiettivo
+      inactive:
+        heading_paused: Questo obiettivo è in pausa
+        heading_archived: Questo obiettivo è archiviato
+        body: "%{saved} di %{target} risparmiati finora."
+      no_target_date:
+        heading: Aggiungi una data obiettivo
+        body: Imposta una scadenza per proiettare un traguardo e monitorare il ritmo richiesto.
+        cta: Imposta data obiettivo
+      empty:
+        heading: Nessun deposito ancora
+        body: Effettua un trasferimento nel tuo conto collegato. L'app lo rileverà alla prossima sincronizzazione. Oppure aggiorna il saldo del tuo conto manuale.
+    errors:
+      not_found: Questo obiettivo non è stato trovato. Potrebbe essere stato eliminato.
+    states:
+      active: Attivo
+      paused: In pausa
+      completed: Completato
+      archived: Archiviato
+    status:
+      on_track: In regola
+      behind: In ritardo
+      reached: Raggiunto
+      completed: Completato
+      no_target_date: Aperto
+      paused: In pausa
+      archived: Archiviato
+    empty_state:
+      heading: Nessun obiettivo ancora
+      body: Imposta un obiettivo, collega i conti in cui risparmi e osserva i tuoi progressi accumularsi.
+      subtitle: Imposta un obiettivo e inizia a risparmiare.
+      new_goal: Crea il tuo primo obiettivo
+      no_depository_accounts: Hai bisogno di almeno un conto corrente (conto corrente, risparmio, HSA, CD, mercato monetario) prima di creare un obiettivo.
+      add_account: Aggiungi un conto
+    goal_card:
+      no_accounts: Nessun conto collegato
+      n_accounts: "%{first} +%{count}"
+      left: rimanente
+      aria_progress: "%{percent}%% di %{target}"
+      accounts:
+        one: 1 conto
+        other: "%{count} conti"
+      no_target_date: Aperto
+      completed: Completato
+      past_due: Scaduto
+      days_left:
+        one: 1 giorno rimanente
+        other: "%{count} giorni rimanenti"
+      pace_with_target: "%{avg}/mese · obiettivo %{target}/mese"
+      pace_no_target: "%{avg}/mese medio"
+      footer_paused: In pausa
+      footer_archived: Archiviato
+      footer_reached: Obiettivo raggiunto
+      footer_catch_up: "Risparmia %{amount}/mese per recuperare"
+      footer_no_deadline: Aperto
+      pending_pledge: Impegno in sospeso
+      pending_count:
+        one: 1 in sospeso
+        other: "%{count} in sospeso"
+      footer_no_pledges: Nessun impegno abbinato ancora
+      footer_last_today: Ultimo impegno abbinato oggi
+      footer_last_days:
+        one: Ultimo impegno abbinato 1 giorno fa
+        other: "Ultimo impegno abbinato %{count} giorni fa"
+    form:
+      create: Crea obiettivo
+      save: Salva modifiche
+      suggested_with_date: "Risparmia {monthly}/mese su {accounts} per raggiungerlo in tempo."
+      suggested_no_date: Imposta una data obiettivo per proiettare un traguardo.
+      errors:
+        name_required: Dai un nome al tuo obiettivo.
+        amount_required: Imposta un obiettivo superiore a zero.
+        accounts_required: Scegli almeno un conto di finanziamento.
+      fields:
+        name: Nome
+        name_placeholder: Fondo emergenza, Anticipo casa…
+        target_amount: Importo obiettivo
+        target_date: Data obiettivo
+        color: Colore
+        notes: Note (opzionale)
+        notes_placeholder: Un promemoria per te in futuro…
+        funding_accounts: Conti di finanziamento
+        funding_accounts_hint: Il saldo di questo obiettivo è il saldo di questi conti.
+        whole_balance: Saldo intero
+        earmark_for: Accantona un importo per %{account}
+        earmark_hint: Lascia vuoto un importo per dedicare l'intero saldo di quel conto.
+      subtypes:
+        checking: Conto corrente
+        savings: Risparmio
+        hsa: HSA
+        cd: CD
+        money_market: Mercato monetario
+        other: Altro
diff --git a/config/locales/views/goals/pl.yml b/config/locales/views/goals/pl.yml
new file mode 100644
index 000000000..4e7e87acd
--- /dev/null
+++ b/config/locales/views/goals/pl.yml
@@ -0,0 +1,297 @@
+---
+pl:
+  goals:
+    color_picker:
+      trigger_label: Wybierz kolor i ikonę
+      color_heading: Kolor
+      icon_heading: Ikona
+      poor_contrast: Słaby kontrast, wybierz ciemniejszy kolor lub
+      auto_adjust: automatycznie dostosuj.
+    index:
+      title: Cele
+      subtitle: Oszczędzaj na to, co ważne.
+      new_goal: Nowy cel
+      empty_filtered: Brak pasujących celów.
+      pending_pledges_callout: Masz oczekujące zobowiązania. Sure potwierdzi je przy następnej synchronizacji.
+      kpi:
+        contributed_label: Wpłacono · ostatnie 30 dni
+        velocity_delta_up: "↑ %{percent}% vs. poprzednie 30 dni"
+        velocity_delta_down: "↓ %{percent}% vs. poprzednie 30 dni"
+        velocity_delta_flat: vs. poprzednie 30 dni
+        velocity_delta_zero_base: Pierwsze 30 dni aktywności
+        needs_this_month_label: Potrzeba w tym miesiącu
+        needs_this_month_sub:
+          one: 1 cel w tyle za tempem
+          few: "%{count} cele w tyle za tempem"
+          many: "%{count} celów w tyle za tempem"
+          other: "%{count} celu w tyle za tempem"
+        needs_this_month_zero_sub: Żaden cel nie jest w tyle
+        on_track_label: Cele na dobrej drodze
+        on_track_value: "%{on_track} z %{total}"
+        on_track_sub_parts:
+          reached:
+            one: 1 osiągnięty
+            few: "%{count} osiągnięte"
+            many: "%{count} osiągniętych"
+            other: "%{count} osiągniętego"
+          behind:
+            one: 1 w tyle
+            few: "%{count} w tyle"
+            many: "%{count} w tyle"
+            other: "%{count} w tyle"
+          no_date:
+            one: 1 bez terminu
+            few: "%{count} bez terminu"
+            many: "%{count} bez terminu"
+            other: "%{count} bez terminu"
+          paused:
+            one: 1 wstrzymany
+            few: "%{count} wstrzymane"
+            many: "%{count} wstrzymanych"
+            other: "%{count} wstrzymanego"
+        on_track_sub_all_good: Wszystkie aktywne cele na dobrej drodze
+        on_track_all_caught_up: Wszystko nadrobione
+      goals_section:
+        heading: Cele
+        subtitle: Oszczędzaj na to, co ważne.
+      ongoing_section:
+        heading: Cele
+      archived_section:
+        heading: Zarchiwizowane
+      search:
+        placeholder: Szukaj celów...
+        aria_label: Szukaj celów
+        empty: Brak pasujących celów.
+        empty_with_query: "Brak celów pasujących do \"%{query}\"."
+        empty_with_filter: Żaden cel nie pasuje do tego filtra.
+        empty_with_both: "Brak celów pasujących do \"%{query}\" z tym filtrem."
+        clear_search: Wyczyść wyszukiwanie
+        show_all: Pokaż wszystkie
+      chips:
+        all: Wszystkie
+        on_track: Na dobrej drodze
+        behind: W tyle
+        no_target_date: Otwarte
+        paused: Wstrzymane
+        completed: Zakończone
+    new:
+      heading: Nowy cel
+      subtitle: Oszczędzaj na coś konkretnego.
+    edit:
+      heading: Edytuj cel
+      save: Zapisz zmiany
+    create:
+      success: Cel utworzony.
+    update:
+      success: Cel zaktualizowany.
+    destroy:
+      success: Cel usunięty.
+      archive_first: Zarchiwizuj cel przed jego usunięciem.
+    pause:
+      success: Cel wstrzymany.
+      invalid_transition: Cel nie może być wstrzymany z bieżącego stanu.
+    resume:
+      success: Cel wznowiony.
+      invalid_transition: Cel nie może być wznowiony z bieżącego stanu.
+    complete:
+      success: Cel oznaczony jako zakończony.
+      invalid_transition: Cel nie może być zakończony z bieżącego stanu.
+    archive:
+      success: Cel zarchiwizowany.
+      invalid_transition: Cel nie może być zarchiwizowany z bieżącego stanu.
+    unarchive:
+      success: Cel przywrócony.
+      invalid_transition: Cel nie może być przywrócony z bieżącego stanu.
+    reopen:
+      success: Cel otwarty ponownie.
+      invalid_transition: Cel nie może być ponownie otwarty z bieżącego stanu.
+    show:
+      edit: Edytuj
+      pause: Wstrzymaj
+      resume: Wznów
+      complete: Oznacz jako zakończony
+      archive: Archiwizuj
+      unarchive: Przywróć
+      reopen: Otwórz ponownie
+      delete: Usuń na stałe
+      record_pledge_cta: Zapisz zobowiązanie
+      pledge_just_transferred: Zarejestruj wykonany przelew
+      pledge_just_saved: Zarejestruj odłożone pieniądze
+      funding_accounts_heading: Konta finansujące
+      funding_accounts:
+        earmarked_of: "%{earmarked} przeznaczone z %{balance}"
+        empty:
+          heading: Brak powiązanych kont finansujących
+          body: Edytuj cel, aby powiązać konta depozytowe, na które oszczędzasz.
+      notes: Notatki
+      funding_last_30d: ostatnie 30 dni
+      funding_last_90d: ostatnie 90 dni
+      status_callout:
+        behind: "oszczędzaj %{amount}/mies. więcej, aby nadrobić"
+        behind_covered: "oczekujące zobowiązania wypełniają lukę"
+        on_track: "osiąga cel około %{date}"
+        no_target_date: "ustaw datę docelową, aby przewidzieć metę"
+      pending_pledge:
+        title:
+          zero: "Oczekujące: %{amount} na %{account} · wygasa dzisiaj"
+          one: "Oczekujące: %{amount} na %{account} · 1 dzień"
+          few: "Oczekujące: %{amount} na %{account} · %{count} dni"
+          many: "Oczekujące: %{amount} na %{account} · %{count} dni"
+          other: "Oczekujące: %{amount} na %{account} · %{count} dni"
+        body_transfer: Automatycznie potwierdza się, gdy Sure wykryje pasujący depozyt przy następnej synchronizacji.
+        body_manual: Potwierdza się przy następnej ręcznej edycji salda.
+        pledged_at: "Zobowiązano %{time_ago} temu"
+        extend: Przedłuż o 7 dni
+        cancel: Anuluj
+        confirm_cancel_title: Anulować to zobowiązanie?
+        confirm_cancel_body: "Zobowiązanie %{amount} zostanie usunięte. Możesz w każdej chwili dodać nowe."
+        confirm_cancel_cta: Anuluj zobowiązanie
+      header:
+        target: "Cel %{amount}"
+        target_by: "Cel %{amount} do %{date}"
+        target_by_past: "Cel %{amount} · termin upłynął %{date}"
+      ring:
+        saved: Zaoszczędzono
+        of: "z %{target}"
+        to_go: "Pozostało %{amount}"
+        of_target: z celu
+        market_value: "Wartość rynkowa %{amount}"
+        aria_label: "Cel ukończony w %{percent}%. Zaoszczędzono %{amount} z %{target}."
+      projection:
+        heading: Prognoza
+        legend_saved: Zaoszczędzono
+        legend_projection: Prognoza
+        legend_required: Wymagane
+        reached: Osiągnąłeś cel. Prognoza nie jest potrzebna.
+        no_target_date: Nie ustawiono daty docelowej. Ustaw ją, aby przewidzieć metę.
+        no_pace: Brak wpłat. Dodaj pieniądze na powiązane konto, aby rozpocząć prognozę.
+        behind: Przy obecnym tempie brakuje do celu.
+        on_track_html: Przy obecnym tempie osiągniesz ten cel około <strong class="text-primary whitespace-nowrap">%{date}</strong>.
+        aria_label: "Wykres prognozy dla %{name}"
+        today_marker: Dzisiaj
+        tooltip_projected: "Prognoza: %{amount}"
+        tooltip_saved: "Zaoszczędzono: %{amount}"
+        tooltip_target_relation: "%{percent}% z celu %{target}"
+      catch_up:
+        title: "Oszczędzaj %{amount}/mies. więcej, aby nadrobić"
+        body: "Obecne tempo %{avg}/mies. · wymagane %{required}/mies. do osiągnięcia celu."
+        adjust_target_cta: Zamiast tego dostosuj cel
+      confirm_complete_title: Oznaczyć ten cel jako zakończony?
+      confirm_complete_body: Opuści listę aktywnych. Nadal możesz go później zarchiwizować lub przywrócić.
+      confirm_complete_body_short: "Jesteś na %{progress}%, %{saved} z %{target}. Oznaczenie jako zakończone zapisze to jako osiągnięcie zamiast pierwotnego celu. Kontynuować, czy zamknąć i dostosować cel?"
+      confirm_complete_cta: Oznacz jako zakończone
+      confirm_archive_title: Zarchiwizować ten cel?
+      confirm_archive_body: Zarchiwizowane cele znikną z głównej listy. Możesz je później przywrócić.
+      confirm_archive_cta: Archiwizuj
+      paused_banner:
+        title: Ten cel jest wstrzymany
+        body: Wznów go, aby kontynuować śledzenie postępów.
+        resume_cta: Wznów cel
+      archived_banner:
+        title: Ten cel jest zarchiwizowany
+        body: Przywróć go, aby kontynuować wpłaty, lub pozostaw jako zapis.
+        restore_cta: Przywróć cel
+      celebration:
+        heading: Cel osiągnięty. Dobra robota.
+        body: "Cel zamknięty na %{saved} z %{target}. Zachowaj go jako zapis lub zarchiwizuj teraz."
+        archive_cta: Archiwizuj cel
+      inactive:
+        heading_paused: Ten cel jest wstrzymany
+        heading_archived: Ten cel jest zarchiwizowany
+        body: "%{saved} z %{target} zaoszczędzonych do tej pory."
+      no_target_date:
+        heading: Dodaj datę docelową
+        body: Ustaw termin, aby przewidzieć metę i śledzić wymagane tempo.
+        cta: Ustaw datę docelową
+      empty:
+        heading: Brak wpłat
+        body: Wykonaj przelew na swoje powiązane konto. Sure wykryje go przy następnej synchronizacji. Lub zaktualizuj saldo ręcznego konta.
+    errors:
+      not_found: Ten cel nie został znaleziony. Mógł zostać usunięty.
+    states:
+      active: Aktywny
+      paused: Wstrzymany
+      completed: Zakończony
+      archived: Zarchiwizowany
+    status:
+      on_track: Na dobrej drodze
+      behind: W tyle
+      reached: Osiągnięty
+      completed: Zakończony
+      no_target_date: Otwarty
+      paused: Wstrzymany
+      archived: Zarchiwizowany
+    empty_state:
+      heading: Brak celów
+      body: Ustaw cel, połącz konta, na które oszczędzasz, i obserwuj, jak rosną postępy.
+      subtitle: Ustaw cel i zacznij oszczędzać.
+      new_goal: Utwórz pierwszy cel
+      no_depository_accounts: Potrzebujesz co najmniej jednego konta depozytowego (czekowe, oszczędnościowe, HSA, CD, rynek pieniężny) przed utworzeniem celu.
+      add_account: Dodaj konto
+    goal_card:
+      no_accounts: Brak połączonych kont
+      n_accounts: "%{first} +%{count}"
+      left: zostało
+      aria_progress: "%{percent}% z %{target}"
+      accounts:
+        few: "%{count} konta"
+        many: "%{count} kont"
+        one: 1 konto
+        other: "%{count} kont"
+      no_target_date: Otwarty
+      completed: Zakończony
+      past_due: Po terminie
+      days_left:
+        few: "%{count} dni"
+        many: "%{count} dni"
+        one: 1 dzień
+        other: "%{count} dni"
+      pace_with_target: "%{avg}/mies. · cel %{target}/mies."
+      pace_no_target: "średnio %{avg}/mies."
+      footer_paused: Wstrzymany
+      footer_archived: Zarchiwizowany
+      footer_reached: Cel osiągnięty
+      footer_catch_up: "Oszczędzaj %{amount}/mies., aby nadrobić"
+      footer_no_deadline: Otwarty
+      pending_pledge: Oczekujące zobowiązanie
+      pending_count:
+        few: "%{count} oczekujące"
+        many: "%{count} oczekujących"
+        one: 1 oczekujące
+        other: "%{count} oczekujących"
+      footer_no_pledges: Brak dopasowanych zobowiązań
+      footer_last_today: Ostatnie zobowiązanie dopasowane dzisiaj
+      footer_last_days:
+        few: "Ostatnie zobowiązanie dopasowane %{count} dni temu"
+        many: "Ostatnie zobowiązanie dopasowane %{count} dni temu"
+        one: Ostatnie zobowiązanie dopasowane 1 dzień temu
+        other: "Ostatnie zobowiązanie dopasowane %{count} dni temu"
+    form:
+      create: Utwórz cel
+      save: Zapisz zmiany
+      suggested_with_date: "Oszczędzaj {monthly}/mies. na {accounts}, aby osiągnąć cel na czas."
+      suggested_no_date: Ustaw datę docelową, aby przewidzieć metę.
+      errors:
+        name_required: Nadaj celowi nazwę.
+        amount_required: Ustaw cel powyżej zera.
+        accounts_required: Wybierz co najmniej jedno konto finansujące.
+      fields:
+        name: Nazwa
+        name_placeholder: Fundusz awaryjny, zaliczka na dom...
+        target_amount: Kwota docelowa
+        target_date: Data docelowa
+        color: Kolor
+        notes: Notatki (opcjonalnie)
+        notes_placeholder: Przypomnienie dla przyszłego Ciebie...
+        funding_accounts: Konta finansujące
+        funding_accounts_hint: Saldo tego celu to saldo (lub przeznaczona część) tych kont.
+        whole_balance: Całe saldo
+        earmark_for: Przeznacz kwotę dla %{account}
+        earmark_hint: Pozostaw kwotę pustą, aby przeznaczyć całe saldo konta.
+      subtypes:
+        checking: Czekowe
+        savings: Oszczędnościowe
+        hsa: HSA
+        cd: CD
+        money_market: Rynek pieniężny
+        other: Inne
diff --git a/config/locales/views/goals/ru.yml b/config/locales/views/goals/ru.yml
new file mode 100644
index 000000000..5ab84f351
--- /dev/null
+++ b/config/locales/views/goals/ru.yml
@@ -0,0 +1,265 @@
+---
+ru:
+  goals:
+    archive:
+      invalid_transition: Нельзя архивировать цель в текущем состоянии.
+      success: Цель архивирована.
+    color_picker:
+      auto_adjust: автонастройка.
+      color_heading: Цвет
+      icon_heading: Иконка
+      poor_contrast: Низкий контраст, выберите более тёмный цвет или
+      trigger_label: Выбрать цвет и иконку
+    complete:
+      invalid_transition: Нельзя завершить цель в текущем состоянии.
+      success: Цель отмечена как выполненная.
+    create:
+      success: Цель создана.
+    destroy:
+      archive_first: Сначала архивируйте цель перед удалением.
+      success: Цель удалена.
+    edit:
+      heading: Редактировать цель
+      save: Сохранить изменения
+    empty_state:
+      add_account: Добавить счёт
+      body: Установите цель, выберите счета для накоплений и отслеживайте прогресс.
+      heading: Пока нет целей
+      new_goal: Создать первую цель
+      no_depository_accounts: Перед созданием цели нужен хотя бы один счёт (расчётный, сберегательный и т.д.).
+      subtitle: Установите цель и начните копить.
+    errors:
+      not_found: Цель не найдена. Возможно, она была удалена.
+    form:
+      create: Создать цель
+      errors:
+        accounts_required: Выберите хотя бы один счёт.
+        amount_required: Укажите цель больше нуля.
+        name_required: Укажите название цели.
+      fields:
+        color: Цвет
+        earmark_for: Зарезервировать сумму для %{account}
+        earmark_hint: Оставьте пустым, чтобы использовать весь баланс счёта.
+        funding_accounts: Счета для накоплений
+        funding_accounts_hint: Баланс цели — это баланс (или часть) этих счетов.
+        name: Название
+        name_placeholder: Финансовая подушка, первоначальный взнос…
+        notes: Заметки (необязательно)
+        notes_placeholder: Напоминание себе…
+        target_amount: Целевая сумма
+        target_date: Дата достижения
+        whole_balance: Весь баланс
+      save: Сохранить изменения
+      subtypes:
+        cd: Срочный вклад
+        checking: Расчётный счёт
+        hsa: Медицинский сберегательный счёт
+        money_market: Накопительный счёт
+        other: Другое
+        savings: Сберегательный счёт
+      suggested_no_date: Укажите дату, чтобы рассчитать срок достижения.
+      suggested_with_date: Откладывайте {monthly}/мес. на {accounts}, чтобы уложиться в срок.
+    goal_card:
+      accounts:
+        one: "%{count} счёт"
+        few: "%{count} счёта"
+        many: "%{count} счетов"
+        other: "%{count} счёта"
+      aria_progress: "%{percent}% от %{target}"
+      completed: Выполнено
+      days_left:
+        one: "%{count} день остался"
+        few: "%{count} дня осталось"
+        many: "%{count} дней осталось"
+        other: "%{count} дня осталось"
+      footer_archived: Архив
+      footer_catch_up: Откладывайте %{amount}/мес., чтобы наверстать
+      footer_last_days:
+        one: Последнее пополнение %{count} день назад
+        few: Последнее пополнение %{count} дня назад
+        many: Последнее пополнение %{count} дней назад
+        other: Последнее пополнение %{count} дня назад
+      footer_last_today: Последнее пополнение сегодня
+      footer_no_deadline: Без срока
+      footer_no_pledges: Пока нет пополнений
+      footer_paused: Пауза
+      footer_reached: Цель достигнута
+      left: осталось
+      n_accounts: "%{first} +%{count}"
+      no_accounts: Нет привязанных счетов
+      no_target_date: Без срока
+      pace_no_target: "%{avg}/мес."
+      pace_with_target: "%{avg}/мес. · цель %{target}/мес."
+      past_due: Просрочено
+      pending_count:
+        one: "%{count} в ожидании"
+        few: "%{count} в ожидании"
+        many: "%{count} в ожидании"
+        other: "%{count} в ожидании"
+      pending_pledge: Ожидаемое пополнение
+    index:
+      archived_section:
+        heading: Архив
+      chips:
+        all: Все
+        behind: Отставание
+        completed: Выполненные
+        no_target_date: Без срока
+        on_track: По плану
+        paused: Пауза
+      empty_filtered: Нет подходящих целей.
+      goals_section:
+        heading: Цели
+        subtitle: Копите на важное.
+      kpi:
+        contributed_label: Пополнено · за 30 дней
+        needs_this_month_label: Требуется в этом месяце
+        needs_this_month_sub:
+          one: "%{count} цель отстаёт"
+          few: "%{count} цели отстают"
+          many: "%{count} целей отстают"
+          other: "%{count} цели отстают"
+        needs_this_month_zero_sub: Нет отстающих целей
+        on_track_all_caught_up: Всё по плану
+        on_track_label: Цели по плану
+        on_track_sub_all_good: Все активные цели идут по плану
+        on_track_sub_parts:
+          behind:
+            one: "%{count} отстаёт"
+            few: "%{count} отстают"
+            many: "%{count} отстают"
+            other: "%{count} отстают"
+          no_date:
+            one: "%{count} без срока"
+            few: "%{count} без срока"
+            many: "%{count} без срока"
+            other: "%{count} без срока"
+          paused:
+            one: "%{count} на паузе"
+            few: "%{count} на паузе"
+            many: "%{count} на паузе"
+            other: "%{count} на паузе"
+          reached:
+            one: "%{count} достигнута"
+            few: "%{count} достигнуты"
+            many: "%{count} достигнуты"
+            other: "%{count} достигнуты"
+        on_track_value: "%{on_track} из %{total}"
+        velocity_delta_down: "↓ %{percent}%% к предыдущим 30 дн."
+        velocity_delta_flat: к предыдущим 30 дн.
+        velocity_delta_up: "↑ %{percent}%% к предыдущим 30 дн."
+        velocity_delta_zero_base: Первые 30 дней активности
+      new_goal: Новая цель
+      ongoing_section:
+        heading: Цели
+      pending_pledges_callout: У вас есть ожидаемые пополнения. Они подтвердятся при следующей синхронизации.
+      search:
+        aria_label: Поиск целей
+        clear_search: Очистить поиск
+        empty: Нет подходящих целей.
+        empty_with_both: Нет целей по запросу "%{query}" с этим фильтром.
+        empty_with_filter: Нет целей для этого фильтра.
+        empty_with_query: Нет целей по запросу "%{query}".
+        placeholder: Поиск целей…
+        show_all: Показать все
+      subtitle: Копите на важное.
+      title: Цели
+    new:
+      heading: Новая цель
+      subtitle: Копите на конкретную цель.
+    pause:
+      invalid_transition: Нельзя поставить цель на паузу в текущем состоянии.
+      success: Цель поставлена на паузу.
+    reopen:
+      invalid_transition: Нельзя открыть цель в текущем состоянии.
+      success: Цель открыта снова.
+    resume:
+      invalid_transition: Нельзя возобновить цель в текущем состоянии.
+      success: Цель возобновлена.
+    show:
+      archive: Архивировать
+      archived_banner:
+        body: Восстановите цель, чтобы продолжить накопления, или оставьте как запись.
+        restore_cta: Восстановить цель
+        title: Цель в архиве
+      catch_up:
+        adjust_target_cta: Изменить цель
+        body: Текущий темп %{avg}/мес. · требуется %{required}/мес.
+        title: Откладывайте %{amount}/мес. больше
+      celebration:
+        archive_cta: Архивировать цель
+        body: Накоплено %{saved} из %{target}.
+        heading: Цель достигнута
+      complete: Отметить выполненной
+      confirm_archive_body: Архивные цели скрываются из списка. Их можно восстановить позже.
+      confirm_archive_cta: Архивировать
+      confirm_archive_title: Архивировать цель?
+      confirm_complete_body: Цель исчезнет из активных.
+      confirm_complete_body_short: Вы достигли %{progress}%, %{saved} из %{target}.
+      confirm_complete_cta: Отметить выполненной
+      confirm_complete_title: Завершить цель?
+      delete: Удалить
+      edit: Редактировать
+      empty:
+        body: Пополните счёт — данные появятся после синхронизации.
+        heading: Пока нет пополнений
+      funding_accounts:
+        earmarked_of: "%{earmarked} из %{balance}"
+        empty:
+          body: Добавьте счета для накоплений.
+          heading: Нет счетов
+      funding_accounts_heading: Счета
+      funding_last_30d: за 30 дней
+      funding_last_90d: за 90 дней
+      header:
+        target: Цель %{amount}
+        target_by: Цель %{amount} к %{date}
+        target_by_past: Цель %{amount} · срок прошёл %{date}
+      inactive:
+        body: Накоплено %{saved} из %{target}.
+        heading_archived: Цель в архиве
+        heading_paused: Цель на паузе
+      no_target_date:
+        body: Укажите дату для прогноза.
+        cta: Указать дату
+        heading: Добавьте дату
+      notes: Заметки
+      pause: Пауза
+      paused_banner:
+        body: Возобновите, чтобы продолжить отслеживание.
+        resume_cta: Возобновить
+        title: Цель на паузе
+      record_pledge_cta: Добавить пополнение
+      reopen: Открыть снова
+      resume: Возобновить
+      ring:
+        aria_label: Выполнено %{percent}%. %{amount} из %{target}
+        market_value: Текущая стоимость %{amount}
+        of: из %{target}
+        of_target: от цели
+        saved: Накоплено
+        to_go: Осталось %{amount}
+      status_callout:
+        behind: откладывайте %{amount}/мес. больше
+        behind_covered: ожидаемые пополнения покроют разницу
+        no_target_date: укажите дату
+        on_track: достижение около %{date}
+      unarchive: Восстановить
+    states:
+      active: Активна
+      archived: В архиве
+      completed: Выполнена
+      paused: На паузе
+    status:
+      archived: В архиве
+      behind: Отстаёт
+      completed: Выполнена
+      no_target_date: Без срока
+      on_track: По плану
+      paused: На паузе
+      reached: Достигнута
+    unarchive:
+      invalid_transition: Нельзя восстановить цель в текущем состоянии.
+      success: Цель восстановлена.
+    update:
+      success: Цель обновлена.
\ No newline at end of file
diff --git a/config/locales/views/goals/tr.yml b/config/locales/views/goals/tr.yml
new file mode 100644
index 000000000..961d60fd0
--- /dev/null
+++ b/config/locales/views/goals/tr.yml
@@ -0,0 +1,295 @@
+---
+tr:
+  goals:
+    archive:
+      invalid_transition: Hedef mevcut durumundan arşivlenemez.
+      success: Hedef arşivlendi.
+    color_picker:
+      auto_adjust: otomatik ayarla.
+      color_heading: Renk
+      icon_heading: Simge
+      poor_contrast: Kontrast düşük, daha koyu bir renk seçin veya
+      trigger_label: Renk ve simge seçin
+    complete:
+      invalid_transition: Hedef mevcut durumundan tamamlanamaz.
+      success: Hedef tamamlandı olarak işaretlendi.
+    create:
+      success: Hedef oluşturuldu.
+    destroy:
+      archive_first: Hedefi silmeden önce arşivleyin.
+      success: Hedef silindi.
+    edit:
+      heading: Hedefi düzenle
+      save: Değişiklikleri kaydet
+    empty_state:
+      add_account: Hesap ekle
+      body: Bir hedef belirleyin, biriktirdiğiniz hesapları bağlayın ve ilerlemenizi
+        izleyin.
+      heading: Henüz hedef yok
+      new_goal: İlk hedefinizi oluşturun
+      no_depository_accounts: Bir hedef oluşturmadan önce en az bir mevduat hesabına
+        (vadesiz, vadeli, HSA, CD, para piyasası) ihtiyacınız var.
+      subtitle: Bir hedef belirleyin ve ona doğru birikime başlayın.
+    errors:
+      not_found: Bu hedef bulunamadı. Silinmiş olabilir.
+    form:
+      create: Hedef oluştur
+      errors:
+        accounts_required: En az bir kaynak hesap seçin.
+        amount_required: Sıfırdan büyük bir hedef belirleyin.
+        name_required: Hedefinize bir ad verin.
+      fields:
+        color: Renk
+        earmark_for: "%{account} için ayrılan tutar"
+        earmark_hint: Hesabın tüm bakiyesini ayırmak için tutarı boş bırakın.
+        funding_accounts: Kaynak hesaplar
+        funding_accounts_hint: Bu hedefin bakiyesi, bu hesapların bakiyesi (veya ayrılan
+          kısmı) kadardır.
+        name: Ad
+        name_placeholder: Acil durum fonu, Ev peşinatı…
+        notes: Notlar (isteğe bağlı)
+        notes_placeholder: Gelecekteki siz için bir hatırlatma…
+        target_amount: Hedef tutar
+        target_date: Hedef tarihi
+        whole_balance: Tüm bakiye
+      save: Değişiklikleri kaydet
+      subtypes:
+        cd: CD
+        checking: Vadesiz hesap
+        hsa: HSA
+        money_market: Para piyasası
+        other: Diğer
+        savings: Tasarruf
+      suggested_no_date: Bitiş tarihini öngörmek için bir hedef tarihi belirleyin.
+      suggested_with_date: Zamanında ulaşmak için {accounts} hesaplarında ayda {monthly}
+        biriktirin.
+    goal_card:
+      accounts:
+        one: 1 hesap
+        other: "%{count} hesap"
+      aria_progress: "%{target}'in %{percent}%'i"
+      completed: Tamamlandı
+      days_left:
+        one: 1 gün kaldı
+        other: "%{count} gün kaldı"
+      footer_archived: Arşivlendi
+      footer_catch_up: Yakalamak için ayda %{amount} biriktirin
+      footer_last_days:
+        one: Son taahhüt 1 gün önce eşleşti
+        other: Son taahhüt %{count} gün önce eşleşti
+      footer_last_today: Son taahhüt bugün eşleşti
+      footer_no_deadline: Açık
+      footer_no_pledges: Henüz eşleşen taahhüt yok
+      footer_paused: Duraklatıldı
+      footer_reached: Hedefe ulaşıldı
+      left: kaldı
+      n_accounts: "%{first} +%{count}"
+      no_accounts: Bağlı hesap yok
+      no_target_date: Açık
+      pace_no_target: ortalama %{avg}/ay
+      pace_with_target: "%{avg}/ay · hedef %{target}/ay"
+      past_due: Süresi geçti
+      pending_count:
+        one: 1 bekleyen
+        other: "%{count} bekleyen"
+      pending_pledge: Bekleyen taahhüt
+    index:
+      archived_section:
+        heading: Arşivlenmiş
+      chips:
+        all: Tümü
+        behind: Geride
+        completed: Tamamlandı
+        no_target_date: Açık
+        on_track: Yolunda
+        paused: Duraklatıldı
+      empty_filtered: Eşleşen hedef yok.
+      goals_section:
+        heading: Hedefler
+        subtitle: Önemli olan şey için biriktirin.
+      kpi:
+        contributed_label: Katkı · son 30 gün
+        needs_this_month_label: Bu ay gerekli
+        needs_this_month_sub:
+          one: 1 hedef geride
+          other: "%{count} hedef geride"
+        needs_this_month_zero_sub: Geride kalan hedef yok
+        on_track_all_caught_up: Hepsi yakalandı
+        on_track_label: Yolunda giden hedefler
+        on_track_sub_all_good: Tüm aktif hedefler yolunda
+        on_track_sub_parts:
+          behind:
+            one: 1 geride
+            other: "%{count} geride"
+          no_date:
+            one: 1 tarihsiz
+            other: "%{count} tarihsiz"
+          paused:
+            one: 1 duraklatıldı
+            other: "%{count} duraklatıldı"
+          reached:
+            one: 1 ulaşıldı
+            other: "%{count} ulaşıldı"
+        on_track_value: "%{total} içinden %{on_track}"
+        velocity_delta_down: "↓ %{percent}% önceki 30 güne göre"
+        velocity_delta_flat: önceki 30 güne göre
+        velocity_delta_up: "↑ %{percent}% önceki 30 güne göre"
+        velocity_delta_zero_base: İlk 30 günlük hareket
+      new_goal: Yeni hedef
+      ongoing_section:
+        heading: Hedefler
+      pending_pledges_callout: Bekleyen taahhütleriniz var. Sure bir sonraki eşitlemede
+        bunları onaylayacak.
+      search:
+        aria_label: Hedeflerde ara
+        clear_search: Aramayı temizle
+        empty: Eşleşen hedef yok.
+        empty_with_both: Bu filtreyle "%{query}" ile eşleşen hedef yok.
+        empty_with_filter: Bu filtreyle eşleşen hedef yok.
+        empty_with_query: '"%{query}" ile eşleşen hedef yok.'
+        placeholder: Hedeflerde ara…
+        show_all: Tümünü göster
+      subtitle: Önemli olan şey için biriktirin.
+      title: Hedefler
+    new:
+      heading: Yeni hedef
+      subtitle: Belirli bir şey için biriktirin.
+    pause:
+      invalid_transition: Hedef mevcut durumundan duraklatılamaz.
+      success: Hedef duraklatıldı.
+    reopen:
+      invalid_transition: Hedef mevcut durumundan yeniden açılamaz.
+      success: Hedef yeniden açıldı.
+    resume:
+      invalid_transition: Hedef mevcut durumundan devam ettirilemez.
+      success: Hedef devam ettirildi.
+    show:
+      archive: Arşivle
+      archived_banner:
+        body: Katkıya devam etmek için geri yükleyin veya kayıt olarak bırakın.
+        restore_cta: Hedefi geri yükle
+        title: Bu hedef arşivlenmiş
+      catch_up:
+        adjust_target_cta: Bunun yerine hedefi ayarla
+        body: Mevcut hız %{avg}/ay · hedefinize ulaşmak için %{required}/ay gerekiyor.
+        title: Yakalamak için ayda %{amount} daha fazla biriktirin
+      celebration:
+        archive_cta: Hedefi arşivle
+        body: Hedef %{target} üzerinden %{saved} olarak kapatıldı. Kayıt olarak tutun
+          veya şimdi arşivleyin.
+        heading: Hedefe ulaşıldı. Tebrikler.
+      complete: Tamamlandı olarak işaretle
+      confirm_archive_body: Arşivlenen hedefler ana listeden kaybolur. Daha sonra
+        geri yükleyebilirsiniz.
+      confirm_archive_cta: Arşivle
+      confirm_archive_title: Bu hedef arşivlensin mi?
+      confirm_complete_body: Devam Eden listesinden çıkar. Daha sonra yine de arşivleyebilir
+        veya geri yükleyebilirsiniz.
+      confirm_complete_body_short: "%{progress}%'desiniz, %{target} hedefinin %{saved}
+        kadarını biriktirdiniz. Tamamlandı olarak işaretlemek bunu orijinal hedef
+        yerine başarınız olarak kaydeder. Devam edin ya da bunu kapatıp hedefi ayarlayın."
+      confirm_complete_cta: Tamamlandı olarak işaretle
+      confirm_complete_title: Bu hedef tamamlandı olarak işaretlensin mi?
+      delete: Kalıcı olarak sil
+      edit: Düzenle
+      empty:
+        body: Bağlı hesabınıza bir transfer yapın. Sure bir sonraki eşitlemede bunu
+          yakalayacak. Ya da manuel hesap bakiyenizi güncelleyin.
+        heading: Henüz yatırma yok
+      funding_accounts:
+        earmarked_of: "%{balance} bakiyenin %{earmarked} kadarı ayrıldı"
+        empty:
+          body: Biriktirdiğiniz mevduat hesaplarını bağlamak için hedefi düzenleyin.
+          heading: Henüz bağlı kaynak hesap yok
+      funding_accounts_heading: Kaynak hesaplar
+      funding_last_30d: son 30 gün
+      funding_last_90d: son 90 gün
+      header:
+        target: Hedef %{amount}
+        target_by: Hedef %{amount}, %{date} tarihine kadar
+        target_by_past: Hedef %{amount} · son tarih %{date} idi
+      inactive:
+        body: Şu ana kadar %{target} hedefinin %{saved} kadarı biriktirildi.
+        heading_archived: Bu hedef arşivlenmiş
+        heading_paused: Bu hedef duraklatılmış
+      no_target_date:
+        body: Bitiş çizgisini öngörmek ve gerekli hızı takip etmek için bir son tarih
+          belirleyin.
+        cta: Hedef tarihi belirle
+        heading: Hedef tarihi ekle
+      notes: Notlar
+      pause: Duraklat
+      paused_banner:
+        body: İlerlemenizi takip etmeye devam etmek için devam ettirin.
+        resume_cta: Hedefi devam ettir
+        title: Bu hedef duraklatılmış
+      pending_pledge:
+        body_manual: Bir sonraki manuel bakiye düzenlemenizde onaylanır.
+        body_transfer: Sure bir sonraki eşitlemede eşleşen bir yatırma tespit ettiğinde
+          otomatik olarak onaylanır.
+        cancel: İptal
+        confirm_cancel_body: "%{amount} taahhüdü kaldırılacaktır. İstediğiniz zaman
+          yeni bir tane kaydedebilirsiniz."
+        confirm_cancel_cta: Taahhüdü iptal et
+        confirm_cancel_title: Bu taahhüt iptal edilsin mi?
+        extend: 7 gün uzat
+        pledged_at: "%{time_ago} önce taahhüt edildi"
+        title:
+          one: 'Bekliyor: %{account} hesabına %{amount} · 1 gün kaldı'
+          other: 'Bekliyor: %{account} hesabına %{amount} · %{count} gün kaldı'
+          zero: 'Bekliyor: %{account} hesabına %{amount} · bugün sona eriyor'
+      pledge_just_saved: Ayırdığınız parayı kaydedin
+      pledge_just_transferred: Yaptığınız bir transferi kaydedin
+      projection:
+        aria_label: "%{name} için öngörü grafiği"
+        behind: Mevcut hızda yetersiz kalıyor.
+        heading: Öngörü
+        legend_projection: Öngörü
+        legend_required: Gerekli
+        legend_saved: Biriktirilen
+        no_pace: Henüz yatırma yok. Bir öngörü başlatmak için bağlı bir hesaba para
+          ekleyin.
+        no_target_date: Hedef tarihi belirlenmemiş. Bitiş çizgisini öngörmek için
+          bir tane belirleyin.
+        on_track_html: Mevcut hızınızla bu hedefe yaklaşık <strong class="text-primary
+          whitespace-nowrap">%{date}</strong> tarihinde ulaşacaksınız.
+        reached: Hedefe ulaştınız. Öngörüye gerek yok.
+        today_marker: Bugün
+        tooltip_projected: 'Öngörülen: %{amount}'
+        tooltip_saved: 'Biriktirilen: %{amount}'
+        tooltip_target_relation: "%{target} hedefinin %{percent}%'i"
+      record_pledge_cta: Taahhüt kaydet
+      reopen: Hedefi yeniden aç
+      resume: Devam ettir
+      ring:
+        aria_label: "Hedef %{percent}% tamamlandı. %{target} hedefinin %{amount} kadarı
+          biriktirildi."
+        market_value: Piyasa değeri %{amount}
+        of: "%{target} içinden"
+        of_target: hedeften
+        saved: Biriktirilen
+        to_go: "%{amount} kaldı"
+      status_callout:
+        behind: yakalamak için ayda %{amount} daha fazla biriktirin
+        behind_covered: bekleyen taahhütler farkı kapatıyor
+        no_target_date: bitiş çizgisini öngörmek için bir hedef tarihi belirleyin
+        on_track: hedefe yaklaşık %{date} tarihinde ulaşır
+      unarchive: Geri yükle
+    states:
+      active: Aktif
+      archived: Arşivlendi
+      completed: Tamamlandı
+      paused: Duraklatıldı
+    status:
+      archived: Arşivlendi
+      behind: Geride
+      completed: Tamamlandı
+      no_target_date: Açık
+      on_track: Yolunda
+      paused: Duraklatıldı
+      reached: Ulaşıldı
+    unarchive:
+      invalid_transition: Hedef mevcut durumundan geri yüklenemez.
+      success: Hedef geri yüklendi.
+    update:
+      success: Hedef güncellendi.
diff --git a/config/locales/views/goals/zh-CN.yml b/config/locales/views/goals/zh-CN.yml
new file mode 100644
index 000000000..6727a0f71
--- /dev/null
+++ b/config/locales/views/goals/zh-CN.yml
@@ -0,0 +1,277 @@
+---
+zh-CN:
+  goals:
+    color_picker:
+      trigger_label: 选择颜色和图标
+      color_heading: 颜色
+      icon_heading: 图标
+      poor_contrast: 对比度较低，请选择更深的颜色或
+      auto_adjust: 自动调整。
+    index:
+      title: 目标
+      subtitle: 为重要目标储蓄。
+      new_goal: 新建目标
+      empty_filtered: 没有匹配的目标。
+      pending_pledges_callout: 你有待确认的承诺。Sure 会在下次同步时确认。
+      kpi:
+        contributed_label: 已投入 · 最近 30 天
+        velocity_delta_up: 较前 30 天 ↑ %{percent}%%
+        velocity_delta_down: 较前 30 天 ↓ %{percent}%%
+        velocity_delta_flat: 相比前 30 天
+        velocity_delta_zero_base: 首个 30 天活动期
+        needs_this_month_label: 本月所需
+        needs_this_month_sub:
+          one: 1 个目标进度落后
+          other: "%{count} 个目标进度落后"
+        needs_this_month_zero_sub: 没有进度落后的目标
+        on_track_label: 进度正常的目标
+        on_track_value: "%{total} 个中 %{on_track} 个"
+        on_track_sub_parts:
+          reached:
+            one: 1 个已达成
+            other: "%{count} 个已达成"
+          behind:
+            one: 1 个落后
+            other: "%{count} 个落后"
+          no_date:
+            one: 1 个没有截止日期
+            other: "%{count} 个没有截止日期"
+          paused:
+            one: 1 个已暂停
+            other: "%{count} 个已暂停"
+        on_track_sub_all_good: 所有进行中的目标进度正常
+        on_track_all_caught_up: 全部已赶上进度
+      goals_section:
+        heading: 目标
+        subtitle: 为重要目标储蓄。
+      ongoing_section:
+        heading: 目标
+      archived_section:
+        heading: 已归档
+      search:
+        placeholder: 搜索目标…
+        aria_label: 搜索目标
+        empty: 没有匹配的目标。
+        empty_with_query: 没有与“%{query}”匹配的目标。
+        empty_with_filter: 没有目标匹配此筛选条件。
+        empty_with_both: 此筛选条件下没有与“%{query}”匹配的目标。
+        clear_search: 清除搜索
+        show_all: 显示全部
+      chips:
+        all: 全部
+        on_track: 进度正常
+        behind: 进度落后
+        no_target_date: 开放
+        paused: 已暂停
+        completed: 已完成
+    new:
+      heading: 新建目标
+      subtitle: 为具体目标储蓄。
+    edit:
+      heading: 编辑目标
+      save: 保存更改
+    create:
+      success: 目标已创建。
+    update:
+      success: 目标已更新。
+    destroy:
+      success: 目标已删除。
+      archive_first: 删除前请先归档该目标。
+    pause:
+      success: 目标已暂停。
+      invalid_transition: 目标当前状态不能暂停。
+    resume:
+      success: 目标已恢复。
+      invalid_transition: 目标当前状态不能恢复。
+    complete:
+      success: 目标已标记为完成。
+      invalid_transition: 目标当前状态不能标记为完成。
+    archive:
+      success: 目标已归档。
+      invalid_transition: 目标当前状态不能归档。
+    unarchive:
+      success: 目标已恢复。
+      invalid_transition: 目标当前状态不能恢复。
+    reopen:
+      success: 目标已重新开启。
+      invalid_transition: 目标当前状态无法重新开启。
+    show:
+      edit: 编辑
+      pause: 暂停
+      resume: 恢复
+      complete: 标记完成
+      archive: 归档
+      unarchive: 恢复
+      reopen: 重新开启目标
+      delete: 永久删除
+      record_pledge_cta: 记录承诺
+      pledge_just_transferred: 记录你完成的转账
+      pledge_just_saved: 记录你留出的资金
+      funding_accounts_heading: 资金账户
+      funding_accounts:
+        earmarked_of: 已预留 %{earmarked}（共 %{balance}）
+        empty:
+          heading: 尚未关联资金账户
+          body: 编辑目标以关联用于储蓄的存款账户。
+      notes: 备注
+      funding_last_30d: 最近 30 天
+      funding_last_90d: 最近 90 天
+      status_callout:
+        behind: 每月多存 %{amount} 以赶上进度
+        behind_covered: 待确认承诺可以补足差距
+        on_track: 预计在 %{date} 左右达成目标
+        no_target_date: 设置目标日期以预测完成时间
+      pending_pledge:
+        title:
+          zero: 待确认：%{amount} 存入 %{account} · 今天过期
+          one: 待确认：%{amount} 存入 %{account} · 剩余 1 天
+          other: 待确认：%{amount} 存入 %{account} · 剩余 %{count} 天
+        body_transfer: Sure 在下次同步发现匹配存款时会自动确认。
+        body_manual: 会在你下次手动编辑余额时确认。
+        pledged_at: "%{time_ago} 前承诺"
+        extend: 延长 7 天
+        cancel: 取消
+        confirm_cancel_title: 取消此承诺？
+        confirm_cancel_body: "%{amount} 的承诺将被移除。你可以随时记录新的承诺。"
+        confirm_cancel_cta: 取消承诺
+      header:
+        target: 目标 %{amount}
+        target_by: 到 %{date} 达到 %{amount}
+        target_by_past: 目标 %{amount} · 原定 %{date} 到期
+      ring:
+        saved: 已存
+        of: 共 %{target}
+        to_go: 还差 %{amount}
+        of_target: 目标进度
+        market_value: 市值 %{amount}
+        aria_label: 目标已完成 %{percent}%。已存 %{target} 中的 %{amount}。
+      projection:
+        heading: 预测
+        legend_saved: 已存
+        legend_projection: 预测
+        legend_required: 所需
+        reached: 你已达到目标，无需预测。
+        no_target_date: 尚未设置目标日期。设置后可预测完成时间。
+        no_pace: 还没有存入资金。向关联账户存钱后即可开始预测。
+        behind: 按当前进度会低于目标。
+        on_track_html: 按当前进度，你大约会在 <strong class="text-primary whitespace-nowrap">%{date}</strong> 达成此目标。
+        aria_label: "%{name} 的预测图表"
+        today_marker: 今天
+        tooltip_projected: 预计：%{amount}
+        tooltip_saved: 已存：%{amount}
+        tooltip_target_relation: 目标 %{target} 的 %{percent}%
+      catch_up:
+        title: 每月多存 %{amount} 以赶上进度
+        body: 当前进度 %{avg}/月 · 达成目标需要 %{required}/月。
+        adjust_target_cta: 改为调整目标
+      confirm_complete_title: 将此目标标记为完成？
+      confirm_complete_body: 完成后会从进行中的目标列表移除。之后仍可归档或恢复。
+      confirm_complete_body_short: 当前进度为 %{progress}，已存 %{saved}/%{target}。标记完成会把当前结果记录为达成值，而不是原始目标。要继续吗？
+      confirm_complete_cta: 标记完成
+      confirm_archive_title: 归档此目标？
+      confirm_archive_body: 归档后的目标会从主列表隐藏。之后可以恢复。
+      confirm_archive_cta: 归档
+      paused_banner:
+        title: 此目标已暂停
+        body: 恢复它以继续跟踪进度。
+        resume_cta: 恢复目标
+      archived_banner:
+        title: 此目标已归档
+        body: 恢复后可继续投入，也可以保留为记录。
+        restore_cta: 恢复目标
+      celebration:
+        heading: 目标已达成。做得不错。
+        body: 目标以 %{saved}/%{target} 关闭。可以保留记录，或现在归档。
+        archive_cta: 归档目标
+      inactive:
+        heading_paused: 此目标已暂停
+        heading_archived: 此目标已归档
+        body: 目前已存 %{target} 中的 %{saved}。
+      no_target_date:
+        heading: 添加目标日期
+        body: 设置截止日期以预测完成时间并跟踪所需进度。
+        cta: 设置目标日期
+      empty:
+        heading: 还没有存入资金
+        body: 向关联账户转入资金。Sure 会在下次同步时识别，或你也可以更新手动账户余额。
+    errors:
+      not_found: 找不到该目标。它可能已被删除。
+    states:
+      active: 进行中
+      paused: 已暂停
+      completed: 已完成
+      archived: 已归档
+    status:
+      on_track: 进度正常
+      behind: 进度落后
+      reached: 已达成
+      completed: 已完成
+      no_target_date: 开放
+      paused: 已暂停
+      archived: 已归档
+    empty_state:
+      heading: 还没有目标
+      body: 设定目标，关联储蓄账户，并查看进度累积。
+      subtitle: 设定目标并开始储蓄。
+      new_goal: 创建第一个目标
+      no_depository_accounts: 创建目标前至少需要一个存款账户（支票、储蓄、HSA、CD、货币市场账户）。
+      add_account: 添加账户
+    goal_card:
+      no_accounts: 没有关联账户
+      n_accounts: "%{first} +%{count}"
+      left: 剩余
+      aria_progress: "%{target} 的 %{percent}%"
+      accounts:
+        one: 1 个账户
+        other: "%{count} 个账户"
+      no_target_date: 开放
+      completed: 已完成
+      past_due: 已逾期
+      days_left:
+        one: 剩余 1 天
+        other: 剩余 %{count} 天
+      pace_with_target: 平均 %{avg}/月 · 目标 %{target}/月
+      pace_no_target: 平均 %{avg}/月
+      footer_paused: 已暂停
+      footer_archived: 已归档
+      footer_reached: 目标已达成
+      footer_catch_up: 每月存入 %{amount} 以赶上进度
+      footer_no_deadline: 开放
+      pending_pledge: 待确认承诺
+      pending_count:
+        one: 1 个待处理
+        other: "%{count} 个待处理"
+      footer_no_pledges: 暂无匹配的承诺
+      footer_last_today: 上次承诺今天已匹配
+      footer_last_days:
+        one: 上次承诺 1 天前已匹配
+        other: 上次承诺 %{count} 天前已匹配
+    form:
+      create: 创建目标
+      save: 保存更改
+      suggested_with_date: 在 {accounts} 中每月存入 {monthly} 以按时达成目标。
+      suggested_no_date: 设置目标日期以预测完成时间。
+      errors:
+        name_required: 请为目标命名。
+        amount_required: 请设置大于 0 的目标。
+        accounts_required: 请选择至少一个资金账户。
+      fields:
+        name: 名称
+        name_placeholder: 应急基金、购房首付…
+        target_amount: 目标金额
+        target_date: 目标日期
+        color: 颜色
+        notes: 备注（可选）
+        notes_placeholder: 给未来自己的提醒…
+        funding_accounts: 资金账户
+        funding_accounts_hint: 此目标余额等于这些账户的余额（或预留的部分）。
+        whole_balance: 全部余额
+        earmark_for: 为「%{account}」预留的金额
+        earmark_hint: 留空则使用该账户的全部余额。
+      subtypes:
+        checking: 支票账户
+        savings: 储蓄账户
+        hsa: HSA
+        cd: 定期存单
+        money_market: 货币市场
+        other: 其他
diff --git a/config/locales/views/holdings/fr.yml b/config/locales/views/holdings/fr.yml
index 4d2c360d0..2f92109db 100644
--- a/config/locales/views/holdings/fr.yml
+++ b/config/locales/views/holdings/fr.yml
@@ -3,98 +3,117 @@ fr:
   holdings:
     cash:
       brokerage_cash: Liquidités de courtage
-    destroy:
-      success: Avoir supprimé
-    update:
-      success: Coût de revient enregistré.
-      error: Valeur de coût de revient invalide.
-    unlock_cost_basis:
-      success: Coût de revient déverrouillé. Il pourra être mis à jour lors de la prochaine synchronisation.
-    remap_security:
-      success: Titre mis à jour avec succès.
-      security_not_found: Impossible de trouver le titre sélectionné.
-    reset_security:
-      success: Titre réinitialisé à la valeur du fournisseur.
-    sync_prices:
-      success: Données de marché synchronisées avec succès.
-      unavailable: La synchronisation des données de marché n'est pas disponible pour les titres hors ligne.
-      provider_error: Impossible de récupérer les derniers cours. Veuillez réessayer dans quelques minutes.
-    errors:
-      security_collision: "Réaffectation impossible : vous avez déjà un avoir pour %{ticker} au %{date}."
-    cost_basis_sources:
-      manual: Défini par l'utilisateur
-      calculated: À partir des transactions boursières
-      provider: Depuis le fournisseur
     cost_basis_cell:
-      unknown: "--"
-      set_cost_basis_header: "Définir le coût de revient pour %{ticker} (%{qty} actions)"
-      total_cost_basis_label: Coût de revient total
-      or_per_share_label: "Ou saisir par action :"
-      per_share: par action
       cancel: Annuler
-      save: Enregistrer
+      or_per_share_label: 'Ou saisir par action :'
+      overwrite_confirm_body: Cela remplacera le coût de revient actuel de %{current}.
       overwrite_confirm_title: Écraser le coût de revient ?
-      overwrite_confirm_body: "Cela remplacera le coût de revient actuel de %{current}."
+      per_share: par action
+      save: Enregistrer
+      set: Ensemble
+      set_cost_basis_header: Définir le coût de revient pour %{ticker} (%{qty} actions)
+      total_cost_basis_label: Coût de revient total
+      unknown: "--"
+    cost_basis_sources:
+      calculated: À partir des transactions boursières
+      manual: Défini par l'utilisateur
+      provider: Depuis le fournisseur
+    destroy:
+      cannot_delete: Vous ne pouvez pas supprimer cette exploitation
+      success: Holding supprimé
+    errors:
+      security_collision: 'Réaffectation impossible : vous avez déjà un holding pour
+        %{ticker} au %{date}.'
     holding:
+      no_cost_basis: Aucun coût de revient
       per_share: par action
       shares: "%{qty} actions"
       unknown: "--"
-      no_cost_basis: Aucun coût de revient
     index:
       average_cost: Coût moyen
-      holdings: Avoirs
+      holdings: Holdings
       name: Nom
       new_holding: Nouvelle activité
-      no_holdings: Aucun avoir à afficher.
+      no_holdings: Aucun holding à afficher.
       return: Rendement total
       weight: Poids
     missing_price_tooltip:
-      description: Cet investissement a des valeurs manquantes et nous ne pouvons pas calculer
-        son rendement ou sa valeur.
+      description: Cet investissement a des valeurs manquantes et nous ne pouvons
+        pas calculer son rendement ou sa valeur.
       missing_data: Données manquantes
+    remap_security:
+      security_not_found: Impossible de trouver le titre sélectionné.
+      success: Titre mis à jour avec succès.
+    reset_security:
+      success: Titre réinitialisé à la valeur du fournisseur.
     show:
       avg_cost_label: Coût moyen
+      book_value_label: Valeur comptable
+      cancel: Annuler
+      cost_basis_locked_description: Votre coût de revient défini manuellement ne
+        sera pas modifié par les synchronisations.
+      cost_basis_locked_label: Le coût de revient est verrouillé
       current_market_price_label: Prix de marché actuel
       delete: Supprimer
-      delete_subtitle: Cela supprimera l'avoir et toutes vos transactions boursières associées sur ce compte. Cette action ne peut pas être annulée.
-      delete_title: Supprimer l'avoir
+      delete_subtitle: Cela supprimera l'holding et toutes vos transactions boursières
+        associées sur ce compte. Cette action ne peut pas être annulée.
+      delete_title: Supprimer l'holding
       edit_security: Modifier le titre
       history: Historique
-      no_trade_history: Aucun historique de transactions boursières disponible pour cet avoir.
-      overview: Aperçu
-      portfolio_weight_label: Poids du portefeuille
-      settings: Paramètres
-      security_label: Titre
-      originally: "était %{ticker}"
-      search_security: Rechercher un titre
-      search_security_placeholder: Rechercher par ticker ou par nom
-      cancel: Annuler
-      remap_security: Enregistrer
-      provider_disabled_warning: "Mises à jour des cours en pause — le fournisseur %{provider} est désactivé. Passez à un autre fournisseur ci-dessous ou réactivez-le dans les Paramètres."
-      truncated_history_warning: "L'historique des cours n'est disponible qu'à partir du %{date}. Les dates antérieures ne disposent d'aucune donnée du fournisseur sélectionné — cela peut se produire lorsque l'actif a été coté après la date de votre transaction boursière, ou lorsque le fournisseur n'offre qu'une fenêtre historique limitée avec son forfait actuel."
-      switch_provider_label: Changer de fournisseur
-      switch_provider_description: "%{provider} est désactivé. Recherchez ce titre auprès d'un autre fournisseur activé."
-      switch_provider_button: Changer
-      no_security_provider: Aucun fournisseur de titres configuré. Impossible de rechercher des titres.
-      security_remapped_label: Titre réaffecté
-      provider_sent: "Envoyé par le fournisseur : %{ticker}"
-      reset_to_provider: Réinitialiser au fournisseur
-      reset_confirm_title: Réinitialiser le titre au fournisseur ?
-      reset_confirm_body: "Cela changera le titre de %{current} à %{original} et déplacera toutes les transactions boursières associées."
-      ticker_label: Ticker
-      trade_history_entry: "%{qty} actions de %{security} à %{price}"
-      total_return_label: Rendement total
-      unknown: Inconnu
-      cost_basis_locked_label: Le coût de revient est verrouillé
-      cost_basis_locked_description: Votre coût de revient défini manuellement ne sera pas modifié par les synchronisations.
-      unlock_cost_basis: Déverrouiller
-      unlock_confirm_title: Déverrouiller le coût de revient ?
-      unlock_confirm_body: Cela permettra au coût de revient d'être mis à jour par les synchronisations du fournisseur ou les calculs de transactions boursières.
-      shares_label: Actions
-      book_value_label: Valeur comptable
-      market_value_label: Valeur marchande
+      last_price_update: Dernière mise à jour du cours
       market_data_label: Données de marché
       market_data_sync_button: Actualiser
-      last_price_update: Dernière mise à jour du cours
-      syncing: Synchronisation…
+      market_value_label: Valeur marchande
       never: Jamais
+      no_security_provider: Aucun fournisseur de titres configuré. Impossible de rechercher
+        des titres.
+      no_trade_history: Aucun historique de transactions boursières disponible pour
+        cet holding.
+      originally: était %{ticker}
+      overview: Aperçu
+      portfolio_weight_label: Poids du portefeuille
+      provider_disabled_warning: Mises à jour des cours en pause — le fournisseur
+        %{provider} est désactivé. Passez à un autre fournisseur ci-dessous ou réactivez-le
+        dans les Paramètres.
+      provider_sent: 'Envoyé par le fournisseur : %{ticker}'
+      remap_security: Enregistrer
+      reset_confirm_body: Cela changera le titre de %{current} à %{original} et déplacera
+        toutes les transactions boursières associées.
+      reset_confirm_title: Réinitialiser le titre au fournisseur ?
+      reset_to_provider: Réinitialiser au fournisseur
+      search_security: Rechercher un titre
+      search_security_placeholder: Rechercher par ticker ou par nom
+      security_label: Titre
+      security_remapped_label: Titre réaffecté
+      settings: Paramètres
+      shares_label: Actions
+      switch_provider_button: Changer
+      switch_provider_description: "%{provider} est désactivé. Recherchez ce titre
+        auprès d'un autre fournisseur activé."
+      switch_provider_label: Changer de fournisseur
+      syncing: Synchronisation…
+      ticker_label: Ticker
+      total_return_label: Rendement total
+      trade_history_entry: "%{qty} actions de %{security} à %{price}"
+      truncated_history_warning: L'historique des cours n'est disponible qu'à partir
+        du %{date}. Les dates antérieures ne disposent d'aucune donnée du fournisseur
+        sélectionné — cela peut se produire lorsque l'actif a été coté après la date
+        de votre transaction boursière, ou lorsque le fournisseur n'offre qu'une fenêtre
+        historique limitée avec son forfait actuel.
+      unknown: Inconnu
+      unlock_confirm_body: Cela permettra au coût de revient d'être mis à jour par
+        les synchronisations du fournisseur ou les calculs de transactions boursières.
+      unlock_confirm_title: Déverrouiller le coût de revient ?
+      unlock_cost_basis: Déverrouiller
+    sync_prices:
+      provider_error: Impossible de récupérer les derniers cours. Veuillez réessayer
+        dans quelques minutes.
+      success: Données de marché synchronisées avec succès.
+      unavailable: La synchronisation des données de marché n'est pas disponible pour
+        les titres hors ligne.
+    unlock_cost_basis:
+      success: Coût de revient déverrouillé. Il pourra être mis à jour lors de la
+        prochaine synchronisation.
+    update:
+      error: Valeur de coût de revient invalide.
+      success: Coût de revient enregistré.
diff --git a/config/locales/views/holdings/it.yml b/config/locales/views/holdings/it.yml
new file mode 100644
index 000000000..d007dda8d
--- /dev/null
+++ b/config/locales/views/holdings/it.yml
@@ -0,0 +1,101 @@
+---
+it:
+  holdings:
+    cash:
+      brokerage_cash: Liquidità di conto
+    destroy:
+      success: Posizione eliminata
+      cannot_delete: Non puoi eliminare questa posizione
+    update:
+      success: Costo base salvato.
+      error: Valore del costo base non valido.
+    unlock_cost_basis:
+      success: Costo base sbloccato. Potrebbe essere aggiornato alla prossima sincronizzazione.
+    remap_security:
+      success: Titolo aggiornato con successo.
+      security_not_found: Impossibile trovare il titolo selezionato.
+    reset_security:
+      success: Titolo reimpostato al valore del provider.
+    sync_prices:
+      success: Dati di mercato sincronizzati con successo.
+      unavailable: La sincronizzazione dei dati di mercato non è disponibile per i titoli offline.
+      provider_error: Impossibile recuperare i prezzi aggiornati. Riprova tra qualche minuto.
+    errors:
+      security_collision: "Impossibile rimappare: hai già una posizione per %{ticker} in data %{date}."
+    cost_basis_sources:
+      manual: Impostato dall'utente
+      calculated: Dai movimenti
+      provider: Dal provider
+    cost_basis_cell:
+      unknown: "--"
+      set: Imposta
+      set_cost_basis_header: "Imposta costo base per %{ticker} (%{qty} azioni)"
+      total_cost_basis_label: Costo base totale
+      or_per_share_label: "Oppure inserisci per azione:"
+      per_share: per azione
+      cancel: Annulla
+      save: Salva
+      overwrite_confirm_title: Sovrascrivere il costo base?
+      overwrite_confirm_body: "Questo sostituirà il costo base attuale di %{current}."
+    holding:
+      per_share: per azione
+      shares: "%{qty} azioni"
+      unknown: "--"
+      no_cost_basis: Nessun costo base
+    index:
+      average_cost: Costo medio
+      holdings: Portafoglio
+      name: Nome
+      new_holding: Nuova attività
+      no_holdings: Nessuna posizione da mostrare.
+      return: Rendimento totale
+      weight: Peso
+    missing_price_tooltip:
+      description: Questo investimento ha valori mancanti e non è stato possibile calcolarne i rendimenti o il valore.
+      missing_data: Dati mancanti
+    show:
+      avg_cost_label: Costo Medio
+      current_market_price_label: Prezzo di Mercato Attuale
+      delete: Elimina
+      delete_subtitle: Questo eliminerà la posizione e tutti i movimenti associati su questo conto. Questa azione non può essere annullata.
+      delete_title: Elimina posizione
+      edit_security: Modifica titolo
+      history: Cronologia
+      no_trade_history: Nessuna cronologia movimenti disponibile per questa posizione.
+      overview: Panoramica
+      portfolio_weight_label: Peso in Portafoglio
+      settings: Impostazioni
+      security_label: Titolo
+      originally: "era %{ticker}"
+      search_security: Cerca titolo
+      search_security_placeholder: Cerca per simbolo o nome
+      cancel: Annulla
+      remap_security: Salva
+      provider_disabled_warning: "Aggiornamenti prezzi in pausa — il provider %{provider} è disabilitato. Passa a un altro provider qui sotto o riabilitalo nelle Impostazioni."
+      truncated_history_warning: "Lo storico dei prezzi è disponibile solo dal %{date} in poi. Le date precedenti non hanno dati dal provider selezionato — questo può succedere quando l'asset è stato quotato dopo la data del tuo acquisto, o quando il provider offre solo una finestra storica limitata nel suo piano attuale."
+      switch_provider_label: Cambia provider
+      switch_provider_description: "%{provider} è disabilitato. Cerca questo titolo su un altro provider abilitato."
+      switch_provider_button: Cambia
+      no_security_provider: Provider titoli non configurato. Impossibile cercare titoli.
+      security_remapped_label: Titolo rimappato
+      provider_sent: "Provider ha inviato: %{ticker}"
+      reset_to_provider: Reimposta al provider
+      reset_confirm_title: Reimpostare il titolo al provider?
+      reset_confirm_body: "Questo cambierà il titolo da %{current} a %{original} e sposterà tutti i movimenti associati."
+      ticker_label: Simbolo
+      trade_history_entry: "%{qty} azioni di %{security} a %{price}"
+      total_return_label: Rendimento Totale
+      unknown: Sconosciuto
+      cost_basis_locked_label: Costo base bloccato
+      cost_basis_locked_description: Il costo base impostato manualmente non verrà modificato dalle sincronizzazioni.
+      unlock_cost_basis: Sblocca
+      unlock_confirm_title: Sbloccare il costo base?
+      unlock_confirm_body: Questo permetterà al costo base di essere aggiornato dalle sincronizzazioni del provider o dai calcoli sui movimenti.
+      shares_label: Azioni
+      book_value_label: Valore di Libro
+      market_value_label: Valore di Mercato
+      market_data_label: Dati di mercato
+      market_data_sync_button: Aggiorna
+      last_price_update: Ultimo aggiornamento prezzo
+      syncing: Sincronizzazione in corso...
+      never: Mai
diff --git a/config/locales/views/holdings/ru.yml b/config/locales/views/holdings/ru.yml
new file mode 100644
index 000000000..67389bd75
--- /dev/null
+++ b/config/locales/views/holdings/ru.yml
@@ -0,0 +1,114 @@
+---
+ru:
+  holdings:
+    cash:
+      brokerage_cash: Брокерский счёт
+    cost_basis_cell:
+      cancel: Отмена
+      or_per_share_label: 'Или введите за акцию:'
+      overwrite_confirm_body: Это заменит текущую стоимость %{current}.
+      overwrite_confirm_title: Перезаписать стоимость?
+      per_share: за акцию
+      save: Сохранить
+      set: Установить
+      set_cost_basis_header: Установить стоимость для %{ticker} (%{qty} акций)
+      total_cost_basis_label: Общая стоимость
+      unknown: "--"
+    cost_basis_sources:
+      calculated: Из сделок
+      manual: Установлено пользователем
+      provider: От поставщика
+    destroy:
+      cannot_delete: Вы не можете удалить этот актив
+      success: Актив удалён
+    errors:
+      security_collision: 'Невозможно переназначить: у вас уже есть актив для %{ticker}
+        на %{date}.'
+    holding:
+      no_cost_basis: Нет стоимости
+      per_share: за акцию
+      shares: "%{qty} акций"
+      unknown: "--"
+    index:
+      average_cost: Средняя стоимость
+      holdings: Активы
+      name: Название
+      new_holding: Новая активность
+      no_holdings: Нет активов для отображения.
+      return: Общая доходность
+      weight: Доля
+    missing_price_tooltip:
+      description: У этого вложения отсутствуют значения, и мы не можем рассчитать
+        его доходность или стоимость.
+      missing_data: Отсутствуют данные
+    remap_security:
+      security_not_found: Не удалось найти выбранную ценную бумагу.
+      success: Ценная бумага успешно обновлена.
+    reset_security:
+      success: Ценная бумага сброшена до значения поставщика.
+    show:
+      avg_cost_label: Средняя стоимость
+      book_value_label: Балансовая стоимость
+      cancel: Отмена
+      cost_basis_locked_description: Ваша вручную установленная стоимость не будет
+        изменена при синхронизации.
+      cost_basis_locked_label: Стоимость заблокирована
+      current_market_price_label: Текущая рыночная цена
+      delete: Удалить
+      delete_subtitle: Это удалит актив и все связанные с ним сделки на этом счёте.
+        Это действие нельзя отменить.
+      delete_title: Удалить актив
+      edit_security: Редактировать ценную бумагу
+      history: История
+      last_price_update: Последнее обновление цены
+      market_data_label: Рыночные данные
+      market_data_sync_button: Обновить
+      market_value_label: Рыночная стоимость
+      never: Никогда
+      no_security_provider: Поставщик ценных бумаг не настроен. Невозможно искать
+        ценные бумаги.
+      no_trade_history: Нет доступной истории сделок для этого актива.
+      originally: было %{ticker}
+      overview: Обзор
+      portfolio_weight_label: Доля в портфеле
+      provider_disabled_warning: Обновления цен приостановлены — поставщик %{provider}
+        отключен. Переключитесь на другого поставщика ниже или включите его в Настройках.
+      provider_sent: 'Поставщик отправил: %{ticker}'
+      remap_security: Сохранить
+      reset_confirm_body: Это изменит ценную бумагу с %{current} обратно на %{original}
+        и переместит все связанные сделки.
+      reset_confirm_title: Сбросить ценную бумагу до поставщика?
+      reset_to_provider: Сбросить до поставщика
+      search_security: Поиск ценной бумаги
+      search_security_placeholder: Поиск по тикеру или названию
+      security_label: Ценная бумага
+      security_remapped_label: Ценная бумага переназначена
+      settings: Настройки
+      shares_label: Акции
+      switch_provider_button: Сменить
+      switch_provider_description: "%{provider} отключен. Найдите эту ценную бумагу
+        у другого включенного поставщика."
+      switch_provider_label: Сменить поставщика
+      syncing: Синхронизация...
+      ticker_label: Тикер
+      total_return_label: Общая доходность
+      trade_history_entry: "%{qty} акций %{security} по цене %{price}"
+      truncated_history_warning: История цен доступна только с %{date}. Более ранние
+        даты не содержат данных от выбранного поставщика — это может произойти, если
+        актив был добавлен после даты вашей сделки или если поставщик предлагает ограниченное
+        количество исторических данных в текущем тарифе.
+      unknown: Неизвестно
+      unlock_confirm_body: Это позволит обновлять стоимость при синхронизации с поставщиком
+        или расчётах сделок.
+      unlock_confirm_title: Разблокировать стоимость?
+      unlock_cost_basis: Разблокировать
+    sync_prices:
+      provider_error: Не удалось получить последние цены. Пожалуйста, попробуйте снова
+        через несколько минут.
+      success: Рыночные данные успешно синхронизированы.
+      unavailable: Синхронизация рыночных данных недоступна для офлайн-активов.
+    unlock_cost_basis:
+      success: Стоимость разблокирована. Она может быть обновлена при следующей синхронизации.
+    update:
+      error: Неверное значение стоимости.
+      success: Стоимость сохранена.
diff --git a/config/locales/views/holdings/tr.yml b/config/locales/views/holdings/tr.yml
index d49db1681..e9910a631 100644
--- a/config/locales/views/holdings/tr.yml
+++ b/config/locales/views/holdings/tr.yml
@@ -3,11 +3,32 @@ tr:
   holdings:
     cash:
       brokerage_cash: Aracı kurum nakiti
+    cost_basis_cell:
+      cancel: İptal
+      or_per_share_label: 'Veya hisse başına girin:'
+      overwrite_confirm_body: Bu işlem, mevcut %{current} maliyet bazını değiştirecektir.
+      overwrite_confirm_title: Maliyet bazının üzerine yazılsın mı?
+      per_share: hisse başına
+      save: Kaydet
+      set: Ayarla
+      set_cost_basis_header: "%{ticker} için maliyet bazını ayarla (%{qty} hisse)"
+      total_cost_basis_label: Toplam maliyet bazı
+      unknown: "--"
+    cost_basis_sources:
+      calculated: İşlemlerden
+      manual: Kullanıcı tarafından ayarlandı
+      provider: Sağlayıcıdan
     destroy:
+      cannot_delete: Bu varlığı silemezsiniz
       success: Holding silindi
+    errors:
+      security_collision: 'Yeniden eşlenemedi: %{ticker} için zaten %{date} tarihinde
+        bir varlığınız var.'
     holding:
+      no_cost_basis: Maliyet bazı yok
       per_share: Hisse başına
       shares: "%{qty} adet hisse"
+      unknown: "--"
     index:
       average_cost: Ortalama maliyet
       holdings: Varlıklar
@@ -19,17 +40,76 @@ tr:
     missing_price_tooltip:
       description: Bu yatırımda eksik veriler var ve getirisi veya değeri hesaplanamadı.
       missing_data: Eksik veri
+    remap_security:
+      security_not_found: Seçilen menkul kıymet bulunamadı.
+      success: Menkul kıymet başarıyla güncellendi.
+    reset_security:
+      success: Menkul kıymet sağlayıcı değerine sıfırlandı.
     show:
       avg_cost_label: Ortalama Maliyet
+      book_value_label: Defter Değeri
+      cancel: İptal
+      cost_basis_locked_description: Manuel olarak ayarladığınız maliyet bazı senkronizasyonlarla
+        değiştirilmeyecektir.
+      cost_basis_locked_label: Maliyet bazı kilitli
       current_market_price_label: Güncel Piyasa Fiyatı
       delete: Sil
-      delete_subtitle: Bu işlem, bu varlığı ve bu hesaptaki ilişkili tüm işlemlerinizi silecektir. Bu işlem geri alınamaz.
+      delete_subtitle: Bu işlem, bu varlığı ve bu hesaptaki ilişkili tüm işlemlerinizi
+        silecektir. Bu işlem geri alınamaz.
       delete_title: Varlığı sil
+      edit_security: Menkul kıymeti düzenle
       history: Geçmiş
+      last_price_update: Son fiyat güncellemesi
+      market_data_label: Piyasa verisi
+      market_data_sync_button: Yenile
+      market_value_label: Piyasa Değeri
+      never: Hiç
+      no_security_provider: Menkul kıymet sağlayıcısı yapılandırılmamış. Menkul kıymet
+        aranamıyor.
+      no_trade_history: Bu varlık için işlem geçmişi mevcut değil.
+      originally: önceden %{ticker} idi
       overview: Genel Bakış
       portfolio_weight_label: Portföy Ağırlığı
+      provider_disabled_warning: Fiyat güncellemeleri duraklatıldı — %{provider} sağlayıcısı
+        devre dışı. Aşağıdan başka bir sağlayıcıya geçin veya Ayarlar'dan yeniden
+        etkinleştirin.
+      provider_sent: 'Sağlayıcı gönderdi: %{ticker}'
+      remap_security: Kaydet
+      reset_confirm_body: Bu işlem, menkul kıymeti %{current} değerinden %{original}
+        değerine geri döndürecek ve ilişkili tüm işlemleri taşıyacaktır.
+      reset_confirm_title: Menkul kıymet sağlayıcı değerine sıfırlansın mı?
+      reset_to_provider: Sağlayıcı değerine sıfırla
+      search_security: Menkul kıymet ara
+      search_security_placeholder: Sembol veya isimle arayın
+      security_label: Menkul Kıymet
+      security_remapped_label: Menkul kıymet yeniden eşlendi
       settings: Ayarlar
+      shares_label: Hisseler
+      switch_provider_button: Değiştir
+      switch_provider_description: "%{provider} devre dışı. Bu menkul kıymeti başka
+        bir etkin sağlayıcıdan arayın."
+      switch_provider_label: Sağlayıcıyı değiştir
+      syncing: Senkronize ediliyor...
       ticker_label: Sembol
-      trade_history_entry: "%{qty} adet %{security} %{price} fiyatından"
       total_return_label: Toplam Getiri
-      unknown: Bilinmiyor
\ No newline at end of file
+      trade_history_entry: "%{qty} adet %{security} %{price} fiyatından"
+      truncated_history_warning: Fiyat geçmişi yalnızca %{date} tarihinden itibaren
+        mevcuttur. Bu tarihten öncesi için seçilen sağlayıcıdan veri bulunmamaktadır
+        — bu, varlığın işlem tarihinizden sonra listelenmesi veya sağlayıcının mevcut
+        planında sınırlı bir geçmiş veri aralığı sunması durumunda oluşabilir.
+      unknown: Bilinmiyor
+      unlock_confirm_body: Bu işlem, maliyet bazının sağlayıcı senkronizasyonları
+        veya işlem hesaplamaları tarafından güncellenmesine izin verecektir.
+      unlock_confirm_title: Maliyet bazının kilidi açılsın mı?
+      unlock_cost_basis: Kilidi Aç
+    sync_prices:
+      provider_error: Güncel fiyatlar alınamadı. Lütfen birkaç dakika sonra tekrar
+        deneyin.
+      success: Piyasa verileri başarıyla senkronize edildi.
+      unavailable: Çevrimdışı menkul kıymetler için piyasa verisi senkronizasyonu
+        kullanılamaz.
+    unlock_cost_basis:
+      success: Maliyet bazının kilidi açıldı. Bir sonraki senkronizasyonda güncellenebilir.
+    update:
+      error: Geçersiz maliyet bazı değeri.
+      success: Maliyet bazı kaydedildi.
diff --git a/config/locales/views/ibkr_items/de.yml b/config/locales/views/ibkr_items/de.yml
new file mode 100644
index 000000000..0190a74bc
--- /dev/null
+++ b/config/locales/views/ibkr_items/de.yml
@@ -0,0 +1,92 @@
+---
+de:
+  providers:
+    ibkr:
+      name: Interactive Brokers
+      connection_description: Verbinden Sie einen Interactive Brokers Flex Web Service-Bericht
+      institution_name: Interactive Brokers
+  ibkr_items:
+    defaults:
+      name: Interactive Brokers
+    ibkr_item:
+      deletion_in_progress: Löschung läuft
+      flex_web_service: Flex Web Service
+      syncing: Synchronisiere
+      requires_update: Zugangsdaten erfordern Aufmerksamkeit
+      error: Fehler
+      synced: Vor %{time} synchronisiert. %{summary}.
+      never_synced: Noch nie synchronisiert.
+      setup_accounts: Konten einrichten
+      delete: Löschen
+      accounts_need_setup: Konten müssen eingerichtet werden
+      accounts_need_setup_description: Einige Konten von IBKR müssen mit Sure-Konten verknüpft werden.
+      no_accounts_discovered: Noch keine IBKR-Konten gefunden.
+      no_accounts_discovered_description: Führen Sie nach der Konfiguration Ihrer Flex-Abfrage eine Synchronisierung durch, um Konten zu finden.
+    setup_accounts:
+      page_title: Interactive Brokers-Konten einrichten
+      dialog_title: Richten Sie Ihre Interactive Brokers-Konten ein
+      subtitle: Wählen Sie aus, welche IBKR-Brokerage-Konten verknüpft werden sollen.
+      info_box:
+        title: IBKR Flex-Abfrage-Import
+        items:
+          item_1: Bestände mit aktuellen Kursen und Stückzahlen
+          item_2: Einstandskosten pro Position
+          item_3: Trades, Dividenden, Provisionen sowie Bareinzahlungen und -abhebungen
+        warning: Historische Aktivitäten sind auf den Berichtszeitraum der Flex-Abfrage beschränkt
+      status:
+        fetching_accounts: Konten werden von Interactive Brokers abgerufen...
+        no_accounts_found_title: Keine Konten gefunden.
+        no_accounts_found_description: Sure konnte im neuesten Flex-Bericht keine IBKR-Konten finden.
+      available_accounts:
+        title: Verfügbare Konten
+        account_type_investment: Investment
+        account_summary: "%{account_type} • Saldo: %{balance}"
+        account_id: "Konto-ID: %{account_id}"
+      link_existing:
+        description: Oder verknüpfen Sie ein gefundenes IBKR-Konto mit einem bestehenden manuellen Investmentkonto.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Konto auswählen...
+      linked_accounts:
+        title: Bereits verknüpft
+        linked_to_html: "Verknüpft mit: %{account}"
+      buttons:
+        refresh: Aktualisieren
+        cancel: Abbrechen
+        back_to_settings: Zurück zu den Einstellungen
+        create_selected_accounts: Ausgewählte Konten erstellen
+        link: Verknüpfen
+        done: Fertig
+    sync_status:
+      no_accounts: Noch keine IBKR-Konten gefunden
+      all_linked:
+        one: 1 Konto verknüpft
+        other: "%{count} Konten verknüpft"
+      partial: "%{linked} verknüpft, %{unlinked} müssen eingerichtet werden"
+    select_existing_account:
+      title: Interactive Brokers-Konto verknüpfen
+      no_accounts_available: Es sind noch keine nicht verknüpften Interactive Brokers-Konten verfügbar.
+      run_sync_hint: "Führen Sie unter Einstellungen > Anbieter eine Synchronisierung durch, nachdem Sie Ihre Flex-Abfrage aktualisiert haben."
+      wait_for_sync: Warten Sie, bis die Synchronisierung zur Kontoerkennung abgeschlossen ist.
+      balance: Saldo
+      link: Verknüpfen
+      cancel: Abbrechen
+    create:
+      success: Interactive Brokers erfolgreich konfiguriert.
+    update:
+      success: Interactive Brokers-Konfiguration erfolgreich aktualisiert.
+    destroy:
+      success: Interactive Brokers-Verbindung zur Löschung vorgemerkt.
+    select_accounts:
+      not_configured: Interactive Brokers ist nicht konfiguriert.
+    link_existing_account:
+      not_found: Konto oder Interactive Brokers-Konfiguration nicht gefunden.
+      only_manual_investment: Nur manuelle Investmentkonten können mit Interactive Brokers verknüpft werden.
+      already_linked: Dieses Interactive Brokers-Konto ist bereits verknüpft.
+      success: Erfolgreich mit Interactive Brokers-Konto verknüpft.
+      failed: Verknüpfung mit Interactive Brokers-Konto fehlgeschlagen.
+    complete_account_setup:
+      success:
+        one: "%{count} Interactive Brokers-Konto erfolgreich erstellt."
+        other: "%{count} Interactive Brokers-Konten erfolgreich erstellt."
+      none_selected: Es wurden keine Konten ausgewählt.
+      none_created: Es wurden keine Konten erstellt.
diff --git a/config/locales/views/ibkr_items/es.yml b/config/locales/views/ibkr_items/es.yml
new file mode 100644
index 000000000..857d308fb
--- /dev/null
+++ b/config/locales/views/ibkr_items/es.yml
@@ -0,0 +1,92 @@
+---
+es:
+  providers:
+    ibkr:
+      name: Interactive Brokers
+      connection_description: Conecta un informe del Flex Web Service de Interactive Brokers
+      institution_name: Interactive Brokers
+  ibkr_items:
+    defaults:
+      name: Interactive Brokers
+    ibkr_item:
+      deletion_in_progress: Eliminación en curso
+      flex_web_service: Flex Web Service
+      syncing: Sincronizando
+      requires_update: Las credenciales requieren atención
+      error: Error
+      synced: Sincronizado hace %{time}. %{summary}.
+      never_synced: Nunca sincronizado.
+      setup_accounts: Configurar cuentas
+      delete: Eliminar
+      accounts_need_setup: Las cuentas necesitan configuración
+      accounts_need_setup_description: Algunas cuentas de IBKR deben vincularse a cuentas de Sure.
+      no_accounts_discovered: Aún no se han detectado cuentas de IBKR.
+      no_accounts_discovered_description: Ejecuta una sincronización después de configurar tu consulta Flex para detectar cuentas.
+    setup_accounts:
+      page_title: Configurar cuentas de Interactive Brokers
+      dialog_title: Configura tus cuentas de Interactive Brokers
+      subtitle: Selecciona qué cuentas de bróker de IBKR quieres vincular.
+      info_box:
+        title: Importación mediante consulta Flex de IBKR
+        items:
+          item_1: Posiciones con precios y cantidades actuales
+          item_2: Coste base por posición
+          item_3: Operaciones, dividendos, comisiones y depósitos o retiradas de efectivo
+        warning: La actividad histórica se limita al periodo del informe de la consulta Flex
+      status:
+        fetching_accounts: Obteniendo cuentas de Interactive Brokers...
+        no_accounts_found_title: No se han encontrado cuentas.
+        no_accounts_found_description: Sure no pudo encontrar ninguna cuenta de IBKR en el último informe Flex.
+      available_accounts:
+        title: Cuentas disponibles
+        account_type_investment: Inversión
+        account_summary: "%{account_type} • Saldo: %{balance}"
+        account_id: "ID de cuenta: %{account_id}"
+      link_existing:
+        description: O vincula una cuenta de IBKR detectada a una cuenta de inversión manual existente.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Selecciona una cuenta...
+      linked_accounts:
+        title: Ya vinculadas
+        linked_to_html: "Vinculada a: %{account}"
+      buttons:
+        refresh: Actualizar
+        cancel: Cancelar
+        back_to_settings: Volver a Ajustes
+        create_selected_accounts: Crear cuentas seleccionadas
+        link: Vincular
+        done: Hecho
+    sync_status:
+      no_accounts: Aún no se han detectado cuentas de IBKR
+      all_linked:
+        one: 1 cuenta vinculada
+        other: "%{count} cuentas vinculadas"
+      partial: "%{linked} vinculadas, %{unlinked} necesitan configuración"
+    select_existing_account:
+      title: Vincular cuenta de Interactive Brokers
+      no_accounts_available: Aún no hay cuentas de Interactive Brokers sin vincular disponibles.
+      run_sync_hint: "Ejecuta una sincronización desde Ajustes > Proveedores después de actualizar tu consulta Flex."
+      wait_for_sync: Espera a que termine la sincronización de detección de cuentas.
+      balance: Saldo
+      link: Vincular
+      cancel: Cancelar
+    create:
+      success: Interactive Brokers configurado correctamente.
+    update:
+      success: Configuración de Interactive Brokers actualizada correctamente.
+    destroy:
+      success: Conexión de Interactive Brokers programada para su eliminación.
+    select_accounts:
+      not_configured: Interactive Brokers no está configurado.
+    link_existing_account:
+      not_found: No se ha encontrado la cuenta o la configuración de Interactive Brokers.
+      only_manual_investment: Solo las cuentas de inversión manuales pueden vincularse a Interactive Brokers.
+      already_linked: Esta cuenta de Interactive Brokers ya está vinculada.
+      success: Vinculado correctamente a la cuenta de Interactive Brokers.
+      failed: No se pudo vincular la cuenta de Interactive Brokers.
+    complete_account_setup:
+      success:
+        one: Se ha creado %{count} cuenta de Interactive Brokers correctamente.
+        other: Se han creado %{count} cuentas de Interactive Brokers correctamente.
+      none_selected: No se ha seleccionado ninguna cuenta.
+      none_created: No se ha creado ninguna cuenta.
diff --git a/config/locales/views/ibkr_items/fr.yml b/config/locales/views/ibkr_items/fr.yml
new file mode 100644
index 000000000..59461cf56
--- /dev/null
+++ b/config/locales/views/ibkr_items/fr.yml
@@ -0,0 +1,102 @@
+---
+fr:
+  ibkr_items:
+    complete_account_setup:
+      none_created: Aucun compte n'a été créé.
+      none_selected: Aucun compte n'a été sélectionné.
+      success:
+        one: Le compte %{count} Interactive Brokers a été créé avec succès.
+        other: Comptes %{count} Interactive Brokers créés avec succès.
+    create:
+      success: Interactive Brokers configuré avec succès.
+    defaults:
+      name: Courtiers interactifs
+    destroy:
+      success: Connexion Interactive Brokers planifiée pour suppression.
+    ibkr_item:
+      accounts_need_setup: Les comptes doivent être configurés
+      accounts_need_setup_description: Certains comptes d'IBKR doivent être liés à
+        des comptes Sure.
+      delete: Supprimer
+      deletion_in_progress: Suppression en cours
+      error: Erreur
+      flex_web_service: Service Web flexible
+      never_synced: Jamais synchronisé.
+      no_accounts_discovered: Aucun compte IBKR découvert pour l'instant.
+      no_accounts_discovered_description: Exécutez une synchronisation après holding
+        configuré votre requête Flex pour découvrir les comptes.
+      requires_update: Les informations d'identification nécessitent une attention
+        particulière
+      setup_accounts: Configurer des comptes
+      synced: Synchronisé il y a %{time}. %{summary}.
+      syncing: Synchronisation
+    link_existing_account:
+      already_linked: Ce compte Interactive Brokers est déjà lié.
+      failed: Échec de l'association du compte Interactive Brokers.
+      not_found: Configuration du compte ou d'Interactive Brokers introuvable.
+      only_manual_investment: Seuls les comptes d'investissement manuels peuvent être
+        liés à Interactive Brokers.
+      success: Lié avec succès au compte Interactive Brokers.
+    select_accounts:
+      not_configured: Interactive Brokers n'est pas configuré.
+    select_existing_account:
+      balance: Solde
+      cancel: Annuler
+      link: Lien
+      no_accounts_available: Aucun compte Interactive Brokers non lié n’est encore
+        disponible.
+      run_sync_hint: Exécutez une synchronisation depuis Paramètres > Fournisseurs
+        après avoir mis à jour votre requête Flex.
+      title: Associer un compte Interactive Brokers
+      wait_for_sync: Attendez la fin de la synchronisation de la découverte du compte.
+    setup_accounts:
+      available_accounts:
+        account_id: 'Identifiant de compte : %{account_id}'
+        account_summary: "%{account_type} • Solde : %{balance}"
+        account_type_investment: Investissement
+        title: Comptes disponibles
+      buttons:
+        back_to_settings: Retour aux paramètres
+        cancel: Annuler
+        create_selected_accounts: Créer les comptes sélectionnés
+        done: Terminé
+        link: Lien
+        refresh: Actualiser
+      dialog_title: Configurez vos comptes Interactive Brokers
+      info_box:
+        items:
+          item_1: Fonds avec prix et quantités actuels
+          item_2: Base de coût par poste
+          item_3: Transactions, dividendes, commissions et dépôts ou retraits en espèces
+        title: Importation de requêtes IBKR Flex
+        warning: L'activité historique est limitée à la fenêtre de rapport de Flex
+          Query
+      link_existing:
+        description: Ou associez un compte IBKR découvert à un compte d'investissement
+          manuel existant.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Sélectionnez un compte...
+      linked_accounts:
+        linked_to_html: 'Lié à : %{account}'
+        title: Déjà lié
+      page_title: Configurer des comptes Interactive Brokers
+      status:
+        fetching_accounts: Récupération de comptes auprès d'Interactive Brokers...
+        no_accounts_found_description: Bien sûr, aucun compte IBKR n’a été trouvé
+          dans le dernier rapport Flex.
+        no_accounts_found_title: Aucun compte trouvé.
+      subtitle: Sélectionnez les comptes de courtage IBKR à lier.
+    sync_status:
+      all_linked:
+        one: 1 compte lié
+        other: "%{count} comptes associés"
+      no_accounts: Aucun compte IBKR découvert pour l'instant
+      partial: "%{linked} lié, %{unlinked} doit être configuré"
+    update:
+      success: La configuration d'Interactive Brokers a été mise à jour avec succès.
+  providers:
+    ibkr:
+      connection_description: Connecter un rapport de service Web Flex d'Interactive
+        Brokers
+      institution_name: Courtiers interactifs
+      name: Courtiers interactifs
diff --git a/config/locales/views/ibkr_items/it.yml b/config/locales/views/ibkr_items/it.yml
new file mode 100644
index 000000000..4eeb141f8
--- /dev/null
+++ b/config/locales/views/ibkr_items/it.yml
@@ -0,0 +1,92 @@
+---
+it:
+  providers:
+    ibkr:
+      name: Interactive Brokers
+      connection_description: Connetti un report Flex Web Service di Interactive Brokers
+      institution_name: Interactive Brokers
+  ibkr_items:
+    defaults:
+      name: Interactive Brokers
+    ibkr_item:
+      deletion_in_progress: Eliminazione in corso
+      flex_web_service: Flex Web Service
+      syncing: Sincronizzazione in corso
+      requires_update: Le credenziali richiedono attenzione
+      error: Errore
+      synced: Sincronizzato %{time} fa. %{summary}.
+      never_synced: Mai sincronizzato.
+      setup_accounts: Configura conti
+      delete: Elimina
+      accounts_need_setup: I conti devono essere configurati
+      accounts_need_setup_description: Alcuni conti da IBKR devono essere collegati ai conti Sure.
+      no_accounts_discovered: Nessun conto IBKR scoperto ancora.
+      no_accounts_discovered_description: Esegui una sincronizzazione dopo aver configurato la tua query Flex per scoprire i conti.
+    setup_accounts:
+      page_title: Configura conti Interactive Brokers
+      dialog_title: Configura i tuoi conti Interactive Brokers
+      subtitle: Seleziona quali conti brokerage IBKR collegare.
+      info_box:
+        title: Importazione Flex Query IBKR
+        items:
+          item_1: Posizioni con prezzi e quantità correnti
+          item_2: Costo base per posizione
+          item_3: Movimenti, dividendi, commissioni e depositi o prelievi in contanti
+        warning: L'attività storica è limitata alla finestra del report della Flex Query
+      status:
+        fetching_accounts: Recupero conti da Interactive Brokers...
+        no_accounts_found_title: Nessun conto trovato.
+        no_accounts_found_description: Sure non ha trovato nessun conto IBKR nell'ultimo report Flex.
+      available_accounts:
+        title: Conti disponibili
+        account_type_investment: Investimento
+        account_summary: "%{account_type} • Saldo: %{balance}"
+        account_id: "ID conto: %{account_id}"
+      link_existing:
+        description: Oppure collega un conto IBKR scoperto a un conto investimento manuale esistente.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Seleziona un conto...
+      linked_accounts:
+        title: Già collegati
+        linked_to_html: "Collegato a: %{account}"
+      buttons:
+        refresh: Aggiorna
+        cancel: Annulla
+        back_to_settings: Torna alle Impostazioni
+        create_selected_accounts: Crea i conti selezionati
+        link: Collega
+        done: Fatto
+    sync_status:
+      no_accounts: Nessun conto IBKR scoperto ancora
+      all_linked:
+        one: 1 conto collegato
+        other: "%{count} conti collegati"
+      partial: "%{linked} collegati, %{unlinked} da configurare"
+    select_existing_account:
+      title: Collega conto Interactive Brokers
+      no_accounts_available: Nessun conto Interactive Brokers non collegato disponibile ancora.
+      run_sync_hint: "Esegui una sincronizzazione da Impostazioni > Provider dopo aver aggiornato la tua query Flex."
+      wait_for_sync: Attendi il completamento della sincronizzazione di scoperta conti.
+      balance: Saldo
+      link: Collega
+      cancel: Annulla
+    create:
+      success: Interactive Brokers configurato con successo.
+    update:
+      success: Configurazione Interactive Brokers aggiornata con successo.
+    destroy:
+      success: Connessione Interactive Brokers pianificata per l'eliminazione.
+    select_accounts:
+      not_configured: Interactive Brokers non è configurato.
+    link_existing_account:
+      not_found: Conto o configurazione Interactive Brokers non trovati.
+      only_manual_investment: Solo i conti investimento manuali possono essere collegati a Interactive Brokers.
+      already_linked: Questo conto Interactive Brokers è già collegato.
+      success: Collegato con successo al conto Interactive Brokers.
+      failed: Collegamento al conto Interactive Brokers fallito.
+    complete_account_setup:
+      success:
+        one: Creato con successo %{count} conto Interactive Brokers.
+        other: Creati con successo %{count} conti Interactive Brokers.
+      none_selected: Nessun conto è stato selezionato.
+      none_created: Nessun conto è stato creato.
diff --git a/config/locales/views/ibkr_items/nl.yml b/config/locales/views/ibkr_items/nl.yml
new file mode 100644
index 000000000..56f6cd01d
--- /dev/null
+++ b/config/locales/views/ibkr_items/nl.yml
@@ -0,0 +1,92 @@
+---
+nl:
+  providers:
+    ibkr:
+      name: Interactive Brokers
+      connection_description: Verbind een Interactive Brokers Flex Web Service-rapport
+      institution_name: Interactive Brokers
+  ibkr_items:
+    defaults:
+      name: Interactive Brokers
+    ibkr_item:
+      deletion_in_progress: Verwijderen bezig
+      flex_web_service: Flex Web Service
+      syncing: Synchroniseren
+      requires_update: Inloggegevens vereisen aandacht
+      error: Fout
+      synced: Gesynchroniseerd %{time} geleden. %{summary}.
+      never_synced: Nooit gesynchroniseerd.
+      setup_accounts: Accounts instellen
+      delete: Verwijderen
+      accounts_need_setup: Accounts moeten worden ingesteld
+      accounts_need_setup_description: Sommige accounts van IBKR moeten worden gekoppeld aan Sure-accounts.
+      no_accounts_discovered: Nog geen IBKR-accounts gevonden.
+      no_accounts_discovered_description: Voer een synchronisatie uit nadat u uw Flex-query hebt geconfigureerd om accounts te vinden.
+    setup_accounts:
+      page_title: Interactive Brokers-accounts instellen
+      dialog_title: Stel uw Interactive Brokers-accounts in
+      subtitle: Selecteer welke IBKR-effectenaccounts u wilt koppelen.
+      info_box:
+        title: IBKR Flex-query-import
+        items:
+          item_1: Posities met actuele koersen en aantallen
+          item_2: Kostprijsbasis per positie
+          item_3: Transacties, dividenden, commissies en kasstortingen of -opnames
+        warning: Historische activiteit is beperkt tot het rapportvenster van de Flex-query
+      status:
+        fetching_accounts: Accounts ophalen van Interactive Brokers...
+        no_accounts_found_title: Geen accounts gevonden.
+        no_accounts_found_description: Sure kon geen IBKR-accounts vinden in het meest recente Flex-rapport.
+      available_accounts:
+        title: Beschikbare accounts
+        account_type_investment: Beleggingen
+        account_summary: "%{account_type} • Saldo: %{balance}"
+        account_id: "Account-ID: %{account_id}"
+      link_existing:
+        description: Of koppel een gevonden IBKR-account aan een bestaand handmatig beleggingsaccount.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Selecteer een account...
+      linked_accounts:
+        title: Al gekoppeld
+        linked_to_html: "Gekoppeld aan: %{account}"
+      buttons:
+        refresh: Vernieuwen
+        cancel: Annuleren
+        back_to_settings: Terug naar instellingen
+        create_selected_accounts: Geselecteerde accounts aanmaken
+        link: Koppelen
+        done: Klaar
+    sync_status:
+      no_accounts: Nog geen IBKR-accounts gevonden
+      all_linked:
+        one: 1 account gekoppeld
+        other: "%{count} accounts gekoppeld"
+      partial: "%{linked} gekoppeld, %{unlinked} moeten worden ingesteld"
+    select_existing_account:
+      title: Interactive Brokers-account koppelen
+      no_accounts_available: Er zijn nog geen niet-gekoppelde Interactive Brokers-accounts beschikbaar.
+      run_sync_hint: "Voer een synchronisatie uit via Instellingen > Providers nadat u uw Flex-query hebt bijgewerkt."
+      wait_for_sync: Wacht tot de synchronisatie voor accountdetectie is voltooid.
+      balance: Saldo
+      link: Koppelen
+      cancel: Annuleren
+    create:
+      success: Interactive Brokers succesvol geconfigureerd.
+    update:
+      success: Interactive Brokers-configuratie succesvol bijgewerkt.
+    destroy:
+      success: Interactive Brokers-verbinding is in de wachtrij voor verwijdering geplaatst.
+    select_accounts:
+      not_configured: Interactive Brokers is niet geconfigureerd.
+    link_existing_account:
+      not_found: Account of Interactive Brokers-configuratie niet gevonden.
+      only_manual_investment: Alleen handmatige beleggingsaccounts kunnen aan Interactive Brokers worden gekoppeld.
+      already_linked: Dit Interactive Brokers-account is al gekoppeld.
+      success: Succesvol gekoppeld aan Interactive Brokers-account.
+      failed: Koppelen aan Interactive Brokers-account mislukt.
+    complete_account_setup:
+      success:
+        one: "%{count} Interactive Brokers-account succesvol aangemaakt."
+        other: "%{count} Interactive Brokers-accounts succesvol aangemaakt."
+      none_selected: Er zijn geen accounts geselecteerd.
+      none_created: Er zijn geen accounts aangemaakt.
diff --git a/config/locales/views/ibkr_items/pl.yml b/config/locales/views/ibkr_items/pl.yml
new file mode 100644
index 000000000..80b0f7778
--- /dev/null
+++ b/config/locales/views/ibkr_items/pl.yml
@@ -0,0 +1,96 @@
+---
+pl:
+  providers:
+    ibkr:
+      name: Interactive Brokers
+      connection_description: Połącz raport Flex Web Service od Interactive Brokers
+      institution_name: Interactive Brokers
+  ibkr_items:
+    defaults:
+      name: Interactive Brokers
+    ibkr_item:
+      deletion_in_progress: Trwa usuwanie
+      flex_web_service: Flex Web Service
+      syncing: Synchronizowanie
+      requires_update: Dane uwierzytelniające wymagają uwagi
+      error: Błąd
+      synced: "Zsynchronizowano %{time} temu. %{summary}."
+      never_synced: Nigdy nie synchronizowano.
+      setup_accounts: Konfiguruj konta
+      delete: Usuń
+      accounts_need_setup: Konta wymagają konfiguracji
+      accounts_need_setup_description: Niektóre konta z IBKR wymagają połączenia z kontami Sure.
+      no_accounts_discovered: Nie odkryto jeszcze kont IBKR.
+      no_accounts_discovered_description: Uruchom synchronizację po skonfigurowaniu zapytania Flex, aby odkryć konta.
+    setup_accounts:
+      page_title: Konfiguruj konta Interactive Brokers
+      dialog_title: Skonfiguruj konta Interactive Brokers
+      subtitle: Wybierz, które konta maklerskie IBKR połączyć.
+      info_box:
+        title: Import zapytania Flex IBKR
+        items:
+          item_1: Portfele z bieżącymi cenami i ilościami
+          item_2: Podstawa kosztu na pozycję
+          item_3: Transakcje, dywidendy, prowizje oraz wpłaty i wypłaty gotówki
+        warning: Historyczna aktywność jest ograniczona do okna raportu zapytania Flex
+      status:
+        fetching_accounts: Pobieranie kont z Interactive Brokers...
+        no_accounts_found_title: Nie znaleziono kont.
+        no_accounts_found_description: Sure nie znalazł żadnych kont IBKR w najnowszym raporcie Flex.
+      available_accounts:
+        title: Dostępne konta
+        account_type_investment: Inwestycyjne
+        account_summary: "%{account_type} • Saldo: %{balance}"
+        account_id: "ID konta: %{account_id}"
+      link_existing:
+        description: Lub połącz odkryte konto IBKR z istniejącym ręcznym kontem inwestycyjnym.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Wybierz konto...
+      linked_accounts:
+        title: Już połączone
+        linked_to_html: "Połączone z: %{account}"
+      buttons:
+        refresh: Odśwież
+        cancel: Anuluj
+        back_to_settings: Powrót do ustawień
+        create_selected_accounts: Utwórz wybrane konta
+        link: Połącz
+        done: Gotowe
+    sync_status:
+      no_accounts: Nie odkryto jeszcze kont IBKR
+      all_linked:
+        few: "%{count} konta połączone"
+        many: "%{count} kont połączonych"
+        one: 1 konto połączone
+        other: "%{count} kont połączonych"
+      partial: "%{linked} połączonych, %{unlinked} wymaga konfiguracji"
+    select_existing_account:
+      title: Połącz konto Interactive Brokers
+      no_accounts_available: Nie ma jeszcze dostępnych niepołączonych kont Interactive Brokers.
+      run_sync_hint: "Uruchom synchronizację z Ustawienia > Dostawcy po zaktualizowaniu zapytania Flex."
+      wait_for_sync: Poczekaj na zakończenie synchronizacji wykrywania kont.
+      balance: Saldo
+      link: Połącz
+      cancel: Anuluj
+    create:
+      success: Skonfigurowano Interactive Brokers.
+    update:
+      success: Zaktualizowano konfigurację Interactive Brokers.
+    destroy:
+      success: Zaplanowano usunięcie połączenia Interactive Brokers.
+    select_accounts:
+      not_configured: Interactive Brokers nie jest skonfigurowany.
+    link_existing_account:
+      not_found: Nie znaleziono konta lub konfiguracji Interactive Brokers.
+      only_manual_investment: Tylko ręczne konta inwestycyjne mogą być połączone z Interactive Brokers.
+      already_linked: To konto Interactive Brokers jest już połączone.
+      success: Połączono z kontem Interactive Brokers.
+      failed: Nie można połączyć konta Interactive Brokers.
+    complete_account_setup:
+      success:
+        few: Utworzono %{count} konta Interactive Brokers.
+        many: Utworzono %{count} kont Interactive Brokers.
+        one: Utworzono %{count} konto Interactive Brokers.
+        other: Utworzono %{count} kont Interactive Brokers.
+      none_selected: Nie wybrano żadnych kont.
+      none_created: Nie utworzono żadnych kont.
diff --git a/config/locales/views/ibkr_items/pt-BR.yml b/config/locales/views/ibkr_items/pt-BR.yml
new file mode 100644
index 000000000..4eeaa4962
--- /dev/null
+++ b/config/locales/views/ibkr_items/pt-BR.yml
@@ -0,0 +1,92 @@
+---
+pt-BR:
+  providers:
+    ibkr:
+      name: Interactive Brokers
+      connection_description: Conecte um relatório do Flex Web Service da Interactive Brokers
+      institution_name: Interactive Brokers
+  ibkr_items:
+    defaults:
+      name: Interactive Brokers
+    ibkr_item:
+      deletion_in_progress: Exclusão em andamento
+      flex_web_service: Flex Web Service
+      syncing: Sincronizando
+      requires_update: As credenciais exigem atenção
+      error: Erro
+      synced: Sincronizado há %{time}. %{summary}.
+      never_synced: Nunca sincronizado.
+      setup_accounts: Configurar contas
+      delete: Excluir
+      accounts_need_setup: As contas precisam de configuração
+      accounts_need_setup_description: Algumas contas da IBKR precisam ser vinculadas a contas do Sure.
+      no_accounts_discovered: Nenhuma conta da IBKR encontrada ainda.
+      no_accounts_discovered_description: Execute uma sincronização após configurar sua consulta Flex para encontrar contas.
+    setup_accounts:
+      page_title: Configurar contas da Interactive Brokers
+      dialog_title: Configure suas contas da Interactive Brokers
+      subtitle: Selecione quais contas de corretagem da IBKR você quer vincular.
+      info_box:
+        title: Importação por consulta Flex da IBKR
+        items:
+          item_1: Posições com preços e quantidades atuais
+          item_2: Custo de aquisição por posição
+          item_3: Negociações, dividendos, comissões e depósitos ou saques em dinheiro
+        warning: A atividade histórica é limitada ao período do relatório da consulta Flex
+      status:
+        fetching_accounts: Buscando contas na Interactive Brokers...
+        no_accounts_found_title: Nenhuma conta encontrada.
+        no_accounts_found_description: O Sure não conseguiu encontrar nenhuma conta da IBKR no relatório Flex mais recente.
+      available_accounts:
+        title: Contas disponíveis
+        account_type_investment: Investimento
+        account_summary: "%{account_type} • Saldo: %{balance}"
+        account_id: "ID da conta: %{account_id}"
+      link_existing:
+        description: Ou vincule uma conta da IBKR encontrada a uma conta de investimento manual existente.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Selecione uma conta...
+      linked_accounts:
+        title: Já vinculadas
+        linked_to_html: "Vinculada a: %{account}"
+      buttons:
+        refresh: Atualizar
+        cancel: Cancelar
+        back_to_settings: Voltar às Configurações
+        create_selected_accounts: Criar contas selecionadas
+        link: Vincular
+        done: Concluído
+    sync_status:
+      no_accounts: Nenhuma conta da IBKR encontrada ainda
+      all_linked:
+        one: 1 conta vinculada
+        other: "%{count} contas vinculadas"
+      partial: "%{linked} vinculadas, %{unlinked} precisam de configuração"
+    select_existing_account:
+      title: Vincular conta da Interactive Brokers
+      no_accounts_available: Ainda não há contas da Interactive Brokers não vinculadas disponíveis.
+      run_sync_hint: "Execute uma sincronização em Configurações > Provedores após atualizar sua consulta Flex."
+      wait_for_sync: Aguarde a conclusão da sincronização de descoberta de contas.
+      balance: Saldo
+      link: Vincular
+      cancel: Cancelar
+    create:
+      success: Interactive Brokers configurada com sucesso.
+    update:
+      success: Configuração da Interactive Brokers atualizada com sucesso.
+    destroy:
+      success: Conexão da Interactive Brokers programada para exclusão.
+    select_accounts:
+      not_configured: A Interactive Brokers não está configurada.
+    link_existing_account:
+      not_found: Conta ou configuração da Interactive Brokers não encontrada.
+      only_manual_investment: Apenas contas de investimento manuais podem ser vinculadas à Interactive Brokers.
+      already_linked: Esta conta da Interactive Brokers já está vinculada.
+      success: Vinculado com sucesso à conta da Interactive Brokers.
+      failed: Não foi possível vincular a conta da Interactive Brokers.
+    complete_account_setup:
+      success:
+        one: "%{count} conta da Interactive Brokers criada com sucesso."
+        other: "%{count} contas da Interactive Brokers criadas com sucesso."
+      none_selected: Nenhuma conta foi selecionada.
+      none_created: Nenhuma conta foi criada.
diff --git a/config/locales/views/ibkr_items/ru.yml b/config/locales/views/ibkr_items/ru.yml
new file mode 100644
index 000000000..da01710d6
--- /dev/null
+++ b/config/locales/views/ibkr_items/ru.yml
@@ -0,0 +1,102 @@
+---
+ru:
+  ibkr_items:
+    complete_account_setup:
+      none_created: Счета не были созданы.
+      none_selected: Счета не были выбраны.
+      success:
+        few: Успешно созданы %{count} счёта Interactive Brokers.
+        many: Успешно создано %{count} счетов Interactive Brokers.
+        one: Успешно создан %{count} счёт Interactive Brokers.
+        other: Успешно созданы %{count} счёта Interactive Brokers.
+    create:
+      success: Успешно настроен Interactive Brokers.
+    defaults:
+      name: Interactive Brokers
+    destroy:
+      success: Подключение Interactive Brokers запланировано на удаление.
+    ibkr_item:
+      accounts_need_setup: Требуется настройка счетов
+      accounts_need_setup_description: Некоторые счета из IBKR нужно связать с счетами
+        в Sure.
+      delete: Удалить
+      deletion_in_progress: Удаление в процессе
+      error: Ошибка
+      flex_web_service: Flex Web Service
+      never_synced: Никогда не синхронизировалось.
+      no_accounts_discovered: Счета IBKR ещё не обнаружены.
+      no_accounts_discovered_description: Запустите синхронизацию после настройки
+        вашего Flex-запроса для обнаружения счетов.
+      requires_update: Требуется внимание к учетным данным
+      setup_accounts: Настроить счета
+      synced: Синхронизировано %{time} назад. %{summary}.
+      syncing: Синхронизация
+    link_existing_account:
+      already_linked: Этот счёт Interactive Brokers уже связан.
+      failed: Не удалось связать счёт Interactive Brokers.
+      not_found: Счёт или конфигурация Interactive Brokers не найдены.
+      only_manual_investment: Только ручные инвестиционные счета могут быть связаны
+        с Interactive Brokers.
+      success: Успешно связан с счётом Interactive Brokers.
+    select_accounts:
+      not_configured: Interactive Brokers не настроен.
+    select_existing_account:
+      balance: Баланс
+      cancel: Отмена
+      link: Связать
+      no_accounts_available: Нет доступных несвязанных счетов Interactive Brokers.
+      run_sync_hint: Запустите синхронизацию из Настройки > Провайдеры после обновления
+        вашего Flex-запроса.
+      title: Связать счёт Interactive Brokers
+      wait_for_sync: Подождите завершения синхронизации обнаружения счетов.
+    setup_accounts:
+      available_accounts:
+        account_id: 'ID счёта: %{account_id}'
+        account_summary: "%{account_type} • Баланс: %{balance}"
+        account_type_investment: Инвестиционный
+        title: Доступные счета
+      buttons:
+        back_to_settings: Назад к настройкам
+        cancel: Отмена
+        create_selected_accounts: Создать выбранные счета
+        done: Готово
+        link: Связать
+        refresh: Обновить
+      dialog_title: Настройте свои счета Interactive Brokers
+      info_box:
+        items:
+          item_1: Активы с текущими ценами и количествами
+          item_2: Стоимость по каждой позиции
+          item_3: Сделки, дивиденды, комиссии и денежные вклады или снятия
+        title: Импорт Flex Query IBKR
+        warning: Историческая активность ограничена окном отчёта Flex Query
+      link_existing:
+        description: Или свяжите обнаруженный счёт IBKR с существующим ручным инвестиционным
+          счётом.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Выберите счёт...
+      linked_accounts:
+        linked_to_html: 'Связан с: %{account}'
+        title: Уже связаны
+      page_title: Настройка счетов Interactive Brokers
+      status:
+        fetching_accounts: Получение счетов из Interactive Brokers...
+        no_accounts_found_description: Sure не удалось найти счета IBKR в последнем
+          отчёте Flex.
+        no_accounts_found_title: Счета не найдены.
+      subtitle: Выберите, какие брокерские счета IBKR связать.
+    sync_status:
+      all_linked:
+        few: "%{count} счёта связаны"
+        many: "%{count} счетов связано"
+        one: "%{count} счёт связан"
+        other: "%{count} счёта связаны"
+      no_accounts: Счета IBKR ещё не обнаружены
+      partial: "%{linked} связаны, %{unlinked} требуют настройки"
+    update:
+      success: Конфигурация Interactive Brokers успешно обновлена.
+  providers:
+    ibkr:
+      connection_description: Подключите отчёт Flex Web Service от Interactive Brokers
+      institution_name: Interactive Brokers
+      name: Interactive Brokers
diff --git a/config/locales/views/ibkr_items/tr.yml b/config/locales/views/ibkr_items/tr.yml
new file mode 100644
index 000000000..2f7a221de
--- /dev/null
+++ b/config/locales/views/ibkr_items/tr.yml
@@ -0,0 +1,98 @@
+---
+tr:
+  ibkr_items:
+    complete_account_setup:
+      none_created: Hiçbir hesap oluşturulmadı.
+      none_selected: Hiçbir hesap seçilmedi.
+      success:
+        one: "%{count} Interactive Brokers hesabı başarıyla oluşturuldu."
+        other: "%{count} Interactive Brokers hesabı başarıyla oluşturuldu."
+    create:
+      success: Interactive Brokers başarıyla yapılandırıldı.
+    defaults:
+      name: Interactive Brokers
+    destroy:
+      success: Interactive Brokers bağlantısı silinmek üzere zamanlandı.
+    ibkr_item:
+      accounts_need_setup: Hesaplar kurulum gerektiriyor
+      accounts_need_setup_description: IBKR'den bazı hesapların Sure hesaplarıyla
+        bağlantılandırılması gerekiyor.
+      delete: Sil
+      deletion_in_progress: Silme işlemi devam ediyor
+      error: Hata
+      flex_web_service: Flex Web Service
+      never_synced: Hiç senkronize edilmedi.
+      no_accounts_discovered: Henüz IBKR hesabı bulunamadı.
+      no_accounts_discovered_description: Hesapları bulmak için Flex sorgunuzu yapılandırdıktan
+        sonra bir senkronizasyon çalıştırın.
+      requires_update: Kimlik bilgileri dikkat gerektiriyor
+      setup_accounts: Hesapları kur
+      synced: "%{time} önce senkronize edildi. %{summary}."
+      syncing: Senkronize ediliyor
+    link_existing_account:
+      already_linked: Bu Interactive Brokers hesabı zaten bağlı.
+      failed: Interactive Brokers hesabı bağlanamadı.
+      not_found: Hesap veya Interactive Brokers yapılandırması bulunamadı.
+      only_manual_investment: Yalnızca manuel yatırım hesapları Interactive Brokers'a
+        bağlanabilir.
+      success: Interactive Brokers hesabına başarıyla bağlandı.
+    select_accounts:
+      not_configured: Interactive Brokers yapılandırılmamış.
+    select_existing_account:
+      balance: Bakiye
+      cancel: İptal
+      link: Bağla
+      no_accounts_available: Henüz bağlanmamış Interactive Brokers hesabı yok.
+      run_sync_hint: Flex sorgunuzu güncelledikten sonra Ayarlar > Sağlayıcılar bölümünden
+        bir senkronizasyon çalıştırın.
+      title: Interactive Brokers hesabını bağla
+      wait_for_sync: Hesap keşif senkronizasyonunun tamamlanmasını bekleyin.
+    setup_accounts:
+      available_accounts:
+        account_id: 'Hesap Kimliği: %{account_id}'
+        account_summary: "%{account_type} • Bakiye: %{balance}"
+        account_type_investment: Yatırım
+        title: Kullanılabilir hesaplar
+      buttons:
+        back_to_settings: Ayarlara Dön
+        cancel: İptal
+        create_selected_accounts: Seçilen hesapları oluştur
+        done: Tamam
+        link: Bağla
+        refresh: Yenile
+      dialog_title: Interactive Brokers Hesaplarınızı Kurun
+      info_box:
+        items:
+          item_1: Güncel fiyat ve miktarlarla varlıklar
+          item_2: Pozisyon başına maliyet esası
+          item_3: İşlemler, temettüler, komisyonlar ve nakit yatırma veya çekmeler
+        title: IBKR Flex Sorgu İçe Aktarımı
+        warning: Geçmiş etkinlik, Flex Sorgusunun rapor penceresiyle sınırlıdır
+      link_existing:
+        description: Ya da bulunan bir IBKR hesabını mevcut bir manuel yatırım hesabına
+          bağlayın.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Bir hesap seçin...
+      linked_accounts:
+        linked_to_html: 'Bağlı: %{account}'
+        title: Zaten bağlı
+      page_title: Interactive Brokers Hesaplarını Kur
+      status:
+        fetching_accounts: Interactive Brokers'tan hesaplar alınıyor...
+        no_accounts_found_description: Sure, en son Flex raporunda herhangi bir IBKR
+          hesabı bulamadı.
+        no_accounts_found_title: Hesap bulunamadı.
+      subtitle: Bağlanacak IBKR aracı kurum hesaplarını seçin.
+    sync_status:
+      all_linked:
+        one: 1 hesap bağlandı
+        other: "%{count} hesap bağlandı"
+      no_accounts: Henüz IBKR hesabı bulunamadı
+      partial: "%{linked} bağlandı, %{unlinked} kurulum gerektiriyor"
+    update:
+      success: Interactive Brokers yapılandırması başarıyla güncellendi.
+  providers:
+    ibkr:
+      connection_description: Bir Interactive Brokers Flex Web Service raporu bağlayın
+      institution_name: Interactive Brokers
+      name: Interactive Brokers
diff --git a/config/locales/views/impersonation_sessions/fr.yml b/config/locales/views/impersonation_sessions/fr.yml
index e5a58194b..581465561 100644
--- a/config/locales/views/impersonation_sessions/fr.yml
+++ b/config/locales/views/impersonation_sessions/fr.yml
@@ -13,3 +13,13 @@ fr:
       success: Session quittée
     reject:
       success: Demande rejetée
+    super_admin_bar:
+      impersonating: Usurpation d'identité
+      jobs: Emplois
+      join: Rejoindre
+      join_a_session: Rejoindre une session
+      leave: Partir
+      request_impersonation: Demander une usurpation d'identité
+      super_admin: Super administrateur
+      terminate: Terminer
+      uuid_placeholder: UUID
diff --git a/config/locales/views/impersonation_sessions/it.yml b/config/locales/views/impersonation_sessions/it.yml
new file mode 100644
index 000000000..1f0755631
--- /dev/null
+++ b/config/locales/views/impersonation_sessions/it.yml
@@ -0,0 +1,25 @@
+---
+it:
+  impersonation_sessions:
+    approve:
+      success: Richiesta approvata
+    complete:
+      success: Sessione completata
+    create:
+      success: Richiesta inviata all'utente. In attesa di approvazione.
+    join:
+      success: Sessione unita
+    leave:
+      success: Sessione abbandonata
+    reject:
+      success: Richiesta rifiutata
+    super_admin_bar:
+      super_admin: Super Amministratore
+      jobs: Processi
+      impersonating: Impersonando
+      leave: Abbandona
+      terminate: Termina
+      join_a_session: Unisciti a una sessione
+      join: Unisciti
+      uuid_placeholder: UUID
+      request_impersonation: Richiedi impersonazione
diff --git a/config/locales/views/impersonation_sessions/ru.yml b/config/locales/views/impersonation_sessions/ru.yml
new file mode 100644
index 000000000..c0d202b26
--- /dev/null
+++ b/config/locales/views/impersonation_sessions/ru.yml
@@ -0,0 +1,25 @@
+---
+ru:
+  impersonation_sessions:
+    approve:
+      success: Запрос одобрен
+    complete:
+      success: Сеанс завершён
+    create:
+      success: Запрос отправлен пользователю. Ожидание одобрения.
+    join:
+      success: Присоединился к сеансу
+    leave:
+      success: Покинул сеанс
+    reject:
+      success: Запрос отклонён
+    super_admin_bar:
+      impersonating: Имитация
+      jobs: Задачи
+      join: Присоединиться
+      join_a_session: Присоединиться к сеансу
+      leave: Выйти
+      request_impersonation: Запросить имитацию
+      super_admin: Супер Админ
+      terminate: Завершить
+      uuid_placeholder: UUID
diff --git a/config/locales/views/impersonation_sessions/tr.yml b/config/locales/views/impersonation_sessions/tr.yml
index 5a5e36dcc..cffd8f9ff 100644
--- a/config/locales/views/impersonation_sessions/tr.yml
+++ b/config/locales/views/impersonation_sessions/tr.yml
@@ -12,4 +12,14 @@ tr:
     leave:
       success: Oturumdan ayrıldınız
     reject:
-      success: İstek reddedildi
\ No newline at end of file
+      success: İstek reddedildi
+    super_admin_bar:
+      impersonating: Taklit ediliyor
+      jobs: Görevler
+      join: Katıl
+      join_a_session: Oturuma katıl
+      leave: Ayrıl
+      request_impersonation: Taklit İsteği Gönder
+      super_admin: Süper Yönetici
+      terminate: Sonlandır
+      uuid_placeholder: UUID
diff --git a/config/locales/views/impersonation_sessions/zh-CN.yml b/config/locales/views/impersonation_sessions/zh-CN.yml
index 661759c58..959ca9005 100644
--- a/config/locales/views/impersonation_sessions/zh-CN.yml
+++ b/config/locales/views/impersonation_sessions/zh-CN.yml
@@ -13,3 +13,13 @@ zh-CN:
       success: 已离开会话
     reject:
       success: 请求已拒绝
+    super_admin_bar:
+      super_admin: 超级管理员
+      jobs: 后台任务
+      impersonating: 正在代入用户
+      leave: 离开
+      terminate: 终止
+      join_a_session: 加入会话
+      join: 加入
+      uuid_placeholder: UUID
+      request_impersonation: 请求代入访问
diff --git a/config/locales/views/imports/ca.yml b/config/locales/views/imports/ca.yml
index 723d6471e..5be501adc 100644
--- a/config/locales/views/imports/ca.yml
+++ b/config/locales/views/imports/ca.yml
@@ -321,7 +321,6 @@ ca:
       category: Categoria
       tag: Etiqueta
     new:
-      coming_soon: Properament
       description: Importa des d'una eina financera o puja fitxers de dades sense
         processar.
       import_accounts: Importa comptes
diff --git a/config/locales/views/imports/en.yml b/config/locales/views/imports/en.yml
index 7d83f0793..2a90caf48 100644
--- a/config/locales/views/imports/en.yml
+++ b/config/locales/views/imports/en.yml
@@ -110,6 +110,10 @@ en:
         description: Upload a simple CSV file (like the one we generate when you
           export your data). We'll automatically map the columns for you.
         instructions: Select continue to parse your CSV and move on to the clean step.
+      merchant_import:
+        button_label: Continue
+        description: Upload a CSV file with your merchants. We'll automatically map the columns for you.
+        instructions: Select continue to parse your CSV and move on to the clean step.
       mint_import:
         date_format_label: Date format
       actual_import:
@@ -126,6 +130,17 @@ en:
         category_label: Category (optional)
         notes_label: Notes (optional)
         apply_configuration: Apply configuration
+      ynab_import:
+        preconfigured_notice: We have pre-configured your YNAB import for you. Please proceed to the next step.
+        amount_notice: Amounts are detected automatically from the Outflow and Inflow columns.
+        leave_empty: Leave empty
+        date_label: Date
+        date_format_label: Date format
+        account_label: Account (optional)
+        name_label: Payee (optional)
+        category_label: Category (optional)
+        notes_label: Memo (optional)
+        apply_configuration: Apply configuration
       rule_import:
         description: Configure your rule import. Rules will be created or updated based
           on the CSV data.
@@ -169,6 +184,8 @@ en:
           existing tags.  You can also add new tags or leave them uncategorized.
         tag_mapping_title: Assign your tags
     uploads:
+      handle_qif_upload:
+        qif_uploaded: "QIF file uploaded successfully."
       update:
         qif_uploaded: "QIF file uploaded successfully."
       show:
@@ -250,6 +267,8 @@ en:
       category_parent: "Parent category"
       category_color: "Color"
       category_icon: "Lucide icon"
+      merchant_color: "Color"
+      merchant_website: "Website URL"
     update:
       account_saved: "Account saved."
       invalid_account: "Account not found."
@@ -258,6 +277,9 @@ en:
       max_rows_exceeded: "Your import exceeds the maximum row count of %{max}."
     revert:
       started: "Import is reverting in the background."
+    cancel:
+      cancelled: "Import marked as failed. You can try again from the import page."
+      not_cancellable: "This import can't be marked as failed right now — its job may still be running. Try again once it has been inactive for an hour."
     apply_template:
       template_applied: "Template applied."
       no_template_found: "No template found, please manually configure your import."
@@ -302,9 +324,11 @@ en:
       account_import: "Account import"
       mint_import: "Mint import"
       actual_import: "Actual import"
+      ynab_import: "YNAB import"
       qif_import: "QIF import"
       category_import: "Category import"
       rule_import: "Rule import"
+      merchant_import: "Merchant import"
       pdf_import: "PDF import"
       document_import: "Document import"
       sure_import: "Sure import"
@@ -335,9 +359,11 @@ en:
           account_import: "Account"
           mint_import: "Mint"
           actual_import: "Actual"
+          ynab_import: "YNAB"
           qif_import: "QIF"
           category_import: "Category"
           rule_import: "Rule"
+          merchant_import: "Merchant"
           pdf_import: "PDF"
           document_import: "Document"
           sure_import: "Sure"
@@ -353,15 +379,17 @@ en:
           confirm_revert: This will delete transactions that were imported, but you will still be able to review and re-import your data at any time.
           delete: Delete
           view: View
+          mark_failed: Mark as failed
+          confirm_mark_failed: This import has been inactive for a while and its background job was likely interrupted. Mark it as failed so you can try again? No imported data is kept.
       empty: No imports yet.
     new:
       description: Import from a financial tool or upload raw data files.
       tab_financial_tools: Financial Tools & Files
       tab_raw_data: Raw Data
-      coming_soon: Coming soon
       import_ynab: Import from YNAB
       import_accounts: Import accounts
       import_categories: Import categories
+      import_merchants: Import merchants
       import_mint: Import from Mint
       import_actual: Import from Actual Budget
       import_portfolio: Import investments
@@ -406,6 +434,8 @@ en:
       back_to_imports: Back to imports
     errors:
       custom_column_requires_inflow: "Custom column imports require an inflow column to be selected"
+      interrupted: "The background worker was interrupted before this finished. Imported data was rolled back — you can safely try again."
+      presumed_lost: "Marked as failed after the background job was presumed lost. The imported data was rolled back — you can safely try again."
     document_types:
       bank_statement: Bank Statement
       credit_card_statement: Credit Card Statement
diff --git a/config/locales/views/imports/fr.yml b/config/locales/views/imports/fr.yml
index 0ca426ad2..eb4576e68 100644
--- a/config/locales/views/imports/fr.yml
+++ b/config/locales/views/imports/fr.yml
@@ -1,43 +1,51 @@
 ---
 fr:
   import:
-    qif_category_selections:
-      show:
-        title: "Configurer et sélectionner"
-        description: "Vérifiez le format de date détecté, puis choisissez les catégories et étiquettes de votre fichier QIF à importer dans %{product_name}."
-        categories_heading: Catégories
-        categories_found:
-          one: "1 catégorie trouvée"
-          other: "%{count} catégories trouvées"
-        category_name_col: Nom de la catégorie
-        transactions_col: Transactions
-        tags_heading: Étiquettes
-        tags_found:
-          one: "1 étiquette trouvée"
-          other: "%{count} étiquettes trouvées"
-        tag_name_col: Nom de l'étiquette
-        txn_count:
-          one: "1 opération"
-          other: "%{count} opérations"
-        split_warning_title: Transactions scindées détectées
-        split_warning_description: "Ce fichier QIF contient des transactions scindées. Les transactions scindées ne sont pas encore prises en charge : chaque transaction scindée sera importée comme une transaction unique avec son montant total et sans catégorie. Les ventilations individuelles ne seront pas conservées."
-        split_badge: scindée
-        empty_state_primary: Aucune catégorie ou étiquette trouvée dans ce fichier QIF.
-        empty_state_secondary: Toutes les transactions seront importées sans catégories ni étiquettes.
-        submit: Continuer vers la revue
     cleans:
       show:
+        all_rows: Toutes les lignes
+        data_cleaned: Vos données ont été nettoyées
         description: Modifiez vos données dans le tableau ci-dessous. Les cellules rouges sont invalides.
+        error_rows: Lignes d'erreur
         errors_notice: Vous avez des erreurs dans vos données. Survolez l'erreur pour voir les détails.
         errors_notice_mobile: Vous avez des erreurs dans vos données. Cliquez sur l'icône d'aide de l'erreur pour voir les détails.
+        next_step: Étape suivante
+        not_configured: Veuillez configurer votre importation avant de continuer.
         title: Nettoyez vos données
     configurations:
-      update:
-        success: Importation configurée avec succès.
+      account_import:
+        apply_configuration: Appliquer la configuration
+        balance: Solde
+        balance_date: Date du solde
+        currency: Devise
+        date_format: Format des dates
+        default: Par défaut
+        entity_type: Type d'entité
+        leave_empty: Laisser vide
+        name: Nom
+        select_format: Sélectionnez le format
+      actual_import:
+        account_label: Compte (facultatif)
+        amount_label: Montant
+        apply_configuration: Appliquer la configuration
+        category_label: Catégorie (facultatif)
+        date_format_label: Format des dates
+        date_label: Date
+        incomes_are_negative: Les revenus sont négatifs
+        incomes_are_positive: Les revenus sont positifs
+        leave_empty: Laisser vide
+        name_label: Bénéficiaire (facultatif)
+        notes_label: Remarques (facultatif)
+        preconfigured_notice: Nous avons préconfiguré votre importation de budget réel pour vous. Veuillez passer à l'étape suivante.
+        signage_convention_label: Convention de signalétique
       category_import:
         button_label: Continuer
         description: Téléversez un fichier CSV simple (comme celui que nous générons lorsque vous exportez vos données). Nous mapperons automatiquement les colonnes pour vous.
         instructions: Sélectionnez continuer pour analyser votre CSV et passer à l'étape de nettoyage.
+      merchant_import:
+        button_label: Continuer
+        description: Téléversez un fichier CSV avec vos commerçants. Nous mapperons automatiquement les colonnes pour vous.
+        instructions: Sélectionnez continuer pour analyser votre CSV et passer à l'étape de nettoyage.
       mint_import:
         date_format_label: Format de date
       rule_import:
@@ -48,24 +56,77 @@ fr:
         description: Sélectionnez les colonnes qui correspondent à chaque champ dans votre CSV.
         title: Configurez votre importation
       trade_import:
+        account_label: Compte
+        apply_configuration: Appliquer la configuration
+        buys_are_negative: Les achats sont en quantité négative
+        buys_are_positive: Les achats sont en quantité positive
+        currency_label: Devise
         date_format_label: Format de date
+        date_label: Date
+        default: Par défaut
+        format_label: Formater
+        leave_empty: Laisser vide
+        name_label: Nom
+        no_security_provider_warning: Le fournisseur de prix de sécurité n'est pas configuré.  Vos importations commerciales fonctionneront, mais bien sûr, elles ne rempliront pas l'historique des prix.  Veuillez accéder à vos paramètres pour configurer cela.
+        note_label: Remarque
+        price_label: Prix
+        quantity_label: Quantité
+        select_column: Sélectionner une colonne
+        select_format: Sélectionnez le format
+        stock_exchange_code_label: Code de bourse
+        ticker_label: Ticker
       transaction_import:
+        account_label: Compte
+        amount_label: Montant
+        amount_type_label: Type de montant
+        amount_type_strategy_label: Stratégie de type de montant
+        apply_configuration: Appliquer la configuration
+        as_amount_type_column: comme colonne de type de montant
+        as_identifier_value: comme valeur d'identifiant
+        category_label: Catégorie
+        currency_label: Devise
         date_format_label: Format de date
+        date_label: Date
+        default: Par défaut
+        expense_outflow: Dépense (sortie)
+        format_label: Formater
+        income_inflow: Revenu (entrée)
+        incomes_are_negative: Les revenus sont négatifs
+        incomes_are_positive: Les revenus sont positifs
+        leave_empty: Laisser vide
+        name_label: Nom
+        notes_label: Remarques
         rows_to_skip_label: Ignorer les n premières lignes
+        select_column: Sélectionner une colonne
+        select_convention: Sélectionnez une convention
+        select_format: Sélectionnez le format
+        select_strategy: Sélectionnez une stratégie
+        select_type: Sélectionnez le type
+        select_value: Sélectionner une valeur
+        set: Ensemble
+        tags_label: Balises
+        treat_as_html: Traitez "<span class="font-medium">%{value}</span>" comme
+      update:
+        success: Importation configurée avec succès.
+      ynab_import:
+        account_label: Compte (facultatif)
+        amount_notice: Les montants sont détectés automatiquement à partir des colonnes Débit (Outflow) et Crédit (Inflow).
+        apply_configuration: Appliquer la configuration
+        category_label: Catégorie (facultatif)
+        date_format_label: Format de date
+        date_label: Date
+        leave_empty: Laisser vide
+        name_label: Bénéficiaire (facultatif)
+        notes_label: Mémo (facultatif)
+        preconfigured_notice: Nous avons préconfiguré votre importation YNAB pour vous. Veuillez passer à l'étape suivante.
     confirms:
-      sure_import:
-        title: Confirmer votre importation
-        description: Vérifiez les données qui seront importées depuis votre fichier d'export.
-        summary: Résumé de l'importation
-        empty_summary: Aucun enregistrement importable n'a été trouvé dans ce fichier. Il est peut-être vide, ou les lignes ne correspondent pas au format d'export attendu (chaque ligne doit être un objet JSON avec les clés « type » et « data », pour des types pris en charge par cet import).
-        publish_button: Démarrer l'importation
-        cancel: Annuler
       mappings:
         create_account: Créer un compte
         csv_mapping_label: "%{mapping} dans le CSV"
-        sure_mapping_label: "%{mapping} dans %{product_name}"
+        next: Suivant
         no_accounts: Vous n'avez pas encore de comptes. Veuillez créer un compte que nous pouvons utiliser pour les lignes non affectées de votre CSV ou retournez à l'étape Nettoyer et fournissez un nom de compte que nous pouvons utiliser.
         rows_label: Lignes
+        sure_mapping_label: "%{mapping} dans %{product_name}"
         unassigned_account: Avez-vous besoin de créer un nouveau compte pour les lignes non affectées ?
       show:
         account_mapping_description: Affectez tous les comptes de votre fichier importé aux comptes existants. Vous pouvez également ajouter de nouveaux comptes ou les laisser sans catégorie.
@@ -74,168 +135,327 @@ fr:
         account_type_mapping_title: Attribuez vos types de comptes
         category_mapping_description: Affectez toutes les catégories importées dans votre fichier aux catégories existantes. Vous pouvez également ajouter de nouvelles catégories ou les laisser non catégorisées.
         category_mapping_title: Attribuez vos catégories
+        invalid_data: Vous avez des données invalides, veuillez les modifier jusqu'à ce que toutes les erreurs soient résolues
         tag_mapping_description: Affectez toutes les étiquettes importées dans votre fichier aux étiquettes existantes. Vous pouvez également ajouter de nouvelles étiquettes ou les laisser non catégorisées.
         tag_mapping_title: Attribuez vos étiquettes
-    uploads:
+      sure_import:
+        cancel: Annuler
+        description: Vérifiez les données qui seront importées depuis votre fichier d'export.
+        empty_summary: Aucun enregistrement importable n'a été trouvé dans ce fichier. Il est peut-être vide, ou les lignes ne correspondent pas au format d'export attendu (chaque ligne doit être un objet JSON avec les clés « type » et « data », pour des types pris en charge par cet import).
+        publish_button: Démarrer l'importation
+        summary: Résumé de l'importation
+        title: Confirmer votre importation
+    qif_category_selections:
       show:
-        qif_title: Téléverser le fichier QIF
-        qif_description: Sélectionnez le compte auquel appartient ce fichier QIF, puis téléversez votre export .qif depuis Quicken.
-        qif_account_label: Compte
-        qif_account_placeholder: Sélectionner un compte…
-        qif_file_prompt: pour ajouter votre fichier QIF ici
-        qif_file_hint: Fichiers .qif uniquement
-        qif_submit: Téléverser le QIF
+        categories_found:
+          one: 1 catégorie trouvée
+          other: "%{count} catégories trouvées"
+        categories_heading: Catégories
+        category_name_col: Nom de la catégorie
+        description: Vérifiez le format de date détecté, puis choisissez les catégories et étiquettes de votre fichier QIF à importer dans %{product_name}.
+        empty_state_primary: Aucune catégorie ou étiquette trouvée dans ce fichier QIF.
+        empty_state_secondary: Toutes les transactions seront importées sans catégories ni étiquettes.
+        split_badge: scindée
+        split_warning_description: 'Ce fichier QIF contient des transactions scindées. Les transactions scindées ne sont pas encore prises en charge : chaque transaction scindée sera importée comme une transaction unique avec son montant total et sans catégorie. Les ventilations individuelles ne seront pas conservées.'
+        split_warning_title: Transactions scindées détectées
+        submit: Continuer vers la revue
+        tag_name_col: Nom de l'étiquette
+        tags_found:
+          one: 1 étiquette trouvée
+          other: "%{count} étiquettes trouvées"
+        tags_heading: Étiquettes
+        title: Configurer et sélectionner
+        transactions_col: Transactions
+        txn_count:
+          one: 1 opération
+          other: "%{count} opérations"
+      update:
+        success: Catégories et balises enregistrées.
+    uploads:
+      handle_qif_upload:
+        qif_uploaded: Fichier QIF téléversé avec succès.
+      show:
+        account_optional_label: Compte (facultatif)
         browse: Parcourir
+        copy_paste_tab: Copier et coller
         csv_file_prompt: pour ajouter votre fichier CSV ici
+        csv_invalid: Doit être un CSV valide avec des en-têtes et au moins une ligne de données
         description: Collez ou téléversez votre fichier CSV ci-dessous. Veuillez examiner les instructions dans le tableau ci-dessous avant de commencer.
+        download_sample_csv: Téléchargez un exemple de fichier CSV
+        drop_csv_subtitle: Votre fichier sera téléchargé automatiquement
+        drop_csv_title: Déposez le CSV pour télécharger
         instructions_1: Voici un exemple de CSV avec des colonnes disponibles pour l'importation.
         instructions_2: Votre CSV doit avoir une ligne d'en-tête
         instructions_3: Vous pouvez nommer vos colonnes comme vous le souhaitez. Vous les associerez à un stade ultérieur.
         instructions_4: Les colonnes marquées avec une étoile (*) sont des données requises.
         instructions_5: Pas de virgules, pas de symboles monétaires et pas de parenthèses dans les nombres.
+        multi_account_import: Importation multi-comptes
+        paste_csv_placeholder: Collez le contenu de votre fichier CSV ici
+        qif_account_label: Compte
+        qif_account_placeholder: Sélectionner un compte…
+        qif_description: Sélectionnez le compte auquel appartient ce fichier QIF, puis téléversez votre export .qif depuis Quicken.
+        qif_file_hint: Fichiers .qif uniquement
+        qif_file_prompt: pour ajouter votre fichier QIF ici
+        qif_submit: Téléverser le QIF
+        qif_title: Téléverser le fichier QIF
         title: Importez vos données
+        to_see_format: pour voir le format CSV requis
+        upload_csv_button: Télécharger CSV
+        upload_csv_tab: Télécharger CSV
       sure_import:
-        title: Importer depuis l'export
-        description: Téléversez le fichier all.ndjson de votre export de données pour restaurer vos comptes, transactions, catégories et plus encore.
-        drop_title: Déposez le NDJSON pour téléverser
-        drop_subtitle: Votre fichier sera téléversé automatiquement
         browse: Parcourir
         browse_hint: pour ajouter votre fichier all.ndjson ici
-        upload_button: Téléverser le NDJSON
+        description: Téléversez le fichier all.ndjson de votre export de données pour restaurer vos comptes, transactions, catégories et plus encore.
+        drop_subtitle: Votre fichier sera téléversé automatiquement
+        drop_title: Déposez le NDJSON pour téléverser
         hint_html: Téléversez le fichier <strong>all.ndjson</strong> de l'archive ZIP d'export de vos données
         ndjson_invalid: Le fichier doit être un NDJSON valide avec au moins un enregistrement
+        title: Importer depuis l'export
+        upload_button: Téléverser le NDJSON
+      update:
+        qif_uploaded: Fichier QIF téléchargé avec succès.
   imports:
+    apply_template:
+      no_template_found: Aucun modèle trouvé, veuillez configurer manuellement votre importation.
+      template_applied: Modèle appliqué.
+    column_labels:
+      account: Compte
+      amount: Montant
+      category: Catégorie
+      category_color: Couleur
+      category_icon: Icône Lucide
+      category_parent: Catégorie parente
+      currency: Devise
+      date: Date
+      entity_type: Type
+      exchange: Échange
+      merchant_color: Couleur
+      merchant_website: URL du site web
+      name: Nom
+      notes: Remarques
+      price: Prix
+      qty: Quantité
+      tags: Balises
+      ticker: Ticker
+    create:
+      csv_uploaded: CSV téléversé avec succès.
+      document_provider_not_configured: Aucun magasin de vecteurs n'est configuré pour les téléversements de documents.
+      document_too_large: Le document est trop volumineux. La taille maximale est de %{max_size} Mo.
+      document_upload_failed: Nous n'avons pas pu téléverser le document dans le magasin de vecteurs. Veuillez réessayer.
+      document_uploaded: Document téléversé avec succès.
+      duplicate_pdf_unavailable: Ce PDF est déjà enregistré comme un relevé auquel vous ne pouvez pas accéder.
+      file_too_large: Le fichier est trop volumineux. La taille maximale est de %{max_size} Mo.
+      invalid_document_file_type: Type de fichier de document invalide pour le magasin de vecteurs actif.
+      invalid_file_type: Type de fichier invalide. Veuillez téléverser un fichier CSV.
+      invalid_ndjson_file_type: Type ou format de fichier invalide. Veuillez téléverser un fichier d'export .ndjson ou .json valide.
+      invalid_pdf: Le fichier téléversé n'est pas un PDF valide.
+      ndjson_uploaded: Fichier NDJSON téléversé avec succès.
+      pdf_processing: Votre PDF est en cours de traitement. Vous recevrez un e-mail lorsque l'analyse sera terminée.
+      pdf_too_large: Le fichier PDF est trop volumineux. La taille maximale est de %{max_size} Mo.
     date_format:
+      description: Le format de date a été détecté automatiquement depuis votre fichier. Modifiez-le si les dates semblent incorrectes.
+      error_description: Aucun des formats de date pris en charge n'a pu analyser les dates dans ce fichier. Veuillez vérifier que le fichier contient des entrées de date valides.
+      error_title: Impossible de détecter le format de date
       heading: Format de date
-      description: "Le format de date a été détecté automatiquement depuis votre fichier. Modifiez-le si les dates semblent incorrectes."
-      preview: "Première date analysée"
-      error_title: "Impossible de détecter le format de date"
-      error_description: "Aucun des formats de date pris en charge n'a pu analyser les dates dans ce fichier. Veuillez vérifier que le fichier contient des entrées de date valides."
-    type_labels:
-      transaction_import: "Import de transactions"
-      trade_import: "Import de transactions boursières"
-      account_import: "Import de comptes"
-      mint_import: "Import Mint"
-      qif_import: "Import QIF"
-      category_import: "Import de catégories"
-      rule_import: "Import de règles"
-      pdf_import: "Import PDF"
-      document_import: "Import de document"
-      sure_import: "Import Sure"
-    steps:
-      upload: Téléverser
-      configure: Configurer
-      clean: Nettoyer
-      map: Mapper
-      confirm: Confirmer
-      select: Sélectionner
+      preview: Première date analysée
+    destroy:
+      deleted: Votre importation a été supprimée.
+    document_types:
+      bank_statement: Relevé bancaire
+      contract: Contrat
+      credit_card_statement: Relevé de carte de crédit
+      financial_document: Document financier
+      investment_statement: Relevé d'investissement
+      other: Autre document
+      unknown: Document inconnu
+    dry_run_resources:
+      accounts: Comptes
+      balances: Soldes
+      budget_categories: Catégories budgétaires
+      budgets: Budgets
+      categories: Catégories
+      holdings: Holdings
+      merchants: Marchands
+      recurring_transactions: Transactions récurrentes
+      rejected_transfers: Transferts rejetés
+      rules: Règles
+      tags: Balises
+      trades: Métiers
+      transactions: Opérations
+      transfers: Transferts
+      valuations: Évaluations
+    empty:
+      message: Aucune importation trouvée.
+    errors:
+      custom_column_requires_inflow: Les importations de colonnes personnalisées nécessitent la sélection d'une colonne d'entrée
+    failure:
+      description: Veuillez vérifier le format de votre fichier, détecter d'éventuelles erreurs et que tous les champs obligatoires sont remplis, puis revenez et réessayez.
+      title: Échec de l'importation
+      try_again: Réessayez
+    importing:
+      back_to_dashboard: Retour au tableau de bord
+      check_status: Vérifier l'état
+      description: Votre importation est en cours. Consultez le menu des importations pour les mises à jour de statut ou cliquez sur « Vérifier le statut » pour actualiser la page pour les mises à jour. N'hésitez pas à continuer à utiliser l'application.
+      title: Importation en cours
     index:
-      title: Importations
       new: Nouvelle importation
-    table:
-      title: Imports
-      header:
-        date: Date
-        operation: Opération
-        status: Statut
-        actions: Actions
-      row:
-        type_labels:
-          transaction_import: "Transaction"
-          trade_import: "Transaction boursière"
-          account_import: "Compte"
-          mint_import: "Mint"
-          qif_import: "QIF"
-          category_import: "Catégorie"
-          rule_import: "Règle"
-          pdf_import: "PDF"
-          document_import: "Document"
-          sure_import: "Sure"
-        status:
-          in_progress: En cours
-          uploading: Traitement des lignes
-          reverting: Annulation en cours
-          revert_failed: Annulation échouée
-          complete: Terminé
-          failed: Échoué
-        actions:
-          revert: Revenir
-          confirm_revert: Cette opération supprimera les transactions importées, mais vous pourrez toujours consulter et réimporter vos données à tout moment.
-          delete: Supprimer
-          view: Afficher
-      empty: Aucune importation pour l'instant.
+      title: Importations
+    mapping_labels:
+      account: Compte
+      account_type: Type de compte
+      category: Catégorie
+      tag: Étiquette
     new:
       description: Importez depuis un outil financier ou téléversez des fichiers de données bruts.
-      tab_financial_tools: Outils financiers et fichiers
-      tab_raw_data: Données brutes
-      coming_soon: Bientôt disponible
-      import_ynab: Importer depuis YNAB
       import_accounts: Importer les comptes
+      import_actual: Importer à partir du budget réel
       import_categories: Importer les catégories
-      import_mint: Importer depuis Mint
-      import_portfolio: Importer les investissements
-      import_rules: Importer les règles
-      import_transactions: Importer les transactions
-      import_qif: Importer depuis Quicken (QIF)
-      import_sure: Importer depuis Sure
-      import_sure_description: Fichier .ndjson d'export complet
       import_file: Importer un document
       import_file_description: Analyse par IA pour les PDF et téléversement de fichiers avec recherche
+      import_merchants: Importer des commerçants
+      import_mint: Importer depuis Mint
+      import_portfolio: Importer les investissements
+      import_qif: Importer depuis Quicken (QIF)
+      import_rules: Importer les règles
+      import_sure: Importer depuis Sure
+      import_sure_description: Fichier .ndjson d'export complet
+      import_transactions: Importer les transactions
+      import_ynab: Importer depuis YNAB
       requires_account: Importez d'abord des comptes pour débloquer cette option.
       resume: Reprendre %{type}
       sources: Sources
+      tab_financial_tools: Outils financiers et fichiers
+      tab_raw_data: Données brutes
       title: Nouvelle importation
-    create:
-      file_too_large: Le fichier est trop volumineux. La taille maximale est de %{max_size} Mo.
-      invalid_file_type: Type de fichier invalide. Veuillez téléverser un fichier CSV.
-      csv_uploaded: CSV téléversé avec succès.
-      ndjson_uploaded: Fichier NDJSON téléversé avec succès.
-      pdf_too_large: Le fichier PDF est trop volumineux. La taille maximale est de %{max_size} Mo.
-      pdf_processing: Votre PDF est en cours de traitement. Vous recevrez un e-mail lorsque l'analyse sera terminée.
-      invalid_pdf: Le fichier téléversé n'est pas un PDF valide.
-      document_too_large: Le document est trop volumineux. La taille maximale est de %{max_size} Mo.
-      invalid_document_file_type: Type de fichier de document invalide pour le magasin de vecteurs actif.
-      document_uploaded: Document téléversé avec succès.
-      document_upload_failed: Nous n'avons pas pu téléverser le document dans le magasin de vecteurs. Veuillez réessayer.
-      invalid_ndjson_file_type: Type ou format de fichier invalide. Veuillez téléverser un fichier d'export .ndjson ou .json valide.
-      document_provider_not_configured: Aucun magasin de vecteurs n'est configuré pour les téléversements de documents.
-    show:
-      finalize_upload: Veuillez finaliser le téléversement de votre fichier.
-      finalize_mappings: Veuillez finaliser vos correspondances avant de continuer.
+    pdf_import:
+      back_to_dashboard: Retour au tableau de bord
+      back_to_imports: Retour aux importations
+      check_status: Vérifier le statut
+      complete_description: Nous avons analysé votre PDF et voici ce que nous avons trouvé.
+      complete_title: Document analysé
+      create_account: Créer un compte
+      delete_import: Supprimer l'importation
+      document_type_label: Type de document
+      email_sent_notice: Un e-mail vous a été envoyé avec les prochaines étapes.
+      failed_description: Nous n'avons pas pu traiter votre document PDF. Veuillez réessayer ou contacter le support.
+      failed_title: Traitement échoué
+      no_accounts: Aucun compte disponible. Veuillez d'abord créer un compte.
+      processing_description: Nous analysons votre document à l'aide de l'IA. Cela peut prendre un moment. Vous recevrez un e-mail lorsque l'analyse sera terminée.
+      processing_failed_generic: 'Traitement échoué : %{error}'
+      processing_failed_with_message: "%{message}"
+      processing_title: Traitement de votre PDF
+      publish_transactions:
+        one: Publier la transaction %{count}
+        other: Publier %{count} Transactions
+      ready_for_review_description: Nous avons extrait %{count} transactions de votre relevé. Examinez-les et publiez-les pour les ajouter à votre compte.
+      ready_for_review_title: Prêt pour l'examen
+      review_transactions: Examiner les transactions
+      save_account: Enregistrer
+      select_account: Importer vers le compte
+      select_account_hint: Choisissez dans quel compte importer ces transactions.
+      select_account_placeholder: Sélectionnez un compte...
+      select_account_to_continue: Veuillez sélectionner un compte ci-dessus pour continuer.
+      source_statement: Relevé source
+      summary_label: Résumé
+      transactions_extracted: Transactions extraites
+      transactions_extracted_count:
+        one: "%{count} transaction"
+        other: "%{count} transactions"
+      try_again: Réessayer
+      unknown_document_type: Inconnu
+      unknown_state_description: Cette importation est dans un état inattendu. Veuillez retourner aux importations.
+      unknown_state_title: État inconnu
+    publish:
+      max_rows_exceeded: Votre importation dépasse le nombre maximal de lignes de %{max}.
+      started: Votre importation a démarré en arrière-plan.
     ready:
+      back_to_imports: Retour aux importations
       description: Voici un résumé des nouveaux éléments qui seront ajoutés à votre compte une fois que vous aurez publié cette importation.
-      title: Confirmez vos données d'importation
-      summary_item_label: Élément
-      summary_count_label: Nombre
       empty_summary: Aucun enregistrement importable n'a été trouvé dans ce fichier. Il est peut-être vide, ou les lignes ne correspondent pas au format d'export attendu (chaque ligne doit être un objet JSON avec les clés « type » et « data », pour des types pris en charge par cet import).
       publish_import: Publier l'importation
-      back_to_imports: Retour aux importations
-    errors:
-      custom_column_requires_inflow: "Les importations de colonnes personnalisées nécessitent la sélection d'une colonne d'entrée"
-    document_types:
-      bank_statement: Relevé bancaire
-      credit_card_statement: Relevé de carte de crédit
-      investment_statement: Relevé d'investissement
-      financial_document: Document financier
-      contract: Contrat
-      other: Autre document
-      unknown: Document inconnu
-    pdf_import:
-      processing_title: Traitement de votre PDF
-      processing_description: Nous analysons votre document à l'aide de l'IA. Cela peut prendre un moment. Vous recevrez un e-mail lorsque l'analyse sera terminée.
-      check_status: Vérifier le statut
+      summary_count_label: Nombre
+      summary_item_label: Élément
+      title: Confirmez vos données d'importation
+    revert:
+      started: L'importation est rétablie en arrière-plan.
+    revert_failure:
+      description: Veuillez réessayer
+      title: L'annulation de l'importation a échoué
+      try_again: Réessayez
+    show:
+      finalize_mappings: Veuillez finaliser vos correspondances avant de continuer.
+      finalize_upload: Veuillez finaliser le téléversement de votre fichier.
+    steps:
+      clean: Nettoyer
+      configure: Configurer
+      confirm: Confirmer
+      map: Mapper
+      progress: Étape %{step} de %{total}
+      select: Sélectionner
+      upload: Téléverser
+    success:
       back_to_dashboard: Retour au tableau de bord
-      failed_title: Traitement échoué
-      failed_description: Nous n'avons pas pu traiter votre document PDF. Veuillez réessayer ou contacter le support.
-      try_again: Réessayer
-      delete_import: Supprimer l'importation
-      complete_title: Document analysé
-      complete_description: Nous avons analysé votre PDF et voici ce que nous avons trouvé.
-      document_type_label: Type de document
-      summary_label: Résumé
-      email_sent_notice: Un e-mail vous a été envoyé avec les prochaines étapes.
-      back_to_imports: Retour aux importations
-      unknown_state_title: État inconnu
-      unknown_state_description: Cette importation est dans un état inattendu. Veuillez retourner aux importations.
-      processing_failed_with_message: "%{message}"
-      processing_failed_generic: "Traitement échoué : %{error}"
+      description: Vos données importées ont été ajoutées avec succès à l'application et sont maintenant prêtes à être utilisées.
+      title: Importation réussie
+      verification:
+        checked: Vérifié
+        mismatches: Inadéquations
+        status:
+          failed: Échec
+          matched: Correspondant
+          mismatch: Inadéquation
+          not_verified: Non vérifié
+          reverted: Rétabli
+        title: Vérification de la relecture
+    table:
+      empty: Aucune importation pour l'instant.
+      header:
+        actions: Actions
+        date: Date
+        operation: Opération
+        status: Statut
+      row:
+        actions:
+          confirm_revert: Cette opération supprimera les transactions importées, mais vous pourrez toujours consulter et réimporter vos données à tout moment.
+          delete: Supprimer
+          revert: Revenir
+          view: Afficher
+        status:
+          complete: Terminé
+          failed: Échoué
+          in_progress: En cours
+          revert_failed: Annulation échouée
+          reverting: Annulation en cours
+          uploading: Traitement des lignes
+        type_labels:
+          account_import: Compte
+          actual_import: Réel
+          category_import: Catégorie
+          document_import: Document
+          merchant_import: Commerçant
+          mint_import: Mint
+          pdf_import: PDF
+          qif_import: QIF
+          rule_import: Règle
+          sure_import: Sure
+          trade_import: Transaction boursière
+          transaction_import: Transaction
+          ynab_import: YNAB
+      title: Imports
+    type_labels:
+      account_import: Import de comptes
+      actual_import: Importation réelle
+      category_import: Import de catégories
+      document_import: Import de document
+      merchant_import: Importation de commerçants
+      mint_import: Import Mint
+      pdf_import: Import PDF
+      qif_import: Import QIF
+      rule_import: Import de règles
+      sure_import: Import Sure
+      trade_import: Import de transactions boursières
+      transaction_import: Import de transactions
+      ynab_import: Importation YNAB
+    update:
+      account_saved: Compte enregistré.
+      invalid_account: Compte introuvable.
diff --git a/config/locales/views/imports/hu.yml b/config/locales/views/imports/hu.yml
index 543194625..2acab92bd 100644
--- a/config/locales/views/imports/hu.yml
+++ b/config/locales/views/imports/hu.yml
@@ -302,7 +302,6 @@ hu:
       description: Importálás pénzügyi eszközből vagy nyers adatfájlok feltöltése.
       tab_financial_tools: Pénzügyi eszközök és fájlok
       tab_raw_data: Nyers adatok
-      coming_soon: Hamarosan
       import_ynab: Importálás YNAB-ból
       import_accounts: Számlák importálása
       import_categories: Kategóriák importálása
diff --git a/config/locales/views/imports/it.yml b/config/locales/views/imports/it.yml
new file mode 100644
index 000000000..9c0070e40
--- /dev/null
+++ b/config/locales/views/imports/it.yml
@@ -0,0 +1,461 @@
+---
+it:
+  import:
+    qif_category_selections:
+      update:
+        success: "Categorie ed etichette salvate."
+      show:
+        title: "Configura e seleziona"
+        description: "Esamina il formato data rilevato, poi scegli quali categorie ed etichette dal tuo file QIF importare in %{product_name}."
+        categories_heading: Categorie
+        categories_found:
+          one: "1 categoria trovata"
+          other: "%{count} categorie trovate"
+        category_name_col: Nome categoria
+        transactions_col: Transazioni
+        tags_heading: Etichette
+        tags_found:
+          one: "1 etichetta trovata"
+          other: "%{count} etichette trovate"
+        tag_name_col: Nome etichetta
+        txn_count:
+          one: "1 trans."
+          other: "%{count} trans."
+        split_warning_title: Transazioni suddivise rilevate
+        split_warning_description: "Questo file QIF contiene transazioni suddivise. Le suddivisioni non sono ancora supportate, quindi ogni transazione suddivisa verrà importata come singola transazione con il suo importo totale e senza categoria. I dettagli delle singole suddivisioni non verranno preservati."
+        split_badge: suddivisa
+        empty_state_primary: Nessuna categoria o etichetta trovata in questo file QIF.
+        empty_state_secondary: Tutte le transazioni verranno importate senza categorie o etichette.
+        submit: Continua alla revisione
+    cleans:
+      show:
+        not_configured: "Configura la tua importazione prima di procedere."
+        description: Modifica i tuoi dati nella tabella qui sotto. Le celle rosse non sono valide.
+        errors_notice: Hai degli errori nei tuoi dati. Passa sopra l'errore per vedere i dettagli.
+        errors_notice_mobile: Hai degli errori nei tuoi dati. Tocca il tooltip di errore per vedere i dettagli.
+        title: Pulisci i tuoi dati
+        data_cleaned: I tuoi dati sono stati puliti
+        next_step: Passo successivo
+        all_rows: Tutte le righe
+        error_rows: Righe con errori
+    configurations:
+      update:
+        success: Importazione configurata con successo.
+      account_import:
+        leave_empty: Lascia vuoto
+        default: Predefinito
+        entity_type: Tipo entità
+        name: Nome
+        balance: Saldo
+        currency: Valuta
+        balance_date: Data saldo
+        date_format: Formato data
+        select_format: Seleziona formato
+        apply_configuration: Applica configurazione
+      transaction_import:
+        date_label: Data
+        select_column: Seleziona colonna
+        select_format: Seleziona formato
+        amount_label: Importo
+        default: Predefinito
+        currency_label: Valuta
+        format_label: Formato
+        amount_type_strategy_label: Strategia tipo importo
+        select_strategy: Seleziona strategia
+        set: Imposta
+        as_amount_type_column: come colonna tipo importo
+        select_value: Seleziona valore
+        as_identifier_value: come valore identificatore
+        treat_as_html: "Tratta \"<span class=\"font-medium\">%{value}</span>\" come"
+        income_inflow: Entrata (flusso in entrata)
+        expense_outflow: Spesa (flusso in uscita)
+        select_type: Seleziona tipo
+        leave_empty: Lascia vuoto
+        account_label: Conto
+        name_label: Nome
+        category_label: Categoria
+        tags_label: Etichette
+        notes_label: Note
+        apply_configuration: Applica configurazione
+        incomes_are_positive: Le entrate sono positive
+        incomes_are_negative: Le entrate sono negative
+        amount_type_label: Tipo importo
+        select_convention: Seleziona convenzione
+        date_format_label: Formato data
+        rows_to_skip_label: Salta prime n righe
+      trade_import:
+        select_column: Seleziona colonna
+        date_label: Data
+        quantity_label: Quantità
+        buys_are_positive: Gli acquisti hanno quantità positiva
+        buys_are_negative: Gli acquisti hanno quantità negativa
+        default: Predefinito
+        currency_label: Valuta
+        format_label: Formato
+        select_format: Seleziona formato
+        ticker_label: Ticker
+        leave_empty: Lascia vuoto
+        stock_exchange_code_label: Codice borsa
+        price_label: Prezzo
+        account_label: Conto
+        name_label: Nome
+        note_label: Nota
+        no_security_provider_warning: Il provider di prezzi dei titoli non è configurato. Le importazioni di operazioni funzioneranno, ma Sure non recupererà la cronologia dei prezzi. Vai nelle impostazioni per configurarlo.
+        date_format_label: Formato data
+        apply_configuration: Applica configurazione
+      category_import:
+        button_label: Continua
+        description: Carica un semplice file CSV (come quello che generiamo quando esporti i tuoi dati). Mapperemo automaticamente le colonne per te.
+        instructions: Seleziona continua per analizzare il tuo CSV e passare alla fase di pulizia.
+      merchant_import:
+        button_label: Continua
+        description: Carica un file CSV con i tuoi esercenti. Mapperemo automaticamente le colonne per te.
+        instructions: Seleziona continua per analizzare il tuo CSV e passare alla fase di pulizia.
+      mint_import:
+        date_format_label: Formato data
+      actual_import:
+        preconfigured_notice: Abbiamo preconfigurato la tua importazione da Actual Budget. Procedi al passo successivo.
+        leave_empty: Lascia vuoto
+        date_label: Data
+        date_format_label: Formato data
+        amount_label: Importo
+        signage_convention_label: Convenzione segni
+        incomes_are_negative: Le entrate sono negative
+        incomes_are_positive: Le entrate sono positive
+        account_label: Conto (opzionale)
+        name_label: Beneficiario (opzionale)
+        category_label: Categoria (opzionale)
+        notes_label: Note (opzionale)
+        apply_configuration: Applica configurazione
+      ynab_import:
+        preconfigured_notice: Abbiamo preconfigurato la tua importazione da YNAB. Procedi al passo successivo.
+        amount_notice: Gli importi vengono rilevati automaticamente dalle colonne Uscita ed Entrata.
+        leave_empty: Lascia vuoto
+        date_label: Data
+        date_format_label: Formato data
+        account_label: Conto (opzionale)
+        name_label: Beneficiario (opzionale)
+        category_label: Categoria (opzionale)
+        notes_label: Memo (opzionale)
+        apply_configuration: Applica configurazione
+      rule_import:
+        description: Configura la tua importazione di regole. Le regole verranno create o aggiornate in base ai dati CSV.
+        process_button: Elabora regole
+        process_help: Clicca il pulsante qui sotto per elaborare il tuo CSV e generare le righe delle regole.
+      show:
+        description: Seleziona le colonne che corrispondono a ogni campo nel tuo CSV.
+        title: Configura la tua importazione
+    confirms:
+      sure_import:
+        title: Conferma la tua importazione
+        description: Esamina i dati che verranno importati dal tuo file di esportazione.
+        summary: Riepilogo importazione
+        empty_summary: Non abbiamo trovato record importabili in questo file. Potrebbe essere vuoto, o le righe potrebbero non corrispondere al formato di esportazione previsto (ogni riga dovrebbe essere un oggetto JSON con chiavi "type" e "data", usando i tipi supportati da questa importazione).
+        publish_button: Avvia importazione
+        cancel: Annulla
+      mappings:
+        create_account: Crea conto
+        csv_mapping_label: "%{mapping} nel CSV"
+        sure_mapping_label: "%{mapping} in %{product_name}"
+        no_accounts: Non hai ancora nessun conto. Crea un conto da usare per le righe (non assegnate) nel tuo CSV o torna alla fase di pulizia e fornisci un nome conto da usare.
+        rows_label: Righe
+        unassigned_account: Hai bisogno di creare un nuovo conto per le righe non assegnate?
+        next: Avanti
+      show:
+        invalid_data: "Hai dati non validi, modifica finché tutti gli errori non sono risolti"
+        account_mapping_description: Assegna tutti i conti del tuo file importato ai conti esistenti di %{product_name}. Puoi anche aggiungere nuovi conti o lasciarli non categorizzati.
+        account_mapping_title: Assegna i tuoi conti
+        account_type_mapping_description: Assegna tutti i tipi di conto del tuo file importato a quelli di %{product_name}
+        account_type_mapping_title: Assegna i tipi di conto
+        category_mapping_description: Assegna tutte le categorie del tuo file importato alle categorie esistenti di %{product_name}. Puoi anche aggiungere nuove categorie o lasciarle non categorizzate.
+        category_mapping_title: Assegna le tue categorie
+        tag_mapping_description: Assegna tutte le etichette del tuo file importato alle etichette esistenti di %{product_name}. Puoi anche aggiungere nuove etichette o lasciarle non categorizzate.
+        tag_mapping_title: Assegna le tue etichette
+    uploads:
+      handle_qif_upload:
+        qif_uploaded: "File QIF caricato con successo."
+      update:
+        qif_uploaded: "File QIF caricato con successo."
+      show:
+        csv_invalid: "Deve essere un CSV valido con intestazioni e almeno una riga di dati"
+        drop_csv_title: Trascina CSV per caricare
+        drop_csv_subtitle: Il tuo file verrà caricato automaticamente
+        upload_csv_tab: Carica CSV
+        copy_paste_tab: Copia e incolla
+        account_optional_label: Conto (opzionale)
+        multi_account_import: Importazione multi-conto
+        upload_csv_button: Carica CSV
+        paste_csv_placeholder: Incolla qui il contenuto del tuo file CSV
+        download_sample_csv: Scarica un CSV di esempio
+        to_see_format: per vedere il formato CSV richiesto
+        qif_title: Carica file QIF
+        qif_description: Seleziona il conto a cui appartiene questo file QIF, poi carica la tua esportazione .qif da Quicken.
+        qif_account_label: Conto
+        qif_account_placeholder: Seleziona un conto…
+        qif_file_prompt: per aggiungere qui il tuo file QIF
+        qif_file_hint: Solo file .qif
+        qif_submit: Carica QIF
+        browse: Sfoglia
+        csv_file_prompt: per aggiungere qui il tuo file CSV
+        description: Incolla o carica il tuo file CSV qui sotto. Esamina le istruzioni nella tabella qui sotto prima di iniziare.
+        instructions_1: Di seguito un esempio di CSV con le colonne disponibili per l'importazione.
+        instructions_2: Il tuo CSV deve avere una riga di intestazione
+        instructions_3: Puoi nominare le tue colonne come preferisci. Le mapperai in un passaggio successivo.
+        instructions_4: Le colonne contrassegnate con asterisco (*) sono dati obbligatori.
+        instructions_5: Nessuna virgola, simbolo valuta o parentesi nei numeri.
+        title: Importa i tuoi dati
+      sure_import:
+        title: Importa da esportazione
+        description: Carica il file all.ndjson dalla tua esportazione dati per ripristinare conti, transazioni, categorie e altro.
+        drop_title: Trascina NDJSON per caricare
+        drop_subtitle: Il tuo file verrà caricato automaticamente
+        browse: Sfoglia
+        browse_hint: per aggiungere qui il tuo file all.ndjson
+        upload_button: Carica NDJSON
+        hint_html: Carica il file <strong>all.ndjson</strong> dal tuo ZIP di esportazione dati
+        ndjson_invalid: Deve essere un NDJSON valido con almeno un record
+  imports:
+    mapping_labels:
+      account_type: "Tipo conto"
+      account: "Conto"
+      category: "Categoria"
+      tag: "Etichetta"
+    dry_run_resources:
+      transactions: "Transazioni"
+      balances: "Saldi"
+      accounts: "Conti"
+      categories: "Categorie"
+      tags: "Etichette"
+      rules: "Regole"
+      merchants: "Esercenti"
+      recurring_transactions: "Transazioni ricorrenti"
+      transfers: "Bonifici"
+      rejected_transfers: "Bonifici rifiutati"
+      trades: "Operazioni"
+      holdings: "Posizioni"
+      valuations: "Valutazioni"
+      budgets: "Budget"
+      budget_categories: "Categorie budget"
+    column_labels:
+      date: "Data"
+      amount: "Importo"
+      name: "Nome"
+      currency: "Valuta"
+      category: "Categoria"
+      tags: "Etichette"
+      account: "Conto"
+      notes: "Note"
+      qty: "Quantità"
+      ticker: "Ticker"
+      exchange: "Borsa"
+      price: "Prezzo"
+      entity_type: "Tipo"
+      category_parent: "Categoria genitore"
+      category_color: "Colore"
+      category_icon: "Icona Lucide"
+      merchant_color: "Colore"
+      merchant_website: "URL sito web"
+    update:
+      account_saved: "Conto salvato."
+      invalid_account: "Conto non trovato."
+    publish:
+      started: "La tua importazione è iniziata in background."
+      max_rows_exceeded: "La tua importazione supera il numero massimo di righe di %{max}."
+    revert:
+      started: "Ripristino importazione in background."
+    apply_template:
+      template_applied: "Template applicato."
+      no_template_found: "Nessun template trovato, configura manualmente la tua importazione."
+    destroy:
+      deleted: "La tua importazione è stata eliminata."
+    failure:
+      title: Importazione fallita
+      description: Verifica il formato del tuo file, eventuali errori e che tutti i campi obbligatori siano compilati, poi torna e riprova.
+      try_again: Riprova
+    success:
+      title: Importazione riuscita
+      description: I dati importati sono stati aggiunti con successo all'app e sono ora pronti per l'uso.
+      back_to_dashboard: Torna al dashboard
+      verification:
+        title: Verifica di rilettura
+        checked: Verificato
+        mismatches: Discrepanze
+        status:
+          not_verified: Non verificato
+          matched: Corrispondente
+          mismatch: Discrepanza
+          failed: Fallito
+          reverted: Ripristinato
+    importing:
+      title: Importazione in corso
+      description: "La tua importazione è in corso. Controlla il menu importazioni per aggiornamenti sullo stato o clicca 'Controlla stato' per aggiornare la pagina. Puoi continuare a usare l'app."
+      check_status: Controlla stato
+      back_to_dashboard: Torna al dashboard
+    revert_failure:
+      title: Ripristino importazione fallito
+      description: Riprova
+      try_again: Riprova
+    date_format:
+      heading: Formato data
+      description: "Il formato data è stato rilevato automaticamente dal tuo file. Modificalo se le date sembrano errate."
+      preview: "Prima data analizzata"
+      error_title: "Impossibile rilevare il formato data"
+      error_description: "Nessuno dei formati data supportati ha potuto analizzare le date in questo file. Verifica che il file contenga voci di data valide."
+    type_labels:
+      transaction_import: "Importazione transazioni"
+      trade_import: "Importazione operazioni"
+      account_import: "Importazione conti"
+      mint_import: "Importazione Mint"
+      actual_import: "Importazione Actual"
+      ynab_import: "Importazione YNAB"
+      qif_import: "Importazione QIF"
+      category_import: "Importazione categorie"
+      rule_import: "Importazione regole"
+      merchant_import: "Importazione esercenti"
+      pdf_import: "Importazione PDF"
+      document_import: "Importazione documento"
+      sure_import: "Importazione Sure"
+    steps:
+      upload: Carica
+      configure: Configura
+      clean: Pulisci
+      map: Mappa
+      confirm: Conferma
+      select: Seleziona
+      progress: "Passo %{step} di %{total}"
+    empty:
+      message: Nessuna importazione trovata.
+    index:
+      title: Importazioni
+      new: Nuova importazione
+    table:
+      title: Importazioni
+      header:
+        date: Data
+        operation: Operazione
+        status: Stato
+        actions: Azioni
+      row:
+        type_labels:
+          transaction_import: "Transazione"
+          trade_import: "Operazione"
+          account_import: "Conto"
+          mint_import: "Mint"
+          actual_import: "Actual"
+          ynab_import: "YNAB"
+          qif_import: "QIF"
+          category_import: "Categoria"
+          rule_import: "Regola"
+          merchant_import: "Esercente"
+          pdf_import: "PDF"
+          document_import: "Documento"
+          sure_import: "Sure"
+        status:
+          in_progress: In corso
+          uploading: Elaborazione righe
+          reverting: Ripristino
+          revert_failed: Ripristino fallito
+          complete: Completa
+          failed: Fallita
+        actions:
+          revert: Ripristina
+          confirm_revert: Verranno eliminate le transazioni importate, ma potrai comunque rivedere e reimportare i tuoi dati in qualsiasi momento.
+          delete: Elimina
+          view: Vedi
+      empty: Nessuna importazione ancora.
+    new:
+      description: Importa da uno strumento finanziario o carica file di dati grezzi.
+      tab_financial_tools: Strumenti finanziari e file
+      tab_raw_data: Dati grezzi
+      import_ynab: Importa da YNAB
+      import_accounts: Importa conti
+      import_categories: Importa categorie
+      import_merchants: Importa esercenti
+      import_mint: Importa da Mint
+      import_actual: Importa da Actual Budget
+      import_portfolio: Importa investimenti
+      import_rules: Importa regole
+      import_transactions: Importa transazioni
+      import_qif: Importa da Quicken (QIF)
+      import_sure: Importa da Sure
+      import_sure_description: File .ndjson esportazione completa
+      import_file: Importa documento
+      import_file_description: Analisi con AI per PDF e caricamento file ricercabili
+      requires_account: Importa prima i conti per sbloccare questa opzione.
+      resume: Riprendi %{type}
+      sources: Sorgenti
+      title: Nuova importazione
+    create:
+      file_too_large: Il file è troppo grande. La dimensione massima è %{max_size}MB.
+      invalid_file_type: Tipo di file non valido. Carica un file CSV.
+      csv_uploaded: CSV caricato con successo.
+      ndjson_uploaded: File NDJSON caricato con successo.
+      pdf_too_large: Il file PDF è troppo grande. La dimensione massima è %{max_size}MB.
+      pdf_processing: Il tuo PDF è in fase di elaborazione. Riceverai un'email quando l'analisi sarà completata.
+      invalid_pdf: Il file caricato non è un PDF valido.
+      duplicate_pdf_unavailable: Questo PDF è già archiviato come estratto conto a cui non puoi accedere.
+      document_too_large: Il file documento è troppo grande. La dimensione massima è %{max_size}MB.
+      invalid_document_file_type: Tipo di file documento non valido per il vector store attivo.
+      document_uploaded: Documento caricato con successo.
+      document_upload_failed: Non siamo riusciti a caricare il documento nel vector store. Riprova.
+      invalid_ndjson_file_type: Tipo o formato file non valido. Carica un file di esportazione .ndjson o .json valido.
+      document_provider_not_configured: Nessun vector store configurato per i caricamenti di documenti.
+    show:
+      finalize_upload: Finalizza il caricamento del file.
+      finalize_mappings: Finalizza le mappature prima di procedere.
+    ready:
+      description: Ecco un riepilogo dei nuovi elementi che verranno aggiunti al tuo conto una volta pubblicata questa importazione.
+      title: Conferma i tuoi dati di importazione
+      summary_item_label: Elemento
+      summary_count_label: Conteggio
+      empty_summary: Non abbiamo trovato record importabili in questo file. Potrebbe essere vuoto, o le righe potrebbero non corrispondere al formato di esportazione previsto (ogni riga dovrebbe essere un oggetto JSON con chiavi "type" e "data", usando i tipi supportati da questa importazione).
+      publish_import: Pubblica importazione
+      back_to_imports: Torna alle importazioni
+    errors:
+      custom_column_requires_inflow: "Le importazioni con colonne personalizzate richiedono la selezione di una colonna di flusso in entrata"
+    document_types:
+      bank_statement: Estratto conto bancario
+      credit_card_statement: Estratto carta di credito
+      investment_statement: Estratto investimenti
+      financial_document: Documento finanziario
+      contract: Contratto
+      other: Altro documento
+      unknown: Documento sconosciuto
+    pdf_import:
+      processing_title: Elaborazione del tuo PDF
+      processing_description: Stiamo analizzando il tuo documento con l'AI. Potrebbe richiedere un momento. Riceverai un'email quando l'analisi sarà completata.
+      check_status: Controlla stato
+      back_to_dashboard: Torna al dashboard
+      failed_title: Elaborazione fallita
+      failed_description: Non siamo riusciti a elaborare il tuo documento PDF. Riprova o contatta il supporto.
+      try_again: Riprova
+      delete_import: Elimina importazione
+      complete_title: Documento analizzato
+      complete_description: Abbiamo analizzato il tuo PDF ed ecco cosa abbiamo trovato.
+      document_type_label: Tipo documento
+      source_statement: Estratto sorgente
+      summary_label: Riepilogo
+      email_sent_notice: Ti è stata inviata un'email con i prossimi passi.
+      back_to_imports: Torna alle importazioni
+      unknown_state_title: Stato sconosciuto
+      unknown_state_description: Questa importazione è in uno stato imprevisto. Torna alle importazioni.
+      processing_failed_with_message: "%{message}"
+      processing_failed_generic: "Elaborazione fallita: %{error}"
+      ready_for_review_title: Pronto per la revisione
+      ready_for_review_description: "Abbiamo estratto %{count} transazioni dal tuo estratto conto. Revisiona e pubblica per aggiungerle al tuo conto."
+      transactions_extracted: Transazioni estratte
+      transactions_extracted_count:
+        one: "%{count} transazione"
+        other: "%{count} transazioni"
+      select_account: Importa nel conto
+      select_account_placeholder: Seleziona un conto...
+      select_account_hint: Scegli in quale conto importare queste transazioni.
+      no_accounts: Nessun conto disponibile. Crea prima un conto.
+      create_account: Crea conto
+      save_account: Salva
+      publish_transactions:
+        one: "Pubblica %{count} transazione"
+        other: "Pubblica %{count} transazioni"
+      review_transactions: Rivedi transazioni
+      select_account_to_continue: Seleziona un conto sopra per continuare.
+      unknown_document_type: Sconosciuto
diff --git a/config/locales/views/imports/pl.yml b/config/locales/views/imports/pl.yml
index d5d1cd967..6a45d25b5 100644
--- a/config/locales/views/imports/pl.yml
+++ b/config/locales/views/imports/pl.yml
@@ -168,7 +168,6 @@ pl:
       description: Importuj dane z narzędzia finansowego lub prześlij surowe pliki danych.
       tab_financial_tools: Narzędzia i pliki finansowe
       tab_raw_data: Surowe dane
-      coming_soon: Wkrótce
       import_ynab: Importuj z YNAB
       import_accounts: Importuj konta
       import_categories: Importuj kategorie
diff --git a/config/locales/views/imports/ru.yml b/config/locales/views/imports/ru.yml
new file mode 100644
index 000000000..b942bfff7
--- /dev/null
+++ b/config/locales/views/imports/ru.yml
@@ -0,0 +1,531 @@
+---
+ru:
+  import:
+    cleans:
+      show:
+        all_rows: Все строки
+        data_cleaned: Ваши данные очищены
+        description: Редактируйте ваши данные в таблице ниже. Красные ячейки недействительны.
+        error_rows: Строки с ошибками
+        errors_notice: У вас есть ошибки в данных. Наведите курсор на ошибку, чтобы
+          увидеть детали.
+        errors_notice_mobile: У вас есть ошибки в данных. Нажмите на подсказку ошибки,
+          чтобы увидеть детали.
+        next_step: Следующий шаг
+        not_configured: Пожалуйста, настройте импорт перед продолжением.
+        title: Очистите ваши данные
+    configurations:
+      account_import:
+        apply_configuration: Применить настройки
+        balance: Баланс
+        balance_date: Дата баланса
+        currency: Валюта
+        date_format: Формат даты
+        default: По умолчанию
+        entity_type: Тип сущности
+        leave_empty: Оставить пустым
+        name: Имя
+        select_format: Выберите формат
+      actual_import:
+        account_label: Счёт (необязательно)
+        amount_label: Сумма
+        apply_configuration: Применить настройки
+        category_label: Категория (необязательно)
+        date_format_label: Формат даты
+        date_label: Дата
+        incomes_are_negative: Доходы отрицательные
+        incomes_are_positive: Доходы положительные
+        leave_empty: Оставить пустым
+        name_label: Получатель (необязательно)
+        notes_label: Заметки (необязательно)
+        preconfigured_notice: Мы предварительно настроили ваш импорт Actual Budget.
+          Пожалуйста, перейдите к следующему шагу.
+        signage_convention_label: Соглашение о знаках
+      category_import:
+        button_label: Продолжить
+        description: Загрузите простой CSV файл (как тот, который мы генерируем при
+          экспорте ваших данных). Мы автоматически сопоставим колонки для вас.
+        instructions: Нажмите Продолжить, чтобы обработать CSV и перейти к очистке данных.
+      merchant_import:
+        button_label: Продолжить
+        description: Загрузите CSV-файл с продавцами. Мы автоматически сопоставим столбцы.
+        instructions: Нажмите Продолжить, чтобы обработать CSV и перейти к очистке данных.
+      mint_import:
+        date_format_label: Формат даты
+      rule_import:
+        description: Настройте импорт правил. Правила будут созданы или обновлены
+          на основе данных CSV.
+        process_button: Обработать правила
+        process_help: Нажмите кнопку ниже, чтобы обработать ваш CSV и создать строки
+          правил.
+      show:
+        description: Выберите колонки, которые соответствуют каждому полю в вашем
+          CSV.
+        title: Настройте ваш импорт
+      trade_import:
+        account_label: Счёт
+        apply_configuration: Применить настройки
+        buys_are_negative: Покупки отрицательные
+        buys_are_positive: Покупки положительные
+        currency_label: Валюта
+        date_format_label: Формат даты
+        date_label: Дата
+        default: По умолчанию
+        format_label: Формат
+        leave_empty: Оставить пустым
+        name_label: Имя
+        no_security_provider_warning: Поставщик цен на ценные бумаги не настроен.
+          Ваши импорты торгов будут работать, но Sure не будет заполнять историю цен.
+          Пожалуйста, перейдите в настройки, чтобы настроить это.
+        note_label: Заметка
+        price_label: Цена
+        quantity_label: Количество
+        select_column: Выберите колонку
+        select_format: Выберите формат
+        stock_exchange_code_label: Код биржи
+        ticker_label: Тикер
+      transaction_import:
+        account_label: Счёт
+        amount_label: Сумма
+        amount_type_label: Тип суммы
+        amount_type_strategy_label: Стратегия типа суммы
+        apply_configuration: Применить настройки
+        as_amount_type_column: как колонку типа суммы
+        as_identifier_value: как идентификатор
+        category_label: Категория
+        currency_label: Валюта
+        date_format_label: Формат даты
+        date_label: Дата
+        default: По умолчанию
+        expense_outflow: Расход (выбытие)
+        format_label: Формат
+        income_inflow: Доход (поступление)
+        incomes_are_negative: Доходы отрицательные
+        incomes_are_positive: Доходы положительные
+        leave_empty: Оставить пустым
+        name_label: Имя
+        notes_label: Заметки
+        rows_to_skip_label: Пропустить первые n строк
+        select_column: Выберите колонку
+        select_convention: Выберите соглашение
+        select_format: Выберите формат
+        select_strategy: Выберите стратегию
+        select_type: Выберите тип
+        select_value: Выберите значение
+        set: Установить
+        tags_label: Теги
+        treat_as_html: Рассматривать "<span class="font-medium">%{value}</span>" как
+      update:
+        success: Импорт успешно настроен.
+      ynab_import:
+        account_label: Счёт (необязательно)
+        amount_notice: Суммы автоматически определяются по столбцам Outflow и Inflow.
+        apply_configuration: Применить настройки
+        category_label: Категория (необязательно)
+        date_format_label: Формат даты
+        date_label: Дата
+        leave_empty: Оставить пустым
+        name_label: Получатель (необязательно)
+        notes_label: Примечание (необязательно)
+        preconfigured_notice: Мы уже настроили импорт YNAB за вас. Перейдите к следующему шагу.
+    confirms:
+      mappings:
+        create_account: Создать счёт
+        csv_mapping_label: "%{mapping} в CSV"
+        next: Далее
+        no_accounts: У вас ещё нет счетов. Пожалуйста, создайте счёт, который мы можем
+          использовать для (неприсвоенных) строк в вашем CSV или вернитесь к шагу
+          очистки и укажите имя счёта, которое мы можем использовать.
+        rows_label: Строки
+        sure_mapping_label: "%{mapping} в %{product_name}"
+        unassigned_account: Нужно создать новый счёт для неприсвоенных строк?
+      show:
+        account_mapping_description: Назначьте все счета из импортированного файла
+          существующим счетам в %{product_name}. Вы также можете добавить новые счета
+          или оставить их без категории.
+        account_mapping_title: Назначьте ваши счета
+        account_type_mapping_description: Назначьте все типы счетов из вашего импортированного
+          файла типам %{product_name}
+        account_type_mapping_title: Назначьте ваши типы счетов
+        category_mapping_description: Назначьте все категории из вашего импортированного
+          файла существующим категориям %{product_name}. Вы также можете добавить
+          новые категории или оставить их некатегоризированными.
+        category_mapping_title: Назначьте ваши категории
+        invalid_data: У вас есть недействительные данные, пожалуйста, исправьте их,
+          пока все ошибки не будут устранены
+        tag_mapping_description: Назначьте все теги из вашего импортированного файла
+          существующим тегам %{product_name}. Вы также можете добавить новые теги
+          или оставить их некатегоризированными.
+        tag_mapping_title: Назначьте ваши теги
+      sure_import:
+        cancel: Отмена
+        description: Проверьте данные, которые будут импортированы из вашего экспортного
+          файла.
+        empty_summary: Мы не смогли найти импортируемые записи в этом файле. Он может
+          быть пустым, или строки могут не соответствовать ожидаемому формату экспорта
+          (каждая строка должна быть JSON объектом с ключами "type" и "data", используя
+          поддерживаемые этим импортом типы).
+        publish_button: Начать импорт
+        summary: Сводка импорта
+        title: Подтвердите ваш импорт
+    qif_category_selections:
+      show:
+        categories_found:
+          few: Найдено %{count} категории
+          many: Найдено %{count} категорий
+          one: Найдена 1 категория
+          other: Найдено %{count} категории
+        categories_heading: Категории
+        category_name_col: Название категории
+        description: Проверьте обнаруженный формат даты, затем выберите, какие категории
+          и теги из вашего QIF файла перенести в %{product_name}.
+        empty_state_primary: В этом QIF файле не найдено категорий или тегов.
+        empty_state_secondary: Все операции будут импортированы без категорий или
+          тегов.
+        split_badge: разделение
+        split_warning_description: Этот QIF файл содержит разделённые операции. Разделения
+          пока не поддерживаются, поэтому каждая разделённая операция будет импортирована
+          как одна операция с полной суммой и без категории. Индивидуальные разделения
+          не будут сохранены.
+        split_warning_title: Обнаружены разделённые операции
+        submit: Продолжить к обзору
+        tag_name_col: Название тега
+        tags_found:
+          few: Найдено %{count} тега
+          many: Найдено %{count} тегов
+          one: Найден 1 тег
+          other: Найдено %{count} тега
+        tags_heading: Теги
+        title: Настройка и выбор
+        transactions_col: Операции
+        txn_count:
+          few: "%{count} операции"
+          many: "%{count} операций"
+          one: 1 операция
+          other: "%{count} операции"
+      update:
+        success: Категории и теги сохранены.
+    uploads:
+      handle_qif_upload:
+        qif_uploaded: Файл Qif загружен
+      show:
+        account_optional_label: Счёт (необязательно)
+        browse: Обзор
+        copy_paste_tab: Копировать и вставить
+        csv_file_prompt: чтобы добавить ваш CSV файл сюда
+        csv_invalid: Должен быть действительный CSV с заголовками и хотя бы одной
+          строкой данных
+        description: Вставьте или загрузите ваш CSV файл ниже. Пожалуйста, ознакомьтесь
+          с инструкциями в таблице ниже перед началом.
+        download_sample_csv: Скачать пример CSV
+        drop_csv_subtitle: Ваш файл будет загружен автоматически
+        drop_csv_title: Перетащите CSV для загрузки
+        instructions_1: Ниже приведён пример CSV с колонками, доступными для импорта.
+        instructions_2: Ваш CSV должен иметь строку заголовка
+        instructions_3: Вы можете назвать ваши колонки как угодно. Вы сопоставите
+          их на следующем шаге.
+        instructions_4: Колонки, отмеченные звёздочкой (*), являются обязательными.
+        instructions_5: Без запятых, символов валют и скобок в числах.
+        multi_account_import: Импорт нескольких счетов
+        paste_csv_placeholder: Вставьте содержимое вашего CSV файла здесь
+        qif_account_label: Счёт
+        qif_account_placeholder: Выберите счёт…
+        qif_description: Выберите счёт, к которому относится этот QIF файл, затем
+          загрузите ваш .qif экспорт из Quicken.
+        qif_file_hint: только .qif файлы
+        qif_file_prompt: чтобы добавить ваш QIF файл сюда
+        qif_submit: Загрузить QIF
+        qif_title: Загрузить QIF файл
+        title: Импортируйте ваши данные
+        to_see_format: чтобы увидеть требуемый формат CSV
+        upload_csv_button: Загрузить CSV
+        upload_csv_tab: Загрузить CSV
+      sure_import:
+        browse: Обзор
+        browse_hint: чтобы добавить ваш all.ndjson файл сюда
+        description: Загрузите файл all.ndjson из вашего экспорта данных, чтобы восстановить
+          ваши счета, операции, категории и многое другое.
+        drop_subtitle: Ваш файл будет загружен автоматически
+        drop_title: Перетащите NDJSON для загрузки
+        hint_html: Загрузите <strong>all.ndjson</strong> файл из вашего ZIP экспорта
+          данных
+        ndjson_invalid: Должен быть действительный NDJSON с хотя бы одной записью
+        title: Импорт из экспорта
+        upload_button: Загрузить NDJSON
+      update:
+        qif_uploaded: QIF файл успешно загружен.
+  imports:
+    apply_template:
+      no_template_found: Шаблон не найден, пожалуйста, настройте ваш импорт вручную.
+      template_applied: Шаблон применён.
+    column_labels:
+      account: Счёт
+      amount: Сумма
+      category: Категория
+      category_color: Цвет
+      category_icon: Иконка Lucide
+      category_parent: Родительская категория
+      currency: Валюта
+      date: Дата
+      entity_type: Тип
+      exchange: Биржа
+      merchant_color: Цвет
+      merchant_website: Сайт
+      name: Имя
+      notes: Заметки
+      price: Цена
+      qty: Количество
+      tags: Теги
+      ticker: Тикер
+    create:
+      csv_uploaded: CSV успешно загружен.
+      document_provider_not_configured: Хранилище векторов для загрузки документов
+        не настроено.
+      document_too_large: Файл документа слишком большой. Максимальный размер %{max_size}MB.
+      document_upload_failed: Не удалось загрузить документ в хранилище векторов.
+        Пожалуйста, попробуйте снова.
+      document_uploaded: Документ успешно загружен.
+      duplicate_pdf_unavailable: Этот PDF уже сохранён как выписка, к которой у вас
+        нет доступа.
+      file_too_large: Файл слишком большой. Максимальный размер %{max_size}MB.
+      invalid_document_file_type: Неверный тип файла документа для активного хранилища
+        векторов.
+      invalid_file_type: Неверный тип файла. Пожалуйста, загрузите CSV файл.
+      invalid_ndjson_file_type: Неверный тип или формат файла. Пожалуйста, загрузите
+        действительный .ndjson или .json файл экспорта.
+      invalid_pdf: Загруженный файл не является действительным PDF.
+      ndjson_uploaded: NDJSON файл успешно загружен.
+      pdf_processing: Ваш PDF обрабатывается. Вы получите электронное письмо, когда
+        анализ будет завершён.
+      pdf_too_large: PDF файл слишком большой. Максимальный размер %{max_size}MB.
+    date_format:
+      description: Формат даты был автоматически определён из вашего файла. Измените
+        его, если даты выглядят некорректно.
+      error_description: Ни один из поддерживаемых форматов даты не смог разобрать
+        даты в этом файле. Пожалуйста, проверьте, что файл содержит действительные
+        записи дат.
+      error_title: Не удалось определить формат даты
+      heading: Формат даты
+      preview: Первая разобранная дата
+    destroy:
+      deleted: Ваш импорт был удалён.
+    document_types:
+      bank_statement: Выписка из банка
+      contract: Контракт
+      credit_card_statement: Выписка по кредитной карте
+      financial_document: Финансовый документ
+      investment_statement: Инвестиционная выписка
+      other: Другой документ
+      unknown: Неизвестный документ
+    dry_run_resources:
+      accounts: Счета
+      balances: Балансы
+      budget_categories: Категории бюджета
+      budgets: Бюджеты
+      categories: Категории
+      holdings: Активы
+      merchants: Продавцы
+      recurring_transactions: Регулярные операции
+      rejected_transfers: Отклонённые переводы
+      rules: Правила
+      tags: Теги
+      trades: Сделки
+      transactions: Операции
+      transfers: Переводы
+      valuations: Оценки
+    empty:
+      message: Импорты не найдены.
+    errors:
+      custom_column_requires_inflow: Импорт пользовательских колонок требует выбора
+        колонки поступлений
+    failure:
+      description: Пожалуйста, проверьте формат вашего файла, наличие ошибок и заполненность
+        всех обязательных полей, затем вернитесь и попробуйте снова.
+      title: Импорт не удался
+      try_again: Попробовать снова
+    importing:
+      back_to_dashboard: Назад к панели
+      check_status: Проверить статус
+      description: Ваш импорт в процессе. Проверьте меню импорта для обновлений статуса
+        или нажмите 'Проверить статус', чтобы обновить страницу. Вы можете продолжать
+        использовать приложение.
+      title: Импорт в процессе
+    index:
+      new: Новый импорт
+      title: Импорты
+    mapping_labels:
+      account: Счёт
+      account_type: Тип счёта
+      category: Категория
+      tag: Тег
+    new:
+      coming_soon: Скоро
+      description: Импорт из финансового инструмента или загрузка сырых данных.
+      import_accounts: Импорт счетов
+      import_actual: Импорт из Actual Budget
+      import_categories: Импорт категорий
+      import_file: Импорт документа
+      import_file_description: Анализ на основе ИИ для PDF и загрузка файлов с возможностью
+        поиска
+      import_merchants: Импорт продавцов
+      import_mint: Импорт из Mint
+      import_portfolio: Импорт инвестиций
+      import_qif: Импорт из Quicken (QIF)
+      import_rules: Импорт правил
+      import_sure: Импорт из Sure
+      import_sure_description: Полный экспорт .ndjson файл
+      import_transactions: Импорт операций
+      import_ynab: Импорт из YNAB
+      requires_account: Сначала импортируйте счета, чтобы разблокировать эту опцию.
+      resume: Возобновить %{type}
+      sources: Источники
+      tab_financial_tools: Финансовые инструменты и файлы
+      tab_raw_data: Сырые данные
+      title: Новый импорт
+    pdf_import:
+      back_to_dashboard: Назад к панели
+      back_to_imports: Назад к импортам
+      check_status: Проверить статус
+      complete_description: Мы проанализировали ваш PDF и вот что мы нашли.
+      complete_title: Документ проанализирован
+      create_account: Создать счёт
+      delete_import: Удалить импорт
+      document_type_label: Тип документа
+      email_sent_notice: Вам отправлено электронное письмо с дальнейшими шагами.
+      failed_description: Мы не смогли обработать ваш PDF документ. Пожалуйста, попробуйте
+        снова или свяжитесь с поддержкой.
+      failed_title: Обработка не удалась
+      no_accounts: Нет доступных счетов. Пожалуйста, сначала создайте счёт.
+      processing_description: Мы анализируем ваш документ с помощью ИИ. Это может
+        занять некоторое время. Вы получите электронное письмо, когда анализ будет
+        завершён.
+      processing_failed_generic: 'Обработка не удалась: %{error}'
+      processing_failed_with_message: "%{message}"
+      processing_title: Обработка вашего PDF
+      publish_transactions:
+        few: Опубликовать %{count} операции
+        many: Опубликовать %{count} операций
+        one: Опубликовать %{count} операцию
+        other: Опубликовать %{count} операции
+      ready_for_review_description: Мы извлекли %{count} операций из вашей выписки.
+        Проверьте и опубликуйте их, чтобы добавить на ваш счёт.
+      ready_for_review_title: Готово к обзору
+      review_transactions: Проверить операции
+      save_account: Сохранить
+      select_account: Импортировать на счёт
+      select_account_hint: Выберите, на какой счёт импортировать эти операции.
+      select_account_placeholder: Выберите счёт...
+      select_account_to_continue: Пожалуйста, выберите счёт выше, чтобы продолжить.
+      source_statement: Исходная выписка
+      summary_label: Сводка
+      transactions_extracted: Извлечённые операции
+      transactions_extracted_count:
+        few: "%{count} операции"
+        many: "%{count} операций"
+        one: "%{count} операция"
+        other: "%{count} операции"
+      try_again: Попробовать снова
+      unknown_document_type: Неизвестный
+      unknown_state_description: Этот импорт находится в неожиданном состоянии. Пожалуйста,
+        вернитесь к импортам.
+      unknown_state_title: Неизвестное состояние
+    publish:
+      max_rows_exceeded: Ваш импорт превышает максимальное количество строк в %{max}.
+      started: Ваш импорт начался в фоновом режиме.
+    ready:
+      back_to_imports: Назад к импортам
+      description: Вот сводка новых элементов, которые будут добавлены на ваш счёт
+        после публикации этого импорта.
+      empty_summary: Мы не смогли найти импортируемые записи в этом файле. Он может
+        быть пустым, или строки могут не соответствовать ожидаемому формату экспорта
+        (каждая строка должна быть JSON объектом с ключами "type" и "data", используя
+        поддерживаемые этим импортом типы).
+      publish_import: Опубликовать импорт
+      summary_count_label: Количество
+      summary_item_label: Элемент
+      title: Подтвердите ваши данные импорта
+    revert:
+      started: Импорт отменяется в фоновом режиме.
+    revert_failure:
+      description: Пожалуйста, попробуйте снова
+      title: Отмена импорта не удалась
+      try_again: Попробовать снова
+    show:
+      finalize_mappings: Пожалуйста, завершите сопоставления перед продолжением.
+      finalize_upload: Пожалуйста, завершите загрузку вашего файла.
+    steps:
+      clean: Очистка
+      configure: Настройка
+      confirm: Подтверждение
+      map: Сопоставление
+      progress: Шаг %{step} из %{total}
+      select: Выбор
+      upload: Загрузка
+    success:
+      back_to_dashboard: Назад к панели
+      description: Ваши импортированные данные успешно добавлены в приложение и готовы
+        к использованию.
+      title: Импорт успешен
+      verification:
+        checked: Проверено
+        mismatches: Несоответствия
+        status:
+          failed: Не удалось
+          matched: Совпадает
+          mismatch: Несоответствие
+          not_verified: Не проверено
+          reverted: Отменено
+        title: Проверка обратного чтения
+    table:
+      empty: Импортов пока нет.
+      header:
+        actions: Действия
+        date: Дата
+        operation: Операция
+        status: Статус
+      row:
+        actions:
+          confirm_revert: Это удалит операции, которые были импортированы, но вы всё
+            ещё сможете просмотреть и повторно импортировать ваши данные в любое время.
+          delete: Удалить
+          revert: Отменить
+          view: Просмотр
+        status:
+          complete: Завершено
+          failed: Не удалось
+          in_progress: В процессе
+          revert_failed: Отмена не удалась
+          reverting: Отмена
+          uploading: Обработка строк
+        type_labels:
+          account_import: Счёт
+          actual_import: Actual
+          category_import: Категория
+          document_import: Документ
+          merchant_import: Продавец
+          mint_import: Mint
+          pdf_import: PDF
+          qif_import: QIF
+          rule_import: Правило
+          sure_import: Sure
+          trade_import: Сделка
+          transaction_import: Операция
+          ynab_import: YNAB
+      title: Импорты
+    type_labels:
+      account_import: Импорт счетов
+      actual_import: Импорт из Actual
+      category_import: Импорт категорий
+      document_import: Импорт документов
+      merchant_import: Импорт продавцев
+      mint_import: Импорт из Mint
+      pdf_import: Импорт PDF
+      qif_import: Импорт QIF
+      rule_import: Импорт правил
+      sure_import: Импорт Sure
+      trade_import: Импорт сделок
+      transaction_import: Импорт операций
+      ynab_import: Импорт из YNAB
+    update:
+      account_saved: Счёт сохранён.
+      invalid_account: Счёт не найден.
diff --git a/config/locales/views/imports/tr.yml b/config/locales/views/imports/tr.yml
index 8296d655c..dca535b82 100644
--- a/config/locales/views/imports/tr.yml
+++ b/config/locales/views/imports/tr.yml
@@ -3,85 +3,528 @@ tr:
   import:
     cleans:
       show:
+        all_rows: Tüm satırlar
+        data_cleaned: Verileriniz temizlendi
         description: Aşağıdaki tabloda verilerinizi düzenleyin. Kırmızı hücreler geçersizdir.
-        errors_notice: Verilerinizde hatalar var. Detayları görmek için hatanın üzerine gelin.
-        errors_notice_mobile: Verilerinizde hatalar var. Detayları görmek için hata simgesine dokunun.
+        error_rows: Hatalı satırlar
+        errors_notice: Verilerinizde hatalar var. Detayları görmek için hatanın üzerine
+          gelin.
+        errors_notice_mobile: Verilerinizde hatalar var. Detayları görmek için hata
+          simgesine dokunun.
+        next_step: Sonraki adım
+        not_configured: Devam etmeden önce lütfen içe aktarmanızı yapılandırın.
         title: Verilerinizi temizleyin
     configurations:
+      account_import:
+        apply_configuration: Yapılandırmayı uygula
+        balance: Bakiye
+        balance_date: Bakiye Tarihi
+        currency: Para Birimi
+        date_format: Tarih Formatı
+        default: Varsayılan
+        entity_type: Varlık Türü
+        leave_empty: Boş bırak
+        name: Ad
+        select_format: Format seçin
+      actual_import:
+        account_label: Hesap (isteğe bağlı)
+        amount_label: Tutar
+        apply_configuration: Yapılandırmayı uygula
+        category_label: Kategori (isteğe bağlı)
+        date_format_label: Tarih formatı
+        date_label: Tarih
+        incomes_are_negative: Gelirler negatiftir
+        incomes_are_positive: Gelirler pozitiftir
+        leave_empty: Boş bırak
+        name_label: Alıcı (isteğe bağlı)
+        notes_label: Notlar (isteğe bağlı)
+        preconfigured_notice: Actual Budget içe aktarmanızı sizin için önceden yapılandırdık.
+          Lütfen sonraki adıma geçin.
+        signage_convention_label: İşaret kuralı
+      category_import:
+        button_label: Devam et
+        description: Basit bir CSV dosyası yükleyin (verilerinizi dışa aktardığınızda
+          oluşturduğumuz dosya gibi). Sütunları sizin için otomatik olarak eşleştireceğiz.
+        instructions: CSV'nizi ayrıştırmak ve temizleme adımına geçmek için devam'ı
+          seçin.
+      merchant_import:
+        button_label: Devam et
+        description: Satıcılarınızın bulunduğu bir CSV dosyası yükleyin. Sütunları
+          sizin için otomatik olarak eşleştireceğiz.
+        instructions: CSV'nizi ayrıştırmak ve temizleme adımına geçmek için devam'ı
+          seçin.
       mint_import:
         date_format_label: Tarih formatı
+      rule_import:
+        description: Kural içe aktarmanızı yapılandırın. Kurallar CSV verilerine göre
+          oluşturulacak veya güncellenecektir.
+        process_button: Kuralları İşle
+        process_help: CSV'nizi işlemek ve kural satırları oluşturmak için aşağıdaki
+          düğmeye tıklayın.
       show:
         description: CSV dosyanızdaki her alan için karşılık gelen sütunları seçin.
         title: İçe aktarmayı yapılandırın
       trade_import:
+        account_label: Hesap
+        apply_configuration: Yapılandırmayı uygula
+        buys_are_negative: Alışlar negatif miktardır
+        buys_are_positive: Alışlar pozitif miktardır
+        currency_label: Para Birimi
         date_format_label: Tarih formatı
+        date_label: Tarih
+        default: Varsayılan
+        format_label: Format
+        leave_empty: Boş bırak
+        name_label: Ad
+        no_security_provider_warning: Menkul kıymet fiyat sağlayıcısı yapılandırılmamış.
+          Alım satım içe aktarmalarınız çalışacak, ancak Sure geçmiş fiyat verilerini
+          geriye dönük olarak doldurmayacaktır. Bunu yapılandırmak için lütfen ayarlarınıza
+          gidin.
+        note_label: Not
+        price_label: Fiyat
+        quantity_label: Miktar
+        select_column: Sütun seçin
+        select_format: Format seçin
+        stock_exchange_code_label: Borsa kodu
+        ticker_label: Sembol
       transaction_import:
+        account_label: Hesap
+        amount_label: Tutar
+        amount_type_label: Tutar türü
+        amount_type_strategy_label: Tutar türü stratejisi
+        apply_configuration: Yapılandırmayı uygula
+        as_amount_type_column: tutar türü sütunu olarak
+        as_identifier_value: tanımlayıcı değer olarak
+        category_label: Kategori
+        currency_label: Para Birimi
         date_format_label: Tarih formatı
+        date_label: Tarih
+        default: Varsayılan
+        expense_outflow: Gider (çıkış)
+        format_label: Format
+        income_inflow: Gelir (giriş)
+        incomes_are_negative: Gelirler negatiftir
+        incomes_are_positive: Gelirler pozitiftir
+        leave_empty: Boş bırak
+        name_label: Ad
+        notes_label: Notlar
+        rows_to_skip_label: İlk n satırı atla
+        select_column: Sütun seçin
+        select_convention: Kural seçin
+        select_format: Format seçin
+        select_strategy: Strateji seçin
+        select_type: Tür seçin
+        select_value: Değer seçin
+        set: Ayarla
+        tags_label: Etiketler
+        treat_as_html: '"<span class="font-medium">%{value}</span>" ifadesini şu şekilde
+          ele al'
+      update:
+        success: İçe aktarma başarıyla yapılandırıldı.
+      ynab_import:
+        account_label: Hesap (isteğe bağlı)
+        amount_notice: Tutarlar, Çıkış ve Giriş sütunlarından otomatik olarak algılanır.
+        apply_configuration: Yapılandırmayı uygula
+        category_label: Kategori (isteğe bağlı)
+        date_format_label: Tarih formatı
+        date_label: Tarih
+        leave_empty: Boş bırak
+        name_label: Alıcı (isteğe bağlı)
+        notes_label: Not (isteğe bağlı)
+        preconfigured_notice: YNAB içe aktarmanızı sizin için önceden yapılandırdık.
+          Lütfen sonraki adıma geçin.
     confirms:
       mappings:
         create_account: Hesap oluştur
         csv_mapping_label: CSV'de %{mapping}
-        sure_mapping_label: "%{product_name}'de %{mapping}"
-        no_accounts: Henüz hiç hesabınız yok. Lütfen CSV'nizdeki (atanmamış) satırlar için kullanabileceğimiz bir hesap oluşturun veya Temizle adımına geri dönüp kullanabileceğimiz bir hesap adı girin.
+        next: İleri
+        no_accounts: Henüz hiç hesabınız yok. Lütfen CSV'nizdeki (atanmamış) satırlar
+          için kullanabileceğimiz bir hesap oluşturun veya Temizle adımına geri dönüp
+          kullanabileceğimiz bir hesap adı girin.
         rows_label: Satırlar
-        unassigned_account: Atanmamış satırlar için yeni bir hesap oluşturmak ister misiniz?
+        sure_mapping_label: "%{product_name}'de %{mapping}"
+        unassigned_account: Atanmamış satırlar için yeni bir hesap oluşturmak ister
+          misiniz?
       show:
-        account_mapping_description: "İçe aktardığınız dosyadaki tüm hesapları %{product_name}'deki mevcut hesaplara eşleyin. Ayrıca yeni hesaplar ekleyebilir veya kategorize etmeden bırakabilirsiniz."
+        account_mapping_description: İçe aktardığınız dosyadaki tüm hesapları %{product_name}'deki
+          mevcut hesaplara eşleyin. Ayrıca yeni hesaplar ekleyebilir veya kategorize
+          etmeden bırakabilirsiniz.
         account_mapping_title: Hesaplarınızı eşleyin
-        account_type_mapping_description: "İçe aktardığınız dosyadaki tüm hesap türlerini %{product_name}'deki hesap türlerine eşleyin."
+        account_type_mapping_description: İçe aktardığınız dosyadaki tüm hesap türlerini
+          %{product_name}'deki hesap türlerine eşleyin.
         account_type_mapping_title: Hesap türlerinizi eşleyin
-        category_mapping_description: "İçe aktardığınız dosyadaki tüm kategorileri %{product_name}'deki mevcut kategorilere eşleyin. Ayrıca yeni kategoriler ekleyebilir veya kategorize etmeden bırakabilirsiniz."
+        category_mapping_description: İçe aktardığınız dosyadaki tüm kategorileri
+          %{product_name}'deki mevcut kategorilere eşleyin. Ayrıca yeni kategoriler
+          ekleyebilir veya kategorize etmeden bırakabilirsiniz.
         category_mapping_title: Kategorilerinizi eşleyin
-        tag_mapping_description: "İçe aktardığınız dosyadaki tüm etiketleri %{product_name}'deki mevcut etiketlere eşleyin. Ayrıca yeni etiketler ekleyebilir veya kategorize etmeden bırakabilirsiniz."
+        invalid_data: Geçersiz verileriniz var, lütfen tüm hatalar giderilene kadar
+          düzenleyin
+        tag_mapping_description: İçe aktardığınız dosyadaki tüm etiketleri %{product_name}'deki
+          mevcut etiketlere eşleyin. Ayrıca yeni etiketler ekleyebilir veya kategorize
+          etmeden bırakabilirsiniz.
         tag_mapping_title: Etiketlerinizi eşleyin
-    uploads:
+      sure_import:
+        cancel: İptal
+        description: Dışa aktarma dosyanızdan içe aktarılacak verileri inceleyin.
+        empty_summary: Bu dosyada içe aktarılabilir herhangi bir kayıt bulamadık.
+          Dosya boş olabilir veya satırlar beklenen dışa aktarma biçimiyle eşleşmiyor
+          olabilir (her satır, bu içe aktarmanın desteklediği türleri kullanan "type"
+          ve "data" anahtarlarına sahip bir JSON nesnesi olmalıdır).
+        publish_button: İçe aktarmayı başlat
+        summary: İçe aktarma özeti
+        title: İçe aktarmanızı onaylayın
+    qif_category_selections:
       show:
-        description: CSV dosyanızı aşağıya yapıştırın veya yükleyin. Başlamadan önce lütfen aşağıdaki tablodaki talimatları inceleyin.
+        categories_found:
+          one: 1 kategori bulundu
+          other: "%{count} kategori bulundu"
+        categories_heading: Kategoriler
+        category_name_col: Kategori adı
+        description: Algılanan tarih formatını inceleyin, ardından QIF dosyanızdaki
+          hangi kategori ve etiketlerin %{product_name}'e aktarılacağını seçin.
+        empty_state_primary: Bu QIF dosyasında hiç kategori veya etiket bulunamadı.
+        empty_state_secondary: Tüm işlemler kategori veya etiket olmadan içe aktarılacaktır.
+        split_badge: bölünmüş
+        split_warning_description: Bu QIF dosyası bölünmüş işlemler içeriyor. Bölünmüş
+          işlemler henüz desteklenmediğinden, her bölünmüş işlem tam tutarıyla ve
+          kategorisiz tek bir işlem olarak içe aktarılacaktır. Ayrı bölünme dökümleri
+          korunmayacaktır.
+        split_warning_title: Bölünmüş işlemler tespit edildi
+        submit: İncelemeye devam et
+        tag_name_col: Etiket adı
+        tags_found:
+          one: 1 etiket bulundu
+          other: "%{count} etiket bulundu"
+        tags_heading: Etiketler
+        title: Yapılandır ve seç
+        transactions_col: İşlemler
+        txn_count:
+          one: 1 işlem
+          other: "%{count} işlem"
+      update:
+        success: Kategoriler ve etiketler kaydedildi.
+    uploads:
+      handle_qif_upload:
+        qif_uploaded: QIF dosyası başarıyla yüklendi.
+      show:
+        account_optional_label: Hesap (isteğe bağlı)
+        browse: Gözat
+        copy_paste_tab: Kopyala ve Yapıştır
+        csv_file_prompt: CSV dosyanızı buraya eklemek için
+        csv_invalid: Başlıklara ve en az bir satır veriye sahip geçerli bir CSV olmalıdır
+        description: CSV dosyanızı aşağıya yapıştırın veya yükleyin. Başlamadan önce
+          lütfen aşağıdaki tablodaki talimatları inceleyin.
+        download_sample_csv: Örnek bir CSV indirin
+        drop_csv_subtitle: Dosyanız otomatik olarak yüklenecektir
+        drop_csv_title: Yüklemek için CSV'yi buraya bırakın
         instructions_1: Aşağıda içe aktarılabilir sütunlara sahip örnek bir CSV bulunmaktadır.
         instructions_2: CSV'nizin bir başlık satırı olmalıdır
-        instructions_3: Sütunlarınıza istediğiniz ismi verebilirsiniz. Bunları sonraki adımda eşleyeceksiniz.
+        instructions_3: Sütunlarınıza istediğiniz ismi verebilirsiniz. Bunları sonraki
+          adımda eşleyeceksiniz.
         instructions_4: Yıldız (*) ile işaretli sütunlar zorunlu verilerdir.
         instructions_5: Sayılarda virgül, para birimi simgesi veya parantez kullanmayın.
+        multi_account_import: Çoklu hesap içe aktarma
+        paste_csv_placeholder: CSV dosya içeriğinizi buraya yapıştırın
+        qif_account_label: Hesap
+        qif_account_placeholder: Bir hesap seçin…
+        qif_description: Bu QIF dosyasının ait olduğu hesabı seçin, ardından Quicken'dan
+          dışa aktardığınız .qif dosyasını yükleyin.
+        qif_file_hint: Yalnızca .qif dosyaları
+        qif_file_prompt: QIF dosyanızı buraya eklemek için
+        qif_submit: QIF Yükle
+        qif_title: QIF dosyası yükle
         title: Verilerinizi içe aktarın
+        to_see_format: gerekli CSV formatını görmek için
+        upload_csv_button: CSV Yükle
+        upload_csv_tab: CSV Yükle
+      sure_import:
+        browse: Gözat
+        browse_hint: all.ndjson dosyanızı buraya eklemek için
+        description: Hesaplarınızı, işlemlerinizi, kategorilerinizi ve daha fazlasını
+          geri yüklemek için veri dışa aktarmanızdaki all.ndjson dosyasını yükleyin.
+        drop_subtitle: Dosyanız otomatik olarak yüklenecektir
+        drop_title: Yüklemek için NDJSON'u buraya bırakın
+        hint_html: Veri dışa aktarma ZIP dosyanızdaki <strong>all.ndjson</strong>
+          dosyasını yükleyin
+        ndjson_invalid: En az bir kayıt içeren geçerli bir NDJSON olmalıdır
+        title: Dışa aktarmadan içe aktar
+        upload_button: NDJSON Yükle
+      update:
+        qif_uploaded: QIF dosyası başarıyla yüklendi.
   imports:
+    apply_template:
+      no_template_found: Şablon bulunamadı, lütfen içe aktarmanızı manuel olarak yapılandırın.
+      template_applied: Şablon uygulandı.
+    cancel:
+      cancelled: İçe aktarma başarısız olarak işaretlendi. İçe aktarma sayfasından
+        tekrar deneyebilirsiniz.
+      not_cancellable: Bu içe aktarma şu anda başarısız olarak işaretlenemez — işi
+        hâlâ çalışıyor olabilir. Bir saat boyunca etkin olmadıktan sonra tekrar deneyin.
+    column_labels:
+      account: Hesap
+      amount: Tutar
+      category: Kategori
+      category_color: Renk
+      category_icon: Lucide simgesi
+      category_parent: Üst kategori
+      currency: Para Birimi
+      date: Tarih
+      entity_type: Tür
+      exchange: Borsa
+      merchant_color: Renk
+      merchant_website: Web sitesi URL'si
+      name: Ad
+      notes: Notlar
+      price: Fiyat
+      qty: Miktar
+      tags: Etiketler
+      ticker: Sembol
+    create:
+      csv_uploaded: CSV başarıyla yüklendi.
+      document_provider_not_configured: Belge yüklemeleri için hiçbir vektör deposu
+        yapılandırılmamış.
+      document_too_large: Belge dosyası çok büyük. Maksimum boyut %{max_size}MB'dir.
+      document_upload_failed: Belgeyi vektör deposuna yükleyemedik. Lütfen tekrar
+        deneyin.
+      document_uploaded: Belge başarıyla yüklendi.
+      duplicate_pdf_unavailable: Bu PDF, erişemediğiniz bir ekstre olarak zaten kaydedilmiş.
+      file_too_large: Dosya çok büyük. Maksimum boyut %{max_size}MB'dir.
+      invalid_document_file_type: Aktif vektör deposu için geçersiz belge dosya türü.
+      invalid_file_type: Geçersiz dosya türü. Lütfen bir CSV dosyası yükleyin.
+      invalid_ndjson_file_type: Geçersiz dosya türü veya biçimi. Lütfen geçerli bir
+        .ndjson veya .json dışa aktarma dosyası yükleyin.
+      invalid_pdf: Yüklenen dosya geçerli bir PDF değil.
+      ndjson_uploaded: NDJSON dosyası başarıyla yüklendi.
+      pdf_processing: PDF'iniz işleniyor. Analiz tamamlandığında bir e-posta alacaksınız.
+      pdf_too_large: PDF dosyası çok büyük. Maksimum boyut %{max_size}MB'dir.
+    date_format:
+      description: Tarih formatı dosyanızdan otomatik olarak algılandı. Tarihler yanlış
+        görünüyorsa değiştirin.
+      error_description: Desteklenen tarih formatlarının hiçbiri bu dosyadaki tarihleri
+        ayrıştıramadı. Lütfen dosyanın geçerli tarih girişleri içerdiğinden emin olun.
+      error_title: Tarih formatı algılanamadı
+      heading: Tarih formatı
+      preview: Ayrıştırılan ilk tarih
+    destroy:
+      deleted: İçe aktarmanız silindi.
+    document_types:
+      bank_statement: Banka Ekstresi
+      contract: Sözleşme
+      credit_card_statement: Kredi Kartı Ekstresi
+      financial_document: Finansal Belge
+      investment_statement: Yatırım Ekstresi
+      other: Diğer Belge
+      unknown: Bilinmeyen Belge
+    dry_run_resources:
+      accounts: Hesaplar
+      balances: Bakiyeler
+      budget_categories: Bütçe Kategorileri
+      budgets: Bütçeler
+      categories: Kategoriler
+      holdings: Varlıklar
+      merchants: Satıcılar
+      recurring_transactions: Yinelenen İşlemler
+      rejected_transfers: Reddedilen Transferler
+      rules: Kurallar
+      tags: Etiketler
+      trades: Alım Satımlar
+      transactions: İşlemler
+      transfers: Transferler
+      valuations: Değerlemeler
+    empty:
+      message: İçe aktarma bulunamadı.
+    errors:
+      custom_column_requires_inflow: Özel sütun içe aktarmaları için bir giriş sütunu
+        seçilmesi gerekir
+      presumed_lost: Arka plan işinin kaybolduğu varsayıldığından başarısız olarak
+        işaretlendi. İçe aktarılan veriler geri alındı — güvenle tekrar deneyebilirsiniz.
+    failure:
+      description: Lütfen dosya biçiminizi, olası hataları ve tüm zorunlu alanların
+        doldurulduğunu kontrol edin, ardından geri dönüp tekrar deneyin.
+      title: İçe aktarma başarısız oldu
+      try_again: Tekrar dene
+    importing:
+      back_to_dashboard: Panele dön
+      check_status: Durumu kontrol et
+      description: İçe aktarmanız devam ediyor. Durum güncellemeleri için içe aktarmalar
+        menüsünü kontrol edin veya sayfayı yenilemek için 'Durumu Kontrol Et' butonuna
+        tıklayın. Uygulamayı kullanmaya devam edebilirsiniz.
+      title: İçe aktarma devam ediyor
     index:
-      title: İçe aktarmalar
       new: Yeni İçe Aktarma
-    table:
       title: İçe aktarmalar
+    mapping_labels:
+      account: Hesap
+      account_type: Hesap Türü
+      category: Kategori
+      tag: Etiket
+    new:
+      description: Farklı veri türlerini CSV ile manuel olarak içe aktarabilir veya
+        Mint gibi içe aktarma şablonlarımızı kullanabilirsiniz.
+      import_accounts: Hesapları içe aktar
+      import_actual: Actual Budget'ten içe aktar
+      import_categories: Kategorileri içe aktar
+      import_file: Belge içe aktar
+      import_file_description: PDF'ler için yapay zeka destekli analiz ve aranabilir
+        dosya yükleme
+      import_merchants: Satıcıları içe aktar
+      import_mint: Mint'ten içe aktar
+      import_portfolio: Yatırımları içe aktar
+      import_qif: Quicken'dan içe aktar (QIF)
+      import_rules: Kuralları içe aktar
+      import_sure: Sure'dan içe aktar
+      import_sure_description: Tam dışa aktarma .ndjson dosyası
+      import_transactions: İşlemleri içe aktar
+      import_ynab: YNAB'dan içe aktar
+      requires_account: Bu seçeneğin kilidini açmak için önce hesapları içe aktarın.
+      resume: "%{type} işlemini sürdür"
+      sources: Kaynaklar
+      tab_financial_tools: Finansal Araçlar ve Dosyalar
+      tab_raw_data: Ham Veri
+      title: Yeni CSV İçe Aktarma
+    pdf_import:
+      back_to_dashboard: Panele dön
+      back_to_imports: İçe aktarmalara dön
+      check_status: Durumu kontrol et
+      complete_description: PDF'inizi analiz ettik, işte bulduklarımız.
+      complete_title: Belge analiz edildi
+      create_account: Hesap Oluştur
+      delete_import: İçe aktarmayı sil
+      document_type_label: Belge Türü
+      email_sent_notice: Sonraki adımlarla ilgili size bir e-posta gönderildi.
+      failed_description: PDF belgenizi işleyemedik. Lütfen tekrar deneyin veya destekle
+        iletişime geçin.
+      failed_title: İşleme başarısız oldu
+      no_accounts: Kullanılabilir hesap yok. Lütfen önce bir hesap oluşturun.
+      processing_description: Belgenizi yapay zeka kullanarak analiz ediyoruz. Bu
+        biraz zaman alabilir. Analiz tamamlandığında bir e-posta alacaksınız.
+      processing_failed_generic: 'İşleme başarısız oldu: %{error}'
+      processing_failed_with_message: "%{message}"
+      processing_title: PDF'iniz işleniyor
+      publish_transactions:
+        one: "%{count} İşlemi Yayınla"
+        other: "%{count} İşlemi Yayınla"
+      ready_for_review_description: Ekstrenizden %{count} işlem çıkardık. Hesabınıza
+        eklemek için inceleyin ve yayınlayın.
+      ready_for_review_title: İncelemeye Hazır
+      review_transactions: İşlemleri İncele
+      save_account: Kaydet
+      select_account: Hesaba İçe Aktar
+      select_account_hint: Bu işlemleri hangi hesaba aktaracağınızı seçin.
+      select_account_placeholder: Bir hesap seçin...
+      select_account_to_continue: Devam etmek için lütfen yukarıdan bir hesap seçin.
+      source_statement: Kaynak ekstre
+      summary_label: Özet
+      transactions_extracted: Çıkarılan İşlemler
+      transactions_extracted_count:
+        one: "%{count} işlem"
+        other: "%{count} işlem"
+      try_again: Tekrar dene
+      unknown_document_type: Bilinmeyen
+      unknown_state_description: Bu içe aktarma beklenmeyen bir durumda. Lütfen içe
+        aktarmalara geri dönün.
+      unknown_state_title: Bilinmeyen durum
+    publish:
+      max_rows_exceeded: İçe aktarmanız maksimum %{max} satır sayısını aşıyor.
+      started: İçe aktarmanız arka planda başlatıldı.
+    ready:
+      back_to_imports: İçe aktarmalara dön
+      description: Bu içe aktarmayı yayınladığınızda hesabınıza eklenecek yeni öğelerin
+        özeti aşağıdadır.
+      empty_summary: Bu dosyada içe aktarılabilir kayıt bulunamadı. Dosya boş olabilir
+        veya satırlar beklenen dışa aktarma biçimiyle eşleşmiyor (her satır, bu içe
+        aktarmanın desteklediği türlerle «type» ve «data» anahtarlarına sahip bir
+        JSON nesnesi olmalıdır).
+      publish_import: İçe aktarmayı yayınla
+      summary_count_label: Adet
+      summary_item_label: Öğe
+      title: İçe aktarma verilerinizi onaylayın
+    revert:
+      started: İçe aktarma arka planda geri alınıyor.
+    revert_failure:
+      description: Lütfen tekrar deneyin
+      title: İçe aktarmayı geri alma başarısız oldu
+      try_again: Tekrar dene
+    show:
+      finalize_mappings: Devam etmeden önce lütfen eşlemelerinizi tamamlayın.
+      finalize_upload: Lütfen dosya yüklemenizi tamamlayın.
+    steps:
+      clean: Temizle
+      configure: Yapılandır
+      confirm: Onayla
+      map: Eşle
+      progress: Adım %{step}/%{total}
+      select: Seç
+      upload: Yükle
+    success:
+      back_to_dashboard: Panele dön
+      description: İçe aktarılan verileriniz uygulamaya başarıyla eklendi ve artık
+        kullanıma hazır.
+      title: İçe aktarma başarılı
+      verification:
+        checked: Kontrol edildi
+        mismatches: Uyuşmazlıklar
+        status:
+          failed: Başarısız
+          matched: Eşleşti
+          mismatch: Uyuşmazlık
+          not_verified: Doğrulanmadı
+          reverted: Geri alındı
+        title: Geri okuma doğrulaması
+    table:
+      empty: Henüz hiç içe aktarma yok.
       header:
+        actions: Eylemler
         date: Tarih
         operation: Operasyon
         status: Durum
-        actions: Eylemler
       row:
+        actions:
+          confirm_mark_failed: Bu içe aktarma bir süredir etkin değil ve arka plan
+            işi muhtemelen kesintiye uğradı. Tekrar deneyebilmeniz için başarısız
+            olarak mı işaretlensin? Hiçbir içe aktarılan veri saklanmaz.
+          confirm_revert: Bu işlem, içe aktarılan işlemleri silecektir, ancak verilerinizi
+            istediğiniz zaman inceleyebilir ve yeniden içe aktarabilirsiniz.
+          delete: Sil
+          mark_failed: Başarısız olarak işaretle
+          revert: Geri al
+          view: Görüntüle
         status:
-          in_progress: Devam ediyor
-          uploading: Satırlar işleniyor
-          reverting: Geri alınıyor
-          revert_failed: Geri alma başarısız
           complete: Tamamlandı
           failed: Başarısız
-        actions:
-          revert: Geri al
-          confirm_revert: Bu işlem, içe aktarılan işlemleri silecektir, ancak verilerinizi istediğiniz zaman inceleyebilir ve yeniden içe aktarabilirsiniz.
-          delete: Sil
-          view: Görüntüle
-      empty: Henüz hiç içe aktarma yok.
-    new:
-      description: Farklı veri türlerini CSV ile manuel olarak içe aktarabilir veya Mint gibi içe aktarma şablonlarımızı kullanabilirsiniz.
-      import_accounts: Hesapları içe aktar
-      import_mint: Mint'ten içe aktar
-      import_portfolio: Yatırımları içe aktar
-      import_transactions: İşlemleri içe aktar
-      resume: "%{type} işlemini sürdür"
-      sources: Kaynaklar
-      title: Yeni CSV İçe Aktarma
-    ready:
-      description: Bu içe aktarmayı yayınladığınızda hesabınıza eklenecek yeni öğelerin özeti aşağıdadır.
-      title: İçe aktarma verilerinizi onaylayın
-      summary_item_label: Öğe
-      summary_count_label: Adet
-      empty_summary: Bu dosyada içe aktarılabilir kayıt bulunamadı. Dosya boş olabilir veya satırlar beklenen dışa aktarma biçimiyle eşleşmiyor (her satır, bu içe aktarmanın desteklediği türlerle «type» ve «data» anahtarlarına sahip bir JSON nesnesi olmalıdır).
-      publish_import: İçe aktarmayı yayınla
-      back_to_imports: İçe aktarmalara dön
\ No newline at end of file
+          in_progress: Devam ediyor
+          revert_failed: Geri alma başarısız
+          reverting: Geri alınıyor
+          uploading: Satırlar işleniyor
+        type_labels:
+          account_import: Hesap
+          actual_import: Actual
+          category_import: Kategori
+          document_import: Belge
+          merchant_import: Satıcı
+          mint_import: Mint
+          pdf_import: PDF
+          qif_import: QIF
+          rule_import: Kural
+          sure_import: Sure
+          trade_import: Alım Satım
+          transaction_import: İşlem
+          ynab_import: YNAB
+      title: İçe aktarmalar
+    type_labels:
+      account_import: Hesap içe aktarma
+      actual_import: Actual içe aktarma
+      category_import: Kategori içe aktarma
+      document_import: Belge içe aktarma
+      merchant_import: Satıcı içe aktarma
+      mint_import: Mint içe aktarma
+      pdf_import: PDF içe aktarma
+      qif_import: QIF içe aktarma
+      rule_import: Kural içe aktarma
+      sure_import: Sure içe aktarma
+      trade_import: Alım satım içe aktarma
+      transaction_import: İşlem içe aktarma
+      ynab_import: YNAB içe aktarma
+    update:
+      account_saved: Hesap kaydedildi.
+      invalid_account: Hesap bulunamadı.
diff --git a/config/locales/views/imports/vi.yml b/config/locales/views/imports/vi.yml
index 1943a9334..0ac69cc9d 100644
--- a/config/locales/views/imports/vi.yml
+++ b/config/locales/views/imports/vi.yml
@@ -344,7 +344,6 @@ vi:
       description: Nhập từ công cụ tài chính hoặc tải lên tệp dữ liệu thô.
       tab_financial_tools: Công cụ tài chính & Tệp
       tab_raw_data: Dữ liệu thô
-      coming_soon: Sắp ra mắt
       import_ynab: Nhập từ YNAB
       import_accounts: Nhập tài khoản
       import_categories: Nhập danh mục
diff --git a/config/locales/views/imports/zh-CN.yml b/config/locales/views/imports/zh-CN.yml
index 21be8ebf1..9c93e5630 100644
--- a/config/locales/views/imports/zh-CN.yml
+++ b/config/locales/views/imports/zh-CN.yml
@@ -130,6 +130,10 @@ zh-CN:
       show:
         description: 选择与 CSV 中每个字段对应的列。
         title: 配置您的导入
+      merchant_import:
+        button_label: 继续
+        description: 导入商户列表，用于补全交易商户信息。
+        instructions: 上传包含商户名称、网站和颜色等字段的 CSV 文件。
     confirms:
       sure_import:
         title: 确认您的导入
@@ -157,6 +161,8 @@ zh-CN:
         tag_mapping_description: 将导入文件中的所有标签分配到 %{product_name} 中现有的标签。您也可以添加新标签，或将其保留为未分类。
         tag_mapping_title: 分配您的标签
     uploads:
+      handle_qif_upload:
+        qif_uploaded: QIF 文件上传成功。
       update:
         qif_uploaded: QIF 文件上传成功。
       show:
@@ -236,6 +242,8 @@ zh-CN:
       category_parent: 父分类
       category_color: 颜色
       category_icon: Lucide 图标
+      merchant_color: 颜色
+      merchant_website: 网站 URL
     update:
       account_saved: 账户已保存。
       invalid_account: 未找到账户。
@@ -267,6 +275,19 @@ zh-CN:
           confirm_revert: 这将删除已导入的交易记录，但您仍然可以随时查看和重新导入您的数据。
           delete: 删除
           view: 查看
+        type_labels:
+          transaction_import: 交易
+          trade_import: 投资交易
+          account_import: 账户
+          mint_import: Mint
+          actual_import: Actual
+          qif_import: QIF
+          category_import: 分类
+          rule_import: 规则
+          merchant_import: 商户
+          pdf_import: PDF
+          document_import: 文档
+          sure_import: Sure
       empty: 暂无导入记录。
     new:
       description: 您可以通过 CSV 手动导入多种类型数据，或使用我们的导入模板（如 Mint 格式）。
@@ -279,6 +300,17 @@ zh-CN:
       resume: 继续 %{type}
       sources: 数据来源
       title: 新建 CSV 导入
+      tab_financial_tools: 财务工具和文件
+      tab_raw_data: 原始数据
+      import_ynab: 从 YNAB 导入
+      import_merchants: 导入商户
+      import_actual: 从 Actual Budget 导入
+      import_qif: 从 Quicken（QIF）导入
+      import_sure: 从 Sure 导入
+      import_sure_description: 导入 Sure 导出的数据文件。
+      import_file: 导入文档
+      import_file_description: 上传账单、CSV 或其他财务文档。
+      requires_account: 导入前需要先创建账户。
     ready:
       description: 以下是发布导入后将添加到您账户的新项目摘要。
       title: 确认导入数据
@@ -287,3 +319,130 @@ zh-CN:
       empty_summary: 在此文件中未找到可导入的记录。文件可能为空，或各行不符合预期的导出格式（每行应为包含「type」和「data」键的 JSON 对象，且类型须为本导入支持的类型）。
       publish_import: 发布导入
       back_to_imports: 返回导入列表
+    apply_template:
+      template_applied: 模板已应用。
+      no_template_found: 找不到可用模板。
+    destroy:
+      deleted: 导入已删除。
+    failure:
+      title: 导入 失败
+      description: 导入过程中出现问题。
+      try_again: 重试
+    success:
+      title: 导入成功
+      description: 导入成功说明
+      back_to_dashboard: 返回仪表盘
+      verification:
+        title: 回读校验
+        checked: 已检查
+        mismatches: 不匹配
+        status:
+          not_verified: 未校验
+          matched: 已匹配
+          mismatch: 不匹配
+          failed: 失败
+          reverted: 已回滚
+    importing:
+      title: 正在导入
+      description: 正在处理导入文件，请稍候。
+      check_status: 检查状态
+      back_to_dashboard: 返回仪表盘
+    revert_failure:
+      title: 回滚导入失败
+      description: 请重试
+      try_again: 重试
+    date_format:
+      heading: 日期格式
+      description: 选择导入文件中日期字段使用的格式。
+      preview: 第一条解析日期
+      error_title: 日期格式无效
+      error_description: 无法按所选格式解析日期，请检查示例。
+    type_labels:
+      transaction_import: 交易导入
+      trade_import: 投资交易导入
+      account_import: 账户导入
+      mint_import: Mint 导入
+      actual_import: Actual 导入
+      qif_import: QIF 导入
+      category_import: 分类导入
+      rule_import: 规则导入
+      merchant_import: 商户导入
+      pdf_import: PDF 导入
+      document_import: 文档导入
+      sure_import: Sure 导入
+    steps:
+      upload: 上传
+      configure: 配置
+      clean: 清理
+      map: 映射
+      confirm: 确认
+      select: 选择
+      progress: 第 %{step} 步，共 %{total} 步
+    empty:
+      message: 未找到导入记录。
+    create:
+      file_too_large: 文件过大，最大允许 %{max_size}。
+      invalid_file_type: 文件类型无效。
+      csv_uploaded: CSV 已成功上传。
+      ndjson_uploaded: NDJSON 文件已成功上传。
+      pdf_too_large: PDF 过大，最大允许 %{max_size}。
+      pdf_processing: PDF 正在处理中。
+      invalid_pdf: PDF 文件无效。
+      duplicate_pdf_unavailable: 暂时无法检查重复 PDF。
+      document_too_large: 文档过大，最大允许 %{max_size}。
+      invalid_document_file_type: 文档文件类型无效。
+      document_uploaded: 文档已成功上传。
+      document_upload_failed: 文档上传失败。
+      invalid_ndjson_file_type: NDJSON 文件类型无效。
+      document_provider_not_configured: 文档处理提供商尚未配置。
+    show:
+      finalize_upload: 完成上传
+      finalize_mappings: 完成映射
+    errors:
+      custom_column_requires_inflow: 自定义列需要选择流入金额列。
+    document_types:
+      bank_statement: 银行账单
+      credit_card_statement: 信用卡账单
+      investment_statement: 投资账单
+      financial_document: 财务文档
+      contract: 合同
+      other: 其他文档
+      unknown: 未知文档
+    pdf_import:
+      processing_title: 正在处理 PDF
+      processing_description: 正在分析文档并提取交易。
+      check_status: 检查状态
+      back_to_dashboard: 返回仪表盘
+      failed_title: 处理失败
+      failed_description: 无法处理此文档。请重试或查看日志。
+      try_again: 重试
+      delete_import: 删除导入
+      complete_title: 文档已分析
+      complete_description: 文档分析完成，可以继续审核导入结果。
+      document_type_label: 文档类型
+      source_statement: 来源账单
+      summary_label: 摘要
+      email_sent_notice: 处理完成后会发送邮件通知。
+      back_to_imports: 返回导入
+      unknown_state_title: 未知状态
+      unknown_state_description: 此导入处于未知状态。请刷新页面或查看日志。
+      processing_failed_with_message: "%{message}"
+      processing_failed_generic: 处理失败：%{error}
+      ready_for_review_title: 可供审核
+      ready_for_review_description: 已提取 %{count} 条交易，请审核后发布。
+      transactions_extracted: 已提取交易
+      transactions_extracted_count:
+        one: "%{count} 笔交易"
+        other: "%{count} 笔交易"
+      select_account: 导入到账户
+      select_account_placeholder: 选择账户...
+      select_account_hint: 选择这些交易要导入的账户。
+      no_accounts: 没有可用账户。
+      create_account: 创建账户
+      save_account: 保存
+      publish_transactions:
+        one: 发布 %{count} 笔交易
+        other: 发布 %{count} 笔交易
+      review_transactions: 审核交易
+      select_account_to_continue: 请选择账户后继续。
+      unknown_document_type: 未知
diff --git a/config/locales/views/indexa_capital_items/fr.yml b/config/locales/views/indexa_capital_items/fr.yml
index 66dce0d18..e87eeaffa 100644
--- a/config/locales/views/indexa_capital_items/fr.yml
+++ b/config/locales/views/indexa_capital_items/fr.yml
@@ -1,252 +1,258 @@
 ---
 fr:
   indexa_capital_items:
-    # Model method strings (i18n for item_model.rb)
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      creation_failed: 'Échec de la création des comptes : %{error}'
+      no_accounts: Aucun compte à configurer.
+      success: "%{count} compte(s) créé(s) avec succès."
+    create:
+      success: Connexion Indexa Capital créée avec succès
+    destroy:
+      success: Connexion Indexa Capital supprimée
+    errors:
+      provider_not_configured: Le fournisseur Indexa Capital n'est pas configuré
+    index:
+      title: Connexions Indexa Capital
+    indexa_capital_item:
+      accounts_need_setup: Des comptes doivent être configurés
+      delete: Supprimer la connexion
+      deletion_in_progress: suppression en cours…
+      error: Erreur
+      more_accounts_available:
+        one: "%{count} compte supplémentaire disponible"
+        other: "%{count} comptes supplémentaires disponibles"
+      no_accounts_description: Cette connexion n'a pas encore de comptes liés.
+      no_accounts_title: Aucun compte
+      provider_name: Indexa Capital
+      requires_update: Connexion à mettre à jour
+      setup_action: Configurer les nouveaux comptes
+      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types
+        de compte pour vos comptes Indexa Capital nouvellement importés."
+      setup_needed: Nouveaux comptes prêts à être configurés
+      status: Synchronisé il y a %{timestamp} — %{summary}
+      status_never: Jamais synchronisé
+      syncing: Synchronisation…
+      total: Total
+      unlinked: Non lié
+      update_credentials: Mettre à jour les identifiants
+    institution_summary:
+      count:
+        one: "%{count} institution"
+        other: "%{count} institutions"
+      none: Aucune institution connectée
+    link_accounts:
+      all_already_linked:
+        one: Le compte sélectionné (%{names}) est déjà lié
+        other: 'Les %{count} comptes sélectionnés sont déjà liés : %{names}'
+      api_error: 'Erreur API : %{message}'
+      invalid_account_names:
+        one: Impossible de lier un compte sans nom
+        other: Impossible de lier %{count} comptes sans nom
+      link_failed: Échec de la liaison des comptes
+      no_accounts_selected: Veuillez sélectionner au moins un compte
+      no_api_key: Identifiants Indexa Capital introuvables. Veuillez les configurer
+        dans les paramètres du fournisseur.
+      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count}
+        étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
+      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count}
+        compte(s) étaient déjà liés : %{already_linked_names}"
+      success:
+        one: "%{count} compte lié avec succès"
+        other: "%{count} comptes liés avec succès"
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      api_error: 'Erreur API : %{message}'
+      invalid_account_name: Impossible de lier un compte sans nom
+      missing_parameters: Paramètres requis manquants
+      no_api_key: Identifiants Indexa Capital introuvables. Veuillez les configurer
+        dans les paramètres du fournisseur.
+      provider_account_already_linked: Ce compte Indexa Capital est déjà lié à un
+        autre compte
+      provider_account_not_found: Compte Indexa Capital introuvable
+      success: "%{account_name} lié avec succès à Indexa Capital"
+    loading:
+      loading_message: Chargement des comptes Indexa Capital…
+      loading_title: Chargement
+    panel:
+      alternative_auth: Ou utilisez plutôt l'authentification par nom d'utilisateur
+        / mot de passe…
+      field_descriptions: 'Description des champs :'
+      fields:
+        api_token:
+          description: Votre jeton API en lecture seule depuis le tableau de bord
+            Indexa Capital
+          label: Jeton API
+          placeholder_new: Collez votre jeton API ici
+          placeholder_update: Saisissez un nouveau jeton API pour mettre à jour
+        document:
+          description: Votre document / identifiant Indexa Capital
+          label: Identifiant du document
+          placeholder_new: Collez l'identifiant du document ici
+          placeholder_update: Saisissez un nouvel identifiant de document pour mettre
+            à jour
+        password:
+          description: Votre mot de passe Indexa Capital
+          label: Mot de passe
+          placeholder_new: Collez le mot de passe ici
+          placeholder_update: Saisissez un nouveau mot de passe pour mettre à jour
+        username:
+          description: Votre nom d'utilisateur / e-mail Indexa Capital
+          label: Nom d'utilisateur
+          placeholder_new: Collez le nom d'utilisateur ici
+          placeholder_update: Saisissez un nouveau nom d'utilisateur pour mettre à
+            jour
+      optional: "(Facultatif)"
+      optional_with_default: "(facultatif, valeur par défaut : %{default_value})"
+      required: "(obligatoire)"
+      save_button: Enregistrer la configuration
+      setup_instructions: 'Instructions de configuration :'
+      step_1: Rendez-vous sur votre tableau de bord Indexa Capital pour générer un
+        jeton API en lecture seule
+      step_2: Collez votre jeton API ci-dessous et cliquez sur Enregistrer
+      step_3: Après une connexion réussie, rendez-vous sur l'onglet Comptes pour configurer
+        les nouveaux comptes
+      update_button: Mettre à jour la configuration
+    preload_accounts:
+      no_credentials_configured: Veuillez d'abord configurer vos identifiants Indexa
+        Capital dans les paramètres du fournisseur.
+    select_accounts:
+      accounts_selected: comptes sélectionnés
+      api_error: 'Erreur API : %{message}'
+      cancel: Annuler
+      configure_name_in_provider: Impossible d'importer - veuillez configurer le nom
+        du compte dans Indexa Capital
+      description: Sélectionnez les comptes que vous souhaitez lier à votre compte
+        %{product_name}.
+      link_accounts: Lier les comptes sélectionnés
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier vos identifiants Indexa
+        Capital.
+      no_api_key: Les identifiants Indexa Capital ne sont pas configurés. Veuillez
+        les configurer dans les Paramètres.
+      no_credentials_configured: Veuillez d'abord configurer vos identifiants Indexa
+        Capital dans les paramètres du fournisseur.
+      no_name_placeholder: "(Sans nom)"
+      title: Sélectionner les comptes Indexa Capital
+    select_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      all_accounts_already_linked: Tous les comptes Indexa Capital sont déjà liés
+      api_error: 'Erreur API : %{message}'
+      balance_label: 'Solde :'
+      cancel: Annuler
+      cancel_button: Annuler
+      configure_name_in_provider: Impossible d'importer - veuillez configurer le nom
+        du compte dans Indexa Capital
+      connect_hint: Connectez un compte Indexa Capital pour activer la synchronisation
+        automatique.
+      description: Sélectionnez un compte Indexa Capital à lier avec ce compte. Les
+        transactions seront synchronisées et dédupliquées automatiquement.
+      header: Lier avec Indexa Capital
+      link_account: Lier le compte
+      link_button: Lier ce compte
+      linking_to: 'Liaison à :'
+      no_account_specified: Aucun compte spécifié
+      no_accounts: Aucun compte Indexa Capital non lié trouvé.
+      no_accounts_found: Aucun compte Indexa Capital trouvé. Veuillez vérifier vos
+        identifiants.
+      no_api_key: Les identifiants Indexa Capital ne sont pas configurés. Veuillez
+        les configurer dans les Paramètres.
+      no_credentials_configured: Veuillez d'abord configurer vos identifiants Indexa
+        Capital dans les paramètres du fournisseur.
+      no_name_placeholder: "(Sans nom)"
+      settings_link: Aller aux paramètres du fournisseur
+      subtitle: Choisissez un compte Indexa Capital
+      title: Lier %{account_name} avec Indexa Capital
+    setup_accounts:
+      account_type_label: 'Type de compte :'
+      account_types:
+        credit_card: Carte de crédit
+        crypto: Compte de cryptomonnaie
+        depository: Compte courant ou épargne
+        investment: Compte d'investissement
+        loan: Prêt ou hypothèque
+        other_asset: Autre actif
+        skip: Ignorer ce compte
+      accounts_count:
+        one: "%{count} compte disponible"
+        other: "%{count} comptes disponibles"
+      all_accounts_linked: Tous vos comptes Indexa Capital ont déjà été configurés.
+      api_error: 'Erreur API : %{message}'
+      balance: Solde
+      cancel: Annuler
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        Indexa Capital :'
+      create_accounts: Créer les comptes
+      creating: Création des comptes…
+      creating_accounts: Création des comptes…
+      fetch_failed: Échec de la récupération des comptes
+      historical_data_range: 'Plage de données historiques :'
+      import_selected: Importer les comptes sélectionnés
+      instructions: Sélectionnez les comptes que vous souhaitez importer depuis Indexa
+        Capital. Vous pouvez choisir plusieurs comptes.
+      no_accounts: Aucun compte non lié trouvé pour cette connexion Indexa Capital.
+      no_accounts_to_setup: Aucun compte à configurer
+      no_api_key: Les identifiants Indexa Capital ne sont pas configurés. Veuillez
+        vérifier les paramètres de connexion.
+      select_all: Tout sélectionner
+      subtitle: Choisissez les types de compte corrects pour vos comptes importés
+      subtype_labels:
+        credit_card: ''
+        crypto: ''
+        depository: 'Sous-type de compte :'
+        investment: 'Type d''investissement :'
+        loan: 'Type de prêt :'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Les cartes de crédit seront automatiquement configurées comme
+          comptes de carte de crédit.
+        crypto: Les comptes de cryptomonnaie seront configurés pour suivre les holdings
+          et les transactions.
+        other_asset: Aucune option supplémentaire nécessaire pour les autres actifs.
+      subtypes:
+        depository:
+          cd: Certificat de dépôt
+          checking: Compte courant
+          hsa: Compte épargne santé
+          money_market: Compte du marché monétaire
+          savings: Compte épargne
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: Plan 529
+          angel: Investissement providentiel
+          brokerage: Courtage
+          hsa: Compte épargne santé
+          ira: IRA traditionnel
+          mutual_fund: Fonds commun de placement
+          pension: Pension
+          retirement: Retraite
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Plan d'épargne Thrift
+        loan:
+          auto: Prêt auto
+          mortgage: Hypothèque
+          other: Autre prêt
+          student: Prêt étudiant
+      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions.
+      sync_start_date_label: 'Commencer la synchronisation des transactions à partir
+        de :'
+      title: Configurer vos comptes Indexa Capital
+    sync:
+      status:
+        calculating: Calcul des soldes…
+        checking_setup: Vérification de la configuration du compte…
+        importing: Importation des comptes depuis Indexa Capital…
+        importing_data: Importation des données du compte…
+        needs_setup: "%{count} comptes à configurer…"
+        processing: Traitement des holdings et des activités…
+      success: Synchronisation démarrée
     sync_status:
-      no_accounts: "Aucun compte trouvé"
+      no_accounts: Aucun compte trouvé
       synced:
         one: "%{count} compte synchronisé"
         other: "%{count} comptes synchronisés"
       synced_with_setup: "%{linked} synchronisé(s), %{unlinked} à configurer"
-    institution_summary:
-      none: "Aucune institution connectée"
-      count:
-        one: "%{count} institution"
-        other: "%{count} institutions"
-    errors:
-      provider_not_configured: "Le fournisseur Indexa Capital n'est pas configuré"
-
-    # Syncer status messages
-    sync:
-      status:
-        importing: "Importation des comptes depuis Indexa Capital…"
-        processing: "Traitement des avoirs et des activités…"
-        calculating: "Calcul des soldes…"
-        importing_data: "Importation des données du compte…"
-        checking_setup: "Vérification de la configuration du compte…"
-        needs_setup: "%{count} comptes à configurer…"
-      success: "Synchronisation démarrée"
-
-    # Panel (settings view)
-    panel:
-      setup_instructions: "Instructions de configuration :"
-      step_1: "Rendez-vous sur votre tableau de bord Indexa Capital pour générer un jeton API en lecture seule"
-      step_2: "Collez votre jeton API ci-dessous et cliquez sur Enregistrer"
-      step_3: "Après une connexion réussie, rendez-vous sur l'onglet Comptes pour configurer les nouveaux comptes"
-      field_descriptions: "Description des champs :"
-      optional: "(Facultatif)"
-      required: "(obligatoire)"
-      optional_with_default: "(facultatif, valeur par défaut : %{default_value})"
-      alternative_auth: "Ou utilisez plutôt l'authentification par nom d'utilisateur / mot de passe…"
-      save_button: "Enregistrer la configuration"
-      update_button: "Mettre à jour la configuration"
-      fields:
-        api_token:
-          label: "Jeton API"
-          description: "Votre jeton API en lecture seule depuis le tableau de bord Indexa Capital"
-          placeholder_new: "Collez votre jeton API ici"
-          placeholder_update: "Saisissez un nouveau jeton API pour mettre à jour"
-        username:
-          label: "Nom d'utilisateur"
-          description: "Votre nom d'utilisateur / e-mail Indexa Capital"
-          placeholder_new: "Collez le nom d'utilisateur ici"
-          placeholder_update: "Saisissez un nouveau nom d'utilisateur pour mettre à jour"
-        document:
-          label: "Identifiant du document"
-          description: "Votre document / identifiant Indexa Capital"
-          placeholder_new: "Collez l'identifiant du document ici"
-          placeholder_update: "Saisissez un nouvel identifiant de document pour mettre à jour"
-        password:
-          label: "Mot de passe"
-          description: "Votre mot de passe Indexa Capital"
-          placeholder_new: "Collez le mot de passe ici"
-          placeholder_update: "Saisissez un nouveau mot de passe pour mettre à jour"
-
-    # CRUD success messages
-    create:
-      success: "Connexion Indexa Capital créée avec succès"
     update:
-      success: "Connexion Indexa Capital mise à jour"
-    destroy:
-      success: "Connexion Indexa Capital supprimée"
-    index:
-      title: "Connexions Indexa Capital"
-
-    # Loading states
-    loading:
-      loading_message: "Chargement des comptes Indexa Capital…"
-      loading_title: "Chargement"
-
-    # Account linking
-    link_accounts:
-      all_already_linked:
-        one: "Le compte sélectionné (%{names}) est déjà lié"
-        other: "Les %{count} comptes sélectionnés sont déjà liés : %{names}"
-      api_error: "Erreur API : %{message}"
-      invalid_account_names:
-        one: "Impossible de lier un compte sans nom"
-        other: "Impossible de lier %{count} comptes sans nom"
-      link_failed: "Échec de la liaison des comptes"
-      no_accounts_selected: "Veuillez sélectionner au moins un compte"
-      no_api_key: "Identifiants Indexa Capital introuvables. Veuillez les configurer dans les paramètres du fournisseur."
-      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count} étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
-      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count} compte(s) étaient déjà liés : %{already_linked_names}"
-      success:
-        one: "%{count} compte lié avec succès"
-        other: "%{count} comptes liés avec succès"
-
-    # Provider item display (used in _item partial)
-    indexa_capital_item:
-      accounts_need_setup: "Des comptes doivent être configurés"
-      delete: "Supprimer la connexion"
-      deletion_in_progress: "suppression en cours…"
-      error: "Erreur"
-      more_accounts_available:
-        one: "%{count} compte supplémentaire disponible"
-        other: "%{count} comptes supplémentaires disponibles"
-      no_accounts_description: "Cette connexion n'a pas encore de comptes liés."
-      no_accounts_title: "Aucun compte"
-      provider_name: "Indexa Capital"
-      requires_update: "Connexion à mettre à jour"
-      setup_action: "Configurer les nouveaux comptes"
-      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types de compte pour vos comptes Indexa Capital nouvellement importés."
-      setup_needed: "Nouveaux comptes prêts à être configurés"
-      status: "Synchronisé il y a %{timestamp} — %{summary}"
-      status_never: "Jamais synchronisé"
-      syncing: "Synchronisation…"
-      total: "Total"
-      unlinked: "Non lié"
-      update_credentials: "Mettre à jour les identifiants"
-
-    # Select accounts view
-    select_accounts:
-      accounts_selected: "comptes sélectionnés"
-      api_error: "Erreur API : %{message}"
-      cancel: "Annuler"
-      configure_name_in_provider: "Impossible d'importer - veuillez configurer le nom du compte dans Indexa Capital"
-      description: "Sélectionnez les comptes que vous souhaitez lier à votre compte %{product_name}."
-      link_accounts: "Lier les comptes sélectionnés"
-      no_accounts_found: "Aucun compte trouvé. Veuillez vérifier vos identifiants Indexa Capital."
-      no_api_key: "Les identifiants Indexa Capital ne sont pas configurés. Veuillez les configurer dans les Paramètres."
-      no_credentials_configured: "Veuillez d'abord configurer vos identifiants Indexa Capital dans les paramètres du fournisseur."
-      no_name_placeholder: "(Sans nom)"
-      title: "Sélectionner les comptes Indexa Capital"
-
-    # Select existing account view
-    select_existing_account:
-      account_already_linked: "Ce compte est déjà lié à un fournisseur"
-      all_accounts_already_linked: "Tous les comptes Indexa Capital sont déjà liés"
-      api_error: "Erreur API : %{message}"
-      balance_label: "Solde :"
-      cancel: "Annuler"
-      cancel_button: "Annuler"
-      configure_name_in_provider: "Impossible d'importer - veuillez configurer le nom du compte dans Indexa Capital"
-      connect_hint: "Connectez un compte Indexa Capital pour activer la synchronisation automatique."
-      description: "Sélectionnez un compte Indexa Capital à lier avec ce compte. Les transactions seront synchronisées et dédupliquées automatiquement."
-      header: "Lier avec Indexa Capital"
-      link_account: "Lier le compte"
-      link_button: "Lier ce compte"
-      linking_to: "Liaison à :"
-      no_account_specified: "Aucun compte spécifié"
-      no_accounts: "Aucun compte Indexa Capital non lié trouvé."
-      no_accounts_found: "Aucun compte Indexa Capital trouvé. Veuillez vérifier vos identifiants."
-      no_api_key: "Les identifiants Indexa Capital ne sont pas configurés. Veuillez les configurer dans les Paramètres."
-      no_credentials_configured: "Veuillez d'abord configurer vos identifiants Indexa Capital dans les paramètres du fournisseur."
-      no_name_placeholder: "(Sans nom)"
-      settings_link: "Aller aux paramètres du fournisseur"
-      subtitle: "Choisissez un compte Indexa Capital"
-      title: "Lier %{account_name} avec Indexa Capital"
-
-    # Link existing account
-    link_existing_account:
-      account_already_linked: "Ce compte est déjà lié à un fournisseur"
-      api_error: "Erreur API : %{message}"
-      invalid_account_name: "Impossible de lier un compte sans nom"
-      provider_account_already_linked: "Ce compte Indexa Capital est déjà lié à un autre compte"
-      provider_account_not_found: "Compte Indexa Capital introuvable"
-      missing_parameters: "Paramètres requis manquants"
-      no_api_key: "Identifiants Indexa Capital introuvables. Veuillez les configurer dans les paramètres du fournisseur."
-      success: "%{account_name} lié avec succès à Indexa Capital"
-
-    # Setup accounts wizard
-    setup_accounts:
-      account_type_label: "Type de compte :"
-      accounts_count:
-        one: "%{count} compte disponible"
-        other: "%{count} comptes disponibles"
-      all_accounts_linked: "Tous vos comptes Indexa Capital ont déjà été configurés."
-      api_error: "Erreur API : %{message}"
-      creating: "Création des comptes…"
-      fetch_failed: "Échec de la récupération des comptes"
-      import_selected: "Importer les comptes sélectionnés"
-      instructions: "Sélectionnez les comptes que vous souhaitez importer depuis Indexa Capital. Vous pouvez choisir plusieurs comptes."
-      no_accounts: "Aucun compte non lié trouvé pour cette connexion Indexa Capital."
-      no_accounts_to_setup: "Aucun compte à configurer"
-      no_api_key: "Les identifiants Indexa Capital ne sont pas configurés. Veuillez vérifier les paramètres de connexion."
-      select_all: "Tout sélectionner"
-      account_types:
-        skip: "Ignorer ce compte"
-        depository: "Compte courant ou épargne"
-        credit_card: "Carte de crédit"
-        investment: "Compte d'investissement"
-        crypto: "Compte de cryptomonnaie"
-        loan: "Prêt ou hypothèque"
-        other_asset: "Autre actif"
-      subtype_labels:
-        depository: "Sous-type de compte :"
-        credit_card: ""
-        investment: "Type d'investissement :"
-        crypto: ""
-        loan: "Type de prêt :"
-        other_asset: ""
-      subtype_messages:
-        credit_card: "Les cartes de crédit seront automatiquement configurées comme comptes de carte de crédit."
-        other_asset: "Aucune option supplémentaire nécessaire pour les autres actifs."
-        crypto: "Les comptes de cryptomonnaie seront configurés pour suivre les avoirs et les transactions."
-      subtypes:
-        depository:
-          checking: "Compte courant"
-          savings: "Compte épargne"
-          hsa: "Compte épargne santé"
-          cd: "Certificat de dépôt"
-          money_market: "Compte du marché monétaire"
-        investment:
-          brokerage: "Courtage"
-          pension: "Pension"
-          retirement: "Retraite"
-          "401k": "401(k)"
-          roth_401k: "Roth 401(k)"
-          "403b": "403(b)"
-          tsp: "Plan d'épargne Thrift"
-          "529_plan": "Plan 529"
-          hsa: "Compte épargne santé"
-          mutual_fund: "Fonds commun de placement"
-          ira: "IRA traditionnel"
-          roth_ira: "Roth IRA"
-          angel: "Investissement providentiel"
-        loan:
-          mortgage: "Hypothèque"
-          student: "Prêt étudiant"
-          auto: "Prêt auto"
-          other: "Autre prêt"
-      balance: "Solde"
-      cancel: "Annuler"
-      choose_account_type: "Choisissez le type de compte correct pour chaque compte Indexa Capital :"
-      create_accounts: "Créer les comptes"
-      creating_accounts: "Création des comptes…"
-      historical_data_range: "Plage de données historiques :"
-      subtitle: "Choisissez les types de compte corrects pour vos comptes importés"
-      sync_start_date_help: "Sélectionnez jusqu'où vous souhaitez synchroniser l'historique des transactions."
-      sync_start_date_label: "Commencer la synchronisation des transactions à partir de :"
-      title: "Configurer vos comptes Indexa Capital"
-
-    # Complete account setup
-    complete_account_setup:
-      all_skipped: "Tous les comptes ont été ignorés. Aucun compte n'a été créé."
-      creation_failed: "Échec de la création des comptes : %{error}"
-      no_accounts: "Aucun compte à configurer."
-      success: "%{count} compte(s) créé(s) avec succès."
-
-    # Preload accounts
-    preload_accounts:
-      no_credentials_configured: "Veuillez d'abord configurer vos identifiants Indexa Capital dans les paramètres du fournisseur."
+      success: Connexion Indexa Capital mise à jour
diff --git a/config/locales/views/indexa_capital_items/it.yml b/config/locales/views/indexa_capital_items/it.yml
new file mode 100644
index 000000000..3ba6b102e
--- /dev/null
+++ b/config/locales/views/indexa_capital_items/it.yml
@@ -0,0 +1,228 @@
+---
+it:
+  indexa_capital_items:
+    sync_status:
+      no_accounts: "Nessun conto trovato"
+      synced:
+        one: "%{count} conto sincronizzato"
+        other: "%{count} conti sincronizzati"
+      synced_with_setup: "%{linked} sincronizzati, %{unlinked} da configurare"
+    institution_summary:
+      none: "Nessuna istituzione connessa"
+      count:
+        one: "%{count} istituzione"
+        other: "%{count} istituzioni"
+    errors:
+      provider_not_configured: "Il provider IndexaCapital non è configurato"
+    sync:
+      status:
+        importing: "Importazione conti da IndexaCapital..."
+        processing: "Elaborazione posizioni e attività..."
+        calculating: "Calcolo saldi..."
+        importing_data: "Importazione dati conto..."
+        checking_setup: "Verifica configurazione conto..."
+        needs_setup: "%{count} conti da configurare..."
+      success: "Sincronizzazione avviata"
+    panel:
+      setup_instructions: "Istruzioni di configurazione:"
+      step_1: "Visita il tuo dashboard Indexa Capital per generare un token API in sola lettura"
+      step_2: "Incolla il tuo token API qui sotto e clicca Salva"
+      step_3: "Dopo una connessione riuscita, vai alla scheda Conti per configurare i nuovi conti"
+      field_descriptions: "Descrizioni campi:"
+      optional: "(facoltativo)"
+      required: "(obbligatorio)"
+      optional_with_default: "(facoltativo, predefinito %{default_value})"
+      alternative_auth: "Oppure usa l'autenticazione con username/password..."
+      save_button: "Salva configurazione"
+      update_button: "Aggiorna configurazione"
+      fields:
+        api_token:
+          label: "Token API"
+          description: "Il tuo token API in sola lettura dal dashboard Indexa Capital"
+          placeholder_new: "Incolla qui il tuo token API"
+          placeholder_update: "Inserisci nuovo token API per aggiornare"
+        username:
+          label: "Nome utente"
+          description: "Il tuo username/email Indexa Capital"
+          placeholder_new: "Incolla username qui"
+          placeholder_update: "Inserisci nuovo username per aggiornare"
+        document:
+          label: "ID documento"
+          description: "Il tuo documento/ID Indexa Capital"
+          placeholder_new: "Incolla ID documento qui"
+          placeholder_update: "Inserisci nuovo ID documento per aggiornare"
+        password:
+          label: "Password"
+          description: "La tua password Indexa Capital"
+          placeholder_new: "Incolla password qui"
+          placeholder_update: "Inserisci nuova password per aggiornare"
+    create:
+      success: "Connessione IndexaCapital creata con successo"
+    update:
+      success: "Connessione IndexaCapital aggiornata"
+    destroy:
+      success: "Connessione IndexaCapital rimossa"
+    index:
+      title: "Connessioni IndexaCapital"
+    loading:
+      loading_message: "Caricamento conti IndexaCapital..."
+      loading_title: "Caricamento"
+    link_accounts:
+      all_already_linked:
+        one: "Il conto selezionato (%{names}) è già collegato"
+        other: "Tutti i %{count} conti selezionati sono già collegati: %{names}"
+      api_error: "Errore API: %{message}"
+      invalid_account_names:
+        one: "Impossibile collegare un conto senza nome"
+        other: "Impossibile collegare %{count} conti senza nome"
+      link_failed: "Collegamento conti fallito"
+      no_accounts_selected: "Seleziona almeno un conto"
+      no_api_key: "Credenziali IndexaCapital non trovate. Configurale nelle Impostazioni provider."
+      partial_invalid: "Collegati con successo %{created_count} conto/i, %{already_linked_count} erano già collegati, %{invalid_count} conto/i aveva nomi non validi"
+      partial_success: "Collegati con successo %{created_count} conto/i. %{already_linked_count} conto/i erano già collegati: %{already_linked_names}"
+      success:
+        one: "Collegato con successo %{count} conto"
+        other: "Collegati con successo %{count} conti"
+    indexa_capital_item:
+      accounts_need_setup: "I conti devono essere configurati"
+      delete: "Elimina connessione"
+      deletion_in_progress: "eliminazione in corso..."
+      error: "Errore"
+      no_accounts_description: "Questa connessione non ha ancora conti collegati."
+      no_accounts_title: "Nessun conto"
+      setup_action: "Configura nuovi conti"
+      setup_description: "%{linked} di %{total} conti collegati."
+      setup_needed: "Nuovi conti pronti per la configurazione"
+      status: "Sincronizzato %{timestamp} fa — %{summary}"
+      status_never: "Mai sincronizzato"
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      syncing: "Sincronizzazione in corso..."
+      total: "Totale"
+      more_accounts_available:
+        one: "%{count} altro conto disponibile"
+        other: "%{count} altri conti disponibili"
+      provider_name: "IndexaCapital"
+      requires_update: "La connessione necessita di aggiornamento"
+      unlinked: "Non collegati"
+      update_credentials: "Aggiorna credenziali"
+    select_accounts:
+      accounts_selected: "conti selezionati"
+      api_error: "Errore API: %{message}"
+      cancel: "Annulla"
+      configure_name_in_provider: "Impossibile importare - configura il nome del conto in IndexaCapital"
+      description: "Seleziona i conti che vuoi collegare al tuo account %{product_name}."
+      link_accounts: "Collega i conti selezionati"
+      no_accounts_found: "Nessun conto trovato. Controlla le credenziali IndexaCapital."
+      no_api_key: "Le credenziali IndexaCapital non sono configurate. Configurale nelle Impostazioni."
+      no_credentials_configured: "Configura prima le credenziali IndexaCapital nelle Impostazioni provider."
+      no_name_placeholder: "(Nessun nome)"
+      title: "Seleziona conti IndexaCapital"
+    select_existing_account:
+      account_already_linked: "Questo conto è già collegato a un provider"
+      all_accounts_already_linked: "Tutti i conti IndexaCapital sono già collegati"
+      api_error: "Errore API: %{message}"
+      balance_label: "Saldo:"
+      cancel: "Annulla"
+      cancel_button: "Annulla"
+      configure_name_in_provider: "Impossibile importare - configura il nome del conto in IndexaCapital"
+      connect_hint: "Connetti un account IndexaCapital per abilitare la sincronizzazione automatica."
+      description: "Seleziona un conto IndexaCapital da collegare a questo conto. Le transazioni verranno sincronizzate e deduplicate automaticamente."
+      header: "Collega con IndexaCapital"
+      link_account: "Collega conto"
+      link_button: "Collega questo conto"
+      linking_to: "Collegamento a:"
+      no_account_specified: "Nessun conto specificato"
+      no_accounts: "Nessun conto IndexaCapital non collegato trovato."
+      no_accounts_found: "Nessun conto IndexaCapital trovato. Controlla le credenziali."
+      no_api_key: "Le credenziali IndexaCapital non sono configurate. Configurale nelle Impostazioni."
+      no_credentials_configured: "Configura prima le credenziali IndexaCapital nelle Impostazioni provider."
+      no_name_placeholder: "(Nessun nome)"
+      settings_link: "Vai alle Impostazioni provider"
+      subtitle: "Scegli un conto IndexaCapital"
+      title: "Collega %{account_name} con IndexaCapital"
+    link_existing_account:
+      account_already_linked: "Questo conto è già collegato a un provider"
+      api_error: "Errore API: %{message}"
+      invalid_account_name: "Impossibile collegare un conto senza nome"
+      provider_account_already_linked: "Questo conto IndexaCapital è già collegato a un altro conto"
+      provider_account_not_found: "Conto IndexaCapital non trovato"
+      missing_parameters: "Parametri obbligatori mancanti"
+      no_api_key: "Credenziali IndexaCapital non trovate. Configurale nelle Impostazioni provider."
+      success: "Collegato con successo %{account_name} con IndexaCapital"
+    setup_accounts:
+      account_type_label: "Tipo di conto:"
+      accounts_count:
+        one: "%{count} conto disponibile"
+        other: "%{count} conti disponibili"
+      all_accounts_linked: "Tutti i tuoi conti IndexaCapital sono già stati configurati."
+      api_error: "Errore API: %{message}"
+      creating: "Creazione conti..."
+      fetch_failed: "Recupero conti fallito"
+      import_selected: "Importa conti selezionati"
+      instructions: "Seleziona i conti che vuoi importare da IndexaCapital. Puoi scegliere più conti."
+      no_accounts: "Nessun conto non collegato trovato da questa connessione IndexaCapital."
+      no_accounts_to_setup: "Nessun conto da configurare"
+      no_api_key: "Le credenziali IndexaCapital non sono configurate. Controlla le impostazioni di connessione."
+      select_all: "Seleziona tutti"
+      account_types:
+        skip: "Salta questo conto"
+        depository: "Conto Corrente o Risparmio"
+        credit_card: "Carta di credito"
+        investment: "Conto investimento"
+        crypto: "Conto criptovaluta"
+        loan: "Prestito o Mutuo"
+        other_asset: "Altro attivo"
+      subtype_labels:
+        depository: "Sottotipo conto:"
+        credit_card: ""
+        investment: "Tipo investimento:"
+        crypto: ""
+        loan: "Tipo prestito:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Le carte di credito saranno configurate automaticamente come conti carta di credito."
+        other_asset: "Nessuna opzione aggiuntiva necessaria per gli altri attivi."
+        crypto: "I conti criptovaluta saranno configurati per tracciare posizioni e transazioni."
+      subtypes:
+        depository:
+          checking: "Conto Corrente"
+          savings: "Risparmio"
+          hsa: "Health Savings Account"
+          cd: "Certificato di Deposito"
+          money_market: "Mercato Monetario"
+        investment:
+          brokerage: "Intermediazione"
+          pension: "Pensione"
+          retirement: "Previdenza"
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: "Thrift Savings Plan"
+          "529_plan": "Piano 529"
+          hsa: "Health Savings Account"
+          mutual_fund: "Fondo comune"
+          ira: "IRA Tradizionale"
+          roth_ira: "Roth IRA"
+          angel: "Angel"
+        loan:
+          mortgage: "Mutuo"
+          student: "Prestito studentesco"
+          auto: "Prestito auto"
+          other: "Altro prestito"
+      balance: "Saldo"
+      cancel: "Annulla"
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto IndexaCapital:"
+      create_accounts: "Crea conti"
+      creating_accounts: "Creazione conti in corso..."
+      historical_data_range: "Intervallo dati storici:"
+      subtitle: "Scegli i tipi di conto corretti per i tuoi conti importati"
+      sync_start_date_help: "Seleziona fino a quando vuoi sincronizzare la cronologia delle transazioni."
+      sync_start_date_label: "Inizia a sincronizzare le transazioni da:"
+      title: "Configura i tuoi conti IndexaCapital"
+    complete_account_setup:
+      all_skipped: "Tutti i conti sono stati saltati. Nessun conto è stato creato."
+      creation_failed: "Creazione conti fallita: %{error}"
+      no_accounts: "Nessun conto da configurare."
+      success: "Creati con successo %{count} conto/i."
+    preload_accounts:
+      no_credentials_configured: "Configura prima le credenziali IndexaCapital nelle Impostazioni provider."
diff --git a/config/locales/views/indexa_capital_items/ru.yml b/config/locales/views/indexa_capital_items/ru.yml
new file mode 100644
index 000000000..253333f40
--- /dev/null
+++ b/config/locales/views/indexa_capital_items/ru.yml
@@ -0,0 +1,264 @@
+---
+ru:
+  indexa_capital_items:
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Счета не были созданы.
+      creation_failed: 'Не удалось создать счета: %{error}'
+      no_accounts: Нет счетов для настройки.
+      success: Успешно создано %{count} счёт(а).
+    create:
+      success: Подключение к IndexaCapital успешно создано
+    destroy:
+      success: Подключение к IndexaCapital удалено
+    errors:
+      provider_not_configured: Провайдер IndexaCapital не настроен
+    index:
+      title: Подключения IndexaCapital
+    indexa_capital_item:
+      accounts_need_setup: Счета требуют настройки
+      delete: Удалить подключение
+      deletion_in_progress: удаление в процессе...
+      error: Ошибка
+      more_accounts_available:
+        few: Доступно ещё %{count} счёта
+        many: Доступно ещё %{count} счетов
+        one: Доступен ещё %{count} счёт
+        other: Доступно ещё %{count} счёта
+      no_accounts_description: Это подключение пока не имеет привязанных счетов.
+      no_accounts_title: Нет счетов
+      provider_name: IndexaCapital
+      requires_update: Подключение требует обновления
+      setup_action: Настроить новые счета
+      setup_description: "%{linked} из %{total} счетов привязаны. Выберите типы счетов
+        для ваших новых импортированных счетов IndexaCapital."
+      setup_needed: Новые счета готовы к настройке
+      status: Синхронизировано %{timestamp} назад — %{summary}
+      status_never: Никогда не синхронизировалось
+      syncing: Синхронизация...
+      total: Всего
+      unlinked: Не привязано
+      update_credentials: Обновить учетные данные
+    institution_summary:
+      count:
+        few: "%{count} учреждения"
+        many: "%{count} учреждений"
+        one: "%{count} учреждение"
+        other: "%{count} учреждения"
+      none: Нет подключенных учреждений
+    link_accounts:
+      all_already_linked:
+        few: "%{count} выбранных счёта уже привязаны: %{names}"
+        many: "%{count} выбранных счетов уже привязаны: %{names}"
+        one: Выбранный счёт (%{names}) уже привязан
+        other: "%{count} выбранных счёта уже привязаны: %{names}"
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_names:
+        few: Невозможно привязать %{count} счёта с пустыми именами
+        many: Невозможно привязать %{count} счетов с пустыми именами
+        one: Невозможно привязать счёт с пустым именем
+        other: Невозможно привязать %{count} счёта с пустыми именами
+      link_failed: Не удалось привязать счета
+      no_accounts_selected: Пожалуйста, выберите хотя бы один счёт
+      no_api_key: Учетные данные IndexaCapital не найдены. Пожалуйста, настройте их
+        в настройках провайдера.
+      partial_invalid: Успешно привязано %{created_count} счёт(а), %{already_linked_count}
+        уже были привязаны, %{invalid_count} счёт(а) имели недопустимые имена
+      partial_success: 'Успешно привязано %{created_count} счёт(а). %{already_linked_count}
+        счёт(а) уже были привязаны: %{already_linked_names}'
+      success:
+        few: Успешно привязаны %{count} счёта
+        many: Успешно привязано %{count} счетов
+        one: Успешно привязан %{count} счёт
+        other: Успешно привязаны %{count} счёта
+    link_existing_account:
+      account_already_linked: Этот счёт уже привязан к провайдеру
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_name: Невозможно привязать счёт с пустым именем
+      missing_parameters: Отсутствуют обязательные параметры
+      no_api_key: Учетные данные IndexaCapital не найдены. Пожалуйста, настройте их
+        в Настройках провайдера.
+      provider_account_already_linked: Этот счёт IndexaCapital уже привязан к другому
+        счёту
+      provider_account_not_found: Счёт IndexaCapital не найден
+      success: Успешно привязан %{account_name} к IndexaCapital
+    loading:
+      loading_message: Загрузка счетов IndexaCapital...
+      loading_title: Загрузка
+    panel:
+      alternative_auth: Или используйте аутентификацию по имени пользователя/паролю...
+      field_descriptions: 'Описание полей:'
+      fields:
+        api_token:
+          description: Ваш API-токен только для чтения из панели управления Indexa
+            Capital
+          label: API-токен
+          placeholder_new: Вставьте ваш API-токен сюда
+          placeholder_update: Введите новый API-токен для обновления
+        document:
+          description: Ваш документ/ID в Indexa Capital
+          label: ID документа
+          placeholder_new: Вставьте ID документа сюда
+          placeholder_update: Введите новый ID документа для обновления
+        password:
+          description: Ваш пароль от Indexa Capital
+          label: Пароль
+          placeholder_new: Вставьте пароль сюда
+          placeholder_update: Введите новый пароль для обновления
+        username:
+          description: Ваше имя пользователя/электронная почта в Indexa Capital
+          label: Имя пользователя
+          placeholder_new: Вставьте имя пользователя сюда
+          placeholder_update: Введите новое имя пользователя для обновления
+      optional: "(Необязательно)"
+      optional_with_default: "(необязательно, по умолчанию %{default_value})"
+      required: "(Обязательно)"
+      save_button: Сохранить конфигурацию
+      setup_instructions: 'Инструкции по настройке:'
+      step_1: Посетите панель управления Indexa Capital, чтобы сгенерировать API-токен
+        только для чтения
+      step_2: Вставьте ваш API-токен ниже и нажмите Сохранить
+      step_3: После успешного подключения перейдите на вкладку Счета, чтобы настроить
+        новые счета
+      update_button: Обновить конфигурацию
+    preload_accounts:
+      no_credentials_configured: Пожалуйста, сначала настройте ваши учетные данные
+        IndexaCapital в Настройках провайдера.
+    select_accounts:
+      accounts_selected: выбрано счетов
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_provider: Невозможно импортировать - пожалуйста, настройте
+        имя счёта в IndexaCapital
+      description: Выберите счета, которые вы хотите привязать к вашему счёту %{product_name}.
+      link_accounts: Привязать выбранные счета
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте ваши учетные данные
+        IndexaCapital.
+      no_api_key: Учетные данные IndexaCapital не настроены. Пожалуйста, настройте
+        их в Настройках.
+      no_credentials_configured: Пожалуйста, сначала настройте ваши учетные данные
+        IndexaCapital в Настройках провайдера.
+      no_name_placeholder: "(Без имени)"
+      title: Выберите счета IndexaCapital
+    select_existing_account:
+      account_already_linked: Этот счёт уже привязан к провайдеру
+      all_accounts_already_linked: Все счета IndexaCapital уже привязаны
+      api_error: 'Ошибка API: %{message}'
+      balance_label: 'Баланс:'
+      cancel: Отмена
+      cancel_button: Отмена
+      configure_name_in_provider: Невозможно импортировать - пожалуйста, настройте
+        имя счёта в IndexaCapital
+      connect_hint: Подключите счёт IndexaCapital для автоматической синхронизации.
+      description: Выберите счёт IndexaCapital для привязки к этому счёту. Операции
+        будут синхронизированы и дубли удалены автоматически.
+      header: Привязать к IndexaCapital
+      link_account: Привязать счёт
+      link_button: Привязать этот счёт
+      linking_to: 'Привязка к:'
+      no_account_specified: Счёт не указан
+      no_accounts: Не найдено непривязанных счетов IndexaCapital.
+      no_accounts_found: Счета IndexaCapital не найдены. Пожалуйста, проверьте ваши
+        учетные данные.
+      no_api_key: Учетные данные IndexaCapital не настроены. Пожалуйста, настройте
+        их в Настройках.
+      no_credentials_configured: Пожалуйста, сначала настройте ваши учетные данные
+        IndexaCapital в Настройках провайдера.
+      no_name_placeholder: "(Без имени)"
+      settings_link: Перейти в Настройки провайдера
+      subtitle: Выберите счёт IndexaCapital
+      title: Привязать %{account_name} к IndexaCapital
+    setup_accounts:
+      account_type_label: 'Тип счёта:'
+      account_types:
+        credit_card: Кредитная карта
+        crypto: Счёт криптовалюты
+        depository: Текущий или сберегательный счёт
+        investment: Инвестиционный счёт
+        loan: Кредит или ипотека
+        other_asset: Другой актив
+        skip: Пропустить этот счёт
+      accounts_count:
+        few: Доступно %{count} счёта
+        many: Доступно %{count} счетов
+        one: Доступен %{count} счёт
+        other: Доступно %{count} счёта
+      all_accounts_linked: Все ваши счета IndexaCapital уже настроены.
+      api_error: 'Ошибка API: %{message}'
+      balance: Баланс
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип счёта для каждого счёта IndexaCapital:'
+      create_accounts: Создать счета
+      creating: Создание счетов...
+      creating_accounts: Создание счетов...
+      fetch_failed: Не удалось получить счета
+      historical_data_range: 'Диапазон исторических данных:'
+      import_selected: Импортировать выбранные счета
+      instructions: Выберите счета, которые вы хотите импортировать из IndexaCapital.
+        Вы можете выбрать несколько счетов.
+      no_accounts: Не найдено непривязанных счетов из этого подключения IndexaCapital.
+      no_accounts_to_setup: Нет счетов для настройки
+      no_api_key: Учетные данные IndexaCapital не настроены. Пожалуйста, проверьте
+        настройки подключения.
+      select_all: Выбрать все
+      subtitle: Выберите правильные типы счетов для ваших импортированных счетов
+      subtype_labels:
+        credit_card: ''
+        crypto: ''
+        depository: 'Подтип счёта:'
+        investment: 'Тип инвестиции:'
+        loan: 'Тип кредита:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Кредитные карты будут автоматически настроены как счета кредитных
+          карт.
+        crypto: Счета криптовалюты будут настроены для отслеживания активов и операций.
+        other_asset: Дополнительные параметры для других активов не требуются.
+      subtypes:
+        depository:
+          cd: Сертификат депозита
+          checking: Текущий
+          hsa: Счёт медицинских сбережений
+          money_market: Денежный рынок
+          savings: Сберегательный
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: План 529
+          angel: Ангел
+          brokerage: Брокерский
+          hsa: Счёт медицинских сбережений
+          ira: Традиционная IRA
+          mutual_fund: Паевой инвестиционный фонд
+          pension: Пенсионный
+          retirement: Пенсионный
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: План сбережений
+        loan:
+          auto: Автокредит
+          mortgage: Ипотека
+          other: Другой кредит
+          student: Студенческий кредит
+      sync_start_date_help: Выберите, насколько далеко назад вы хотите синхронизировать
+        историю операций.
+      sync_start_date_label: 'Начать синхронизацию операций с:'
+      title: Настройте ваши счета IndexaCapital
+    sync:
+      status:
+        calculating: Расчёт балансов...
+        checking_setup: Проверка конфигурации счёта...
+        importing: Импортирование счетов из IndexaCapital...
+        importing_data: Импорт данных счёта...
+        needs_setup: "%{count} счетов требуют настройки..."
+        processing: Обработка активов и операций...
+      success: Синхронизация начата
+    sync_status:
+      no_accounts: Счета не найдены
+      synced:
+        few: Синхронизированы %{count} счёта
+        many: Синхронизировано %{count} счетов
+        one: Синхронизирован %{count} счёт
+        other: Синхронизированы %{count} счёта
+      synced_with_setup: "%{linked} синхронизировано, %{unlinked} требует настройки"
+    update:
+      success: Подключение к IndexaCapital обновлено
diff --git a/config/locales/views/indexa_capital_items/tr.yml b/config/locales/views/indexa_capital_items/tr.yml
new file mode 100644
index 000000000..41d3d270f
--- /dev/null
+++ b/config/locales/views/indexa_capital_items/tr.yml
@@ -0,0 +1,250 @@
+---
+tr:
+  indexa_capital_items:
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hiçbir hesap oluşturulmadı.
+      creation_failed: 'Hesaplar oluşturulamadı: %{error}'
+      no_accounts: Kurulacak hesap yok.
+      success: "%{count} hesap başarıyla oluşturuldu."
+    create:
+      success: IndexaCapital bağlantısı başarıyla oluşturuldu
+    destroy:
+      success: IndexaCapital bağlantısı kaldırıldı
+    errors:
+      provider_not_configured: IndexaCapital sağlayıcısı yapılandırılmamış
+    index:
+      title: IndexaCapital Bağlantıları
+    indexa_capital_item:
+      accounts_need_setup: Hesaplar kurulum gerektiriyor
+      delete: Bağlantıyı sil
+      deletion_in_progress: silme işlemi devam ediyor...
+      error: Hata
+      more_accounts_available:
+        one: "%{count} hesap daha mevcut"
+        other: "%{count} hesap daha mevcut"
+      no_accounts_description: Bu bağlantının henüz bağlı hesabı yok.
+      no_accounts_title: Hesap yok
+      provider_name: IndexaCapital
+      requires_update: Bağlantının güncellenmesi gerekiyor
+      setup_action: Yeni Hesaplar Kur
+      setup_description: "%{linked}/%{total} hesap bağlandı. Yeni içe aktarılan IndexaCapital
+        hesaplarınız için hesap türlerini seçin."
+      setup_needed: Kurulacak yeni hesaplar hazır
+      status: "%{timestamp} önce senkronize edildi — %{summary}"
+      status_never: Hiç senkronize edilmedi
+      syncing: Senkronize ediliyor...
+      total: Toplam
+      unlinked: Bağlı değil
+      update_credentials: Kimlik bilgilerini güncelle
+    institution_summary:
+      count:
+        one: "%{count} kurum"
+        other: "%{count} kurum"
+      none: Bağlı kurum yok
+    link_accounts:
+      all_already_linked:
+        one: Seçilen hesap (%{names}) zaten bağlı
+        other: 'Seçilen %{count} hesabın tümü zaten bağlı: %{names}'
+      api_error: 'API hatası: %{message}'
+      invalid_account_names:
+        one: Boş adlı hesap bağlanamaz
+        other: Boş adlı %{count} hesap bağlanamaz
+      link_failed: Hesaplar bağlanamadı
+      no_accounts_selected: Lütfen en az bir hesap seçin
+      no_api_key: IndexaCapital kimlik bilgileri bulunamadı. Lütfen Sağlayıcı Ayarları'ndan
+        yapılandırın.
+      partial_invalid: "%{created_count} hesap başarıyla bağlandı, %{already_linked_count}
+        hesap zaten bağlıydı, %{invalid_count} hesabın adı geçersizdi"
+      partial_success: "%{created_count} hesap başarıyla bağlandı. %{already_linked_count}
+        hesap zaten bağlıydı: %{already_linked_names}"
+      success:
+        one: "%{count} hesap başarıyla bağlandı"
+        other: "%{count} hesap başarıyla bağlandı"
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      api_error: 'API hatası: %{message}'
+      invalid_account_name: Boş adlı hesap bağlanamaz
+      missing_parameters: Gerekli parametreler eksik
+      no_api_key: IndexaCapital kimlik bilgileri bulunamadı. Lütfen Sağlayıcı Ayarları'ndan
+        yapılandırın.
+      provider_account_already_linked: Bu IndexaCapital hesabı zaten başka bir hesaba
+        bağlı
+      provider_account_not_found: IndexaCapital hesabı bulunamadı
+      success: "%{account_name} IndexaCapital ile başarıyla bağlandı"
+    loading:
+      loading_message: IndexaCapital hesapları yükleniyor...
+      loading_title: Yükleniyor
+    panel:
+      alternative_auth: Ya da kullanıcı adı/parola kimlik doğrulamasını kullanın...
+      field_descriptions: 'Alan açıklamaları:'
+      fields:
+        api_token:
+          description: Indexa Capital panelinizden alınan salt okunur API belirteciniz
+          label: API Belirteci
+          placeholder_new: API belirtecinizi buraya yapıştırın
+          placeholder_update: Güncellemek için yeni API belirteci girin
+        document:
+          description: Indexa Capital belge/kimlik numaranız
+          label: Belge Kimliği
+          placeholder_new: Belge kimliğini buraya yapıştırın
+          placeholder_update: Güncellemek için yeni belge kimliği girin
+        password:
+          description: Indexa Capital parolanız
+          label: Parola
+          placeholder_new: Parolayı buraya yapıştırın
+          placeholder_update: Güncellemek için yeni parola girin
+        username:
+          description: Indexa Capital kullanıcı adınız/e-postanız
+          label: Kullanıcı Adı
+          placeholder_new: Kullanıcı adını buraya yapıştırın
+          placeholder_update: Güncellemek için yeni kullanıcı adı girin
+      optional: "(İsteğe bağlı)"
+      optional_with_default: "(isteğe bağlı, varsayılan %{default_value})"
+      required: "(zorunlu)"
+      save_button: Yapılandırmayı Kaydet
+      setup_instructions: 'Kurulum talimatları:'
+      step_1: Salt okunur bir API belirteci oluşturmak için Indexa Capital panelinizi
+        ziyaret edin
+      step_2: API belirtecinizi aşağıya yapıştırın ve Kaydet'e tıklayın
+      step_3: Bağlantı başarılı olduktan sonra yeni hesaplar kurmak için Hesaplar
+        sekmesine gidin
+      update_button: Yapılandırmayı Güncelle
+    preload_accounts:
+      no_credentials_configured: Lütfen önce IndexaCapital kimlik bilgilerinizi Sağlayıcı
+        Ayarları'nda yapılandırın.
+    select_accounts:
+      accounts_selected: hesap seçildi
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_provider: İçe aktarılamıyor - lütfen IndexaCapital'de hesap
+        adını yapılandırın
+      description: "%{product_name} hesabınıza bağlamak istediğiniz hesapları seçin."
+      link_accounts: Seçilen hesapları bağla
+      no_accounts_found: Hesap bulunamadı. Lütfen IndexaCapital kimlik bilgilerinizi
+        kontrol edin.
+      no_api_key: IndexaCapital kimlik bilgileri yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      no_credentials_configured: Lütfen önce IndexaCapital kimlik bilgilerinizi Sağlayıcı
+        Ayarları'nda yapılandırın.
+      no_name_placeholder: "(Ad yok)"
+      title: IndexaCapital Hesaplarını Seç
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      all_accounts_already_linked: Tüm IndexaCapital hesapları zaten bağlı
+      api_error: 'API hatası: %{message}'
+      balance_label: 'Bakiye:'
+      cancel: İptal
+      cancel_button: İptal
+      configure_name_in_provider: İçe aktarılamıyor - lütfen IndexaCapital'de hesap
+        adını yapılandırın
+      connect_hint: Otomatik senkronizasyonu etkinleştirmek için bir IndexaCapital
+        hesabı bağlayın.
+      description: Bu hesapla bağlamak için bir IndexaCapital hesabı seçin. İşlemler
+        otomatik olarak senkronize edilecek ve mükerrer kayıtlar önlenecektir.
+      header: IndexaCapital ile Bağla
+      link_account: Hesabı bağla
+      link_button: Bu hesabı bağla
+      linking_to: 'Şuna bağlanıyor:'
+      no_account_specified: Hesap belirtilmedi
+      no_accounts: Bağlı olmayan IndexaCapital hesabı bulunamadı.
+      no_accounts_found: IndexaCapital hesabı bulunamadı. Lütfen kimlik bilgilerinizi
+        kontrol edin.
+      no_api_key: IndexaCapital kimlik bilgileri yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      no_credentials_configured: Lütfen önce IndexaCapital kimlik bilgilerinizi Sağlayıcı
+        Ayarları'nda yapılandırın.
+      no_name_placeholder: "(Ad yok)"
+      settings_link: Sağlayıcı Ayarları'na git
+      subtitle: Bir IndexaCapital hesabı seçin
+      title: "%{account_name} ile IndexaCapital'i bağla"
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      account_types:
+        credit_card: Kredi Kartı
+        crypto: Kripto Para Hesabı
+        depository: Vadesiz veya Vadeli Mevduat Hesabı
+        investment: Yatırım Hesabı
+        loan: Kredi veya İpotek
+        other_asset: Diğer Varlık
+        skip: Bu hesabı atla
+      accounts_count:
+        one: "%{count} hesap mevcut"
+        other: "%{count} hesap mevcut"
+      all_accounts_linked: Tüm IndexaCapital hesaplarınız zaten kuruldu.
+      api_error: 'API hatası: %{message}'
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her IndexaCapital hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating: Hesaplar oluşturuluyor...
+      creating_accounts: Hesaplar Oluşturuluyor...
+      fetch_failed: Hesaplar Getirilemedi
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      import_selected: Seçilen hesapları içe aktar
+      instructions: IndexaCapital'den içe aktarmak istediğiniz hesapları seçin. Birden
+        fazla hesap seçebilirsiniz.
+      no_accounts: Bu IndexaCapital bağlantısından bağlı olmayan hesap bulunamadı.
+      no_accounts_to_setup: Kurulacak Hesap Yok
+      no_api_key: IndexaCapital kimlik bilgileri yapılandırılmamış. Lütfen bağlantı
+        ayarlarınızı kontrol edin.
+      select_all: Tümünü seç
+      subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      subtype_labels:
+        credit_card: ''
+        crypto: ''
+        depository: 'Hesap Alt Türü:'
+        investment: 'Yatırım Türü:'
+        loan: 'Kredi Türü:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Kredi kartları otomatik olarak kredi kartı hesabı olarak kurulacaktır.
+        crypto: Kripto para hesapları, varlıkları ve işlemleri takip edecek şekilde
+          kurulacaktır.
+        other_asset: Diğer Varlıklar için ek seçenek gerekmez.
+      subtypes:
+        depository:
+          cd: Mevduat Sertifikası
+          checking: Vadesiz Hesap
+          hsa: Sağlık Tasarruf Hesabı
+          money_market: Para Piyasası
+          savings: Tasarruf Hesabı
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: 529 Planı
+          angel: Melek Yatırımı
+          brokerage: Aracılık
+          hsa: Sağlık Tasarruf Hesabı
+          ira: Geleneksel IRA
+          mutual_fund: Yatırım Fonu
+          pension: Emeklilik
+          retirement: Emeklilik
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Tasarruf Planı (TSP)
+        loan:
+          auto: Taşıt Kredisi
+          mortgage: İpotek
+          other: Diğer Kredi
+          student: Öğrenim Kredisi
+      sync_start_date_help: İşlem geçmişini ne kadar geriye senkronize etmek istediğinizi
+        seçin.
+      sync_start_date_label: 'Şu tarihten itibaren işlemleri senkronize et:'
+      title: IndexaCapital Hesaplarınızı Kurun
+    sync:
+      status:
+        calculating: Bakiyeler hesaplanıyor...
+        checking_setup: Hesap yapılandırması kontrol ediliyor...
+        importing: IndexaCapital'den hesaplar içe aktarılıyor...
+        importing_data: Hesap verileri içe aktarılıyor...
+        needs_setup: "%{count} hesap kurulum gerektiriyor..."
+        processing: Varlıklar ve işlemler işleniyor...
+      success: Senkronizasyon başlatıldı
+    sync_status:
+      no_accounts: Hesap bulunamadı
+      synced:
+        one: "%{count} hesap senkronize edildi"
+        other: "%{count} hesap senkronize edildi"
+      synced_with_setup: "%{linked} senkronize edildi, %{unlinked} kurulum gerektiriyor"
+    update:
+      success: IndexaCapital bağlantısı güncellendi
diff --git a/config/locales/views/insights/en.yml b/config/locales/views/insights/en.yml
new file mode 100644
index 000000000..fccc31a06
--- /dev/null
+++ b/config/locales/views/insights/en.yml
@@ -0,0 +1,93 @@
+---
+en:
+  insights:
+    index:
+      title: Insights
+      subtitle: What's happening across your finances, refreshed nightly.
+      refresh: Check for new insights
+      empty:
+        title: No insights yet
+        description: Insights appear here once there's enough activity in your accounts. They refresh automatically every night.
+    refresh:
+      queued: We're generating fresh insights. Check back in a minute.
+      checking: Checking…
+    card:
+      dismiss: Dismiss
+      new: New
+      dismissed: Insight dismissed
+      undo: Undo
+    feed:
+      view_all: View all insights
+      header: Latest
+      header_new: New
+    types:
+      spending_anomaly: Spending
+      cash_flow_warning: Cash flow
+      net_worth_milestone: Net worth
+      subscription_audit: Subscriptions
+      savings_rate_change: Savings rate
+      idle_cash: Idle cash
+      budget_at_risk: Budget
+      budget_on_track: Budget
+    meta:
+      next_n_days:
+        one: Next day
+        other: Next %{count} days
+      last_n_days:
+        one: Last day
+        other: Last %{count} days
+      date_range: "%{from} to %{to}"
+    figures:
+      vs_previous: vs prior month
+      today: today
+      on_pace: on pace
+      of_budget: of budget
+      days_overdue:
+        one: "%{count} day overdue"
+        other: "%{count} days overdue"
+      idle_days:
+        one: idle %{count} day
+        other: idle %{count} days
+    actions:
+      spending_anomaly: View %{category} transactions
+      cash_flow_warning: Review recurring transactions
+      net_worth_milestone: View net worth report
+      subscription_audit: Review recurring transactions
+      savings_rate_change: View that month's transactions
+      idle_cash: Go to account
+      budget: View budget
+    titles:
+      spending_anomaly:
+        above: "%{category} spending is trending up"
+        below: "%{category} spending is trending down"
+      cash_flow_warning:
+        low: Your cash balance may run low
+        negative: Your cash balance may go negative
+      net_worth_milestone: "Net worth milestone: %{milestone}"
+      subscription_audit: "Is %{name} still active?"
+      savings_rate_change:
+        up: Your savings rate improved in %{month}
+        down: Your savings rate dropped in %{month}
+      idle_cash: Idle cash in %{account}
+      budget_at_risk:
+        one: One category needs attention in your budget
+        other: "%{count} categories need attention in your budget"
+      budget_on_track: Your budget is on track
+    templates:
+      spending_anomaly:
+        above: You're on pace to spend %{projected_spend} on %{category} this month, about %{deviation_pct}% more than your recent monthly average of %{baseline_spend}.
+        below: You're on pace to spend %{projected_spend} on %{category} this month, about %{deviation_pct}% less than your recent monthly average of %{baseline_spend}.
+      cash_flow_warning:
+        low: Based on your upcoming recurring transactions and typical spending, your cash balance could drop to %{projected_low} around %{projected_low_date}.
+        negative: Based on your upcoming recurring transactions and typical spending, your cash balance could fall to %{projected_low} around %{projected_low_date}.
+      net_worth_milestone: Your net worth crossed %{milestone} and now stands at %{net_worth}.
+      subscription_audit: "%{name} (%{amount}) hasn't appeared since it was expected on %{expected_on}. It may have been cancelled, or the charge may have moved."
+      savings_rate_change:
+        up: You saved %{current_rate}% of your income in %{month}, up %{change_pp} percentage points from %{previous_rate}% the month before.
+        down: You saved %{current_rate}% of your income in %{month}, down %{change_pp} percentage points from %{previous_rate}% the month before.
+        down_negative: "You spent more than you earned in %{month}: your savings rate fell to %{current_rate}%, from %{previous_rate}% the month before."
+      idle_cash: "%{account} holds %{balance} with no activity in the last %{idle_days} days."
+      budget_at_risk:
+        over: "%{categories} went over budget this month. You've used %{budget_spent_pct}% of your total budget so far."
+        near: "%{categories} are close to their limits this month. You've used %{budget_spent_pct}% of your total budget so far."
+      budget_on_track: You've spent %{spent} of your %{budgeted} budget (%{budget_spent_pct}%) and everything is within its limit.
diff --git a/config/locales/views/insights/fr.yml b/config/locales/views/insights/fr.yml
new file mode 100644
index 000000000..1c72b712c
--- /dev/null
+++ b/config/locales/views/insights/fr.yml
@@ -0,0 +1,114 @@
+---
+fr:
+  insights:
+    actions:
+      budget: Voir le budget
+      cash_flow_warning: Vérifier les transactions récurrentes
+      idle_cash: Aller au compte
+      net_worth_milestone: Voir le rapport de patrimoine net
+      savings_rate_change: Voir les transactions de ce mois
+      spending_anomaly: Voir les transactions de %{category}
+      subscription_audit: Vérifier les transactions récurrentes
+    card:
+      dismiss: Ignorer
+      dismissed: Analyse ignorée
+      new: Nouveau
+      undo: Annuler
+    feed:
+      header: Dernières
+      header_new: Nouveau
+      view_all: Voir toutes les analyses
+    figures:
+      days_overdue:
+        one: "%{count} jour de retard"
+        other: "%{count} jours de retard"
+      idle_days:
+        one: inactif depuis %{count} jour
+        other: inactif depuis %{count} jours
+      of_budget: du budget
+      on_pace: au rythme actuel
+      today: aujourd'hui
+      vs_previous: vs mois précédent
+    index:
+      empty:
+        description: Les analyses apparaissent ici dès qu'il y a suffisamment d'activité
+          sur vos comptes. Elles se rafraîchissent automatiquement chaque nuit.
+        title: Aucune analyse pour l'instant
+      refresh: Rechercher de nouvelles analyses
+      subtitle: Ce qui se passe dans vos finances, actualisé chaque nuit.
+      title: Analyses
+    meta:
+      date_range: "%{from} au %{to}"
+      last_n_days:
+        one: Dernier jour
+        other: "%{count} derniers jours"
+      next_n_days:
+        one: Jour suivant
+        other: "%{count} prochains jours"
+    refresh:
+      checking: Vérification…
+      queued: Nous générons de nouvelles analyses. Revenez dans une minute.
+    templates:
+      budget_at_risk:
+        near: "%{categories} approchent de leurs limites ce mois-ci. Vous avez utilisé
+          %{budget_spent_pct}% de votre budget total jusqu'à présent."
+        over: "%{categories} ont dépassé le budget ce mois-ci. Vous avez utilisé
+          %{budget_spent_pct}% de votre budget total jusqu'à présent."
+      budget_on_track: Vous avez dépensé %{spent} sur votre budget de %{budgeted}
+        (%{budget_spent_pct}%) et tout reste dans les limites.
+      cash_flow_warning:
+        low: D'après vos prochaines transactions récurrentes et vos dépenses habituelles,
+          votre solde de trésorerie pourrait descendre à %{projected_low} vers le
+          %{projected_low_date}.
+        negative: D'après vos prochaines transactions récurrentes et vos dépenses
+          habituelles, votre solde de trésorerie pourrait chuter à %{projected_low}
+          vers le %{projected_low_date}.
+      idle_cash: "%{account} détient %{balance} sans aucune activité depuis %{idle_days}
+        jours."
+      net_worth_milestone: Votre patrimoine net a franchi %{milestone} et s'élève
+        désormais à %{net_worth}.
+      savings_rate_change:
+        down: Vous avez épargné %{current_rate}% de vos revenus en %{month}, soit
+          %{change_pp} points de pourcentage de moins que %{previous_rate}% le mois
+          précédent.
+        down_negative: "Vous avez dépensé plus que vous n'avez gagné en %{month}
+          : votre taux d'épargne est tombé à %{current_rate}%, contre %{previous_rate}%
+          le mois précédent."
+        up: Vous avez épargné %{current_rate}% de vos revenus en %{month}, soit %{change_pp}
+          points de pourcentage de plus que %{previous_rate}% le mois précédent.
+      spending_anomaly:
+        above: Vous êtes en voie de dépenser %{projected_spend} pour %{category}
+          ce mois-ci, soit environ %{deviation_pct}% de plus que votre moyenne mensuelle
+          récente de %{baseline_spend}.
+        below: Vous êtes en voie de dépenser %{projected_spend} pour %{category}
+          ce mois-ci, soit environ %{deviation_pct}% de moins que votre moyenne mensuelle
+          récente de %{baseline_spend}.
+      subscription_audit: "%{name} (%{amount}) n'est pas réapparu depuis la date
+        prévue du %{expected_on}. Il est possible que l'abonnement ait été annulé
+        ou que le prélèvement ait changé de date."
+    titles:
+      budget_at_risk:
+        one: Une catégorie de votre budget nécessite votre attention
+        other: "%{count} catégories de votre budget nécessitent votre attention"
+      budget_on_track: Votre budget est sur la bonne voie
+      cash_flow_warning:
+        low: Votre solde de trésorerie pourrait devenir faible
+        negative: Votre solde de trésorerie pourrait devenir négatif
+      idle_cash: Liquidités inactives sur %{account}
+      net_worth_milestone: "Étape de patrimoine net : %{milestone}"
+      savings_rate_change:
+        down: Votre taux d'épargne a baissé en %{month}
+        up: Votre taux d'épargne s'est amélioré en %{month}
+      spending_anomaly:
+        above: Les dépenses de %{category} sont en hausse
+        below: Les dépenses de %{category} sont en baisse
+      subscription_audit: "%{name} est-il toujours actif ?"
+    types:
+      budget_at_risk: Budget
+      budget_on_track: Budget
+      cash_flow_warning: Trésorerie
+      idle_cash: Liquidités inactives
+      net_worth_milestone: Patrimoine net
+      savings_rate_change: Taux d'épargne
+      spending_anomaly: Dépenses
+      subscription_audit: Abonnements
diff --git a/config/locales/views/insights/pl.yml b/config/locales/views/insights/pl.yml
new file mode 100644
index 000000000..264a18928
--- /dev/null
+++ b/config/locales/views/insights/pl.yml
@@ -0,0 +1,103 @@
+---
+pl:
+  insights:
+    index:
+      title: Analityka
+      subtitle: Co dzieje się w twoich finansach, odświeżane codziennie.
+      refresh: Sprawdź nowe analizy
+      empty:
+        title: Brak analiz
+        description: Analizy pojawią się tutaj, gdy na kontach będzie wystarczająco dużo aktywności. Odświeżają się automatycznie każdej nocy.
+    refresh:
+      queued: Generujemy świeże analizy. Sprawdź za minutę.
+      checking: Sprawdzanie...
+    card:
+      dismiss: Odrzuć
+      new: Nowa
+      dismissed: Analiza odrzucona
+      undo: Cofnij
+    feed:
+      view_all: Zobacz wszystkie analizy
+      header: Najnowsze
+      header_new: Nowe
+    types:
+      spending_anomaly: Wydatki
+      cash_flow_warning: Przepływy pieniężne
+      net_worth_milestone: Wartość netto
+      subscription_audit: Subskrypcje
+      savings_rate_change: Stopa oszczędności
+      idle_cash: Nieaktywna gotówka
+      budget_at_risk: Budżet
+      budget_on_track: Budżet
+    meta:
+      next_n_days:
+        few: Następne %{count} dni
+        many: Następnych %{count} dni
+        one: Następny dzień
+        other: Następnych %{count} dni
+      last_n_days:
+        few: Ostatnie %{count} dni
+        many: Ostatnich %{count} dni
+        one: Ostatni dzień
+        other: Ostatnich %{count} dni
+      date_range: "%{from} do %{to}"
+    figures:
+      vs_previous: vs. poprzedni miesiąc
+      today: dzisiaj
+      on_pace: zgodnie z tempem
+      of_budget: z budżetu
+      days_overdue:
+        few: "%{count} dni po terminie"
+        many: "%{count} dni po terminie"
+        one: "%{count} dzień po terminie"
+        other: "%{count} dni po terminie"
+      idle_days:
+        few: nieaktywna %{count} dni
+        many: nieaktywna %{count} dni
+        one: nieaktywna %{count} dzień
+        other: nieaktywna %{count} dni
+    actions:
+      spending_anomaly: Zobacz transakcje %{category}
+      cash_flow_warning: Przejrzyj cykliczne transakcje
+      net_worth_milestone: Zobacz raport wartości netto
+      subscription_audit: Przejrzyj cykliczne transakcje
+      savings_rate_change: Zobacz transakcje z tego miesiąca
+      idle_cash: Przejdź do konta
+      budget: Zobacz budżet
+    titles:
+      spending_anomaly:
+        above: "Wydatki w kategorii %{category} rosną"
+        below: "Wydatki w kategorii %{category} spadają"
+      cash_flow_warning:
+        low: Twoje saldo gotówki może się wyczerpać
+        negative: Twoje saldo gotówki może być ujemne
+      net_worth_milestone: "Kamień milowy wartości netto: %{milestone}"
+      subscription_audit: "Czy %{name} jest nadal aktywne?"
+      savings_rate_change:
+        up: Twoja stopa oszczędności poprawiła się w %{month}
+        down: Twoja stopa oszczędności spadła w %{month}
+      idle_cash: Nieaktywna gotówka na %{account}
+      budget_at_risk:
+        few: "%{count} kategorie wymagają uwagi w budżecie"
+        many: "%{count} kategorii wymaga uwagi w budżecie"
+        one: Jedna kategoria wymaga uwagi w budżecie
+        other: "%{count} kategorii wymaga uwagi w budżecie"
+      budget_on_track: Twój budżet jest na dobrej drodze
+    templates:
+      spending_anomaly:
+        above: Jesteś na dobrej drodze, aby wydać %{projected_spend} na %{category} w tym miesiącu, około %{deviation_pct}% więcej niż Twoja średnia miesięczna %{baseline_spend}.
+        below: Jesteś na dobrej drodze, aby wydać %{projected_spend} na %{category} w tym miesiącu, około %{deviation_pct}% mniej niż Twoja średnia miesięczna %{baseline_spend}.
+      cash_flow_warning:
+        low: Na podstawie nadchodzących cyklicznych transakcji i typowych wydatków, Twoje saldo gotówki może spaść do %{projected_low} około %{projected_low_date}.
+        negative: Na podstawie nadchodzących cyklicznych transakcji i typowych wydatków, Twoje saldo gotówki może spaść do %{projected_low} około %{projected_low_date}.
+      net_worth_milestone: Twoja wartość netto przekroczyła %{milestone} i wynosi teraz %{net_worth}.
+      subscription_audit: "%{name} (%{amount}) nie pojawiło się od oczekiwanej daty %{expected_on}. Mogło zostać anulowane lub opłata mogła zostać przeniesiona."
+      savings_rate_change:
+        up: Zaoszczędziłeś %{current_rate}% swojego dochodu w %{month}, wzrost o %{change_pp} punktów procentowych z %{previous_rate}% w poprzednim miesiącu.
+        down: Zaoszczędziłeś %{current_rate}% swojego dochodu w %{month}, spadek o %{change_pp} punktów procentowych z %{previous_rate}% w poprzednim miesiącu.
+        down_negative: "Wydałeś więcej niż zarobiłeś w %{month}: Twoja stopa oszczędności spadła do %{current_rate}% z %{previous_rate}% w poprzednim miesiącu."
+      idle_cash: "%{account} posiada %{balance} bez aktywności w ostatnich %{idle_days} dniach."
+      budget_at_risk:
+        over: "%{categories} przekroczyło budżet w tym miesiącu. Wykorzystałeś %{budget_spent_pct}% swojego całkowitego budżetu."
+        near: "%{categories} jest blisko swoich limitów w tym miesiącu. Wykorzystałeś %{budget_spent_pct}% swojego całkowitego budżetu."
+      budget_on_track: Wydałeś %{spent} z %{budgeted} budżetu (%{budget_spent_pct}%) i wszystko mieści się w limicie.
diff --git a/config/locales/views/insights/tr.yml b/config/locales/views/insights/tr.yml
new file mode 100644
index 000000000..4992dad6b
--- /dev/null
+++ b/config/locales/views/insights/tr.yml
@@ -0,0 +1,110 @@
+---
+tr:
+  insights:
+    actions:
+      budget: Bütçeyi görüntüle
+      cash_flow_warning: Yinelenen işlemleri incele
+      idle_cash: Hesaba git
+      net_worth_milestone: Net değer raporunu görüntüle
+      savings_rate_change: O ayın işlemlerini görüntüle
+      spending_anomaly: "%{category} işlemlerini görüntüle"
+      subscription_audit: Yinelenen işlemleri incele
+    card:
+      dismiss: Yoksay
+      dismissed: İçgörü yoksayıldı
+      new: Yeni
+      undo: Geri al
+    feed:
+      header: Son
+      header_new: Yeni
+      view_all: Tüm içgörüleri görüntüle
+    figures:
+      days_overdue:
+        one: "%{count} gün gecikti"
+        other: "%{count} gün gecikti"
+      idle_days:
+        one: "%{count} gündür hareketsiz"
+        other: "%{count} gündür hareketsiz"
+      of_budget: bütçenin
+      on_pace: bu tempoda
+      today: bugün
+      vs_previous: önceki aya göre
+    index:
+      empty:
+        description: Hesaplarınızda yeterli hareket olduğunda içgörüler burada görünür.
+          Her gece otomatik olarak yenilenirler.
+        title: Henüz içgörü yok
+      refresh: Yeni içgörüleri kontrol et
+      subtitle: Finansal durumunuzda neler oluyor, her gece yenilenir.
+      title: İçgörüler
+    meta:
+      date_range: "%{from} - %{to}"
+      last_n_days:
+        one: Son gün
+        other: Son %{count} gün
+      next_n_days:
+        one: Sonraki gün
+        other: Sonraki %{count} gün
+    refresh:
+      checking: Kontrol ediliyor…
+      queued: Yeni içgörüler oluşturuyoruz. Bir dakika sonra tekrar kontrol edin.
+    templates:
+      budget_at_risk:
+        near: "%{categories} bu ay limitlerine yaklaşıyor. Şu ana kadar toplam bütçenizin
+          %{budget_spent_pct}%'ini kullandınız."
+        over: "%{categories} bu ay bütçeyi aştı. Şu ana kadar toplam bütçenizin %{budget_spent_pct}%'ini
+          kullandınız."
+      budget_on_track: "%{budgeted} bütçenizin %{spent} kadarını harcadınız (%{budget_spent_pct}%)
+        ve her şey limitler dahilinde."
+      cash_flow_warning:
+        low: Yaklaşan yinelenen işlemleriniz ve tipik harcamalarınıza dayanarak, nakit
+          bakiyeniz %{projected_low_date} civarında %{projected_low} seviyesine düşebilir.
+        negative: Yaklaşan yinelenen işlemleriniz ve tipik harcamalarınıza dayanarak,
+          nakit bakiyeniz %{projected_low_date} civarında %{projected_low} seviyesine
+          kadar gerileyebilir.
+      idle_cash: "%{account} hesabında son %{idle_days} gündür herhangi bir hareket
+        olmadan %{balance} bulunuyor."
+      net_worth_milestone: Net değeriniz %{milestone} sınırını geçti ve şu anda %{net_worth}
+        seviyesinde.
+      savings_rate_change:
+        down: "%{month} ayında gelirinizin %{current_rate}%'ini biriktirdiniz, bu
+          önceki aydaki %{previous_rate}%'den %{change_pp} puan düşüş anlamına geliyor."
+        down_negative: "%{month} ayında kazandığınızdan daha fazla harcadınız: tasarruf
+          oranınız önceki aydaki %{previous_rate}%'den %{current_rate}%'e düştü."
+        up: "%{month} ayında gelirinizin %{current_rate}%'ini biriktirdiniz, bu önceki
+          aydaki %{previous_rate}%'den %{change_pp} puan artış anlamına geliyor."
+      spending_anomaly:
+        above: Bu ay %{category} kategorisinde %{projected_spend} harcama temposundasınız;
+          bu, son aylık ortalamanız olan %{baseline_spend}'den yaklaşık %{deviation_pct}%
+          daha fazla.
+        below: Bu ay %{category} kategorisinde %{projected_spend} harcama temposundasınız;
+          bu, son aylık ortalamanız olan %{baseline_spend}'den yaklaşık %{deviation_pct}%
+          daha az.
+      subscription_audit: "%{name} (%{amount}), %{expected_on} tarihinde beklenmesine
+        rağmen görünmedi. İptal edilmiş olabilir veya ödeme tarihi değişmiş olabilir."
+    titles:
+      budget_at_risk:
+        one: Bütçenizde bir kategori dikkat gerektiriyor
+        other: "%{count} kategori bütçenizde dikkat gerektiriyor"
+      budget_on_track: Bütçeniz yolunda
+      cash_flow_warning:
+        low: Nakit bakiyeniz azalabilir
+        negative: Nakit bakiyeniz eksiye düşebilir
+      idle_cash: "%{account} hesabında hareketsiz nakit"
+      net_worth_milestone: 'Net değer kilometre taşı: %{milestone}'
+      savings_rate_change:
+        down: Tasarruf oranınız %{month} ayında düştü
+        up: Tasarruf oranınız %{month} ayında iyileşti
+      spending_anomaly:
+        above: "%{category} harcamaları artış eğiliminde"
+        below: "%{category} harcamaları azalış eğiliminde"
+      subscription_audit: "%{name} hâlâ aktif mi?"
+    types:
+      budget_at_risk: Bütçe
+      budget_on_track: Bütçe
+      cash_flow_warning: Nakit akışı
+      idle_cash: Hareketsiz nakit
+      net_worth_milestone: Net değer
+      savings_rate_change: Tasarruf oranı
+      spending_anomaly: Harcama
+      subscription_audit: Abonelikler
diff --git a/config/locales/views/investments/fr.yml b/config/locales/views/investments/fr.yml
index 865bb546b..543753dd8 100644
--- a/config/locales/views/investments/fr.yml
+++ b/config/locales/views/investments/fr.yml
@@ -11,116 +11,181 @@ fr:
     show:
       chart_title: Valeur totale
     subtypes:
-      # United States
-      brokerage:
-        short: Courtier
-        long: Courtier
       401k:
-        short: 401(k)
         long: 401(k)
-      roth_401k:
-        short: Roth 401(k)
-        long: Roth 401(k)
+        short: 401(k)
       403b:
-        short: 403(b)
         long: 403(b)
+        short: 403(b)
       457b:
-        short: 457(b)
         long: 457(b)
-      tsp:
-        short: TSP
-        long: Plan d'épargne fédéral américain (TSP)
-      ira:
-        short: IRA
-        long: Compte de retraite individuel (IRA)
-      roth_ira:
-        short: Roth IRA
-        long: Compte de retraite individuel Roth (Roth IRA)
-      sep_ira:
-        short: SEP IRA
-        long: Plan de retraite simplifié pour employés (SEP-IRA)
-      simple_ira:
-        short: SIMPLE IRA
-        long: Plan d'épargne salariale (SIMPLE IRA)
+        short: 457(b)
       529_plan:
-        short: Plan 529
         long: Plan 529 d'épargne-études
-      hsa:
-        short: HSA
-        long: Compte d'épargne santé
-      ugma:
-        short: UGMA
-        long: Compte de garde UGMA
-      utma:
-        short: UTMA
-        long: Compte de garde UTMA
-      # United Kingdom
-      isa:
-        short: ISA
-        long: Plan d'épargne individuel britannique (ISA)
-      lisa:
-        short: LISA
-        long: Plan d'épargne individuel à vie (LISA)
-      sipp:
-        short: SIPP
-        long: Plan de retraite individuel auto-géré (SIPP)
-      workplace_pension_uk:
-        short: Pension
-        long: Pension d'entreprise
-      # Canada
-      rrsp:
-        short: REER
-        long: Régime enregistré d'épargne-retraite
-      tfsa:
-        short: CELI
-        long: Compte d'épargne libre d'impôt
-      resp:
-        short: REEE
-        long: Régime enregistré d'épargne-études
-      lira:
-        short: CRI
-        long: Compte de retraite immobilisé
-      rrif:
-        short: FERR
-        long: Fonds enregistré de revenu de retraite
-      # Australia
-      super:
-        short: Super
-        long: Superannuation
-      smsf:
-        short: SMSF
-        long: Self-Managed Super Fund
-      # Europe
-      pea:
-        short: PEA
-        long: Plan d'Épargne en Actions
-      pillar_3a:
-        short: Pilier 3a
-        long: Prévoyance privée (Pilier 3a)
-      riester:
-        short: Riester
-        long: Riester-Rente
-      # Generic
-      pension:
-        short: Retraite
-        long: Retraite
-      retirement:
-        short: Retraite
-        long: Compte de retraite
-      mutual_fund:
-        short: Fonds commun
-        long: Fonds commun de placement
+        short: Plan 529
       angel:
-        short: Business angel
         long: Investissement providentiel
-      trust:
-        short: Fiducie
-        long: Fiducie
+        short: Business angel
+      apy:
+        long: Atal Pension Yojana
+        short: APY
+      brokerage:
+        long: Courtier
+        short: Courtier
+      corporate_bond:
+        long: Obligation d'entreprise
+        short: Obligation d'entreprise
+      fd:
+        long: Dépôt fixe
+        short: FD
+      g_sec:
+        long: Titres d'État (G-Secs)
+        short: G-Sec
+      gold:
+        long: Or (physique ou numérique)
+        short: Or
+      gold_etf:
+        long: FNB sur l'or
+        short: FNB sur l'or
+      gold_mf:
+        long: Fonds commun de placement en or
+        short: Or MF
+      hsa:
+        long: Compte d'épargne santé
+        short: HSA
+      indian_equity:
+        long: Actions indiennes
+        short: Actions indiennes
+      indian_etf:
+        long: ETF indien
+        short: ETF indien
+      indian_stocks:
+        long: Actions indiennes (Demat)
+        short: Actions indiennes
+      infrastructure_bond:
+        long: Obligation d'infrastructure
+        short: Lien Infra
+      ira:
+        long: Compte de retraite individuel (IRA)
+        short: IRA
+      isa:
+        long: Plan d'épargne individuel britannique (ISA)
+        short: ISA
+      kvp:
+        long: Kisan Vikas Patra
+        short: KVP
+      life_insurance:
+        long: Assurance vie
+        short: Assurance vie
+      lira:
+        long: Compte de retraite immobilisé
+        short: CRI
+      lisa:
+        long: Plan d'épargne individuel à vie (LISA)
+        short: LISA
+      mutual_fund:
+        long: Fonds commun de placement
+        short: Fonds commun
+      nps:
+        long: Système national de retraite
+        short: NPS
+      nsc:
+        long: Certificat d'épargne national
+        short: CNS
       other:
-        short: Autre
         long: Autre investissement
+        short: Autre
+      pea:
+        long: Plan d'Épargne en Actions
+        short: PEA
+      pension:
+        long: Retraite
+        short: Retraite
+      pillar_3a:
+        long: Prévoyance privée (Pilier 3a)
+        short: Pilier 3a
+      pomis:
+        long: Régime de revenu mensuel de la poste
+        short: POMIS
+      ppf:
+        long: Fonds de prévoyance publique
+        short: FPP
+      rd:
+        long: Dépôt récurrent
+        short: DR
+      resp:
+        long: Régime enregistré d'épargne-études
+        short: REEE
+      retirement:
+        long: Compte de retraite
+        short: Retraite
+      riester:
+        long: Riester-Rente
+        short: Riester
+      roth_401k:
+        long: Roth 401(k)
+        short: Roth 401(k)
+      roth_ira:
+        long: Compte de retraite individuel Roth (Roth IRA)
+        short: Roth IRA
+      rrif:
+        long: Fonds enregistré de revenu de retraite
+        short: FERR
+      rrsp:
+        long: Régime enregistré d'épargne-retraite
+        short: REER
+      scss:
+        long: Plan d'épargne pour les seniors
+        short: SCSS
+      sdl:
+        long: Prêts de développement de l'État (SDL)
+        short: SDL
+      sep_ira:
+        long: Plan de retraite simplifié pour employés (SEP-IRA)
+        short: SEP IRA
+      sgb:
+        long: Obligation souveraine en or
+        short: SGB
+      simple_ira:
+        long: Plan d'épargne salariale (SIMPLE IRA)
+        short: SIMPLE IRA
+      sipp:
+        long: Plan de retraite individuel auto-géré (SIPP)
+        short: SIPP
+      smsf:
+        long: Self-Managed Super Fund
+        short: SMSF
+      ssy:
+        long: Sukanya Samriddhi Yojana
+        short: SSY
+      super:
+        long: Superannuation
+        short: Super
+      tax_free_bond:
+        long: Obligation non imposable
+        short: Obligation non imposable
+      tfsa:
+        long: Compte d'épargne libre d'impôt
+        short: CELI
+      trust:
+        long: Fiducie
+        short: Fiducie
+      tsp:
+        long: Plan d'épargne fédéral américain (TSP)
+        short: TSP
+      ugma:
+        long: Compte de garde UGMA
+        short: UGMA
+      utma:
+        long: Compte de garde UTMA
+        short: UTMA
+      workplace_pension_uk:
+        long: Pension d'entreprise
+        short: Pension
     value_tooltip:
       cash: Liquidités
       holdings: Titres
       total: Valeur totale du portefeuille
-      total_value_tooltip: Le solde total du portefeuille correspond à la somme des liquidités (disponibles pour la négociation) et de la valeur marchande actuelle de vos titres.
+      total_value_tooltip: Le solde total du portefeuille correspond à la somme des
+        liquidités (disponibles pour la négociation) et de la valeur marchande actuelle
+        de vos titres.
diff --git a/config/locales/views/investments/it.yml b/config/locales/views/investments/it.yml
new file mode 100644
index 000000000..5cc396f75
--- /dev/null
+++ b/config/locales/views/investments/it.yml
@@ -0,0 +1,189 @@
+---
+it:
+  investments:
+    edit:
+      edit: Modifica %{account}
+    form:
+      none: Nessuno
+      subtype_prompt: Seleziona tipo di investimento
+    new:
+      title: Inserisci saldo conto
+    show:
+      chart_title: Valore totale
+    subtypes:
+      brokerage:
+        short: Intermediario
+        long: Conto intermediario
+      401k:
+        short: 401(k)
+        long: 401(k)
+      roth_401k:
+        short: Roth 401(k)
+        long: Roth 401(k)
+      403b:
+        short: 403(b)
+        long: 403(b)
+      457b:
+        short: 457(b)
+        long: 457(b)
+      tsp:
+        short: TSP
+        long: Thrift Savings Plan
+      ira:
+        short: IRA
+        long: IRA Tradizionale
+      roth_ira:
+        short: Roth IRA
+        long: Roth IRA
+      sep_ira:
+        short: SEP IRA
+        long: SEP IRA
+      simple_ira:
+        short: SIMPLE IRA
+        long: SIMPLE IRA
+      529_plan:
+        short: Piano 529
+        long: Piano di risparmio 529 per l'istruzione
+      hsa:
+        short: HSA
+        long: Conto di risparmio sanitario
+      ugma:
+        short: UGMA
+        long: Conto custodiale UGMA
+      utma:
+        short: UTMA
+        long: Conto custodiale UTMA
+      isa:
+        short: ISA
+        long: Conto di risparmio individuale
+      lisa:
+        short: LISA
+        long: Lifetime ISA
+      sipp:
+        short: SIPP
+        long: Pensione personale autogestita
+      workplace_pension_uk:
+        short: Pensione
+        long: Pensione aziendale
+      rrsp:
+        short: RRSP
+        long: Piano di risparmio pensionistico registrato
+      tfsa:
+        short: TFSA
+        long: Conto di risparmio esente da imposte
+      resp:
+        short: RESP
+        long: Piano di risparmio per l'istruzione registrato
+      lira:
+        short: LIRA
+        long: Conto pensionistico vincolato
+      rrif:
+        short: RRIF
+        long: Fondo di reddito pensionistico registrato
+      super:
+        short: Super
+        long: Superannuation
+      smsf:
+        short: SMSF
+        long: Fondo pensione autogestito
+      pea:
+        short: PEA
+        long: Piano di risparmio in azioni (PEA)
+      pillar_3a:
+        short: Pilastro 3a
+        long: Pensione privata (Pilastro 3a)
+      riester:
+        short: Riester
+        long: Riester-Rente
+      nps:
+        short: NPS
+        long: Sistema pensionistico nazionale
+      apy:
+        short: APY
+        long: Atal Pension Yojana
+      indian_stocks:
+        short: Azioni indiane
+        long: Azioni indiane (Demat)
+      indian_equity:
+        short: Equity indiana
+        long: Equity indiana
+      indian_etf:
+        short: ETF indiano
+        long: ETF indiano
+      life_insurance:
+        short: Assicurazione vita
+        long: Assicurazione vita
+      ppf:
+        short: PPF
+        long: Fondo di previdenza pubblica
+      ssy:
+        short: SSY
+        long: Sukanya Samriddhi Yojana
+      nsc:
+        short: NSC
+        long: Certificato di risparmio nazionale
+      scss:
+        short: SCSS
+        long: Schema di risparmio per anziani
+      fd:
+        short: FD
+        long: Deposito vincolato
+      rd:
+        short: RD
+        long: Deposito ricorrente
+      pomis:
+        short: POMIS
+        long: Schema di reddito mensile postale
+      kvp:
+        short: KVP
+        long: Kisan Vikas Patra
+      gold_etf:
+        short: ETF oro
+        long: ETF oro
+      gold_mf:
+        short: Fondo oro
+        long: Fondo comune oro
+      sgb:
+        short: SGB
+        long: Obbligazione oro sovrana
+      g_sec:
+        short: G-Sec
+        long: Titoli di Stato
+      sdl:
+        short: SDL
+        long: Prestiti per lo sviluppo statale
+      corporate_bond:
+        short: Obbligazione aziendale
+        long: Obbligazione aziendale
+      infrastructure_bond:
+        short: Obbligazione infrastrutture
+        long: Obbligazione infrastrutture
+      tax_free_bond:
+        short: Obbligazione esente
+        long: Obbligazione esente da imposte
+      pension:
+        short: Pensione
+        long: Pensione
+      retirement:
+        short: Previdenza
+        long: Conto previdenziale
+      mutual_fund:
+        short: Fondo comune
+        long: Fondo comune di investimento
+      gold:
+        short: Oro
+        long: Oro (fisico o digitale)
+      angel:
+        short: Angel
+        long: Investimento angel
+      trust:
+        short: Trust
+        long: Trust
+      other:
+        short: Altro
+        long: Altro investimento
+    value_tooltip:
+      cash: Liquidità
+      holdings: Posizioni
+      total: Saldo portafoglio
+      total_value_tooltip: Il saldo totale del portafoglio è la somma della liquidità del broker (disponibile per il trading) e del valore di mercato attuale delle posizioni.
diff --git a/config/locales/views/investments/ru.yml b/config/locales/views/investments/ru.yml
new file mode 100644
index 000000000..8b1c37a1e
--- /dev/null
+++ b/config/locales/views/investments/ru.yml
@@ -0,0 +1,193 @@
+---
+ru:
+  investments:
+    edit:
+      edit: Изменить %{account}
+    form:
+      none: Нет
+      subtype_prompt: Выберите тип инвестиций
+    new:
+      title: Введите баланс счёта
+    show:
+      chart_title: Общая стоимость
+    subtypes:
+      401k:
+        long: 401(k)
+        short: 401(k)
+      403b:
+        long: 403(b)
+        short: 403(b)
+      457b:
+        long: 457(b)
+        short: 457(b)
+      529_plan:
+        long: План сбережений на образование 529
+        short: План 529
+      angel:
+        long: Ангельские инвестиции
+        short: Ангел
+      apy:
+        long: Пенсионный план Атала (Atal Pension Yojana)
+        short: APY
+      brokerage:
+        long: Брокерский счёт
+        short: Брокерский
+      corporate_bond:
+        long: Корпоративная облигация
+        short: Корпоративная облигация
+      fd:
+        long: Фиксированный депозит
+        short: FD
+      g_sec:
+        long: Государственные ценные бумаги (G-Secs)
+        short: Гос. облигации
+      gold:
+        long: Золото (физическое или цифровое)
+        short: Золото
+      gold_etf:
+        long: Золотой ETF
+        short: Золотой ETF
+      gold_mf:
+        long: Золотой паевой инвестиционный фонд
+        short: Золотой ПИФ
+      hsa:
+        long: Счёт медицинских сбережений (Health Savings Account)
+        short: HSA
+      indian_equity:
+        long: Индийский капитал
+        short: Индийский капитал
+      indian_etf:
+        long: Индийский ETF
+        short: Индийский ETF
+      indian_stocks:
+        long: Индийские акции (Демат)
+        short: Индийские акции
+      infrastructure_bond:
+        long: Инфраструктурная облигация
+        short: Инфра облигация
+      ira:
+        long: Традиционный IRA
+        short: IRA
+      isa:
+        long: Индивидуальный сберегательный счёт (Individual Savings Account)
+        short: ISA
+      kvp:
+        long: Кисан Викас Патра (Kisan Vikas Patra)
+        short: KVP
+      life_insurance:
+        long: Страхование жизни
+        short: Страхование жизни
+      lira:
+        long: Заблокированный пенсионный счёт (Locked-In Retirement Account)
+        short: LIRA
+      lisa:
+        long: Долгосрочный ISA (Lifetime ISA)
+        short: LISA
+      mutual_fund:
+        long: Паевой инвестиционный фонд
+        short: ПИФ
+      nps:
+        long: Национальная пенсионная система (National Pension System)
+        short: NPS
+      nsc:
+        long: Национальный сберегательный сертификат (National Savings Certificate)
+        short: NSC
+      other:
+        long: Другие инвестиции
+        short: Другое
+      pea:
+        long: План сбережений в акциях (Plan d'Épargne en Actions)
+        short: PEA
+      pension:
+        long: Пенсия
+        short: Пенсия
+      pillar_3a:
+        long: Частная пенсия (Столп 3a)
+        short: Столп 3a
+      pomis:
+        long: Почтовая схема ежемесячного дохода (Post Office Monthly Income Scheme)
+        short: POMIS
+      ppf:
+        long: Общественный фонд сбережений (Public Provident Fund)
+        short: PPF
+      rd:
+        long: Регулярный депозит
+        short: RD
+      resp:
+        long: Зарегистрированный образовательный сберегательный план (Registered Education
+          Savings Plan)
+        short: RESP
+      retirement:
+        long: Пенсионный счёт
+        short: Пенсионный
+      riester:
+        long: Пенсия Ристер (Riester-Rente)
+        short: Ристер
+      roth_401k:
+        long: Roth 401(k)
+        short: Roth 401(k)
+      roth_ira:
+        long: Roth IRA
+        short: Roth IRA
+      rrif:
+        long: Зарегистрированный пенсионный фонд доходов (Registered Retirement Income
+          Fund)
+        short: RRIF
+      rrsp:
+        long: Зарегистрированный пенсионный сберегательный план (Registered Retirement
+          Savings Plan)
+        short: RRSP
+      scss:
+        long: Схема сбережений для пожилых граждан (Senior Citizens' Savings Scheme)
+        short: SCSS
+      sdl:
+        long: Займы на развитие штатов (SDLs)
+        short: Займы штатов
+      sep_ira:
+        long: SEP IRA
+        short: SEP IRA
+      sgb:
+        long: Суверенная золотая облигация (Sovereign Gold Bond)
+        short: SGB
+      simple_ira:
+        long: SIMPLE IRA
+        short: SIMPLE IRA
+      sipp:
+        long: Самостоятельная личная пенсия (Self-Invested Personal Pension)
+        short: SIPP
+      smsf:
+        long: Самоуправляемый суперфонд (Self-Managed Super Fund)
+        short: SMSF
+      ssy:
+        long: Сукания Самриддхи Йоджана (Sukanya Samriddhi Yojana)
+        short: SSY
+      super:
+        long: Супераннуэйшн
+        short: Супер
+      tax_free_bond:
+        long: Безналоговая облигация
+        short: Безналоговая облигация
+      tfsa:
+        long: Счёт сбережений без налога (Tax-Free Savings Account)
+        short: TFSA
+      trust:
+        long: Траст
+        short: Траст
+      tsp:
+        long: План сбережений (Thrift Savings Plan)
+        short: TSP
+      ugma:
+        long: Опекунский счёт UGMA
+        short: UGMA
+      utma:
+        long: Опекунский счёт UTMA
+        short: UTMA
+      workplace_pension_uk:
+        long: Рабочая пенсия
+        short: Пенсия
+    value_tooltip:
+      cash: Наличные
+      holdings: Активы
+      total: Баланс портфеля
+      total_value_tooltip: Общий баланс портфеля — это сумма наличных средств в брокерском
+        счёте (доступных для торговли) и текущей рыночной стоимости ваших активов.
diff --git a/config/locales/views/investments/tr.yml b/config/locales/views/investments/tr.yml
index a3a6ccefe..ee975c914 100644
--- a/config/locales/views/investments/tr.yml
+++ b/config/locales/views/investments/tr.yml
@@ -10,8 +10,181 @@ tr:
       title: Hesap bakiyesini girin
     show:
       chart_title: Toplam değer
+    subtypes:
+      401k:
+        long: 401(k)
+        short: 401(k)
+      403b:
+        long: 403(b)
+        short: 403(b)
+      457b:
+        long: 457(b)
+        short: 457(b)
+      529_plan:
+        long: 529 Eğitim Tasarruf Planı
+        short: 529 Plan
+      angel:
+        long: Melek Yatırımı
+        short: Melek Yatırımı
+      apy:
+        long: Atal Pension Yojana
+        short: APY
+      brokerage:
+        long: Aracılık Hesabı
+        short: Aracılık
+      corporate_bond:
+        long: Kurumsal Tahvil
+        short: Kurumsal Tahvil
+      fd:
+        long: Vadeli Mevduat
+        short: FD
+      g_sec:
+        long: Devlet Tahvilleri (G-Sec)
+        short: G-Sec
+      gold:
+        long: Altın (fiziksel veya dijital)
+        short: Altın
+      gold_etf:
+        long: Altın ETF
+        short: Altın ETF
+      gold_mf:
+        long: Altın Yatırım Fonu
+        short: Altın Fonu
+      hsa:
+        long: Sağlık Tasarruf Hesabı
+        short: HSA
+      indian_equity:
+        long: Hint Hisse Senedi
+        short: Hint Hisse Senedi
+      indian_etf:
+        long: Hint ETF
+        short: Hint ETF
+      indian_stocks:
+        long: Hint Hisseleri (Demat)
+        short: Hint Hisseleri
+      infrastructure_bond:
+        long: Altyapı Tahvili
+        short: Altyapı Tahvili
+      ira:
+        long: Geleneksel IRA
+        short: IRA
+      isa:
+        long: Bireysel Tasarruf Hesabı
+        short: ISA
+      kvp:
+        long: Kisan Vikas Patra
+        short: KVP
+      life_insurance:
+        long: Hayat Sigortası
+        short: Hayat Sigortası
+      lira:
+        long: Kilitli Emeklilik Hesabı
+        short: LIRA
+      lisa:
+        long: Ömür Boyu ISA
+        short: LISA
+      mutual_fund:
+        long: Yatırım Fonu
+        short: Yatırım Fonu
+      nps:
+        long: Ulusal Emeklilik Sistemi
+        short: NPS
+      nsc:
+        long: Ulusal Tasarruf Sertifikası
+        short: NSC
+      other:
+        long: Diğer Yatırım
+        short: Diğer
+      pea:
+        long: Plan d'Épargne en Actions
+        short: PEA
+      pension:
+        long: Emeklilik
+        short: Emeklilik
+      pillar_3a:
+        long: Özel Emeklilik (3a Sütunu)
+        short: Pillar 3a
+      pomis:
+        long: Posta Aylık Gelir Planı
+        short: POMIS
+      ppf:
+        long: Kamu İhtiyat Fonu
+        short: PPF
+      rd:
+        long: Birikimli Mevduat
+        short: RD
+      resp:
+        long: Kayıtlı Eğitim Tasarruf Planı
+        short: RESP
+      retirement:
+        long: Emeklilik Hesabı
+        short: Emeklilik
+      riester:
+        long: Riester-Rente
+        short: Riester
+      roth_401k:
+        long: Roth 401(k)
+        short: Roth 401(k)
+      roth_ira:
+        long: Roth IRA
+        short: Roth IRA
+      rrif:
+        long: Kayıtlı Emeklilik Gelir Fonu
+        short: RRIF
+      rrsp:
+        long: Kayıtlı Emeklilik Tasarruf Planı
+        short: RRSP
+      scss:
+        long: Yaşlı Vatandaşlar Tasarruf Planı
+        short: SCSS
+      sdl:
+        long: Eyalet Kalkınma Kredileri (SDL)
+        short: SDL
+      sep_ira:
+        long: SEP IRA
+        short: SEP IRA
+      sgb:
+        long: Egemen Altın Tahvili
+        short: SGB
+      simple_ira:
+        long: SIMPLE IRA
+        short: SIMPLE IRA
+      sipp:
+        long: Kendi Kendine Yönetilen Kişisel Emeklilik
+        short: SIPP
+      smsf:
+        long: Kendi Kendine Yönetilen Emeklilik Fonu
+        short: SMSF
+      ssy:
+        long: Sukanya Samriddhi Yojana
+        short: SSY
+      super:
+        long: Emeklilik Fonu (Avustralya)
+        short: Emeklilik
+      tax_free_bond:
+        long: Vergiden Muaf Tahvil
+        short: Vergiden Muaf Tahvil
+      tfsa:
+        long: Vergiden Muaf Tasarruf Hesabı
+        short: TFSA
+      trust:
+        long: Güven Fonu
+        short: Güven Fonu
+      tsp:
+        long: Tasarruf Planı
+        short: TSP
+      ugma:
+        long: UGMA Vesayet Hesabı
+        short: UGMA
+      utma:
+        long: UTMA Vesayet Hesabı
+        short: UTMA
+      workplace_pension_uk:
+        long: İşyeri Emeklilik Planı
+        short: Emeklilik
     value_tooltip:
       cash: Nakit
       holdings: Varlıklar
       total: Portföy bakiyesi
-      total_value_tooltip: Toplam portföy bakiyesi, aracı kurum nakiti (işlem için kullanılabilir) ve varlıklarınızın güncel piyasa değerinin toplamıdır.
\ No newline at end of file
+      total_value_tooltip: Toplam portföy bakiyesi, aracı kurum nakiti (işlem için
+        kullanılabilir) ve varlıklarınızın güncel piyasa değerinin toplamıdır.
diff --git a/config/locales/views/invitation_mailer/fr.yml b/config/locales/views/invitation_mailer/fr.yml
index c34494313..9fe58eccc 100644
--- a/config/locales/views/invitation_mailer/fr.yml
+++ b/config/locales/views/invitation_mailer/fr.yml
@@ -3,6 +3,7 @@ fr:
   invitation_mailer:
     invite_email:
       accept_button: Accepter l'invitation
-      body: "%{inviter} vous a invité à rejoindre sa famille %{family} sur %{product_name} !"
+      body: "%{inviter} vous a invité à rejoindre sa famille %{family} sur %{product_name}
+        !"
       expiry_notice: Cette invitation expire dans %{days} jours
       greeting: Bienvenue sur %{product_name} !
diff --git a/config/locales/views/invitation_mailer/it.yml b/config/locales/views/invitation_mailer/it.yml
new file mode 100644
index 000000000..e5121b4cb
--- /dev/null
+++ b/config/locales/views/invitation_mailer/it.yml
@@ -0,0 +1,8 @@
+---
+it:
+  invitation_mailer:
+    invite_email:
+      accept_button: Accetta invito
+      body: "%{inviter} ti ha invitato a unirti alla %{family} %{moniker} su %{product_name}!"
+      expiry_notice: Questo invito scadrà tra %{days} giorni
+      greeting: Benvenuto su %{product_name}!
diff --git a/config/locales/views/invitation_mailer/ru.yml b/config/locales/views/invitation_mailer/ru.yml
new file mode 100644
index 000000000..d98d1f778
--- /dev/null
+++ b/config/locales/views/invitation_mailer/ru.yml
@@ -0,0 +1,8 @@
+---
+ru:
+  invitation_mailer:
+    invite_email:
+      accept_button: Принять приглашение
+      body: "%{inviter} пригласил вас присоединиться к %{family} %{moniker} в %{product_name}!"
+      expiry_notice: Это приглашение истечет через %{days} дней
+      greeting: Добро пожаловать в %{product_name}!
diff --git a/config/locales/views/invitation_mailer/tr.yml b/config/locales/views/invitation_mailer/tr.yml
index 159094177..d9d54bfbc 100644
--- a/config/locales/views/invitation_mailer/tr.yml
+++ b/config/locales/views/invitation_mailer/tr.yml
@@ -3,6 +3,7 @@ tr:
   invitation_mailer:
     invite_email:
       accept_button: Daveti Kabul Et
-      body: "%{inviter}, sizi %{family} ailesine Maybe üzerinden katılmaya davet etti!"
+      body: "%{inviter}, sizi %{product_name} üzerinde %{family} %{moniker} adlı haneye
+        katılmaya davet etti!"
       expiry_notice: Bu davet %{days} gün içinde geçerliliğini yitirecek
-      greeting: "%{product_name}'ye Hoş Geldiniz!"
\ No newline at end of file
+      greeting: "%{product_name}'ye Hoş Geldiniz!"
diff --git a/config/locales/views/invitation_mailer/zh-CN.yml b/config/locales/views/invitation_mailer/zh-CN.yml
index 4b3ee1cc4..4b059b415 100644
--- a/config/locales/views/invitation_mailer/zh-CN.yml
+++ b/config/locales/views/invitation_mailer/zh-CN.yml
@@ -3,6 +3,6 @@ zh-CN:
   invitation_mailer:
     invite_email:
       accept_button: 接受邀请
-      body: "%{inviter} 邀请您加入 %{family} 家庭，共同使用 %{product_name}！"
+      body: "%{inviter} 邀请您加入 %{family} %{moniker}，共同使用 %{product_name}！"
       expiry_notice: 此邀请将在 %{days} 天后过期
       greeting: 欢迎使用 %{product_name}！
diff --git a/config/locales/views/invitations/fr.yml b/config/locales/views/invitations/fr.yml
index 89901ea69..d548909d4 100644
--- a/config/locales/views/invitations/fr.yml
+++ b/config/locales/views/invitations/fr.yml
@@ -9,6 +9,7 @@ fr:
       title: Rejoindre %{family}
     create:
       existing_user_added: L'utilisateur a été ajouté à votre foyer.
+      existing_user_has_family_data: Cet utilisateur possède déjà un foyer avec des comptes. Il doit supprimer ou transférer ces comptes avant de rejoindre le vôtre.
       failure: Impossible d'envoyer l'invitation
       success: Invitation envoyée avec succès
     destroy:
diff --git a/config/locales/views/invitations/it.yml b/config/locales/views/invitations/it.yml
new file mode 100644
index 000000000..5e27a7119
--- /dev/null
+++ b/config/locales/views/invitations/it.yml
@@ -0,0 +1,28 @@
+---
+it:
+  invitations:
+    accept_choice:
+      create_account: Crea nuovo account
+      joined_household: Hai aderito alla famiglia.
+      message: "%{inviter} ti ha invitato a unirti come %{role}."
+      sign_in_existing: Ho già un account
+      title: Unisciti a %{family}
+    create:
+      existing_user_added: L'utente è stato aggiunto alla tua famiglia.
+      existing_user_has_family_data: Quell'utente possiede già una famiglia con conti. Deve rimuovere o trasferire quei conti prima di unirsi alla tua.
+      failure: Impossibile inviare l'invito
+      success: Invito inviato con successo
+    destroy:
+      failure: Si è verificato un problema nella rimozione dell'invito.
+      not_authorized: Non sei autorizzato a gestire gli inviti.
+      success: Invito rimosso con successo.
+    new:
+      email_label: Indirizzo email
+      email_placeholder: Inserisci indirizzo email
+      role_admin: Amministratore
+      role_guest: Ospite
+      role_label: Ruolo
+      role_member: Membro
+      submit: Invia invito
+      subtitle: Invia un invito per unirsi al tuo account %{moniker} su %{product_name}
+      title: Invita qualcuno
diff --git a/config/locales/views/invitations/ru.yml b/config/locales/views/invitations/ru.yml
new file mode 100644
index 000000000..6134bac05
--- /dev/null
+++ b/config/locales/views/invitations/ru.yml
@@ -0,0 +1,30 @@
+---
+ru:
+  invitations:
+    accept_choice:
+      create_account: Создать новую учетную запись
+      joined_household: Вы присоединились к домохозяйству.
+      message: "%{inviter} пригласил вас присоединиться в качестве %{role}."
+      sign_in_existing: У меня уже есть учетная запись
+      title: Присоединиться к %{family}
+    create:
+      existing_user_added: Пользователь добавлен в ваше домохозяйство.
+      existing_user_has_family_data: That user already owns a household with accounts.
+        They need to remove or transfer those accounts before joining yours.
+      failure: Не удалось отправить приглашение
+      success: Приглашение успешно отправлено
+    destroy:
+      failure: Произошла ошибка при удалении приглашения.
+      not_authorized: У вас нет прав для управления приглашениями.
+      success: Приглашение успешно удалено.
+    new:
+      email_label: Адрес электронной почты
+      email_placeholder: Введите адрес электронной почты
+      role_admin: Администратор
+      role_guest: Гость
+      role_label: Роль
+      role_member: Участник
+      submit: Отправить приглашение
+      subtitle: Отправьте приглашение присоединиться к вашей учетной записи %{moniker}
+        в %{product_name}
+      title: Пригласить кого-то
diff --git a/config/locales/views/invitations/tr.yml b/config/locales/views/invitations/tr.yml
index d6fa3a78f..c46e7679d 100644
--- a/config/locales/views/invitations/tr.yml
+++ b/config/locales/views/invitations/tr.yml
@@ -1,7 +1,16 @@
 ---
 tr:
   invitations:
+    accept_choice:
+      create_account: Yeni hesap oluştur
+      joined_household: Haneye katıldınız.
+      message: "%{inviter} sizi %{role} olarak katılmaya davet etti."
+      sign_in_existing: Zaten bir hesabım var
+      title: "%{family} hanesine katıl"
     create:
+      existing_user_added: Kullanıcı hanenize eklendi.
+      existing_user_has_family_data: Bu kullanıcının zaten hesapları olan bir hanesi
+        var. Sizinkine katılmadan önce bu hesapları kaldırması veya devretmesi gerekiyor.
       failure: Davetiye gönderilemedi
       success: Davetiye başarıyla gönderildi
     destroy:
@@ -12,8 +21,10 @@ tr:
       email_label: E-posta Adresi
       email_placeholder: E-posta adresi girin
       role_admin: Yönetici
+      role_guest: Misafir
       role_label: Rol
       role_member: Üye
       submit: Davet Gönder
-      subtitle: "%{product_name}'de aile hesabınıza katılmaları için bir davetiye gönderin"
-      title: Birini Davet Et
\ No newline at end of file
+      subtitle: "%{product_name}'de %{moniker} hesabınıza katılmaları için bir davetiye
+        gönderin"
+      title: Birini Davet Et
diff --git a/config/locales/views/invitations/zh-CN.yml b/config/locales/views/invitations/zh-CN.yml
index 048879292..47f7c7d7d 100644
--- a/config/locales/views/invitations/zh-CN.yml
+++ b/config/locales/views/invitations/zh-CN.yml
@@ -11,6 +11,7 @@ zh-CN:
       existing_user_added: 用户已添加到您的家庭中。
       failure: 无法发送邀请
       success: 邀请已成功发送
+      existing_user_has_family_data: 此用户已有家庭数据，无法接受该邀请。
     destroy:
       failure: 移除邀请时出现问题。
       not_authorized: 您无权管理邀请。
diff --git a/config/locales/views/invite_codes/fr.yml b/config/locales/views/invite_codes/fr.yml
index a222d3737..2faffaccf 100644
--- a/config/locales/views/invite_codes/fr.yml
+++ b/config/locales/views/invite_codes/fr.yml
@@ -1,6 +1,11 @@
 ---
 fr:
   invite_codes:
+    create:
+      success: Code généré
+    destroy:
+      success: Code supprimé
     index:
-      invite_code_description: Générez un nouveau code pour le voir affiché ici. Les codes générés qui ont été utilisés ne seront plus affichés.
+      invite_code_description: Générez un nouveau code pour le voir affiché ici. Les
+        codes générés qui ont été utilisés ne seront plus affichés.
       no_invite_codes: Aucun code à afficher
diff --git a/config/locales/views/invite_codes/it.yml b/config/locales/views/invite_codes/it.yml
new file mode 100644
index 000000000..2053753f3
--- /dev/null
+++ b/config/locales/views/invite_codes/it.yml
@@ -0,0 +1,10 @@
+---
+it:
+  invite_codes:
+    create:
+      success: "Codice generato"
+    destroy:
+      success: "Codice eliminato"
+    index:
+      invite_code_description: Genera un nuovo codice per vederlo visualizzato qui. I codici generati che sono stati utilizzati non verranno più mostrati.
+      no_invite_codes: Nessun codice da mostrare
diff --git a/config/locales/views/invite_codes/ru.yml b/config/locales/views/invite_codes/ru.yml
new file mode 100644
index 000000000..4cc3bc666
--- /dev/null
+++ b/config/locales/views/invite_codes/ru.yml
@@ -0,0 +1,11 @@
+---
+ru:
+  invite_codes:
+    create:
+      success: Код создан
+    destroy:
+      success: Код удалён
+    index:
+      invite_code_description: Создайте новый код, чтобы он отобразился здесь. Использованные
+        коды больше не будут отображаться.
+      no_invite_codes: Нет кодов для отображения
diff --git a/config/locales/views/invite_codes/tr.yml b/config/locales/views/invite_codes/tr.yml
index 26dcea1f3..ab6e09652 100644
--- a/config/locales/views/invite_codes/tr.yml
+++ b/config/locales/views/invite_codes/tr.yml
@@ -1,6 +1,11 @@
 ---
 tr:
   invite_codes:
+    create:
+      success: Kod oluşturuldu
+    destroy:
+      success: Kod silindi
     index:
-      invite_code_description: Yeni bir kod oluşturduğunuzda burada görüntülenecektir. Kullanılmış olan oluşturulan kodlar artık gösterilmeyecek.
-      no_invite_codes: Gösterilecek kod yok
\ No newline at end of file
+      invite_code_description: Yeni bir kod oluşturduğunuzda burada görüntülenecektir.
+        Kullanılmış olan oluşturulan kodlar artık gösterilmeyecek.
+      no_invite_codes: Gösterilecek kod yok
diff --git a/config/locales/views/kraken_items/de.yml b/config/locales/views/kraken_items/de.yml
new file mode 100644
index 000000000..2a31167b0
--- /dev/null
+++ b/config/locales/views/kraken_items/de.yml
@@ -0,0 +1,85 @@
+---
+de:
+  kraken_items:
+    provider_connection:
+      default_name: Kraken
+      default_description: Mit einem Kraken-Börsenkonto verknüpfen
+      name: "Kraken - %{name}"
+      description: "Mit %{name} verknüpfen"
+    create:
+      default_name: Kraken
+      success: Erfolgreich mit Kraken verbunden. Ihr Börsenkonto wird synchronisiert.
+    update:
+      success: Kraken-Verbindung erfolgreich aktualisiert.
+    destroy:
+      success: Kraken-Verbindung zur Löschung vorgemerkt.
+    select_accounts:
+      select_connection: Wählen Sie in den Anbietereinstellungen eine Kraken-Verbindung aus.
+      no_credentials_configured: Fügen Sie Kraken-API-Zugangsdaten hinzu, bevor Sie Konten einrichten.
+    link_accounts:
+      select_connection: Wählen Sie eine Kraken-Verbindung aus, bevor Sie Konten verknüpfen.
+    select_existing_account:
+      title: Kraken-Konto verknüpfen
+      no_accounts_found: Keine Kraken-Konten gefunden.
+      wait_for_sync: Warten Sie, bis Kraken die Synchronisierung abgeschlossen hat.
+      check_provider_health: Prüfen Sie, ob Ihre Kraken-API-Zugangsdaten gültig sind.
+      link: Verknüpfen
+      cancel: Abbrechen
+    link_existing_account:
+      success: Erfolgreich mit Kraken-Konto verknüpft
+      select_connection: Wählen Sie eine Kraken-Verbindung aus, bevor Sie Konten verknüpfen.
+      errors:
+        only_manual: Nur manuelle Krypto-Börsenkonten ohne bestehende Anbieterverknüpfung können mit Kraken verknüpft werden
+        invalid_kraken_account: Ungültiges Kraken-Konto
+        kraken_account_already_linked: Dieses Kraken-Konto ist bereits verknüpft
+    setup_accounts:
+      title: Kraken-Konto importieren
+      subtitle: Wählen Sie das zu verfolgende Börsenkonto
+      instructions: Kraken importiert für diese Verbindung ein kombiniertes Krypto-Börsenkonto, ausschließlich mit Beständen und Spot-Trade-Ausführungen.
+      no_accounts: Alle Kraken-Konten wurden importiert.
+      accounts_count:
+        one: "%{count} Konto verfügbar"
+        other: "%{count} Konten verfügbar"
+      select_all: Alle auswählen
+      import_selected: Ausgewählte importieren
+      cancel: Abbrechen
+      creating: Importiere...
+    complete_account_setup:
+      success:
+        one: "%{count} Konto importiert"
+        other: "%{count} Konten importiert"
+      none_selected: Keine Konten ausgewählt
+      no_accounts: Keine Konten zum Import
+    kraken_item:
+      provider_name: Kraken
+      syncing: Synchronisiere...
+      reconnect: Zugangsdaten müssen aktualisiert werden
+      deletion_in_progress: Wird gelöscht...
+      sync_status:
+        no_accounts: Keine Konten gefunden
+        all_synced:
+          one: "%{count} Konto synchronisiert"
+          other: "%{count} Konten synchronisiert"
+        partial_sync: "%{linked_count} synchronisiert, %{unlinked_count} müssen eingerichtet werden"
+      status: "Zuletzt synchronisiert vor %{timestamp}"
+      status_with_summary: "Zuletzt synchronisiert vor %{timestamp} – %{summary}"
+      status_never: Noch nie synchronisiert
+      delete: Löschen
+      no_accounts_title: Keine Konten gefunden
+      no_accounts_message: Ihr Kraken-Börsenkonto erscheint hier nach der Synchronisierung.
+      setup_needed: Konto bereit zum Import
+      setup_description: Importieren Sie diese Kraken-Verbindung als Krypto-Börsenkonto.
+      setup_action: Konto importieren
+      import_accounts_menu: Konto importieren
+      stale_rate_warning: "Der Saldo ist ein Näherungswert, da der genaue Wechselkurs für %{date} nicht verfügbar war. Er wird bei der nächsten Synchronisierung aktualisiert."
+  kraken_item:
+    syncer:
+      checking_credentials: Zugangsdaten werden geprüft...
+      credentials_invalid: Ungültige Kraken-API-Zugangsdaten. Bitte überprüfen Sie Ihren API-Schlüssel und Ihr Secret.
+      importing_accounts: Konten werden von Kraken importiert...
+      checking_configuration: Kontokonfiguration wird geprüft...
+      accounts_need_setup:
+        one: "%{count} Konto muss eingerichtet werden"
+        other: "%{count} Konten müssen eingerichtet werden"
+      processing_accounts: Kontodaten werden verarbeitet...
+      calculating_balances: Salden werden berechnet...
diff --git a/config/locales/views/kraken_items/es.yml b/config/locales/views/kraken_items/es.yml
new file mode 100644
index 000000000..26a3eaaf8
--- /dev/null
+++ b/config/locales/views/kraken_items/es.yml
@@ -0,0 +1,85 @@
+---
+es:
+  kraken_items:
+    provider_connection:
+      default_name: Kraken
+      default_description: Vincular a una cuenta de la plataforma de intercambio Kraken
+      name: "Kraken - %{name}"
+      description: "Vincular a %{name}"
+    create:
+      default_name: Kraken
+      success: Conexión con Kraken establecida con éxito. Tu cuenta de la plataforma se está sincronizando.
+    update:
+      success: Conexión de Kraken actualizada correctamente.
+    destroy:
+      success: Conexión de Kraken programada para su eliminación.
+    select_accounts:
+      select_connection: Elige una conexión de Kraken en los Ajustes del proveedor.
+      no_credentials_configured: Añade las credenciales de la API de Kraken antes de configurar las cuentas.
+    link_accounts:
+      select_connection: Elige una conexión de Kraken antes de vincular cuentas.
+    select_existing_account:
+      title: Vincular cuenta de Kraken
+      no_accounts_found: No se han encontrado cuentas de Kraken.
+      wait_for_sync: Espera a que Kraken termine de sincronizar.
+      check_provider_health: Comprueba que tus credenciales de la API de Kraken sean válidas.
+      link: Vincular
+      cancel: Cancelar
+    link_existing_account:
+      success: Vinculado correctamente a la cuenta de Kraken
+      select_connection: Elige una conexión de Kraken antes de vincular cuentas.
+      errors:
+        only_manual: Solo las cuentas manuales de plataforma de criptomonedas sin un vínculo de proveedor existente pueden vincularse a Kraken
+        invalid_kraken_account: Cuenta de Kraken no válida
+        kraken_account_already_linked: Esta cuenta de Kraken ya está vinculada
+    setup_accounts:
+      title: Importar cuenta de Kraken
+      subtitle: Selecciona la cuenta de la plataforma que quieres seguir
+      instructions: Kraken importa una única cuenta combinada de plataforma de criptomonedas para esta conexión, con solo posiciones y ejecuciones de operaciones al contado.
+      no_accounts: Se han importado todas las cuentas de Kraken.
+      accounts_count:
+        one: "%{count} cuenta disponible"
+        other: "%{count} cuentas disponibles"
+      select_all: Seleccionar todas
+      import_selected: Importar seleccionadas
+      cancel: Cancelar
+      creating: Importando...
+    complete_account_setup:
+      success:
+        one: "Se ha importado %{count} cuenta"
+        other: "Se han importado %{count} cuentas"
+      none_selected: No se ha seleccionado ninguna cuenta
+      no_accounts: No hay cuentas para importar
+    kraken_item:
+      provider_name: Kraken
+      syncing: Sincronizando...
+      reconnect: Es necesario actualizar las credenciales
+      deletion_in_progress: Eliminando...
+      sync_status:
+        no_accounts: No se han encontrado cuentas
+        all_synced:
+          one: "%{count} cuenta sincronizada"
+          other: "%{count} cuentas sincronizadas"
+        partial_sync: "%{linked_count} sincronizadas, %{unlinked_count} necesitan configuración"
+      status: "Sincronizado hace %{timestamp}"
+      status_with_summary: "Sincronizado hace %{timestamp} - %{summary}"
+      status_never: Nunca sincronizado
+      delete: Eliminar
+      no_accounts_title: No se han encontrado cuentas
+      no_accounts_message: Tu cuenta de la plataforma Kraken aparecerá aquí después de la sincronización.
+      setup_needed: Cuenta lista para importar
+      setup_description: Importa esta conexión de Kraken como una cuenta de plataforma de criptomonedas.
+      setup_action: Importar cuenta
+      import_accounts_menu: Importar cuenta
+      stale_rate_warning: "El saldo es aproximado porque el tipo de cambio exacto para %{date} no estaba disponible. Se actualizará en la próxima sincronización."
+  kraken_item:
+    syncer:
+      checking_credentials: Comprobando credenciales...
+      credentials_invalid: Credenciales de la API de Kraken no válidas. Comprueba tu clave de API y tu secreto.
+      importing_accounts: Importando cuentas desde Kraken...
+      checking_configuration: Comprobando la configuración de la cuenta...
+      accounts_need_setup:
+        one: "%{count} cuenta necesita configuración"
+        other: "%{count} cuentas necesitan configuración"
+      processing_accounts: Procesando los datos de la cuenta...
+      calculating_balances: Calculando saldos...
diff --git a/config/locales/views/kraken_items/fr.yml b/config/locales/views/kraken_items/fr.yml
new file mode 100644
index 000000000..b04a5ee14
--- /dev/null
+++ b/config/locales/views/kraken_items/fr.yml
@@ -0,0 +1,92 @@
+---
+fr:
+  kraken_item:
+    syncer:
+      accounts_need_setup:
+        one: Le compte %{count} doit être configuré
+        other: "%{count} comptes doivent être configurés"
+      calculating_balances: Calcul des soldes...
+      checking_configuration: Vérification de la configuration du compte...
+      checking_credentials: Vérification des informations d'identification...
+      credentials_invalid: Informations d'identification de l'API Kraken invalides.
+        Veuillez vérifier votre clé API et votre secret.
+      importing_accounts: Importation de comptes depuis Kraken...
+      processing_accounts: Traitement des données du compte...
+  kraken_items:
+    complete_account_setup:
+      no_accounts: Aucun compte à importer
+      none_selected: Aucun compte sélectionné
+      success:
+        one: Compte %{count} importé
+        other: Comptes %{count} importés
+    create:
+      default_name: Kraken
+      success: Connexion réussie à Kraken. Votre compte Exchange est en cours de synchronisation.
+    destroy:
+      success: Connexion Kraken programmée pour suppression.
+    kraken_item:
+      delete: Supprimer
+      deletion_in_progress: Suppression...
+      import_accounts_menu: Compte d'importation
+      no_accounts_message: Votre compte d'échange Kraken apparaîtra ici après la synchronisation.
+      no_accounts_title: Aucun compte trouvé
+      provider_name: Kraken
+      reconnect: Les informations d'identification doivent être mises à jour
+      setup_action: Compte d'importation
+      setup_description: Importez cette connexion Kraken en tant que compte d'échange
+        Crypto.
+      setup_needed: Compte prêt à importer
+      stale_rate_warning: Le solde est approximatif car le taux de change exact pour
+        %{date} n'était pas disponible. Sera mis à jour lors de la prochaine synchronisation.
+      status: Dernière synchronisation il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} - %{summary}
+      sync_status:
+        all_synced:
+          one: Compte %{count} synchronisé
+          other: "%{count} comptes synchronisés"
+        no_accounts: Aucun compte trouvé
+        partial_sync: "%{linked_count} synchronisé, %{unlinked_count} doit être configuré"
+      syncing: Synchronisation...
+    link_accounts:
+      select_connection: Choisissez une connexion Kraken avant de lier des comptes.
+    link_existing_account:
+      errors:
+        invalid_kraken_account: Compte Kraken invalide
+        kraken_account_already_linked: Ce compte Kraken est déjà lié
+        only_manual: Seuls les comptes d'échange Crypto manuels sans lien de fournisseur
+          existant peuvent être liés à Kraken
+      select_connection: Choisissez une connexion Kraken avant de lier des comptes.
+      success: Lié avec succès au compte Kraken
+    provider_connection:
+      default_description: Lien vers un compte d'échange Kraken
+      default_name: Kraken
+      description: Lien vers %{name}
+      name: Kraken-%{name}
+    select_accounts:
+      no_credentials_configured: Ajoutez les informations d'identification de l'API
+        Kraken avant de configurer des comptes.
+      select_connection: Choisissez une connexion Kraken dans les paramètres du fournisseur.
+    select_existing_account:
+      cancel: Annuler
+      check_provider_health: Vérifiez que vos informations d'identification de l'API
+        Kraken sont valides.
+      link: Lien
+      no_accounts_found: Aucun compte Kraken trouvé.
+      title: Associer un compte Kraken
+      wait_for_sync: Attendez que Kraken termine la synchronisation.
+    setup_accounts:
+      accounts_count:
+        one: Compte %{count} disponible
+        other: "%{count} comptes disponibles"
+      cancel: Annuler
+      creating: Importation...
+      import_selected: Importer la sélection
+      instructions: Kraken importe un compte d'échange Crypto combiné pour cette connexion,
+        avec des holdings et des transactions au comptant uniquement.
+      no_accounts: Tous les comptes Kraken ont été importés.
+      select_all: Tout sélectionner
+      subtitle: Sélectionnez le compte d'échange à suivre
+      title: Importer un compte Kraken
+    update:
+      success: Connexion Kraken mise à jour avec succès.
diff --git a/config/locales/views/kraken_items/it.yml b/config/locales/views/kraken_items/it.yml
new file mode 100644
index 000000000..3bfce48b0
--- /dev/null
+++ b/config/locales/views/kraken_items/it.yml
@@ -0,0 +1,85 @@
+---
+it:
+  kraken_items:
+    provider_connection:
+      default_name: Kraken
+      default_description: Collega a un conto exchange Kraken
+      name: "Kraken - %{name}"
+      description: "Collega a %{name}"
+    create:
+      default_name: Kraken
+      success: Connessione a Kraken riuscita. Il tuo conto exchange viene sincronizzato.
+    update:
+      success: Connessione Kraken aggiornata con successo.
+    destroy:
+      success: Connessione Kraken pianificata per l'eliminazione.
+    select_accounts:
+      select_connection: Scegli una connessione Kraken nelle Impostazioni provider.
+      no_credentials_configured: Aggiungi le credenziali API Kraken prima di configurare i conti.
+    link_accounts:
+      select_connection: Scegli una connessione Kraken prima di collegare i conti.
+    select_existing_account:
+      title: Collega conto Kraken
+      no_accounts_found: Nessun conto Kraken trovato.
+      wait_for_sync: Attendi il completamento della sincronizzazione Kraken.
+      check_provider_health: Verifica che le tue credenziali API Kraken siano valide.
+      link: Collega
+      cancel: Annulla
+    link_existing_account:
+      success: Collegato con successo al conto Kraken
+      select_connection: Scegli una connessione Kraken prima di collegare i conti.
+      errors:
+        only_manual: Solo i conti exchange Crypto manuali senza collegamento provider esistente possono essere collegati a Kraken
+        invalid_kraken_account: Conto Kraken non valido
+        kraken_account_already_linked: Questo conto Kraken è già collegato
+    setup_accounts:
+      title: Importa conto Kraken
+      subtitle: Seleziona il conto exchange da tracciare
+      instructions: Kraken importa un unico conto exchange Crypto combinato per questa connessione, con solo posizioni e operazioni spot.
+      no_accounts: Tutti i conti Kraken sono stati importati.
+      accounts_count:
+        one: "%{count} conto disponibile"
+        other: "%{count} conti disponibili"
+      select_all: Seleziona tutto
+      import_selected: Importa selezionati
+      cancel: Annulla
+      creating: Importazione in corso...
+    complete_account_setup:
+      success:
+        one: "Importato %{count} conto"
+        other: "Importati %{count} conti"
+      none_selected: Nessun conto selezionato
+      no_accounts: Nessun conto da importare
+    kraken_item:
+      provider_name: Kraken
+      syncing: Sincronizzazione in corso...
+      reconnect: Le credenziali devono essere aggiornate
+      deletion_in_progress: Eliminazione in corso...
+      sync_status:
+        no_accounts: Nessun conto trovato
+        all_synced:
+          one: "%{count} conto sincronizzato"
+          other: "%{count} conti sincronizzati"
+        partial_sync: "%{linked_count} sincronizzati, %{unlinked_count} da configurare"
+      status: "Ultima sincronizzazione %{timestamp} fa"
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      status_never: Mai sincronizzato
+      delete: Elimina
+      no_accounts_title: Nessun conto trovato
+      no_accounts_message: Il tuo conto exchange Kraken apparirà qui dopo la sincronizzazione.
+      setup_needed: Conto pronto per l'importazione
+      setup_description: Importa questa connessione Kraken come conto exchange Crypto.
+      setup_action: Importa conto
+      import_accounts_menu: Importa conto
+      stale_rate_warning: "Il saldo è approssimativo perché il tasso di cambio esatto per %{date} non era disponibile. Verrà aggiornato alla prossima sincronizzazione."
+  kraken_item:
+    syncer:
+      checking_credentials: Verifica credenziali...
+      credentials_invalid: Credenziali API Kraken non valide. Controlla la tua chiave API e il segreto.
+      importing_accounts: Importazione conti da Kraken...
+      checking_configuration: Verifica configurazione conto...
+      accounts_need_setup:
+        one: "%{count} conto da configurare"
+        other: "%{count} conti da configurare"
+      processing_accounts: Elaborazione dati conto...
+      calculating_balances: Calcolo saldi...
diff --git a/config/locales/views/kraken_items/nl.yml b/config/locales/views/kraken_items/nl.yml
new file mode 100644
index 000000000..d57362e04
--- /dev/null
+++ b/config/locales/views/kraken_items/nl.yml
@@ -0,0 +1,85 @@
+---
+nl:
+  kraken_items:
+    provider_connection:
+      default_name: Kraken
+      default_description: Koppelen aan een Kraken-beursaccount
+      name: "Kraken - %{name}"
+      description: "Koppelen aan %{name}"
+    create:
+      default_name: Kraken
+      success: Succesvol verbonden met Kraken. Uw beursaccount wordt gesynchroniseerd.
+    update:
+      success: Kraken-verbinding succesvol bijgewerkt.
+    destroy:
+      success: Kraken-verbinding is in de wachtrij voor verwijdering geplaatst.
+    select_accounts:
+      select_connection: Kies een Kraken-verbinding in de Provider-instellingen.
+      no_credentials_configured: Voeg Kraken-API-inloggegevens toe voordat u accounts instelt.
+    link_accounts:
+      select_connection: Kies een Kraken-verbinding voordat u accounts koppelt.
+    select_existing_account:
+      title: Kraken-account koppelen
+      no_accounts_found: Geen Kraken-accounts gevonden.
+      wait_for_sync: Wacht tot Kraken klaar is met synchroniseren.
+      check_provider_health: Controleer of uw Kraken-API-inloggegevens geldig zijn.
+      link: Koppelen
+      cancel: Annuleren
+    link_existing_account:
+      success: Succesvol gekoppeld aan Kraken-account
+      select_connection: Kies een Kraken-verbinding voordat u accounts koppelt.
+      errors:
+        only_manual: Alleen handmatige crypto-beursaccounts zonder bestaande providerkoppeling kunnen aan Kraken worden gekoppeld
+        invalid_kraken_account: Ongeldig Kraken-account
+        kraken_account_already_linked: Dit Kraken-account is al gekoppeld
+    setup_accounts:
+      title: Kraken-account importeren
+      subtitle: Selecteer het beursaccount dat u wilt volgen
+      instructions: Kraken importeert voor deze verbinding één gecombineerd crypto-beursaccount, met alleen posities en spot-transactie-uitvoeringen.
+      no_accounts: Alle Kraken-accounts zijn geïmporteerd.
+      accounts_count:
+        one: "%{count} account beschikbaar"
+        other: "%{count} accounts beschikbaar"
+      select_all: Alles selecteren
+      import_selected: Geselecteerde importeren
+      cancel: Annuleren
+      creating: Importeren...
+    complete_account_setup:
+      success:
+        one: "%{count} account geïmporteerd"
+        other: "%{count} accounts geïmporteerd"
+      none_selected: Geen accounts geselecteerd
+      no_accounts: Geen accounts om te importeren
+    kraken_item:
+      provider_name: Kraken
+      syncing: Synchroniseren...
+      reconnect: Inloggegevens moeten worden bijgewerkt
+      deletion_in_progress: Verwijderen...
+      sync_status:
+        no_accounts: Geen accounts gevonden
+        all_synced:
+          one: "%{count} account gesynchroniseerd"
+          other: "%{count} accounts gesynchroniseerd"
+        partial_sync: "%{linked_count} gesynchroniseerd, %{unlinked_count} moeten worden ingesteld"
+      status: "Laatst gesynchroniseerd %{timestamp} geleden"
+      status_with_summary: "Laatst gesynchroniseerd %{timestamp} geleden - %{summary}"
+      status_never: Nooit gesynchroniseerd
+      delete: Verwijderen
+      no_accounts_title: Geen accounts gevonden
+      no_accounts_message: Uw Kraken-beursaccount verschijnt hier na de synchronisatie.
+      setup_needed: Account klaar om te importeren
+      setup_description: Importeer deze Kraken-verbinding als een crypto-beursaccount.
+      setup_action: Account importeren
+      import_accounts_menu: Account importeren
+      stale_rate_warning: "Het saldo is bij benadering omdat de exacte wisselkoers voor %{date} niet beschikbaar was. Wordt bijgewerkt bij de volgende synchronisatie."
+  kraken_item:
+    syncer:
+      checking_credentials: Inloggegevens controleren...
+      credentials_invalid: Ongeldige Kraken-API-inloggegevens. Controleer uw API-sleutel en secret.
+      importing_accounts: Accounts importeren vanuit Kraken...
+      checking_configuration: Accountconfiguratie controleren...
+      accounts_need_setup:
+        one: "%{count} account moet worden ingesteld"
+        other: "%{count} accounts moeten worden ingesteld"
+      processing_accounts: Accountgegevens verwerken...
+      calculating_balances: Saldi berekenen...
diff --git a/config/locales/views/kraken_items/pl.yml b/config/locales/views/kraken_items/pl.yml
new file mode 100644
index 000000000..e1ba33e0e
--- /dev/null
+++ b/config/locales/views/kraken_items/pl.yml
@@ -0,0 +1,93 @@
+---
+pl:
+  kraken_items:
+    provider_connection:
+      default_name: Kraken
+      default_description: Połącz z kontem giełdy Kraken
+      name: "Kraken - %{name}"
+      description: "Połącz z %{name}"
+    create:
+      default_name: Kraken
+      success: Połączono z Kraken. Twoje konto giełdowe jest synchronizowane.
+    update:
+      success: Zaktualizowano połączenie Kraken.
+    destroy:
+      success: Zaplanowano usunięcie połączenia Kraken.
+    select_accounts:
+      select_connection: Wybierz połączenie Kraken w ustawieniach dostawcy.
+      no_credentials_configured: Dodaj dane uwierzytelniające API Kraken przed konfiguracją kont.
+    link_accounts:
+      select_connection: Wybierz połączenie Kraken przed połączeniem kont.
+    select_existing_account:
+      title: Połącz konto Kraken
+      no_accounts_found: Nie znaleziono kont Kraken.
+      wait_for_sync: Poczekaj na zakończenie synchronizacji Kraken.
+      check_provider_health: Sprawdź, czy dane uwierzytelniające API Kraken są prawidłowe.
+      link: Połącz
+      cancel: Anuluj
+    link_existing_account:
+      success: Połączono z kontem Kraken
+      select_connection: Wybierz połączenie Kraken przed połączeniem kont.
+      errors:
+        only_manual: Tylko ręczne konta kryptowalutowe bez istniejącego połączenia z dostawcą mogą być połączone z Kraken
+        invalid_kraken_account: Nieprawidłowe konto Kraken
+        kraken_account_already_linked: To konto Kraken jest już połączone
+    setup_accounts:
+      title: Importuj konto Kraken
+      subtitle: Wybierz konto giełdowe do śledzenia
+      instructions: Kraken importuje jedno połączone konto giełdy kryptowalut dla tego połączenia, tylko z portfelami i realizacjami transakcji spot.
+      no_accounts: Wszystkie konta Kraken zostały zaimportowane.
+      accounts_count:
+        few: "%{count} konta dostępne"
+        many: "%{count} kont dostępnych"
+        one: "%{count} konto dostępne"
+        other: "%{count} kont dostępnych"
+      select_all: Zaznacz wszystkie
+      import_selected: Importuj zaznaczone
+      cancel: Anuluj
+      creating: Importowanie...
+    complete_account_setup:
+      success:
+        few: "Zaimportowano %{count} konta"
+        many: "Zaimportowano %{count} kont"
+        one: "Zaimportowano %{count} konto"
+        other: "Zaimportowano %{count} kont"
+      none_selected: Nie wybrano kont
+      no_accounts: Brak kont do zaimportowania
+    kraken_item:
+      provider_name: Kraken
+      syncing: Synchronizowanie...
+      reconnect: Wymagana aktualizacja danych uwierzytelniających
+      deletion_in_progress: Usuwanie...
+      sync_status:
+        no_accounts: Nie znaleziono kont
+        all_synced:
+          few: "%{count} konta zsynchronizowane"
+          many: "%{count} kont zsynchronizowanych"
+          one: "%{count} konto zsynchronizowane"
+          other: "%{count} kont zsynchronizowanych"
+        partial_sync: "%{linked_count} zsynchronizowanych, %{unlinked_count} wymaga konfiguracji"
+      status: "Ostatnia synchronizacja %{timestamp} temu"
+      status_with_summary: "Ostatnia synchronizacja %{timestamp} temu - %{summary}"
+      status_never: Nigdy nie synchronizowano
+      delete: Usuń
+      no_accounts_title: Nie znaleziono kont
+      no_accounts_message: Twoje konto giełdy Kraken pojawi się tutaj po synchronizacji.
+      setup_needed: Konto gotowe do importu
+      setup_description: Zaimportuj to połączenie Kraken jako konto giełdy kryptowalut.
+      setup_action: Importuj konto
+      import_accounts_menu: Importuj konto
+      stale_rate_warning: "Saldo jest przybliżone, ponieważ dokładny kurs wymiany z %{date} był niedostępny. Zaktualizuje się przy następnej synchronizacji."
+  kraken_item:
+    syncer:
+      checking_credentials: Sprawdzanie danych uwierzytelniających...
+      credentials_invalid: Nieprawidłowe dane uwierzytelniające API Kraken. Sprawdź swój klucz API i sekret.
+      importing_accounts: Importowanie kont z Kraken...
+      checking_configuration: Sprawdzanie konfiguracji konta...
+      accounts_need_setup:
+        few: "%{count} konta wymagają konfiguracji"
+        many: "%{count} kont wymaga konfiguracji"
+        one: "%{count} konto wymaga konfiguracji"
+        other: "%{count} kont wymaga konfiguracji"
+      processing_accounts: Przetwarzanie danych kont...
+      calculating_balances: Obliczanie sald...
diff --git a/config/locales/views/kraken_items/pt-BR.yml b/config/locales/views/kraken_items/pt-BR.yml
new file mode 100644
index 000000000..6a6bef331
--- /dev/null
+++ b/config/locales/views/kraken_items/pt-BR.yml
@@ -0,0 +1,85 @@
+---
+pt-BR:
+  kraken_items:
+    provider_connection:
+      default_name: Kraken
+      default_description: Vincular a uma conta da corretora Kraken
+      name: "Kraken - %{name}"
+      description: "Vincular a %{name}"
+    create:
+      default_name: Kraken
+      success: Conexão com a Kraken estabelecida com sucesso. Sua conta da corretora está sendo sincronizada.
+    update:
+      success: Conexão da Kraken atualizada com sucesso.
+    destroy:
+      success: Conexão da Kraken programada para exclusão.
+    select_accounts:
+      select_connection: Escolha uma conexão da Kraken nas Configurações do provedor.
+      no_credentials_configured: Adicione as credenciais da API da Kraken antes de configurar as contas.
+    link_accounts:
+      select_connection: Escolha uma conexão da Kraken antes de vincular contas.
+    select_existing_account:
+      title: Vincular conta da Kraken
+      no_accounts_found: Nenhuma conta da Kraken encontrada.
+      wait_for_sync: Aguarde a Kraken concluir a sincronização.
+      check_provider_health: Verifique se suas credenciais da API da Kraken são válidas.
+      link: Vincular
+      cancel: Cancelar
+    link_existing_account:
+      success: Vinculado com sucesso à conta da Kraken
+      select_connection: Escolha uma conexão da Kraken antes de vincular contas.
+      errors:
+        only_manual: Apenas contas manuais de corretora de criptomoedas sem um vínculo de provedor existente podem ser vinculadas à Kraken
+        invalid_kraken_account: Conta da Kraken inválida
+        kraken_account_already_linked: Esta conta da Kraken já está vinculada
+    setup_accounts:
+      title: Importar conta da Kraken
+      subtitle: Selecione a conta da corretora que você quer acompanhar
+      instructions: A Kraken importa uma única conta combinada de corretora de criptomoedas para esta conexão, apenas com posições e execuções de negociações à vista.
+      no_accounts: Todas as contas da Kraken foram importadas.
+      accounts_count:
+        one: "%{count} conta disponível"
+        other: "%{count} contas disponíveis"
+      select_all: Selecionar todas
+      import_selected: Importar selecionadas
+      cancel: Cancelar
+      creating: Importando...
+    complete_account_setup:
+      success:
+        one: "%{count} conta importada"
+        other: "%{count} contas importadas"
+      none_selected: Nenhuma conta selecionada
+      no_accounts: Nenhuma conta para importar
+    kraken_item:
+      provider_name: Kraken
+      syncing: Sincronizando...
+      reconnect: As credenciais precisam ser atualizadas
+      deletion_in_progress: Excluindo...
+      sync_status:
+        no_accounts: Nenhuma conta encontrada
+        all_synced:
+          one: "%{count} conta sincronizada"
+          other: "%{count} contas sincronizadas"
+        partial_sync: "%{linked_count} sincronizadas, %{unlinked_count} precisam de configuração"
+      status: "Sincronizado há %{timestamp}"
+      status_with_summary: "Sincronizado há %{timestamp} - %{summary}"
+      status_never: Nunca sincronizado
+      delete: Excluir
+      no_accounts_title: Nenhuma conta encontrada
+      no_accounts_message: Sua conta da corretora Kraken aparecerá aqui após a sincronização.
+      setup_needed: Conta pronta para importar
+      setup_description: Importe esta conexão da Kraken como uma conta de corretora de criptomoedas.
+      setup_action: Importar conta
+      import_accounts_menu: Importar conta
+      stale_rate_warning: "O saldo é aproximado porque a taxa de câmbio exata para %{date} não estava disponível. Será atualizado na próxima sincronização."
+  kraken_item:
+    syncer:
+      checking_credentials: Verificando credenciais...
+      credentials_invalid: Credenciais da API da Kraken inválidas. Verifique sua chave de API e seu segredo.
+      importing_accounts: Importando contas da Kraken...
+      checking_configuration: Verificando a configuração da conta...
+      accounts_need_setup:
+        one: "%{count} conta precisa de configuração"
+        other: "%{count} contas precisam de configuração"
+      processing_accounts: Processando os dados da conta...
+      calculating_balances: Calculando saldos...
diff --git a/config/locales/views/kraken_items/ru.yml b/config/locales/views/kraken_items/ru.yml
new file mode 100644
index 000000000..c9011a834
--- /dev/null
+++ b/config/locales/views/kraken_items/ru.yml
@@ -0,0 +1,100 @@
+---
+ru:
+  kraken_item:
+    syncer:
+      accounts_need_setup:
+        few: "%{count} счёта требуют настройки"
+        many: "%{count} счетов требуют настройки"
+        one: "%{count} счёт требует настройки"
+        other: "%{count} счёта требуют настройки"
+      calculating_balances: Расчёт балансов...
+      checking_configuration: Проверка конфигурации счёта...
+      checking_credentials: Проверка учётных данных...
+      credentials_invalid: Недействительные API-учётные данные Kraken. Пожалуйста,
+        проверьте ваш API-ключ и секрет.
+      importing_accounts: Импортирование счетов из Kraken...
+      processing_accounts: Обработка данных счёта...
+  kraken_items:
+    complete_account_setup:
+      no_accounts: Нет счетов для импорта
+      none_selected: Счета не выбраны
+      success:
+        few: Импортированы %{count} счёта
+        many: Импортировано %{count} счетов
+        one: Импортирован %{count} счёт
+        other: Импортированы %{count} счёта
+    create:
+      default_name: Kraken
+      success: Успешно подключено к Kraken. Ваша учётная запись на бирже синхронизируется.
+    destroy:
+      success: Подключение к Kraken запланировано на удаление.
+    kraken_item:
+      delete: Удалить
+      deletion_in_progress: Удаление...
+      import_accounts_menu: Импортировать счёт
+      no_accounts_message: Ваша учётная запись на бирже Kraken появится здесь после
+        синхронизации.
+      no_accounts_title: Счета не найдены
+      provider_name: Kraken
+      reconnect: Необходимо обновить учётные данные
+      setup_action: Импортировать счёт
+      setup_description: Импортируйте это подключение Kraken как учётную запись криптобиржи.
+      setup_needed: Счёт готов к импорту
+      stale_rate_warning: Баланс приблизительный, так как точный курс обмена на %{date}
+        был недоступен. Обновится при следующей синхронизации.
+      status: Последняя синхронизация %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад - %{summary}
+      sync_status:
+        all_synced:
+          few: Синхронизированы %{count} счёта
+          many: Синхронизировано %{count} счетов
+          one: Синхронизирован %{count} счёт
+          other: Синхронизированы %{count} счёта
+        no_accounts: Счета не найдены
+        partial_sync: "%{linked_count} синхронизировано, %{unlinked_count} требуют
+          настройки"
+      syncing: Синхронизация...
+    link_accounts:
+      select_connection: Выберите подключение к Kraken перед связыванием счетов.
+    link_existing_account:
+      errors:
+        invalid_kraken_account: Недействительный счёт Kraken
+        kraken_account_already_linked: Этот счёт Kraken уже связан
+        only_manual: Только ручные счета криптобиржи без существующей связи с провайдером
+          могут быть связаны с Kraken
+      select_connection: Выберите подключение к Kraken перед связыванием счетов.
+      success: Успешно связан с учётной записью Kraken
+    provider_connection:
+      default_description: Связь с учётной записью на бирже Kraken
+      default_name: Kraken
+      description: Связь с %{name}
+      name: Kraken - %{name}
+    select_accounts:
+      no_credentials_configured: Добавьте API-учётные данные Kraken перед настройкой
+        счетов.
+      select_connection: Выберите подключение к Kraken в настройках провайдера.
+    select_existing_account:
+      cancel: Отмена
+      check_provider_health: Проверьте, что ваши API-учётные данные Kraken действительны.
+      link: Связать
+      no_accounts_found: Счета Kraken не найдены.
+      title: Связать счёт Kraken
+      wait_for_sync: Подождите, пока завершится синхронизация с Kraken.
+    setup_accounts:
+      accounts_count:
+        few: Доступно %{count} счёта
+        many: Доступно %{count} счетов
+        one: Доступен %{count} счёт
+        other: Доступно %{count} счёта
+      cancel: Отмена
+      creating: Импортирование...
+      import_selected: Импортировать выбранные
+      instructions: Kraken импортирует одну объединённую учётную запись криптобиржи
+        для этого подключения, только с активами и спотовыми сделками.
+      no_accounts: Все счета Kraken были импортированы.
+      select_all: Выбрать все
+      subtitle: Выберите учётную запись биржи для отслеживания
+      title: Импортировать счёт Kraken
+    update:
+      success: Успешно обновлено подключение к Kraken.
diff --git a/config/locales/views/kraken_items/tr.yml b/config/locales/views/kraken_items/tr.yml
new file mode 100644
index 000000000..5e8ec52c1
--- /dev/null
+++ b/config/locales/views/kraken_items/tr.yml
@@ -0,0 +1,93 @@
+---
+tr:
+  kraken_item:
+    syncer:
+      accounts_need_setup:
+        one: "%{count} hesabın kurulması gerekiyor"
+        other: "%{count} hesabın kurulması gerekiyor"
+      calculating_balances: Bakiyeler hesaplanıyor...
+      checking_configuration: Hesap yapılandırması kontrol ediliyor...
+      checking_credentials: Kimlik bilgileri kontrol ediliyor...
+      credentials_invalid: Geçersiz Kraken API kimlik bilgileri. Lütfen API anahtarınızı
+        ve gizli anahtarınızı kontrol edin.
+      importing_accounts: Kraken'den hesaplar içe aktarılıyor...
+      processing_accounts: Hesap verileri işleniyor...
+  kraken_items:
+    complete_account_setup:
+      no_accounts: İçe aktarılacak hesap yok
+      none_selected: Hesap seçilmedi
+      success:
+        one: "%{count} hesap içe aktarıldı"
+        other: "%{count} hesap içe aktarıldı"
+    create:
+      default_name: Kraken
+      success: Kraken'e başarıyla bağlanıldı. Borsa hesabınız senkronize ediliyor.
+    destroy:
+      success: Kraken bağlantısı silinmek üzere zamanlandı.
+    kraken_item:
+      delete: Sil
+      deletion_in_progress: Siliniyor...
+      import_accounts_menu: Hesabı İçe Aktar
+      no_accounts_message: Kraken borsa hesabınız senkronizasyondan sonra burada görünecek.
+      no_accounts_title: Hesap bulunamadı
+      provider_name: Kraken
+      reconnect: Kimlik bilgilerinin güncellenmesi gerekiyor
+      setup_action: Hesabı İçe Aktar
+      setup_description: Bu Kraken bağlantısını bir Kripto borsa hesabı olarak içe
+        aktarın.
+      setup_needed: Hesap içe aktarılmaya hazır
+      stale_rate_warning: "%{date} tarihi için kesin döviz kuru kullanılamadığından
+        bakiye yaklaşık olarak gösteriliyor. Sonraki senkronizasyonda güncellenecek."
+      status: 'Son senkronizasyon: %{timestamp} önce'
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: 'Son senkronizasyon: %{timestamp} önce - %{summary}'
+      sync_status:
+        all_synced:
+          one: "%{count} hesap senkronize edildi"
+          other: "%{count} hesap senkronize edildi"
+        no_accounts: Hesap bulunamadı
+        partial_sync: "%{linked_count} senkronize edildi, %{unlinked_count} kurulmayı
+          bekliyor"
+      syncing: Senkronize ediliyor...
+    link_accounts:
+      select_connection: Hesapları bağlamadan önce bir Kraken bağlantısı seçin.
+    link_existing_account:
+      errors:
+        invalid_kraken_account: Geçersiz Kraken hesabı
+        kraken_account_already_linked: Bu Kraken hesabı zaten bağlı
+        only_manual: Yalnızca mevcut bir sağlayıcı bağlantısı olmayan manuel Kripto
+          borsa hesapları Kraken'a bağlanabilir
+      select_connection: Hesapları bağlamadan önce bir Kraken bağlantısı seçin.
+      success: Kraken hesabına başarıyla bağlandı
+    provider_connection:
+      default_description: Bir Kraken borsa hesabına bağlanın
+      default_name: Kraken
+      description: "%{name} hesabına bağlan"
+      name: Kraken - %{name}
+    select_accounts:
+      no_credentials_configured: Hesapları kurmadan önce Kraken API kimlik bilgilerinizi
+        ekleyin.
+      select_connection: Sağlayıcı Ayarları'nda bir Kraken bağlantısı seçin.
+    select_existing_account:
+      cancel: İptal
+      check_provider_health: Kraken API kimlik bilgilerinizin geçerli olduğunu kontrol
+        edin.
+      link: Bağla
+      no_accounts_found: Kraken hesabı bulunamadı.
+      title: Kraken Hesabını Bağla
+      wait_for_sync: Kraken senkronizasyonunun tamamlanmasını bekleyin.
+    setup_accounts:
+      accounts_count:
+        one: "%{count} hesap kullanılabilir"
+        other: "%{count} hesap kullanılabilir"
+      cancel: İptal
+      creating: İçe aktarılıyor...
+      import_selected: Seçilenleri İçe Aktar
+      instructions: Kraken, bu bağlantı için yalnızca varlıkları ve spot işlem gerçekleşmelerini
+        içeren tek bir birleşik Kripto borsa hesabını içe aktarır.
+      no_accounts: Tüm Kraken hesapları içe aktarıldı.
+      select_all: Tümünü seç
+      subtitle: İzlenecek borsa hesabını seçin
+      title: Kraken Hesabını İçe Aktar
+    update:
+      success: Kraken bağlantısı başarıyla güncellendi.
diff --git a/config/locales/views/layout/ca.yml b/config/locales/views/layout/ca.yml
index 4d37fa917..33adeab98 100644
--- a/config/locales/views/layout/ca.yml
+++ b/config/locales/views/layout/ca.yml
@@ -10,6 +10,8 @@ ca:
         reports: Informes
         transactions: Transaccions
       privacy_mode: Commuta el mode de privadesa
+      resize_left_sidebar: Redimensiona la barra lateral de comptes
+      resize_right_sidebar: Redimensiona la barra lateral de l'assistent
       skip_to_main: Salta al contingut principal
     auth:
       existing_account: Ja tens un compte?
diff --git a/config/locales/views/layout/en.yml b/config/locales/views/layout/en.yml
index 329138ca4..624de169a 100644
--- a/config/locales/views/layout/en.yml
+++ b/config/locales/views/layout/en.yml
@@ -2,7 +2,10 @@
 en:
   layouts:
     application:
+      insights: Insights
       privacy_mode: Toggle privacy mode
+      resize_left_sidebar: Resize the accounts sidebar
+      resize_right_sidebar: Resize the assistant sidebar
       skip_to_main: Skip to main content
       nav:
         assistant: Assistant
diff --git a/config/locales/views/layout/fr.yml b/config/locales/views/layout/fr.yml
index f27374036..3fb8e8030 100644
--- a/config/locales/views/layout/fr.yml
+++ b/config/locales/views/layout/fr.yml
@@ -2,25 +2,33 @@
 fr:
   layouts:
     application:
-      privacy_mode: Activer/désactiver le mode confidentialité
-      skip_to_main: Aller au contenu principal
+      insights: Analyses
       nav:
         assistant: Assistant
         budgets: Budgets
+        goals: Objectifs
         home: Accueil
         intro: Introduction
         reports: Rapports
         transactions: Transactions
+      privacy_mode: Activer/désactiver le mode confidentialité
+      resize_left_sidebar: Redimensionner la barre latérale des comptes
+      resize_right_sidebar: Redimensionner la barre latérale de l'assistant
+      skip_to_main: Aller au contenu principal
     auth:
       existing_account: Déjà un compte ?
       no_account: Nouveau sur %{product_name} ?
       sign_in: Se connecter
       sign_up: Créer un compte
     shared:
+      confirm_dialog:
+        are_you_sure: Êtes-vous sûr?
+        cannot_be_undone: Cette action ne peut pas être annulée.
+        confirm: Confirmer
       footer:
         privacy_policy: Politique de confidentialité
         terms_of_service: Conditions d'utilisation
     trial:
-      open_demo: Démo ouverte
+      contribute: Contribuer
       data_deleted_in_days: Les données seront supprimées dans %{days} jours
-      contribute: Contribuer
\ No newline at end of file
+      open_demo: Démo ouverte
diff --git a/config/locales/views/layout/it.yml b/config/locales/views/layout/it.yml
new file mode 100644
index 000000000..43917096f
--- /dev/null
+++ b/config/locales/views/layout/it.yml
@@ -0,0 +1,32 @@
+---
+it:
+  layouts:
+    application:
+      privacy_mode: Attiva/disattiva modalità privacy
+      resize_left_sidebar: Ridimensiona la barra laterale dei conti
+      resize_right_sidebar: Ridimensiona la barra laterale dell'assistente
+      skip_to_main: Vai al contenuto principale
+      nav:
+        assistant: Assistente
+        budgets: Budget
+        home: Home
+        reports: Rapporti
+        goals: Obiettivi
+        transactions: Transazioni
+    auth:
+      existing_account: Hai già un account?
+      no_account: Nuovo su %{product_name}?
+      sign_in: Accedi
+      sign_up: Crea account
+    shared:
+      footer:
+        privacy_policy: Informativa sulla privacy
+        terms_of_service: Termini di servizio
+      confirm_dialog:
+        are_you_sure: Sei sicuro?
+        cannot_be_undone: Questa azione non può essere annullata.
+        confirm: Conferma
+    trial:
+      open_demo: Apri demo
+      data_deleted_in_days: Dati eliminati tra %{days} giorni
+      contribute: Contribuisci
diff --git a/config/locales/views/layout/ru.yml b/config/locales/views/layout/ru.yml
new file mode 100644
index 000000000..b0bdafec2
--- /dev/null
+++ b/config/locales/views/layout/ru.yml
@@ -0,0 +1,32 @@
+---
+ru:
+  layouts:
+    application:
+      nav:
+        assistant: Ассистент
+        budgets: Бюджеты
+        goals: Цели
+        home: Главная
+        reports: Отчёты
+        transactions: Операции
+      privacy_mode: Переключить режим конфиденциальности
+      resize_left_sidebar: Изменить ширину боковой панели счетов
+      resize_right_sidebar: Изменить ширину боковой панели ассистента
+      skip_to_main: Перейти к основному содержимому
+    auth:
+      existing_account: Уже есть аккаунт?
+      no_account: Впервые в %{product_name}?
+      sign_in: Войти
+      sign_up: Создать аккаунт
+    shared:
+      confirm_dialog:
+        are_you_sure: Вы уверены?
+        cannot_be_undone: Это действие нельзя отменить.
+        confirm: Подтвердить
+      footer:
+        privacy_policy: Политика конфиденциальности
+        terms_of_service: Условия использования
+    trial:
+      contribute: Внести вклад
+      data_deleted_in_days: Данные будут удалены через %{days} дней
+      open_demo: Открыть демо
diff --git a/config/locales/views/layout/tr.yml b/config/locales/views/layout/tr.yml
index 65cd21fc2..6dbea3604 100644
--- a/config/locales/views/layout/tr.yml
+++ b/config/locales/views/layout/tr.yml
@@ -2,25 +2,33 @@
 tr:
   layouts:
     application:
-      privacy_mode: Gizlilik modunu değiştir
-      skip_to_main: Ana içeriğe atla
+      insights: İçgörüler
       nav:
         assistant: Asistan
         budgets: Bütçeler
+        goals: Hedefler
         home: Ana Sayfa
         intro: Giriş
         reports: Raporlar
         transactions: İşlemler
+      privacy_mode: Gizlilik modunu değiştir
+      resize_left_sidebar: Hesaplar kenar çubuğunu yeniden boyutlandır
+      resize_right_sidebar: Asistan kenar çubuğunu yeniden boyutlandır
+      skip_to_main: Ana içeriğe atla
     auth:
       existing_account: Zaten bir hesabınız var mı?
       no_account: "%{product_name}'ye yeni misiniz?"
       sign_in: Giriş yap
       sign_up: Hesap oluştur
     shared:
+      confirm_dialog:
+        are_you_sure: Emin misiniz?
+        cannot_be_undone: Bu işlem geri alınamaz.
+        confirm: Onayla
       footer:
         privacy_policy: Gizlilik Politikası
         terms_of_service: Hizmet Şartları
     trial:
-      open_demo: Açık demo
+      contribute: Katkıda bulun
       data_deleted_in_days: Veriler %{days} gün içinde silinecek
-      contribute: Katkıda bulun
\ No newline at end of file
+      open_demo: Açık demo
diff --git a/config/locales/views/layout/zh-CN.yml b/config/locales/views/layout/zh-CN.yml
index 0ba8206e7..46d31614b 100644
--- a/config/locales/views/layout/zh-CN.yml
+++ b/config/locales/views/layout/zh-CN.yml
@@ -11,6 +11,7 @@ zh-CN:
         intro: 介绍
         reports: 报表
         transactions: 交易
+        goals: 目标
     auth:
       existing_account: 已经有账户？
       no_account: 新加入 %{product_name}？
diff --git a/config/locales/views/loans/fr.yml b/config/locales/views/loans/fr.yml
index fb3d14b0e..fd82d5a6f 100644
--- a/config/locales/views/loans/fr.yml
+++ b/config/locales/views/loans/fr.yml
@@ -4,22 +4,34 @@ fr:
     edit:
       edit: Modifier %{account}
     form:
+      initial_balance: Solde initial du prêt
       interest_rate: Taux d'intérêt
       interest_rate_placeholder: '5,25'
-      initial_balance: Solde initial du prêt
+      none: Aucun
       rate_type: Type de taux
+      subtype_none: Aucun
+      subtype_prompt: Sélectionner le type de prêt
       term_months: Durée (mois)
       term_months_placeholder: '360'
-      subtype_prompt: Sélectionner le type de prêt
-      subtype_none: Aucun
     new:
       title: Saisir les détails du prêt
     overview:
       interest_rate: Taux d'intérêt
       monthly_payment: Paiement mensuel
-      not_applicable: N/A
+      not_applicable: N/D
       original_principal: Principal initial
       remaining_principal: Principal restant
       term: Durée
       type: Type
       unknown: Inconnu
+    tabs:
+      overview:
+        edit_loan_details: Modifier les détails du prêt
+        interest_rate: Taux d'intérêt
+        monthly_payment: Paiement mensuel
+        not_applicable: N/D
+        original_principal: Capital d'origine
+        remaining_principal: Capital restant
+        term: Durée
+        type: Type
+        unknown: Inconnu
diff --git a/config/locales/views/loans/it.yml b/config/locales/views/loans/it.yml
new file mode 100644
index 000000000..446928194
--- /dev/null
+++ b/config/locales/views/loans/it.yml
@@ -0,0 +1,37 @@
+---
+it:
+  loans:
+    edit:
+      edit: Modifica %{account}
+    form:
+      interest_rate: Tasso di interesse
+      interest_rate_placeholder: '5.25'
+      initial_balance: Capitale originale del prestito
+      rate_type: Tipo di tasso
+      term_months: Durata (mesi)
+      term_months_placeholder: '360'
+      none: Nessuno
+      subtype_prompt: Seleziona tipo di prestito
+      subtype_none: Nessuno
+    new:
+      title: Inserisci i dettagli del prestito
+    overview:
+      interest_rate: Tasso di Interesse
+      monthly_payment: Rata Mensile
+      not_applicable: N/A
+      original_principal: Capitale Originale
+      remaining_principal: Capitale Residuo
+      term: Durata
+      type: Tipo
+      unknown: Sconosciuto
+    tabs:
+      overview:
+        interest_rate: Tasso di Interesse
+        monthly_payment: Rata Mensile
+        not_applicable: N/A
+        original_principal: Capitale Originale
+        remaining_principal: Capitale Residuo
+        term: Durata
+        type: Tipo
+        unknown: Sconosciuto
+        edit_loan_details: "Modifica dettagli prestito"
diff --git a/config/locales/views/loans/ru.yml b/config/locales/views/loans/ru.yml
new file mode 100644
index 000000000..8d2e7e898
--- /dev/null
+++ b/config/locales/views/loans/ru.yml
@@ -0,0 +1,37 @@
+---
+ru:
+  loans:
+    edit:
+      edit: Редактировать %{account}
+    form:
+      initial_balance: Первоначальная сумма кредита
+      interest_rate: Процентная ставка
+      interest_rate_placeholder: '5.25'
+      none: Нет
+      rate_type: Тип ставки
+      subtype_none: Нет
+      subtype_prompt: Выберите тип кредита
+      term_months: Срок (месяцы)
+      term_months_placeholder: '360'
+    new:
+      title: Введите детали кредита
+    overview:
+      interest_rate: Процентная ставка
+      monthly_payment: Ежемесячный платёж
+      not_applicable: Н/Д
+      original_principal: Первоначальная сумма
+      remaining_principal: Остаток по кредиту
+      term: Срок
+      type: Тип
+      unknown: Неизвестно
+    tabs:
+      overview:
+        edit_loan_details: Редактировать детали кредита
+        interest_rate: Процентная ставка
+        monthly_payment: Ежемесячный платёж
+        not_applicable: Н/Д
+        original_principal: Первоначальная сумма
+        remaining_principal: Остаток по кредиту
+        term: Срок
+        type: Тип
+        unknown: Неизвестно
diff --git a/config/locales/views/loans/tr.yml b/config/locales/views/loans/tr.yml
index 34fab49a5..fa0acf202 100644
--- a/config/locales/views/loans/tr.yml
+++ b/config/locales/views/loans/tr.yml
@@ -4,20 +4,34 @@ tr:
     edit:
       edit: "%{account} düzenle"
     form:
-      interest_rate: "Faiz oranı"
+      initial_balance: Orijinal kredi bakiyesi
+      interest_rate: Faiz oranı
       interest_rate_placeholder: '5.25'
-      initial_balance: "Orijinal kredi bakiyesi"
-      rate_type: "Oran türü"
-      term_months: "Vade (ay)"
+      none: Yok
+      rate_type: Oran türü
+      subtype_none: Yok
+      subtype_prompt: Kredi türünü seçin
+      term_months: Vade (ay)
       term_months_placeholder: '360'
     new:
-      title: "Kredi detaylarını girin"
+      title: Kredi detaylarını girin
     overview:
-      interest_rate: "Faiz Oranı"
-      monthly_payment: "Aylık Ödeme"
-      not_applicable: "Uygulanamaz"
-      original_principal: "Orijinal Anapara"
-      remaining_principal: "Kalan Anapara"
-      term: "Vade"
-      type: "Tür"
-      unknown: "Bilinmiyor"
\ No newline at end of file
+      interest_rate: Faiz Oranı
+      monthly_payment: Aylık Ödeme
+      not_applicable: Uygulanamaz
+      original_principal: Orijinal Anapara
+      remaining_principal: Kalan Anapara
+      term: Vade
+      type: Tür
+      unknown: Bilinmiyor
+    tabs:
+      overview:
+        edit_loan_details: Kredi detaylarını düzenle
+        interest_rate: Faiz Oranı
+        monthly_payment: Aylık Ödeme
+        not_applicable: Yok
+        original_principal: Orijinal Anapara
+        remaining_principal: Kalan Anapara
+        term: Vade
+        type: Tür
+        unknown: Bilinmiyor
diff --git a/config/locales/views/loans/zh-CN.yml b/config/locales/views/loans/zh-CN.yml
index 0a8353fc7..16f3e6015 100644
--- a/config/locales/views/loans/zh-CN.yml
+++ b/config/locales/views/loans/zh-CN.yml
@@ -10,6 +10,9 @@ zh-CN:
       rate_type: 利率类型
       term_months: 期限（月）
       term_months_placeholder: '360'
+      none: 无
+      subtype_prompt: 选择贷款类型
+      subtype_none: 无
     new:
       title: 请输入贷款详情
     overview:
@@ -31,3 +34,4 @@ zh-CN:
         term: 期限
         type: 类型
         unknown: 未知
+        edit_loan_details: 编辑贷款详情
diff --git a/config/locales/views/lunchflow_items/fr.yml b/config/locales/views/lunchflow_items/fr.yml
index f01bf47ae..ea41f2334 100644
--- a/config/locales/views/lunchflow_items/fr.yml
+++ b/config/locales/views/lunchflow_items/fr.yml
@@ -1,30 +1,59 @@
 ---
 fr:
   lunchflow_items:
+    api_error:
+      check_provider_settings: Vérifier les paramètres du fournisseur
+      common_issues: 'Problèmes courants :'
+      expired_credentials_desc: Générer une nouvelle clé API à partir de Lunch Flow
+      expired_credentials_label: Identifiants expirés
+      invalid_api_key_desc: Vérifiez votre clé API dans les paramètres du fournisseur
+      invalid_api_key_label: Clé API invalide
+      network_issue_desc: Vérifiez votre connexion Internet
+      network_issue_label: Problème de réseau
+      service_down_desc: L'API Lunch Flow peut être temporairement indisponible
+      service_down_label: Service en panne
+      title: Erreur de connexion au flux de déjeuner
+      unable_to_connect: Impossible de se connecter à Lunch Flow
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      creation_failed: 'Échec de la création des comptes : %{error}'
+      no_accounts: Aucun compte à configurer.
+      success: "%{count} compte(s) créé(s) avec succès."
     create:
       success: Connexion Lunch Flow créée avec succès
     destroy:
       success: Connexion Lunch Flow supprimée
     index:
       title: Connexions Lunch Flow
-    loading:
-      loading_message: Chargement des comptes Lunch Flow...
-      loading_title: Chargement
     link_accounts:
       all_already_linked:
-        one: "Le compte sélectionné (%{names}) est déjà lié"
-        other: "Les %{count} comptes sélectionnés sont déjà liés : %{names}"
-      api_error: "Erreur API : %{message}"
+        one: Le compte sélectionné (%{names}) est déjà lié
+        other: 'Les %{count} comptes sélectionnés sont déjà liés : %{names}'
+      api_error: 'Erreur API : %{message}'
       invalid_account_names:
-        one: "Impossible de lier un compte sans nom"
-        other: "Impossible de lier %{count} comptes sans nom"
+        one: Impossible de lier un compte sans nom
+        other: Impossible de lier %{count} comptes sans nom
       link_failed: Échec de la liaison des comptes
       no_accounts_selected: Veuillez sélectionner au moins un compte
-      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count} étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
-      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count} compte(s) étaient déjà liés : %{already_linked_names}"
+      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count}
+        étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
+      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count}
+        compte(s) étaient déjà liés : %{already_linked_names}"
       success:
         one: "%{count} compte lié avec succès"
         other: "%{count} comptes liés avec succès"
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      api_error: 'Erreur API : %{message}'
+      invalid_account_name: Impossible de lier un compte sans nom
+      lunchflow_account_already_linked: Ce compte Lunch Flow est déjà lié à un autre
+        compte
+      lunchflow_account_not_found: Compte Lunch Flow introuvable
+      missing_parameters: Paramètres requis manquants
+      success: "%{account_name} lié avec succès à Lunch Flow"
+    loading:
+      loading_message: Chargement des comptes Lunch Flow...
+      loading_title: Chargement
     lunchflow_item:
       accounts_need_setup: Des comptes doivent être configurés
       delete: Supprimer la connexion
@@ -33,110 +62,122 @@ fr:
       no_accounts_description: Cette connexion n'a pas encore de comptes liés.
       no_accounts_title: Aucun compte
       setup_action: Configurer les nouveaux comptes
-      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types de compte pour vos comptes Lunch Flow nouvellement importés."
+      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types
+        de compte pour vos comptes Lunch Flow nouvellement importés."
       setup_needed: Nouveaux comptes prêts à être configurés
-      status: "Synchronisé il y a %{timestamp}"
+      status: Synchronisé il y a %{timestamp}
       status_never: Jamais synchronisé
-      status_with_summary: "Dernière synchronisation il y a %{timestamp} • %{summary}"
+      status_with_summary: Dernière synchronisation il y a %{timestamp} • %{summary}
       syncing: Synchronisation...
       total: Total
       unlinked: Non lié
     select_accounts:
       accounts_selected: comptes sélectionnés
-      api_error: "Erreur API : %{message}"
+      api_error: 'Erreur API : %{message}'
       cancel: Annuler
-      configure_name_in_lunchflow: Impossible d'importer - veuillez configurer le nom du compte dans Lunchflow
-      description: Sélectionnez les comptes que vous souhaitez lier à votre compte %{product_name}.
+      configure_name_in_lunchflow: Impossible d'importer - veuillez configurer le
+        nom du compte dans Lunchflow
+      description: Sélectionnez les comptes que vous souhaitez lier à votre compte
+        %{product_name}.
       link_accounts: Lier les comptes sélectionnés
-      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de votre clé API.
-      no_api_key: La clé API Lunch Flow n'est pas configurée. Veuillez la configurer dans les Paramètres.
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de
+        votre clé API.
+      no_api_key: La clé API Lunch Flow n'est pas configurée. Veuillez la configurer
+        dans les Paramètres.
       no_name_placeholder: "(Sans nom)"
       title: Sélectionner les comptes Lunch Flow
     select_existing_account:
       account_already_linked: Ce compte est déjà lié à un fournisseur
       all_accounts_already_linked: Tous les comptes Lunch Flow sont déjà liés
-      api_error: "Erreur API : %{message}"
+      api_error: 'Erreur API : %{message}'
       cancel: Annuler
-      configure_name_in_lunchflow: Impossible d'importer - veuillez configurer le nom du compte dans Lunchflow
-      description: Sélectionnez un compte Lunch Flow à lier avec ce compte. Les transactions seront synchronisées et dédupliquées automatiquement.
+      configure_name_in_lunchflow: Impossible d'importer - veuillez configurer le
+        nom du compte dans Lunchflow
+      description: Sélectionnez un compte Lunch Flow à lier avec ce compte. Les transactions
+        seront synchronisées et dédupliquées automatiquement.
       link_account: Lier le compte
       no_account_specified: Aucun compte spécifié
-      no_accounts_found: Aucun compte Lunch Flow trouvé. Veuillez vérifier la configuration de votre clé API.
-      no_api_key: La clé API Lunch Flow n'est pas configurée. Veuillez la configurer dans les Paramètres.
+      no_accounts_found: Aucun compte Lunch Flow trouvé. Veuillez vérifier la configuration
+        de votre clé API.
+      no_api_key: La clé API Lunch Flow n'est pas configurée. Veuillez la configurer
+        dans les Paramètres.
       no_name_placeholder: "(Sans nom)"
-      title: "Lier %{account_name} avec Lunch Flow"
-    link_existing_account:
-      account_already_linked: Ce compte est déjà lié à un fournisseur
-      api_error: "Erreur API : %{message}"
-      invalid_account_name: Impossible de lier un compte sans nom
-      lunchflow_account_already_linked: Ce compte Lunch Flow est déjà lié à un autre compte
-      lunchflow_account_not_found: Compte Lunch Flow introuvable
-      missing_parameters: Paramètres requis manquants
-      success: "%{account_name} lié avec succès à Lunch Flow"
+      title: Lier %{account_name} avec Lunch Flow
     setup_accounts:
-      account_type_label: "Type de compte :"
-      all_accounts_linked: "Tous vos comptes Lunch Flow ont déjà été configurés."
-      api_error: "Erreur API : %{message}"
-      fetch_failed: "Échec de la récupération des comptes"
-      no_accounts_to_setup: "Aucun compte à configurer"
-      no_api_key: "La clé API Lunch Flow n'est pas configurée. Veuillez vérifier les paramètres de connexion."
+      account_type_label: 'Type de compte :'
       account_types:
-        skip: Ignorer ce compte
-        depository: Compte courant ou épargne
         credit_card: Carte de crédit
+        depository: Compte courant ou épargne
         investment: Compte d'investissement
         loan: Prêt ou hypothèque
         other_asset: Autre actif
-      subtype_labels:
-        depository: "Sous-type de compte :"
-        credit_card: ""
-        investment: "Type d'investissement :"
-        loan: "Type de prêt :"
-        other_asset: ""
-      subtype_messages:
-        credit_card: "Les cartes de crédit seront automatiquement configurées comme comptes de carte de crédit."
-        other_asset: "Aucune option supplémentaire nécessaire pour les autres actifs."
-      subtypes:
-        depository:
-          checking: Compte courant
-          savings: Compte épargne
-          hsa: Compte épargne santé
-          cd: Certificat de dépôt
-          money_market: Compte du marché monétaire
-        investment:
-          brokerage: Courtage
-          pension: Pension
-          retirement: Retraite
-          "401k": "401(k)"
-          roth_401k: "Roth 401(k)"
-          "403b": "403(b)"
-          tsp: Plan d'épargne Thrift
-          "529_plan": "Plan 529"
-          hsa: Compte épargne santé
-          mutual_fund: Fonds commun de placement
-          ira: IRA traditionnel
-          roth_ira: Roth IRA
-          angel: Investissement providentiel
-        loan:
-          mortgage: Hypothèque
-          student: Prêt étudiant
-          auto: Prêt auto
-          other: Autre prêt
+        skip: Ignorer ce compte
+      all_accounts_linked: Tous vos comptes Lunch Flow ont déjà été configurés.
+      api_error: 'Erreur API : %{message}'
       balance: Solde
       cancel: Annuler
-      choose_account_type: "Choisissez le type de compte correct pour chaque compte Lunch Flow :"
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        Lunch Flow :'
       create_accounts: Créer les comptes
       creating_accounts: Création des comptes...
-      historical_data_range: "Plage de données historiques :"
+      fetch_failed: Échec de la récupération des comptes
+      historical_data_range: 'Plage de données historiques :'
+      no_accounts_to_setup: Aucun compte à configurer
+      no_api_key: La clé API Lunch Flow n'est pas configurée. Veuillez vérifier les
+        paramètres de connexion.
       subtitle: Choisissez les types de compte corrects pour vos comptes importés
-      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique des transactions. Maximum 3 ans d'historique disponible.
-      sync_start_date_label: "Commencer la synchronisation des transactions à partir de :"
+      subtype_labels:
+        credit_card: ''
+        depository: 'Sous-type de compte :'
+        investment: 'Type d''investissement :'
+        loan: 'Type de prêt :'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Les cartes de crédit seront automatiquement configurées comme
+          comptes de carte de crédit.
+        other_asset: Aucune option supplémentaire nécessaire pour les autres actifs.
+      subtypes:
+        depository:
+          cd: Certificat de dépôt
+          checking: Compte courant
+          hsa: Compte épargne santé
+          money_market: Compte du marché monétaire
+          savings: Compte épargne
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: Plan 529
+          angel: Investissement providentiel
+          brokerage: Courtage
+          hsa: Compte épargne santé
+          ira: IRA traditionnel
+          mutual_fund: Fonds commun de placement
+          pension: Pension
+          retirement: Retraite
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Plan d'épargne Thrift
+        loan:
+          auto: Prêt auto
+          mortgage: Hypothèque
+          other: Autre prêt
+          student: Prêt étudiant
+      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions. Maximum 3 ans d'historique disponible.
+      sync_start_date_label: 'Commencer la synchronisation des transactions à partir
+        de :'
       title: Configurer vos comptes Lunch Flow
-    complete_account_setup:
-      all_skipped: "Tous les comptes ont été ignorés. Aucun compte n'a été créé."
-      creation_failed: "Échec de la création des comptes : %{error}"
-      no_accounts: "Aucun compte à configurer."
-      success: "%{count} compte(s) créé(s) avec succès."
+    setup_required:
+      api_key_description: Avant de pouvoir lier des comptes Lunch Flow, vous devez
+        configurer votre clé API Lunch Flow.
+      api_key_not_configured: Clé API non configurée
+      go_to_provider_settings: Accédez aux paramètres du fournisseur
+      setup_step_1_html: Accédez à <strong>Paramètres → Fournisseurs</strong>.
+      setup_step_2_html: Recherchez la section <strong>Lunch Flow</strong>
+      setup_step_3: Entrez votre clé API Lunch Flow
+      setup_step_4: Revenez ici pour lier vos comptes
+      setup_steps_title: 'Étapes de configuration :'
+      title: Configuration du flux de déjeuner requise
     sync:
       success: Synchronisation démarrée
     update:
diff --git a/config/locales/views/lunchflow_items/it.yml b/config/locales/views/lunchflow_items/it.yml
new file mode 100644
index 000000000..b1a3b87ec
--- /dev/null
+++ b/config/locales/views/lunchflow_items/it.yml
@@ -0,0 +1,166 @@
+---
+it:
+  lunchflow_items:
+    api_error:
+      title: Errore di connessione Lunch Flow
+      unable_to_connect: Impossibile connettersi a Lunch Flow
+      common_issues: "Problemi comuni:"
+      invalid_api_key_label: Chiave API non valida
+      invalid_api_key_desc: Controlla la tua chiave API nelle Impostazioni provider
+      expired_credentials_label: Credenziali scadute
+      expired_credentials_desc: Genera una nuova chiave API da Lunch Flow
+      network_issue_label: Problema di rete
+      network_issue_desc: Controlla la tua connessione internet
+      service_down_label: Servizio non disponibile
+      service_down_desc: L'API di Lunch Flow potrebbe essere temporaneamente non disponibile
+      check_provider_settings: Controlla Impostazioni provider
+    setup_required:
+      title: Configurazione Lunch Flow richiesta
+      api_key_not_configured: Chiave API non configurata
+      api_key_description: Prima di poter collegare i conti Lunch Flow, devi configurare la tua chiave API Lunch Flow.
+      setup_steps_title: "Passi di configurazione:"
+      setup_step_1_html: "Vai su <strong>Impostazioni → Provider</strong>"
+      setup_step_2_html: "Trova la sezione <strong>Lunch Flow</strong>"
+      setup_step_3: Inserisci la tua chiave API Lunch Flow
+      setup_step_4: Torna qui per collegare i tuoi conti
+      go_to_provider_settings: Vai alle Impostazioni provider
+    create:
+      success: Connessione Lunch Flow creata con successo
+    destroy:
+      success: Connessione Lunch Flow rimossa
+    index:
+      title: Connessioni Lunch Flow
+    loading:
+      loading_message: Caricamento conti Lunch Flow...
+      loading_title: Caricamento
+    link_accounts:
+      all_already_linked:
+        one: "Il conto selezionato (%{names}) è già collegato"
+        other: "Tutti i %{count} conti selezionati sono già collegati: %{names}"
+      api_error: "Errore API: %{message}"
+      invalid_account_names:
+        one: "Impossibile collegare un conto senza nome"
+        other: "Impossibile collegare %{count} conti senza nome"
+      link_failed: Collegamento conti fallito
+      no_accounts_selected: Seleziona almeno un conto
+      partial_invalid: "Collegati con successo %{created_count} conto/i, %{already_linked_count} erano già collegati, %{invalid_count} conto/i aveva nomi non validi"
+      partial_success: "Collegati con successo %{created_count} conto/i. %{already_linked_count} conto/i erano già collegati: %{already_linked_names}"
+      success:
+        one: "Collegato con successo %{count} conto"
+        other: "Collegati con successo %{count} conti"
+    lunchflow_item:
+      accounts_need_setup: I conti devono essere configurati
+      delete: Elimina connessione
+      deletion_in_progress: eliminazione in corso...
+      error: Errore
+      no_accounts_description: Questa connessione non ha ancora conti collegati.
+      no_accounts_title: Nessun conto
+      setup_action: Configura nuovi conti
+      setup_description: "%{linked} di %{total} conti collegati. Scegli i tipi di conto per i tuoi nuovi conti Lunch Flow importati."
+      setup_needed: Nuovi conti pronti per la configurazione
+      status: "Sincronizzato %{timestamp} fa"
+      status_never: Mai sincronizzato
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa • %{summary}"
+      syncing: Sincronizzazione in corso...
+      total: Totale
+      unlinked: Non collegati
+    select_accounts:
+      accounts_selected: conti selezionati
+      api_error: "Errore API: %{message}"
+      cancel: Annulla
+      configure_name_in_lunchflow: Impossibile importare - configura il nome del conto in Lunchflow
+      description: Seleziona i conti che vuoi collegare al tuo account %{product_name}.
+      link_accounts: Collega i conti selezionati
+      no_accounts_found: Nessun conto trovato. Controlla la configurazione della tua chiave API.
+      no_api_key: La chiave API di Lunch Flow non è configurata. Configurala nelle Impostazioni.
+      no_name_placeholder: "(Nessun nome)"
+      title: Seleziona conti Lunch Flow
+    select_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      all_accounts_already_linked: Tutti i conti Lunch Flow sono già collegati
+      api_error: "Errore API: %{message}"
+      cancel: Annulla
+      configure_name_in_lunchflow: Impossibile importare - configura il nome del conto in Lunchflow
+      description: Seleziona un conto Lunch Flow da collegare a questo conto. Le transazioni verranno sincronizzate e deduplicate automaticamente.
+      link_account: Collega conto
+      no_account_specified: Nessun conto specificato
+      no_accounts_found: Nessun conto Lunch Flow trovato. Controlla la configurazione della tua chiave API.
+      no_api_key: La chiave API di Lunch Flow non è configurata. Configurala nelle Impostazioni.
+      no_name_placeholder: "(Nessun nome)"
+      title: "Collega %{account_name} con Lunch Flow"
+    link_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      api_error: "Errore API: %{message}"
+      invalid_account_name: Impossibile collegare un conto senza nome
+      lunchflow_account_already_linked: Questo conto Lunch Flow è già collegato a un altro conto
+      lunchflow_account_not_found: Conto Lunch Flow non trovato
+      missing_parameters: Parametri obbligatori mancanti
+      success: "Collegato con successo %{account_name} con Lunch Flow"
+    setup_accounts:
+      account_type_label: "Tipo di conto:"
+      all_accounts_linked: "Tutti i tuoi conti Lunch Flow sono già stati configurati."
+      api_error: "Errore API: %{message}"
+      fetch_failed: "Recupero conti fallito"
+      no_accounts_to_setup: "Nessun conto da configurare"
+      no_api_key: "La chiave API di Lunch Flow non è configurata. Controlla le impostazioni di connessione."
+      account_types:
+        skip: Salta questo conto
+        depository: Conto corrente o risparmio
+        credit_card: Carta di credito
+        investment: Conto investimento
+        loan: Prestito o mutuo
+        other_asset: Altro asset
+      subtype_labels:
+        depository: "Sottotipo conto:"
+        credit_card: ""
+        investment: "Tipo di investimento:"
+        loan: "Tipo di prestito:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Le carte di credito verranno configurate automaticamente come conti carta di credito."
+        other_asset: "Nessuna opzione aggiuntiva necessaria per gli altri asset."
+      subtypes:
+        depository:
+          checking: Conto corrente
+          savings: Conto risparmio
+          hsa: Conto risparmio sanitario
+          cd: Certificato di deposito
+          money_market: Mercato monetario
+        investment:
+          brokerage: Brokerage
+          pension: Pensione
+          retirement: Pensionamento
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Piano di risparmio thrift
+          "529_plan": "Piano 529"
+          hsa: Conto risparmio sanitario
+          mutual_fund: Fondo comune
+          ira: IRA tradizionale
+          roth_ira: Roth IRA
+          angel: Angel
+        loan:
+          mortgage: Mutuo
+          student: Prestito studentesco
+          auto: Prestito auto
+          other: Altro prestito
+      balance: Saldo
+      cancel: Annulla
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto Lunch Flow:"
+      create_accounts: Crea conti
+      creating_accounts: Creazione conti in corso...
+      historical_data_range: "Intervallo dati storici:"
+      subtitle: Scegli i tipi di conto corretti per i conti importati
+      sync_start_date_help: Seleziona quanto indietro vuoi sincronizzare la cronologia delle transazioni. Massimo 3 anni di cronologia disponibile.
+      sync_start_date_label: "Inizia la sincronizzazione delle transazioni dal:"
+      title: Configura i tuoi conti Lunch Flow
+    complete_account_setup:
+      all_skipped: "Tutti i conti sono stati saltati. Nessun conto è stato creato."
+      creation_failed: "Creazione conti fallita: %{error}"
+      no_accounts: "Nessun conto da configurare."
+      success: "Creati con successo %{count} conto/i."
+    sync:
+      success: Sincronizzazione avviata
+    update:
+      success: Connessione Lunch Flow aggiornata
diff --git a/config/locales/views/lunchflow_items/ru.yml b/config/locales/views/lunchflow_items/ru.yml
new file mode 100644
index 000000000..29a7fe346
--- /dev/null
+++ b/config/locales/views/lunchflow_items/ru.yml
@@ -0,0 +1,190 @@
+---
+ru:
+  lunchflow_items:
+    api_error:
+      check_provider_settings: Проверьте настройки провайдера
+      common_issues: 'Возможные проблемы:'
+      expired_credentials_desc: Сгенерируйте новый API-ключ в Lunch Flow
+      expired_credentials_label: Истекшие учетные данные
+      invalid_api_key_desc: Проверьте ваш API-ключ в настройках провайдера
+      invalid_api_key_label: Неверный API-ключ
+      network_issue_desc: Проверьте ваше интернет-соединение
+      network_issue_label: Проблема с сетью
+      service_down_desc: API Lunch Flow может быть временно недоступен
+      service_down_label: Сервис недоступен
+      title: Ошибка подключения Lunch Flow
+      unable_to_connect: Не удалось подключиться к Lunch Flow
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Счета не были созданы.
+      creation_failed: 'Не удалось создать счета: %{error}'
+      no_accounts: Нет счетов для настройки.
+      success: Успешно создано %{count} счёт(а).
+    create:
+      success: Подключение к Lunch Flow успешно создано
+    destroy:
+      success: Подключение к Lunch Flow удалено
+    index:
+      title: Подключения Lunch Flow
+    link_accounts:
+      all_already_linked:
+        few: "%{count} выбранных счёта уже связаны: %{names}"
+        many: "%{count} выбранных счетов уже связаны: %{names}"
+        one: Выбранный счёт (%{names}) уже связан
+        other: "%{count} выбранных счёта уже связаны: %{names}"
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_names:
+        few: Невозможно связать %{count} счёта с пустыми именами
+        many: Невозможно связать %{count} счетов с пустыми именами
+        one: Невозможно связать счёт с пустым именем
+        other: Невозможно связать %{count} счёта с пустыми именами
+      link_failed: Не удалось связать счета
+      no_accounts_selected: Пожалуйста, выберите хотя бы один счёт
+      no_api_key: Не настроен API-ключ
+      partial_invalid: Успешно связаны %{created_count} счёт(а), %{already_linked_count}
+        уже были связаны, %{invalid_count} счёт(а) имели недопустимые имена
+      partial_success: 'Успешно связаны %{created_count} счёт(а). %{already_linked_count}
+        счёт(а) уже были связаны: %{already_linked_names}'
+      success:
+        few: Успешно связаны %{count} счёта
+        many: Успешно связано %{count} счетов
+        one: Успешно связан %{count} счёт
+        other: Успешно связаны %{count} счёта
+    link_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_name: Невозможно связать счёт с пустым именем
+      lunchflow_account_already_linked: Этот счёт Lunch Flow уже связан с другим счётом
+      lunchflow_account_not_found: Счёт Lunch Flow не найден
+      missing_parameters: Отсутствуют необходимые параметры
+      no_api_key: Не настроен API-ключ
+      success: Успешно связан %{account_name} с Lunch Flow
+    loading:
+      loading_message: Загрузка счетов Lunch Flow...
+      loading_title: Загрузка
+    lunchflow_item:
+      accounts_need_setup: Требуется настройка счетов
+      delete: Удалить подключение
+      deletion_in_progress: удаление в процессе...
+      error: Ошибка
+      no_accounts_description: Это подключение пока не имеет связанных счетов.
+      no_accounts_title: Нет счетов
+      setup_action: Настроить новые счета
+      setup_description: "%{linked} из %{total} счетов связаны. Выберите типы счетов
+        для ваших новых импортированных счетов Lunch Flow."
+      setup_needed: Новые счета готовы к настройке
+      status: Синхронизировано %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад • %{summary}
+      syncing: Синхронизация...
+      total: Всего
+      unlinked: Несвязанные
+    select_accounts:
+      accounts_selected: счетов выбрано
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_lunchflow: Невозможно импортировать - пожалуйста, настройте
+        имя счёта в Lunch Flow
+      description: Выберите счета, которые вы хотите связать с вашим счётом %{product_name}.
+      link_accounts: Связать выбранные счета
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте конфигурацию вашего
+        API-ключа.
+      no_api_key: API-ключ Lunch Flow не настроен. Пожалуйста, настройте его в Настройках.
+      no_credentials_configured: Сначала настройте API-ключ Lunch Flow в настройках
+        провайдеров.
+      no_name_placeholder: "(Без имени)"
+      title: Выберите счета Lunch Flow
+    select_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      all_accounts_already_linked: Все счета Lunch Flow уже связаны
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_lunchflow: Невозможно импортировать - пожалуйста, настройте
+        имя счёта в Lunchflow
+      description: Выберите счёт Lunch Flow для связи с этим счётом. Операции будут
+        синхронизированы и дубли удалены автоматически.
+      link_account: Связать счёт
+      no_account_specified: Счёт не указан
+      no_accounts_found: Счета Lunch Flow не найдены. Пожалуйста, проверьте конфигурацию
+        вашего API-ключа.
+      no_api_key: API-ключ Lunch Flow не настроен. Пожалуйста, настройте его в Настройках.
+      no_credentials_configured: Сначала настройте API-ключ Lunch Flow в настройках
+        провайдеров.
+      no_name_placeholder: "(Без имени)"
+      title: Связать %{account_name} с Lunch Flow
+    setup_accounts:
+      account_type_label: 'Тип счёта:'
+      account_types:
+        credit_card: Кредитная карта
+        depository: Текущий или сберегательный счёт
+        investment: Инвестиционный счёт
+        loan: Кредит или ипотека
+        other_asset: Другой актив
+        skip: Пропустить этот счёт
+      all_accounts_linked: Все ваши счета Lunch Flow уже настроены.
+      api_error: 'Ошибка API: %{message}'
+      balance: Баланс
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип счёта для каждого счёта Lunch
+        Flow:'
+      create_accounts: Создать счета
+      creating_accounts: Создание счетов...
+      fetch_failed: Не удалось получить счета
+      historical_data_range: 'Диапазон исторических данных:'
+      no_accounts_to_setup: Нет счетов для настройки
+      no_api_key: API-ключ Lunch Flow не настроен. Пожалуйста, проверьте настройки
+        подключения.
+      subtitle: Выберите правильные типы счетов для ваших импортированных счетов
+      subtype_labels:
+        credit_card: ''
+        depository: 'Подтип счёта:'
+        investment: 'Тип инвестиций:'
+        loan: 'Тип кредита:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Кредитные карты будут автоматически настроены как кредитные счета.
+        other_asset: Дополнительные параметры для других активов не требуются.
+      subtypes:
+        depository:
+          cd: Депозитный сертификат
+          checking: Текущий
+          hsa: Счёт медицинских сбережений
+          money_market: Денежный рынок
+          savings: Сберегательный
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: План 529
+          angel: Ангельские инвестиции
+          brokerage: Брокерский
+          hsa: Счёт медицинских сбережений
+          ira: Традиционная IRA
+          mutual_fund: Паевой инвестиционный фонд
+          pension: Пенсионный
+          retirement: Пенсионные накопления
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: План сбережений
+        loan:
+          auto: Автокредит
+          mortgage: Ипотека
+          other: Другой кредит
+          student: Студенческий кредит
+      sync_start_date_help: Выберите, насколько далеко назад вы хотите синхронизировать
+        историю операций. Максимум доступно 3 года истории.
+      sync_start_date_label: 'Начать синхронизацию операций с:'
+      title: Настройте ваши счета Lunch Flow
+    setup_required:
+      api_key_description: Прежде чем вы сможете связать счета Lunch Flow, вам нужно
+        настроить ваш API-ключ Lunch Flow.
+      api_key_not_configured: API-ключ не настроен
+      go_to_provider_settings: Перейти к настройкам провайдера
+      setup_step_1_html: Перейдите в <strong>Настройки → Провайдеры</strong>
+      setup_step_2_html: Найдите раздел <strong>Lunch Flow</strong>
+      setup_step_3: Введите ваш API-ключ Lunch Flow
+      setup_step_4: Вернитесь сюда, чтобы связать ваши счета
+      setup_steps_title: 'Шаги настройки:'
+      title: Требуется настройка Lunch Flow
+    sync:
+      success: Синхронизация начата
+    update:
+      success: Подключение к Lunch Flow обновлено
diff --git a/config/locales/views/lunchflow_items/tr.yml b/config/locales/views/lunchflow_items/tr.yml
new file mode 100644
index 000000000..64b568751
--- /dev/null
+++ b/config/locales/views/lunchflow_items/tr.yml
@@ -0,0 +1,182 @@
+---
+tr:
+  lunchflow_items:
+    api_error:
+      check_provider_settings: Sağlayıcı Ayarlarını Kontrol Et
+      common_issues: 'Yaygın Sorunlar:'
+      expired_credentials_desc: Lunch Flow'dan yeni bir API anahtarı oluşturun
+      expired_credentials_label: Süresi Dolmuş Kimlik Bilgileri
+      invalid_api_key_desc: API anahtarınızı Sağlayıcı Ayarları'ndan kontrol edin
+      invalid_api_key_label: Geçersiz API Anahtarı
+      network_issue_desc: İnternet bağlantınızı kontrol edin
+      network_issue_label: Ağ Sorunu
+      service_down_desc: Lunch Flow API geçici olarak kullanılamıyor olabilir
+      service_down_label: Hizmet Kapalı
+      title: Lunch Flow Bağlantı Hatası
+      unable_to_connect: Lunch Flow'a bağlanılamıyor
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hiçbir hesap oluşturulmadı.
+      creation_failed: 'Hesaplar oluşturulamadı: %{error}'
+      no_accounts: Kurulacak hesap yok.
+      success: "%{count} hesap başarıyla oluşturuldu."
+    create:
+      success: Lunch Flow bağlantısı başarıyla oluşturuldu
+    destroy:
+      success: Lunch Flow bağlantısı kaldırıldı
+    index:
+      title: Lunch Flow Bağlantıları
+    link_accounts:
+      all_already_linked:
+        one: Seçilen hesap (%{names}) zaten bağlı
+        other: 'Seçilen %{count} hesabın tümü zaten bağlı: %{names}'
+      api_error: 'API hatası: %{message}'
+      invalid_account_names:
+        one: Adı boş olan hesap bağlanamaz
+        other: Adı boş olan %{count} hesap bağlanamaz
+      link_failed: Hesaplar bağlanamadı
+      no_accounts_selected: Lütfen en az bir hesap seçin
+      no_api_key: ''
+      partial_invalid: "%{created_count} hesap başarıyla bağlandı, %{already_linked_count}
+        hesap zaten bağlıydı, %{invalid_count} hesabın adı geçersizdi"
+      partial_success: "%{created_count} hesap başarıyla bağlandı. %{already_linked_count}
+        hesap zaten bağlıydı: %{already_linked_names}"
+      success:
+        one: "%{count} hesap başarıyla bağlandı"
+        other: "%{count} hesap başarıyla bağlandı"
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      api_error: 'API hatası: %{message}'
+      invalid_account_name: Adı boş olan hesap bağlanamaz
+      lunchflow_account_already_linked: Bu Lunch Flow hesabı zaten başka bir hesaba
+        bağlı
+      lunchflow_account_not_found: Lunch Flow hesabı bulunamadı
+      missing_parameters: Gerekli parametreler eksik
+      no_api_key: ''
+      success: "%{account_name} Lunch Flow ile başarıyla bağlandı"
+    loading:
+      loading_message: Lunch Flow hesapları yükleniyor...
+      loading_title: Yükleniyor
+    lunchflow_item:
+      accounts_need_setup: Hesapların kurulumu gerekiyor
+      delete: Bağlantıyı sil
+      deletion_in_progress: siliniyor...
+      error: Hata
+      no_accounts_description: Bu bağlantının henüz bağlı hesabı yok.
+      no_accounts_title: Hesap yok
+      setup_action: Yeni Hesapları Kur
+      setup_description: "%{total} hesaptan %{linked} tanesi bağlandı. Yeni içe aktarılan
+        Lunch Flow hesaplarınız için hesap türlerini seçin."
+      setup_needed: Kurulacak yeni hesaplar hazır
+      status: "%{timestamp} önce senkronize edildi"
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: "%{timestamp} önce senkronize edildi • %{summary}"
+      syncing: Senkronize ediliyor...
+      total: Toplam
+      unlinked: Bağlı değil
+    select_accounts:
+      accounts_selected: hesap seçildi
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_lunchflow: İçe aktarılamıyor - lütfen Lunchflow'da hesap adını
+        yapılandırın
+      description: "%{product_name} hesabınıza bağlamak istediğiniz hesapları seçin."
+      link_accounts: Seçilen hesapları bağla
+      no_accounts_found: Hesap bulunamadı. Lütfen API anahtarı yapılandırmanızı kontrol
+        edin.
+      no_api_key: Lunch Flow API anahtarı yapılandırılmamış. Lütfen Ayarlar'dan yapılandırın.
+      no_credentials_configured: ''
+      no_name_placeholder: "(Ad yok)"
+      title: Lunch Flow Hesaplarını Seç
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      all_accounts_already_linked: Tüm Lunch Flow hesapları zaten bağlı
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_lunchflow: İçe aktarılamıyor - lütfen Lunchflow'da hesap adını
+        yapılandırın
+      description: Bu hesapla bağlamak için bir Lunch Flow hesabı seçin. İşlemler
+        otomatik olarak senkronize edilecek ve yinelenenler ayıklanacaktır.
+      link_account: Hesabı bağla
+      no_account_specified: Hesap belirtilmedi
+      no_accounts_found: Lunch Flow hesabı bulunamadı. Lütfen API anahtarı yapılandırmanızı
+        kontrol edin.
+      no_api_key: Lunch Flow API anahtarı yapılandırılmamış. Lütfen Ayarlar'dan yapılandırın.
+      no_credentials_configured: ''
+      no_name_placeholder: "(Ad yok)"
+      title: "%{account_name} hesabını Lunch Flow ile bağla"
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      account_types:
+        credit_card: Kredi Kartı
+        depository: Vadesiz veya Vadeli Hesap
+        investment: Yatırım Hesabı
+        loan: Kredi veya İpotek
+        other_asset: Diğer Varlık
+        skip: Bu hesabı atla
+      all_accounts_linked: Tüm Lunch Flow hesaplarınız zaten kuruldu.
+      api_error: 'API hatası: %{message}'
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her Lunch Flow hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating_accounts: Hesaplar Oluşturuluyor...
+      fetch_failed: Hesaplar Getirilemedi
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      no_accounts_to_setup: Kurulacak Hesap Yok
+      no_api_key: Lunch Flow API anahtarı yapılandırılmamış. Lütfen bağlantı ayarlarınızı
+        kontrol edin.
+      subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      subtype_labels:
+        credit_card: ''
+        depository: 'Hesap Alt Türü:'
+        investment: 'Yatırım Türü:'
+        loan: 'Kredi Türü:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Kredi kartları otomatik olarak kredi kartı hesabı olarak kurulacaktır.
+        other_asset: Diğer Varlıklar için ek seçenek gerekmez.
+      subtypes:
+        depository:
+          cd: Mevduat Sertifikası
+          checking: Vadesiz Hesap
+          hsa: Sağlık Tasarruf Hesabı
+          money_market: Para Piyasası
+          savings: Vadeli Hesap
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: 529 Planı
+          angel: Melek Yatırımcı
+          brokerage: Aracı Kurum Hesabı
+          hsa: Sağlık Tasarruf Hesabı
+          ira: Geleneksel Bireysel Emeklilik Hesabı (IRA)
+          mutual_fund: Yatırım Fonu
+          pension: Emeklilik Maaşı
+          retirement: Emeklilik
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Tasarruf Planı (TSP)
+        loan:
+          auto: Taşıt Kredisi
+          mortgage: İpotek
+          other: Diğer Kredi
+          student: Öğrenci Kredisi
+      sync_start_date_help: İşlem geçmişini ne kadar geriye senkronize etmek istediğinizi
+        seçin. En fazla 3 yıllık geçmiş kullanılabilir.
+      sync_start_date_label: 'İşlemleri şu tarihten itibaren senkronize etmeye başla:'
+      title: Lunch Flow Hesaplarınızı Kurun
+    setup_required:
+      api_key_description: Lunch Flow hesaplarını bağlamadan önce Lunch Flow API anahtarınızı
+        yapılandırmanız gerekir.
+      api_key_not_configured: API Anahtarı Yapılandırılmamış
+      go_to_provider_settings: Sağlayıcı Ayarlarına Git
+      setup_step_1_html: "<strong>Ayarlar → Sağlayıcılar</strong> bölümüne gidin"
+      setup_step_2_html: "<strong>Lunch Flow</strong> bölümünü bulun"
+      setup_step_3: Lunch Flow API anahtarınızı girin
+      setup_step_4: Hesaplarınızı bağlamak için buraya geri dönün
+      setup_steps_title: 'Kurulum Adımları:'
+      title: Lunch Flow Kurulumu Gerekiyor
+    sync:
+      success: Senkronizasyon başlatıldı
+    update:
+      success: Lunch Flow bağlantısı güncellendi
diff --git a/config/locales/views/lunchflow_items/zh-CN.yml b/config/locales/views/lunchflow_items/zh-CN.yml
index ac963800c..8b68df587 100644
--- a/config/locales/views/lunchflow_items/zh-CN.yml
+++ b/config/locales/views/lunchflow_items/zh-CN.yml
@@ -48,6 +48,7 @@ zh-CN:
       success:
         one: 成功连接 %{count} 个账户
         other: 成功连接 %{count} 个账户
+      no_api_key: 缺少 Lunch Flow API 密钥。
     lunchflow_item:
       accounts_need_setup: 账户需要设置
       delete: 删除连接
@@ -75,6 +76,7 @@ zh-CN:
       no_api_key: 未配置 Lunch Flow API 密钥。请在设置中配置。
       no_name_placeholder: （无名称）
       title: 选择 Lunch Flow 账户
+      no_credentials_configured: 请先配置 Lunch Flow 凭据。
     select_existing_account:
       account_already_linked: 此账户已连接到某个提供商
       all_accounts_already_linked: 所有 Lunch Flow 账户都已连接
@@ -88,6 +90,7 @@ zh-CN:
       no_api_key: 未配置 Lunch Flow API 密钥。请在设置中配置。
       no_name_placeholder: （无名称）
       title: 将 %{account_name} 与 Lunch Flow 关联
+      no_credentials_configured: 请先配置 Lunch Flow 凭据。
     link_existing_account:
       account_already_linked: 此账户已连接到某个提供商
       api_error: API 错误：%{message}
@@ -96,6 +99,7 @@ zh-CN:
       lunchflow_account_not_found: 未找到 Lunch Flow 账户
       missing_parameters: 缺少必需参数
       success: 已成功将 %{account_name} 与 Lunch Flow 关联
+      no_api_key: 缺少 Lunch Flow API 密钥。
     setup_accounts:
       account_type_label: 账户类型：
       all_accounts_linked: 您的所有 Lunch Flow 账户都已设置完成。
diff --git a/config/locales/views/merchants/en.yml b/config/locales/views/merchants/en.yml
index 7c99f3e68..a65741b00 100644
--- a/config/locales/views/merchants/en.yml
+++ b/config/locales/views/merchants/en.yml
@@ -16,6 +16,7 @@ en:
     index:
       empty: No merchants yet
       new: New merchant
+      import: Import merchants
       merge: Merge merchants
       title: Merchants
       family_title: "%{moniker} merchants"
@@ -28,6 +29,11 @@ en:
         one: "%{count} provider merchant is missing website information. Enhance with AI to detect websites, display logos, and merge duplicate merchants."
         other: "%{count} provider merchants are missing website information. Enhance with AI to detect websites, display logos, and merge duplicate merchants."
       enhance_button: Enhance with AI
+      search_family_merchants: Search family merchants...
+      search_provider_merchants: Search provider merchants...
+      no_family_merchants_found: No matching family merchants found
+      no_provider_merchants_found: No matching provider merchants found
+      per_page: per page
       unlinked_title: Recently unlinked
       unlinked_info: These merchants were recently removed from your transactions. They will disappear from this list after 30 days unless re-assigned to a transaction.
       table:
@@ -50,6 +56,8 @@ en:
       target_label: Merge into (target)
       select_target: Select target merchant...
       sources_label: Merchants to merge
+      sources_search_placeholder: Search merchants...
+      no_merchants_found: No matching merchants found
       sources_hint: Selected merchants will be merged into the target. Family merchants will be deleted, provider merchants will be unlinked.
       submit: Merge selected
     new:
diff --git a/config/locales/views/merchants/fr.yml b/config/locales/views/merchants/fr.yml
index e395d388b..eeaa20b9b 100644
--- a/config/locales/views/merchants/fr.yml
+++ b/config/locales/views/merchants/fr.yml
@@ -9,63 +9,66 @@ fr:
       unlinked_success: Marchand retiré de vos transactions
     edit:
       title: Modifier le marchand
+    enhance:
+      already_running: Une amélioration est déjà en cours. Veuillez attendre qu'elle se termine.
+      success: L'amélioration des marchands du fournisseur a démarré. Les marchands seront améliorés et les doublons fusionnés sous peu.
+    family_merchant:
+      delete: Supprimer
+      edit: Modifier
     form:
       name_placeholder: Nom du marchand
-      website_placeholder: "Site web (ex. : starbucks.com)"
       website_hint: Saisissez le site web du marchand pour afficher automatiquement son logo
+      website_placeholder: 'Site web (ex. : starbucks.com)'
     index:
       empty: Aucun marchand pour l'instant
-      new: Nouveau marchand
-      merge: Fusionner des marchands
-      title: Marchands
-      family_title: "Marchands %{moniker}"
-      family_empty: "Aucun marchand %{moniker} pour l'instant"
-      provider_title: Marchands du fournisseur
-      provider_empty: "Aucun marchand du fournisseur lié à ce %{moniker} pour l'instant"
-      provider_read_only: Les marchands du fournisseur sont synchronisés depuis vos institutions connectées. Ils ne peuvent pas être modifiés ici.
-      provider_info: Ces marchands ont été détectés automatiquement par vos connexions bancaires ou par l'IA. Vous pouvez les modifier pour créer votre propre copie, ou les retirer pour les dissocier de vos transactions.
+      enhance_button: Améliorer avec l'IA
       enhance_info:
         one: "%{count} marchand du fournisseur n'a pas d'informations de site web. Améliorez avec l'IA pour détecter les sites web, afficher les logos et fusionner les marchands en double."
         other: "%{count} marchands du fournisseur n'ont pas d'informations de site web. Améliorez avec l'IA pour détecter les sites web, afficher les logos et fusionner les marchands en double."
-      enhance_button: Améliorer avec l'IA
-      unlinked_title: Récemment dissociés
-      unlinked_info: Ces marchands ont été récemment retirés de vos transactions. Ils disparaîtront de cette liste après 30 jours s'ils ne sont pas réaffectés à une transaction.
+      family_empty: Aucun marchand %{moniker} pour l'instant
+      family_title: Marchands %{moniker}
+      import: Importer des commerçants
+      merge: Fusionner des marchands
+      new: Nouveau marchand
+      provider_empty: Aucun marchand du fournisseur lié à ce %{moniker} pour l'instant
+      provider_info: Ces marchands ont été détectés automatiquement par vos connexions bancaires ou par l'IA. Vous pouvez les modifier pour créer votre propre copie, ou les retirer pour les dissocier de vos transactions.
+      provider_read_only: Les marchands du fournisseur sont synchronisés depuis vos institutions connectées. Ils ne peuvent pas être modifiés ici.
+      provider_title: Marchands du fournisseur
       table:
-        merchant: Marchand
         actions: Actions
+        merchant: Marchand
         source: Source
+      title: Marchands
+      unlinked_info: Ces marchands ont été récemment retirés de vos transactions. Ils disparaîtront de cette liste après 30 jours s'ils ne sont pas réaffectés à une transaction.
+      unlinked_title: Récemment dissociés
     merchant:
       confirm_accept: Supprimer le marchand
-      confirm_body: Êtes-vous sûr de vouloir supprimer ce marchand ? La suppression de ce marchand
-        dissocierait toutes les transactions associées et pourrait affecter vos rapports.
+      confirm_body: Êtes-vous sûr de vouloir supprimer ce marchand ? La suppression de ce marchand dissocierait toutes les transactions associées et pourrait affecter vos rapports.
       confirm_title: Supprimer le marchand ?
       delete: Supprimer le marchand
       edit: Modifier le marchand
     merge:
-      title: Fusionner des marchands
       description: Sélectionnez un marchand cible et les marchands à fusionner avec lui. Toutes les transactions des marchands fusionnés seront réaffectées à la cible.
-      target_label: Fusionner vers (cible)
       select_target: Sélectionnez le marchand cible…
-      sources_label: Marchands à fusionner
       sources_hint: Les marchands sélectionnés seront fusionnés avec la cible. Les marchands de la famille seront supprimés, les marchands du fournisseur seront dissociés.
+      sources_label: Marchands à fusionner
       submit: Fusionner la sélection
+      target_label: Fusionner vers (cible)
+      title: Fusionner des marchands
     new:
       title: Nouveau marchand
     perform_merge:
+      invalid_merchants: Marchands sélectionnés invalides
+      no_merchants_selected: Aucun marchand sélectionné à fusionner
       success:
         one: "%{count} marchand fusionné avec succès"
         other: "%{count} marchands fusionnés avec succès"
-      no_merchants_selected: Aucun marchand sélectionné à fusionner
       target_not_found: Marchand cible introuvable
-      invalid_merchants: Marchands sélectionnés invalides
     provider_merchant:
       edit: Modifier
       remove: Retirer
-      remove_confirm_title: Retirer le marchand ?
       remove_confirm_body: Êtes-vous sûr de vouloir retirer %{name} ? Cela dissociera toutes les transactions associées à ce marchand, mais ne supprimera pas le marchand lui-même.
-    enhance:
-      success: L'amélioration des marchands du fournisseur a démarré. Les marchands seront améliorés et les doublons fusionnés sous peu.
-      already_running: Une amélioration est déjà en cours. Veuillez attendre qu'elle se termine.
+      remove_confirm_title: Retirer le marchand ?
     update:
-      success: Marchand mis à jour avec succès
       converted_success: Marchand converti et mis à jour avec succès
+      success: Marchand mis à jour avec succès
diff --git a/config/locales/views/merchants/it.yml b/config/locales/views/merchants/it.yml
new file mode 100644
index 000000000..1a50fb2ca
--- /dev/null
+++ b/config/locales/views/merchants/it.yml
@@ -0,0 +1,74 @@
+---
+it:
+  family_merchants:
+    create:
+      error: "Errore nella creazione del commerciante: %{error}"
+      success: Nuovo commerciante creato con successo
+    destroy:
+      success: Commerciante eliminato con successo
+      unlinked_success: Commerciante rimosso dalle tue transazioni
+    edit:
+      title: Modifica commerciante
+    form:
+      name_placeholder: Nome commerciante
+      website_placeholder: Sito web (es. starbucks.com)
+      website_hint: Inserisci il sito web del commerciante per visualizzarne automaticamente il logo
+    index:
+      empty: Nessun commerciante ancora
+      new: Nuovo commerciante
+      import: Importa commercianti
+      merge: Unisci commercianti
+      title: Commercianti
+      family_title: "Commercianti %{moniker}"
+      family_empty: "Nessun commerciante %{moniker} ancora"
+      provider_title: Commercianti del provider
+      provider_empty: "Nessun commerciante del provider collegato a questo %{moniker} ancora"
+      provider_read_only: I commercianti del provider vengono sincronizzati dalle istituzioni collegate. Non possono essere modificati qui.
+      provider_info: Questi commercianti sono stati rilevati automaticamente dai tuoi conti bancari collegati o dall'IA. Puoi modificarli per crearne una copia personalizzata, o rimuoverli per scollegarli dalle transazioni.
+      enhance_info:
+        one: "%{count} commerciante del provider non ha informazioni sul sito web. Migliora con l'IA per rilevare siti, mostrare loghi e unire commercianti duplicati."
+        other: "%{count} commercianti del provider non hanno informazioni sul sito web. Migliora con l'IA per rilevare siti, mostrare loghi e unire commercianti duplicati."
+      enhance_button: Migliora con l'IA
+      unlinked_title: Scollegati di recente
+      unlinked_info: Questi commercianti sono stati recentemente rimossi dalle tue transazioni. Scompariranno da questa lista dopo 30 giorni a meno che non vengano riassegnati a una transazione.
+      table:
+        merchant: Commerciante
+        actions: Azioni
+        source: Fonte
+    family_merchant:
+      edit: Modifica
+      delete: Elimina
+    merchant:
+      confirm_accept: Elimina commerciante
+      confirm_body: Sei sicuro di voler eliminare questo commerciante? La rimozione di questo commerciante scollegherà tutte le transazioni associate e potrebbe influire sui rapporti.
+      confirm_title: Eliminare il commerciante?
+      delete: Elimina commerciante
+      edit: Modifica commerciante
+    merge:
+      title: Unisci commercianti
+      description: Seleziona un commerciante di destinazione e i commercianti da unire. Tutte le transazioni dei commercianti uniti verranno riassegnate alla destinazione.
+      target_label: Unisci in (destinazione)
+      select_target: Seleziona commerciante di destinazione...
+      sources_label: Commercianti da unire
+      sources_hint: I commercianti selezionati verranno uniti nella destinazione. I commercianti della famiglia verranno eliminati, quelli del provider verranno scollegati.
+      submit: Unisci selezionati
+    new:
+      title: Nuovo commerciante
+    perform_merge:
+      success:
+        one: Unito con successo %{count} commerciante
+        other: Uniti con successo %{count} commercianti
+      no_merchants_selected: Nessun commerciante selezionato da unire
+      target_not_found: Commerciante di destinazione non trovato
+      invalid_merchants: Commercianti non validi selezionati
+    provider_merchant:
+      edit: Modifica
+      remove: Rimuovi
+      remove_confirm_title: Rimuovere il commerciante?
+      remove_confirm_body: Sei sicuro di voler rimuovere %{name}? Questo scollegherà tutte le transazioni associate da questo commerciante ma non lo eliminerà.
+    enhance:
+      success: Miglioramento commercianti del provider avviato. I commercianti verranno migliorati e i duplicati uniti a breve.
+      already_running: Il miglioramento è già in corso. Attendi che finisca.
+    update:
+      success: Commerciante aggiornato con successo
+      converted_success: Commerciante convertito e aggiornato con successo
diff --git a/config/locales/views/merchants/ru.yml b/config/locales/views/merchants/ru.yml
new file mode 100644
index 000000000..fc515b780
--- /dev/null
+++ b/config/locales/views/merchants/ru.yml
@@ -0,0 +1,92 @@
+---
+ru:
+  family_merchants:
+    create:
+      error: 'Ошибка при создании продавца: %{error}'
+      success: Новый продавец успешно создан
+    destroy:
+      success: Продавец успешно удалён
+      unlinked_success: Продавец удалён из ваших операций
+    edit:
+      title: Редактировать продавца
+    enhance:
+      already_running: Улучшение уже выполняется. Пожалуйста, дождитесь его завершения.
+      success: Улучшение продавца провайдера начато. Продавцы будут улучшены, а дубликаты
+        объединены в ближайшее время.
+    family_merchant:
+      delete: Удалить
+      edit: Редактировать
+    form:
+      name_placeholder: Имя продавца
+      website_hint: Введите веб-сайт продавца, чтобы автоматически отобразить его
+        логотип
+      website_placeholder: Веб-сайт (например, starbucks.com)
+    index:
+      empty: Пока нет продавцов
+      enhance_button: Улучшить с помощью ИИ
+      enhance_info:
+        few: "%{count} продавца не имеют информации о сайте. Улучшите данные с помощью
+          ИИ: найдём сайты, добавим логотипы и объединим дубликаты."
+        many: "%{count} продавцов не имеют информации о сайте. Улучшите данные с помощью
+          ИИ: найдём сайты, добавим логотипы и объединим дубликаты."
+        one: "%{count} продавец не имеет информации о сайте. Улучшите данные с помощью
+          ИИ: найдём сайт, добавим логотип и объединим дубликаты."
+        other: "%{count} продавца не имеют информации о сайте. Улучшите данные с помощью
+          ИИ: найдём сайты, добавим логотипы и объединим дубликаты."
+      family_empty: Пока нет продавцов %{moniker}
+      family_title: Продавцы %{moniker}
+      import: Импорт продавцов
+      merge: Объединить продавцов
+      new: Новый продавец
+      provider_empty: Пока нет продавцов провайдера, связанных с этим %{moniker}
+      provider_info: Эти продавцы были автоматически обнаружены вашими банковскими
+        подключениями или ИИ. Вы можете отредактировать их, чтобы создать свою копию,
+        или удалить, чтобы отвязать от ваших операций.
+      provider_read_only: Продавцы провайдера синхронизированы с вашими подключёнными
+        учреждениями. Их нельзя редактировать здесь.
+      provider_title: Продавцы провайдера
+      table:
+        actions: Действия
+        merchant: Продавец
+        source: Источник
+      title: Продавцы
+      unlinked_info: Эти продавцы недавно были удалены из ваших операций. Они исчезнут
+        из этого списка через 30 дней, если не будут снова назначены операции.
+      unlinked_title: Недавно отвязанные
+    merchant:
+      confirm_accept: Удалить продавца
+      confirm_body: Вы уверены, что хотите удалить этого продавца? Удаление этого
+        продавца отвяжет все связанные операции и может повлиять на ваши отчёты.
+      confirm_title: Удалить продавца?
+      delete: Удалить продавца
+      edit: Редактировать продавца
+    merge:
+      description: Выберите целевого продавца и продавцов для объединения с ним. Все
+        операции от объединённых продавцов будут переназначены целевому.
+      select_target: Выберите целевого продавца...
+      sources_hint: Выбранные продавцы будут объединены с целью. Семейные продавцы
+        будут удалены, продавцы провайдера будут отвязаны.
+      sources_label: Продавцы для объединения
+      submit: Объединить выбранные
+      target_label: Объединить в (цель)
+      title: Объединить продавцов
+    new:
+      title: Новый продавец
+    perform_merge:
+      invalid_merchants: Выбраны недопустимые продавцы
+      no_merchants_selected: Не выбрано продавцов для объединения
+      success:
+        few: Успешно объединены %{count} продавца
+        many: Успешно объединено %{count} продавцов
+        one: Успешно объединён %{count} продавец
+        other: Успешно объединены %{count} продавца
+      target_not_found: Целевой продавец не найден
+    provider_merchant:
+      edit: Редактировать
+      remove: Удалить
+      remove_confirm_body: Вы уверены, что хотите удалить %{name}? Это отвяжет все
+        связанные операции с этим продавцом, но не удалит самого продавца.
+      remove_confirm_title: Удалить продавца?
+    update:
+      converted_success: Продавец преобразован и успешно обновлён
+      success: Продавец успешно обновлён
diff --git a/config/locales/views/merchants/tr.yml b/config/locales/views/merchants/tr.yml
index eeea835ba..bffc664a0 100644
--- a/config/locales/views/merchants/tr.yml
+++ b/config/locales/views/merchants/tr.yml
@@ -2,35 +2,88 @@
 tr:
   family_merchants:
     create:
-      error: "Satıcı oluşturulurken hata: %{error}"
-      success: "Yeni satıcı başarıyla oluşturuldu"
+      error: 'Satıcı oluşturulurken hata: %{error}'
+      success: Yeni satıcı başarıyla oluşturuldu
     destroy:
-      success: "Satıcı başarıyla silindi"
+      success: Satıcı başarıyla silindi
+      unlinked_success: Satıcı işlemlerinizden kaldırıldı
     edit:
-      title: "Satıcıyı düzenle"
+      title: Satıcıyı düzenle
+    enhance:
+      already_running: İyileştirme zaten devam ediyor. Lütfen bitmesini bekleyin.
+      success: Sağlayıcı satıcı iyileştirmesi başlatıldı. Satıcılar kısa süre içinde
+        iyileştirilecek ve kopyalar birleştirilecek.
+    family_merchant:
+      delete: Sil
+      edit: Düzenle
     form:
-      name_placeholder: "Satıcı adı"
+      name_placeholder: Satıcı adı
+      website_hint: Logosunun otomatik olarak görüntülenmesi için satıcının web sitesini
+        girin
+      website_placeholder: Web sitesi (örn. starbucks.com)
     index:
-      empty: "Henüz satıcı yok"
-      new: "Yeni satıcı"
-      title: "Satıcılar"
-      family_title: "Aile satıcıları"
-      family_empty: "Henüz aile satıcısı yok"
-      provider_title: "Sağlayıcı satıcıları"
-      provider_empty: "Bu aileye bağlı sağlayıcı satıcısı yok"
-      provider_read_only: "Sağlayıcı satıcılar bağlı olduğunuz kurumlarla otomatik olarak eşitlenir. Burada düzenlenemezler."
+      empty: Henüz satıcı yok
+      enhance_button: Yapay Zeka ile İyileştir
+      enhance_info:
+        one: "%{count} sağlayıcı satıcısının web sitesi bilgisi eksik. Web sitelerini
+          tespit etmek, logoları görüntülemek ve yinelenen satıcıları birleştirmek
+          için Yapay Zeka ile İyileştirin."
+        other: "%{count} sağlayıcı satıcısının web sitesi bilgisi eksik. Web sitelerini
+          tespit etmek, logoları görüntülemek ve yinelenen satıcıları birleştirmek
+          için Yapay Zeka ile İyileştirin."
+      family_empty: Henüz %{moniker} satıcısı yok
+      family_title: "%{moniker} satıcıları"
+      import: Satıcıları içe aktar
+      merge: Satıcıları birleştir
+      new: Yeni satıcı
+      provider_empty: Bu %{moniker} hesabına bağlı sağlayıcı satıcısı yok
+      provider_info: Bu satıcılar banka bağlantılarınız veya Yapay Zeka tarafından
+        otomatik olarak tespit edildi. Kendi kopyanızı oluşturmak için düzenleyebilir
+        veya işlemlerinizden bağlantısını kaldırmak için kaldırabilirsiniz.
+      provider_read_only: Sağlayıcı satıcılar bağlı olduğunuz kurumlarla otomatik
+        olarak eşitlenir. Burada düzenlenemezler.
+      provider_title: Sağlayıcı satıcıları
       table:
-        merchant: "Satıcı"
-        actions: "İşlemler"
-        source: "Kaynak"
+        actions: İşlemler
+        merchant: Satıcı
+        source: Kaynak
+      title: Satıcılar
+      unlinked_info: Bu satıcılar yakın zamanda işlemlerinizden kaldırıldı. Bir işleme
+        yeniden atanmadıkça 30 gün sonra bu listeden kaybolacaklar.
+      unlinked_title: Son bağlantısı kaldırılanlar
     merchant:
-      confirm_accept: "Satıcıyı sil"
-      confirm_body: "Bu satıcıyı silmek istediğinizden emin misiniz? Satıcıyı kaldırmak
-        ilişkili tüm işlemlerin bağlantısını kaldıracak ve raporlamanızı etkileyebilir."
-      confirm_title: "Satıcı silinsin mi?"
-      delete: "Satıcıyı sil"
-      edit: "Satıcıyı düzenle"
+      confirm_accept: Satıcıyı sil
+      confirm_body: Bu satıcıyı silmek istediğinizden emin misiniz? Satıcıyı kaldırmak
+        ilişkili tüm işlemlerin bağlantısını kaldıracak ve raporlamanızı etkileyebilir.
+      confirm_title: Satıcı silinsin mi?
+      delete: Satıcıyı sil
+      edit: Satıcıyı düzenle
+    merge:
+      description: Hedef bir satıcı ve onunla birleştirilecek satıcıları seçin. Birleştirilen
+        satıcılardaki tüm işlemler hedefe yeniden atanacaktır.
+      select_target: Hedef satıcı seçin...
+      sources_hint: Seçilen satıcılar hedefle birleştirilecek. Aile satıcıları silinecek,
+        sağlayıcı satıcılarının bağlantısı kaldırılacaktır.
+      sources_label: Birleştirilecek satıcılar
+      submit: Seçilenleri birleştir
+      target_label: Şununla birleştir (hedef)
+      title: Satıcıları birleştir
     new:
-      title: "Yeni satıcı"
+      title: Yeni satıcı
+    perform_merge:
+      invalid_merchants: Geçersiz satıcılar seçildi
+      no_merchants_selected: Birleştirmek için satıcı seçilmedi
+      success:
+        one: "%{count} satıcı başarıyla birleştirildi"
+        other: "%{count} satıcı başarıyla birleştirildi"
+      target_not_found: Hedef satıcı bulunamadı
+    provider_merchant:
+      edit: Düzenle
+      remove: Kaldır
+      remove_confirm_body: "%{name} adlı satıcıyı kaldırmak istediğinizden emin misiniz?
+        Bu, bu satıcıyla ilişkili tüm işlemlerin bağlantısını kaldıracak ancak satıcının
+        kendisini silmeyecektir."
+      remove_confirm_title: Satıcı kaldırılsın mı?
     update:
-      success: "Satıcı başarıyla güncellendi"
\ No newline at end of file
+      converted_success: Satıcı başarıyla dönüştürüldü ve güncellendi
+      success: Satıcı başarıyla güncellendi
diff --git a/config/locales/views/merchants/zh-CN.yml b/config/locales/views/merchants/zh-CN.yml
index b82bd8c85..65b70e51f 100644
--- a/config/locales/views/merchants/zh-CN.yml
+++ b/config/locales/views/merchants/zh-CN.yml
@@ -34,6 +34,7 @@ zh-CN:
         merchant: 商户
         actions: 操作
         source: 来源
+      import: 导入商户
     family_merchant:
       edit: 编辑
       delete: 删除
diff --git a/config/locales/views/mercury_items/fr.yml b/config/locales/views/mercury_items/fr.yml
index 3a879a11d..ce8592275 100644
--- a/config/locales/views/mercury_items/fr.yml
+++ b/config/locales/views/mercury_items/fr.yml
@@ -1,31 +1,67 @@
 ---
 fr:
   mercury_items:
+    api_error:
+      check_provider_settings: Vérifier les paramètres du fournisseur
+      common_issues: 'Problèmes courants :'
+      expired_credentials_desc: Générer un nouveau jeton API à partir de Mercury
+      expired_credentials_label: Identifiants expirés
+      insufficient_permissions_desc: Assurez-vous que votre jeton dispose d'un accès
+        en lecture seule
+      insufficient_permissions_label: Autorisations insuffisantes
+      invalid_api_token_desc: Vérifiez votre jeton API dans les paramètres du fournisseur
+      invalid_api_token_label: Jeton API invalide
+      network_issue_desc: Vérifiez votre connexion Internet
+      network_issue_label: Problème de réseau
+      service_down_desc: L'API Mercury peut être temporairement indisponible
+      service_down_label: Service en panne
+      title: Erreur de connexion Mercure
+      unable_to_connect: Impossible de se connecter à Mercury
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      creation_failed: 'Échec de la création des comptes : %{error}'
+      no_accounts: Aucun compte à configurer.
+      success: "%{count} compte(s) créé(s) avec succès."
     create:
       success: Connexion Mercury créée avec succès
     destroy:
       success: Connexion Mercury supprimée
     index:
       title: Connexions Mercury
-    loading:
-      loading_message: Chargement des comptes Mercury…
-      loading_title: Chargement
     link_accounts:
       all_already_linked:
-        one: "Le compte sélectionné (%{names}) est déjà lié"
-        other: "Les %{count} comptes sélectionnés sont déjà liés : %{names}"
-      api_error: "Erreur API : %{message}"
+        one: Le compte sélectionné (%{names}) est déjà lié
+        other: 'Les %{count} comptes sélectionnés sont déjà liés : %{names}'
+      api_error: 'Erreur API : %{message}'
       invalid_account_names:
-        one: "Impossible de lier un compte sans nom"
-        other: "Impossible de lier %{count} comptes sans nom"
+        one: Impossible de lier un compte sans nom
+        other: Impossible de lier %{count} comptes sans nom
       link_failed: Échec de la liaison des comptes
       no_accounts_selected: Veuillez sélectionner au moins un compte
-      no_api_token: Jeton API Mercury introuvable. Veuillez le configurer dans les paramètres du fournisseur.
-      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count} étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
-      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count} compte(s) étaient déjà liés : %{already_linked_names}"
+      no_api_token: Jeton API Mercury introuvable. Veuillez le configurer dans les
+        paramètres du fournisseur.
+      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count}
+        étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
+      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count}
+        compte(s) étaient déjà liés : %{already_linked_names}"
+      select_connection: Choisissez une connexion Mercury avant de lier des comptes.
       success:
         one: "%{count} compte lié avec succès"
         other: "%{count} comptes liés avec succès"
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      api_error: 'Erreur API : %{message}'
+      invalid_account_name: Impossible de lier un compte sans nom
+      mercury_account_already_linked: Ce compte Mercury est déjà lié à un autre compte
+      mercury_account_not_found: Compte Mercury introuvable
+      missing_parameters: Paramètres requis manquants
+      no_api_token: Jeton API Mercury introuvable. Veuillez le configurer dans les
+        paramètres du fournisseur.
+      select_connection: Choisissez une connexion Mercury avant de lier des comptes.
+      success: "%{account_name} lié avec succès à Mercury"
+    loading:
+      loading_message: Chargement des comptes Mercury…
+      loading_title: Chargement
     mercury_item:
       accounts_need_setup: Des comptes doivent être configurés
       delete: Supprimer la connexion
@@ -34,113 +70,169 @@ fr:
       no_accounts_description: Cette connexion n'a pas encore de comptes liés.
       no_accounts_title: Aucun compte
       setup_action: Configurer les nouveaux comptes
-      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types de compte pour vos comptes Mercury nouvellement importés."
+      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types
+        de compte pour vos comptes Mercury nouvellement importés."
       setup_needed: Nouveaux comptes prêts à être configurés
-      status: "Synchronisé il y a %{timestamp}"
+      status: Synchronisé il y a %{timestamp}
       status_never: Jamais synchronisé
-      status_with_summary: "Dernière synchronisation il y a %{timestamp} - %{summary}"
+      status_with_summary: Dernière synchronisation il y a %{timestamp} - %{summary}
       syncing: Synchronisation…
       total: Total
       unlinked: Non lié
+    mercury_item_selection_error_payload:
+      select_connection: Choisissez une connexion Mercury avant de charger les comptes.
+    provider_connection:
+      default_description: Connectez-vous à votre banque via Mercury
+      default_name: Mercure
+      description: Connectez-vous en utilisant %{name}
+      name: Mercure - %{name}
+    provider_panel:
+      add_connection: Ajouter une connexion Mercury
+      base_url_label: URL de base (facultatif)
+      base_url_placeholder: https://api.mercury.com/api/v1 (par défaut)
+      connection_name_label: Nom de la connexion
+      connection_name_placeholder: Vérification commerciale
+      default_connection_name: Connexion Mercure
+      disconnect_confirm: Déconnecter %{name} ?
+      instructions:
+        copy_token_html: Copiez le <strong>jeton complet</strong> (y compris le préfixe
+          <code>secret-token :</code>) et ajoutez-le en tant que connexion nommée
+          ci-dessous.
+        create_token: Créez un nouveau jeton API avec un accès "Lecture seule"
+        open_tokens: Accédez à Paramètres > Développeur > Jetons API
+        sign_in_html: Visitez %{link} et connectez-vous au compte que vous souhaitez
+          connecter
+        whitelist_ip_html: "<strong>Important :</strong> Ajoutez l'adresse IP de votre
+          serveur à la liste blanche du token"
+      keep_token_placeholder: Laisser vide pour conserver le jeton actuel
+      sandbox_note_html: Utilisez une connexion nommée distincte pour chaque jeton
+        de connexion/API Mercury que vous souhaitez synchroniser. Pour les tests sandbox,
+        utilisez <code>https://api-sandbox.mercury.com/api/v1</code> comme URL de
+        base. Mercury nécessite une liste blanche d'adresses IP - assurez-vous d'ajouter
+        votre adresse IP dans le tableau de bord Mercury.
+      setup_accounts: Configurer des comptes
+      setup_title: 'Instructions de configuration :'
+      sync: Synchroniser
+      token_label: Jeton
+      token_placeholder: Collez le jeton ici
+      update_connection: Mettre à jour la connexion
+    render_mercury_item_selection_failure:
+      no_credentials_configured: Veuillez d'abord configurer votre jeton API Mercury
+        dans les paramètres du fournisseur.
+      select_connection: Choisissez une connexion Mercury dans les paramètres du fournisseur.
     select_accounts:
       accounts_selected: comptes sélectionnés
-      api_error: "Erreur API : %{message}"
+      api_error: 'Erreur API : %{message}'
       cancel: Annuler
-      configure_name_in_mercury: Impossible d'importer - veuillez configurer le nom du compte dans Mercury
-      description: Sélectionnez les comptes que vous souhaitez lier à votre compte %{product_name}.
+      configure_name_in_mercury: Impossible d'importer - veuillez configurer le nom
+        du compte dans Mercury
+      description: Sélectionnez les comptes que vous souhaitez lier à votre compte
+        %{product_name}.
       link_accounts: Lier les comptes sélectionnés
-      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de votre jeton API.
-      no_api_token: Le jeton API Mercury n'est pas configuré. Veuillez le configurer dans les Paramètres.
-      no_credentials_configured: Veuillez d'abord configurer votre jeton API Mercury dans les paramètres du fournisseur.
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de
+        votre jeton API.
+      no_api_token: Le jeton API Mercury n'est pas configuré. Veuillez le configurer
+        dans les Paramètres.
+      no_credentials_configured: Veuillez d'abord configurer votre jeton API Mercury
+        dans les paramètres du fournisseur.
       no_name_placeholder: "(Sans nom)"
+      select_connection: Choisissez une connexion Mercury dans les paramètres du fournisseur.
       title: Sélectionner les comptes Mercury
     select_existing_account:
       account_already_linked: Ce compte est déjà lié à un fournisseur
       all_accounts_already_linked: Tous les comptes Mercury sont déjà liés
-      api_error: "Erreur API : %{message}"
+      api_error: 'Erreur API : %{message}'
       cancel: Annuler
-      configure_name_in_mercury: Impossible d'importer - veuillez configurer le nom du compte dans Mercury
-      description: Sélectionnez un compte Mercury à lier avec ce compte. Les transactions seront synchronisées et dédupliquées automatiquement.
+      configure_name_in_mercury: Impossible d'importer - veuillez configurer le nom
+        du compte dans Mercury
+      description: Sélectionnez un compte Mercury à lier avec ce compte. Les transactions
+        seront synchronisées et dédupliquées automatiquement.
       link_account: Lier le compte
       no_account_specified: Aucun compte spécifié
-      no_accounts_found: Aucun compte Mercury trouvé. Veuillez vérifier la configuration de votre jeton API.
-      no_api_token: Le jeton API Mercury n'est pas configuré. Veuillez le configurer dans les Paramètres.
-      no_credentials_configured: Veuillez d'abord configurer votre jeton API Mercury dans les paramètres du fournisseur.
+      no_accounts_found: Aucun compte Mercury trouvé. Veuillez vérifier la configuration
+        de votre jeton API.
+      no_api_token: Le jeton API Mercury n'est pas configuré. Veuillez le configurer
+        dans les Paramètres.
+      no_credentials_configured: Veuillez d'abord configurer votre jeton API Mercury
+        dans les paramètres du fournisseur.
       no_name_placeholder: "(Sans nom)"
-      title: "Lier %{account_name} avec Mercury"
-    link_existing_account:
-      account_already_linked: Ce compte est déjà lié à un fournisseur
-      api_error: "Erreur API : %{message}"
-      invalid_account_name: Impossible de lier un compte sans nom
-      mercury_account_already_linked: Ce compte Mercury est déjà lié à un autre compte
-      mercury_account_not_found: Compte Mercury introuvable
-      missing_parameters: Paramètres requis manquants
-      no_api_token: Jeton API Mercury introuvable. Veuillez le configurer dans les paramètres du fournisseur.
-      success: "%{account_name} lié avec succès à Mercury"
+      select_connection: Choisissez une connexion Mercury dans les paramètres du fournisseur.
+      title: Lier %{account_name} avec Mercury
     setup_accounts:
-      account_type_label: "Type de compte :"
-      all_accounts_linked: "Tous vos comptes Mercury ont déjà été configurés."
-      api_error: "Erreur API : %{message}"
-      fetch_failed: "Échec de la récupération des comptes"
-      no_accounts_to_setup: "Aucun compte à configurer"
-      no_api_token: "Le jeton API Mercury n'est pas configuré. Veuillez vérifier les paramètres de connexion."
+      account_type_label: 'Type de compte :'
       account_types:
-        skip: Ignorer ce compte
-        depository: Compte courant ou épargne
         credit_card: Carte de crédit
+        depository: Compte courant ou épargne
         investment: Compte d'investissement
         loan: Prêt ou hypothèque
         other_asset: Autre actif
-      subtype_labels:
-        depository: "Sous-type de compte :"
-        credit_card: ""
-        investment: "Type d'investissement :"
-        loan: "Type de prêt :"
-        other_asset: ""
-      subtype_messages:
-        credit_card: "Les cartes de crédit seront automatiquement configurées comme comptes de carte de crédit."
-        other_asset: "Aucune option supplémentaire nécessaire pour les autres actifs."
-      subtypes:
-        depository:
-          checking: Compte courant
-          savings: Compte épargne
-          hsa: Compte épargne santé
-          cd: Certificat de dépôt
-          money_market: Compte du marché monétaire
-        investment:
-          brokerage: Courtage
-          pension: Pension
-          retirement: Retraite
-          "401k": "401(k)"
-          roth_401k: "Roth 401(k)"
-          "403b": "403(b)"
-          tsp: Plan d'épargne Thrift
-          "529_plan": "Plan 529"
-          hsa: Compte épargne santé
-          mutual_fund: Fonds commun de placement
-          ira: IRA traditionnel
-          roth_ira: Roth IRA
-          angel: Investissement providentiel
-        loan:
-          mortgage: Hypothèque
-          student: Prêt étudiant
-          auto: Prêt auto
-          other: Autre prêt
+        skip: Ignorer ce compte
+      all_accounts_linked: Tous vos comptes Mercury ont déjà été configurés.
+      api_error: 'Erreur API : %{message}'
       balance: Solde
       cancel: Annuler
-      choose_account_type: "Choisissez le type de compte correct pour chaque compte Mercury :"
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        Mercury :'
       create_accounts: Créer les comptes
       creating_accounts: Création des comptes…
-      historical_data_range: "Plage de données historiques :"
+      fetch_failed: Échec de la récupération des comptes
+      historical_data_range: 'Plage de données historiques :'
+      no_accounts_to_setup: Aucun compte à configurer
+      no_api_token: Le jeton API Mercury n'est pas configuré. Veuillez vérifier les
+        paramètres de connexion.
       subtitle: Choisissez les types de compte corrects pour vos comptes importés
-      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique des transactions. Maximum 3 ans d'historique disponible.
-      sync_start_date_label: "Commencer la synchronisation des transactions à partir de :"
+      subtype_labels:
+        credit_card: ''
+        depository: 'Sous-type de compte :'
+        investment: 'Type d''investissement :'
+        loan: 'Type de prêt :'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Les cartes de crédit seront automatiquement configurées comme
+          comptes de carte de crédit.
+        other_asset: Aucune option supplémentaire nécessaire pour les autres actifs.
+      subtypes:
+        depository:
+          cd: Certificat de dépôt
+          checking: Compte courant
+          hsa: Compte épargne santé
+          money_market: Compte du marché monétaire
+          savings: Compte épargne
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: Plan 529
+          angel: Investissement providentiel
+          brokerage: Courtage
+          hsa: Compte épargne santé
+          ira: IRA traditionnel
+          mutual_fund: Fonds commun de placement
+          pension: Pension
+          retirement: Retraite
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Plan d'épargne Thrift
+        loan:
+          auto: Prêt auto
+          mortgage: Hypothèque
+          other: Autre prêt
+          student: Prêt étudiant
+      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions. Maximum 3 ans d'historique disponible.
+      sync_start_date_label: 'Commencer la synchronisation des transactions à partir
+        de :'
       title: Configurer vos comptes Mercury
-    complete_account_setup:
-      all_skipped: "Tous les comptes ont été ignorés. Aucun compte n'a été créé."
-      creation_failed: "Échec de la création des comptes : %{error}"
-      no_accounts: "Aucun compte à configurer."
-      success: "%{count} compte(s) créé(s) avec succès."
+    setup_required:
+      api_token_description: Avant de pouvoir lier des comptes Mercury, vous devez
+        configurer votre jeton API Mercury.
+      api_token_not_configured: Jeton API non configuré
+      go_to_provider_settings: Accédez aux paramètres du fournisseur
+      setup_step_1_html: Accédez à <strong>Paramètres > Fournisseurs</strong>.
+      setup_step_2_html: Retrouvez la rubrique <strong>Mercure</strong>
+      setup_step_3: Entrez votre jeton API Mercury
+      setup_step_4: Revenez ici pour lier vos comptes
+      setup_steps_title: 'Étapes de configuration :'
+      title: Configuration Mercury requise
     sync:
       success: Synchronisation démarrée
     update:
diff --git a/config/locales/views/mercury_items/it.yml b/config/locales/views/mercury_items/it.yml
new file mode 100644
index 000000000..3a54dfb46
--- /dev/null
+++ b/config/locales/views/mercury_items/it.yml
@@ -0,0 +1,208 @@
+---
+it:
+  mercury_items:
+    api_error:
+      title: Errore di connessione Mercury
+      unable_to_connect: Impossibile connettersi a Mercury
+      common_issues: "Problemi comuni:"
+      invalid_api_token_label: Token API non valido
+      invalid_api_token_desc: Controlla il tuo token API nelle Impostazioni provider
+      expired_credentials_label: Credenziali scadute
+      expired_credentials_desc: Genera un nuovo token API da Mercury
+      insufficient_permissions_label: Permessi insufficienti
+      insufficient_permissions_desc: Assicurati che il tuo token abbia accesso in sola lettura
+      network_issue_label: Problema di rete
+      network_issue_desc: Controlla la tua connessione internet
+      service_down_label: Servizio non disponibile
+      service_down_desc: L'API Mercury potrebbe essere temporaneamente non disponibile
+      check_provider_settings: Controlla Impostazioni provider
+    setup_required:
+      title: Configurazione Mercury richiesta
+      api_token_not_configured: Token API non configurato
+      api_token_description: Prima di poter collegare i conti Mercury, devi configurare il tuo token API Mercury.
+      setup_steps_title: "Passi di configurazione:"
+      setup_step_1_html: "Vai su <strong>Impostazioni > Provider</strong>"
+      setup_step_2_html: "Trova la sezione <strong>Mercury</strong>"
+      setup_step_3: Inserisci il tuo token API Mercury
+      setup_step_4: Torna qui per collegare i tuoi conti
+      go_to_provider_settings: Vai alle Impostazioni provider
+    create:
+      success: Connessione Mercury creata con successo
+    destroy:
+      success: Connessione Mercury rimossa
+    index:
+      title: Connessioni Mercury
+    loading:
+      loading_message: Caricamento conti Mercury...
+      loading_title: Caricamento
+    link_accounts:
+      all_already_linked:
+        one: "Il conto selezionato (%{names}) è già collegato"
+        other: "Tutti i %{count} conti selezionati sono già collegati: %{names}"
+      api_error: "Errore API: %{message}"
+      invalid_account_names:
+        one: "Impossibile collegare un conto senza nome"
+        other: "Impossibile collegare %{count} conti senza nome"
+      link_failed: Collegamento conti fallito
+      no_accounts_selected: Seleziona almeno un conto
+      no_api_token: Token API Mercury non trovato. Configuralo nelle Impostazioni provider.
+      partial_invalid: "Collegati con successo %{created_count} conto/i, %{already_linked_count} erano già collegati, %{invalid_count} conto/i aveva nomi non validi"
+      partial_success: "Collegati con successo %{created_count} conto/i. %{already_linked_count} conto/i erano già collegati: %{already_linked_names}"
+      select_connection: Scegli una connessione Mercury prima di collegare i conti.
+      success:
+        one: "Collegato con successo %{count} conto"
+        other: "Collegati con successo %{count} conti"
+    mercury_item:
+      accounts_need_setup: I conti devono essere configurati
+      delete: Elimina connessione
+      deletion_in_progress: eliminazione in corso...
+      error: Errore
+      no_accounts_description: Questa connessione non ha ancora conti collegati.
+      no_accounts_title: Nessun conto
+      setup_action: Configura nuovi conti
+      setup_description: "%{linked} di %{total} conti collegati. Scegli i tipi di conto per i tuoi nuovi conti Mercury importati."
+      setup_needed: Nuovi conti pronti per la configurazione
+      status: "Sincronizzato %{timestamp} fa"
+      status_never: Mai sincronizzato
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      syncing: Sincronizzazione in corso...
+      total: Totale
+      unlinked: Non collegati
+    provider_panel:
+      add_connection: Aggiungi connessione Mercury
+      base_url_label: URL base (facoltativo)
+      base_url_placeholder: https://api.mercury.com/api/v1 (predefinito)
+      connection_name_label: Nome connessione
+      connection_name_placeholder: Conto aziendale
+      default_connection_name: Connessione Mercury
+      disconnect_confirm: "Disconnettere %{name}?"
+      instructions:
+        copy_token_html: "Copia il <strong>token completo</strong> (incluso il prefisso <code>secret-token:</code>) e aggiungilo come connessione nominata qui sotto"
+        create_token: Crea un nuovo token API con accesso "Sola lettura"
+        open_tokens: Vai su Impostazioni > Sviluppatori > Token API
+        sign_in_html: "Visita %{link} e accedi all'account che vuoi connettere"
+        whitelist_ip_html: "<strong>Importante:</strong> Aggiungi l'indirizzo IP del tuo server alla whitelist del token"
+      keep_token_placeholder: Lascia vuoto per mantenere il token attuale
+      sandbox_note_html: "Usa una connessione nominata separata per ogni login/token API Mercury che vuoi sincronizzare. Per i test sandbox, usa <code>https://api-sandbox.mercury.com/api/v1</code> come URL base. Mercury richiede la whitelist IP - assicurati di aggiungere il tuo IP nel dashboard Mercury."
+      setup_accounts: Configura conti
+      setup_title: "Istruzioni di configurazione:"
+      sync: Sincronizza
+      token_label: Token
+      token_placeholder: Incolla il token qui
+      update_connection: Aggiorna connessione
+    provider_connection:
+      default_description: Connetti alla tua banca tramite Mercury
+      default_name: Mercury
+      description: "Connetti usando %{name}"
+      name: "Mercury - %{name}"
+    select_accounts:
+      accounts_selected: conti selezionati
+      api_error: "Errore API: %{message}"
+      cancel: Annulla
+      configure_name_in_mercury: Impossibile importare - configura il nome del conto in Mercury
+      description: Seleziona i conti che vuoi collegare al tuo account %{product_name}.
+      link_accounts: Collega i conti selezionati
+      no_accounts_found: Nessun conto trovato. Controlla la configurazione del tuo token API.
+      no_api_token: Il token API Mercury non è configurato. Configuralo nelle Impostazioni.
+      no_credentials_configured: Configura prima il tuo token API Mercury nelle Impostazioni provider.
+      no_name_placeholder: "(Nessun nome)"
+      select_connection: Scegli una connessione Mercury nelle Impostazioni provider.
+      title: Seleziona conti Mercury
+    select_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      all_accounts_already_linked: Tutti i conti Mercury sono già collegati
+      api_error: "Errore API: %{message}"
+      cancel: Annulla
+      configure_name_in_mercury: Impossibile importare - configura il nome del conto in Mercury
+      description: Seleziona un conto Mercury da collegare a questo conto. Le transazioni verranno sincronizzate e deduplicate automaticamente.
+      link_account: Collega conto
+      no_account_specified: Nessun conto specificato
+      no_accounts_found: Nessun conto Mercury trovato. Controlla la configurazione del token API.
+      no_api_token: Il token API Mercury non è configurato. Configuralo nelle Impostazioni.
+      no_credentials_configured: Configura prima il tuo token API Mercury nelle Impostazioni provider.
+      no_name_placeholder: "(Nessun nome)"
+      select_connection: Scegli una connessione Mercury nelle Impostazioni provider.
+      title: "Collega %{account_name} con Mercury"
+    link_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      api_error: "Errore API: %{message}"
+      invalid_account_name: Impossibile collegare un conto senza nome
+      mercury_account_already_linked: Questo conto Mercury è già collegato a un altro conto
+      mercury_account_not_found: Conto Mercury non trovato
+      missing_parameters: Parametri obbligatori mancanti
+      no_api_token: Token API Mercury non trovato. Configuralo nelle Impostazioni provider.
+      select_connection: Scegli una connessione Mercury prima di collegare i conti.
+      success: "Collegato con successo %{account_name} con Mercury"
+    setup_accounts:
+      account_type_label: "Tipo di conto:"
+      all_accounts_linked: "Tutti i tuoi conti Mercury sono già stati configurati."
+      api_error: "Errore API: %{message}"
+      fetch_failed: "Recupero conti fallito"
+      no_accounts_to_setup: "Nessun conto da configurare"
+      no_api_token: "Il token API Mercury non è configurato. Controlla le impostazioni di connessione."
+      account_types:
+        skip: Salta questo conto
+        depository: Conto Corrente o Risparmio
+        credit_card: Carta di credito
+        investment: Conto investimento
+        loan: Prestito o Mutuo
+        other_asset: Altro attivo
+      subtype_labels:
+        depository: "Sottotipo conto:"
+        credit_card: ""
+        investment: "Tipo investimento:"
+        loan: "Tipo prestito:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Le carte di credito saranno configurate automaticamente come conti carta di credito."
+        other_asset: "Nessuna opzione aggiuntiva necessaria per gli altri attivi."
+      subtypes:
+        depository:
+          checking: Conto Corrente
+          savings: Risparmio
+          hsa: Health Savings Account
+          cd: Certificato di Deposito
+          money_market: Mercato Monetario
+        investment:
+          brokerage: Intermediazione
+          pension: Pensione
+          retirement: Previdenza
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: Thrift Savings Plan
+          "529_plan": "Piano 529"
+          hsa: Health Savings Account
+          mutual_fund: Fondo comune
+          ira: IRA Tradizionale
+          roth_ira: Roth IRA
+          angel: Angel
+        loan:
+          mortgage: Mutuo
+          student: Prestito studentesco
+          auto: Prestito auto
+          other: Altro prestito
+      balance: Saldo
+      cancel: Annulla
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto Mercury:"
+      create_accounts: Crea conti
+      creating_accounts: Creazione conti in corso...
+      historical_data_range: "Intervallo dati storici:"
+      subtitle: Scegli i tipi di conto corretti per i tuoi conti importati
+      sync_start_date_help: Seleziona fino a quando vuoi sincronizzare la cronologia delle transazioni. Disponibili fino a 3 anni di cronologia.
+      sync_start_date_label: "Inizia a sincronizzare le transazioni da:"
+      title: Configura i tuoi conti Mercury
+    complete_account_setup:
+      all_skipped: "Tutti i conti sono stati saltati. Nessun conto è stato creato."
+      creation_failed: "Creazione conti fallita: %{error}"
+      no_accounts: "Nessun conto da configurare."
+      success: "Creati con successo %{count} conto/i."
+    sync:
+      success: Sincronizzazione avviata
+    update:
+      success: Connessione Mercury aggiornata
+    mercury_item_selection_error_payload:
+      select_connection: Scegli una connessione Mercury prima di caricare i conti.
+    render_mercury_item_selection_failure:
+      select_connection: Scegli una connessione Mercury nelle Impostazioni provider.
+      no_credentials_configured: Configura prima il tuo token API Mercury nelle Impostazioni provider.
diff --git a/config/locales/views/mercury_items/ru.yml b/config/locales/views/mercury_items/ru.yml
new file mode 100644
index 000000000..f4794e4cf
--- /dev/null
+++ b/config/locales/views/mercury_items/ru.yml
@@ -0,0 +1,238 @@
+---
+ru:
+  mercury_items:
+    api_error:
+      check_provider_settings: Проверьте настройки провайдера
+      common_issues: 'Возможные проблемы:'
+      expired_credentials_desc: Создайте новый API токен в Mercury
+      expired_credentials_label: Истекшие учетные данные
+      insufficient_permissions_desc: Убедитесь, что ваш токен имеет доступ только
+        для чтения
+      insufficient_permissions_label: Недостаточно прав
+      invalid_api_token_desc: Проверьте ваш API токен в настройках провайдера
+      invalid_api_token_label: Неверный API токен
+      network_issue_desc: Проверьте ваше интернет-соединение
+      network_issue_label: Проблема с сетью
+      service_down_desc: API Mercury может быть временно недоступен
+      service_down_label: Сервис недоступен
+      title: Ошибка подключения к Mercury
+      unable_to_connect: Не удалось подключиться к Mercury
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Счета не были созданы.
+      creation_failed: 'Не удалось создать счета: %{error}'
+      no_accounts: Нет счетов для настройки.
+      success: Успешно создано %{count} счёт(ов).
+    create:
+      success: Подключение к Mercury успешно создано
+    destroy:
+      success: Подключение к Mercury удалено
+    index:
+      title: Подключения к Mercury
+    link_accounts:
+      all_already_linked:
+        few: "%{count} выбранных счёта уже связаны: %{names}"
+        many: "%{count} выбранных счетов уже связаны: %{names}"
+        one: Выбранный счёт (%{names}) уже связан
+        other: 'Все %{count} выбранные счета уже связаны: %{names}'
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_names:
+        few: Невозможно связать %{count} счёта с пустыми именами
+        many: Невозможно связать %{count} счетов с пустыми именами
+        one: Невозможно связать счёт с пустым именем
+        other: Невозможно связать %{count} счёта с пустыми именами
+      link_failed: Не удалось связать счета
+      no_accounts_selected: Пожалуйста, выберите хотя бы один счёт
+      no_api_token: API токен Mercury не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      partial_invalid: Успешно связано %{created_count} счёт(ов), %{already_linked_count}
+        уже были связаны, %{invalid_count} счёт(ов) имели недопустимые имена
+      partial_success: 'Успешно связано %{created_count} счёт(ов). %{already_linked_count}
+        счёт(ов) уже были связаны: %{already_linked_names}'
+      select_connection: Выберите подключение к Mercury перед связыванием счетов.
+      success:
+        few: Успешно связаны %{count} счёта
+        many: Успешно связано %{count} счетов
+        one: Успешно связан %{count} счёт
+        other: Успешно связаны %{count} счёта
+    link_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      api_error: 'Ошибка API: %{message}'
+      invalid_account_name: Невозможно связать счёт с пустым именем
+      mercury_account_already_linked: Этот счёт Mercury уже связан с другим счётом
+      mercury_account_not_found: Счёт Mercury не найден
+      missing_parameters: Отсутствуют необходимые параметры
+      no_api_token: API токен Mercury не найден. Пожалуйста, настройте его в настройках
+        провайдера.
+      select_connection: Выберите подключение к Mercury перед связыванием счетов.
+      success: Успешно связан %{account_name} с Mercury
+    loading:
+      loading_message: Загрузка счетов Mercury...
+      loading_title: Загрузка
+    mercury_item:
+      accounts_need_setup: Требуется настройка счетов
+      delete: Удалить подключение
+      deletion_in_progress: удаление в процессе...
+      error: Ошибка
+      no_accounts_description: Это подключение пока не имеет связанных счетов.
+      no_accounts_title: Нет счетов
+      setup_action: Настроить новые счета
+      setup_description: "%{linked} из %{total} счетов связаны. Выберите типы счетов
+        для ваших новых импортированных счетов Mercury."
+      setup_needed: Новые счета готовы к настройке
+      status: Синхронизировано %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад - %{summary}
+      syncing: Синхронизация...
+      total: Всего
+      unlinked: Несвязанные
+    mercury_item_selection_error_payload:
+      select_connection: Выберите подключение к Mercury перед загрузкой счетов.
+    provider_connection:
+      default_description: Подключитесь к вашему банку через Mercury
+      default_name: Mercury
+      description: Подключение через %{name}
+      name: Mercury - %{name}
+    provider_panel:
+      add_connection: Добавить подключение Mercury
+      base_url_label: Базовый URL (необязательно)
+      base_url_placeholder: https://api.mercury.com/api/v1 (по умолчанию)
+      connection_name_label: Название подключения
+      connection_name_placeholder: Бизнес-счёт
+      default_connection_name: Подключение Mercury
+      disconnect_confirm: Отключить %{name}?
+      instructions:
+        copy_token_html: Скопируйте <strong>полный токен</strong> (включая префикс
+          <code>secret-token:</code>) и добавьте его как именованное подключение ниже
+        create_token: Создайте новый API токен с доступом "Только для чтения"
+        open_tokens: Перейдите в Настройки > Разработчик > API токены
+        sign_in_html: Посетите %{link} и войдите в аккаунт, который хотите подключить
+        whitelist_ip_html: "<strong>Важно:</strong> Добавьте IP-адрес вашего сервера
+          в белый список токена"
+      keep_token_placeholder: Оставьте пустым, чтобы сохранить текущий токен
+      sandbox_note_html: Используйте отдельное именованное подключение для каждого
+        входа в Mercury/API токена, который вы хотите синхронизировать. Для тестирования
+        в песочнице используйте <code>https://api-sandbox.mercury.com/api/v1</code>
+        в качестве базового URL. Mercury требует добавления IP в белый список - убедитесь,
+        что ваш IP добавлен в панели управления Mercury.
+      setup_accounts: Настроить счета
+      setup_title: 'Инструкции по настройке:'
+      sync: Синхронизировать
+      token_label: Токен
+      token_placeholder: Вставьте токен здесь
+      update_connection: Обновить подключение
+    render_mercury_item_selection_failure:
+      no_credentials_configured: Пожалуйста, сначала настройте ваш API токен Mercury
+        в настройках провайдера.
+      select_connection: Выберите подключение к Mercury в настройках провайдера.
+    select_accounts:
+      accounts_selected: счета выбраны
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_mercury: Невозможно импортировать - пожалуйста, настройте
+        имя счёта в Mercury
+      description: Выберите счета, которые вы хотите связать с вашим счётом %{product_name}.
+      link_accounts: Связать выбранные счета
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте конфигурацию вашего
+        API токена.
+      no_api_token: API токен Mercury не настроен. Пожалуйста, настройте его в Настройках.
+      no_credentials_configured: Пожалуйста, сначала настройте ваш API токен Mercury
+        в настройках провайдера.
+      no_name_placeholder: "(Без имени)"
+      select_connection: Выберите подключение к Mercury в настройках провайдера.
+      title: Выберите счета Mercury
+    select_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      all_accounts_already_linked: Все счета Mercury уже связаны
+      api_error: 'Ошибка API: %{message}'
+      cancel: Отмена
+      configure_name_in_mercury: Невозможно импортировать - пожалуйста, настройте
+        имя счёта в Mercury
+      description: Выберите счёт Mercury для связывания с этим счётом. Операции будут
+        синхронизированы и дубли удалены автоматически.
+      link_account: Связать счёт
+      no_account_specified: Счёт не указан
+      no_accounts_found: Счета Mercury не найдены. Пожалуйста, проверьте конфигурацию
+        вашего API токена.
+      no_api_token: API токен Mercury не настроен. Пожалуйста, настройте его в Настройках.
+      no_credentials_configured: Пожалуйста, сначала настройте ваш API токен Mercury
+        в настройках провайдера.
+      no_name_placeholder: "(Без имени)"
+      select_connection: Выберите подключение к Mercury в настройках провайдера.
+      title: Связать %{account_name} с Mercury
+    setup_accounts:
+      account_type_label: 'Тип счёта:'
+      account_types:
+        credit_card: Кредитная карта
+        depository: Текущий или сберегательный счёт
+        investment: Инвестиционный счёт
+        loan: Кредит или ипотека
+        other_asset: Другой актив
+        skip: Пропустить этот счёт
+      all_accounts_linked: Все ваши счета Mercury уже настроены.
+      api_error: 'Ошибка API: %{message}'
+      balance: Баланс
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип счёта для каждого счёта Mercury:'
+      create_accounts: Создать счета
+      creating_accounts: Создание счетов...
+      fetch_failed: Не удалось получить счета
+      historical_data_range: 'Диапазон исторических данных:'
+      no_accounts_to_setup: Нет счетов для настройки
+      no_api_token: API токен Mercury не настроен. Пожалуйста, проверьте настройки
+        подключения.
+      subtitle: Выберите правильные типы счетов для ваших импортированных счетов
+      subtype_labels:
+        credit_card: ''
+        depository: 'Подтип счёта:'
+        investment: 'Тип инвестиции:'
+        loan: 'Тип кредита:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Кредитные карты будут автоматически настроены как счета кредитных
+          карт.
+        other_asset: Дополнительные параметры для других активов не требуются.
+      subtypes:
+        depository:
+          cd: Депозитный сертификат
+          checking: Текущий
+          hsa: Счёт медицинских сбережений
+          money_market: Денежный рынок
+          savings: Сберегательный
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: План 529
+          angel: Ангел
+          brokerage: Брокерский
+          hsa: Счёт медицинских сбережений
+          ira: Традиционная IRA
+          mutual_fund: Паевой инвестиционный фонд
+          pension: Пенсионный
+          retirement: Пенсионный
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: План сбережений
+        loan:
+          auto: Автокредит
+          mortgage: Ипотека
+          other: Другой кредит
+          student: Студенческий кредит
+      sync_start_date_help: Выберите, насколько далеко назад вы хотите синхронизировать
+        историю операций. Максимум доступно 3 года истории.
+      sync_start_date_label: 'Начать синхронизацию операций с:'
+      title: Настройте ваши счета Mercury
+    setup_required:
+      api_token_description: Прежде чем связать счета Mercury, вам нужно настроить
+        ваш API токен Mercury.
+      api_token_not_configured: API токен не настроен
+      go_to_provider_settings: Перейти в настройки провайдера
+      setup_step_1_html: Перейдите в <strong>Настройки > Провайдеры</strong>
+      setup_step_2_html: Найдите раздел <strong>Mercury</strong>
+      setup_step_3: Введите ваш API токен Mercury
+      setup_step_4: Вернитесь сюда, чтобы связать ваши счета
+      setup_steps_title: 'Шаги настройки:'
+      title: Требуется настройка Mercury
+    sync:
+      success: Синхронизация начата
+    update:
+      success: Подключение к Mercury обновлено
diff --git a/config/locales/views/mercury_items/tr.yml b/config/locales/views/mercury_items/tr.yml
new file mode 100644
index 000000000..29ce346ab
--- /dev/null
+++ b/config/locales/views/mercury_items/tr.yml
@@ -0,0 +1,231 @@
+---
+tr:
+  mercury_items:
+    api_error:
+      check_provider_settings: Sağlayıcı Ayarlarını Kontrol Et
+      common_issues: 'Yaygın Sorunlar:'
+      expired_credentials_desc: Mercury'den yeni bir API token'ı oluşturun
+      expired_credentials_label: Süresi Dolmuş Kimlik Bilgileri
+      insufficient_permissions_desc: Token'ınızın salt okunur erişime sahip olduğundan
+        emin olun
+      insufficient_permissions_label: Yetersiz İzinler
+      invalid_api_token_desc: Sağlayıcı Ayarlarında API token'ınızı kontrol edin
+      invalid_api_token_label: Geçersiz API Token
+      network_issue_desc: İnternet bağlantınızı kontrol edin
+      network_issue_label: Ağ Sorunu
+      service_down_desc: Mercury API geçici olarak kullanılamıyor olabilir
+      service_down_label: Servis Kapalı
+      title: Mercury Bağlantı Hatası
+      unable_to_connect: Mercury'ye bağlanılamıyor
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hiçbir hesap oluşturulmadı.
+      creation_failed: 'Hesaplar oluşturulamadı: %{error}'
+      no_accounts: Kurulacak hesap yok.
+      success: "%{count} hesap başarıyla oluşturuldu."
+    create:
+      success: Mercury bağlantısı başarıyla oluşturuldu
+    destroy:
+      success: Mercury bağlantısı kaldırıldı
+    index:
+      title: Mercury Bağlantıları
+    link_accounts:
+      all_already_linked:
+        one: Seçilen hesap (%{names}) zaten bağlı
+        other: "%{count} seçilen hesabın tümü zaten bağlı: %{names}"
+      api_error: 'API hatası: %{message}'
+      invalid_account_names:
+        one: Boş isimli hesap bağlanamaz
+        other: Boş isimli %{count} hesap bağlanamaz
+      link_failed: Hesaplar bağlanamadı
+      no_accounts_selected: Lütfen en az bir hesap seçin
+      no_api_token: Mercury API token'ı bulunamadı. Lütfen Sağlayıcı Ayarlarında yapılandırın.
+      partial_invalid: "%{created_count} hesap başarıyla bağlandı, %{already_linked_count}
+        hesap zaten bağlıydı, %{invalid_count} hesabın adı geçersizdi"
+      partial_success: "%{created_count} hesap başarıyla bağlandı. %{already_linked_count}
+        hesap zaten bağlıydı: %{already_linked_names}"
+      select_connection: Hesapları bağlamadan önce bir Mercury bağlantısı seçin.
+      success:
+        one: "%{count} hesap başarıyla bağlandı"
+        other: "%{count} hesap başarıyla bağlandı"
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      api_error: 'API hatası: %{message}'
+      invalid_account_name: Boş isimli hesap bağlanamaz
+      mercury_account_already_linked: Bu Mercury hesabı zaten başka bir hesaba bağlı
+      mercury_account_not_found: Mercury hesabı bulunamadı
+      missing_parameters: Gerekli parametreler eksik
+      no_api_token: Mercury API token'ı bulunamadı. Lütfen Sağlayıcı Ayarlarında yapılandırın.
+      select_connection: Hesapları bağlamadan önce bir Mercury bağlantısı seçin.
+      success: "%{account_name} Mercury ile başarıyla bağlandı"
+    loading:
+      loading_message: Mercury hesapları yükleniyor...
+      loading_title: Yükleniyor
+    mercury_item:
+      accounts_need_setup: Hesapların kurulumu gerekiyor
+      delete: Bağlantıyı sil
+      deletion_in_progress: silme işlemi devam ediyor...
+      error: Hata
+      no_accounts_description: Bu bağlantının henüz bağlı hesabı yok.
+      no_accounts_title: Hesap yok
+      setup_action: Yeni Hesapları Kur
+      setup_description: "%{total} hesaptan %{linked} tanesi bağlandı. Yeni içe aktarılan
+        Mercury hesaplarınız için hesap türlerini seçin."
+      setup_needed: Kurulmaya hazır yeni hesaplar var
+      status: "%{timestamp} önce eşitlendi"
+      status_never: Hiç eşitlenmedi
+      status_with_summary: Son eşitleme %{timestamp} önce - %{summary}
+      syncing: Eşitleniyor...
+      total: Toplam
+      unlinked: Bağlantısız
+    mercury_item_selection_error_payload:
+      select_connection: Hesapları yüklemeden önce bir Mercury bağlantısı seçin.
+    provider_connection:
+      default_description: Mercury üzerinden bankanıza bağlanın
+      default_name: Mercury
+      description: "%{name} kullanarak bağlan"
+      name: Mercury - %{name}
+    provider_panel:
+      add_connection: Mercury bağlantısı ekle
+      base_url_label: Temel URL (isteğe bağlı)
+      base_url_placeholder: https://api.mercury.com/api/v1 (varsayılan)
+      connection_name_label: Bağlantı adı
+      connection_name_placeholder: İşletme vadesiz hesabı
+      default_connection_name: Mercury Bağlantısı
+      disconnect_confirm: "%{name} bağlantısı kesilsin mi?"
+      instructions:
+        copy_token_html: "<strong>Tam token'ı</strong> (<code>secret-token:</code>
+          ön ekiyle birlikte) kopyalayın ve aşağıya adlandırılmış bir bağlantı olarak
+          ekleyin"
+        create_token: '"Salt Okunur" erişimle yeni bir API token''ı oluşturun'
+        open_tokens: Ayarlar > Geliştirici > API Token'ları bölümüne gidin
+        sign_in_html: "%{link} adresini ziyaret edin ve bağlamak istediğiniz hesaba
+          giriş yapın"
+        whitelist_ip_html: "<strong>Önemli:</strong> Sunucunuzun IP adresini token'ın
+          beyaz listesine ekleyin"
+      keep_token_placeholder: Mevcut token'ı korumak için boş bırakın
+      sandbox_note_html: Senkronize etmek istediğiniz her Mercury girişi/API token'ı
+        için ayrı, adlandırılmış bir bağlantı kullanın. Sandbox testi için Temel URL
+        olarak <code>https://api-sandbox.mercury.com/api/v1</code> kullanın. Mercury,
+        IP beyaz listeye alınmasını gerektirir - IP'nizi Mercury panosuna eklediğinizden
+        emin olun.
+      setup_accounts: Hesapları kur
+      setup_title: 'Kurulum talimatları:'
+      sync: Eşitle
+      token_label: Token
+      token_placeholder: Token'ı buraya yapıştırın
+      update_connection: Bağlantıyı güncelle
+    render_mercury_item_selection_failure:
+      no_credentials_configured: Lütfen önce Sağlayıcı Ayarlarında Mercury API token'ınızı
+        yapılandırın.
+      select_connection: Sağlayıcı Ayarlarında bir Mercury bağlantısı seçin.
+    select_accounts:
+      accounts_selected: hesap seçildi
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_mercury: İçe aktarılamıyor - lütfen Mercury'de hesap adını
+        yapılandırın
+      description: "%{product_name} hesabınıza bağlamak istediğiniz hesapları seçin."
+      link_accounts: Seçilen hesapları bağla
+      no_accounts_found: Hesap bulunamadı. Lütfen API token yapılandırmanızı kontrol
+        edin.
+      no_api_token: Mercury API token'ı yapılandırılmamış. Lütfen Ayarlar'da yapılandırın.
+      no_credentials_configured: Lütfen önce Sağlayıcı Ayarlarında Mercury API token'ınızı
+        yapılandırın.
+      no_name_placeholder: "(İsim yok)"
+      select_connection: Sağlayıcı Ayarlarında bir Mercury bağlantısı seçin.
+      title: Mercury Hesaplarını Seç
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      all_accounts_already_linked: Tüm Mercury hesapları zaten bağlı
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_mercury: İçe aktarılamıyor - lütfen Mercury'de hesap adını
+        yapılandırın
+      description: Bu hesapla bağlamak için bir Mercury hesabı seçin. İşlemler otomatik
+        olarak eşitlenecek ve yinelenenler kaldırılacaktır.
+      link_account: Hesabı bağla
+      no_account_specified: Hesap belirtilmedi
+      no_accounts_found: Mercury hesabı bulunamadı. Lütfen API token yapılandırmanızı
+        kontrol edin.
+      no_api_token: Mercury API token'ı yapılandırılmamış. Lütfen Ayarlar'da yapılandırın.
+      no_credentials_configured: Lütfen önce Sağlayıcı Ayarlarında Mercury API token'ınızı
+        yapılandırın.
+      no_name_placeholder: "(İsim yok)"
+      select_connection: Sağlayıcı Ayarlarında bir Mercury bağlantısı seçin.
+      title: "%{account_name} hesabını Mercury ile bağla"
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      account_types:
+        credit_card: Kredi Kartı
+        depository: Vadesiz veya Vadeli Hesap
+        investment: Yatırım Hesabı
+        loan: Kredi veya İpotek
+        other_asset: Diğer Varlık
+        skip: Bu hesabı atla
+      all_accounts_linked: Tüm Mercury hesaplarınız zaten kuruldu.
+      api_error: 'API hatası: %{message}'
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her Mercury hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating_accounts: Hesaplar Oluşturuluyor...
+      fetch_failed: Hesaplar Getirilemedi
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      no_accounts_to_setup: Kurulacak Hesap Yok
+      no_api_token: Mercury API token'ı yapılandırılmamış. Lütfen bağlantı ayarlarınızı
+        kontrol edin.
+      subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      subtype_labels:
+        credit_card: ''
+        depository: 'Hesap Alt Türü:'
+        investment: 'Yatırım Türü:'
+        loan: 'Kredi Türü:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Kredi kartları otomatik olarak kredi kartı hesapları olarak kurulacaktır.
+        other_asset: Diğer Varlıklar için ek seçenek gerekmez.
+      subtypes:
+        depository:
+          cd: Vadeli Mevduat Sertifikası
+          checking: Vadesiz Hesap
+          hsa: Sağlık Tasarruf Hesabı
+          money_market: Para Piyasası
+          savings: Tasarruf Hesabı
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: 529 Plan
+          angel: Melek Yatırım
+          brokerage: Aracı Kurum Hesabı
+          hsa: Sağlık Tasarruf Hesabı
+          ira: Geleneksel IRA
+          mutual_fund: Yatırım Fonu
+          pension: Emeklilik
+          retirement: Emeklilik Hesabı
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Thrift Savings Plan
+        loan:
+          auto: Taşıt Kredisi
+          mortgage: İpotek
+          other: Diğer Kredi
+          student: Öğrenci Kredisi
+      sync_start_date_help: İşlem geçmişini ne kadar geriye kadar eşitlemek istediğinizi
+        seçin. En fazla 3 yıllık geçmiş mevcuttur.
+      sync_start_date_label: 'İşlemleri şu tarihten itibaren eşitlemeye başla:'
+      title: Mercury Hesaplarınızı Kurun
+    setup_required:
+      api_token_description: Mercury hesaplarını bağlayabilmeniz için önce Mercury
+        API token'ınızı yapılandırmanız gerekir.
+      api_token_not_configured: API Token Yapılandırılmamış
+      go_to_provider_settings: Sağlayıcı Ayarlarına Git
+      setup_step_1_html: "<strong>Ayarlar > Sağlayıcılar</strong> bölümüne gidin"
+      setup_step_2_html: "<strong>Mercury</strong> bölümünü bulun"
+      setup_step_3: Mercury API token'ınızı girin
+      setup_step_4: Hesaplarınızı bağlamak için buraya dönün
+      setup_steps_title: 'Kurulum Adımları:'
+      title: Mercury Kurulumu Gerekli
+    sync:
+      success: Eşitleme başlatıldı
+    update:
+      success: Mercury bağlantısı güncellendi
diff --git a/config/locales/views/messages/de.yml b/config/locales/views/messages/de.yml
new file mode 100644
index 000000000..17e199c34
--- /dev/null
+++ b/config/locales/views/messages/de.yml
@@ -0,0 +1,6 @@
+---
+de:
+  messages:
+    chat_form:
+      placeholder: "Fragen Sie irgendetwas ..."
+      disclaimer: "KI-Antworten dienen nur zur Information. Keine Finanzberatung!"
diff --git a/config/locales/views/messages/es.yml b/config/locales/views/messages/es.yml
new file mode 100644
index 000000000..b5d1a4924
--- /dev/null
+++ b/config/locales/views/messages/es.yml
@@ -0,0 +1,6 @@
+---
+es:
+  messages:
+    chat_form:
+      placeholder: "Pregunta lo que quieras ..."
+      disclaimer: "Las respuestas de la IA son solo informativas. ¡No constituyen asesoramiento financiero!"
diff --git a/config/locales/views/messages/fr.yml b/config/locales/views/messages/fr.yml
new file mode 100644
index 000000000..c42098e3c
--- /dev/null
+++ b/config/locales/views/messages/fr.yml
@@ -0,0 +1,7 @@
+---
+fr:
+  messages:
+    chat_form:
+      disclaimer: Les réponses de l’IA sont uniquement informatives. Pas de conseils
+        financiers !
+      placeholder: Demandez n'importe quoi...
diff --git a/config/locales/views/messages/it.yml b/config/locales/views/messages/it.yml
new file mode 100644
index 000000000..7c60f4f89
--- /dev/null
+++ b/config/locales/views/messages/it.yml
@@ -0,0 +1,6 @@
+---
+it:
+  messages:
+    chat_form:
+      placeholder: "Chiedi qualsiasi cosa ..."
+      disclaimer: "Le risposte IA sono solo informative. Non costituiscono consulenza finanziaria!"
diff --git a/config/locales/views/messages/nl.yml b/config/locales/views/messages/nl.yml
new file mode 100644
index 000000000..29a4d2ecb
--- /dev/null
+++ b/config/locales/views/messages/nl.yml
@@ -0,0 +1,6 @@
+---
+nl:
+  messages:
+    chat_form:
+      placeholder: "Vraag wat u wilt ..."
+      disclaimer: "AI-antwoorden zijn alleen informatief. Geen financieel advies!"
diff --git a/config/locales/views/messages/pl.yml b/config/locales/views/messages/pl.yml
new file mode 100644
index 000000000..0b8b90dbb
--- /dev/null
+++ b/config/locales/views/messages/pl.yml
@@ -0,0 +1,6 @@
+---
+pl:
+  messages:
+    chat_form:
+      placeholder: "Zapytaj o cokolwiek..."
+      disclaimer: "Odpowiedzi AI mają charakter wyłącznie informacyjny. To nie są porady finansowe!"
diff --git a/config/locales/views/messages/pt-BR.yml b/config/locales/views/messages/pt-BR.yml
new file mode 100644
index 000000000..b4779fe6d
--- /dev/null
+++ b/config/locales/views/messages/pt-BR.yml
@@ -0,0 +1,6 @@
+---
+pt-BR:
+  messages:
+    chat_form:
+      placeholder: "Pergunte qualquer coisa ..."
+      disclaimer: "As respostas da IA são apenas informativas. Não constituem aconselhamento financeiro!"
diff --git a/config/locales/views/messages/ru.yml b/config/locales/views/messages/ru.yml
new file mode 100644
index 000000000..95a4c6999
--- /dev/null
+++ b/config/locales/views/messages/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  messages:
+    chat_form:
+      disclaimer: Ответы ИИ носят исключительно информационный характер. Это не финансовая
+        консультация!
+      placeholder: Спросите что угодно ...
diff --git a/config/locales/views/messages/tr.yml b/config/locales/views/messages/tr.yml
new file mode 100644
index 000000000..3e64d4e30
--- /dev/null
+++ b/config/locales/views/messages/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  messages:
+    chat_form:
+      disclaimer: AI yanıtları yalnızca bilgilendirme amaçlıdır. Finansal tavsiye
+        değildir!
+      placeholder: Herhangi bir şey sorun ...
diff --git a/config/locales/views/mfa/fr.yml b/config/locales/views/mfa/fr.yml
index e01939430..8154b55bc 100644
--- a/config/locales/views/mfa/fr.yml
+++ b/config/locales/views/mfa/fr.yml
@@ -2,12 +2,12 @@
 fr:
   mfa:
     backup_codes:
-      backup_codes_description: Chaque code ne peut être utilisé qu'une seule fois. Gardez ces codes
-        en sécurité et protégés.
+      backup_codes_description: Chaque code ne peut être utilisé qu'une seule fois.
+        Gardez ces codes en sécurité et protégés.
       backup_codes_title: Vos Codes de Sauvegarde
       continue: Continuer vers les paramètres de sécurité
-      description: Enregistrez ces codes de sauvegarde dans un endroit sûr - vous en aurez besoin si
-        vous perdez l'accès à votre application d'authentification.
+      description: Enregistrez ces codes de sauvegarde dans un endroit sûr - vous
+        en aurez besoin si vous perdez l'accès à votre application d'authentification.
       page_title: Codes de Sauvegarde
       title: Enregistrer vos Codes de Sauvegarde
     create:
@@ -17,13 +17,14 @@ fr:
     new:
       code_label: Code de vérification
       code_placeholder: Saisissez un code à 6 chiffres
-      description: Améliorez la sécurité de votre compte en configurant l'authentification à deux facteurs.
+      description: Améliorez la sécurité de votre compte en configurant l'authentification
+        à deux facteurs.
       page_title: Configuration de l'authentification à deux facteurs
-      scan_description: Utilisez une application d'authentification comme Google Authenticator ou 1Password
-        pour scanner ce code QR.
+      scan_description: Utilisez une application d'authentification comme Google Authenticator
+        ou 1Password pour scanner ce code QR.
       scan_title: 1. Scanner le code QR
-      secret_description: Si vous ne pouvez pas scanner le code QR, entrez cette clé secrète manuellement
-        dans votre application d'authentification.
+      secret_description: Si vous ne pouvez pas scanner le code QR, entrez cette clé
+        secrète manuellement dans votre application d'authentification.
       secret_title: Clé secrète (saisie manuelle)
       title: Configurer l’authentification à deux facteurs
       verify_button: Vérifier et activer l’authentification à deux facteurs
@@ -31,8 +32,18 @@ fr:
       verify_title: 2. Saisissez le code de vérification
     verify:
       description: Entrez le code de votre application d'authentification pour continuer.
+      or: ou
       page_title: Vérifier l'Authentification à Deux Facteurs
       title: Authentification à Deux Facteurs
       verify_button: Vérifier
+      webauthn_button: Utiliser un mot de passe ou une clé de sécurité
+      webauthn_unsupported: Ce navigateur ne prend pas en charge les mots de passe
+        ou les clés de sécurité.
     verify_code:
       invalid_code: Code d'authentification invalide. Veuillez essayer à nouveau.
+    verify_webauthn:
+      invalid_credential: Impossible de vérifier ce mot de passe ou cette clé de sécurité.
+        Veuillez réessayer.
+    webauthn_options:
+      unavailable: Aucun mot de passe ou clé de sécurité n'est disponible pour ce
+        compte.
diff --git a/config/locales/views/mfa/it.yml b/config/locales/views/mfa/it.yml
new file mode 100644
index 000000000..e374a9191
--- /dev/null
+++ b/config/locales/views/mfa/it.yml
@@ -0,0 +1,41 @@
+---
+it:
+  mfa:
+    backup_codes:
+      backup_codes_description: Ogni codice può essere usato una sola volta. Tieni questi codici al sicuro.
+      backup_codes_title: I tuoi codici di backup
+      continue: Continua alle Impostazioni di Sicurezza
+      description: Conserva questi codici di backup in un posto sicuro — ne avrai bisogno se perdi l'accesso alla tua app di autenticazione
+      page_title: Codici di backup
+      title: Salva i tuoi codici di backup
+    create:
+      invalid_code: Codice di verifica non valido. Riprova.
+    disable:
+      success: L'autenticazione a due fattori è stata disabilitata
+    new:
+      code_label: Codice di verifica
+      code_placeholder: Inserisci il codice a 6 cifre
+      description: Migliora la sicurezza del tuo account configurando l'autenticazione a due fattori
+      page_title: Configurazione autenticazione a due fattori
+      scan_description: Usa un'app di autenticazione come Google Authenticator o 1Password per scansionare questo QR code
+      scan_title: 1. Scansiona il QR Code
+      secret_description: Se non riesci a scansionare il QR code, inserisci manualmente questa chiave segreta nella tua app di autenticazione
+      secret_title: Codice per inserimento manuale
+      title: Configura l'autenticazione a due fattori
+      verify_button: Verifica e abilita 2FA
+      verify_description: Inserisci il codice a 6 cifre dalla tua app di autenticazione
+      verify_title: 2. Inserisci il codice di verifica
+    verify:
+      description: Inserisci il codice dalla tua app di autenticazione per continuare
+      or: oppure
+      page_title: Verifica autenticazione a due fattori
+      title: Autenticazione a due fattori
+      verify_button: Verifica
+      webauthn_button: Usa passkey o chiave di sicurezza
+      webauthn_unsupported: Questo browser non supporta passkey o chiavi di sicurezza.
+    verify_code:
+      invalid_code: Codice di autenticazione non valido. Riprova.
+    verify_webauthn:
+      invalid_credential: Impossibile verificare la passkey o la chiave di sicurezza. Riprova.
+    webauthn_options:
+      unavailable: Nessuna passkey o chiave di sicurezza disponibile per questo account.
diff --git a/config/locales/views/mfa/ru.yml b/config/locales/views/mfa/ru.yml
new file mode 100644
index 000000000..788aab9d1
--- /dev/null
+++ b/config/locales/views/mfa/ru.yml
@@ -0,0 +1,46 @@
+---
+ru:
+  mfa:
+    backup_codes:
+      backup_codes_description: Каждый код можно использовать только один раз. Храните
+        эти коды в безопасности.
+      backup_codes_title: Ваши резервные коды
+      continue: Перейти к настройкам безопасности
+      description: Сохраните эти резервные коды в безопасном месте — они понадобятся
+        вам, если вы потеряете доступ к приложению-аутентификатору
+      page_title: Резервные коды
+      title: Сохраните ваши резервные коды
+    create:
+      invalid_code: Неверный код подтверждения. Пожалуйста, попробуйте снова.
+    disable:
+      success: Двухфакторная аутентификация отключена
+    new:
+      code_label: Код подтверждения
+      code_placeholder: Введите 6-значный код
+      description: Повышайте безопасность вашего счёта, настроив двухфакторную аутентификацию
+      page_title: Настройка двухфакторной аутентификации
+      scan_description: Используйте приложение-аутентификатор, такое как Google Authenticator
+        или 1Password, чтобы сканировать этот QR-код
+      scan_title: 1. Сканируйте QR-код
+      secret_description: Если вы не можете сканировать QR-код, введите этот секретный
+        ключ вручную в вашем приложении-аутентификаторе
+      secret_title: Код для ручного ввода
+      title: Настройте двухфакторную аутентификацию
+      verify_button: Подтвердить и включить 2FA
+      verify_description: Введите 6-значный код из вашего приложения-аутентификатора
+      verify_title: 2. Введите код подтверждения
+    verify:
+      description: Введите код из вашего приложения-аутентификатора, чтобы продолжить
+      or: или
+      page_title: Подтверждение двухфакторной аутентификации
+      title: Двухфакторная аутентификация
+      verify_button: Подтвердить
+      webauthn_button: Использовать ключ доступа или ключ безопасности
+      webauthn_unsupported: Этот браузер не поддерживает ключи доступа или ключи безопасности.
+    verify_code:
+      invalid_code: Неверный код аутентификации. Пожалуйста, попробуйте снова.
+    verify_webauthn:
+      invalid_credential: Не удалось подтвердить ключ доступа или ключ безопасности.
+        Пожалуйста, попробуйте снова.
+    webauthn_options:
+      unavailable: Для этого счёта нет доступных ключей доступа или ключей безопасности.
diff --git a/config/locales/views/mfa/tr.yml b/config/locales/views/mfa/tr.yml
index d9ad8f1fe..c303aaf8a 100644
--- a/config/locales/views/mfa/tr.yml
+++ b/config/locales/views/mfa/tr.yml
@@ -2,10 +2,12 @@
 tr:
   mfa:
     backup_codes:
-      backup_codes_description: Her kod yalnızca bir kez kullanılabilir. Bu kodları güvenli ve emniyetli bir yerde saklayın.
+      backup_codes_description: Her kod yalnızca bir kez kullanılabilir. Bu kodları
+        güvenli ve emniyetli bir yerde saklayın.
       backup_codes_title: Yedek Kodlarınız
       continue: Güvenlik Ayarlarına Devam Et
-      description: Bu yedek kodları güvenli bir yerde saklayın - doğrulama uygulamanıza erişiminizi kaybederseniz bunlara ihtiyacınız olacak
+      description: Bu yedek kodları güvenli bir yerde saklayın - doğrulama uygulamanıza
+        erişiminizi kaybederseniz bunlara ihtiyacınız olacak
       page_title: Yedek Kodlar
       title: Yedek Kodlarınızı Kaydedin
     create:
@@ -17,9 +19,11 @@ tr:
       code_placeholder: 6 haneli kodu girin
       description: Hesabınızın güvenliğini iki faktörlü kimlik doğrulama ile artırın
       page_title: İki Faktörlü Kimlik Doğrulama Kurulumu
-      scan_description: Bu QR kodunu taramak için Google Authenticator veya 1Password gibi bir doğrulama uygulaması kullanın
+      scan_description: Bu QR kodunu taramak için Google Authenticator veya 1Password
+        gibi bir doğrulama uygulaması kullanın
       scan_title: 1. QR Kodunu Tara
-      secret_description: QR kodunu tarayamıyorsanız, bu gizli anahtarı doğrulama uygulamanıza manuel olarak girin
+      secret_description: QR kodunu tarayamıyorsanız, bu gizli anahtarı doğrulama
+        uygulamanıza manuel olarak girin
       secret_title: Manuel Giriş Kodu
       title: İki Faktörlü Kimlik Doğrulamayı Kur
       verify_button: Doğrula ve 2FA'yı Etkinleştir
@@ -27,8 +31,18 @@ tr:
       verify_title: 2. Doğrulama Kodunu Girin
     verify:
       description: Devam etmek için doğrulama uygulamanızdan kodu girin
+      or: veya
       page_title: İki Faktörlü Kimlik Doğrulamayı Doğrula
       title: İki Faktörlü Kimlik Doğrulama
       verify_button: Doğrula
+      webauthn_button: Geçiş anahtarı veya güvenlik anahtarı kullan
+      webauthn_unsupported: Bu tarayıcı geçiş anahtarlarını veya güvenlik anahtarlarını
+        desteklemiyor.
     verify_code:
-      invalid_code: Geçersiz kimlik doğrulama kodu. Lütfen tekrar deneyin.
\ No newline at end of file
+      invalid_code: Geçersiz kimlik doğrulama kodu. Lütfen tekrar deneyin.
+    verify_webauthn:
+      invalid_credential: Bu geçiş anahtarı veya güvenlik anahtarı doğrulanamadı.
+        Lütfen tekrar deneyin.
+    webauthn_options:
+      unavailable: Bu hesap için kullanılabilir geçiş anahtarı veya güvenlik anahtarı
+        yok.
diff --git a/config/locales/views/oidc_accounts/fr.yml b/config/locales/views/oidc_accounts/fr.yml
index 771ee1884..c9d92a2e9 100644
--- a/config/locales/views/oidc_accounts/fr.yml
+++ b/config/locales/views/oidc_accounts/fr.yml
@@ -1,34 +1,48 @@
 ---
 fr:
   oidc_accounts:
+    create_link:
+      no_pending_oidc: Aucune authentification OIDC en attente trouvée
+    create_user:
+      account_created: Bienvenue ! Votre compte a été créé.
+      account_creation_disabled: La création de compte SSO est désactivée. Veuillez
+        contacter un administrateur.
+      no_pending_oidc: Aucune authentification OIDC en attente trouvée
     link:
-      title_link: Associer un compte OIDC
-      title_create: Créer un compte
-      verify_heading: Vérifier votre identité
-      verify_description_html: "Pour associer votre compte %{provider}%{email_suffix}, veuillez vérifier votre identité en saisissant votre mot de passe."
-      email_suffix_html: " (<strong>%{email}</strong>)"
+      account_creation_disabled: La création de compte via l'authentification unique
+        est désactivée. Veuillez contacter un administrateur.
+      cancel: Annuler
+      create_description_html: Aucun compte trouvé avec l'adresse e-mail <strong>%{email}</strong>.
+        Cliquez ci-dessous pour créer un nouveau compte avec votre identité %{provider}.
+      create_heading: Créer un nouveau compte
       email_label: Adresse e-mail
       email_placeholder: Saisissez votre adresse e-mail
+      email_suffix_html: " (<strong>%{email}</strong>)"
+      info_email: 'E-mail :'
+      info_name: 'Nom :'
+      no_pending_oidc: Aucune authentification OIDC en attente trouvée
       password_label: Mot de passe
       password_placeholder: Saisissez votre mot de passe
-      verify_hint: Cela garantit que vous seul pouvez associer des comptes externes à votre profil.
-      submit_link: Associer le compte
-      create_heading: Créer un nouveau compte
-      create_description_html: "Aucun compte trouvé avec l'adresse e-mail <strong>%{email}</strong>. Cliquez ci-dessous pour créer un nouveau compte avec votre identité %{provider}."
-      info_email: "E-mail :"
-      info_name: "Nom :"
-      submit_create: Créer un compte
       submit_accept_invitation: Accepter l'invitation
-      account_creation_disabled: La création de compte via l'authentification unique est désactivée. Veuillez contacter un administrateur.
-      cancel: Annuler
+      submit_create: Créer un compte
+      submit_link: Associer le compte
+      title_create: Créer un compte
+      title_link: Associer un compte OIDC
+      verify_description_html: Pour associer votre compte %{provider}%{email_suffix},
+        veuillez vérifier votre identité en saisissant votre mot de passe.
+      verify_heading: Vérifier votre identité
+      verify_hint: Cela garantit que vous seul pouvez associer des comptes externes
+        à votre profil.
     new_user:
-      title: Compléter votre compte
-      heading: Créer votre compte
-      description: Veuillez confirmer vos informations pour finaliser la création de compte avec votre identité %{provider}.
+      cancel: Annuler
+      description: Veuillez confirmer vos informations pour finaliser la création
+        de compte avec votre identité %{provider}.
       email_label: E-mail (du fournisseur SSO)
       first_name_label: Prénom
       first_name_placeholder: Saisissez votre prénom
+      heading: Créer votre compte
       last_name_label: Nom de famille
       last_name_placeholder: Saisissez votre nom de famille
+      no_pending_oidc: Aucune authentification OIDC en attente trouvée
       submit: Créer un compte
-      cancel: Annuler
+      title: Compléter votre compte
diff --git a/config/locales/views/oidc_accounts/it.yml b/config/locales/views/oidc_accounts/it.yml
new file mode 100644
index 000000000..add156784
--- /dev/null
+++ b/config/locales/views/oidc_accounts/it.yml
@@ -0,0 +1,42 @@
+---
+it:
+  oidc_accounts:
+    link:
+      no_pending_oidc: Nessuna autenticazione OIDC in sospeso trovata
+      title_link: Collega account OIDC
+      title_create: Crea account
+      verify_heading: Verifica la tua identità
+      verify_description_html: "Per collegare il tuo account %{provider}%{email_suffix}, verifica la tua identità inserendo la tua password."
+      email_suffix_html: " (<strong>%{email}</strong>)"
+      email_label: Email
+      email_placeholder: Inserisci la tua email
+      password_label: Password
+      password_placeholder: Inserisci la tua password
+      verify_hint: Questo aiuta a garantire che solo tu possa collegare account esterni al tuo profilo.
+      submit_link: Collega account
+      create_heading: Crea nuovo account
+      create_description_html: "Nessun account trovato con l'email <strong>%{email}</strong>. Clicca qui sotto per creare un nuovo account usando la tua identità %{provider}."
+      info_email: "Email:"
+      info_name: "Nome:"
+      submit_create: Crea account
+      submit_accept_invitation: Accetta invito
+      account_creation_disabled: La creazione di nuovi account tramite single sign-on è disabilitata. Contatta un amministratore per creare il tuo account.
+      cancel: Annulla
+    create_link:
+      no_pending_oidc: Nessuna autenticazione OIDC in sospeso trovata
+    new_user:
+      no_pending_oidc: Nessuna autenticazione OIDC in sospeso trovata
+      title: Completa il tuo account
+      heading: Crea il tuo account
+      description: Conferma i tuoi dettagli per completare la creazione dell'account con la tua identità %{provider}.
+      email_label: Email (dal provider SSO)
+      first_name_label: Nome
+      first_name_placeholder: Inserisci il tuo nome
+      last_name_label: Cognome
+      last_name_placeholder: Inserisci il tuo cognome
+      submit: Crea account
+      cancel: Annulla
+    create_user:
+      no_pending_oidc: Nessuna autenticazione OIDC in sospeso trovata
+      account_creation_disabled: La creazione di account SSO è disabilitata. Contatta un amministratore.
+      account_created: "Benvenuto! Il tuo account è stato creato."
diff --git a/config/locales/views/oidc_accounts/ru.yml b/config/locales/views/oidc_accounts/ru.yml
new file mode 100644
index 000000000..f380c47c6
--- /dev/null
+++ b/config/locales/views/oidc_accounts/ru.yml
@@ -0,0 +1,49 @@
+---
+ru:
+  oidc_accounts:
+    create_link:
+      no_pending_oidc: Не найдено ожидающей аутентификации OIDC
+    create_user:
+      account_created: Добро пожаловать! Ваш аккаунт был создан.
+      account_creation_disabled: Создание аккаунтов через SSO отключено. Пожалуйста,
+        свяжитесь с администратором.
+      no_pending_oidc: Не найдено ожидающей аутентификации OIDC
+    link:
+      account_creation_disabled: Создание новых аккаунтов через единый вход отключено.
+        Пожалуйста, свяжитесь с администратором для создания вашего аккаунта.
+      cancel: Отмена
+      create_description_html: Аккаунт с электронной почтой <strong>%{email}</strong>
+        не найден. Нажмите ниже, чтобы создать новый аккаунт, используя вашу идентификацию
+        %{provider}.
+      create_heading: Создать новый счёт
+      email_label: Электронная почта
+      email_placeholder: Введите вашу электронную почту
+      email_suffix_html: " (<strong>%{email}</strong>)"
+      info_email: 'Электронная почта:'
+      info_name: 'Имя:'
+      no_pending_oidc: Не найдено ожидающей аутентификации OIDC
+      password_label: Пароль
+      password_placeholder: Введите ваш пароль
+      submit_accept_invitation: Принять приглашение
+      submit_create: Создать счёт
+      submit_link: Привязать аккаунт
+      title_create: Создать счёт
+      title_link: Привязать OIDC аккаунт
+      verify_description_html: Чтобы привязать ваш аккаунт %{provider}%{email_suffix},
+        пожалуйста, подтвердите вашу личность, введя пароль.
+      verify_heading: Подтвердите вашу личность
+      verify_hint: Это помогает убедиться, что только вы можете привязывать внешние
+        аккаунты к вашему профилю.
+    new_user:
+      cancel: Отмена
+      description: Пожалуйста, подтвердите ваши данные для завершения создания аккаунта
+        с вашей идентификацией %{provider}.
+      email_label: Электронная почта (от поставщика SSO)
+      first_name_label: Имя
+      first_name_placeholder: Введите ваше имя
+      heading: Создайте ваш аккаунт
+      last_name_label: Фамилия
+      last_name_placeholder: Введите вашу фамилию
+      no_pending_oidc: Не найдено ожидающей аутентификации OIDC
+      submit: Создать счёт
+      title: Завершите создание аккаунта
diff --git a/config/locales/views/oidc_accounts/tr.yml b/config/locales/views/oidc_accounts/tr.yml
index d7f0d6e28..e5a9181fd 100644
--- a/config/locales/views/oidc_accounts/tr.yml
+++ b/config/locales/views/oidc_accounts/tr.yml
@@ -1,33 +1,49 @@
 ---
 tr:
   oidc_accounts:
+    create_link:
+      no_pending_oidc: Bekleyen OIDC kimlik doğrulaması bulunamadı
+    create_user:
+      account_created: Hoş geldiniz! Hesabınız oluşturuldu.
+      account_creation_disabled: SSO ile hesap oluşturma devre dışı. Lütfen bir yöneticiyle
+        iletişime geçin.
+      no_pending_oidc: Bekleyen OIDC kimlik doğrulaması bulunamadı
     link:
-      title_link: OIDC Hesabını Bağla
-      title_create: Hesap Oluştur
-      verify_heading: Kimliğinizi Doğrulayın
-      verify_description_html: "%{provider} hesabınızı%{email_suffix} bağlamak için şifrenizi girerek kimliğinizi doğrulayın."
-      email_suffix_html: " (<strong>%{email}</strong>)"
+      account_creation_disabled: Tek oturum açma ile hesap oluşturma devre dışı bırakıldı.
+        Lütfen bir yöneticiyle iletişime geçin.
+      cancel: İptal
+      create_description_html: "<strong>%{email}</strong> e-posta adresiyle bir hesap
+        bulunamadı. %{provider} kimliğinizle yeni bir hesap oluşturmak için aşağıya
+        tıklayın."
+      create_heading: Yeni Hesap Oluştur
       email_label: E-posta
       email_placeholder: E-posta adresinizi girin
+      email_suffix_html: " (<strong>%{email}</strong>)"
+      info_email: 'E-posta:'
+      info_name: 'Ad:'
+      no_pending_oidc: Bekleyen OIDC kimlik doğrulaması bulunamadı
       password_label: Şifre
       password_placeholder: Şifrenizi girin
-      verify_hint: Bu, yalnızca sizin harici hesapları profilinize bağlayabilmenizi sağlar.
-      submit_link: Hesabı Bağla
-      create_heading: Yeni Hesap Oluştur
-      create_description_html: "<strong>%{email}</strong> e-posta adresiyle bir hesap bulunamadı. %{provider} kimliğinizle yeni bir hesap oluşturmak için aşağıya tıklayın."
-      info_email: "E-posta:"
-      info_name: "Ad:"
+      submit_accept_invitation: Daveti Kabul Et
       submit_create: Hesap Oluştur
-      account_creation_disabled: Tek oturum açma ile hesap oluşturma devre dışı bırakıldı. Lütfen bir yöneticiyle iletişime geçin.
-      cancel: İptal
+      submit_link: Hesabı Bağla
+      title_create: Hesap Oluştur
+      title_link: OIDC Hesabını Bağla
+      verify_description_html: "%{provider} hesabınızı%{email_suffix} bağlamak için
+        şifrenizi girerek kimliğinizi doğrulayın."
+      verify_heading: Kimliğinizi Doğrulayın
+      verify_hint: Bu, yalnızca sizin harici hesapları profilinize bağlayabilmenizi
+        sağlar.
     new_user:
-      title: Hesabınızı Tamamlayın
-      heading: Hesabınızı Oluşturun
-      description: "%{provider} kimliğinizle hesap oluşturmayı tamamlamak için bilgilerinizi onaylayın."
+      cancel: İptal
+      description: "%{provider} kimliğinizle hesap oluşturmayı tamamlamak için bilgilerinizi
+        onaylayın."
       email_label: E-posta (SSO sağlayıcısından)
       first_name_label: Ad
       first_name_placeholder: Adınızı girin
+      heading: Hesabınızı Oluşturun
       last_name_label: Soyad
       last_name_placeholder: Soyadınızı girin
+      no_pending_oidc: Bekleyen OIDC kimlik doğrulaması bulunamadı
       submit: Hesap Oluştur
-      cancel: İptal
\ No newline at end of file
+      title: Hesabınızı Tamamlayın
diff --git a/config/locales/views/oidc_accounts/zh-CN.yml b/config/locales/views/oidc_accounts/zh-CN.yml
index 06668b929..cdb55d010 100644
--- a/config/locales/views/oidc_accounts/zh-CN.yml
+++ b/config/locales/views/oidc_accounts/zh-CN.yml
@@ -20,6 +20,8 @@ zh-CN:
       submit_create: 创建账户
       account_creation_disabled: 通过单点登录创建账户已禁用。请联系管理员。
       cancel: 取消
+      no_pending_oidc: 未找到待处理的 OIDC 认证。
+      submit_accept_invitation: 接受邀请
     new_user:
       title: 完善您的账户
       heading: 创建您的账户
@@ -30,4 +32,11 @@ zh-CN:
       last_name_label: 姓
       last_name_placeholder: 请输入您的姓
       submit: 创建账户
-      cancel: 取消
\ No newline at end of file
+      cancel: 取消
+      no_pending_oidc: 未找到待处理的 OIDC 认证。
+    create_link:
+      no_pending_oidc: 未找到待处理的 OIDC 认证。
+    create_user:
+      no_pending_oidc: 未找到待处理的 OIDC 认证。
+      account_creation_disabled: SSO 账户创建已禁用。请联系管理员。
+      account_created: 欢迎！你的账户已创建。
diff --git a/config/locales/views/onboardings/fr.yml b/config/locales/views/onboardings/fr.yml
index d93acd519..f147940ba 100644
--- a/config/locales/views/onboardings/fr.yml
+++ b/config/locales/views/onboardings/fr.yml
@@ -1,66 +1,74 @@
 ---
 fr:
   onboardings:
+    goals:
+      ai_insights: Laisser l'IA m'aider à comprendre mes finances
+      budgeting: Gérer les plans financiers et les budgets
+      cashflow: Comprendre les flux de trésorerie et les dépenses
+      investments: Suivre les investissements
+      optimization: Analyser et optimiser les comptes
+      partner: Gérer les finances avec un partenaire
+      reduce_stress: Réduire le stress financier ou l'anxiété
+      submit: Suivant
+      subtitle: Sélectionnez un ou plusieurs objectifs que vous souhaitez atteindre
+        avec %{product_name} comme outil de finances personnelles.
+      title: Qu'est-ce qui vous amène ici ?
+      unified_accounts: Voir tous mes comptes en un seul endroit
     header:
-      sign_out: Se déconnecter
-      setup: Configuration
-      preferences: Préférences
       goals: Objectifs
+      preferences: Préférences
+      setup: Configuration
+      sign_out: Se déconnecter
       start: Démarrer
     logout:
       sign_out: Se déconnecter
+    preferences:
+      color_theme: Thème de couleur
+      currency: Devise
+      date_format: Format de date
+      example: Compte exemple
+      locale: Langue
+      preview: Aperçu de l'affichage des données selon vos préférences.
+      submit: Terminer
+      subtitle: Configurons vos préférences.
+      theme_dark: Sombre
+      theme_light: Clair
+      theme_system: Système
+      title: Configurez vos préférences
     show:
-      title: Configurons votre compte
-      subtitle: Commençons par compléter votre profil.
+      country: Pays
       first_name: Prénom
       first_name_placeholder: Prénom
-      last_name: Nom de famille
-      last_name_placeholder: Nom de famille
       group_name: Nom du groupe
       group_name_placeholder: Nom du groupe
       household_name: Nom du foyer
       household_name_placeholder: Nom du foyer
-      moniker_prompt: "Vous utiliserez %{product_name} avec…"
-      moniker_family: Membres de la famille (seul ou avec votre partenaire, vos enfants, etc.)
-      moniker_group: Groupe de personnes (entreprise, club, association, ou tout autre type)
-      country: Pays
+      last_name: Nom de famille
+      last_name_placeholder: Nom de famille
+      moniker_family: Membres de la famille (seul ou avec votre partenaire, vos enfants,
+        etc.)
+      moniker_group: Groupe de personnes (entreprise, club, association, ou tout autre
+        type)
+      moniker_prompt: Vous utiliserez %{product_name} avec…
       submit: Continuer
-    preferences:
-      title: Configurez vos préférences
-      subtitle: Configurons vos préférences.
-      example: Compte exemple
-      preview: Aperçu de l'affichage des données selon vos préférences.
-      color_theme: Thème de couleur
-      theme_system: Système
-      theme_light: Clair
-      theme_dark: Sombre
-      locale: Langue
-      currency: Devise
-      date_format: Format de date
-      submit: Terminer
-    goals:
-      title: Qu'est-ce qui vous amène ici ?
-      subtitle: Sélectionnez un ou plusieurs objectifs que vous souhaitez atteindre avec %{product_name} comme outil de finances personnelles.
-      unified_accounts: Voir tous mes comptes en un seul endroit
-      cashflow: Comprendre les flux de trésorerie et les dépenses
-      budgeting: Gérer les plans financiers et les budgets
-      partner: Gérer les finances avec un partenaire
-      investments: Suivre les investissements
-      ai_insights: Laisser l'IA m'aider à comprendre mes finances
-      optimization: Analyser et optimiser les comptes
-      reduce_stress: Réduire le stress financier ou l'anxiété
-      submit: Suivant
+      subtitle: Commençons par compléter votre profil.
+      title: Configurons votre compte
     trial:
-      title: Essayez Sure pendant 45 jours
-      data_deletion: Les données seront supprimées ensuite
-      description_html: À partir d'aujourd'hui, vous pouvez tester le produit en profondeur.<br/>Si vous l'aimez, hébergez-le vous-même ou contribuez pour continuer à l'utiliser ici.
-      try_button: Essayer Sure pendant 45 jours
       continue_trial: Continuer l'essai
-      upgrade: Mettre à niveau
+      data_deletion: Les données seront supprimées ensuite
+      description_html: À partir d'aujourd'hui, vous pouvez tester le produit en profondeur.<br/>Si
+        vous l'aimez, hébergez-le vous-même ou contribuez pour continuer à l'utiliser
+        ici.
       how_it_works: Comment ça fonctionne
-      today: Aujourd'hui
-      today_description: Vous aurez un accès gratuit à Sure pendant 45 jours sur notre AWS.
       in_40_days: Dans 40 jours (%{date})
-      in_40_days_description: Nous vous notifierons pour vous rappeler d'exporter vos données.
+      in_40_days_description: Nous vous notifierons pour vous rappeler d'exporter
+        vos données.
       in_45_days: Dans 45 jours (%{date})
-      in_45_days_description: Nous supprimons vos données — contribuez pour continuer à utiliser Sure ici !
+      in_45_days_description: Nous supprimons vos données — contribuez pour continuer
+        à utiliser Sure ici !
+      title: Essayez Sure pendant 45 jours
+      today: Aujourd'hui
+      today_description: Vous aurez un accès gratuit à Sure pendant 45 jours sur notre
+        AWS.
+      try_button: Essayer Sure pendant 45 jours
+      upgrade: Mettre à niveau
diff --git a/config/locales/views/onboardings/it.yml b/config/locales/views/onboardings/it.yml
new file mode 100644
index 000000000..5a20dca48
--- /dev/null
+++ b/config/locales/views/onboardings/it.yml
@@ -0,0 +1,66 @@
+---
+it:
+  onboardings:
+    header:
+      sign_out: Disconnetti
+      setup: Configurazione
+      preferences: Preferenze
+      goals: Obiettivi
+      start: Inizia
+    logout:
+      sign_out: Disconnetti
+    show:
+      title: Configuriamo il tuo account
+      subtitle: Prima di tutto, configuriamo il tuo profilo.
+      first_name: Nome
+      first_name_placeholder: Nome
+      last_name: Cognome
+      last_name_placeholder: Cognome
+      group_name: Nome del gruppo
+      group_name_placeholder: Nome del gruppo
+      household_name: Nome del nucleo familiare
+      household_name_placeholder: Nome del nucleo familiare
+      moniker_prompt: "Utilizzerò %{product_name} con ..."
+      moniker_family: Familiari (solo tu o con partner, figli, ecc.)
+      moniker_group: Gruppo di persone (azienda, club, associazione, altro)
+      country: Paese
+      submit: Continua
+    preferences:
+      title: Configura le tue preferenze
+      subtitle: Configuriamo le tue preferenze.
+      example: Conto di esempio
+      preview: Anteprima di come vengono visualizzati i dati in base alle preferenze.
+      color_theme: Tema colore
+      theme_system: Sistema
+      theme_light: Chiaro
+      theme_dark: Scuro
+      locale: Lingua
+      currency: Valuta
+      date_format: Formato data
+      submit: Completa
+    goals:
+      title: Cosa ti porta qui?
+      subtitle: Seleziona uno o più obiettivi che hai nell'utilizzare %{product_name} come strumento di finanza personale.
+      unified_accounts: Vedere tutti i miei conti in un unico posto
+      cashflow: Capire i flussi di cassa e le spese
+      budgeting: Gestire piani finanziari e budget
+      partner: Gestire le finanze con un partner
+      investments: Monitorare gli investimenti
+      ai_insights: Usare l'AI per capire meglio le mie finanze
+      optimization: Analizzare e ottimizzare i conti
+      reduce_stress: Ridurre lo stress o l'ansia finanziaria
+      submit: Avanti
+    trial:
+      title: Prova Sure per 45 giorni
+      data_deletion: I dati saranno eliminati in seguito
+      description_html: A partire da oggi puoi dare un'occhiata approfondita al prodotto.<br/>Se ti piace, fai self-hosting o contribuisci per continuare a usarlo qui.
+      try_button: Prova Sure per 45 giorni
+      continue_trial: Continua la prova
+      upgrade: Aggiorna
+      how_it_works: Come funziona qui
+      today: Oggi
+      today_description: Avrai accesso gratuito a Sure per 45 giorni sul nostro AWS.
+      in_40_days: Tra 40 giorni (%{date})
+      in_40_days_description: Ti invieremo una notifica per ricordarti di esportare i tuoi dati.
+      in_45_days: Tra 45 giorni (%{date})
+      in_45_days_description: Eliminiamo i tuoi dati — contribuisci per continuare a usare Sure qui!
diff --git a/config/locales/views/onboardings/ru.yml b/config/locales/views/onboardings/ru.yml
new file mode 100644
index 000000000..d4ac9dbf1
--- /dev/null
+++ b/config/locales/views/onboardings/ru.yml
@@ -0,0 +1,71 @@
+---
+ru:
+  onboardings:
+    goals:
+      ai_insights: Пусть ИИ поможет мне понять мои финансы
+      budgeting: Управление финансовыми планами и бюджетом
+      cashflow: Понимание денежного потока и расходов
+      investments: Отслеживание инвестиций
+      optimization: Анализ и оптимизация счетов
+      partner: Управление финансами с партнёром
+      reduce_stress: Снижение финансового стресса или тревоги
+      submit: Далее
+      subtitle: Выберите одну или несколько целей, которые вы преследуете, используя
+        %{product_name} как инструмент управления личными финансами.
+      title: Что привело вас сюда?
+      unified_accounts: Просмотр всех моих счетов в одном месте
+    header:
+      goals: Цели
+      preferences: Предпочтения
+      setup: Настройка
+      sign_out: Выйти
+      start: Начать
+    logout:
+      sign_out: Выйти
+    preferences:
+      color_theme: Цветовая тема
+      currency: Валюта
+      date_format: Формат даты
+      example: Пример счёта
+      locale: Язык
+      preview: Предварительный просмотр отображения данных на основе предпочтений.
+      submit: Завершить
+      subtitle: Давайте настроим ваши предпочтения.
+      theme_dark: Тёмная
+      theme_light: Светлая
+      theme_system: Системная
+      title: Настройте ваши предпочтения
+    show:
+      country: Страна
+      first_name: Имя
+      first_name_placeholder: Имя
+      group_name: Название группы
+      group_name_placeholder: Название группы
+      household_name: Название домохозяйства
+      household_name_placeholder: Название домохозяйства
+      last_name: Фамилия
+      last_name_placeholder: Фамилия
+      moniker_family: Члены семьи (только вы или с партнёром, подростками и т.д.)
+      moniker_group: Группа людей (компания, клуб, ассоциация, любой другой тип)
+      moniker_prompt: Будете использовать %{product_name} с ...
+      submit: Продолжить
+      subtitle: Сначала давайте настроим ваш профиль.
+      title: Давайте настроим ваш счёт
+    trial:
+      continue_trial: Продолжить пробный период
+      data_deletion: Данные будут удалены после этого
+      description_html: Начиная с сегодняшнего дня, вы можете внимательно ознакомиться
+        с продуктом.<br/>Если он вам понравится, разверните его самостоятельно или
+        внесите вклад, чтобы продолжить использование здесь.
+      how_it_works: Как это работает
+      in_40_days: Через 40 дней (%{date})
+      in_40_days_description: Мы напомним вам экспортировать ваши данные.
+      in_45_days: Через 45 дней (%{date})
+      in_45_days_description: Мы удалим ваши данные — внесите вклад, чтобы продолжить
+        использование Sure здесь!
+      title: Попробуйте Sure в течение 45 дней
+      today: Сегодня
+      today_description: Вы получите бесплатный доступ к Sure на 45 дней на нашем
+        AWS.
+      try_button: Попробовать Sure в течение 45 дней
+      upgrade: Обновить
diff --git a/config/locales/views/onboardings/tr.yml b/config/locales/views/onboardings/tr.yml
index 351fedc9a..b4a911eb0 100644
--- a/config/locales/views/onboardings/tr.yml
+++ b/config/locales/views/onboardings/tr.yml
@@ -1,61 +1,72 @@
 ---
 tr:
   onboardings:
+    goals:
+      ai_insights: AI'ın finanslarımı anlamama yardım etmesini sağlamak
+      budgeting: Finansal planları ve bütçeleri yönetmek
+      cashflow: Nakit akışını ve harcamaları anlamak
+      investments: Yatırımları takip etmek
+      optimization: Hesapları analiz etmek ve optimize etmek
+      partner: Bir partnerle birlikte finansları yönetmek
+      reduce_stress: Finansal stresi veya kaygıyı azaltmak
+      submit: Sonraki
+      subtitle: "%{product_name}'i kişisel finans aracınız olarak kullanmak için bir
+        veya daha fazla hedef seçin."
+      title: Sizi buraya ne getirdi?
+      unified_accounts: Tüm hesaplarımı tek bir yerde görmek
     header:
-      sign_out: Çıkış yap
-      setup: Kurulum
-      preferences: Tercihler
       goals: Hedefler
+      preferences: Tercihler
+      setup: Kurulum
+      sign_out: Çıkış yap
       start: Başla
     logout:
       sign_out: Çıkış yap
-    show:
-      title: Hesabınızı kuralım
-      subtitle: Önce profilinizi tamamlayalım.
-      first_name: Ad
-      first_name_placeholder: Ad
-      last_name: Soyad
-      last_name_placeholder: Soyad
-      household_name: Hane adı
-      household_name_placeholder: Hane adı
-      country: Ülke
-      submit: Devam et
     preferences:
-      title: Tercihlerinizi yapılandırın
-      subtitle: Tercihlerinizi yapılandıralım.
-      example: Örnek hesap
-      preview: Tercihlere göre verilerin nasıl görüntüleneceğinin önizlemesi.
       color_theme: Renk teması
-      theme_system: Sistem
-      theme_light: Açık
-      theme_dark: Koyu
-      locale: Dil
       currency: Para birimi
       date_format: Tarih formatı
+      example: Örnek hesap
+      locale: Dil
+      preview: Tercihlere göre verilerin nasıl görüntüleneceğinin önizlemesi.
       submit: Tamamla
-    goals:
-      title: Sizi buraya ne getirdi?
-      subtitle: "%{product_name}'i kişisel finans aracınız olarak kullanmak için bir veya daha fazla hedef seçin."
-      unified_accounts: Tüm hesaplarımı tek bir yerde görmek
-      cashflow: Nakit akışını ve harcamaları anlamak
-      budgeting: Finansal planları ve bütçeleri yönetmek
-      partner: Bir partnerle birlikte finansları yönetmek
-      investments: Yatırımları takip etmek
-      ai_insights: AI'ın finanslarımı anlamama yardım etmesini sağlamak
-      optimization: Hesapları analiz etmek ve optimize etmek
-      reduce_stress: Finansal stresi veya kaygıyı azaltmak
-      submit: Sonraki
+      subtitle: Tercihlerinizi yapılandıralım.
+      theme_dark: Koyu
+      theme_light: Açık
+      theme_system: Sistem
+      title: Tercihlerinizi yapılandırın
+    show:
+      country: Ülke
+      first_name: Ad
+      first_name_placeholder: Ad
+      group_name: Grup adı
+      group_name_placeholder: Grup adı
+      household_name: Hane adı
+      household_name_placeholder: Hane adı
+      last_name: Soyad
+      last_name_placeholder: Soyad
+      moniker_family: Aile üyeleri (yalnız siz ya da eşiniz, çocuklarınızla birlikte
+        vb.)
+      moniker_group: Bir grup insan (şirket, kulüp, dernek veya başka herhangi bir
+        tür)
+      moniker_prompt: "%{product_name}'i şunlarla kullanacaksınız: ..."
+      submit: Devam et
+      subtitle: Önce profilinizi tamamlayalım.
+      title: Hesabınızı kuralım
     trial:
-      title: Sure'u 45 gün deneyin
-      data_deletion: Veriler daha sonra silinecek
-      description_html: Bugünden itibaren ürünü detaylı test edebilirsiniz.<br/>Beğenirseniz, kendiniz barındırın veya burada kullanmaya devam etmek için katkıda bulunun.
-      try_button: Sure'u 45 gün dene
       continue_trial: Denemeye devam et
-      upgrade: Yükselt
+      data_deletion: Veriler daha sonra silinecek
+      description_html: Bugünden itibaren ürünü detaylı test edebilirsiniz.<br/>Beğenirseniz,
+        kendiniz barındırın veya burada kullanmaya devam etmek için katkıda bulunun.
       how_it_works: Nasıl çalışır
+      in_40_days: 40 gün içinde (%{date})
+      in_40_days_description: Verilerinizi dışa aktarmanızı hatırlatmak için sizi
+        bilgilendireceğiz.
+      in_45_days: 45 gün içinde (%{date})
+      in_45_days_description: Verilerinizi siliyoruz — Sure'u burada kullanmaya devam
+        etmek için katkıda bulunun!
+      title: Sure'u 45 gün deneyin
       today: Bugün
       today_description: AWS'mizde Sure'a 45 gün ücretsiz erişim elde edeceksiniz.
-      in_40_days: 40 gün içinde (%{date})
-      in_40_days_description: Verilerinizi dışa aktarmanızı hatırlatmak için sizi bilgilendireceğiz.
-      in_45_days: 45 gün içinde (%{date})
-      in_45_days_description: Verilerinizi siliyoruz — Sure'u burada kullanmaya devam etmek için katkıda bulunun!
\ No newline at end of file
+      try_button: Sure'u 45 gün dene
+      upgrade: Yükselt
diff --git a/config/locales/views/other_assets/fr.yml b/config/locales/views/other_assets/fr.yml
index c34fa85e2..dc827adb2 100644
--- a/config/locales/views/other_assets/fr.yml
+++ b/config/locales/views/other_assets/fr.yml
@@ -2,8 +2,12 @@
 fr:
   other_assets:
     edit:
+      balance_tracking_info: Les autres actifs sont suivis via des valorisations manuelles
+        à l'aide de 'Nouveau solde', et non via des transactions. Les flux de trésorerie
+        n'affecteront pas le solde du compte.
       edit: Modifier %{account}
-      balance_tracking_info: "Les autres actifs sont suivis via des valorisations manuelles à l'aide de 'Nouveau solde', et non via des transactions. Les flux de trésorerie n'affecteront pas le solde du compte."
     new:
+      balance_tracking_info: Les autres actifs sont suivis via des valorisations manuelles
+        à l'aide de 'Nouveau solde', et non via des transactions. Les flux de trésorerie
+        n'affecteront pas le solde du compte.
       title: Saisir les détails de l'actif
-      balance_tracking_info: "Les autres actifs sont suivis via des valorisations manuelles à l'aide de 'Nouveau solde', et non via des transactions. Les flux de trésorerie n'affecteront pas le solde du compte."
diff --git a/config/locales/views/other_assets/it.yml b/config/locales/views/other_assets/it.yml
new file mode 100644
index 000000000..5ca51e282
--- /dev/null
+++ b/config/locales/views/other_assets/it.yml
@@ -0,0 +1,9 @@
+---
+it:
+  other_assets:
+    edit:
+      edit: Modifica %{account}
+      balance_tracking_info: "Gli altri asset vengono tracciati tramite valutazioni manuali usando 'Nuovo saldo', non con le transazioni. Il flusso di cassa non influisce sul saldo del conto."
+    new:
+      title: Inserisci i dettagli dell'asset
+      balance_tracking_info: "Gli altri asset vengono tracciati tramite valutazioni manuali usando 'Nuovo saldo', non con le transazioni. Il flusso di cassa non influisce sul saldo del conto."
diff --git a/config/locales/views/other_assets/ru.yml b/config/locales/views/other_assets/ru.yml
new file mode 100644
index 000000000..cff010701
--- /dev/null
+++ b/config/locales/views/other_assets/ru.yml
@@ -0,0 +1,13 @@
+---
+ru:
+  other_assets:
+    edit:
+      balance_tracking_info: Другие активы отслеживаются через ручные оценки с использованием
+        'Нового баланса', а не операций. Денежный поток не будет влиять на баланс
+        счёта.
+      edit: Редактировать %{account}
+    new:
+      balance_tracking_info: Другие активы отслеживаются через ручные оценки с использованием
+        'Нового баланса', а не операций. Денежный поток не будет влиять на баланс
+        счёта.
+      title: Введите данные актива
diff --git a/config/locales/views/other_assets/tr.yml b/config/locales/views/other_assets/tr.yml
index 261ddce6a..76c2d95e0 100644
--- a/config/locales/views/other_assets/tr.yml
+++ b/config/locales/views/other_assets/tr.yml
@@ -2,6 +2,10 @@
 tr:
   other_assets:
     edit:
+      balance_tracking_info: Diğer Varlıklar, işlemler yerine 'Yeni Bakiye' kullanılarak
+        yapılan manuel değerlemelerle takip edilir. Nakit akışı hesap bakiyesini etkilemez.
       edit: "%{account} düzenle"
     new:
-      title: Varlık detaylarını gir
\ No newline at end of file
+      balance_tracking_info: Diğer Varlıklar, işlemler yerine 'Yeni Bakiye' kullanılarak
+        yapılan manuel değerlemelerle takip edilir. Nakit akışı hesap bakiyesini etkilemez.
+      title: Varlık detaylarını gir
diff --git a/config/locales/views/other_liabilities/it.yml b/config/locales/views/other_liabilities/it.yml
new file mode 100644
index 000000000..f5b96128f
--- /dev/null
+++ b/config/locales/views/other_liabilities/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  other_liabilities:
+    edit:
+      edit: Modifica %{account}
+    new:
+      title: Inserisci i dettagli della passività
diff --git a/config/locales/views/other_liabilities/ru.yml b/config/locales/views/other_liabilities/ru.yml
new file mode 100644
index 000000000..3a6018300
--- /dev/null
+++ b/config/locales/views/other_liabilities/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  other_liabilities:
+    edit:
+      edit: Изменить %{account}
+    new:
+      title: Введите данные об обязательстве
diff --git a/config/locales/views/other_liabilities/tr.yml b/config/locales/views/other_liabilities/tr.yml
index 74beec90a..96f8e3893 100644
--- a/config/locales/views/other_liabilities/tr.yml
+++ b/config/locales/views/other_liabilities/tr.yml
@@ -4,4 +4,4 @@ tr:
     edit:
       edit: "%{account} düzenle"
     new:
-      title: Borç detaylarını gir
\ No newline at end of file
+      title: Borç detaylarını gir
diff --git a/config/locales/views/pages/en.yml b/config/locales/views/pages/en.yml
index b03062678..6d5876284 100644
--- a/config/locales/views/pages/en.yml
+++ b/config/locales/views/pages/en.yml
@@ -41,8 +41,18 @@ en:
       welcome: "Welcome back, %{name}"
       subtitle: "Here's what's happening with your finances"
       new: "New"
+      sections_aria_label: "Dashboard sections"
       drag_to_reorder: "Drag to reorder section"
       toggle_section: "Toggle section visibility"
+      widget_size:
+        label: "Adjust size"
+        width_label: "Width"
+        half: "Half"
+        full: "Full"
+        height_label: "Height"
+        compact: "Compact"
+        auto: "Auto"
+        tall: "Tall"
       net_worth_chart:
         data_not_available: Data not available for the selected period
         title: Net Worth
@@ -64,6 +74,8 @@ en:
         classifications:
           asset: "Assets"
           liability: "Liabilities"
+      insights_feed:
+        title: "Insights"
       cashflow_sankey:
         title: "Cashflow"
         zoom_out: "Back to full cashflow"
@@ -93,3 +105,16 @@ en:
         trades: "Trades"
         no_investments: "No investment accounts"
         add_investment: "Add an investment account to track your portfolio"
+      money_flow:
+        title: "Money In / Out"
+        date_range: "%{start_date} to %{end_date}"
+        month_picker_aria_label: "Select month"
+        filter_accounts: "Filter accounts (%{count})"
+        filter_accounts_all: "All accounts"
+        period_scope_hint: "Shows the months you pick here — independent of the dashboard's time period at the top."
+        search_accounts: "Search accounts"
+        apply: "Apply"
+        balance: "Transaction balance"
+        chart_span: "Last %{count} months"
+        income: "Income"
+        expenses: "Expenses"
diff --git a/config/locales/views/pages/fr.yml b/config/locales/views/pages/fr.yml
index bfd6ed1c1..480b74a05 100644
--- a/config/locales/views/pages/fr.yml
+++ b/config/locales/views/pages/fr.yml
@@ -3,56 +3,118 @@ fr:
   pages:
     changelog:
       title: Nouveautés
-    privacy:
-      title: Politique de confidentialité
-      heading: Politique de confidentialité
-      placeholder: Le contenu de la politique de confidentialité sera affiché ici.
-    terms:
-      title: Conditions d'utilisation
-      heading: Conditions d'utilisation
-      placeholder: Le contenu des conditions d'utilisation sera affiché ici.
     dashboard:
-      welcome: "Content de vous revoir, %{name}"
-      subtitle: "Voici ce qui se passe avec vos finances"
-      new: "Nouveau"
-      drag_to_reorder: "Glisser pour réorganiser la section"
-      toggle_section: "Afficher/masquer la section"
+      balance_sheet:
+        add_accounts: Ajoutez vos comptes %{name} pour voir une ventilation complète
+        add_asset_accounts: Ajoutez vos comptes d'actifs pour voir une répartition complète
+        add_liability_accounts: Ajoutez vos comptes de passif pour voir une répartition complète
+        classifications:
+          asset: Actifs
+          liability: Passif
+        name: Nom
+        no_asset: Aucun actif pour l'instant
+        no_items: Aucun %{name} pour l'instant
+        no_liability: Pas encore de passif
+        title: Bilan
+        value: Valeur
+        weight: Poids
+      cashflow_sankey:
+        add_transaction: Ajouter une transaction
+        no_data_description: Ajoutez des transactions pour afficher les données de flux de trésorerie ou étendez la période
+        no_data_title: Aucune donnée de flux de trésorerie pour cette période
+        title: Flux de trésorerie
+        zoom_out: Retour à la trésorerie totale
+      drag_to_reorder: Glisser pour réorganiser la section
+      insights_feed:
+        title: Analyses
+      investment_summary:
+        add_investment: Ajoutez un compte d'investissement pour suivre votre portefeuille
+        contributions: Apports
+        holding: Holding
+        no_investments: Aucun compte d'investissement
+        period_activity: Activité %{period}
+        return: Rendement
+        title: Investissements
+        total_return: Rendement total
+        trades: Transactions boursières
+        value: Valeur
+        weight: Poids
+        withdrawals: Retraits
+      money_flow:
+        apply: Appliquer
+        balance: Balance des opérations
+        chart_span: "%{count} derniers mois"
+        date_range: Du %{start_date} au %{end_date}
+        expenses: Sorties
+        filter_accounts: Filtrer les comptes (%{count})
+        filter_accounts_all: Tous les comptes
+        income: Entrées
+        month_picker_aria_label: Sélectionner un mois
+        period_scope_hint: Affiche les mois que vous sélectionnez ici — indépendant de la période du tableau de bord en haut.
+        search_accounts: Rechercher un compte
+        title: Entrées / sorties d'argent
       net_worth_chart:
         data_not_available: Données indisponibles pour la période sélectionnée
         title: Patrimoine net
+      new: Nouveau
       no_account_empty_state:
         new_account: Nouveau compte
         no_account_subtitle: Comme aucun compte n'a été ajouté, il n'y a pas de données à afficher. Ajoutez vos premiers comptes pour commencer à consulter les données du tableau de bord.
         no_account_title: Pas encore de comptes
-      balance_sheet:
-        title: "Bilan"
-        no_items: "Aucun %{name} pour l'instant"
-        add_accounts: "Ajoutez vos comptes %{name} pour voir une ventilation complète"
-      cashflow_sankey:
-        title: "Flux de trésorerie"
-        no_data_title: "Aucune donnée de flux de trésorerie pour cette période"
-        no_data_description: "Ajoutez des transactions pour afficher les données de flux de trésorerie ou étendez la période"
-        add_transaction: "Ajouter une transaction"
       no_accounts:
-        title: "Pas encore de comptes"
-        description: "Ajoutez des comptes pour afficher les données de patrimoine net"
-        add_account: "Ajouter un compte"
+        add_account: Ajouter un compte
+        description: Ajoutez des comptes pour afficher les données de patrimoine net
+        title: Pas encore de comptes
       outflows_donut:
-        title: "Sorties"
-        total_outflows: "Total des sorties"
-        categories: "Catégories"
-        value: "Valeur"
-        weight: "Poids"
-      investment_summary:
-        title: "Investissements"
-        total_return: "Rendement total"
-        holding: "Avoir"
-        weight: "Poids"
-        value: "Valeur"
-        return: "Rendement"
-        period_activity: "Activité %{period}"
-        contributions: "Apports"
-        withdrawals: "Retraits"
-        trades: "Transactions boursières"
-        no_investments: "Aucun compte d'investissement"
-        add_investment: "Ajoutez un compte d'investissement pour suivre votre portefeuille"
+        categories: Catégories
+        title: Sorties
+        total_outflows: Total des sorties
+        value: Valeur
+        weight: Poids
+      sections_aria_label: Sections du tableau de bord
+      subtitle: Voici ce qui se passe avec vos finances
+      toggle_section: Afficher/masquer la section
+      welcome: Content de vous revoir, %{name}
+      widget_size:
+        auto: Auto
+        compact: Compact
+        full: Plein
+        half: Moitié
+        height_label: Hauteur
+        label: Ajuster la taille
+        tall: Grand
+        width_label: Largeur
+    feedback:
+      bug_report: Déposer un rapport de bug
+      description: Faites-nous savoir si vous avez des commentaires spécifiques. N'hésitez pas à inclure des liens vers des vidéos ou des captures d'écran.
+      discuss: Discutez de %{product} avec d'autres personnes
+      feature_request: Rédiger une demande de fonctionnalité
+      heading: Laisser des commentaires
+      title: Commentaires
+    intro:
+      coming_soon: Expérience d'introduction à venir
+      description: Nous construisons un parcours d'intégration plus riche pour en savoir plus sur vos objectifs, vos étapes et vos besoins quotidiens. Pour l’instant, rendez-vous dans la barre latérale de discussion pour démarrer une conversation avec Sure et dites-nous où vous en êtes dans votre parcours financier.
+      not_authorized: L'intro n'est disponible que pour les utilisateurs invités.
+      start_chatting: Commencez à discuter
+      welcome: Bienvenue !
+    privacy:
+      heading: Politique de confidentialité
+      placeholder: Le contenu de la politique de confidentialité sera affiché ici.
+      title: Politique de confidentialité
+    redis_configuration_error:
+      heading: Configuration Redis requise
+      page_title: Configuration Redis requise - Bien sûr
+      refresh_hint: Une fois que vous avez configuré Redis, actualisez cette page pour continuer.
+      refresh_page: Actualiser la page
+      setup_guide_hint: Suivez notre guide de configuration complet de Docker pour configurer Redis
+      subheading: Votre installation Sure auto-hébergée nécessite que Redis soit correctement configuré.
+      view_setup_guide: Afficher le guide de configuration
+      why_required_body: Sure utilise Redis pour alimenter les tâches en arrière-plan de Sidekiq pour des tâches telles que la synchronisation des données de compte, le traitement des importations et d'autres opérations en arrière-plan qui maintiennent vos données financières à jour.
+      why_required_title: Pourquoi Redis est-il requis ?
+    release_notes_unavailable:
+      body_html: "<p>Impossible de récupérer les dernières notes de mise à jour pour le moment. Veuillez réessayer plus tard ou visiter directement notre <a href='https://github.com/we-promise/sure/releases' target='_blank' rel='noopener noreferrer'>page de versions GitHub</a>.</p>"
+      name: Notes de mise à jour indisponibles
+    terms:
+      heading: Conditions d'utilisation
+      placeholder: Le contenu des conditions d'utilisation sera affiché ici.
+      title: Conditions d'utilisation
diff --git a/config/locales/views/pages/it.yml b/config/locales/views/pages/it.yml
new file mode 100644
index 000000000..d9d73da0c
--- /dev/null
+++ b/config/locales/views/pages/it.yml
@@ -0,0 +1,105 @@
+---
+it:
+  pages:
+    feedback:
+      title: Feedback
+      heading: Lascia un feedback
+      description: Facci sapere se hai feedback specifici. Puoi includere link a video o screenshot.
+      feature_request: Scrivi una richiesta di funzionalità
+      bug_report: Segnala un bug
+      discuss: "Discuti di %{product} con altri"
+    intro:
+      not_authorized: "L'introduzione è disponibile solo per gli utenti ospite."
+      welcome: "Benvenuto!"
+      coming_soon: Esperienza di introduzione in arrivo
+      description: "Stiamo costruendo un percorso di onboarding più ricco per conoscere i tuoi obiettivi, traguardi e necessità quotidiane. Per ora, vai alla barra laterale della chat per iniziare una conversazione con Sure e raccontaci dove sei nel tuo percorso finanziario."
+      start_chatting: Inizia a chattare
+    redis_configuration_error:
+      page_title: Configurazione Redis Richiesta - Sure
+      heading: Configurazione Redis Richiesta
+      subheading: La tua installazione self-hosted di Sure ha bisogno che Redis sia correttamente configurato.
+      why_required_title: Perché Redis è richiesto?
+      why_required_body: Sure usa Redis per gestire i job in background di Sidekiq per attività come la sincronizzazione dei dati dei conti, l'elaborazione delle importazioni e altre operazioni in background che mantengono aggiornati i tuoi dati finanziari.
+      view_setup_guide: Visualizza guida alla configurazione
+      setup_guide_hint: Segui la nostra guida Docker completa per configurare Redis
+      refresh_hint: "Una volta configurato Redis, aggiorna questa pagina per continuare."
+      refresh_page: Aggiorna pagina
+    changelog:
+      title: Novità
+    release_notes_unavailable:
+      name: Note di rilascio non disponibili
+      body_html: "<p>Impossibile recuperare le ultime note di rilascio al momento. Riprova più tardi o visita direttamente la nostra <a href='https://github.com/we-promise/sure/releases' target='_blank' rel='noopener noreferrer'>pagina rilasci su GitHub</a>.</p>"
+    privacy:
+      title: Informativa sulla privacy
+      heading: Informativa sulla privacy
+      placeholder: Il contenuto della privacy policy verrà visualizzato qui.
+    terms:
+      title: Termini di Servizio
+      heading: Termini di Servizio
+      placeholder: Il contenuto dei termini di servizio verrà visualizzato qui.
+    dashboard:
+      welcome: "Bentornato, %{name}"
+      subtitle: "Ecco cosa sta succedendo con le tue finanze"
+      new: "Nuovo"
+      sections_aria_label: "Sezioni dashboard"
+      drag_to_reorder: "Trascina per riordinare la sezione"
+      toggle_section: "Attiva/disattiva visibilità sezione"
+      widget_size:
+        label: "Regola dimensione"
+        width_label: "Larghezza"
+        half: "Metà"
+        full: "Intera"
+        height_label: "Altezza"
+        compact: "Compatta"
+        auto: "Auto"
+        tall: "Alta"
+      net_worth_chart:
+        data_not_available: Dati non disponibili per il periodo selezionato
+        title: Patrimonio Netto
+      no_account_empty_state:
+        new_account: Nuovo conto
+        no_account_subtitle: Poiché non sono stati aggiunti conti, non ci sono dati da visualizzare. Aggiungi i tuoi primi conti per iniziare a vedere i dati della dashboard.
+        no_account_title: Nessun conto ancora
+      balance_sheet:
+        title: "Stato Patrimoniale"
+        no_items: "Nessun %{name} ancora"
+        add_accounts: "Aggiungi i tuoi conti %{name} per vedere un riepilogo completo"
+        no_asset: "Nessun asset ancora"
+        no_liability: "Nessuna passività ancora"
+        add_asset_accounts: "Aggiungi i tuoi conti asset per vedere un riepilogo completo"
+        add_liability_accounts: "Aggiungi i tuoi conti passività per vedere un riepilogo completo"
+        name: "Nome"
+        weight: "Peso"
+        value: "Valore"
+        classifications:
+          asset: "Attività"
+          liability: "Passività"
+      cashflow_sankey:
+        title: "Flusso di cassa"
+        zoom_out: "Torna al flusso completo"
+        no_data_title: "Nessun dato di flusso di cassa per questo periodo"
+        no_data_description: "Aggiungi transazioni per visualizzare i dati di flusso di cassa o amplia il periodo"
+        add_transaction: "Aggiungi transazione"
+      no_accounts:
+        title: "Nessun conto ancora"
+        description: "Aggiungi conti per visualizzare i dati del patrimonio netto"
+        add_account: "Aggiungi conto"
+      outflows_donut:
+        title: "Uscite"
+        total_outflows: "Uscite Totali"
+        categories: "Categorie"
+        value: "Valore"
+        weight: "Peso"
+      investment_summary:
+        title: "Investimenti"
+        total_return: "Rendimento Totale"
+        holding: "Posizione"
+        weight: "Peso"
+        value: "Valore"
+        return: "Rendimento"
+        period_activity: "Attività %{period}"
+        contributions: "Contributi"
+        withdrawals: "Prelievi"
+        trades: "Movimenti"
+        no_investments: "Nessun conto investimenti"
+        add_investment: "Aggiungi un conto investimenti per tracciare il tuo portafoglio"
diff --git a/config/locales/views/pages/ru.yml b/config/locales/views/pages/ru.yml
new file mode 100644
index 000000000..3d159b4e3
--- /dev/null
+++ b/config/locales/views/pages/ru.yml
@@ -0,0 +1,112 @@
+---
+ru:
+  pages:
+    changelog:
+      title: Что нового
+    dashboard:
+      balance_sheet:
+        add_accounts: Добавьте счета %{name}, чтобы увидеть разбивку
+        add_asset_accounts: Добавьте счета активов
+        add_liability_accounts: Добавьте счета обязательств
+        classifications:
+          asset: Активы
+          liability: Обязательства
+        name: Название
+        no_asset: Пока нет активов
+        no_items: Пока нет %{name}
+        no_liability: Пока нет обязательств
+        title: Баланс
+        value: Сумма
+        weight: Доля
+      cashflow_sankey:
+        add_transaction: Добавить операцию
+        no_data_description: Добавьте операции или измените период
+        no_data_title: Нет данных за период
+        title: Денежный поток
+        zoom_out: Показать весь поток
+      drag_to_reorder: Перетащите для изменения порядка
+      investment_summary:
+        add_investment: Добавьте инвестиционный счёт для отслеживания портфеля
+        contributions: Пополнения
+        holding: Позиция
+        no_investments: Нет инвестиционных счетов
+        period_activity: Активность за %{period}
+        return: Доходность
+        title: Инвестиции
+        total_return: Общая доходность
+        trades: Сделки
+        value: Сумма
+        weight: Доля
+        withdrawals: Выводы
+      net_worth_chart:
+        data_not_available: Нет данных за выбранный период
+        title: Свободные средства
+      new: Новое
+      no_account_empty_state:
+        new_account: Новый счёт
+        no_account_subtitle: Добавьте счета, чтобы увидеть данные на панели.
+        no_account_title: Пока нет счетов
+      no_accounts:
+        add_account: Добавить счёт
+        description: Добавьте счета, чтобы увидеть чистую стоимость
+        title: Пока нет счетов
+      outflows_donut:
+        categories: Категории
+        title: Расходы
+        total_outflows: Всего расходов
+        value: Сумма
+        weight: Доля
+      sections_aria_label: Разделы панели
+      subtitle: Вот что происходит с вашими финансами
+      toggle_section: Показать/скрыть раздел
+      welcome: С возвращением, %{name}
+      widget_size:
+        auto: Авто
+        compact: Компактный
+        full: Полный
+        half: Половина
+        height_label: Высота
+        label: Размер
+        tall: Высокий
+        width_label: Ширина
+    feedback:
+      bug_report: Сообщить об ошибке
+      description: Сообщите нам, если у вас есть замечания. Можно приложить ссылки
+        на видео или скриншоты.
+      discuss: Обсудите %{product} с другими
+      feature_request: Предложить функцию
+      heading: Оставьте отзыв
+      title: Обратная связь
+    intro:
+      coming_soon: Скоро появится
+      description: Мы создаём более продуманный онбординг, чтобы узнать о ваших целях
+        и потребностях. Пока перейдите в чат с Sure и расскажите о своей финансовой
+        ситуации.
+      not_authorized: Раздел доступен только для гостей.
+      start_chatting: Начать чат
+      welcome: Добро пожаловать!
+    privacy:
+      heading: Политика конфиденциальности
+      placeholder: Здесь будет текст политики конфиденциальности.
+      title: Политика конфиденциальности
+    redis_configuration_error:
+      heading: Требуется настройка Redis
+      page_title: Требуется настройка Redis — Sure
+      refresh_hint: После настройки Redis обновите страницу.
+      refresh_page: Обновить
+      setup_guide_hint: Следуйте руководству по настройке Docker для конфигурации
+        Redis
+      subheading: Для self-hosted версии Sure необходимо настроить Redis.
+      view_setup_guide: Открыть руководство
+      why_required_body: Sure использует Redis для фоновых задач Sidekiq — синхронизации
+        счетов, обработки импорта и других операций, поддерживающих актуальность данных.
+      why_required_title: Зачем нужен Redis?
+    release_notes_unavailable:
+      body_html: "<p>Не удалось получить последние заметки о выпуске. Пожалуйста,
+        попробуйте позже или посетите <a href='https://github.com/we-promise/sure/releases'
+        target='_blank' rel='noopener noreferrer'>страницу релизов на GitHub</a>.</p>"
+      name: Заметки о выпуске недоступны
+    terms:
+      heading: Условия использования
+      placeholder: Здесь будет текст условий использования.
+      title: Условия использования
diff --git a/config/locales/views/pages/tr.yml b/config/locales/views/pages/tr.yml
index 35b12cede..6ec5c2007 100644
--- a/config/locales/views/pages/tr.yml
+++ b/config/locales/views/pages/tr.yml
@@ -4,10 +4,118 @@ tr:
     changelog:
       title: Yenilikler
     dashboard:
+      balance_sheet:
+        add_accounts: Tam bir döküm görmek için %{name} hesaplarınızı ekleyin
+        add_asset_accounts: Tam bir döküm görmek için varlık hesaplarınızı ekleyin
+        add_liability_accounts: Tam bir döküm görmek için yükümlülük hesaplarınızı
+          ekleyin
+        classifications:
+          asset: Varlıklar
+          liability: Yükümlülükler
+        name: Ad
+        no_asset: Henüz varlık yok
+        no_items: Henüz %{name} yok
+        no_liability: Henüz yükümlülük yok
+        title: Bilanço
+        value: Değer
+        weight: Ağırlık
+      cashflow_sankey:
+        add_transaction: İşlem ekle
+        no_data_description: Nakit akışı verilerini görüntülemek için işlem ekleyin
+          veya zaman aralığını genişletin
+        no_data_title: Bu zaman aralığı için nakit akışı verisi yok
+        title: Nakit Akışı
+        zoom_out: Tam nakit akışına dön
+      drag_to_reorder: Bölümü yeniden sıralamak için sürükleyin
+      insights_feed:
+        title: İçgörüler
+      investment_summary:
+        add_investment: Portföyünüzü takip etmek için bir yatırım hesabı ekleyin
+        contributions: Katkılar
+        holding: Varlık
+        no_investments: Yatırım hesabı yok
+        period_activity: "%{period} Etkinliği"
+        return: Getiri
+        title: Yatırımlar
+        total_return: Toplam Getiri
+        trades: Alım Satımlar
+        value: Değer
+        weight: Ağırlık
+        withdrawals: Çekimler
       net_worth_chart:
         data_not_available: Seçilen dönem için veri mevcut değil
         title: Net Değer
+      new: Yeni
       no_account_empty_state:
         new_account: Yeni hesap
-        no_account_subtitle: Henüz hiç hesap eklenmediği için gösterilecek veri yok. İlk hesaplarınızı ekleyerek gösterge paneli verilerini görmeye başlayın.
-        no_account_title: Henüz hesap yok
\ No newline at end of file
+        no_account_subtitle: Henüz hiç hesap eklenmediği için gösterilecek veri yok.
+          İlk hesaplarınızı ekleyerek gösterge paneli verilerini görmeye başlayın.
+        no_account_title: Henüz hesap yok
+      no_accounts:
+        add_account: Hesap ekle
+        description: Net değer verilerini görüntülemek için hesap ekleyin
+        title: Henüz hesap yok
+      outflows_donut:
+        categories: Kategoriler
+        title: Çıkışlar
+        total_outflows: Toplam Çıkışlar
+        value: Değer
+        weight: Ağırlık
+      sections_aria_label: Gösterge paneli bölümleri
+      subtitle: Finansal durumunuzda neler oluyor, işte özeti
+      toggle_section: Bölüm görünürlüğünü değiştir
+      welcome: Tekrar hoş geldiniz, %{name}
+      widget_size:
+        auto: Otomatik
+        compact: Kompakt
+        full: Tam
+        half: Yarım
+        height_label: Yükseklik
+        label: Boyutu ayarla
+        tall: Uzun
+        width_label: Genişlik
+    feedback:
+      bug_report: Hata bildirimi gönder
+      description: Belirli bir geri bildiriminiz varsa bize bildirin. Video veya ekran
+        görüntüsü bağlantıları eklemekten çekinmeyin.
+      discuss: "%{product} hakkında başkalarıyla tartışın"
+      feature_request: Özellik isteği yaz
+      heading: Geri bildirim bırakın
+      title: Geri bildirim
+    intro:
+      coming_soon: Tanıtım deneyimi yakında geliyor
+      description: Hedeflerinizi, kilometre taşlarınızı ve günlük ihtiyaçlarınızı
+        öğrenmek için daha zengin bir kurulum deneyimi geliştiriyoruz. Şimdilik, Sure
+        ile bir sohbet başlatmak için sohbet kenar çubuğuna gidin ve finansal yolculuğunuzda
+        nerede olduğunuzu bize bildirin.
+      not_authorized: Tanıtım yalnızca misafir kullanıcılar için kullanılabilir.
+      start_chatting: Sohbete başla
+      welcome: Hoş geldiniz!
+    privacy:
+      heading: Gizlilik Politikası
+      placeholder: Gizlilik politikası içeriği burada görüntülenecek.
+      title: Gizlilik Politikası
+    redis_configuration_error:
+      heading: Redis Yapılandırması Gerekiyor
+      page_title: Redis Yapılandırması Gerekiyor - Sure
+      refresh_hint: Redis'i yapılandırdıktan sonra, devam etmek için bu sayfayı yenileyin.
+      refresh_page: Sayfayı Yenile
+      setup_guide_hint: Redis'i yapılandırmak için eksiksiz Docker kurulum kılavuzumuzu
+        izleyin
+      subheading: Kendi sunucunuzda barındırdığınız Sure kurulumunun düzgün yapılandırılmış
+        bir Redis'e ihtiyacı var.
+      view_setup_guide: Kurulum Kılavuzunu Görüntüle
+      why_required_body: Sure, hesap verilerini senkronize etme, içe aktarmaları işleme
+        ve finansal verilerinizi güncel tutan diğer arka plan işlemleri gibi görevler
+        için Sidekiq arka plan işlerini çalıştırmak amacıyla Redis kullanır.
+      why_required_title: Redis neden gereklidir?
+    release_notes_unavailable:
+      body_html: "<p>Şu anda en son sürüm notları alınamıyor. Lütfen daha sonra tekrar
+        kontrol edin veya doğrudan <a href='https://github.com/we-promise/sure/releases'
+        target='_blank' rel='noopener noreferrer'>GitHub sürümler sayfamızı</a> ziyaret
+        edin.</p>"
+      name: Sürüm notları kullanılamıyor
+    terms:
+      heading: Kullanım Şartları
+      placeholder: Kullanım şartları içeriği burada görüntülenecek.
+      title: Kullanım Şartları
diff --git a/config/locales/views/pages/zh-CN.yml b/config/locales/views/pages/zh-CN.yml
index f8d8165b8..4d4a025c9 100644
--- a/config/locales/views/pages/zh-CN.yml
+++ b/config/locales/views/pages/zh-CN.yml
@@ -90,3 +90,6 @@ zh-CN:
         trades: 交易
         no_investments: 暂无投资账户
         add_investment: 添加投资账户以跟踪您的投资组合
+    release_notes_unavailable:
+      name: 发布说明暂不可用
+      body_html: "<p>暂时无法获取最新发布说明。请稍后再试，或直接访问 <a href='https://github.com/we-promise/sure/releases' target='_blank' rel='noopener noreferrer'>GitHub releases 页面</a>。</p>"
diff --git a/config/locales/views/password_mailer/fr.yml b/config/locales/views/password_mailer/fr.yml
index 9d0d148e8..c60bc4e8f 100644
--- a/config/locales/views/password_mailer/fr.yml
+++ b/config/locales/views/password_mailer/fr.yml
@@ -3,6 +3,8 @@ fr:
   password_mailer:
     password_reset:
       cta: Réinitialiser votre mot de passe
-      ignore_if_not_requested: Si vous n'avez pas fait cette demande, vous pouvez ignorer cet e-mail.
-      request_made: Une demande a été faite pour réinitialiser votre mot de passe %{product_name}. Cliquez sur le lien pour le réinitialiser.
-      subject: '%{product_name} : Réinitialiser votre mot de passe'
+      ignore_if_not_requested: Si vous n'avez pas fait cette demande, vous pouvez
+        ignorer cet e-mail.
+      request_made: Une demande a été faite pour réinitialiser votre mot de passe
+        %{product_name}. Cliquez sur le lien pour le réinitialiser.
+      subject: "%{product_name} : Réinitialiser votre mot de passe"
diff --git a/config/locales/views/password_mailer/it.yml b/config/locales/views/password_mailer/it.yml
new file mode 100644
index 000000000..212c04d60
--- /dev/null
+++ b/config/locales/views/password_mailer/it.yml
@@ -0,0 +1,8 @@
+---
+it:
+  password_mailer:
+    password_reset:
+      cta: Reimposta la tua password
+      ignore_if_not_requested: Se non hai fatto questa richiesta, puoi ignorare questa email.
+      request_made: È stata fatta una richiesta per reimpostare la tua password di %{product_name}. Clicca il link per reimpostarla.
+      subject: '%{product_name}: Reimposta la tua password'
diff --git a/config/locales/views/password_mailer/ru.yml b/config/locales/views/password_mailer/ru.yml
new file mode 100644
index 000000000..c8649a912
--- /dev/null
+++ b/config/locales/views/password_mailer/ru.yml
@@ -0,0 +1,10 @@
+---
+ru:
+  password_mailer:
+    password_reset:
+      cta: Сбросить пароль
+      ignore_if_not_requested: Если вы не запрашивали это, просто проигнорируйте это
+        письмо.
+      request_made: Был получен запрос на сброс пароля для %{product_name}. Нажмите
+        на ссылку, чтобы сбросить его.
+      subject: "%{product_name}: Сброс пароля"
diff --git a/config/locales/views/password_mailer/tr.yml b/config/locales/views/password_mailer/tr.yml
index 42d55d08e..dd385b313 100644
--- a/config/locales/views/password_mailer/tr.yml
+++ b/config/locales/views/password_mailer/tr.yml
@@ -3,6 +3,8 @@ tr:
   password_mailer:
     password_reset:
       cta: Şifrenizi sıfırlayın
-      ignore_if_not_requested: Eğer bu isteği siz yapmadıysanız, bu e-postayı yok sayabilirsiniz.
-      request_made: "%{product_name} şifrenizi sıfırlamak için bir istek yapıldı. Sıfırlamak için bağlantıya tıklayın."
-      subject: '%{product_name}: Şifrenizi sıfırlayın'
\ No newline at end of file
+      ignore_if_not_requested: Eğer bu isteği siz yapmadıysanız, bu e-postayı yok
+        sayabilirsiniz.
+      request_made: "%{product_name} şifrenizi sıfırlamak için bir istek yapıldı.
+        Sıfırlamak için bağlantıya tıklayın."
+      subject: "%{product_name}: Şifrenizi sıfırlayın"
diff --git a/config/locales/views/password_resets/fr.yml b/config/locales/views/password_resets/fr.yml
index df1fbe5c9..12e88d602 100644
--- a/config/locales/views/password_resets/fr.yml
+++ b/config/locales/views/password_resets/fr.yml
@@ -1,15 +1,18 @@
 ---
 fr:
   password_resets:
-    disabled: La réinitialisation du mot de passe via Sure est désactivée. Veuillez réinitialiser votre mot de passe via votre fournisseur d'identité.
-    sso_only_user: Votre compte utilise le SSO pour l'authentification. Veuillez contacter votre administrateur pour gérer vos identifiants.
+    disabled: La réinitialisation du mot de passe via Sure est désactivée. Veuillez
+      réinitialiser votre mot de passe via votre fournisseur d'identité.
     edit:
       title: Réinitialiser votre mot de passe
     new:
-      requested: Veuillez vérifier votre boîte mail pour un lien de réinitialisation de votre mot de passe.
+      back: Retour
+      requested: Veuillez vérifier votre boîte mail pour un lien de réinitialisation
+        de votre mot de passe.
       submit: Réinitialiser votre mot de passe
       title: Réinitialiser votre mot de passe
-      back: Retour
+    sso_only_user: Votre compte utilise le SSO pour l'authentification. Veuillez contacter
+      votre administrateur pour gérer vos identifiants.
     update:
       invalid_token: Jeton invalide.
       success: Votre mot de passe a été réinitialisé.
diff --git a/config/locales/views/password_resets/it.yml b/config/locales/views/password_resets/it.yml
new file mode 100644
index 000000000..521cd8be9
--- /dev/null
+++ b/config/locales/views/password_resets/it.yml
@@ -0,0 +1,15 @@
+---
+it:
+  password_resets:
+    disabled: Il reset della password tramite Sure è disabilitato. Reimposta la password tramite il tuo provider di identità.
+    sso_only_user: Il tuo account usa SSO per l'autenticazione. Contatta il tuo amministratore per gestire le credenziali.
+    edit:
+      title: Reimposta password
+    new:
+      requested: Controlla la tua email per un link per reimpostare la password.
+      submit: Reimposta password
+      title: Reimposta password
+      back: Indietro
+    update:
+      invalid_token: Token non valido.
+      success: La tua password è stata reimpostata.
diff --git a/config/locales/views/password_resets/ru.yml b/config/locales/views/password_resets/ru.yml
new file mode 100644
index 000000000..8fcde2e14
--- /dev/null
+++ b/config/locales/views/password_resets/ru.yml
@@ -0,0 +1,18 @@
+---
+ru:
+  password_resets:
+    disabled: Сброс пароля через Sure отключён. Пожалуйста, сбросьте пароль через
+      вашего провайдера идентификации.
+    edit:
+      title: Сброс пароля
+    new:
+      back: Назад
+      requested: Пожалуйста, проверьте вашу электронную почту для получения ссылки
+        на сброс пароля.
+      submit: Сбросить пароль
+      title: Сброс пароля
+    sso_only_user: Ваш аккаунт использует SSO для аутентификации. Пожалуйста, свяжитесь
+      с вашим администратором для управления учётными данными.
+    update:
+      invalid_token: Неверный токен.
+      success: Ваш пароль был сброшен.
diff --git a/config/locales/views/password_resets/tr.yml b/config/locales/views/password_resets/tr.yml
index 5bcb9a0e1..278bf329a 100644
--- a/config/locales/views/password_resets/tr.yml
+++ b/config/locales/views/password_resets/tr.yml
@@ -1,13 +1,17 @@
 ---
 tr:
   password_resets:
+    disabled: Sure üzerinden şifre sıfırlama devre dışı bırakılmıştır. Lütfen şifrenizi
+      kimlik sağlayıcınız üzerinden sıfırlayın.
     edit:
       title: Şifreyi sıfırla
     new:
+      back: Geri
       requested: Lütfen şifrenizi sıfırlamak için e-postanızı kontrol edin.
       submit: Şifreyi sıfırla
       title: Şifreyi sıfırla
-      back: Geri
+    sso_only_user: Hesabınız kimlik doğrulama için SSO kullanıyor. Kimlik bilgilerinizi
+      yönetmek için lütfen yöneticinizle iletişime geçin.
     update:
       invalid_token: Geçersiz token.
       success: Şifreniz başarıyla sıfırlandı.
diff --git a/config/locales/views/password_resets/zh-CN.yml b/config/locales/views/password_resets/zh-CN.yml
index 5bbf19447..ce5efcf3c 100644
--- a/config/locales/views/password_resets/zh-CN.yml
+++ b/config/locales/views/password_resets/zh-CN.yml
@@ -11,3 +11,5 @@ zh-CN:
     update:
       invalid_token: 验证令牌无效。
       success: 密码已重置成功。
+    disabled: Sure 密码重置已禁用。请通过身份提供商重置密码。
+    sso_only_user: 你的账户使用 SSO 登录。请联系管理员管理凭据。
diff --git a/config/locales/views/passwords/it.yml b/config/locales/views/passwords/it.yml
new file mode 100644
index 000000000..dae094463
--- /dev/null
+++ b/config/locales/views/passwords/it.yml
@@ -0,0 +1,10 @@
+---
+it:
+  passwords:
+    edit:
+      password: Nuova password
+      password_challenge: Password attuale
+      submit: Reimposta password
+      title: Aggiorna password
+    update:
+      success: La tua password è stata reimpostata.
diff --git a/config/locales/views/passwords/ru.yml b/config/locales/views/passwords/ru.yml
new file mode 100644
index 000000000..87b6993f0
--- /dev/null
+++ b/config/locales/views/passwords/ru.yml
@@ -0,0 +1,10 @@
+---
+ru:
+  passwords:
+    edit:
+      password: Новый пароль
+      password_challenge: Текущий пароль
+      submit: Сбросить пароль
+      title: Обновить пароль
+    update:
+      success: Ваш пароль был сброшен.
diff --git a/config/locales/views/passwords/tr.yml b/config/locales/views/passwords/tr.yml
index b68e76829..6ba784ff7 100644
--- a/config/locales/views/passwords/tr.yml
+++ b/config/locales/views/passwords/tr.yml
@@ -7,4 +7,4 @@ tr:
       submit: Şifreyi Sıfırla
       title: Şifreyi Güncelle
     update:
-      success: Şifreniz sıfırlandı.
\ No newline at end of file
+      success: Şifreniz sıfırlandı.
diff --git a/config/locales/views/pdf_import_mailer/fr.yml b/config/locales/views/pdf_import_mailer/fr.yml
index 93115a3c5..184e6c3f0 100644
--- a/config/locales/views/pdf_import_mailer/fr.yml
+++ b/config/locales/views/pdf_import_mailer/fr.yml
@@ -2,16 +2,22 @@
 fr:
   pdf_import_mailer:
     next_steps:
-      greeting: "Bonjour %{name},"
-      intro: "Nous avons terminé l'analyse du document PDF que vous avez téléversé sur %{product}."
+      document_stored_note: Ce document a été stocké pour votre référence. Il peut
+        être utilisé pour fournir du contexte dans vos futures conversations avec
+        l'IA.
       document_type_label: Type de document
-      summary_label: Résumé IA
-      transactions_note: Ce document semble contenir des transactions. Vous pouvez les extraire et les consulter maintenant.
-      document_stored_note: Ce document a été stocké pour votre référence. Il peut être utilisé pour fournir du contexte dans vos futures conversations avec l'IA.
+      footer_note: Ceci est un message automatique. Veuillez ne pas répondre directement
+        à cet e-mail.
+      greeting: Bonjour %{name},
+      intro: Nous avons terminé l'analyse du document PDF que vous avez téléversé
+        sur %{product}.
+      next_steps_intro: 'Plusieurs options s''offrent à vous :'
       next_steps_label: Et maintenant ?
-      next_steps_intro: "Plusieurs options s'offrent à vous :"
-      option_extract_transactions: Extraire les transactions de ce relevé
-      option_keep_reference: Conserver ce document pour référence dans vos futures conversations avec l'IA
       option_delete: Supprimer cet import si vous n'en avez plus besoin
+      option_extract_transactions: Extraire les transactions de ce relevé
+      option_keep_reference: Conserver ce document pour référence dans vos futures
+        conversations avec l'IA
+      summary_label: Résumé IA
+      transactions_note: Ce document semble contenir des transactions. Vous pouvez
+        les extraire et les consulter maintenant.
       view_import_button: Voir les détails de l'import
-      footer_note: Ceci est un message automatique. Veuillez ne pas répondre directement à cet e-mail.
diff --git a/config/locales/views/pdf_import_mailer/it.yml b/config/locales/views/pdf_import_mailer/it.yml
new file mode 100644
index 000000000..31b5eebf1
--- /dev/null
+++ b/config/locales/views/pdf_import_mailer/it.yml
@@ -0,0 +1,17 @@
+---
+it:
+  pdf_import_mailer:
+    next_steps:
+      greeting: "Ciao %{name},"
+      intro: "Abbiamo finito di analizzare il documento PDF che hai caricato su %{product}."
+      document_type_label: Tipo documento
+      summary_label: Riepilogo IA
+      transactions_note: Questo documento sembra contenere delle transazioni. Puoi estrarle e rivederle ora.
+      document_stored_note: Questo documento è stato salvato come riferimento. Può essere usato per fornire contesto nelle future conversazioni IA.
+      next_steps_label: E adesso?
+      next_steps_intro: "Hai diverse opzioni:"
+      option_extract_transactions: Estrai le transazioni da questo estratto conto
+      option_keep_reference: Mantieni questo documento come riferimento per le future conversazioni IA
+      option_delete: Elimina questa importazione se non ne hai più bisogno
+      view_import_button: Visualizza dettagli importazione
+      footer_note: Questo è un messaggio automatico. Non rispondere direttamente a questa email.
diff --git a/config/locales/views/pdf_import_mailer/ru.yml b/config/locales/views/pdf_import_mailer/ru.yml
new file mode 100644
index 000000000..56652380c
--- /dev/null
+++ b/config/locales/views/pdf_import_mailer/ru.yml
@@ -0,0 +1,21 @@
+---
+ru:
+  pdf_import_mailer:
+    next_steps:
+      document_stored_note: Этот документ сохранён для вашего удобства. Он может быть
+        использован для предоставления контекста в будущих разговорах с ИИ.
+      document_type_label: Тип документа
+      footer_note: Это автоматическое сообщение. Пожалуйста, не отвечайте напрямую
+        на этот email.
+      greeting: Привет, %{name},
+      intro: Мы закончили анализировать PDF-документ, который вы загрузили в %{product}.
+      next_steps_intro: 'У вас есть несколько вариантов:'
+      next_steps_label: Что дальше?
+      option_delete: Удалить этот импорт, если он вам больше не нужен
+      option_extract_transactions: Извлечь операции из этой выписки
+      option_keep_reference: Сохранить этот документ для справки в будущих разговорах
+        с ИИ
+      summary_label: Резюме ИИ
+      transactions_note: Этот документ, похоже, содержит операции. Вы можете извлечь
+        и просмотреть их сейчас.
+      view_import_button: Просмотреть детали импорта
diff --git a/config/locales/views/pdf_import_mailer/tr.yml b/config/locales/views/pdf_import_mailer/tr.yml
new file mode 100644
index 000000000..1b70f14e5
--- /dev/null
+++ b/config/locales/views/pdf_import_mailer/tr.yml
@@ -0,0 +1,20 @@
+---
+tr:
+  pdf_import_mailer:
+    next_steps:
+      document_stored_note: Bu belge referansınız için saklandı. Gelecekteki yapay
+        zeka sohbetlerinde bağlam sağlamak için kullanılabilir.
+      document_type_label: Belge Türü
+      footer_note: Bu otomatik bir mesajdır. Lütfen bu e-postayı doğrudan yanıtlamayın.
+      greeting: Merhaba %{name},
+      intro: "%{product}'a yüklediğiniz PDF belgesinin analizini tamamladık."
+      next_steps_intro: 'Birkaç seçeneğiniz var:'
+      next_steps_label: Sırada Ne Var?
+      option_delete: Artık ihtiyacınız yoksa bu içe aktarmayı silin
+      option_extract_transactions: Bu ekstreden işlemleri çıkarın
+      option_keep_reference: Gelecekteki yapay zeka sohbetlerinde referans olması
+        için bu belgeyi saklayın
+      summary_label: Yapay Zeka Özeti
+      transactions_note: Bu belge işlemler içeriyor gibi görünüyor. Şimdi bunları
+        çıkarabilir ve inceleyebilirsiniz.
+      view_import_button: İçe Aktarma Ayrıntılarını Görüntüle
diff --git a/config/locales/views/pending_duplicate_merges/de.yml b/config/locales/views/pending_duplicate_merges/de.yml
new file mode 100644
index 000000000..6a7a5ef60
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/de.yml
@@ -0,0 +1,21 @@
+---
+de:
+  pending_duplicate_merges:
+    create:
+      no_posted_selected: Bitte wählen Sie eine gebuchte Transaktion zum Zusammenführen aus
+      invalid_transaction: Ungültige Transaktion zum Zusammenführen ausgewählt
+      merge_success: Ausstehende Transaktion mit gebuchter Transaktion zusammengeführt
+      merge_failed: Transaktionen konnten nicht zusammengeführt werden
+    set_transaction:
+      pending_only: Diese Funktion ist nur für ausstehende Transaktionen verfügbar
+    new:
+      title: Mit gebuchter Transaktion zusammenführen
+      warning_title: Manuelles Zusammenführen von Duplikaten
+      warning_description: Verwenden Sie dies, um eine ausstehende Transaktion manuell mit ihrer gebuchten Version zusammenzuführen. Dadurch wird die ausstehende Transaktion gelöscht und nur die gebuchte beibehalten.
+      pending_transaction: Ausstehende Transaktion
+      select_posted: Gebuchte Transaktion zum Zusammenführen auswählen
+      showing_range: "%{start} - %{end} werden angezeigt"
+      previous: "← Vorherige 10"
+      next: "Nächste 10 →"
+      no_candidates: Keine gebuchten Transaktionen in diesem Konto gefunden.
+      submit_button: Transaktionen zusammenführen
diff --git a/config/locales/views/pending_duplicate_merges/es.yml b/config/locales/views/pending_duplicate_merges/es.yml
new file mode 100644
index 000000000..d85917824
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/es.yml
@@ -0,0 +1,21 @@
+---
+es:
+  pending_duplicate_merges:
+    create:
+      no_posted_selected: Selecciona una transacción contabilizada con la que fusionar
+      invalid_transaction: Transacción seleccionada para fusionar no válida
+      merge_success: Transacción pendiente fusionada con la transacción contabilizada
+      merge_failed: No se pudieron fusionar las transacciones
+    set_transaction:
+      pending_only: Esta función solo está disponible para transacciones pendientes
+    new:
+      title: Fusionar con transacción contabilizada
+      warning_title: Fusión manual de duplicados
+      warning_description: Usa esto para fusionar manualmente una transacción pendiente con su versión contabilizada. Se eliminará la transacción pendiente y se conservará únicamente la contabilizada.
+      pending_transaction: Transacción pendiente
+      select_posted: Selecciona la transacción contabilizada con la que fusionar
+      showing_range: "Mostrando %{start} - %{end}"
+      previous: "← 10 anteriores"
+      next: "10 siguientes →"
+      no_candidates: No se han encontrado transacciones contabilizadas en esta cuenta.
+      submit_button: Fusionar transacciones
diff --git a/config/locales/views/pending_duplicate_merges/fr.yml b/config/locales/views/pending_duplicate_merges/fr.yml
index 16aeabdbc..0ff463d60 100644
--- a/config/locales/views/pending_duplicate_merges/fr.yml
+++ b/config/locales/views/pending_duplicate_merges/fr.yml
@@ -1,14 +1,25 @@
 ---
 fr:
   pending_duplicate_merges:
+    create:
+      invalid_transaction: Transaction non valide sélectionnée pour la fusion
+      merge_failed: Impossible de fusionner les transactions
+      merge_success: Transaction en attente fusionnée avec la transaction publiée
+      no_posted_selected: Veuillez sélectionner une transaction publiée avec laquelle
+        fusionner
     new:
-      title: Fusionner avec une transaction validée
-      warning_title: Fusion manuelle de doublons
-      warning_description: Utilisez cette option pour fusionner manuellement une transaction en attente avec sa version validée. Cela supprimera la transaction en attente et ne conservera que la version validée.
-      pending_transaction: Transaction en attente
-      select_posted: Sélectionner la transaction validée à fusionner
-      showing_range: "Affichage de %{start} - %{end}"
-      previous: "← 10 précédentes"
-      next: "10 suivantes →"
+      next: 10 suivantes →
       no_candidates: Aucune transaction validée trouvée sur ce compte.
+      pending_transaction: Transaction en attente
+      previous: "← 10 précédentes"
+      select_posted: Sélectionner la transaction validée à fusionner
+      showing_range: Affichage de %{start} - %{end}
       submit_button: Fusionner les transactions
+      title: Fusionner avec une transaction validée
+      warning_description: Utilisez cette option pour fusionner manuellement une transaction
+        en attente avec sa version validée. Cela supprimera la transaction en attente
+        et ne conservera que la version validée.
+      warning_title: Fusion manuelle de doublons
+    set_transaction:
+      pending_only: Cette fonctionnalité n'est disponible que pour les transactions
+        en attente
diff --git a/config/locales/views/pending_duplicate_merges/it.yml b/config/locales/views/pending_duplicate_merges/it.yml
new file mode 100644
index 000000000..d05cd9b25
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/it.yml
@@ -0,0 +1,21 @@
+---
+it:
+  pending_duplicate_merges:
+    create:
+      no_posted_selected: Seleziona una transazione registrata con cui unire
+      invalid_transaction: Transazione selezionata per l'unione non valida
+      merge_success: Transazione in sospeso unita con la transazione registrata
+      merge_failed: Impossibile unire le transazioni
+    set_transaction:
+      pending_only: Questa funzione è disponibile solo per le transazioni in sospeso
+    new:
+      title: Unisci con transazione registrata
+      warning_title: Unione duplicati manuale
+      warning_description: Usa questa funzione per unire manualmente una transazione in sospeso con la sua versione registrata. Questo eliminerà la transazione in sospeso e manterrà solo quella registrata.
+      pending_transaction: Transazione in sospeso
+      select_posted: Seleziona la transazione registrata con cui unire
+      showing_range: "Visualizzando %{start} - %{end}"
+      previous: "← Precedenti 10"
+      next: "Successive 10 →"
+      no_candidates: Nessuna transazione registrata trovata in questo conto.
+      submit_button: Unisci transazioni
diff --git a/config/locales/views/pending_duplicate_merges/nl.yml b/config/locales/views/pending_duplicate_merges/nl.yml
new file mode 100644
index 000000000..328fba74b
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/nl.yml
@@ -0,0 +1,21 @@
+---
+nl:
+  pending_duplicate_merges:
+    create:
+      no_posted_selected: Selecteer een geboekte transactie om mee samen te voegen
+      invalid_transaction: Ongeldige transactie geselecteerd om samen te voegen
+      merge_success: Lopende transactie samengevoegd met geboekte transactie
+      merge_failed: Transacties konden niet worden samengevoegd
+    set_transaction:
+      pending_only: Deze functie is alleen beschikbaar voor lopende transacties
+    new:
+      title: Samenvoegen met geboekte transactie
+      warning_title: Handmatig duplicaten samenvoegen
+      warning_description: Gebruik dit om een lopende transactie handmatig samen te voegen met de geboekte versie. Hiermee wordt de lopende transactie verwijderd en alleen de geboekte behouden.
+      pending_transaction: Lopende transactie
+      select_posted: Selecteer de geboekte transactie om mee samen te voegen
+      showing_range: "%{start} - %{end} worden weergegeven"
+      previous: "← Vorige 10"
+      next: "Volgende 10 →"
+      no_candidates: Geen geboekte transacties gevonden in dit account.
+      submit_button: Transacties samenvoegen
diff --git a/config/locales/views/pending_duplicate_merges/pt-BR.yml b/config/locales/views/pending_duplicate_merges/pt-BR.yml
new file mode 100644
index 000000000..24a118e60
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/pt-BR.yml
@@ -0,0 +1,21 @@
+---
+pt-BR:
+  pending_duplicate_merges:
+    create:
+      no_posted_selected: Selecione uma transação lançada para mesclar
+      invalid_transaction: Transação selecionada para mesclagem inválida
+      merge_success: Transação pendente mesclada com a transação lançada
+      merge_failed: Não foi possível mesclar as transações
+    set_transaction:
+      pending_only: Este recurso está disponível apenas para transações pendentes
+    new:
+      title: Mesclar com transação lançada
+      warning_title: Mesclagem manual de duplicatas
+      warning_description: Use isto para mesclar manualmente uma transação pendente com sua versão lançada. Isso excluirá a transação pendente e manterá apenas a lançada.
+      pending_transaction: Transação pendente
+      select_posted: Selecione a transação lançada para mesclar
+      showing_range: "Exibindo %{start} - %{end}"
+      previous: "← 10 anteriores"
+      next: "Próximas 10 →"
+      no_candidates: Nenhuma transação lançada encontrada nesta conta.
+      submit_button: Mesclar transações
diff --git a/config/locales/views/pending_duplicate_merges/ru.yml b/config/locales/views/pending_duplicate_merges/ru.yml
new file mode 100644
index 000000000..8e778e059
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/ru.yml
@@ -0,0 +1,23 @@
+---
+ru:
+  pending_duplicate_merges:
+    create:
+      invalid_transaction: Выбрана недопустимая операция для объединения
+      merge_failed: Не удалось объединить операции
+      merge_success: Ожидаемая операция объединена с проведённой операцией
+      no_posted_selected: Пожалуйста, выберите проведённую операцию для объединения
+    new:
+      next: Следующие 10 →
+      no_candidates: В этом счёте не найдено проведённых операций.
+      pending_transaction: Ожидаемая операция
+      previous: "← Предыдущие 10"
+      select_posted: Выберите проведённую операцию для объединения
+      showing_range: Показано %{start} - %{end}
+      submit_button: Объединить операции
+      title: Объединение с проведённой операцией
+      warning_description: Используйте это для ручного объединения ожидаемой операции
+        с её проведённой версией. Это удалит ожидаемую операцию и сохранит только
+        проведённую.
+      warning_title: Ручное объединение дубликатов
+    set_transaction:
+      pending_only: Эта функция доступна только для ожидаемых операций
diff --git a/config/locales/views/pending_duplicate_merges/tr.yml b/config/locales/views/pending_duplicate_merges/tr.yml
new file mode 100644
index 000000000..22a40a6d2
--- /dev/null
+++ b/config/locales/views/pending_duplicate_merges/tr.yml
@@ -0,0 +1,23 @@
+---
+tr:
+  pending_duplicate_merges:
+    create:
+      invalid_transaction: Birleştirme için geçersiz işlem seçildi
+      merge_failed: İşlemler birleştirilemedi
+      merge_success: Bekleyen işlem, kaydedilmiş işlemle birleştirildi
+      no_posted_selected: Lütfen birleştirmek için kaydedilmiş bir işlem seçin
+    new:
+      next: Sonraki 10 →
+      no_candidates: Bu hesapta kaydedilmiş işlem bulunamadı.
+      pending_transaction: Bekleyen İşlem
+      previous: "← Önceki 10"
+      select_posted: Birleştirilecek Kaydedilmiş İşlemi Seçin
+      showing_range: "%{start} - %{end} arası gösteriliyor"
+      submit_button: İşlemleri Birleştir
+      title: Kaydedilmiş İşlemle Birleştir
+      warning_description: Bunu, bekleyen bir işlemi kaydedilmiş sürümüyle manuel
+        olarak birleştirmek için kullanın. Bu, bekleyen işlemi silecek ve yalnızca
+        kaydedilmiş olanı tutacaktır.
+      warning_title: Manuel Yinelenen Birleştirme
+    set_transaction:
+      pending_only: Bu özellik yalnızca bekleyen işlemler için kullanılabilir
diff --git a/config/locales/views/plaid_items/fr.yml b/config/locales/views/plaid_items/fr.yml
index 64a627f9f..eff83bb22 100644
--- a/config/locales/views/plaid_items/fr.yml
+++ b/config/locales/views/plaid_items/fr.yml
@@ -5,6 +5,13 @@ fr:
       success: Compte lié avec succès. Veuillez patienter pendant que les comptes se synchronisent.
     destroy:
       success: Les comptes prévus pour la suppression ont été marqués.
+    errors:
+      link_token_generic: Nous n'avons pas pu ouvrir Plaid pour le moment. Veuillez réessayer, et si le problème persiste, vérifiez les journaux du serveur pour plus de détails.
+      link_token_with_message: 'Plaid n''a pas pu ouvrir la connexion : %{message}'
+    link_existing_account:
+      already_linked: Ce compte Plaid est déjà lié
+      invalid_account: Compte Plaid non valide sélectionné
+      success: Compte lié avec succès à Plaid
     plaid_item:
       add_new: Ajouter une nouvelle connexion
       confirm_accept: Supprimer l'institution
@@ -13,6 +20,7 @@ fr:
       connection_lost: Connexion perdue
       connection_lost_description: Cette connexion n'est plus valide. Vous devrez la supprimer et en ajouter une nouvelle pour pouvoir continuer la synchronisation des données.
       delete: Supprimer
+      deletion_in_progress: "(suppression en cours...)"
       error: Une erreur s'est produite lors de la synchronisation des données
       no_accounts_description: Nous ne pouvons pas charger des comptes depuis cette institution financière.
       no_accounts_title: Aucun compte trouvé
@@ -22,7 +30,8 @@ fr:
       syncing: Synchronisation...
       update: Mettre à jour la connexion
     select_existing_account:
-      title: "Lier %{account_name} à Plaid"
-      description: Sélectionnez un compte Plaid à lier à votre compte existant
       cancel: Annuler
+      description: Sélectionnez un compte Plaid à lier à votre compte existant
       link_account: Lier le compte
+      no_available_accounts: Aucun compte Plaid disponible à lier. Veuillez d'abord connecter un nouveau compte Plaid.
+      title: Lier %{account_name} à Plaid
diff --git a/config/locales/views/plaid_items/it.yml b/config/locales/views/plaid_items/it.yml
new file mode 100644
index 000000000..fbe0faadc
--- /dev/null
+++ b/config/locales/views/plaid_items/it.yml
@@ -0,0 +1,37 @@
+---
+it:
+  plaid_items:
+    create:
+      success: Conto collegato con successo. Attendi la sincronizzazione dei conti.
+    destroy:
+      success: Conti pianificati per l'eliminazione.
+    errors:
+      link_token_generic: Impossibile aprire Plaid al momento. Riprova e, se il problema persiste, controlla i log del server per i dettagli.
+      link_token_with_message: "Plaid non ha potuto aprire la connessione: %{message}"
+    plaid_item:
+      add_new: Aggiungi nuova connessione
+      confirm_accept: Elimina istituzione
+      confirm_body: Questo eliminerà definitivamente tutti i conti in questo gruppo e tutti i dati associati.
+      confirm_title: Eliminare l'istituzione?
+      connection_lost: Connessione persa
+      connection_lost_description: Questa connessione non è più valida. Dovrai eliminare questa connessione e aggiungerla di nuovo per continuare a sincronizzare i dati.
+      delete: Elimina
+      deletion_in_progress: (eliminazione in corso...)
+      error: Si è verificato un errore durante la sincronizzazione dei dati
+      no_accounts_description: Non è stato possibile caricare nessun conto da questa istituzione finanziaria.
+      no_accounts_title: Nessun conto trovato
+      requires_update: Riconnetti
+      status: Ultima sincronizzazione %{timestamp} fa
+      status_never: Richiede sincronizzazione dati
+      syncing: Sincronizzazione in corso...
+      update: Aggiorna
+    select_existing_account:
+      no_available_accounts: Nessun conto Plaid disponibile da collegare. Collega prima un nuovo conto Plaid.
+      title: "Collega %{account_name} a Plaid"
+      description: Seleziona un conto Plaid da collegare al tuo conto esistente
+      cancel: Annulla
+      link_account: Collega conto
+    link_existing_account:
+      invalid_account: Conto Plaid selezionato non valido
+      already_linked: Questo conto Plaid è già collegato
+      success: Conto collegato con successo a Plaid
diff --git a/config/locales/views/plaid_items/ru.yml b/config/locales/views/plaid_items/ru.yml
new file mode 100644
index 000000000..dee13cde9
--- /dev/null
+++ b/config/locales/views/plaid_items/ru.yml
@@ -0,0 +1,41 @@
+---
+ru:
+  plaid_items:
+    create:
+      success: Счёт успешно привязан. Пожалуйста, подождите, пока счета синхронизируются.
+    destroy:
+      success: Счета запланированы на удаление.
+    errors:
+      link_token_generic: Не удалось открыть Plaid. Пожалуйста, попробуйте ещё раз.
+        Если проблема сохраняется, проверьте логи сервера.
+      link_token_with_message: 'Не удалось открыть подключение Plaid: %{message}'
+    link_existing_account:
+      already_linked: Этот счёт Plaid уже привязан
+      invalid_account: Выбран недействительный счёт Plaid
+      success: Счёт успешно привязан к Plaid
+    plaid_item:
+      add_new: Добавить новое подключение
+      confirm_accept: Удалить учреждение
+      confirm_body: Это навсегда удалит все счета в этой группе и все связанные данные.
+      confirm_title: Удалить учреждение?
+      connection_lost: Соединение потеряно
+      connection_lost_description: Это соединение больше не действительно. Вам нужно
+        удалить это соединение и добавить его снова, чтобы продолжить синхронизацию
+        данных.
+      delete: Удалить
+      deletion_in_progress: "(удаление в процессе...)"
+      error: Произошла ошибка при синхронизации данных
+      no_accounts_description: Мы не смогли загрузить счета из этого финансового учреждения.
+      no_accounts_title: Счета не найдены
+      requires_update: Переподключить
+      status: Последняя синхронизация %{timestamp} назад
+      status_never: Требуется синхронизация данных
+      syncing: Синхронизация...
+      update: Обновить
+    select_existing_account:
+      cancel: Отмена
+      description: Выберите счёт Plaid для привязки к вашему существующему счёту
+      link_account: Привязать счёт
+      no_available_accounts: Нет доступных счетов Plaid для привязки. Пожалуйста,
+        сначала подключите новый счёт Plaid.
+      title: Привязать %{account_name} к Plaid
diff --git a/config/locales/views/plaid_items/tr.yml b/config/locales/views/plaid_items/tr.yml
index b2e7bddbe..706943649 100644
--- a/config/locales/views/plaid_items/tr.yml
+++ b/config/locales/views/plaid_items/tr.yml
@@ -5,14 +5,25 @@ tr:
       success: Hesap başarıyla bağlandı. Lütfen hesapların senkronize olmasını bekleyin.
     destroy:
       success: Hesaplar silinmek üzere sıraya alındı.
+    errors:
+      link_token_generic: Şu anda Plaid açılamadı. Lütfen tekrar deneyin, sorun devam
+        ederse ayrıntılar için sunucu günlüklerini kontrol edin.
+      link_token_with_message: 'Plaid bağlantıyı açamadı: %{message}'
+    link_existing_account:
+      already_linked: Bu Plaid hesabı zaten bağlı
+      invalid_account: Geçersiz Plaid hesabı seçildi
+      success: Hesap başarıyla Plaid'e bağlandı
     plaid_item:
       add_new: Yeni bağlantı ekle
       confirm_accept: Kurumu sil
-      confirm_body: Bu işlem, bu gruptaki tüm hesapları ve ilişkili tüm verileri kalıcı olarak silecektir.
+      confirm_body: Bu işlem, bu gruptaki tüm hesapları ve ilişkili tüm verileri kalıcı
+        olarak silecektir.
       confirm_title: Kurum silinsin mi?
       connection_lost: Bağlantı kayboldu
-      connection_lost_description: Bu bağlantı artık geçerli değil. Verileri senkronize etmeye devam etmek için bu bağlantıyı silip tekrar eklemeniz gerekecek.
+      connection_lost_description: Bu bağlantı artık geçerli değil. Verileri senkronize
+        etmeye devam etmek için bu bağlantıyı silip tekrar eklemeniz gerekecek.
       delete: Sil
+      deletion_in_progress: "(silme işlemi devam ediyor...)"
       error: Veriler senkronize edilirken bir hata oluştu
       no_accounts_description: Bu finansal kurumdan herhangi bir hesap yüklenemedi.
       no_accounts_title: Hesap bulunamadı
@@ -20,4 +31,11 @@ tr:
       status: Son senkronizasyon %{timestamp} önce
       status_never: Veri senkronizasyonu gerekli
       syncing: Senkronize ediliyor...
-      update: Bağlantıyı güncelle
\ No newline at end of file
+      update: Bağlantıyı güncelle
+    select_existing_account:
+      cancel: İptal
+      description: Mevcut hesabınıza bağlamak için bir Plaid hesabı seçin
+      link_account: Hesabı bağla
+      no_available_accounts: Bağlanacak uygun Plaid hesabı yok. Lütfen önce yeni bir
+        Plaid hesabı bağlayın.
+      title: "%{account_name} hesabını Plaid'e bağla"
diff --git a/config/locales/views/plaid_items/zh-CN.yml b/config/locales/views/plaid_items/zh-CN.yml
index bacb08f13..633c13d3a 100644
--- a/config/locales/views/plaid_items/zh-CN.yml
+++ b/config/locales/views/plaid_items/zh-CN.yml
@@ -21,8 +21,17 @@ zh-CN:
       status_never: 需要数据同步
       syncing: 同步中...
       update: 更新
+      deletion_in_progress: "（正在删除...）"
     select_existing_account:
       cancel: 取消
       description: 选择一个 Plaid 账户与您的现有账户关联
       link_account: 关联账户
       title: 将 %{account_name} 关联到 Plaid
+      no_available_accounts: 没有可关联的 Plaid 账户。请先连接新的 Plaid 账户。
+    errors:
+      link_token_generic: 暂时无法打开 Plaid。请重试；如果问题仍然存在，请查看服务器日志。
+      link_token_with_message: Plaid 无法打开连接：%{message}
+    link_existing_account:
+      invalid_account: 选择的 Plaid 账户无效。
+      already_linked: 此 Plaid 账户已关联。
+      success: 账户已成功关联到 Plaid。
diff --git a/config/locales/views/preview/fr.yml b/config/locales/views/preview/fr.yml
new file mode 100644
index 000000000..a5c9ce32e
--- /dev/null
+++ b/config/locales/views/preview/fr.yml
@@ -0,0 +1,5 @@
+---
+fr:
+  preview:
+    not_enabled: Cette fonctionnalité est en avant-première. Activez les fonctionnalités
+      d'aperçu dans Paramètres → Préférences pour l'essayer.
diff --git a/config/locales/views/preview/it.yml b/config/locales/views/preview/it.yml
new file mode 100644
index 000000000..2f098c56a
--- /dev/null
+++ b/config/locales/views/preview/it.yml
@@ -0,0 +1,4 @@
+---
+it:
+  preview:
+    not_enabled: Questa funzione è in anteprima. Abilita le funzioni di anteprima in Impostazioni → Preferenze per provarla.
diff --git a/config/locales/views/preview/pl.yml b/config/locales/views/preview/pl.yml
new file mode 100644
index 000000000..76d6a318f
--- /dev/null
+++ b/config/locales/views/preview/pl.yml
@@ -0,0 +1,4 @@
+---
+pl:
+  preview:
+    not_enabled: Ta funkcja jest w fazie podglądu. Włącz funkcje podglądu w Ustawienia → Preferencje, aby wypróbować.
diff --git a/config/locales/views/preview/ru.yml b/config/locales/views/preview/ru.yml
new file mode 100644
index 000000000..d4eb142f8
--- /dev/null
+++ b/config/locales/views/preview/ru.yml
@@ -0,0 +1,6 @@
+---
+ru:
+  preview:
+    not_enabled: Эта функция находится в режиме предварительного просмотра. Включите
+      функции предварительного просмотра в Настройки → Предпочтения, чтобы попробовать
+      её.
diff --git a/config/locales/views/preview/tr.yml b/config/locales/views/preview/tr.yml
new file mode 100644
index 000000000..c6a735f72
--- /dev/null
+++ b/config/locales/views/preview/tr.yml
@@ -0,0 +1,5 @@
+---
+tr:
+  preview:
+    not_enabled: Bu özellik önizleme aşamasındadır. Denemek için Ayarlar → Tercihler
+      bölümünden önizleme özelliklerini etkinleştirin.
diff --git a/config/locales/views/properties/en.yml b/config/locales/views/properties/en.yml
index fabe4d28a..d0dc0fe4c 100644
--- a/config/locales/views/properties/en.yml
+++ b/config/locales/views/properties/en.yml
@@ -21,9 +21,22 @@ en:
       subtype_prompt: Select property type
       year_built: Year built
       year_built_placeholder: '2000'
+    avm_providers:
+      rentcast: RentCast
+      realie: Realie
     new:
       title: Enter property manually
       next: "Next"
+      avm_option: "Add via %{provider}"
+      avm_title: "Add property via %{provider}"
+      avm_description: "Enter a name for the property and its address. %{provider} will look up the property details and estimated market value for you."
+      avm_us_only: "%{provider} only supports properties located in the United States."
+      avm_submit: "Look up property"
+      avm_preview_title: "Confirm property details"
+      avm_preview_description: "Here's what %{provider} found. Review the details before adding the property — nothing has been created yet."
+      avm_preview_no_record: "%{provider} couldn't find a property record at this address, so the value shown is an estimate based on the surrounding area. Double-check the address before continuing."
+      avm_preview_back: "Back"
+      avm_preview_confirm: "Add property"
     address:
       title: "Enter property manually"
       address_line1_label: "Address Line 1"
diff --git a/config/locales/views/properties/fr.yml b/config/locales/views/properties/fr.yml
index 5061213e8..5ae681f8e 100644
--- a/config/locales/views/properties/fr.yml
+++ b/config/locales/views/properties/fr.yml
@@ -1,6 +1,27 @@
 ---
 fr:
   properties:
+    address:
+      address_line1_label: Ligne d'adresse 1
+      address_line1_placeholder: 123, rue Principale
+      city_label: Ville
+      city_placeholder: San Francisco
+      country_label: Pays
+      country_placeholder: États-Unis
+      postal_code_label: Code postal
+      postal_code_placeholder: '12345'
+      save: Enregistrer
+      state_region_label: État/Région
+      state_region_placeholder: CA
+      title: Saisir la propriété manuellement
+    balances:
+      market_value_label: Valeur marchande estimée
+      market_value_tooltip: La valeur marchande estimée de votre propriété. Ce numéro
+        peut souvent être trouvé sur des sites comme Zillow ou Redfin, et n'est jamais
+        un nombre exact.
+      next: Suivant
+      save: Enregistrer
+      title: Saisir la propriété manuellement
     edit:
       edit: Modifier %{account}
     form:
@@ -22,6 +43,7 @@ fr:
       year_built: Année de construction
       year_built_placeholder: '2000'
     new:
+      next: Suivant
       title: Saisir les détails de la propriété
     overview:
       living_area: Surface habitable
@@ -30,3 +52,40 @@ fr:
       trend: Tendance
       unknown: Inconnu
       year_built: Année de construction
+    overview_fields:
+      area_label: Zone (facultatif)
+      area_placeholder: '1200'
+      area_unit_label: Unité de surface
+      name_label: Nom
+      name_placeholder: Maison de vacances
+      property_type_label: Type de propriété
+      square_feet: Pieds carrés
+      square_meters: Mètres carrés
+      subtype_prompt: Sélectionnez le type
+      year_built_label: Année de construction (facultatif)
+      year_built_placeholder: '1990'
+    subtypes:
+      agri_land:
+        long: Terrain agricole
+        short: Terre agricole
+      apartment:
+        long: Appartement
+        short: Appartement
+      commercial:
+        long: Propriété commerciale
+        short: Commercial
+      plot:
+        long: Terrain / Terrain
+        short: Terrain
+      rented:
+        long: Propriété louée
+        short: Loué
+    tabs:
+      overview:
+        edit_account_details: Modifier les détails du compte
+        living_area: Surface habitable
+        market_value: Valeur marchande
+        purchase_price: Prix d'achat
+        trend: Tendance
+        unknown: Inconnu
+        year_built: Année de construction
diff --git a/config/locales/views/properties/it.yml b/config/locales/views/properties/it.yml
new file mode 100644
index 000000000..a7226070a
--- /dev/null
+++ b/config/locales/views/properties/it.yml
@@ -0,0 +1,89 @@
+---
+it:
+  properties:
+    edit:
+      edit: Modifica %{account}
+    form:
+      address_line1: Indirizzo
+      address_line1_placeholder: Via Roma, 1
+      area: Superficie abitabile
+      area_placeholder: '80'
+      area_unit: Unità di misura
+      country: Paese
+      country_placeholder: IT
+      locality: Città
+      locality_placeholder: Milano
+      none: Nessuno
+      postal_code: CAP
+      postal_code_placeholder: '20100'
+      region: Provincia/Regione
+      region_placeholder: MI
+      subtype_prompt: Seleziona tipo di proprietà
+      year_built: Anno di costruzione
+      year_built_placeholder: '2000'
+    new:
+      title: Inserisci la proprietà manualmente
+      next: "Avanti"
+    address:
+      title: "Inserisci la proprietà manualmente"
+      address_line1_label: "Indirizzo"
+      address_line1_placeholder: "Via Roma, 1"
+      city_label: "Città"
+      city_placeholder: "Milano"
+      state_region_label: "Provincia/Regione"
+      state_region_placeholder: "MI"
+      postal_code_label: "CAP"
+      postal_code_placeholder: "20100"
+      country_label: "Paese"
+      country_placeholder: "Italia"
+      save: "Salva"
+    balances:
+      title: "Inserisci la proprietà manualmente"
+      market_value_label: "Valore di mercato stimato"
+      market_value_tooltip: "Il valore di mercato stimato della tua proprietà. Questo numero può spesso essere trovato su siti come Immobiliare.it o Idealista, e non è mai un numero esatto."
+      save: "Salva"
+      next: "Avanti"
+    overview_fields:
+      name_label: "Nome"
+      name_placeholder: "Casa vacanze"
+      subtype_prompt: "Seleziona tipo"
+      property_type_label: "Tipo di proprietà"
+      year_built_label: "Anno di costruzione (facoltativo)"
+      year_built_placeholder: "1990"
+      area_label: "Superficie (facoltativo)"
+      area_placeholder: "80"
+      square_feet: "Piedi quadrati"
+      square_meters: "Metri quadrati"
+      area_unit_label: "Unità superficie"
+    overview:
+      living_area: Superficie
+      market_value: Valore di Mercato
+      purchase_price: Prezzo di Acquisto
+      trend: Tendenza
+      unknown: Sconosciuto
+      year_built: Anno di Costruzione
+    tabs:
+      overview:
+        living_area: Superficie
+        market_value: Valore di Mercato
+        purchase_price: Prezzo di Acquisto
+        trend: Tendenza
+        unknown: Sconosciuto
+        year_built: Anno di Costruzione
+        edit_account_details: "Modifica dettagli conto"
+    subtypes:
+      apartment:
+        short: Appartamento
+        long: Appartamento
+      plot:
+        short: Terreno
+        long: Terreno / Lotto
+      commercial:
+        short: Commerciale
+        long: Proprietà Commerciale
+      rented:
+        short: In Affitto
+        long: Proprietà in Affitto
+      agri_land:
+        short: Terreno Agric.
+        long: Terreno Agricolo
diff --git a/config/locales/views/properties/ru.yml b/config/locales/views/properties/ru.yml
new file mode 100644
index 000000000..3f10363e6
--- /dev/null
+++ b/config/locales/views/properties/ru.yml
@@ -0,0 +1,91 @@
+---
+ru:
+  properties:
+    address:
+      address_line1_label: Адрес, строка 1
+      address_line1_placeholder: ул. Ленина, 123
+      city_label: Город
+      city_placeholder: Москва
+      country_label: Страна
+      country_placeholder: Россия
+      postal_code_label: Почтовый индекс
+      postal_code_placeholder: '101000'
+      save: Сохранить
+      state_region_label: Область/Регион
+      state_region_placeholder: МО
+      title: Ввести данные вручную
+    balances:
+      market_value_label: Оценочная рыночная стоимость
+      market_value_tooltip: Оценочная рыночная стоимость вашей недвижимости. Это число
+        можно найти на сайтах, таких как Zillow или Redfin, и оно никогда не является
+        точным.
+      next: Далее
+      save: Сохранить
+      title: Ввести данные вручную
+    edit:
+      edit: Редактировать %{account}
+    form:
+      address_line1: Улица
+      address_line1_placeholder: ул. Ленина, 123
+      area: Жилая площадь
+      area_placeholder: '2000'
+      area_unit: Единица измерения
+      country: Страна
+      country_placeholder: РФ
+      locality: Город
+      locality_placeholder: Москва
+      none: Нет
+      postal_code: Почтовый индекс
+      postal_code_placeholder: '101000'
+      region: Область/Регион
+      region_placeholder: МО
+      subtype_prompt: Выберите тип недвижимости
+      year_built: Год постройки
+      year_built_placeholder: '2000'
+    new:
+      next: Далее
+      title: Ввести данные вручную
+    overview:
+      living_area: Жилая площадь
+      market_value: Рыночная стоимость
+      purchase_price: Цена покупки
+      trend: Тренд
+      unknown: Неизвестно
+      year_built: Год постройки
+    overview_fields:
+      area_label: Площадь (необязательно)
+      area_placeholder: '1200'
+      area_unit_label: Единица площади
+      name_label: Название
+      name_placeholder: Дом для отпуска
+      property_type_label: Тип недвижимости
+      square_feet: Квадратные футы
+      square_meters: Квадратные метры
+      subtype_prompt: Выберите тип
+      year_built_label: Год постройки (необязательно)
+      year_built_placeholder: '1990'
+    subtypes:
+      agri_land:
+        long: Сельскохозяйственная земля
+        short: С/х земля
+      apartment:
+        long: Квартира
+        short: Квартира
+      commercial:
+        long: Коммерческая недвижимость
+        short: Коммерческая
+      plot:
+        long: Участок / Земля
+        short: Участок
+      rented:
+        long: Арендованная недвижимость
+        short: Арендованная
+    tabs:
+      overview:
+        edit_account_details: Редактировать данные счёта
+        living_area: Жилая площадь
+        market_value: Рыночная стоимость
+        purchase_price: Цена покупки
+        trend: Тренд
+        unknown: Неизвестно
+        year_built: Год постройки
diff --git a/config/locales/views/properties/tr.yml b/config/locales/views/properties/tr.yml
index c8077daca..2b58833c2 100644
--- a/config/locales/views/properties/tr.yml
+++ b/config/locales/views/properties/tr.yml
@@ -1,6 +1,27 @@
 ---
 tr:
   properties:
+    address:
+      address_line1_label: Adres Satırı 1
+      address_line1_placeholder: Örnek Cadde No:123
+      city_label: Şehir
+      city_placeholder: İstanbul
+      country_label: Ülke
+      country_placeholder: Türkiye
+      postal_code_label: Posta Kodu
+      postal_code_placeholder: '12345'
+      save: Kaydet
+      state_region_label: Eyalet/Bölge
+      state_region_placeholder: CA
+      title: Mülk bilgilerini manuel girin
+    balances:
+      market_value_label: Tahmini piyasa değeri
+      market_value_tooltip: Mülkünüzün tahmini piyasa değeri. Bu rakam genellikle
+        Zillow veya Redfin gibi sitelerde bulunabilir ve hiçbir zaman kesin bir sayı
+        değildir.
+      next: İleri
+      save: Kaydet
+      title: Mülk bilgilerini manuel girin
     edit:
       edit: "%{account} düzenle"
     form:
@@ -22,6 +43,7 @@ tr:
       year_built: İnşa yılı
       year_built_placeholder: '2000'
     new:
+      next: İleri
       title: Mülk bilgilerini girin
     overview:
       living_area: Yaşam Alanı
@@ -29,4 +51,41 @@ tr:
       purchase_price: Satın Alma Fiyatı
       trend: Eğilim
       unknown: Bilinmiyor
-      year_built: İnşa Yılı
\ No newline at end of file
+      year_built: İnşa Yılı
+    overview_fields:
+      area_label: Alan (isteğe bağlı)
+      area_placeholder: '1200'
+      area_unit_label: Alan Birimi
+      name_label: Ad
+      name_placeholder: Yazlık ev
+      property_type_label: Mülk türü
+      square_feet: Fit Kare
+      square_meters: Metrekare
+      subtype_prompt: Tür seçin
+      year_built_label: İnşa Yılı (isteğe bağlı)
+      year_built_placeholder: '1990'
+    subtypes:
+      agri_land:
+        long: Tarım Arazisi
+        short: Tarım Arazisi
+      apartment:
+        long: Daire
+        short: Daire
+      commercial:
+        long: Ticari Mülk
+        short: Ticari
+      plot:
+        long: Arsa
+        short: Arsa
+      rented:
+        long: Kiralık Mülk
+        short: Kiralık
+    tabs:
+      overview:
+        edit_account_details: Hesap bilgilerini düzenle
+        living_area: Yaşam Alanı
+        market_value: Piyasa Değeri
+        purchase_price: Satın Alma Fiyatı
+        trend: Eğilim
+        unknown: Bilinmiyor
+        year_built: İnşa Yılı
diff --git a/config/locales/views/properties/zh-CN.yml b/config/locales/views/properties/zh-CN.yml
index cddfe072f..952c8b7c7 100644
--- a/config/locales/views/properties/zh-CN.yml
+++ b/config/locales/views/properties/zh-CN.yml
@@ -20,6 +20,7 @@ zh-CN:
       region_placeholder: 加利福尼亚州
       year_built: 建造年份
       year_built_placeholder: '2000'
+      subtype_prompt: 选择房产类型
     new:
       title: 手动输入房产
       next: 下一步
@@ -35,6 +36,7 @@ zh-CN:
       country_label: 国家
       country_placeholder: 美国
       save: 保存
+      postal_code_label: 邮政编码
     balances:
       title: 手动输入房产
       market_value_label: 估算市值
diff --git a/config/locales/views/questrade_items/en.yml b/config/locales/views/questrade_items/en.yml
new file mode 100644
index 000000000..3ba28ff3d
--- /dev/null
+++ b/config/locales/views/questrade_items/en.yml
@@ -0,0 +1,252 @@
+---
+en:
+  questrade_items:
+    default_name: "Questrade Connection"
+    # Model method strings (i18n for item_model.rb)
+    sync_status:
+      no_accounts: "No accounts found"
+      synced:
+        one: "%{count} account synced"
+        other: "%{count} accounts synced"
+      synced_with_setup: "%{linked} synced, %{unlinked} need setup"
+    institution_summary:
+      none: "No institutions connected"
+      count:
+        one: "%{count} institution"
+        other: "%{count} institutions"
+    errors:
+      provider_not_configured: "Questrade provider is not configured"
+
+    # Syncer status messages
+    sync:
+      status:
+        importing: "Importing accounts from Questrade..."
+        processing: "Processing holdings and activities..."
+        calculating: "Calculating balances..."
+        importing_data: "Importing account data..."
+        checking_setup: "Checking account configuration..."
+        needs_setup: "%{count} accounts need setup..."
+      success: "Sync started"
+
+    # Panel (settings view)
+    panel:
+      setup_instructions: "Setup instructions:"
+      step_1: "Visit your Questrade dashboard to get your credentials"
+      step_2: "Enter your credentials below and click the Save button"
+      step_3: "After a successful connection, go to the Accounts tab to set up new accounts"
+      field_descriptions: "Field descriptions:"
+      optional: "(Optional)"
+      required: "(required)"
+      optional_with_default: "(optional, defaults to %{default_value})"
+      save_button: "Save Configuration"
+      update_button: "Update Configuration"
+      token_refresh_hint: "Questrade tokens renew automatically each time your accounts sync. If a connection sits unused for over 7 days and goes stale, paste a new token here to re-arm it without disconnecting."
+      status_configured_html: "Configured and ready to use. Visit the <a href=\"%{accounts_path}\" class=\"link\">Accounts</a> tab to manage and set up accounts."
+      status_not_configured: "Not configured"
+      fields:
+        refresh_token:
+          label: "Refresh Token"
+          description: "Your Questrade refresh token"
+          placeholder_new: "Paste refresh token here"
+          placeholder_update: "Enter new refresh token to update"
+        api_server:
+          label: "Api Server"
+          description: "Your Questrade api server"
+          placeholder_new: "Paste api server here"
+          placeholder_update: "Enter new api server to update"
+
+    # CRUD success messages
+    create:
+      success: "Questrade connection created successfully"
+    update:
+      success: "Questrade connection updated"
+    destroy:
+      success: "Questrade connection removed"
+    index:
+      title: "Questrade Connections"
+
+    # Loading states
+    loading:
+      loading_message: "Loading Questrade accounts..."
+      loading_title: "Loading"
+
+    # Account linking
+    link_accounts:
+      all_already_linked:
+        one: "The selected account (%{names}) is already linked"
+        other: "All %{count} selected accounts are already linked: %{names}"
+      api_error: "API error: %{message}"
+      invalid_account_names:
+        one: "Cannot link account with blank name"
+        other: "Cannot link %{count} accounts with blank names"
+      link_failed: "Failed to link accounts"
+      no_accounts_selected: "Please select at least one account"
+      no_api_key: "Questrade API key not found. Please configure it in Provider Settings."
+      partial_invalid: "Successfully linked %{created_count} account(s), %{already_linked_count} were already linked, %{invalid_count} account(s) had invalid names"
+      partial_success: "Successfully linked %{created_count} account(s). %{already_linked_count} account(s) were already linked: %{already_linked_names}"
+      success:
+        one: "Successfully linked %{count} account"
+        other: "Successfully linked %{count} accounts"
+
+    # Provider item display (used in _item partial)
+    questrade_item:
+      kind: Brokerage
+      accounts_need_setup: "Accounts need setup"
+      delete: "Delete connection"
+      deletion_in_progress: "deletion in progress..."
+      error: "Error"
+      more_accounts_available:
+        one: "%{count} more account available"
+        other: "%{count} more accounts available"
+      no_accounts_description: "This connection has no linked accounts yet."
+      no_accounts_title: "No accounts"
+      provider_name: "Questrade"
+      requires_update: "Connection needs update"
+      setup_action: "Set Up New Accounts"
+      setup_description: "%{linked} of %{total} accounts linked. Choose account types for your newly imported Questrade accounts."
+      setup_needed: "New accounts ready to set up"
+      status: "Synced %{timestamp} ago"
+      status_never: "Never synced"
+      status_with_summary: "Last synced %{timestamp} ago - %{summary}"
+      syncing: "Syncing..."
+      total: "Total"
+      unlinked: "Unlinked"
+      update_credentials: "Update credentials"
+
+    # Select accounts view
+    select_accounts:
+      accounts_selected: "accounts selected"
+      api_error: "API error: %{message}"
+      cancel: "Cancel"
+      configure_name_in_provider: "Cannot import - please configure account name in Questrade"
+      description: "Select the accounts you want to link to your %{product_name} account."
+      link_accounts: "Link selected accounts"
+      no_accounts_found: "No accounts found. Please check your API key configuration."
+      no_api_key: "Questrade API key is not configured. Please configure it in Settings."
+      no_credentials_configured: "Please configure your Questrade credentials first in Provider Settings."
+      no_name_placeholder: "(No name)"
+      title: "Select Questrade Accounts"
+
+    # Select existing account view
+    select_existing_account:
+      account_already_linked: "This account is already linked to a provider"
+      all_accounts_already_linked: "All Questrade accounts are already linked"
+      api_error: "API error: %{message}"
+      balance_label: "Balance:"
+      cancel: "Cancel"
+      cancel_button: "Cancel"
+      configure_name_in_provider: "Cannot import - please configure account name in Questrade"
+      connect_hint: "Connect a Questrade account to enable automatic syncing."
+      description: "Select a Questrade account to link with this account. Transactions will be synced and deduplicated automatically."
+      header: "Link with Questrade"
+      link_account: "Link account"
+      link_button: "Link this account"
+      linking_to: "Linking to:"
+      no_account_specified: "No account specified"
+      no_accounts: "No unlinked Questrade accounts found."
+      no_accounts_found: "No Questrade accounts found. Please check your API key configuration."
+      no_api_key: "Questrade API key is not configured. Please configure it in Settings."
+      no_credentials_configured: "Please configure your Questrade credentials first in Provider Settings."
+      no_name_placeholder: "(No name)"
+      settings_link: "Go to Provider Settings"
+      subtitle: "Choose a Questrade account"
+      title: "Link %{account_name} with Questrade"
+
+    # Link existing account
+    link_existing_account:
+      account_already_linked: "This account is already linked to a provider"
+      api_error: "API error: %{message}"
+      invalid_account_name: "Cannot link account with blank name"
+      provider_account_already_linked: "This Questrade account is already linked to another account"
+      provider_account_not_found: "Questrade account not found"
+      missing_parameters: "Missing required parameters"
+      no_api_key: "Questrade API key not found. Please configure it in Provider Settings."
+      success: "Successfully linked %{account_name} with Questrade"
+
+    # Setup accounts wizard
+    setup_accounts:
+      account_type_label: "Account Type:"
+      accounts_count:
+        one: "%{count} account available"
+        other: "%{count} accounts available"
+      all_accounts_linked: "All your Questrade accounts have already been set up."
+      api_error: "API error: %{message}"
+      creating: "Creating accounts..."
+      fetch_failed: "Failed to Fetch Accounts"
+      import_selected: "Import selected accounts"
+      instructions: "Select the accounts you want to import from Questrade. You can choose multiple accounts."
+      no_accounts: "No unlinked accounts found from this Questrade connection."
+      no_accounts_to_setup: "No Accounts to Set Up"
+      no_api_key: "Questrade API key is not configured. Please check your connection settings."
+      select_all: "Select all"
+      account_types:
+        skip: "Skip this account"
+        depository: "Checking or Savings Account"
+        credit_card: "Credit Card"
+        investment: "Investment Account"
+        crypto: "Cryptocurrency Account"
+        loan: "Loan or Mortgage"
+        other_asset: "Other Asset"
+      subtype_labels:
+        depository: "Account Subtype:"
+        credit_card: ""
+        investment: "Investment Type:"
+        crypto: ""
+        loan: "Loan Type:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Credit cards will be automatically set up as credit card accounts."
+        other_asset: "No additional options needed for Other Assets."
+        crypto: "Cryptocurrency accounts will be set up to track holdings and transactions."
+      subtypes:
+        depository:
+          checking: "Checking"
+          savings: "Savings"
+          hsa: "Health Savings Account"
+          cd: "Certificate of Deposit"
+          money_market: "Money Market"
+        investment:
+          brokerage: "Brokerage"
+          pension: "Pension"
+          retirement: "Retirement"
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: "Thrift Savings Plan"
+          "529_plan": "529 Plan"
+          hsa: "Health Savings Account"
+          mutual_fund: "Mutual Fund"
+          ira: "Traditional IRA"
+          roth_ira: "Roth IRA"
+          angel: "Angel"
+        loan:
+          mortgage: "Mortgage"
+          student: "Student Loan"
+          auto: "Auto Loan"
+          other: "Other Loan"
+      balance: "Balance"
+      cancel: "Cancel"
+      choose_account_type: "Choose the correct account type for each Questrade account:"
+      create_accounts: "Create Accounts"
+      creating_accounts: "Creating Accounts..."
+      historical_data_range: "Historical Data Range:"
+      subtitle: "Choose the correct account types for your imported accounts"
+      sync_start_date_help: "Select how far back you want to sync transaction history."
+      sync_start_date_label: "Start syncing transactions from:"
+      title: "Set Up Your Questrade Accounts"
+
+    # Complete account setup
+    setup_required:
+      title: Connect Questrade first
+      not_configured_title: Questrade isn't connected yet
+      not_configured_description: Add your Questrade connection under Provider settings, then come back here to link accounts.
+      go_to_provider_settings: Go to provider settings
+    complete_account_setup:
+      all_skipped: "All accounts were skipped. No accounts were created."
+      creation_failed: "Failed to create accounts: %{error}"
+      no_accounts: "No accounts to set up."
+      success: "Successfully created %{count} account(s)."
+
+    # Preload accounts
+    preload_accounts:
+      no_credentials_configured: "Please configure your Questrade credentials first in Provider Settings."
diff --git a/config/locales/views/questrade_items/fr.yml b/config/locales/views/questrade_items/fr.yml
new file mode 100644
index 000000000..d28763315
--- /dev/null
+++ b/config/locales/views/questrade_items/fr.yml
@@ -0,0 +1,263 @@
+---
+fr:
+  questrade_items:
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      creation_failed: 'Échec de la création des comptes : %{error}'
+      no_accounts: Aucun compte à configurer.
+      success:
+        one: "%{count} compte créé avec succès."
+        other: "%{count} comptes créés avec succès."
+    create:
+      success: Connexion Questrade créée avec succès
+    default_name: Connexion Questrade
+    destroy:
+      success: Connexion Questrade supprimée
+    errors:
+      provider_not_configured: Le fournisseur Questrade n'est pas configuré
+    index:
+      title: Connexions Questrade
+    institution_summary:
+      count:
+        one: "%{count} institution"
+        other: "%{count} institutions"
+      none: Aucune institution connectée
+    link_accounts:
+      all_already_linked:
+        one: Le compte sélectionné (%{names}) est déjà lié
+        other: 'Les %{count} comptes sélectionnés sont déjà liés : %{names}'
+      api_error: 'Erreur API : %{message}'
+      invalid_account_names:
+        one: Impossible de lier un compte sans nom
+        other: Impossible de lier %{count} comptes sans nom
+      link_failed: Échec de la liaison des comptes
+      no_accounts_selected: Veuillez sélectionner au moins un compte
+      no_api_key: Clé API Questrade introuvable. Veuillez la configurer dans les paramètres
+        du fournisseur.
+      partial_invalid: "%{created_count} compte(s) lié(s) avec succès, %{already_linked_count}
+        étaient déjà liés, %{invalid_count} compte(s) avaient des noms invalides"
+      partial_success: "%{created_count} compte(s) lié(s) avec succès. %{already_linked_count}
+        compte(s) étaient déjà liés : %{already_linked_names}"
+      success:
+        one: "%{count} compte lié avec succès"
+        other: "%{count} comptes liés avec succès"
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      api_error: 'Erreur API : %{message}'
+      invalid_account_name: Impossible de lier un compte sans nom
+      missing_parameters: Paramètres requis manquants
+      no_api_key: Clé API Questrade introuvable. Veuillez la configurer dans les paramètres
+        du fournisseur.
+      provider_account_already_linked: Ce compte Questrade est déjà lié à un autre
+        compte
+      provider_account_not_found: Compte Questrade introuvable
+      success: "%{account_name} lié avec succès à Questrade"
+    loading:
+      loading_message: Chargement des comptes Questrade…
+      loading_title: Chargement
+    panel:
+      field_descriptions: 'Description des champs :'
+      fields:
+        api_server:
+          description: Votre serveur API Questrade
+          label: Serveur API
+          placeholder_new: Collez le serveur API ici
+          placeholder_update: Saisissez un nouveau serveur API pour mettre à jour
+        refresh_token:
+          description: Votre jeton de rafraîchissement Questrade
+          label: Jeton de rafraîchissement
+          placeholder_new: Collez le jeton de rafraîchissement ici
+          placeholder_update: Saisissez un nouveau jeton de rafraîchissement pour
+            mettre à jour
+      optional: "(Facultatif)"
+      optional_with_default: "(facultatif, valeur par défaut : %{default_value})"
+      required: "(obligatoire)"
+      save_button: Enregistrer la configuration
+      setup_instructions: 'Instructions de configuration :'
+      status_configured_html: Configuré et prêt à l'emploi. Rendez-vous sur l'onglet
+        <a href="%{accounts_path}" class="link">Comptes</a> pour gérer et configurer
+        les comptes.
+      status_not_configured: Non configuré
+      step_1: Rendez-vous sur votre tableau de bord Questrade pour récupérer vos
+        identifiants
+      step_2: Saisissez vos identifiants ci-dessous et cliquez sur le bouton Enregistrer
+      step_3: Après une connexion réussie, rendez-vous sur l'onglet Comptes pour
+        configurer les nouveaux comptes
+      token_refresh_hint: Les jetons Questrade se renouvellent automatiquement à
+        chaque synchronisation de vos comptes. Si une connexion reste inutilisée
+        pendant plus de 7 jours et devient obsolète, collez un nouveau jeton ici
+        pour la réactiver sans la déconnecter.
+      update_button: Mettre à jour la configuration
+    preload_accounts:
+      no_credentials_configured: Veuillez d'abord configurer vos identifiants Questrade
+        dans les paramètres du fournisseur.
+    questrade_item:
+      accounts_need_setup: Des comptes doivent être configurés
+      delete: Supprimer la connexion
+      deletion_in_progress: suppression en cours…
+      error: Erreur
+      kind: Courtage
+      more_accounts_available:
+        one: "%{count} compte supplémentaire disponible"
+        other: "%{count} comptes supplémentaires disponibles"
+      no_accounts_description: Cette connexion n'a pas encore de comptes liés.
+      no_accounts_title: Aucun compte
+      provider_name: Questrade
+      requires_update: Connexion à mettre à jour
+      setup_action: Configurer les nouveaux comptes
+      setup_description: "%{linked} sur %{total} comptes liés. Choisissez les types
+        de compte pour vos comptes Questrade nouvellement importés."
+      setup_needed: Nouveaux comptes prêts à être configurés
+      status: Synchronisé il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} - %{summary}
+      syncing: Synchronisation…
+      total: Total
+      unlinked: Non lié
+      update_credentials: Mettre à jour les identifiants
+    select_accounts:
+      accounts_selected: comptes sélectionnés
+      api_error: 'Erreur API : %{message}'
+      cancel: Annuler
+      configure_name_in_provider: Impossible d'importer - veuillez configurer le
+        nom du compte dans Questrade
+      description: Sélectionnez les comptes que vous souhaitez lier à votre compte
+        %{product_name}.
+      link_accounts: Lier les comptes sélectionnés
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration
+        de votre clé API.
+      no_api_key: La clé API Questrade n'est pas configurée. Veuillez la configurer
+        dans les Paramètres.
+      no_credentials_configured: Veuillez d'abord configurer vos identifiants Questrade
+        dans les paramètres du fournisseur.
+      no_name_placeholder: "(Sans nom)"
+      title: Sélectionner les comptes Questrade
+    select_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      all_accounts_already_linked: Tous les comptes Questrade sont déjà liés
+      api_error: 'Erreur API : %{message}'
+      balance_label: 'Solde :'
+      cancel: Annuler
+      cancel_button: Annuler
+      configure_name_in_provider: Impossible d'importer - veuillez configurer le
+        nom du compte dans Questrade
+      connect_hint: Connectez un compte Questrade pour activer la synchronisation
+        automatique.
+      description: Sélectionnez un compte Questrade à lier avec ce compte. Les transactions
+        seront synchronisées et dédupliquées automatiquement.
+      header: Lier avec Questrade
+      link_account: Lier le compte
+      link_button: Lier ce compte
+      linking_to: 'Liaison à :'
+      no_account_specified: Aucun compte spécifié
+      no_accounts: Aucun compte Questrade non lié trouvé.
+      no_accounts_found: Aucun compte Questrade trouvé. Veuillez vérifier la configuration
+        de votre clé API.
+      no_api_key: La clé API Questrade n'est pas configurée. Veuillez la configurer
+        dans les Paramètres.
+      no_credentials_configured: Veuillez d'abord configurer vos identifiants Questrade
+        dans les paramètres du fournisseur.
+      no_name_placeholder: "(Sans nom)"
+      settings_link: Aller aux paramètres du fournisseur
+      subtitle: Choisissez un compte Questrade
+      title: Lier %{account_name} avec Questrade
+    setup_accounts:
+      account_type_label: 'Type de compte :'
+      account_types:
+        credit_card: Carte de crédit
+        crypto: Compte de cryptomonnaie
+        depository: Compte courant ou épargne
+        investment: Compte d'investissement
+        loan: Prêt ou hypothèque
+        other_asset: Autre actif
+        skip: Ignorer ce compte
+      accounts_count:
+        one: "%{count} compte disponible"
+        other: "%{count} comptes disponibles"
+      all_accounts_linked: Tous vos comptes Questrade ont déjà été configurés.
+      api_error: 'Erreur API : %{message}'
+      balance: Solde
+      cancel: Annuler
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        Questrade :'
+      create_accounts: Créer les comptes
+      creating: Création des comptes…
+      creating_accounts: Création des comptes…
+      fetch_failed: Échec de la récupération des comptes
+      historical_data_range: 'Plage de données historiques :'
+      import_selected: Importer les comptes sélectionnés
+      instructions: Sélectionnez les comptes que vous souhaitez importer depuis Questrade.
+        Vous pouvez choisir plusieurs comptes.
+      no_accounts: Aucun compte non lié trouvé pour cette connexion Questrade.
+      no_accounts_to_setup: Aucun compte à configurer
+      no_api_key: La clé API Questrade n'est pas configurée. Veuillez vérifier les
+        paramètres de connexion.
+      select_all: Tout sélectionner
+      subtitle: Choisissez les types de compte corrects pour vos comptes importés
+      subtype_labels:
+        credit_card: ''
+        crypto: ''
+        depository: 'Sous-type de compte :'
+        investment: 'Type d''investissement :'
+        loan: 'Type de prêt :'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Les cartes de crédit seront automatiquement configurées comme
+          comptes de carte de crédit.
+        crypto: Les comptes de cryptomonnaie seront configurés pour suivre les holdings
+          et les transactions.
+        other_asset: Aucune option supplémentaire nécessaire pour les autres actifs.
+      subtypes:
+        depository:
+          cd: Certificat de dépôt
+          checking: Compte courant
+          hsa: Compte épargne santé
+          money_market: Compte du marché monétaire
+          savings: Compte épargne
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: Plan 529
+          angel: Investissement providentiel
+          brokerage: Courtage
+          hsa: Compte épargne santé
+          ira: IRA traditionnel
+          mutual_fund: Fonds commun de placement
+          pension: Pension
+          retirement: Retraite
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Plan d'épargne Thrift
+        loan:
+          auto: Prêt auto
+          mortgage: Hypothèque
+          other: Autre prêt
+          student: Prêt étudiant
+      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions.
+      sync_start_date_label: 'Commencer la synchronisation des transactions à partir
+        de :'
+      title: Configurer vos comptes Questrade
+    setup_required:
+      go_to_provider_settings: Aller aux paramètres du fournisseur
+      not_configured_description: Ajoutez votre connexion Questrade dans les paramètres
+        du fournisseur, puis revenez ici pour lier des comptes.
+      not_configured_title: Questrade n'est pas encore connecté
+      title: Connectez d'abord Questrade
+    sync:
+      status:
+        calculating: Calcul des soldes…
+        checking_setup: Vérification de la configuration du compte…
+        importing: Importation des comptes depuis Questrade…
+        importing_data: Importation des données du compte…
+        needs_setup: "%{count} comptes à configurer…"
+        processing: Traitement des holdings et des activités…
+      success: Synchronisation démarrée
+    sync_status:
+      no_accounts: Aucun compte trouvé
+      synced:
+        one: "%{count} compte synchronisé"
+        other: "%{count} comptes synchronisés"
+      synced_with_setup: "%{linked} synchronisé(s), %{unlinked} à configurer"
+    update:
+      success: Connexion Questrade mise à jour
diff --git a/config/locales/views/questrade_items/pl.yml b/config/locales/views/questrade_items/pl.yml
new file mode 100644
index 000000000..b79909424
--- /dev/null
+++ b/config/locales/views/questrade_items/pl.yml
@@ -0,0 +1,241 @@
+---
+pl:
+  questrade_items:
+    default_name: "Połączenie Questrade"
+    sync_status:
+      no_accounts: "Nie znaleziono kont"
+      synced:
+        few: "%{count} konta zsynchronizowane"
+        many: "%{count} kont zsynchronizowanych"
+        one: "%{count} konto zsynchronizowane"
+        other: "%{count} kont zsynchronizowanych"
+      synced_with_setup: "%{linked} zsynchronizowanych, %{unlinked} wymaga konfiguracji"
+    institution_summary:
+      none: "Brak połączonych instytucji"
+      count:
+        few: "%{count} instytucje"
+        many: "%{count} instytucji"
+        one: "%{count} instytucja"
+        other: "%{count} instytucji"
+    errors:
+      provider_not_configured: "Dostawca Questrade nie jest skonfigurowany"
+    sync:
+      status:
+        importing: "Importowanie kont z Questrade..."
+        processing: "Przetwarzanie portfeli i aktywności..."
+        calculating: "Obliczanie sald..."
+        importing_data: "Importowanie danych kont..."
+        checking_setup: "Sprawdzanie konfiguracji konta..."
+        needs_setup: "%{count} kont wymaga konfiguracji..."
+      success: "Synchronizacja rozpoczęta"
+    panel:
+      setup_instructions: "Instrukcje konfiguracji:"
+      step_1: "Odwiedź panel Questrade, aby uzyskać dane uwierzytelniające"
+      step_2: "Wprowadź dane uwierzytelniające poniżej i kliknij przycisk Zapisz"
+      step_3: "Po udanym połączeniu przejdź do zakładki Konta, aby skonfigurować nowe konta"
+      field_descriptions: "Opisy pól:"
+      optional: "(Opcjonalnie)"
+      required: "(wymagane)"
+      optional_with_default: "(opcjonalnie, domyślnie %{default_value})"
+      save_button: "Zapisz konfigurację"
+      update_button: "Aktualizuj konfigurację"
+      token_refresh_hint: "Tokeny Questrade odnawiają się automatycznie przy każdej synchronizacji kont. Jeśli połączenie pozostanie nieużywane przez ponad 7 dni, wklej nowy token tutaj, aby je ponownie uzbroić bez rozłączania."
+      status_configured_html: "Skonfigurowane i gotowe do użycia. Przejdź do zakładki <a href=\"%{accounts_path}\" class=\"link\">Konta</a>, aby zarządzać kontami."
+      status_not_configured: "Nieskonfigurowane"
+      fields:
+        refresh_token:
+          label: "Token odświeżania"
+          description: "Twój token odświeżania Questrade"
+          placeholder_new: "Wklej token odświeżania tutaj"
+          placeholder_update: "Wprowadź nowy token odświeżania, aby zaktualizować"
+        api_server:
+          label: "Serwer API"
+          description: "Twój serwer API Questrade"
+          placeholder_new: "Wklej serwer API tutaj"
+          placeholder_update: "Wprowadź nowy serwer API, aby zaktualizować"
+    create:
+      success: "Połączenie Questrade utworzone pomyślnie"
+    update:
+      success: "Połączenie Questrade zaktualizowane"
+    destroy:
+      success: "Połączenie Questrade usunięte"
+    index:
+      title: "Połączenia Questrade"
+    loading:
+      loading_message: "Ładowanie kont Questrade..."
+      loading_title: "Ładowanie"
+    link_accounts:
+      all_already_linked:
+        few: "Wszystkie %{count} wybrane konta są już połączone: %{names}"
+        many: "Wszystkie %{count} wybranych kont jest już połączonych: %{names}"
+        one: "Wybrane konto (%{names}) jest już połączone"
+        other: "Wszystkie %{count} wybranych kont jest już połączonych: %{names}"
+      api_error: "Błąd API: %{message}"
+      invalid_account_names:
+        few: "Nie można połączyć %{count} kont z pustymi nazwami"
+        many: "Nie można połączyć %{count} kont z pustymi nazwami"
+        one: "Nie można połączyć konta z pustą nazwą"
+        other: "Nie można połączyć %{count} kont z pustymi nazwami"
+      link_failed: "Nie można połączyć kont"
+      no_accounts_selected: "Wybierz co najmniej jedno konto"
+      no_api_key: "Nie znaleziono klucza API Questrade. Skonfiguruj go w ustawieniach dostawcy."
+      partial_invalid: "Połączono %{created_count}, %{already_linked_count} było już połączonych, %{invalid_count} miało nieprawidłowe nazwy"
+      partial_success: "Połączono %{created_count}. %{already_linked_count} było już połączonych: %{already_linked_names}"
+      success:
+        few: "Połączono %{count} konta"
+        many: "Połączono %{count} kont"
+        one: "Połączono %{count} konto"
+        other: "Połączono %{count} kont"
+    questrade_item:
+      kind: Maklerskie
+      accounts_need_setup: "Konta wymagają konfiguracji"
+      delete: "Usuń połączenie"
+      deletion_in_progress: "trwa usuwanie..."
+      error: "Błąd"
+      more_accounts_available:
+        few: "%{count} więcej konta dostępne"
+        many: "%{count} więcej kont dostępnych"
+        one: "%{count} więcej konto dostępne"
+        other: "%{count} więcej kont dostępnych"
+      no_accounts_description: "To połączenie nie ma jeszcze połączonych kont."
+      no_accounts_title: "Brak kont"
+      provider_name: "Questrade"
+      requires_update: "Połączenie wymaga aktualizacji"
+      setup_action: "Skonfiguruj nowe konta"
+      setup_description: "%{linked} z %{total} kont połączonych. Wybierz typy kont dla nowo zaimportowanych kont Questrade."
+      setup_needed: "Nowe konta gotowe do konfiguracji"
+      status: "Zsynchronizowano %{timestamp} temu"
+      status_never: "Nigdy nie synchronizowano"
+      status_with_summary: "Ostatnia synchronizacja %{timestamp} temu - %{summary}"
+      syncing: "Synchronizowanie..."
+      total: "Łącznie"
+      unlinked: "Niepołączone"
+      update_credentials: "Aktualizuj dane uwierzytelniające"
+    select_accounts:
+      accounts_selected: "wybrane konta"
+      api_error: "Błąd API: %{message}"
+      cancel: "Anuluj"
+      configure_name_in_provider: "Nie można zaimportować - skonfiguruj nazwę konta w Questrade"
+      description: "Wybierz konta, które chcesz połączyć ze swoim kontem %{product_name}."
+      link_accounts: "Połącz wybrane konta"
+      no_accounts_found: "Nie znaleziono kont. Sprawdź konfigurację klucza API."
+      no_api_key: "Klucz API Questrade nie jest skonfigurowany. Skonfiguruj go w Ustawieniach."
+      no_credentials_configured: "Najpierw skonfiguruj dane uwierzytelniające Questrade w ustawieniach dostawcy."
+      no_name_placeholder: "(Bez nazwy)"
+      title: "Wybierz konta Questrade"
+    select_existing_account:
+      account_already_linked: "To konto jest już połączone z dostawcą"
+      all_accounts_already_linked: "Wszystkie konta Questrade są już połączone"
+      api_error: "Błąd API: %{message}"
+      balance_label: "Saldo:"
+      cancel: "Anuluj"
+      cancel_button: "Anuluj"
+      configure_name_in_provider: "Nie można zaimportować - skonfiguruj nazwę konta w Questrade"
+      connect_hint: "Połącz konto Questrade, aby włączyć automatyczną synchronizację."
+      description: "Wybierz konto Questrade do połączenia z tym kontem. Transakcje będą synchronizowane i deduplikowane automatycznie."
+      header: "Połącz z Questrade"
+      link_account: "Połącz konto"
+      link_button: "Połącz to konto"
+      linking_to: "Łączenie z:"
+      no_account_specified: "Nie określono konta"
+      no_accounts: "Nie znaleziono niepołączonych kont Questrade."
+      no_accounts_found: "Nie znaleziono kont Questrade. Sprawdź konfigurację klucza API."
+      no_api_key: "Klucz API Questrade nie jest skonfigurowany. Skonfiguruj go w Ustawieniach."
+      no_credentials_configured: "Najpierw skonfiguruj dane uwierzytelniające Questrade w ustawieniach dostawcy."
+      no_name_placeholder: "(Bez nazwy)"
+      settings_link: "Przejdź do ustawień dostawcy"
+      subtitle: "Wybierz konto Questrade"
+      title: "Połącz %{account_name} z Questrade"
+    link_existing_account:
+      account_already_linked: "To konto jest już połączone z dostawcą"
+      api_error: "Błąd API: %{message}"
+      invalid_account_name: "Nie można połączyć konta z pustą nazwą"
+      provider_account_already_linked: "To konto Questrade jest już połączone z innym kontem"
+      provider_account_not_found: "Nie znaleziono konta Questrade"
+      missing_parameters: "Brak wymaganych parametrów"
+      no_api_key: "Nie znaleziono klucza API Questrade. Skonfiguruj go w ustawieniach dostawcy."
+      success: "Połączono %{account_name} z Questrade"
+    setup_accounts:
+      account_type_label: "Typ konta:"
+      accounts_count:
+        few: "%{count} konta dostępne"
+        many: "%{count} kont dostępnych"
+        one: "%{count} konto dostępne"
+        other: "%{count} kont dostępnych"
+      all_accounts_linked: "Wszystkie konta Questrade zostały już skonfigurowane."
+      api_error: "Błąd API: %{message}"
+      creating: "Tworzenie kont..."
+      fetch_failed: "Nie można pobrać kont"
+      import_selected: "Importuj wybrane konta"
+      instructions: "Wybierz konta, które chcesz zaimportować z Questrade. Możesz wybrać wiele kont."
+      no_accounts: "Nie znaleziono niepołączonych kont z tego połączenia Questrade."
+      no_accounts_to_setup: "Brak kont do skonfigurowania"
+      no_api_key: "Klucz API Questrade nie jest skonfigurowany. Sprawdź ustawienia połączenia."
+      select_all: "Zaznacz wszystkie"
+      account_types:
+        skip: "Pomiń to konto"
+        depository: "Konto czekowe lub oszczędnościowe"
+        credit_card: "Karta kredytowa"
+        investment: "Konto inwestycyjne"
+        crypto: "Konto kryptowalutowe"
+        loan: "Pożyczka lub hipoteka"
+        other_asset: "Inny składnik aktywów"
+      subtype_labels:
+        depository: "Podtyp konta:"
+        credit_card: ""
+        investment: "Typ inwestycji:"
+        crypto: ""
+        loan: "Typ pożyczki:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Karty kredytowe zostaną automatycznie skonfigurowane jako konta kart kredytowych."
+        other_asset: "Nie są wymagane żadne dodatkowe opcje dla innych aktywów."
+        crypto: "Konta kryptowalutowe zostaną skonfigurowane do śledzenia portfeli i transakcji."
+      subtypes:
+        depository:
+          checking: "Czekowe"
+          savings: "Oszczędnościowe"
+          hsa: "Konto oszczędnościowe zdrowotne"
+          cd: "Certyfikat depozytowy"
+          money_market: "Rynek pieniężny"
+        investment:
+          brokerage: "Maklerskie"
+          pension: "Emerytalne"
+          retirement: "Emerytalne"
+          "401k": "401(k)"
+          roth_401k: "Roth 401(k)"
+          "403b": "403(b)"
+          tsp: "Thrift Savings Plan"
+          "529_plan": "Plan 529"
+          hsa: "Konto oszczędnościowe zdrowotne"
+          mutual_fund: "Fundusz powierniczy"
+          ira: "Tradycyjne IRA"
+          roth_ira: "Roth IRA"
+          angel: "Anioł biznesu"
+        loan:
+          mortgage: "Hipoteczna"
+          student: "Pożyczka studencka"
+          auto: "Pożyczka samochodowa"
+          other: "Inna pożyczka"
+      balance: "Saldo"
+      cancel: "Anuluj"
+      choose_account_type: "Wybierz odpowiedni typ konta dla każdego konta Questrade:"
+      create_accounts: "Utwórz konta"
+      creating_accounts: "Tworzenie kont..."
+      historical_data_range: "Zakres danych historycznych:"
+      subtitle: "Wybierz odpowiednie typy kont dla zaimportowanych kont"
+      sync_start_date_help: "Wybierz, jak daleko wstecz chcesz synchronizować historię transakcji."
+      sync_start_date_label: "Rozpocznij synchronizację transakcji od:"
+      title: "Skonfiguruj konta Questrade"
+    setup_required:
+      title: "Najpierw połącz Questrade"
+      not_configured_title: "Questrade nie jest jeszcze połączone"
+      not_configured_description: "Dodaj swoje połączenie Questrade w ustawieniach dostawcy, a następnie wróć tutaj, aby połączyć konta."
+      go_to_provider_settings: "Przejdź do ustawień dostawcy"
+    complete_account_setup:
+      all_skipped: "Wszystkie konta zostały pominięte. Nie utworzono żadnych kont."
+      creation_failed: "Nie utworzono kont: %{error}"
+      no_accounts: "Brak kont do skonfigurowania."
+      success: "Utworzono %{count} konto(a)."
+    preload_accounts:
+      no_credentials_configured: "Najpierw skonfiguruj dane uwierzytelniające Questrade w ustawieniach dostawcy."
diff --git a/config/locales/views/questrade_items/tr.yml b/config/locales/views/questrade_items/tr.yml
new file mode 100644
index 000000000..85870b32b
--- /dev/null
+++ b/config/locales/views/questrade_items/tr.yml
@@ -0,0 +1,253 @@
+---
+tr:
+  questrade_items:
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hesap oluşturulmadı.
+      creation_failed: 'Hesaplar oluşturulamadı: %{error}'
+      no_accounts: Kurulacak hesap yok.
+      success: "%{count} hesap başarıyla oluşturuldu."
+    create:
+      success: Questrade bağlantısı başarıyla oluşturuldu
+    default_name: Questrade Bağlantısı
+    destroy:
+      success: Questrade bağlantısı kaldırıldı
+    errors:
+      provider_not_configured: Questrade sağlayıcısı yapılandırılmamış
+    index:
+      title: Questrade Bağlantıları
+    institution_summary:
+      count:
+        one: "%{count} kurum"
+        other: "%{count} kurum"
+      none: Bağlı kurum yok
+    link_accounts:
+      all_already_linked:
+        one: Seçilen hesap (%{names}) zaten bağlı
+        other: 'Seçilen %{count} hesabın tümü zaten bağlı: %{names}'
+      api_error: 'API hatası: %{message}'
+      invalid_account_names:
+        one: Adı boş olan hesap bağlanamaz
+        other: Adı boş olan %{count} hesap bağlanamaz
+      link_failed: Hesaplar bağlanamadı
+      no_accounts_selected: Lütfen en az bir hesap seçin
+      no_api_key: Questrade API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda
+        yapılandırın.
+      partial_invalid: "%{created_count} hesap başarıyla bağlandı, %{already_linked_count}
+        hesap zaten bağlıydı, %{invalid_count} hesabın adı geçersizdi"
+      partial_success: "%{created_count} hesap başarıyla bağlandı. %{already_linked_count}
+        hesap zaten bağlıydı: %{already_linked_names}"
+      success:
+        one: "%{count} hesap başarıyla bağlandı"
+        other: "%{count} hesap başarıyla bağlandı"
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      api_error: 'API hatası: %{message}'
+      invalid_account_name: Adı boş olan hesap bağlanamaz
+      missing_parameters: Gerekli parametreler eksik
+      no_api_key: Questrade API anahtarı bulunamadı. Lütfen Sağlayıcı Ayarları'nda
+        yapılandırın.
+      provider_account_already_linked: Bu Questrade hesabı zaten başka bir hesaba
+        bağlı
+      provider_account_not_found: Questrade hesabı bulunamadı
+      success: "%{account_name} Questrade ile başarıyla bağlandı"
+    loading:
+      loading_message: Questrade hesapları yükleniyor...
+      loading_title: Yükleniyor
+    panel:
+      field_descriptions: 'Alan açıklamaları:'
+      fields:
+        api_server:
+          description: Questrade API sunucunuz
+          label: API Sunucusu
+          placeholder_new: API sunucusunu buraya yapıştırın
+          placeholder_update: Güncellemek için yeni API sunucusu girin
+        refresh_token:
+          description: Questrade yenileme anahtarınız
+          label: Yenileme Anahtarı
+          placeholder_new: Yenileme anahtarını buraya yapıştırın
+          placeholder_update: Güncellemek için yeni yenileme anahtarı girin
+      optional: "(İsteğe bağlı)"
+      optional_with_default: "(isteğe bağlı, varsayılan: %{default_value})"
+      required: "(zorunlu)"
+      save_button: Yapılandırmayı Kaydet
+      setup_instructions: 'Kurulum talimatları:'
+      status_configured_html: Yapılandırıldı ve kullanıma hazır. Hesapları yönetmek
+        ve kurmak için <a href="%{accounts_path}" class="link">Hesaplar</a> sekmesini
+        ziyaret edin.
+      status_not_configured: Yapılandırılmadı
+      step_1: Kimlik bilgilerinizi almak için Questrade panelinizi ziyaret edin
+      step_2: Kimlik bilgilerinizi aşağıya girin ve Kaydet düğmesine tıklayın
+      step_3: Başarılı bir bağlantıdan sonra yeni hesapları kurmak için Hesaplar sekmesine
+        gidin
+      token_refresh_hint: Questrade anahtarları hesaplarınız her senkronize edildiğinde
+        otomatik olarak yenilenir. Bir bağlantı 7 günden fazla kullanılmadıysa ve
+        eskidiyse, bağlantıyı kesmeden yeniden devreye almak için buraya yeni bir
+        anahtar yapıştırın.
+      update_button: Yapılandırmayı Güncelle
+    preload_accounts:
+      no_credentials_configured: Lütfen önce Questrade kimlik bilgilerinizi Sağlayıcı
+        Ayarları'nda yapılandırın.
+    questrade_item:
+      accounts_need_setup: Hesapların kurulması gerekiyor
+      delete: Bağlantıyı sil
+      deletion_in_progress: siliniyor...
+      error: Hata
+      kind: Aracılık
+      more_accounts_available:
+        one: "%{count} hesap daha kullanılabilir"
+        other: "%{count} hesap daha kullanılabilir"
+      no_accounts_description: Bu bağlantıda henüz bağlı hesap yok.
+      no_accounts_title: Hesap yok
+      provider_name: Questrade
+      requires_update: Bağlantının güncellenmesi gerekiyor
+      setup_action: Yeni Hesapları Kur
+      setup_description: "%{total} hesabın %{linked} tanesi bağlı. Yeni içe aktarılan
+        Questrade hesaplarınız için hesap türlerini seçin."
+      setup_needed: Yeni hesaplar kurulmaya hazır
+      status: "%{timestamp} önce senkronize edildi"
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: 'Son senkronizasyon: %{timestamp} önce - %{summary}'
+      syncing: Senkronize ediliyor...
+      total: Toplam
+      unlinked: Bağlı değil
+      update_credentials: Kimlik bilgilerini güncelle
+    select_accounts:
+      accounts_selected: hesap seçildi
+      api_error: 'API hatası: %{message}'
+      cancel: İptal
+      configure_name_in_provider: İçe aktarılamıyor - lütfen Questrade'de hesap adını
+        yapılandırın
+      description: "%{product_name} hesabınıza bağlamak istediğiniz hesapları seçin."
+      link_accounts: Seçili hesapları bağla
+      no_accounts_found: Hesap bulunamadı. Lütfen API anahtar yapılandırmanızı kontrol
+        edin.
+      no_api_key: Questrade API anahtarı yapılandırılmamış. Lütfen Ayarlar'da yapılandırın.
+      no_credentials_configured: Lütfen önce Questrade kimlik bilgilerinizi Sağlayıcı
+        Ayarları'nda yapılandırın.
+      no_name_placeholder: "(Adsız)"
+      title: Questrade Hesaplarını Seç
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      all_accounts_already_linked: Tüm Questrade hesapları zaten bağlı
+      api_error: 'API hatası: %{message}'
+      balance_label: 'Bakiye:'
+      cancel: İptal
+      cancel_button: İptal
+      configure_name_in_provider: İçe aktarılamıyor - lütfen Questrade'de hesap adını
+        yapılandırın
+      connect_hint: Otomatik senkronizasyonu etkinleştirmek için bir Questrade hesabı
+        bağlayın.
+      description: Bu hesaba bağlamak için bir Questrade hesabı seçin. İşlemler otomatik
+        olarak senkronize edilir ve tekilleştirilir.
+      header: Questrade ile bağla
+      link_account: Hesabı bağla
+      link_button: Bu hesabı bağla
+      linking_to: 'Bağlanıyor:'
+      no_account_specified: Hesap belirtilmedi
+      no_accounts: Bağlı olmayan Questrade hesabı bulunamadı.
+      no_accounts_found: Questrade hesabı bulunamadı. Lütfen API anahtar yapılandırmanızı
+        kontrol edin.
+      no_api_key: Questrade API anahtarı yapılandırılmamış. Lütfen Ayarlar'da yapılandırın.
+      no_credentials_configured: Lütfen önce Questrade kimlik bilgilerinizi Sağlayıcı
+        Ayarları'nda yapılandırın.
+      no_name_placeholder: "(Adsız)"
+      settings_link: Sağlayıcı Ayarlarına Git
+      subtitle: Bir Questrade hesabı seçin
+      title: "%{account_name} hesabını Questrade ile bağla"
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      account_types:
+        credit_card: Kredi Kartı
+        crypto: Kripto Para Hesabı
+        depository: Vadesiz veya Tasarruf Hesabı
+        investment: Yatırım Hesabı
+        loan: Kredi veya İpotek
+        other_asset: Diğer Varlık
+        skip: Bu hesabı atla
+      accounts_count:
+        one: "%{count} hesap kullanılabilir"
+        other: "%{count} hesap kullanılabilir"
+      all_accounts_linked: Tüm Questrade hesaplarınız zaten kuruldu.
+      api_error: 'API hatası: %{message}'
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her Questrade hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating: Hesaplar oluşturuluyor...
+      creating_accounts: Hesaplar Oluşturuluyor...
+      fetch_failed: Hesaplar Getirilemedi
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      import_selected: Seçili hesapları içe aktar
+      instructions: Questrade'den içe aktarmak istediğiniz hesapları seçin. Birden
+        fazla hesap seçebilirsiniz.
+      no_accounts: Bu Questrade bağlantısında bağlı olmayan hesap bulunamadı.
+      no_accounts_to_setup: Kurulacak Hesap Yok
+      no_api_key: Questrade API anahtarı yapılandırılmamış. Lütfen bağlantı ayarlarınızı
+        kontrol edin.
+      select_all: Tümünü seç
+      subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      subtype_labels:
+        credit_card: ''
+        crypto: ''
+        depository: 'Hesap Alt Türü:'
+        investment: 'Yatırım Türü:'
+        loan: 'Kredi Türü:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Kredi kartları otomatik olarak kredi kartı hesapları olarak kurulacaktır.
+        crypto: Kripto para hesapları varlıkları ve işlemleri takip edecek şekilde
+          kurulacaktır.
+        other_asset: Diğer Varlıklar için ek seçenek gerekmez.
+      subtypes:
+        depository:
+          cd: Vadeli Mevduat Sertifikası
+          checking: Vadesiz
+          hsa: Sağlık Tasarruf Hesabı
+          money_market: Para Piyasası
+          savings: Tasarruf
+        investment:
+          401k: 401(k)
+          403b: 403(b)
+          529_plan: 529 Planı
+          angel: Melek
+          brokerage: Aracılık
+          hsa: Sağlık Tasarruf Hesabı
+          ira: Geleneksel IRA
+          mutual_fund: Yatırım Fonu
+          pension: Emeklilik
+          retirement: Emeklilik
+          roth_401k: Roth 401(k)
+          roth_ira: Roth IRA
+          tsp: Tasarruf Planı
+        loan:
+          auto: Araç Kredisi
+          mortgage: İpotek
+          other: Diğer Kredi
+          student: Öğrenci Kredisi
+      sync_start_date_help: İşlem geçmişinizin ne kadar geriye senkronize edilmesini
+        istediğinizi seçin.
+      sync_start_date_label: 'İşlemleri şu tarihten itibaren senkronize et:'
+      title: Questrade Hesaplarınızı Kurun
+    setup_required:
+      go_to_provider_settings: Sağlayıcı ayarlarına git
+      not_configured_description: Questrade bağlantınızı Sağlayıcı ayarları altında
+        ekleyin, ardından hesapları bağlamak için buraya geri dönün.
+      not_configured_title: Questrade henüz bağlı değil
+      title: Önce Questrade'i bağlayın
+    sync:
+      status:
+        calculating: Bakiyeler hesaplanıyor...
+        checking_setup: Hesap yapılandırması kontrol ediliyor...
+        importing: Questrade'den hesaplar içe aktarılıyor...
+        importing_data: Hesap verileri içe aktarılıyor...
+        needs_setup: "%{count} hesabın kurulması gerekiyor..."
+        processing: Varlıklar ve işlemler işleniyor...
+      success: Senkronizasyon başladı
+    sync_status:
+      no_accounts: Hesap bulunamadı
+      synced:
+        one: "%{count} hesap senkronize edildi"
+        other: "%{count} hesap senkronize edildi"
+      synced_with_setup: "%{linked} senkronize edildi, %{unlinked} kurulmayı bekliyor"
+    update:
+      success: Questrade bağlantısı güncellendi
diff --git a/config/locales/views/recurring_transactions/fr.yml b/config/locales/views/recurring_transactions/fr.yml
index 462db1e1d..53b985f40 100644
--- a/config/locales/views/recurring_transactions/fr.yml
+++ b/config/locales/views/recurring_transactions/fr.yml
@@ -1,52 +1,66 @@
 ---
 fr:
   recurring_transactions:
-    title: Transactions récurrentes
-    upcoming: Transactions récurrentes à venir
+    already_exists: Une transaction récurrente manuelle existe déjà pour ce modèle
+    amount_range: 'Plage : %{min} à %{max}'
+    badges:
+      manual: Manuel
+    cleaned_up: "%{count} transactions récurrentes obsolètes nettoyées"
+    cleanup_stale: Nettoyer les obsolètes
+    confirm_delete: Êtes-vous sûr(e) de vouloir supprimer cette transaction récurrente
+      ?
+    creation_failed: Échec de la création de la transaction récurrente. Veuillez vérifier
+      les détails de la transaction et réessayer.
+    day_of_month: Jour %{day} du mois
+    deleted: Transaction récurrente supprimée
+    empty:
+      description: Cliquez sur "Identifier les modèles" pour détecter automatiquement
+        les transactions récurrentes à partir de votre historique de transactions.
+      title: Aucune transaction récurrente trouvée
+    expected_in:
+      one: Attendue dans %{count} jour
+      other: Attendue dans %{count} jours
+    expected_today: Attendue aujourd'hui
+    identified: "%{count} modèles de transactions récurrentes identifiés"
+    identify_patterns: Identifier les modèles
+    info:
+      automatic_description: 'L''identification automatique s''exécute également après
+        :'
+      manual_description: Vous pouvez identifier manuellement les modèles ou nettoyer
+        les transactions récurrentes obsolètes en utilisant les boutons ci-dessus.
+      title: Détection automatique des modèles
+      triggers:
+      - Les importations CSV sont terminées (transactions, trades, comptes, etc.)
+      - Toute synchronisation de fournisseur est terminée (Plaid, SimpleFIN, etc.)
+    marked_active: Transaction récurrente marquée comme active
+    marked_as_recurring: Transaction marquée comme récurrente
+    marked_inactive: Transaction récurrente marquée comme inactive
     projected: Projeté
     recurring: Récurrent
-    expected_today: "Attendue aujourd'hui"
-    expected_in:
-      one: "Attendue dans %{count} jour"
-      other: "Attendue dans %{count} jours"
-    day_of_month: Jour %{day} du mois
-    identify_patterns: Identifier les modèles
-    cleanup_stale: Nettoyer les obsolètes
     settings:
+      enable_description: Détecter automatiquement les modèles de transactions récurrentes
+        et afficher les transactions projetées à venir.
       enable_label: Activer les transactions récurrentes
-      enable_description: Détecter automatiquement les modèles de transactions récurrentes et afficher les transactions projetées à venir.
     settings_updated: Paramètres des transactions récurrentes mis à jour
-    info:
-      title: Détection automatique des modèles
-      manual_description: Vous pouvez identifier manuellement les modèles ou nettoyer les transactions récurrentes obsolètes en utilisant les boutons ci-dessus.
-      automatic_description: "L'identification automatique s'exécute également après :"
-      triggers:
-        - Les importations CSV sont terminées (transactions, trades, comptes, etc.)
-        - Toute synchronisation de fournisseur est terminée (Plaid, SimpleFIN, etc.)
-    identified: "%{count} modèles de transactions récurrentes identifiés"
-    cleaned_up: "%{count} transactions récurrentes obsolètes nettoyées"
-    marked_inactive: Transaction récurrente marquée comme inactive
-    marked_active: Transaction récurrente marquée comme active
-    deleted: Transaction récurrente supprimée
-    confirm_delete: Êtes-vous sûr(e) de vouloir supprimer cette transaction récurrente ?
-    marked_as_recurring: Transaction marquée comme récurrente
-    already_exists: Une transaction récurrente manuelle existe déjà pour ce modèle
-    creation_failed: Échec de la création de la transaction récurrente. Veuillez vérifier les détails de la transaction et réessayer.
-    unexpected_error: Une erreur inattendue s'est produite lors de la création de la transaction récurrente
-    amount_range: "Plage : %{min} à %{max}"
-    empty:
-      title: Aucune transaction récurrente trouvée
-      description: Cliquez sur "Identifier les modèles" pour détecter automatiquement les transactions récurrentes à partir de votre historique de transactions.
-    table:
-      merchant: Nom
-      amount: Montant
-      expected_day: Jour prévu
-      next_date: Prochaine date
-      last_occurrence: Dernière occurrence
-      status: Statut
-      actions: Actions
     status:
       active: Actif
       inactive: Inactif
-    badges:
-      manual: Manuel
+    table:
+      actions: Actions
+      amount: Montant
+      expected_day: Jour prévu
+      last_occurrence: Dernière occurrence
+      merchant: Nom
+      next_date: Prochaine date
+      status: Statut
+    title: Transactions récurrentes
+    transfer_already_exists: Un transfert récurrent existe déjà pour cette paire de
+      comptes
+    transfer_creation_failed: Échec de la création du transfert récurrent. Veuillez
+      vérifier les détails du transfert et réessayer.
+    transfer_feature_disabled: Les transactions récurrentes sont désactivées pour
+      cette famille
+    transfer_marked_as_recurring: Transfert marqué comme récurrent
+    unexpected_error: Une erreur inattendue s'est produite lors de la création de
+      la transaction récurrente
+    upcoming: Transactions récurrentes à venir
diff --git a/config/locales/views/recurring_transactions/it.yml b/config/locales/views/recurring_transactions/it.yml
new file mode 100644
index 000000000..81d724b11
--- /dev/null
+++ b/config/locales/views/recurring_transactions/it.yml
@@ -0,0 +1,56 @@
+---
+it:
+  recurring_transactions:
+    title: Transazioni ricorrenti
+    upcoming: Transazioni ricorrenti in arrivo
+    projected: Proiettata
+    recurring: Ricorrente
+    expected_today: "Prevista oggi"
+    expected_in:
+      one: "Prevista tra %{count} giorno"
+      other: "Prevista tra %{count} giorni"
+    day_of_month: Giorno %{day} del mese
+    identify_patterns: Identifica schemi
+    cleanup_stale: Elimina obsolete
+    settings:
+      enable_label: Abilita transazioni ricorrenti
+      enable_description: Rileva automaticamente gli schemi di transazioni ricorrenti e mostra le transazioni proiettate in arrivo.
+    settings_updated: Impostazioni transazioni ricorrenti aggiornate
+    info:
+      title: Rilevamento automatico degli schemi
+      manual_description: Puoi identificare manualmente gli schemi o eliminare le transazioni ricorrenti obsolete usando i pulsanti sopra.
+      automatic_description: "Il rilevamento automatico viene eseguito anche dopo:"
+      triggers:
+        - Completamento importazioni CSV (transazioni, operazioni, conti, ecc.)
+        - Completamento di qualsiasi sincronizzazione provider (Plaid, SimpleFIN, ecc.)
+    identified: Identificati %{count} schemi di transazioni ricorrenti
+    cleaned_up: Eliminate %{count} transazioni ricorrenti obsolete
+    marked_inactive: Transazione ricorrente contrassegnata come inattiva
+    marked_active: Transazione ricorrente contrassegnata come attiva
+    deleted: Transazione ricorrente eliminata
+    confirm_delete: Sei sicuro di voler eliminare questa transazione ricorrente?
+    marked_as_recurring: Transazione contrassegnata come ricorrente
+    already_exists: Esiste già una transazione ricorrente manuale per questo schema
+    creation_failed: Impossibile creare la transazione ricorrente. Verifica i dettagli della transazione e riprova.
+    unexpected_error: Si è verificato un errore imprevisto durante la creazione della transazione ricorrente
+    amount_range: "Intervallo: %{min} a %{max}"
+    empty:
+      title: Nessuna transazione ricorrente trovata
+      description: Clicca "Identifica schemi" per rilevare automaticamente le transazioni ricorrenti dalla cronologia delle transazioni.
+    table:
+      merchant: Nome
+      amount: Importo
+      expected_day: Giorno previsto
+      next_date: Data successiva
+      last_occurrence: Ultima occorrenza
+      status: Stato
+      actions: Azioni
+    status:
+      active: Attiva
+      inactive: Inattiva
+    badges:
+      manual: Manuale
+    transfer_marked_as_recurring: Bonifico contrassegnato come ricorrente
+    transfer_already_exists: Esiste già un bonifico ricorrente per questa coppia di conti
+    transfer_creation_failed: Impossibile creare il bonifico ricorrente. Verifica i dettagli e riprova.
+    transfer_feature_disabled: Le transazioni ricorrenti sono disabilitate per questa famiglia
diff --git a/config/locales/views/recurring_transactions/ru.yml b/config/locales/views/recurring_transactions/ru.yml
new file mode 100644
index 000000000..fcea5fb95
--- /dev/null
+++ b/config/locales/views/recurring_transactions/ru.yml
@@ -0,0 +1,63 @@
+---
+ru:
+  recurring_transactions:
+    already_exists: Ручная регулярная операция уже существует для этого шаблона
+    amount_range: 'Диапазон: от %{min} до %{max}'
+    badges:
+      manual: Вручную
+    cleaned_up: Очищено %{count} устаревших регулярных операций
+    cleanup_stale: Очистить устаревшие
+    confirm_delete: Вы уверены, что хотите удалить эту регулярную операцию?
+    creation_failed: Не удалось создать регулярную операцию. Пожалуйста, проверьте
+      детали операции и попробуйте снова.
+    day_of_month: День %{day} месяца
+    deleted: Регулярная операция удалена
+    empty:
+      description: Нажмите "Определить шаблоны", чтобы автоматически обнаружить регулярные
+        операции из вашей истории операций.
+      title: Регулярные операции не найдены
+    expected_in:
+      few: Ожидается через %{count} дня
+      many: Ожидается через %{count} дней
+      one: Ожидается через %{count} день
+      other: Ожидается через %{count} дня
+    expected_today: Ожидается сегодня
+    identified: Определено %{count} шаблонов регулярных операций
+    identify_patterns: Определить шаблоны
+    info:
+      automatic_description: 'Автоматическое определение также запускается после:'
+      manual_description: Вы можете вручную определить шаблоны или очистить устаревшие
+        регулярные операции, используя кнопки выше.
+      title: Автоматическое определение шаблонов
+      triggers:
+      - Завершения импорта CSV (операции, сделки, счета и т.д.)
+      - Завершения синхронизации любого провайдера (Plaid, SimpleFIN и т.д.)
+    marked_active: Регулярная операция отмечена как активная
+    marked_as_recurring: Операция отмечена как регулярная
+    marked_inactive: Регулярная операция отмечена как неактивная
+    projected: Прогнозируемые
+    recurring: Регулярные
+    settings:
+      enable_description: Автоматически определять шаблоны регулярных операций и показывать
+        предстоящие прогнозируемые операции.
+      enable_label: Включить регулярные операции
+    settings_updated: Настройки регулярных операций обновлены
+    status:
+      active: Активно
+      inactive: Неактивно
+    table:
+      actions: Действия
+      amount: Сумма
+      expected_day: Ожидаемый день
+      last_occurrence: Последнее событие
+      merchant: Название
+      next_date: Следующая дата
+      status: Статус
+    title: Регулярные операции
+    transfer_already_exists: Регулярный перевод уже существует для этой пары счетов
+    transfer_creation_failed: Не удалось создать регулярный перевод. Пожалуйста, проверьте
+      детали перевода и попробуйте снова.
+    transfer_feature_disabled: Регулярные операции отключены для этой семьи
+    transfer_marked_as_recurring: Перевод отмечен как регулярный
+    unexpected_error: Произошла непредвиденная ошибка при создании регулярной операции
+    upcoming: Предстоящие регулярные операции
diff --git a/config/locales/views/recurring_transactions/tr.yml b/config/locales/views/recurring_transactions/tr.yml
new file mode 100644
index 000000000..cc995156e
--- /dev/null
+++ b/config/locales/views/recurring_transactions/tr.yml
@@ -0,0 +1,63 @@
+---
+tr:
+  recurring_transactions:
+    already_exists: Bu desen için zaten manuel bir yinelenen işlem var
+    amount_range: 'Aralık: %{min} - %{max}'
+    badges:
+      manual: Manuel
+    cleaned_up: "%{count} eski yinelenen işlem temizlendi"
+    cleanup_stale: Eskileri Temizle
+    confirm_delete: Bu yinelenen işlemi silmek istediğinizden emin misiniz?
+    creation_failed: Yinelenen işlem oluşturulamadı. Lütfen işlem bilgilerini kontrol
+      edip tekrar deneyin.
+    day_of_month: Ayın %{day}. günü
+    deleted: Yinelenen işlem silindi
+    empty:
+      description: İşlem geçmişinizden yinelenen işlemleri otomatik olarak tespit
+        etmek için "Desenleri Tespit Et"e tıklayın.
+      title: Yinelenen işlem bulunamadı
+    expected_in:
+      one: "%{count} gün içinde bekleniyor"
+      other: "%{count} gün içinde bekleniyor"
+    expected_today: Bugün bekleniyor
+    identified: "%{count} yinelenen işlem deseni tespit edildi"
+    identify_patterns: Desenleri Tespit Et
+    info:
+      automatic_description: 'Otomatik tespit ayrıca şunlardan sonra da çalışır:'
+      manual_description: Yukarıdaki düğmeleri kullanarak desenleri manuel olarak
+        tespit edebilir veya eski yinelenen işlemleri temizleyebilirsiniz.
+      title: Otomatik Desen Tespiti
+      triggers:
+        - CSV içe aktarmaları tamamlandığında (işlemler, alım satımlar, hesaplar
+          vb.)
+        - Herhangi bir sağlayıcı senkronizasyonu tamamlandığında (Plaid, SimpleFIN
+          vb.)
+    marked_active: Yinelenen işlem etkin olarak işaretlendi
+    marked_as_recurring: İşlem yinelenen olarak işaretlendi
+    marked_inactive: Yinelenen işlem etkin değil olarak işaretlendi
+    projected: Projeksiyon
+    recurring: Yinelenen
+    settings:
+      enable_description: Yinelenen işlem desenlerini otomatik olarak tespit edin
+        ve yaklaşan projeksiyon işlemlerini gösterin.
+      enable_label: Yinelenen İşlemleri Etkinleştir
+    settings_updated: Yinelenen işlem ayarları güncellendi
+    status:
+      active: Etkin
+      inactive: Etkin değil
+    table:
+      actions: Eylemler
+      amount: Tutar
+      expected_day: Beklenen Gün
+      last_occurrence: Son Gerçekleşme
+      merchant: Ad
+      next_date: Sonraki Tarih
+      status: Durum
+    title: Yinelenen İşlemler
+    transfer_already_exists: Bu hesap çifti için zaten yinelenen bir transfer var
+    transfer_creation_failed: Yinelenen transfer oluşturulamadı. Lütfen transfer bilgilerini
+      kontrol edip tekrar deneyin.
+    transfer_feature_disabled: Yinelenen işlemler bu aile için devre dışı bırakılmıştır
+    transfer_marked_as_recurring: Transfer yinelenen olarak işaretlendi
+    unexpected_error: Yinelenen işlem oluşturulurken beklenmeyen bir hata oluştu
+    upcoming: Yaklaşan Yinelenen İşlemler
diff --git a/config/locales/views/redbark_items/en.yml b/config/locales/views/redbark_items/en.yml
new file mode 100644
index 000000000..1f7f016e3
--- /dev/null
+++ b/config/locales/views/redbark_items/en.yml
@@ -0,0 +1,212 @@
+---
+en:
+  redbark_items:
+    default_name: "Redbark Connection"
+    # Model method strings (i18n for item_model.rb)
+    sync_status:
+      no_accounts: "No accounts found"
+      synced:
+        one: "%{count} account synced"
+        other: "%{count} accounts synced"
+      synced_with_setup: "%{linked} synced, %{unlinked} need setup"
+    institution_summary:
+      none: "No institutions connected"
+      count:
+        one: "%{count} institution"
+        other: "%{count} institutions"
+    errors:
+      provider_not_configured: "Redbark provider is not configured"
+
+    # Syncer status messages
+    sync:
+      status:
+        importing: "Importing accounts from Redbark..."
+        processing: "Processing transactions..."
+        calculating: "Calculating balances..."
+        importing_data: "Importing account data..."
+        checking_setup: "Checking account configuration..."
+        needs_setup: "%{count} accounts need setup..."
+      success: "Sync started"
+
+    # Panel (settings view)
+    panel:
+      setup_instructions: "Setup instructions:"
+      step_1: "Create an API key at app.redbark.com under Settings"
+      step_2: "Enter your API key below and click the Save button"
+      step_3: "After a successful connection, go to the Accounts tab to set up new accounts"
+      field_descriptions: "Field descriptions:"
+      optional: "(Optional)"
+      required: "(required)"
+      optional_with_default: "(optional, defaults to %{default_value})"
+      save_button: "Save Configuration"
+      update_button: "Update Configuration"
+      status_configured_html: "Configured and ready to use. Visit the <a href=\"%{accounts_path}\" class=\"link\">Accounts</a> tab to manage and set up accounts."
+      status_not_configured: "Not configured"
+      fields:
+        api_key:
+          label: "API Key"
+          description: "Your Redbark API key (starts with rbk_live_)"
+          placeholder_new: "rbk_live_..."
+          placeholder_update: "Enter new API key to update"
+
+    # CRUD success messages
+    create:
+      success: "Redbark connection created successfully"
+    update:
+      success: "Redbark connection updated"
+    destroy:
+      success: "Redbark connection removed"
+      unlink_failed:
+        one: "Could not unlink %{count} account. Please try again."
+        other: "Could not unlink %{count} accounts. Please try again."
+    index:
+      title: "Redbark Connections"
+
+    # Loading states
+    loading:
+      loading_message: "Loading Redbark accounts..."
+      loading_title: "Loading"
+
+    # Provider item display (used in _item partial)
+    redbark_item:
+      accounts_need_setup: "Accounts need setup"
+      delete: "Delete connection"
+      deletion_in_progress: "deletion in progress..."
+      error: "Error"
+      more_accounts_available:
+        one: "%{count} more account available"
+        other: "%{count} more accounts available"
+      no_accounts_description: "This connection has no linked accounts yet."
+      no_accounts_title: "No accounts"
+      provider_name: "Redbark"
+      requires_update: "Connection needs update"
+      setup_action: "Set Up New Accounts"
+      setup_description: "%{linked} of %{total} accounts linked. Choose account types for your newly imported Redbark accounts."
+      setup_needed: "New accounts ready to set up"
+      status: "Synced %{timestamp} ago"
+      status_never: "Never synced"
+      status_with_summary: "Last synced %{timestamp} ago - %{summary}"
+      syncing: "Syncing..."
+      total: "Total"
+      unlinked: "Unlinked"
+      update_credentials: "Update credentials"
+
+    # Select accounts view
+    select_accounts:
+      accounts_selected: "accounts selected"
+      api_error: "API error: %{message}"
+      cancel: "Cancel"
+      configure_name_in_provider: "Cannot import - please configure account name in Redbark"
+      description: "Select the accounts you want to link to your %{product_name} account."
+      link_accounts: "Link selected accounts"
+      no_accounts_found: "No accounts found. Please check your API key configuration."
+      no_api_key: "Redbark API key is not configured. Please configure it in Settings."
+      no_credentials_configured: "Please configure your Redbark credentials first in Provider Settings."
+      no_name_placeholder: "(No name)"
+      title: "Select Redbark Accounts"
+
+    # Select existing account view
+    select_existing_account:
+      account_already_linked: "This account is already linked to a provider"
+      all_accounts_already_linked: "All Redbark accounts are already linked"
+      api_error: "API error: %{message}"
+      balance_label: "Balance:"
+      cancel: "Cancel"
+      cancel_button: "Cancel"
+      configure_name_in_provider: "Cannot import - please configure account name in Redbark"
+      connect_hint: "Connect a Redbark account to enable automatic syncing."
+      description: "Select a Redbark account to link with this account. Transactions will be synced and deduplicated automatically."
+      header: "Link with Redbark"
+      link_account: "Link account"
+      link_button: "Link this account"
+      linking_to: "Linking to:"
+      no_account_specified: "No account specified"
+      no_accounts: "No unlinked Redbark accounts found."
+      no_accounts_found: "No Redbark accounts found. Please check your API key configuration."
+      no_api_key: "Redbark API key is not configured. Please configure it in Settings."
+      no_credentials_configured: "Please configure your Redbark credentials first in Provider Settings."
+      no_name_placeholder: "(No name)"
+      settings_link: "Go to Provider Settings"
+      subtitle: "Choose a Redbark account"
+      title: "Link %{account_name} with Redbark"
+
+    # Link existing account
+    link_existing_account:
+      account_already_linked: "This account is already linked to a provider"
+      api_error: "API error: %{message}"
+      invalid_account_name: "Cannot link account with blank name"
+      provider_account_already_linked: "This Redbark account is already linked to another account"
+      provider_account_not_found: "Redbark account not found"
+      missing_parameters: "Missing required parameters"
+      no_api_key: "Redbark API key not found. Please configure it in Provider Settings."
+      success: "Successfully linked %{account_name} with Redbark"
+
+    # Setup accounts wizard
+    setup_accounts:
+      account_type_label: "Account Type:"
+      accounts_count:
+        one: "%{count} account available"
+        other: "%{count} accounts available"
+      all_accounts_linked: "All your Redbark accounts have already been set up."
+      api_error: "API error: %{message}"
+      creating: "Creating accounts..."
+      fetch_failed: "Failed to Fetch Accounts"
+      import_selected: "Import selected accounts"
+      instructions: "Select the accounts you want to import from Redbark. You can choose multiple accounts."
+      no_accounts: "No unlinked accounts found from this Redbark connection."
+      no_accounts_to_setup: "No Accounts to Set Up"
+      no_api_key: "Redbark API key is not configured. Please check your connection settings."
+      select_all: "Select all"
+      account_types:
+        skip: "Skip this account"
+        depository: "Checking or Savings Account"
+        credit_card: "Credit Card"
+        loan: "Loan or Mortgage"
+        other_asset: "Other Asset"
+      subtype_labels:
+        depository: "Account Subtype:"
+        credit_card: ""
+        loan: "Loan Type:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Credit cards will be automatically set up as credit card accounts."
+        other_asset: "No additional options needed for Other Assets."
+      subtypes:
+        depository:
+          checking: "Checking"
+          savings: "Savings"
+          hsa: "Health Savings Account"
+          cd: "Certificate of Deposit"
+          money_market: "Money Market"
+        loan:
+          mortgage: "Mortgage"
+          student: "Student Loan"
+          auto: "Auto Loan"
+          other: "Other Loan"
+      balance: "Balance"
+      cancel: "Cancel"
+      done: "Done"
+      choose_account_type: "Choose the correct account type for each Redbark account:"
+      create_accounts: "Create Accounts"
+      creating_accounts: "Creating Accounts..."
+      historical_data_range: "Historical Data Range:"
+      subtitle: "Choose the correct account types for your imported accounts"
+      sync_start_date_help: "Select how far back you want to sync transaction history."
+      sync_start_date_label: "Start syncing transactions from:"
+      title: "Set Up Your Redbark Accounts"
+
+    setup_required:
+      title: Connect Redbark first
+      not_configured_title: Redbark isn't connected yet
+      not_configured_description: Add your Redbark API key under Provider settings, then come back here to link accounts.
+      go_to_provider_settings: Go to provider settings
+
+    # Complete account setup
+    complete_account_setup:
+      all_skipped: "All accounts were skipped. No accounts were created."
+      creation_failed: "Failed to create accounts: %{error}"
+      creation_failed_generic: "Failed to create accounts."
+      setup_failed: "%{count} account(s) could not be created. Nothing else was changed - fix the issue and try again."
+      no_accounts: "No accounts to set up."
+      success: "Successfully created %{count} account(s)."
+
diff --git a/config/locales/views/registrations/fr.yml b/config/locales/views/registrations/fr.yml
index f5ab94380..c2c5c15fa 100644
--- a/config/locales/views/registrations/fr.yml
+++ b/config/locales/views/registrations/fr.yml
@@ -16,16 +16,17 @@ fr:
     new:
       invitation_message: "%{inviter} vous a invité à rejoindre en tant que %{role}"
       join_family_title: Rejoindre %{family} %{moniker}
+      password_placeholder: Entrez votre mot de passe
+      password_requirements:
+        case: Majuscules et minuscules
+        length: Minimum 8 caractères
+        number: Un chiffre (0-9)
+        special: 'Un caractère spécial (!, @, #, $, %, etc)'
       role_admin: administrateur
       role_guest: invité
       role_member: membre
       submit: Créer un compte
       title: Créez votre compte
-      welcome_body: Pour commencer, vous devez créer un nouveau compte. Vous pourrez ensuite configurer des paramètres supplémentaires à l'intérieur de l'application.
+      welcome_body: Pour commencer, vous devez créer un nouveau compte. Vous pourrez
+        ensuite configurer des paramètres supplémentaires à l'intérieur de l'application.
       welcome_title: Bienvenue sur %{product_name} !
-      password_placeholder: Entrez votre mot de passe
-      password_requirements:
-        length: Minimum 8 caractères
-        case: Majuscules et minuscules
-        number: Un chiffre (0-9)
-        special: "Un caractère spécial (!, @, #, $, %, etc)"
diff --git a/config/locales/views/registrations/it.yml b/config/locales/views/registrations/it.yml
new file mode 100644
index 000000000..b1e5bf5fd
--- /dev/null
+++ b/config/locales/views/registrations/it.yml
@@ -0,0 +1,31 @@
+---
+it:
+  helpers:
+    label:
+      user:
+        invite_code: Codice invito
+    submit:
+      user:
+        create: Continua
+  registrations:
+    closed: Le registrazioni sono attualmente chiuse.
+    create:
+      failure: Si è verificato un problema durante la registrazione.
+      invalid_invite_code: Codice invito non valido, riprova.
+      success: Registrazione completata con successo.
+    new:
+      invitation_message: "%{inviter} ti ha invitato a unirti come %{role}"
+      join_family_title: Unisciti a %{family} %{moniker}
+      role_admin: amministratore
+      role_guest: ospite
+      role_member: membro
+      submit: Crea account
+      title: Crea il tuo account
+      welcome_body: Per iniziare, devi registrarti per un nuovo account. Potrai quindi configurare impostazioni aggiuntive nell'app.
+      welcome_title: Benvenuto su Self Hosted %{product_name}!
+      password_placeholder: Inserisci la tua password
+      password_requirements:
+        length: Minimo 8 caratteri
+        case: Lettere maiuscole e minuscole
+        number: Un numero (0-9)
+        special: "Un carattere speciale (!, @, #, $, %, ecc.)"
diff --git a/config/locales/views/registrations/ru.yml b/config/locales/views/registrations/ru.yml
new file mode 100644
index 000000000..cd6b2dcd5
--- /dev/null
+++ b/config/locales/views/registrations/ru.yml
@@ -0,0 +1,32 @@
+---
+ru:
+  helpers:
+    label:
+      user:
+        invite_code: Код приглашения
+    submit:
+      user:
+        create: Продолжить
+  registrations:
+    closed: Регистрация в данный момент закрыта.
+    create:
+      failure: Произошла ошибка при регистрации.
+      invalid_invite_code: Неверный код приглашения, попробуйте снова.
+      success: Вы успешно зарегистрировались.
+    new:
+      invitation_message: "%{inviter} пригласил вас присоединиться в качестве %{role}"
+      join_family_title: Присоединиться к %{family} %{moniker}
+      password_placeholder: Введите ваш пароль
+      password_requirements:
+        case: Заглавные и строчные буквы
+        length: Минимум 8 символов
+        number: Цифра (0-9)
+        special: 'Специальный символ (!, @, #, $, %, и т.д.)'
+      role_admin: администратор
+      role_guest: гость
+      role_member: участник
+      submit: Создать аккаунт
+      title: Создайте ваш аккаунт
+      welcome_body: Чтобы начать, вам необходимо зарегистрировать новый аккаунт. Затем
+        вы сможете настроить дополнительные параметры в приложении.
+      welcome_title: Добро пожаловать в %{product_name} (self-hosted)!
diff --git a/config/locales/views/registrations/tr.yml b/config/locales/views/registrations/tr.yml
index 61dc038aa..f1f783c91 100644
--- a/config/locales/views/registrations/tr.yml
+++ b/config/locales/views/registrations/tr.yml
@@ -15,16 +15,18 @@ tr:
       success: Başarıyla kaydoldunuz.
     new:
       invitation_message: "%{inviter}, sizi %{role} olarak katılmaya davet etti"
-      join_family_title: "%{family} ailesine katıl"
+      join_family_title: "%{family} %{moniker} hesabına katıl"
+      password_placeholder: Şifrenizi girin
+      password_requirements:
+        case: Büyük ve küçük harfler
+        length: En az 8 karakter
+        number: Bir rakam (0-9)
+        special: 'Bir özel karakter (!, @, #, $, %, vb.)'
       role_admin: yönetici
+      role_guest: misafir
       role_member: üye
       submit: Hesap oluştur
       title: Hesabınızı oluşturun
-      welcome_body: Başlamak için yeni bir hesap oluşturmalısınız. Daha sonra uygulama içinde ek ayarları yapılandırabileceksiniz.
+      welcome_body: Başlamak için yeni bir hesap oluşturmalısınız. Daha sonra uygulama
+        içinde ek ayarları yapılandırabileceksiniz.
       welcome_title: Self Hosted %{product_name}'ye Hoş Geldiniz!
-      password_placeholder: Şifrenizi girin
-      password_requirements:
-        length: En az 8 karakter
-        case: Büyük ve küçük harfler
-        number: Bir rakam (0-9)
-        special: "Bir özel karakter (!, @, #, $, %, etc)"
diff --git a/config/locales/views/reports/fr.yml b/config/locales/views/reports/fr.yml
index fc9d964f0..03d6214f7 100644
--- a/config/locales/views/reports/fr.yml
+++ b/config/locales/views/reports/fr.yml
@@ -1,224 +1,254 @@
 ---
 fr:
   reports:
+    budget_performance:
+      budgeted: Budgété
+      no_budgets: Aucune catégorie de budget définie pour ce mois
+      over_by: Dépassé de
+      remaining: Restant
+      shared: partagé
+      spent: Dépensé
+      status:
+        good: En bonne voie
+        over: Budget dépassé
+        warning: Proche de la limite
+      suggested_daily: "%{amount} suggéré par jour pour les %{days} jours restants"
+      title: Performance budgétaire
+    empty_state:
+      add_account: Ajouter un compte
+      add_transaction: Ajouter une transaction
+      description: Commencez à suivre vos finances en ajoutant des transactions ou
+        en connectant vos comptes pour voir des rapports complets
+      title: Aucune donnée disponible
+    google_sheets_instructions:
+      close: Compris
+      example: Exemple
+      go_to_api_keys: Aller aux clés API
+      need_key: Pour importer des données dans Google Sheets, vous avez besoin d'une
+        clé API.
+      open_sheets: Ouvrir Google Sheets
+      ready: Votre URL CSV (avec clé API) est prête.
+      security_warning: Cette URL inclut votre clé API. Gardez-la en sécurité !
+      step1: Allez dans Paramètres → Clés API
+      step2: Créez une nouvelle clé API avec la permission "lecture"
+      step3: Copiez la clé API
+      step4: 'Ajoutez-la à cette URL comme : ?api_key=VOTRE_CLÉ'
+      steps: |-
+        Pour importer dans Google Sheets :
+        1. Créez une nouvelle feuille Google
+        2. Dans la cellule A1, entrez la formule ci-dessous
+        3. Appuyez sur Entrée
+      then_use: Ensuite, utilisez l'URL complète avec =IMPORTDATA() dans Google Sheets.
+      title_no_key: "⚠️ Clé API requise"
+      title_with_key: "✅ Copier l'URL pour Google Sheets"
     index:
-      title: Rapports
-      subtitle: Aperçus complets de votre santé financière
-      export: Exporter CSV
-      print_report: Imprimer le rapport
-      drag_to_reorder: "Glisser pour réorganiser la section"
-      toggle_section: "Basculer la visibilité de la section"
-      periods:
-        monthly: Mensuel
-        quarterly: Trimestriel
-        ytd: Depuis le début de l'année
-        last_6_months: 6 derniers mois
-        custom: Plage personnalisée
       date_range:
         from: Du
         to: Au
-      showing_period: "Affichage des données du %{start} au %{end}"
-    invalid_date_range: "La date de fin ne peut pas être antérieure à la date de début. Les dates ont été inversées."
-    summary:
-      total_income: Revenus totaux
-      total_expenses: Dépenses totales
-      net_savings: Épargne nette
-      budget_performance: Performance budgétaire
-      vs_previous: vs période précédente
-      income_minus_expenses: Revenus moins dépenses
-      of_budget_used: du budget utilisé
-      no_budget_data: Aucune donnée budgétaire pour cette période
-    budget_performance:
-      title: Performance budgétaire
-      spent: Dépensé
-      budgeted: Budgété
-      remaining: Restant
-      over_by: Dépassé de
-      shared: partagé
-      suggested_daily: "%{amount} suggéré par jour pour les %{days} jours restants"
-      no_budgets: Aucune catégorie de budget définie pour ce mois
-      status:
-        good: En bonne voie
-        warning: Proche de la limite
-        over: Budget dépassé
-    trends:
-      title: Tendances et aperçus
-      monthly_breakdown: Répartition mensuelle
-      month: Mois
-      income: Revenus
-      expenses: Dépenses
-      net: Net
-      savings_rate: Taux d'épargne
-      current: actuel
-      avg_monthly_income: Revenu mensuel moyen
-      avg_monthly_expenses: Dépenses mensuelles moyennes
-      avg_monthly_savings: Épargne mensuelle moyenne
-      no_data: Aucune donnée de tendance disponible
-      spending_patterns: Modèles de dépenses
-      weekday_spending: Dépenses en semaine
-      weekend_spending: Dépenses le week-end
-      total: Total
-      avg_per_transaction: Moy. par transaction
-      transactions: Transactions
-      insight_title: Aperçu
-      insight_higher_weekend: "Vous dépensez %{percent}% de plus par transaction le week-end qu'en semaine"
-      insight_higher_weekday: "Vous dépensez %{percent}% de plus par transaction en semaine que le week-end"
-      insight_similar: "Vos dépenses par transaction sont similaires en semaine et le week-end"
-      no_spending_data: Aucune donnée de dépenses disponible pour cette période
-    empty_state:
-      title: Aucune donnée disponible
-      description: Commencez à suivre vos finances en ajoutant des transactions ou en connectant vos comptes pour voir des rapports complets
-      add_transaction: Ajouter une transaction
-      add_account: Ajouter un compte
-    transactions_breakdown:
-      title: Répartition des activités
-      no_transactions: Aucune activité trouvée pour la période et les filtres sélectionnés
-      filters:
-        title: Filtres
-        category: Catégorie
-        account: Compte
-        tag: Étiquette
-        amount_min: Montant min
-        amount_max: Montant max
-        date_range: Plage de dates
-        all_categories: Toutes les catégories
-        all_accounts: Tous les comptes
-        all_tags: Toutes les étiquettes
-        apply: Appliquer les filtres
-        clear: Effacer les filtres
-      sort:
-        label: Trier par
-        date_desc: Date (Plus récent)
-        amount_desc: Montant (Élevé à faible)
-        amount_asc: Montant (Faible à élevé)
-      export:
-        label: Exporter
-        csv: CSV
-        excel: Excel
-        pdf: PDF
-        google_sheets: Ouvrir dans Google Sheets
-      table:
-        category: Catégorie
-        amount: Montant
-        type: Type
-        expense: Dépenses
-        income: Revenus
-        uncategorized: Non catégorisé
-        entries:
-          one: "%{count} entrée"
-          other: "%{count} entrées"
-        percentage: "% du total"
-      pagination:
-        showing:
-          one: Affichage de %{count} entrée
-          other: Affichage de %{count} entrées
-        previous: Précédent
-        next: Suivant
-    net_worth:
-      title: Patrimoine net
-      current_net_worth: Patrimoine net actuel
-      period_change: Variation sur la période
-      assets_vs_liabilities: Actifs vs Passifs
-      total_assets: Actifs
-      total_liabilities: Passifs
-      no_assets: Aucun actif
-      no_liabilities: Aucun passif
+      drag_to_reorder: Glisser pour réorganiser la section
+      export: Exporter CSV
+      next_decade: La prochaine décennie
+      next_period: Période suivante
+      next_year: L'année prochaine
+      period_label:
+        last_6_months: "%{start} – %{end}"
+        past_year: "%{year}"
+        quarterly: Q%{quarter} %{year}
+        ytd: Cumul cumulatif %{year}
+      period_picker:
+        quarter: Q%{quarter} %{year}
+        ytd: Cumul cumulatif %{year}
+      periods:
+        custom: Plage personnalisée
+        last_6_months: 6 derniers mois
+        monthly: Mensuel
+        quarterly: Trimestriel
+        ytd: Depuis le début de l'année
+      previous_decade: Décennie précédente
+      previous_period: Période précédente
+      previous_year: Année précédente
+      print_report: Imprimer le rapport
+      showing_period: Affichage des données du %{start} au %{end}
+      subtitle: Aperçus complets de votre santé financière
+      title: Rapports
+      today: Aujourd'hui
+      toggle_section: Basculer la visibilité de la section
+    invalid_date_range: La date de fin ne peut pas être antérieure à la date de début.
+      Les dates ont été inversées.
+    investment_flows:
+      contributions: Contributions
+      contributions_description: Argent ajouté aux investissements
+      description: Suivez les flux d'argent entrants et sortants de vos comptes d'investissement
+      net_flow: Flux net
+      net_flow_description: Variation nette totale
+      title: Flux d'investissement
+      withdrawals: Retraits
+      withdrawals_description: Argent retiré des investissements
     investment_performance:
-      title: Performance des investissements
-      portfolio_value: Valeur du portefeuille
-      total_return: Rendement total
-      contributions: Contributions de la période
-      withdrawals: Retraits de la période
-      top_holdings: Principaux avoirs
-      holding: Avoir
-      weight: Poids
-      value: Valeur
-      return: Rendement
       accounts: Comptes d'investissement
+      and_more: "+%{count} de plus"
+      contributions: Contributions de la période
       gains_by_tax_treatment: Gains par traitement fiscal
-      unrealized_gains: Plus-values latentes
-      realized_gains: Plus-values réalisées
-      total_gains: Gains totaux
-      taxable_realized_note: Ces gains peuvent être soumis à l'impôt
-      no_data: "-"
-      view_details: Voir les détails
+      holding: Holding
+      holdings: Holdings
       holdings_count:
-        one: "%{count} avoir"
-        other: "%{count} avoirs"
+        one: "%{count} holding"
+        other: "%{count} holdings"
+      no_data: "-"
+      period_return: Rendement de la période
+      portfolio_value: Valeur du portefeuille
+      realized_gains: Plus-values réalisées
+      return: Rendement
+      sell_trades: Transactions boursières de vente
       sells_count:
         one: "%{count} vente"
         other: "%{count} ventes"
-      holdings: Avoirs
-      sell_trades: Transactions boursières de vente
-      and_more: "+%{count} de plus"
-    investment_flows:
-      title: Flux d'investissement
-      description: Suivez les flux d'argent entrants et sortants de vos comptes d'investissement
-      contributions: Contributions
-      withdrawals: Retraits
-      net_flow: Flux net
-    google_sheets_instructions:
-      title_with_key: "✅ Copier l'URL pour Google Sheets"
-      title_no_key: "⚠️ Clé API requise"
-      ready: Votre URL CSV (avec clé API) est prête.
-      steps: "Pour importer dans Google Sheets :\n1. Créez une nouvelle feuille Google\n2. Dans la cellule A1, entrez la formule ci-dessous\n3. Appuyez sur Entrée"
-      security_warning: "Cette URL inclut votre clé API. Gardez-la en sécurité !"
-      need_key: Pour importer des données dans Google Sheets, vous avez besoin d'une clé API.
-      step1: "Allez dans Paramètres → Clés API"
-      step2: "Créez une nouvelle clé API avec la permission \"lecture\""
-      step3: Copiez la clé API
-      step4: "Ajoutez-la à cette URL comme : ?api_key=VOTRE_CLÉ"
-      example: Exemple
-      then_use: Ensuite, utilisez l'URL complète avec =IMPORTDATA() dans Google Sheets.
-      open_sheets: Ouvrir Google Sheets
-      go_to_api_keys: Aller aux clés API
-      close: Compris
+      taxable_realized_note: Ces gains peuvent être soumis à l'impôt
+      title: Performance des investissements
+      top_holdings: Principaux holdings
+      total_gains: Gains totaux
+      total_return: Rendement total
+      unrealized_gains: Plus-values latentes
+      value: Valeur
+      view_details: Voir les détails
+      weight: Poids
+      withdrawals: Retraits de la période
+    net_worth:
+      assets_vs_liabilities: Actifs vs Passifs
+      current_net_worth: Patrimoine net actuel
+      no_assets: Aucun actif
+      no_liabilities: Aucun passif
+      period_change: Variation sur la période
+      title: Patrimoine net
+      total_assets: Actifs
+      total_liabilities: Passifs
     print:
       document_title: Rapport financier
-      title: Rapport financier
-      generated_on: "Généré le %{date}"
-      summary:
-        title: Résumé
-        income: Revenus
-        expenses: Dépenses
-        net_savings: Épargne nette
-        budget: Budget
-        vs_prior: "%{percent}% vs précédent"
-        of_income: "%{percent}% des revenus"
-        used: utilisé
-      net_worth:
-        title: Patrimoine net
-        current_balance: Solde actuel
+      generated_on: Généré le %{date}
+      investments:
+        contributions: Contributions
+        holding: Holding
+        period_return: Rendement de la période
+        portfolio_value: Valeur du portefeuille
+        return: Rendement
         this_period: cette période
+        title: Investissements
+        top_holdings: Principaux holdings
+        total_return: Rendement total
+        value: Valeur
+        weight: Poids
+        withdrawals: Retraits
+      net_worth:
         assets: Actifs
+        current_balance: Solde actuel
         liabilities: Passifs
         no_liabilities: Aucun passif
-      trends:
-        title: Tendances mensuelles
-        month: Mois
-        income: Revenus
+        this_period: cette période
+        title: Patrimoine net
+      spending:
+        amount: Montant
+        category: Catégorie
         expenses: Dépenses
-        net: Net
-        savings_rate: Taux d'épargne
+        income: Revenus
+        more_categories: "+ %{count} autres catégories"
+        percent: "%"
+        title: Dépenses par catégorie
+      summary:
+        budget: Budget
+        expenses: Dépenses
+        income: Revenus
+        net_savings: Épargne nette
+        of_income: "%{percent}% des revenus"
+        title: Résumé
+        used: utilisé
+        vs_prior: "%{percent}% vs précédent"
+      title: Rapport financier
+      trends:
         average: Moyenne
         current_month_note: "* Mois en cours (données partielles)"
-      investments:
-        title: Investissements
-        portfolio_value: Valeur du portefeuille
-        total_return: Rendement total
-        contributions: Contributions
-        withdrawals: Retraits
-        this_period: cette période
-        top_holdings: Principaux avoirs
-        holding: Avoir
-        weight: Poids
-        value: Valeur
-        return: Rendement
-      spending:
-        title: Dépenses par catégorie
-        income: Revenus
         expenses: Dépenses
+        income: Revenus
+        month: Mois
+        net: Net
+        savings_rate: Taux d'épargne
+        title: Tendances mensuelles
+    summary:
+      budget_performance: Performance budgétaire
+      income_minus_expenses: Revenus moins dépenses
+      net_savings: Épargne nette
+      no_budget_data: Aucune donnée budgétaire pour cette période
+      of_budget_used: du budget utilisé
+      total_expenses: Dépenses totales
+      total_income: Revenus totaux
+      vs_previous: vs période précédente
+    transactions_breakdown:
+      export:
+        csv: CSV
+        excel: Excel
+        google_sheets: Ouvrir dans Google Sheets
+        label: Exporter
+        pdf: PDF
+      filters:
+        account: Compte
+        all_accounts: Tous les comptes
+        all_categories: Toutes les catégories
+        all_tags: Toutes les étiquettes
+        amount_max: Montant max
+        amount_min: Montant min
+        apply: Appliquer les filtres
         category: Catégorie
+        clear: Effacer les filtres
+        date_range: Plage de dates
+        tag: Étiquette
+        title: Filtres
+      no_transactions: Aucune activité trouvée pour la période et les filtres sélectionnés
+      pagination:
+        next: Suivant
+        previous: Précédent
+        showing:
+          one: Affichage de %{count} entrée
+          other: Affichage de %{count} entrées
+      sort:
+        amount_asc: Montant (Faible à élevé)
+        amount_desc: Montant (Élevé à faible)
+        date_desc: Date (Plus récent)
+        label: Trier par
+      table:
         amount: Montant
-        percent: "%"
-        more_categories: "+ %{count} autres catégories"
+        category: Catégorie
+        entries:
+          one: "%{count} entrée"
+          other: "%{count} entrées"
+        expense: Dépenses
+        income: Revenus
+        percentage: "% du total"
+        type: Type
+        uncategorized: Non catégorisé
+      title: Répartition des activités
+    trends:
+      avg_monthly_expenses: Dépenses mensuelles moyennes
+      avg_monthly_income: Revenu mensuel moyen
+      avg_monthly_savings: Épargne mensuelle moyenne
+      avg_per_transaction: Moy. par transaction
+      current: actuel
+      expenses: Dépenses
+      income: Revenus
+      insight_higher_weekday: Vous dépensez %{percent}% de plus par transaction en
+        semaine que le week-end
+      insight_higher_weekend: Vous dépensez %{percent}% de plus par transaction le
+        week-end qu'en semaine
+      insight_similar: Vos dépenses par transaction sont similaires en semaine et
+        le week-end
+      insight_title: Aperçu
+      month: Mois
+      monthly_breakdown: Répartition mensuelle
+      net: Net
+      no_data: Aucune donnée de tendance disponible
+      no_spending_data: Aucune donnée de dépenses disponible pour cette période
+      savings_rate: Taux d'épargne
+      spending_patterns: Modèles de dépenses
+      title: Tendances et aperçus
+      total: Total
+      transactions: Transactions
+      weekday_spending: Dépenses en semaine
+      weekend_spending: Dépenses le week-end
diff --git a/config/locales/views/reports/it.yml b/config/locales/views/reports/it.yml
new file mode 100644
index 000000000..fc62782c5
--- /dev/null
+++ b/config/locales/views/reports/it.yml
@@ -0,0 +1,244 @@
+---
+it:
+  reports:
+    index:
+      title: Rapporti
+      subtitle: Analisi approfondita della tua salute finanziaria
+      export: Esporta CSV
+      print_report: Stampa rapporto
+      drag_to_reorder: "Trascina per riordinare la sezione"
+      toggle_section: "Mostra/nascondi sezione"
+      periods:
+        monthly: Mensile
+        quarterly: Trimestrale
+        ytd: Da inizio anno
+        last_6_months: Ultimi 6 mesi
+        custom: Intervallo personalizzato
+      date_range:
+        from: Da
+        to: A
+      showing_period: "Visualizzazione dati dal %{start} al %{end}"
+      previous_period: "Periodo precedente"
+      next_period: "Periodo successivo"
+      today: "Oggi"
+      period_label:
+        quarterly: "T%{quarter} %{year}"
+        ytd: "YTD %{year}"
+        past_year: "%{year}"
+        last_6_months: "%{start} – %{end}"
+      period_picker:
+        quarter: "T%{quarter} %{year}"
+        ytd: "YTD %{year}"
+      previous_year: "Anno precedente"
+      next_year: "Anno successivo"
+      previous_decade: "Decennio precedente"
+      next_decade: "Decennio successivo"
+    invalid_date_range: "La data di fine non può essere precedente alla data di inizio. Le date sono state scambiate."
+    summary:
+      total_income: Entrate totali
+      total_expenses: Spese totali
+      net_savings: Risparmio netto
+      budget_performance: Performance budget
+      vs_previous: vs periodo precedente
+      income_minus_expenses: Entrate meno spese
+      of_budget_used: del budget utilizzato
+      no_budget_data: Nessun dato budget per questo periodo
+    budget_performance:
+      title: Performance budget
+      spent: Speso
+      budgeted: Pianificato
+      remaining: Rimanente
+      over_by: In eccesso di
+      shared: condiviso
+      suggested_daily: "%{amount} suggeriti al giorno per i %{days} giorni rimanenti"
+      no_budgets: Nessuna categoria budget configurata per questo mese
+      status:
+        good: In regola
+        warning: Vicino al limite
+        over: Oltre il budget
+    trends:
+      title: Tendenze e Approfondimenti
+      monthly_breakdown: Ripartizione mensile
+      month: Mese
+      income: Entrate
+      expenses: Spese
+      net: Netto
+      savings_rate: Tasso di risparmio
+      current: corrente
+      avg_monthly_income: Entrate medie mensili
+      avg_monthly_expenses: Spese medie mensili
+      avg_monthly_savings: Risparmio medio mensile
+      no_data: Nessun dato di tendenza disponibile
+      spending_patterns: Schemi di spesa
+      weekday_spending: Spese nei giorni feriali
+      weekend_spending: Spese nel weekend
+      total: Totale
+      avg_per_transaction: Media per transazione
+      transactions: Transazioni
+      insight_title: Analisi
+      insight_higher_weekend: "Spendi il %{percent}%% in più per transazione nel weekend rispetto ai giorni feriali"
+      insight_higher_weekday: "Spendi il %{percent}%% in più per transazione nei giorni feriali rispetto al weekend"
+      insight_similar: "La tua spesa per transazione è simile nei giorni feriali e nel weekend"
+      no_spending_data: Nessun dato di spesa disponibile per questo periodo
+    empty_state:
+      title: Nessun dato disponibile
+      description: Inizia a monitorare le tue finanze aggiungendo transazioni o collegando i tuoi conti per vedere rapporti completi
+      add_transaction: Aggiungi transazione
+      add_account: Aggiungi conto
+    transactions_breakdown:
+      title: Ripartizione attività
+      no_transactions: Nessuna attività trovata per il periodo e i filtri selezionati
+      filters:
+        title: Filtri
+        category: Categoria
+        account: Conto
+        tag: Etichetta
+        amount_min: Importo minimo
+        amount_max: Importo massimo
+        date_range: Intervallo date
+        all_categories: Tutte le categorie
+        all_accounts: Tutti i conti
+        all_tags: Tutte le etichette
+        apply: Applica filtri
+        clear: Rimuovi filtri
+      sort:
+        label: Ordina per
+        date_desc: Data (più recente)
+        amount_desc: Importo (dal più alto)
+        amount_asc: Importo (dal più basso)
+      export:
+        label: Esporta
+        csv: CSV
+        excel: Excel
+        pdf: PDF
+        google_sheets: Apri in Google Sheets
+      table:
+        category: Categoria
+        amount: Importo
+        type: Tipo
+        expense: Spese
+        income: Entrate
+        uncategorized: Non categorizzate
+        entries:
+          one: "%{count} voce"
+          other: "%{count} voci"
+        percentage: "% del totale"
+      pagination:
+        showing:
+          one: Visualizzazione di %{count} voce
+          other: Visualizzazione di %{count} voci
+        previous: Precedente
+        next: Successivo
+    net_worth:
+      title: Patrimonio netto
+      current_net_worth: Patrimonio netto attuale
+      period_change: Variazione del periodo
+      assets_vs_liabilities: Attività vs passività
+      total_assets: Attività
+      total_liabilities: Passività
+      no_assets: Nessuna attività
+      no_liabilities: Nessuna passività
+    investment_performance:
+      title: Performance investimenti
+      portfolio_value: Valore portafoglio
+      total_return: Rendimento totale
+      period_return: Rendimento del periodo
+      contributions: Contributi del periodo
+      withdrawals: Prelievi del periodo
+      top_holdings: Posizioni principali
+      holding: Posizione
+      weight: Peso
+      value: Valore
+      return: Rendimento
+      accounts: Conti di investimento
+      gains_by_tax_treatment: Guadagni per trattamento fiscale
+      unrealized_gains: Plusvalenze non realizzate
+      realized_gains: Plusvalenze realizzate
+      total_gains: Guadagni totali
+      taxable_realized_note: Questi guadagni potrebbero essere soggetti a tassazione
+      no_data: "-"
+      view_details: Vedi dettagli
+      holdings_count:
+        one: "%{count} posizione"
+        other: "%{count} posizioni"
+      sells_count:
+        one: "%{count} vendita"
+        other: "%{count} vendite"
+      holdings: Posizioni
+      sell_trades: Operazioni di vendita
+      and_more: "+%{count} altre"
+    investment_flows:
+      title: Flussi di investimento
+      description: Monitora il denaro che entra ed esce dai tuoi conti di investimento tramite contributi e prelievi.
+      contributions: Contributi
+      contributions_description: Denaro aggiunto agli investimenti
+      withdrawals: Prelievi
+      withdrawals_description: Denaro prelevato dagli investimenti
+      net_flow: Flusso netto
+      net_flow_description: Variazione netta totale
+    google_sheets_instructions:
+      title_with_key: "✅ Copia URL per Google Sheets"
+      title_no_key: "⚠️ Chiave API richiesta"
+      ready: Il tuo URL CSV (con chiave API) è pronto.
+      steps: "Per importare in Google Sheets:\n1. Crea un nuovo Google Sheet\n2. Nella cella A1, inserisci la formula mostrata sotto\n3. Premi Invio"
+      security_warning: "Questo URL include la tua chiave API. Tienila al sicuro!"
+      need_key: Per importare dati in Google Sheets, hai bisogno di una chiave API.
+      step1: "Vai su Impostazioni → Chiavi API"
+      step2: "Crea una nuova chiave API con permesso \"lettura\""
+      step3: Copia la chiave API
+      step4: "Aggiungila a questo URL come: ?api_key=LA_TUA_CHIAVE"
+      example: Esempio
+      then_use: Poi usa l'URL completo con =IMPORTDATA() in Google Sheets.
+      open_sheets: Apri Google Sheets
+      go_to_api_keys: Vai alle chiavi API
+      close: Capito
+    print:
+      document_title: Rapporto finanziario
+      title: Rapporto finanziario
+      generated_on: "Generato il %{date}"
+      summary:
+        title: Riepilogo
+        income: Entrate
+        expenses: Spese
+        net_savings: Risparmio netto
+        budget: Budget
+        vs_prior: "%{percent}%% vs precedente"
+        of_income: "%{percent}%% delle entrate"
+        used: utilizzato
+      net_worth:
+        title: Patrimonio netto
+        current_balance: Saldo attuale
+        this_period: questo periodo
+        assets: Attività
+        liabilities: Passività
+        no_liabilities: Nessuna passività
+      trends:
+        title: Tendenze mensili
+        month: Mese
+        income: Entrate
+        expenses: Spese
+        net: Netto
+        savings_rate: Tasso di risparmio
+        average: Media
+        current_month_note: "* Mese corrente (dati parziali)"
+      investments:
+        title: Investimenti
+        portfolio_value: Valore portafoglio
+        total_return: Rendimento totale
+        period_return: Rendimento del periodo
+        contributions: Contributi
+        withdrawals: Prelievi
+        this_period: questo periodo
+        top_holdings: Posizioni principali
+        holding: Posizione
+        weight: Peso
+        value: Valore
+        return: Rendimento
+      spending:
+        title: Spese per categoria
+        income: Entrate
+        expenses: Spese
+        category: Categoria
+        amount: Importo
+        percent: "%"
+        more_categories: "+ %{count} altre categorie"
diff --git a/config/locales/views/reports/ru.yml b/config/locales/views/reports/ru.yml
new file mode 100644
index 000000000..419dfb5ed
--- /dev/null
+++ b/config/locales/views/reports/ru.yml
@@ -0,0 +1,261 @@
+---
+ru:
+  reports:
+    budget_performance:
+      budgeted: Запланировано
+      no_budgets: Нет категорий бюджета на этот месяц
+      over_by: Превышение на
+      remaining: Остаток
+      shared: общий
+      spent: Потрачено
+      status:
+        good: В норме
+        over: Превышение бюджета
+        warning: Близко к лимиту
+      suggested_daily: "%{amount} рекомендовано в день на оставшиеся %{days} дней"
+      title: Выполнение бюджета
+    empty_state:
+      add_account: Добавить счёт
+      add_transaction: Добавить операцию
+      description: Начните отслеживать свои финансы, добавив операции или подключив
+        свои счета, чтобы увидеть полные отчёты
+      title: Нет доступных данных
+    google_sheets_instructions:
+      close: Понятно
+      example: Пример
+      go_to_api_keys: Перейти к API-ключам
+      need_key: Чтобы импортировать данные в Google Sheets, вам нужен API-ключ.
+      open_sheets: Открыть Google Sheets
+      ready: Ваш URL для CSV (с API-ключом) готов.
+      security_warning: Этот URL включает ваш API-ключ. Держите его в безопасности!
+      step1: Перейдите в Настройки → API-ключи
+      step2: Создайте новый API-ключ с разрешением "чтение"
+      step3: Скопируйте API-ключ
+      step4: 'Добавьте его в этот URL как: ?api_key=YOUR_KEY'
+      steps: |-
+        Чтобы импортировать в Google Sheets:
+        1. Создайте новый Google Sheet
+        2. В ячейке A1 введите формулу, показанную ниже
+        3. Нажмите Enter
+      then_use: Затем используйте полный URL с =IMPORTDATA() в Google Sheets.
+      title_no_key: "⚠️ Требуется API-ключ"
+      title_with_key: "✅ Скопируйте URL для Google Sheets"
+    index:
+      date_range:
+        from: С
+        to: По
+      drag_to_reorder: Перетащите для изменения порядка разделов
+      export: Экспорт CSV
+      next_decade: Следующее десятилетие
+      next_period: Следующий период
+      next_year: Следующий год
+      period_label:
+        last_6_months: "%{start} – %{end}"
+        past_year: "%{year}"
+        quarterly: Квартал %{quarter} %{year}
+        ytd: С начала года %{year}
+      period_picker:
+        quarter: Квартал %{quarter} %{year}
+        ytd: С начала года %{year}
+      periods:
+        custom: Пользовательский диапазон
+        last_6_months: Последние 6 месяцев
+        monthly: Ежемесячно
+        quarterly: Ежеквартально
+        ytd: С начала года
+      previous_decade: Предыдущее десятилетие
+      previous_period: Предыдущий период
+      previous_year: Предыдущий год
+      print_report: Печать отчёта
+      showing_period: Показаны данные с %{start} по %{end}
+      subtitle: Полный анализ вашего финансового состояния
+      title: Отчёты
+      today: Сегодня
+      toggle_section: Переключить видимость раздела
+    invalid_date_range: Дата окончания не может быть раньше даты начала. Даты были
+      поменяны местами.
+    investment_flows:
+      contributions: Взносы
+      contributions_description: Средства, добавленные в инвестиции
+      description: Отслеживайте движение средств в и из ваших инвестиционных счетов
+        через взносы и изъятия.
+      net_flow: Чистый поток
+      net_flow_description: Общая чистая изменяемость
+      title: Инвестиционные потоки
+      withdrawals: Изъятия
+      withdrawals_description: Средства, изъятые из инвестиций
+    investment_performance:
+      accounts: Инвестиционные счета
+      and_more: "+%{count} ещё"
+      contributions: Взносы за период
+      gains_by_tax_treatment: Доходы по налоговому учёту
+      holding: Актив
+      holdings: Активы
+      holdings_count:
+        few: "%{count} актива"
+        many: "%{count} активов"
+        one: "%{count} актив"
+        other: "%{count} актива"
+      no_data: "-"
+      period_return: Доходность за период
+      portfolio_value: Стоимость портфеля
+      realized_gains: Реализованные доходы
+      return: Доходность
+      sell_trades: Продажи
+      sells_count:
+        few: "%{count} продажи"
+        many: "%{count} продаж"
+        one: "%{count} продажа"
+        other: "%{count} продажи"
+      taxable_realized_note: Эти доходы могут облагаться налогами
+      title: Эффективность инвестиций
+      top_holdings: Основные активы
+      total_gains: Общие доходы
+      total_return: Общая доходность
+      unrealized_gains: Нереализованные доходы
+      value: Стоимость
+      view_details: Посмотреть детали
+      weight: Доля
+      withdrawals: Изъятия за период
+    net_worth:
+      assets_vs_liabilities: Активы против обязательств
+      current_net_worth: Текущая чистая стоимость
+      no_assets: Нет активов
+      no_liabilities: Нет обязательств
+      period_change: Изменение за период
+      title: Чистая стоимость
+      total_assets: Активы
+      total_liabilities: Обязательства
+    print:
+      document_title: Финансовый отчёт
+      generated_on: Создан %{date}
+      investments:
+        contributions: Взносы
+        holding: Актив
+        period_return: Доходность за период
+        portfolio_value: Стоимость портфеля
+        return: Доходность
+        this_period: за этот период
+        title: Инвестиции
+        top_holdings: Основные активы
+        total_return: Общая доходность
+        value: Стоимость
+        weight: Доля
+        withdrawals: Изъятия
+      net_worth:
+        assets: Активы
+        current_balance: Текущий баланс
+        liabilities: Обязательства
+        no_liabilities: Нет обязательств
+        this_period: за этот период
+        title: Свободные средства
+      spending:
+        amount: Сумма
+        category: Категория
+        expenses: Расходы
+        income: Доход
+        more_categories: "+ %{count} ещё категорий"
+        percent: "%"
+        title: Расходы по категориям
+      summary:
+        budget: Бюджет
+        expenses: Расходы
+        income: Доход
+        net_savings: Чистые сбережения
+        of_income: "%{percent}% от дохода"
+        title: Сводка
+        used: использовано
+        vs_prior: "%{percent}% по сравнению с предыдущим"
+      title: Финансовый отчёт
+      trends:
+        average: Среднее
+        current_month_note: "* Текущий месяц (частичные данные)"
+        expenses: Расходы
+        income: Доход
+        month: Месяц
+        net: Чистый
+        savings_rate: Уровень сбережений
+        title: Ежемесячные тренды
+    summary:
+      budget_performance: Выполнение бюджета
+      income_minus_expenses: Доход минус расходы
+      net_savings: Чистые сбережения
+      no_budget_data: Нет данных о бюджете за этот период
+      of_budget_used: от бюджета использовано
+      total_expenses: Общие расходы
+      total_income: Общий доход
+      vs_previous: по сравнению с предыдущим периодом
+    transactions_breakdown:
+      export:
+        csv: CSV
+        excel: Excel
+        google_sheets: Открыть в Google Sheets
+        label: Экспорт
+        pdf: PDF
+      filters:
+        account: Счёт
+        all_accounts: Все счета
+        all_categories: Все категории
+        all_tags: Все теги
+        amount_max: Макс. сумма
+        amount_min: Мин. сумма
+        apply: Применить фильтры
+        category: Категория
+        clear: Очистить фильтры
+        date_range: Диапазон дат
+        tag: Тег
+        title: Фильтры
+      no_transactions: Нет активности за выбранный период и фильтры
+      pagination:
+        next: Следующая
+        previous: Предыдущая
+        showing:
+          few: Показано %{count} записи
+          many: Показано %{count} записей
+          one: Показана %{count} запись
+          other: Показано %{count} записи
+      sort:
+        amount_asc: Сумма (по возрастанию)
+        amount_desc: Сумма (по убыванию)
+        date_desc: Дата (сначала новые)
+        label: Сортировать по
+      table:
+        amount: Сумма
+        category: Категория
+        entries:
+          few: "%{count} записи"
+          many: "%{count} записей"
+          one: "%{count} запись"
+          other: "%{count} записи"
+        expense: Расходы
+        income: Доход
+        percentage: "% от общего"
+        type: Тип
+        uncategorized: Без категории
+      title: Разбивка активности
+    trends:
+      avg_monthly_expenses: Средние ежемесячные расходы
+      avg_monthly_income: Средний ежемесячный доход
+      avg_monthly_savings: Средние ежемесячные сбережения
+      avg_per_transaction: Среднее за операцию
+      current: текущий
+      expenses: Расходы
+      income: Доход
+      insight_higher_weekday: Вы тратите на %{percent}% больше за операцию в будни,
+        чем в выходные
+      insight_higher_weekend: Вы тратите на %{percent}% больше за операцию в выходные,
+        чем в будни
+      insight_similar: Ваши расходы за операцию схожи в будни и выходные
+      insight_title: Анализ
+      month: Месяц
+      monthly_breakdown: Ежемесячная разбивка
+      net: Чистый
+      no_data: Нет данных о трендах
+      no_spending_data: Нет данных о расходах за этот период
+      savings_rate: Уровень сбережений
+      spending_patterns: Модели расходов
+      title: Тренды и анализ
+      total: Итого
+      transactions: Операции
+      weekday_spending: Расходы в будни
+      weekend_spending: Расходы в выходные
diff --git a/config/locales/views/reports/tr.yml b/config/locales/views/reports/tr.yml
new file mode 100644
index 000000000..0579e24af
--- /dev/null
+++ b/config/locales/views/reports/tr.yml
@@ -0,0 +1,254 @@
+---
+tr:
+  reports:
+    budget_performance:
+      budgeted: Bütçelenen
+      no_budgets: Bu ay için ayarlanmış bütçe kategorisi yok
+      over_by: Aşım
+      remaining: Kalan
+      shared: paylaşılan
+      spent: Harcanan
+      status:
+        good: Yolunda
+        over: Bütçe Aşıldı
+        warning: Limite Yakın
+      suggested_daily: Kalan %{days} gün için günlük %{amount} önerilir
+      title: Bütçe Performansı
+    empty_state:
+      add_account: Hesap Ekle
+      add_transaction: İşlem Ekle
+      description: Kapsamlı raporlar görmek için işlem ekleyerek veya hesaplarınızı
+        bağlayarak finansal durumunuzu takip etmeye başlayın
+      title: Veri Yok
+    google_sheets_instructions:
+      close: Anladım
+      example: Örnek
+      go_to_api_keys: API Anahtarlarına Git
+      need_key: Google E-Tablolar'a veri aktarmak için bir API anahtarına ihtiyacınız
+        var.
+      open_sheets: Google E-Tablolar'ı Aç
+      ready: CSV URL'niz (API anahtarıyla birlikte) hazır.
+      security_warning: Bu URL, API anahtarınızı içerir. Güvende tutun!
+      step1: Ayarlar → API Anahtarları'na gidin
+      step2: '"okuma" izniyle yeni bir API anahtarı oluşturun'
+      step3: API anahtarını kopyalayın
+      step4: 'Bu URL''ye şu şekilde ekleyin: ?api_key=ANAHTARINIZ'
+      steps: |-
+        Google E-Tablolar'a aktarmak için:
+        1. Yeni bir Google E-Tablo oluşturun
+        2. A1 hücresine aşağıda gösterilen formülü girin
+        3. Enter'a basın
+      then_use: Ardından Google E-Tablolar'da =IMPORTDATA() ile tam URL'yi kullanın.
+      title_no_key: "⚠️ API Anahtarı Gerekli"
+      title_with_key: "✅ Google E-Tablolar için URL'yi Kopyala"
+    index:
+      date_range:
+        from: Başlangıç
+        to: Bitiş
+      drag_to_reorder: Bölümü yeniden sıralamak için sürükleyin
+      export: CSV Dışa Aktar
+      next_decade: Sonraki on yıl
+      next_period: Sonraki dönem
+      next_year: Sonraki yıl
+      period_label:
+        last_6_months: "%{start} – %{end}"
+        past_year: "%{year}"
+        quarterly: "%{quarter}. Ç %{year}"
+        ytd: "%{year} YBB"
+      period_picker:
+        quarter: "%{quarter}. Ç %{year}"
+        ytd: "%{year} YBB"
+      periods:
+        custom: Özel Aralık
+        last_6_months: Son 6 Ay
+        monthly: Aylık
+        quarterly: Üç Aylık
+        ytd: Yıl Başından Bugüne
+      previous_decade: Önceki on yıl
+      previous_period: Önceki dönem
+      previous_year: Önceki yıl
+      print_report: Raporu Yazdır
+      showing_period: "%{start} - %{end} tarihleri arasındaki veriler gösteriliyor"
+      subtitle: Finansal sağlığınıza dair kapsamlı içgörüler
+      title: Raporlar
+      today: Bugün
+      toggle_section: Bölüm görünürlüğünü değiştir
+    invalid_date_range: Bitiş tarihi başlangıç tarihinden önce olamaz. Tarihler yer
+      değiştirildi.
+    investment_flows:
+      contributions: Katkılar
+      contributions_description: Yatırımlara eklenen para
+      description: Katkılar ve çekimler yoluyla yatırım hesaplarınıza giren ve çıkan
+        parayı takip edin.
+      net_flow: Net Akış
+      net_flow_description: Toplam net değişim
+      title: Yatırım Akışları
+      withdrawals: Çekimler
+      withdrawals_description: Yatırımlardan çekilen para
+    investment_performance:
+      accounts: Yatırım Hesapları
+      and_more: "+%{count} daha fazla"
+      contributions: Dönem Katkıları
+      gains_by_tax_treatment: Vergi Durumuna Göre Kazançlar
+      holding: Varlık
+      holdings: Varlıklar
+      holdings_count:
+        one: "%{count} varlık"
+        other: "%{count} varlık"
+      no_data: "-"
+      period_return: Dönem Getirisi
+      portfolio_value: Portföy Değeri
+      realized_gains: Gerçekleşen Kazançlar
+      return: Getiri
+      sell_trades: Satış İşlemleri
+      sells_count:
+        one: "%{count} satış"
+        other: "%{count} satış"
+      taxable_realized_note: Bu kazançlar vergiye tabi olabilir
+      title: Yatırım Performansı
+      top_holdings: En Büyük Varlıklar
+      total_gains: Toplam Kazanç
+      total_return: Toplam Getiri
+      unrealized_gains: Gerçekleşmemiş Kazançlar
+      value: Değer
+      view_details: Ayrıntıları görüntüle
+      weight: Ağırlık
+      withdrawals: Dönem Çekimleri
+    net_worth:
+      assets_vs_liabilities: Varlıklar ve Yükümlülükler
+      current_net_worth: Güncel Net Değer
+      no_assets: Varlık yok
+      no_liabilities: Yükümlülük yok
+      period_change: Dönemsel Değişim
+      title: Net Değer
+      total_assets: Varlıklar
+      total_liabilities: Yükümlülükler
+    print:
+      document_title: Finansal Rapor
+      generated_on: "%{date} tarihinde oluşturuldu"
+      investments:
+        contributions: Katkılar
+        holding: Varlık
+        period_return: Dönem Getirisi
+        portfolio_value: Portföy Değeri
+        return: Getiri
+        this_period: bu dönem
+        title: Yatırımlar
+        top_holdings: En Büyük Varlıklar
+        total_return: Toplam Getiri
+        value: Değer
+        weight: Ağırlık
+        withdrawals: Çekimler
+      net_worth:
+        assets: Varlıklar
+        current_balance: Güncel Bakiye
+        liabilities: Yükümlülükler
+        no_liabilities: Yükümlülük yok
+        this_period: bu dönem
+        title: Net Değer
+      spending:
+        amount: Tutar
+        category: Kategori
+        expenses: Giderler
+        income: Gelir
+        more_categories: "+ %{count} kategori daha"
+        percent: "%"
+        title: Kategoriye Göre Harcama
+      summary:
+        budget: Bütçe
+        expenses: Giderler
+        income: Gelir
+        net_savings: Net Tasarruf
+        of_income: "gelirin yüzde %{percent}'i"
+        title: Özet
+        used: kullanıldı
+        vs_prior: "öncekine göre %{percent}%"
+      title: Finansal Rapor
+      trends:
+        average: Ortalama
+        current_month_note: "* Bu ay (kısmi veri)"
+        expenses: Giderler
+        income: Gelir
+        month: Ay
+        net: Net
+        savings_rate: Tasarruf Oranı
+        title: Aylık Eğilimler
+    summary:
+      budget_performance: Bütçe Performansı
+      income_minus_expenses: Gelir eksi giderler
+      net_savings: Net Tasarruf
+      no_budget_data: Bu dönem için bütçe verisi yok
+      of_budget_used: bütçe kullanıldı
+      total_expenses: Toplam Gider
+      total_income: Toplam Gelir
+      vs_previous: önceki döneme göre
+    transactions_breakdown:
+      export:
+        csv: CSV
+        excel: Excel
+        google_sheets: Google E-Tablolar'da Aç
+        label: Dışa Aktar
+        pdf: PDF
+      filters:
+        account: Hesap
+        all_accounts: Tüm Hesaplar
+        all_categories: Tüm Kategoriler
+        all_tags: Tüm Etiketler
+        amount_max: Maksimum Tutar
+        amount_min: Minimum Tutar
+        apply: Filtreleri Uygula
+        category: Kategori
+        clear: Filtreleri Temizle
+        date_range: Tarih Aralığı
+        tag: Etiket
+        title: Filtreler
+      no_transactions: Seçilen dönem ve filtreler için etkinlik bulunamadı
+      pagination:
+        next: Sonraki
+        previous: Önceki
+        showing:
+          one: "%{count} kayıt gösteriliyor"
+          other: "%{count} kayıt gösteriliyor"
+      sort:
+        amount_asc: Tutar (Düşükten Yükseğe)
+        amount_desc: Tutar (Yüksekten Düşüğe)
+        date_desc: Tarih (En Yeni)
+        label: Sırala
+      table:
+        amount: Tutar
+        category: Kategori
+        entries:
+          one: "%{count} kayıt"
+          other: "%{count} kayıt"
+        expense: Giderler
+        income: Gelir
+        percentage: Toplamın %'si
+        type: Tür
+        uncategorized: Kategorisiz
+      title: Etkinlik Dökümü
+    trends:
+      avg_monthly_expenses: Ort. Aylık Gider
+      avg_monthly_income: Ort. Aylık Gelir
+      avg_monthly_savings: Ort. Aylık Tasarruf
+      avg_per_transaction: İşlem başına ort.
+      current: güncel
+      expenses: Giderler
+      income: Gelir
+      insight_higher_weekday: "Hafta içi işlem başına hafta sonundan %{percent}% daha
+        fazla harcıyorsunuz"
+      insight_higher_weekend: "Hafta sonu işlem başına hafta içinden %{percent}% daha
+        fazla harcıyorsunuz"
+      insight_similar: İşlem başına harcamanız hafta içi ve hafta sonu benzer
+      insight_title: İçgörü
+      month: Ay
+      monthly_breakdown: Aylık Döküm
+      net: Net
+      no_data: Kullanılabilir eğilim verisi yok
+      no_spending_data: Bu dönem için harcama verisi yok
+      savings_rate: Tasarruf Oranı
+      spending_patterns: Harcama Kalıpları
+      title: Eğilimler ve İçgörüler
+      total: Toplam
+      transactions: İşlemler
+      weekday_spending: Hafta İçi Harcama
+      weekend_spending: Hafta Sonu Harcama
diff --git a/config/locales/views/reports/zh-CN.yml b/config/locales/views/reports/zh-CN.yml
index 8fe8cf3cb..fdf9cde4c 100644
--- a/config/locales/views/reports/zh-CN.yml
+++ b/config/locales/views/reports/zh-CN.yml
@@ -142,6 +142,7 @@ zh-CN:
       title: 投资表现
       portfolio_value: 投资组合价值
       total_return: 总回报
+      period_return: 本期回报
       contributions: 本期投入
       withdrawals: 本期提取
       top_holdings: 主要持仓
@@ -232,6 +233,7 @@ zh-CN:
         weight: 占比
         value: 金额
         return: 回报
+        period_return: 本期回报
       spending:
         title: 按分类支出
         income: 收入
diff --git a/config/locales/views/rules/fr.yml b/config/locales/views/rules/fr.yml
index fac2d1c9d..7a756a1ab 100644
--- a/config/locales/views/rules/fr.yml
+++ b/config/locales/views/rules/fr.yml
@@ -1,52 +1,134 @@
 ---
 fr:
+  rule:
+    conditions:
+      condition_group:
+        add_condition: Ajouter une condition
+        all: tout
+        and_prefix: et
+        any: n'importe quel
+        match: correspondre
+        of_the_following_conditions: des conditions suivantes
   rules:
-    no_action: Aucune action
-    no_condition: Aucune condition
     actions:
       value_placeholder: Entrez une valeur
     apply_all:
-      button: Appliquer tout
-      confirm_title: Appliquer toutes les règles
-      confirm_message: Vous êtes sur le point d'appliquer %{count} règles affectant %{transactions} transactions uniques. Veuillez confirmer si vous souhaitez continuer.
-      confirm_button: Confirmer et appliquer tout
-      success: Toutes les règles ont été mises en file d'attente pour exécution
+      ai_cost_message: Cela utilisera l'IA pour catégoriser jusqu'à %{transactions}
+        transactions.
       ai_cost_title: Estimation du coût IA
-      ai_cost_message: Cela utilisera l'IA pour catégoriser jusqu'à %{transactions} transactions.
-      estimated_cost: "Coût estimé : ~%{cost} $"
+      button: Appliquer tout
+      confirm_button: Confirmer et appliquer tout
+      confirm_message: Vous êtes sur le point d'appliquer %{count} règles affectant
+        %{transactions} transactions uniques. Veuillez confirmer si vous souhaitez
+        continuer.
+      confirm_title: Appliquer toutes les règles
       cost_unavailable_model: Estimation du coût non disponible pour le modèle "%{model}".
-      cost_unavailable_no_provider: Estimation du coût non disponible (aucun fournisseur LLM configuré).
-      cost_warning: Vous pourriez encourir des frais, veuillez vérifier auprès du fournisseur du modèle pour les prix les plus récents.
+      cost_unavailable_no_provider: Estimation du coût non disponible (aucun fournisseur
+        LLM configuré).
+      cost_warning: Vous pourriez encourir des frais, veuillez vérifier auprès du
+        fournisseur du modèle pour les prix les plus récents.
+      estimated_cost: 'Coût estimé : ~%{cost} $'
+      success: Toutes les règles ont été mises en file d'attente pour exécution
       view_usage: Voir l'historique d'utilisation
+    clear_ai_cache:
+      button: Réinitialiser le cache IA
+      confirm_body: Êtes-vous sûr de vouloir réinitialiser le cache IA ? Cela permettra
+        aux règles IA de retraiter toutes les transactions. Cela pourrait engendrer
+        des coûts API supplémentaires.
+      confirm_button: Réinitialiser le cache
+      confirm_title: Réinitialiser le cache IA ?
+      success: Le cache IA est en cours de suppression. Cela peut prendre quelques
+        instants.
+    condition_filters:
+      transaction_type:
+        equal_to: Égal à
+        expense: Dépense
+        income: Revenu
+        transfer: Virement
+    confirm:
+      ai_cost_no_estimate_html: Cela utilisera l’IA pour catégoriser les transactions
+        %{count}.
+      ai_cost_title: Estimation des coûts de l'IA
+      ai_cost_with_estimate_html: 'Cela utilisera l’IA pour catégoriser les transactions
+        %{count}. Coût estimé : <span class="font-semibold">~$%{cost}</span>'
+      apply_notice_html: Vous êtes sur le point d'appliquer cette règle aux <span
+        class="text-primary font-medium">%{count} %{resource}</span> qui répondent
+        aux critères de règle spécifiés.  Veuillez confirmer si vous souhaitez procéder
+        à ce changement.
+      confirm_changes: Confirmer les modifications
+      cost_unavailable_model: L'estimation des coûts n'est pas disponible pour le
+        modèle "%{model}".
+      cost_unavailable_no_provider: Estimation des coûts non disponible (aucun fournisseur
+        LLM configuré).
+      cost_warning: Vous pouvez encourir des frais, veuillez vérifier auprès du fournisseur
+        de modèles pour connaître les prix les plus récents.
+      title: Confirmer les modifications
+      title_with_name: Confirmez les modifications apportées à "%{name}"
+      view_usage_history: Afficher l'historique d'utilisation
+    destroy:
+      success: Règle supprimée
+    destroy_all:
+      success: Toutes les règles supprimées
+    form:
+      add_action: Ajouter une action
+      add_condition: Ajouter une condition
+      add_condition_group: Ajouter un groupe de conditions
+      all_past_and_future: Tout le passé et le futur %{resource}
+      rule_name_label: Nom de la règle (facultatif)
+      rule_name_placeholder: Entrez un nom pour cette règle
+      starting_from: À partir de
+      then: ALORS
+    index:
+      ai_cost_warning: Les actions de règles basées sur l’IA coûteront de l’argent.  Assurez-vous
+        de filtrer le plus étroitement possible pour éviter des coûts inutiles.
+      delete_all_rules: Supprimer toutes les règles
+      new_rule: Nouvelle règle
+      no_rules_description: Configurez des règles pour effectuer des actions sur vos
+        transactions et autres données à chaque synchronisation de compte.
+      no_rules_title: Pas encore de règles
+      page_title: Règles
+      rules_heading: Règles
+      sort_by: 'Trier par :'
+      sort_name: Nom
+      sort_updated_at: Mis à jour à
+      toggle_sort_direction: Changer le sens du tri
+    no_action: Aucune action
+    no_condition: Aucune condition
     recent_runs:
-      title: Exécutions récentes
-      description: Consultez l'historique d'exécution de vos règles, y compris le statut de réussite/échec et le nombre de transactions.
-      unnamed_rule: Règle sans nom
       columns:
         date_time: Date/Heure
         execution_type: Type
-        status: Statut
         rule_name: Nom de la règle
+        status: Statut
         transactions_counts:
-          queued: En file d'attente
-          processed: Traitées
+          blocked: Bloqué
           modified: Modifiées
+          processed: Traitées
+          queued: En file d'attente
+      description: Consultez l'historique d'exécution de vos règles, y compris le
+        statut de réussite/échec et le nombre de transactions.
       execution_types:
         manual: Manuel
         scheduled: Planifié
       statuses:
+        failed: Échoué
         pending: En attente
         success: Réussi
-        failed: Échoué
-    clear_ai_cache:
-      button: Réinitialiser le cache IA
-      confirm_title: Réinitialiser le cache IA ?
-      confirm_body: Êtes-vous sûr de vouloir réinitialiser le cache IA ? Cela permettra aux règles IA de retraiter toutes les transactions. Cela pourrait engendrer des coûts API supplémentaires.
-      confirm_button: Réinitialiser le cache
-      success: Le cache IA est en cours de suppression. Cela peut prendre quelques instants.
-    condition_filters:
-      transaction_type:
-        income: Revenu
-        expense: Dépense
-        transfer: Virement
-        equal_to: Égal à
+      title: Exécutions récentes
+      unnamed_rule: Règle sans nom
+    rule:
+      action_label_to: "%{label} à %{value}"
+      all_past_and_future: Tout le passé et le futur %{resource}
+      and_more_actions:
+        one: et 1 action supplémentaire
+        other: et %{count} actions supplémentaires
+      and_more_conditions:
+        one: et 1 autre condition
+        other: et %{count} conditions supplémentaires
+      delete: Supprimer
+      edit: Modifier
+      on_or_after: "%{resource} le %{date} ou après"
+      re_apply_rule: Réappliquer la règle
+      then: ALORS
+    update:
+      success: Règle mise à jour
diff --git a/config/locales/views/rules/it.yml b/config/locales/views/rules/it.yml
new file mode 100644
index 000000000..90a23082d
--- /dev/null
+++ b/config/locales/views/rules/it.yml
@@ -0,0 +1,115 @@
+---
+it:
+  rules:
+    no_action: Nessuna azione
+    no_condition: Nessuna condizione
+    rule:
+      edit: Modifica
+      re_apply_rule: Riapplica regola
+      delete: Elimina
+      then: ALLORA
+      and_more_conditions:
+        one: e 1 altra condizione
+        other: e %{count} altre condizioni
+      and_more_actions:
+        one: e 1 altra azione
+        other: e %{count} altre azioni
+      action_label_to: "%{label} a %{value}"
+      all_past_and_future: Tutti i %{resource} passati e futuri
+      on_or_after: "%{resource} dal %{date} in poi"
+    form:
+      rule_name_label: Nome regola (opzionale)
+      rule_name_placeholder: Inserisci un nome per questa regola
+      add_condition: Aggiungi condizione
+      add_condition_group: Aggiungi gruppo di condizioni
+      add_action: Aggiungi azione
+      all_past_and_future: Tutti i %{resource} passati e futuri
+      starting_from: A partire da
+      then: ALLORA
+    index:
+      page_title: Regole
+      delete_all_rules: Elimina tutte le regole
+      new_rule: Nuova regola
+      ai_cost_warning: Le azioni delle regole con AI comporteranno dei costi. Filtra nel modo più specifico possibile per evitare costi inutili.
+      rules_heading: Regole
+      sort_by: "Ordina per:"
+      sort_name: Nome
+      sort_updated_at: Data aggiornamento
+      toggle_sort_direction: Cambia direzione ordinamento
+      no_rules_title: Nessuna regola ancora
+      no_rules_description: Configura regole per eseguire azioni sulle tue transazioni e altri dati ad ogni sincronizzazione del conto.
+    confirm:
+      title: Conferma modifiche
+      title_with_name: "Conferma modifiche a \"%{name}\""
+      apply_notice_html: "Stai per applicare questa regola a <span class=\"text-primary font-medium\">%{count} %{resource}</span> che soddisfano i criteri specificati. Conferma se desideri procedere con questa modifica."
+      ai_cost_title: Stima costo AI
+      ai_cost_with_estimate_html: "Verrà usata l'AI per categorizzare %{count} transazione/i. Costo stimato: <span class=\"font-semibold\">~$%{cost}</span>"
+      ai_cost_no_estimate_html: "Verrà usata l'AI per categorizzare %{count} transazione/i."
+      cost_unavailable_model: "Stima costo non disponibile per il modello \"%{model}\"."
+      cost_unavailable_no_provider: Stima costo non disponibile (nessun provider LLM configurato).
+      cost_warning: Potrebbero verificarsi dei costi, consulta il provider del modello per i prezzi più aggiornati.
+      view_usage_history: Vedi cronologia utilizzo
+      confirm_changes: Conferma modifiche
+    actions:
+      value_placeholder: Inserisci un valore
+    update:
+      success: Regola aggiornata
+    destroy:
+      success: Regola eliminata
+    destroy_all:
+      success: Tutte le regole eliminate
+    apply_all:
+      button: Applica tutte
+      confirm_title: Applica tutte le regole
+      confirm_message: Stai per applicare %{count} regole che influenzano %{transactions} transazioni uniche. Conferma se desideri procedere.
+      confirm_button: Conferma e applica tutte
+      success: Tutte le regole sono state messe in coda per l'esecuzione
+      ai_cost_title: Stima costo AI
+      ai_cost_message: Verrà usata l'AI per categorizzare fino a %{transactions} transazioni.
+      estimated_cost: "Costo stimato: ~$%{cost}"
+      cost_unavailable_model: Stima costo non disponibile per il modello "%{model}".
+      cost_unavailable_no_provider: Stima costo non disponibile (nessun provider LLM configurato).
+      cost_warning: Potrebbero verificarsi dei costi, consulta il provider del modello per i prezzi più aggiornati.
+      view_usage: Vedi cronologia utilizzo
+    recent_runs:
+      title: Esecuzioni recenti
+      description: Visualizza la cronologia di esecuzione delle tue regole incluso lo stato di successo/errore e i conteggi delle transazioni.
+      unnamed_rule: Regola senza nome
+      columns:
+        date_time: Data/Ora
+        execution_type: Tipo
+        status: Stato
+        rule_name: Nome regola
+        transactions_counts:
+          queued: In coda
+          processed: Elaborate
+          modified: Modificate
+          blocked: Bloccate
+      execution_types:
+        manual: Manuale
+        scheduled: Pianificata
+      statuses:
+        pending: In attesa
+        success: Successo
+        failed: Fallita
+    clear_ai_cache:
+      button: Reimposta cache AI
+      confirm_title: Reimpostare la cache AI?
+      confirm_body: Sei sicuro di voler reimpostare la cache AI? Questo permetterà alle regole AI di rielaborare tutte le transazioni. Potrebbero verificarsi costi API aggiuntivi.
+      confirm_button: Reimposta cache
+      success: La cache AI è in fase di svuotamento. Potrebbe richiedere alcuni istanti.
+    condition_filters:
+      transaction_type:
+        income: Entrata
+        expense: Spesa
+        transfer: Bonifico
+        equal_to: Uguale a
+  rule:
+    conditions:
+      condition_group:
+        and_prefix: e
+        match: corrispondono
+        all: tutte
+        any: almeno una
+        of_the_following_conditions: delle seguenti condizioni
+        add_condition: Aggiungi condizione
diff --git a/config/locales/views/rules/ru.yml b/config/locales/views/rules/ru.yml
new file mode 100644
index 000000000..14a99ee72
--- /dev/null
+++ b/config/locales/views/rules/ru.yml
@@ -0,0 +1,132 @@
+---
+ru:
+  rule:
+    conditions:
+      condition_group:
+        add_condition: Добавить условие
+        all: все
+        and_prefix: и
+        any: любые
+        match: совпадение
+        of_the_following_conditions: из следующих условий
+  rules:
+    actions:
+      value_placeholder: Введите значение
+    apply_all:
+      ai_cost_message: Это использует ИИ для категоризации до %{transactions} операций.
+      ai_cost_title: Оценка стоимости ИИ
+      button: Применить все
+      confirm_button: Подтвердить и применить все
+      confirm_message: Вы собираетесь применить %{count} правил, затрагивающих %{transactions}
+        уникальных операций. Пожалуйста, подтвердите, если хотите продолжить.
+      confirm_title: Применить все правила
+      cost_unavailable_model: Оценка стоимости недоступна для модели "%{model}".
+      cost_unavailable_no_provider: Оценка стоимости недоступна (поставщик LLM не
+        настроен).
+      cost_warning: Вы можете понести расходы, пожалуйста, уточните актуальные цены
+        у поставщика модели.
+      estimated_cost: 'Оценочная стоимость: ~$%{cost}'
+      success: Все правила поставлены в очередь на выполнение
+      view_usage: Просмотреть историю использования
+    clear_ai_cache:
+      button: Сбросить кэш ИИ
+      confirm_body: Вы уверены, что хотите сбросить кэш ИИ? Это позволит ИИ-правилам
+        повторно обработать все операции. Это может привести к дополнительным затратам
+        на API.
+      confirm_button: Сбросить кэш
+      confirm_title: Сбросить кэш ИИ?
+      success: Кэш ИИ очищается. Это может занять несколько минут.
+    condition_filters:
+      transaction_type:
+        equal_to: Равно
+        expense: Расход
+        income: Доход
+        transfer: Перевод
+    confirm:
+      ai_cost_no_estimate_html: Это использует ИИ для категоризации %{count} операций.
+      ai_cost_title: Оценка стоимости ИИ
+      ai_cost_with_estimate_html: 'Это использует ИИ для категоризации %{count} операций.
+        Оценочная стоимость: <span class="font-semibold">~$%{cost}</span>'
+      apply_notice_html: Вы собираетесь применить это правило к <span class="text-primary
+        font-medium">%{count} %{resource}</span>, которые соответствуют указанным
+        критериям правила. Пожалуйста, подтвердите, если хотите продолжить это изменение.
+      confirm_changes: Подтвердить изменения
+      cost_unavailable_model: Оценка стоимости недоступна для модели "%{model}".
+      cost_unavailable_no_provider: Оценка стоимости недоступна (поставщик LLM не
+        настроен).
+      cost_warning: Вы можете понести расходы, пожалуйста, уточните актуальные цены
+        у поставщика модели.
+      title: Подтвердите изменения
+      title_with_name: Подтвердите изменения для "%{name}"
+      view_usage_history: Просмотреть историю использования
+    destroy:
+      success: Правило удалено
+    destroy_all:
+      success: Все правила удалены
+    form:
+      add_action: Добавить действие
+      add_condition: Добавить условие
+      add_condition_group: Добавить группу условий
+      all_past_and_future: Все прошлые и будущие %{resource}
+      rule_name_label: Название правила (необязательно)
+      rule_name_placeholder: Введите название для этого правила
+      starting_from: Начиная с
+      then: ТОГДА
+    index:
+      ai_cost_warning: Действия с использованием ИИ будут стоить денег. Убедитесь,
+        что фильтры настроены как можно точнее, чтобы избежать ненужных затрат.
+      delete_all_rules: Удалить все правила
+      new_rule: Новое правило
+      no_rules_description: Настройте правила для выполнения действий с вашими операциями
+        и другими данными при каждой синхронизации счёта.
+      no_rules_title: Пока нет правил
+      page_title: Правила
+      rules_heading: Правила
+      sort_by: 'Сортировать по:'
+      sort_name: Имя
+      sort_updated_at: Обновлено
+      toggle_sort_direction: Изменить направление сортировки
+    no_action: Нет действия
+    no_condition: Нет условия
+    recent_runs:
+      columns:
+        date_time: Дата/Время
+        execution_type: Тип
+        rule_name: Название правила
+        status: Статус
+        transactions_counts:
+          blocked: Заблокировано
+          modified: Изменено
+          processed: Обработано
+          queued: В очереди
+      description: Просмотрите историю выполнения ваших правил, включая статус успеха/неудачи
+        и количество операций.
+      execution_types:
+        manual: Вручную
+        scheduled: Запланировано
+      statuses:
+        failed: Неудача
+        pending: В ожидании
+        success: Успешно
+      title: Недавние запуски
+      unnamed_rule: Безымянное правило
+    rule:
+      action_label_to: "%{label} к %{value}"
+      all_past_and_future: Все прошлые и будущие %{resource}
+      and_more_actions:
+        few: и ещё %{count} действия
+        many: и ещё %{count} действий
+        one: и ещё %{count} действие
+        other: и ещё %{count} действия
+      and_more_conditions:
+        few: и ещё %{count} условия
+        many: и ещё %{count} условий
+        one: и ещё 1 условие
+        other: и ещё %{count} условий
+      delete: Удалить
+      edit: Редактировать
+      on_or_after: "%{resource} на или после %{date}"
+      re_apply_rule: Применить правило повторно
+      then: ТОГДА
+    update:
+      success: Правило обновлено
diff --git a/config/locales/views/rules/tr.yml b/config/locales/views/rules/tr.yml
index b1418415e..ae22a80b9 100644
--- a/config/locales/views/rules/tr.yml
+++ b/config/locales/views/rules/tr.yml
@@ -1,25 +1,131 @@
 ---
 tr:
+  rule:
+    conditions:
+      condition_group:
+        add_condition: Koşul ekle
+        all: tümü
+        and_prefix: ve
+        any: herhangi biri
+        match: eşleşsin
+        of_the_following_conditions: aşağıdaki koşullardan
   rules:
+    actions:
+      value_placeholder: Bir değer girin
+    apply_all:
+      ai_cost_message: Bu işlem, %{transactions} adede kadar işlemi kategorize etmek
+        için yapay zeka kullanacak.
+      ai_cost_title: Yapay Zeka Maliyet Tahmini
+      button: Tümünü Uygula
+      confirm_button: Onayla ve Tümünü Uygula
+      confirm_message: "%{transactions} benzersiz işlemi etkileyen %{count} kuralı
+        uygulamak üzeresiniz. Devam etmek istediğinizi onaylayın."
+      confirm_title: Tüm Kuralları Uygula
+      cost_unavailable_model: '"%{model}" modeli için maliyet tahmini kullanılamıyor.'
+      cost_unavailable_no_provider: Maliyet tahmini kullanılamıyor (LLM sağlayıcısı
+        yapılandırılmamış).
+      cost_warning: Ek maliyetler oluşabilir, güncel fiyatlar için lütfen model sağlayıcısına
+        danışın.
+      estimated_cost: 'Tahmini maliyet: ~$%{cost}'
+      success: Tüm kurallar çalıştırılmak üzere sıraya alındı
+      view_usage: Kullanım geçmişini görüntüle
+    clear_ai_cache:
+      button: Yapay zeka önbelleğini sıfırla
+      confirm_body: Yapay zeka önbelleğini sıfırlamak istediğinizden emin misiniz?
+        Bu işlem, yapay zeka kurallarının tüm işlemleri yeniden işlemesine izin verecektir.
+        Bu, ek API maliyetlerine neden olabilir.
+      confirm_button: Önbelleği Sıfırla
+      confirm_title: Yapay zeka önbelleği sıfırlansın mı?
+      success: Yapay zeka önbelleği temizleniyor. Bu birkaç dakika sürebilir.
+    condition_filters:
+      transaction_type:
+        equal_to: Eşittir
+        expense: Gider
+        income: Gelir
+        transfer: Transfer
+    confirm:
+      ai_cost_no_estimate_html: Bu işlem, %{count} işlemi kategorize etmek için yapay
+        zeka kullanacak.
+      ai_cost_title: Yapay Zeka Maliyet Tahmini
+      ai_cost_with_estimate_html: 'Bu işlem, %{count} işlemi kategorize etmek için
+        yapay zeka kullanacak. Tahmini maliyet: <span class="font-semibold">~$%{cost}</span>'
+      apply_notice_html: Belirtilen kural kriterlerini karşılayan <span class="text-primary
+        font-medium">%{count} %{resource}</span> öğesine bu kuralı uygulamak üzeresiniz.
+        Bu değişiklikle devam etmek istediğinizi onaylayın.
+      confirm_changes: Değişiklikleri onayla
+      cost_unavailable_model: '"%{model}" modeli için maliyet tahmini kullanılamıyor.'
+      cost_unavailable_no_provider: Maliyet tahmini kullanılamıyor (LLM sağlayıcısı
+        yapılandırılmamış).
+      cost_warning: Ek maliyetler oluşabilir, güncel fiyatlar için lütfen model sağlayıcısına
+        danışın.
+      title: Değişiklikleri onayla
+      title_with_name: '"%{name}" için değişiklikleri onayla'
+      view_usage_history: Kullanım geçmişini görüntüle
+    destroy:
+      success: Kural silindi
+    destroy_all:
+      success: Tüm kurallar silindi
+    form:
+      add_action: Eylem ekle
+      add_condition: Koşul ekle
+      add_condition_group: Koşul grubu ekle
+      all_past_and_future: Geçmişteki ve gelecekteki tüm %{resource}
+      rule_name_label: Kural adı (isteğe bağlı)
+      rule_name_placeholder: Bu kural için bir ad girin
+      starting_from: Başlangıç
+      then: SONRA
+    index:
+      ai_cost_warning: Yapay zeka destekli kural eylemleri ücrete tabidir. Gereksiz
+        maliyetlerden kaçınmak için mümkün olduğunca dar bir filtreleme yaptığınızdan
+        emin olun.
+      delete_all_rules: Tüm kuralları sil
+      new_rule: Yeni kural
+      no_rules_description: Her hesap senkronizasyonunda işlemleriniz ve diğer verileriniz
+        üzerinde eylemler gerçekleştirmek için kurallar oluşturun.
+      no_rules_title: Henüz kural yok
+      page_title: Kurallar
+      rules_heading: Kurallar
+      sort_by: 'Sırala:'
+      sort_name: Ad
+      sort_updated_at: Güncellenme Tarihi
+      toggle_sort_direction: Sıralama yönünü değiştir
     no_action: İşlem yok
     no_condition: Koşul yok
     recent_runs:
-      title: Son Çalıştırmalar
-      description: Başarı/başarısızlık durumu ve işlem sayıları dahil olmak üzere kurallarınızın yürütme geçmişini görüntüleyin.
-      unnamed_rule: İsimsiz Kural
       columns:
         date_time: Tarih/Saat
         execution_type: Tür
-        status: Durum
         rule_name: Kural Adı
+        status: Durum
         transactions_counts:
-          queued: Kuyruğa Alındı
-          processed: İşlendi
+          blocked: Engellendi
           modified: Değiştirildi
+          processed: İşlendi
+          queued: Kuyruğa Alındı
+      description: Başarı/başarısızlık durumu ve işlem sayıları dahil olmak üzere
+        kurallarınızın yürütme geçmişini görüntüleyin.
       execution_types:
         manual: Manuel
         scheduled: Zamanlanmış
       statuses:
+        failed: Başarısız
         pending: Beklemede
         success: Başarılı
-        failed: Başarısız
+      title: Son Çalıştırmalar
+      unnamed_rule: İsimsiz Kural
+    rule:
+      action_label_to: "%{label} - %{value}"
+      all_past_and_future: Geçmişteki ve gelecekteki tüm %{resource}
+      and_more_actions:
+        one: ve 1 eylem daha
+        other: ve %{count} eylem daha
+      and_more_conditions:
+        one: ve 1 koşul daha
+        other: ve %{count} koşul daha
+      delete: Sil
+      edit: Düzenle
+      on_or_after: "%{date} tarihinde veya sonrasındaki %{resource}"
+      re_apply_rule: Kuralı yeniden uygula
+      then: SONRA
+    update:
+      success: Kural güncellendi
diff --git a/config/locales/views/securities/ca.yml b/config/locales/views/securities/ca.yml
index 629d44140..42416e8ff 100644
--- a/config/locales/views/securities/ca.yml
+++ b/config/locales/views/securities/ca.yml
@@ -7,6 +7,7 @@ ca:
     providers:
       alpha_vantage: Alpha Vantage
       binance_public: Binance
+      moex_public: MOEX
       eodhd: EODHD
       mfapi: MFAPI.in
       tiingo: Tiingo
diff --git a/config/locales/views/securities/de.yml b/config/locales/views/securities/de.yml
new file mode 100644
index 000000000..e1945f1c0
--- /dev/null
+++ b/config/locales/views/securities/de.yml
@@ -0,0 +1,15 @@
+---
+de:
+  securities:
+    combobox:
+      display: "%{symbol} - %{name} (%{exchange})"
+      exchange_label: "%{symbol} (%{exchange})"
+    providers:
+      twelve_data: Twelve Data
+      yahoo_finance: Yahoo Finance
+      tiingo: Tiingo
+      eodhd: EODHD
+      alpha_vantage: Alpha Vantage
+      mfapi: MFAPI.in
+      binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/en.yml b/config/locales/views/securities/en.yml
index c7243b28e..5ff0f5d6d 100644
--- a/config/locales/views/securities/en.yml
+++ b/config/locales/views/securities/en.yml
@@ -12,3 +12,4 @@ en:
       alpha_vantage: Alpha Vantage
       mfapi: MFAPI.in
       binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/fr.yml b/config/locales/views/securities/fr.yml
index f615a2f1c..0afe46d6f 100644
--- a/config/locales/views/securities/fr.yml
+++ b/config/locales/views/securities/fr.yml
@@ -5,6 +5,11 @@ fr:
       display: "%{symbol} - %{name} (%{exchange})"
       exchange_label: "%{symbol} (%{exchange})"
     providers:
+      alpha_vantage: Alpha Vantage
+      binance_public: Binance
+      eodhd: EODHD
+      mfapi: MFAPI.in
+      tiingo: Tiingo
       twelve_data: Twelve Data
       yahoo_finance: Yahoo Finance
       tiingo: Tiingo
@@ -12,3 +17,4 @@ fr:
       alpha_vantage: Alpha Vantage
       mfapi: MFAPI.in
       binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/hu.yml b/config/locales/views/securities/hu.yml
index 96098788f..688c4cce2 100644
--- a/config/locales/views/securities/hu.yml
+++ b/config/locales/views/securities/hu.yml
@@ -12,3 +12,4 @@ hu:
       alpha_vantage: Alpha Vantage
       mfapi: MFAPI.in
       binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/it.yml b/config/locales/views/securities/it.yml
new file mode 100644
index 000000000..cceb03dd8
--- /dev/null
+++ b/config/locales/views/securities/it.yml
@@ -0,0 +1,15 @@
+---
+it:
+  securities:
+    combobox:
+      display: "%{symbol} - %{name} (%{exchange})"
+      exchange_label: "%{symbol} (%{exchange})"
+    providers:
+      twelve_data: Twelve Data
+      yahoo_finance: Yahoo Finance
+      tiingo: Tiingo
+      eodhd: EODHD
+      alpha_vantage: Alpha Vantage
+      mfapi: MFAPI.in
+      binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/nl.yml b/config/locales/views/securities/nl.yml
new file mode 100644
index 000000000..206df2264
--- /dev/null
+++ b/config/locales/views/securities/nl.yml
@@ -0,0 +1,15 @@
+---
+nl:
+  securities:
+    combobox:
+      display: "%{symbol} - %{name} (%{exchange})"
+      exchange_label: "%{symbol} (%{exchange})"
+    providers:
+      twelve_data: Twelve Data
+      yahoo_finance: Yahoo Finance
+      tiingo: Tiingo
+      eodhd: EODHD
+      alpha_vantage: Alpha Vantage
+      mfapi: MFAPI.in
+      binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/pt-BR.yml b/config/locales/views/securities/pt-BR.yml
new file mode 100644
index 000000000..db1ac2098
--- /dev/null
+++ b/config/locales/views/securities/pt-BR.yml
@@ -0,0 +1,15 @@
+---
+pt-BR:
+  securities:
+    combobox:
+      display: "%{symbol} - %{name} (%{exchange})"
+      exchange_label: "%{symbol} (%{exchange})"
+    providers:
+      twelve_data: Twelve Data
+      yahoo_finance: Yahoo Finance
+      tiingo: Tiingo
+      eodhd: EODHD
+      alpha_vantage: Alpha Vantage
+      mfapi: MFAPI.in
+      binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/ru.yml b/config/locales/views/securities/ru.yml
new file mode 100644
index 000000000..b373efa5c
--- /dev/null
+++ b/config/locales/views/securities/ru.yml
@@ -0,0 +1,15 @@
+---
+ru:
+  securities:
+    combobox:
+      display: "%{symbol} - %{name} (%{exchange})"
+      exchange_label: "%{symbol} (%{exchange})"
+    providers:
+      alpha_vantage: Alpha Vantage
+      binance_public: Binance
+      eodhd: EODHD
+      mfapi: MFAPI.in
+      moex_public: MOEX
+      tiingo: Tiingo
+      twelve_data: Twelve Data
+      yahoo_finance: Yahoo Finance
diff --git a/config/locales/views/securities/tr.yml b/config/locales/views/securities/tr.yml
new file mode 100644
index 000000000..bede46436
--- /dev/null
+++ b/config/locales/views/securities/tr.yml
@@ -0,0 +1,15 @@
+---
+tr:
+  securities:
+    combobox:
+      display: "%{symbol} - %{name} (%{exchange})"
+      exchange_label: "%{symbol} (%{exchange})"
+    providers:
+      alpha_vantage: Alpha Vantage
+      binance_public: Binance
+      eodhd: EODHD
+      mfapi: MFAPI.in
+      moex_public: MOEX
+      tiingo: Tiingo
+      twelve_data: Twelve Data
+      yahoo_finance: Yahoo Finance
diff --git a/config/locales/views/securities/vi.yml b/config/locales/views/securities/vi.yml
index 5f15d5fac..2f3a045f9 100644
--- a/config/locales/views/securities/vi.yml
+++ b/config/locales/views/securities/vi.yml
@@ -12,3 +12,4 @@ vi:
       alpha_vantage: Alpha Vantage
       mfapi: MFAPI.in
       binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/securities/zh-CN.yml b/config/locales/views/securities/zh-CN.yml
index 0a42dadd8..e15f5c494 100644
--- a/config/locales/views/securities/zh-CN.yml
+++ b/config/locales/views/securities/zh-CN.yml
@@ -12,3 +12,4 @@ zh-CN:
       alpha_vantage: Alpha Vantage
       mfapi: MFAPI.in
       binance_public: Binance
+      moex_public: MOEX
diff --git a/config/locales/views/sessions/fr.yml b/config/locales/views/sessions/fr.yml
index 3f76019af..d312081b0 100644
--- a/config/locales/views/sessions/fr.yml
+++ b/config/locales/views/sessions/fr.yml
@@ -3,31 +3,39 @@ fr:
   sessions:
     create:
       invalid_credentials: Adresse e-mail ou mot de passe invalide.
-      local_login_disabled: La connexion locale par mot de passe est désactivée. Veuillez utiliser l'authentification unique.
+      local_login_disabled: La connexion locale par mot de passe est désactivée. Veuillez
+        utiliser l'authentification unique.
     destroy:
       logout_successful: Vous avez été déconnecté avec succès.
-    post_logout:
-      logout_successful: Vous avez été déconnecté avec succès.
-    openid_connect:
-      account_linked: "Compte lié avec succès à %{provider}"
-      failed: Impossible de s'authentifier via OpenID Connect.
     failure:
       failed: Impossible de s'authentifier.
-      sso_provider_unavailable: "Le fournisseur SSO est actuellement indisponible. Veuillez réessayer plus tard ou contacter un administrateur."
-      sso_invalid_response: "Réponse invalide reçue du fournisseur SSO. Veuillez réessayer."
-      sso_failed: "Échec de l'authentification unique. Veuillez réessayer."
+      sso_failed: Échec de l'authentification unique. Veuillez réessayer.
+      sso_invalid_response: Réponse invalide reçue du fournisseur SSO. Veuillez réessayer.
+      sso_provider_unavailable: Le fournisseur SSO est actuellement indisponible.
+        Veuillez réessayer plus tard ou contacter un administrateur.
+    mobile_sso_start:
+      redirecting_html: Redirection pour vous connecter... <a href="%{url}">Cliquez
+        ici</a> si vous n'êtes pas redirigé.
     new:
+      demo_banner_message: Ceci est un environnement de démonstration. Les identifiants
+        de connexion ont été pré-remplis par commodité. Veuillez ne pas saisir d'informations
+        réelles ou sensibles.
+      demo_banner_title: Mode démo activé
       email: Adresse e-mail
       email_placeholder: nom@exemple.fr
       forgot_password: Mot de passe oublié ?
-      password: Mot de passe
-      submit: Se connecter
-      title: Connectez-vous à votre compte
-      password_placeholder: Entrez votre mot de passe
-      openid_connect: Se connecter avec OpenID Connect
-      oidc: Se connecter avec OpenID Connect
       google_auth_connect: Se connecter avec Google
       local_login_admin_only: La connexion locale est réservée aux administrateurs.
-      no_auth_methods_enabled: Aucune méthode d'authentification n'est actuellement activée. Veuillez contacter un administrateur.
-      demo_banner_title: "Mode démo activé"
-      demo_banner_message: "Ceci est un environnement de démonstration. Les identifiants de connexion ont été pré-remplis par commodité. Veuillez ne pas saisir d'informations réelles ou sensibles."
+      no_auth_methods_enabled: Aucune méthode d'authentification n'est actuellement
+        activée. Veuillez contacter un administrateur.
+      oidc: Se connecter avec OpenID Connect
+      openid_connect: Se connecter avec OpenID Connect
+      password: Mot de passe
+      password_placeholder: Entrez votre mot de passe
+      submit: Se connecter
+      title: Connectez-vous à votre compte
+    openid_connect:
+      account_linked: Compte lié avec succès à %{provider}
+      failed: Impossible de s'authentifier via OpenID Connect.
+    post_logout:
+      logout_successful: Vous avez été déconnecté avec succès.
diff --git a/config/locales/views/sessions/it.yml b/config/locales/views/sessions/it.yml
new file mode 100644
index 000000000..3527c1903
--- /dev/null
+++ b/config/locales/views/sessions/it.yml
@@ -0,0 +1,35 @@
+---
+it:
+  sessions:
+    create:
+      invalid_credentials: Email o password non validi.
+      local_login_disabled: L'accesso con password locale è disabilitato. Utilizza il single sign-on.
+    destroy:
+      logout_successful: Hai effettuato la disconnessione con successo.
+    post_logout:
+      logout_successful: Hai effettuato la disconnessione con successo.
+    openid_connect:
+      account_linked: "Account collegato con successo a %{provider}"
+      failed: Impossibile autenticarsi tramite OpenID Connect.
+    failure:
+      failed: Impossibile autenticarsi.
+      sso_provider_unavailable: "Il provider SSO non è attualmente disponibile. Riprova più tardi o contatta un amministratore."
+      sso_invalid_response: "Risposta non valida ricevuta dal provider SSO. Riprova."
+      sso_failed: "Autenticazione single sign-on non riuscita. Riprova."
+    mobile_sso_start:
+      redirecting_html: "Reindirizzamento all'accesso... <a href=\"%{url}\">Clicca qui</a> se non vieni reindirizzato."
+    new:
+      email: Indirizzo email
+      email_placeholder: tu@esempio.com
+      forgot_password: Hai dimenticato la password?
+      password: Password
+      submit: Accedi
+      title: Sure
+      password_placeholder: Inserisci la tua password
+      openid_connect: Accedi con OpenID Connect
+      oidc: Accedi con OpenID Connect
+      google_auth_connect: Accedi con Google
+      local_login_admin_only: L'accesso locale è riservato agli amministratori.
+      no_auth_methods_enabled: Nessun metodo di autenticazione è attualmente abilitato. Contatta un amministratore.
+      demo_banner_title: "Modalità demo attiva"
+      demo_banner_message: "Questo è un ambiente dimostrativo. Le credenziali di accesso sono state precompilate per tua comodità. Non inserire informazioni reali o sensibili."
diff --git a/config/locales/views/sessions/ru.yml b/config/locales/views/sessions/ru.yml
new file mode 100644
index 000000000..e74cbb1b7
--- /dev/null
+++ b/config/locales/views/sessions/ru.yml
@@ -0,0 +1,43 @@
+---
+ru:
+  sessions:
+    create:
+      invalid_credentials: Неверный адрес электронной почты или пароль.
+      local_login_disabled: Локальная авторизация по паролю отключена. Пожалуйста,
+        используйте единый вход.
+    destroy:
+      logout_successful: Вы успешно вышли из системы.
+    failure:
+      failed: Не удалось аутентифицироваться.
+      sso_failed: Аутентификация через единый вход не удалась. Пожалуйста, попробуйте
+        снова.
+      sso_invalid_response: Получен некорректный ответ от поставщика единого входа.
+        Пожалуйста, попробуйте снова.
+      sso_provider_unavailable: Поставщик единого входа в данный момент недоступен.
+        Пожалуйста, попробуйте позже или свяжитесь с администратором.
+    mobile_sso_start:
+      redirecting_html: Перенаправление для входа... <a href="%{url}">Нажмите здесь</a>,
+        если перенаправление не произошло.
+    new:
+      demo_banner_message: Это демонстрационная среда. Данные для входа были предварительно
+        заполнены для вашего удобства. Пожалуйста, не вводите реальные или конфиденциальные
+        данные.
+      demo_banner_title: Демонстрационный режим активен
+      email: Адрес электронной почты
+      email_placeholder: you@example.com
+      forgot_password: Забыли пароль?
+      google_auth_connect: Войти через Google
+      local_login_admin_only: Локальная авторизация ограничена для администраторов.
+      no_auth_methods_enabled: В данный момент не включены методы аутентификации.
+        Пожалуйста, свяжитесь с администратором.
+      oidc: Войти через OpenID Connect
+      openid_connect: Войти через OpenID Connect
+      password: Пароль
+      password_placeholder: Введите ваш пароль
+      submit: Войти
+      title: Sure
+    openid_connect:
+      account_linked: Учётная запись успешно связана с %{provider}
+      failed: Не удалось аутентифицироваться через OpenID Connect.
+    post_logout:
+      logout_successful: Вы успешно вышли из системы.
diff --git a/config/locales/views/sessions/tr.yml b/config/locales/views/sessions/tr.yml
index f354dd02c..927e8b0cd 100644
--- a/config/locales/views/sessions/tr.yml
+++ b/config/locales/views/sessions/tr.yml
@@ -3,17 +3,40 @@ tr:
   sessions:
     create:
       invalid_credentials: Geçersiz e-posta veya şifre.
+      local_login_disabled: Yerel şifre girişi devre dışı. Lütfen tekli oturum açmayı
+        kullanın.
     destroy:
       logout_successful: Başarıyla çıkış yaptınız.
-    openid_connect:
-      failed: OpenID Connect ile kimlik doğrulaması yapılamadı.
+    failure:
+      failed: Kimlik doğrulanamadı.
+      sso_failed: Tekli oturum açma kimlik doğrulaması başarısız oldu. Lütfen tekrar
+        deneyin.
+      sso_invalid_response: SSO sağlayıcısından geçersiz bir yanıt alındı. Lütfen
+        tekrar deneyin.
+      sso_provider_unavailable: SSO sağlayıcısı şu anda kullanılamıyor. Lütfen daha
+        sonra tekrar deneyin veya bir yöneticiyle iletişime geçin.
+    mobile_sso_start:
+      redirecting_html: Girişe yönlendiriliyorsunuz... Yönlendirilmezseniz <a href="%{url}">buraya
+        tıklayın</a>.
     new:
+      demo_banner_message: Bu bir demo ortamıdır. Kolaylığınız için giriş bilgileri
+        önceden doldurulmuştur. Lütfen gerçek veya hassas bilgi girmeyin.
+      demo_banner_title: Demo Modu Aktif
       email: E-posta adresi
       email_placeholder: ornek@eposta.com
       forgot_password: Şifrenizi mi unuttunuz?
+      google_auth_connect: Google ile giriş yap
+      local_login_admin_only: Yerel giriş yalnızca yöneticilerle sınırlıdır.
+      no_auth_methods_enabled: Şu anda hiçbir kimlik doğrulama yöntemi etkin değil.
+        Lütfen bir yöneticiyle iletişime geçin.
+      oidc: OpenID Connect ile giriş yap
+      openid_connect: OpenID Connect ile giriş yap
       password: Şifre
+      password_placeholder: Şifrenizi girin
       submit: Giriş yap
       title: Hesabınıza giriş yapın
-      password_placeholder: Şifrenizi girin
-      openid_connect: OpenID Connect ile giriş yap
-      oidc: OpenID Connect ile giriş yap
+    openid_connect:
+      account_linked: Hesap %{provider} ile başarıyla bağlandı
+      failed: OpenID Connect ile kimlik doğrulaması yapılamadı.
+    post_logout:
+      logout_successful: Başarıyla çıkış yaptınız.
diff --git a/config/locales/views/settings/api_keys/en.yml b/config/locales/views/settings/api_keys/en.yml
index ebc072b88..c9fd6eba5 100644
--- a/config/locales/views/settings/api_keys/en.yml
+++ b/config/locales/views/settings/api_keys/en.yml
@@ -5,32 +5,29 @@ en:
       success: "Your API key has been created successfully"
       revoked_successfully: "API key has been revoked successfully"
       revoke_failed: "Failed to revoke API key"
-      scope_descriptions:
-        read_accounts: "View Accounts"
-        read_transactions: "View Transactions"
-        read_balances: "View Balances"
-        write_transactions: "Create Transactions"
     api_keys:
       create:
         success: "Your API key has been created successfully"
       destroy:
-        not_found: "API key not found"
-        cannot_revoke: "This API key cannot be revoked"
         revoked_successfully: "API key has been revoked successfully"
         revoke_failed: "Failed to revoke API key"
+      shared:
+        active: "Active"
+        created_ago: "Created %{time} ago"
+        last_used_ago: "Last used %{time} ago"
+        never_used: "Never used"
+        scope_read_only: "Read Only"
+        scope_read_write: "Read/Write"
+      index:
+        title: "API Keys"
+        subtitle: "Manage API keys for programmatic access to your data."
+        new_key: "New API Key"
+        empty_heading: "No API keys yet"
+        empty_description: "Create an API key to access your data programmatically."
+        revoke_key: "Revoke"
+        revoke_confirmation: "Are you sure you want to revoke \"%{name}\"? This will immediately disable any application using this key."
       show:
         title: "API Key Management"
-        no_api_key:
-          title: "API Key"
-          heading: "Access your account data programmatically"
-          description: "Get programmatic access to your Sure data with a secure API key."
-          what_you_can_do: "What you can do with the API:"
-          feature_1: "Access your account data programmatically"
-          feature_2: "Build custom integrations and applications"
-          feature_3: "Automate data retrieval and analysis"
-          security_note_title: "Security First"
-          security_note: "Your API key will have restricted permissions based on the scopes you select. You can only have one active API key at a time."
-          create_api_key: "Create API Key"
         newly_created:
           page_title: "API Key Created Successfully"
           heading: "API Key Created Successfully!"
@@ -42,25 +39,12 @@ en:
           continue: "Continue to API Key Settings"
         current_api_key:
           title: "Your API Key"
-          description: "Your active API key is ready to use. Keep it secure and never share it publicly."
-          active: "Active"
-          key_name: "Name"
-          created_at: "Created"
-          created_ago: "Created %{time} ago"
-          last_used: "Last Used"
-          last_used_ago: "Last used %{time} ago"
-          expires: "Expires"
-          ago: "ago"
-          never_used: "Never used"
-          never_expires: "Never expires"
           permissions: "Permissions"
-          scope_read_only: "Read Only"
-          scope_read_write: "Read/Write"
           copy_api_key: "Copy API Key"
           copy_store_securely: "Copy and store this key securely. You'll need it to authenticate your API requests."
           usage_instructions_title: "How to use your API key"
           usage_instructions: "Include your API key in the X-Api-Key header when making requests to the %{product_name} API:"
-          regenerate_key: "Create New Key"
+          back_to_keys: "Back to API Keys"
           revoke_key: "Revoke Key"
           revoke_confirmation: "Are you sure you want to revoke this API key? This action cannot be undone and will immediately disable all applications using this key."
       new:
@@ -88,28 +72,4 @@ en:
         security_warning: "Your API key will be shown only once after creation. Store it securely and never share it publicly. If you lose it, you'll need to create a new one."
         create_key: "Create API Key"
         cancel: "Cancel"
-        save_api_key: "Save API Key"
-      created:
-        page_title: "API Key Created"
-        title: "API Key Created"
-        success_title: "API Key Created Successfully"
-        success_description: "Your new API key has been generated successfully."
-        key_ready: "Your new API key \"%{name}\" has been created and is ready to use."
-        your_api_key: "Your API Key"
-        copy_store_securely: "Copy and store this key securely. You'll need it to authenticate your API requests."
-        key_details_title: "Key Details"
-        key_name_label: "Name:"
-        permissions_label: "Permissions:"
-        created_label: "Created:"
-        security_note_title: "Important Security Note"
-        security_note_body: "This is the only time your API key will be displayed. Make sure to copy it now and store it securely. If you lose this key, you'll need to generate a new one."
-        usage_instructions_title: "How to use your API key"
-        key_name: "Name"
-        permissions: "Permissions"
-        critical_warning_title: "Critical: Save Your API Key Now"
-        critical_warning_1: "This is the only time you'll see your API key in plain text."
-        critical_warning_2: "Copy and store it securely in your password manager or application."
-        critical_warning_3: "If you lose this key, you'll need to create a new one."
-        usage_instructions: "Use your API key by including it in the X-Api-Key header:"
-        copy_key: "Copy API Key"
-        continue: "Continue to API Key Settings"
\ No newline at end of file
+        save_api_key: "Save API Key"
\ No newline at end of file
diff --git a/config/locales/views/settings/api_keys/fr.yml b/config/locales/views/settings/api_keys/fr.yml
index 9851ab654..205672a18 100644
--- a/config/locales/views/settings/api_keys/fr.yml
+++ b/config/locales/views/settings/api_keys/fr.yml
@@ -1,76 +1,132 @@
 ---
 fr:
   settings:
-    api_keys_controller:
-      success: "Votre clé API a été créée avec succès."
-      revoked_successfully: "La clé API a été révoquée avec succès."
-      revoke_failed: "Échec de la révocation de la clé API."
-      scope_descriptions:
-        read_accounts: "Afficher les comptes"
-        read_transactions: "Afficher les transactions"
-        read_balances: "Afficher les soldes"
-        write_transactions: "Créer des transactions"
     api_keys:
-      show:
-        title: "Gestion des clés API"
-        no_api_key:
-          title: "Clé API"
-          heading: "Accédez à vos données de compte par programmation"
-          description: "Accédez de manière programmée à vos données Sure avec une clé API sécurisée."
-          what_you_can_do: "Ce que vous pouvez faire avec l'API :"
-          feature_1: "Accéder à vos données de compte de manière automatisée"
-          feature_2: "Construire des intégrations et applications personnalisées"
-          feature_3: "Automatiser la récupération et l'analyse des données"
-          security_note_title: "Sécurité avant tout"
-          security_note: "Votre clé API aura des autorisations limitées en fonction des domaines que vous sélectionnez. Vous ne pouvez avoir qu'une seule clé API active à la fois."
-          create_api_key: "Créer une clé API"
-        current_api_key:
-          title: "Votre Clé API"
-          description: "Votre clé API active est prête à être utilisée. Gardez-la en sécurité et ne la partagez jamais publiquement."
-          active: "Active"
-          key_name: "Nom"
-          created_at: "Créée le"
-          last_used: "Dernière utilisation"
-          expires: "Expire le"
-          ago: "il y a"
-          never_used: "Jamais utilisée"
-          never_expires: "N'expire jamais"
-          permissions: "Autorisations"
-          usage_instructions_title: "Comment utiliser votre clé API"
-          usage_instructions: "Incluez votre clé API dans l'en-tête X-Api-Key lors des requêtes à l'API %{product_name} :"
-          regenerate_key: "Créer une nouvelle clé"
-          revoke_key: "Révoquer la clé"
-          revoke_confirmation: "Êtes-vous sûr(e) de vouloir révoquer cette clé API ? Cette action ne peut pas être annulée et désactivera immédiatement toutes les applications utilisant cette clé."
-      new:
-        title: "Créer une clé API"
-        create_new_key: "Créer une nouvelle clé API"
-        description: "Configurez votre nouvelle clé API avec un nom descriptif et des autorisations appropriées."
-        name_label: "Nom de la clé API"
-        name_placeholder: "ex., Application de production, Tableau de bord analytique"
-        name_help: "Choisissez un nom descriptif pour vous aider à identifier l'objectif de cette clé."
-        permissions_label: "Autorisations"
-        permissions_help: "Sélectionnez les autorisations nécessaires pour votre clé API. Vous pouvez toujours créer une nouvelle clé avec des autorisations différentes."
-        scope_details:
-          read_accounts: "Afficher les informations du compte, les soldes et les données au niveau du compte"
-          read_transactions: "Afficher les données de transaction, les catégories et les détails des transactions"
-          read_balances: "Afficher les données historiques des soldes et les tendances des valeurs des comptes"
-          write_transactions: "Créer et mettre à jour des enregistrements de transaction (prochainement disponible)"
-        security_warning_title: "Avertissement important de sécurité"
-        security_warning: "Votre clé API sera affichée uniquement une fois après sa création. Gardez-la en sécurité et ne la partagez jamais publiquement. Si vous l'avez perdue, vous devrez en créer une nouvelle."
-        create_key: "Créer une clé API"
-        cancel: "Annuler"
+      create:
+        success: Votre clé API a été créée avec succès
       created:
-        title: "Clé API créée"
-        success_title: "Clé API créée avec succès"
-        success_description: "Votre nouvelle clé API est prête à être utilisée. Assurez-vous de la copier maintenant, car vous ne pourrez plus l'afficher par la suite."
-        your_api_key: "Votre clé API"
-        key_name: "Nom"
-        permissions: "Autorisations"
+        continue: Continuer vers les paramètres de la clé API
+        copy_key: Copier la clé API
+        copy_store_securely: Copiez et conservez cette clé en toute sécurité. Vous en aurez besoin pour authentifier vos requêtes API.
+        created_label: 'Créé :'
+        critical_warning_1: C'est le seul moment où vous verrez votre clé API en clair.
+        critical_warning_2: Copiez-la et stockez-la de manière sécurisée dans votre gestionnaire de mots de passe ou dans l'application.
+        critical_warning_3: Si vous l'avez perdue, vous devrez en créer une nouvelle.
         critical_warning_title: "⚠️ Critique : Sauvegardez votre clé API maintenant"
-        critical_warning_1: "C'est le seul moment où vous verrez votre clé API en clair."
-        critical_warning_2: "Copiez-la et stockez-la de manière sécurisée dans votre gestionnaire de mots de passe ou dans l'application."
-        critical_warning_3: "Si vous l'avez perdue, vous devrez en créer une nouvelle."
-        usage_instructions_title: "Démarrage rapide"
-        usage_instructions: "Utilisez votre clé API en l'incluant dans l'en-tête X-Api-Key :"
-        copy_key: "Copier la clé API"
-        continue: "Continuer vers les paramètres de la clé API"
+        key_details_title: Détails clés
+        key_name: Nom
+        key_name_label: 'Nom :'
+        key_ready: Votre nouvelle clé API "%{name}" a été créée et est prête à être utilisée.
+        page_title: Clé API créée
+        permissions: Autorisations
+        permissions_label: 'Autorisations :'
+        security_note_body: C'est la seule fois où votre clé API sera affichée. Assurez-vous de le copier maintenant et de le stocker en toute sécurité. Si vous perdez cette clé, vous devrez en générer une nouvelle.
+        security_note_title: Note de sécurité importante
+        success_description: Votre nouvelle clé API est prête à être utilisée. Assurez-vous de la copier maintenant, car vous ne pourrez plus l'afficher par la suite.
+        success_title: Clé API créée avec succès
+        title: Clé API créée
+        usage_instructions: 'Utilisez votre clé API en l''incluant dans l''en-tête X-Api-Key :'
+        usage_instructions_title: Démarrage rapide
+        your_api_key: Votre clé API
+      destroy:
+        cannot_revoke: Cette clé API ne peut pas être révoquée
+        not_found: Clé API introuvable
+        revoke_failed: Échec de la révocation de la clé API
+        revoked_successfully: La clé API a été révoquée avec succès
+      index:
+        empty_description: Créez une clé API pour accéder à vos données par programmation.
+        empty_heading: Aucune clé API pour l'instant
+        new_key: Nouvelle clé API
+        revoke_confirmation: Voulez-vous vraiment révoquer "%{name}" ? Cela désactivera immédiatement toute application utilisant cette clé.
+        revoke_key: Révoquer
+        subtitle: Gérez les clés API pour l'accès programmatique à vos données.
+        title: Clés API
+      new:
+        cancel: Annuler
+        create_key: Créer une clé API
+        create_new_api_key: Créer une nouvelle clé API
+        create_new_key: Créer une nouvelle clé API
+        description: Configurez votre nouvelle clé API avec un nom descriptif et des autorisations appropriées.
+        name_help: Choisissez un nom descriptif pour vous aider à identifier l'objectif de cette clé.
+        name_help_text: Choisissez un nom descriptif pour vous aider à identifier cette clé ultérieurement.
+        name_label: Nom de la clé API
+        name_placeholder: ex., Application de production, Tableau de bord analytique
+        permissions_help: Sélectionnez les autorisations nécessaires pour votre clé API. Vous pouvez toujours créer une nouvelle clé avec des autorisations différentes.
+        permissions_label: Autorisations
+        save_api_key: Enregistrer la clé API
+        scope_details:
+          read_accounts: Afficher les informations du compte, les soldes et les données au niveau du compte
+          read_balances: Afficher les données historiques des soldes et les tendances des valeurs des comptes
+          read_transactions: Afficher les données de transaction, les catégories et les détails des transactions
+          write_transactions: Créer et mettre à jour des enregistrements de transaction (prochainement disponible)
+        scope_read_only: Lecture seule
+        scope_read_only_description: Consultez vos comptes, transactions et soldes
+        scope_read_write: Lire/écrire
+        scope_read_write_description: Consultez vos données et créez de nouvelles transactions
+        security_warning: Votre clé API sera affichée uniquement une fois après sa création. Gardez-la en sécurité et ne la partagez jamais publiquement. Si vous l'avez perdue, vous devrez en créer une nouvelle.
+        security_warning_body: Votre clé API ne sera affichée qu'une seule fois après sa création. Assurez-vous de le copier et de le stocker en toute sécurité. Toute personne ayant accès à cette clé peut accéder à vos données selon les autorisations que vous sélectionnez.
+        security_warning_title: Avertissement important de sécurité
+        subtitle: Générez une nouvelle clé API pour accéder à vos données Sure par programmation.
+        title: Créer une clé API
+      shared:
+        active: Actif
+        created_ago: Créé il y a %{time}
+        last_used_ago: Utilisé il y a %{time}
+        never_used: Jamais utilisé
+        scope_read_only: Lecture seule
+        scope_read_write: Lecture/Écriture
+      show:
+        current_api_key:
+          active: Active
+          ago: il y a
+          back_to_keys: Retour aux clés API
+          copy_api_key: Copier la clé API
+          copy_store_securely: Copiez et conservez cette clé en toute sécurité. Vous en aurez besoin pour authentifier vos requêtes API.
+          created_ago: Créé il y a %{time}
+          created_at: Créée le
+          description: Votre clé API active est prête à être utilisée. Gardez-la en sécurité et ne la partagez jamais publiquement.
+          expires: Expire le
+          key_name: Nom
+          last_used: Dernière utilisation
+          last_used_ago: Dernière utilisation il y a %{time}
+          never_expires: N'expire jamais
+          never_used: Jamais utilisée
+          permissions: Autorisations
+          regenerate_key: Créer une nouvelle clé
+          revoke_confirmation: Êtes-vous sûr(e) de vouloir révoquer cette clé API ? Cette action ne peut pas être annulée et désactivera immédiatement toutes les applications utilisant cette clé.
+          revoke_key: Révoquer la clé
+          scope_read_only: Lecture seule
+          scope_read_write: Lire/écrire
+          title: Votre Clé API
+          usage_instructions: 'Incluez votre clé API dans l''en-tête X-Api-Key lors des requêtes à l''API %{product_name} :'
+          usage_instructions_title: Comment utiliser votre clé API
+        newly_created:
+          continue: Continuer vers les paramètres de la clé API
+          copy_api_key: Copier la clé API
+          copy_store_securely: Copiez et conservez cette clé en toute sécurité. Vous en aurez besoin pour authentifier vos requêtes API.
+          heading: Clé API créée avec succès !
+          how_to_use: Comment utiliser votre clé API
+          key_ready: Votre nouvelle clé API "%{name}" a été créée et est prête à être utilisée.
+          page_title: Clé API créée avec succès
+          your_api_key: Votre clé API
+        no_api_key:
+          create_api_key: Créer une clé API
+          description: Accédez de manière programmée à vos données Sure avec une clé API sécurisée.
+          feature_1: Accéder à vos données de compte de manière automatisée
+          feature_2: Construire des intégrations et applications personnalisées
+          feature_3: Automatiser la récupération et l'analyse des données
+          heading: Accédez à vos données de compte par programmation
+          security_note: Votre clé API aura des autorisations limitées en fonction des domaines que vous sélectionnez. Vous ne pouvez avoir qu'une seule clé API active à la fois.
+          security_note_title: Sécurité avant tout
+          title: Clé API
+          what_you_can_do: 'Ce que vous pouvez faire avec l''API :'
+        title: Gestion des clés API
+    api_keys_controller:
+      revoke_failed: Échec de la révocation de la clé API.
+      revoked_successfully: La clé API a été révoquée avec succès.
+      scope_descriptions:
+        read_accounts: Afficher les comptes
+        read_balances: Afficher les soldes
+        read_transactions: Afficher les transactions
+        write_transactions: Créer des transactions
+      success: Votre clé API a été créée avec succès.
diff --git a/config/locales/views/settings/api_keys/it.yml b/config/locales/views/settings/api_keys/it.yml
new file mode 100644
index 000000000..8a31a622f
--- /dev/null
+++ b/config/locales/views/settings/api_keys/it.yml
@@ -0,0 +1,131 @@
+---
+it:
+  settings:
+    api_keys_controller:
+      success: "La tua chiave API è stata creata con successo"
+      revoked_successfully: "Chiave API revocata con successo"
+      revoke_failed: "Revoca chiave API fallita"
+      scope_descriptions:
+        read_accounts: "Visualizza conti"
+        read_transactions: "Visualizza transazioni"
+        read_balances: "Visualizza saldi"
+        write_transactions: "Crea transazioni"
+    api_keys:
+      create:
+        success: "La tua chiave API è stata creata con successo"
+      destroy:
+        not_found: "Chiave API non trovata"
+        cannot_revoke: "Questa chiave API non può essere revocata"
+        revoked_successfully: "Chiave API revocata con successo"
+        revoke_failed: "Revoca chiave API fallita"
+      shared:
+        active: "Attiva"
+        created_ago: "Creata %{time} fa"
+        last_used_ago: "Usata l'ultima volta %{time} fa"
+        never_used: "Mai utilizzata"
+        scope_read_only: "Solo lettura"
+        scope_read_write: "Lettura/Scrittura"
+      index:
+        title: "Chiavi API"
+        subtitle: "Gestisci le chiavi API per l'accesso programmatico ai tuoi dati."
+        new_key: "Nuova chiave API"
+        empty_heading: "Nessuna chiave API ancora"
+        empty_description: "Crea una chiave API per accedere ai tuoi dati in modo programmatico."
+        revoke_key: "Revoca"
+        revoke_confirmation: "Sei sicuro di voler revocare \"%{name}\"? Questa azione disabiliterà immediatamente tutte le applicazioni che usano questa chiave."
+      show:
+        title: "Gestione chiavi API"
+        no_api_key:
+          title: "Chiave API"
+          heading: "Accedi ai dati del tuo account in modo programmatico"
+          description: "Ottieni accesso programmatico ai tuoi dati Sure con una chiave API sicura."
+          what_you_can_do: "Cosa puoi fare con l'API:"
+          feature_1: "Accedi ai dati del tuo account in modo programmatico"
+          feature_2: "Crea integrazioni e applicazioni personalizzate"
+          feature_3: "Automatizza il recupero e l'analisi dei dati"
+          security_note_title: "Prima la sicurezza"
+          security_note: "La tua chiave API avrà permessi limitati in base agli scope che selezioni. Puoi avere solo una chiave API attiva alla volta."
+          create_api_key: "Crea chiave API"
+        newly_created:
+          page_title: "Chiave API creata con successo"
+          heading: "Chiave API creata con successo!"
+          key_ready: "La tua nuova chiave API \"%{name}\" è stata creata ed è pronta all'uso."
+          your_api_key: "La tua chiave API"
+          copy_store_securely: "Copia e conserva questa chiave in modo sicuro. Ne avrai bisogno per autenticare le richieste API."
+          copy_api_key: "Copia chiave API"
+          how_to_use: "Come usare la tua chiave API"
+          continue: "Vai alle impostazioni chiave API"
+        current_api_key:
+          title: "La tua chiave API"
+          description: "La tua chiave API attiva è pronta all'uso. Tienila al sicuro e non condividerla mai pubblicamente."
+          active: "Attiva"
+          key_name: "Nome"
+          created_at: "Creata"
+          created_ago: "Creata %{time} fa"
+          last_used: "Ultimo utilizzo"
+          last_used_ago: "Usata l'ultima volta %{time} fa"
+          expires: "Scade"
+          ago: "fa"
+          never_used: "Mai utilizzata"
+          never_expires: "Non scade mai"
+          permissions: "Permessi"
+          scope_read_only: "Solo lettura"
+          scope_read_write: "Lettura/Scrittura"
+          copy_api_key: "Copia chiave API"
+          copy_store_securely: "Copia e conserva questa chiave in modo sicuro. Ne avrai bisogno per autenticare le richieste API."
+          usage_instructions_title: "Come usare la tua chiave API"
+          usage_instructions: "Includi la tua chiave API nell'intestazione X-Api-Key quando fai richieste all'API di %{product_name}:"
+          regenerate_key: "Crea nuova chiave"
+          back_to_keys: "Torna alle chiavi API"
+          revoke_key: "Revoca chiave"
+          revoke_confirmation: "Sei sicuro di voler revocare questa chiave API? Questa azione non può essere annullata e disabiliterà immediatamente tutte le applicazioni che usano questa chiave."
+      new:
+        title: "Crea chiave API"
+        create_new_api_key: "Crea nuova chiave API"
+        subtitle: "Genera una nuova chiave API per accedere ai tuoi dati Sure in modo programmatico."
+        description: "Configura la tua nuova chiave API con un nome descrittivo e i permessi appropriati."
+        name_label: "Nome chiave API"
+        name_placeholder: "es., La mia app budget, Tracker portafoglio"
+        name_help_text: "Scegli un nome descrittivo per identificare questa chiave in seguito."
+        name_help: "Scegli un nome descrittivo per identificare lo scopo di questa chiave."
+        permissions_label: "Permessi"
+        permissions_help: "Seleziona i permessi che questa chiave API deve avere:"
+        scope_read_only: "Solo lettura"
+        scope_read_only_description: "Visualizza conti, transazioni e saldi"
+        scope_read_write: "Lettura/Scrittura"
+        scope_read_write_description: "Visualizza i dati e crea nuove transazioni"
+        scope_details:
+          read_accounts: "Visualizza informazioni conto, saldi e dati a livello di conto"
+          read_transactions: "Visualizza dati transazioni, categorie e dettagli transazioni"
+          read_balances: "Visualizza dati saldo storici e tendenze valore conto"
+          write_transactions: "Crea e aggiorna registrazioni transazioni (prossimamente)"
+        security_warning_title: "Avviso di sicurezza"
+        security_warning_body: "La tua chiave API verrà mostrata solo una volta dopo la creazione. Assicurati di copiarla e conservarla in modo sicuro. Chiunque abbia accesso a questa chiave può accedere ai tuoi dati in base ai permessi che selezioni."
+        security_warning: "La tua chiave API verrà mostrata solo una volta dopo la creazione. Conservala in modo sicuro e non condividerla mai pubblicamente. Se la perdi, dovrai crearne una nuova."
+        create_key: "Crea chiave API"
+        cancel: "Annulla"
+        save_api_key: "Salva chiave API"
+      created:
+        page_title: "Chiave API creata"
+        title: "Chiave API creata"
+        success_title: "Chiave API creata con successo"
+        success_description: "La tua nuova chiave API è stata generata con successo."
+        key_ready: "La tua nuova chiave API \"%{name}\" è stata creata ed è pronta all'uso."
+        your_api_key: "La tua chiave API"
+        copy_store_securely: "Copia e conserva questa chiave in modo sicuro. Ne avrai bisogno per autenticare le richieste API."
+        key_details_title: "Dettagli chiave"
+        key_name_label: "Nome:"
+        permissions_label: "Permessi:"
+        created_label: "Creata:"
+        security_note_title: "Nota di sicurezza importante"
+        security_note_body: "Questa è l'unica volta in cui la tua chiave API verrà visualizzata. Assicurati di copiarla ora e di conservarla in modo sicuro. Se perdi questa chiave, dovrai generarne una nuova."
+        usage_instructions_title: "Come usare la tua chiave API"
+        key_name: "Nome"
+        permissions: "Permessi"
+        critical_warning_title: "Critico: salva subito la tua chiave API"
+        critical_warning_1: "Questa è l'unica volta in cui vedrai la tua chiave API in chiaro."
+        critical_warning_2: "Copiala e conservala in modo sicuro nel tuo gestore password o applicazione."
+        critical_warning_3: "Se perdi questa chiave, dovrai crearne una nuova."
+        usage_instructions: "Usa la tua chiave API includendola nell'intestazione X-Api-Key:"
+        copy_key: "Copia chiave API"
+        continue: "Vai alle impostazioni chiave API"
diff --git a/config/locales/views/settings/api_keys/ru.yml b/config/locales/views/settings/api_keys/ru.yml
new file mode 100644
index 000000000..31cd2ae2b
--- /dev/null
+++ b/config/locales/views/settings/api_keys/ru.yml
@@ -0,0 +1,157 @@
+---
+ru:
+  settings:
+    api_keys:
+      create:
+        success: Ваш API-ключ успешно создан
+      created:
+        continue: Перейти к настройкам API-ключа
+        copy_key: Скопировать API-ключ
+        copy_store_securely: Скопируйте и храните этот ключ в безопасности. Он понадобится
+          вам для аутентификации ваших API-запросов.
+        created_label: 'Создан:'
+        critical_warning_1: Это единственный раз, когда вы увидите ваш API-ключ в
+          открытом виде.
+        critical_warning_2: Скопируйте и храните его в безопасности в вашем менеджере
+          паролей или приложении.
+        critical_warning_3: Если вы потеряете этот ключ, вам нужно будет создать новый.
+        critical_warning_title: 'Критично: сохраните ваш API-ключ сейчас'
+        key_details_title: Детали ключа
+        key_name: Имя
+        key_name_label: 'Имя:'
+        key_ready: Ваш новый API-ключ "%{name}" создан и готов к использованию.
+        page_title: API-ключ создан
+        permissions: Разрешения
+        permissions_label: 'Разрешения:'
+        security_note_body: Это единственный раз, когда ваш API-ключ будет показан.
+          Убедитесь, что вы скопировали его сейчас и сохранили в безопасности. Если
+          вы потеряете этот ключ, вам нужно будет создать новый.
+        security_note_title: Важное замечание о безопасности
+        success_description: Ваш новый API-ключ успешно создан.
+        success_title: API-ключ успешно создан
+        title: API-ключ создан
+        usage_instructions: 'Используйте ваш API-ключ, включая его в заголовок X-Api-Key:'
+        usage_instructions_title: Как использовать ваш API-ключ
+        your_api_key: Ваш API-ключ
+      destroy:
+        cannot_revoke: Этот API-ключ не может быть отозван
+        not_found: API-ключ не найден
+        revoke_failed: Не удалось отозвать API-ключ
+        revoked_successfully: API-ключ успешно отозван
+      index:
+        empty_description: Создайте API-ключ для программного доступа к вашим данным.
+        empty_heading: Пока нет API-ключей
+        new_key: Новый API-ключ
+        revoke_confirmation: Вы уверены, что хотите отозвать %{name}? Это сразу отключит 
+          все приложения, использующие этот ключ.
+        revoke_key: Отозвать
+        subtitle: Управляйте API-ключами для программного доступа к данным.
+        title: API-ключи        
+      new:
+        cancel: Отмена
+        create_key: Создать API-ключ
+        create_new_api_key: Создать новый API-ключ
+        description: Настройте ваш новый API-ключ с описательным именем и соответствующими
+          разрешениями.
+        name_help: Выберите описательное имя, чтобы помочь вам определить назначение
+          этого ключа.
+        name_help_text: Выберите описательное имя, чтобы помочь вам позже идентифицировать
+          этот ключ.
+        name_label: Имя API-ключа
+        name_placeholder: например, Моё бюджетное приложение, Трекер портфеля
+        permissions_help: 'Выберите разрешения, которые должен иметь этот API-ключ:'
+        permissions_label: Разрешения
+        save_api_key: Сохранить API-ключ
+        scope_details:
+          read_accounts: Просмотр информации о счёте, балансов и данных на уровне
+            счёта
+          read_balances: Просмотр исторических данных балансов и тенденций стоимости
+            счёта
+          read_transactions: Просмотр данных операций, категорий и деталей операций
+          write_transactions: Создание и обновление записей операций (скоро)
+        scope_read_only: Только чтение
+        scope_read_only_description: Просмотр ваших счетов, операций и балансов
+        scope_read_write: Чтение/Запись
+        scope_read_write_description: Просмотр ваших данных и создание новых операций
+        security_warning: Ваш API-ключ будет показан только один раз после создания.
+          Храните его в безопасности и никогда не делитесь им публично. Если вы его
+          потеряете, вам нужно будет создать новый.
+        security_warning_body: Ваш API-ключ будет показан только один раз после создания.
+          Убедитесь, что вы скопировали и сохранили его в безопасности. Любой, у кого
+          есть доступ к этому ключу, может получить доступ к вашим данным в соответствии
+          с выбранными вами разрешениями.
+        security_warning_title: Предупреждение о безопасности
+        subtitle: Создайте новый API-ключ для программного доступа к вашим данным
+          Sure.
+        title: Создать API-ключ
+      shared:
+        active: Активен
+        created_ago: Создан %{time} назад
+        last_used_ago: Использован %{time} назад
+        never_used: Не использовался
+        scope_read_only: Только чтение
+        scope_read_write: Чтение и запись
+      show:
+        current_api_key:
+          active: Активен
+          ago: назад
+          back_to_keys: К API-ключам
+          copy_api_key: Скопировать API-ключ
+          copy_store_securely: Скопируйте и храните этот ключ в безопасности. Он понадобится
+            вам для аутентификации ваших API-запросов.
+          created_ago: Создан %{time} назад
+          created_at: Создан
+          description: Ваш активный API-ключ готов к использованию. Храните его в
+            безопасности и никогда не делитесь им публично.
+          expires: Истекает
+          key_name: Имя
+          last_used: Последнее использование
+          last_used_ago: Последнее использование %{time} назад
+          never_expires: Никогда не истекает
+          never_used: Никогда не использовался
+          permissions: Разрешения
+          regenerate_key: Создать новый ключ
+          revoke_confirmation: Вы уверены, что хотите отозвать этот API-ключ? Это
+            действие нельзя отменить, и все приложения, использующие этот ключ, будут
+            немедленно отключены.
+          revoke_key: Отозвать ключ
+          scope_read_only: Только чтение
+          scope_read_write: Чтение/Запись
+          title: Ваш API-ключ
+          usage_instructions: 'Включите ваш API-ключ в заголовок X-Api-Key при отправке
+            запросов к API %{product_name}:'
+          usage_instructions_title: Как использовать ваш API-ключ
+        newly_created:
+          continue: Перейти к настройкам API-ключа
+          copy_api_key: Скопировать API-ключ
+          copy_store_securely: Скопируйте и храните этот ключ в безопасности. Он понадобится
+            вам для аутентификации ваших API-запросов.
+          heading: API-ключ успешно создан!
+          how_to_use: Как использовать ваш API-ключ
+          key_ready: Ваш новый API-ключ "%{name}" создан и готов к использованию.
+          page_title: API-ключ успешно создан
+          your_api_key: Ваш API-ключ
+        no_api_key:
+          create_api_key: Создать API-ключ
+          description: Получите программный доступ к вашим данным Sure с помощью безопасного
+            API-ключа.
+          feature_1: Программный доступ к данным вашего счёта
+          feature_2: Создание пользовательских интеграций и приложений
+          feature_3: Автоматизация получения и анализа данных
+          heading: Доступ к данным вашего счёта программно
+          security_note: Ваш API-ключ будет иметь ограниченные права в зависимости
+            от выбранных вами областей. Вы можете иметь только один активный API-ключ
+            одновременно.
+          security_note_title: Безопасность прежде всего
+          title: API-ключ
+          what_you_can_do: 'Что вы можете делать с API:'
+        title: Управление API-ключами
+    api_keys_controller:
+      revoke_failed: Не удалось отозвать API-ключ
+      revoked_successfully: API-ключ успешно отозван
+      scope_descriptions:
+        read_accounts: Просмотр счетов
+        read_balances: Просмотр балансов
+        read_transactions: Просмотр операций
+        write_transactions: Создание операций
+      success: Ваш API-ключ успешно создан
diff --git a/config/locales/views/settings/api_keys/tr.yml b/config/locales/views/settings/api_keys/tr.yml
index 9aee48687..5d1f79aa3 100644
--- a/config/locales/views/settings/api_keys/tr.yml
+++ b/config/locales/views/settings/api_keys/tr.yml
@@ -1,75 +1,151 @@
 ---
 tr:
   settings:
-    api_keys_controller:
-      success: "API anahtarınız başarıyla oluşturuldu"
-      revoked_successfully: "API anahtarı başarıyla iptal edildi"
-      revoke_failed: "API anahtarı iptal edilemedi"
-      scope_descriptions:
-        read_accounts: "Hesapları Görüntüle"
-        read_transactions: "İşlemleri Görüntüle"
-        read_balances: "Bakiyeleri Görüntüle"
-        write_transactions: "İşlem Oluştur"
     api_keys:
-      show:
-        title: "API Anahtarı Yönetimi"
-      no_api_key:
-        title: "API Anahtarınızı Oluşturun"
-        description: "Maybe verilerinize güvenli bir API anahtarı ile programatik erişim sağlayın."
-        what_you_can_do: "API ile yapabilecekleriniz:"
-        feature_1: "Hesap verilerinize programatik olarak erişin"
-        feature_2: "Özel entegrasyonlar ve uygulamalar oluşturun"
-        feature_3: "Veri çekme ve analizini otomatikleştirin"
-        security_note_title: "Önce Güvenlik"
-        security_note: "API anahtarınız, seçtiğiniz yetkilere göre kısıtlanacaktır. Aynı anda yalnızca bir aktif API anahtarınız olabilir."
-        create_api_key: "API Anahtarı Oluştur"
-      current_api_key:
-        title: "API Anahtarınız"
-        description: "Aktif API anahtarınız kullanıma hazır. Güvende tutun ve asla herkese açık şekilde paylaşmayın."
-        active: "Aktif"
-        key_name: "Adı"
-        created_at: "Oluşturulma"
-        last_used: "Son Kullanım"
-        expires: "Bitiş"
-        ago: "önce"
-        never_used: "Hiç kullanılmadı"
-        never_expires: "Süresiz"
-        permissions: "Yetkiler"
-        usage_instructions_title: "API anahtarınızı nasıl kullanırsınız"
-        usage_instructions: "%{product_name} API'ye istek yaparken API anahtarınızı X-Api-Key başlığına ekleyin:"
-        regenerate_key: "Yeni Anahtar Oluştur"
-        revoke_key: "Anahtarı İptal Et"
-        revoke_confirmation: "Bu API anahtarını iptal etmek istediğinizden emin misiniz? Bu işlem geri alınamaz ve bu anahtarı kullanan tüm uygulamalar hemen devre dışı kalır."
-      new:
-        title: "API Anahtarı Oluştur"
-        create_new_key: "Yeni API Anahtarı Oluştur"
-        description: "Yeni API anahtarınızı açıklayıcı bir ad ve uygun yetkilerle yapılandırın."
-        name_label: "API Anahtarı Adı"
-        name_placeholder: "örn. Üretim Uygulaması, Analitik Paneli"
-        name_help: "Bu anahtarın amacını tanımlamanıza yardımcı olacak açıklayıcı bir ad seçin."
-        permissions_label: "Yetkiler"
-        permissions_help: "API anahtarınızın ihtiyaç duyduğu yetkileri seçin. Her zaman farklı yetkilerle yeni bir anahtar oluşturabilirsiniz."
-        scope_details:
-          read_accounts: "Hesap bilgilerini, bakiyeleri ve hesap düzeyindeki verileri görüntüle"
-          read_transactions: "İşlem verilerini, kategorileri ve işlem detaylarını görüntüle"
-          read_balances: "Geçmiş bakiye verilerini ve hesap değer eğilimlerini görüntüle"
-          write_transactions: "İşlem kayıtları oluştur ve güncelle (yakında)"
-        security_warning_title: "Önemli Güvenlik Uyarısı"
-        security_warning: "API anahtarınız oluşturulduktan sonra yalnızca bir kez gösterilecektir. Güvenli bir şekilde saklayın ve asla herkese açık şekilde paylaşmayın. Kaybederseniz, yeni bir anahtar oluşturmanız gerekir."
-        create_key: "API Anahtarı Oluştur"
-        cancel: "İptal"
+      create:
+        success: API anahtarınız başarıyla oluşturuldu
       created:
-        title: "API Anahtarı Oluşturuldu"
-        success_title: "API Anahtarı Başarıyla Oluşturuldu"
-        success_description: "Yeni API anahtarınız kullanıma hazır. Şimdi kopyaladığınızdan emin olun, çünkü tekrar göremeyeceksiniz."
-        your_api_key: "API Anahtarınız"
-        key_name: "Adı"
-        permissions: "Yetkiler"
+        continue: API Anahtarı Ayarlarına Devam Et
+        copy_key: API Anahtarını Kopyala
+        critical_warning_1: API anahtarınızı düz metin olarak göreceğiniz tek zaman
+          budur.
+        critical_warning_2: Kopyalayın ve güvenli bir şekilde şifre yöneticinize veya
+          uygulamanıza kaydedin.
+        critical_warning_3: Bu anahtarı kaybederseniz, yeni bir anahtar oluşturmanız
+          gerekir.
         critical_warning_title: "⚠️ Kritik: API Anahtarınızı Şimdi Kaydedin"
-        critical_warning_1: "API anahtarınızı düz metin olarak göreceğiniz tek zaman budur."
-        critical_warning_2: "Kopyalayın ve güvenli bir şekilde şifre yöneticinize veya uygulamanıza kaydedin."
-        critical_warning_3: "Bu anahtarı kaybederseniz, yeni bir anahtar oluşturmanız gerekir."
-        usage_instructions_title: "Hızlı Başlangıç"
-        usage_instructions: "API anahtarınızı X-Api-Key başlığına ekleyerek kullanın:"
-        copy_key: "API Anahtarını Kopyala"
-        continue: "API Anahtarı Ayarlarına Devam Et"
\ No newline at end of file
+        key_name: Adı
+        permissions: Yetkiler
+        success_description: Yeni API anahtarınız kullanıma hazır. Şimdi kopyaladığınızdan
+          emin olun, çünkü tekrar göremeyeceksiniz.
+        success_title: API Anahtarı Başarıyla Oluşturuldu
+        title: API Anahtarı Oluşturuldu
+        usage_instructions: 'API anahtarınızı X-Api-Key başlığına ekleyerek kullanın:'
+        usage_instructions_title: Hızlı Başlangıç
+        your_api_key: API Anahtarınız
+      current_api_key:
+        active: Aktif
+        ago: önce
+        created_at: Oluşturulma
+        description: Aktif API anahtarınız kullanıma hazır. Güvende tutun ve asla
+          herkese açık şekilde paylaşmayın.
+        expires: Bitiş
+        key_name: Adı
+        last_used: Son Kullanım
+        never_expires: Süresiz
+        never_used: Hiç kullanılmadı
+        permissions: Yetkiler
+        regenerate_key: Yeni Anahtar Oluştur
+        revoke_confirmation: Bu API anahtarını iptal etmek istediğinizden emin misiniz?
+          Bu işlem geri alınamaz ve bu anahtarı kullanan tüm uygulamalar hemen devre
+          dışı kalır.
+        revoke_key: Anahtarı İptal Et
+        title: API Anahtarınız
+        usage_instructions: "%{product_name} API'ye istek yaparken API anahtarınızı
+          X-Api-Key başlığına ekleyin:"
+        usage_instructions_title: API anahtarınızı nasıl kullanırsınız
+      destroy:
+        revoke_failed: API anahtarı iptal edilemedi
+        revoked_successfully: API anahtarı başarıyla iptal edildi
+      index:
+        empty_description: Verilerinize programatik olarak erişmek için bir API anahtarı
+          oluşturun.
+        empty_heading: Henüz API anahtarı yok
+        new_key: Yeni API Anahtarı
+        revoke_confirmation: '"%{name}" anahtarını iptal etmek istediğinizden emin
+          misiniz? Bu, bu anahtarı kullanan tüm uygulamaları hemen devre dışı bırakacaktır.'
+        revoke_key: İptal Et
+        subtitle: Verilerinize programatik erişim için API anahtarlarını yönetin.
+        title: API Anahtarları
+      new:
+        cancel: İptal
+        create_key: API Anahtarı Oluştur
+        create_new_api_key: Yeni API Anahtarı Oluştur
+        create_new_key: Yeni API Anahtarı Oluştur
+        description: Yeni API anahtarınızı açıklayıcı bir ad ve uygun yetkilerle yapılandırın.
+        name_help: Bu anahtarın amacını tanımlamanıza yardımcı olacak açıklayıcı bir
+          ad seçin.
+        name_help_text: Bu anahtarı daha sonra tanımanıza yardımcı olacak açıklayıcı
+          bir ad seçin.
+        name_label: API Anahtarı Adı
+        name_placeholder: örn. Üretim Uygulaması, Analitik Paneli
+        permissions_help: API anahtarınızın ihtiyaç duyduğu yetkileri seçin. Her zaman
+          farklı yetkilerle yeni bir anahtar oluşturabilirsiniz.
+        permissions_label: Yetkiler
+        save_api_key: API Anahtarını Kaydet
+        scope_details:
+          read_accounts: Hesap bilgilerini, bakiyeleri ve hesap düzeyindeki verileri
+            görüntüle
+          read_balances: Geçmiş bakiye verilerini ve hesap değer eğilimlerini görüntüle
+          read_transactions: İşlem verilerini, kategorileri ve işlem detaylarını görüntüle
+          write_transactions: İşlem kayıtları oluştur ve güncelle (yakında)
+        scope_read_only: Salt Okunur
+        scope_read_only_description: Hesaplarınızı, işlemlerinizi ve bakiyelerinizi
+          görüntüleyin
+        scope_read_write: Okuma/Yazma
+        scope_read_write_description: Verilerinizi görüntüleyin ve yeni işlemler oluşturun
+        security_warning: API anahtarınız oluşturulduktan sonra yalnızca bir kez gösterilecektir.
+          Güvenli bir şekilde saklayın ve asla herkese açık şekilde paylaşmayın. Kaybederseniz,
+          yeni bir anahtar oluşturmanız gerekir.
+        security_warning_body: API anahtarınız oluşturulduktan sonra yalnızca bir
+          kez görüntülenecektir. Kopyaladığınızdan ve güvenli bir şekilde sakladığınızdan
+          emin olun. Bu anahtara erişimi olan herkes, seçtiğiniz izinlere göre verilerinize
+          erişebilir.
+        security_warning_title: Önemli Güvenlik Uyarısı
+        subtitle: Sure verilerinize programatik olarak erişmek için yeni bir API anahtarı
+          oluşturun.
+        title: API Anahtarı Oluştur
+      no_api_key:
+        create_api_key: API Anahtarı Oluştur
+        description: Verilerinize güvenli bir API anahtarıyla programatik erişim
+          sağlayın.
+        feature_1: Hesap verilerinize programatik olarak erişin
+        feature_2: Özel entegrasyonlar ve uygulamalar oluşturun
+        feature_3: Veri çekme ve analizini otomatikleştirin
+        security_note: API anahtarınız, seçtiğiniz yetkilere göre kısıtlanacaktır.
+          Aynı anda yalnızca bir aktif API anahtarınız olabilir.
+        security_note_title: Önce Güvenlik
+        title: API Anahtarınızı Oluşturun
+        what_you_can_do: 'API ile yapabilecekleriniz:'
+      shared:
+        active: Aktif
+        created_ago: "%{time} önce oluşturuldu"
+        last_used_ago: Son kullanım %{time} önce
+        never_used: Hiç kullanılmadı
+        scope_read_only: Salt Okunur
+        scope_read_write: Okuma/Yazma
+      show:
+        current_api_key:
+          back_to_keys: API Anahtarlarına Dön
+          copy_api_key: API Anahtarını Kopyala
+          copy_store_securely: Bu anahtarı kopyalayıp güvenli bir şekilde saklayın.
+            API isteklerinizi doğrulamak için buna ihtiyacınız olacak.
+          permissions: Yetkiler
+          revoke_confirmation: Bu API anahtarını iptal etmek istediğinizden emin misiniz?
+            Bu işlem geri alınamaz ve bu anahtarı kullanan tüm uygulamaları hemen
+            devre dışı bırakır.
+          revoke_key: Anahtarı İptal Et
+          title: API Anahtarınız
+          usage_instructions: 'API anahtarınızı %{product_name} API''sine istek yaparken
+            X-Api-Key başlığına ekleyin:'
+          usage_instructions_title: API anahtarınızı nasıl kullanırsınız
+        newly_created:
+          continue: API Anahtarı Ayarlarına Devam Et
+          copy_api_key: API Anahtarını Kopyala
+          copy_store_securely: Bu anahtarı kopyalayıp güvenli bir şekilde saklayın.
+            API isteklerinizi doğrulamak için buna ihtiyacınız olacak.
+          heading: API Anahtarı Başarıyla Oluşturuldu!
+          how_to_use: API anahtarınızı nasıl kullanırsınız
+          key_ready: Yeni "%{name}" API anahtarınız oluşturuldu ve kullanıma hazır.
+          page_title: API Anahtarı Başarıyla Oluşturuldu
+          your_api_key: API Anahtarınız
+        title: API Anahtarı Yönetimi
+    api_keys_controller:
+      revoke_failed: API anahtarı iptal edilemedi
+      revoked_successfully: API anahtarı başarıyla iptal edildi
+      scope_descriptions:
+        read_accounts: Hesapları Görüntüle
+        read_balances: Bakiyeleri Görüntüle
+        read_transactions: İşlemleri Görüntüle
+        write_transactions: İşlem Oluştur
+      success: API anahtarınız başarıyla oluşturuldu
diff --git a/config/locales/views/settings/api_keys/zh-CN.yml b/config/locales/views/settings/api_keys/zh-CN.yml
index 611099f18..2692b60fc 100644
--- a/config/locales/views/settings/api_keys/zh-CN.yml
+++ b/config/locales/views/settings/api_keys/zh-CN.yml
@@ -106,3 +106,10 @@ zh-CN:
         usage_instructions: 使用 API 密钥时，请将其包含在 X-Api-Key 请求头中：
         copy_key: 复制 API 密钥
         continue: 继续前往 API 密钥设置
+      create:
+        success: API 密钥已成功创建
+      destroy:
+        not_found: 找不到 API 密钥
+        cannot_revoke: 此 API 密钥不能撤销
+        revoked_successfully: API 密钥已撤销
+        revoke_failed: 撤销 API 密钥失败
diff --git a/config/locales/views/settings/ca.yml b/config/locales/views/settings/ca.yml
index 9df987673..0c8e99a95 100644
--- a/config/locales/views/settings/ca.yml
+++ b/config/locales/views/settings/ca.yml
@@ -35,6 +35,10 @@ ca:
         theme_light: Clar
         theme_subtitle: Tria el tema preferit per a l'aplicació
         theme_system: Sistema
+        modals_title: Modals
+        modals_subtitle: Personalitza el comportament dels modals
+        disable_modal_click_outside_title: Mantén els modals oberts en fer clic fora
+        disable_modal_click_outside_description: Evita que els modals es tanquin en fer clic fora. Útil per evitar perdre canvis no desats accidentalment.
         theme_title: Tema
         transactions_subtitle: Personalitza com es mostren les transaccions
         transactions_title: Transaccions
@@ -91,10 +95,7 @@ ca:
         completion: completació
         cost_by_model: Cost per model
         cost_by_operation: Cost per operació
-        cost_estimates_description: Els costos s'estimen segons els preus d'OpenAI
-          de 2025. Els costos reals poden variar. El preu és per cada milió de tokens
-          i varia segons el model. Els models personalitzats o amb self hosting mostraran
-          "N/D" i no s'inclouen als totals de cost.
+        cost_estimates_description: 'Els costos s’estimen segons els preus publicats pels proveïdors, inclosos els preus d’OpenAI de juliol de 2026. Els costos reals poden variar. El preu és per cada milió de tokens i varia segons el model. Els models personalitzats o amb self hosting mostraran "N/A" i no s’inclouen als totals de cost.'
         cost_estimates_title: Sobre les estimacions de cost
         end_date: Data de fi
         failed: Errades
@@ -441,7 +442,6 @@ ca:
           one: Cal renovar el consentiment en 1 dia
           other: Cal renovar el consentiment en %{count} dies
         reconsent_required: Cal renovar el consentiment
-        registration_needed: Cal registrar-se
         sync_error: Error de sincronització
       not_authorized: No autoritzat
       not_found: Proveïdor no trobat.
diff --git a/config/locales/views/settings/de.yml b/config/locales/views/settings/de.yml
index eb17807f2..f0fbe7708 100644
--- a/config/locales/views/settings/de.yml
+++ b/config/locales/views/settings/de.yml
@@ -46,6 +46,12 @@ de:
         month_start_day: Budgetmonat beginnt am
         month_start_day_hint: Lege fest, wann dein Budgetmonat beginnt (z. B. Gehaltstag)
         month_start_day_warning: Deine Budgets und MTD-Berechnungen verwenden diesen benutzerdefinierten Starttag anstelle des 1. jedes Monats.
+    appearances:
+      show:
+        modals_title: Modale Fenster
+        modals_subtitle: Verhalten der modalen Fenster anpassen
+        disable_modal_click_outside_title: Modale Fenster bei Klick außerhalb geöffnet lassen
+        disable_modal_click_outside_description: Verhindert das Schließen modaler Fenster beim Klicken außerhalb. Nützlich, um ungespeicherte Änderungen nicht versehentlich zu verlieren.
     profiles:
       destroy:
         cannot_remove_self: Du kannst dich nicht selbst aus dem Konto entfernen.
diff --git a/config/locales/views/settings/en.yml b/config/locales/views/settings/en.yml
index fa545ed9b..9872977f7 100644
--- a/config/locales/views/settings/en.yml
+++ b/config/locales/views/settings/en.yml
@@ -6,6 +6,49 @@ en:
         renewal: "Your contribution continues on %{date}."
         cancellation: "Your contribution ends on %{date}."
   settings:
+    background_jobs:
+      show:
+        page_title: "Background jobs"
+        title: "Worker status"
+        subtitle: "Live Sidekiq runtime state: worker processes, queue depths, and retry/dead sets."
+        redis_unreachable: "Sidekiq state is unavailable (Redis unreachable). Liveness is unknown, so actions are disabled."
+        operations_title: "In-flight operations"
+        operations_subtitle: "Syncs, imports, and exports across all families that have not reached a terminal status. Operations idle for over 30 minutes with no visible job are presumed lost and can be marked as such."
+        empty: "No in-flight operations."
+        missing_value: "-"
+        stats:
+          workers: "Workers"
+          busy: "Busy"
+          enqueued: "Enqueued"
+          retries: "Retries"
+          scheduled: "Scheduled"
+          dead: "Dead"
+          latency: "%{value}s latency"
+        table:
+          type: "Operation"
+          family: "Family"
+          status: "Status"
+          last_activity: "Last activity"
+          liveness: "Liveness"
+          action: "Action"
+      operation:
+        ago: "%{time} ago"
+        sync_label: "Sync · %{type}"
+        running: "Running"
+        queued: "Queued"
+        recent: "Recent"
+        unknown: "Unknown"
+        stuck: "Stuck — presumed lost"
+        confirm: "Mark this operation as lost? The record is moved to a terminal status so it can be retried. The underlying data is not touched."
+        missing_value: "-"
+        actions:
+          mark_stale: "Mark stale"
+          mark_failed: "Mark failed"
+          release_claim: "Release claim"
+      cancel:
+        cancelled: "%{type} marked as lost."
+        not_cancellable: "This operation can't be modified right now — its job may still be queued or running. Try again once it has been idle for 30 minutes."
+        cancelled_error: "Marked as failed by an administrator — the background job was presumed lost."
     debugs:
       show:
         page_title: "Debug"
@@ -67,7 +110,7 @@ en:
         failed: "Failed"
         no_usage_data: "No usage data found for the selected period"
         cost_estimates_title: "About Cost Estimates"
-        cost_estimates_description: "Costs are estimated based on OpenAI's pricing as of 2025. Actual costs may vary. Pricing is per 1 million tokens and varies by model. Custom or self-hosted models will show \"N/A\" and are not included in cost totals."
+        cost_estimates_description: "Costs are estimated from published provider pricing, including OpenAI pricing as of July 2026. Actual costs may vary. Pricing is per 1 million tokens and varies by model. Custom or self-hosted models will show \"N/A\" and are not included in cost totals."
     ai_prompts:
       show:
         page_title: AI Prompts
@@ -107,12 +150,16 @@ en:
         theme_dark: Dark
         theme_light: Light
         theme_system: System
+        modals_title: Modals
+        modals_subtitle: Customize modal behavior
+        disable_modal_click_outside_title: Keep modals open on outside click
+        disable_modal_click_outside_description: Prevent modals from closing when clicking outside. Useful to avoid accidentally losing unsaved changes.
         transactions_title: Transactions
         transactions_subtitle: Customize how transactions are displayed
         dashboard_title: Dashboard
         dashboard_subtitle: Customize how the dashboard is displayed
         dashboard_two_column_title: Two-column layout
-        dashboard_two_column_description: Display dashboard widgets in two columns on large screens. When off, widgets stack in a single column.
+        dashboard_two_column_description: Display dashboard widgets in two columns on large screens, with per-widget width and height controls in each widget's header. When off, widgets stack in a single column.
         split_grouped_title: Group split transactions
         split_grouped_description: Show split transactions grouped under their parent in the transaction list. When off, split children appear as individual rows.
     preferences:
@@ -210,10 +257,20 @@ en:
         profile_title: Personal
         remove_invitation: Remove Invitation
         remove_member: Remove Member
+        resend_confirmation_link: request a new confirmation email
         save: Save
+        unconfirmed_email_notice_html: You have requested to change your email to %{email}. Please go to your email and confirm for the change to take effect. If you haven't received the email, please check your spam folder, or %{resend_link}.
     securities:
       show:
         page_title: Security
+        encryption_warning:
+          title: Encryption keys missing
+          intro: "Sensitive data (API keys, provider tokens, MFA secrets, and PII) are being stored unencrypted at rest. To enable encryption, set the following keys in your environment variables or Rails credentials:"
+          keys:
+            - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+            - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+            - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+          generate: "Generate a set with: bin/rails db:encryption:init"
         mfa_title: Two-Factor Authentication
         mfa_description: Add an extra layer of security to your account by requiring a code from your authenticator app when signing in
         enable_mfa: Enable 2FA
@@ -231,11 +288,32 @@ en:
         sso_confirm_body: Are you sure you want to disconnect your %{provider} account? You can reconnect it later by signing in with that provider again.
         sso_confirm_button: Disconnect
         sso_warning_message: This is your only login method. You should set a password in your security settings before disconnecting, otherwise you may be locked out of your account.
+    mcp:
+      show:
+        page_title: MCP Server
+        connect_title: Connect an AI assistant
+        connect_subtitle: Paste this URL into Claude.ai (or any MCP-compatible client) to connect it to your Sure account.
+        copy_url: Copy
+        copied: Copied!
+        how_to_connect_title: How to connect Claude
+        step_1: "Open Claude.ai and go to Settings → Integrations."
+        step_2: Click "Add integration" and paste the MCP server URL above.
+        step_3: Click Connect — you'll be redirected to Sure to sign in and authorize access.
+        step_4: Once authorized, Claude can read your accounts, transactions, and balance data.
+        connected_title: Connected clients
+        connected_subtitle: These apps currently have access to your Sure data. Revoke any you no longer use.
+        unknown_client: Unknown client
+        connected_ago: "Connected %{time} ago"
+        revoke: Revoke
+        revoke_confirm: Revoke access for this client?
+      revoke:
+        revoked: Connection revoked.
     settings_nav:
       accounts_label: Accounts
       advanced_section_title: Advanced
       ai_prompts_label: AI Prompts
-      api_key_label: API Key
+      background_jobs_label: Background jobs
+      api_key_label: API Keys
       payment_label: Payment
       categories_label: Categories
       feedback_label: Feedback
@@ -252,6 +330,7 @@ en:
       profile_label: Profile Info
       recurring_transactions_label: Recurring
       rules_label: Rules
+      mcp_label: MCP
       security_label: Security
       self_hosting_label: Self-Hosting
       sso_providers_label: SSO Providers
@@ -260,7 +339,7 @@ en:
       transactions_section_title: Transactions
       users_label: Users
       whats_new_label: What's new
-      api_keys_label: API Key
+      api_keys_label: API Keys
       appearance_label: Appearance
       bank_sync_label: Bank sync
       debug_label: Debug
@@ -305,7 +384,6 @@ en:
       meta:
         sync_error: Sync error
         no_recent_sync: Sync overdue
-        registration_needed: Registration needed
         reconsent_required: Re-consent required
         reconsent_needed:
           one: Re-consent needed in 1 day
@@ -321,15 +399,19 @@ en:
         akahu: Sync New Zealand financial institutions via Akahu.
         simplefin: Connect US bank accounts via the open SimpleFIN protocol.
         lunchflow: Connect 20k+ banks from 40+ countries (UK, EU, USA and more!)
+        redbark: Sync Australian bank accounts via Redbark open banking.
         enable_banking: Sync European bank accounts via PSD2 open banking.
         coinstats: Track your entire crypto portfolio across wallets and exchanges.
+        wise: Sync your Wise multi-currency balances and international transfers automatically.
         mercury: Sync your Mercury business banking accounts automatically.
         brex: Sync Brex cash and corporate card activity with read-only access.
         coinbase: Import your Coinbase crypto holdings and track performance.
         binance: Sync your Binance spot balances using a read-only API key.
         kraken: Sync Kraken balances and spot trade fills using a read-only API key.
         snaptrade: Connect brokerage accounts via the SnapTrade aggregation network.
+        trading212: Sync your Trading 212 investment portfolio using a read-only API key.
         ibkr: Sync Interactive Brokers investment accounts via Flex Query imports.
+        questrade: Sync your Questrade investment accounts directly via the Questrade API.
         indexa_capital: Track your Indexa Capital automated investment portfolio.
         sophtron: Connect US & Canadian banks and utilities.
         plaid: Connect thousands of US financial institutions via Plaid.
@@ -450,6 +532,10 @@ en:
         step_1_html: "Go to %{link} and create a personal app."
         step_2: "Copy your app token and user token."
         step_3: "Paste the tokens below, save, then link your synced accounts."
+      up_panel:
+        step_1_html: "Go to %{link} and generate a personal access token."
+        step_2: "Copy your personal access token."
+        step_3: "Paste the token below, save, then link your synced accounts."
       simplefin_panel:
         step_1_html: "Go to %{link} for a one-time setup token."
         step_2: "Paste the token below and connect."
@@ -520,3 +606,26 @@ en:
         accounts_tab: Accounts
         status_configured_suffix: tab to manage discovered accounts.
         not_configured: Not configured.
+      trading212_panel:
+        steps:
+          step_1: Go to Trading 212 → Settings → API (web or mobile app).
+          step_2: Generate a new API key — Trading 212 will show you an API ID and a Secret Key.
+          step_3: Paste both below, select your environment and account currency, then save.
+        api_key_label: API ID
+        api_key_placeholder_new: Paste your Trading 212 API ID
+        api_key_placeholder_existing: Leave blank to keep the current API ID
+        api_secret_label: Secret Key
+        api_secret_placeholder_new: Paste your Trading 212 Secret Key
+        api_secret_placeholder_existing: Leave blank to keep the current Secret Key
+        environment_label: Environment
+        environment_live: Live account
+        environment_demo: Demo account
+        currency_label: Account currency
+        save_configuration: Save Configuration
+        update_configuration: Update Configuration
+        sync: Sync
+        disconnect_confirm: Disconnect Trading 212?
+        status_configured_prefix: "Configured. Visit the"
+        accounts_tab: Accounts
+        status_configured_suffix: tab to manage discovered accounts.
+        not_configured: Not configured.
diff --git a/config/locales/views/settings/es.yml b/config/locales/views/settings/es.yml
index 1ff5af650..d0db5bc13 100644
--- a/config/locales/views/settings/es.yml
+++ b/config/locales/views/settings/es.yml
@@ -50,6 +50,12 @@ es:
         preview:
           title: Habilitar funciones experimentales
           description: Activa las funciones en desarrollo etiquetadas como experimentales o canary.
+    appearances:
+      show:
+        modals_title: Modales
+        modals_subtitle: Personalizar el comportamiento de los modales
+        disable_modal_click_outside_title: Mantener modales abiertos al hacer clic fuera
+        disable_modal_click_outside_description: Evita que los modales se cierren al hacer clic fuera. Útil para evitar perder cambios no guardados accidentalmente.
     profiles:
       destroy:
         cannot_remove_self: No puedes eliminarte a ti mismo de la cuenta.
diff --git a/config/locales/views/settings/fr.yml b/config/locales/views/settings/fr.yml
index 6faca441d..b44388800 100644
--- a/config/locales/views/settings/fr.yml
+++ b/config/locales/views/settings/fr.yml
@@ -1,88 +1,185 @@
 ---
 fr:
-  views:
-    settings:
-      payments:
-        renewal: "Votre contribution se poursuit le %{date}."
-        cancellation: "Votre contribution se termine le %{date}."
   settings:
     ai_prompts:
       show:
-        page_title: Prompts IA
-        openai_label: OpenAI
         disable_ai: Désactiver l'assistant IA
-        prompt_instructions: Instructions pour les prompts
         main_system_prompt:
-          title: Prompt Système Principal
           subtitle: Instructions fondamentales qui définissent le comportement de l'assistant AI dans toutes les conversations de chat
-        transaction_categorizer:
-          title: Catégorisation des transactions
-          subtitle: L'IA catégorise automatiquement vos transactions en fonction de vos catégories définies
+          title: Prompt Système Principal
         merchant_detector:
-          title: Détection du marchand
           subtitle: L'IA identifie et enrichit les données de transaction avec des informations sur le marchand
-    payments:
-      show:
-        page_title: Paiements
-        subscription_subtitle: Mettez à jour les détails de votre carte de crédit
-        subscription_title: Gérer les contributions
+          title: Détection du marchand
+        openai_label: OpenAI
+        page_title: Prompts IA
+        prompt_instructions: Instructions pour les prompts
+        transaction_categorizer:
+          subtitle: L'IA catégorise automatiquement vos transactions en fonction de vos catégories définies
+          title: Catégorisation des transactions
     appearances:
       show:
+        dashboard_subtitle: Personnalisez l'affichage du tableau de bord
+        dashboard_title: Tableau de bord
+        dashboard_two_column_description: Affiche les widgets du tableau de bord sur deux colonnes sur les grands écrans. Lorsque cette option est désactivée, les widgets sont empilés dans une seule colonne.
+        dashboard_two_column_title: Mise en page à deux colonnes
         page_title: Apparence
-        theme_title: Thème
-        theme_subtitle: Choisissez un thème préféré pour l'application
+        split_grouped_description: Affiche les transactions fractionnées groupées sous leur parent dans la liste des transactions. Lorsque cette option est désactivée, les enfants fractionnés apparaissent comme des lignes individuelles.
+        split_grouped_title: Grouper les transactions fractionnées
         theme_dark: Sombre
         theme_light: Clair
+        theme_subtitle: Choisissez un thème préféré pour l'application
         theme_system: Système
+        theme_title: Thème
+        modals_title: Fenêtres modales
+        modals_subtitle: Personnaliser le comportement des fenêtres modales
+        disable_modal_click_outside_title: Garder les fenêtres modales ouvertes au clic extérieur
+        disable_modal_click_outside_description: Empêche les fenêtres modales de se fermer en cliquant à l'extérieur. Utile pour éviter de perdre accidentellement des modifications non sauvegardées.
         transactions_title: Transactions
         transactions_subtitle: Personnalisez l'affichage des transactions
-        dashboard_title: Tableau de bord
-        dashboard_subtitle: Personnalisez l'affichage du tableau de bord
-        dashboard_two_column_title: Mise en page à deux colonnes
-        dashboard_two_column_description: Affiche les widgets du tableau de bord sur deux colonnes sur les grands écrans. Lorsque cette option est désactivée, les widgets sont empilés dans une seule colonne.
-        split_grouped_title: Grouper les transactions fractionnées
-        split_grouped_description: Affiche les transactions fractionnées groupées sous leur parent dans la liste des transactions. Lorsque cette option est désactivée, les enfants fractionnés apparaissent comme des lignes individuelles.
+    debugs:
+      show:
+        context:
+          account: compte=%{value}
+          account_provider: account_provider=%{value}
+          family: famille=%{value}
+          provider: fournisseur=%{value}
+          user: utilisateur=%{value}
+        empty: Aucun événement de débogage trouvé.
+        filters:
+          account_id: Identifiant du compte
+          account_provider_id: ID du fournisseur de compte
+          all: Tout
+          category: Catégorie
+          end_date: À
+          family_id: Carte d'identité familiale
+          level: Niveau
+          provider: Fournisseur
+          reset: Réinitialiser
+          source: Origine
+          start_date: De
+          submit: Filtrer
+          user_id: Identifiant utilisateur
+        missing_value: "-"
+        page_title: Débogage
+        subtitle: Événements opérationnels significatifs pour les super administrateurs. Le plus récent en premier.
+        table:
+          category: Catégorie
+          context: Contexte
+          level: Niveau
+          message: Message
+          metadata: Métadonnées
+          source: Origine
+          time: Temps
+          view_metadata: Voir
+        title: Journal des événements de débogage
+    llm_usages:
+      show:
+        avg_cost_per_request: Coût moyen/demande
+        based_on_requests: Basé sur %{with_cost} requêtes sur %{total} avec données de coût
+        col_cost: Coût
+        col_date: Date
+        col_model: Modèle
+        col_operation: Fonctionnement
+        col_tokens: Jetons
+        completion: achèvement
+        cost_by_model: Coût par modèle
+        cost_by_operation: Coût par opération
+        cost_estimates_description: "Les coûts sont estimés d’après les tarifs publiés par les fournisseurs, y compris les tarifs OpenAI en vigueur en juillet 2026. Les coûts réels peuvent varier. Le prix est par million de jetons et varie selon le modèle. Les modèles personnalisés ou auto-hébergés afficheront « N/A » et ne seront pas inclus dans le coût total."
+        cost_estimates_title: À propos des estimations de coûts
+        end_date: Date de fin
+        failed: Échec
+        filter: Filtrer
+        no_usage_data: Aucune donnée d'utilisation trouvée pour la période sélectionnée
+        page_title: Utilisation et coûts du LLM
+        prompt: invite
+        recent_usage: Utilisation récente
+        start_date: Date de début
+        subtitle: Suivez votre utilisation de l'IA et les coûts estimés
+        total_cost: Coût total
+        total_requests: Total demandes
+        total_tokens: Total jetons
+    mcp:
+      revoke:
+        revoked: Connexion révoquée.
+      show:
+        connect_subtitle: Collez cette URL dans Claude.ai (ou tout client compatible MCP) pour le connecter à votre compte Sure.
+        connect_title: Connecter un assistant IA
+        connected_ago: Connecté il y a %{time}
+        connected_subtitle: Ces applications ont actuellement accès à vos données Sure. Révoquez celles que vous n'utilisez plus.
+        connected_title: Clients connectés
+        copied: Copié !
+        copy_url: Copier
+        how_to_connect_title: Comment connecter Claude
+        page_title: Serveur MCP
+        revoke: Révoquer
+        revoke_confirm: Révoquer l'accès pour ce client ?
+        step_1: Ouvrez Claude.ai et allez dans Paramètres → Intégrations.
+        step_2: Cliquez sur "Ajouter l'intégration" et collez l'URL du serveur MCP ci-dessus.
+        step_3: Cliquez sur Connecter — vous serez redirigé vers Sure pour vous connecter et autoriser l'accès.
+        step_4: Une fois autorisé, Claude peut lire vos comptes, transactions et données de solde.
+        unknown_client: Client inconnu
+    payments:
+      show:
+        choose_level: Choisir le niveau
+        contributions_note: Les contributions à %{product_name} s'afficheront ici.
+        currently_on_plan: Actuellement sur le
+        manage: Gérer
+        not_contributing_emphasis: ne pas contribuer
+        not_contributing_prefix: Vous êtes actuellement
+        page_title: Paiements
+        payment_via_stripe: Paiement via Stripe
+        subscription_subtitle: Mettez à jour les détails de votre carte de crédit
+        subscription_title: Gérer les contributions
+        trial_days_left:
+          one: Les données seront supprimées dans %{count} jour
+          other: Les données seront supprimées dans %{count} jours
+        trialing: J'utilise actuellement la démo ouverte de %{product_name}
     preferences:
       show:
+        additional_currencies_label: Devises supplémentaires
+        base_currency_badge: Devise de base
+        base_currency_label: Devise de base
         country: Pays
+        currencies_more: "+%{count} de plus"
+        currencies_subtitle: Choisissez les devises qui apparaissent dans les champs monétaires de votre %{moniker}
+        currencies_title: Devises de %{moniker}
         currency: Devise
+        currency_search_placeholder: Rechercher des devises
         date_format: Format de date
+        default_account_order: Ordre d'affichage des comptes par défaut
+        default_period: Période par défaut
         general_subtitle: Configurez vos préférences
         general_title: Général
-        default_period: Période par défaut
-        default_account_order: Ordre d'affichage des comptes par défaut
         language: Langue
         language_auto: Langue du navigateur
-        page_title: Préférences
-        timezone: Fuseau horaire
+        manage_currencies: Gérer les devises
+        manage_currencies_subtitle: Désélectionnez les devises que vous n'utilisez jamais, ou réduisez la liste à quelques-unes seulement.
         month_start_day: Le mois budgétaire commence le
         month_start_day_hint: Définissez le jour de début de votre mois budgétaire (ex. jour de paie)
         month_start_day_warning: Vos budgets et vos calculs MTD utiliseront ce jour de début personnalisé au lieu du 1er de chaque mois.
-        currencies_title: "Devises de %{moniker}"
-        currencies_subtitle: Choisissez les devises qui apparaissent dans les champs monétaires de votre %{moniker}
-        base_currency_label: Devise de base
-        base_currency_badge: Devise de base
-        additional_currencies_label: Devises supplémentaires
         no_additional_currencies: Aucune sélectionnée
-        currencies_more: "+%{count} de plus"
-        manage_currencies: Gérer les devises
-        manage_currencies_subtitle: Désélectionnez les devises que vous n'utilisez jamais, ou réduisez la liste à quelques-unes seulement.
+        no_matching_currencies: Aucune devise trouvée
+        page_title: Préférences
+        preview:
+          description: Activez les fonctionnalités en cours étiquetées Aperçu ou Canary.
+          title: Activer les fonctionnalités d'aperçu
+        save_currencies: Enregistrer les devises
         select_all_currencies: Tout sélectionner
         select_base_only: Devise de base uniquement
-        currency_search_placeholder: Rechercher des devises
-        no_matching_currencies: Aucune devise trouvée
         selected_currencies_count:
           one: "%{count} sélectionnée"
           other: "%{count} sélectionnées"
-        save_currencies: Enregistrer les devises
-        sharing_title: "Partage de %{moniker}"
-        sharing_subtitle: "Contrôlez comment les comptes sont partagés dans votre %{moniker}"
         sharing_default_label: Partage par défaut pour les nouveaux comptes
-        sharing_shared: Partager avec tous les membres
         sharing_private: Garder privé par défaut
+        sharing_shared: Partager avec tous les membres
+        sharing_subtitle: Contrôlez comment les comptes sont partagés dans votre %{moniker}
+        sharing_title: Partage de %{moniker}
+        timezone: Fuseau horaire
+        translations_notice: Veuillez noter que nous travaillons toujours sur des traductions dans différentes langues.
     profiles:
       destroy:
         cannot_remove_self: Vous ne pouvez pas vous enlever de votre compte.
+        member_owns_other_family_data: Ce membre possède toujours des comptes dans un autre foyer et ne peut pas être supprimé. Transférez ou supprimez ces comptes d'abord.
         member_removal_failed: Il y a eu un problème lors de la suppression du membre.
         member_removed: Le membre a été supprimé avec succès.
         not_authorized: Vous n'êtes pas autorisé à supprimer les membres.
@@ -90,25 +187,21 @@ fr:
         confirm_delete:
           body: Êtes-vous sûr(e) de vouloir supprimer définitivement votre compte ? Cette action est irréversible.
           title: Supprimer le compte?
-        confirm_reset:
-          body: Êtes-vous sûr(e) de vouloir réinitialiser votre compte ? Cela supprimera tous vos comptes, catégories, marchands, étiquettes et autres données. Cette action ne peut pas être annulée.
-          title: Réinitialiser le compte?
-        confirm_reset_with_sample_data:
-          body: Êtes-vous sûr(e) de vouloir réinitialiser votre compte et charger des données d'exemple ? Cela supprimera vos données existantes et les remplacera par des données de démonstration afin que vous puissiez explorer Sure en toute sécurité.
-          title: Réinitialiser le compte et charger des données d'exemple ?
         confirm_remove_invitation:
           body: Êtes-vous sûr(e) de vouloir supprimer l'invitation pour %{email}?
           title: Supprimer l'invitation
         confirm_remove_member:
           body: Êtes-vous sûr(e) de vouloir supprimer %{name} de votre compte?
           title: Supprimer le membre
+        confirm_reset:
+          body: Êtes-vous sûr(e) de vouloir réinitialiser votre compte ? Cela supprimera tous vos comptes, catégories, marchands, étiquettes et autres données. Cette action ne peut pas être annulée.
+          title: Réinitialiser le compte?
+        confirm_reset_with_sample_data:
+          body: Êtes-vous sûr(e) de vouloir réinitialiser votre compte et charger des données d'exemple ? Cela supprimera vos données existantes et les remplacera par des données de démonstration afin que vous puissiez explorer Sure en toute sécurité.
+          title: Réinitialiser le compte et charger des données d'exemple ?
         danger_zone_title: Zone dangereuse
         delete_account: Supprimer le compte
         delete_account_warning: La suppression de votre compte entraînera la suppression permanente de toutes vos données et ne pourra pas être annulée.
-        reset_account: Réinitialiser le compte
-        reset_account_warning: La réinitialisation de votre compte supprimera tous vos comptes, catégories, marchands, étiquettes et autres données, mais gardera votre compte utilisateur intact.
-        reset_account_with_sample_data: Réinitialiser et précharger
-        reset_account_with_sample_data_warning: Supprime toutes vos données existantes puis charge des données d'exemple afin que vous puissiez explorer avec un environnement pré-rempli.
         email: E-mail
         first_name: Prénom
         group_form_input_placeholder: Entrez le nom du groupe
@@ -127,101 +220,341 @@ fr:
         profile_title: Personnel
         remove_invitation: Supprimer l'invitation
         remove_member: Supprimer le membre
+        resend_confirmation_link: demander un nouvel e-mail de confirmation
+        reset_account: Réinitialiser le compte
+        reset_account_warning: La réinitialisation de votre compte supprimera tous vos comptes, catégories, marchands, étiquettes et autres données, mais gardera votre compte utilisateur intact.
+        reset_account_with_sample_data: Réinitialiser et précharger
+        reset_account_with_sample_data_warning: Supprime toutes vos données existantes puis charge des données d'exemple afin que vous puissiez explorer avec un environnement pré-rempli.
         save: Enregistrer
+        unconfirmed_email_notice_html: Vous avez demandé à changer votre e-mail pour %{email}. Veuillez confirmer via l'e-mail reçu pour que le changement prenne effet. Si vous n'avez pas reçu l'e-mail, vérifiez vos spams ou %{resend_link}.
+    providers:
+      akahu_panel:
+        step_1_html: Allez sur %{link} et créez une application personnelle.
+        step_2: Copiez votre jeton d'application et votre jeton d'utilisateur.
+        step_3: Collez les jetons ci-dessous, enregistrez, puis liez vos comptes synchronisés.
+      bank_sync:
+        lede: Connectez des comptes externes pour que les transactions, les soldes et les holdings soient automatiquement transférés vers Sure.
+        page_title: Synchronisation bancaire
+      binance_panel:
+        api_key_label: Clé API
+        api_key_placeholder: Collez votre clé API Binance
+        api_secret_label: Secret API
+        api_secret_placeholder: Collez votre secret API Binance
+        connect_button: Connecter Binance
+        disconnect_confirm: Êtes-vous sûr(e) de vouloir déconnecter Binance ?
+        historical_import: Paramètres d'importation historique
+        ip_hint_body: 'Ajoutez l''IP de sortie du serveur de l''application à la liste blanche de la clé API Binance :'
+        ip_hint_contact_admin: Contactez votre administrateur pour obtenir l'adresse IP de sortie du serveur de l'application.
+        ip_hint_title: Liste blanche d'IP requise
+        no_withdraw_body: N'activez pas les permissions de retrait lors de la création de votre clé API Binance. Sure requiert uniquement un accès en lecture.
+        no_withdraw_title: Clé en lecture seule uniquement
+        no_withdraw_warning: 'Attention : n''activez PAS les permissions de retrait'
+        setup_instructions: 'Pour connecter Binance, créez une clé API en lecture seule :'
+        step1_html: Allez dans la <a href="https://www.binance.com/en/my/settings/api-management" target="_blank" rel="noopener noreferrer" class="underline">Gestion des API Binance</a>
+        step2: Créez une nouvelle clé API avec la permission Enable Reading uniquement
+        step3: Collez votre clé API et votre secret ci-dessous
+        sync: Synchroniser
+        sync_start_date_help: Sélectionnez l'ancienneté des transactions à importer.
+        sync_start_date_label: Importer les données depuis
+        syncing: Synchronisation…
+      clear_filter: Effacer les filtres
+      coinbase_panel:
+        api_key_label: Clé API
+        api_key_placeholder: Entrez votre clé API Coinbase
+        api_secret_label: Secret API
+        api_secret_placeholder: Entrez votre secret API Coinbase
+        connect_button: Connecter Coinbase
+        disconnect_confirm: Êtes-vous sûr(e) de vouloir déconnecter cette connexion Coinbase ? Vos comptes synchronisés deviendront des comptes manuels.
+        setup_instructions: 'Pour connecter Coinbase :'
+        step1_html: Allez dans les <a href="https://portal.cdp.coinbase.com/projects/api-keys" target="_blank" rel="noopener noreferrer" class="text-primary underline">Paramètres API de Coinbase</a>
+        step2: Créez une nouvelle clé API avec des permissions en lecture seule (voir les comptes, voir les transactions)
+        step3: Copiez votre clé API et votre secret API et collez-les ci-dessous
+        sync: Synchroniser
+        syncing: Synchronisation…
+      connect: Se connecter
+      drawer_trust_statement: Accès en lecture seule. Sure ne peut jamais déplacer d'argent, et vos identifiants sont stockés de manière chiffrée.
+      empty_filter: Aucun fournisseur ne correspond à votre filtre.
+      enable_banking_panel:
+        add_connection: Ajouter une connexion
+        application_id_label: Application ID
+        application_id_placeholder_new: Saisissez l'identifiant de l'application
+        application_id_placeholder_update: Saisissez le nouvel identifiant pour mettre à jour
+        callback_url_instruction: Pour l'URL de rappel, utilisez %{callback_url}.
+        client_certificate_label: Certificat client (avec clé privée)
+        config_locked_message: Déconnectez toutes les banques liées avant de modifier ces identifiants.
+        config_locked_title: Configuration verrouillée
+        configured: Configuré
+        connect_bank: Connecter la banque
+        connected_bank: Banque connectée
+        connection: Connexion
+        connection_error: Erreur de connexion
+        country_label: Pays
+        ready_to_link: Prêt à lier les comptes
+        reconnect: Reconnecter
+        remove: Supprimer
+        remove_confirm: Voulez-vous vraiment supprimer cette connexion ?
+        save_and_connect: Enregistrer et connecter
+        select_country: Sélectionner le pays...
+        session_expired_reconnect: Session expirée - reconnecter
+        session_expires: 'La session expire le : %{date}'
+        step_1_html: Allez sur %{link} et récupérez vos identifiants de développeur.
+        step_2: Choisissez votre pays et collez l'identifiant de l'application (Application ID) et le certificat client ci-dessous.
+        step_3: Enregistrez, puis utilisez Ajouter une connexion pour lier votre banque.
+        sync: Synchroniser
+        syncing: Synchronisation...
+        unknown: Inconnu
+        update_connection: Mettre à jour la connexion
+      encryption_error:
+        message: Les clés de chiffrement Active Record ne sont pas configurées. Veuillez vous assurer que les identifiants de chiffrement (active_record_encryption.primary_key, active_record_encryption.deterministic_key et active_record_encryption.key_derivation_salt) sont correctement définis dans vos identifiants Rails ou variables d'environnement avant d'utiliser les fournisseurs de synchronisation.
+        title: Configuration de chiffrement requise
+      groups:
+        available: Disponibles
+        empty_available: Tous les fournisseurs disponibles sont connectés.
+        your_connections: Vos connexions
+      health_strip:
+        accounts_syncing: synchronisation des comptes
+        connected: connecté
+        last_synced: Dernière synchronisation il y a %{time}
+        needs_attention: requiert de l'attention
+      ibkr_panel:
+        accounts_tab: Comptes
+        configuration:
+          all_other_options: 'All other configuration options : "No"'
+          date_format: 'Date Format : yyyy-MM-dd'
+          date_time_separator: 'Date/Time Separator : ; (semi-colon)'
+          format: 'Format : XML'
+          models: 'Models : Optional'
+          period: 'Period : Last 365 Calendar Days'
+          profit_and_loss: 'Profit and Loss : Default'
+          time_format: 'Time Format : HH:mm:ss'
+        disconnect_confirm: Déconnecter Interactive Brokers ?
+        flex_query_details:
+          configuration_heading: Définissez ces options de requête
+          eyebrow: Requête Flex
+          sections_heading: Activez ces sections et ces champs
+          summary: Développez pour voir les sections, champs et paramètres exacts que votre requête Flex d'activité IBKR doit inclure.
+          title: Sections, champs et configuration
+        not_configured: Non configuré.
+        query_id_label: ID de requête (Query ID)
+        query_id_placeholder_existing: Laissez vide pour conserver l'ID de requête actuel
+        query_id_placeholder_new: Saisissez votre ID de requête IBKR Flex
+        report_window_note: Les rapports IBKR Flex sont limités à la fenêtre de requête que vous avez configurée dans IBKR. Sure importera la totalité des positions actuelles ainsi que jusqu'aux 365 derniers jours d'activité de ce rapport.
+        save_configuration: Enregistrer la configuration
+        sections:
+          account_information: 'Account Information: Account ID, Currency'
+          cash_report: 'Cash Report :'
+          cash_report_fields: 'Fields : Currency, Ending Cash'
+          cash_report_options: 'Options : None'
+          cash_transactions: 'Cash Transactions :'
+          cash_transactions_fields: 'Fields : Amount, Conid, Currency, FX Rate To Base, Report Date, Transaction ID, Type'
+          cash_transactions_options: 'Options : Dividends, Deposits & Withdrawals, Detail'
+          change_in_position_value_summary: 'Change In Position Value Summary : Currency, End Of Period Value'
+          net_asset_value: 'Net Asset Value (NAV) in Base :'
+          net_asset_value_fields: 'Fields : Currency, Report Date, Total'
+          net_asset_value_options: 'Options : None'
+          open_positions: 'Open Positions :'
+          open_positions_fields: 'Fields : Asset Class, Conid, Cost Basis Price, Currency, FX Rate To Base, Mark Price, Quantity, Report Date, Security ID, Security ID Type, Side, Symbol'
+          open_positions_options: 'Options : Summary'
+          trades: 'Trades :'
+          trades_fields: 'Fields : Asset Class, Buy/Sell, Conid, Currency, FX Rate To Base, IB Commission, IB Commission Currency, Quantity, Symbol, Trade Date, Trade ID, TradePrice, Transaction ID'
+          trades_options: 'Options : Execution'
+        status_configured_prefix: "%{summary}. Visitez l'onglet"
+        status_configured_suffix: pour gérer les comptes découverts.
+        steps:
+          step_1: Dans votre portail client IBKR, accédez à "Performance & Rapports" > "Requêtes Flex".
+          step_2: Cliquez sur l'icône "+" dans la section "Activity Flex Query" pour créer une nouvelle requête.
+          step_3: 'Nommez votre requête (ex: "Sure Sync"), puis passez en revue les détails de la requête Flex ci-dessous et activez les sections, champs et options de configuration répertoriés.'
+          step_4: Enregistrez la requête, notez votre "Query ID", puis utilisez l'icône d'engrenage dans la section "Flex Web Service Configuration" pour générer un jeton d'accès (Token).
+          step_5: Collez votre Query ID et votre Token ci-dessous, enregistrez la configuration, puis allez dans Comptes pour lier les comptes IBKR découverts.
+        sync: Synchroniser
+        token_label: Jeton (Token)
+        token_placeholder_existing: Laissez vide pour conserver le jeton actuel
+        token_placeholder_new: Saisissez votre jeton de service web IBKR Flex
+        update_configuration: Mettre à jour la configuration
+      kraken_panel:
+        add_connection: Ajouter une connexion Kraken
+        api_key_label: Clé API
+        api_key_placeholder: Collez votre clé API Kraken
+        api_secret_label: Clé privée
+        api_secret_placeholder: Collez votre clé privée Kraken
+        connection_name_label: Nom de la connexion
+        connection_name_placeholder: Kraken principal
+        default_connection_name: Kraken
+        disconnect: Déconnecter
+        disconnect_confirm: Voulez-vous vraiment déconnecter %{name} ?
+        keep_api_key_placeholder: Laissez vide pour conserver la clé API existante
+        keep_api_secret_placeholder: Laissez vide pour conserver la clé privée existante
+        read_only_body: N'accordez pas de droits de trading, d'annulation, de retrait, d'exportation, de grand livre, de gain, de jalonnement ou de transfert. Sure importe uniquement les soldes, actifs et transactions spot exécutées.
+        read_only_title: Synchronisation d'échange en lecture seule uniquement
+        setup_accounts: Configurer le compte
+        step1_html: Allez dans les <a href="https://pro.kraken.com/app/settings/api" target="_blank" rel="noopener noreferrer" class="underline">paramètres d'API Kraken</a>
+        step2: Créez une clé API avec uniquement les droits Query Funds et Query Closed Orders & Trades.
+        step3: Collez la clé API et la clé privée ci-dessous.
+        sync: Synchroniser
+        syncing: Synchronisation...
+        update_connection: Mettre à jour la connexion
+      lunchflow_panel:
+        api_key_label: Clé API
+        api_key_placeholder_new: Collez la clé API ici
+        api_key_placeholder_update: Saisissez la nouvelle clé API pour mettre à jour
+        base_url_label: URL de base (Facultatif)
+        base_url_placeholder: https://lunchflow.app/api/v1 (par défaut)
+        save_and_connect: Enregistrer et connecter
+        step_1_html: Allez sur %{link} et créez une clé API.
+        step_2: Collez votre clé ci-dessous et connectez-vous.
+        step_3: Ensuite, allez dans Comptes pour lier vos comptes synchronisés.
+        update_connection: Mettre à jour la connexion
+      maturity:
+        alpha: Alpha
+        beta: Bêta
+      meta:
+        last_synced: Synchronisé il y a %{time}
+        no_recent_sync: Synchro en retard
+        reconsent_needed:
+          one: Consentement requis dans 1 jour
+          other: Consentement requis dans %{count} jours
+        reconsent_required: Consentement requis
+        sync_error: Erreur de synchro
+      not_authorized: Non autorisé
+      not_found: Fournisseur non trouvé.
+      plaid_eu_panel:
+        step_1_html: Ouvrez %{link} et copiez votre EU Client ID et Secret Key.
+      plaid_panel:
+        step_1_html: Ouvrez %{link} et copiez votre Client ID et Secret Key.
+        step_2: Choisissez un environnement. Utilisez sandbox pour les tests et production pour les comptes réels.
+        step_3: Collez vos identifiants ci-dessous et connectez-vous.
+      provider_form:
+        save_and_connect: Enregistrer et connecter
+      recently_synced: Synchronisé récemment. Réessayez dans un instant.
+      search_filters:
+        aria_label: Rechercher des fournisseurs
+        chips:
+          all: Tous
+          bank: Banques
+          crypto: Crypto
+          investment: Investissements
+        placeholder: Rechercher des fournisseurs
+      setup_steps:
+        eyebrow: Configuration
+        need_help: Besoin d'aide ?
+      show:
+        coinbase_title: Coinbase
+      simplefin_panel:
+        save_and_connect: Enregistrer et connecter
+        setup_token_label: Jeton de configuration (Setup Token)
+        setup_token_placeholder: Collez le jeton de configuration SimpleFIN
+        step_1_html: Allez sur %{link} pour obtenir un jeton de configuration à usage unique.
+        step_2: Collez le jeton ci-dessous et connectez-vous.
+        step_3: Ensuite, allez dans Comptes pour lier vos comptes synchronisés.
+      status:
+        err: Erreur
+        'false': Non configuré
+        ok: Connecté
+        warn: Action nécessaire
+      sync_all: Tout synchroniser
+      sync_all_in_progress: Synchronisation de tous les fournisseurs connectés…
+      sync_all_recently: Synchronisation déjà en cours. Réessayez dans un instant.
+      sync_provider: Synchroniser maintenant
+      sync_provider_in_progress: Synchronisation démarrée.
+      sync_provider_no_items: Aucune connexion disponible pour la synchronisation.
+      taglines:
+        akahu: Synchronisez les institutions financières de Nouvelle-Zélande via Akahu.
+        binance: Synchronisez vos soldes Binance spot à l'aide d'une clé API en lecture seule.
+        brex: Synchronisez l'activité de vos cartes de crédit et comptes de trésorerie Brex en lecture seule.
+        coinbase: Importez vos actifs crypto Coinbase et suivez leur performance.
+        coinstats: Suivez l'intégralité de votre portefeuille crypto sur vos portefeuilles et plateformes.
+        enable_banking: Synchronisez les comptes bancaires européens via l'open banking PSD2.
+        ibkr: Synchronisez vos comptes d'investissement Interactive Brokers via l'import Flex Query.
+        indexa_capital: Suivez votre portefeuille d'investissement automatisé Indexa Capital.
+        kraken: Synchronisez vos soldes Kraken et transactions spot à l'aide d'une clé API en lecture seule.
+        lunchflow: Connectez plus de 20k banques dans plus de 40 pays (UK, UE, USA, etc.)
+        mercury: Synchronisez automatiquement vos comptes professionnels Mercury.
+        plaid: Connectez des milliers d'institutions financières américaines via Plaid.
+        plaid_eu: Connectez des institutions financières européennes via Plaid (PSD2 / Open Banking).
+        questrade: Synchronisez directement vos comptes d'investissement Questrade via l'API Questrade.
+        simplefin: Connectez des comptes bancaires américains via le protocole ouvert SimpleFIN.
+        snaptrade: Connectez vos comptes de courtage via le réseau d'agrégation SnapTrade.
+        sophtron: Connectez vos banques et services publics américains et canadiens.
+        wise: Synchronisez automatiquement vos soldes multi-devises Wise et vos transferts internationaux.
+      up_panel:
+        step_1_html: Allez sur %{link} et générez un jeton d'accès personnel.
+        step_2: Copiez votre jeton d'accès personnel.
+        step_3: Collez le jeton ci-dessous, enregistrez, puis liez vos comptes synchronisés.
+      update:
+        no_changes: Aucune modification n'a été apportée
+        updated_successfully: Paramètres du fournisseur mis à jour avec succès
     securities:
       show:
-        page_title: Sécurité
-        mfa_title: Authentification à deux facteurs
+        disable_mfa: Désactiver la 2FA
+        disable_mfa_confirm: Voulez-vous vraiment désactiver l'authentification à deux facteurs ?
+        enable_mfa: Activer la 2FA
+        encryption_warning:
+          generate: 'Générez un ensemble avec : bin/rails db:encryption:init'
+          intro: 'Les données sensibles (clés API, jetons de fournisseur, secrets MFA et PII) sont stockées non chiffrées au repos. Pour activer le chiffrement, définissez les clés suivantes dans vos variables d''environnement ou identifiants Rails :'
+          keys:
+          - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+          - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+          - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+          title: Clés de chiffrement manquantes
         mfa_description: Ajoutez une couche de sécurité supplémentaire à votre compte en exigeant un code de votre application d'authentification lors de la connexion
-        enable_mfa: Activer 2FA
-        disable_mfa: Désactiver 2FA
-        disable_mfa_confirm: Êtes-vous sûr(e) de vouloir désactiver l'authentification à deux facteurs ?
-        sso_title: Comptes connectés
-        sso_subtitle: Gérez vos connexions de compte à authentification unique
+        mfa_title: Authentification à deux facteurs
+        page_title: Sécurité
+        sso_confirm_body: Êtes-vous sûr(e) de vouloir déconnecter votre compte %{provider} ? Vous pourrez le reconnecter ultérieurement en vous connectant avec ce fournisseur.
+        sso_confirm_button: Déconnecter
+        sso_confirm_title: Déconnecter le compte ?
+        sso_connect_hint: Déconnectez-vous et connectez-vous avec un fournisseur SSO pour connecter un compte.
         sso_disconnect: Déconnecter
         sso_last_used: Dernière utilisation
         sso_never: Jamais
         sso_no_email: Pas d'email
         sso_no_identities: Aucun compte SSO connecté
-        sso_connect_hint: Déconnectez-vous et connectez-vous avec un fournisseur SSO pour connecter un compte.
-        sso_confirm_title: Déconnecter le compte ?
-        sso_confirm_body: Êtes-vous sûr(e) de vouloir déconnecter votre compte %{provider} ? Vous pourrez le reconnecter ultérieurement en vous connectant avec ce fournisseur.
-        sso_confirm_button: Déconnecter
+        sso_subtitle: Gérez vos connexions de compte à authentification unique
+        sso_title: Comptes connectés
         sso_warning_message: C'est votre seule méthode de connexion. Vous devriez définir un mot de passe dans vos paramètres de sécurité avant de déconnecter, sinon vous pourriez être bloqué(e) hors de votre compte.
     settings_nav:
       accounts_label: Comptes
       advanced_section_title: Avancé
       ai_prompts_label: Prompts IA
       api_key_label: Clé API
-      payment_label: Paiement
+      api_keys_label: Clés API
+      appearance_label: Apparence
+      bank_sync_label: Synchronisation bancaire
       categories_label: Catégories
+      debug_label: Débogage
+      exports_label: Exportations
       feedback_label: Retour d'information
       general_section_title: Général
+      guides_label: Guides
       imports_label: Importations
-      exports_label: Exportations
       llm_usage_label: Utilisation LLM
       logout: Se déconnecter
+      mcp_label: MCP
       merchants_label: Marchands
-      providers_label: Fournisseurs
-      guides_label: Guides
       other_section_title: Plus
+      payment_label: Paiement
       preferences_label: Préférences
       profile_label: Informations du profil
+      providers_label: Fournisseurs
       recurring_transactions_label: Récurrentes
       rules_label: Règles
       security_label: Sécurité
       self_hosting_label: Auto-hébergement
+      sso_providers_label: Fournisseurs SSO
       statement_vault_label: Coffre des relevés
       tags_label: Étiquettes
       transactions_section_title: Transactions
+      users_label: Utilisateurs
       whats_new_label: Dernières nouvelles
-      api_keys_label: Clés API
-      appearance_label: Apparence
-      bank_sync_label: Synchronisation bancaire
     settings_nav_link_large:
       next: Suivant
       previous: Précédent
     user_avatar_field:
       accepted_formats: JPG ou PNG. 5MB max.
-      choose: Charger une photo
-      choose_label: (facultatif)
       change: Changer de photo
-    providers:
-      show:
-        coinbase_title: Coinbase
-      encryption_error:
-        title: Configuration de chiffrement requise
-        message: Les clés de chiffrement Active Record ne sont pas configurées. Veuillez vous assurer que les identifiants de chiffrement (active_record_encryption.primary_key, active_record_encryption.deterministic_key et active_record_encryption.key_derivation_salt) sont correctement définis dans vos identifiants Rails ou variables d'environnement avant d'utiliser les fournisseurs de synchronisation.
-      coinbase_panel:
-        setup_instructions: "Pour connecter Coinbase :"
-        step1_html: Allez dans les <a href="https://portal.cdp.coinbase.com/projects/api-keys" target="_blank" rel="noopener noreferrer" class="text-primary underline">Paramètres API de Coinbase</a>
-        step2: Créez une nouvelle clé API avec des permissions en lecture seule (voir les comptes, voir les transactions)
-        step3: Copiez votre clé API et votre secret API et collez-les ci-dessous
-        api_key_label: Clé API
-        api_key_placeholder: Entrez votre clé API Coinbase
-        api_secret_label: Secret API
-        api_secret_placeholder: Entrez votre secret API Coinbase
-        connect_button: Connecter Coinbase
-        syncing: Synchronisation…
-        sync: Synchroniser
-        disconnect_confirm: Êtes-vous sûr(e) de vouloir déconnecter cette connexion Coinbase ? Vos comptes synchronisés deviendront des comptes manuels.
-      binance_panel:
-        setup_instructions: "Pour connecter Binance, créez une clé API en lecture seule :"
-        step1_html: 'Allez dans la <a href="https://www.binance.com/en/my/settings/api-management" target="_blank" rel="noopener noreferrer" class="underline">Gestion des API Binance</a>'
-        step2: "Créez une nouvelle clé API avec la permission Enable Reading uniquement"
-        step3: "Collez votre clé API et votre secret ci-dessous"
-        no_withdraw_warning: "Attention : n'activez PAS les permissions de retrait"
-        ip_hint_title: "Liste blanche d'IP requise"
-        ip_hint_body: "Ajoutez l'IP de sortie du serveur de l'application à la liste blanche de la clé API Binance :"
-        ip_hint_contact_admin: "Contactez votre administrateur pour obtenir l'adresse IP de sortie du serveur de l'application."
-        api_key_label: Clé API
-        api_key_placeholder: Collez votre clé API Binance
-        api_secret_label: Secret API
-        api_secret_placeholder: Collez votre secret API Binance
-        connect_button: Connecter Binance
-        syncing: Synchronisation…
-        sync: Synchroniser
-        disconnect_confirm: "Êtes-vous sûr(e) de vouloir déconnecter Binance ?"
-      enable_banking_panel:
-        callback_url_instruction: "Pour l'URL de rappel, utilisez %{callback_url}."
-        connection_error: Erreur de connexion
+      choose: Charger une photo
+      choose_label: "(facultatif)"
+  views:
+    settings:
+      payments:
+        cancellation: Votre contribution se termine le %{date}.
+        renewal: Votre contribution se poursuit le %{date}.
diff --git a/config/locales/views/settings/guides/en.yml b/config/locales/views/settings/guides/en.yml
new file mode 100644
index 000000000..6df7c1929
--- /dev/null
+++ b/config/locales/views/settings/guides/en.yml
@@ -0,0 +1,6 @@
+---
+en:
+  settings:
+    guides:
+      show:
+        page_title: Guides
diff --git a/config/locales/views/settings/guides/fr.yml b/config/locales/views/settings/guides/fr.yml
new file mode 100644
index 000000000..221016685
--- /dev/null
+++ b/config/locales/views/settings/guides/fr.yml
@@ -0,0 +1,6 @@
+---
+fr:
+  settings:
+    guides:
+      show:
+        page_title: Guides
diff --git a/config/locales/views/settings/guides/it.yml b/config/locales/views/settings/guides/it.yml
new file mode 100644
index 000000000..ebe3be085
--- /dev/null
+++ b/config/locales/views/settings/guides/it.yml
@@ -0,0 +1,6 @@
+---
+it:
+  settings:
+    guides:
+      show:
+        page_title: Guide
diff --git a/config/locales/views/settings/guides/ru.yml b/config/locales/views/settings/guides/ru.yml
new file mode 100644
index 000000000..9aa961dad
--- /dev/null
+++ b/config/locales/views/settings/guides/ru.yml
@@ -0,0 +1,6 @@
+---
+ru:
+  settings:
+    guides:
+      show:
+        page_title: Guides
diff --git a/config/locales/views/settings/guides/tr.yml b/config/locales/views/settings/guides/tr.yml
new file mode 100644
index 000000000..be7adf86b
--- /dev/null
+++ b/config/locales/views/settings/guides/tr.yml
@@ -0,0 +1,6 @@
+---
+tr:
+  settings:
+    guides:
+      show:
+        page_title: Kılavuzlar
diff --git a/config/locales/views/settings/hostings/ca.yml b/config/locales/views/settings/hostings/ca.yml
index 02b1a6282..0e90bedc3 100644
--- a/config/locales/views/settings/hostings/ca.yml
+++ b/config/locales/views/settings/hostings/ca.yml
@@ -153,6 +153,7 @@ ca:
         uri_base_placeholder: https://api.openai.com/v1 (per defecte)
       provider_selection:
         binance_public_hint: gratuït, sense clau API — només cripto (BTC, ETH, etc.)
+        moex_public_hint: gratuït, sense clau API — accions, fons i bons russos (MOEX), inclou canvi RUB
         description: Tria un únic proveïdor per obtenir tipus de canvi de divisa.
         env_configured_message: La selecció de proveïdor està desactivada perquè hi
           ha variables d'entorn configurades. Per activar la selecció aquí, elimina
@@ -165,6 +166,7 @@ ca:
         providers:
           alpha_vantage: Alpha Vantage
           binance_public: Binance
+          moex_public: MOEX
           eodhd: EODHD
           mfapi: MFAPI.in
           tiingo: Tiingo
diff --git a/config/locales/views/settings/hostings/en.yml b/config/locales/views/settings/hostings/en.yml
index a2f08e4e1..9c6539ad9 100644
--- a/config/locales/views/settings/hostings/en.yml
+++ b/config/locales/views/settings/hostings/en.yml
@@ -21,6 +21,7 @@ en:
         general: General Settings
         ai_assistant: AI Assistant
         financial_data_providers: Financial Data Providers
+        property_valuation_providers: Property Valuation Providers
         sync_settings: Sync Settings
         invites: Invite Codes
         title: Self-Hosting
@@ -44,6 +45,8 @@ en:
         requires_api_key_alpha_vantage: requires API key, 25 calls/day limit
         mfapi_hint: free, no API key -- Indian mutual funds only
         binance_public_hint: free, no API key -- crypto only (BTC, ETH, etc.)
+        moex_public_hint: free, no API key -- Russian stocks, funds & bonds (MOEX), incl. RUB FX
+        tinkoff_invest_hint: requires read-only token -- Russian stocks/funds/bonds prices + brand logos
         providers:
           twelve_data: Twelve Data
           yahoo_finance: Yahoo Finance
@@ -52,6 +55,9 @@ en:
           alpha_vantage: Alpha Vantage
           mfapi: MFAPI.in
           binance_public: Binance
+          moex_public: MOEX
+          tinkoff_invest: T-Invest (T-Bank)
+          frankfurter: Frankfurter
       assistant_settings:
         title: AI Assistant
         description: Choose how the chat assistant responds. Builtin uses your configured LLM provider directly. External delegates to a remote AI agent that can call back to Sure's financial tools via MCP.
@@ -90,6 +96,28 @@ en:
         title: Brand Fetch Settings
         high_res_label: Enable high-resolution logos
         high_res_description: When enabled, logos will be retrieved at 120x120 resolution instead of 40x40. This provides sharper images on high-DPI displays.
+      llm_provider_selector:
+        title: AI Provider
+        description: Choose which LLM powers AI chat. Batch operations (transaction categorization, merchant detection, and PDF processing) currently always use OpenAI.
+        env_configured_message: Successfully configured through the LLM_PROVIDER environment variable.
+        provider_label: Active LLM provider
+        provider_openai: OpenAI
+        provider_anthropic: Anthropic (Claude)
+        provider_help: Switching providers takes effect on the next chat. Configure the active provider's credentials below.
+        not_configured_hint: "Add a %{provider} API key below to activate it."
+        data_retention_heading: Data handling
+        data_retention: API inputs are not used to train models by default; the providers' hosted APIs retain data for ~30 days for trust & safety. Custom or self-hosted endpoints follow your own policy.
+      anthropic_settings:
+        title: Anthropic (Claude)
+        description: Enter your Anthropic API key. Optionally point Base URL at AWS Bedrock or GCP Vertex.
+        env_configured_message: Successfully configured through environment variables.
+        access_token_label: API Key
+        access_token_placeholder: Enter your Anthropic API key
+        base_url_label: Base URL (Optional)
+        base_url_placeholder: "https://api.anthropic.com (default)"
+        model_label: Default Model (Optional)
+        model_placeholder: "claude-sonnet-4-6 (default)"
+        model_help: Used for chat and PDF processing. Batch operations (categorize, merchant detection) default to Haiku for cost.
       openai_settings:
         description: Enter the access token and optionally configure a custom OpenAI-compatible provider
         env_configured_message: Successfully configured through environment variables.
@@ -106,7 +134,7 @@ en:
         json_mode_json_object: JSON Object
         json_mode_help: "Strict mode works best with thinking models (qwen-thinking, deepseek-reasoner). None mode works best with standard models (llama, mistral, gpt-oss)."
         budget_heading: Token Budget
-        budget_description: Applies to every LLM call — chat history, auto-categorization, merchant detection, and PDF processing. Defaults are conservative for small-context local models. Raise for cloud models with larger context windows.
+        budget_description: Applies to OpenAI-compatible calls (chat, auto-categorization, merchant detection, and PDF processing). Defaults are conservative for small-context local models. Raise for cloud models with larger context windows.
         context_window_label: Context Window (Optional)
         context_window_help: "Total tokens the model will accept. Default: 2048 — raise to 8192+ for cloud OpenAI or large-context local models."
         max_response_tokens_label: Max Response Tokens (Optional)
@@ -117,10 +145,28 @@ en:
       yahoo_finance_settings:
         title: Yahoo Finance
         description: Yahoo Finance provides free access to stock prices, exchange rates, and financial data without requiring an API key.
-        status_active: Yahoo Finance is active and working
-        status_inactive: Yahoo Finance connection failed
-        connection_failed: Unable to connect to Yahoo Finance
-        troubleshooting: Check your internet connection and firewall settings. Yahoo Finance may be temporarily unavailable.
+        status_healthy: Yahoo Finance is active and working.
+        status_rate_limited: Yahoo Finance is temporarily rate limiting requests.
+        rate_limited_title: Yahoo Finance rate limit reached.
+        rate_limited_message: No action is required. Sure will avoid additional health checks for 30 minutes. Price and exchange-rate operations continue independently.
+        status_unavailable: Yahoo Finance is currently unavailable.
+        unavailable_title: Could not verify Yahoo Finance.
+        unavailable_message: Yahoo Finance could not be reached or returned an unexpected response. Check your internet connection and try again later.
+        status_unknown: Yahoo Finance status is being checked.
+      rentcast_settings:
+        title: RentCast
+        description: Enter your RentCast API key to look up US property details and value estimates when adding a property. The free tier is limited to 50 API requests per month, shared between property lookups and daily valuation refreshes. On a paid plan, raise the cap with the RENTCAST_MAX_REQUESTS_PER_MONTH environment variable.
+        env_configured_message: Successfully configured through the RENTCAST_API_KEY environment variable.
+        label: API Key
+        placeholder: Enter your RentCast API key here
+        usage: "%{used} of %{limit} monthly requests used"
+      realie_settings:
+        title: Realie
+        description: Enter your Realie API key to look up US property details and value estimates when adding a property. The free tier is limited to 25 API requests per month, shared between property lookups and daily valuation refreshes. On a paid plan, raise the cap with the REALIE_MAX_REQUESTS_PER_MONTH environment variable.
+        env_configured_message: Successfully configured through the REALIE_API_KEY environment variable.
+        label: API Key
+        placeholder: Enter your Realie API key here
+        usage: "%{used} of %{limit} monthly requests used"
       tiingo_settings:
         title: Tiingo
         description: Enter the API token provided by Tiingo. Free tier supports 50 unique symbols per hour with 30+ years of historical data.
@@ -131,6 +177,16 @@ en:
         step_1_html: 'Visit <a href="https://www.tiingo.com" target="_blank" rel="noopener noreferrer" class="underline">tiingo.com</a> and create a free account.'
         step_2_html: 'Go to the <a href="https://www.tiingo.com/account/api/token" target="_blank" rel="noopener noreferrer" class="underline">API Token</a> page.'
         step_3: Copy your API token and paste it below.
+      tinkoff_invest_settings:
+        title: T-Invest (T-Bank)
+        description: Enter a read-only T-Invest API token. Used to fetch brand logos for securities (incl. funds and bonds, even when MOEX prices them) and, when enabled above, prices for Russian instruments.
+        env_configured_message: Successfully configured through the TINKOFF_INVEST_API_KEY environment variable.
+        label: API Token
+        placeholder: Enter your T-Invest API token here
+        show_details: "(show details)"
+        step_1: Open T-Bank investments, then Settings, then API tokens (requires an open T-Bank brokerage account).
+        step_2: Create a token with read-only access.
+        step_3: Copy the token and paste it below.
       eodhd_settings:
         title: EODHD
         description: Enter the API token provided by EODHD. Supports EU ETFs on LSE, XETRA, and other international exchanges.
@@ -175,12 +231,16 @@ en:
         invalid_onboarding_state: Invalid onboarding state
         invalid_sync_time: Invalid sync time format. Please use HH:MM format (e.g., 02:30).
         invalid_llm_budget: "%{field} must be a whole number ≥ %{minimum}."
+        invalid_anthropic_base_url: Anthropic Base URL must be an http(s) URL.
+        anthropic_model_required_for_base_url: Anthropic Model is required when a custom Base URL is set.
         scheduler_sync_failed: Settings saved, but failed to update the sync schedule. Please try again or check the server logs.
       disconnect_external_assistant:
         external_assistant_disconnected: External assistant disconnected
       clear_cache:
         cache_cleared: Data cache has been cleared. This may take a few moments to complete.
       not_authorized: You are not authorized to perform this action
+      ensure_admin:
+        not_authorized: You are not authorized to perform this action
       ensure_super_admin_for_onboarding:
         not_authorized: You are not authorized to perform this action
       sync_auto_sync_scheduler!:
diff --git a/config/locales/views/settings/hostings/es.yml b/config/locales/views/settings/hostings/es.yml
index aff9d71f8..d0f5e82a1 100644
--- a/config/locales/views/settings/hostings/es.yml
+++ b/config/locales/views/settings/hostings/es.yml
@@ -87,10 +87,14 @@ es:
       yahoo_finance_settings:
         title: Yahoo Finance
         description: Yahoo Finance proporciona acceso gratuito a precios de acciones, tipos de cambio y datos financieros sin necesidad de una clave API.
-        status_active: Yahoo Finance está activo y funcionando
-        status_inactive: La conexión con Yahoo Finance falló
-        connection_failed: No se pudo conectar con Yahoo Finance
-        troubleshooting: Verifica tu conexión a internet y la configuración del firewall. Yahoo Finance puede estar temporalmente no disponible.
+        status_healthy: Yahoo Finance está activo y funcionando.
+        status_rate_limited: Yahoo Finance está limitando temporalmente las solicitudes.
+        rate_limited_title: Se alcanzó el límite de solicitudes de Yahoo Finance.
+        rate_limited_message: No es necesario realizar ninguna acción. Sure evitará comprobaciones de estado adicionales durante 30 minutos. Las operaciones de precios y tipos de cambio continuarán de forma independiente.
+        status_unavailable: Yahoo Finance no está disponible en este momento.
+        unavailable_title: No se pudo verificar Yahoo Finance.
+        unavailable_message: No se pudo contactar con Yahoo Finance o se recibió una respuesta inesperada. Comprueba tu conexión a internet e inténtalo de nuevo más tarde.
+        status_unknown: Se está comprobando el estado de Yahoo Finance.
       twelve_data_settings:
         api_calls_used: "%{used} / %{limit} llamadas diarias a la API utilizadas (%{percentage})"
         description: Introduce la clave API proporcionada por Twelve Data
@@ -121,4 +125,4 @@ es:
         auto_sync_time_description: Especifica la hora del día en la que debe ocurrir la sincronización automática.
         include_pending_label: Incluir transacciones pendientes
         include_pending_description: Cuando está habilitado, las transacciones pendientes (no liquidadas) se importarán y se conciliarán automáticamente cuando se confirmen. Desactívalo si tu banco proporciona datos pendientes poco fiables.
-        env_configured_message: Este ajuste está desactivado porque hay una variable de entorno del proveedor (SIMPLEFIN_INCLUDE_PENDING o PLAID_INCLUDE_PENDING) definida. Elimínala para habilitar este ajuste aquí.
\ No newline at end of file
+        env_configured_message: Este ajuste está desactivado porque hay una variable de entorno del proveedor (SIMPLEFIN_INCLUDE_PENDING o PLAID_INCLUDE_PENDING) definida. Elimínala para habilitar este ajuste aquí.
diff --git a/config/locales/views/settings/hostings/fr.yml b/config/locales/views/settings/hostings/fr.yml
index 7a42e86ca..8dc06744e 100644
--- a/config/locales/views/settings/hostings/fr.yml
+++ b/config/locales/views/settings/hostings/fr.yml
@@ -2,184 +2,234 @@
 fr:
   settings:
     hostings:
-      invite_code_settings:
-        description: "Contrôlez comment les nouvelles personnes s'inscrivent à votre instance de %{product}."
-        email_confirmation_description: "Lorsque cette option est activée, les utilisateurs doivent confirmer leur nouvelle adresse e-mail lorsqu'ils la modifient."
-        email_confirmation_title: "Exiger la confirmation de l'e-mail"
-        default_family_title: "Famille par défaut pour les nouveaux utilisateurs"
-        default_family_description: "Placer les nouveaux utilisateurs dans cette famille/groupe uniquement s'ils n'ont pas d'invitation."
-        default_family_none: "Aucune (créer une nouvelle famille)"
-        generate_tokens: "Générer un nouveau code"
-        generated_tokens: "Codes générés"
-        title: "Inscription des utilisateurs"
-        states:
-          open: "Ouvert"
-          closed: "Fermé"
-          invite_only: "Sur invitation uniquement"
-      show:
-        general: "Paramètres généraux"
-        ai_assistant: "Assistant IA"
-        financial_data_providers: "Fournisseurs de données financières"
-        sync_settings: "Paramètres de synchronisation"
-        invites: "Codes d'invitation"
-        title: "Auto-hébergement"
-        danger_zone: "Zone dangereuse"
-        clear_cache: "Effacer le cache de données"
-        clear_cache_warning: "L'effacement du cache de données supprimera tous les taux de change, les cours des titres, les soldes des comptes et d'autres données. Cela ne supprimera pas les comptes, les transactions, les catégories ou d'autres données possédées par les utilisateurs."
-        confirm_clear_cache:
-          title: "Effacer le cache de données ?"
-          body: "Êtes-vous sûr(e) de vouloir effacer le cache de données ? Cela supprimera tous les taux de change, les cours des titres, les soldes des comptes et d'autres données. Cette action ne peut pas être annulée."
-      provider_selection:
-        exchange_rate_title: "Fournisseur de taux de change"
-        exchange_rate_description: "Sélectionnez un seul fournisseur pour récupérer les taux de change des devises."
-        exchange_rate_provider_label: "Fournisseur de taux de change"
-        securities_title: "Fournisseurs de titres"
-        securities_description: "Activez un ou plusieurs fournisseurs pour récupérer les cours des actions, ETF et fonds communs. Lors d'une recherche, tous les fournisseurs activés sont interrogés et les résultats sont fusionnés."
-        env_configured_message: "La sélection du fournisseur est désactivée car des variables d'environnement sont définies. Pour activer la sélection ici, supprimez ces variables d'environnement de votre configuration."
-        twelve_data_hint: "nécessite une clé API, 800 crédits/jour"
-        yahoo_finance_hint: "gratuit, aucune clé API requise"
-        requires_api_key: "nécessite une clé API"
-        requires_api_key_eodhd: "nécessite une clé API, limite de 20 appels/jour"
-        requires_api_key_alpha_vantage: "nécessite une clé API, limite de 25 appels/jour"
-        mfapi_hint: "gratuit, aucune clé API -- fonds communs indiens uniquement"
-        binance_public_hint: "gratuit, aucune clé API -- crypto uniquement (BTC, ETH, etc.)"
-        providers:
-          twelve_data: "Twelve Data"
-          yahoo_finance: "Yahoo Finance"
-          tiingo: "Tiingo"
-          eodhd: "EODHD"
-          alpha_vantage: "Alpha Vantage"
-          mfapi: "MFAPI.in"
-          binance_public: "Binance"
-      assistant_settings:
-        title: "Assistant IA"
-        description: "Choisissez comment l'assistant de discussion répond. Intégré utilise directement votre fournisseur LLM configuré. Externe délègue à un agent IA distant qui peut invoquer les outils financiers de Sure via MCP."
-        type_label: "Type d'assistant"
-        type_builtin: "Intégré (LLM direct)"
-        type_external: "Externe (agent distant)"
-        external_status: "Endpoint de l'assistant externe"
-        external_configured: "Configuré"
-        external_not_configured: "Non configuré. Saisissez l'URL et le token ci-dessous, ou définissez les variables d'environnement EXTERNAL_ASSISTANT_URL et EXTERNAL_ASSISTANT_TOKEN."
-        env_notice: "Le type d'assistant est verrouillé sur '%{type}' via la variable d'environnement ASSISTANT_TYPE."
-        env_configured_external: "Configuré avec succès via les variables d'environnement."
-        url_label: "URL du endpoint"
-        url_placeholder: "https://your-agent-host/v1/chat"
-        url_help: "L'URL complète du endpoint de l'API de votre agent. Votre fournisseur d'agent vous la fournira."
-        token_label: "Token API"
-        token_placeholder: "Saisissez le token de votre fournisseur d'agent"
-        token_help: "Le token d'authentification fourni par votre agent externe. Il est envoyé en tant que Bearer token avec chaque requête."
-        agent_id_label: "ID de l'agent (Optionnel)"
-        agent_id_placeholder: "main (par défaut)"
-        agent_id_help: "Route vers un agent spécifique lorsque le fournisseur en héberge plusieurs. Laisser vide pour la valeur par défaut."
-        disconnect_title: "Connexion externe"
-        disconnect_description: "Supprimer la connexion à l'assistant externe et revenir à l'assistant intégré."
-        disconnect_button: "Déconnecter"
-        confirm_disconnect:
-          title: "Déconnecter l'assistant externe ?"
-          body: "Cela supprimera l'URL, le token et l'ID de l'agent enregistrés, et basculera vers l'assistant intégré. Vous pourrez vous reconnecter ultérieurement en saisissant de nouvelles informations d'identification."
-      brand_fetch_settings:
-        description: "Saisissez l'ID client fourni par Brand Fetch"
-        label: "ID client"
-        placeholder: "Entrez votre ID client ici"
-        title: "Paramètres Brand Fetch"
-        high_res_label: "Activer les logos haute résolution"
-        high_res_description: "Lorsque cette option est activée, les logos seront récupérés en résolution 120x120 au lieu de 40x40. Cela offre des images plus nettes sur les écrans à haute densité de pixels."
-      openai_settings:
-        description: "Saisissez le jeton d'accès et configurez éventuellement un fournisseur compatible OpenAI personnalisé"
-        env_configured_message: "Configuré avec succès via les variables d'environnement."
-        access_token_label: "Jeton d'accès"
-        access_token_placeholder: "Entrez votre jeton d'accès ici"
-        uri_base_label: "URL de base de l'API (Optionnel)"
-        uri_base_placeholder: "https://api.openai.com/v1 (par défaut)"
-        model_label: "Modèle (Optionnel)"
-        model_placeholder: "gpt-4.1 (par défaut)"
-        json_mode_label: "Mode JSON"
-        json_mode_auto: "Auto (recommandé)"
-        json_mode_strict: "Strict (meilleur pour les modèles de raisonnement)"
-        json_mode_none: "Aucun (meilleur pour les modèles standard)"
-        json_mode_json_object: "Objet JSON"
-        json_mode_help: "Le mode strict fonctionne mieux avec les modèles de raisonnement (qwen-thinking, deepseek-reasoner). Le mode aucun fonctionne mieux avec les modèles standard (llama, mistral, gpt-oss)."
-        budget_heading: "Budget de tokens"
-        budget_description: "S'applique à chaque appel LLM — historique de discussion, auto-catégorisation, détection de marchand et traitement PDF. Les valeurs par défaut sont conservatrices pour les modèles locaux à petit contexte. Augmentez-les pour les modèles cloud avec des fenêtres de contexte plus grandes."
-        context_window_label: "Fenêtre de contexte (Optionnel)"
-        context_window_help: "Nombre total de tokens que le modèle acceptera. Par défaut : 2048 — augmenter à 8192+ pour OpenAI cloud ou les modèles locaux à grand contexte."
-        max_response_tokens_label: "Tokens de réponse max (Optionnel)"
-        max_response_tokens_help: "Tokens réservés à la réponse du modèle. Par défaut : 512. Abaisser pour libérer de l'espace pour un historique plus long."
-        max_items_per_call_label: "Nombre maximum d'éléments par lot (Optionnel)"
-        max_items_per_call_help: "Limite supérieure pour les lots d'auto-catégorisation / détection de marchand. Par défaut : 25. Les lots plus grands sont automatiquement découpés pour tenir dans la fenêtre de contexte."
-        title: "OpenAI"
-      yahoo_finance_settings:
-        title: "Yahoo Finance"
-        description: "Yahoo Finance fournit un accès gratuit aux cours boursiers, taux de change et données financières sans nécessiter de clé API."
-        status_active: "Yahoo Finance est actif et fonctionne"
-        status_inactive: "La connexion à Yahoo Finance a échoué"
-        connection_failed: "Impossible de se connecter à Yahoo Finance"
-        troubleshooting: "Vérifiez votre connexion Internet et les paramètres de votre pare-feu. Yahoo Finance peut être temporairement indisponible."
-      tiingo_settings:
-        title: "Tiingo"
-        description: "Saisissez le token API fourni par Tiingo. Le forfait gratuit supporte 50 symboles uniques par heure avec plus de 30 ans de données historiques."
-        env_configured_message: "Configuré avec succès via la variable d'environnement TIINGO_API_KEY."
-        label: "Token API"
-        placeholder: "Entrez votre token API Tiingo ici"
-        show_details: "(afficher les détails)"
-        step_1_html: 'Visitez <a href="https://www.tiingo.com" target="_blank" rel="noopener noreferrer" class="underline">tiingo.com</a> et créez un compte gratuit.'
-        step_2_html: 'Accédez à la page <a href="https://www.tiingo.com/account/api/token" target="_blank" rel="noopener noreferrer" class="underline">Token API</a>.'
-        step_3: "Copiez votre token API et collez-le ci-dessous."
-      eodhd_settings:
-        title: "EODHD"
-        description: "Saisissez le token API fourni par EODHD. Supporte les ETF européens sur LSE, XETRA et d'autres places boursières internationales."
-        env_configured_message: "Configuré avec succès via la variable d'environnement EODHD_API_KEY."
-        label: "Token API"
-        placeholder: "Entrez votre token API EODHD ici"
-        show_details: "(afficher les détails)"
-        step_1_html: 'Visitez <a href="https://eodhd.com/register" target="_blank" rel="noopener noreferrer" class="underline">eodhd.com</a> et créez un compte gratuit.'
-        step_2_html: 'Accédez à votre <a href="https://eodhd.com/cp/dashboard" target="_blank" rel="noopener noreferrer" class="underline">Tableau de bord</a> pour trouver votre token API.'
-        step_3: "Copiez votre token API et collez-le ci-dessous."
-        rate_limit_warning: "Le forfait gratuit EODHD est limité à 20 appels API par jour. À utiliser de préférence comme fournisseur complémentaire pour les ETF européens non disponibles chez d'autres fournisseurs."
       alpha_vantage_settings:
-        title: "Alpha Vantage"
-        description: "Saisissez la clé API d'Alpha Vantage. Supporte les ETF européens sur la Bourse de Londres, XETRA et d'autres places boursières."
-        env_configured_message: "Configuré avec succès via la variable d'environnement ALPHA_VANTAGE_API_KEY."
-        label: "Clé API"
-        placeholder: "Entrez votre clé API Alpha Vantage ici"
+        description: Saisissez la clé API d'Alpha Vantage. Prend en charge les ETF de l'UE sur la Bourse de Londres, XETRA et d'autres places boursières.
+        env_configured_message: Configuré avec succès via la variable d'environnement ALPHA_VANTAGE_API_KEY.
+        label: Clé API
+        no_health_check_note: La vérification de l'état de la connexion est indisponible pour ce fournisseur en raison de la limite stricte de taux.
+        placeholder: Saisissez votre clé API Alpha Vantage ici
+        rate_limit_warning: L'offre gratuite d'Alpha Vantage est limitée à 25 appels d'API par jour. Idéal comme fournisseur supplémentaire pour les ETF de l'UE non disponibles chez d'autres fournisseurs.
         show_details: "(afficher les détails)"
-        step_1_html: 'Visitez <a href="https://www.alphavantage.co/support/#api-key" target="_blank" rel="noopener noreferrer" class="underline">alphavantage.co</a> et réclamez votre clé API gratuite.'
-        step_2: "Copiez la clé API et collez-la ci-dessous."
-        rate_limit_warning: "Le forfait gratuit Alpha Vantage est limité à 25 appels API par jour. À utiliser de préférence comme fournisseur complémentaire pour les ETF européens non disponibles chez d'autres fournisseurs."
-        no_health_check_note: "La vérification de l'état de la connexion n'est pas disponible pour ce fournisseur en raison de la limite de débit stricte."
-      twelve_data_settings:
-        title: "Twelve Data"
-        api_calls_used: "%{used} / %{limit} appels API quotidiens utilisés (%{percentage})"
-        description: "Saisissez la clé API fournie par Twelve Data"
-        env_configured_message: "Configurée avec succès via la variable d'environnement TWELVE_DATA_API_KEY."
-        label: "Clé API"
-        placeholder: "Entrez votre clé API ici"
+        step_1_html: Visitez <a href="https://www.alphavantage.co/support/#api-key" target="_blank" rel="noopener noreferrer" class="underline">alphavantage.co</a> pour obtenir votre clé API gratuite.
+        step_2: Copiez la clé API et collez-la ci-dessous.
+        title: Alpha Vantage
+      anthropic_settings:
+        access_token_label: Clé API
+        access_token_placeholder: Saisissez votre clé API Anthropic
+        base_url_label: URL de base (Facultatif)
+        base_url_placeholder: https://api.anthropic.com (par défaut)
+        description: Saisissez votre clé API Anthropic. Pointez éventuellement l'URL de base vers AWS Bedrock ou GCP Vertex.
+        env_configured_message: Configuré avec succès via les variables d'environnement.
+        model_help: Utilisé pour le chat et le traitement des PDF. Les opérations par lots (catégorisation, détection des commerçants) utilisent par défaut Haiku pour des raisons de coût.
+        model_label: Modèle par défaut (Facultatif)
+        model_placeholder: claude-sonnet-4-6 (par défaut)
+        title: Anthropic (Claude)
+      assistant_settings:
+        agent_id_help: Route vers un agent spécifique lorsque le fournisseur en héberge plusieurs. Laisser vide pour la valeur par défaut.
+        agent_id_label: ID de l'agent (Optionnel)
+        agent_id_placeholder: main (par défaut)
+        confirm_disconnect:
+          body: Cela supprimera l'URL, le token et l'ID de l'agent enregistrés, et basculera vers l'assistant intégré. Vous pourrez vous reconnecter ultérieurement en saisissant de nouvelles informations d'identification.
+          title: Déconnecter l'assistant externe ?
+        description: Choisissez comment l'assistant de discussion répond. Intégré utilise directement votre fournisseur LLM configuré. Externe délègue à un agent IA distant qui peut invoquer les outils financiers de Sure via MCP.
+        disconnect_button: Déconnecter
+        disconnect_description: Supprimer la connexion à l'assistant externe et revenir à l'assistant intégré.
+        disconnect_title: Connexion externe
+        env_configured_external: Configuré avec succès via les variables d'environnement.
+        env_notice: Le type d'assistant est verrouillé sur '%{type}' via la variable d'environnement ASSISTANT_TYPE.
+        external_configured: Configuré
+        external_not_configured: Non configuré. Saisissez l'URL et le token ci-dessous, ou définissez les variables d'environnement EXTERNAL_ASSISTANT_URL et EXTERNAL_ASSISTANT_TOKEN.
+        external_status: Endpoint de l'assistant externe
+        title: Assistant IA
+        token_help: Le token d'authentification fourni par votre agent externe. Il est envoyé en tant que Bearer token avec chaque requête.
+        token_label: Token API
+        token_placeholder: Saisissez le token de votre fournisseur d'agent
+        type_builtin: Intégré (LLM direct)
+        type_external: Externe (agent distant)
+        type_label: Type d'assistant
+        url_help: L'URL complète du endpoint de l'API de votre agent. Votre fournisseur d'agent vous la fournira.
+        url_label: URL du endpoint
+        url_placeholder: https://your-agent-host/v1/chat
+      brand_fetch_settings:
+        description: Saisissez l'ID client fourni par Brand Fetch
+        env_configured_message: Vous avez configuré avec succès votre ID client Brand Fetch via la variable d'environnement BRAND_FETCH_CLIENT_ID.
+        high_res_description: Lorsque cette option est activée, les logos seront récupérés en résolution 120x120 au lieu de 40x40. Cela offre des images plus nettes sur les écrans à haute densité de pixels.
+        high_res_label: Activer les logos haute résolution
+        label: ID client
+        placeholder: Entrez votre ID client ici
+        setup_step_1_html: Visitez <a href="https://brandfetch.com/developers" target="_blank" rel="noopener noreferrer" class="underline">brandfetch.com</a> et créez un compte de développeur Brand Fetch gratuit.
+        setup_step_2_html: Accédez à la page <a href="https://developers.brandfetch.com/dashboard/logo-api" target="_blank" rel="noopener noreferrer" class="underline">API du logo</a>.
+        setup_step_3: Appuyez sur l'icône en forme d'œil sous la section « Votre ID client » pour révéler votre ID client et collez-le ci-dessous.
         show_details: "(afficher les détails)"
-        step_1_html: 'Visitez <a href="https://twelvedata.com/register" target="_blank" rel="noopener noreferrer" class="underline">twelvedata.com</a> et créez un compte Twelve Data Developer gratuit.'
-        step_2_html: 'Accédez à la page <a href="https://twelvedata.com/account/api-keys" target="_blank" rel="noopener noreferrer" class="underline">Clés API</a>.'
-        step_3: "Révélez votre clé secrète et collez-la ci-dessous."
-        plan: "Forfait %{plan}"
-        plan_upgrade_warning_title: "Certains tickers nécessitent un forfait payant"
-        plan_upgrade_warning_description: "Les tickers suivants de votre portefeuille ne peuvent pas synchroniser leurs cours avec votre forfait Twelve Data actuel."
-        requires_plan: "nécessite le forfait %{plan}"
-        view_pricing: "Voir les tarifs Twelve Data"
-      update:
-        failure: "Valeur de paramètre invalide"
-        success: "Paramètres mis à jour"
-        invalid_onboarding_state: "État d'intégration invalide"
-        invalid_sync_time: "Format d'heure de synchronisation invalide. Veuillez utiliser le format HH:MM (ex. 02:30)."
-        invalid_llm_budget: "%{field} doit être un nombre entier ≥ %{minimum}."
-        scheduler_sync_failed: "Paramètres enregistrés, mais la mise à jour du planning de synchronisation a échoué. Veuillez réessayer ou vérifier les journaux du serveur."
-      disconnect_external_assistant:
-        external_assistant_disconnected: "Assistant externe déconnecté"
+        title: Paramètres Brand Fetch
       clear_cache:
-        cache_cleared: "Le cache de données a été effacé. Cela peut prendre quelques instants."
-      not_authorized: "Vous n'êtes pas autorisé(e) à effectuer cette action"
+        cache_cleared: Le cache de données a été effacé. Cela peut prendre quelques instants.
+      disconnect_external_assistant:
+        external_assistant_disconnected: Assistant externe déconnecté
+      ensure_admin:
+        not_authorized: Vous n'êtes pas autorisé à effectuer cette action
+      ensure_super_admin_for_onboarding:
+        not_authorized: Vous n'êtes pas autorisé à effectuer cette action
+      eodhd_settings:
+        description: Saisissez le token API fourni par EODHD. Supporte les ETF européens sur LSE, XETRA et d'autres places boursières internationales.
+        env_configured_message: Configuré avec succès via la variable d'environnement EODHD_API_KEY.
+        label: Token API
+        placeholder: Entrez votre token API EODHD ici
+        rate_limit_warning: Le forfait gratuit EODHD est limité à 20 appels API par jour. À utiliser de préférence comme fournisseur complémentaire pour les ETF européens non disponibles chez d'autres fournisseurs.
+        show_details: "(afficher les détails)"
+        step_1_html: Visitez <a href="https://eodhd.com/register" target="_blank" rel="noopener noreferrer" class="underline">eodhd.com</a> et créez un compte gratuit.
+        step_2_html: Accédez à votre <a href="https://eodhd.com/cp/dashboard" target="_blank" rel="noopener noreferrer" class="underline">Tableau de bord</a> pour trouver votre token API.
+        step_3: Copiez votre token API et collez-le ci-dessous.
+        title: EODHD
+      invite_code_settings:
+        default_family_description: Placer les nouveaux utilisateurs dans cette famille/groupe uniquement s'ils n'ont pas d'invitation.
+        default_family_none: Aucune (créer une nouvelle famille)
+        default_family_title: Famille par défaut pour les nouveaux utilisateurs
+        description: Contrôlez comment les nouvelles personnes s'inscrivent à votre instance de %{product}.
+        email_confirmation_description: Lorsque cette option est activée, les utilisateurs doivent confirmer leur nouvelle adresse e-mail lorsqu'ils la modifient.
+        email_confirmation_title: Exiger la confirmation de l'e-mail
+        generate_tokens: Générer un nouveau code
+        generated_tokens: Codes générés
+        states:
+          closed: Fermé
+          invite_only: Sur invitation uniquement
+          open: Ouvert
+        title: Inscription des utilisateurs
+      llm_provider_selector:
+        data_retention: Les entrées de l'API ne sont pas utilisées pour entraîner les modèles par défaut ; les API hébergées des fournisseurs conservent les données pendant environ 30 jours pour des raisons de confiance et de sécurité. Les terminaux personnalisés ou auto-hébergés suivent votre propre politique.
+        data_retention_heading: Traitement des données
+        description: Choisissez quel LLM alimente le chat IA. Les opérations par lots (catégorisation des transactions, détection des commerçants et traitement des PDF) utilisent actuellement toujours OpenAI.
+        env_configured_message: Configuré avec succès via la variable d'environnement LLM_PROVIDER.
+        not_configured_hint: Ajoutez une clé API %{provider} ci-dessous pour l'activer.
+        provider_anthropic: Anthropic (Claude)
+        provider_help: Le changement de fournisseur prend effet lors du prochain chat. Configurez les identifiants du fournisseur actif ci-dessous.
+        provider_label: Fournisseur de LLM actif
+        provider_openai: OpenAI
+        title: Fournisseur d'IA
+      not_authorized: Vous n'êtes pas autorisé(e) à effectuer cette action
+      openai_settings:
+        access_token_label: Jeton d'accès
+        access_token_placeholder: Entrez votre jeton d'accès ici
+        budget_description: S'applique à chaque appel LLM — historique de discussion, auto-catégorisation, détection de marchand et traitement PDF. Les valeurs par défaut sont conservatrices pour les modèles locaux à petit contexte. Augmentez-les pour les modèles cloud avec des fenêtres de contexte plus grandes.
+        budget_heading: Budget de tokens
+        context_window_help: 'Nombre total de tokens que le modèle acceptera. Par défaut : 2048 — augmenter à 8192+ pour OpenAI cloud ou les modèles locaux à grand contexte.'
+        context_window_label: Fenêtre de contexte (Optionnel)
+        description: Saisissez le jeton d'accès et configurez éventuellement un fournisseur compatible OpenAI personnalisé
+        env_configured_message: Configuré avec succès via les variables d'environnement.
+        json_mode_auto: Auto (recommandé)
+        json_mode_help: Le mode strict fonctionne mieux avec les modèles de raisonnement (qwen-thinking, deepseek-reasoner). Le mode aucun fonctionne mieux avec les modèles standard (llama, mistral, gpt-oss).
+        json_mode_json_object: Objet JSON
+        json_mode_label: Mode JSON
+        json_mode_none: Aucun (meilleur pour les modèles standard)
+        json_mode_strict: Strict (meilleur pour les modèles de raisonnement)
+        max_items_per_call_help: 'Limite supérieure pour les lots d''auto-catégorisation / détection de marchand. Par défaut : 25. Les lots plus grands sont automatiquement découpés pour tenir dans la fenêtre de contexte.'
+        max_items_per_call_label: Nombre maximum d'éléments par lot (Optionnel)
+        max_response_tokens_help: 'Tokens réservés à la réponse du modèle. Par défaut : 512. Abaisser pour libérer de l''espace pour un historique plus long.'
+        max_response_tokens_label: Tokens de réponse max (Optionnel)
+        model_label: Modèle (Optionnel)
+        model_placeholder: gpt-4.1 (par défaut)
+        title: OpenAI
+        uri_base_label: URL de base de l'API (Optionnel)
+        uri_base_placeholder: https://api.openai.com/v1 (par défaut)
+      provider_selection:
+        binance_public_hint: gratuit, aucune clé API -- crypto uniquement (BTC, ETH, etc.)
+        env_configured_message: La sélection du fournisseur est désactivée car des variables d'environnement sont définies. Pour activer la sélection ici, supprimez ces variables d'environnement de votre configuration.
+        exchange_rate_description: Sélectionnez un seul fournisseur pour récupérer les taux de change des devises.
+        exchange_rate_provider_label: Fournisseur de taux de change
+        exchange_rate_title: Fournisseur de taux de change
+        mfapi_hint: gratuit, aucune clé API -- fonds communs indiens uniquement
+        moex_public_hint: gratuit, pas de clé API -- actions, fonds et obligations russes (MOEX), y compris change RUB
+        providers:
+          alpha_vantage: Alpha Vantage
+          binance_public: Binance
+          eodhd: EODHD
+          frankfurter: Frankfurter
+          mfapi: MFAPI.in
+          moex_public: MOEX
+          tiingo: Tiingo
+          tinkoff_invest: T-Invest (T-Bank)
+          twelve_data: Twelve Data
+          yahoo_finance: Yahoo Finance
+        requires_api_key: nécessite une clé API
+        requires_api_key_alpha_vantage: nécessite une clé API, limite de 25 appels/jour
+        requires_api_key_eodhd: nécessite une clé API, limite de 20 appels/jour
+        securities_description: Activez un ou plusieurs fournisseurs pour récupérer les cours des actions, ETF et fonds communs. Lors d'une recherche, tous les fournisseurs activés sont interrogés et les résultats sont fusionnés.
+        securities_title: Fournisseurs de titres
+        tinkoff_invest_hint: requiert un jeton en lecture seule -- cours des actions/fonds/obligations russes + logos des marques
+        twelve_data_hint: nécessite une clé API, 800 crédits/jour
+        yahoo_finance_hint: gratuit, aucune clé API requise
+      show:
+        ai_assistant: Assistant IA
+        clear_cache: Effacer le cache de données
+        clear_cache_warning: L'effacement du cache de données supprimera tous les taux de change, les cours des titres, les soldes des comptes et d'autres données. Cela ne supprimera pas les comptes, les transactions, les catégories ou d'autres données possédées par les utilisateurs.
+        confirm_clear_cache:
+          body: Êtes-vous sûr(e) de vouloir effacer le cache de données ? Cela supprimera tous les taux de change, les cours des titres, les soldes des comptes et d'autres données. Cette action ne peut pas être annulée.
+          title: Effacer le cache de données ?
+        danger_zone: Zone dangereuse
+        financial_data_providers: Fournisseurs de données financières
+        general: Paramètres généraux
+        invites: Codes d'invitation
+        sync_settings: Paramètres de synchronisation
+        title: Auto-hébergement
+      sync_auto_sync_scheduler!:
+        scheduler_sync_failed: Paramètres enregistrés, mais échec de la mise à jour de la planification de synchronisation. Veuillez réessayer ou vérifier les journaux du serveur.
       sync_settings:
-        auto_sync_label: "Activer la synchronisation automatique"
-        auto_sync_description: "Lorsque cette option est activée, tous les comptes seront automatiquement synchronisés quotidiennement à l'heure spécifiée."
-        auto_sync_time_label: "Heure de synchronisation (HH:MM)"
-        auto_sync_time_description: "Spécifiez l'heure à laquelle la synchronisation automatique doit se produire."
-        include_pending_label: "Inclure les transactions en attente"
-        include_pending_description: "Lorsque cette option est activée, les transactions en attente (non confirmées) seront importées et automatiquement réconciliées lors de leur validation. Désactivez si votre banque fournit des données de transactions en attente peu fiables."
-        env_configured_message: "Ce paramètre est désactivé car une variable d'environnement du fournisseur (SIMPLEFIN_INCLUDE_PENDING ou PLAID_INCLUDE_PENDING) est définie. Supprimez-la pour activer ce paramètre."
+        auto_sync_description: Lorsque cette option est activée, tous les comptes seront automatiquement synchronisés quotidiennement à l'heure spécifiée.
+        auto_sync_label: Activer la synchronisation automatique
+        auto_sync_time_description: Spécifiez l'heure à laquelle la synchronisation automatique doit se produire.
+        auto_sync_time_label: Heure de synchronisation (HH:MM)
+        env_configured_message: Ce paramètre est désactivé car une variable d'environnement du fournisseur (SIMPLEFIN_INCLUDE_PENDING ou PLAID_INCLUDE_PENDING) est définie. Supprimez-la pour activer ce paramètre.
+        include_pending_description: Lorsque cette option est activée, les transactions en attente (non confirmées) seront importées et automatiquement réconciliées lors de leur validation. Désactivez si votre banque fournit des données de transactions en attente peu fiables.
+        include_pending_label: Inclure les transactions en attente
+      tiingo_settings:
+        description: Saisissez le token API fourni par Tiingo. Le forfait gratuit supporte 50 symboles uniques par heure avec plus de 30 ans de données historiques.
+        env_configured_message: Configuré avec succès via la variable d'environnement TIINGO_API_KEY.
+        label: Token API
+        placeholder: Entrez votre token API Tiingo ici
+        show_details: "(afficher les détails)"
+        step_1_html: Visitez <a href="https://www.tiingo.com" target="_blank" rel="noopener noreferrer" class="underline">tiingo.com</a> et créez un compte gratuit.
+        step_2_html: Accédez à la page <a href="https://www.tiingo.com/account/api/token" target="_blank" rel="noopener noreferrer" class="underline">Token API</a>.
+        step_3: Copiez votre token API et collez-le ci-dessous.
+        title: Tiingo
+      tinkoff_invest_settings:
+        description: Saisissez un jeton API T-Invest en lecture seule. Utilisé pour récupérer les logos de marque des titres (y compris les fonds et obligations, même lorsque MOEX les évalue) et, lorsqu'il est activé ci-dessus, les prix des instruments russes.
+        env_configured_message: Configuré avec succès via la variable d'environnement TINKOFF_INVEST_API_KEY.
+        label: Jeton API
+        placeholder: Saisissez votre jeton API T-Invest ici
+        show_details: "(afficher les détails)"
+        step_1: Ouvrez T-Bank investissements, puis Paramètres, puis jetons API (nécessite un compte de courtage T-Bank ouvert).
+        step_2: Créez un jeton avec un accès en lecture seule.
+        step_3: Copiez le jeton et collez-le ci-dessous.
+        title: T-Invest (T-Bank)
+      twelve_data_settings:
+        api_calls_used: "%{used} / %{limit} appels API quotidiens utilisés (%{percentage})"
+        description: Saisissez la clé API fournie par Twelve Data
+        env_configured_message: Configurée avec succès via la variable d'environnement TWELVE_DATA_API_KEY.
+        label: Clé API
+        placeholder: Entrez votre clé API ici
+        plan: Forfait %{plan}
+        plan_upgrade_warning_description: Les tickers suivants de votre portefeuille ne peuvent pas synchroniser leurs cours avec votre forfait Twelve Data actuel.
+        plan_upgrade_warning_title: Certains tickers nécessitent un forfait payant
+        requires_plan: nécessite le forfait %{plan}
+        show_details: "(afficher les détails)"
+        step_1_html: Visitez <a href="https://twelvedata.com/register" target="_blank" rel="noopener noreferrer" class="underline">twelvedata.com</a> et créez un compte Twelve Data Developer gratuit.
+        step_2_html: Accédez à la page <a href="https://twelvedata.com/account/api-keys" target="_blank" rel="noopener noreferrer" class="underline">Clés API</a>.
+        step_3: Révélez votre clé secrète et collez-la ci-dessous.
+        title: Twelve Data
+        view_pricing: Voir les tarifs Twelve Data
+      update:
+        anthropic_model_required_for_base_url: Le modèle Anthropic est requis lorsqu'une URL de base personnalisée est définie.
+        failure: Valeur de paramètre invalide
+        invalid_anthropic_base_url: L'URL de base d'Anthropic doit être une URL http(s).
+        invalid_llm_budget: "%{field} doit être un nombre entier ≥ %{minimum}."
+        invalid_onboarding_state: État d'intégration invalide
+        invalid_sync_time: Format d'heure de synchronisation invalide. Veuillez utiliser le format HH:MM (ex. 02:30).
+        scheduler_sync_failed: Paramètres enregistrés, mais la mise à jour du planning de synchronisation a échoué. Veuillez réessayer ou vérifier les journaux du serveur.
+        success: Paramètres mis à jour
+      yahoo_finance_settings:
+        connection_failed: Impossible de se connecter à Yahoo Finance
+        description: Yahoo Finance fournit un accès gratuit aux cours boursiers, taux de change et données financières sans nécessiter de clé API.
+        status_active: Yahoo Finance est actif et fonctionne
+        status_inactive: La connexion à Yahoo Finance a échoué
+        title: Yahoo Finance
+        troubleshooting: Vérifiez votre connexion Internet et les paramètres de votre pare-feu. Yahoo Finance peut être temporairement indisponible.
diff --git a/config/locales/views/settings/hostings/hu.yml b/config/locales/views/settings/hostings/hu.yml
index 3d0131bfb..5683ab649 100644
--- a/config/locales/views/settings/hostings/hu.yml
+++ b/config/locales/views/settings/hostings/hu.yml
@@ -44,6 +44,7 @@ hu:
         requires_api_key_alpha_vantage: API-kulcs szükséges, 25 hívás/nap limit
         mfapi_hint: ingyenes, nem kell API-kulcs – csak indiai befektetési alapok
         binance_public_hint: ingyenes, nem kell API-kulcs – csak kriptó (BTC, ETH stb.)
+        moex_public_hint: ingyenes, nem kell API-kulcs – orosz részvények, alapok és kötvények (MOEX), RUB devizával
         providers:
           twelve_data: Twelve Data
           yahoo_finance: Yahoo Finance
@@ -52,6 +53,7 @@ hu:
           alpha_vantage: Alpha Vantage
           mfapi: MFAPI.in
           binance_public: Binance
+          moex_public: MOEX
       assistant_settings:
         title: AI-asszisztens
         description: Válaszd ki, hogyan válaszoljon a csevegési asszisztens. A beépített mód közvetlenül a beállított LLM-szolgáltatót használja. A külső mód egy távoli AI-ügynökhöz továbbítja a kérést, amely MCP-n keresztül hozzáférhet a Sure pénzügyi eszközeihez.
diff --git a/config/locales/views/settings/hostings/it.yml b/config/locales/views/settings/hostings/it.yml
new file mode 100644
index 000000000..70e40ea00
--- /dev/null
+++ b/config/locales/views/settings/hostings/it.yml
@@ -0,0 +1,234 @@
+---
+it:
+  settings:
+    hostings:
+      invite_code_settings:
+        description: Controlla come le nuove persone si registrano alla tua istanza di %{product}.
+        email_confirmation_description: Quando abilitato, gli utenti devono confermare il loro indirizzo email quando lo cambiano.
+        email_confirmation_title: Richiedi conferma email
+        default_family_title: Famiglia predefinita per i nuovi utenti
+        default_family_description: "Metti i nuovi utenti su questa famiglia/gruppo solo se non hanno un invito."
+        default_family_none: Nessuna (crea nuova famiglia)
+        generate_tokens: Genera nuovo codice
+        generated_tokens: Codici generati
+        title: Onboarding
+        states:
+          open: Aperto
+          closed: Chiuso
+          invite_only: Solo su invito
+      show:
+        general: Impostazioni generali
+        ai_assistant: Assistente IA
+        financial_data_providers: Provider dati finanziari
+        sync_settings: Impostazioni sincronizzazione
+        invites: Codici invito
+        title: Self-Hosting
+        danger_zone: Zona pericolosa
+        clear_cache: Svuota cache dati
+        clear_cache_warning: Svuotare la cache dei dati rimuoverà tutti i tassi di cambio, i prezzi dei titoli, i saldi dei conti e altri dati. Questo non eliminerà conti, transazioni, categorie o altri dati degli utenti.
+        confirm_clear_cache:
+          title: Svuotare la cache dei dati?
+          body: Sei sicuro di voler svuotare la cache dei dati? Questo rimuoverà tutti i tassi di cambio, i prezzi dei titoli, i saldi dei conti e altri dati. Questa azione non può essere annullata.
+      provider_selection:
+        exchange_rate_title: Provider tasso di cambio
+        exchange_rate_description: Seleziona un singolo provider per recuperare i tassi di cambio.
+        exchange_rate_provider_label: Provider tasso di cambio
+        securities_title: Provider titoli
+        securities_description: Abilita uno o più provider per recuperare prezzi di azioni, ETF e fondi comuni. Durante la ricerca, tutti i provider abilitati vengono interrogati e i risultati uniti.
+        env_configured_message: La selezione del provider è disabilitata perché sono impostate variabili d'ambiente. Per abilitare la selezione qui, rimuovi queste variabili d'ambiente dalla configurazione.
+        twelve_data_hint: richiede chiave API, 800 crediti/giorno
+        yahoo_finance_hint: gratuito, nessuna chiave API richiesta
+        requires_api_key: richiede chiave API
+        requires_api_key_eodhd: richiede chiave API, limite 20 chiamate/giorno
+        requires_api_key_alpha_vantage: richiede chiave API, limite 25 chiamate/giorno
+        mfapi_hint: gratuito, nessuna chiave API — solo fondi comuni indiani
+        binance_public_hint: gratuito, nessuna chiave API — solo crypto (BTC, ETH, ecc.)
+        moex_public_hint: gratuito, nessuna chiave API — azioni, fondi e obbligazioni russe (MOEX), incluso FX RUB
+        tinkoff_invest_hint: richiede token di sola lettura — prezzi di azioni/fondi/obbligazioni russe + loghi dei brand
+        providers:
+          twelve_data: Twelve Data
+          yahoo_finance: Yahoo Finance
+          tiingo: Tiingo
+          eodhd: EODHD
+          alpha_vantage: Alpha Vantage
+          mfapi: MFAPI.in
+          binance_public: Binance
+          moex_public: MOEX
+          tinkoff_invest: T-Invest (T-Bank)
+      assistant_settings:
+        title: Assistente IA
+        description: Scegli come risponde l'assistente chat. Integrato usa il tuo provider LLM configurato direttamente. Esterno delega a un agente IA remoto che può richiamare gli strumenti finanziari di Sure tramite MCP.
+        type_label: Tipo di assistente
+        type_builtin: Integrato (LLM diretto)
+        type_external: Esterno (agente remoto)
+        external_status: Endpoint assistente esterno
+        external_configured: Configurato
+        external_not_configured: Non configurato. Inserisci l'URL e il token qui sotto, o imposta le variabili d'ambiente EXTERNAL_ASSISTANT_URL e EXTERNAL_ASSISTANT_TOKEN.
+        env_notice: "Il tipo di assistente è bloccato su '%{type}' tramite la variabile d'ambiente ASSISTANT_TYPE."
+        env_configured_external: Configurato con successo tramite variabili d'ambiente.
+        url_label: URL endpoint
+        url_placeholder: "https://your-agent-host/v1/chat"
+        url_help: L'URL completo all'endpoint API del tuo agente. Il tuo provider agente te lo fornirà.
+        token_label: Token API
+        token_placeholder: Inserisci il token dal tuo provider agente
+        token_help: Il token di autenticazione fornito dal tuo agente esterno. Viene inviato come token Bearer con ogni richiesta.
+        agent_id_label: ID agente (facoltativo)
+        agent_id_placeholder: "main (predefinito)"
+        agent_id_help: Instrada a un agente specifico quando il provider ospita più agenti. Lascia vuoto per il predefinito.
+        disconnect_title: Connessione esterna
+        disconnect_description: Rimuovi la connessione all'assistente esterno e torna all'assistente integrato.
+        disconnect_button: Disconnetti
+        confirm_disconnect:
+          title: Disconnettere l'assistente esterno?
+          body: Questo rimuoverà l'URL, il token e l'ID agente salvati, e passerà all'assistente integrato. Puoi riconnetterti in seguito inserendo nuove credenziali.
+      brand_fetch_settings:
+        description: Inserisci il Client ID fornito da Brand Fetch
+        env_configured_message: Hai configurato con successo il tuo Client ID di Brand Fetch tramite la variabile d'ambiente BRAND_FETCH_CLIENT_ID.
+        show_details: "(mostra dettagli)"
+        setup_step_1_html: 'Visita <a href="https://brandfetch.com/developers" target="_blank" rel="noopener noreferrer" class="underline">brandfetch.com</a> e crea un account sviluppatore Brand Fetch gratuito.'
+        setup_step_2_html: 'Vai alla pagina <a href="https://developers.brandfetch.com/dashboard/logo-api" target="_blank" rel="noopener noreferrer" class="underline">Logo API</a>.'
+        setup_step_3: 'Tocca l''icona occhio nella sezione "Il tuo Client ID" per visualizzare il tuo Client ID e incollarlo qui sotto.'
+        label: Client ID
+        placeholder: Inserisci il tuo Client ID qui
+        title: Impostazioni Brand Fetch
+        high_res_label: Abilita loghi ad alta risoluzione
+        high_res_description: Se abilitato, i loghi verranno recuperati alla risoluzione 120x120 invece di 40x40. Questo fornisce immagini più nitide su display ad alta densità.
+      llm_provider_selector:
+        title: Provider IA
+        description: Scegli quale LLM alimenta la chat IA. Le operazioni batch (categorizzazione transazioni, rilevamento commercianti e elaborazione PDF) usano sempre OpenAI.
+        env_configured_message: Configurato con successo tramite la variabile d'ambiente LLM_PROVIDER.
+        provider_label: Provider LLM attivo
+        provider_openai: OpenAI
+        provider_anthropic: Anthropic (Claude)
+        provider_help: Il cambio di provider ha effetto sulla prossima chat. Configura le credenziali del provider attivo qui sotto.
+        not_configured_hint: "Aggiungi una chiave API %{provider} qui sotto per attivarlo."
+        data_retention_heading: Gestione dati
+        data_retention: Gli input API non vengono usati per addestrare modelli per impostazione predefinita; le API hosted dei provider conservano i dati per ~30 giorni per fiducia e sicurezza. Gli endpoint personalizzati o self-hosted seguono la tua politica.
+      anthropic_settings:
+        title: Anthropic (Claude)
+        description: Inserisci la tua chiave API Anthropic. Opzionalmente punta l'URL base ad AWS Bedrock o GCP Vertex.
+        env_configured_message: Configurato con successo tramite variabili d'ambiente.
+        access_token_label: Chiave API
+        access_token_placeholder: Inserisci la tua chiave API Anthropic
+        base_url_label: URL base (facoltativo)
+        base_url_placeholder: "https://api.anthropic.com (predefinito)"
+        model_label: Modello predefinito (facoltativo)
+        model_placeholder: "claude-sonnet-4-6 (predefinito)"
+        model_help: Usato per chat ed elaborazione PDF. Le operazioni batch (categorizza, rilevamento commercianti) usano Haiku per il costo.
+      openai_settings:
+        description: Inserisci il token di accesso e opzionalmente configura un provider compatibile con OpenAI personalizzato
+        env_configured_message: Configurato con successo tramite variabili d'ambiente.
+        access_token_label: Token di accesso
+        access_token_placeholder: Inserisci il tuo token di accesso qui
+        uri_base_label: URL base API (facoltativo)
+        uri_base_placeholder: "https://api.openai.com/v1 (predefinito)"
+        model_label: Modello (facoltativo)
+        model_placeholder: "gpt-4.1 (predefinito)"
+        json_mode_label: Modalità JSON
+        json_mode_auto: Auto (consigliato)
+        json_mode_strict: Strict (ottimo per modelli thinking)
+        json_mode_none: Nessuno (ottimo per modelli standard)
+        json_mode_json_object: Oggetto JSON
+        json_mode_help: "La modalità Strict funziona meglio con i modelli thinking (qwen-thinking, deepseek-reasoner). La modalità None funziona meglio con i modelli standard (llama, mistral, gpt-oss)."
+        budget_heading: Budget token
+        budget_description: Si applica alle chiamate compatibili con OpenAI (chat, auto-categorizzazione, rilevamento commercianti ed elaborazione PDF). I valori predefiniti sono conservativi per i modelli locali a contesto ridotto. Aumenta per i modelli cloud con finestre di contesto più grandi.
+        context_window_label: Finestra di contesto (facoltativo)
+        context_window_help: "Token totali che il modello accetterà. Predefinito: 2048 — aumenta a 8192+ per OpenAI cloud o modelli locali a contesto ampio."
+        max_response_tokens_label: Token risposta massimi (facoltativo)
+        max_response_tokens_help: "Token riservati per la risposta del modello. Predefinito: 512. Diminuisci per liberare spazio per cronologie più lunghe."
+        max_items_per_call_label: Elementi massimi per batch (facoltativo)
+        max_items_per_call_help: "Limite superiore per batch di auto-categorizzazione/rilevamento commercianti. Predefinito: 25. I batch più grandi vengono suddivisi automaticamente per adattarsi alla finestra di contesto."
+        title: OpenAI
+      yahoo_finance_settings:
+        title: Yahoo Finance
+        description: Yahoo Finance fornisce accesso gratuito a prezzi azionari, tassi di cambio e dati finanziari senza richiedere una chiave API.
+        status_active: Yahoo Finance è attivo e funzionante
+        status_inactive: Connessione Yahoo Finance fallita
+        connection_failed: Impossibile connettersi a Yahoo Finance
+        troubleshooting: Controlla la connessione internet e le impostazioni del firewall. Yahoo Finance potrebbe essere temporaneamente non disponibile.
+      tiingo_settings:
+        title: Tiingo
+        description: Inserisci il token API fornito da Tiingo. Il piano gratuito supporta 50 simboli unici all'ora con oltre 30 anni di dati storici.
+        env_configured_message: Configurato con successo tramite la variabile d'ambiente TIINGO_API_KEY.
+        label: Token API
+        placeholder: Inserisci il tuo token API Tiingo qui
+        show_details: "(mostra dettagli)"
+        step_1_html: 'Visita <a href="https://www.tiingo.com" target="_blank" rel="noopener noreferrer" class="underline">tiingo.com</a> e crea un account gratuito.'
+        step_2_html: 'Vai alla pagina <a href="https://www.tiingo.com/account/api/token" target="_blank" rel="noopener noreferrer" class="underline">Token API</a>.'
+        step_3: Copia il tuo token API e incollalo qui sotto.
+      tinkoff_invest_settings:
+        title: T-Invest (T-Bank)
+        description: Inserisci un token API T-Invest di sola lettura. Usato per recuperare i loghi dei brand per i titoli (inclusi fondi e obbligazioni, anche quando i prezzi sono forniti da MOEX) e, se abilitato sopra, i prezzi per gli strumenti russi.
+        env_configured_message: Configurato con successo tramite la variabile d'ambiente TINKOFF_INVEST_API_KEY.
+        label: Token API
+        placeholder: Inserisci il tuo token API T-Invest qui
+        show_details: "(mostra dettagli)"
+        step_1: Apri T-Bank investments, poi Impostazioni, poi Token API (richiede un conto di intermediazione T-Bank aperto).
+        step_2: Crea un token con accesso in sola lettura.
+        step_3: Copia il token e incollalo qui sotto.
+      eodhd_settings:
+        title: EODHD
+        description: Inserisci il token API fornito da EODHD. Supporta ETF europei su LSE, XETRA e altre borse internazionali.
+        env_configured_message: Configurato con successo tramite la variabile d'ambiente EODHD_API_KEY.
+        label: Token API
+        placeholder: Inserisci il tuo token API EODHD qui
+        show_details: "(mostra dettagli)"
+        step_1_html: 'Visita <a href="https://eodhd.com/register" target="_blank" rel="noopener noreferrer" class="underline">eodhd.com</a> e crea un account gratuito.'
+        step_2_html: 'Vai alla tua <a href="https://eodhd.com/cp/dashboard" target="_blank" rel="noopener noreferrer" class="underline">Dashboard</a> per trovare il tuo token API.'
+        step_3: Copia il tuo token API e incollalo qui sotto.
+        rate_limit_warning: "Il piano gratuito EODHD è limitato a 20 chiamate API al giorno. Usato al meglio come provider supplementare per ETF europei non disponibili da altri provider."
+      alpha_vantage_settings:
+        title: Alpha Vantage
+        description: Inserisci la chiave API da Alpha Vantage. Supporta ETF europei su London Stock Exchange, XETRA e altre borse.
+        env_configured_message: Configurato con successo tramite la variabile d'ambiente ALPHA_VANTAGE_API_KEY.
+        label: Chiave API
+        placeholder: Inserisci qui la tua chiave API Alpha Vantage
+        show_details: "(mostra dettagli)"
+        step_1_html: 'Visita <a href="https://www.alphavantage.co/support/#api-key" target="_blank" rel="noopener noreferrer" class="underline">alphavantage.co</a> e ottieni la tua chiave API gratuita.'
+        step_2: Copia la chiave API e incollala qui sotto.
+        rate_limit_warning: "Il piano gratuito Alpha Vantage è limitato a 25 chiamate API al giorno. Usato al meglio come provider supplementare per ETF europei non disponibili da altri provider."
+        no_health_check_note: "Il controllo salute della connessione non è disponibile per questo provider a causa del limite di frequenza rigoroso."
+      twelve_data_settings:
+        api_calls_used: "%{used} / %{limit} chiamate API giornaliere usate (%{percentage})"
+        description: Inserisci la chiave API fornita da Twelve Data
+        env_configured_message: Configurato con successo tramite la variabile d'ambiente TWELVE_DATA_API_KEY.
+        label: Chiave API
+        placeholder: Inserisci qui la tua chiave API
+        show_details: "(mostra dettagli)"
+        step_1_html: 'Visita <a href="https://twelvedata.com/register" target="_blank" rel="noopener noreferrer" class="underline">twelvedata.com</a> e crea un account sviluppatore Twelve Data gratuito.'
+        step_2_html: 'Vai alla pagina <a href="https://twelvedata.com/account/api-keys" target="_blank" rel="noopener noreferrer" class="underline">Chiavi API</a>.'
+        step_3: Mostra la tua chiave segreta e incollala qui sotto.
+        plan: "Piano %{plan}"
+        plan_upgrade_warning_title: Alcuni ticker richiedono un piano a pagamento
+        plan_upgrade_warning_description: I seguenti ticker nel tuo portafoglio non possono sincronizzare i prezzi con il tuo piano Twelve Data attuale.
+        requires_plan: richiede piano %{plan}
+        view_pricing: Visualizza prezzi Twelve Data
+        title: Twelve Data
+      update:
+        failure: Valore impostazione non valido
+        success: Impostazioni aggiornate
+        invalid_onboarding_state: Stato di onboarding non valido
+        invalid_sync_time: Formato orario di sincronizzazione non valido. Usa il formato HH:MM (es. 02:30).
+        invalid_llm_budget: "%{field} deve essere un numero intero ≥ %{minimum}."
+        invalid_anthropic_base_url: L'URL base di Anthropic deve essere un URL http(s).
+        anthropic_model_required_for_base_url: Il modello Anthropic è obbligatorio quando si imposta un URL base personalizzato.
+        scheduler_sync_failed: Impostazioni salvate, ma aggiornamento pianificazione sincronizzazione fallito. Riprova o controlla i log del server.
+      disconnect_external_assistant:
+        external_assistant_disconnected: Assistente esterno disconnesso
+      clear_cache:
+        cache_cleared: Cache dati svuotata. Potrebbero volerci alcuni istanti per completare.
+      not_authorized: Non sei autorizzato a eseguire questa azione
+      ensure_admin:
+        not_authorized: Non sei autorizzato a eseguire questa azione
+      ensure_super_admin_for_onboarding:
+        not_authorized: Non sei autorizzato a eseguire questa azione
+      sync_auto_sync_scheduler!:
+        scheduler_sync_failed: Impostazioni salvate, ma aggiornamento pianificazione sincronizzazione fallito. Riprova o controlla i log del server.
+      sync_settings:
+        auto_sync_label: Abilita sincronizzazione automatica
+        auto_sync_description: Quando abilitata, tutti i conti verranno sincronizzati automaticamente ogni giorno all'orario specificato.
+        auto_sync_time_label: Orario sincronizzazione (HH:MM)
+        auto_sync_time_description: Specifica l'ora del giorno in cui deve avvenire la sincronizzazione automatica.
+        include_pending_label: Includi transazioni in sospeso
+        include_pending_description: Quando abilitato, le transazioni in sospeso (non confermate) verranno importate e riconciliate automaticamente quando vengono registrate. Disabilita se la tua banca fornisce dati in sospeso inaffidabili.
+        env_configured_message: Questa impostazione è disabilitata perché è impostata una variabile d'ambiente del provider (SIMPLEFIN_INCLUDE_PENDING o PLAID_INCLUDE_PENDING). Rimuovila per abilitare questa impostazione.
diff --git a/config/locales/views/settings/hostings/ru.yml b/config/locales/views/settings/hostings/ru.yml
new file mode 100644
index 000000000..225908740
--- /dev/null
+++ b/config/locales/views/settings/hostings/ru.yml
@@ -0,0 +1,314 @@
+---
+ru:
+  settings:
+    hostings:
+      alpha_vantage_settings:
+        description: Введите API ключ от Alpha Vantage. Поддерживает ETF ЕС на Лондонской
+          фондовой бирже, XETRA и других биржах.
+        env_configured_message: Успешно настроено через переменную окружения ALPHA_VANTAGE_API_KEY.
+        label: API ключ
+        no_health_check_note: Проверка состояния подключения недоступна для этого
+          поставщика из-за строгого ограничения скорости.
+        placeholder: Введите ваш Alpha Vantage API ключ здесь
+        rate_limit_warning: Бесплатный тариф Alpha Vantage ограничен 25 API вызовами
+          в день. Лучше всего использовать как дополнительного поставщика для ETF
+          ЕС, недоступных у других поставщиков.
+        show_details: "(показать детали)"
+        step_1_html: Посетите <a href="https://www.alphavantage.co/support/#api-key"
+          target="_blank" rel="noopener noreferrer" class="underline">alphavantage.co</a>
+          и получите ваш бесплатный API ключ.
+        step_2: Скопируйте API ключ и вставьте его ниже.
+        title: Alpha Vantage
+      anthropic_settings:
+        access_token_label: API-ключ
+        access_token_placeholder: Введите API-ключ Anthropic
+        base_url_label: Base URL (необязательно)
+        base_url_placeholder: https://api.anthropic.com (по умолчанию)
+        description: Введите API-ключ Anthropic. При необходимости можно указать Base URL 
+          для AWS Bedrock или GCP Vertex.
+        env_configured_message: Настройки успешно заданы через переменные окружения.
+        model_help: Используется для чата и обработки PDF. Пакетные операции 
+          (категоризация, определение продавцов) по умолчанию используют Haiku для 
+          снижения стоимости.
+        model_label: Модель по умолчанию (необязательно)
+        model_placeholder: claude-sonnet-4-6 (по умолчанию)
+        title: Anthropic (Claude)
+      assistant_settings:
+        agent_id_help: Направляет к конкретному агенту, когда поставщик размещает
+          несколько. Оставьте пустым для использования по умолчанию.
+        agent_id_label: ID агента (необязательно)
+        agent_id_placeholder: main (по умолчанию)
+        confirm_disconnect:
+          body: Это удалит сохраненные URL, токен и ID агента и переключит на встроенного
+            ассистента. Вы можете подключиться снова, введя новые учетные данные.
+          title: Отключить внешнего ассистента?
+        description: Выберите, как чат-ассистент будет отвечать. Встроенный использует
+          вашего настроенного LLM-поставщика напрямую. Внешний делегирует удаленному
+          AI-агенту, который может обращаться к финансовым инструментам Sure через
+          MCP.
+        disconnect_button: Отключить
+        disconnect_description: Удалите подключение внешнего ассистента и переключитесь
+          обратно на встроенного ассистента.
+        disconnect_title: Внешнее подключение
+        env_configured_external: Успешно настроено через переменные окружения.
+        env_notice: Тип ассистента заблокирован на '%{type}' через переменную окружения
+          ASSISTANT_TYPE.
+        external_configured: Настроен
+        external_not_configured: Не настроен. Введите URL и токен ниже или установите
+          переменные окружения EXTERNAL_ASSISTANT_URL и EXTERNAL_ASSISTANT_TOKEN.
+        external_status: Статус внешнего ассистента
+        title: AI Ассистент
+        token_help: Токен аутентификации, предоставленный вашим внешним агентом. Отправляется
+          как Bearer токен с каждым запросом.
+        token_label: API токен
+        token_placeholder: Введите токен от вашего поставщика агента
+        type_builtin: Встроенный (прямой LLM)
+        type_external: Внешний (удаленный агент)
+        type_label: Тип ассистента
+        url_help: Полный URL API конечной точки вашего агента. Ваш поставщик агента
+          предоставит вам это.
+        url_label: URL конечной точки
+        url_placeholder: https://your-agent-host/v1/chat
+      brand_fetch_settings:
+        description: Введите Client ID, предоставленный Brand Fetch
+        env_configured_message: Вы успешно настроили ваш Brand Fetch Client ID через
+          переменную окружения BRAND_FETCH_CLIENT_ID.
+        high_res_description: Если включено, логотипы будут получены в разрешении
+          120x120 вместо 40x40. Это обеспечивает более четкие изображения на дисплеях
+          с высоким разрешением.
+        high_res_label: Включить логотипы высокого разрешения
+        label: Client ID
+        placeholder: Введите ваш Client ID здесь
+        setup_step_1_html: Посетите <a href="https://brandfetch.com/developers" target="_blank"
+          rel="noopener noreferrer" class="underline">brandfetch.com</a> и создайте
+          бесплатный аккаунт разработчика Brand Fetch.
+        setup_step_2_html: Перейдите на страницу <a href="https://developers.brandfetch.com/dashboard/logo-api"
+          target="_blank" rel="noopener noreferrer" class="underline">Logo API</a>.
+        setup_step_3: Нажмите на значок глаза в разделе "Ваш Client ID", чтобы показать
+          ваш Client ID и вставьте его ниже.
+        show_details: "(показать детали)"
+        title: Настройки Brand Fetch
+      clear_cache:
+        cache_cleared: Кэш данных очищен. Это может занять несколько минут.
+      disconnect_external_assistant:
+        external_assistant_disconnected: Внешний ассистент отключен
+      ensure_super_admin_for_onboarding:
+        not_authorized: У вас нет прав для выполнения этого действия
+      eodhd_settings:
+        description: Введите API токен, предоставленный EODHD. Поддерживает ETF ЕС
+          на LSE, XETRA и других международных биржах.
+        env_configured_message: Успешно настроено через переменную окружения EODHD_API_KEY.
+        label: API токен
+        placeholder: Введите ваш EODHD API токен здесь
+        rate_limit_warning: Бесплатный тариф EODHD ограничен 20 API вызовами в день.
+          Лучше всего использовать как дополнительного поставщика для ETF ЕС, недоступных
+          у других поставщиков.
+        show_details: "(показать детали)"
+        step_1_html: Посетите <a href="https://eodhd.com/register" target="_blank"
+          rel="noopener noreferrer" class="underline">eodhd.com</a> и создайте бесплатный
+          аккаунт.
+        step_2_html: Перейдите на вашу <a href="https://eodhd.com/cp/dashboard" target="_blank"
+          rel="noopener noreferrer" class="underline">Панель управления</a>, чтобы
+          найти ваш API токен.
+        step_3: Скопируйте ваш API токен и вставьте его ниже.
+        title: EODHD
+      invite_code_settings:
+        default_family_description: Добавляйте новых пользователей в эту семью/группу
+          только если у них нет приглашения.
+        default_family_none: Нет (создать новую семью)
+        default_family_title: Семья по умолчанию для новых пользователей
+        description: Управляйте тем, как новые пользователи регистрируются в вашей
+          версии %{product}.
+        email_confirmation_description: Если включено, пользователи должны подтвердить
+          свой адрес электронной почты при его изменении.
+        email_confirmation_title: Требовать подтверждение электронной почты
+        generate_tokens: Создать новый код
+        generated_tokens: Созданные коды
+        states:
+          closed: Закрыто
+          invite_only: Только по приглашению
+          open: Открыто
+        title: Регистрация
+      llm_provider_selector:
+        data_retention: Входные данные API по умолчанию не используются для обучения моделей; API провайдеров хранят данные около 30 дней для целей безопасности. Для кастомных или self-hosted эндпоинтов действует ваша собственная политика.
+        data_retention_heading: Обработка данных
+        description: Выберите провайдера LLM для AI-чата. Пакетные операции (категоризация операций, определение продавцов и обработка PDF) пока всегда используют OpenAI.
+        env_configured_message: Настройки успешно заданы через переменную окружения LLM_PROVIDER.
+        not_configured_hint: Добавьте API-ключ %{provider} ниже, чтобы активировать его.
+        provider_anthropic: Anthropic (Claude)
+        provider_help: Смена провайдера вступит в силу при следующем чате. Настройте учётные данные выбранного провайдера ниже.
+        provider_label: Активный провайдер LLM
+        provider_openai: OpenAI
+        title: AI-провайдер        
+      not_authorized: У вас нет прав для выполнения этого действия
+      openai_settings:
+        access_token_label: Токен доступа
+        access_token_placeholder: Введите ваш токен доступа здесь
+        budget_description: Применяется к каждому вызову LLM — история чата, автоматическая
+          категоризация, обнаружение продавцов и обработка PDF. По умолчанию консервативные
+          настройки для локальных моделей с малым контекстом. Увеличьте для облачных
+          моделей с большими контекстными окнами.
+        budget_heading: Бюджет токенов
+        context_window_help: 'Общее количество токенов, которые модель примет. По
+          умолчанию: 2048 — увеличьте до 8192+ для облачных OpenAI или локальных моделей
+          с большим контекстом.'
+        context_window_label: Контекстное окно (необязательно)
+        description: Введите токен доступа и, при необходимости, настройте собственного
+          поставщика, совместимого с OpenAI
+        env_configured_message: Успешно настроено через переменные окружения.
+        json_mode_auto: Авто (рекомендуется)
+        json_mode_help: Строгий режим лучше всего работает с моделями мышления (qwen-thinking,
+          deepseek-reasoner). Режим 'Нет' лучше всего работает со стандартными моделями
+          (llama, mistral, gpt-oss).
+        json_mode_json_object: JSON объект
+        json_mode_label: JSON режим
+        json_mode_none: Нет (лучше для стандартных моделей)
+        json_mode_strict: Строгий (лучше для моделей мышления)
+        max_items_per_call_help: 'Верхний предел для автоматической категоризации
+          / обнаружения продавцов. По умолчанию: 25. Большие партии автоматически
+          разбиваются, чтобы соответствовать контекстному окну.'
+        max_items_per_call_label: Максимум элементов за вызов (необязательно)
+        max_response_tokens_help: 'Токены, зарезервированные для ответа модели. По
+          умолчанию: 512. Уменьшите, чтобы освободить место для более длинной истории.'
+        max_response_tokens_label: Максимум токенов ответа (необязательно)
+        model_label: Модель (необязательно)
+        model_placeholder: gpt-4.1 (по умолчанию)
+        title: OpenAI
+        uri_base_label: Базовый URL API (необязательно)
+        uri_base_placeholder: https://api.openai.com/v1 (по умолчанию)
+      provider_selection:
+        binance_public_hint: бесплатно, API ключ не требуется — только криптовалюта
+          (BTC, ETH и т.д.)
+        env_configured_message: Выбор поставщика отключен, так как установлены переменные
+          окружения. Чтобы включить выбор здесь, удалите эти переменные из вашей конфигурации.
+        exchange_rate_description: Выберите одного поставщика для получения курсов
+          валют.
+        exchange_rate_provider_label: Поставщик курсов валют
+        exchange_rate_title: Поставщик курсов валют
+        mfapi_hint: бесплатно, API ключ не требуется — только индийские паевые фонды
+        moex_public_hint: бесплатно, без API-ключа — российские акции, фонды и облигации 
+         (MOEX), включая валюту RUB
+        providers:
+          alpha_vantage: Alpha Vantage
+          binance_public: Binance
+          eodhd: EODHD
+          mfapi: MFAPI.in
+          moex_public: MOEX
+          tiingo: Tiingo
+          tinkoff_invest: T-Invest (Т-Банк)
+          twelve_data: Twelve Data
+          yahoo_finance: Yahoo Finance
+        requires_api_key: требуется API ключ
+        requires_api_key_alpha_vantage: требуется API ключ, лимит 25 запросов/день
+        requires_api_key_eodhd: требуется API ключ, лимит 20 запросов/день
+        securities_description: Включите одного или нескольких поставщиков для получения
+          цен на акции, ETF и паевые инвестиционные фонды. При поиске все включенные
+          поставщики запрашиваются, и результаты объединяются.
+        securities_title: Поставщики ценных бумаг
+        tinkoff_invest_hint: требуется токен только для чтения — цены российских акций, 
+          фондов и облигаций + логотипы брендов
+        twelve_data_hint: требуется API ключ, 800 запросов/день
+        yahoo_finance_hint: бесплатно, API ключ не требуется
+      show:
+        ai_assistant: AI Ассистент
+        clear_cache: Очистить кэш данных
+        clear_cache_warning: Очистка кэша данных удалит все курсы валют, цены на ценные
+          бумаги, балансы счетов и другие данные. Это не удалит счета, операции, категории
+          или другие данные, принадлежащие пользователю.
+        confirm_clear_cache:
+          body: Вы уверены, что хотите очистить кэш данных? Это удалит все курсы валют,
+            цены на ценные бумаги, балансы счетов и другие данные. Это действие нельзя
+            отменить.
+          title: Очистить кэш данных?
+        danger_zone: Опасная зона
+        financial_data_providers: Поставщики финансовых данных
+        general: Общие настройки
+        invites: Коды приглашений
+        sync_settings: Настройки синхронизации
+        title: Самостоятельный хостинг
+      sync_auto_sync_scheduler!:
+        scheduler_sync_failed: Настройки сохранены, но не удалось обновить расписание
+          синхронизации. Пожалуйста, попробуйте снова или проверьте журналы сервера.
+      sync_settings:
+        auto_sync_description: Если включено, все счета будут автоматически синхронизироваться
+          ежедневно в указанное время.
+        auto_sync_label: Включить автоматическую синхронизацию
+        auto_sync_time_description: Укажите время дня, когда должна происходить автоматическая
+          синхронизация.
+        auto_sync_time_label: Время синхронизации (ЧЧ:ММ)
+        env_configured_message: Эта настройка отключена, так как установлена переменная
+          окружения поставщика (SIMPLEFIN_INCLUDE_PENDING или PLAID_INCLUDE_PENDING).
+          Удалите её, чтобы включить эту настройку.
+        include_pending_description: Если включено, ожидающие (непроведенные) операции
+          будут импортированы и автоматически сверены при их проведении. Отключите,
+          если ваш банк предоставляет ненадежные данные по ожидающим операциям.
+        include_pending_label: Включить ожидающие операции
+      tiingo_settings:
+        description: Введите API токен, предоставленный Tiingo. Бесплатный тариф поддерживает
+          50 уникальных символов в час с более чем 30-летней историей данных.
+        env_configured_message: Успешно настроено через переменную окружения TIINGO_API_KEY.
+        label: API токен
+        placeholder: Введите ваш Tiingo API токен здесь
+        show_details: "(показать детали)"
+        step_1_html: Посетите <a href="https://www.tiingo.com" target="_blank" rel="noopener
+          noreferrer" class="underline">tiingo.com</a> и создайте бесплатный аккаунт.
+        step_2_html: Перейдите на страницу <a href="https://www.tiingo.com/account/api/token"
+          target="_blank" rel="noopener noreferrer" class="underline">API токен</a>.
+        step_3: Скопируйте ваш API токен и вставьте его ниже.
+        title: Tiingo
+      tinkoff_invest_settings:
+        description: Введите API-токен T‑Invest с правами только на чтение. Используется 
+          для загрузки логотипов ценных бумаг (включая фонды и облигации, даже если цены 
+          берутся с MOEX), а также — при включении выше — для получения котировок 
+          российских инструментов.
+        env_configured_message: Настройки успешно заданы через переменную окружения 
+          TINKOFF_INVEST_API_KEY.
+        label: API-токен
+        placeholder: Введите ваш API-токен T‑Invest
+        show_details: "(показать детали)"
+        step_1: Откройте инвестиции Т-Банка, затем «Настройки» → «API-токены» 
+          (требуется брокерский счёт в Т-Банке).
+        step_2: Создайте токен с правами только на чтение.
+        step_3: Скопируйте токен и вставьте его ниже.
+        title: T-Invest (Т-Банк)        
+      twelve_data_settings:
+        api_calls_used: "%{used} / %{limit} API вызовов в день использовано (%{percentage})"
+        description: Введите API ключ, предоставленный Twelve Data
+        env_configured_message: Успешно настроено через переменную окружения TWELVE_DATA_API_KEY.
+        label: API ключ
+        placeholder: Введите ваш API ключ здесь
+        plan: Тариф %{plan}
+        plan_upgrade_warning_description: Следующие тикеры в вашем портфеле не могут
+          синхронизировать цены с вашим текущим тарифом Twelve Data.
+        plan_upgrade_warning_title: Некоторые тикеры требуют платного тарифа
+        requires_plan: требуется тариф %{plan}
+        show_details: "(показать детали)"
+        step_1_html: Посетите <a href="https://twelvedata.com/register" target="_blank"
+          rel="noopener noreferrer" class="underline">twelvedata.com</a> и создайте
+          бесплатный аккаунт разработчика Twelve Data.
+        step_2_html: Перейдите на страницу <a href="https://twelvedata.com/account/api-keys"
+          target="_blank" rel="noopener noreferrer" class="underline">API ключи</a>.
+        step_3: Покажите ваш секретный ключ и вставьте его ниже.
+        title: Twelve Data
+        view_pricing: Посмотреть цены Twelve Data
+      update:
+        anthropic_model_required_for_base_url: Необходимо указать модель Anthropic при 
+          использовании пользовательского Base URL.
+        failure: Неверное значение настройки
+        invalid_anthropic_base_url: Base URL Anthropic должен быть корректным URL с http(s).
+        invalid_llm_budget: "%{field} должно быть целым числом ≥ %{minimum}."
+        invalid_onboarding_state: Неверное состояние регистрации
+        invalid_sync_time: Неверный формат времени синхронизации. Пожалуйста, используйте
+          формат ЧЧ:ММ (например, 02:30).
+        scheduler_sync_failed: Настройки сохранены, но не удалось обновить расписание
+          синхронизации. Пожалуйста, попробуйте снова или проверьте журналы сервера.
+        success: Настройки обновлены
+      yahoo_finance_settings:
+        connection_failed: Не удалось подключиться к Yahoo Finance
+        description: Yahoo Finance предоставляет бесплатный доступ к ценам на акции,
+          курсам валют и финансовым данным без необходимости в API ключе.
+        status_active: Yahoo Finance активен и работает
+        status_inactive: Подключение к Yahoo Finance не удалось
+        title: Yahoo Finance
+        troubleshooting: Проверьте ваше интернет-соединение и настройки брандмауэра.
+          Yahoo Finance может быть временно недоступен.
diff --git a/config/locales/views/settings/hostings/tr.yml b/config/locales/views/settings/hostings/tr.yml
index cc43985f0..ec9f52210 100644
--- a/config/locales/views/settings/hostings/tr.yml
+++ b/config/locales/views/settings/hostings/tr.yml
@@ -2,28 +2,260 @@
 tr:
   settings:
     hostings:
+      alpha_vantage_settings:
+        description: Alpha Vantage'dan aldığınız API anahtarını girin. Londra Menkul
+          Kıymetler Borsası, XETRA ve diğer borsalardaki AB ETF'lerini destekler.
+        env_configured_message: ALPHA_VANTAGE_API_KEY ortam değişkeni aracılığıyla
+          başarıyla yapılandırıldı.
+        label: API Anahtarı
+        no_health_check_note: Katı hız sınırı nedeniyle bu sağlayıcı için bağlantı
+          sağlık kontrolü kullanılamıyor.
+        placeholder: Alpha Vantage API anahtarınızı buraya girin
+        rate_limit_warning: Alpha Vantage ücretsiz katmanı günde 25 API çağrısıyla
+          sınırlıdır. Diğer sağlayıcılarda bulunmayan AB ETF'leri için tamamlayıcı
+          bir sağlayıcı olarak en iyi şekilde kullanılır.
+        show_details: "(detayları göster)"
+        step_1_html: <a href="https://www.alphavantage.co/support/#api-key" target="_blank"
+          rel="noopener noreferrer" class="underline">alphavantage.co</a> adresini
+          ziyaret edin ve ücretsiz API anahtarınızı alın.
+        step_2: API anahtarını kopyalayıp aşağıya yapıştırın.
+        title: Alpha Vantage
+      anthropic_settings:
+        access_token_label: API Anahtarı
+        access_token_placeholder: Anthropic API anahtarınızı girin
+        base_url_label: Temel URL (İsteğe Bağlı)
+        base_url_placeholder: https://api.anthropic.com (varsayılan)
+        description: Anthropic API anahtarınızı girin. İsteğe bağlı olarak Temel URL'yi
+          AWS Bedrock veya GCP Vertex'e yönlendirebilirsiniz.
+        env_configured_message: Ortam değişkenleri aracılığıyla başarıyla yapılandırıldı.
+        model_help: Sohbet ve PDF işleme için kullanılır. Toplu işlemler (kategorilendirme,
+          satıcı tespiti) maliyet nedeniyle varsayılan olarak Haiku kullanır.
+        model_label: Varsayılan Model (İsteğe Bağlı)
+        model_placeholder: claude-sonnet-4-6 (varsayılan)
+        title: Anthropic (Claude)
+      assistant_settings:
+        agent_id_help: Sağlayıcı birden fazla ajan barındırdığında belirli bir ajana
+          yönlendirir. Varsayılan için boş bırakın.
+        agent_id_label: Ajan Kimliği (İsteğe Bağlı)
+        agent_id_placeholder: main (varsayılan)
+        confirm_disconnect:
+          body: Bu, kaydedilmiş URL'yi, token'ı ve ajan kimliğini kaldıracak ve yerleşik
+            asistana geçecektir. Daha sonra yeni kimlik bilgileri girerek yeniden
+            bağlanabilirsiniz.
+          title: Harici asistan bağlantısı kesilsin mi?
+        description: Sohbet asistanının nasıl yanıt vereceğini seçin. Yerleşik, yapılandırdığınız
+          LLM sağlayıcısını doğrudan kullanır. Harici, MCP aracılığıyla Sure'un finansal
+          araçlarını çağırabilen uzak bir yapay zeka ajanına devreder.
+        disconnect_button: Bağlantıyı kes
+        disconnect_description: Harici asistan bağlantısını kaldırın ve yerleşik asistana
+          geri dönün.
+        disconnect_title: Harici bağlantı
+        env_configured_external: Ortam değişkenleri aracılığıyla başarıyla yapılandırıldı.
+        env_notice: Asistan türü, ASSISTANT_TYPE ortam değişkeni aracılığıyla '%{type}'
+          olarak kilitlenmiştir.
+        external_configured: Yapılandırıldı
+        external_not_configured: Yapılandırılmamış. Aşağıya URL ve token girin veya
+          EXTERNAL_ASSISTANT_URL ve EXTERNAL_ASSISTANT_TOKEN ortam değişkenlerini
+          ayarlayın.
+        external_status: Harici asistan uç noktası
+        title: Yapay Zeka Asistanı
+        token_help: Harici ajanınız tarafından sağlanan kimlik doğrulama token'ı.
+          Bu, her istekle birlikte Bearer token olarak gönderilir.
+        token_label: API Token'ı
+        token_placeholder: Ajan sağlayıcınızdan aldığınız token'ı girin
+        type_builtin: Yerleşik (doğrudan LLM)
+        type_external: Harici (uzak ajan)
+        type_label: Asistan türü
+        url_help: Ajanınızın API uç noktasının tam URL'si. Ajan sağlayıcınız bunu
+          size verecektir.
+        url_label: Uç Nokta URL'si
+        url_placeholder: https://your-agent-host/v1/chat
+      brand_fetch_settings:
+        description: Brand Fetch tarafından sağlanan İstemci Kimliğini girin
+        env_configured_message: Brand Fetch İstemci Kimliğinizi BRAND_FETCH_CLIENT_ID
+          ortam değişkeni aracılığıyla başarıyla yapılandırdınız.
+        high_res_description: Etkinleştirildiğinde, logolar 40x40 yerine 120x120 çözünürlükte
+          alınır. Bu, yüksek DPI'lı ekranlarda daha net görüntüler sağlar.
+        high_res_label: Yüksek çözünürlüklü logoları etkinleştir
+        label: İstemci Kimliği
+        placeholder: İstemci Kimliğinizi buraya girin
+        setup_step_1_html: <a href="https://brandfetch.com/developers" target="_blank"
+          rel="noopener noreferrer" class="underline">brandfetch.com</a> adresini
+          ziyaret edin ve ücretsiz bir Brand Fetch Geliştirici hesabı oluşturun.
+        setup_step_2_html: <a href="https://developers.brandfetch.com/dashboard/logo-api"
+          target="_blank" rel="noopener noreferrer" class="underline">Logo API</a>
+          sayfasına gidin.
+        setup_step_3: İstemci Kimliğinizi göstermek için "İstemci Kimliğiniz" bölümündeki
+          göz simgesine dokunun ve aşağıya yapıştırın.
+        show_details: "(detayları göster)"
+        title: Brand Fetch Ayarları
+      clear_cache:
+        cache_cleared: Veri önbelleği temizlendi. Bu işlemin tamamlanması birkaç dakika
+          sürebilir.
+      disconnect_external_assistant:
+        external_assistant_disconnected: Harici asistan bağlantısı kesildi
+      ensure_admin:
+        not_authorized: Bu işlemi gerçekleştirmek için yetkiniz yok
+      ensure_super_admin_for_onboarding:
+        not_authorized: Bu işlemi gerçekleştirmek için yetkiniz yok
+      eodhd_settings:
+        description: EODHD tarafından sağlanan API token'ını girin. LSE, XETRA ve
+          diğer uluslararası borsalardaki AB ETF'lerini destekler.
+        env_configured_message: EODHD_API_KEY ortam değişkeni aracılığıyla başarıyla
+          yapılandırıldı.
+        label: API Token'ı
+        placeholder: EODHD API token'ınızı buraya girin
+        rate_limit_warning: EODHD ücretsiz katmanı günde 20 API çağrısıyla sınırlıdır.
+          Diğer sağlayıcılarda bulunmayan AB ETF'leri için tamamlayıcı bir sağlayıcı
+          olarak en iyi şekilde kullanılır.
+        show_details: "(detayları göster)"
+        step_1_html: <a href="https://eodhd.com/register" target="_blank" rel="noopener
+          noreferrer" class="underline">eodhd.com</a> adresini ziyaret edin ve ücretsiz
+          bir hesap oluşturun.
+        step_2_html: API token'ınızı bulmak için <a href="https://eodhd.com/cp/dashboard"
+          target="_blank" rel="noopener noreferrer" class="underline">Kontrol Paneli</a>nize
+          gidin.
+        step_3: API token'ınızı kopyalayıp aşağıya yapıştırın.
+        title: EODHD
       invite_code_settings:
-        description: Yeni kullanıcıların %{product} örneğinize nasıl kaydolacağını kontrol edin.
-        email_confirmation_description: Etkinleştirildiğinde, kullanıcılar e-posta adreslerini değiştirirken e-posta onayı yapmak zorundadır.
+        default_family_description: Yeni kullanıcıları, yalnızca bir davetleri yoksa
+          bu aile/gruba yerleştirin.
+        default_family_none: Yok (yeni aile oluştur)
+        default_family_title: Yeni kullanıcılar için varsayılan aile
+        description: Yeni kullanıcıların %{product} örneğinize nasıl kaydolacağını
+          kontrol edin.
+        email_confirmation_description: Etkinleştirildiğinde, kullanıcılar e-posta
+          adreslerini değiştirirken e-posta onayı yapmak zorundadır.
         email_confirmation_title: E-posta onayı gerektir
         generate_tokens: Yeni kod oluştur
         generated_tokens: Oluşturulan kodlar
-        title: Onboarding
         states:
-          open: Açık
           closed: Kapalı
           invite_only: Davet ile
+          open: Açık
+        title: Onboarding
+      llm_provider_selector:
+        data_retention: API girdileri varsayılan olarak modelleri eğitmek için kullanılmaz;
+          sağlayıcıların barındırılan API'leri, güven ve güvenlik amacıyla verileri
+          ~30 gün boyunca saklar. Özel veya kendi barındırdığınız uç noktalar kendi
+          politikanızı izler.
+        data_retention_heading: Veri işleme
+        description: Yapay zeka sohbetini hangi LLM'nin güçlendireceğini seçin. Toplu
+          işlemler (işlem kategorilendirme, satıcı tespiti ve PDF işleme) şu anda
+          her zaman OpenAI kullanır.
+        env_configured_message: LLM_PROVIDER ortam değişkeni aracılığıyla başarıyla
+          yapılandırıldı.
+        not_configured_hint: Etkinleştirmek için aşağıya bir %{provider} API anahtarı
+          ekleyin.
+        provider_anthropic: Anthropic (Claude)
+        provider_help: Sağlayıcı değiştirmek bir sonraki sohbette etkili olur. Aktif
+          sağlayıcının kimlik bilgilerini aşağıda yapılandırın.
+        provider_label: Aktif LLM sağlayıcısı
+        provider_openai: OpenAI
+        title: Yapay Zeka Sağlayıcısı
+      not_authorized: Bu işlemi gerçekleştirmek için yetkiniz yok
+      openai_settings:
+        access_token_label: Erişim Token'ı
+        access_token_placeholder: Erişim token'ınızı buraya girin
+        budget_description: OpenAI uyumlu çağrılar için geçerlidir (sohbet, otomatik
+          kategorilendirme, satıcı tespiti ve PDF işleme). Varsayılanlar, küçük bağlamlı
+          yerel modeller için muhafazakârdır. Daha büyük bağlam pencerelerine sahip
+          bulut modelleri için yükseltin.
+        budget_heading: Token Bütçesi
+        context_window_help: 'Modelin kabul edeceği toplam token sayısı. Varsayılan:
+          2048 — bulut OpenAI veya büyük bağlamlı yerel modeller için 8192+''e yükseltin.'
+        context_window_label: Bağlam Penceresi (İsteğe Bağlı)
+        description: Erişim token'ını girin ve isteğe bağlı olarak özel bir OpenAI
+          uyumlu sağlayıcı yapılandırın
+        env_configured_message: Ortam değişkenleri aracılığıyla başarıyla yapılandırıldı.
+        json_mode_auto: Otomatik (önerilen)
+        json_mode_help: Sıkı mod, düşünen modellerle (qwen-thinking, deepseek-reasoner)
+          en iyi şekilde çalışır. Yok modu, standart modellerle (llama, mistral, gpt-oss)
+          en iyi şekilde çalışır.
+        json_mode_json_object: JSON Nesnesi
+        json_mode_label: JSON Modu
+        json_mode_none: Yok (standart modeller için en iyisi)
+        json_mode_strict: Sıkı (düşünen modeller için en iyisi)
+        max_items_per_call_help: 'Otomatik kategorilendirme / satıcı tespiti toplu
+          işlemleri için üst sınır. Varsayılan: 25. Daha büyük toplu işlemler bağlam
+          penceresine sığacak şekilde otomatik olarak bölünür.'
+        max_items_per_call_label: Toplu İşlem Başına Maksimum Öğe (İsteğe Bağlı)
+        max_response_tokens_help: 'Modelin yanıtı için ayrılan token sayısı. Varsayılan:
+          512. Daha uzun geçmiş için yer açmak amacıyla düşürün.'
+        max_response_tokens_label: Maksimum Yanıt Token'ı (İsteğe Bağlı)
+        model_label: Model (İsteğe Bağlı)
+        model_placeholder: gpt-4.1 (varsayılan)
+        title: OpenAI
+        uri_base_label: API Temel URL'si (İsteğe Bağlı)
+        uri_base_placeholder: https://api.openai.com/v1 (varsayılan)
+      provider_selection:
+        binance_public_hint: ücretsiz, API anahtarı gerekmez -- yalnızca kripto (BTC,
+          ETH vb.)
+        env_configured_message: Ortam değişkenleri ayarlandığı için sağlayıcı seçimi
+          devre dışı bırakıldı. Burada seçimi etkinleştirmek için bu ortam değişkenlerini
+          yapılandırmanızdan kaldırın.
+        exchange_rate_description: Döviz kurlarını almak için tek bir sağlayıcı seçin.
+        exchange_rate_provider_label: Döviz Kuru Sağlayıcısı
+        exchange_rate_title: Döviz Kuru Sağlayıcısı
+        mfapi_hint: ücretsiz, API anahtarı gerekmez -- yalnızca Hint yatırım fonları
+        moex_public_hint: ücretsiz, API anahtarı gerekmez -- Rus hisse senetleri,
+          fonlar ve tahviller (MOEX), RUB döviz kuru dahil
+        providers:
+          alpha_vantage: Alpha Vantage
+          binance_public: Binance
+          eodhd: EODHD
+          frankfurter: Frankfurter
+          mfapi: MFAPI.in
+          moex_public: MOEX
+          tiingo: Tiingo
+          tinkoff_invest: T-Invest (T-Bank)
+          twelve_data: Twelve Data
+          yahoo_finance: Yahoo Finance
+        requires_api_key: API anahtarı gerektirir
+        requires_api_key_alpha_vantage: API anahtarı gerektirir, günlük 25 çağrı sınırı
+        requires_api_key_eodhd: API anahtarı gerektirir, günlük 20 çağrı sınırı
+        securities_description: Hisse senedi, ETF ve yatırım fonu fiyatlarını almak
+          için bir veya daha fazla sağlayıcıyı etkinleştirin. Arama yaptığınızda,
+          etkinleştirilen tüm sağlayıcılar sorgulanır ve sonuçlar birleştirilir.
+        securities_title: Menkul Kıymet Sağlayıcıları
+        tinkoff_invest_hint: salt okunur token gerektirir -- Rus hisse senedi/fon/tahvil
+          fiyatları + marka logoları
+        twelve_data_hint: API anahtarı gerektirir, günlük 800 kredi
+        yahoo_finance_hint: ücretsiz, API anahtarı gerekmez
       show:
-        general: Genel Ayarlar
-        financial_data_providers: Finansal Veri Sağlayıcıları
-        invites: Davet Kodları
-        title: Kendi Sunucunda Barındırma
-        danger_zone: Tehlikeli Bölge
+        ai_assistant: Yapay Zeka Asistanı
         clear_cache: Veri önbelleğini temizle
-        clear_cache_warning: Veri önbelleğini temizlemek tüm döviz kurları, menkul kıymet fiyatları, hesap bakiyeleri ve diğer verileri kaldıracaktır. Bu işlem hesapları, işlemleri, kategorileri veya diğer kullanıcıya ait verileri silmez.
+        clear_cache_warning: Veri önbelleğini temizlemek tüm döviz kurları, menkul
+          kıymet fiyatları, hesap bakiyeleri ve diğer verileri kaldıracaktır. Bu işlem
+          hesapları, işlemleri, kategorileri veya diğer kullanıcıya ait verileri silmez.
         confirm_clear_cache:
+          body: Veri önbelleğini temizlemek istediğinizden emin misiniz? Bu işlem
+            tüm döviz kurları, menkul kıymet fiyatları, hesap bakiyeleri ve diğer
+            verileri kaldıracaktır. Bu işlem geri alınamaz.
           title: Veri önbelleği temizlensin mi?
-          body: Veri önbelleğini temizlemek istediğinizden emin misiniz? Bu işlem tüm döviz kurları, menkul kıymet fiyatları, hesap bakiyeleri ve diğer verileri kaldıracaktır. Bu işlem geri alınamaz.
+        danger_zone: Tehlikeli Bölge
+        financial_data_providers: Finansal Veri Sağlayıcıları
+        general: Genel Ayarlar
+        invites: Davet Kodları
+        sync_settings: Eşitleme Ayarları
+        title: Kendi Sunucunda Barındırma
+      sync_auto_sync_scheduler!:
+        scheduler_sync_failed: Ayarlar kaydedildi, ancak eşitleme zamanlaması güncellenemedi.
+          Lütfen tekrar deneyin veya sunucu günlüklerini kontrol edin.
+      sync_settings:
+        auto_sync_description: Etkinleştirildiğinde, tüm hesaplar belirtilen saatte
+          otomatik olarak günlük eşitlenecektir.
+        auto_sync_label: Otomatik eşitlemeyi etkinleştir
+        auto_sync_time_description: Otomatik eşitlemenin gerçekleşeceği günün saatini
+          belirtin.
+        auto_sync_time_label: Eşitleme saati (HH:MM)
+        env_configured_message: Bir sağlayıcı ortam değişkeni (SIMPLEFIN_INCLUDE_PENDING
+          veya PLAID_INCLUDE_PENDING) ayarlandığı için bu ayar devre dışı bırakıldı.
+          Bu ayarı etkinleştirmek için kaldırın.
+        include_pending_description: Etkinleştirildiğinde, bekleyen (henüz kesinleşmemiş)
+          işlemler içe aktarılır ve kesinleştiklerinde otomatik olarak eşleştirilir.
+          Bankanız güvenilmez bekleyen veri sağlıyorsa devre dışı bırakın.
+        include_pending_label: Bekleyen işlemleri dahil et
       synth_settings:
         api_calls_used: "%{used} / %{limit} API çağrısı kullanıldı (%{percentage})"
         description: Synth tarafından sağlanan API anahtarını girin
@@ -31,17 +263,76 @@ tr:
         placeholder: API anahtarınızı buraya girin
         plan: "%{plan} planı"
         title: Synth Ayarları
+      tiingo_settings:
+        description: Tiingo tarafından sağlanan API token'ını girin. Ücretsiz katman,
+          30+ yıllık geçmiş veriyle saatte 50 benzersiz sembolü destekler.
+        env_configured_message: TIINGO_API_KEY ortam değişkeni aracılığıyla başarıyla
+          yapılandırıldı.
+        label: API Token'ı
+        placeholder: Tiingo API token'ınızı buraya girin
+        show_details: "(detayları göster)"
+        step_1_html: <a href="https://www.tiingo.com" target="_blank" rel="noopener
+          noreferrer" class="underline">tiingo.com</a> adresini ziyaret edin ve ücretsiz
+          bir hesap oluşturun.
+        step_2_html: <a href="https://www.tiingo.com/account/api/token" target="_blank"
+          rel="noopener noreferrer" class="underline">API Token</a> sayfasına gidin.
+        step_3: API token'ınızı kopyalayıp aşağıya yapıştırın.
+        title: Tiingo
+      tinkoff_invest_settings:
+        description: Salt okunur bir T-Invest API token'ı girin. Menkul kıymetler
+          için marka logolarını almak (MOEX fiyatlandırsa bile fonlar ve tahviller
+          dahil) ve yukarıda etkinleştirildiğinde Rus enstrümanları için fiyatları
+          almak amacıyla kullanılır.
+        env_configured_message: TINKOFF_INVEST_API_KEY ortam değişkeni aracılığıyla
+          başarıyla yapılandırıldı.
+        label: API Token'ı
+        placeholder: T-Invest API token'ınızı buraya girin
+        show_details: "(detayları göster)"
+        step_1: T-Bank yatırımlarını açın, ardından Ayarlar, ardından API token'ları
+          (açık bir T-Bank aracılık hesabı gerektirir).
+        step_2: Salt okunur erişimle bir token oluşturun.
+        step_3: Token'ı kopyalayıp aşağıya yapıştırın.
+        title: T-Invest (T-Bank)
+      twelve_data_settings:
+        api_calls_used: "%{used} / %{limit} günlük API çağrısı kullanıldı (%{percentage})"
+        description: Twelve Data tarafından sağlanan API anahtarını girin
+        env_configured_message: TWELVE_DATA_API_KEY ortam değişkeni aracılığıyla başarıyla
+          yapılandırıldı.
+        label: API Anahtarı
+        placeholder: API anahtarınızı buraya girin
+        plan: "%{plan} planı"
+        plan_upgrade_warning_description: Portföyünüzdeki aşağıdaki semboller mevcut
+          Twelve Data planınızla fiyat eşitleyemiyor.
+        plan_upgrade_warning_title: Bazı semboller ücretli bir plan gerektiriyor
+        requires_plan: "%{plan} planı gerektirir"
+        show_details: "(detayları göster)"
+        step_1_html: <a href="https://twelvedata.com/register" target="_blank" rel="noopener
+          noreferrer" class="underline">twelvedata.com</a> adresini ziyaret edin ve
+          ücretsiz bir Twelve Data Geliştirici hesabı oluşturun.
+        step_2_html: <a href="https://twelvedata.com/account/api-keys" target="_blank"
+          rel="noopener noreferrer" class="underline">API Anahtarları</a> sayfasına
+          gidin.
+        step_3: Gizli Anahtarınızı ortaya çıkarın ve aşağıya yapıştırın.
+        title: Twelve Data
+        view_pricing: Twelve Data fiyatlandırmasını görüntüle
       update:
+        anthropic_model_required_for_base_url: Özel bir Temel URL ayarlandığında Anthropic
+          Modeli gereklidir.
         failure: Geçersiz ayar değeri
-        success: Ayarlar güncellendi
+        invalid_anthropic_base_url: Anthropic Temel URL'si bir http(s) URL'si olmalıdır.
+        invalid_llm_budget: "%{field}, %{minimum} veya daha büyük bir tam sayı olmalıdır."
         invalid_onboarding_state: Geçersiz onboarding durumu
-      clear_cache:
-        cache_cleared: Veri önbelleği temizlendi. Bu işlemin tamamlanması birkaç dakika sürebilir.
-      not_authorized: Bu işlemi gerçekleştirmek için yetkiniz yok
+        invalid_sync_time: Geçersiz eşitleme saati biçimi. Lütfen HH:MM biçimini kullanın
+          (örn. 02:30).
+        scheduler_sync_failed: Ayarlar kaydedildi, ancak eşitleme zamanlaması güncellenemedi.
+          Lütfen tekrar deneyin veya sunucu günlüklerini kontrol edin.
+        success: Ayarlar güncellendi
       yahoo_finance_settings:
-        title: Yahoo Finance
-        description: Yahoo Finance, API anahtarı gerektirmeden hisse senedi fiyatları, döviz kurları ve finansal verilere ücretsiz erişim sağlar.
+        connection_failed: Yahoo Finance'e bağlanılamıyor
+        description: Yahoo Finance, API anahtarı gerektirmeden hisse senedi fiyatları,
+          döviz kurları ve finansal verilere ücretsiz erişim sağlar.
         status_active: Yahoo Finance aktif ve çalışıyor
         status_inactive: Yahoo Finance bağlantısı başarısız
-        connection_failed: Yahoo Finance'e bağlanılamıyor
-        troubleshooting: İnternet bağlantınızı ve güvenlik duvarı ayarlarınızı kontrol edin. Yahoo Finance geçici olarak kullanılamayabilir.
+        title: Yahoo Finance
+        troubleshooting: İnternet bağlantınızı ve güvenlik duvarı ayarlarınızı kontrol
+          edin. Yahoo Finance geçici olarak kullanılamayabilir.
diff --git a/config/locales/views/settings/hostings/vi.yml b/config/locales/views/settings/hostings/vi.yml
index 6b9bc4766..cdb7bbdf8 100644
--- a/config/locales/views/settings/hostings/vi.yml
+++ b/config/locales/views/settings/hostings/vi.yml
@@ -43,6 +43,7 @@ vi:
         requires_api_key_alpha_vantage: yêu cầu khóa API, giới hạn 25 lần gọi/ngày
         mfapi_hint: miễn phí, không cần khóa API -- chỉ quỹ tương hỗ Ấn Độ
         binance_public_hint: miễn phí, không cần khóa API -- chỉ tiền điện tử (BTC, ETH, v.v.)
+        moex_public_hint: miễn phí, không cần khóa API -- cổ phiếu, quỹ và trái phiếu Nga (MOEX), bao gồm tỷ giá RUB
         providers:
           twelve_data: Twelve Data
           yahoo_finance: Yahoo Finance
@@ -51,6 +52,7 @@ vi:
           alpha_vantage: Alpha Vantage
           mfapi: MFAPI.in
           binance_public: Binance
+          moex_public: MOEX
       assistant_settings:
         title: Trợ lý AI
         description: Chọn cách trợ lý trò chuyện phản hồi. Tích hợp sẵn sử dụng nhà cung cấp LLM đã cấu hình trực tiếp. Bên ngoài ủy thác cho tác nhân AI từ xa có thể gọi lại các công cụ tài chính của Sure qua MCP.
diff --git a/config/locales/views/settings/hostings/zh-CN.yml b/config/locales/views/settings/hostings/zh-CN.yml
index 176679e10..a49131627 100644
--- a/config/locales/views/settings/hostings/zh-CN.yml
+++ b/config/locales/views/settings/hostings/zh-CN.yml
@@ -7,6 +7,13 @@ zh-CN:
         label: Client ID
         placeholder: 在此输入您的 Client ID
         title: Brand Fetch 设置
+        env_configured_message: 已通过环境变量配置 Brandfetch。
+        show_details: "（显示详情）"
+        setup_step_1_html: 前往 Brandfetch 并创建 API Key。
+        setup_step_2_html: 复制 API Key。
+        setup_step_3: 将 API Key 粘贴到下方。
+        high_res_label: 高清 Logo
+        high_res_description: 启用后优先获取更高分辨率的品牌资源。
       clear_cache:
         cache_cleared: 数据缓存已清除，此操作可能需要一些时间完成。
       invite_code_settings:
@@ -20,6 +27,9 @@ zh-CN:
           invite_only: 仅限邀请注册
           open: 开放注册
         title: 新用户注册设置
+        default_family_title: 新用户默认家庭
+        default_family_description: 选择使用邀请码注册的新用户默认加入哪个家庭。
+        default_family_none: 无（创建新家庭）
       not_authorized: 您没有执行此操作的权限
       openai_settings:
         access_token_label: 访问令牌
@@ -37,6 +47,14 @@ zh-CN:
         title: OpenAI 设置
         uri_base_label: API 基础 URL（可选）
         uri_base_placeholder: https://api.openai.com/v1（默认）
+        budget_heading: Token 预算
+        budget_description: 控制每次 AI 请求可使用的 Token 上限。
+        context_window_label: 上下文窗口（可选）
+        context_window_help: 留空时使用模型默认上下文窗口。
+        max_response_tokens_label: 最大响应 Token（可选）
+        max_response_tokens_help: 限制模型单次回答可生成的 Token 数。
+        max_items_per_call_label: 每次调用最大项目数
+        max_items_per_call_help: 限制单次请求传给模型的数据项数量。
       provider_selection:
         description: 选择用于获取汇率和证券价格的服务。Yahoo Finance 免费且无需 API 密钥。Twelve Data 需要免费的
           API 密钥，但可能提供更全面的数据覆盖。
@@ -45,8 +63,26 @@ zh-CN:
         providers:
           twelve_data: Twelve Data
           yahoo_finance: Yahoo Finance
+          tiingo: Tiingo
+          eodhd: EODHD
+          alpha_vantage: Alpha Vantage
+          mfapi: MFAPI.in
+          binance_public: Binance
+          moex_public: MOEX
         securities_provider_label: 证券（股票价格）数据提供商
         title: 数据提供商选择
+        exchange_rate_title: 汇率提供商
+        exchange_rate_description: 选择用于同步汇率数据的提供商。
+        securities_title: 证券价格提供商
+        securities_description: 选择用于同步证券和投资价格的提供商。
+        twelve_data_hint: Twelve Data 支持股票、ETF 和部分基金价格。
+        yahoo_finance_hint: Yahoo Finance 可作为免密钥价格来源。
+        requires_api_key: 需要 API Key
+        requires_api_key_eodhd: EODHD 需要 API Token。
+        requires_api_key_alpha_vantage: Alpha Vantage 需要 API Key。
+        mfapi_hint: MFAPI.in 可用于部分印度基金数据。
+        binance_public_hint: Binance 公共接口可用于加密资产行情。
+        moex_public_hint: 免费，无需 API 密钥 -- 俄罗斯股票、基金和债券（MOEX），包括 RUB 外汇
       show:
         clear_cache: 清除数据缓存
         clear_cache_warning: 清除数据缓存将移除所有汇率、证券价格、账户余额及其他数据。这不会删除账户、交易记录、分类或其他用户自有数据。
@@ -58,6 +94,8 @@ zh-CN:
         general: 通用设置
         invites: 邀请码设置
         title: 自托管配置
+        ai_assistant: AI 助手
+        sync_settings: 同步设置
       twelve_data_settings:
         api_calls_used: 已使用 %{used} / %{limit} 次每日 API 调用（%{percentage}）
         description: 请输入 Twelve Data 提供的 API 密钥
@@ -66,10 +104,23 @@ zh-CN:
         placeholder: 在此输入您的 API 密钥
         plan: "%{plan} 套餐"
         title: Twelve Data 设置
+        show_details: "（显示详情）"
+        step_1_html: 注册或登录 Twelve Data。
+        step_2_html: 前往 <a href="https://twelvedata.com/account/api-keys" target="_blank" rel="noopener noreferrer" class="underline">API Keys</a> 页面。
+        step_3: 显示 API 密钥并粘贴到下方。
+        plan_upgrade_warning_title: 部分代码需要付费计划
+        plan_upgrade_warning_description: 当前 Twelve Data 计划无法同步下列持仓价格。
+        requires_plan: 需要 %{plan} 计划
+        view_pricing: 查看 Twelve Data 价格
       update:
         failure: 设置值无效
         invalid_onboarding_state: 无效的新用户注册状态
         success: 设置已更新
+        invalid_sync_time: 同步时间无效。
+        invalid_llm_budget: "%{field} 必须是大于等于 %{minimum} 的整数。"
+        invalid_anthropic_base_url: Anthropic Base URL 无效。
+        anthropic_model_required_for_base_url: 设置 Anthropic Base URL 时必须填写模型。
+        scheduler_sync_failed: 设置已保存，但同步计划更新失败。请重试或检查服务器日志。
       yahoo_finance_settings:
         connection_failed: 无法连接到 Yahoo Finance
         description: Yahoo Finance 提供免费的股票价格、汇率和金融数据访问，无需 API 密钥。
@@ -77,3 +128,99 @@ zh-CN:
         status_inactive: Yahoo Finance 连接失败
         title: Yahoo Finance 设置
         troubleshooting: 请检查您的互联网连接和防火墙设置。Yahoo Finance 可能暂时不可用。
+      assistant_settings:
+        title: AI 助手
+        description: 配置 Sure 使用的 AI 助手模式。
+        type_label: 助手类型
+        type_builtin: 内置（直接调用 LLM）
+        type_external: 外部（远程代理）
+        external_status: 外部助手端点
+        external_configured: 已配置
+        external_not_configured: 外部助手尚未配置。
+        env_notice: 已通过环境变量配置 %{type}。
+        env_configured_external: 外部助手已通过环境变量配置。
+        url_label: 端点 URL
+        url_placeholder: 输入外部助手端点 URL
+        url_help: 外部助手服务的完整访问地址。
+        token_label: API 令牌
+        token_placeholder: 输入 API 令牌
+        token_help: 用于验证外部助手请求的令牌。
+        agent_id_label: Agent ID（可选）
+        agent_id_placeholder: main（默认）
+        agent_id_help: 留空时使用默认代理。
+        disconnect_title: 外部连接
+        disconnect_description: 断开当前外部助手连接。
+        disconnect_button: 断开连接
+        confirm_disconnect:
+          title: 断开外部助手？
+          body: 断开后将无法继续使用此远程助手。
+      llm_provider_selector:
+        title: AI 提供商
+        description: 选择 Sure 调用的 LLM 提供商。
+        env_configured_message: 已通过环境变量配置 LLM 提供商。
+        provider_label: 当前 LLM 提供商
+        provider_openai: OpenAI
+        provider_anthropic: Anthropic (Claude)
+        provider_help: 更改后会影响新的 AI 请求。
+        not_configured_hint: "%{provider} 尚未配置。"
+        data_retention_heading: 数据处理
+        data_retention: 发送给 AI 提供商的数据可能包含财务上下文，请按你的部署策略配置。
+      anthropic_settings:
+        title: Anthropic (Claude)
+        description: 使用 Anthropic Claude 作为 AI 提供商。
+        env_configured_message: 已通过环境变量配置 Anthropic。
+        access_token_label: API 密钥
+        access_token_placeholder: 输入 Anthropic API Key
+        base_url_label: Base URL（可选）
+        base_url_placeholder: 自定义 Anthropic Base URL
+        model_label: 默认模型（可选）
+        model_placeholder: claude-sonnet-4-6（默认）
+        model_help: 留空时使用系统默认模型。
+      tiingo_settings:
+        title: Tiingo
+        description: 使用 Tiingo 同步证券价格。
+        env_configured_message: 已通过环境变量配置 Tiingo。
+        label: API 令牌
+        placeholder: 粘贴 Tiingo API Token
+        show_details: "（显示详情）"
+        step_1_html: 注册或登录 Tiingo。
+        step_2_html: 前往 <a href="https://www.tiingo.com/account/api/token" target="_blank" rel="noopener noreferrer" class="underline">API Token</a> 页面。
+        step_3: 复制 API Token 并粘贴到下方。
+      eodhd_settings:
+        title: EODHD
+        description: 使用 EODHD 同步证券价格。
+        env_configured_message: 已通过环境变量配置 EODHD。
+        label: API 令牌
+        placeholder: 粘贴 EODHD API Token
+        show_details: "（显示详情）"
+        step_1_html: 注册或登录 EODHD。
+        step_2_html: 打开 API Token 页面。
+        step_3: 复制 API Token 并粘贴到下方。
+        rate_limit_warning: 免费或低阶计划可能有调用频率限制。
+      alpha_vantage_settings:
+        title: Alpha Vantage
+        description: 使用 Alpha Vantage 同步证券价格。
+        env_configured_message: 已通过环境变量配置 Alpha Vantage。
+        label: API 密钥
+        placeholder: 粘贴 Alpha Vantage API Key
+        show_details: "（显示详情）"
+        step_1_html: 注册或登录 Alpha Vantage。
+        step_2: 前往 API Key 页面并复制密钥。
+        rate_limit_warning: 免费计划可能有调用频率限制。
+        no_health_check_note: 此提供商暂无健康检查。
+      disconnect_external_assistant:
+        external_assistant_disconnected: 外部助手已断开连接。
+      ensure_admin:
+        not_authorized: 您没有执行此操作的权限。
+      ensure_super_admin_for_onboarding:
+        not_authorized: 只有超级管理员可以访问此设置。
+      sync_auto_sync_scheduler!:
+        scheduler_sync_failed: 自动同步计划更新失败。
+      sync_settings:
+        auto_sync_label: 启用自动同步
+        auto_sync_description: 按计划自动同步已连接账户。
+        auto_sync_time_label: 同步时间（HH:MM）
+        auto_sync_time_description: 每天触发自动同步的时间。
+        include_pending_label: 包含待处理交易
+        include_pending_description: 同步时同时拉取提供商返回的待处理交易。
+        env_configured_message: 已通过环境变量配置同步设置。
diff --git a/config/locales/views/settings/hu.yml b/config/locales/views/settings/hu.yml
index b43b6cc97..16c9ba68d 100644
--- a/config/locales/views/settings/hu.yml
+++ b/config/locales/views/settings/hu.yml
@@ -31,7 +31,7 @@ hu:
         failed: "Sikertelen"
         no_usage_data: "Nem található használati adat a kiválasztott időszakra"
         cost_estimates_title: "A költségbecslésekről"
-        cost_estimates_description: "A költségek az OpenAI 2025-ös árazása alapján vannak becsülve. A tényleges költségek eltérhetnek. Az árazás millió tokenenként van megadva, és modellenként változik. Az egyéni vagy önállóan üzemeltetett modellek \"N/A\"-t mutatnak, és nem szerepelnek a költségösszesítőkben."
+        cost_estimates_description: "A költségek a szolgáltatók közzétett árazása alapján vannak becsülve, beleértve az OpenAI 2026. júliusi árait. A tényleges költségek eltérhetnek. Az árazás millió tokenenként van megadva, és modellenként változik. Az egyéni vagy önállóan üzemeltetett modellek \"N/A\"-t mutatnak, és nem szerepelnek a költségösszesítőkben."
     ai_prompts:
       show:
         page_title: MI promptok
@@ -71,6 +71,10 @@ hu:
         theme_dark: Sötét
         theme_light: Világos
         theme_system: Rendszer
+        modals_title: Modális ablakok
+        modals_subtitle: Modális ablakok viselkedésének testreszabása
+        disable_modal_click_outside_title: Modális ablakok nyitva tartása külső kattintáskor
+        disable_modal_click_outside_description: Megakadályozza, hogy a modális ablakok bezáródjanak külső kattintáskor. Hasznos a nem mentett változtatások véletlen elvesztésének elkerülésére.
         transactions_title: Tranzakciók
         transactions_subtitle: Szabd testre a tranzakciók megjelenítését
         dashboard_title: Irányítópult
@@ -258,7 +262,6 @@ hu:
       meta:
         sync_error: Szinkronizálási hiba
         no_recent_sync: Szinkronizálás lejárt
-        registration_needed: Regisztráció szükséges
         reconsent_required: Újrahozzájárulás szükséges
         reconsent_needed:
           one: Újrahozzájárulás szükséges 1 napon belül
diff --git a/config/locales/views/settings/it.yml b/config/locales/views/settings/it.yml
new file mode 100644
index 000000000..b5b5adfef
--- /dev/null
+++ b/config/locales/views/settings/it.yml
@@ -0,0 +1,556 @@
+---
+it:
+  views:
+    settings:
+      payments:
+        renewal: "Il tuo contributo continua il %{date}."
+        cancellation: "Il tuo contributo termina il %{date}."
+  settings:
+    debugs:
+      show:
+        page_title: "Debug"
+        title: "Registro eventi debug"
+        subtitle: "Eventi operativi significativi per super amministratori. Dal più recente."
+        empty: "Nessun evento debug trovato."
+        missing_value: "-"
+        filters:
+          all: "Tutti"
+          category: "Categoria"
+          level: "Livello"
+          source: "Sorgente"
+          provider: "Provider"
+          start_date: "Da"
+          end_date: "A"
+          family_id: "ID famiglia"
+          account_id: "ID conto"
+          user_id: "ID utente"
+          account_provider_id: "ID provider conto"
+          submit: "Filtra"
+          reset: "Reimposta"
+        table:
+          time: "Ora"
+          level: "Livello"
+          category: "Categoria"
+          source: "Sorgente"
+          message: "Messaggio"
+          context: "Contesto"
+          metadata: "Metadati"
+          view_metadata: "Vedi"
+        context:
+          provider: "provider=%{value}"
+          family: "famiglia=%{value}"
+          account: "conto=%{value}"
+          user: "utente=%{value}"
+          account_provider: "account_provider=%{value}"
+    llm_usages:
+      show:
+        page_title: "Utilizzo e costi LLM"
+        subtitle: "Monitora l'utilizzo AI e i costi stimati"
+        start_date: "Data inizio"
+        end_date: "Data fine"
+        filter: "Filtra"
+        total_requests: "Richieste totali"
+        total_tokens: "Token totali"
+        prompt: "prompt"
+        completion: "completamento"
+        total_cost: "Costo totale"
+        avg_cost_per_request: "Costo medio/richiesta"
+        based_on_requests: "Basato su %{with_cost} di %{total} richieste con dati di costo"
+        cost_by_operation: "Costo per operazione"
+        cost_by_model: "Costo per modello"
+        recent_usage: "Utilizzo recente"
+        col_date: "Data"
+        col_operation: "Operazione"
+        col_model: "Modello"
+        col_tokens: "Token"
+        col_cost: "Costo"
+        failed: "Fallita"
+        no_usage_data: "Nessun dato di utilizzo trovato per il periodo selezionato"
+        cost_estimates_title: "Informazioni sulle stime dei costi"
+        cost_estimates_description: "I costi sono stimati in base ai prezzi di OpenAI del 2025. I costi effettivi possono variare. I prezzi sono per 1 milione di token e variano per modello. I modelli personalizzati o self-hosted mostreranno \"N/A\" e non sono inclusi nei totali dei costi."
+    ai_prompts:
+      show:
+        page_title: Prompt AI
+        openai_label: OpenAI
+        disable_ai: Disabilita assistente AI
+        prompt_instructions: Istruzioni prompt
+        main_system_prompt:
+          title: Prompt di sistema principale
+          subtitle: Istruzioni fondamentali che definiscono come l'assistente AI si comporta in tutte le conversazioni
+        transaction_categorizer:
+          title: Categorizzatore transazioni
+          subtitle: L'AI categorizza automaticamente le tue transazioni in base alle categorie definite
+        merchant_detector:
+          title: Rilevatore esercenti
+          subtitle: L'AI identifica e arricchisce i dati delle transazioni con informazioni sull'esercente
+    payments:
+      show:
+        page_title: Pagamenti
+        subscription_subtitle: Aggiorna i dettagli della tua carta di credito
+        subscription_title: Gestisci contributi
+        currently_on_plan: "Attualmente nel piano"
+        trialing: "Stai usando la demo aperta di %{product_name}"
+        trial_days_left:
+          one: "I dati verranno eliminati tra %{count} giorno"
+          other: "I dati verranno eliminati tra %{count} giorni"
+        not_contributing_prefix: "Attualmente"
+        not_contributing_emphasis: "non stai contribuendo"
+        contributions_note: "I contributi a %{product_name} appariranno qui."
+        manage: "Gestisci"
+        choose_level: "Scegli livello"
+        payment_via_stripe: "Pagamento tramite Stripe"
+    appearances:
+      show:
+        page_title: Aspetto
+        theme_title: Tema
+        theme_subtitle: Scegli un tema preferito per l'app
+        theme_dark: Scuro
+        theme_light: Chiaro
+        theme_system: Sistema
+        modals_title: Finestre modali
+        modals_subtitle: Personalizza il comportamento delle finestre modali
+        disable_modal_click_outside_title: Mantieni le finestre modali aperte al clic esterno
+        disable_modal_click_outside_description: Impedisce la chiusura delle finestre modali quando si fa clic all'esterno. Utile per evitare di perdere accidentalmente le modifiche non salvate.
+        transactions_title: Transazioni
+        transactions_subtitle: Personalizza come vengono visualizzate le transazioni
+        dashboard_title: Dashboard
+        dashboard_subtitle: Personalizza come viene visualizzato il dashboard
+        dashboard_two_column_title: Layout a due colonne
+        dashboard_two_column_description: Visualizza i widget del dashboard in due colonne su schermi grandi, con controlli larghezza e altezza per widget nell'intestazione di ciascun widget. Se disattivato, i widget si impilano in una singola colonna.
+        split_grouped_title: Raggruppa transazioni suddivise
+        split_grouped_description: Mostra le transazioni suddivise raggruppate sotto la voce principale nell'elenco transazioni. Se disattivato, le voci figlie appaiono come righe individuali.
+    preferences:
+      show:
+        country: Paese
+        currency: Valuta
+        date_format: Formato data
+        general_subtitle: Configura le tue preferenze
+        general_title: Generali
+        default_period: Periodo predefinito
+        default_account_order: Ordine predefinito conti
+        language: Lingua
+        language_auto: Lingua del browser
+        page_title: Preferenze
+        timezone: Fuso orario
+        month_start_day: Il mese budget inizia il
+        month_start_day_hint: Imposta quando inizia il mese del budget (es. giorno di paga)
+        month_start_day_warning: I tuoi budget e i calcoli MTD useranno questo giorno di inizio personalizzato invece del 1° di ogni mese.
+        translations_notice: Nota che stiamo ancora lavorando alle traduzioni per varie lingue.
+        currencies_title: "Valute %{moniker}"
+        currencies_subtitle: Scegli quali valute appaiono nei campi importo per il tuo %{moniker}
+        base_currency_label: Valuta base
+        base_currency_badge: Valuta base
+        additional_currencies_label: Valute aggiuntive
+        no_additional_currencies: Nessuna selezionata
+        currencies_more: "+%{count} altre"
+        manage_currencies: Gestisci valute
+        manage_currencies_subtitle: Deseleziona le valute che non usi mai, o riduci la lista a poche.
+        select_all_currencies: Seleziona tutte
+        select_base_only: Solo valuta base
+        currency_search_placeholder: Cerca valute
+        no_matching_currencies: Nessuna valuta trovata
+        selected_currencies_count:
+          one: "%{count} selezionata"
+          other: "%{count} selezionate"
+        save_currencies: Salva valute
+        sharing_title: "Condivisione %{moniker}"
+        sharing_subtitle: "Controlla come i conti vengono condivisi nel tuo %{moniker}"
+        sharing_default_label: Condivisione predefinita per nuovi conti
+        sharing_shared: Condividi con tutti i membri
+        sharing_private: Mantieni privato per impostazione predefinita
+        preview:
+          title: Abilita funzionalità in anteprima
+          description: Opta per le funzionalità in corso contrassegnate come anteprima o canary.
+    profiles:
+      destroy:
+        cannot_remove_self: Non puoi rimuovere te stesso dall'account.
+        member_owns_other_family_data: Questo membro possiede ancora conti in un altro nucleo familiare e non può essere rimosso. Trasferisci o rimuovi prima quei conti.
+        member_removal_failed: Si è verificato un problema durante la rimozione del membro.
+        member_removed: Il membro è stato rimosso con successo.
+        not_authorized: Non sei autorizzato a rimuovere membri.
+      show:
+        confirm_delete:
+          body: Sei sicuro di voler eliminare definitivamente il tuo account? Questa azione è irreversibile.
+          title: Eliminare l'account?
+        confirm_reset:
+          body: Sei sicuro di voler ripristinare il tuo account? Verranno eliminati tutti i tuoi conti, categorie, esercenti, etichette e altri dati. Questa azione non può essere annullata.
+          title: Ripristinare l'account?
+        confirm_reset_with_sample_data:
+          body: Sei sicuro di voler ripristinare il tuo account e caricare dati di esempio? Verranno eliminati i tuoi dati esistenti e sostituiti con dati demo per esplorare Sure in sicurezza.
+          title: Ripristinare l'account e caricare dati di esempio?
+        confirm_remove_invitation:
+          body: Sei sicuro di voler rimuovere l'invito per %{email}?
+          title: Rimuovi invito
+        confirm_remove_member:
+          body: Sei sicuro di voler rimuovere %{name} dal tuo account?
+          title: Rimuovi membro
+        danger_zone_title: Zona pericolo
+        delete_account: Elimina account
+        delete_account_warning: L'eliminazione del tuo account rimuoverà permanentemente tutti i tuoi dati e non può essere annullata.
+        reset_account: Ripristina account
+        reset_account_warning: Il ripristino del tuo account eliminerà tutti i tuoi conti, categorie, esercenti, etichette e altri dati, mantenendo intatto il tuo account utente.
+        reset_account_with_sample_data: Ripristina e precarica
+        reset_account_with_sample_data_warning: Elimina tutti i tuoi dati esistenti e poi carica dati di esempio freschi per esplorare con un ambiente precompilato.
+        email: Email
+        first_name: Nome
+        group_form_input_placeholder: Inserisci nome del gruppo
+        group_form_label: Nome del gruppo
+        group_title: Membri del gruppo
+        household_form_input_placeholder: Inserisci nome del nucleo familiare
+        household_form_label: Nome del nucleo familiare
+        household_subtitle: Gli invitati possono accedere al tuo account %{moniker} e alle risorse condivise.
+        household_title: Nucleo familiare
+        invitation_link: Link di invito
+        invite_member: Aggiungi membro
+        last_name: Cognome
+        page_title: Informazioni profilo
+        pending: In sospeso
+        profile_subtitle: Personalizza come appari su %{product_name}
+        profile_title: Personale
+        remove_invitation: Rimuovi invito
+        remove_member: Rimuovi membro
+        resend_confirmation_link: richiedi una nuova email di conferma
+        save: Salva
+        unconfirmed_email_notice_html: Hai richiesto di cambiare la tua email in %{email}. Vai alla tua email e conferma affinché la modifica abbia effetto. Se non hai ricevuto l'email, controlla la cartella spam, o %{resend_link}.
+    securities:
+      show:
+        page_title: Sicurezza
+        encryption_warning:
+          title: Chiavi di crittografia mancanti
+          intro: "I dati sensibili (chiavi API, token provider, segreti MFA e dati personali) vengono archiviati non crittografati. Per abilitare la crittografia, imposta le seguenti chiavi nelle variabili d'ambiente o nelle credenziali Rails:"
+          keys:
+            - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+            - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+            - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+          generate: "Genera un set con: bin/rails db:encryption:init"
+        mfa_title: Autenticazione a due fattori
+        mfa_description: Aggiungi un ulteriore livello di sicurezza al tuo account richiedendo un codice dalla tua app di autenticazione durante l'accesso
+        enable_mfa: Abilita 2FA
+        disable_mfa: Disabilita 2FA
+        disable_mfa_confirm: Sei sicuro di voler disabilitare l'autenticazione a due fattori?
+        sso_title: Account collegati
+        sso_subtitle: Gestisci le connessioni al tuo account single sign-on
+        sso_disconnect: Disconnetti
+        sso_last_used: Ultimo utilizzo
+        sso_never: Mai
+        sso_no_email: Nessuna email
+        sso_no_identities: Nessun account SSO collegato
+        sso_connect_hint: Disconnetti e accedi con un provider SSO per collegare un account.
+        sso_confirm_title: Disconnettere l'account?
+        sso_confirm_body: Sei sicuro di voler disconnettere il tuo account %{provider}? Puoi ricollegarlo in seguito accedendo di nuovo con quel provider.
+        sso_confirm_button: Disconnetti
+        sso_warning_message: Questo è il tuo unico metodo di accesso. Dovresti impostare una password nelle impostazioni di sicurezza prima di disconnetterti, altrimenti potresti essere escluso dal tuo account.
+    mcp:
+      show:
+        page_title: Server MCP
+        connect_title: Connetti un assistente AI
+        connect_subtitle: Incolla questo URL in Claude.ai (o qualsiasi client compatibile con MCP) per collegarlo al tuo account Sure.
+        copy_url: Copia
+        copied: Copiato!
+        how_to_connect_title: Come connettere Claude
+        step_1: "Apri Claude.ai e vai su Impostazioni → Integrazioni."
+        step_2: Clicca "Aggiungi integrazione" e incolla l'URL del server MCP sopra.
+        step_3: Clicca Connetti — verrai reindirizzato a Sure per accedere e autorizzare l'accesso.
+        step_4: Una volta autorizzato, Claude può leggere i tuoi conti, transazioni e dati di saldo.
+        connected_title: Client connessi
+        connected_subtitle: Queste app hanno attualmente accesso ai tuoi dati Sure. Revoca quelle che non usi più.
+        unknown_client: Client sconosciuto
+        connected_ago: "Connesso %{time} fa"
+        revoke: Revoca
+        revoke_confirm: Revocare l'accesso per questo client?
+      revoke:
+        revoked: Connessione revocata.
+    settings_nav:
+      accounts_label: Conti
+      advanced_section_title: Avanzate
+      ai_prompts_label: Prompt AI
+      api_key_label: Chiave API
+      payment_label: Pagamento
+      categories_label: Categorie
+      feedback_label: Feedback
+      general_section_title: Generali
+      imports_label: Importazioni
+      exports_label: Esportazioni
+      llm_usage_label: Utilizzo LLM
+      logout: Disconnetti
+      merchants_label: Esercenti
+      providers_label: Provider
+      guides_label: Guide
+      other_section_title: Altro
+      preferences_label: Preferenze
+      profile_label: Informazioni profilo
+      recurring_transactions_label: Ricorrenti
+      rules_label: Regole
+      mcp_label: MCP
+      security_label: Sicurezza
+      self_hosting_label: Self-Hosting
+      sso_providers_label: Provider SSO
+      statement_vault_label: Archivio estratti
+      tags_label: Etichette
+      transactions_section_title: Transazioni
+      users_label: Utenti
+      whats_new_label: Novità
+      api_keys_label: Chiave API
+      appearance_label: Aspetto
+      bank_sync_label: Sincronizzazione bancaria
+      debug_label: Debug
+    settings_nav_link_large:
+      next: Avanti
+      previous: Indietro
+    user_avatar_field:
+      accepted_formats: JPG o PNG. Max 5MB.
+      choose: Carica foto
+      choose_label: (opzionale)
+      change: Cambia foto
+    providers:
+      update:
+        updated_successfully: Impostazioni provider aggiornate con successo
+        no_changes: Nessuna modifica apportata
+      not_authorized: Non autorizzato
+      bank_sync:
+        page_title: Sincronizzazione bancaria
+        lede: Connetti conti esterni affinché transazioni, saldi e posizioni fluiscano automaticamente in Sure.
+      status:
+        ok: Connesso
+        warn: Azione richiesta
+        err: Errore
+        off: Non configurato
+      maturity:
+        beta: Beta
+        alpha: Alpha
+      drawer_trust_statement: "Accesso in sola lettura. Sure non può mai spostare denaro, e le tue credenziali sono archiviate in modo crittografato."
+      setup_steps:
+        eyebrow: Configurazione
+        need_help: "Hai bisogno di aiuto?"
+      connect: Connetti
+      groups:
+        your_connections: Le tue connessioni
+        available: Disponibili
+        empty_available: Tutti i provider disponibili sono connessi.
+      health_strip:
+        connected: connesso
+        needs_attention: richiede attenzione
+        accounts_syncing: conti in sincronizzazione
+        last_synced: Ultima sincronizzazione %{time} fa
+      meta:
+        sync_error: Errore di sincronizzazione
+        no_recent_sync: Sincronizzazione in ritardo
+        registration_needed: Registrazione richiesta
+        reconsent_required: Nuovo consenso richiesto
+        reconsent_needed:
+          one: Nuovo consenso richiesto tra 1 giorno
+          other: Nuovo consenso richiesto tra %{count} giorni
+        last_synced: Sincronizzato %{time} fa
+      sync_all: Sincronizza tutti
+      sync_all_in_progress: Sincronizzazione di tutti i provider connessi…
+      sync_all_recently: Sincronizzazione già in corso. Riprova tra un momento.
+      sync_provider: Sincronizza ora
+      sync_provider_in_progress: Sincronizzazione avviata.
+      recently_synced: Sincronizzato di recente. Riprova tra un momento.
+      taglines:
+        akahu: Sincronizza gli istituti finanziari neozelandesi tramite Akahu.
+        simplefin: Connetti conti bancari USA tramite il protocollo aperto SimpleFIN.
+        lunchflow: Connetti 20.000+ banche da 40+ paesi (UK, EU, USA e altro!)
+        enable_banking: Sincronizza conti bancari europei tramite PSD2 open banking.
+        coinstats: Monitora l'intero portafoglio crypto su wallet e exchange.
+        mercury: Sincronizza automaticamente i tuoi conti bancari aziendali Mercury.
+        brex: Sincronizza liquidità e attività corporate card Brex con accesso in sola lettura.
+        coinbase: Importa le tue posizioni crypto Coinbase e monitora le performance.
+        binance: Sincronizza i tuoi saldi spot Binance usando una chiave API in sola lettura.
+        kraken: Sincronizza saldi e operazioni spot Kraken usando una chiave API in sola lettura.
+        snaptrade: Connetti conti di intermediazione tramite la rete di aggregazione SnapTrade.
+        ibkr: Sincronizza conti di investimento Interactive Brokers tramite importazioni Flex Query.
+        indexa_capital: Monitora il tuo portafoglio di investimento automatizzato Indexa Capital.
+        sophtron: Connetti banche e utility USA e canadesi.
+        plaid: Connetti migliaia di istituti finanziari USA tramite Plaid.
+        plaid_eu: Connetti istituti finanziari europei tramite Plaid (PSD2 / Open Banking).
+      search_filters:
+        aria_label: Cerca provider
+        placeholder: Cerca provider
+        chips:
+          all: Tutti
+          bank: Banche
+          crypto: Crypto
+          investment: Investimenti
+      empty_filter: Nessun provider corrisponde al filtro.
+      clear_filter: Rimuovi filtri
+      encryption_error:
+        title: Chiavi di crittografia mancanti
+        message: "La sincronizzazione bancaria necessita di Active Record encryption configurato. Imposta primary_key, deterministic_key e key_derivation_salt nelle credenziali Rails o nelle variabili d'ambiente."
+      provider_form:
+        save_and_connect: "Salva e connetti"
+      coinbase_panel:
+        setup_instructions: "Per connettere Coinbase:"
+        step1_html: Vai alle <a href="https://portal.cdp.coinbase.com/projects/api-keys" target="_blank" rel="noopener noreferrer" class="text-primary underline">Impostazioni API Coinbase</a>
+        step2: Crea una nuova chiave API con permessi in sola lettura (visualizza conti, visualizza transazioni)
+        step3: Copia la tua chiave API e il segreto API e incollali qui sotto
+        api_key_label: Chiave API
+        api_key_placeholder: Inserisci la tua chiave API Coinbase
+        api_secret_label: Segreto API
+        api_secret_placeholder: Inserisci il tuo segreto API Coinbase
+        connect_button: Connetti Coinbase
+        syncing: Sincronizzazione...
+        sync: Sincronizza
+        disconnect_confirm: Sei sicuro di voler disconnettere questa connessione Coinbase? I tuoi conti sincronizzati diventeranno conti manuali.
+      binance_panel:
+        setup_instructions: "Per connettere Binance, crea una chiave API in sola lettura:"
+        step1_html: 'Vai alla <a href="https://www.binance.com/en/my/settings/api-management" target="_blank" rel="noopener noreferrer" class="underline">Gestione API Binance</a>'
+        step2: "Crea una nuova chiave API con solo il permesso Abilita lettura"
+        step3: "Incolla la tua chiave API e il segreto qui sotto"
+        no_withdraw_title: "Solo chiave in sola lettura"
+        no_withdraw_body: "Non abilitare i permessi di prelievo quando crei la tua chiave API Binance. Sure ha bisogno solo dell'accesso in lettura."
+        ip_hint_title: "Whitelist IP richiesta"
+        ip_hint_body: "Aggiungi l'IP di uscita del server app alla whitelist della chiave API Binance:"
+        ip_hint_contact_admin: "Contatta il tuo amministratore per ottenere l'indirizzo IP di uscita del server app."
+        api_key_label: Chiave API
+        api_key_placeholder: Incolla la tua chiave API Binance
+        api_secret_label: Segreto API
+        api_secret_placeholder: Incolla il tuo segreto API Binance
+        connect_button: Connetti Binance
+        syncing: Sincronizzazione...
+        sync: Sincronizza
+        historical_import: "Impostazioni importazione storica"
+        sync_start_date_label: "Importa dati da"
+        sync_start_date_help: "Seleziona fino a quando indietro recuperare le operazioni storiche."
+        disconnect_confirm: "Sei sicuro di voler disconnettere Binance?"
+      kraken_panel:
+        step1_html: 'Vai alle <a href="https://pro.kraken.com/app/settings/api" target="_blank" rel="noopener noreferrer" class="underline">impostazioni API Kraken</a>'
+        step2: "Crea una chiave API con solo Query Funds e Query Closed Orders & Trades."
+        step3: "Incolla la chiave API e la chiave privata qui sotto."
+        read_only_title: "Solo sincronizzazione exchange in sola lettura"
+        read_only_body: "Non concedere permessi di trading, annullamento, prelievo, esportazione, ledger, Earn, staking o trasferimento. Sure importa solo saldi, posizioni e operazioni spot."
+        default_connection_name: Kraken
+        add_connection: Aggiungi connessione Kraken
+        update_connection: Aggiorna connessione
+        connection_name_label: Nome connessione
+        connection_name_placeholder: Kraken principale
+        api_key_label: Chiave API
+        api_key_placeholder: Incolla la tua chiave API Kraken
+        keep_api_key_placeholder: Lascia vuoto per mantenere la chiave API esistente
+        api_secret_label: Chiave privata
+        api_secret_placeholder: Incolla la tua chiave privata Kraken
+        keep_api_secret_placeholder: Lascia vuoto per mantenere la chiave privata esistente
+        setup_accounts: Configura conto
+        syncing: Sincronizzazione...
+        sync: Sincronizza
+        disconnect: Disconnetti
+        disconnect_confirm: "Sei sicuro di voler disconnettere %{name}?"
+      enable_banking_panel:
+        callback_url_instruction: "Per l'URL di callback, usa %{callback_url}."
+        connection_error: Errore di connessione
+        step_1_html: "Vai su %{link} e ottieni le tue credenziali sviluppatore."
+        step_2: "Scegli il tuo paese e incolla l'ID applicazione + certificato client qui sotto."
+        step_3: "Salva, poi usa Aggiungi connessione per collegare la tua banca."
+        config_locked_title: "Configurazione bloccata"
+        config_locked_message: "Disconnetti tutte le banche collegate prima di modificare queste credenziali."
+        application_id_label: "ID applicazione"
+        application_id_placeholder_new: "Inserisci ID applicazione"
+        application_id_placeholder_update: "Inserisci nuovo ID per aggiornare"
+        client_certificate_label: "Certificato client (con chiave privata)"
+        save_and_connect: "Salva e connetti"
+        update_connection: "Aggiorna connessione"
+        connected_bank: "Banca collegata"
+        session_expires: "Sessione scade: %{date}"
+        unknown: "Sconosciuto"
+        connection: "Connessione"
+        session_expired_reconnect: "Sessione scaduta - riconnetti"
+        configured: "Configurato"
+        ready_to_link: "Pronto per collegare conti"
+        sync: "Sincronizza"
+        reconnect: "Riconnetti"
+        connect_bank: "Connetti banca"
+        remove: "Rimuovi"
+        remove_confirm: "Sei sicuro di voler rimuovere questa connessione?"
+        add_connection: "Aggiungi connessione"
+        syncing: "Sincronizzazione"
+        select_country: "Seleziona paese..."
+        country_label: "Paese"
+      lunchflow_panel:
+        step_1_html: "Vai su %{link} e crea una chiave API."
+        step_2: "Incolla la tua chiave qui sotto e connetti."
+        step_3: "Poi vai su Conti per collegare i tuoi conti sincronizzati."
+        api_key_label: "Chiave API"
+        api_key_placeholder_new: "Incolla chiave API qui"
+        api_key_placeholder_update: "Inserisci nuova chiave API per aggiornare"
+        base_url_label: "URL base (opzionale)"
+        base_url_placeholder: "https://lunchflow.app/api/v1 (predefinito)"
+        save_and_connect: "Salva e connetti"
+        update_connection: "Aggiorna connessione"
+      akahu_panel:
+        step_1_html: "Vai su %{link} e crea un'app personale."
+        step_2: "Copia il token dell'app e il token utente."
+        step_3: "Incolla i token qui sotto, salva, poi collega i tuoi conti sincronizzati."
+      up_panel:
+        step_1_html: "Vai su %{link} e genera un token di accesso personale."
+        step_2: "Copia il tuo token di accesso personale."
+        step_3: "Incolla il token qui sotto, salva, poi collega i tuoi conti sincronizzati."
+      simplefin_panel:
+        step_1_html: "Vai su %{link} per un token di configurazione una tantum."
+        step_2: "Incolla il token qui sotto e connetti."
+        step_3: "Poi vai su Conti per collegare i tuoi conti sincronizzati."
+        setup_token_label: "Token di configurazione"
+        setup_token_placeholder: "Incolla token di configurazione SimpleFIN"
+        save_and_connect: "Salva e connetti"
+      plaid_panel:
+        step_1_html: "Apri il %{link} e copia il tuo Client ID e la chiave segreta."
+        step_2: "Scegli un ambiente. Usa sandbox per i test e production per conti reali."
+        step_3: "Incolla le tue credenziali qui sotto e connetti."
+      plaid_eu_panel:
+        step_1_html: "Apri il %{link} e copia il tuo EU Client ID e la chiave segreta."
+      not_found: Provider non trovato.
+      sync_provider_no_items: Nessuna connessione disponibile per la sincronizzazione.
+      ibkr_panel:
+        steps:
+          step_1: 'Nel tuo portale clienti IBKR, vai su "Performance e rapporti" > "Flex Queries".'
+          step_2: 'Clicca sull''icona "+" nella sezione "Activity Flex Query" per creare una nuova query.'
+          step_3: 'Assegna un nome alla query (es. "Sure Sync"), poi esamina i dettagli della Flex Query qui sotto e abilita le sezioni, i campi e le opzioni di configurazione elencati.'
+          step_4: 'Salva la query, annota il tuo "Query ID", poi usa l''icona ingranaggio nella sezione "Flex Web Service Configuration" per generare un token di accesso.'
+          step_5: "Incolla il tuo Query ID e Token qui sotto, salva la configurazione, poi vai su Conti per collegare i conti IBKR scoperti."
+        flex_query_details:
+          eyebrow: Flex Query
+          title: Sezioni, campi e configurazione
+          summary: Espandi per vedere le esatte sezioni, campi e impostazioni che la tua IBKR Activity Flex Query deve includere.
+          sections_heading: Abilita queste sezioni e campi
+          configuration_heading: Imposta queste opzioni di query
+        sections:
+          account_information: "Informazioni conto: Account ID, Valuta"
+          cash_report: "Rapporto liquidità:"
+          cash_report_options: "Opzioni: Nessuna"
+          cash_report_fields: "Campi: Valuta, Liquidità finale"
+          cash_transactions: "Transazioni liquidità:"
+          cash_transactions_options: "Opzioni: Dividendi, Depositi e prelievi, Dettaglio"
+          cash_transactions_fields: "Campi: Importo, Conid, Valuta, Tasso FX alla base, Data rapporto, ID transazione, Tipo"
+          change_in_position_value_summary: "Riepilogo variazione valore posizione: Valuta, Valore fine periodo"
+          net_asset_value: "Valore patrimoniale netto (NAV) in base:"
+          net_asset_value_options: "Opzioni: Nessuna"
+          net_asset_value_fields: "Campi: Valuta, Data rapporto, Totale"
+          open_positions: "Posizioni aperte:"
+          open_positions_options: "Opzioni: Riepilogo"
+          open_positions_fields: "Campi: Classe asset, Conid, Prezzo base costo, Valuta, Tasso FX alla base, Prezzo mark, Quantità, Data rapporto, ID titolo, Tipo ID titolo, Lato, Simbolo"
+          trades: "Operazioni:"
+          trades_options: "Opzioni: Esecuzione"
+          trades_fields: "Campi: Classe asset, Acquisto/Vendita, Conid, Valuta, Tasso FX alla base, Commissione IB, Valuta commissione IB, Quantità, Simbolo, Data operazione, ID operazione, Prezzo operazione, ID transazione"
+        configuration:
+          models: "Modelli: Opzionale"
+          format: "Formato: XML"
+          period: "Periodo: Ultimi 365 giorni di calendario"
+          date_format: "Formato data: yyyy-MM-dd"
+          time_format: "Formato ora: HH:mm:ss"
+          date_time_separator: "Separatore data/ora: ; (punto e virgola)"
+          profit_and_loss: "Profitti e perdite: Predefinito"
+          all_other_options: 'Tutte le altre opzioni: "No"'
+        report_window_note: "I rapporti IBKR Flex sono limitati alla finestra di query configurata in IBKR. Sure importerà le posizioni attuali complete più fino agli ultimi 365 giorni di attività da questo rapporto."
+        sync: Sincronizza
+        disconnect_confirm: Disconnettere Interactive Brokers?
+        query_id_label: Query ID
+        query_id_placeholder_new: Inserisci il tuo IBKR Flex Query ID
+        query_id_placeholder_existing: Lascia vuoto per mantenere il Query ID attuale
+        token_label: Token
+        token_placeholder_new: Inserisci il tuo IBKR Flex Web Service Token
+        token_placeholder_existing: Lascia vuoto per mantenere il Token attuale
+        save_configuration: Salva configurazione
+        update_configuration: Aggiorna configurazione
+        status_configured_prefix: "%{summary}. Visita la scheda"
+        accounts_tab: Conti
+        status_configured_suffix: per gestire i conti scoperti.
+        not_configured: Non configurato.
diff --git a/config/locales/views/settings/nb.yml b/config/locales/views/settings/nb.yml
index ed759aae6..6e7e5c972 100644
--- a/config/locales/views/settings/nb.yml
+++ b/config/locales/views/settings/nb.yml
@@ -27,6 +27,12 @@ nb:
         theme_system: System
         theme_title: Tema
         timezone: Tidssone
+    appearances:
+      show:
+        modals_title: Modaler
+        modals_subtitle: Tilpass oppførselen til modaler
+        disable_modal_click_outside_title: Hold modaler åpne ved klikk utenfor
+        disable_modal_click_outside_description: Forhindrer at modaler lukkes ved klikk utenfor. Nyttig for å unngå å miste ulagrede endringer ved et uhell.
     profiles:
       destroy:
         cannot_remove_self: Du kan ikke fjerne deg selv fra din egen konto.
diff --git a/config/locales/views/settings/nl.yml b/config/locales/views/settings/nl.yml
index a74136bbe..40361ff69 100644
--- a/config/locales/views/settings/nl.yml
+++ b/config/locales/views/settings/nl.yml
@@ -43,6 +43,12 @@ nl:
         theme_system: Systeem
         theme_title: Thema
         timezone: Tijdzone
+    appearances:
+      show:
+        modals_title: Modals
+        modals_subtitle: Gedrag van modals aanpassen
+        disable_modal_click_outside_title: Modals open houden bij klikken buiten
+        disable_modal_click_outside_description: Voorkomt dat modals sluiten bij klikken buiten. Handig om te voorkomen dat niet-opgeslagen wijzigingen per ongeluk verloren gaan.
     profiles:
       destroy:
         cannot_remove_self: U kunt uzelf niet van het account verwijderen.
diff --git a/config/locales/views/settings/pl.yml b/config/locales/views/settings/pl.yml
index 8acfe1772..2ab682b8e 100644
--- a/config/locales/views/settings/pl.yml
+++ b/config/locales/views/settings/pl.yml
@@ -34,6 +34,10 @@ pl:
         theme_dark: Ciemny
         theme_light: Jasny
         theme_system: Systemowy
+        modals_title: Okna modalne
+        modals_subtitle: Dostosuj zachowanie okien modalnych
+        disable_modal_click_outside_title: Utrzymuj okna modalne otwarte po kliknięciu poza nimi
+        disable_modal_click_outside_description: Zapobiega zamykaniu okien modalnych po kliknięciu poza nimi. Przydatne, aby uniknąć przypadkowej utraty niezapisanych zmian.
         transactions_title: Transakcje
         transactions_subtitle: Dostosuj sposób wyświetlania transakcji
         dashboard_title: Pulpit
diff --git a/config/locales/views/settings/pt-BR.yml b/config/locales/views/settings/pt-BR.yml
index 65962871b..7b5bd4f35 100644
--- a/config/locales/views/settings/pt-BR.yml
+++ b/config/locales/views/settings/pt-BR.yml
@@ -34,6 +34,10 @@ pt-BR:
         theme_dark: Escuro
         theme_light: Claro
         theme_system: Sistema
+        modals_title: Modais
+        modals_subtitle: Personalizar o comportamento dos modais
+        disable_modal_click_outside_title: Manter modais abertos ao clicar fora
+        disable_modal_click_outside_description: Impede que os modais fechem ao clicar fora deles. Útil para evitar perder alterações não salvas acidentalmente.
         transactions_title: Transações
         transactions_subtitle: Personalize como as transações são exibidas
         dashboard_title: Painel
diff --git a/config/locales/views/settings/ro.yml b/config/locales/views/settings/ro.yml
index 758bb7d5c..96a82a481 100644
--- a/config/locales/views/settings/ro.yml
+++ b/config/locales/views/settings/ro.yml
@@ -43,6 +43,12 @@ ro:
         theme_system: Sistem
         theme_title: Temă
         timezone: Fus orar
+    appearances:
+      show:
+        modals_title: Ferestre modale
+        modals_subtitle: Personalizați comportamentul ferestrelor modale
+        disable_modal_click_outside_title: Mențineți ferestrele modale deschise la clic exterior
+        disable_modal_click_outside_description: Previne închiderea ferestrelor modale la clic în afara lor. Util pentru a evita pierderea accidentală a modificărilor nesalvate.
     profiles:
       destroy:
         cannot_remove_self: Nu te poți elimina singur din cont.
diff --git a/config/locales/views/settings/ru.yml b/config/locales/views/settings/ru.yml
new file mode 100644
index 000000000..013cb4783
--- /dev/null
+++ b/config/locales/views/settings/ru.yml
@@ -0,0 +1,645 @@
+---
+ru:
+  settings:
+    ai_prompts:
+      show:
+        disable_ai: Отключить AI Ассистента
+        main_system_prompt:
+          subtitle: Основные инструкции, определяющие поведение AI ассистента во всех
+            чатах
+          title: Основной системный запрос
+        merchant_detector:
+          subtitle: AI идентифицирует и обогащает данные операций информацией о продавцах
+          title: Определитель продавцов
+        openai_label: OpenAI
+        page_title: AI Запросы
+        prompt_instructions: Инструкции по запросу
+        transaction_categorizer:
+          subtitle: AI автоматически категоризирует ваши операции на основе заданных
+            категорий
+          title: Категоризатор операций
+    appearances:
+      show:
+        dashboard_subtitle: Настройте отображение панели
+        dashboard_title: Панель
+        dashboard_two_column_description: Отображение виджетов панели в две колонки
+          на больших экранах. Если выключено, виджеты располагаются в одну колонку.
+        dashboard_two_column_title: Двухколоночный макет
+        disable_modal_click_outside_description: Запретить закрытие модальных окон при 
+          клике вне их. Полезно, чтобы не потерять несохранённые изменения.
+        disable_modal_click_outside_title: Не закрывать модальные окна при клике вне их
+        modals_subtitle: Настройка поведения модальных окон
+        modals_title: Модальные окна
+        page_title: Внешний вид
+        split_grouped_description: Показывать разделённые операции сгруппированными
+          под их родительской в списке операций. Если выключено, разделённые элементы
+          отображаются как отдельные строки.
+        split_grouped_title: Группировать разделённые операции
+        theme_dark: Тёмная
+        theme_light: Светлая
+        theme_subtitle: Выберите предпочитаемую тему для приложения
+        theme_system: Системная
+        theme_title: Тема
+        transactions_subtitle: Настройте отображение операций
+        transactions_title: Операции
+    debugs:
+      show:
+        context:
+          account: счёт=%{value}
+          account_provider: поставщик_счёта=%{value}
+          family: семья=%{value}
+          provider: поставщик=%{value}
+          user: пользователь=%{value}
+        empty: События отладки не найдены.
+        filters:
+          account_id: ID счёта
+          account_provider_id: ID поставщика счёта
+          all: Все
+          category: Категория
+          end_date: По
+          family_id: ID семьи
+          level: Уровень
+          provider: Поставщик
+          reset: Сброс
+          source: Источник
+          start_date: С
+          submit: Фильтр
+          user_id: ID пользователя
+        missing_value: "-"
+        page_title: Отладка
+        subtitle: Значимые операционные события для супер-администраторов. Новейшие
+          в начале.
+        table:
+          category: Категория
+          context: Контекст
+          level: Уровень
+          message: Сообщение
+          metadata: Метаданные
+          source: Источник
+          time: Время
+          view_metadata: Просмотр
+        title: Журнал событий отладки
+    hostings:
+      ensure_admin:
+        not_authorized: Доступ запрещён
+    llm_usages:
+      show:
+        avg_cost_per_request: Средняя стоимость/запрос
+        based_on_requests: Основано на %{with_cost} из %{total} запросов с данными
+          о стоимости
+        col_cost: Стоимость
+        col_date: Дата
+        col_model: Модель
+        col_operation: Операция
+        col_tokens: Токены
+        completion: завершение
+        cost_by_model: Стоимость по моделям
+        cost_by_operation: Стоимость по операциям
+        cost_estimates_description: 'Стоимость оценивается на основе опубликованных цен поставщиков, включая цены OpenAI на июль 2026 года. Фактические затраты могут отличаться. Цены указаны за 1 миллион токенов и варьируются в зависимости от модели. Пользовательские или самохостинг-модели будут отображаться как "N/A" и не включаются в общую стоимость.'
+        cost_estimates_title: Оценка стоимости
+        end_date: Дата окончания
+        failed: Неудачно
+        filter: Фильтр
+        no_usage_data: Данные об использовании за выбранный период не найдены
+        page_title: Использование LLM и затраты
+        prompt: запрос
+        recent_usage: Недавнее использование
+        start_date: Дата начала
+        subtitle: Отслеживайте использование ИИ и предполагаемые затраты
+        total_cost: Общая стоимость
+        total_requests: Всего запросов
+        total_tokens: Всего токенов
+    mcp:
+      revoke:
+        revoked: Подключение отозвано.
+      show:
+        connect_subtitle: Вставьте этот URL в Claude.ai (или любой клиент с поддержкой 
+          MCP), чтобы подключить его к вашему аккаунту Sure.
+        connect_title: Подключить ИИ-ассистента
+        connected_ago: Подключено %{time} назад
+        connected_subtitle: Эти приложения сейчас имеют доступ к вашим данным Sure. 
+          Отзовите доступ для тех, которыми больше не пользуетесь.
+        connected_title: Подключённые клиенты
+        copied: Скопировано!
+        copy_url: Копировать
+        how_to_connect_title: Как подключить Claude
+        page_title: MCP-сервер
+        revoke: Отозвать
+        revoke_confirm: Отозвать доступ для этого клиента?
+        step_1: Откройте Claude.ai и перейдите в Settings → Integrations.
+        step_2: Нажмите «Add integration» и вставьте URL MCP-сервера выше.
+        step_3: Нажмите Connect — вы будете перенаправлены в Sure для входа и 
+          подтверждения доступа.
+        step_4: После авторизации Claude сможет читать ваши счета, операции и данные 
+          о балансе.
+        unknown_client: Неизвестный клиент
+    payments:
+      show:
+        choose_level: Выберите уровень
+        contributions_note: Взносы в %{product_name} будут отображаться здесь.
+        currently_on_plan: В настоящее время на
+        manage: Управлять
+        not_contributing_emphasis: не вносите вклад
+        not_contributing_prefix: В настоящее время вы
+        page_title: Платежи
+        payment_via_stripe: Оплата через Stripe
+        subscription_subtitle: Обновите данные вашей кредитной карты
+        subscription_title: Управление взносами
+        trial_days_left:
+          few: Данные будут удалены через %{count} дня
+          many: Данные будут удалены через %{count} дней
+          one: Данные будут удалены через %{count} день
+          other: Данные будут удалены через %{count} дня
+        trialing: В настоящее время используется открытая демо-версия %{product_name}
+    preferences:
+      show:
+        additional_currencies_label: Дополнительные валюты
+        base_currency_badge: Базовая валюта
+        base_currency_label: Базовая валюта
+        country: Страна
+        currencies_more: "+%{count} ещё"
+        currencies_subtitle: Выберите, какие валюты будут отображаться в денежных
+          полях для вашего %{moniker}
+        currencies_title: "%{moniker} Валюты"
+        currency: Валюта
+        currency_search_placeholder: Поиск валют
+        date_format: Формат даты
+        default_account_order: Порядок счетов по умолчанию
+        default_period: Период по умолчанию
+        general_subtitle: Настройте ваши предпочтения
+        general_title: Общие
+        language: Язык
+        language_auto: Язык браузера
+        manage_currencies: Управление валютами
+        manage_currencies_subtitle: Уберите валюты, которые вы никогда не используете,
+          или сократите список до нескольких.
+        month_start_day: Начало бюджетного месяца
+        month_start_day_hint: Установите, когда начинается ваш бюджетный месяц (например,
+          день зарплаты)
+        month_start_day_warning: Ваши бюджеты и расчёты MTD будут использовать этот
+          пользовательский день начала вместо 1-го числа каждого месяца.
+        no_additional_currencies: Не выбрано
+        no_matching_currencies: Валюты не найдены
+        page_title: Предпочтения
+        preview:
+          description: Подключитесь к функциям в процессе разработки, отмеченным как
+            предварительный просмотр или canary.
+          title: Включить функции предварительного просмотра
+        save_currencies: Сохранить валюты
+        select_all_currencies: Выбрать все
+        select_base_only: Только базовая валюта
+        selected_currencies_count:
+          few: Выбрано %{count}
+          many: Выбрано %{count}
+          one: Выбрано %{count}
+          other: Выбрано %{count}
+        sharing_default_label: Совместное использование по умолчанию для новых счетов
+        sharing_private: Оставить приватным по умолчанию
+        sharing_shared: Делитесь со всеми участниками
+        sharing_subtitle: Контролируйте, как счета делятся в вашем %{moniker}
+        sharing_title: "%{moniker} Совместное использование"
+        timezone: Часовой пояс
+        translations_notice: Обратите внимание, что мы всё ещё работаем над переводами
+          на различные языки.
+    profiles:
+      destroy:
+        cannot_remove_self: Вы не можете удалить себя из аккаунта.
+        member_owns_other_family_data: This member still owns accounts in another
+          household and cannot be removed. Transfer or remove those accounts first.
+        member_removal_failed: Произошла ошибка при удалении участника.
+        member_removed: Участник успешно удалён.
+        not_authorized: У вас нет прав для удаления участников.
+      show:
+        confirm_delete:
+          body: Вы уверены, что хотите навсегда удалить свой аккаунт? Это действие
+            необратимо.
+          title: Удалить аккаунт?
+        confirm_remove_invitation:
+          body: Вы уверены, что хотите удалить приглашение для %{email}?
+          title: Удалить приглашение
+        confirm_remove_member:
+          body: Вы уверены, что хотите удалить %{name} из вашего аккаунта?
+          title: Удалить участника
+        confirm_reset:
+          body: Вы уверены, что хотите сбросить свой аккаунт? Это удалит все ваши
+            счета, категории, продавцов, теги и другие данные. Это действие нельзя
+            отменить.
+          title: Сбросить аккаунт?
+        confirm_reset_with_sample_data:
+          body: Вы уверены, что хотите сбросить свой аккаунт и загрузить демонстрационные
+            данные? Это удалит ваши существующие данные и заменит их демонстрационными,
+            чтобы вы могли безопасно исследовать Sure.
+          title: Сбросить аккаунт и загрузить демонстрационные данные?
+        danger_zone_title: Опасная зона
+        delete_account: Удалить аккаунт
+        delete_account_warning: Удаление вашего аккаунта навсегда удалит все ваши
+          данные и не может быть отменено.
+        email: Электронная почта
+        first_name: Имя
+        group_form_input_placeholder: Введите название группы
+        group_form_label: Название группы
+        group_title: Участники группы
+        household_form_input_placeholder: Введите название домохозяйства
+        household_form_label: Название домохозяйства
+        household_subtitle: Приглашённые могут войти в ваш аккаунт %{moniker} и получить
+          доступ к общим ресурсам.
+        household_title: Домохозяйство
+        invitation_link: Ссылка на приглашение
+        invite_member: Добавить участника
+        last_name: Фамилия
+        page_title: Информация о профиле
+        pending: В ожидании
+        profile_subtitle: Настройте, как вы выглядите в %{product_name}
+        profile_title: Личные данные
+        remove_invitation: Удалить приглашение
+        remove_member: Удалить участника
+        resend_confirmation_link: Запросить новое письмо для подтверждения
+        reset_account: Сбросить аккаунт
+        reset_account_warning: Сброс вашего аккаунта удалит все ваши счета, категории,
+          продавцов, теги и другие данные, но сохранит ваш пользовательский аккаунт.
+        reset_account_with_sample_data: Сброс и предзагрузка
+        reset_account_with_sample_data_warning: Удалите все ваши существующие данные
+          и затем загрузите свежие демонстрационные данные, чтобы вы могли исследовать
+          с предзаполненной средой.
+        save: Сохранить
+        unconfirmed_email_notice_html: Вы запросили смену email на %{email}. Перейдите по 
+          ссылке в письме, чтобы подтвердить изменения. Если письмо не пришло, проверьте 
+          папку Спам или %{resend_link}.
+    providers:
+      akahu_panel:
+        step_1_html: Перейдите по ссылке %{link} и создайте персональное приложение.
+        step_2: Скопируйте токен приложения и пользовательский токен.
+        step_3: Вставьте токены ниже, сохраните и подключите синхронизированные счета.
+      bank_sync:
+        lede: Подключите внешние счета, чтобы операции, балансы и активы автоматически
+          поступали в Sure.
+        page_title: Синхронизация банка
+      binance_panel:
+        api_key_label: API Ключ
+        api_key_placeholder: Вставьте ваш API-ключ Binance
+        api_secret_label: Секретный ключ API
+        api_secret_placeholder: Вставьте ваш секретный ключ API Binance
+        connect_button: Подключить Binance
+        disconnect_confirm: Вы уверены, что хотите отключить Binance?
+        historical_import: Настройки исторического импорта
+        ip_hint_body: 'Добавьте IP-адрес выхода сервера приложения в белый список
+          API-ключа Binance:'
+        ip_hint_contact_admin: Свяжитесь с вашим администратором, чтобы получить IP-адрес
+          выхода сервера приложения.
+        ip_hint_title: Требуется белый список IP
+        no_withdraw_body: Не включайте разрешения на вывод средств при создании вашего
+          API-ключа Binance. Sure требуется только доступ для чтения.
+        no_withdraw_title: Только ключ для чтения
+        setup_instructions: 'Чтобы подключить Binance, создайте API-ключ только для
+          чтения:'
+        step1_html: Перейдите на <a href="https://www.binance.com/en/my/settings/api-management"
+          target="_blank" rel="noopener noreferrer" class="underline">Управление API
+          Binance</a>
+        step2: Создайте новый API-ключ с разрешением только для чтения
+        step3: Вставьте ваш API-ключ и секретный ключ ниже
+        sync: Синхронизировать
+        sync_start_date_help: Выберите, с какой даты начинать загрузку исторических
+          сделок.
+        sync_start_date_label: Импортировать данные с
+        syncing: Синхронизация...
+      clear_filter: Очистить фильтры
+      coinbase_panel:
+        api_key_label: API Ключ
+        api_key_placeholder: Введите ваш API-ключ Coinbase
+        api_secret_label: Секретный ключ API
+        api_secret_placeholder: Введите ваш секретный ключ API Coinbase
+        connect_button: Подключить Coinbase
+        disconnect_confirm: Вы уверены, что хотите отключить это подключение Coinbase?
+          Ваши синхронизированные счета станут ручными счетами.
+        setup_instructions: 'Чтобы подключить Coinbase:'
+        step1_html: Перейдите на <a href="https://portal.cdp.coinbase.com/projects/api-keys"
+          target="_blank" rel="noopener noreferrer" class="text-primary underline">Настройки
+          API Coinbase</a>
+        step2: Создайте новый API-ключ с разрешениями только для чтения (просмотр
+          счетов, просмотр операций)
+        step3: Скопируйте ваш API-ключ и секретный ключ API и вставьте их ниже
+        sync: Синхронизировать
+        syncing: Синхронизация...
+      connect: Подключить
+      drawer_trust_statement: Доступ только для чтения. Sure никогда не может перемещать
+        деньги, а ваши учетные данные хранятся в зашифрованном виде.
+      empty_filter: Поставщики, соответствующие вашему фильтру, не найдены.
+      enable_banking_panel:
+        add_connection: Добавить подключение
+        application_id_label: ID приложения
+        application_id_placeholder_new: Введите ID приложения
+        application_id_placeholder_update: Введите новый ID для обновления
+        callback_url_instruction: Для URL обратного вызова используйте %{callback_url}.
+        client_certificate_label: Клиентский сертификат (с приватным ключом)
+        config_locked_message: Отключите все связанные банки перед изменением этих
+          учётных данных.
+        config_locked_title: Конфигурация заблокирована
+        configured: Настроено
+        connect_bank: Подключить банк
+        connected_bank: Подключённый банк
+        connection: Подключение
+        connection_error: Ошибка подключения
+        country_label: Страна
+        ready_to_link: Готово к связыванию счетов
+        reconnect: Переподключить
+        remove: Удалить
+        remove_confirm: Вы уверены, что хотите удалить это подключение?
+        save_and_connect: Сохранить и подключить
+        select_country: Выберите страну...
+        session_expired_reconnect: Сессия истекла - переподключитесь
+        session_expires: 'Сессия истекает: %{date}'
+        step_1_html: Перейдите на %{link} и получите ваши учётные данные разработчика.
+        step_2: Выберите вашу страну и вставьте ID приложения + клиентский сертификат
+          ниже.
+        step_3: Сохраните, затем используйте Добавить подключение, чтобы связать ваш
+          банк.
+        sync: Синхронизировать
+        syncing: Синхронизация
+        unknown: Неизвестно
+        update_connection: Обновить подключение
+      encryption_error:
+        message: Синхронизация банка требует настройки шифрования Active Record. Установите
+          primary_key, deterministic_key и key_derivation_salt в ваших учетных данных
+          Rails или переменных окружения.
+        title: Отсутствуют ключи шифрования
+      groups:
+        available: Доступные
+        empty_available: Все доступные поставщики подключены.
+        your_connections: Ваши подключения
+      health_strip:
+        accounts_syncing: синхронизация счетов
+        connected: подключено
+        last_synced: Последняя синхронизация %{time} назад
+        needs_attention: требует внимания
+      ibkr_panel:
+        accounts_tab: Счета
+        configuration:
+          all_other_options: 'Все остальные параметры конфигурации: "Нет"'
+          date_format: 'Формат даты: yyyy-MM-dd'
+          date_time_separator: 'Разделитель даты/времени: ; (точка с запятой)'
+          format: 'Формат: XML'
+          models: 'Модели: Необязательно'
+          period: 'Период: Последние 365 календарных дней'
+          profit_and_loss: 'Прибыль и убытки: По умолчанию'
+          time_format: 'Формат времени: HH:mm:ss'
+        disconnect_confirm: Отключить Interactive Brokers?
+        flex_query_details:
+          configuration_heading: Установите эти параметры запроса
+          eyebrow: Flex Query
+          sections_heading: Включите эти разделы и поля
+          summary: Разверните, чтобы увидеть точные разделы, поля и настройки, которые
+            должен включать ваш запрос активности IBKR Flex.
+          title: Разделы, поля и конфигурация
+        not_configured: Не настроено.
+        query_id_label: Query ID
+        query_id_placeholder_existing: Оставьте пустым, чтобы сохранить текущий ID
+          запроса
+        query_id_placeholder_new: Введите ваш ID запроса IBKR Flex
+        report_window_note: Отчёты IBKR Flex ограничены окном запроса, которое вы
+          настроили в IBKR. Sure импортирует полные текущие активы плюс до последних
+          365 дней активности из этого отчёта.
+        save_configuration: Сохранить конфигурацию
+        sections:
+          account_information: 'Информация о счёте: ID счёта, Валюта'
+          cash_report: 'Отчёт о наличных:'
+          cash_report_fields: 'Поля: Валюта, Конечный остаток наличных'
+          cash_report_options: 'Опции: Нет'
+          cash_transactions: 'Операции с наличными:'
+          cash_transactions_fields: 'Поля: Сумма, Conid, Валюта, Курс к базовой валюте,
+            Дата отчёта, ID операции, Тип'
+          cash_transactions_options: 'Опции: Дивиденды, Депозиты и снятия, Детали'
+          change_in_position_value_summary: 'Изменение стоимости позиции: Валюта,
+            Стоимость на конец периода'
+          net_asset_value: 'Чистая стоимость активов (NAV) в базовой валюте:'
+          net_asset_value_fields: 'Поля: Валюта, Дата отчёта, Всего'
+          net_asset_value_options: 'Опции: Нет'
+          open_positions: 'Открытые позиции:'
+          open_positions_fields: 'Поля: Класс активов, Conid, Цена по себестоимости,
+            Валюта, Курс к базовой валюте, Рыночная цена, Количество, Дата отчёта,
+            ID ценной бумаги, Тип ID ценной бумаги, Сторона, Символ'
+          open_positions_options: 'Опции: Сводка'
+          trades: 'Сделки:'
+          trades_fields: 'Поля: Класс активов, Покупка/Продажа, Conid, Валюта, Курс
+            к базовой валюте, Комиссия IB, Валюта комиссии IB, Количество, Символ,
+            Дата сделки, ID сделки, Цена сделки, ID операции'
+          trades_options: 'Опции: Исполнение'
+        status_configured_prefix: "%{summary}. Перейдите на"
+        status_configured_suffix: вкладку, чтобы управлять обнаруженными счетами.
+        steps:
+          step_1: В вашем клиентском портале IBKR перейдите в "Performance & Reports"
+            > "Flex Queries".
+          step_2: Нажмите на значок "+" в разделе "Activity Flex Query", чтобы создать
+            новый запрос.
+          step_3: Назовите ваш запрос (например, "Sure Sync"), затем просмотрите детали
+            Flex Query ниже и включите перечисленные разделы, поля и параметры конфигурации.
+          step_4: Сохраните запрос, запомните ваш "Query ID", затем используйте значок
+            шестерёнки в разделе "Flex Web Service Configuration", чтобы сгенерировать
+            токен доступа.
+          step_5: Вставьте ваш Query ID и токен ниже, сохраните конфигурацию, затем
+            перейдите в Счета, чтобы связать обнаруженные счета IBKR.
+        sync: Синхронизировать
+        token_label: Токен
+        token_placeholder_existing: Оставьте пустым, чтобы сохранить текущий токен
+        token_placeholder_new: Введите ваш токен веб-сервиса IBKR Flex
+        update_configuration: Обновить конфигурацию
+      kraken_panel:
+        add_connection: Добавить подключение Kraken
+        api_key_label: API Ключ
+        api_key_placeholder: Вставьте ваш API-ключ Kraken
+        api_secret_label: Приватный ключ
+        api_secret_placeholder: Вставьте ваш приватный ключ Kraken
+        connection_name_label: Название подключения
+        connection_name_placeholder: Основное Kraken
+        default_connection_name: Kraken
+        disconnect: Отключить
+        disconnect_confirm: Вы уверены, что хотите отключить %{name}?
+        keep_api_key_placeholder: Оставьте пустым, чтобы сохранить существующий API-ключ
+        keep_api_secret_placeholder: Оставьте пустым, чтобы сохранить существующий
+          приватный ключ
+        read_only_body: Не предоставляйте разрешения на торговлю, отмену, вывод средств,
+          экспорт, книгу, Earn, стейкинг или переводы. Sure импортирует только балансы,
+          активы и спотовые торговые операции.
+        read_only_title: Только синхронизация биржи для чтения
+        setup_accounts: Настроить счёт
+        step1_html: Перейдите на <a href="https://pro.kraken.com/app/settings/api"
+          target="_blank" rel="noopener noreferrer" class="underline">настройки API
+          Kraken</a>
+        step2: Создайте API-ключ с разрешениями только для запроса средств и закрытых
+          ордеров и торгов.
+        step3: Вставьте API-ключ и приватный ключ ниже.
+        sync: Синхронизировать
+        syncing: Синхронизация...
+        update_connection: Обновить подключение
+      lunchflow_panel:
+        api_key_label: API Ключ
+        api_key_placeholder_new: Вставьте API-ключ здесь
+        api_key_placeholder_update: Введите новый API-ключ для обновления
+        base_url_label: Базовый URL (необязательно)
+        base_url_placeholder: https://lunchflow.app/api/v1 (по умолчанию)
+        save_and_connect: Сохранить и подключить
+        step_1_html: Перейдите на %{link} и создайте API-ключ.
+        step_2: Вставьте ваш ключ ниже и подключитесь.
+        step_3: Затем перейдите в Счета, чтобы связать ваши синхронизированные счета.
+        update_connection: Обновить подключение
+      maturity:
+        alpha: Альфа
+        beta: Бета
+      meta:
+        last_synced: Синхронизировано %{time} назад
+        no_recent_sync: Синхронизация просрочена
+        reconsent_needed:
+          few: Повторное согласие требуется через %{count} дня
+          many: Повторное согласие требуется через %{count} дней
+          one: Повторное согласие требуется через %{count} день
+          other: Повторное согласие требуется через %{count} дня
+        reconsent_required: Требуется повторное согласие
+        sync_error: Ошибка синхронизации
+      not_authorized: Не авторизован
+      not_found: Поставщик не найден.
+      plaid_eu_panel:
+        step_1_html: Откройте %{link} и скопируйте ваш EU Client ID и секретный ключ.
+      plaid_panel:
+        step_1_html: Откройте %{link} и скопируйте ваш Client ID и секретный ключ.
+        step_2: Выберите среду. Используйте песочницу для тестирования и производство
+          для реальных счетов.
+        step_3: Вставьте ваши учётные данные ниже и подключитесь.
+      provider_form:
+        save_and_connect: Сохранить и подключить
+      recently_synced: Недавно синхронизировано. Попробуйте снова через мгновение.
+      search_filters:
+        aria_label: Поиск поставщиков
+        chips:
+          all: Все
+          bank: Банки
+          crypto: Крипто
+          investment: Инвестиции
+        placeholder: Поиск поставщиков
+      setup_steps:
+        eyebrow: Настройка
+        need_help: Нужна помощь?
+      simplefin_panel:
+        save_and_connect: Сохранить и подключить
+        setup_token_label: Токен настройки
+        setup_token_placeholder: Вставьте токен настройки SimpleFIN
+        step_1_html: Перейдите на %{link} для получения одноразового токена настройки.
+        step_2: Вставьте токен ниже и подключитесь.
+        step_3: Затем перейдите в Счета, чтобы связать ваши синхронизированные счета.
+      status:
+        err: Ошибка
+        'false': Не настроено
+        ok: Подключено
+        warn: Требуется действие
+      sync_all: Синхронизировать все
+      sync_all_in_progress: Синхронизация всех подключённых поставщиков…
+      sync_all_recently: Синхронизация уже в процессе. Попробуйте снова через мгновение.
+      sync_provider: Синхронизировать сейчас
+      sync_provider_in_progress: Синхронизация начата.
+      sync_provider_no_items: Нет доступных подключений для синхронизации.
+      taglines:
+        akahu: Синхронизация финансовых учреждений Новой Зеландии через Akahu.
+        binance: Синхронизируйте ваши спотовые балансы Binance с использованием API-ключа
+          только для чтения.
+        brex: Синхронизируйте активность наличных и корпоративных карт Brex с доступом
+          только для чтения.
+        coinbase: Импортируйте ваши криптоактивы Coinbase и отслеживайте производительность.
+        coinstats: Отслеживайте весь ваш криптопортфель через кошельки и биржи.
+        enable_banking: Синхронизируйте европейские банковские счета через PSD2 открытое
+          банковское дело.
+        ibkr: Синхронизируйте инвестиционные счета Interactive Brokers через Flex
+          Query импорт.
+        indexa_capital: Отслеживайте ваш автоматизированный инвестиционный портфель
+          Indexa Capital.
+        kraken: Синхронизируйте балансы Kraken и спотовые торговые операции с использованием
+          API-ключа только для чтения.
+        lunchflow: Подключите более 20 000 банков из более чем 40 стран (Великобритания,
+          ЕС, США и другие!)
+        mercury: Синхронизируйте ваши бизнес-счета Mercury автоматически.
+        plaid: Подключите тысячи финансовых учреждений США через Plaid.
+        plaid_eu: Подключите европейские финансовые учреждения через Plaid (PSD2 /
+          Open Banking).
+        simplefin: Подключите банковские счета США через открытый протокол SimpleFIN.
+        snaptrade: Подключите брокерские счета через сеть агрегации SnapTrade.
+        sophtron: Подключите банки и коммунальные услуги США и Канады.
+      up_panel:
+        step_1_html: Перейдите по ссылке %{link} и создайте персональный токен доступа.
+        step_2: Скопируйте персональный токен доступа.
+        step_3: Вставьте токен ниже, сохраните и подключите синхронизированные счета.
+      update:
+        no_changes: Изменений не было
+        updated_successfully: Настройки поставщика успешно обновлены
+    securities:
+      show:
+        encryption_warning:
+          generate: "Сгенерируйте набор ключей командой: bin/rails db:encryption:init"
+          intro: "Конфиденциальные данные (API-ключи, токены провайдеров, MFA-секреты и 
+            персональные данные) хранятся без шифрования. Чтобы включить шифрование, 
+            задайте следующие ключи в переменных окружения или в Rails credentials:"
+          keys:
+            - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+            - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+            - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+          title: Отсутствуют ключи шифрования
+        page_title: Безопасность
+        sso_confirm_body: Вы уверены, что хотите отключить ваш аккаунт %{provider}?
+          Вы можете подключить его снова, войдя с этим поставщиком.
+        sso_confirm_button: Отключить
+        sso_confirm_title: Отключить аккаунт?
+        sso_connect_hint: Выйдите и войдите с помощью поставщика SSO, чтобы подключить
+          аккаунт.
+        sso_disconnect: Отключить
+        sso_last_used: Последнее использование
+        sso_never: Никогда
+        sso_no_email: Нет электронной почты
+        sso_no_identities: Нет подключённых аккаунтов SSO
+        sso_subtitle: Управляйте подключениями вашего аккаунта единого входа
+        sso_title: Подключённые аккаунты
+        sso_warning_message: Это ваш единственный метод входа. Вы должны установить
+          пароль в настройках безопасности перед отключением, иначе вы можете потерять
+          доступ к своему аккаунту.
+    settings_nav:
+      accounts_label: Счета
+      advanced_section_title: Расширенные
+      ai_prompts_label: AI Запросы
+      api_key_label: API Ключ
+      api_keys_label: API Ключ
+      appearance_label: Внешний вид
+      bank_sync_label: Синхронизация банка
+      categories_label: Категории
+      debug_label: Отладка
+      exports_label: Экспорт
+      feedback_label: Обратная связь
+      general_section_title: Общие
+      guides_label: Руководства
+      imports_label: Импорт
+      llm_usage_label: Использование LLM
+      logout: Выйти
+      mcp_label: MCP
+      merchants_label: Продавцы
+      other_section_title: Ещё
+      payment_label: Платеж
+      preferences_label: Предпочтения
+      profile_label: Информация о профиле
+      providers_label: Поставщики
+      recurring_transactions_label: Регулярные
+      rules_label: Правила
+      security_label: Безопасность
+      self_hosting_label: Самостоятельный хостинг
+      sso_providers_label: Поставщики SSO
+      statement_vault_label: Хранилище выписок
+      tags_label: Теги
+      transactions_section_title: Операции
+      users_label: Пользователи
+      whats_new_label: Что нового
+    settings_nav_link_large:
+      next: Далее
+      previous: Назад
+    user_avatar_field:
+      accepted_formats: JPG или PNG. Максимум 5MB.
+      change: Изменить фото
+      choose: Загрузить фото
+      choose_label: "(необязательно)"
+  views:
+    settings:
+      payments:
+        cancellation: Ваш вклад заканчивается %{date}.
+        renewal: Ваш вклад продолжается %{date}.
diff --git a/config/locales/views/settings/securities/fr.yml b/config/locales/views/settings/securities/fr.yml
index 2c72ed9e7..8891d4840 100644
--- a/config/locales/views/settings/securities/fr.yml
+++ b/config/locales/views/settings/securities/fr.yml
@@ -4,7 +4,41 @@ fr:
     securities:
       show:
         disable_mfa: Désactiver la 2FA
-        disable_mfa_confirm: Êtes-vous sûr(e) de vouloir désactiver l'authentification à deux facteurs ? Cela rendra votre compte moins sécurisé.
+        disable_mfa_confirm: Êtes-vous sûr(e) de vouloir désactiver l'authentification
+          à deux facteurs ? Cela rendra votre compte moins sécurisé.
         enable_mfa: Activer la 2FA
-        mfa_description: Ajoutez une couche supplémentaire de sécurité à votre compte en exigeant un code de votre application d'authentificateur lors de la connexion
+        mfa_description: Ajoutez une couche supplémentaire de sécurité à votre compte
+          en exigeant un code de votre application d'authentificateur lors de la connexion
+        mfa_disabled_description: Activez 2FA pour ajouter une couche de sécurité
+          supplémentaire à votre compte.
+        mfa_disabled_status_html: L'authentification à deux facteurs est <span class="font-medium
+          text-red-600">désactivée</span>
+        mfa_enabled_description: Votre compte est protégé par une couche de sécurité
+          supplémentaire.
+        mfa_enabled_status_html: L'authentification à deux facteurs est <span class="font-medium
+          text-green-600">activée</span>
         mfa_title: Authentification à deux facteurs
+        webauthn_add: Ajouter un mot de passe ou une clé de sécurité
+        webauthn_added: "%{date} ajouté"
+        webauthn_description: Utilisez un mot de passe, Touch ID, Windows Hello ou
+          une clé de sécurité matérielle comme deuxième facteur lors de la connexion.
+        webauthn_empty: Aucun mot de passe ou clé de sécurité n'est encore enregistré.
+        webauthn_last_used: Dernière utilisation il y a %{time_ago}
+        webauthn_name_label: Nom de la clé
+        webauthn_name_placeholder: MacBook Touch ID, YubiKey, etc.
+        webauthn_remove: Supprimer
+        webauthn_remove_confirm: Êtes-vous sûr de vouloir supprimer ce mot de passe
+          ou cette clé de sécurité ?
+        webauthn_remove_confirm_body: Vous devrez enregistrer à nouveau ce mot de
+          passe ou cette clé de sécurité avant de pouvoir l'utiliser pour la vérification
+          de la connexion.
+        webauthn_title: Clés d'accès et clés de sécurité
+        webauthn_unsupported: Ce navigateur ne prend pas en charge les mots de passe
+          ou les clés de sécurité.
+  webauthn_credentials:
+    default_name: Clé de sécurité
+    failure: Impossible d'enregistrer ce mot de passe ou cette clé de sécurité. Veuillez
+      réessayer.
+    mfa_required: Activez l'authentification à deux facteurs avant d'ajouter un mot
+      de passe ou une clé de sécurité.
+    success: Clé d'accès ou clé de sécurité supprimée.
diff --git a/config/locales/views/settings/securities/it.yml b/config/locales/views/settings/securities/it.yml
new file mode 100644
index 000000000..74a4bcf61
--- /dev/null
+++ b/config/locales/views/settings/securities/it.yml
@@ -0,0 +1,31 @@
+---
+it:
+  settings:
+    securities:
+      show:
+        disable_mfa: Disabilita 2FA
+        disable_mfa_confirm: Sei sicuro di voler disabilitare l'autenticazione a due fattori? Questo renderà il tuo account meno sicuro.
+        enable_mfa: Abilita 2FA
+        mfa_enabled_status_html: "L'autenticazione a due fattori è <span class=\"font-medium text-green-600\">abilitata</span>"
+        mfa_enabled_description: Il tuo account è protetto con un ulteriore livello di sicurezza.
+        mfa_disabled_status_html: "L'autenticazione a due fattori è <span class=\"font-medium text-red-600\">disabilitata</span>"
+        mfa_disabled_description: Abilita l'A2F per aggiungere un ulteriore livello di sicurezza al tuo account.
+        mfa_description: Aggiungi un ulteriore livello di sicurezza al tuo account richiedendo un codice dalla tua app di autenticazione al momento dell'accesso
+        mfa_title: Autenticazione a due fattori
+        webauthn_add: Aggiungi passkey o chiave di sicurezza
+        webauthn_added: Aggiunta il %{date}
+        webauthn_description: Usa una passkey, Touch ID, Windows Hello o una chiave di sicurezza hardware come secondo fattore al momento dell'accesso.
+        webauthn_empty: Nessuna passkey o chiave di sicurezza registrata ancora.
+        webauthn_last_used: Usata l'ultima volta %{time_ago} fa
+        webauthn_name_label: Nome chiave
+        webauthn_name_placeholder: MacBook Touch ID, YubiKey, ecc.
+        webauthn_remove: Rimuovi
+        webauthn_remove_confirm: Sei sicuro di voler rimuovere questa passkey o chiave di sicurezza?
+        webauthn_remove_confirm_body: Dovrai registrare nuovamente questa passkey o chiave di sicurezza prima che possa essere usata per la verifica dell'accesso.
+        webauthn_title: Passkey e chiavi di sicurezza
+        webauthn_unsupported: Questo browser non supporta passkey o chiavi di sicurezza.
+  webauthn_credentials:
+    default_name: Chiave di sicurezza
+    failure: Impossibile salvare la passkey o la chiave di sicurezza. Riprova.
+    mfa_required: Abilita l'autenticazione a due fattori prima di aggiungere una passkey o una chiave di sicurezza.
+    success: Passkey o chiave di sicurezza rimossa.
diff --git a/config/locales/views/settings/securities/ru.yml b/config/locales/views/settings/securities/ru.yml
new file mode 100644
index 000000000..f1997a2d4
--- /dev/null
+++ b/config/locales/views/settings/securities/ru.yml
@@ -0,0 +1,43 @@
+---
+ru:
+  settings:
+    securities:
+      show:
+        disable_mfa: Отключить 2FA
+        disable_mfa_confirm: Вы уверены, что хотите отключить двухфакторную аутентификацию?
+          Это сделает ваш счёт менее защищённым.
+        enable_mfa: Включить 2FA
+        mfa_description: Добавьте дополнительный уровень безопасности вашему счёту,
+          требуя код из приложения-аутентификатора при входе
+        mfa_disabled_description: Включите 2FA, чтобы добавить дополнительный уровень
+          безопасности вашему счёту.
+        mfa_disabled_status_html: Двухфакторная аутентификация <span class="font-medium
+          text-destructive">отключена</span>
+        mfa_enabled_description: Ваш счёт защищён дополнительным уровнем безопасности.
+        mfa_enabled_status_html: Двухфакторная аутентификация <span class="font-medium
+          text-success">включена</span>
+        mfa_title: Двухфакторная аутентификация
+        webauthn_add: Добавить ключ доступа или ключ безопасности
+        webauthn_added: Добавлено %{date}
+        webauthn_description: Используйте ключ доступа, Touch ID, Windows Hello или
+          аппаратный ключ безопасности в качестве второго фактора при входе.
+        webauthn_empty: Ключи доступа или ключи безопасности ещё не зарегистрированы.
+        webauthn_last_used: Последнее использование %{time_ago} назад
+        webauthn_name_label: Название ключа
+        webauthn_name_placeholder: MacBook Touch ID, YubiKey и т.д.
+        webauthn_remove: Удалить
+        webauthn_remove_confirm: Вы уверены, что хотите удалить этот ключ доступа
+          или ключ безопасности?
+        webauthn_remove_confirm_body: Вам нужно будет зарегистрировать этот ключ доступа
+          или ключ безопасности снова, прежде чем его можно будет использовать для
+          проверки входа.
+        webauthn_title: Ключи доступа и ключи безопасности
+        webauthn_unsupported: Этот браузер не поддерживает ключи доступа или ключи
+          безопасности.
+  webauthn_credentials:
+    default_name: Ключ безопасности
+    failure: Не удалось сохранить этот ключ доступа или ключ безопасности. Пожалуйста,
+      попробуйте снова.
+    mfa_required: Включите двухфакторную аутентификацию перед добавлением ключа доступа
+      или ключа безопасности.
+    success: Ключ доступа или ключ безопасности удалён.
diff --git a/config/locales/views/settings/securities/tr.yml b/config/locales/views/settings/securities/tr.yml
index 09ea32a72..e33c90fd7 100644
--- a/config/locales/views/settings/securities/tr.yml
+++ b/config/locales/views/settings/securities/tr.yml
@@ -4,8 +4,39 @@ tr:
     securities:
       show:
         disable_mfa: 2FA'yı Devre Dışı Bırak
-        disable_mfa_confirm: İki faktörlü kimlik doğrulamayı devre dışı bırakmak istediğinizden emin misiniz?
-          Bu, hesabınızı daha az güvenli hale getirecektir.
+        disable_mfa_confirm: İki faktörlü kimlik doğrulamayı devre dışı bırakmak istediğinizden
+          emin misiniz? Bu işlem hesabınızı daha az güvenli hale getirecektir.
         enable_mfa: 2FA'yı Etkinleştir
-        mfa_description: Giriş yaparken kimlik doğrulama uygulamanızdan bir kod gerektirerek hesabınıza ekstra bir güvenlik katmanı ekleyin
-        mfa_title: İki Faktörlü Kimlik Doğrulama
\ No newline at end of file
+        mfa_description: Giriş yaparken kimlik doğrulama uygulamanızdan bir kod
+          isteyerek hesabınıza ekstra bir güvenlik katmanı ekleyin
+        mfa_disabled_description: Hesabınıza ekstra bir güvenlik katmanı eklemek için
+          2FA'yı etkinleştirin.
+        mfa_disabled_status_html: İki faktörlü kimlik doğrulama <span class="font-medium
+          text-red-600">devre dışı</span>
+        mfa_enabled_description: Hesabınız ek bir güvenlik katmanıyla korunmaktadır.
+        mfa_enabled_status_html: İki faktörlü kimlik doğrulama <span class="font-medium
+          text-green-600">etkin</span>
+        mfa_title: İki Faktörlü Kimlik Doğrulama
+        webauthn_add: Geçiş anahtarı veya güvenlik anahtarı ekle
+        webauthn_added: "%{date} tarihinde eklendi"
+        webauthn_description: Giriş yaparken ikinci faktör olarak bir geçiş anahtarı,
+          Touch ID, Windows Hello veya donanım güvenlik anahtarı kullanın.
+        webauthn_empty: Henüz kayıtlı geçiş anahtarı veya güvenlik anahtarı yok.
+        webauthn_last_used: Son kullanım %{time_ago} önce
+        webauthn_name_label: Anahtar adı
+        webauthn_name_placeholder: MacBook Touch ID, YubiKey vb.
+        webauthn_remove: Kaldır
+        webauthn_remove_confirm: Bu geçiş anahtarını veya güvenlik anahtarını kaldırmak
+          istediğinizden emin misiniz?
+        webauthn_remove_confirm_body: Giriş doğrulaması için kullanılabilmesi için
+          bu geçiş anahtarını veya güvenlik anahtarını yeniden kaydetmeniz gerekecektir.
+        webauthn_title: Geçiş anahtarları ve güvenlik anahtarları
+        webauthn_unsupported: Bu tarayıcı geçiş anahtarlarını veya güvenlik anahtarlarını
+          desteklemiyor.
+  webauthn_credentials:
+    default_name: Güvenlik anahtarı
+    failure: Bu geçiş anahtarı veya güvenlik anahtarı kaydedilemedi. Lütfen tekrar
+      deneyin.
+    mfa_required: Geçiş anahtarı veya güvenlik anahtarı eklemeden önce iki faktörlü
+      kimlik doğrulamayı etkinleştirin.
+    success: Geçiş anahtarı veya güvenlik anahtarı kaldırıldı.
diff --git a/config/locales/views/settings/securities/zh-CN.yml b/config/locales/views/settings/securities/zh-CN.yml
index 1a3adb6cf..98d88ddab 100644
--- a/config/locales/views/settings/securities/zh-CN.yml
+++ b/config/locales/views/settings/securities/zh-CN.yml
@@ -8,3 +8,24 @@ zh-CN:
         enable_mfa: 启用双重认证
         mfa_description: 在登录时要求输入身份验证器应用中的代码，为账户增加额外安全层
         mfa_title: 双重认证
+        mfa_enabled_status_html: 双重认证已<span class="font-medium text-green-600">启用</span>
+        mfa_enabled_description: 你的账户受到额外安全层保护。
+        mfa_disabled_status_html: 双重认证已<span class="font-medium text-red-600">禁用</span>
+        mfa_disabled_description: 启用双重认证，为账户增加一层保护。
+        webauthn_add: 添加通行密钥或安全密钥
+        webauthn_added: 添加于 %{date}
+        webauthn_description: 使用通行密钥、Touch ID、Windows Hello 或硬件安全密钥作为登录第二因素。
+        webauthn_empty: 暂未注册通行密钥或安全密钥。
+        webauthn_last_used: 上次使用于 %{time_ago} 前
+        webauthn_name_label: 密钥名称
+        webauthn_name_placeholder: MacBook Touch ID、YubiKey 等
+        webauthn_remove: 移除
+        webauthn_remove_confirm: 确定要移除此通行密钥或安全密钥？
+        webauthn_remove_confirm_body: 移除后，你需要重新注册才能再次用于登录验证。
+        webauthn_title: 通行密钥和安全密钥
+        webauthn_unsupported: 此浏览器不支持通行密钥或安全密钥。
+  webauthn_credentials:
+    default_name: 安全密钥
+    failure: 无法保存该通行密钥或安全密钥。请重试。
+    mfa_required: 添加通行密钥或安全密钥前，请先启用双重认证。
+    success: 通行密钥或安全密钥已移除。
diff --git a/config/locales/views/settings/sso_identities/fr.yml b/config/locales/views/settings/sso_identities/fr.yml
new file mode 100644
index 000000000..bfa1df5da
--- /dev/null
+++ b/config/locales/views/settings/sso_identities/fr.yml
@@ -0,0 +1,7 @@
+---
+fr:
+  settings:
+    sso_identities:
+      destroy:
+        cannot_unlink_last: Impossible de dissocier la dernière identité
+        success: Succès
diff --git a/config/locales/views/settings/sso_identities/it.yml b/config/locales/views/settings/sso_identities/it.yml
new file mode 100644
index 000000000..e005f7a82
--- /dev/null
+++ b/config/locales/views/settings/sso_identities/it.yml
@@ -0,0 +1,7 @@
+---
+it:
+  settings:
+    sso_identities:
+      destroy:
+        cannot_unlink_last: Impossibile scollegare l'ultima identità
+        success: Operazione riuscita
diff --git a/config/locales/views/settings/sso_identities/ru.yml b/config/locales/views/settings/sso_identities/ru.yml
new file mode 100644
index 000000000..83ead865f
--- /dev/null
+++ b/config/locales/views/settings/sso_identities/ru.yml
@@ -0,0 +1,7 @@
+---
+ru:
+  settings:
+    sso_identities:
+      destroy:
+        cannot_unlink_last: Невозможно отвязать последнюю учётную запись
+        success: Успешно
diff --git a/config/locales/views/settings/sso_identities/tr.yml b/config/locales/views/settings/sso_identities/tr.yml
new file mode 100644
index 000000000..6cbfc4d6c
--- /dev/null
+++ b/config/locales/views/settings/sso_identities/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  settings:
+    sso_identities:
+      destroy:
+        cannot_unlink_last: Son kimliğin bağlantısı kaldırılamaz
+        success: Başarılı
diff --git a/config/locales/views/settings/tr.yml b/config/locales/views/settings/tr.yml
index 7ad52df99..217a3893b 100644
--- a/config/locales/views/settings/tr.yml
+++ b/config/locales/views/settings/tr.yml
@@ -1,66 +1,253 @@
 ---
 tr:
-  views:
-    settings:
-      payments:
-        renewal: "Katkınız %{date} tarihinde devam edecek."
   settings:
+    ai_prompts:
+      show:
+        disable_ai: Yapay Zeka Asistanını Devre Dışı Bırak
+        main_system_prompt:
+          subtitle: Yapay zeka asistanının tüm sohbet konuşmalarında nasıl davrandığını
+            tanımlayan temel talimatlar
+          title: Ana Sistem İstemi
+        merchant_detector:
+          subtitle: Yapay zeka, işlem verilerini satıcı bilgileriyle tanımlar ve zenginleştirir
+          title: Satıcı Algılayıcı
+        openai_label: OpenAI
+        page_title: Yapay Zeka İstemleri
+        prompt_instructions: İstem Talimatları
+        transaction_categorizer:
+          subtitle: Yapay zeka, tanımladığınız kategorilere göre işlemlerinizi otomatik
+            olarak kategorilendirir
+          title: İşlem Kategorileyici
+    appearances:
+      show:
+        dashboard_subtitle: Panelin nasıl görüntüleneceğini özelleştirin
+        dashboard_title: Panel
+        dashboard_two_column_description: Panel bileşenlerini büyük ekranlarda iki
+          sütun halinde görüntüleyin; her bileşenin başlığında genişlik ve yükseklik
+          kontrolleri bulunur. Kapalıyken bileşenler tek bir sütunda üst üste sıralanır.
+        dashboard_two_column_title: İki sütunlu düzen
+        disable_modal_click_outside_description: Modalların dışına tıklandığında kapanmasını
+          engeller. Kaydedilmemiş değişiklikleri yanlışlıkla kaybetmemek için kullanışlıdır.
+        disable_modal_click_outside_title: Dışarı tıklandığında modalleri açık tut
+        modals_subtitle: Modal davranışını özelleştir
+        modals_title: Modaller
+        page_title: Görünüm
+        split_grouped_description: Bölünmüş işlemleri işlem listesinde üst işlemin
+          altında gruplandırılmış olarak gösterin. Kapalıyken bölünen alt işlemler
+          ayrı satırlar olarak görünür.
+        split_grouped_title: Bölünmüş işlemleri grupla
+        theme_dark: Koyu
+        theme_light: Açık
+        theme_subtitle: Uygulama için tercih edilen temayı seçin
+        theme_system: Sistem
+        theme_title: Tema
+        transactions_subtitle: İşlemlerin nasıl görüntüleneceğini özelleştirin
+        transactions_title: İşlemler
+    debugs:
+      show:
+        context:
+          account: account=%{value}
+          account_provider: account_provider=%{value}
+          family: family=%{value}
+          provider: provider=%{value}
+          user: user=%{value}
+        empty: Hiç debug olayı bulunamadı.
+        filters:
+          account_id: Hesap ID
+          account_provider_id: Hesap sağlayıcı ID
+          all: Tümü
+          category: Kategori
+          end_date: Bitiş
+          family_id: Aile ID
+          level: Seviye
+          provider: Sağlayıcı
+          reset: Sıfırla
+          source: Kaynak
+          start_date: Başlangıç
+          submit: Filtrele
+          user_id: Kullanıcı ID
+        missing_value: "-"
+        page_title: Hata Ayıklama
+        subtitle: Süper yöneticiler için anlamlı operasyonel olaylar. En yeniden en
+          eskiye sıralanır.
+        table:
+          category: Kategori
+          context: Bağlam
+          level: Seviye
+          message: Mesaj
+          metadata: Meta Veri
+          source: Kaynak
+          time: Zaman
+          view_metadata: Görüntüle
+        title: Hata ayıklama olay günlüğü
+    llm_usages:
+      show:
+        avg_cost_per_request: Ort. Maliyet/İstek
+        based_on_requests: Maliyet verisi bulunan %{total} istekten %{with_cost} tanesine
+          dayanmaktadır
+        col_cost: Maliyet
+        col_date: Tarih
+        col_model: Model
+        col_operation: İşlem
+        col_tokens: Jeton
+        completion: tamamlama
+        cost_by_model: Modele Göre Maliyet
+        cost_by_operation: İşleme Göre Maliyet
+        cost_estimates_description: Maliyetler, Temmuz 2026 itibarıyla OpenAI fiyatlandırması
+          dahil olmak üzere yayınlanan sağlayıcı fiyatlarına göre tahmin edilir. Gerçek
+          maliyetler farklılık gösterebilir. Fiyatlandırma 1 milyon jeton başınadır
+          ve modele göre değişir. Özel veya kendi sunucunuzda barındırılan modeller
+          "Yok" olarak gösterilir ve maliyet toplamlarına dahil edilmez.
+        cost_estimates_title: Maliyet Tahminleri Hakkında
+        end_date: Bitiş Tarihi
+        failed: Başarısız
+        filter: Filtrele
+        no_usage_data: Seçilen dönem için kullanım verisi bulunamadı
+        page_title: LLM Kullanımı ve Maliyetleri
+        prompt: istem
+        recent_usage: Son Kullanım
+        start_date: Başlangıç Tarihi
+        subtitle: Yapay zeka kullanımınızı ve tahmini maliyetlerinizi takip edin
+        total_cost: Toplam Maliyet
+        total_requests: Toplam İstek
+        total_tokens: Toplam Jeton
+    mcp:
+      revoke:
+        revoked: Bağlantı iptal edildi.
+      show:
+        connect_subtitle: Bu URL'yi Claude.ai'ye (veya herhangi bir MCP uyumlu istemciye)
+          yapıştırarak Sure hesabınıza bağlayın.
+        connect_title: Bir yapay zeka asistanı bağlayın
+        connected_ago: "%{time} önce bağlandı"
+        connected_subtitle: Bu uygulamalar şu anda Sure verilerinize erişebiliyor.
+          Artık kullanmadıklarınızın erişimini iptal edin.
+        connected_title: Bağlı istemciler
+        copied: Kopyalandı!
+        copy_url: Kopyala
+        how_to_connect_title: Claude nasıl bağlanır
+        page_title: MCP Sunucusu
+        revoke: İptal Et
+        revoke_confirm: Bu istemcinin erişimi iptal edilsin mi?
+        step_1: Claude.ai'yi açın ve Ayarlar → Entegrasyonlar'a gidin.
+        step_2: '"Entegrasyon ekle"ye tıklayın ve yukarıdaki MCP sunucu URL''sini
+          yapıştırın.'
+        step_3: Bağlan'a tıklayın — giriş yapmak ve erişimi yetkilendirmek için Sure'a
+          yönlendirileceksiniz.
+        step_4: Yetkilendirildikten sonra Claude, hesaplarınızı, işlemlerinizi ve
+          bakiye verilerinizi okuyabilir.
+        unknown_client: Bilinmeyen istemci
     payments:
       show:
+        choose_level: Seviye seçin
+        contributions_note: "%{product_name}'e yapılan katkılar burada gösterilecek."
+        currently_on_plan: 'Şu anda kullanılan plan:'
+        manage: Yönet
+        not_contributing_emphasis: katkıda bulunmuyor
+        not_contributing_prefix: Şu anda
         page_title: Ödeme
+        payment_via_stripe: Stripe ile ödeme
         subscription_subtitle: Abonelik ve ödeme bilgilerinizi güncelleyin
         subscription_title: Aboneliği yönet
+        trial_days_left:
+          one: Veriler %{count} gün içinde silinecek
+          other: Veriler %{count} gün içinde silinecek
+        trialing: Şu anda %{product_name}'in açık demosu kullanılıyor
     preferences:
       show:
+        additional_currencies_label: Ek para birimleri
+        base_currency_badge: Ana para birimi
+        base_currency_label: Ana para birimi
         country: Ülke
+        currencies_more: "+%{count} tane daha"
+        currencies_subtitle: "%{moniker} için para birimi alanlarında hangi para birimlerinin
+          görüneceğini seçin"
+        currencies_title: "%{moniker} Para Birimleri"
         currency: Para birimi
+        currency_search_placeholder: Para birimi ara
         date_format: Tarih formatı
+        default_account_order: Varsayılan Hesap Sırası
+        default_period: Varsayılan Dönem
         general_subtitle: Tercihlerinizi yapılandırın
         general_title: Genel
-        default_period: Varsayılan Dönem
         language: Dil
         language_auto: Tarayıcı dili
+        manage_currencies: Para birimlerini yönet
+        manage_currencies_subtitle: Hiç kullanmadığınız para birimlerinin seçimini
+          kaldırın veya listeyi yalnızca birkaç taneye indirin.
+        month_start_day: Bütçe ayı başlangıcı
+        month_start_day_hint: Bütçe ayınızın ne zaman başlayacağını ayarlayın (ör.
+          maaş günü)
+        month_start_day_warning: Bütçeleriniz ve ay-başı-bugüne hesaplamalarınız,
+          her ayın 1'i yerine bu özel başlangıç gününü kullanacaktır.
+        no_additional_currencies: Hiçbiri seçilmedi
+        no_matching_currencies: Para birimi bulunamadı
         page_title: Tercihler
+        preview:
+          description: Önizleme veya deneysel olarak etiketlenen devam eden özelliklere
+            katılın.
+          title: Önizleme özelliklerini etkinleştir
+        save_currencies: Para birimlerini kaydet
+        select_all_currencies: Tümünü seç
+        select_base_only: Yalnızca ana para birimi
+        selected_currencies_count:
+          one: "%{count} seçildi"
+          other: "%{count} seçildi"
+        sharing_default_label: Yeni hesaplar için varsayılan paylaşım
+        sharing_private: Varsayılan olarak özel tut
+        sharing_shared: Tüm üyelerle paylaş
+        sharing_subtitle: "%{moniker} içinde hesapların nasıl paylaşılacağını kontrol
+          edin"
+        sharing_title: "%{moniker} Paylaşımı"
         theme_dark: Koyu
         theme_light: Açık
         theme_subtitle: Uygulama için tercih edilen temayı seçin
         theme_system: Sistem
         theme_title: Tema
         timezone: Zaman dilimi
+        translations_notice: Lütfen unutmayın, çeşitli diller için çeviriler üzerinde
+          hala çalışıyoruz.
     profiles:
       destroy:
         cannot_remove_self: Kendinizi hesaptan çıkaramazsınız.
+        member_owns_other_family_data: Bu üye, başka bir hanede hesaplara sahip olduğu
+          için kaldırılamıyor. Önce bu hesapları devretmeniz veya kaldırmanız gerekiyor.
         member_removal_failed: Üye kaldırılırken bir sorun oluştu.
         member_removed: Üye başarıyla kaldırıldı.
         not_authorized: Üyeleri kaldırmaya yetkiniz yok.
       show:
         confirm_delete:
-          body: Hesabınızı kalıcı olarak silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.
+          body: Hesabınızı kalıcı olarak silmek istediğinizden emin misiniz? Bu işlem
+            geri alınamaz.
           title: Hesap silinsin mi?
-        confirm_reset:
-          body: Hesabınızı sıfırlamak istediğinizden emin misiniz? Bu işlem tüm hesaplarınızı, kategorilerinizi, satıcılarınızı, etiketlerinizi ve diğer verilerinizi silecektir. Bu işlem geri alınamaz.
-          title: Hesap sıfırlansın mı?
-        confirm_reset_with_sample_data:
-          body: Are you sure you want to reset your account and load sample data? This will delete your existing data and replace it with demo data so you can explore Sure safely.
-          title: Reset account and load sample data?
         confirm_remove_invitation:
           body: "%{email} için daveti kaldırmak istediğinizden emin misiniz?"
-          title: "Daveti Kaldır"
+          title: Daveti Kaldır
         confirm_remove_member:
           body: "%{name} kişisini hesabınızdan kaldırmak istediğinizden emin misiniz?"
-          title: "Üyeyi Kaldır"
+          title: Üyeyi Kaldır
+        confirm_reset:
+          body: Hesabınızı sıfırlamak istediğinizden emin misiniz? Bu işlem tüm hesaplarınızı,
+            kategorilerinizi, satıcılarınızı, etiketlerinizi ve diğer verilerinizi
+            silecektir. Bu işlem geri alınamaz.
+          title: Hesap sıfırlansın mı?
+        confirm_reset_with_sample_data:
+          body: Hesabınızı sıfırlamak ve örnek veri yüklemek istediğinizden emin misiniz?
+            Bu işlem mevcut verilerinizi silecek ve Sure'u güvenle keşfedebilmeniz
+            için demo verilerle değiştirecektir.
+          title: Hesap sıfırlansın ve örnek veri yüklensin mi?
         danger_zone_title: Tehlikeli Alan
         delete_account: Hesabı sil
-        delete_account_warning: Hesabınızı silmek tüm verilerinizi kalıcı olarak kaldırır ve geri alınamaz.
-        reset_account: Hesabı sıfırla
-        reset_account_warning: Hesabınızı sıfırlamak tüm hesaplarınızı, kategorilerinizi, satıcılarınızı, etiketlerinizi ve diğer verilerinizi silecek, ancak kullanıcı hesabınızı koruyacaktır.
-        reset_account_with_sample_data: Reset account and load sample data
-        reset_account_with_sample_data_warning: Resetting your account will delete all your existing data and then load fresh sample data so you can explore Sure with a pre-filled environment.
+        delete_account_warning: Hesabınızı silmek tüm verilerinizi kalıcı olarak kaldırır
+          ve geri alınamaz.
         email: E-posta
         first_name: Ad
+        group_form_input_placeholder: Grup adı girin
+        group_form_label: Grup adı
+        group_title: Grup Üyeleri
         household_form_input_placeholder: Hane adı girin
         household_form_label: Hane adı
-        household_subtitle: Aile üyelerini, partnerleri ve diğer kişileri davet edin. Davetliler hanenize giriş yapabilir ve paylaşılan hesaplarınıza erişebilir.
+        household_subtitle: Davetliler %{moniker} hesabınıza giriş yapabilir ve paylaşılan
+          kaynaklara erişebilir.
         household_title: Hane
         invitation_link: Davet bağlantısı
         invite_member: Üye ekle
@@ -71,35 +258,409 @@ tr:
         profile_title: Profil
         remove_invitation: Daveti Kaldır
         remove_member: Üyeyi Kaldır
+        resend_confirmation_link: yeni bir onay e-postası isteyin
+        reset_account: Hesabı sıfırla
+        reset_account_warning: Hesabınızı sıfırlamak tüm hesaplarınızı, kategorilerinizi,
+          satıcılarınızı, etiketlerinizi ve diğer verilerinizi silecek, ancak kullanıcı
+          hesabınızı koruyacaktır.
+        reset_account_with_sample_data: Hesabı sıfırla ve örnek veri yükle
+        reset_account_with_sample_data_warning: Hesabınızı sıfırlamak mevcut tüm verilerinizi
+          silecek ve önceden doldurulmuş bir ortamda Sure'u keşfedebilmeniz için yeni
+          örnek veriler yükleyecektir.
         save: Kaydet
+        unconfirmed_email_notice_html: E-postanızı %{email} olarak değiştirmeyi talep
+          ettiniz. Değişikliğin geçerli olması için lütfen e-postanıza gidip onaylayın.
+          E-postayı almadıysanız lütfen spam klasörünüzü kontrol edin veya %{resend_link}.
+    providers:
+      akahu_panel:
+        step_1_html: "%{link} adresine gidin ve kişisel bir uygulama oluşturun."
+        step_2: Uygulama jetonunuzu ve kullanıcı jetonunuzu kopyalayın.
+        step_3: Jetonları aşağıya yapıştırın, kaydedin, ardından senkronize hesaplarınızı
+          bağlayın.
+      bank_sync:
+        lede: İşlemlerin, bakiyelerin ve varlıkların otomatik olarak Sure'a akması
+          için harici hesapları bağlayın.
+        page_title: Banka senkronizasyonu
+      binance_panel:
+        api_key_label: API Anahtarı
+        api_key_placeholder: Binance API Anahtarınızı yapıştırın
+        api_secret_label: API Gizli Anahtarı
+        api_secret_placeholder: Binance API Gizli Anahtarınızı yapıştırın
+        connect_button: Binance'a Bağlan
+        disconnect_confirm: Binance bağlantısını kesmek istediğinizden emin misiniz?
+        historical_import: Geçmiş İçe Aktarma Ayarları
+        ip_hint_body: 'Uygulama sunucusunun çıkış IP adresini Binance API Anahtarı
+          beyaz listesine ekleyin:'
+        ip_hint_contact_admin: Uygulama sunucusunun çıkış IP adresini almak için yöneticinizle
+          iletişime geçin.
+        ip_hint_title: IP beyaz listeye alma gerekli
+        no_withdraw_body: Binance API anahtarınızı oluştururken çekme izinlerini etkinleştirmeyin.
+          Sure yalnızca okuma erişimine ihtiyaç duyar.
+        no_withdraw_title: Yalnızca salt okunur anahtar
+        setup_instructions: 'Binance''ı bağlamak için salt okunur bir API anahtarı
+          oluşturun:'
+        step1_html: <a href="https://www.binance.com/en/my/settings/api-management"
+          target="_blank" rel="noopener noreferrer" class="underline">Binance API
+          Yönetimi</a> sayfasına gidin
+        step2: Yalnızca Okumayı Etkinleştir izniyle yeni bir API anahtarı oluşturun
+        step3: API Anahtarınızı ve Gizli Anahtarınızı aşağıya yapıştırın
+        sync: Senkronize et
+        sync_start_date_help: Geçmiş işlemlerin ne kadar geriye gidilerek alınacağını
+          seçin.
+        sync_start_date_label: Verileri içe aktar
+        syncing: Senkronize ediliyor...
+      clear_filter: Filtreleri temizle
+      coinbase_panel:
+        api_key_label: API Anahtarı
+        api_key_placeholder: Coinbase API anahtarınızı girin
+        api_secret_label: API Gizli Anahtarı
+        api_secret_placeholder: Coinbase API gizli anahtarınızı girin
+        connect_button: Coinbase'e Bağlan
+        disconnect_confirm: Bu Coinbase bağlantısını kesmek istediğinizden emin misiniz?
+          Senkronize hesaplarınız manuel hesaplara dönüşecektir.
+        setup_instructions: 'Coinbase''i bağlamak için:'
+        step1_html: <a href="https://portal.cdp.coinbase.com/projects/api-keys"
+          target="_blank" rel="noopener noreferrer" class="text-primary underline">Coinbase
+          API Ayarları</a> sayfasına gidin
+        step2: Salt okunur izinlerle (hesapları görüntüleme, işlemleri görüntüleme)
+          yeni bir API anahtarı oluşturun
+        step3: API anahtarınızı ve API gizli anahtarınızı kopyalayıp aşağıya yapıştırın
+        sync: Senkronize et
+        syncing: Senkronize ediliyor...
+      connect: Bağlan
+      drawer_trust_statement: Salt okunur erişim. Sure asla para transferi yapamaz
+        ve kimlik bilgileriniz şifrelenmiş olarak saklanır.
+      empty_filter: Filtrenizle eşleşen sağlayıcı yok.
+      enable_banking_panel:
+        add_connection: Bağlantı Ekle
+        application_id_label: Uygulama ID
+        application_id_placeholder_new: Uygulama ID girin
+        application_id_placeholder_update: Güncellemek için yeni ID girin
+        callback_url_instruction: Geri çağırma URL'si için %{callback_url} kullanın.
+        client_certificate_label: İstemci Sertifikası (Özel Anahtar ile)
+        config_locked_message: Bu kimlik bilgilerini değiştirmeden önce bağlı tüm
+          bankaların bağlantısını kesin.
+        config_locked_title: Yapılandırma kilitli
+        configured: Yapılandırıldı
+        connect_bank: Banka bağla
+        connected_bank: Bağlı Banka
+        connection: Bağlantı
+        connection_error: Bağlantı Hatası
+        country_label: Ülke
+        ready_to_link: Hesapları bağlamaya hazır
+        reconnect: Yeniden bağlan
+        remove: Kaldır
+        remove_confirm: Bu bağlantıyı kaldırmak istediğinizden emin misiniz?
+        save_and_connect: Kaydet ve bağlan
+        select_country: Ülke seçin...
+        session_expired_reconnect: Oturum süresi doldu - yeniden bağlan
+        session_expires: 'Oturum sona eriyor: %{date}'
+        step_1_html: "%{link} adresine gidin ve geliştirici kimlik bilgilerinizi alın."
+        step_2: Ülkenizi seçin ve Uygulama ID + İstemci Sertifikasını aşağıya yapıştırın.
+        step_3: Kaydedin, ardından bankanızı bağlamak için Bağlantı Ekle'yi kullanın.
+        sync: Senkronize et
+        syncing: Senkronize ediliyor
+        unknown: Bilinmiyor
+        update_connection: Bağlantıyı güncelle
+      encryption_error:
+        message: Banka senkronizasyonu için Active Record şifrelemesinin yapılandırılması
+          gerekir. Rails kimlik bilgilerinizde veya ortam değişkenlerinizde primary_key,
+          deterministic_key ve key_derivation_salt değerlerini ayarlayın.
+        title: Şifreleme anahtarları eksik
+      groups:
+        available: Kullanılabilir
+        empty_available: Kullanılabilir tüm sağlayıcılar bağlı.
+        your_connections: Bağlantılarınız
+      health_strip:
+        accounts_syncing: hesap senkronize ediliyor
+        connected: bağlı
+        last_synced: Son senkronizasyon %{time} önce
+        needs_attention: dikkat gerekiyor
+      ibkr_panel:
+        accounts_tab: Hesaplar
+        configuration:
+          all_other_options: 'Diğer tüm yapılandırma seçenekleri: "No"'
+          date_format: 'Tarih Formatı: yyyy-MM-dd'
+          date_time_separator: 'Tarih/Saat Ayırıcı: ; (noktalı virgül)'
+          format: 'Format: XML'
+          models: 'Modeller: İsteğe Bağlı'
+          period: 'Dönem: Son 365 Takvim Günü'
+          profit_and_loss: 'Kar ve Zarar: Varsayılan'
+          time_format: 'Saat Formatı: HH:mm:ss'
+        disconnect_confirm: Interactive Brokers bağlantısı kesilsin mi?
+        flex_query_details:
+          configuration_heading: Bu sorgu seçeneklerini ayarlayın
+          eyebrow: Flex Query
+          sections_heading: Bu bölümleri ve alanları etkinleştirin
+          summary: IBKR Activity Flex Query'nizin içermesi gereken tam bölümleri,
+            alanları ve ayarları görmek için genişletin.
+          title: Bölümler, alanlar ve yapılandırma
+        not_configured: Yapılandırılmadı.
+        query_id_label: Sorgu ID
+        query_id_placeholder_existing: Mevcut Sorgu ID'sini korumak için boş bırakın
+        query_id_placeholder_new: IBKR Flex Query ID'nizi girin
+        report_window_note: IBKR Flex raporları, IBKR'de yapılandırdığınız sorgu penceresiyle
+          sınırlıdır. Sure, bu rapordan mevcut tüm varlıkları ve son 365 güne kadar
+          olan işlem geçmişini içe aktaracaktır.
+        save_configuration: Yapılandırmayı Kaydet
+        sections:
+          account_information: 'Hesap Bilgileri: Account ID, Currency'
+          cash_report: 'Nakit Raporu:'
+          cash_report_fields: 'Alanlar: Currency, Ending Cash'
+          cash_report_options: 'Seçenekler: None'
+          cash_transactions: 'Nakit İşlemleri:'
+          cash_transactions_fields: 'Alanlar: Amount, Conid, Currency, FX Rate To
+            Base, Report Date, Transaction ID, Type'
+          cash_transactions_options: 'Seçenekler: Dividends, Deposits & Withdrawals,
+            Detail'
+          change_in_position_value_summary: 'Pozisyon Değeri Değişim Özeti: Currency,
+            End Of Period Value'
+          net_asset_value: 'Ana Para Biriminde Net Varlık Değeri (NAV):'
+          net_asset_value_fields: 'Alanlar: Currency, Report Date, Total'
+          net_asset_value_options: 'Seçenekler: None'
+          open_positions: 'Açık Pozisyonlar:'
+          open_positions_fields: 'Alanlar: Asset Class, Conid, Cost Basis Price, Currency,
+            FX Rate To Base, Mark Price, Quantity, Report Date, Security ID, Security
+            ID Type, Side, Symbol'
+          open_positions_options: 'Seçenekler: Summary'
+          trades: 'İşlemler:'
+          trades_fields: 'Alanlar: Asset Class, Buy/Sell, Conid, Currency, FX Rate
+            To Base, IB Commission, IB Commission Currency, Quantity, Symbol, Trade
+            Date, Trade ID, TradePrice, Transaction ID'
+          trades_options: 'Seçenekler: Execution'
+        status_configured_prefix: "%{summary}. Şuraya gidin:"
+        status_configured_suffix: sekmesine giderek keşfedilen hesapları yönetin.
+        steps:
+          step_1: IBKR Client Portal'ınızda "Performance & Reports" > "Flex Queries"
+            bölümüne gidin.
+          step_2: Yeni bir sorgu oluşturmak için "Activity Flex Query" bölümündeki
+            "+" simgesine tıklayın.
+          step_3: Sorgunuza bir ad verin (ör. "Sure Sync"), ardından aşağıdaki Flex
+            Query ayrıntılarını inceleyin ve listelenen bölümleri, alanları ve yapılandırma
+            seçeneklerini etkinleştirin.
+          step_4: Sorguyu kaydedin, "Query ID"nizi not edin, ardından bir erişim Token'ı
+            oluşturmak için "Flex Web Service Configuration" bölümündeki dişli simgesini
+            kullanın.
+          step_5: Sorgu ID'nizi ve Token'ınızı aşağıya yapıştırın, yapılandırmayı
+            kaydedin, ardından keşfedilen IBKR hesaplarını bağlamak için Hesaplar'a
+            gidin.
+        sync: Senkronize et
+        token_label: Token
+        token_placeholder_existing: Mevcut Token'ı korumak için boş bırakın
+        token_placeholder_new: IBKR Flex Web Service Token'ınızı girin
+        update_configuration: Yapılandırmayı Güncelle
+      kraken_panel:
+        add_connection: Kraken bağlantısı ekle
+        api_key_label: API Anahtarı
+        api_key_placeholder: Kraken API anahtarınızı yapıştırın
+        api_secret_label: Özel Anahtar
+        api_secret_placeholder: Kraken özel anahtarınızı yapıştırın
+        connection_name_label: Bağlantı adı
+        connection_name_placeholder: Ana Kraken
+        default_connection_name: Kraken
+        disconnect: Bağlantıyı kes
+        disconnect_confirm: "%{name} bağlantısını kesmek istediğinizden emin misiniz?"
+        keep_api_key_placeholder: Mevcut API anahtarını korumak için boş bırakın
+        keep_api_secret_placeholder: Mevcut özel anahtarı korumak için boş bırakın
+        read_only_body: İşlem yapma, iptal etme, çekme, dışa aktarma, defter, Earn,
+          stake etme veya transfer izinleri vermeyin. Sure yalnızca bakiyeleri, varlıkları
+          ve spot işlem gerçekleşmelerini içe aktarır.
+        read_only_title: Yalnızca salt okunur borsa senkronizasyonu
+        setup_accounts: Hesabı kur
+        step1_html: <a href="https://pro.kraken.com/app/settings/api" target="_blank"
+          rel="noopener noreferrer" class="underline">Kraken API ayarları</a> sayfasına
+          gidin
+        step2: Yalnızca Query Funds ve Query Closed Orders & Trades izinleriyle bir
+          API anahtarı oluşturun.
+        step3: API anahtarını ve özel anahtarı aşağıya yapıştırın.
+        sync: Senkronize et
+        syncing: Senkronize ediliyor...
+        update_connection: Bağlantıyı güncelle
+      lunchflow_panel:
+        api_key_label: API Anahtarı
+        api_key_placeholder_new: API anahtarını buraya yapıştırın
+        api_key_placeholder_update: Güncellemek için yeni API anahtarı girin
+        base_url_label: Temel URL (İsteğe Bağlı)
+        base_url_placeholder: https://lunchflow.app/api/v1 (varsayılan)
+        save_and_connect: Kaydet ve bağlan
+        step_1_html: "%{link} adresine gidin ve bir API anahtarı oluşturun."
+        step_2: Anahtarınızı aşağıya yapıştırın ve bağlanın.
+        step_3: Ardından senkronize hesaplarınızı bağlamak için Hesaplar'a gidin.
+        update_connection: Bağlantıyı güncelle
+      maturity:
+        alpha: Alfa
+        beta: Beta
+      meta:
+        last_synced: "%{time} önce senkronize edildi"
+        no_recent_sync: Senkronizasyon gecikti
+        reconsent_needed:
+          one: 1 gün içinde yeniden onay gerekiyor
+          other: "%{count} gün içinde yeniden onay gerekiyor"
+        reconsent_required: Yeniden onay gerekiyor
+        registration_needed: Kayıt gerekiyor
+        sync_error: Senkronizasyon hatası
+      not_authorized: Yetkiniz yok
+      not_found: Sağlayıcı bulunamadı.
+      plaid_eu_panel:
+        step_1_html: "%{link} sayfasını açın ve AB İstemci ID'nizi ve Gizli Anahtarınızı
+          kopyalayın."
+      plaid_panel:
+        step_1_html: "%{link} sayfasını açın ve İstemci ID'nizi ve Gizli Anahtarınızı
+          kopyalayın."
+        step_2: Bir ortam seçin. Test için sandbox, gerçek hesaplar için production
+          kullanın.
+        step_3: Kimlik bilgilerinizi aşağıya yapıştırın ve bağlanın.
+      provider_form:
+        save_and_connect: Kaydet ve bağlan
+      recently_synced: Yakın zamanda senkronize edildi. Biraz sonra tekrar deneyin.
+      search_filters:
+        aria_label: Sağlayıcıları ara
+        chips:
+          all: Tümü
+          bank: Bankalar
+          crypto: Kripto
+          investment: Yatırımlar
+        placeholder: Sağlayıcıları ara
+      setup_steps:
+        eyebrow: Kurulum
+        need_help: Yardıma mı ihtiyacınız var?
+      simplefin_panel:
+        save_and_connect: Kaydet ve bağlan
+        setup_token_label: Kurulum Jetonu
+        setup_token_placeholder: SimpleFIN kurulum jetonunu yapıştırın
+        step_1_html: Tek seferlik kurulum jetonu için %{link} adresine gidin.
+        step_2: Jetonu aşağıya yapıştırın ve bağlanın.
+        step_3: Ardından senkronize hesaplarınızı bağlamak için Hesaplar'a gidin.
+      status:
+        err: Hata
+        off: Yapılandırılmadı
+        ok: Bağlandı
+        warn: İşlem gerekiyor
+      sync_all: Tümünü senkronize et
+      sync_all_in_progress: Bağlı tüm sağlayıcılar senkronize ediliyor…
+      sync_all_recently: Senkronizasyon zaten devam ediyor. Biraz sonra tekrar deneyin.
+      sync_provider: Şimdi senkronize et
+      sync_provider_in_progress: Senkronizasyon başladı.
+      sync_provider_no_items: Senkronize edilecek bağlantı yok.
+      taglines:
+        akahu: Akahu üzerinden Yeni Zelanda finans kurumlarını senkronize edin.
+        binance: Salt okunur bir API anahtarı kullanarak Binance spot bakiyelerinizi
+          senkronize edin.
+        brex: Salt okunur erişimle Brex nakit ve kurumsal kart hareketlerinizi senkronize
+          edin.
+        coinbase: Coinbase kripto varlıklarınızı içe aktarın ve performansı takip
+          edin.
+        coinstats: Tüm kripto portföyünüzü cüzdanlar ve borsalar genelinde takip edin.
+        enable_banking: PSD2 açık bankacılığı üzerinden Avrupa banka hesaplarınızı
+          senkronize edin.
+        ibkr: Flex Query içe aktarmaları yoluyla Interactive Brokers yatırım hesaplarınızı
+          senkronize edin.
+        indexa_capital: Indexa Capital otomatik yatırım portföyünüzü takip edin.
+        kraken: Salt okunur bir API anahtarı kullanarak Kraken bakiyelerinizi ve spot
+          işlem gerçekleşmelerinizi senkronize edin.
+        lunchflow: 40'tan fazla ülkeden 20 bin+ bankayı bağlayın (İngiltere, AB, ABD
+          ve daha fazlası!)
+        mercury: Mercury işletme bankacılığı hesaplarınızı otomatik olarak senkronize
+          edin.
+        plaid: Plaid üzerinden binlerce ABD finans kurumunu bağlayın.
+        plaid_eu: Plaid üzerinden (PSD2 / Açık Bankacılık) Avrupa finans kurumlarını
+          bağlayın.
+        questrade: Questrade API'si aracılığıyla Questrade yatırım hesaplarınızı doğrudan
+          senkronize edin.
+        simplefin: Açık SimpleFIN protokolü üzerinden ABD banka hesaplarını bağlayın.
+        snaptrade: SnapTrade birleştirme ağı üzerinden aracı kurum hesaplarını bağlayın.
+        sophtron: ABD ve Kanada bankalarını ve kurumlarını bağlayın.
+        wise: Wise çoklu para birimi bakiyelerinizi ve uluslararası transferlerinizi
+          otomatik olarak senkronize edin.
+      up_panel:
+        step_1_html: "%{link} adresine gidin ve kişisel bir erişim jetonu oluşturun."
+        step_2: Kişisel erişim jetonunuzu kopyalayın.
+        step_3: Jetonu aşağıya yapıştırın, kaydedin, ardından senkronize hesaplarınızı
+          bağlayın.
+      update:
+        no_changes: Herhangi bir değişiklik yapılmadı
+        updated_successfully: Sağlayıcı ayarları başarıyla güncellendi
     securities:
       show:
-        page_title: Menkul Kıymet
+        disable_mfa: 2FA'yı devre dışı bırak
+        disable_mfa_confirm: İki faktörlü kimlik doğrulamayı devre dışı bırakmak istediğinizden
+          emin misiniz?
+        enable_mfa: 2FA'yı etkinleştir
+        encryption_warning:
+          generate: 'Şununla bir set oluşturun: bin/rails db:encryption:init'
+          intro: 'Hassas veriler (API anahtarları, sağlayıcı jetonları, MFA gizli
+            anahtarları ve kişisel veriler) şu anda şifrelenmeden depolanıyor. Şifrelemeyi
+            etkinleştirmek için ortam değişkenlerinizde veya Rails kimlik bilgilerinizde
+            aşağıdaki anahtarları ayarlayın:'
+          keys:
+            - ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY
+            - ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY
+            - ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT
+          title: Şifreleme anahtarları eksik
+        mfa_description: Hesabınıza, oturum açarken kimlik doğrulayıcı uygulamanızdan
+          bir kod isteyerek ekstra bir güvenlik katmanı ekleyin
+        mfa_title: İki Faktörlü Kimlik Doğrulama
+        page_title: Güvenlik
+        sso_confirm_body: "%{provider} hesabınızın bağlantısını kesmek istediğinizden
+          emin misiniz? Daha sonra o sağlayıcıyla tekrar giriş yaparak yeniden bağlayabilirsiniz."
+        sso_confirm_button: Bağlantıyı kes
+        sso_confirm_title: Hesap bağlantısı kesilsin mi?
+        sso_connect_hint: Bir hesap bağlamak için çıkış yapın ve bir SSO sağlayıcısıyla
+          giriş yapın.
+        sso_disconnect: Bağlantıyı kes
+        sso_last_used: Son kullanım
+        sso_never: Hiçbir zaman
+        sso_no_email: E-posta yok
+        sso_no_identities: Bağlı SSO hesabı yok
+        sso_subtitle: Tekli oturum açma hesap bağlantılarınızı yönetin
+        sso_title: Bağlı Hesaplar
+        sso_warning_message: Bu sizin tek giriş yönteminiz. Bağlantıyı kesmeden önce
+          güvenlik ayarlarınızda bir şifre belirlemelisiniz, aksi takdirde hesabınızın
+          dışında kalabilirsiniz.
     settings_nav:
       accounts_label: Hesaplar
-      api_key_label: API Anahtarı
       advanced_section_title: Gelişmiş
-      payment_label: Ödeme
+      ai_prompts_label: Yapay Zeka İstemleri
+      api_key_label: API Anahtarı
+      api_keys_label: API Anahtarları
+      appearance_label: Görünüm
+      bank_sync_label: Banka senkronizasyonu
       categories_label: Kategoriler
+      debug_label: Hata Ayıklama
+      exports_label: Dışa Aktarımlar
       feedback_label: Geri Bildirim
       general_section_title: Genel
+      guides_label: Rehberler
       imports_label: İçe Aktarımlar
+      llm_usage_label: LLM Kullanımı
       logout: Çıkış Yap
+      mcp_label: MCP
       merchants_label: Satıcılar
       other_section_title: Diğer
+      payment_label: Ödeme
       preferences_label: Tercihler
       profile_label: Hesap
+      providers_label: Sağlayıcılar
+      recurring_transactions_label: Yinelenen
       rules_label: Kurallar
       security_label: Güvenlik
       self_hosting_label: Kendi Sunucunda Barındırma
+      sso_providers_label: SSO Sağlayıcıları
+      statement_vault_label: Ekstre Kasası
       tags_label: Etiketler
       transactions_section_title: İşlemler
+      users_label: Kullanıcılar
       whats_new_label: Yenilikler
     settings_nav_link_large:
       next: Sonraki
       previous: Geri
     user_avatar_field:
       accepted_formats: JPG veya PNG. Maksimum 5MB.
+      change: Fotoğrafı değiştir
       choose: Fotoğraf yükle
-      choose_label: (isteğe bağlı)
-      change: Fotoğrafı değiştir
\ No newline at end of file
+      choose_label: "(isteğe bağlı)"
+  views:
+    settings:
+      payments:
+        cancellation: Katkınız %{date} tarihinde sona erecek.
+        renewal: Katkınız %{date} tarihinde devam edecek.
diff --git a/config/locales/views/settings/vi.yml b/config/locales/views/settings/vi.yml
index a5ac5f5e1..612751b19 100644
--- a/config/locales/views/settings/vi.yml
+++ b/config/locales/views/settings/vi.yml
@@ -67,7 +67,7 @@ vi:
         failed: "Thất bại"
         no_usage_data: "Không tìm thấy dữ liệu sử dụng cho kỳ đã chọn"
         cost_estimates_title: "Về ước tính chi phí"
-        cost_estimates_description: "Chi phí được ước tính dựa trên bảng giá của OpenAI từ năm 2025. Chi phí thực tế có thể khác nhau. Giá tính trên 1 triệu token và thay đổi theo mô hình. Mô hình tùy chỉnh hoặc tự lưu trữ sẽ hiển thị \"N/A\" và không được tính vào tổng chi phí."
+        cost_estimates_description: "Chi phí được ước tính theo bảng giá công bố của nhà cung cấp, bao gồm bảng giá OpenAI tính đến tháng 7 năm 2026. Chi phí thực tế có thể khác nhau. Giá tính trên 1 triệu token và thay đổi theo mô hình. Mô hình tùy chỉnh hoặc tự lưu trữ sẽ hiển thị \"N/A\" và không được tính vào tổng chi phí."
     ai_prompts:
       show:
         page_title: Câu lệnh AI
@@ -107,6 +107,10 @@ vi:
         theme_dark: Tối
         theme_light: Sáng
         theme_system: Hệ thống
+        modals_title: Hộp thoại
+        modals_subtitle: Tùy chỉnh hành vi hộp thoại
+        disable_modal_click_outside_title: Giữ hộp thoại mở khi nhấp bên ngoài
+        disable_modal_click_outside_description: Ngăn hộp thoại đóng khi nhấp bên ngoài. Hữu ích để tránh vô tình mất các thay đổi chưa lưu.
         transactions_title: Giao dịch
         transactions_subtitle: Tùy chỉnh cách hiển thị giao dịch
         dashboard_title: Bảng điều khiển
@@ -300,7 +304,6 @@ vi:
       meta:
         sync_error: Lỗi đồng bộ
         no_recent_sync: Đồng bộ quá hạn
-        registration_needed: Cần đăng ký
         reconsent_required: Cần đồng ý lại
         reconsent_needed:
           one: Cần đồng ý lại sau 1 ngày
diff --git a/config/locales/views/settings/zh-CN.yml b/config/locales/views/settings/zh-CN.yml
index 6f8716019..ef5dabeed 100644
--- a/config/locales/views/settings/zh-CN.yml
+++ b/config/locales/views/settings/zh-CN.yml
@@ -67,7 +67,7 @@ zh-CN:
         failed: 失败
         no_usage_data: 所选时间段内未找到用量数据
         cost_estimates_title: 关于费用预估
-        cost_estimates_description: 费用根据 OpenAI 2025 年的定价估算。实际费用可能不同。定价按每 100 万 token 计算，并随模型而异。自定义或自托管模型将显示为“N/A”，且不计入总费用。
+        cost_estimates_description: "费用根据各提供商公布的定价估算，包括截至 2026 年 7 月的 OpenAI 定价。实际费用可能不同。定价按每 100 万 token 计算，并随模型而异。自定义或自托管模型将显示为“N/A”，且不计入总费用。"
     ai_prompts:
       show:
         page_title: AI 提示词
@@ -107,6 +107,10 @@ zh-CN:
         theme_dark: 深色
         theme_light: 浅色
         theme_system: 跟随系统
+        modals_title: 模态框
+        modals_subtitle: 自定义模态框行为
+        disable_modal_click_outside_title: 点击外部时保持模态框打开
+        disable_modal_click_outside_description: 防止点击外部时关闭模态框。有助于避免意外丢失未保存的更改。
         transactions_title: 交易
         transactions_subtitle: 自定义交易的显示方式
         dashboard_title: 仪表盘
@@ -163,6 +167,7 @@ zh-CN:
         member_removal_failed: 移除成员时出现问题。
         member_removed: 成员已成功移除。
         not_authorized: 您没有权限移除成员。
+        member_owns_other_family_data: 此成员仍拥有其他家庭的数据，无法移除。请先转移或删除这些账户。
       show:
         confirm_delete:
           body: 确定要永久删除您的账户吗？此操作不可逆。
@@ -299,7 +304,6 @@ zh-CN:
       meta:
         sync_error: 同步错误
         no_recent_sync: 同步已逾期
-        registration_needed: 需要注册
         reconsent_required: 需要重新授权
         reconsent_needed:
           one: 1 天后需要重新授权
@@ -327,6 +331,7 @@ zh-CN:
         sophtron: 连接美国和加拿大的银行及公用事业账户。
         plaid: 通过 Plaid 连接数千家美国金融机构。
         plaid_eu: 通过 Plaid 连接欧洲金融机构（PSD2 / Open Banking）。
+        akahu: 通过 Akahu 同步新西兰金融机构。
       search_filters:
         aria_label: 搜索提供商
         placeholder: 搜索提供商
@@ -373,6 +378,9 @@ zh-CN:
         syncing: 正在同步...
         sync: 同步
         disconnect_confirm: 确定要断开 Binance 吗？
+        historical_import: 历史导入设置
+        sync_start_date_label: 导入起始日期
+        sync_start_date_help: 选择要向前获取历史交易的时间范围。
       kraken_panel:
         step1_html: '前往 <a href="https://pro.kraken.com/app/settings/api" target="_blank" rel="noopener noreferrer" class="underline">Kraken API 设置</a>'
         step2: 仅创建一个具备 Query Funds 和 Query Closed Orders & Trades 权限的 API key。
@@ -506,3 +514,7 @@ zh-CN:
         accounts_tab: 账户
         status_configured_suffix: 标签页以管理已发现的账户。
         not_configured: 未配置。
+      akahu_panel:
+        step_1_html: 前往 %{link} 并创建个人应用。
+        step_2: 复制 App Token 和 User Token。
+        step_3: 粘贴 Token、保存，然后关联同步到账户。
diff --git a/config/locales/views/settings/zh-TW.yml b/config/locales/views/settings/zh-TW.yml
index 4d544f479..a3ac0fae1 100644
--- a/config/locales/views/settings/zh-TW.yml
+++ b/config/locales/views/settings/zh-TW.yml
@@ -43,6 +43,12 @@ zh-TW:
         theme_system: 系統設定
         theme_title: 主題
         timezone: 時區
+    appearances:
+      show:
+        modals_title: 模態視窗
+        modals_subtitle: 自訂模態視窗行為
+        disable_modal_click_outside_title: 點擊外部時保持模態視窗開啟
+        disable_modal_click_outside_description: 防止點擊外部時關閉模態視窗。有助於避免意外遺失未儲存的變更。
     profiles:
       destroy:
         cannot_remove_self: 您無法將自己從帳號中移除。
diff --git a/config/locales/views/shared/ca.yml b/config/locales/views/shared/ca.yml
index b1f9457d7..ad0c8427f 100644
--- a/config/locales/views/shared/ca.yml
+++ b/config/locales/views/shared/ca.yml
@@ -29,6 +29,9 @@ ca:
     money_field:
       label: Import
     require_admin: Només els administradors poden fer aquesta acció
+    sync_toast:
+      message: Hi ha dades noves disponibles
+      refresh: Actualitza
     syncing_notice:
       syncing: S'estan sincronitzant les dades dels comptes...
     transaction_tabs:
diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml
index 50599089c..3ec0b37ea 100644
--- a/config/locales/views/shared/en.yml
+++ b/config/locales/views/shared/en.yml
@@ -6,8 +6,8 @@ en:
   shared:
     preview: Preview
     sync_toast:
-      message: "Your data has been updated"
-      refresh: "Refresh now"
+      message: "New data available"
+      refresh: "Refresh"
     confirm_modal:
       accept: Confirm
       body_html: "<p>You will not be able to undo this decision</p>"
diff --git a/config/locales/views/shared/fr.yml b/config/locales/views/shared/fr.yml
index 106ededa6..975646aae 100644
--- a/config/locales/views/shared/fr.yml
+++ b/config/locales/views/shared/fr.yml
@@ -1,21 +1,42 @@
 ---
 fr:
+  concerns:
+    self_hostable:
+      redis_configured: Redis est maintenant correctement configuré ! Vous pouvez maintenant configurer votre application Sure.
   shared:
+    cancel: Annuler
     confirm_modal:
       accept: Confirmer
       body_html: "<p>Vous ne pourrez pas annuler cette action</p>"
       cancel: Annuler
       title: Êtes-vous sûr ?
-    money_field:
-      label: Montant
+    custom_confirm:
+      default_body: Ceci n’est pas réversible.
+      default_btn_text: Confirmer
+      default_title: Êtes-vous sûr?
     exchange_rate_tabs:
       calculate_rate_tab: Calculer le taux FX
       convert_tab: Convertir avec le taux FX
       destination_amount: Montant de destination
       exchange_rate: Taux de change
       exchange_rate_help: Choisissez comment entrer le montant.
+    family_moniker:
+      group_plural: Groupes
+      group_singular: Groupe
+      plural: Familles
+      singular: Famille
+    money_field:
+      label: Montant
+    preview: Aperçu
+    require_admin: Seuls les administrateurs peuvent effectuer cette action
+    sync_toast:
+      message: Nouvelles données disponibles
+      refresh: Actualiser
     syncing_notice:
       syncing: Synchronisation des données de compte...
-    require_admin: "Seuls les administrateurs peuvent effectuer cette action"
+    transaction_tabs:
+      expense: Dépense
+      income: Revenu
+      transfer: Transfert
     trend_change:
-      no_change: "pas de changement"
+      no_change: pas de changement
diff --git a/config/locales/views/shared/it.yml b/config/locales/views/shared/it.yml
new file mode 100644
index 000000000..82257a538
--- /dev/null
+++ b/config/locales/views/shared/it.yml
@@ -0,0 +1,42 @@
+---
+it:
+  concerns:
+    self_hostable:
+      redis_configured: "Redis è ora configurato correttamente! Puoi procedere con la configurazione della tua applicazione."
+  shared:
+    preview: Anteprima
+    sync_toast:
+      message: "Nuovi dati disponibili"
+      refresh: "Aggiorna"
+    confirm_modal:
+      accept: Conferma
+      body_html: "<p>Non potrai annullare questa decisione</p>"
+      cancel: Annulla
+      title: Sei sicuro?
+    money_field:
+      label: Importo
+    exchange_rate_tabs:
+      calculate_rate_tab: Calcola tasso di cambio
+      convert_tab: Converti con tasso di cambio
+      destination_amount: Importo di destinazione
+      exchange_rate: Tasso di cambio
+      exchange_rate_help: Scegli come inserire l'importo.
+    syncing_notice:
+      syncing: Sincronizzazione dati conti in corso...
+    require_admin: "Solo gli amministratori possono eseguire questa azione"
+    custom_confirm:
+      default_title: "Sei sicuro?"
+      default_body: "Questa operazione non è reversibile."
+      default_btn_text: "Conferma"
+    family_moniker:
+      group_plural: Gruppi
+      group_singular: Gruppo
+      plural: Famiglie
+      singular: Famiglia
+    trend_change:
+      no_change: "nessuna variazione"
+    cancel: Annulla
+    transaction_tabs:
+      expense: Spesa
+      income: Entrata
+      transfer: Bonifico
diff --git a/config/locales/views/shared/ru.yml b/config/locales/views/shared/ru.yml
new file mode 100644
index 000000000..5d1b926c0
--- /dev/null
+++ b/config/locales/views/shared/ru.yml
@@ -0,0 +1,43 @@
+---
+ru:
+  concerns:
+    self_hostable:
+      redis_configured: Redis теперь настроен правильно! Вы можете настроить своё
+        приложение Sure.
+  shared:
+    cancel: Отмена
+    confirm_modal:
+      accept: Подтвердить
+      body_html: "<p>Вы не сможете отменить это решение</p>"
+      cancel: Отмена
+      title: Вы уверены?
+    custom_confirm:
+      default_body: Это действие необратимо.
+      default_btn_text: Подтвердить
+      default_title: Вы уверены?
+    exchange_rate_tabs:
+      calculate_rate_tab: Рассчитать курс
+      convert_tab: Конвертировать по курсу
+      destination_amount: Сумма назначения
+      exchange_rate: Обменный курс
+      exchange_rate_help: Выберите способ ввода суммы.
+    family_moniker:
+      group_plural: Группы
+      group_singular: Группа
+      plural: Семьи
+      singular: Семья
+    money_field:
+      label: Сумма
+    preview: Просмотр
+    require_admin: Только администраторы могут выполнить это действие
+    sync_toast:
+      message: Ваши данные были обновлены
+      refresh: Обновить сейчас
+    syncing_notice:
+      syncing: Синхронизация данных счетов...
+    transaction_tabs:
+      expense: Расход
+      income: Доход
+      transfer: Перевод
+    trend_change:
+      no_change: без изменений
diff --git a/config/locales/views/shared/tr.yml b/config/locales/views/shared/tr.yml
index 045e211c2..c96a04894 100644
--- a/config/locales/views/shared/tr.yml
+++ b/config/locales/views/shared/tr.yml
@@ -1,20 +1,43 @@
 ---
 tr:
+  concerns:
+    self_hostable:
+      redis_configured: Redis artık düzgün şekilde yapılandırıldı! Artık Sure uygulamanızı
+        kurabilirsiniz.
   shared:
+    cancel: İptal
     confirm_modal:
       accept: Onayla
       body_html: "<p>Bu kararı geri alamayacaksınız</p>"
       cancel: İptal
       title: Emin misiniz?
-    money_field:
-      label: Tutar
+    custom_confirm:
+      default_body: Bu işlem geri alınamaz.
+      default_btn_text: Onayla
+      default_title: Emin misiniz?
     exchange_rate_tabs:
       calculate_rate_tab: Döviz Kuru Hesapla
       convert_tab: Döviz Kuru ile Dönüştür
       destination_amount: Hedef Tutar
       exchange_rate: Döviz Kuru
       exchange_rate_help: Tutar girişiniz için yöntemi seçin.
+    family_moniker:
+      group_plural: Gruplar
+      group_singular: Grup
+      plural: Aileler
+      singular: Aile
+    money_field:
+      label: Tutar
+    preview: Önizleme
+    require_admin: Bu işlemi yalnızca yöneticiler gerçekleştirebilir
+    sync_toast:
+      message: Yeni veri mevcut
+      refresh: Yenile
     syncing_notice:
       syncing: Hesap verileri senkronize ediliyor...
+    transaction_tabs:
+      expense: Gider
+      income: Gelir
+      transfer: Transfer
     trend_change:
-      no_change: "değişiklik yok"
\ No newline at end of file
+      no_change: değişiklik yok
diff --git a/config/locales/views/shared/zh-CN.yml b/config/locales/views/shared/zh-CN.yml
index 2f5964b75..074022c1b 100644
--- a/config/locales/views/shared/zh-CN.yml
+++ b/config/locales/views/shared/zh-CN.yml
@@ -36,3 +36,7 @@ zh-CN:
       expense: 支出
       income: 收入
       transfer: 转账
+    preview: 预览
+    sync_toast:
+      message: 有新数据可用
+      refresh: 刷新
diff --git a/config/locales/views/simplefin_items/fr.yml b/config/locales/views/simplefin_items/fr.yml
index 64a94d364..79d9dff8a 100644
--- a/config/locales/views/simplefin_items/fr.yml
+++ b/config/locales/views/simplefin_items/fr.yml
@@ -1,132 +1,193 @@
 ---
 fr:
   simplefin_items:
-    new:
-      title: Connecter SimpleFIN
-      setup_token: Jeton de configuration
-      setup_token_placeholder: collez votre jeton de configuration SimpleFIN
-      connect: Connecter
-      cancel: Annuler
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      no_accounts: Aucun compte à configurer.
+      stale_accounts_errors:
+        one: "%{count} action sur un compte obsolète a échoué. Consultez les journaux
+          pour plus de détails."
+        other: "%{count} actions sur des comptes obsolètes ont échoué. Consultez les
+          journaux pour plus de détails."
+      stale_accounts_processed: 'Comptes obsolètes : %{deleted} supprimés, %{moved}
+        déplacés.'
+      success:
+        one: "%{count} compte SimpleFIN créé avec succès ! Vos transactions et holdings
+          sont en cours d'importation en arrière-plan."
+        other: "%{count} comptes SimpleFIN créés avec succès ! Vos transactions et
+          holdings sont en cours d'importation en arrière-plan."
     create:
-      success: Connexion SimpleFIN ajoutée avec succès ! Vos comptes apparaîtront sous peu lors de la synchronisation en arrière-plan.
       errors:
         blank_token: Veuillez entrer un jeton de configuration SimpleFIN.
-        invalid_token: Jeton de configuration invalide. Veuillez vérifier que vous avez copié le jeton complet depuis SimpleFIN Bridge.
-        token_compromised: Le jeton de configuration est peut-être compromis, expiré ou déjà utilisé. Veuillez en créer un nouveau.
-        create_failed: "Échec de la connexion : %{message}"
+        create_failed: 'Échec de la connexion : %{message}'
+        invalid_token: Jeton de configuration invalide. Veuillez vérifier que vous
+          avez copié le jeton complet depuis SimpleFIN Bridge.
+        token_compromised: Le jeton de configuration est peut-être compromis, expiré
+          ou déjà utilisé. Veuillez en créer un nouveau.
         unexpected: Une erreur inattendue s'est produite. Veuillez réessayer.
+      success: Connexion SimpleFIN ajoutée avec succès ! Vos comptes apparaîtront
+        sous peu lors de la synchronisation en arrière-plan.
     destroy:
       success: La connexion SimpleFIN va être supprimée
-    update:
-      success: Connexion SimpleFIN mise à jour avec succès ! Vos comptes sont en cours de reconnexion.
-      errors:
-        blank_token: Veuillez entrer un jeton de configuration SimpleFIN.
-        invalid_token: Jeton de configuration invalide. Veuillez vérifier que vous avez copié le jeton complet depuis SimpleFIN Bridge.
-        token_compromised: Le jeton de configuration est peut-être compromis, expiré ou déjà utilisé. Veuillez en créer un nouveau.
-        update_failed: "Échec de la mise à jour de la connexion : %{message}"
-        unexpected: Une erreur inattendue s'est produite. Veuillez réessayer.
-    edit:
-      setup_token:
-        label: "Jeton de configuration SimpleFIN :"
-        placeholder: "Collez votre jeton de configuration SimpleFIN ici..."
-        help_text: "Le jeton doit être une longue chaîne commençant par des lettres et des chiffres"
-    setup_accounts:
-      account_card:
-        balance: "Solde"
-      activity:
-        recent:
-          one: "1 transaction • dernière %{when}"
-          other: "%{count} transactions • dernière %{when}"
-        dormant: "Aucune activité depuis %{days} jours"
-        empty: "Aucune transaction importée pour le moment"
-        likely_closed: "Aucune activité récente et solde à zéro — il peut s'agir d'une carte fermée ou remplacée"
-        today: "aujourd'hui"
-        yesterday: "hier"
-        days_ago:
-          one: "il y a 1 jour"
-          other: "il y a %{count} jours"
-      stale_accounts:
-        title: "Comptes qui ne sont plus dans SimpleFIN"
-        description: "Ces comptes existent dans votre base de données mais ne sont plus fournis par SimpleFIN. Cela peut se produire lorsque la configuration des comptes change en amont."
-        action_prompt: "Que souhaitez-vous faire ?"
-        action_delete: "Supprimer le compte et toutes les transactions"
-        action_move: "Déplacer les transactions vers :"
-        action_skip: "Ignorer pour l'instant"
-        transaction_count:
-          one: "%{count} transaction"
-          other: "%{count} transactions"
-    complete_account_setup:
-      all_skipped: "Tous les comptes ont été ignorés. Aucun compte n'a été créé."
-      no_accounts: "Aucun compte à configurer."
-      success:
-        one: "%{count} compte SimpleFIN créé avec succès ! Vos transactions et avoirs sont en cours d'importation en arrière-plan."
-        other: "%{count} comptes SimpleFIN créés avec succès ! Vos transactions et avoirs sont en cours d'importation en arrière-plan."
-      stale_accounts_processed: "Comptes obsolètes : %{deleted} supprimés, %{moved} déplacés."
-      stale_accounts_errors:
-        one: "%{count} action sur un compte obsolète a échoué. Consultez les journaux pour plus de détails."
-        other: "%{count} actions sur des comptes obsolètes ont échoué. Consultez les journaux pour plus de détails."
-    simplefin_item:
-      add_new: Ajouter une nouvelle connexion
-      confirm_accept: Supprimer la connexion
-      confirm_body: Cela supprimera définitivement tous les comptes de ce groupe et toutes les données associées.
-      confirm_title: Supprimer la connexion SimpleFIN ?
-      delete: Supprimer
-      deletion_in_progress: "(suppression en cours...)"
-      error: Une erreur s'est produite lors de la synchronisation des données
-      no_accounts_description: Cette connexion n'a pas encore de comptes synchronisés.
-      no_accounts_title: Aucun compte trouvé
-      requires_update: Reconnecter
-      setup_needed: Nouveaux comptes prêts à être configurés
-      setup_description: Choisissez les types de comptes pour vos comptes SimpleFIN nouvellement importés.
-      setup_action: Configurer les nouveaux comptes
-      setup_accounts_menu: Configurer les comptes
-      more_accounts_available:
-        one: "%{count} compte supplémentaire disponible à configurer"
-        other: "%{count} comptes supplémentaires disponibles à configurer"
-      accounts_skipped_tooltip: "Certains comptes ont été ignorés en raison d'erreurs lors de la synchronisation"
-      accounts_skipped_label: "Ignorés : %{count}"
-      rate_limited_ago: "Limite de débit atteinte (il y a %{time})"
-      rate_limited_recently: "Limite de débit atteinte récemment"
-      status: Dernière synchronisation il y a %{timestamp}
-      status_never: Jamais synchronisé
-      status_with_summary: "Dernière synchronisation il y a %{timestamp} • %{summary}"
-      syncing: Synchronisation...
-      update: Mettre à jour
-      stale_pending_note: "(exclues des budgets)"
-      stale_pending_accounts: "dans : %{accounts}"
-      reconciled_details_note: "(voir le résumé de synchronisation pour plus de détails)"
-      duplicate_accounts_skipped: "Certains comptes ont été ignorés comme doublons — utilisez 'Lier des comptes existants' pour fusionner."
-    select_existing_account:
-      title: "Lier %{account_name} à SimpleFIN"
-      description: Sélectionnez un compte SimpleFIN à lier à votre compte existant
-      cancel: Annuler
-      link_account: Lier le compte
-      no_accounts_found: "Aucun compte SimpleFIN trouvé pour ce %{moniker}."
-      wait_for_sync: Si vous venez de connecter ou de synchroniser, réessayez une fois la synchronisation terminée.
-      unlink_to_move: Pour déplacer un lien, détachez-le d'abord depuis le menu d'actions du compte.
-      all_accounts_already_linked: Tous les comptes SimpleFIN semblent déjà liés.
-      currently_linked_to: "Actuellement lié à : %{account_name}"
-
-    link_existing_account:
-      success: Compte lié à SimpleFIN avec succès
-      errors:
-        only_manual: Seuls les comptes manuels peuvent être liés
-        different_provider: Ce compte est lié à un autre fournisseur. Détachez-le d'abord de ce fournisseur, puis liez-le à SimpleFIN.
-        invalid_simplefin_account: Compte SimpleFIN sélectionné invalide
     dismiss_replacement_suggestion:
       dismissed: Suggestion de remplacement ignorée
-    replacement_prompt:
-      title: "Votre carte %{institution} a peut-être été remplacée"
-      description: "« %{account_name} » est liée à « %{old_name} », qui n'a eu aucune activité récente et un solde à zéro. Une nouvelle carte, « %{new_name} », est désormais active dans la même institution. Reliez-la pour conserver votre historique intact."
-      relink: Relier à la nouvelle carte
-      confirm_title: Relier à la nouvelle carte ?
-      confirm_body: "« %{account_name} » sera liée à « %{new_name} ». Votre historique de transactions est conservé ; les transactions futures proviendront de la nouvelle carte."
-      dismiss_aria: Ignorer la suggestion de remplacement
+    edit:
+      cancel: Annuler
+      connection_needs_update: 'Votre connexion SimpleFIN doit être mise à jour :'
+      header_subtitle: Obtenez un nouveau jeton de configuration pour reconnecter
+        votre compte SimpleFIN
+      setup_token:
+        help_text: Le jeton doit être une longue chaîne commençant par des lettres
+          et des chiffres
+        label: 'Jeton de configuration SimpleFIN :'
+        placeholder: Collez votre jeton de configuration SimpleFIN ici...
+      step_1_html: Visitez <a href="https://bridge.simplefin.org/simplefin/create"
+        target="_blank" rel="noopener noreferrer" class="text-link hover:text-link
+        underline">SimpleFIN Bridge</a> pour créer un nouveau jeton de configuration.
+      step_2: Copiez le jeton et collez-le ci-dessous
+      step_3: Cliquez sur "Mettre à jour" pour restaurer l'accès
+      title: Mettre à jour la connexion SimpleFIN
+      update: Mise à jour
+    link_existing_account:
+      errors:
+        different_provider: Ce compte est lié à un autre fournisseur. Détachez-le
+          d'abord de ce fournisseur, puis liez-le à SimpleFIN.
+        invalid_simplefin_account: Compte SimpleFIN sélectionné invalide
+        only_manual: Seuls les comptes manuels peuvent être liés
+      success: Compte lié à SimpleFIN avec succès
+    new:
+      cancel: Annuler
+      connect: Connecter
+      setup_token: Jeton de configuration
+      setup_token_placeholder: collez votre jeton de configuration SimpleFIN
+      title: Connecter SimpleFIN
     reconciled_status:
       message:
         one: "%{count} transaction en attente en doublon réconciliée"
         other: "%{count} transactions en attente en doublon réconciliées"
+    replacement_prompt:
+      confirm_body: "« %{account_name} » sera liée à « %{new_name} ». Votre historique
+        de transactions est conservé ; les transactions futures proviendront de la
+        nouvelle carte."
+      confirm_title: Relier à la nouvelle carte ?
+      description: "« %{account_name} » est liée à « %{old_name} », qui n'a eu aucune
+        activité récente et un solde à zéro. Une nouvelle carte, « %{new_name} »,
+        est désormais active dans la même institution. Reliez-la pour conserver votre
+        historique intact."
+      dismiss_aria: Ignorer la suggestion de remplacement
+      relink: Relier à la nouvelle carte
+      title: Votre carte %{institution} a peut-être été remplacée
+    select_existing_account:
+      all_accounts_already_linked: Tous les comptes SimpleFIN semblent déjà liés.
+      cancel: Annuler
+      currently_linked_to: 'Actuellement lié à : %{account_name}'
+      description: Sélectionnez un compte SimpleFIN à lier à votre compte existant
+      link_account: Lier le compte
+      no_accounts_found: Aucun compte SimpleFIN trouvé pour ce %{moniker}.
+      title: Lier %{account_name} à SimpleFIN
+      unlink_to_move: Pour déplacer un lien, détachez-le d'abord depuis le menu d'actions
+        du compte.
+      wait_for_sync: Si vous venez de connecter ou de synchroniser, réessayez une
+        fois la synchronisation terminée.
+    setup_accounts:
+      account_card:
+        balance: Solde
+      account_type_checking_savings: Chèque ou épargne
+      account_type_checking_savings_desc: Comptes bancaires réguliers
+      account_type_credit_card: Carte de crédit
+      account_type_credit_card_desc: Comptes de carte de crédit
+      account_type_investment: Investissement
+      account_type_investment_desc: Courtage, 401(k), comptes IRA
+      account_type_label: 'Type de compte :'
+      account_type_loan: Prêt ou hypothèque
+      account_type_loan_desc: Comptes de dette
+      account_type_other_asset: Autre actif
+      account_type_other_asset_desc: Tout le reste
+      activity:
+        days_ago:
+          one: il y a 1 jour
+          other: il y a %{count} jours
+        dormant: Aucune activité depuis %{days} jours
+        empty: Aucune transaction importée pour le moment
+        likely_closed: Aucune activité récente et solde à zéro — il peut s'agir d'une
+          carte fermée ou remplacée
+        recent:
+          one: 1 transaction • dernière %{when}
+          other: "%{count} transactions • dernière %{when}"
+        today: aujourd'hui
+        yesterday: hier
+      cancel: Annuler
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        SimpleFIN :'
+      create_accounts: Créer des comptes
+      creating_accounts: Création de comptes...
+      header_subtitle: Choisissez les types de comptes corrects pour vos comptes importés
+      stale_accounts:
+        action_delete: Supprimer le compte et toutes les transactions
+        action_move: 'Déplacer les transactions vers :'
+        action_prompt: Que souhaitez-vous faire ?
+        action_skip: Ignorer pour l'instant
+        description: Ces comptes existent dans votre base de données mais ne sont
+          plus fournis par SimpleFIN. Cela peut se produire lorsque la configuration
+          des comptes change en amont.
+        title: Comptes qui ne sont plus dans SimpleFIN
+        transaction_count:
+          one: "%{count} transaction"
+          other: "%{count} transactions"
+      title: Configurez vos comptes SimpleFIN
+      transaction_history_description_html: SimpleFIN fournit généralement <strong>60
+        à 90 jours</strong> d'historique des transactions, en fonction de votre banque.
+        Après la configuration initiale, les nouvelles transactions seront automatiquement
+        synchronisées. La disponibilité des données historiques varie selon l'institution
+        et le type de compte.
+      transaction_history_title: 'Historique des transactions :'
+    simplefin_item:
+      accounts_skipped_label: 'Ignorés : %{count}'
+      accounts_skipped_tooltip: Certains comptes ont été ignorés en raison d'erreurs
+        lors de la synchronisation
+      add_new: Ajouter une nouvelle connexion
+      confirm_accept: Supprimer la connexion
+      confirm_body: Cela supprimera définitivement tous les comptes de ce groupe et
+        toutes les données associées.
+      confirm_title: Supprimer la connexion SimpleFIN ?
+      delete: Supprimer
+      deletion_in_progress: "(suppression en cours...)"
+      duplicate_accounts_skipped: Certains comptes ont été ignorés comme doublons
+        — utilisez 'Lier des comptes existants' pour fusionner.
+      error: Une erreur s'est produite lors de la synchronisation des données
+      more_accounts_available:
+        one: "%{count} compte supplémentaire disponible à configurer"
+        other: "%{count} comptes supplémentaires disponibles à configurer"
+      no_accounts_description: Cette connexion n'a pas encore de comptes synchronisés.
+      no_accounts_title: Aucun compte trouvé
+      rate_limited_ago: Limite de débit atteinte (il y a %{time})
+      rate_limited_recently: Limite de débit atteinte récemment
+      reconciled_details_note: "(voir le résumé de synchronisation pour plus de détails)"
+      requires_update: Reconnecter
+      setup_accounts_menu: Configurer les comptes
+      setup_action: Configurer les nouveaux comptes
+      setup_description: Choisissez les types de comptes pour vos comptes SimpleFIN
+        nouvellement importés.
+      setup_needed: Nouveaux comptes prêts à être configurés
+      stale_pending_accounts: 'dans : %{accounts}'
+      stale_pending_note: "(exclues des budgets)"
+      status: Dernière synchronisation il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} • %{summary}
+      syncing: Synchronisation...
+      update: Mettre à jour
     stale_pending_status:
       message:
         one: "%{count} transaction en attente depuis plus de %{days} jours"
         other: "%{count} transactions en attente depuis plus de %{days} jours"
+    update:
+      errors:
+        blank_token: Veuillez entrer un jeton de configuration SimpleFIN.
+        invalid_token: Jeton de configuration invalide. Veuillez vérifier que vous
+          avez copié le jeton complet depuis SimpleFIN Bridge.
+        token_compromised: Le jeton de configuration est peut-être compromis, expiré
+          ou déjà utilisé. Veuillez en créer un nouveau.
+        unexpected: Une erreur inattendue s'est produite. Veuillez réessayer.
+        update_failed: 'Échec de la mise à jour de la connexion : %{message}'
+      success: Connexion SimpleFIN mise à jour avec succès ! Vos comptes sont en cours
+        de reconnexion.
diff --git a/config/locales/views/simplefin_items/it.yml b/config/locales/views/simplefin_items/it.yml
new file mode 100644
index 000000000..7a098619e
--- /dev/null
+++ b/config/locales/views/simplefin_items/it.yml
@@ -0,0 +1,158 @@
+---
+it:
+  simplefin_items:
+    new:
+      title: Connetti SimpleFIN
+      setup_token: Token di configurazione
+      setup_token_placeholder: incolla il tuo token di configurazione SimpleFIN
+      connect: Connetti
+      cancel: Annulla
+    create:
+      success: Connessione SimpleFIN aggiunta con successo! I tuoi conti appariranno a breve mentre vengono sincronizzati in background.
+      errors:
+        blank_token: Inserisci un token di configurazione SimpleFIN.
+        invalid_token: Token di configurazione non valido. Verifica di aver copiato il token completo da SimpleFIN Bridge.
+        token_compromised: Il token di configurazione potrebbe essere compromesso, scaduto o già utilizzato. Creane uno nuovo.
+        create_failed: "Connessione fallita: %{message}"
+        unexpected: Si è verificato un errore imprevisto. Riprova.
+    destroy:
+      success: La connessione SimpleFIN verrà rimossa
+    update:
+      success: Connessione SimpleFIN aggiornata con successo! I tuoi conti vengono riconnessi.
+      errors:
+        blank_token: Inserisci un token di configurazione SimpleFIN.
+        invalid_token: Token di configurazione non valido. Verifica di aver copiato il token completo da SimpleFIN Bridge.
+        token_compromised: Il token di configurazione potrebbe essere compromesso, scaduto o già utilizzato. Creane uno nuovo.
+        update_failed: "Aggiornamento connessione fallito: %{message}"
+        unexpected: Si è verificato un errore imprevisto. Riprova.
+    edit:
+      setup_token:
+        label: "Token di configurazione SimpleFIN:"
+        placeholder: "Incolla qui il tuo token di configurazione SimpleFIN..."
+        help_text: "Il token deve essere una stringa lunga che inizia con lettere e numeri"
+      title: Aggiorna connessione SimpleFIN
+      header_subtitle: Ottieni un nuovo token di configurazione per riconnettere il tuo account SimpleFIN
+      connection_needs_update: "La tua connessione SimpleFIN deve essere aggiornata:"
+      step_1_html: "Visita <a href=\"https://bridge.simplefin.org/simplefin/create\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-link hover:text-link underline\">SimpleFIN Bridge</a> per creare un nuovo token di configurazione"
+      step_2: Copia il token e incollalo qui sotto
+      step_3: "Clicca \"Aggiorna\" per ripristinare l'accesso"
+      update: Aggiorna
+      cancel: Annulla
+    setup_accounts:
+      title: Configura i tuoi conti SimpleFIN
+      header_subtitle: Scegli i tipi di conto corretti per i conti importati
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto SimpleFIN:"
+      account_type_checking_savings: Conto corrente o risparmio
+      account_type_checking_savings_desc: Conti bancari ordinari
+      account_type_credit_card: Carta di credito
+      account_type_credit_card_desc: Conti carta di credito
+      account_type_investment: Investimento
+      account_type_investment_desc: "Conti brokerage, 401(k), IRA"
+      account_type_loan: Prestito o mutuo
+      account_type_loan_desc: Conti debiti
+      account_type_other_asset: Altro asset
+      account_type_other_asset_desc: Tutto il resto
+      transaction_history_title: "Cronologia transazioni:"
+      transaction_history_description_html: "SimpleFIN fornisce tipicamente <strong>60-90 giorni</strong> di cronologia transazioni, a seconda della banca. Dopo la configurazione iniziale, le nuove transazioni verranno sincronizzate automaticamente. La disponibilità dei dati storici varia per istituzione e tipo di conto."
+      account_type_label: "Tipo di conto:"
+      create_accounts: Crea conti
+      creating_accounts: Creazione conti in corso...
+      cancel: Annulla
+      account_card:
+        balance: "Saldo"
+      activity:
+        recent:
+          one: "1 transazione • ultima %{when}"
+          other: "%{count} transazioni • ultima %{when}"
+        dormant: "Nessuna attività negli ultimi %{days} giorni"
+        empty: "Nessuna transazione importata ancora"
+        likely_closed: "Nessuna attività recente e saldo zero — questo potrebbe essere un conto chiuso o sostituito"
+        today: "oggi"
+        yesterday: "ieri"
+        days_ago:
+          one: "1 giorno fa"
+          other: "%{count} giorni fa"
+      stale_accounts:
+        title: "Conti non più in SimpleFIN"
+        description: "Questi conti esistono nel database ma non vengono più forniti da SimpleFIN. Questo può succedere quando le configurazioni dei conti cambiano a monte."
+        action_prompt: "Cosa vuoi fare?"
+        action_delete: "Elimina conto e tutte le transazioni"
+        action_move: "Sposta le transazioni in:"
+        action_skip: "Salta per ora"
+        transaction_count:
+          one: "%{count} transazione"
+          other: "%{count} transazioni"
+    complete_account_setup:
+      all_skipped: "Tutti i conti sono stati saltati. Nessun conto è stato creato."
+      no_accounts: "Nessun conto da configurare."
+      success:
+        one: "Creato con successo %{count} conto SimpleFIN! Le tue transazioni e posizioni vengono importate in background."
+        other: "Creati con successo %{count} conti SimpleFIN! Le tue transazioni e posizioni vengono importate in background."
+      stale_accounts_processed: "Conti inattivi: %{deleted} eliminati, %{moved} spostati."
+      stale_accounts_errors:
+        one: "%{count} azione su conto inattivo è fallita. Controlla i log per i dettagli."
+        other: "%{count} azioni su conti inattivi sono fallite. Controlla i log per i dettagli."
+    simplefin_item:
+      add_new: Aggiungi nuova connessione
+      confirm_accept: Elimina connessione
+      confirm_body: Questo eliminerà definitivamente tutti i conti in questo gruppo e tutti i dati associati.
+      confirm_title: Eliminare la connessione SimpleFIN?
+      delete: Elimina
+      deletion_in_progress: "(eliminazione in corso...)"
+      error: Si è verificato un errore durante la sincronizzazione dei dati
+      no_accounts_description: Questa connessione non ha ancora conti sincronizzati.
+      no_accounts_title: Nessun conto trovato
+      requires_update: Riconnetti
+      setup_needed: Nuovi conti pronti per la configurazione
+      setup_description: Scegli i tipi di conto per i tuoi nuovi conti SimpleFIN importati.
+      setup_action: Configura nuovi conti
+      setup_accounts_menu: Configura conti
+      more_accounts_available:
+        one: "%{count} altro conto disponibile da configurare"
+        other: "%{count} altri conti disponibili da configurare"
+      accounts_skipped_tooltip: "Alcuni conti sono stati saltati a causa di errori durante la sincronizzazione"
+      accounts_skipped_label: "Saltati: %{count}"
+      rate_limited_ago: "Limite di frequenza (%{time} fa)"
+      rate_limited_recently: "Limite di frequenza raggiunto di recente"
+      status: Ultima sincronizzazione %{timestamp} fa
+      status_never: Mai sincronizzato
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa • %{summary}"
+      syncing: Sincronizzazione in corso...
+      update: Aggiorna
+      stale_pending_note: "(escluso dai budget)"
+      stale_pending_accounts: "in: %{accounts}"
+      reconciled_details_note: "(vedi riepilogo sincronizzazione per i dettagli)"
+      duplicate_accounts_skipped: "Alcuni conti sono stati saltati come duplicati — usa 'Collega conti esistenti' per unirli."
+    select_existing_account:
+      title: "Collega %{account_name} a SimpleFIN"
+      description: Seleziona un conto SimpleFIN da collegare al tuo conto esistente
+      cancel: Annulla
+      link_account: Collega conto
+      no_accounts_found: "Nessun conto SimpleFIN trovato per questo %{moniker}."
+      wait_for_sync: Se hai appena connesso o sincronizzato, riprova dopo il completamento della sincronizzazione.
+      unlink_to_move: Per spostare un collegamento, prima scollegalo dal menu azioni del conto.
+      all_accounts_already_linked: Tutti i conti SimpleFIN sembrano già collegati.
+      currently_linked_to: "Attualmente collegato a: %{account_name}"
+    link_existing_account:
+      success: Conto collegato con successo a SimpleFIN
+      errors:
+        only_manual: Solo i conti manuali possono essere collegati
+        different_provider: Questo conto è collegato a un provider diverso. Prima scollegalo da quel provider, poi collegalo a SimpleFIN.
+        invalid_simplefin_account: Conto SimpleFIN selezionato non valido
+    dismiss_replacement_suggestion:
+      dismissed: Suggerimento di sostituzione ignorato
+    replacement_prompt:
+      title: "La tua carta %{institution} potrebbe essere stata sostituita"
+      description: "\"%{account_name}\" è collegato a \"%{old_name}\", che non ha avuto attività recente e ha saldo zero. Una nuova carta, \"%{new_name}\", è ora attiva presso la stessa istituzione. Ricollega per mantenere la tua cronologia intatta."
+      relink: Ricollega alla nuova carta
+      confirm_title: Ricollega alla nuova carta?
+      confirm_body: "\"%{account_name}\" verrà collegato a \"%{new_name}\". La cronologia delle transazioni rimane; le future vengono dalla nuova carta."
+      dismiss_aria: Ignora suggerimento di sostituzione
+    reconciled_status:
+      message:
+        one: "%{count} transazione in sospeso duplicata riconciliata"
+        other: "%{count} transazioni in sospeso duplicate riconciliate"
+    stale_pending_status:
+      message:
+        one: "%{count} transazione in sospeso più vecchia di %{days} giorni"
+        other: "%{count} transazioni in sospeso più vecchie di %{days} giorni"
diff --git a/config/locales/views/simplefin_items/ru.yml b/config/locales/views/simplefin_items/ru.yml
new file mode 100644
index 000000000..d05850f3e
--- /dev/null
+++ b/config/locales/views/simplefin_items/ru.yml
@@ -0,0 +1,205 @@
+---
+ru:
+  simplefin_items:
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Счета не были созданы.
+      no_accounts: Нет счетов для настройки.
+      stale_accounts_errors:
+        few: "%{count} действия с устаревшими счетами не удалось. Проверьте логи для
+          деталей."
+        many: "%{count} действий с устаревшими счетами не удалось. Проверьте логи
+          для деталей."
+        one: "%{count} действие с устаревшим счётом не удалось. Проверьте логи для
+          деталей."
+        other: "%{count} действия с устаревшими счетами не удалось. Проверьте логи
+          для деталей."
+      stale_accounts_processed: 'Устаревшие счета: %{deleted} удалено, %{moved} перемещено.'
+      success:
+        few: Успешно созданы %{count} счёта SimpleFIN! Операции и активы импортируются
+          в фоновом режиме.
+        many: Успешно создано %{count} счетов SimpleFIN! Операции и активы импортируются
+          в фоновом режиме.
+        one: Успешно создан %{count} счёт SimpleFIN! Операции и активы импортируются
+          в фоновом режиме.
+        other: Успешно созданы %{count} счёта SimpleFIN! Операции и активы импортируются
+          в фоновом режиме.
+    create:
+      errors:
+        blank_token: Пожалуйста, введите токен настройки SimpleFIN.
+        create_failed: 'Не удалось подключиться: %{message}'
+        invalid_token: Неверный токен настройки. Пожалуйста, проверьте, что вы скопировали
+          полный токен из SimpleFIN Bridge.
+        token_compromised: Токен настройки может быть скомпрометирован, истек или
+          уже использован. Пожалуйста, создайте новый.
+        unexpected: Произошла непредвиденная ошибка. Пожалуйста, попробуйте снова.
+      success: Подключение SimpleFIN успешно добавлено! Ваши счета скоро появятся
+        после синхронизации в фоновом режиме.
+    destroy:
+      success: Подключение SimpleFIN будет удалено
+    dismiss_replacement_suggestion:
+      dismissed: Предложение о замене отклонено
+    edit:
+      cancel: Отмена
+      connection_needs_update: 'Ваше подключение SimpleFIN нуждается в обновлении:'
+      header_subtitle: Получите новый токен настройки для переподключения вашего аккаунта
+        SimpleFIN
+      setup_token:
+        help_text: Токен должен быть длинной строкой, начинающейся с букв и цифр
+        label: 'Токен настройки SimpleFIN:'
+        placeholder: Вставьте ваш токен настройки SimpleFIN здесь...
+      step_1_html: Посетите <a href="https://bridge.simplefin.org/simplefin/create"
+        target="_blank" rel="noopener noreferrer" class="text-link hover:text-link
+        underline">SimpleFIN Bridge</a>, чтобы создать новый токен настройки
+      step_2: Скопируйте токен и вставьте его ниже
+      step_3: Нажмите "Обновить", чтобы восстановить доступ
+      title: Обновить подключение SimpleFIN
+      update: Обновить
+    link_existing_account:
+      errors:
+        different_provider: Этот счёт связан с другим провайдером. Сначала отвяжите
+          его от того провайдера, затем свяжите с SimpleFIN.
+        invalid_simplefin_account: Выбран неверный счёт SimpleFIN
+        only_manual: Только ручные счета могут быть связаны
+      success: Счёт успешно связан с SimpleFIN
+    new:
+      cancel: Отмена
+      connect: Подключить
+      setup_token: Токен настройки
+      setup_token_placeholder: вставьте ваш токен настройки SimpleFIN
+      title: Подключить SimpleFIN
+    reconciled_status:
+      message:
+        few: "%{count} дублирующиеся ожидающие операции согласованы"
+        many: "%{count} дублирующихся ожидающих операций согласовано"
+        one: "%{count} дублирующаяся ожидающая операция согласована"
+        other: "%{count} дублирующиеся ожидающие операции согласованы"
+    replacement_prompt:
+      confirm_body: "«%{account_name}» будет связано с «%{new_name}». Ваша история
+        операций останется; будущие операции будут поступать с новой карты."
+      confirm_title: Переподключить к новой карте?
+      description: "«%{account_name}» связано с «%{old_name}», на котором нет недавней
+        активности и нулевой баланс. Новая карта, «%{new_name}», теперь активна в
+        том же учреждении. Переподключите, чтобы сохранить вашу историю."
+      dismiss_aria: Отклонить предложение о замене
+      relink: Переподключить к новой карте
+      title: Ваша карта %{institution} могла быть заменена
+    select_existing_account:
+      all_accounts_already_linked: Все счета SimpleFIN, похоже, уже связаны.
+      cancel: Отмена
+      check_provider_health: Проверить состояние провайдера
+      currently_linked_to: 'В настоящее время связано с: %{account_name}'
+      description: Выберите счёт SimpleFIN для связи с вашим существующим счётом
+      link_account: Связать счёт
+      no_accounts_found: Счета SimpleFIN не найдены для этого %{moniker}.
+      title: Связать %{account_name} с SimpleFIN
+      unlink_to_move: Чтобы переместить связь, сначала отвяжите её в меню действий
+        счёта.
+      wait_for_sync: Если вы только что подключились или синхронизировались, попробуйте
+        снова после завершения синхронизации.
+    setup_accounts:
+      account_card:
+        balance: Баланс
+      account_type_checking_savings: Текущий или Сберегательный
+      account_type_checking_savings_desc: Обычные банковские счета
+      account_type_credit_card: Кредитная карта
+      account_type_credit_card_desc: Счета кредитных карт
+      account_type_investment: Инвестиции
+      account_type_investment_desc: Брокерские счета, 401(k), IRA
+      account_type_label: 'Тип счёта:'
+      account_type_loan: Кредит или Ипотека
+      account_type_loan_desc: Долговые счета
+      account_type_other_asset: Другой актив
+      account_type_other_asset_desc: Всё остальное
+      activity:
+        days_ago:
+          few: "%{count} дня назад"
+          many: "%{count} дней назад"
+          one: 1 день назад
+          other: "%{count} дня назад"
+        dormant: Нет активности в течение %{days} дней
+        empty: Операции ещё не импортированы
+        likely_closed: Нет недавней активности и нулевой баланс — возможно, это закрытая
+          или заменённая карта
+        recent:
+          few: "%{count} операции • последняя %{when}"
+          many: "%{count} операций • последняя %{when}"
+          one: 1 операция • последняя %{when}
+          other: "%{count} операции • последняя %{when}"
+        today: сегодня
+        yesterday: вчера
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип для каждого счета SimpleFIN:'
+      create_accounts: Создать счета
+      creating_accounts: Создание счетов...
+      header_subtitle: Выберите правильные типы счетов для импортированных счетов
+      stale_accounts:
+        action_delete: Удалить счёт и все операции
+        action_move: 'Переместить операции в:'
+        action_prompt: Что вы хотите сделать?
+        action_skip: Пропустить на данный момент
+        description: Эти счета существуют в вашей базе данных, но больше не предоставляются
+          SimpleFIN. Это может произойти, когда конфигурации счетов изменяются.
+        title: Счета больше не в SimpleFIN
+        transaction_count:
+          few: "%{count} операции"
+          many: "%{count} операций"
+          one: "%{count} операция"
+          other: "%{count} операции"
+      title: Настройте ваши счета SimpleFIN
+      transaction_history_description_html: SimpleFIN обычно предоставляет <strong>60-90
+        дней</strong> истории операций, в зависимости от вашего банка. После первоначальной
+        настройки новые операции будут синхронизироваться автоматически. Доступность
+        исторических данных зависит от учреждения и типа счета.
+      transaction_history_title: 'История операций:'
+    simplefin_item:
+      accounts_skipped_label: 'Пропущено: %{count}'
+      accounts_skipped_tooltip: Некоторые счета были пропущены из-за ошибок во время
+        синхронизации
+      add_new: Добавить новое подключение
+      confirm_accept: Удалить подключение
+      confirm_body: Это навсегда удалит все счета в этой группе и все связанные данные.
+      confirm_title: Удалить подключение SimpleFIN?
+      delete: Удалить
+      deletion_in_progress: "(удаление в процессе...)"
+      duplicate_accounts_skipped: Некоторые счета были пропущены как дубликаты — используйте
+        'Связать существующие счета', чтобы объединить.
+      error: Произошла ошибка при синхронизации данных
+      more_accounts_available:
+        few: "%{count} счёта доступны для настройки"
+        many: "%{count} счетов доступно для настройки"
+        one: "%{count} счёт доступен для настройки"
+        other: "%{count} счёта доступны для настройки"
+      no_accounts_description: Это подключение пока не имеет синхронизированных счетов.
+      no_accounts_title: Счета не найдены
+      rate_limited_ago: Ограничение скорости (%{time} назад)
+      rate_limited_recently: Ограничение скорости недавно
+      reconciled_details_note: "(см. сводку синхронизации для деталей)"
+      requires_update: Переподключить
+      setup_accounts_menu: Настроить счета
+      setup_action: Настроить новые счета
+      setup_description: Выберите типы счетов для ваших недавно импортированных счетов
+        SimpleFIN.
+      setup_needed: Новые счета готовы к настройке
+      stale_pending_accounts: 'в: %{accounts}'
+      stale_pending_note: "(исключено из бюджетов)"
+      status: Последняя синхронизация %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад • %{summary}
+      syncing: Синхронизация...
+      update: Обновить
+    stale_pending_status:
+      message:
+        few: "%{count} ожидающие операции старше %{days} дней"
+        many: "%{count} ожидающих операций старше %{days} дней"
+        one: "%{count} ожидающая операция старше %{days} дней"
+        other: "%{count} ожидающие операции старше %{days} дней"
+    update:
+      errors:
+        blank_token: Пожалуйста, введите токен настройки SimpleFIN.
+        invalid_token: Неверный токен настройки. Пожалуйста, проверьте, что вы скопировали
+          полный токен из SimpleFIN Bridge.
+        token_compromised: Токен настройки может быть скомпрометирован, истек или
+          уже использован. Пожалуйста, создайте новый.
+        unexpected: Произошла непредвиденная ошибка. Пожалуйста, попробуйте снова.
+        update_failed: 'Не удалось обновить подключение: %{message}'
+      success: Подключение SimpleFIN успешно обновлено! Ваши счета переподключаются.
diff --git a/config/locales/views/simplefin_items/tr.yml b/config/locales/views/simplefin_items/tr.yml
new file mode 100644
index 000000000..c98d005dd
--- /dev/null
+++ b/config/locales/views/simplefin_items/tr.yml
@@ -0,0 +1,182 @@
+---
+tr:
+  simplefin_items:
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hesap oluşturulmadı.
+      no_accounts: Kurulacak hesap yok.
+      stale_accounts_errors:
+        one: "%{count} eski hesap eylemi başarısız oldu. Ayrıntılar için günlükleri
+          kontrol edin."
+        other: "%{count} eski hesap eylemi başarısız oldu. Ayrıntılar için günlükleri
+          kontrol edin."
+      stale_accounts_processed: 'Eski hesaplar: %{deleted} silindi, %{moved} taşındı.'
+      success:
+        one: "%{count} SimpleFIN hesabı başarıyla oluşturuldu! İşlemleriniz ve varlıklarınız
+          arka planda içe aktarılıyor."
+        other: "%{count} SimpleFIN hesabı başarıyla oluşturuldu! İşlemleriniz ve varlıklarınız
+          arka planda içe aktarılıyor."
+    create:
+      errors:
+        blank_token: Lütfen bir SimpleFIN kurulum anahtarı girin.
+        create_failed: 'Bağlanılamadı: %{message}'
+        invalid_token: Geçersiz kurulum anahtarı. Lütfen anahtarı SimpleFIN Bridge'den
+          eksiksiz kopyaladığınızdan emin olun.
+        token_compromised: Kurulum anahtarı tehlikeye girmiş, süresi dolmuş veya zaten
+          kullanılmış olabilir. Lütfen yeni bir tane oluşturun.
+        unexpected: Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.
+      success: SimpleFIN bağlantısı başarıyla eklendi! Hesaplar arka planda senkronize
+        edilirken kısa süre içinde görünecek.
+    destroy:
+      success: SimpleFIN bağlantısı kaldırılacak
+    dismiss_replacement_suggestion:
+      dismissed: Değiştirme önerisi reddedildi
+    edit:
+      cancel: İptal
+      connection_needs_update: 'SimpleFIN bağlantınızın güncellenmesi gerekiyor:'
+      header_subtitle: SimpleFIN hesabınızı yeniden bağlamak için yeni bir kurulum
+        anahtarı alın
+      setup_token:
+        help_text: Anahtar harfler ve rakamlarla başlayan uzun bir dize olmalıdır
+        label: 'SimpleFIN Kurulum Anahtarı:'
+        placeholder: SimpleFIN kurulum anahtarınızı buraya yapıştırın...
+      step_1_html: Yeni bir kurulum anahtarı oluşturmak için <a href="https://bridge.simplefin.org/simplefin/create"
+        target="_blank" rel="noopener noreferrer" class="text-link hover:text-link
+        underline">SimpleFIN Bridge</a> adresini ziyaret edin
+      step_2: Anahtarı kopyalayın ve aşağıya yapıştırın
+      step_3: Erişimi geri yüklemek için "Güncelle"ye tıklayın
+      title: SimpleFIN Bağlantısını Güncelle
+      update: Güncelle
+    link_existing_account:
+      errors:
+        different_provider: Bu hesap başka bir sağlayıcıya bağlı. Önce onu o sağlayıcıdan
+          koparın, ardından SimpleFIN'a bağlayın.
+        invalid_simplefin_account: Geçersiz SimpleFIN hesabı seçildi
+        only_manual: Yalnızca manuel hesaplar bağlanabilir
+      success: Hesap SimpleFIN'a başarıyla bağlandı
+    new:
+      cancel: İptal
+      connect: Bağlan
+      setup_token: Kurulum anahtarı
+      setup_token_placeholder: SimpleFIN kurulum anahtarınızı yapıştırın
+      title: SimpleFIN'a Bağlan
+    reconciled_status:
+      message:
+        one: "%{count} yinelenen bekleyen işlem uzlaştırıldı"
+        other: "%{count} yinelenen bekleyen işlem uzlaştırıldı"
+    replacement_prompt:
+      confirm_body: "“%{account_name}”, “%{new_name}” hesabına bağlanacak. İşlem geçmişiniz
+        korunur; gelecekteki işlemler yeni karttan gelir."
+      confirm_title: Yeni karta yeniden bağlansın mı?
+      description: "“%{account_name}”, yakın zamanda hareketi olmayan ve bakiyesi
+        sıfır olan “%{old_name}” hesabına bağlı. Aynı kurumda artık “%{new_name}”
+        adlı yeni bir kart etkin. Geçmişinizi korumak için yeniden bağlayın."
+      dismiss_aria: Değiştirme önerisini reddet
+      relink: Yeni karta yeniden bağla
+      title: "%{institution} kartınız değiştirilmiş olabilir"
+    select_existing_account:
+      all_accounts_already_linked: Tüm SimpleFIN hesapları zaten bağlı görünüyor.
+      cancel: İptal
+      currently_linked_to: 'Şu anda bağlı: %{account_name}'
+      description: Mevcut hesabınıza bağlamak için bir SimpleFIN hesabı seçin
+      link_account: Hesabı bağla
+      no_accounts_found: Bu %{moniker} için SimpleFIN hesabı bulunamadı.
+      title: "%{account_name} hesabını SimpleFIN'a bağla"
+      unlink_to_move: Bir bağlantıyı taşımak için önce onu hesabın eylem menüsünden
+        koparın.
+      wait_for_sync: Henüz bağladıysanız veya senkronize ettiyseniz, senkronizasyon
+        tamamlandıktan sonra tekrar deneyin.
+    setup_accounts:
+      account_card:
+        balance: Bakiye
+      account_type_checking_savings: Vadesiz veya Tasarruf
+      account_type_checking_savings_desc: Normal banka hesapları
+      account_type_credit_card: Kredi Kartı
+      account_type_credit_card_desc: Kredi kartı hesapları
+      account_type_investment: Yatırım
+      account_type_investment_desc: Aracılık, 401(k), IRA hesapları
+      account_type_label: 'Hesap Türü:'
+      account_type_loan: Kredi veya İpotek
+      account_type_loan_desc: Borç hesapları
+      account_type_other_asset: Diğer Varlık
+      account_type_other_asset_desc: Diğer her şey
+      activity:
+        days_ago:
+          one: 1 gün önce
+          other: "%{count} gün önce"
+        dormant: "%{days} gündür hareket yok"
+        empty: Henüz içe aktarılmış işlem yok
+        likely_closed: Yakın tarihli hareket yok ve bakiye sıfır — bu kapalı veya
+          değiştirilmiş bir kart olabilir
+        recent:
+          one: '1 işlem • son: %{when}'
+          other: "%{count} işlem • son: %{when}"
+        today: bugün
+        yesterday: dün
+      cancel: İptal
+      choose_account_type: 'Her SimpleFIN hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating_accounts: Hesaplar Oluşturuluyor...
+      header_subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      stale_accounts:
+        action_delete: Hesabı ve tüm işlemleri sil
+        action_move: 'İşlemleri şuraya taşı:'
+        action_prompt: Ne yapmak istersiniz?
+        action_skip: Şimdilik atla
+        description: Bu hesaplar veritabanınızda var ancak artık SimpleFIN tarafından
+          sağlanmıyor. Bu, hesap yapılandırmaları yukarı akışta değiştiğinde oluşabilir.
+        title: Artık SimpleFIN'da Olmayan Hesaplar
+        transaction_count:
+          one: "%{count} işlem"
+          other: "%{count} işlem"
+      title: SimpleFIN Hesaplarınızı Kurun
+      transaction_history_description_html: SimpleFIN genellikle bankanıza bağlı olarak
+        <strong>60-90 gün</strong> işlem geçmişi sağlar. İlk kurulumdan sonra yeni
+        işlemler ileriye dönük olarak otomatik senkronize edilir. Geçmiş veri kullanılabilirliği
+        kuruma ve hesap türüne göre değişir.
+      transaction_history_title: 'İşlem Geçmişi:'
+    simplefin_item:
+      accounts_skipped_label: 'Atlanan: %{count}'
+      accounts_skipped_tooltip: Senkronizasyon sırasındaki hatalar nedeniyle bazı
+        hesaplar atlandı
+      add_new: Yeni bağlantı ekle
+      confirm_accept: Bağlantıyı sil
+      confirm_body: Bu, bu gruptaki tüm hesapları ve tüm ilişkili verileri kalıcı
+        olarak siler.
+      confirm_title: SimpleFIN bağlantısı silinsin mi?
+      delete: Sil
+      deletion_in_progress: "(siliniyor...)"
+      duplicate_accounts_skipped: Bazı hesaplar yinelenen olarak atlandı — birleştirmek
+        için 'Mevcut hesapları bağla'yı kullanın.
+      error: Veriler senkronize edilirken hata oluştu
+      more_accounts_available:
+        one: "%{count} hesap daha kurulmaya hazır"
+        other: "%{count} hesap daha kurulmaya hazır"
+      no_accounts_description: Bu bağlantıda henüz senkronize edilmiş hesap yok.
+      no_accounts_title: Hesap bulunamadı
+      rate_limited_ago: Hız sınırı aşıldı (%{time} önce)
+      rate_limited_recently: Yakında hız sınırı aşıldı
+      reconciled_details_note: "(ayrıntılar için senkronizasyon özetine bakın)"
+      requires_update: Yeniden bağlan
+      setup_accounts_menu: Hesapları Kur
+      setup_action: Yeni Hesapları Kur
+      setup_description: Yeni içe aktarılan SimpleFIN hesaplarınız için hesap türlerini
+        seçin.
+      setup_needed: Yeni hesaplar kurulmaya hazır
+      stale_pending_accounts: 'şunlarda: %{accounts}'
+      stale_pending_note: "(bütçelerden hariç)"
+      status: "%{timestamp} önce senkronize edildi"
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: 'Son senkronizasyon: %{timestamp} önce • %{summary}'
+      syncing: Senkronize ediliyor...
+      update: Güncelle
+    stale_pending_status:
+      message:
+        one: "%{count} bekleyen işlem %{days} günden daha eski"
+        other: "%{count} bekleyen işlem %{days} günden daha eski"
+    update:
+      errors:
+        invalid_token: Geçersiz kurulum anahtarı. Lütfen anahtarı SimpleFIN Bridge'den
+          eksiksiz kopyaladığınızdan emin olun.
+        token_compromised: Kurulum anahtarı tehlikeye girmiş, süresi dolmuş veya zaten
+          kullanılmış olabilir. Lütfen yeni bir tane oluşturun.
+        unexpected: Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin.
diff --git a/config/locales/views/simplefin_items/update.fr.yml b/config/locales/views/simplefin_items/update.fr.yml
new file mode 100644
index 000000000..f008d6a24
--- /dev/null
+++ b/config/locales/views/simplefin_items/update.fr.yml
@@ -0,0 +1,7 @@
+fr:
+  simplefin_items:
+    update:
+      success: "Connexion SimpleFIN mise à jour avec succès ! Vos comptes sont en cours de reconnexion."
+      errors:
+        blank_token: "Veuillez entrer un jeton de configuration SimpleFIN."
+        update_failed: "Échec de la mise à jour de la connexion : %{message}"
diff --git a/config/locales/views/simplefin_items/update.tr.yml b/config/locales/views/simplefin_items/update.tr.yml
new file mode 100644
index 000000000..a8b90fa0e
--- /dev/null
+++ b/config/locales/views/simplefin_items/update.tr.yml
@@ -0,0 +1,9 @@
+---
+tr:
+  simplefin_items:
+    update:
+      errors:
+        blank_token: Eksik SimpleFIN erişim jetonu. Lütfen bir jeton sağlayın veya
+          devam etmek için Mevcut Hesapları Bağla'yı kullanın.
+        update_failed: 'SimpleFIN bağlantısı güncellenemedi: %{message}'
+      success: SimpleFIN bağlantısı güncellendi.
diff --git a/config/locales/views/simplefin_items/zh-CN.yml b/config/locales/views/simplefin_items/zh-CN.yml
index 65ca9fe27..66595ca9d 100644
--- a/config/locales/views/simplefin_items/zh-CN.yml
+++ b/config/locales/views/simplefin_items/zh-CN.yml
@@ -155,5 +155,5 @@ zh-CN:
         other: 已勾稽 %{count} 笔重复待处理交易
     stale_pending_status:
       message:
-        one: 1 笔待处理交易早于 %{days} 天
+        one: "%{count} 笔待处理交易早于 %{days} 天"
         other: "%{count} 笔待处理交易早于 %{days} 天"
diff --git a/config/locales/views/snaptrade_items/ca.yml b/config/locales/views/snaptrade_items/ca.yml
index d270af3cf..17df5f542 100644
--- a/config/locales/views/snaptrade_items/ca.yml
+++ b/config/locales/views/snaptrade_items/ca.yml
@@ -5,28 +5,17 @@ ca:
       accounts_count:
         one: "%{count} compte"
         other: "%{count} comptes"
-      client_id_label: Client ID
-      client_id_placeholder: Introdueix el teu Client ID de SnapTrade
-      client_id_update_placeholder: Introdueix un nou Client ID per actualitzar
       connect_button: Connecta un broker
       connected_brokerages: 'Connectats:'
       connection_description: Connecta't al teu broker a través de SnapTrade (25+
         brokers admesos)
       connections_error: 'No s''han pogut carregar les connexions: %{message}'
-      consumer_key_label: Consumer Key
-      consumer_key_placeholder: Introdueix la teva Consumer Key de SnapTrade
-      consumer_key_update_placeholder: Introdueix un nou Consumer Key per actualitzar
       delete_connection: Elimina
       delete_connection_body: Això eliminarà permanentment la connexió de %{brokerage}
         de SnapTrade. Tots els comptes d'aquest broker quedaran sense enllaçar. Hauràs
         de reconnectar per sincronitzar aquests comptes de nou.
       delete_connection_confirm: Elimina la connexió
       delete_connection_title: Vols eliminar la connexió amb el broker?
-      delete_orphaned_user: Elimina
-      delete_orphaned_user_body: Això eliminarà permanentment aquest usuari orfe de
-        SnapTrade i totes les seves connexions de broker, alliberant places de connexió.
-      delete_orphaned_user_confirm: Elimina el registre
-      delete_orphaned_user_title: Vols eliminar el registre orfe?
       description: SnapTrade connecta amb més de 25 brokers importants (Fidelity,
         Vanguard, Schwab, Robinhood, etc.) i proporciona l'historial complet d'operacions
         amb etiquetes d'activitat i cost base.
@@ -41,28 +30,11 @@ ca:
         other: "%{count} necessiten configuració"
       no_connections: No s'han trobat connexions de broker.
       orphaned_connection: Connexió orfe (no sincronitzada localment)
-      orphaned_user: Registre orfe
-      orphaned_users_description: Aquests són registres d'usuari de SnapTrade anteriors
-        que ocupen places de connexió. Elimina'ls per alliberar places.
-      orphaned_users_title:
-        one: "%{count} registre orfe"
-        other: "%{count} registres orfes"
-      save_button: Desa la configuració
       setup_accounts_button: Configura comptes
-      setup_title: 'Instruccions de configuració:'
       status_connected:
         one: "%{count} compte de SnapTrade"
         other: "%{count} comptes de SnapTrade"
-      status_needs_registration: Credencials desades. Finalitza la configuració per
-        connectar un broker.
       status_ready: Llest per connectar brokers
-      step_1_html: Crea un compte a <a href="https://dashboard.snaptrade.com" target="_blank"
-        rel="noopener noreferrer" class="text-primary underline">dashboard.snaptrade.com</a>
-      step_2: Copia el teu Client ID i Consumer Key des del panell
-      step_3: Introdueix les teves credencials a continuació i fes clic a Desa
-      step_4: Ves a la pàgina de comptes i utilitza 'Connecta un altre broker' per
-        enllaçar els teus comptes d'inversió
-      update_button: Actualitza la configuració
   snaptrade_item:
     brokerage_summary:
       count:
@@ -108,8 +80,6 @@ ca:
         aquesta connexió i torna-la a crear.
     connections:
       unknown_brokerage: Broker desconegut
-    create:
-      success: SnapTrade s'ha configurat correctament.
     default_name: Connexió SnapTrade
     delete_connection:
       api_deletion_failed: No s'ha pogut eliminar la connexió de SnapTrade — falten
@@ -117,13 +87,8 @@ ca:
       failed: 'No s''ha pogut eliminar la connexió: %{message}'
       missing_authorization_id: Falta l'ID d'autorització
       success: La connexió s'ha eliminat correctament. S'ha alliberat una plaça.
-    delete_orphaned_user:
-      failed: No s'ha pogut eliminar el registre orfe.
-      success: El registre orfe s'ha eliminat correctament.
     destroy:
       success: S'ha programat la connexió SnapTrade per a la seva eliminació.
-    link_accounts:
-      use_setup_flow: Utilitza en el seu lloc el flux de configuració de comptes
     link_existing_account:
       failed: 'No s''ha pogut enllaçar el compte: %{message}'
       not_found: No s'ha trobat el compte.
@@ -205,5 +170,3 @@ ca:
       status: Darrera sincronització fa %{timestamp} - %{summary}
       status_never: Mai sincronitzat
       syncing: Sincronitzant...
-    update:
-      success: La configuració de SnapTrade s'ha actualitzat correctament.
diff --git a/config/locales/views/snaptrade_items/de.yml b/config/locales/views/snaptrade_items/de.yml
index 6ab8c28cf..cf6a6775c 100644
--- a/config/locales/views/snaptrade_items/de.yml
+++ b/config/locales/views/snaptrade_items/de.yml
@@ -2,10 +2,6 @@
 de:
   snaptrade_items:
     default_name: "SnapTrade-Verbindung"
-    create:
-      success: "SnapTrade wurde erfolgreich eingerichtet."
-    update:
-      success: "SnapTrade-Konfiguration wurde erfolgreich aktualisiert."
     destroy:
       success: "SnapTrade-Verbindung wurde zur Löschung vorgemerkt."
     connect:
@@ -50,9 +46,6 @@ de:
       failed: "Löschen der Verbindung fehlgeschlagen: %{message}"
       missing_authorization_id: "Autorisierungs-ID fehlt"
       api_deletion_failed: "Verbindung konnte bei SnapTrade nicht gelöscht werden – Zugangsdaten fehlen. Die Verbindung kann in Ihrem SnapTrade-Konto noch existieren."
-    delete_orphaned_user:
-      success: "Verwaiste Registrierung wurde erfolgreich gelöscht."
-      failed: "Löschen der verwaisten Registrierung fehlgeschlagen."
     setup_accounts:
       title: "SnapTrade-Konten einrichten"
       header: "SnapTrade-Konten einrichten"
@@ -113,20 +106,7 @@ de:
       name: "SnapTrade"
       connection_description: "Verbinden Sie Ihren Broker über SnapTrade (25+ Broker unterstützt)"
       description: "SnapTrade verbindet mit 25+ großen Brokern (Fidelity, Vanguard, Schwab, Robinhood usw.) und liefert vollständige Handelshistorie mit Aktivitätslabels und Einstandskosten."
-      setup_title: "Einrichtungsanleitung:"
-      step_1_html: "Konto erstellen unter <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a>"
-      step_2: "Client ID und Consumer Key aus dem Dashboard kopieren"
-      step_3: "Zugangsdaten unten eintragen und auf Speichern klicken"
-      step_4: "Auf die Konten-Seite gehen und „Weiteren Broker verbinden“ nutzen, um Ihre Anlagekonten zu verknüpfen"
       free_tier_warning: "Free Tier enthält 5 Broker-Verbindungen. Weitere erfordern einen kostenpflichtigen SnapTrade-Plan."
-      client_id_label: "Client ID"
-      client_id_placeholder: "SnapTrade Client ID eingeben"
-      client_id_update_placeholder: "Neue Client ID zum Aktualisieren eingeben"
-      consumer_key_label: "Consumer Key"
-      consumer_key_placeholder: "SnapTrade Consumer Key eingeben"
-      consumer_key_update_placeholder: "Neuen Consumer Key zum Aktualisieren eingeben"
-      save_button: "Konfiguration speichern"
-      update_button: "Konfiguration aktualisieren"
       status_connected:
         one: "%{count} Konto von SnapTrade"
         other: "%{count} Konten von SnapTrade"
@@ -151,15 +131,6 @@ de:
       delete_connection_title: "Broker-Verbindung löschen?"
       delete_connection_body: "Die Verbindung zu %{brokerage} wird dauerhaft von SnapTrade entfernt. Alle Konten dieses Brokers werden getrennt. Zum erneuten Sync müssen Sie sich wieder verbinden."
       delete_connection_confirm: "Verbindung löschen"
-      orphaned_users_title:
-        one: "%{count} verwaiste Registrierung"
-        other: "%{count} verwaiste Registrierungen"
-      orphaned_users_description: "Das sind frühere SnapTrade-Registrierungen, die Ihre Verbindungsplätze belegen. Löschen Sie sie, um Plätze freizugeben."
-      orphaned_user: "Verwaiste Registrierung"
-      delete_orphaned_user: "Löschen"
-      delete_orphaned_user_title: "Verwaiste Registrierung löschen?"
-      delete_orphaned_user_body: "Diese verwaiste SnapTrade-Registrierung und alle zugehörigen Broker-Verbindungen werden dauerhaft gelöscht, Verbindungsplätze werden frei."
-      delete_orphaned_user_confirm: "Registrierung löschen"
 
   snaptrade_item:
     sync_status:
diff --git a/config/locales/views/snaptrade_items/en.yml b/config/locales/views/snaptrade_items/en.yml
index e601741cc..2922a53f0 100644
--- a/config/locales/views/snaptrade_items/en.yml
+++ b/config/locales/views/snaptrade_items/en.yml
@@ -1,12 +1,6 @@
 en:
   snaptrade_items:
     default_name: "SnapTrade Connection"
-    link_accounts:
-      use_setup_flow: Use the account setup flow instead
-    create:
-      success: "Successfully configured SnapTrade."
-    update:
-      success: "Successfully updated SnapTrade configuration."
     destroy:
       success: "Scheduled SnapTrade connection for deletion."
     connect:
@@ -28,6 +22,13 @@ en:
       not_configured: "SnapTrade is not configured."
     select_accounts:
       not_configured: "SnapTrade is not configured."
+    oauth_authorize:
+      not_configured: "SnapTrade OAuth is not configured. Set SNAPTRADE_OAUTH_CLIENT_ID and SNAPTRADE_OAUTH_CLIENT_SECRET, restart the app, then try again."
+    oauth_callback:
+      success: "SnapTrade authorization complete."
+      access_denied: "SnapTrade authorization was cancelled."
+      state_mismatch: "SnapTrade authorization failed a security check. Please try again."
+      failed: "Unable to complete SnapTrade authorization. Please try again."
     select_existing_account:
       not_found: "Account or SnapTrade configuration not found."
       title: "Link to SnapTrade Account"
@@ -50,10 +51,7 @@ en:
       success: "Connection deleted successfully. One slot freed up."
       failed: "Failed to delete connection: %{message}"
       missing_authorization_id: "Missing authorization ID"
-      api_deletion_failed: "Could not delete connection from SnapTrade - missing credentials. The connection may still exist in your SnapTrade account."
-    delete_orphaned_user:
-      success: "Orphaned registration deleted successfully."
-      failed: "Failed to delete orphaned registration."
+      api_deletion_failed: "Could not delete connection from SnapTrade - this item is not authorized. The connection may still exist in your SnapTrade account."
     setup_accounts:
       title: "Set Up SnapTrade Accounts"
       header: "Set Up Your SnapTrade Accounts"
@@ -67,7 +65,7 @@ en:
       info_cost_basis: "Cost basis per position (when available)"
       info_activities: "Trade history with activity labels (Buy, Sell, Dividend, etc.)"
       info_history: "Up to 3 years of transaction history"
-      free_tier_note: "SnapTrade free tier allows 5 brokerage connections. Check your SnapTrade dashboard for current usage."
+      free_tier_note: "SnapTrade free tier allows 20 brokerage connections."
       no_accounts_title: "No Accounts Found"
       no_accounts_message: "No brokerage accounts were found. This can happen if you cancelled the connection or if your brokerage isn't supported."
       try_again: "Connect Brokerage"
@@ -75,6 +73,14 @@ en:
       available_accounts: "Available Accounts"
       balance_label: "Balance:"
       account_number: "Account:"
+      account_type_label: "Account type"
+      account_types:
+        depository: "Checking or Savings Account"
+        credit_card: "Credit Card"
+        investment: "Investment Account"
+        crypto: "Crypto Account"
+        loan: "Loan or Line of Credit"
+        other_asset: "Other Asset"
       sync_start_date_label: "Import transactions from:"
       sync_start_date_help: "Leave blank for all available history"
       create_button: "Create Selected Accounts"
@@ -116,24 +122,18 @@ en:
       name: "SnapTrade"
       connection_description: "Connect to your brokerage via SnapTrade (25+ brokers supported)"
       description: "SnapTrade connects to 25+ major brokerages (Fidelity, Vanguard, Schwab, Robinhood, etc.) and provides full trade history with activity labels and cost basis."
-      setup_title: "Setup instructions:"
-      step_1_html: "Create an account at <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a>"
-      step_2: "Copy your Client ID and Consumer Key from the dashboard"
-      step_3: "Enter your credentials below and click Save"
-      step_4: "Go to the Accounts page and use 'Connect another brokerage' to link your investment accounts"
-      free_tier_warning: "SnapTrade's free tier covers 5 brokerage connections. Upgrade on SnapTrade for more."
-      client_id_label: "Client ID"
-      client_id_placeholder: "Enter your SnapTrade Client ID"
-      client_id_update_placeholder: "Enter new Client ID to update"
-      consumer_key_label: "Consumer Key"
-      consumer_key_placeholder: "Enter your SnapTrade Consumer Key"
-      consumer_key_update_placeholder: "Enter new Consumer Key to update"
-      save_button: "Save Configuration"
-      update_button: "Update Configuration"
+      oauth_setup_step_1_html: "Register an OAuth app at <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"underline\">dashboard.snaptrade.com</a>"
+      oauth_setup_step_2_html: "Add this app's callback URL (<code>%{callback_url}</code>) as a registered redirect URI"
+      oauth_setup_step_3: "Set SNAPTRADE_OAUTH_CLIENT_ID and SNAPTRADE_OAUTH_CLIENT_SECRET in your environment and restart"
+      free_tier_warning: "SnapTrade's free tier covers 20 brokerage connections."
+      oauth_title: "SnapTrade OAuth"
+      oauth_status_ready: "Authorize Sure to read your SnapTrade account data."
+      oauth_status_authorized: "Authorized with SnapTrade."
+      oauth_connect_button: "Connect with SnapTrade"
+      oauth_reauthorize_button: "Reauthorize"
       status_connected:
         one: "%{count} account from SnapTrade"
         other: "%{count} accounts from SnapTrade"
-      status_needs_registration: "Credentials saved. Finish setup to connect a brokerage."
       needs_setup:
         one: "%{count} needs setup"
         other: "%{count} need setup"
@@ -154,15 +154,7 @@ en:
       delete_connection_title: "Delete Brokerage Connection?"
       delete_connection_body: "This will permanently remove the %{brokerage} connection from SnapTrade. All accounts from this brokerage will be unlinked. You'll need to reconnect to sync these accounts again."
       delete_connection_confirm: "Delete Connection"
-      orphaned_users_title:
-        one: "%{count} orphaned registration"
-        other: "%{count} orphaned registrations"
-      orphaned_users_description: "These are previous SnapTrade user registrations that are using your connection slots. Delete them to free up slots."
-      orphaned_user: "Orphaned Registration"
-      delete_orphaned_user: "Delete"
-      delete_orphaned_user_title: "Delete Orphaned Registration?"
-      delete_orphaned_user_body: "This will permanently delete this orphaned SnapTrade user and all their brokerage connections, freeing up connection slots."
-      delete_orphaned_user_confirm: "Delete Registration"
+      manage_at_snaptrade: "Manage connections at SnapTrade"
 
   snaptrade_item:
     sync_status:
diff --git a/config/locales/views/snaptrade_items/es.yml b/config/locales/views/snaptrade_items/es.yml
index db087fff9..333fc10d2 100644
--- a/config/locales/views/snaptrade_items/es.yml
+++ b/config/locales/views/snaptrade_items/es.yml
@@ -2,10 +2,6 @@
 es:
   snaptrade_items:
     default_name: "Conexión de SnapTrade"
-    create:
-      success: "SnapTrade configurado correctamente."
-    update:
-      success: "Configuración de SnapTrade actualizada correctamente."
     destroy:
       success: "Conexión de SnapTrade programada para su eliminación."
     connect:
@@ -50,9 +46,6 @@ es:
       failed: "Error al eliminar la conexión: %{message}"
       missing_authorization_id: "Falta el ID de autorización"
       api_deletion_failed: "No se pudo eliminar la conexión de SnapTrade por falta de credenciales. Es posible que la conexión aún exista en tu cuenta de SnapTrade."
-    delete_orphaned_user:
-      success: "Registro huérfano eliminado correctamente."
-      failed: "Error al eliminar el registro huérfano."
     setup_accounts:
       title: "Configurar cuentas de SnapTrade"
       header: "Configura tus cuentas de SnapTrade"
@@ -113,20 +106,7 @@ es:
       name: "SnapTrade"
       connection_description: "Conecta con tu bróker a través de SnapTrade (más de 25 brókers compatibles)"
       description: "SnapTrade conecta con más de 25 brókers principales (Fidelity, Vanguard, Schwab, Robinhood, etc.) y proporciona un historial completo de operaciones con etiquetas de actividad y base de costes."
-      setup_title: "Instrucciones de configuración:"
-      step_1_html: "Crea una cuenta en <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a>"
-      step_2: "Copia tu Client ID y tu Consumer Key desde el panel"
-      step_3: "Introduce tus credenciales a continuación y haz clic en Guardar"
-      step_4: "Ve a la página de Cuentas y usa 'Conectar otro bróker' para vincular tus cuentas de inversión"
       free_tier_warning: "El nivel gratuito incluye 5 conexiones de bróker. Las conexiones adicionales requieren un plan de pago de SnapTrade."
-      client_id_label: "Client ID"
-      client_id_placeholder: "Introduce tu Client ID de SnapTrade"
-      client_id_update_placeholder: "Introduce el nuevo Client ID para actualizar"
-      consumer_key_label: "Consumer Key"
-      consumer_key_placeholder: "Introduce tu Consumer Key de SnapTrade"
-      consumer_key_update_placeholder: "Introduce la nueva Consumer Key para actualizar"
-      save_button: "Guardar configuración"
-      update_button: "Actualizar configuración"
       status_connected:
         one: "%{count} cuenta de SnapTrade"
         other: "%{count} cuentas de SnapTrade"
@@ -151,15 +131,6 @@ es:
       delete_connection_title: "¿Eliminar conexión del bróker?"
       delete_connection_body: "Esto eliminará permanentemente la conexión de %{brokerage} de SnapTrade. Todas las cuentas de este bróker se desvincularán. Deberás volver a conectar para sincronizar estas cuentas de nuevo."
       delete_connection_confirm: "Eliminar conexión"
-      orphaned_users_title:
-        one: "%{count} registro huérfano"
-        other: "%{count} registros huérfanos"
-      orphaned_users_description: "Estos son registros de usuario de SnapTrade anteriores que están ocupando tus espacios de conexión. Elimínalos para liberar espacio."
-      orphaned_user: "Registro huérfano"
-      delete_orphaned_user: "Eliminar"
-      delete_orphaned_user_title: "¿Eliminar registro huérfano?"
-      delete_orphaned_user_body: "Esto eliminará permanentemente este usuario de SnapTrade huérfano y todas sus conexiones de bróker, liberando espacios de conexión."
-      delete_orphaned_user_confirm: "Eliminar registro"
 
   snaptrade_item:
     sync_status:
diff --git a/config/locales/views/snaptrade_items/fr.yml b/config/locales/views/snaptrade_items/fr.yml
index 65183408e..8b9335060 100644
--- a/config/locales/views/snaptrade_items/fr.yml
+++ b/config/locales/views/snaptrade_items/fr.yml
@@ -1,188 +1,164 @@
 ---
 fr:
-  snaptrade_items:
-    default_name: "Connexion SnapTrade"
-    create:
-      success: "Configuration SnapTrade réussie."
-    update:
-      success: "Configuration SnapTrade mise à jour."
-    destroy:
-      success: "Connexion SnapTrade mise en file d'attente pour suppression."
-    connect:
-      decryption_failed: "Impossible de lire les identifiants SnapTrade. Veuillez supprimer et recréer cette connexion."
-      connection_failed: "Échec de la connexion à SnapTrade : %{message}"
-    callback:
-      success: "Courtier connecté. Veuillez sélectionner les comptes à lier."
-      no_item: "Configuration SnapTrade introuvable."
-    complete_account_setup:
-      success:
-        one: "%{count} compte lié avec succès."
-        other: "%{count} comptes liés avec succès."
-      partial_success:
-        one: "%{count} compte lié. Échec de la liaison de %{failed_count}."
-        other: "%{count} comptes liés. Échec de la liaison de %{failed_count}."
-      link_failed: "Échec de la liaison des comptes : %{errors}"
-      no_accounts: "Aucun compte n'a été sélectionné pour la liaison."
-    preload_accounts:
-      not_configured: "SnapTrade n'est pas configuré."
-    select_accounts:
-      not_configured: "SnapTrade n'est pas configuré."
-    select_existing_account:
-      not_found: "Compte ou configuration SnapTrade introuvable."
-      title: "Lier à un compte SnapTrade"
-      header: "Lier un compte existant"
-      subtitle: "Sélectionnez un compte SnapTrade à lier"
-      no_accounts: "Aucun compte SnapTrade non lié disponible."
-      connect_hint: "Vous devrez peut-être d'abord connecter un courtier."
-      settings_link: "Aller aux paramètres du fournisseur"
-      linking_to: "Liaison au compte :"
-      balance_label: "Solde :"
-      link_button: "Lier"
-      cancel_button: "Annuler"
-    link_existing_account:
-      success: "Compte SnapTrade lié avec succès."
-      failed: "Échec de la liaison du compte : %{message}"
-      not_found: "Compte introuvable."
-    connections:
-      unknown_brokerage: "Courtier inconnu"
-    delete_connection:
-      success: "Connexion supprimée avec succès. Un emplacement libéré."
-      failed: "Échec de la suppression de la connexion : %{message}"
-      missing_authorization_id: "Identifiant d'autorisation manquant"
-      api_deletion_failed: "Impossible de supprimer la connexion de SnapTrade - identifiants manquants. La connexion peut toujours exister dans votre compte SnapTrade."
-    delete_orphaned_user:
-      success: "Enregistrement orphelin supprimé avec succès."
-      failed: "Échec de la suppression de l'enregistrement orphelin."
-    setup_accounts:
-      title: "Configurer les comptes SnapTrade"
-      header: "Configurer vos comptes SnapTrade"
-      subtitle: "Sélectionnez les comptes de courtage à lier"
-      syncing: "Récupération de vos comptes…"
-      loading: "Récupération des comptes depuis SnapTrade…"
-      loading_hint: "Cliquez sur Actualiser pour vérifier les comptes."
-      refresh: "Actualiser"
-      info_title: "Données d'investissement SnapTrade"
-      info_holdings: "Avoirs avec prix actuels et quantités"
-      info_cost_basis: "Coût d'acquisition par position (lorsque disponible)"
-      info_activities: "Historique des transactions boursières avec libellés d'activité (Achat, Vente, Dividende, etc.)"
-      info_history: "Jusqu'à 3 ans d'historique des transactions"
-      free_tier_note: "L'offre gratuite SnapTrade autorise 5 connexions de courtier. Consultez votre tableau de bord SnapTrade pour l'utilisation actuelle."
-      no_accounts_title: "Aucun compte trouvé"
-      no_accounts_message: "Aucun compte de courtage n'a été trouvé. Cela peut se produire si vous avez annulé la connexion ou si votre courtier n'est pas pris en charge."
-      try_again: "Connecter un courtier"
-      back_to_settings: "Retour aux paramètres"
-      available_accounts: "Comptes disponibles"
-      balance_label: "Solde :"
-      account_number: "Compte :"
-      create_button: "Créer les comptes sélectionnés"
-      cancel_button: "Annuler"
-      creating: "Création des comptes…"
-      done_button: "Terminé"
-      or_link_existing: "Ou liez à un compte existant au lieu d'en créer un nouveau :"
-      select_account: "Sélectionnez un compte…"
-      link_button: "Lier"
-      linked_accounts: "Déjà liés"
-      linked_to: "Lié à :"
-    snaptrade_item:
-      accounts_need_setup:
-        one: "%{count} compte à configurer"
-        other: "%{count} comptes à configurer"
-      deletion_in_progress: "Suppression en cours…"
-      syncing: "Synchronisation…"
-      requires_update: "Connexion à mettre à jour"
-      error: "Erreur de synchronisation"
-      status: "Dernière synchronisation il y a %{timestamp} - %{summary}"
-      status_never: "Jamais synchronisé"
-      reconnect: "Reconnecter"
-      connect_brokerage: "Connecter un courtier"
-      add_another_brokerage: "Connecter un autre courtier"
-      delete: "Supprimer"
-      setup_needed: "Comptes à configurer"
-      setup_description: "Certains comptes de SnapTrade doivent être liés à des comptes Sure."
-      setup_action: "Configurer les comptes"
-      setup_accounts_menu: "Configurer les comptes"
-      manage_connections: "Gérer les connexions"
-      more_accounts_available:
-        one: "%{count} compte supplémentaire disponible à configurer"
-        other: "%{count} comptes supplémentaires disponibles à configurer"
-      no_accounts_title: "Aucun compte découvert"
-      no_accounts_description: "Connectez un courtier pour importer vos comptes d'investissement."
-
   providers:
     snaptrade:
-      name: "SnapTrade"
-      connection_description: "Connectez-vous à votre courtier via SnapTrade (plus de 25 courtiers pris en charge)"
-      description: "SnapTrade se connecte à plus de 25 courtiers majeurs (Fidelity, Vanguard, Schwab, Robinhood, etc.) et fournit l'historique complet des transactions avec des libellés d'activité et le coût d'acquisition."
-      setup_title: "Instructions de configuration :"
-      step_1_html: "Créez un compte sur <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a>"
-      step_2: "Copiez votre Client ID et votre Consumer Key depuis le tableau de bord"
-      step_3: "Saisissez vos identifiants ci-dessous et cliquez sur Enregistrer"
-      step_4: "Rendez-vous sur la page Comptes et utilisez « Connecter un autre courtier » pour lier vos comptes d'investissement"
-      free_tier_warning: "L'offre gratuite inclut 5 connexions de courtier. Les connexions supplémentaires nécessitent un forfait SnapTrade payant."
-      client_id_label: "Client ID"
-      client_id_placeholder: "Saisissez votre Client ID SnapTrade"
-      client_id_update_placeholder: "Saisissez un nouveau Client ID pour mettre à jour"
-      consumer_key_label: "Consumer Key"
-      consumer_key_placeholder: "Saisissez votre Consumer Key SnapTrade"
-      consumer_key_update_placeholder: "Saisissez une nouvelle Consumer Key pour mettre à jour"
-      save_button: "Enregistrer la configuration"
-      update_button: "Mettre à jour la configuration"
-      status_connected:
-        one: "%{count} compte depuis SnapTrade"
-        other: "%{count} comptes depuis SnapTrade"
-      needs_setup:
-        one: "%{count} à configurer"
-        other: "%{count} à configurer"
-      status_ready: "Prêt à connecter des courtiers"
-      setup_accounts_button: "Configurer les comptes"
-      connect_button: "Connecter un courtier"
-      connected_brokerages: "Connectés :"
-      manage_connections: "Gérer les connexions"
-      connection_limit_info: "L'offre gratuite SnapTrade autorise 5 connexions de courtier. Supprimez les connexions inutilisées pour libérer des emplacements."
-      loading_connections: "Chargement des connexions…"
-      connections_error: "Échec du chargement des connexions : %{message}"
       accounts_count:
         one: "%{count} compte"
         other: "%{count} comptes"
-      orphaned_connection: "Connexion orpheline (non synchronisée localement)"
-      needs_linking: "à lier"
-      no_connections: "Aucune connexion de courtier trouvée."
-      delete_connection: "Supprimer"
-      delete_connection_title: "Supprimer la connexion de courtier ?"
-      delete_connection_body: "Cela supprimera définitivement la connexion %{brokerage} de SnapTrade. Tous les comptes de ce courtier seront déliés. Vous devrez vous reconnecter pour synchroniser à nouveau ces comptes."
-      delete_connection_confirm: "Supprimer la connexion"
-      orphaned_users_title:
-        one: "%{count} enregistrement orphelin"
-        other: "%{count} enregistrements orphelins"
-      orphaned_users_description: "Il s'agit d'anciens enregistrements d'utilisateurs SnapTrade qui occupent vos emplacements de connexion. Supprimez-les pour libérer des emplacements."
-      orphaned_user: "Enregistrement orphelin"
-      delete_orphaned_user: "Supprimer"
-      delete_orphaned_user_title: "Supprimer l'enregistrement orphelin ?"
-      delete_orphaned_user_body: "Cela supprimera définitivement cet utilisateur SnapTrade orphelin et toutes ses connexions de courtier, libérant ainsi des emplacements de connexion."
-      delete_orphaned_user_confirm: "Supprimer l'enregistrement"
-
+      connect_button: Connecter un courtier
+      connected_brokerages: 'Connectés :'
+      connection_description: Connectez-vous à votre courtier via SnapTrade (plus de 25 courtiers pris en charge)
+      connection_limit_info: L'offre gratuite SnapTrade autorise 5 connexions de courtier. Supprimez les connexions inutilisées pour libérer des emplacements.
+      connections_error: 'Échec du chargement des connexions : %{message}'
+      delete_connection: Supprimer
+      delete_connection_body: Cela supprimera définitivement la connexion %{brokerage} de SnapTrade. Tous les comptes de ce courtier seront déliés. Vous devrez vous reconnecter pour synchroniser à nouveau ces comptes.
+      delete_connection_confirm: Supprimer la connexion
+      delete_connection_title: Supprimer la connexion de courtier ?
+      description: SnapTrade se connecte à plus de 25 courtiers majeurs (Fidelity, Vanguard, Schwab, Robinhood, etc.) et fournit l'historique complet des transactions avec des libellés d'activité et le coût d'acquisition.
+      free_tier_warning: L'offre gratuite inclut 5 connexions de courtier. Les connexions supplémentaires nécessitent un forfait SnapTrade payant.
+      loading_connections: Chargement des connexions…
+      manage_connections: Gérer les connexions
+      name: SnapTrade
+      needs_linking: à lier
+      needs_setup:
+        one: "%{count} à configurer"
+        other: "%{count} à configurer"
+      no_connections: Aucune connexion de courtier trouvée.
+      oauth_connect_button: Se connecter avec SnapTrade
+      oauth_reauthorize_button: Réautoriser
+      oauth_status_authorized: Autorisé avec SnapTrade.
+      oauth_status_ready: Utilisez un code d'appareil pour autoriser Sure pour SnapTrade.
+      oauth_title: SnapTrade OAuth
+      orphaned_connection: Connexion orpheline (non synchronisée localement)
+      setup_accounts_button: Configurer les comptes
+      status_connected:
+        one: "%{count} compte depuis SnapTrade"
+        other: "%{count} comptes depuis SnapTrade"
+      status_ready: Prêt à connecter des courtiers
   snaptrade_item:
+    brokerage_summary:
+      count:
+        one: "%{count} courtier"
+        other: "%{count} courtiers"
+      none: Aucun courtier connecté
+    institution_summary:
+      count:
+        one: "%{count} institution"
+        other: "%{count} institutions"
+      none: Aucune institution connectée
     sync_status:
-      no_accounts: "Aucun compte trouvé"
+      no_accounts: Aucun compte trouvé
       synced:
         one: "%{count} compte synchronisé"
         other: "%{count} comptes synchronisés"
       synced_with_setup: "%{linked} synchronisé(s), %{unlinked} à configurer"
-    institution_summary:
-      none: "Aucune institution connectée"
-      count:
-        one: "%{count} institution"
-        other: "%{count} institutions"
-    brokerage_summary:
-      none: "Aucun courtier connecté"
-      count:
-        one: "%{count} courtier"
-        other: "%{count} courtiers"
     syncer:
-      discovering: "Découverte des comptes…"
-      importing: "Importation des comptes depuis SnapTrade…"
-      processing: "Traitement des avoirs et des activités…"
-      calculating: "Calcul des soldes…"
-      checking_config: "Vérification de la configuration du compte…"
+      activities_fetching_async: Les activités sont récupérées en arrière-plan. Cela peut prendre jusqu'à une minute pour les nouvelles connexions de courtier.
+      calculating: Calcul des soldes…
+      checking_config: Vérification de la configuration du compte…
+      discovering: Découverte des comptes…
+      importing: Importation des comptes depuis SnapTrade…
       needs_setup: "%{count} comptes à configurer…"
-      activities_fetching_async: "Les activités sont récupérées en arrière-plan. Cela peut prendre jusqu'à une minute pour les nouvelles connexions de courtier."
+      processing: Traitement des holdings et des activités…
+  snaptrade_items:
+    callback:
+      no_item: Configuration SnapTrade introuvable.
+      success: Courtier connecté. Veuillez sélectionner les comptes à lier.
+    complete_account_setup:
+      link_failed: 'Échec de la liaison des comptes : %{errors}'
+      no_accounts: Aucun compte n'a été sélectionné pour la liaison.
+      partial_success:
+        one: "%{count} compte lié. Échec de la liaison de %{failed_count}."
+        other: "%{count} comptes liés. Échec de la liaison de %{failed_count}."
+      success:
+        one: "%{count} compte lié avec succès."
+        other: "%{count} comptes liés avec succès."
+    connect:
+      connection_failed: 'Échec de la connexion à SnapTrade : %{message}'
+      decryption_failed: Impossible de lire les identifiants SnapTrade. Veuillez supprimer et recréer cette connexion.
+    connections:
+      unknown_brokerage: Courtier inconnu
+    default_name: Connexion SnapTrade
+    delete_connection:
+      api_deletion_failed: Impossible de supprimer la connexion de SnapTrade - identifiants manquants. La connexion peut toujours exister dans votre compte SnapTrade.
+      failed: 'Échec de la suppression de la connexion : %{message}'
+      missing_authorization_id: Identifiant d'autorisation manquant
+      success: Connexion supprimée avec succès. Un emplacement libéré.
+    destroy:
+      success: Connexion SnapTrade mise en file d'attente pour suppression.
+    link_existing_account:
+      failed: 'Échec de la liaison du compte : %{message}'
+      not_found: Compte introuvable.
+      success: Compte SnapTrade lié avec succès.
+    preload_accounts:
+      not_configured: SnapTrade n'est pas configuré.
+    select_accounts:
+      not_configured: SnapTrade n'est pas configuré.
+    select_existing_account:
+      balance_label: 'Solde :'
+      cancel_button: Annuler
+      connect_hint: Vous devrez peut-être d'abord connecter un courtier.
+      header: Lier un compte existant
+      link_button: Lier
+      linking_to: 'Liaison au compte :'
+      no_accounts: Aucun compte SnapTrade non lié disponible.
+      not_found: Compte ou configuration SnapTrade introuvable.
+      settings_link: Aller aux paramètres du fournisseur
+      subtitle: Sélectionnez un compte SnapTrade à lier
+      title: Lier à un compte SnapTrade
+    setup_accounts:
+      account_number: 'Compte :'
+      available_accounts: Comptes disponibles
+      back_to_settings: Retour aux paramètres
+      balance_label: 'Solde :'
+      cancel_button: Annuler
+      create_button: Créer les comptes sélectionnés
+      creating: Création des comptes…
+      done_button: Terminé
+      free_tier_note: L'offre gratuite SnapTrade autorise 5 connexions de courtier. Consultez votre tableau de bord SnapTrade pour l'utilisation actuelle.
+      header: Configurer vos comptes SnapTrade
+      info_activities: Historique des transactions boursières avec libellés d'activité (Achat, Vente, Dividende, etc.)
+      info_cost_basis: Coût d'acquisition par position (lorsque disponible)
+      info_history: Jusqu'à 3 ans d'historique des transactions
+      info_holdings: Holdings avec prix actuels et quantités
+      info_title: Données d'investissement SnapTrade
+      link_button: Lier
+      linked_accounts: Déjà liés
+      linked_to: 'Lié à :'
+      loading: Récupération des comptes depuis SnapTrade…
+      loading_hint: Cliquez sur Actualiser pour vérifier les comptes.
+      no_accounts_message: Aucun compte de courtage n'a été trouvé. Cela peut se produire si vous avez annulé la connexion ou si votre courtier n'est pas pris en charge.
+      no_accounts_title: Aucun compte trouvé
+      or_link_existing: 'Ou liez à un compte existant au lieu d''en créer un nouveau :'
+      refresh: Actualiser
+      select_account: Sélectionnez un compte…
+      subtitle: Sélectionnez les comptes de courtage à lier
+      sync_start_date_help: Laisser vide pour tout l'historique disponible
+      sync_start_date_label: 'Importer des transactions depuis :'
+      syncing: Récupération de vos comptes…
+      title: Configurer les comptes SnapTrade
+      try_again: Connecter un courtier
+    snaptrade_item:
+      accounts_need_setup:
+        one: "%{count} compte à configurer"
+        other: "%{count} comptes à configurer"
+      add_another_brokerage: Connecter un autre courtier
+      connect_brokerage: Connecter un courtier
+      delete: Supprimer
+      deletion_in_progress: Suppression en cours…
+      error: Erreur de synchronisation
+      manage_connections: Gérer les connexions
+      more_accounts_available:
+        one: "%{count} compte supplémentaire disponible à configurer"
+        other: "%{count} comptes supplémentaires disponibles à configurer"
+      no_accounts_description: Connectez un courtier pour importer vos comptes d'investissement.
+      no_accounts_title: Aucun compte découvert
+      reconnect: Reconnecter
+      requires_update: Connexion à mettre à jour
+      setup_accounts_menu: Configurer les comptes
+      setup_action: Configurer les comptes
+      setup_description: Certains comptes de SnapTrade doivent être liés à des comptes Sure.
+      setup_needed: Comptes à configurer
+      status: Dernière synchronisation il y a %{timestamp} - %{summary}
+      status_never: Jamais synchronisé
+      syncing: Synchronisation…
diff --git a/config/locales/views/snaptrade_items/hu.yml b/config/locales/views/snaptrade_items/hu.yml
index dab3d05ce..d8799bdae 100644
--- a/config/locales/views/snaptrade_items/hu.yml
+++ b/config/locales/views/snaptrade_items/hu.yml
@@ -2,12 +2,6 @@
 hu:
   snaptrade_items:
     default_name: "SnapTrade kapcsolat"
-    link_accounts:
-      use_setup_flow: Használd helyette a számlabeállítási folyamatot
-    create:
-      success: "SnapTrade sikeresen beállítva."
-    update:
-      success: "SnapTrade konfiguráció sikeresen frissítve."
     destroy:
       success: "SnapTrade kapcsolat törlése ütemezve."
     connect:
@@ -52,9 +46,6 @@ hu:
       failed: "Nem sikerült törölni a kapcsolatot: %{message}"
       missing_authorization_id: "Hiányzó engedélyezési azonosító"
       api_deletion_failed: "Nem sikerült törölni a kapcsolatot a SnapTrade-ből — hiányzó hitelesítő adatok. A kapcsolat még mindig létezhet a SnapTrade fiókodon."
-    delete_orphaned_user:
-      success: "Árva regisztráció sikeresen törölve."
-      failed: "Nem sikerült törölni az árva regisztrációt."
     setup_accounts:
       title: "SnapTrade számlák beállítása"
       header: "SnapTrade számlák beállítása"
@@ -117,27 +108,13 @@ hu:
       name: "SnapTrade"
       connection_description: "Csatlakozás a brókereidhez a SnapTrade-en keresztül (25+ bróker támogatott)"
       description: "A SnapTrade 25+ nagyobb brókercéghez csatlakozik (Fidelity, Vanguard, Schwab, Robinhood stb.), és teljes kereskedési előzményeket biztosít tevékenységcímkékkel és bekerülési értékkel."
-      setup_title: "Beállítási utasítások:"
-      step_1_html: "Hozz létre fiókot a <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a> oldalon"
-      step_2: "Másold ki az Ügyfél-azonosítót és a Fogyasztói kulcsot az irányítópultból"
-      step_3: "Add meg a hitelesítő adatokat alább, majd kattints a Mentésre"
-      step_4: "Menj a Számlák oldalra, és az 'Másik brókercég csatlakoztatása' opcióval kapcsold össze a befektetési számláidat"
       free_tier_warning: "Az ingyenes szint 5 bróker kapcsolatot tartalmaz. További kapcsolatokhoz fizetős SnapTrade előfizetés szükséges."
-      client_id_label: "Ügyfél-azonosító"
-      client_id_placeholder: "Add meg a SnapTrade ügyfél-azonosítódat"
-      client_id_update_placeholder: "Add meg az új ügyfél-azonosítót a frissítéshez"
-      consumer_key_label: "Fogyasztói kulcs"
-      consumer_key_placeholder: "Add meg a SnapTrade fogyasztói kulcsodat"
-      consumer_key_update_placeholder: "Add meg az új fogyasztói kulcsot a frissítéshez"
-      save_button: "Konfiguráció mentése"
-      update_button: "Konfiguráció frissítése"
       status_connected:
         one: "%{count} számla a SnapTrade-ből"
         other: "%{count} számla a SnapTrade-ből"
       needs_setup:
         one: "%{count} beállítást igényel"
         other: "%{count} beállítást igényel"
-      status_needs_registration: "Hitelesítő adatok elmentve. Fejezd be a beállítást egy brókercég csatlakoztatásához."
       status_ready: "Készen áll brókercégek csatlakoztatásához"
       setup_accounts_button: "Számlák beállítása"
       connect_button: "Brókercég csatlakoztatása"
@@ -156,15 +133,6 @@ hu:
       delete_connection_title: "Brókeri kapcsolat törlése?"
       delete_connection_body: "Ez véglegesen eltávolítja a(z) %{brokerage} kapcsolatot a SnapTrade-ből. Az ehhez a brókercéghez tartozó összes számla szétkapcsolásra kerül. A számlák újbóli szinkronizálásához újra kell csatlakoznod."
       delete_connection_confirm: "Kapcsolat törlése"
-      orphaned_users_title:
-        one: "%{count} árva regisztráció"
-        other: "%{count} árva regisztráció"
-      orphaned_users_description: "Ezek korábbi SnapTrade felhasználói regisztrációk, amelyek a kapcsolati helyeidet foglalják. Töröl őket a helyek felszabadításához."
-      orphaned_user: "Árva regisztráció"
-      delete_orphaned_user: "Törlés"
-      delete_orphaned_user_title: "Árva regisztráció törlése?"
-      delete_orphaned_user_body: "Ez véglegesen törli ezt az árva SnapTrade felhasználót és az összes brókeri kapcsolatát, felszabadítva a kapcsolati helyeket."
-      delete_orphaned_user_confirm: "Regisztráció törlése"
 
   snaptrade_item:
     sync_status:
diff --git a/config/locales/views/snaptrade_items/it.yml b/config/locales/views/snaptrade_items/it.yml
new file mode 100644
index 000000000..293f625f9
--- /dev/null
+++ b/config/locales/views/snaptrade_items/it.yml
@@ -0,0 +1,214 @@
+---
+it:
+  snaptrade_items:
+    default_name: "Connessione SnapTrade"
+    link_accounts:
+      use_setup_flow: Usa il flusso di configurazione account
+    create:
+      success: "SnapTrade configurato con successo."
+    update:
+      success: "Configurazione SnapTrade aggiornata con successo."
+    destroy:
+      success: "Connessione SnapTrade pianificata per l'eliminazione."
+    connect:
+      decryption_failed: "Impossibile leggere le credenziali SnapTrade. Elimina e ricrea questa connessione."
+      connection_failed: "Connessione a SnapTrade fallita: %{message}"
+    callback:
+      success: "Brokerage connesso! Seleziona quali conti collegare."
+      no_item: "Configurazione SnapTrade non trovata."
+    complete_account_setup:
+      success:
+        one: "Collegato con successo %{count} conto."
+        other: "Collegati con successo %{count} conti."
+      partial_success:
+        one: "Collegato %{count} conto. %{failed_count} non è riuscito a collegarsi."
+        other: "Collegati %{count} conti. %{failed_count} non sono riusciti a collegarsi."
+      link_failed: "Collegamento conti fallito: %{errors}"
+      no_accounts: "Nessun conto è stato selezionato per il collegamento."
+    preload_accounts:
+      not_configured: "SnapTrade non è configurato."
+    select_accounts:
+      not_configured: "SnapTrade non è configurato."
+    oauth_device_flow:
+      title: "Connetti SnapTrade"
+      subtitle: "Autorizza Sure per SnapTrade"
+      instructions: "Apri SnapTrade e conferma questo codice dispositivo, poi torna qui per completare l'autorizzazione."
+      code_label: "Codice dispositivo"
+      open_snaptrade: "Apri SnapTrade"
+      start_button: "Avvia autorizzazione"
+      complete_button: "Ho autorizzato SnapTrade"
+      cancel_button: "Annulla"
+      missing_client_id: "Il Client ID OAuth di SnapTrade non è configurato. Aggiungi SNAPTRADE_OAUTH_CLIENT_ID a .env.local, riavvia l'app, poi riprova."
+    complete_oauth_device_flow:
+      success: "Autorizzazione SnapTrade completata."
+      setup_incomplete: "L'autorizzazione SnapTrade è completa, ma sono necessarie le credenziali API prima che i conti possano sincronizzarsi."
+      failed: "Impossibile completare l'autorizzazione del dispositivo OAuth SnapTrade. Riprova."
+    start_oauth_device_flow:
+      failed: "Impossibile avviare l'autorizzazione del dispositivo OAuth SnapTrade. Riprova."
+    select_existing_account:
+      not_found: "Conto o configurazione SnapTrade non trovati."
+      title: "Collega conto SnapTrade"
+      header: "Collega conto esistente"
+      subtitle: "Seleziona un conto SnapTrade da collegare"
+      no_accounts: "Nessun conto SnapTrade disponibile per il collegamento."
+      connect_hint: "Potrebbe essere necessario connettere prima un brokerage."
+      settings_link: "Vai alle Impostazioni provider"
+      linking_to: "Collegamento al conto:"
+      balance_label: "Saldo:"
+      link_button: "Collega"
+      cancel_button: "Annulla"
+    link_existing_account:
+      success: "Collegato con successo al conto SnapTrade."
+      failed: "Collegamento conto fallito: %{message}"
+      not_found: "Conto non trovato."
+    connections:
+      unknown_brokerage: "Brokerage sconosciuto"
+    delete_connection:
+      success: "Connessione eliminata con successo. Uno slot liberato."
+      failed: "Eliminazione connessione fallita: %{message}"
+      missing_authorization_id: "ID autorizzazione mancante"
+      api_deletion_failed: "Impossibile eliminare la connessione da SnapTrade - credenziali mancanti. La connessione potrebbe esistere ancora nel tuo account SnapTrade."
+    delete_orphaned_user:
+      success: "Registrazione orfana eliminata con successo."
+      failed: "Eliminazione registrazione orfana fallita."
+    setup_accounts:
+      title: "Configura conti SnapTrade"
+      header: "Configura i tuoi conti SnapTrade"
+      subtitle: "Seleziona quali conti brokerage collegare"
+      syncing: "Recupero dei tuoi conti..."
+      loading: "Recupero conti da SnapTrade..."
+      loading_hint: "Clicca Aggiorna per controllare i conti."
+      refresh: "Aggiorna"
+      info_title: "Dati investimento SnapTrade"
+      info_holdings: "Posizioni con prezzi e quantità correnti"
+      info_cost_basis: "Costo base per posizione (quando disponibile)"
+      info_activities: "Cronologia movimenti con etichette attività (Acquisto, Vendita, Dividendo, ecc.)"
+      info_history: "Fino a 3 anni di cronologia transazioni"
+      free_tier_note: "Il piano gratuito SnapTrade consente 20 connessioni brokerage."
+      no_accounts_title: "Nessun conto trovato"
+      no_accounts_message: "Nessun conto brokerage trovato. Questo può succedere se hai annullato la connessione o se il tuo brokerage non è supportato."
+      try_again: "Connetti Brokerage"
+      back_to_settings: "Torna alle Impostazioni"
+      available_accounts: "Conti disponibili"
+      balance_label: "Saldo:"
+      account_number: "Conto:"
+      sync_start_date_label: "Importa transazioni dal:"
+      sync_start_date_help: "Lascia vuoto per tutta la cronologia disponibile"
+      create_button: "Crea conti selezionati"
+      cancel_button: "Annulla"
+      creating: "Creazione conti..."
+      done_button: "Fatto"
+      or_link_existing: "Oppure collega a un conto esistente invece di crearne uno nuovo:"
+      select_account: "Seleziona un conto..."
+      link_button: "Collega"
+      linked_accounts: "Già collegati"
+      linked_to: "Collegato a:"
+    snaptrade_item:
+      accounts_need_setup:
+        one: "%{count} conto da configurare"
+        other: "%{count} conti da configurare"
+      deletion_in_progress: "Eliminazione in corso..."
+      syncing: "Sincronizzazione in corso..."
+      requires_update: "La connessione necessita di aggiornamento"
+      error: "Errore di sincronizzazione"
+      status: "Ultima sincronizzazione %{timestamp} fa - %{summary}"
+      status_never: "Mai sincronizzato"
+      reconnect: "Riconnetti"
+      connect_brokerage: "Connetti Brokerage"
+      add_another_brokerage: "Connetti un altro brokerage"
+      delete: "Elimina"
+      setup_needed: "I conti devono essere configurati"
+      setup_description: "Alcuni conti da SnapTrade devono essere collegati ai conti Sure."
+      setup_action: "Configura conti"
+      setup_accounts_menu: "Configura conti"
+      manage_connections: "Gestisci connessioni"
+      more_accounts_available:
+        one: "%{count} altro conto disponibile da configurare"
+        other: "%{count} altri conti disponibili da configurare"
+      no_accounts_title: "Nessun conto trovato"
+      no_accounts_description: "Connetti un brokerage per importare i tuoi conti investimento."
+
+  providers:
+    snaptrade:
+      name: "SnapTrade"
+      connection_description: "Connetti al tuo brokerage tramite SnapTrade (25+ broker supportati)"
+      description: "SnapTrade si connette a 25+ principali brokerage (Fidelity, Vanguard, Schwab, Robinhood, ecc.) e fornisce cronologia completa delle operazioni con etichette di attività e costo base."
+      setup_title: "Istruzioni di configurazione:"
+      step_1_html: "Crea un account su <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a>"
+      step_2: "Copia il tuo Client ID e Consumer Key dal dashboard"
+      step_3: "Inserisci le tue credenziali qui sotto e clicca Salva"
+      step_4: "Vai alla pagina Conti e usa 'Connetti un altro brokerage' per collegare i tuoi conti investimento"
+      free_tier_warning: "Il piano gratuito SnapTrade copre 20 connessioni brokerage."
+      oauth_title: "OAuth SnapTrade"
+      oauth_status_ready: "Usa un codice dispositivo per autorizzare Sure per SnapTrade."
+      oauth_status_authorized: "Autorizzato con SnapTrade."
+      oauth_connect_button: "Connetti con SnapTrade"
+      oauth_reauthorize_button: "Riautorizza"
+      legacy_credentials_title: "Usa credenziali API legacy"
+      legacy_credentials_description: "Usa la configurazione con Client ID e Consumer Key se il tuo account SnapTrade non ha abilitato OAuth."
+      client_id_label: "Client ID"
+      client_id_placeholder: "Inserisci il tuo Client ID SnapTrade"
+      client_id_update_placeholder: "Inserisci nuovo Client ID per aggiornare"
+      consumer_key_label: "Consumer Key"
+      consumer_key_placeholder: "Inserisci il tuo Consumer Key SnapTrade"
+      consumer_key_update_placeholder: "Inserisci nuovo Consumer Key per aggiornare"
+      save_button: "Salva configurazione"
+      update_button: "Aggiorna configurazione"
+      status_connected:
+        one: "%{count} conto da SnapTrade"
+        other: "%{count} conti da SnapTrade"
+      status_needs_registration: "Credenziali salvate. Completa la configurazione per connettere un brokerage."
+      needs_setup:
+        one: "%{count} da configurare"
+        other: "%{count} da configurare"
+      status_ready: "Pronto per connettere brokerage"
+      setup_accounts_button: "Configura conti"
+      connect_button: "Connetti Brokerage"
+      connected_brokerages: "Connessi:"
+      manage_connections: "Gestisci connessioni"
+      loading_connections: "Caricamento connessioni..."
+      connections_error: "Caricamento connessioni fallito: %{message}"
+      accounts_count:
+        one: "%{count} conto"
+        other: "%{count} conti"
+      orphaned_connection: "Connessione orfana (non sincronizzata localmente)"
+      needs_linking: "da collegare"
+      no_connections: "Nessuna connessione brokerage trovata."
+      delete_connection: "Elimina"
+      delete_connection_title: "Eliminare la connessione brokerage?"
+      delete_connection_body: "Questo rimuoverà definitivamente la connessione %{brokerage} da SnapTrade. Tutti i conti di questo brokerage saranno scollegati. Dovrai riconnetterti per sincronizzare di nuovo questi conti."
+      delete_connection_confirm: "Elimina connessione"
+      orphaned_users_title:
+        one: "%{count} registrazione orfana"
+        other: "%{count} registrazioni orfane"
+      orphaned_users_description: "Queste sono precedenti registrazioni utente SnapTrade che occupano i tuoi slot di connessione. Eliminale per liberare slot."
+      orphaned_user: "Registrazione orfana"
+      delete_orphaned_user: "Elimina"
+      delete_orphaned_user_title: "Eliminare la registrazione orfana?"
+      delete_orphaned_user_body: "Questo eliminerà definitivamente questo utente SnapTrade orfano e tutte le loro connessioni brokerage, liberando slot di connessione."
+      delete_orphaned_user_confirm: "Elimina registrazione"
+  snaptrade_item:
+    sync_status:
+      no_accounts: "Nessun conto trovato"
+      synced:
+        one: "%{count} conto sincronizzato"
+        other: "%{count} conti sincronizzati"
+      synced_with_setup: "%{linked} sincronizzati, %{unlinked} da configurare"
+    institution_summary:
+      none: "Nessuna istituzione connessa"
+      count:
+        one: "%{count} istituzione"
+        other: "%{count} istituzioni"
+    brokerage_summary:
+      none: "Nessun brokerage connesso"
+      count:
+        one: "%{count} brokerage"
+        other: "%{count} brokerage"
+    syncer:
+      discovering: "Ricerca conti..."
+      importing: "Importazione conti da SnapTrade..."
+      processing: "Elaborazione posizioni e attività..."
+      calculating: "Calcolo saldi..."
+      checking_config: "Verifica configurazione conti..."
+      needs_setup: "%{count} conti da configurare..."
+      activities_fetching_async: "Le attività vengono recuperate in background. Potrebbe richiedere fino a un minuto per le nuove connessioni brokerage."
diff --git a/config/locales/views/snaptrade_items/pl.yml b/config/locales/views/snaptrade_items/pl.yml
index 1f45a3aa1..c6819616c 100644
--- a/config/locales/views/snaptrade_items/pl.yml
+++ b/config/locales/views/snaptrade_items/pl.yml
@@ -2,10 +2,6 @@
 pl:
   snaptrade_items:
     default_name: Połączenie SnapTrade
-    create:
-      success: Pomyślnie skonfigurowano SnapTrade.
-    update:
-      success: Pomyślnie zaktualizowano konfigurację SnapTrade.
     destroy:
       success: Zaplanowano usunięcie połączenia SnapTrade.
     connect:
@@ -54,9 +50,6 @@ pl:
       failed: 'Nie udało się usunąć połączenia: %{message}'
       missing_authorization_id: Brak identyfikatora autoryzacji
       api_deletion_failed: Nie można usunąć połączenia z SnapTrade — brak danych uwierzytelniających. Połączenie może nadal istnieć na koncie SnapTrade.
-    delete_orphaned_user:
-      success: Osierocona rejestracja została usunięta pomyślnie.
-      failed: Nie udało się usunąć osieroconej rejestracji.
     setup_accounts:
       title: Skonfiguruj konta SnapTrade
       header: Skonfiguruj swoje konta SnapTrade
@@ -120,20 +113,7 @@ pl:
       name: SnapTrade
       connection_description: Połącz się ze swoim biurem maklerskim przez SnapTrade (obsługuje 25+ brokerów)
       description: SnapTrade łączy się z ponad 25 głównymi biurami maklerskimi (Fidelity, Vanguard, Schwab, Robinhood itp.) i udostępnia pełną historię transakcji z etykietami aktywności oraz podstawą kosztową.
-      setup_title: 'Instrukcje konfiguracji:'
-      step_1_html: Utwórz konto na <a href="https://dashboard.snaptrade.com" target="_blank" rel="noopener noreferrer" class="text-primary underline">dashboard.snaptrade.com</a>
-      step_2: Skopiuj swój Client ID i Consumer Key z pulpitu nawigacyjnego
-      step_3: Wprowadź swoje dane uwierzytelniające poniżej i kliknij Zapisz
-      step_4: Przejdź do strony Konta i użyj opcji „Połącz kolejne biuro maklerskie", aby połączyć swoje konta inwestycyjne
       free_tier_warning: Plan bezpłatny obejmuje 5 połączeń z biurami maklerskimi. Dodatkowe połączenia wymagają płatnego planu SnapTrade.
-      client_id_label: Client ID
-      client_id_placeholder: Wprowadź Client ID SnapTrade
-      client_id_update_placeholder: Wprowadź nowy Client ID, aby zaktualizować
-      consumer_key_label: Consumer Key
-      consumer_key_placeholder: Wprowadź Consumer Key SnapTrade
-      consumer_key_update_placeholder: Wprowadź nowy Consumer Key, aby zaktualizować
-      save_button: Zapisz konfigurację
-      update_button: Zaktualizuj konfigurację
       status_connected:
         one: "%{count} konto z SnapTrade"
         few: "%{count} konta z SnapTrade"
@@ -164,17 +144,6 @@ pl:
       delete_connection_title: Usunąć połączenie z biurem maklerskim?
       delete_connection_body: Spowoduje to trwałe usunięcie połączenia %{brokerage} z SnapTrade. Wszystkie konta tego biura maklerskiego zostaną odłączone. Będziesz musiał ponownie się połączyć, aby synchronizować te konta.
       delete_connection_confirm: Usuń połączenie
-      orphaned_users_title:
-        one: "%{count} osierocona rejestracja"
-        few: "%{count} osierocone rejestracje"
-        many: "%{count} osieroconych rejestracji"
-        other: "%{count} osieroconych rejestracji"
-      orphaned_users_description: Są to poprzednie rejestracje użytkowników SnapTrade, które zajmują Twoje miejsca połączeń. Usuń je, aby zwolnić miejsca.
-      orphaned_user: Osierocona rejestracja
-      delete_orphaned_user: Usuń
-      delete_orphaned_user_title: Usunąć osieroconą rejestrację?
-      delete_orphaned_user_body: Spowoduje to trwałe usunięcie tej osieroconej rejestracji użytkownika SnapTrade i wszystkich jego połączeń z biurami maklerskimi, zwalniając miejsca połączeń.
-      delete_orphaned_user_confirm: Usuń rejestrację
   snaptrade_item:
     sync_status:
       no_accounts: Nie znaleziono kont
diff --git a/config/locales/views/snaptrade_items/ru.yml b/config/locales/views/snaptrade_items/ru.yml
new file mode 100644
index 000000000..9ff33cf80
--- /dev/null
+++ b/config/locales/views/snaptrade_items/ru.yml
@@ -0,0 +1,196 @@
+---
+ru:
+  providers:
+    snaptrade:
+      accounts_count:
+        few: "%{count} счёта"
+        many: "%{count} счетов"
+        one: "%{count} счёт"
+        other: "%{count} счёта"
+      connect_button: Подключить брокера
+      connected_brokerages: 'Подключено:'
+      connection_description: Подключитесь к вашему брокеру через SnapTrade (поддерживается
+        более 25 брокеров)
+      connections_error: 'Не удалось загрузить подключения: %{message}'
+      delete_connection: Удалить
+      delete_connection_body: Это навсегда удалит подключение %{brokerage} из SnapTrade.
+        Все счета этого брокера будут отвязаны. Вам нужно будет переподключиться,
+        чтобы снова синхронизировать эти счета.
+      delete_connection_confirm: Удалить подключение
+      delete_connection_title: Удалить подключение брокера?
+      description: SnapTrade подключается к более чем 25 крупным брокерам (Fidelity,
+        Vanguard, Schwab, Robinhood и др.) и предоставляет полную историю торгов с
+        метками активности и стоимостью.
+      free_tier_warning: Бесплатный тариф SnapTrade покрывает 5 подключений брокеров.
+        Обновите на SnapTrade для большего количества.
+      loading_connections: Загрузка подключений...
+      manage_connections: Управление подключениями
+      name: SnapTrade
+      needs_linking: требует связывания
+      needs_setup:
+        few: "%{count} требуют настройки"
+        many: "%{count} требуют настройки"
+        one: "%{count} требует настройки"
+        other: "%{count} требуют настройки"
+      no_connections: Подключения брокеров не найдены.
+      oauth_connect_button: Подключить через SnapTrade
+      oauth_reauthorize_button: Авторизовать заново
+      oauth_status_authorized: Авторизация через SnapTrade выполнена.
+      oauth_status_ready: Используйте код устройства, чтобы авторизовать Sure в SnapTrade.
+      oauth_title: SnapTrade OAuth
+      orphaned_connection: Неиспользуемое подключение (не синхронизировано локально)
+      setup_accounts_button: Настроить счета
+      status_connected:
+        few: "%{count} счёта из SnapTrade"
+        many: "%{count} счетов из SnapTrade"
+        one: "%{count} счёт из SnapTrade"
+        other: "%{count} счёта из SnapTrade"
+      status_ready: Готово к подключению брокеров
+  snaptrade_item:
+    brokerage_summary:
+      count:
+        few: "%{count} брокера"
+        many: "%{count} брокеров"
+        one: "%{count} брокер"
+        other: "%{count} брокеров"
+      none: Подключённых брокеров нет
+    institution_summary:
+      count:
+        few: "%{count} учреждения"
+        many: "%{count} учреждений"
+        one: "%{count} учреждение"
+        other: "%{count} учреждений"
+      none: Подключённых учреждений нет
+    sync_status:
+      no_accounts: Счета не найдены
+      synced:
+        few: "%{count} счёта синхронизированы"
+        many: "%{count} счетов синхронизировано"
+        one: "%{count} счёт синхронизирован"
+        other: "%{count} счёта синхронизированы"
+      synced_with_setup: "%{linked} синхронизированы, %{unlinked} требуют настройки"
+    syncer:
+      activities_fetching_async: Операции загружаются в фоновом режиме. Это может
+        занять до минуты для новых подключений брокеров.
+      calculating: Расчёт балансов...
+      checking_config: Проверка конфигурации счёта...
+      discovering: Поиск счетов...
+      importing: Импорт счетов из SnapTrade...
+      needs_setup: "%{count} счёта требуют настройки..."
+      processing: Обработка активов и операций...
+  snaptrade_items:
+    callback:
+      no_item: Конфигурация SnapTrade не найдена.
+      success: Брокер подключен! Пожалуйста, выберите, какие счета связать.
+    complete_account_setup:
+      link_failed: 'Не удалось связать счета: %{errors}'
+      no_accounts: Не выбрано ни одного счёта для связывания.
+      partial_success:
+        few: Связаны %{count} счёта. %{failed_count} не удалось связать.
+        many: Связано %{count} счетов. %{failed_count} не удалось связать.
+        one: Связан %{count} счёт. %{failed_count} не удалось связать.
+        other: Связаны %{count} счёта. %{failed_count} не удалось связать.
+      success:
+        few: Успешно связаны %{count} счёта.
+        many: Успешно связано %{count} счетов.
+        one: Успешно связан %{count} счёт.
+        other: Успешно связаны %{count} счёта.
+    connect:
+      connection_failed: 'Не удалось подключиться к SnapTrade: %{message}'
+      decryption_failed: Не удалось прочитать учетные данные SnapTrade. Пожалуйста,
+        удалите и создайте это подключение заново.
+    connections:
+      unknown_brokerage: Неизвестный брокер
+    default_name: Подключение SnapTrade
+    delete_connection:
+      api_deletion_failed: Не удалось удалить подключение из SnapTrade - отсутствуют
+        учетные данные. Подключение может всё ещё существовать в вашем аккаунте SnapTrade.
+      failed: 'Не удалось удалить подключение: %{message}'
+      missing_authorization_id: Отсутствует ID авторизации
+      success: Подключение успешно удалено. Один слот освобождён.
+    destroy:
+      success: Подключение SnapTrade запланировано на удаление.
+    link_existing_account:
+      failed: 'Не удалось связать счёт: %{message}'
+      not_found: Счёт не найден.
+      success: Успешно связан со счётом SnapTrade.
+    preload_accounts:
+      not_configured: SnapTrade не настроен.
+    select_accounts:
+      not_configured: SnapTrade не настроен.
+    select_existing_account:
+      balance_label: 'Баланс:'
+      cancel_button: Отмена
+      connect_hint: Возможно, сначала нужно подключить брокера.
+      header: Связать существующий счёт
+      link_button: Связать
+      linking_to: 'Связывание со счётом:'
+      no_accounts: Нет доступных для связывания счетов SnapTrade.
+      not_found: Счёт или конфигурация SnapTrade не найдены.
+      settings_link: Перейти в настройки провайдера
+      subtitle: Выберите счёт SnapTrade для связывания
+      title: Связать со счётом SnapTrade
+    setup_accounts:
+      account_number: 'Счёт:'
+      available_accounts: Доступные счета
+      back_to_settings: Назад к настройкам
+      balance_label: 'Баланс:'
+      cancel_button: Отмена
+      create_button: Создать выбранные счета
+      creating: Создание счетов...
+      done_button: Готово
+      free_tier_note: Бесплатный тариф SnapTrade позволяет подключить 5 брокеров.
+        Проверьте вашу панель SnapTrade для текущего использования.
+      header: Настройте ваши счета SnapTrade
+      info_activities: История торгов с метками активности (Покупка, Продажа, Дивиденды
+        и т.д.)
+      info_cost_basis: Стоимость позиции (если доступно)
+      info_history: До 3 лет истории операций
+      info_holdings: Активы с текущими ценами и количествами
+      info_title: Инвестиционные данные SnapTrade
+      link_button: Связать
+      linked_accounts: Уже связаны
+      linked_to: 'Связан с:'
+      loading: Получение счетов из SnapTrade...
+      loading_hint: Нажмите Обновить, чтобы проверить наличие счетов.
+      no_accounts_message: Брокерские счета не найдены. Это может произойти, если
+        вы отменили подключение или ваш брокер не поддерживается.
+      no_accounts_title: Счета не найдены
+      or_link_existing: 'Или свяжите с существующим счётом вместо создания нового:'
+      refresh: Обновить
+      select_account: Выберите счёт...
+      subtitle: Выберите, какие брокерские счета связать
+      sync_start_date_help: Оставьте пустым для всей доступной истории
+      sync_start_date_label: 'Импортировать операции с:'
+      syncing: Получение ваших счетов...
+      title: Настройка счетов SnapTrade
+      try_again: Подключить брокера
+    snaptrade_item:
+      accounts_need_setup:
+        few: "%{count} счёта требуют настройки"
+        many: "%{count} счетов требуют настройки"
+        one: "%{count} счёт требует настройки"
+        other: "%{count} счёта требуют настройки"
+      add_another_brokerage: Подключить другого брокера
+      connect_brokerage: Подключить брокера
+      delete: Удалить
+      deletion_in_progress: Удаление в процессе...
+      error: Ошибка синхронизации
+      manage_connections: Управление подключениями
+      more_accounts_available:
+        few: Доступно ещё %{count} счёта для настройки
+        many: Доступно ещё %{count} счетов для настройки
+        one: Доступен ещё %{count} счёт для настройки
+        other: Доступно ещё %{count} счёта для настройки
+      no_accounts_description: Подключите брокера для импорта ваших инвестиционных
+        счетов.
+      no_accounts_title: Счета не обнаружены
+      reconnect: Переподключить
+      requires_update: Подключение требует обновления
+      setup_accounts_menu: Настроить счета
+      setup_action: Настроить счета
+      setup_description: Некоторые счета из SnapTrade нужно связать с счетами Sure.
+      setup_needed: Счета требуют настройки
+      status: Последняя синхронизация %{timestamp} назад - %{summary}
+      status_never: Никогда не синхронизировалось
+      syncing: Синхронизация...
diff --git a/config/locales/views/snaptrade_items/tr.yml b/config/locales/views/snaptrade_items/tr.yml
new file mode 100644
index 000000000..29e21e8c6
--- /dev/null
+++ b/config/locales/views/snaptrade_items/tr.yml
@@ -0,0 +1,235 @@
+---
+tr:
+  providers:
+    snaptrade:
+      accounts_count:
+        one: "%{count} hesap"
+        other: "%{count} hesap"
+      client_id_label: İstemci Kimliği
+      client_id_placeholder: SnapTrade İstemci Kimliğinizi girin
+      client_id_update_placeholder: Güncellemek için yeni İstemci Kimliği girin
+      connect_button: Aracı Bağla
+      connected_brokerages: 'Bağlı:'
+      connection_description: SnapTrade aracılığıyla aracınıza bağlanın (25+ aracı
+        desteklenir)
+      connections_error: 'Bağlantılar yüklenemedi: %{message}'
+      consumer_key_label: Tüketici Anahtarı
+      consumer_key_placeholder: SnapTrade Tüketici Anahtarınızı girin
+      consumer_key_update_placeholder: Güncellemek için yeni Tüketici Anahtarı girin
+      delete_connection: Sil
+      delete_connection_body: Bu işlem %{brokerage} bağlantısını SnapTrade'den kalıcı
+        olarak kaldırır. Bu aracıdaki tüm hesapların bağı koparılır. Bu hesapları
+        tekrar senkronize etmek için yeniden bağlamanız gerekir.
+      delete_connection_confirm: Bağlantıyı Sil
+      delete_connection_title: Aracı Bağlantısı Silinsin mi?
+      delete_orphaned_user: Sil
+      delete_orphaned_user_body: Bu işlem yetim SnapTrade kullanıcısını ve tüm aracı
+        bağlantılarını kalıcı olarak siler ve bağlantı yuvalarını boşaltır.
+      delete_orphaned_user_confirm: Kaydı Sil
+      delete_orphaned_user_title: Yetim Kayıt Silinsin mi?
+      description: SnapTrade, 25+ büyük aracıya (Fidelity, Vanguard, Schwab, Robinhood
+        vb.) bağlanır ve etiketli işlem etiketleri ve maliyet temeli içeren tam işlem
+        geçmişi sağlar.
+      free_tier_warning: SnapTrade'ın ücretsiz katmanı 20 aracı bağlantısını kapsar.
+      legacy_credentials_description: SnapTrade hesabınız OAuth'u etkinleştirmediyse
+        İstemci Kimliği ve Tüketici Anahtarı kurulumunu kullanın.
+      legacy_credentials_title: Eski API kimlik bilgilerini kullan
+      loading_connections: Bağlantılar yükleniyor...
+      manage_connections: Bağlantıları Yönet
+      name: SnapTrade
+      needs_linking: bağlanmayı bekliyor
+      needs_setup:
+        one: "%{count} kurulmayı bekliyor"
+        other: "%{count} kurulmayı bekliyor"
+      no_connections: Aracı bağlantısı bulunamadı.
+      oauth_connect_button: SnapTrade ile bağlan
+      oauth_reauthorize_button: Yeniden yetkilendir
+      oauth_status_authorized: SnapTrade ile yetkilendirildi.
+      oauth_status_ready: Sure'i SnapTrade için yetkilendirmek üzere bir cihaz kodu
+        kullanın.
+      oauth_title: SnapTrade OAuth
+      orphaned_connection: Yetim bağlantı (yerel olarak senkronize edilmedi)
+      orphaned_user: Yetim Kayıt
+      orphaned_users_description: Bunlar bağlantı yuvalarınızı kullanan önceki SnapTrade
+        kullanıcı kayıtlarıdır. Yuvaları boşaltmak için bunları silin.
+      orphaned_users_title:
+        one: "%{count} yetim kayıt"
+        other: "%{count} yetim kayıt"
+      save_button: Yapılandırmayı Kaydet
+      setup_accounts_button: Hesapları Kur
+      setup_title: 'Kurulum talimatları:'
+      status_connected:
+        one: SnapTrade'den %{count} hesap
+        other: SnapTrade'den %{count} hesap
+      status_needs_registration: Kimlik bilgileri kaydedildi. Bir aracı bağlamak için
+        kurulumu tamamlayın.
+      status_ready: Aracı bağlamaya hazır
+      step_1_html: <a href="https://dashboard.snaptrade.com" target="_blank" rel="noopener
+        noreferrer" class="text-primary underline">dashboard.snaptrade.com</a> adresinde
+        bir hesap oluşturun
+      step_2: İstemci Kimliği ve Tüketici Anahtarınızı panodan kopyalayın
+      step_3: Kimlik bilgilerinizi aşağıya girin ve Kaydet'e tıklayın
+      step_4: Hesaplar sayfasına gidin ve yatırım hesaplarınızı bağlamak için 'Başka
+        bir aracı bağla'yı kullanın
+      update_button: Yapılandırmayı Güncelle
+  snaptrade_item:
+    brokerage_summary:
+      count:
+        one: "%{count} aracı"
+        other: "%{count} aracı"
+      none: Bağlı aracı yok
+    institution_summary:
+      count:
+        one: "%{count} kurum"
+        other: "%{count} kurum"
+      none: Bağlı kurum yok
+    sync_status:
+      no_accounts: Hesap bulunamadı
+      synced:
+        one: "%{count} hesap senkronize edildi"
+        other: "%{count} hesap senkronize edildi"
+      synced_with_setup: "%{linked} senkronize edildi, %{unlinked} kurulmayı bekliyor"
+    syncer:
+      activities_fetching_async: İşlemler arka planda getiriliyor. Yeni aracı bağlantılarında
+        bu işlem bir dakikaya kadar sürebilir.
+      calculating: Bakiyeler hesaplanıyor...
+      checking_config: Hesap yapılandırması kontrol ediliyor...
+      discovering: Hesaplar keşfediliyor...
+      importing: SnapTrade'den hesaplar içe aktarılıyor...
+      needs_setup: "%{count} hesabın kurulması gerekiyor..."
+      processing: Varlıklar ve işlemler işleniyor...
+  snaptrade_items:
+    callback:
+      no_item: SnapTrade yapılandırması bulunamadı.
+      success: Aracı bağlandı! Lütfen bağlanacak hesapları seçin.
+    complete_account_setup:
+      link_failed: 'Hesaplar bağlanamadı: %{errors}'
+      no_accounts: Bağlanmak için hesap seçilmedi.
+      partial_success:
+        one: "%{count} hesap bağlandı. %{failed_count} hesap bağlanamadı."
+        other: "%{count} hesap bağlandı. %{failed_count} hesap bağlanamadı."
+      success:
+        one: "%{count} hesap başarıyla bağlandı."
+        other: "%{count} hesap başarıyla bağlandı."
+    complete_oauth_device_flow:
+      failed: SnapTrade OAuth cihaz yetkilendirmesi tamamlanamadı. Lütfen tekrar deneyin.
+      setup_incomplete: SnapTrade yetkilendirmesi tamamlandı, ancak hesaplar senkronize
+        edilemeden önce API kimlik bilgileri gereklidir.
+      success: SnapTrade yetkilendirmesi tamamlandı.
+    connect:
+      connection_failed: 'SnapTrade''e bağlanılamadı: %{message}'
+      decryption_failed: SnapTrade kimlik bilgileri okunamıyor. Lütfen bu bağlantıyı
+        silin ve yeniden oluşturun.
+    connections:
+      unknown_brokerage: Bilinmeyen Aracı
+    create:
+      success: SnapTrade başarıyla yapılandırıldı.
+    default_name: SnapTrade Bağlantısı
+    delete_connection:
+      api_deletion_failed: SnapTrade'den bağlantı silinemedi - kimlik bilgileri eksik.
+        Bağlantı SnapTrade hesabınızda hâlâ var olabilir.
+      failed: 'Bağlantı silinemedi: %{message}'
+      missing_authorization_id: Yetkilendirme kimliği eksik
+      success: Bağlantı başarıyla silindi. Bir yuval boşaltıldı.
+    delete_orphaned_user:
+      failed: Yetim kayıt silinemedi.
+      success: Yetim kayıt başarıyla silindi.
+    destroy:
+      success: SnapTrade bağlantısı silinmek üzere zamanlandı.
+    link_accounts:
+      use_setup_flow: Bunun yerine hesap kurulum akışını kullanın
+    link_existing_account:
+      failed: 'Hesap bağlanamadı: %{message}'
+      not_found: Hesap bulunamadı.
+      success: SnapTrade hesabına başarıyla bağlandı.
+    oauth_device_flow:
+      cancel_button: İptal
+      code_label: Cihaz kodu
+      complete_button: SnapTrade'i yetkilendirdim
+      instructions: SnapTrade'i açın ve bu cihaz kodunu onaylayın, ardından yetkilendirmeyi
+        tamamlamak için buraya dönün.
+      missing_client_id: SnapTrade OAuth istemci kimliği yapılandırılmamış. .env.local
+        dosyasına SNAPTRADE_OAUTH_CLIENT_ID ekleyin, uygulamayı yeniden başlatın ve
+        tekrar deneyin.
+      open_snaptrade: SnapTrade'i aç
+      start_button: Yetkilendirmeyi başlat
+      subtitle: Sure'i SnapTrade için yetkilendir
+      title: SnapTrade'e Bağlan
+    preload_accounts:
+      not_configured: SnapTrade yapılandırılmamış.
+    select_accounts:
+      not_configured: SnapTrade yapılandırılmamış.
+    select_existing_account:
+      balance_label: 'Bakiye:'
+      cancel_button: İptal
+      connect_hint: Önce bir aracı bağlamanız gerekebilir.
+      header: Mevcut Hesabı Bağla
+      link_button: Bağla
+      linking_to: 'Hesaba bağlanıyor:'
+      no_accounts: Bağlı olmayan SnapTrade hesabı yok.
+      not_found: Hesap veya SnapTrade yapılandırması bulunamadı.
+      settings_link: Sağlayıcı Ayarlarına Git
+      subtitle: Bağlanacak bir SnapTrade hesabı seçin
+      title: SnapTrade Hesabına Bağla
+    setup_accounts:
+      account_number: 'Hesap:'
+      available_accounts: Kullanılabilir Hesaplar
+      back_to_settings: Ayarlara Dön
+      balance_label: 'Bakiye:'
+      cancel_button: İptal
+      create_button: Seçili Hesapları Oluştur
+      creating: Hesaplar Oluşturuluyor...
+      done_button: Tamam
+      free_tier_note: SnapTrade ücretsiz katmanı 20 aracı bağlantısına izin verir.
+      header: SnapTrade Hesaplarınızı Kurun
+      info_activities: İşlem etiketleriyle işlem geçmişi (Al, Sat, Temettü vb.)
+      info_cost_basis: Pozisyon başına maliyet temeli (mevcut olduğunda)
+      info_history: 3 yıla kadar işlem geçmişi
+      info_holdings: Güncel fiyat ve miktarlarla varlıklar
+      info_title: SnapTrade Yatırım Verileri
+      link_button: Bağla
+      linked_accounts: Zaten Bağlı
+      linked_to: 'Bağlı:'
+      loading: SnapTrade'den hesaplar getiriliyor...
+      loading_hint: Hesapları kontrol etmek için Yenile'ye tıklayın.
+      no_accounts_message: Aracı hesabı bulunamadı. Bu, bağlantıyı iptal etmiş olmanız
+        veya aracınızın desteklenmemesi durumunda oluşabilir.
+      no_accounts_title: Hesap Bulunamadı
+      or_link_existing: 'Veya yeni hesap oluşturmak yerine mevcut bir hesaba bağlayın:'
+      refresh: Yenile
+      select_account: Bir hesap seçin...
+      subtitle: Hangi aracı hesaplarının bağlanacağını seçin
+      sync_start_date_help: Tüm kullanılabilir geçmiş için boş bırakın
+      sync_start_date_label: 'İşlemleri şu tarihten içe aktar:'
+      syncing: Hesaplarınız getiriliyor...
+      title: SnapTrade Hesaplarını Kur
+      try_again: Aracı Bağla
+    snaptrade_item:
+      accounts_need_setup:
+        one: "%{count} hesabın kurulması gerekiyor"
+        other: "%{count} hesabın kurulması gerekiyor"
+      add_another_brokerage: Başka bir aracı bağla
+      connect_brokerage: Aracı Bağla
+      delete: Sil
+      deletion_in_progress: Siliniyor...
+      error: Senkronizasyon hatası
+      manage_connections: Bağlantıları Yönet
+      more_accounts_available:
+        one: "%{count} hesap daha kurulmaya hazır"
+        other: "%{count} hesap daha kurulmaya hazır"
+      no_accounts_description: Yatırım hesaplarınızı içe aktarmak için bir aracı bağlayın.
+      no_accounts_title: Hesap keşfedilmedi
+      reconnect: Yeniden bağlan
+      requires_update: Bağlantının güncellenmesi gerekiyor
+      setup_accounts_menu: Hesapları Kur
+      setup_action: Hesapları Kur
+      setup_description: SnapTrade'den bazı hesapların Sure hesaplarıyla bağlanması
+        gerekiyor.
+      setup_needed: Hesapların kurulması gerekiyor
+      status: 'Son senkronizasyon: %{timestamp} önce - %{summary}'
+      status_never: Hiç senkronize edilmedi
+      syncing: Senkronize ediliyor...
+    start_oauth_device_flow:
+      failed: SnapTrade OAuth cihaz yetkilendirmesi başlatılamadı. Lütfen tekrar deneyin.
+    update:
+      success: SnapTrade yapılandırması başarıyla güncellendi.
diff --git a/config/locales/views/snaptrade_items/vi.yml b/config/locales/views/snaptrade_items/vi.yml
index 61a95981d..0c963ddc6 100644
--- a/config/locales/views/snaptrade_items/vi.yml
+++ b/config/locales/views/snaptrade_items/vi.yml
@@ -1,12 +1,6 @@
 vi:
   snaptrade_items:
     default_name: "Kết nối SnapTrade"
-    link_accounts:
-      use_setup_flow: Sử dụng luồng thiết lập tài khoản
-    create:
-      success: "Đã cấu hình SnapTrade thành công."
-    update:
-      success: "Đã cập nhật cấu hình SnapTrade thành công."
     destroy:
       success: "Đã lên lịch xóa kết nối SnapTrade."
     connect:
@@ -51,9 +45,6 @@ vi:
       failed: "Xóa kết nối thất bại: %{message}"
       missing_authorization_id: "Thiếu ID ủy quyền"
       api_deletion_failed: "Không thể xóa kết nối khỏi SnapTrade - thiếu thông tin xác thực. Kết nối có thể vẫn tồn tại trong tài khoản SnapTrade của bạn."
-    delete_orphaned_user:
-      success: "Đã xóa đăng ký mồ côi thành công."
-      failed: "Xóa đăng ký mồ côi thất bại."
     setup_accounts:
       title: "Thiết lập tài khoản SnapTrade"
       header: "Thiết lập tài khoản SnapTrade của bạn"
@@ -116,24 +107,10 @@ vi:
       name: "SnapTrade"
       connection_description: "Kết nối với brokerage qua SnapTrade (hỗ trợ 25+ sàn)"
       description: "SnapTrade kết nối với 25+ brokerage lớn (Fidelity, Vanguard, Schwab, Robinhood, v.v.) và cung cấp lịch sử giao dịch đầy đủ với nhãn hoạt động và cơ sở chi phí."
-      setup_title: "Hướng dẫn thiết lập:"
-      step_1_html: "Tạo tài khoản tại <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a>"
-      step_2: "Sao chép Client ID và Consumer Key từ bảng điều khiển"
-      step_3: "Nhập thông tin xác thực bên dưới và nhấn Lưu"
-      step_4: "Đi đến trang Tài khoản và dùng 'Kết nối thêm brokerage' để liên kết tài khoản đầu tư"
       free_tier_warning: "Gói miễn phí SnapTrade hỗ trợ 5 kết nối brokerage. Nâng cấp trên SnapTrade để có thêm."
-      client_id_label: "Client ID"
-      client_id_placeholder: "Nhập Client ID SnapTrade của bạn"
-      client_id_update_placeholder: "Nhập Client ID mới để cập nhật"
-      consumer_key_label: "Consumer Key"
-      consumer_key_placeholder: "Nhập Consumer Key SnapTrade của bạn"
-      consumer_key_update_placeholder: "Nhập Consumer Key mới để cập nhật"
-      save_button: "Lưu cấu hình"
-      update_button: "Cập nhật cấu hình"
       status_connected:
         one: "%{count} tài khoản từ SnapTrade"
         other: "%{count} tài khoản từ SnapTrade"
-      status_needs_registration: "Đã lưu thông tin xác thực. Hoàn tất thiết lập để kết nối brokerage."
       needs_setup:
         one: "%{count} cần thiết lập"
         other: "%{count} cần thiết lập"
@@ -154,15 +131,6 @@ vi:
       delete_connection_title: "Xóa kết nối Brokerage?"
       delete_connection_body: "Thao tác này sẽ xóa vĩnh viễn kết nối %{brokerage} khỏi SnapTrade. Tất cả tài khoản từ brokerage này sẽ bị hủy liên kết. Bạn cần kết nối lại để đồng bộ các tài khoản này."
       delete_connection_confirm: "Xóa kết nối"
-      orphaned_users_title:
-        one: "%{count} đăng ký mồ côi"
-        other: "%{count} đăng ký mồ côi"
-      orphaned_users_description: "Đây là các đăng ký người dùng SnapTrade cũ đang sử dụng slot kết nối của bạn. Xóa chúng để giải phóng slot."
-      orphaned_user: "Đăng ký mồ côi"
-      delete_orphaned_user: "Xóa"
-      delete_orphaned_user_title: "Xóa đăng ký mồ côi?"
-      delete_orphaned_user_body: "Thao tác này sẽ xóa vĩnh viễn người dùng SnapTrade mồ côi này và tất cả kết nối brokerage của họ, giải phóng slot kết nối."
-      delete_orphaned_user_confirm: "Xóa đăng ký"
 
   snaptrade_item:
     sync_status:
diff --git a/config/locales/views/snaptrade_items/zh-CN.yml b/config/locales/views/snaptrade_items/zh-CN.yml
index caac3138d..ed0cb0107 100644
--- a/config/locales/views/snaptrade_items/zh-CN.yml
+++ b/config/locales/views/snaptrade_items/zh-CN.yml
@@ -2,12 +2,6 @@
 zh-CN:
   snaptrade_items:
     default_name: "SnapTrade 连接"
-    link_accounts:
-      use_setup_flow: 请改用账户设置流程
-    create:
-      success: SnapTrade 配置成功。
-    update:
-      success: SnapTrade 配置已更新。
     destroy:
       success: SnapTrade 连接已安排删除。
     connect:
@@ -52,9 +46,6 @@ zh-CN:
       failed: 删除连接失败：%{message}
       missing_authorization_id: 缺少授权 ID
       api_deletion_failed: 无法从 SnapTrade 删除连接 - 缺少凭据。该连接可能仍存在于您的 SnapTrade 账户中。
-    delete_orphaned_user:
-      success: 孤立注册已成功删除。
-      failed: 删除孤立注册失败。
     setup_accounts:
       title: 设置 SnapTrade 账户
       header: 设置您的 SnapTrade 账户
@@ -116,24 +107,10 @@ zh-CN:
       name: "SnapTrade"
       connection_description: 通过 SnapTrade 连接您的券商（支持 25+ 券商）
       description: "SnapTrade 连接 25+ 主流券商（Fidelity、Vanguard、Schwab、Robinhood 等），并提供带活动标签和成本基础的完整交易历史。"
-      setup_title: "设置说明："
-      step_1_html: "在 <a href=\"https://dashboard.snaptrade.com\" target=\"_blank\" rel=\"noopener noreferrer\" class=\"text-primary underline\">dashboard.snaptrade.com</a> 创建账户"
-      step_2: "从仪表盘复制您的 Client ID 和 Consumer Key"
-      step_3: "在下方输入您的凭据并点击保存"
-      step_4: "前往账户页面，使用“连接另一个券商”来关联您的投资账户"
       free_tier_warning: "SnapTrade 免费套餐覆盖 5 个券商连接。更多功能请在 SnapTrade 升级。"
-      client_id_label: "Client ID"
-      client_id_placeholder: "输入您的 SnapTrade Client ID"
-      client_id_update_placeholder: "输入新的 Client ID 以更新"
-      consumer_key_label: "Consumer Key"
-      consumer_key_placeholder: "输入您的 SnapTrade Consumer Key"
-      consumer_key_update_placeholder: "输入新的 Consumer Key 以更新"
-      save_button: "保存配置"
-      update_button: "更新配置"
       status_connected:
         one: "%{count} 个来自 SnapTrade 的账户"
         other: "%{count} 个来自 SnapTrade 的账户"
-      status_needs_registration: "凭据已保存。完成设置后即可连接券商。"
       needs_setup:
         one: "%{count} 个需要设置"
         other: "%{count} 个需要设置"
@@ -154,15 +131,6 @@ zh-CN:
       delete_connection_title: "删除券商连接？"
       delete_connection_body: "这将永久从 SnapTrade 中移除 %{brokerage} 连接。该券商的所有账户都会取消关联。您需要重新连接才能再次同步这些账户。"
       delete_connection_confirm: "删除连接"
-      orphaned_users_title:
-        one: "%{count} 个孤立注册"
-        other: "%{count} 个孤立注册"
-      orphaned_users_description: "这些是之前使用您连接名额的 SnapTrade 用户注册。删除它们可释放名额。"
-      orphaned_user: "孤立注册"
-      delete_orphaned_user: "删除"
-      delete_orphaned_user_title: "删除孤立注册？"
-      delete_orphaned_user_body: "这将永久删除该孤立的 SnapTrade 用户及其所有券商连接，释放连接名额。"
-      delete_orphaned_user_confirm: "删除注册"
   snaptrade_item:
     sync_status:
       no_accounts: "未找到账户"
diff --git a/config/locales/views/sophtron_items/de.yml b/config/locales/views/sophtron_items/de.yml
new file mode 100644
index 000000000..7701dfd25
--- /dev/null
+++ b/config/locales/views/sophtron_items/de.yml
@@ -0,0 +1,313 @@
+---
+de:
+  sophtron_items:
+    defaults:
+      name: Sophtron-Verbindung
+    new:
+      title: Sophtron verbinden
+      user_id: Benutzer-ID
+      user_id_placeholder: Fügen Sie Ihre Sophtron-Benutzer-ID ein
+      access_key: Zugriffsschlüssel
+      access_key_placeholder: Fügen Sie Ihren Sophtron-Zugriffsschlüssel ein
+      connect: Verbinden
+      cancel: Abbrechen
+    create:
+      success: Sophtron-Verbindung erfolgreich erstellt
+    destroy:
+      success: Sophtron-Verbindung entfernt
+    update:
+      success: Sophtron-Verbindung erfolgreich aktualisiert! Ihre Konten werden erneut verbunden.
+      errors:
+        blank_user_id: Bitte geben Sie eine Sophtron-Benutzer-ID ein.
+        invalid_user_id: Ungültige Benutzer-ID. Bitte prüfen Sie, ob Sie die vollständige Benutzer-ID von Sophtron kopiert haben.
+        user_id_compromised: Die Benutzer-ID ist möglicherweise kompromittiert, abgelaufen oder bereits verwendet. Bitte erstellen Sie eine neue.
+        blank_access_key: Bitte geben Sie einen Sophtron-Zugriffsschlüssel ein.
+        invalid_access_key: Ungültiger Zugriffsschlüssel. Bitte prüfen Sie, ob Sie den vollständigen Zugriffsschlüssel von Sophtron kopiert haben.
+        access_key_compromised: Der Zugriffsschlüssel ist möglicherweise kompromittiert, abgelaufen oder bereits verwendet. Bitte erstellen Sie einen neuen.
+        update_failed: "Verbindung konnte nicht aktualisiert werden: %{message}"
+        unexpected: Ein unerwarteter Fehler ist aufgetreten. Bitte versuchen Sie es erneut oder wenden Sie sich an den Support.
+    edit:
+      user_id:
+        label: "Sophtron-Benutzer-ID:"
+        placeholder: "Fügen Sie hier Ihre Sophtron-Benutzer-ID ein..."
+        help_text: "Die Benutzer-ID sollte eine lange Zeichenfolge sein, die mit Buchstaben und Zahlen beginnt"
+      access_key:
+        label: "Sophtron-Zugriffsschlüssel:"
+        placeholder: "Fügen Sie hier Ihren Sophtron-Zugriffsschlüssel ein..."
+        help_text: "Der Zugriffsschlüssel sollte eine lange Zeichenfolge sein, die mit Buchstaben und Zahlen beginnt"
+    index:
+      title: Sophtron-Verbindungen
+    loading:
+      loading_message: Sophtron-Konten werden geladen...
+      loading_title: Wird geladen
+    link_accounts:
+      all_already_linked:
+        one: "Das ausgewählte Konto (%{names}) ist bereits verknüpft"
+        other: "Alle %{count} ausgewählten Konten sind bereits verknüpft: %{names}"
+      api_error: "API-Verbindungsfehler"
+      invalid_account_names:
+        one: "Konto mit leerem Namen kann nicht verknüpft werden"
+        other: "%{count} Konten mit leeren Namen können nicht verknüpft werden"
+      link_failed: Konten konnten nicht verknüpft werden
+      no_accounts_selected: Bitte wählen Sie mindestens ein Konto aus
+      partial_invalid: "%{created_count} Konto(en) erfolgreich verknüpft, %{already_linked_count} waren bereits verknüpft, %{invalid_count} Konto(en) hatten ungültige Namen"
+      partial_success: "%{created_count} Konto(en) erfolgreich verknüpft. %{already_linked_count} Konto(en) waren bereits verknüpft: %{already_linked_names}"
+      success:
+        one: "%{count} Konto erfolgreich verknüpft"
+        other: "%{count} Konten erfolgreich verknüpft"
+      no_credentials_configured: "Bitte konfigurieren Sie zuerst Ihre Sophtron-API-Benutzer-ID und Ihren Zugriffsschlüssel in den Anbietereinstellungen."
+      no_accounts_found: Keine Konten gefunden. Bitte überprüfen Sie Ihre API-Schlüssel-Konfiguration.
+      no_access_key: Sophtron-Zugriffsschlüssel ist nicht konfiguriert. Bitte konfigurieren Sie ihn in den Einstellungen.
+      no_user_id: Sophtron-Benutzer-ID ist nicht konfiguriert. Bitte konfigurieren Sie sie in den Einstellungen.
+      no_institution_connected: Bitte verbinden Sie zuerst ein Bankinstitut mit Sophtron.
+    connect:
+      cancel: Abbrechen
+      captcha: Captcha
+      connect: Verbinden
+      institution_search_label: Institut
+      institution_search_placeholder: Nach Bankname suchen
+      no_institutions: Keine passenden Institute gefunden.
+      password: Passwort
+      search: Suchen
+      search_too_short: Geben Sie mindestens zwei Zeichen für die Suche ein.
+      title: Sophtron-Institut verbinden
+      username: Benutzername
+    connect_institution:
+      api_error: "Sophtron-Verbindung fehlgeschlagen: %{message}"
+      missing_parameters: Wählen Sie ein Institut aus und geben Sie Ihre Bank-Anmeldedaten ein.
+    connection_status:
+      api_error: "API-Verbindungsfehler: %{message}"
+      attempt: "Versuch %{attempt} von %{max}"
+      check_again: Erneut prüfen
+      failed: Sophtron konnte diese Institutsverbindung nicht abschließen.
+      failed_timeout: Bei Sophtron ist eine Zeitüberschreitung aufgetreten, während das Institut die Anmeldung abschloss.
+      timeout: Sophtron hat die Verbindung nicht innerhalb der erwarteten Zeit abgeschlossen. Sie können erneut prüfen oder später erneut versuchen.
+      title: Sophtron wird verbunden
+      waiting: Sophtron verbindet sich noch mit Ihrem Institut.
+    mfa:
+      captcha: Captcha-Text
+      captcha_alt: Sophtron-Captcha
+      phone_confirmed: Ich habe telefonisch bestätigt
+      submit: Absenden
+      title: Sophtron-Verifizierung
+      token: Verifizierungscode
+    submit_mfa:
+      api_error: "Verifizierung fehlgeschlagen: %{message}"
+      invalid_security_answers: Sicherheitsantworten fehlen oder sind zu lang.
+      unknown_challenge: Unbekannter Sophtron-Verifizierungsschritt.
+    sophtron_item:
+      accounts_need_setup: Konten müssen eingerichtet werden
+      automatic_sync: Automatische Synchronisierung verwenden
+      delete: Verbindung löschen
+      deletion_in_progress: Löschung läuft...
+      error: Fehler
+      no_accounts_description: Diese Verbindung hat noch keine verknüpften Konten.
+      no_accounts_title: Keine Konten
+      manual_sync: Manuelle Synchronisierung
+      manual_sync_action: Manuelle Synchronisierung erforderlich machen
+      manual_sync_action_for: "Manuelle Synchronisierung für %{institution} erforderlich machen"
+      automatic_sync_for: "Automatische Synchronisierung für %{institution} verwenden"
+      setup_action: Neue Konten einrichten
+      setup_description: "%{linked} von %{total} Konten verknüpft. Wählen Sie Kontotypen für Ihre neu importierten Sophtron-Konten."
+      setup_needed: Neue Konten bereit zur Einrichtung
+      status: "Vor %{timestamp} synchronisiert"
+      status_never: Noch nie synchronisiert
+      status_with_summary: "Zuletzt synchronisiert vor %{timestamp} • %{summary}"
+      sync_now: Jetzt synchronisieren
+      syncing: Synchronisiere...
+      total: Gesamt
+      unlinked: Nicht verknüpft
+    preload_accounts:
+      preload_accounts: Konten vorab laden
+      api_error: "API-Verbindungsfehler"
+      unexpected_error: "Ein unerwarteter Fehler ist aufgetreten"
+      no_credentials_configured: "Bitte konfigurieren Sie zuerst Ihre Sophtron-API-Benutzer-ID und Ihren Zugriffsschlüssel in den Anbietereinstellungen."
+      no_accounts_found: Keine Konten gefunden. Bitte überprüfen Sie Ihre API-Schlüssel-Konfiguration.
+      no_access_key: Sophtron-Zugriffsschlüssel ist nicht konfiguriert. Bitte konfigurieren Sie ihn in den Einstellungen.
+      no_user_id: Sophtron-Benutzer-ID ist nicht konfiguriert. Bitte konfigurieren Sie sie in den Einstellungen.
+    select_accounts:
+      accounts_selected: Konten ausgewählt
+      api_error: "API-Verbindungsfehler"
+      unexpected_error: "Ein unerwarteter Fehler ist aufgetreten"
+      cancel: Abbrechen
+      configure_name_in_sophtron: Import nicht möglich – bitte konfigurieren Sie den Kontonamen in Sophtron
+      description: Wählen Sie die Konten aus, die Sie mit Ihrem %{product_name}-Konto verknüpfen möchten.
+      link_accounts: Ausgewählte Konten verknüpfen
+      no_accounts_found: Keine Konten gefunden. Bitte überprüfen Sie Ihre API-Schlüssel-Konfiguration.
+      no_access_key: Sophtron-Zugriffsschlüssel ist nicht konfiguriert. Bitte konfigurieren Sie ihn in den Einstellungen.
+      no_user_id: Sophtron-Benutzer-ID ist nicht konfiguriert. Bitte konfigurieren Sie sie in den Einstellungen.
+      no_credentials_configured: "Bitte konfigurieren Sie zuerst Ihre Sophtron-API-Benutzer-ID und Ihren Zugriffsschlüssel in den Anbietereinstellungen."
+      no_institution_connected: Bitte verbinden Sie zuerst ein Bankinstitut mit Sophtron.
+      no_name_placeholder: "(Kein Name)"
+      title: Sophtron-Konten auswählen
+    select_existing_account:
+      account_already_linked: Dieses Konto ist bereits mit einem Anbieter verknüpft
+      all_accounts_already_linked: Alle Sophtron-Konten sind bereits verknüpft
+      api_error: "API-Verbindungsfehler"
+      cancel: Abbrechen
+      configure_name_in_sophtron: Import nicht möglich – bitte konfigurieren Sie den Kontonamen in Sophtron
+      description: Wählen Sie ein Sophtron-Konto aus, das mit diesem Konto verknüpft werden soll. Transaktionen werden automatisch synchronisiert und dedupliziert.
+      link_account: Konto verknüpfen
+      no_account_specified: Kein Konto angegeben
+      no_accounts_found: Keine Sophtron-Konten gefunden. Bitte überprüfen Sie Ihre API-Schlüssel-Konfiguration.
+      no_access_key: Sophtron-Zugriffsschlüssel ist nicht konfiguriert. Bitte konfigurieren Sie ihn in den Einstellungen.
+      no_user_id: Sophtron-Benutzer-ID ist nicht konfiguriert. Bitte konfigurieren Sie sie in den Einstellungen.
+      no_institution_connected: Bitte verbinden Sie zuerst ein Bankinstitut mit Sophtron.
+      no_name_placeholder: "(Kein Name)"
+      title: "%{account_name} mit Sophtron verknüpfen"
+      unexpected_error: "Ein unerwarteter Fehler ist aufgetreten"
+    link_existing_account:
+      account_already_linked: Dieses Konto ist bereits mit einem Anbieter verknüpft
+      api_error: "API-Verbindungsfehler"
+      unexpected_error: "Ein unerwarteter Fehler ist aufgetreten"
+      invalid_account_name: Konto mit leerem Namen kann nicht verknüpft werden
+      sophtron_account_already_linked: Dieses Sophtron-Konto ist bereits mit einem anderen Konto verknüpft
+      sophtron_account_not_found: Sophtron-Konto nicht gefunden
+      missing_parameters: Erforderliche Parameter fehlen
+      no_institution_connected: Bitte verbinden Sie zuerst ein Bankinstitut mit Sophtron.
+      success: "%{account_name} erfolgreich mit Sophtron verknüpft"
+    setup_accounts:
+      account_type_label: "Kontotyp:"
+      all_accounts_linked: "Alle Ihre Sophtron-Konten wurden bereits eingerichtet."
+      api_error: "API-Verbindungsfehler"
+      unexpected_error: "Ein unerwarteter Fehler ist aufgetreten"
+      fetch_failed: "Konten konnten nicht abgerufen werden"
+      no_accounts_to_setup: "Keine Konten zum Einrichten"
+      no_access_key: "Sophtron-Zugriffsschlüssel ist nicht konfiguriert. Bitte überprüfen Sie Ihre Verbindungseinstellungen."
+      no_user_id: "Sophtron-Benutzer-ID ist nicht konfiguriert. Bitte überprüfen Sie Ihre Verbindungseinstellungen."
+      no_institution_connected: "Sophtron-Institut ist noch nicht verbunden."
+      account_types:
+        skip: Dieses Konto überspringen
+        depository: Giro- oder Sparkonto
+        credit_card: Kreditkarte
+        investment: Investmentkonto
+        loan: Darlehen oder Hypothek
+        other_asset: Sonstiger Vermögenswert
+      subtype_labels:
+        depository: "Kontountertyp:"
+        credit_card: ""
+        investment: "Investmenttyp:"
+        loan: "Darlehenstyp:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Kreditkarten werden automatisch als Kreditkartenkonten eingerichtet."
+        other_asset: "Für sonstige Vermögenswerte sind keine zusätzlichen Optionen erforderlich."
+      balance: Saldo
+      cancel: Abbrechen
+      choose_account_type: "Wählen Sie den richtigen Kontotyp für jedes Sophtron-Konto:"
+      create_accounts: Konten erstellen
+      creating_accounts: Konten werden erstellt...
+      historical_data_range: "Historischer Datenbereich:"
+      subtitle: Wählen Sie die richtigen Kontotypen für Ihre importierten Konten
+      sync_start_date_help: Wählen Sie aus, wie weit zurück Sie den Transaktionsverlauf synchronisieren möchten. Maximal 3 Jahre Verlauf verfügbar.
+      sync_start_date_label: "Transaktionen synchronisieren ab:"
+      title: Richten Sie Ihre Sophtron-Konten ein
+    complete_account_setup:
+      all_skipped: "Alle Konten wurden übersprungen. Es wurden keine Konten erstellt."
+      creation_failed: "Konten konnten nicht erstellt werden"
+      api_error: "API-Verbindungsfehler"
+      unexpected_error: "Ein unerwarteter Fehler ist aufgetreten"
+      no_accounts: "Keine Konten zum Einrichten."
+      success: "%{count} Konto(en) erfolgreich erstellt."
+    sync:
+      already_running: Eine manuelle Sophtron-Synchronisierung läuft bereits.
+      api_error: "Manuelle Sophtron-Synchronisierung fehlgeschlagen: %{message}"
+      failed: Manuelle Sophtron-Synchronisierung fehlgeschlagen
+      no_linked_accounts: Dieses Sophtron-Institut hat keine verknüpften Konten zum Synchronisieren.
+      processing_failed: Die manuelle Sophtron-Synchronisierung konnte die aktualisierten Transaktionen nicht verarbeiten.
+      success: Synchronisierung gestartet
+    toggle_manual_sync:
+      success_disabled: Sophtron-Institut wird automatisch synchronisiert.
+      success_enabled: Sophtron-Institut erfordert nun eine manuelle Synchronisierung.
+    manual_sync_complete:
+      close: Schließen
+      description: Die Kontosalden werden im Hintergrund fertig aktualisiert.
+      message: Die Transaktionen wurden nach der Sophtron-Verifizierung heruntergeladen.
+      title: Sophtron-Synchronisierung gestartet
+    sophtron_setup_required:
+      title: Sophtron-Einrichtung erforderlich
+      message: >
+        Um die Einrichtung Ihrer Sophtron-Verbindung abzuschließen, gehen Sie bitte zur Seite mit den Anbietereinstellungen und folgen Sie den Anweisungen, um Ihre Sophtron-Verbindung zu autorisieren und zu konfigurieren.
+      go_to_provider_settings: Zu den Anbietereinstellungen
+      heading: "Benutzer-ID und Zugriffsschlüssel nicht konfiguriert"
+      description: "Bevor Sie Sophtron-Konten verknüpfen können, müssen Sie Ihre Sophtron-Benutzer-ID und Ihren Zugriffsschlüssel konfigurieren."
+      setup_steps_title: "Einrichtungsschritte:"
+      step_1_html: "Gehen Sie zu <strong>Einstellungen → Bank-Sync-Anbieter</strong>"
+      step_2_html: "Suchen Sie den Bereich <strong>Sophtron</strong>"
+      step_3_html: "Geben Sie Ihre Sophtron-Benutzer-ID und Ihren Zugriffsschlüssel ein"
+      step_4: "Kehren Sie hierher zurück, um Ihre Konten zu verknüpfen"
+    api_error:
+      title: "Sophtron-Verbindungsfehler"
+      unable_to_connect: "Verbindung zu Sophtron nicht möglich"
+      institution_unable_to_connect: "Verbindung zum Institut nicht möglich"
+      common_issues_title: "Häufige Probleme:"
+      incorrect_user_id: "Falsche Benutzer-ID: Überprüfen Sie Ihre Benutzer-ID in den Anbietereinstellungen"
+      invalid_access_key: "Ungültiger Zugriffsschlüssel: Überprüfen Sie Ihren Zugriffsschlüssel in den Anbietereinstellungen"
+      expired_credentials: "Abgelaufene Zugangsdaten: Erstellen Sie eine neue Benutzer-ID und einen neuen Zugriffsschlüssel bei Sophtron"
+      network_issue: "Netzwerkproblem: Überprüfen Sie Ihre Internetverbindung"
+      service_down: "Dienst nicht verfügbar: Die Sophtron-API ist möglicherweise vorübergehend nicht verfügbar"
+      bad_credentials: "Bank-Anmeldedaten: Prüfen Sie, ob Benutzername und Passwort korrekt sind"
+      verification_code: "Verifizierungscode: Stellen Sie sicher, dass der neueste Code vor seinem Ablauf eingegeben wurde"
+      institution_timeout: "Zeitüberschreitung des Instituts: Die Bank-Anmeldeseite wurde nicht rechtzeitig abgeschlossen"
+      unsupported_mfa: "MFA-Unterstützung: Sophtron unterstützt möglicherweise den aktuellen Verifizierungsablauf dieses Instituts nicht"
+      check_provider_settings: "Anbietereinstellungen prüfen"
+      try_again: "Erneut verbinden"
+    select_option: "%{type} auswählen"
+    subtype: "Untertyp"
+    type: "Typ"
+    sophtron_panel:
+      setup_instructions_title: "Einrichtungsanweisungen:"
+      setup_instructions:
+        step_1_html: 'Besuchen Sie <a href="%{url}" target="_blank" rel="noopener noreferrer" class="link">Sophtron</a>, um Ihre API-Zugangsdaten zu erhalten'
+        step_2: "Kopieren Sie Ihre Benutzer-ID und Ihren Zugriffsschlüssel aus Ihren Sophtron-Kontoeinstellungen"
+        step_3: "Fügen Sie die Zugangsdaten unten ein und klicken Sie auf Speichern; Sure erstellt oder verwendet Ihre Sophtron-Kunden-ID automatisch"
+      field_descriptions_title: "Feldbeschreibungen:"
+      field_descriptions:
+        user_id_html: "<strong>Benutzer-ID:</strong> Ihre Sophtron-Benutzer-ID-Zugangsdaten"
+        access_key_html: "<strong>Zugriffsschlüssel:</strong> Ihre Sophtron-Zugriffsschlüssel-Zugangsdaten"
+        base_url_html: "<strong>Basis-URL:</strong> Die URL des Sophtron-API-Endpunkts, üblicherweise https://api.sophtron.com/api"
+      fields:
+        user_id:
+          label: "Benutzer-ID"
+          placeholder_new: "Fügen Sie Ihre Sophtron-Benutzer-ID ein"
+          placeholder_edit: "••••••••"
+        access_key:
+          label: "Zugriffsschlüssel"
+          placeholder_new: "Fügen Sie Ihren Sophtron-Zugriffsschlüssel ein"
+          placeholder_edit: "••••••••"
+        base_url:
+          label: "Basis-URL"
+          placeholder: "https://api.sophtron.com/api"
+      save: "Konfiguration speichern"
+      update: "Konfiguration aktualisieren"
+    syncer:
+      manual_sync_required: "Für dieses Institut ist eine manuelle Sophtron-Synchronisierung erforderlich; diese Konten werden während der automatischen Synchronisierung übersprungen."
+      importing_accounts: "Konten werden von Sophtron importiert..."
+      checking_account_configuration: "Kontokonfiguration wird geprüft..."
+      accounts_need_setup: "%{count} Konto(en) müssen eingerichtet werden"
+      processing_transactions: "Transaktionen für verknüpfte Konten werden verarbeitet..."
+      calculating_balances: "Salden für verknüpfte Konten werden berechnet..."
+    sophtron_entry:
+      processor:
+        unknown_transaction: "Unbekannte Transaktion"
+    render_connection_timeout:
+      timeout: "Zeitüberschreitung der Verbindung. Bitte versuchen Sie es erneut."
+    redirect_after_account_link:
+      invalid_account_names:
+        one: "%{count} Konto mit leerem Namen kann nicht verknüpft werden"
+        other: "%{count} Konten mit leeren Namen können nicht verknüpft werden"
+      partial_invalid: "%{created_count} Konto(en) verknüpft. %{already_linked_count} bereits verknüpft, %{invalid_count} hatten ungültige Namen."
+      partial_success: "%{created_count} Konto(en) verknüpft. %{already_linked_count} Konto(en) waren bereits verknüpft."
+      success:
+        one: "%{count} Konto erfolgreich verknüpft."
+        other: "%{count} Konten erfolgreich verknüpft."
+      all_already_linked:
+        one: "Das ausgewählte Konto ist bereits verknüpft"
+        other: "Alle %{count} ausgewählten Konten sind bereits verknüpft"
+      link_failed: "Konten konnten nicht verknüpft werden"
+    start_manual_sync:
+      already_running: "Eine Synchronisierung läuft bereits."
+      no_linked_accounts: "Keine verknüpften Konten zum Synchronisieren verfügbar."
+      api_error: "API-Fehler: %{message}"
+    start_manual_sync_for_account:
+      failed: "Konto konnte nicht synchronisiert werden"
diff --git a/config/locales/views/sophtron_items/es.yml b/config/locales/views/sophtron_items/es.yml
new file mode 100644
index 000000000..f1567857d
--- /dev/null
+++ b/config/locales/views/sophtron_items/es.yml
@@ -0,0 +1,313 @@
+---
+es:
+  sophtron_items:
+    defaults:
+      name: Conexión de Sophtron
+    new:
+      title: Conectar Sophtron
+      user_id: ID de usuario
+      user_id_placeholder: pega tu ID de usuario de Sophtron
+      access_key: Clave de acceso
+      access_key_placeholder: pega tu clave de acceso de Sophtron
+      connect: Conectar
+      cancel: Cancelar
+    create:
+      success: Conexión de Sophtron creada correctamente
+    destroy:
+      success: Conexión de Sophtron eliminada
+    update:
+      success: ¡Conexión de Sophtron actualizada correctamente! Tus cuentas se están reconectando.
+      errors:
+        blank_user_id: Introduce un ID de usuario de Sophtron.
+        invalid_user_id: ID de usuario no válido. Comprueba que has copiado el ID de usuario completo de Sophtron.
+        user_id_compromised: El ID de usuario puede estar comprometido, caducado o ya usado. Crea uno nuevo.
+        blank_access_key: Introduce una clave de acceso de Sophtron.
+        invalid_access_key: Clave de acceso no válida. Comprueba que has copiado la clave de acceso completa de Sophtron.
+        access_key_compromised: La clave de acceso puede estar comprometida, caducada o ya usada. Crea una nueva.
+        update_failed: "No se pudo actualizar la conexión: %{message}"
+        unexpected: Se ha producido un error inesperado. Inténtalo de nuevo o ponte en contacto con el soporte.
+    edit:
+      user_id:
+        label: "ID de usuario de Sophtron:"
+        placeholder: "Pega aquí tu ID de usuario de Sophtron..."
+        help_text: "El ID de usuario debe ser una cadena larga que empieza por letras y números"
+      access_key:
+        label: "Clave de acceso de Sophtron:"
+        placeholder: "Pega aquí tu clave de acceso de Sophtron..."
+        help_text: "La clave de acceso debe ser una cadena larga que empieza por letras y números"
+    index:
+      title: Conexiones de Sophtron
+    loading:
+      loading_message: Cargando cuentas de Sophtron...
+      loading_title: Cargando
+    link_accounts:
+      all_already_linked:
+        one: "La cuenta seleccionada (%{names}) ya está vinculada"
+        other: "Las %{count} cuentas seleccionadas ya están vinculadas: %{names}"
+      api_error: "Error de conexión con la API"
+      invalid_account_names:
+        one: "No se puede vincular una cuenta con el nombre en blanco"
+        other: "No se pueden vincular %{count} cuentas con los nombres en blanco"
+      link_failed: No se pudieron vincular las cuentas
+      no_accounts_selected: Selecciona al menos una cuenta
+      partial_invalid: "Se vincularon %{created_count} cuenta(s) correctamente, %{already_linked_count} ya estaban vinculadas, %{invalid_count} cuenta(s) tenían nombres no válidos"
+      partial_success: "Se vincularon %{created_count} cuenta(s) correctamente. %{already_linked_count} cuenta(s) ya estaban vinculadas: %{already_linked_names}"
+      success:
+        one: "Se ha vinculado %{count} cuenta correctamente"
+        other: "Se han vinculado %{count} cuentas correctamente"
+      no_credentials_configured: "Configura primero tu ID de usuario y tu clave de acceso de la API de Sophtron en los Ajustes del proveedor."
+      no_accounts_found: No se han encontrado cuentas. Comprueba la configuración de tu clave de API.
+      no_access_key: La clave de acceso de Sophtron no está configurada. Configúrala en los Ajustes.
+      no_user_id: El ID de usuario de Sophtron no está configurado. Configúralo en los Ajustes.
+      no_institution_connected: Conecta primero una entidad bancaria con Sophtron.
+    connect:
+      cancel: Cancelar
+      captcha: Captcha
+      connect: Conectar
+      institution_search_label: Entidad
+      institution_search_placeholder: Buscar por nombre del banco
+      no_institutions: No se han encontrado entidades coincidentes.
+      password: Contraseña
+      search: Buscar
+      search_too_short: Introduce al menos dos caracteres para buscar.
+      title: Conectar entidad de Sophtron
+      username: Nombre de usuario
+    connect_institution:
+      api_error: "La conexión con Sophtron ha fallado: %{message}"
+      missing_parameters: Selecciona una entidad e introduce las credenciales de acceso de tu banco.
+    connection_status:
+      api_error: "Error de conexión con la API: %{message}"
+      attempt: "Intento %{attempt} de %{max}"
+      check_again: Volver a comprobar
+      failed: Sophtron no pudo completar esta conexión con la entidad.
+      failed_timeout: Sophtron agotó el tiempo de espera mientras la entidad completaba el acceso.
+      timeout: Sophtron no terminó de conectarse en el tiempo previsto. Puedes volver a comprobarlo o intentar reconectar más tarde.
+      title: Conectando con Sophtron
+      waiting: Sophtron todavía se está conectando con tu entidad.
+    mfa:
+      captcha: Texto del captcha
+      captcha_alt: Captcha de Sophtron
+      phone_confirmed: He confirmado por teléfono
+      submit: Enviar
+      title: Verificación de Sophtron
+      token: Código de verificación
+    submit_mfa:
+      api_error: "La verificación ha fallado: %{message}"
+      invalid_security_answers: Faltan las respuestas de seguridad o son demasiado largas.
+      unknown_challenge: Paso de verificación de Sophtron desconocido.
+    sophtron_item:
+      accounts_need_setup: Las cuentas necesitan configuración
+      automatic_sync: Usar sincronización automática
+      delete: Eliminar conexión
+      deletion_in_progress: eliminación en curso...
+      error: Error
+      no_accounts_description: Esta conexión aún no tiene cuentas vinculadas.
+      no_accounts_title: Sin cuentas
+      manual_sync: Sincronización manual
+      manual_sync_action: Requerir sincronización manual
+      manual_sync_action_for: "Requerir sincronización manual para %{institution}"
+      automatic_sync_for: "Usar sincronización automática para %{institution}"
+      setup_action: Configurar nuevas cuentas
+      setup_description: "%{linked} de %{total} cuentas vinculadas. Elige los tipos de cuenta para tus cuentas de Sophtron recién importadas."
+      setup_needed: Nuevas cuentas listas para configurar
+      status: "Sincronizado hace %{timestamp}"
+      status_never: Nunca sincronizado
+      status_with_summary: "Sincronizado hace %{timestamp} • %{summary}"
+      sync_now: Sincronizar ahora
+      syncing: Sincronizando...
+      total: Total
+      unlinked: Sin vincular
+    preload_accounts:
+      preload_accounts: precargar cuentas
+      api_error: "Error de conexión con la API"
+      unexpected_error: "Se ha producido un error inesperado"
+      no_credentials_configured: "Configura primero tu ID de usuario y tu clave de acceso de la API de Sophtron en los Ajustes del proveedor."
+      no_accounts_found: No se han encontrado cuentas. Comprueba la configuración de tu clave de API.
+      no_access_key: La clave de acceso de Sophtron no está configurada. Configúrala en los Ajustes.
+      no_user_id: El ID de usuario de Sophtron no está configurado. Configúralo en los Ajustes.
+    select_accounts:
+      accounts_selected: cuentas seleccionadas
+      api_error: "Error de conexión con la API"
+      unexpected_error: "Se ha producido un error inesperado"
+      cancel: Cancelar
+      configure_name_in_sophtron: "No se puede importar: configura el nombre de la cuenta en Sophtron"
+      description: Selecciona las cuentas que quieres vincular a tu cuenta de %{product_name}.
+      link_accounts: Vincular cuentas seleccionadas
+      no_accounts_found: No se han encontrado cuentas. Comprueba la configuración de tu clave de API.
+      no_access_key: La clave de acceso de Sophtron no está configurada. Configúrala en los Ajustes.
+      no_user_id: El ID de usuario de Sophtron no está configurado. Configúralo en los Ajustes.
+      no_credentials_configured: "Configura primero tu ID de usuario y tu clave de acceso de la API de Sophtron en los Ajustes del proveedor."
+      no_institution_connected: Conecta primero una entidad bancaria con Sophtron.
+      no_name_placeholder: "(Sin nombre)"
+      title: Seleccionar cuentas de Sophtron
+    select_existing_account:
+      account_already_linked: Esta cuenta ya está vinculada a un proveedor
+      all_accounts_already_linked: Todas las cuentas de Sophtron ya están vinculadas
+      api_error: "Error de conexión con la API"
+      cancel: Cancelar
+      configure_name_in_sophtron: "No se puede importar: configura el nombre de la cuenta en Sophtron"
+      description: Selecciona una cuenta de Sophtron para vincularla a esta cuenta. Las transacciones se sincronizarán y se eliminarán los duplicados automáticamente.
+      link_account: Vincular cuenta
+      no_account_specified: No se ha especificado ninguna cuenta
+      no_accounts_found: No se han encontrado cuentas de Sophtron. Comprueba la configuración de tu clave de API.
+      no_access_key: La clave de acceso de Sophtron no está configurada. Configúrala en los Ajustes.
+      no_user_id: El ID de usuario de Sophtron no está configurado. Configúralo en los Ajustes.
+      no_institution_connected: Conecta primero una entidad bancaria con Sophtron.
+      no_name_placeholder: "(Sin nombre)"
+      title: "Vincular %{account_name} con Sophtron"
+      unexpected_error: "Se ha producido un error inesperado"
+    link_existing_account:
+      account_already_linked: Esta cuenta ya está vinculada a un proveedor
+      api_error: "Error de conexión con la API"
+      unexpected_error: "Se ha producido un error inesperado"
+      invalid_account_name: No se puede vincular una cuenta con el nombre en blanco
+      sophtron_account_already_linked: Esta cuenta de Sophtron ya está vinculada a otra cuenta
+      sophtron_account_not_found: No se ha encontrado la cuenta de Sophtron
+      missing_parameters: Faltan parámetros obligatorios
+      no_institution_connected: Conecta primero una entidad bancaria con Sophtron.
+      success: "%{account_name} vinculada correctamente con Sophtron"
+    setup_accounts:
+      account_type_label: "Tipo de cuenta:"
+      all_accounts_linked: "Todas tus cuentas de Sophtron ya se han configurado."
+      api_error: "Error de conexión con la API"
+      unexpected_error: "Se ha producido un error inesperado"
+      fetch_failed: "No se pudieron obtener las cuentas"
+      no_accounts_to_setup: "No hay cuentas para configurar"
+      no_access_key: "La clave de acceso de Sophtron no está configurada. Comprueba los ajustes de tu conexión."
+      no_user_id: "El ID de usuario de Sophtron no está configurado. Comprueba los ajustes de tu conexión."
+      no_institution_connected: "La entidad de Sophtron aún no está conectada."
+      account_types:
+        skip: Omitir esta cuenta
+        depository: Cuenta corriente o de ahorros
+        credit_card: Tarjeta de crédito
+        investment: Cuenta de inversión
+        loan: Préstamo o hipoteca
+        other_asset: Otro activo
+      subtype_labels:
+        depository: "Subtipo de cuenta:"
+        credit_card: ""
+        investment: "Tipo de inversión:"
+        loan: "Tipo de préstamo:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Las tarjetas de crédito se configurarán automáticamente como cuentas de tarjeta de crédito."
+        other_asset: "No se necesitan opciones adicionales para Otros activos."
+      balance: Saldo
+      cancel: Cancelar
+      choose_account_type: "Elige el tipo de cuenta correcto para cada cuenta de Sophtron:"
+      create_accounts: Crear cuentas
+      creating_accounts: Creando cuentas...
+      historical_data_range: "Rango de datos históricos:"
+      subtitle: Elige los tipos de cuenta correctos para tus cuentas importadas
+      sync_start_date_help: Selecciona hasta qué fecha quieres sincronizar el historial de transacciones. Hay un máximo de 3 años de historial disponible.
+      sync_start_date_label: "Empezar a sincronizar transacciones desde:"
+      title: Configura tus cuentas de Sophtron
+    complete_account_setup:
+      all_skipped: "Se omitieron todas las cuentas. No se ha creado ninguna cuenta."
+      creation_failed: "No se pudieron crear las cuentas"
+      api_error: "Error de conexión con la API"
+      unexpected_error: "Se ha producido un error inesperado"
+      no_accounts: "No hay cuentas para configurar."
+      success: "Se han creado %{count} cuenta(s) correctamente."
+    sync:
+      already_running: Ya hay una sincronización manual de Sophtron en curso.
+      api_error: "La sincronización manual de Sophtron ha fallado: %{message}"
+      failed: La sincronización manual de Sophtron ha fallado
+      no_linked_accounts: Esta entidad de Sophtron no tiene cuentas vinculadas para sincronizar.
+      processing_failed: La sincronización manual de Sophtron no pudo procesar las transacciones actualizadas.
+      success: Sincronización iniciada
+    toggle_manual_sync:
+      success_disabled: La entidad de Sophtron se sincronizará automáticamente.
+      success_enabled: La entidad de Sophtron ahora requiere sincronización manual.
+    manual_sync_complete:
+      close: Cerrar
+      description: Los saldos de las cuentas terminarán de actualizarse en segundo plano.
+      message: Las transacciones se descargaron tras la verificación de Sophtron.
+      title: Sincronización de Sophtron iniciada
+    sophtron_setup_required:
+      title: Configuración de Sophtron necesaria
+      message: >
+        Para completar la configuración de tu conexión de Sophtron, ve a la página de Ajustes del proveedor y sigue las instrucciones para autorizar y configurar tu conexión de Sophtron.
+      go_to_provider_settings: Ir a los Ajustes del proveedor
+      heading: "ID de usuario y clave de acceso no configurados"
+      description: "Antes de poder vincular cuentas de Sophtron, debes configurar tu ID de usuario y tu clave de acceso de Sophtron."
+      setup_steps_title: "Pasos de configuración:"
+      step_1_html: "Ve a <strong>Ajustes → Proveedores de sincronización bancaria</strong>"
+      step_2_html: "Busca la sección <strong>Sophtron</strong>"
+      step_3_html: "Introduce tu ID de usuario y tu clave de acceso de Sophtron"
+      step_4: "Vuelve aquí para vincular tus cuentas"
+    api_error:
+      title: "Error de conexión con Sophtron"
+      unable_to_connect: "No se puede conectar con Sophtron"
+      institution_unable_to_connect: "No se puede conectar con la entidad"
+      common_issues_title: "Problemas habituales:"
+      incorrect_user_id: "ID de usuario incorrecto: Verifica tu ID de usuario en los Ajustes del proveedor"
+      invalid_access_key: "Clave de acceso no válida: Comprueba tu clave de acceso en los Ajustes del proveedor"
+      expired_credentials: "Credenciales caducadas: Genera un nuevo ID de usuario y una nueva clave de acceso en Sophtron"
+      network_issue: "Problema de red: Comprueba tu conexión a internet"
+      service_down: "Servicio no disponible: La API de Sophtron puede estar temporalmente no disponible"
+      bad_credentials: "Credenciales bancarias: Comprueba que el nombre de usuario y la contraseña sean correctos"
+      verification_code: "Código de verificación: Asegúrate de introducir el código más reciente antes de que caduque"
+      institution_timeout: "Tiempo de espera de la entidad agotado: La página de acceso del banco no terminó a tiempo"
+      unsupported_mfa: "Compatibilidad con MFA: Es posible que Sophtron no admita el flujo de verificación actual de esta entidad"
+      check_provider_settings: "Comprobar los Ajustes del proveedor"
+      try_again: "Volver a intentar la conexión"
+    select_option: "Seleccionar %{type}"
+    subtype: "subtipo"
+    type: "tipo"
+    sophtron_panel:
+      setup_instructions_title: "Instrucciones de configuración:"
+      setup_instructions:
+        step_1_html: 'Visita <a href="%{url}" target="_blank" rel="noopener noreferrer" class="link">Sophtron</a> para obtener tus credenciales de API'
+        step_2: "Copia tu ID de usuario y tu clave de acceso desde los ajustes de tu cuenta de Sophtron"
+        step_3: "Pega las credenciales abajo y haz clic en Guardar; Sure creará o reutilizará tu ID de cliente de Sophtron automáticamente"
+      field_descriptions_title: "Descripciones de los campos:"
+      field_descriptions:
+        user_id_html: "<strong>ID de usuario:</strong> Tu credencial de ID de usuario de Sophtron"
+        access_key_html: "<strong>Clave de acceso:</strong> Tu credencial de clave de acceso de Sophtron"
+        base_url_html: "<strong>URL base:</strong> La URL del endpoint de la API de Sophtron, normalmente https://api.sophtron.com/api"
+      fields:
+        user_id:
+          label: "ID de usuario"
+          placeholder_new: "Pega tu ID de usuario de Sophtron"
+          placeholder_edit: "••••••••"
+        access_key:
+          label: "Clave de acceso"
+          placeholder_new: "Pega tu clave de acceso de Sophtron"
+          placeholder_edit: "••••••••"
+        base_url:
+          label: "URL base"
+          placeholder: "https://api.sophtron.com/api"
+      save: "Guardar configuración"
+      update: "Actualizar configuración"
+    syncer:
+      manual_sync_required: "Para esta entidad se requiere una sincronización manual de Sophtron; esas cuentas se omiten durante la sincronización automática."
+      importing_accounts: "Importando cuentas desde Sophtron..."
+      checking_account_configuration: "Comprobando la configuración de la cuenta..."
+      accounts_need_setup: "%{count} cuenta(s) necesitan configuración"
+      processing_transactions: "Procesando transacciones de las cuentas vinculadas..."
+      calculating_balances: "Calculando saldos de las cuentas vinculadas..."
+    sophtron_entry:
+      processor:
+        unknown_transaction: "Transacción desconocida"
+    render_connection_timeout:
+      timeout: "Se ha agotado el tiempo de conexión. Inténtalo de nuevo."
+    redirect_after_account_link:
+      invalid_account_names:
+        one: "No se puede vincular %{count} cuenta con el nombre en blanco"
+        other: "No se pueden vincular %{count} cuentas con los nombres en blanco"
+      partial_invalid: "Se vincularon %{created_count} cuenta(s). %{already_linked_count} ya estaban vinculadas, %{invalid_count} tenían nombres no válidos."
+      partial_success: "Se vincularon %{created_count} cuenta(s). %{already_linked_count} cuenta(s) ya estaban vinculadas."
+      success:
+        one: "Se ha vinculado %{count} cuenta correctamente."
+        other: "Se han vinculado %{count} cuentas correctamente."
+      all_already_linked:
+        one: "La cuenta seleccionada ya está vinculada"
+        other: "Las %{count} cuentas seleccionadas ya están vinculadas"
+      link_failed: "No se pudieron vincular las cuentas"
+    start_manual_sync:
+      already_running: "Ya hay una sincronización en curso."
+      no_linked_accounts: "No hay cuentas vinculadas disponibles para sincronizar."
+      api_error: "Error de la API: %{message}"
+    start_manual_sync_for_account:
+      failed: "No se pudo sincronizar la cuenta"
diff --git a/config/locales/views/sophtron_items/fr.yml b/config/locales/views/sophtron_items/fr.yml
new file mode 100644
index 000000000..459654275
--- /dev/null
+++ b/config/locales/views/sophtron_items/fr.yml
@@ -0,0 +1,379 @@
+---
+fr:
+  sophtron_items:
+    api_error:
+      bad_credentials: 'Identifiants bancaires : vérifiez que le nom d''utilisateur
+        et le mot de passe sont corrects'
+      check_provider_settings: Vérifier les paramètres du fournisseur
+      common_issues_title: 'Problèmes courants :'
+      expired_credentials: 'Informations d''identification expirées : générez un nouvel
+        identifiant utilisateur et une nouvelle clé d''accès à partir de Sophtron'
+      incorrect_user_id: 'ID utilisateur incorrect : vérifiez votre ID utilisateur
+        dans les paramètres du fournisseur'
+      institution_timeout: 'Timeout de l''institution : la page de connexion à la
+        banque ne s''est pas terminée à temps'
+      institution_unable_to_connect: Impossible de se connecter à l'établissement
+      invalid_access_key: 'Clé d''accès invalide : vérifiez votre clé d''accès dans
+        les paramètres du fournisseur'
+      network_issue: 'Problème de réseau : vérifiez votre connexion Internet'
+      service_down: 'Service en panne : l''API Sophtron peut être temporairement indisponible'
+      title: Erreur de connexion Sophtron
+      try_again: Essayez de vous connecter à nouveau
+      unable_to_connect: Impossible de se connecter à Sophtron
+      unsupported_mfa: 'Prise en charge MFA : Sophtron peut ne pas prendre en charge
+        le flux de vérification actuel de cette institution'
+      verification_code: 'Code de vérification : assurez-vous que le dernier code
+        a été saisi avant son expiration'
+    complete_account_setup:
+      all_skipped: Tous les comptes ont été ignorés. Aucun compte n'a été créé.
+      api_error: Erreur de connexion API
+      creation_failed: Échec de la création de comptes
+      no_accounts: Aucun compte à créer.
+      success: Compte(s) %{count} créé avec succès.
+      unexpected_error: Une erreur inattendue s'est produite
+    connect:
+      cancel: Annuler
+      captcha: Captcha
+      connect: Se connecter
+      institution_search_label: Établissement
+      institution_search_placeholder: Rechercher par nom de banque
+      no_institutions: Aucune institution correspondante trouvée.
+      password: Mot de passe
+      search: Rechercher
+      search_too_short: Entrez au moins deux caractères à rechercher.
+      title: Connecter l'établissement Sophtron
+      username: Nom d'utilisateur
+    connect_institution:
+      api_error: 'Échec de la connexion Sophtron : %{message}'
+      missing_parameters: Sélectionnez une institution et saisissez vos identifiants
+        de connexion bancaire.
+    connection_status:
+      api_error: 'Erreur de connexion API : %{message}'
+      attempt: Tentative %{attempt} de %{max}
+      check_again: Vérifiez à nouveau
+      failed: Sophtron n'a pas pu compléter cette connexion institutionnelle.
+      failed_timeout: Sophtron a expiré pendant que l'institution terminait sa connexion.
+      timeout: Sophtron n'a pas fini de se connecter dans le délai prévu. Vous pouvez
+        vérifier à nouveau ou essayer de vous reconnecter plus tard.
+      title: Connexion de Sophtron
+      waiting: Sophtron est toujours connecté à votre établissement.
+    create:
+      success: Connexion Sophtron créée avec succès
+    defaults:
+      name: Connexion Sophtron
+    destroy:
+      success: Connexion Sophtron supprimée
+    edit:
+      access_key:
+        help_text: La clé d'accès doit être une longue chaîne commençant par des lettres
+          et des chiffres.
+        label: 'Clé d''accès Sophtron :'
+        placeholder: Collez votre clé d'accès Sophtron ici...
+      user_id:
+        help_text: L'ID utilisateur doit être une longue chaîne commençant par des
+          lettres et des chiffres.
+        label: 'Identifiant utilisateur Sophtron :'
+        placeholder: Collez votre identifiant Sophtron ici...
+    index:
+      title: Connexions Sophtron
+    link_accounts:
+      all_already_linked:
+        one: Le compte sélectionné (%{names}) est déjà associé
+        other: 'Tous les %{count} comptes sélectionnés sont déjà associés : %{names}'
+      api_error: Erreur de connexion API
+      invalid_account_names:
+        one: Impossible de lier un compte avec un nom vide
+        other: Impossible d'associer les comptes %{count} avec des noms vides
+      link_failed: Échec de l'association des comptes
+      no_access_key: La clé d’accès Sophtron n’est pas configurée. Veuillez le configurer
+        dans Paramètres.
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de
+        votre clé API.
+      no_accounts_selected: Veuillez sélectionner au moins un compte
+      no_credentials_configured: Veuillez d'abord configurer votre identifiant utilisateur
+        et votre clé d'accès de l'API Sophtron dans les paramètres du fournisseur.
+      no_institution_connected: Veuillez d'abord connecter une institution bancaire
+        à Sophtron.
+      no_user_id: L’ID utilisateur Sophtron n’est pas configuré. Veuillez le configurer
+        dans Paramètres.
+      partial_invalid: "%{created_count} comptes ont été associés avec succès, %{already_linked_count}
+        étaient déjà associés, %{invalid_count} comptes avaient des noms non valides"
+      partial_success: 'Compte(s) %{created_count} associé(s) avec succès. %{already_linked_count}
+        comptes étaient déjà associés : %{already_linked_names}'
+      success:
+        one: Compte %{count} associé avec succès
+        other: Comptes %{count} associés avec succès
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      api_error: Erreur de connexion API
+      invalid_account_name: Impossible de lier un compte avec un nom vide
+      missing_parameters: Paramètres requis manquants
+      no_institution_connected: Veuillez d'abord connecter une institution bancaire
+        à Sophtron.
+      sophtron_account_already_linked: Ce compte Sophtron est déjà lié à un autre
+        compte
+      sophtron_account_not_found: Compte Sophtron introuvable
+      success: Liaison réussie de %{account_name} avec Sophtron
+      unexpected_error: Une erreur inattendue s'est produite
+    loading:
+      loading_message: Chargement des comptes Sophtron...
+      loading_title: Chargement
+    manual_sync_complete:
+      close: Fermer
+      description: Les soldes des comptes finiront de se mettre à jour en arrière-plan.
+      message: Les transactions ont été téléchargées après vérification Sophtron.
+      title: Synchronisation Sophtron démarrée
+    mfa:
+      captcha: Texte captcha
+      captcha_alt: Captcha Sophtron
+      phone_confirmed: J'ai confirmé par téléphone
+      submit: Soumettre
+      title: Vérification Sophtron
+      token: Code de vérification
+    new:
+      access_key: Clé d'accès
+      access_key_placeholder: collez votre clé d'accès Sophtron
+      cancel: Annuler
+      connect: Se connecter
+      title: Connecter Sophtron
+      user_id: Identifiant utilisateur
+      user_id_placeholder: collez votre identifiant Sophtron
+    preload_accounts:
+      api_error: Erreur de connexion API
+      no_access_key: La clé d’accès Sophtron n’est pas configurée. Veuillez le configurer
+        dans Paramètres.
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de
+        votre clé API.
+      no_credentials_configured: Veuillez d'abord configurer votre identifiant utilisateur
+        et votre clé d'accès de l'API Sophtron dans les paramètres du fournisseur.
+      no_user_id: L’ID utilisateur Sophtron n’est pas configuré. Veuillez le configurer
+        dans Paramètres.
+      preload_accounts: précharger les comptes
+      unexpected_error: Une erreur inattendue s'est produite
+    redirect_after_account_link:
+      all_already_linked:
+        one: Le compte sélectionné est déjà lié
+        other: Tous les %{count} comptes sélectionnés sont déjà associés
+      invalid_account_names:
+        one: Impossible d'associer le compte %{count} avec un nom vide
+        other: Impossible d'associer les comptes %{count} avec des noms vides
+      link_failed: Échec de l'association des comptes
+      partial_invalid: Compte(s) %{created_count} lié(s). %{already_linked_count}
+        était déjà associé, %{invalid_count} avait des noms non valides.
+      partial_success: Compte(s) %{created_count} lié(s). %{already_linked_count}
+        comptes étaient déjà associés.
+      success:
+        one: Compte %{count} associé avec succès.
+        other: Comptes %{count} associés avec succès.
+    render_connection_timeout:
+      timeout: La connexion a expiré. Veuillez réessayer.
+    select_accounts:
+      accounts_selected: comptes sélectionnés
+      api_error: Erreur de connexion API
+      cancel: Annuler
+      configure_name_in_sophtron: Impossible d'importer - veuillez configurer le nom
+        du compte dans Sophtron
+      description: Sélectionnez les comptes que vous souhaitez associer à votre compte
+        %{product_name}.
+      link_accounts: Associer les comptes sélectionnés
+      no_access_key: La clé d’accès Sophtron n’est pas configurée. Veuillez le configurer
+        dans Paramètres.
+      no_accounts_found: Aucun compte trouvé. Veuillez vérifier la configuration de
+        votre clé API.
+      no_credentials_configured: Veuillez d'abord configurer votre identifiant utilisateur
+        et votre clé d'accès de l'API Sophtron dans les paramètres du fournisseur.
+      no_institution_connected: Veuillez d'abord connecter une institution bancaire
+        à Sophtron.
+      no_name_placeholder: "(Pas de nom)"
+      no_user_id: L’ID utilisateur Sophtron n’est pas configuré. Veuillez le configurer
+        dans Paramètres.
+      title: Sélectionnez les comptes Sophtron
+      unexpected_error: Une erreur inattendue s'est produite
+    select_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur
+      all_accounts_already_linked: Tous les comptes Sophtron sont déjà liés
+      api_error: Erreur de connexion API
+      cancel: Annuler
+      configure_name_in_sophtron: Impossible d'importer - veuillez configurer le nom
+        du compte dans Sophtron
+      description: Sélectionnez un compte Sophtron à associer à ce compte. Les transactions
+        seront synchronisées et dédupliquées automatiquement.
+      link_account: Lier le compte
+      no_access_key: La clé d’accès Sophtron n’est pas configurée. Veuillez le configurer
+        dans Paramètres.
+      no_account_specified: Aucun compte spécifié
+      no_accounts_found: Aucun compte Sophtron trouvé. Veuillez vérifier la configuration
+        de votre clé API.
+      no_institution_connected: Veuillez d'abord connecter une institution bancaire
+        à Sophtron.
+      no_name_placeholder: "(Pas de nom)"
+      no_user_id: L’ID utilisateur Sophtron n’est pas configuré. Veuillez le configurer
+        dans Paramètres.
+      title: Associer %{account_name} à Sophtron
+      unexpected_error: Une erreur inattendue s'est produite
+    select_option: Sélectionnez %{type}
+    setup_accounts:
+      account_type_label: 'Type de compte :'
+      account_types:
+        credit_card: Carte de crédit
+        depository: Compte chèque ou compte d'épargne
+        investment: Compte d'investissement
+        loan: Prêt ou hypothèque
+        other_asset: Autre actif
+        skip: Ignorer ce compte
+      all_accounts_linked: Tous vos comptes Sophtron ont déjà été configurés.
+      api_error: Erreur de connexion API
+      balance: Solde
+      cancel: Annuler
+      choose_account_type: 'Choisissez le type de compte correct pour chaque compte
+        Sophtron :'
+      create_accounts: Créer des comptes
+      creating_accounts: Création de comptes...
+      fetch_failed: Échec de la récupération des comptes
+      historical_data_range: 'Plage de données historiques :'
+      no_access_key: La clé d’accès Sophtron n’est pas configurée. Veuillez vérifier
+        vos paramètres de connexion.
+      no_accounts_to_setup: Aucun compte à configurer
+      no_institution_connected: L'institution Sophtron n'est pas encore connectée.
+      no_user_id: L’ID utilisateur Sophtron n’est pas configuré. Veuillez vérifier
+        vos paramètres de connexion.
+      subtitle: Choisissez les types de comptes corrects pour vos comptes importés
+      subtype_labels:
+        credit_card: ''
+        depository: 'Sous-type de compte :'
+        investment: 'Type d''investissement :'
+        loan: 'Type de prêt :'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Les cartes de crédit seront automatiquement configurées en tant
+          que comptes de carte de crédit.
+        other_asset: Aucune option supplémentaire n'est nécessaire pour les autres
+          actifs.
+      sync_start_date_help: Sélectionnez jusqu'où vous souhaitez synchroniser l'historique
+        des transactions. Maximum 3 ans d’historique disponible.
+      sync_start_date_label: 'Commencez à synchroniser les transactions à partir de :'
+      title: Configurez vos comptes Sophtron
+      unexpected_error: Une erreur inattendue s'est produite
+    sophtron_entry:
+      processor:
+        unknown_transaction: Transaction inconnue
+    sophtron_item:
+      accounts_need_setup: Les comptes doivent être configurés
+      automatic_sync: Utiliser la synchronisation automatique
+      automatic_sync_for: Utiliser la synchronisation automatique pour %{institution}
+      delete: Supprimer la connexion
+      deletion_in_progress: suppression en cours...
+      error: Erreur
+      manual_sync: Synchronisation manuelle
+      manual_sync_action: Exiger une synchronisation manuelle
+      manual_sync_action_for: Exiger une synchronisation manuelle pour %{institution}
+      no_accounts_description: Cette connexion n'a pas encore de compte associé.
+      no_accounts_title: Aucun compte
+      setup_action: Créer de nouveaux comptes
+      setup_description: "%{linked} comptes sur %{total} associés. Choisissez les
+        types de comptes pour vos comptes Sophtron nouvellement importés."
+      setup_needed: Nouveaux comptes prêts à être créés
+      status: Synchronisé il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} • %{summary}
+      sync_now: Synchronisez maintenant
+      syncing: Synchronisation...
+      total: Total
+      unlinked: Sans lien
+    sophtron_panel:
+      field_descriptions:
+        access_key_html: "<strong>Clé d'accès :</strong> votre identifiant de clé
+          d'accès Sophtron"
+        base_url_html: "<strong>URL de base :</strong> l'URL du point de terminaison
+          de l'API Sophtron, généralement https://api.sophtron.com/api"
+        user_id_html: "<strong>ID utilisateur :</strong> votre identifiant d'utilisateur
+          Sophtron"
+      field_descriptions_title: 'Description des champs :'
+      fields:
+        access_key:
+          label: Clé d'accès
+          placeholder_edit: "••••••••"
+          placeholder_new: Collez votre clé d'accès Sophtron
+        base_url:
+          label: URL de base
+          placeholder: https://api.sophtron.com/api
+        user_id:
+          label: Identifiant utilisateur
+          placeholder_edit: "••••••••"
+          placeholder_new: Collez votre identifiant Sophtron
+      save: Enregistrer la configuration
+      setup_instructions:
+        step_1_html: Visitez <a href="%{url}" target="_blank" rel="noopener noreferrer"
+          class="link">Sophtron</a> pour obtenir vos informations d'identification
+          API.
+        step_2: Copiez votre identifiant utilisateur et votre clé d'accès à partir
+          des paramètres de votre compte Sophtron
+        step_3: Collez les informations d'identification ci-dessous et cliquez sur
+          Enregistrer ; Bien sûr, votre identifiant client Sophtron sera automatiquement
+          créé ou réutilisé.
+      setup_instructions_title: 'Instructions de configuration :'
+      update: Mettre à jour la configuration
+    sophtron_setup_required:
+      description: Avant de pouvoir lier des comptes Sophtron, vous devez configurer
+        votre identifiant utilisateur et votre clé d'accès Sophtron.
+      go_to_provider_settings: Accédez aux paramètres du fournisseur
+      heading: ID utilisateur et clé d'accès non configurés
+      message: Pour terminer la configuration de votre connexion Sophtron, veuillez
+        vous rendre sur la page Paramètres du fournisseur et suivez les instructions
+        pour autoriser et configurer votre connexion Sophtron.
+      setup_steps_title: 'Étapes de configuration :'
+      step_1_html: Accédez à <strong>Paramètres → Fournisseurs de synchronisation
+        bancaire</strong>.
+      step_2_html: Retrouvez la rubrique <strong>Sophtron</strong>
+      step_3_html: Entrez votre identifiant utilisateur Sophtron et votre clé d'accès
+      step_4: Revenez ici pour lier vos comptes
+      title: Configuration Sophtron requise
+    start_manual_sync:
+      already_running: Une synchronisation est déjà en cours.
+      api_error: 'Erreur API : %{message}'
+      no_linked_accounts: Aucun compte lié disponible pour la synchronisation.
+    start_manual_sync_for_account:
+      failed: Échec de la synchronisation du compte
+    submit_mfa:
+      api_error: 'Échec de la vérification : %{message}'
+      invalid_security_answers: Les réponses de sécurité sont manquantes ou trop longues.
+      unknown_challenge: Étape de vérification Sophtron inconnue.
+    subtype: sous-type
+    sync:
+      already_running: La synchronisation manuelle Sophtron est déjà en cours.
+      api_error: 'Échec de la synchronisation manuelle Sophtron : %{message}'
+      failed: La synchronisation manuelle de Sophtron a échoué
+      no_linked_accounts: Cette institution Sophtron n'a aucun compte lié à synchroniser.
+      processing_failed: La synchronisation manuelle Sophtron n'a pas pu traiter les
+        transactions actualisées.
+      success: La synchronisation a commencé
+    syncer:
+      accounts_need_setup: "%{count} compte(s) doivent être configurés"
+      calculating_balances: Calcul des soldes des comptes liés...
+      checking_account_configuration: Vérification de la configuration du compte...
+      importing_accounts: Importation de comptes depuis Sophtron...
+      manual_sync_required: La synchronisation manuelle Sophtron est requise pour
+        cette institution ; ignorer ces comptes lors de la synchronisation automatique.
+      processing_transactions: Traitement des transactions pour les comptes liés...
+    toggle_manual_sync:
+      success_disabled: L'institution Sophtron se synchronisera automatiquement.
+      success_enabled: L'institution Sophtron nécessite désormais une synchronisation
+        manuelle.
+    type: type
+    update:
+      errors:
+        access_key_compromised: La clé d'accès peut être compromise, expirée ou déjà
+          utilisée. Veuillez en créer un nouveau.
+        blank_access_key: Veuillez saisir une clé d'accès Sophtron.
+        blank_user_id: Veuillez saisir un identifiant utilisateur Sophtron.
+        invalid_access_key: Clé d'accès invalide. Veuillez vérifier que vous avez
+          copié la clé d'accès complète de Sophtron.
+        invalid_user_id: ID utilisateur invalide. Veuillez vérifier que vous avez
+          copié l'ID utilisateur complet de Sophtron.
+        unexpected: Une erreur inattendue s'est produite. Veuillez réessayer ou contacter
+          l'assistance.
+        update_failed: 'Échec de la mise à jour de la connexion : %{message}'
+        user_id_compromised: L'ID utilisateur peut être compromis, expiré ou déjà
+          utilisé. Veuillez en créer un nouveau.
+      success: Connexion Sophtron mise à jour avec succès ! Vos comptes sont en cours
+        de reconnexion.
diff --git a/config/locales/views/sophtron_items/it.yml b/config/locales/views/sophtron_items/it.yml
new file mode 100644
index 000000000..5048aeb60
--- /dev/null
+++ b/config/locales/views/sophtron_items/it.yml
@@ -0,0 +1,313 @@
+---
+it:
+  sophtron_items:
+    defaults:
+      name: Connessione Sophtron
+    new:
+      title: Connetti Sophtron
+      user_id: ID utente
+      user_id_placeholder: incolla il tuo ID utente Sophtron
+      access_key: Chiave di accesso
+      access_key_placeholder: incolla la tua chiave di accesso Sophtron
+      connect: Connetti
+      cancel: Annulla
+    create:
+      success: Connessione Sophtron creata con successo
+    destroy:
+      success: Connessione Sophtron rimossa
+    update:
+      success: Connessione Sophtron aggiornata con successo! I tuoi conti vengono riconnessi.
+      errors:
+        blank_user_id: Inserisci un ID utente Sophtron.
+        invalid_user_id: ID utente non valido. Verifica di aver copiato l'ID utente completo da Sophtron.
+        user_id_compromised: L'ID utente potrebbe essere compromesso, scaduto o già utilizzato. Creane uno nuovo.
+        blank_access_key: Inserisci una chiave di accesso Sophtron.
+        invalid_access_key: Chiave di accesso non valida. Verifica di aver copiato la chiave di accesso completa da Sophtron.
+        access_key_compromised: La chiave di accesso potrebbe essere compromessa, scaduta o già utilizzata. Creane una nuova.
+        update_failed: "Aggiornamento connessione fallito: %{message}"
+        unexpected: Si è verificato un errore imprevisto. Riprova o contatta il supporto.
+    edit:
+      user_id:
+        label: "ID utente Sophtron:"
+        placeholder: "Incolla qui il tuo ID utente Sophtron..."
+        help_text: "L'ID utente dovrebbe essere una stringa lunga che inizia con lettere e numeri"
+      access_key:
+        label: "Chiave di accesso Sophtron:"
+        placeholder: "Incolla qui la tua chiave di accesso Sophtron..."
+        help_text: "La chiave di accesso dovrebbe essere una stringa lunga che inizia con lettere e numeri"
+    index:
+      title: Connessioni Sophtron
+    loading:
+      loading_message: Caricamento conti Sophtron...
+      loading_title: Caricamento
+    link_accounts:
+      all_already_linked:
+        one: "Il conto selezionato (%{names}) è già collegato"
+        other: "Tutti i %{count} conti selezionati sono già collegati: %{names}"
+      api_error: "Errore di connessione API"
+      invalid_account_names:
+        one: "Impossibile collegare un conto senza nome"
+        other: "Impossibile collegare %{count} conti senza nome"
+      link_failed: Collegamento conti fallito
+      no_accounts_selected: Seleziona almeno un conto
+      partial_invalid: "Collegati con successo %{created_count} conto/i, %{already_linked_count} erano già collegati, %{invalid_count} conto/i aveva nomi non validi"
+      partial_success: "Collegati con successo %{created_count} conto/i. %{already_linked_count} conto/i erano già collegati: %{already_linked_names}"
+      success:
+        one: "Collegato con successo %{count} conto"
+        other: "Collegati con successo %{count} conti"
+      no_credentials_configured: "Configura prima il tuo ID utente e la chiave di accesso API Sophtron nelle Impostazioni provider."
+      no_accounts_found: Nessun conto trovato. Controlla la configurazione della tua chiave API.
+      no_access_key: La chiave di accesso Sophtron non è configurata. Configurala nelle Impostazioni.
+      no_user_id: L'ID utente Sophtron non è configurato. Configuralo nelle Impostazioni.
+      no_institution_connected: Connetti prima un'istituzione bancaria con Sophtron.
+    connect:
+      cancel: Annulla
+      captcha: Captcha
+      connect: Connetti
+      institution_search_label: Istituzione
+      institution_search_placeholder: Cerca per nome banca
+      no_institutions: Nessuna istituzione corrispondente trovata.
+      password: Password
+      search: Cerca
+      search_too_short: Inserisci almeno due caratteri per cercare.
+      title: Connetti istituzione Sophtron
+      username: Nome utente
+    connect_institution:
+      api_error: "Connessione Sophtron fallita: %{message}"
+      missing_parameters: Seleziona un'istituzione e inserisci le credenziali del tuo conto bancario.
+    connection_status:
+      api_error: "Errore di connessione API: %{message}"
+      attempt: "Tentativo %{attempt} di %{max}"
+      check_again: Controlla di nuovo
+      failed: Sophtron non è riuscito a completare la connessione all'istituzione.
+      failed_timeout: Sophtron è andato in timeout mentre l'istituzione completava il login.
+      timeout: Sophtron non ha terminato la connessione nel tempo previsto. Puoi riprovare o connetterti in seguito.
+      title: Connessione Sophtron in corso
+      waiting: Sophtron si sta ancora connettendo alla tua istituzione.
+    mfa:
+      captcha: Testo captcha
+      captcha_alt: Captcha Sophtron
+      phone_confirmed: Ho confermato tramite telefono
+      submit: Invia
+      title: Verifica Sophtron
+      token: Codice di verifica
+    submit_mfa:
+      api_error: "Verifica fallita: %{message}"
+      invalid_security_answers: Le risposte di sicurezza sono mancanti o troppo lunghe.
+      unknown_challenge: Passaggio di verifica Sophtron sconosciuto.
+    sophtron_item:
+      accounts_need_setup: I conti devono essere configurati
+      automatic_sync: Usa sincronizzazione automatica
+      delete: Elimina connessione
+      deletion_in_progress: eliminazione in corso...
+      error: Errore
+      no_accounts_description: Questa connessione non ha ancora conti collegati.
+      no_accounts_title: Nessun conto
+      manual_sync: Sincronizzazione manuale
+      manual_sync_action: Richiedi sincronizzazione manuale
+      manual_sync_action_for: "Richiedi sincronizzazione manuale per %{institution}"
+      automatic_sync_for: "Usa sincronizzazione automatica per %{institution}"
+      setup_action: Configura nuovi conti
+      setup_description: "%{linked} di %{total} conti collegati. Scegli i tipi di conto per i tuoi nuovi conti Sophtron importati."
+      setup_needed: Nuovi conti pronti per la configurazione
+      status: "Sincronizzato %{timestamp} fa"
+      status_never: Mai sincronizzato
+      status_with_summary: "Ultima sincronizzazione %{timestamp} fa • %{summary}"
+      sync_now: Sincronizza ora
+      syncing: Sincronizzazione in corso...
+      total: Totale
+      unlinked: Non collegati
+    preload_accounts:
+      preload_accounts: precarica conti
+      api_error: "Errore di connessione API"
+      unexpected_error: "Si è verificato un errore imprevisto"
+      no_credentials_configured: "Configura prima l'ID utente e la chiave di accesso API Sophtron nelle Impostazioni provider."
+      no_accounts_found: Nessun conto trovato. Controlla la configurazione della chiave API.
+      no_access_key: La chiave di accesso Sophtron non è configurata. Configurala nelle Impostazioni.
+      no_user_id: L'ID utente Sophtron non è configurato. Configuralo nelle Impostazioni.
+    select_accounts:
+      accounts_selected: conti selezionati
+      api_error: "Errore di connessione API"
+      unexpected_error: "Si è verificato un errore imprevisto"
+      cancel: Annulla
+      configure_name_in_sophtron: Impossibile importare - configura il nome del conto in Sophtron
+      description: Seleziona i conti che vuoi collegare al tuo account %{product_name}.
+      link_accounts: Collega i conti selezionati
+      no_accounts_found: Nessun conto trovato. Controlla la configurazione della chiave API.
+      no_access_key: La chiave di accesso Sophtron non è configurata. Configurala nelle Impostazioni.
+      no_user_id: L'ID utente Sophtron non è configurato. Configuralo nelle Impostazioni.
+      no_credentials_configured: "Configura prima l'ID utente e la chiave di accesso API Sophtron nelle Impostazioni provider."
+      no_institution_connected: Connetti prima un'istituzione bancaria con Sophtron.
+      no_name_placeholder: "(Nessun nome)"
+      title: Seleziona conti Sophtron
+    select_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      all_accounts_already_linked: Tutti i conti Sophtron sono già collegati
+      api_error: "Errore di connessione API"
+      cancel: Annulla
+      configure_name_in_sophtron: Impossibile importare - configura il nome del conto in Sophtron
+      description: Seleziona un conto Sophtron da collegare a questo conto. Le transazioni verranno sincronizzate e deduplicate automaticamente.
+      link_account: Collega conto
+      no_account_specified: Nessun conto specificato
+      no_accounts_found: Nessun conto Sophtron trovato. Controlla la configurazione della chiave API.
+      no_access_key: La chiave di accesso Sophtron non è configurata. Configurala nelle Impostazioni.
+      no_user_id: L'ID utente Sophtron non è configurato. Configuralo nelle Impostazioni.
+      no_institution_connected: Connetti prima un'istituzione bancaria con Sophtron.
+      no_name_placeholder: "(Nessun nome)"
+      title: "Collega %{account_name} con Sophtron"
+      unexpected_error: "Si è verificato un errore imprevisto"
+    link_existing_account:
+      account_already_linked: Questo conto è già collegato a un provider
+      api_error: "Errore di connessione API"
+      unexpected_error: "Si è verificato un errore imprevisto"
+      invalid_account_name: Impossibile collegare un conto senza nome
+      sophtron_account_already_linked: Questo conto Sophtron è già collegato a un altro conto
+      sophtron_account_not_found: Conto Sophtron non trovato
+      missing_parameters: Parametri obbligatori mancanti
+      no_institution_connected: Connetti prima un'istituzione bancaria con Sophtron.
+      success: "Collegato con successo %{account_name} con Sophtron"
+    setup_accounts:
+      account_type_label: "Tipo di conto:"
+      all_accounts_linked: "Tutti i tuoi conti Sophtron sono già stati configurati."
+      api_error: "Errore di connessione API"
+      unexpected_error: "Si è verificato un errore imprevisto"
+      fetch_failed: "Recupero conti fallito"
+      no_accounts_to_setup: "Nessun conto da configurare"
+      no_access_key: "La chiave di accesso Sophtron non è configurata. Controlla le impostazioni di connessione."
+      no_user_id: "L'ID utente Sophtron non è configurato. Controlla le impostazioni di connessione."
+      no_institution_connected: "L'istituzione Sophtron non è ancora connessa."
+      account_types:
+        skip: Salta questo conto
+        depository: Conto Corrente o Risparmio
+        credit_card: Carta di credito
+        investment: Conto investimento
+        loan: Prestito o Mutuo
+        other_asset: Altro attivo
+      subtype_labels:
+        depository: "Sottotipo conto:"
+        credit_card: ""
+        investment: "Tipo investimento:"
+        loan: "Tipo prestito:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Le carte di credito saranno configurate automaticamente come conti carta di credito."
+        other_asset: "Nessuna opzione aggiuntiva necessaria per gli altri attivi."
+      balance: Saldo
+      cancel: Annulla
+      choose_account_type: "Scegli il tipo di conto corretto per ogni conto Sophtron:"
+      create_accounts: Crea conti
+      creating_accounts: Creazione conti in corso...
+      historical_data_range: "Intervallo dati storici:"
+      subtitle: Scegli i tipi di conto corretti per i tuoi conti importati
+      sync_start_date_help: Seleziona fino a quando vuoi sincronizzare la cronologia delle transazioni. Disponibili fino a 3 anni di cronologia.
+      sync_start_date_label: "Inizia a sincronizzare le transazioni da:"
+      title: Configura i tuoi conti Sophtron
+    complete_account_setup:
+      all_skipped: "Tutti i conti sono stati saltati. Nessun conto è stato creato."
+      creation_failed: "Creazione conti fallita"
+      api_error: "Errore di connessione API"
+      unexpected_error: "Si è verificato un errore imprevisto"
+      no_accounts: "Nessun conto da configurare."
+      success: "Creati con successo %{count} conto/i."
+    sync:
+      already_running: La sincronizzazione manuale Sophtron è già in corso.
+      api_error: "Sincronizzazione manuale Sophtron fallita: %{message}"
+      failed: Sincronizzazione manuale Sophtron fallita
+      no_linked_accounts: Questa istituzione Sophtron non ha conti collegati da sincronizzare.
+      processing_failed: La sincronizzazione manuale Sophtron non è riuscita a elaborare le transazioni aggiornate.
+      success: Sincronizzazione avviata
+    toggle_manual_sync:
+      success_disabled: L'istituzione Sophtron si sincronizzerà automaticamente.
+      success_enabled: L'istituzione Sophtron richiede ora la sincronizzazione manuale.
+    manual_sync_complete:
+      close: Chiudi
+      description: I saldi dei conti termineranno l'aggiornamento in background.
+      message: Le transazioni sono state scaricate dopo la verifica Sophtron.
+      title: Sincronizzazione Sophtron avviata
+    sophtron_setup_required:
+      title: Configurazione Sophtron richiesta
+      message: >
+        Per completare la configurazione della connessione Sophtron, vai alla pagina Impostazioni provider e segui le istruzioni per autorizzare e configurare la connessione Sophtron.
+      go_to_provider_settings: Vai alle Impostazioni provider
+      heading: "ID utente e chiave di accesso non configurati"
+      description: "Prima di poter collegare i conti Sophtron, devi configurare il tuo ID utente e la chiave di accesso Sophtron."
+      setup_steps_title: "Passaggi di configurazione:"
+      step_1_html: "Vai su <strong>Impostazioni → Provider sincronizzazione bancaria</strong>"
+      step_2_html: "Trova la sezione <strong>Sophtron</strong>"
+      step_3_html: "Inserisci il tuo ID utente e la chiave di accesso Sophtron"
+      step_4: "Torna qui per collegare i tuoi conti"
+    api_error:
+      title: "Errore di connessione Sophtron"
+      unable_to_connect: "Impossibile connettersi a Sophtron"
+      institution_unable_to_connect: "Impossibile connettersi all'istituzione"
+      common_issues_title: "Problemi comuni:"
+      incorrect_user_id: "ID utente errato: verifica il tuo ID utente nelle Impostazioni provider"
+      invalid_access_key: "Chiave di accesso non valida: controlla la tua chiave di accesso nelle Impostazioni provider"
+      expired_credentials: "Credenziali scadute: genera un nuovo ID utente e chiave di accesso da Sophtron"
+      network_issue: "Problema di rete: controlla la tua connessione internet"
+      service_down: "Servizio non disponibile: l'API Sophtron potrebbe essere temporaneamente non disponibile"
+      bad_credentials: "Credenziali bancarie: verifica che username e password siano corretti"
+      verification_code: "Codice di verifica: assicurati che l'ultimo codice sia stato inserito prima della scadenza"
+      institution_timeout: "Timeout istituzione: la pagina di login bancario non ha risposto in tempo"
+      unsupported_mfa: "Supporto MFA: Sophtron potrebbe non supportare il flusso di verifica attuale di questa istituzione"
+      check_provider_settings: "Controlla Impostazioni provider"
+      try_again: "Prova a connetterti di nuovo"
+    select_option: "Seleziona %{type}"
+    subtype: "sottotipo"
+    type: "tipo"
+    sophtron_panel:
+      setup_instructions_title: "Istruzioni di configurazione:"
+      setup_instructions:
+        step_1_html: 'Visita <a href="%{url}" target="_blank" rel="noopener noreferrer" class="link">Sophtron</a> per ottenere le tue credenziali API'
+        step_2: "Copia il tuo ID utente e la chiave di accesso dalle impostazioni del tuo account Sophtron"
+        step_3: "Incolla le credenziali qui sotto e clicca Salva; Sure creerà o riutilizzerà automaticamente il tuo ID cliente Sophtron"
+      field_descriptions_title: "Descrizioni campi:"
+      field_descriptions:
+        user_id_html: "<strong>ID utente:</strong> La tua credenziale ID utente Sophtron"
+        access_key_html: "<strong>Chiave di accesso:</strong> La tua credenziale chiave di accesso Sophtron"
+        base_url_html: "<strong>URL base:</strong> L'URL endpoint API Sophtron, solitamente https://api.sophtron.com/api"
+      fields:
+        user_id:
+          label: "ID utente"
+          placeholder_new: "Incolla il tuo ID utente Sophtron"
+          placeholder_edit: "••••••••"
+        access_key:
+          label: "Chiave di accesso"
+          placeholder_new: "Incolla la tua chiave di accesso Sophtron"
+          placeholder_edit: "••••••••"
+        base_url:
+          label: "URL base"
+          placeholder: "https://api.sophtron.com/api"
+      save: "Salva configurazione"
+      update: "Aggiorna configurazione"
+    syncer:
+      manual_sync_required: "La sincronizzazione manuale Sophtron è richiesta per questa istituzione; i relativi conti vengono saltati durante la sincronizzazione automatica."
+      importing_accounts: "Importazione conti da Sophtron..."
+      checking_account_configuration: "Verifica configurazione conti..."
+      accounts_need_setup: "%{count} conto/i da configurare"
+      processing_transactions: "Elaborazione transazioni per i conti collegati..."
+      calculating_balances: "Calcolo saldi per i conti collegati..."
+    sophtron_entry:
+      processor:
+        unknown_transaction: "Transazione sconosciuta"
+    render_connection_timeout:
+      timeout: "Connessione scaduta. Riprova."
+    redirect_after_account_link:
+      invalid_account_names:
+        one: "Impossibile collegare %{count} conto senza nome"
+        other: "Impossibile collegare %{count} conti senza nome"
+      partial_invalid: "Collegati %{created_count} conto/i. %{already_linked_count} già collegati, %{invalid_count} avevano nomi non validi."
+      partial_success: "Collegati %{created_count} conto/i. %{already_linked_count} conto/i erano già collegati."
+      success:
+        one: "Collegato con successo %{count} conto."
+        other: "Collegati con successo %{count} conti."
+      all_already_linked:
+        one: "Il conto selezionato è già collegato"
+        other: "Tutti i %{count} conti selezionati sono già collegati"
+      link_failed: "Collegamento conti fallito"
+    start_manual_sync:
+      already_running: "Una sincronizzazione è già in corso."
+      no_linked_accounts: "Nessun conto collegato disponibile per la sincronizzazione."
+      api_error: "Errore API: %{message}"
+    start_manual_sync_for_account:
+      failed: "Sincronizzazione conto fallita"
diff --git a/config/locales/views/sophtron_items/nl.yml b/config/locales/views/sophtron_items/nl.yml
new file mode 100644
index 000000000..1dad593af
--- /dev/null
+++ b/config/locales/views/sophtron_items/nl.yml
@@ -0,0 +1,313 @@
+---
+nl:
+  sophtron_items:
+    defaults:
+      name: Sophtron-verbinding
+    new:
+      title: Sophtron verbinden
+      user_id: Gebruikers-ID
+      user_id_placeholder: plak uw Sophtron-gebruikers-ID
+      access_key: Toegangssleutel
+      access_key_placeholder: plak uw Sophtron-toegangssleutel
+      connect: Verbinden
+      cancel: Annuleren
+    create:
+      success: Sophtron-verbinding succesvol aangemaakt
+    destroy:
+      success: Sophtron-verbinding verwijderd
+    update:
+      success: Sophtron-verbinding succesvol bijgewerkt! Uw accounts worden opnieuw verbonden.
+      errors:
+        blank_user_id: Voer een Sophtron-gebruikers-ID in.
+        invalid_user_id: Ongeldige gebruikers-ID. Controleer of u de volledige gebruikers-ID van Sophtron hebt gekopieerd.
+        user_id_compromised: De gebruikers-ID is mogelijk gecompromitteerd, verlopen of al gebruikt. Maak een nieuwe aan.
+        blank_access_key: Voer een Sophtron-toegangssleutel in.
+        invalid_access_key: Ongeldige toegangssleutel. Controleer of u de volledige toegangssleutel van Sophtron hebt gekopieerd.
+        access_key_compromised: De toegangssleutel is mogelijk gecompromitteerd, verlopen of al gebruikt. Maak een nieuwe aan.
+        update_failed: "Verbinding kon niet worden bijgewerkt: %{message}"
+        unexpected: Er is een onverwachte fout opgetreden. Probeer het opnieuw of neem contact op met de ondersteuning.
+    edit:
+      user_id:
+        label: "Sophtron-gebruikers-ID:"
+        placeholder: "Plak hier uw Sophtron-gebruikers-ID..."
+        help_text: "De gebruikers-ID moet een lange tekenreeks zijn die begint met letters en cijfers"
+      access_key:
+        label: "Sophtron-toegangssleutel:"
+        placeholder: "Plak hier uw Sophtron-toegangssleutel..."
+        help_text: "De toegangssleutel moet een lange tekenreeks zijn die begint met letters en cijfers"
+    index:
+      title: Sophtron-verbindingen
+    loading:
+      loading_message: Sophtron-accounts laden...
+      loading_title: Laden
+    link_accounts:
+      all_already_linked:
+        one: "Het geselecteerde account (%{names}) is al gekoppeld"
+        other: "Alle %{count} geselecteerde accounts zijn al gekoppeld: %{names}"
+      api_error: "API-verbindingsfout"
+      invalid_account_names:
+        one: "Kan account met lege naam niet koppelen"
+        other: "Kan %{count} accounts met lege namen niet koppelen"
+      link_failed: Accounts koppelen mislukt
+      no_accounts_selected: Selecteer ten minste één account
+      partial_invalid: "%{created_count} account(s) succesvol gekoppeld, %{already_linked_count} waren al gekoppeld, %{invalid_count} account(s) hadden ongeldige namen"
+      partial_success: "%{created_count} account(s) succesvol gekoppeld. %{already_linked_count} account(s) waren al gekoppeld: %{already_linked_names}"
+      success:
+        one: "%{count} account succesvol gekoppeld"
+        other: "%{count} accounts succesvol gekoppeld"
+      no_credentials_configured: "Configureer eerst uw Sophtron-API-gebruikers-ID en -toegangssleutel in de Provider-instellingen."
+      no_accounts_found: Geen accounts gevonden. Controleer uw API-sleutelconfiguratie.
+      no_access_key: Sophtron-toegangssleutel is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_user_id: Sophtron-gebruikers-ID is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_institution_connected: Verbind eerst een bankinstelling met Sophtron.
+    connect:
+      cancel: Annuleren
+      captcha: Captcha
+      connect: Verbinden
+      institution_search_label: Instelling
+      institution_search_placeholder: Zoeken op banknaam
+      no_institutions: Geen overeenkomende instellingen gevonden.
+      password: Wachtwoord
+      search: Zoeken
+      search_too_short: Voer ten minste twee tekens in om te zoeken.
+      title: Sophtron-instelling verbinden
+      username: Gebruikersnaam
+    connect_institution:
+      api_error: "Sophtron-verbinding mislukt: %{message}"
+      missing_parameters: Selecteer een instelling en voer uw bankinloggegevens in.
+    connection_status:
+      api_error: "API-verbindingsfout: %{message}"
+      attempt: "Poging %{attempt} van %{max}"
+      check_again: Opnieuw controleren
+      failed: Sophtron kon deze instellingsverbinding niet voltooien.
+      failed_timeout: Sophtron kreeg een time-out terwijl de instelling de aanmelding voltooide.
+      timeout: Sophtron heeft het verbinden niet binnen de verwachte tijd voltooid. U kunt opnieuw controleren of later opnieuw proberen te verbinden.
+      title: Sophtron verbinden
+      waiting: Sophtron is nog verbinding aan het maken met uw instelling.
+    mfa:
+      captcha: Captcha-tekst
+      captcha_alt: Sophtron-captcha
+      phone_confirmed: Ik heb telefonisch bevestigd
+      submit: Verzenden
+      title: Sophtron-verificatie
+      token: Verificatiecode
+    submit_mfa:
+      api_error: "Verificatie mislukt: %{message}"
+      invalid_security_answers: Beveiligingsantwoorden ontbreken of zijn te lang.
+      unknown_challenge: Onbekende Sophtron-verificatiestap.
+    sophtron_item:
+      accounts_need_setup: Accounts moeten worden ingesteld
+      automatic_sync: Automatische synchronisatie gebruiken
+      delete: Verbinding verwijderen
+      deletion_in_progress: verwijderen bezig...
+      error: Fout
+      no_accounts_description: Deze verbinding heeft nog geen gekoppelde accounts.
+      no_accounts_title: Geen accounts
+      manual_sync: Handmatige synchronisatie
+      manual_sync_action: Handmatige synchronisatie vereisen
+      manual_sync_action_for: "Handmatige synchronisatie vereisen voor %{institution}"
+      automatic_sync_for: "Automatische synchronisatie gebruiken voor %{institution}"
+      setup_action: Nieuwe accounts instellen
+      setup_description: "%{linked} van %{total} accounts gekoppeld. Kies accounttypes voor uw nieuw geïmporteerde Sophtron-accounts."
+      setup_needed: Nieuwe accounts klaar om in te stellen
+      status: "Gesynchroniseerd %{timestamp} geleden"
+      status_never: Nooit gesynchroniseerd
+      status_with_summary: "Laatst gesynchroniseerd %{timestamp} geleden • %{summary}"
+      sync_now: Nu synchroniseren
+      syncing: Synchroniseren...
+      total: Totaal
+      unlinked: Niet gekoppeld
+    preload_accounts:
+      preload_accounts: accounts vooraf laden
+      api_error: "API-verbindingsfout"
+      unexpected_error: "Er is een onverwachte fout opgetreden"
+      no_credentials_configured: "Configureer eerst uw Sophtron-API-gebruikers-ID en -toegangssleutel in de Provider-instellingen."
+      no_accounts_found: Geen accounts gevonden. Controleer uw API-sleutelconfiguratie.
+      no_access_key: Sophtron-toegangssleutel is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_user_id: Sophtron-gebruikers-ID is niet geconfigureerd. Configureer deze in de Instellingen.
+    select_accounts:
+      accounts_selected: accounts geselecteerd
+      api_error: "API-verbindingsfout"
+      unexpected_error: "Er is een onverwachte fout opgetreden"
+      cancel: Annuleren
+      configure_name_in_sophtron: "Kan niet importeren - configureer de accountnaam in Sophtron"
+      description: Selecteer de accounts die u wilt koppelen aan uw %{product_name}-account.
+      link_accounts: Geselecteerde accounts koppelen
+      no_accounts_found: Geen accounts gevonden. Controleer uw API-sleutelconfiguratie.
+      no_access_key: Sophtron-toegangssleutel is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_user_id: Sophtron-gebruikers-ID is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_credentials_configured: "Configureer eerst uw Sophtron-API-gebruikers-ID en -toegangssleutel in de Provider-instellingen."
+      no_institution_connected: Verbind eerst een bankinstelling met Sophtron.
+      no_name_placeholder: "(Geen naam)"
+      title: Sophtron-accounts selecteren
+    select_existing_account:
+      account_already_linked: Dit account is al gekoppeld aan een provider
+      all_accounts_already_linked: Alle Sophtron-accounts zijn al gekoppeld
+      api_error: "API-verbindingsfout"
+      cancel: Annuleren
+      configure_name_in_sophtron: "Kan niet importeren - configureer de accountnaam in Sophtron"
+      description: Selecteer een Sophtron-account om aan dit account te koppelen. Transacties worden automatisch gesynchroniseerd en ontdubbeld.
+      link_account: Account koppelen
+      no_account_specified: Geen account opgegeven
+      no_accounts_found: Geen Sophtron-accounts gevonden. Controleer uw API-sleutelconfiguratie.
+      no_access_key: Sophtron-toegangssleutel is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_user_id: Sophtron-gebruikers-ID is niet geconfigureerd. Configureer deze in de Instellingen.
+      no_institution_connected: Verbind eerst een bankinstelling met Sophtron.
+      no_name_placeholder: "(Geen naam)"
+      title: "%{account_name} koppelen aan Sophtron"
+      unexpected_error: "Er is een onverwachte fout opgetreden"
+    link_existing_account:
+      account_already_linked: Dit account is al gekoppeld aan een provider
+      api_error: "API-verbindingsfout"
+      unexpected_error: "Er is een onverwachte fout opgetreden"
+      invalid_account_name: Kan account met lege naam niet koppelen
+      sophtron_account_already_linked: Dit Sophtron-account is al gekoppeld aan een ander account
+      sophtron_account_not_found: Sophtron-account niet gevonden
+      missing_parameters: Vereiste parameters ontbreken
+      no_institution_connected: Verbind eerst een bankinstelling met Sophtron.
+      success: "%{account_name} succesvol gekoppeld aan Sophtron"
+    setup_accounts:
+      account_type_label: "Accounttype:"
+      all_accounts_linked: "Al uw Sophtron-accounts zijn al ingesteld."
+      api_error: "API-verbindingsfout"
+      unexpected_error: "Er is een onverwachte fout opgetreden"
+      fetch_failed: "Accounts ophalen mislukt"
+      no_accounts_to_setup: "Geen accounts om in te stellen"
+      no_access_key: "Sophtron-toegangssleutel is niet geconfigureerd. Controleer uw verbindingsinstellingen."
+      no_user_id: "Sophtron-gebruikers-ID is niet geconfigureerd. Controleer uw verbindingsinstellingen."
+      no_institution_connected: "Sophtron-instelling is nog niet verbonden."
+      account_types:
+        skip: Dit account overslaan
+        depository: Betaal- of spaarrekening
+        credit_card: Creditcard
+        investment: Beleggingsaccount
+        loan: Lening of hypotheek
+        other_asset: Overig actief
+      subtype_labels:
+        depository: "Accountsubtype:"
+        credit_card: ""
+        investment: "Beleggingstype:"
+        loan: "Leningtype:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Creditcards worden automatisch ingesteld als creditcardaccounts."
+        other_asset: "Voor overige activa zijn geen aanvullende opties nodig."
+      balance: Saldo
+      cancel: Annuleren
+      choose_account_type: "Kies het juiste accounttype voor elk Sophtron-account:"
+      create_accounts: Accounts aanmaken
+      creating_accounts: Accounts aanmaken...
+      historical_data_range: "Historisch gegevensbereik:"
+      subtitle: Kies de juiste accounttypes voor uw geïmporteerde accounts
+      sync_start_date_help: Selecteer hoe ver terug u de transactiegeschiedenis wilt synchroniseren. Maximaal 3 jaar geschiedenis beschikbaar.
+      sync_start_date_label: "Transacties synchroniseren vanaf:"
+      title: Stel uw Sophtron-accounts in
+    complete_account_setup:
+      all_skipped: "Alle accounts zijn overgeslagen. Er zijn geen accounts aangemaakt."
+      creation_failed: "Accounts konden niet worden aangemaakt"
+      api_error: "API-verbindingsfout"
+      unexpected_error: "Er is een onverwachte fout opgetreden"
+      no_accounts: "Geen accounts om in te stellen."
+      success: "%{count} account(s) succesvol aangemaakt."
+    sync:
+      already_running: Een handmatige Sophtron-synchronisatie is al bezig.
+      api_error: "Handmatige Sophtron-synchronisatie mislukt: %{message}"
+      failed: Handmatige Sophtron-synchronisatie mislukt
+      no_linked_accounts: Deze Sophtron-instelling heeft geen gekoppelde accounts om te synchroniseren.
+      processing_failed: De handmatige Sophtron-synchronisatie kon de bijgewerkte transacties niet verwerken.
+      success: Synchronisatie gestart
+    toggle_manual_sync:
+      success_disabled: Sophtron-instelling wordt automatisch gesynchroniseerd.
+      success_enabled: Sophtron-instelling vereist nu handmatige synchronisatie.
+    manual_sync_complete:
+      close: Sluiten
+      description: De accountsaldi worden op de achtergrond verder bijgewerkt.
+      message: De transacties zijn gedownload na de Sophtron-verificatie.
+      title: Sophtron-synchronisatie gestart
+    sophtron_setup_required:
+      title: Sophtron-installatie vereist
+      message: >
+        Ga naar de pagina met Provider-instellingen en volg de instructies om uw Sophtron-verbinding te autoriseren en te configureren om de installatie van uw Sophtron-verbinding te voltooien.
+      go_to_provider_settings: Ga naar Provider-instellingen
+      heading: "Gebruikers-ID en toegangssleutel niet geconfigureerd"
+      description: "Voordat u Sophtron-accounts kunt koppelen, moet u uw Sophtron-gebruikers-ID en -toegangssleutel configureren."
+      setup_steps_title: "Installatiestappen:"
+      step_1_html: "Ga naar <strong>Instellingen → Bank-sync-providers</strong>"
+      step_2_html: "Zoek het gedeelte <strong>Sophtron</strong>"
+      step_3_html: "Voer uw Sophtron-gebruikers-ID en -toegangssleutel in"
+      step_4: "Kom hier terug om uw accounts te koppelen"
+    api_error:
+      title: "Sophtron-verbindingsfout"
+      unable_to_connect: "Kan geen verbinding maken met Sophtron"
+      institution_unable_to_connect: "Kan geen verbinding maken met de instelling"
+      common_issues_title: "Veelvoorkomende problemen:"
+      incorrect_user_id: "Onjuiste gebruikers-ID: Controleer uw gebruikers-ID in de Provider-instellingen"
+      invalid_access_key: "Ongeldige toegangssleutel: Controleer uw toegangssleutel in de Provider-instellingen"
+      expired_credentials: "Verlopen inloggegevens: Genereer een nieuwe gebruikers-ID en toegangssleutel bij Sophtron"
+      network_issue: "Netwerkprobleem: Controleer uw internetverbinding"
+      service_down: "Dienst niet beschikbaar: De Sophtron-API is mogelijk tijdelijk niet beschikbaar"
+      bad_credentials: "Bankinloggegevens: Controleer of de gebruikersnaam en het wachtwoord correct zijn"
+      verification_code: "Verificatiecode: Zorg ervoor dat de meest recente code is ingevoerd voordat deze verliep"
+      institution_timeout: "Time-out instelling: De bankaanmeldpagina werd niet op tijd voltooid"
+      unsupported_mfa: "MFA-ondersteuning: Sophtron ondersteunt mogelijk de huidige verificatiestroom van deze instelling niet"
+      check_provider_settings: "Provider-instellingen controleren"
+      try_again: "Opnieuw proberen te verbinden"
+    select_option: "%{type} selecteren"
+    subtype: "subtype"
+    type: "type"
+    sophtron_panel:
+      setup_instructions_title: "Installatie-instructies:"
+      setup_instructions:
+        step_1_html: 'Ga naar <a href="%{url}" target="_blank" rel="noopener noreferrer" class="link">Sophtron</a> om uw API-inloggegevens te verkrijgen'
+        step_2: "Kopieer uw gebruikers-ID en toegangssleutel uit uw Sophtron-accountinstellingen"
+        step_3: "Plak de inloggegevens hieronder en klik op Opslaan; Sure maakt of hergebruikt automatisch uw Sophtron-klant-ID"
+      field_descriptions_title: "Veldbeschrijvingen:"
+      field_descriptions:
+        user_id_html: "<strong>Gebruikers-ID:</strong> Uw Sophtron-gebruikers-ID-inloggegeven"
+        access_key_html: "<strong>Toegangssleutel:</strong> Uw Sophtron-toegangssleutel-inloggegeven"
+        base_url_html: "<strong>Basis-URL:</strong> De URL van het Sophtron-API-eindpunt, meestal https://api.sophtron.com/api"
+      fields:
+        user_id:
+          label: "Gebruikers-ID"
+          placeholder_new: "Plak uw Sophtron-gebruikers-ID"
+          placeholder_edit: "••••••••"
+        access_key:
+          label: "Toegangssleutel"
+          placeholder_new: "Plak uw Sophtron-toegangssleutel"
+          placeholder_edit: "••••••••"
+        base_url:
+          label: "Basis-URL"
+          placeholder: "https://api.sophtron.com/api"
+      save: "Configuratie opslaan"
+      update: "Configuratie bijwerken"
+    syncer:
+      manual_sync_required: "Voor deze instelling is een handmatige Sophtron-synchronisatie vereist; deze accounts worden overgeslagen tijdens de automatische synchronisatie."
+      importing_accounts: "Accounts importeren vanuit Sophtron..."
+      checking_account_configuration: "Accountconfiguratie controleren..."
+      accounts_need_setup: "%{count} account(s) moeten worden ingesteld"
+      processing_transactions: "Transacties voor gekoppelde accounts verwerken..."
+      calculating_balances: "Saldi voor gekoppelde accounts berekenen..."
+    sophtron_entry:
+      processor:
+        unknown_transaction: "Onbekende transactie"
+    render_connection_timeout:
+      timeout: "Time-out bij verbinding. Probeer het opnieuw."
+    redirect_after_account_link:
+      invalid_account_names:
+        one: "Kan %{count} account met lege naam niet koppelen"
+        other: "Kan %{count} accounts met lege namen niet koppelen"
+      partial_invalid: "%{created_count} account(s) gekoppeld. %{already_linked_count} al gekoppeld, %{invalid_count} hadden ongeldige namen."
+      partial_success: "%{created_count} account(s) gekoppeld. %{already_linked_count} account(s) waren al gekoppeld."
+      success:
+        one: "%{count} account succesvol gekoppeld."
+        other: "%{count} accounts succesvol gekoppeld."
+      all_already_linked:
+        one: "Het geselecteerde account is al gekoppeld"
+        other: "Alle %{count} geselecteerde accounts zijn al gekoppeld"
+      link_failed: "Accounts koppelen mislukt"
+    start_manual_sync:
+      already_running: "Er is al een synchronisatie bezig."
+      no_linked_accounts: "Geen gekoppelde accounts beschikbaar om te synchroniseren."
+      api_error: "API-fout: %{message}"
+    start_manual_sync_for_account:
+      failed: "Account synchroniseren mislukt"
diff --git a/config/locales/views/sophtron_items/pl.yml b/config/locales/views/sophtron_items/pl.yml
new file mode 100644
index 000000000..a78378052
--- /dev/null
+++ b/config/locales/views/sophtron_items/pl.yml
@@ -0,0 +1,325 @@
+---
+pl:
+  sophtron_items:
+    defaults:
+      name: Połączenie Sophtron
+    new:
+      title: Połącz Sophtron
+      user_id: ID użytkownika
+      user_id_placeholder: wklej swój identyfikator użytkownika Sophtron
+      access_key: Klucz dostępu
+      access_key_placeholder: wklej swój klucz dostępu Sophtron
+      connect: Połącz
+      cancel: Anuluj
+    create:
+      success: Połączenie Sophtron utworzone pomyślnie
+    destroy:
+      success: Połączenie Sophtron usunięte
+    update:
+      success: Połączenie Sophtron zaktualizowane pomyślnie! Twoje konta są ponownie łączone.
+      errors:
+        blank_user_id: Wprowadź identyfikator użytkownika Sophtron.
+        invalid_user_id: Nieprawidłowy identyfikator użytkownika. Sprawdź, czy skopiowałeś kompletny identyfikator z Sophtron.
+        user_id_compromised: Identyfikator użytkownika może być zagrożony, wygasły lub już używany. Utwórz nowy.
+        blank_access_key: Wprowadź klucz dostępu Sophtron.
+        invalid_access_key: Nieprawidłowy klucz dostępu. Sprawdź, czy skopiowałeś kompletny klucz z Sophtron.
+        access_key_compromised: Klucz dostępu może być zagrożony, wygasły lub już używany. Utwórz nowy.
+        update_failed: "Nie udało się zaktualizować połączenia: %{message}"
+        unexpected: Wystąpił nieoczekiwany błąd. Spróbuj ponownie lub skontaktuj się z pomocą techniczną.
+    edit:
+      user_id:
+        label: "Identyfikator użytkownika Sophtron:"
+        placeholder: "Wklej swój identyfikator użytkownika Sophtron tutaj..."
+        help_text: "Identyfikator użytkownika powinien być długim ciągiem zaczynającym się od liter i cyfr"
+      access_key:
+        label: "Klucz dostępu Sophtron:"
+        placeholder: "Wklej swój klucz dostępu Sophtron tutaj..."
+        help_text: "Klucz dostępu powinien być długim ciągiem zaczynającym się od liter i cyfr"
+    index:
+      title: Połączenia Sophtron
+    loading:
+      loading_message: Ładowanie kont Sophtron...
+      loading_title: Ładowanie
+    link_accounts:
+      all_already_linked:
+        few: "Wszystkie %{count} wybrane konta są już połączone: %{names}"
+        many: "Wszystkie %{count} wybranych kont jest już połączonych: %{names}"
+        one: "Wybrane konto (%{names}) jest już połączone"
+        other: "Wszystkie %{count} wybranych kont jest już połączonych: %{names}"
+      api_error: "Błąd połączenia API"
+      invalid_account_names:
+        few: "Nie można połączyć %{count} kont z pustymi nazwami"
+        many: "Nie można połączyć %{count} kont z pustymi nazwami"
+        one: "Nie można połączyć konta z pustą nazwą"
+        other: "Nie można połączyć %{count} kont z pustymi nazwami"
+      link_failed: Nie można połączyć kont
+      no_accounts_selected: Wybierz co najmniej jedno konto
+      partial_invalid: "Połączono %{created_count}, %{already_linked_count} było już połączonych, %{invalid_count} miało nieprawidłowe nazwy"
+      partial_success: "Połączono %{created_count}. %{already_linked_count} było już połączonych: %{already_linked_names}"
+      success:
+        few: "Połączono %{count} konta"
+        many: "Połączono %{count} kont"
+        one: "Połączono %{count} konto"
+        other: "Połączono %{count} kont"
+      no_credentials_configured: "Najpierw skonfiguruj identyfikator użytkownika API i klucz dostępu Sophtron w ustawieniach dostawcy."
+      no_accounts_found: Nie znaleziono kont. Sprawdź konfigurację klucza API.
+      no_access_key: Klucz dostępu Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_user_id: Identyfikator użytkownika Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_institution_connected: Najpierw połącz instytucję bankową z Sophtron.
+    connect:
+      cancel: Anuluj
+      captcha: Captcha
+      connect: Połącz
+      institution_search_label: Instytucja
+      institution_search_placeholder: Szukaj po nazwie banku
+      no_institutions: Nie znaleziono pasujących instytucji.
+      password: Hasło
+      search: Szukaj
+      search_too_short: Wprowadź co najmniej dwa znaki, aby wyszukać.
+      title: Połącz instytucję Sophtron
+      username: Nazwa użytkownika
+    connect_institution:
+      api_error: "Połączenie Sophtron nie powiodło się: %{message}"
+      missing_parameters: Wybierz instytucję i wprowadź dane logowania do banku.
+    connection_status:
+      api_error: "Błąd połączenia API: %{message}"
+      attempt: "Próba %{attempt} z %{max}"
+      check_again: Sprawdź ponownie
+      failed: Sophtron nie mógł zakończyć połączenia z tą instytucją.
+      failed_timeout: Sophtron przekroczył limit czasu podczas logowania do instytucji.
+      timeout: Sophtron nie zakończył połączenia w oczekiwanym czasie. Możesz sprawdzić ponownie lub spróbować połączyć później.
+      title: Łączenie Sophtron
+      waiting: Sophtron wciąż łączy się z Twoją instytucją.
+    mfa:
+      captcha: Tekst captcha
+      captcha_alt: Captcha Sophtron
+      phone_confirmed: Potwierdziłem telefonicznie
+      submit: Wyślij
+      title: Weryfikacja Sophtron
+      token: Kod weryfikacyjny
+    submit_mfa:
+      api_error: "Weryfikacja nie powiodła się: %{message}"
+      invalid_security_answers: Odpowiedzi bezpieczeństwa są puste lub zbyt długie.
+      unknown_challenge: Nieznany krok weryfikacji Sophtron.
+    sophtron_item:
+      accounts_need_setup: Konta wymagają konfiguracji
+      automatic_sync: Użyj automatycznej synchronizacji
+      delete: Usuń połączenie
+      deletion_in_progress: trwa usuwanie...
+      error: Błąd
+      no_accounts_description: To połączenie nie ma jeszcze połączonych kont.
+      no_accounts_title: Brak kont
+      manual_sync: Ręczna synchronizacja
+      manual_sync_action: Wymagaj ręcznej synchronizacji
+      manual_sync_action_for: "Wymagaj ręcznej synchronizacji dla %{institution}"
+      automatic_sync_for: "Użyj automatycznej synchronizacji dla %{institution}"
+      setup_action: Skonfiguruj nowe konta
+      setup_description: "%{linked} z %{total} kont połączonych. Wybierz typy kont dla nowo zaimportowanych kont Sophtron."
+      setup_needed: Nowe konta gotowe do konfiguracji
+      status: "Zsynchronizowano %{timestamp} temu"
+      status_never: Nigdy nie synchronizowano
+      status_with_summary: "Ostatnia synchronizacja %{timestamp} temu • %{summary}"
+      sync_now: Synchronizuj teraz
+      syncing: Synchronizowanie...
+      total: Łącznie
+      unlinked: Niepołączone
+    preload_accounts:
+      preload_accounts: wstępnie załaduj konta
+      api_error: "Błąd połączenia API"
+      unexpected_error: "Wystąpił nieoczekiwany błąd"
+      no_credentials_configured: "Najpierw skonfiguruj identyfikator użytkownika API i klucz dostępu Sophtron w ustawieniach dostawcy."
+      no_accounts_found: Nie znaleziono kont. Sprawdź konfigurację klucza API.
+      no_access_key: Klucz dostępu Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_user_id: Identyfikator użytkownika Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+    select_accounts:
+      accounts_selected: wybrane konta
+      api_error: "Błąd połączenia API"
+      unexpected_error: "Wystąpił nieoczekiwany błąd"
+      cancel: Anuluj
+      configure_name_in_sophtron: Nie można zaimportować - skonfiguruj nazwę konta w Sophtron
+      description: Wybierz konta, które chcesz połączyć ze swoim kontem %{product_name}.
+      link_accounts: Połącz wybrane konta
+      no_accounts_found: Nie znaleziono kont. Sprawdź konfigurację klucza API.
+      no_access_key: Klucz dostępu Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_user_id: Identyfikator użytkownika Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_credentials_configured: "Najpierw skonfiguruj identyfikator użytkownika API i klucz dostępu Sophtron w ustawieniach dostawcy."
+      no_institution_connected: Najpierw połącz instytucję bankową z Sophtron.
+      no_name_placeholder: "(Bez nazwy)"
+      title: Wybierz konta Sophtron
+    select_existing_account:
+      account_already_linked: To konto jest już połączone z dostawcą
+      all_accounts_already_linked: Wszystkie konta Sophtron są już połączone
+      api_error: "Błąd połączenia API"
+      cancel: Anuluj
+      configure_name_in_sophtron: Nie można zaimportować - skonfiguruj nazwę konta w Sophtron
+      description: Wybierz konto Sophtron do połączenia z tym kontem. Transakcje będą synchronizowane i deduplikowane automatycznie.
+      link_account: Połącz konto
+      no_account_specified: Nie określono konta
+      no_accounts_found: Nie znaleziono kont Sophtron. Sprawdź konfigurację klucza API.
+      no_access_key: Klucz dostępu Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_user_id: Identyfikator użytkownika Sophtron nie jest skonfigurowany. Skonfiguruj go w Ustawieniach.
+      no_institution_connected: Najpierw połącz instytucję bankową z Sophtron.
+      no_name_placeholder: "(Bez nazwy)"
+      title: "Połącz %{account_name} z Sophtron"
+      unexpected_error: "Wystąpił nieoczekiwany błąd"
+    link_existing_account:
+      account_already_linked: To konto jest już połączone z dostawcą
+      api_error: "Błąd połączenia API"
+      unexpected_error: "Wystąpił nieoczekiwany błąd"
+      invalid_account_name: Nie można połączyć konta z pustą nazwą
+      sophtron_account_already_linked: To konto Sophtron jest już połączone z innym kontem
+      sophtron_account_not_found: Nie znaleziono konta Sophtron
+      missing_parameters: Brak wymaganych parametrów
+      no_institution_connected: Najpierw połącz instytucję bankową z Sophtron.
+      success: "Połączono %{account_name} z Sophtron"
+    setup_accounts:
+      account_type_label: "Typ konta:"
+      all_accounts_linked: "Wszystkie konta Sophtron zostały już skonfigurowane."
+      api_error: "Błąd połączenia API"
+      unexpected_error: "Wystąpił nieoczekiwany błąd"
+      fetch_failed: "Nie można pobrać kont"
+      no_accounts_to_setup: "Brak kont do skonfigurowania"
+      no_access_key: "Klucz dostępu Sophtron nie jest skonfigurowany. Sprawdź ustawienia połączenia."
+      no_user_id: "Identyfikator użytkownika Sophtron nie jest skonfigurowany. Sprawdź ustawienia połączenia."
+      no_institution_connected: "Instytucja Sophtron nie jest jeszcze połączona."
+      account_types:
+        skip: Pomiń to konto
+        depository: Konto czekowe lub oszczędnościowe
+        credit_card: Karta kredytowa
+        investment: Konto inwestycyjne
+        loan: Pożyczka lub hipoteka
+        other_asset: Inny składnik aktywów
+      subtype_labels:
+        depository: "Podtyp konta:"
+        credit_card: ""
+        investment: "Typ inwestycji:"
+        loan: "Typ pożyczki:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Karty kredytowe zostaną automatycznie skonfigurowane jako konta kart kredytowych."
+        other_asset: "Nie są wymagane żadne dodatkowe opcje dla innych aktywów."
+      balance: Saldo
+      cancel: Anuluj
+      choose_account_type: "Wybierz odpowiedni typ konta dla każdego konta Sophtron:"
+      create_accounts: Utwórz konta
+      creating_accounts: Tworzenie kont...
+      historical_data_range: "Zakres danych historycznych:"
+      subtitle: Wybierz odpowiednie typy kont dla zaimportowanych kont
+      sync_start_date_help: Wybierz, jak daleko wstecz chcesz synchronizować historię transakcji. Dostępne maksymalnie 3 lata historii.
+      sync_start_date_label: "Rozpocznij synchronizację transakcji od:"
+      title: Skonfiguruj konta Sophtron
+    complete_account_setup:
+      all_skipped: "Wszystkie konta zostały pominięte. Nie utworzono żadnych kont."
+      creation_failed: "Nie utworzono kont"
+      api_error: "Błąd połączenia API"
+      unexpected_error: "Wystąpił nieoczekiwany błąd"
+      no_accounts: "Brak kont do skonfigurowania."
+      success: "Utworzono %{count} konto(a)."
+    sync:
+      already_running: Ręczna synchronizacja Sophtron jest już w toku.
+      api_error: "Ręczna synchronizacja Sophtron nie powiodła się: %{message}"
+      failed: Ręczna synchronizacja Sophtron nie powiodła się
+      no_linked_accounts: Ta instytucja Sophtron nie ma połączonych kont do synchronizacji.
+      processing_failed: Ręczna synchronizacja Sophtron nie mogła przetworzyć odświeżonych transakcji.
+      success: Synchronizacja rozpoczęta
+    toggle_manual_sync:
+      success_disabled: Instytucja Sophtron będzie synchronizować automatycznie.
+      success_enabled: Instytucja Sophtron wymaga teraz ręcznej synchronizacji.
+    manual_sync_complete:
+      close: Zamknij
+      description: Salda kont zostaną zaktualizowane w tle.
+      message: Transakcje zostały pobrane po weryfikacji Sophtron.
+      title: Synchronizacja Sophtron rozpoczęta
+    sophtron_setup_required:
+      title: Wymagana konfiguracja Sophtron
+      message: >
+        Aby zakończyć konfigurację połączenia Sophtron, przejdź do strony ustawień dostawcy i postępuj zgodnie z instrukcjami, aby autoryzować i skonfigurować połączenie Sophtron.
+      go_to_provider_settings: Przejdź do ustawień dostawcy
+      heading: "Identyfikator użytkownika i klucz dostępu nie są skonfigurowane"
+      description: "Zanim będziesz mógł połączyć konta Sophtron, musisz skonfigurować identyfikator użytkownika i klucz dostępu Sophtron."
+      setup_steps_title: "Kroki konfiguracji:"
+      step_1_html: "Przejdź do <strong>Ustawienia → Dostawcy synchronizacji bankowej</strong>"
+      step_2_html: "Znajdź sekcję <strong>Sophtron</strong>"
+      step_3_html: "Wprowadź identyfikator użytkownika i klucz dostępu Sophtron"
+      step_4: "Wróć tutaj, aby połączyć konta"
+    api_error:
+      title: "Błąd połączenia Sophtron"
+      unable_to_connect: "Nie można połączyć z Sophtron"
+      institution_unable_to_connect: "Nie można połączyć z instytucją"
+      common_issues_title: "Najczęstsze problemy:"
+      incorrect_user_id: "Nieprawidłowy identyfikator użytkownika: Sprawdź identyfikator w ustawieniach dostawcy"
+      invalid_access_key: "Nieprawidłowy klucz dostępu: Sprawdź klucz w ustawieniach dostawcy"
+      expired_credentials: "Wygasłe dane uwierzytelniające: Wygeneruj nowy identyfikator użytkownika i klucz dostępu z Sophtron"
+      network_issue: "Problem z siecią: Sprawdź połączenie internetowe"
+      service_down: "Usługa niedostępna: API Sophtron może być tymczasowo niedostępne"
+      bad_credentials: "Dane logowania do banku: Sprawdź, czy nazwa użytkownika i hasło są prawidłowe"
+      verification_code: "Kod weryfikacyjny: Upewnij się, że ostatni kod został wprowadzony przed wygaśnięciem"
+      institution_timeout: "Limit czasu instytucji: Strona logowania banku nie zakończyła się na czas"
+      unsupported_mfa: "Obsługa MFA: Sophtron może nie obsługiwać bieżącego przepływu weryfikacji tej instytucji"
+      check_provider_settings: "Sprawdź ustawienia dostawcy"
+      try_again: "Spróbuj połączyć ponownie"
+    select_option: "Wybierz %{type}"
+    subtype: "podtyp"
+    type: "typ"
+    sophtron_panel:
+      setup_instructions_title: "Instrukcje konfiguracji:"
+      setup_instructions:
+        step_1_html: 'Odwiedź <a href="%{url}" target="_blank" rel="noopener noreferrer" class="link">Sophtron</a>, aby uzyskać dane uwierzytelniające API'
+        step_2: "Skopiuj identyfikator użytkownika i klucz dostępu z ustawień konta Sophtron"
+        step_3: "Wklej dane uwierzytelniające poniżej i kliknij Zapisz; Sure automatycznie utworzy lub ponownie użyje Twojego identyfikatora klienta Sophtron"
+      field_descriptions_title: "Opisy pól:"
+      field_descriptions:
+        user_id_html: "<strong>Identyfikator użytkownika:</strong> Twój identyfikator użytkownika Sophtron"
+        access_key_html: "<strong>Klucz dostępu:</strong> Twój klucz dostępu Sophtron"
+        base_url_html: "<strong>Bazowy URL:</strong> Adres URL punktu końcowego API Sophtron, zazwyczaj https://api.sophtron.com/api"
+      fields:
+        user_id:
+          label: "Identyfikator użytkownika"
+          placeholder_new: "Wklej swój identyfikator użytkownika Sophtron"
+          placeholder_edit: "••••••••"
+        access_key:
+          label: "Klucz dostępu"
+          placeholder_new: "Wklej swój klucz dostępu Sophtron"
+          placeholder_edit: "••••••••"
+        base_url:
+          label: "Bazowy URL"
+          placeholder: "https://api.sophtron.com/api"
+      save: "Zapisz konfigurację"
+      update: "Aktualizuj konfigurację"
+    syncer:
+      manual_sync_required: "Ręczna synchronizacja Sophtron jest wymagana dla tej instytucji; pomijanie tych kont podczas automatycznej synchronizacji."
+      importing_accounts: "Importowanie kont z Sophtron..."
+      checking_account_configuration: "Sprawdzanie konfiguracji konta..."
+      accounts_need_setup: "%{count} kont wymaga konfiguracji"
+      processing_transactions: "Przetwarzanie transakcji dla połączonych kont..."
+      calculating_balances: "Obliczanie sald dla połączonych kont..."
+    sophtron_entry:
+      processor:
+        unknown_transaction: "Nieznana transakcja"
+    render_connection_timeout:
+      timeout: "Połączenie przekroczyło limit czasu. Spróbuj ponownie."
+    redirect_after_account_link:
+      invalid_account_names:
+        few: "Nie można połączyć %{count} kont z pustymi nazwami"
+        many: "Nie można połączyć %{count} kont z pustymi nazwami"
+        one: "Nie można połączyć %{count} konta z pustą nazwą"
+        other: "Nie można połączyć %{count} kont z pustymi nazwami"
+      partial_invalid: "Połączono %{created_count} konto(a). %{already_linked_count} już połączonych, %{invalid_count} miało nieprawidłowe nazwy."
+      partial_success: "Połączono %{created_count} konto(a). %{already_linked_count} było już połączonych."
+      success:
+        few: "Połączono %{count} konta."
+        many: "Połączono %{count} kont."
+        one: "Połączono %{count} konto."
+        other: "Połączono %{count} kont."
+      all_already_linked:
+        few: "Wszystkie %{count} wybrane konta są już połączone"
+        many: "Wszystkie %{count} wybranych kont jest już połączonych"
+        one: "Wybrane konto jest już połączone"
+        other: "Wszystkie %{count} wybranych kont jest już połączonych"
+      link_failed: "Nie można połączyć kont"
+    start_manual_sync:
+      already_running: "Synchronizacja jest już w toku."
+      no_linked_accounts: "Brak połączonych kont do synchronizacji."
+      api_error: "Błąd API: %{message}"
+    start_manual_sync_for_account:
+      failed: "Nie można zsynchronizować konta"
diff --git a/config/locales/views/sophtron_items/pt-BR.yml b/config/locales/views/sophtron_items/pt-BR.yml
new file mode 100644
index 000000000..b88ca97b3
--- /dev/null
+++ b/config/locales/views/sophtron_items/pt-BR.yml
@@ -0,0 +1,313 @@
+---
+pt-BR:
+  sophtron_items:
+    defaults:
+      name: Conexão da Sophtron
+    new:
+      title: Conectar a Sophtron
+      user_id: ID de usuário
+      user_id_placeholder: cole seu ID de usuário da Sophtron
+      access_key: Chave de acesso
+      access_key_placeholder: cole sua chave de acesso da Sophtron
+      connect: Conectar
+      cancel: Cancelar
+    create:
+      success: Conexão da Sophtron criada com sucesso
+    destroy:
+      success: Conexão da Sophtron removida
+    update:
+      success: Conexão da Sophtron atualizada com sucesso! Suas contas estão sendo reconectadas.
+      errors:
+        blank_user_id: Insira um ID de usuário da Sophtron.
+        invalid_user_id: ID de usuário inválido. Verifique se você copiou o ID de usuário completo da Sophtron.
+        user_id_compromised: O ID de usuário pode estar comprometido, expirado ou já usado. Crie um novo.
+        blank_access_key: Insira uma chave de acesso da Sophtron.
+        invalid_access_key: Chave de acesso inválida. Verifique se você copiou a chave de acesso completa da Sophtron.
+        access_key_compromised: A chave de acesso pode estar comprometida, expirada ou já usada. Crie uma nova.
+        update_failed: "Não foi possível atualizar a conexão: %{message}"
+        unexpected: Ocorreu um erro inesperado. Tente novamente ou entre em contato com o suporte.
+    edit:
+      user_id:
+        label: "ID de usuário da Sophtron:"
+        placeholder: "Cole aqui seu ID de usuário da Sophtron..."
+        help_text: "O ID de usuário deve ser uma sequência longa que começa com letras e números"
+      access_key:
+        label: "Chave de acesso da Sophtron:"
+        placeholder: "Cole aqui sua chave de acesso da Sophtron..."
+        help_text: "A chave de acesso deve ser uma sequência longa que começa com letras e números"
+    index:
+      title: Conexões da Sophtron
+    loading:
+      loading_message: Carregando contas da Sophtron...
+      loading_title: Carregando
+    link_accounts:
+      all_already_linked:
+        one: "A conta selecionada (%{names}) já está vinculada"
+        other: "Todas as %{count} contas selecionadas já estão vinculadas: %{names}"
+      api_error: "Erro de conexão com a API"
+      invalid_account_names:
+        one: "Não é possível vincular uma conta com o nome em branco"
+        other: "Não é possível vincular %{count} contas com os nomes em branco"
+      link_failed: Não foi possível vincular as contas
+      no_accounts_selected: Selecione pelo menos uma conta
+      partial_invalid: "%{created_count} conta(s) vinculada(s) com sucesso, %{already_linked_count} já estavam vinculadas, %{invalid_count} conta(s) tinham nomes inválidos"
+      partial_success: "%{created_count} conta(s) vinculada(s) com sucesso. %{already_linked_count} conta(s) já estavam vinculadas: %{already_linked_names}"
+      success:
+        one: "%{count} conta vinculada com sucesso"
+        other: "%{count} contas vinculadas com sucesso"
+      no_credentials_configured: "Configure primeiro seu ID de usuário e sua chave de acesso da API da Sophtron nas Configurações do provedor."
+      no_accounts_found: Nenhuma conta encontrada. Verifique a configuração da sua chave de API.
+      no_access_key: A chave de acesso da Sophtron não está configurada. Configure-a nas Configurações.
+      no_user_id: O ID de usuário da Sophtron não está configurado. Configure-o nas Configurações.
+      no_institution_connected: Conecte primeiro uma instituição bancária à Sophtron.
+    connect:
+      cancel: Cancelar
+      captcha: Captcha
+      connect: Conectar
+      institution_search_label: Instituição
+      institution_search_placeholder: Pesquisar pelo nome do banco
+      no_institutions: Nenhuma instituição correspondente encontrada.
+      password: Senha
+      search: Pesquisar
+      search_too_short: Insira pelo menos dois caracteres para pesquisar.
+      title: Conectar instituição da Sophtron
+      username: Nome de usuário
+    connect_institution:
+      api_error: "A conexão com a Sophtron falhou: %{message}"
+      missing_parameters: Selecione uma instituição e insira as credenciais de acesso do seu banco.
+    connection_status:
+      api_error: "Erro de conexão com a API: %{message}"
+      attempt: "Tentativa %{attempt} de %{max}"
+      check_again: Verificar novamente
+      failed: A Sophtron não conseguiu concluir esta conexão com a instituição.
+      failed_timeout: A Sophtron atingiu o tempo limite enquanto a instituição concluía o acesso.
+      timeout: A Sophtron não concluiu a conexão dentro do tempo esperado. Você pode verificar novamente ou tentar reconectar mais tarde.
+      title: Conectando à Sophtron
+      waiting: A Sophtron ainda está se conectando à sua instituição.
+    mfa:
+      captcha: Texto do captcha
+      captcha_alt: Captcha da Sophtron
+      phone_confirmed: Confirmei por telefone
+      submit: Enviar
+      title: Verificação da Sophtron
+      token: Código de verificação
+    submit_mfa:
+      api_error: "A verificação falhou: %{message}"
+      invalid_security_answers: As respostas de segurança estão ausentes ou são muito longas.
+      unknown_challenge: Etapa de verificação da Sophtron desconhecida.
+    sophtron_item:
+      accounts_need_setup: As contas precisam de configuração
+      automatic_sync: Usar sincronização automática
+      delete: Excluir conexão
+      deletion_in_progress: exclusão em andamento...
+      error: Erro
+      no_accounts_description: Esta conexão ainda não tem contas vinculadas.
+      no_accounts_title: Sem contas
+      manual_sync: Sincronização manual
+      manual_sync_action: Exigir sincronização manual
+      manual_sync_action_for: "Exigir sincronização manual para %{institution}"
+      automatic_sync_for: "Usar sincronização automática para %{institution}"
+      setup_action: Configurar novas contas
+      setup_description: "%{linked} de %{total} contas vinculadas. Escolha os tipos de conta para suas contas da Sophtron recém-importadas."
+      setup_needed: Novas contas prontas para configurar
+      status: "Sincronizado há %{timestamp}"
+      status_never: Nunca sincronizado
+      status_with_summary: "Sincronizado há %{timestamp} • %{summary}"
+      sync_now: Sincronizar agora
+      syncing: Sincronizando...
+      total: Total
+      unlinked: Não vinculada
+    preload_accounts:
+      preload_accounts: pré-carregar contas
+      api_error: "Erro de conexão com a API"
+      unexpected_error: "Ocorreu um erro inesperado"
+      no_credentials_configured: "Configure primeiro seu ID de usuário e sua chave de acesso da API da Sophtron nas Configurações do provedor."
+      no_accounts_found: Nenhuma conta encontrada. Verifique a configuração da sua chave de API.
+      no_access_key: A chave de acesso da Sophtron não está configurada. Configure-a nas Configurações.
+      no_user_id: O ID de usuário da Sophtron não está configurado. Configure-o nas Configurações.
+    select_accounts:
+      accounts_selected: contas selecionadas
+      api_error: "Erro de conexão com a API"
+      unexpected_error: "Ocorreu um erro inesperado"
+      cancel: Cancelar
+      configure_name_in_sophtron: "Não é possível importar - configure o nome da conta na Sophtron"
+      description: Selecione as contas que você quer vincular à sua conta do %{product_name}.
+      link_accounts: Vincular contas selecionadas
+      no_accounts_found: Nenhuma conta encontrada. Verifique a configuração da sua chave de API.
+      no_access_key: A chave de acesso da Sophtron não está configurada. Configure-a nas Configurações.
+      no_user_id: O ID de usuário da Sophtron não está configurado. Configure-o nas Configurações.
+      no_credentials_configured: "Configure primeiro seu ID de usuário e sua chave de acesso da API da Sophtron nas Configurações do provedor."
+      no_institution_connected: Conecte primeiro uma instituição bancária à Sophtron.
+      no_name_placeholder: "(Sem nome)"
+      title: Selecionar contas da Sophtron
+    select_existing_account:
+      account_already_linked: Esta conta já está vinculada a um provedor
+      all_accounts_already_linked: Todas as contas da Sophtron já estão vinculadas
+      api_error: "Erro de conexão com a API"
+      cancel: Cancelar
+      configure_name_in_sophtron: "Não é possível importar - configure o nome da conta na Sophtron"
+      description: Selecione uma conta da Sophtron para vincular a esta conta. As transações serão sincronizadas e desduplicadas automaticamente.
+      link_account: Vincular conta
+      no_account_specified: Nenhuma conta especificada
+      no_accounts_found: Nenhuma conta da Sophtron encontrada. Verifique a configuração da sua chave de API.
+      no_access_key: A chave de acesso da Sophtron não está configurada. Configure-a nas Configurações.
+      no_user_id: O ID de usuário da Sophtron não está configurado. Configure-o nas Configurações.
+      no_institution_connected: Conecte primeiro uma instituição bancária à Sophtron.
+      no_name_placeholder: "(Sem nome)"
+      title: "Vincular %{account_name} à Sophtron"
+      unexpected_error: "Ocorreu um erro inesperado"
+    link_existing_account:
+      account_already_linked: Esta conta já está vinculada a um provedor
+      api_error: "Erro de conexão com a API"
+      unexpected_error: "Ocorreu um erro inesperado"
+      invalid_account_name: Não é possível vincular uma conta com o nome em branco
+      sophtron_account_already_linked: Esta conta da Sophtron já está vinculada a outra conta
+      sophtron_account_not_found: Conta da Sophtron não encontrada
+      missing_parameters: Parâmetros obrigatórios ausentes
+      no_institution_connected: Conecte primeiro uma instituição bancária à Sophtron.
+      success: "%{account_name} vinculada com sucesso à Sophtron"
+    setup_accounts:
+      account_type_label: "Tipo de conta:"
+      all_accounts_linked: "Todas as suas contas da Sophtron já foram configuradas."
+      api_error: "Erro de conexão com a API"
+      unexpected_error: "Ocorreu um erro inesperado"
+      fetch_failed: "Não foi possível buscar as contas"
+      no_accounts_to_setup: "Nenhuma conta para configurar"
+      no_access_key: "A chave de acesso da Sophtron não está configurada. Verifique as configurações da sua conexão."
+      no_user_id: "O ID de usuário da Sophtron não está configurado. Verifique as configurações da sua conexão."
+      no_institution_connected: "A instituição da Sophtron ainda não está conectada."
+      account_types:
+        skip: Ignorar esta conta
+        depository: Conta corrente ou poupança
+        credit_card: Cartão de crédito
+        investment: Conta de investimento
+        loan: Empréstimo ou financiamento
+        other_asset: Outro ativo
+      subtype_labels:
+        depository: "Subtipo de conta:"
+        credit_card: ""
+        investment: "Tipo de investimento:"
+        loan: "Tipo de empréstimo:"
+        other_asset: ""
+      subtype_messages:
+        credit_card: "Os cartões de crédito serão configurados automaticamente como contas de cartão de crédito."
+        other_asset: "Não são necessárias opções adicionais para Outros ativos."
+      balance: Saldo
+      cancel: Cancelar
+      choose_account_type: "Escolha o tipo de conta correto para cada conta da Sophtron:"
+      create_accounts: Criar contas
+      creating_accounts: Criando contas...
+      historical_data_range: "Intervalo de dados históricos:"
+      subtitle: Escolha os tipos de conta corretos para suas contas importadas
+      sync_start_date_help: Selecione até que ponto no passado você quer sincronizar o histórico de transações. Há no máximo 3 anos de histórico disponíveis.
+      sync_start_date_label: "Começar a sincronizar transações a partir de:"
+      title: Configure suas contas da Sophtron
+    complete_account_setup:
+      all_skipped: "Todas as contas foram ignoradas. Nenhuma conta foi criada."
+      creation_failed: "Não foi possível criar as contas"
+      api_error: "Erro de conexão com a API"
+      unexpected_error: "Ocorreu um erro inesperado"
+      no_accounts: "Nenhuma conta para configurar."
+      success: "%{count} conta(s) criada(s) com sucesso."
+    sync:
+      already_running: Uma sincronização manual da Sophtron já está em andamento.
+      api_error: "A sincronização manual da Sophtron falhou: %{message}"
+      failed: A sincronização manual da Sophtron falhou
+      no_linked_accounts: Esta instituição da Sophtron não tem contas vinculadas para sincronizar.
+      processing_failed: A sincronização manual da Sophtron não conseguiu processar as transações atualizadas.
+      success: Sincronização iniciada
+    toggle_manual_sync:
+      success_disabled: A instituição da Sophtron será sincronizada automaticamente.
+      success_enabled: A instituição da Sophtron agora exige sincronização manual.
+    manual_sync_complete:
+      close: Fechar
+      description: Os saldos das contas terminarão de ser atualizados em segundo plano.
+      message: As transações foram baixadas após a verificação da Sophtron.
+      title: Sincronização da Sophtron iniciada
+    sophtron_setup_required:
+      title: Configuração da Sophtron necessária
+      message: >
+        Para concluir a configuração da sua conexão da Sophtron, acesse a página de Configurações do provedor e siga as instruções para autorizar e configurar sua conexão da Sophtron.
+      go_to_provider_settings: Ir para Configurações do provedor
+      heading: "ID de usuário e chave de acesso não configurados"
+      description: "Antes de poder vincular contas da Sophtron, você precisa configurar seu ID de usuário e sua chave de acesso da Sophtron."
+      setup_steps_title: "Etapas de configuração:"
+      step_1_html: "Acesse <strong>Configurações → Provedores de sincronização bancária</strong>"
+      step_2_html: "Encontre a seção <strong>Sophtron</strong>"
+      step_3_html: "Insira seu ID de usuário e sua chave de acesso da Sophtron"
+      step_4: "Volte aqui para vincular suas contas"
+    api_error:
+      title: "Erro de conexão com a Sophtron"
+      unable_to_connect: "Não é possível conectar à Sophtron"
+      institution_unable_to_connect: "Não é possível conectar à instituição"
+      common_issues_title: "Problemas comuns:"
+      incorrect_user_id: "ID de usuário incorreto: Verifique seu ID de usuário nas Configurações do provedor"
+      invalid_access_key: "Chave de acesso inválida: Verifique sua chave de acesso nas Configurações do provedor"
+      expired_credentials: "Credenciais expiradas: Gere um novo ID de usuário e uma nova chave de acesso na Sophtron"
+      network_issue: "Problema de rede: Verifique sua conexão com a internet"
+      service_down: "Serviço indisponível: A API da Sophtron pode estar temporariamente indisponível"
+      bad_credentials: "Credenciais bancárias: Verifique se o nome de usuário e a senha estão corretos"
+      verification_code: "Código de verificação: Certifique-se de que o código mais recente foi inserido antes de expirar"
+      institution_timeout: "Tempo limite da instituição: A página de acesso do banco não foi concluída a tempo"
+      unsupported_mfa: "Suporte a MFA: A Sophtron pode não oferecer suporte ao fluxo de verificação atual desta instituição"
+      check_provider_settings: "Verificar Configurações do provedor"
+      try_again: "Tentar conectar novamente"
+    select_option: "Selecionar %{type}"
+    subtype: "subtipo"
+    type: "tipo"
+    sophtron_panel:
+      setup_instructions_title: "Instruções de configuração:"
+      setup_instructions:
+        step_1_html: 'Acesse <a href="%{url}" target="_blank" rel="noopener noreferrer" class="link">Sophtron</a> para obter suas credenciais de API'
+        step_2: "Copie seu ID de usuário e sua chave de acesso das configurações da sua conta da Sophtron"
+        step_3: "Cole as credenciais abaixo e clique em Salvar; o Sure criará ou reutilizará seu ID de cliente da Sophtron automaticamente"
+      field_descriptions_title: "Descrições dos campos:"
+      field_descriptions:
+        user_id_html: "<strong>ID de usuário:</strong> Sua credencial de ID de usuário da Sophtron"
+        access_key_html: "<strong>Chave de acesso:</strong> Sua credencial de chave de acesso da Sophtron"
+        base_url_html: "<strong>URL base:</strong> A URL do endpoint da API da Sophtron, geralmente https://api.sophtron.com/api"
+      fields:
+        user_id:
+          label: "ID de usuário"
+          placeholder_new: "Cole seu ID de usuário da Sophtron"
+          placeholder_edit: "••••••••"
+        access_key:
+          label: "Chave de acesso"
+          placeholder_new: "Cole sua chave de acesso da Sophtron"
+          placeholder_edit: "••••••••"
+        base_url:
+          label: "URL base"
+          placeholder: "https://api.sophtron.com/api"
+      save: "Salvar configuração"
+      update: "Atualizar configuração"
+    syncer:
+      manual_sync_required: "É necessária uma sincronização manual da Sophtron para esta instituição; essas contas são ignoradas durante a sincronização automática."
+      importing_accounts: "Importando contas da Sophtron..."
+      checking_account_configuration: "Verificando a configuração da conta..."
+      accounts_need_setup: "%{count} conta(s) precisam de configuração"
+      processing_transactions: "Processando transações das contas vinculadas..."
+      calculating_balances: "Calculando saldos das contas vinculadas..."
+    sophtron_entry:
+      processor:
+        unknown_transaction: "Transação desconhecida"
+    render_connection_timeout:
+      timeout: "Tempo limite de conexão esgotado. Tente novamente."
+    redirect_after_account_link:
+      invalid_account_names:
+        one: "Não é possível vincular %{count} conta com o nome em branco"
+        other: "Não é possível vincular %{count} contas com os nomes em branco"
+      partial_invalid: "%{created_count} conta(s) vinculada(s). %{already_linked_count} já vinculadas, %{invalid_count} tinham nomes inválidos."
+      partial_success: "%{created_count} conta(s) vinculada(s). %{already_linked_count} conta(s) já estavam vinculadas."
+      success:
+        one: "%{count} conta vinculada com sucesso."
+        other: "%{count} contas vinculadas com sucesso."
+      all_already_linked:
+        one: "A conta selecionada já está vinculada"
+        other: "Todas as %{count} contas selecionadas já estão vinculadas"
+      link_failed: "Não foi possível vincular as contas"
+    start_manual_sync:
+      already_running: "Uma sincronização já está em andamento."
+      no_linked_accounts: "Não há contas vinculadas disponíveis para sincronizar."
+      api_error: "Erro da API: %{message}"
+    start_manual_sync_for_account:
+      failed: "Não foi possível sincronizar a conta"
diff --git a/config/locales/views/sophtron_items/ru.yml b/config/locales/views/sophtron_items/ru.yml
new file mode 100644
index 000000000..9ae6bcbd9
--- /dev/null
+++ b/config/locales/views/sophtron_items/ru.yml
@@ -0,0 +1,383 @@
+---
+ru:
+  sophtron_items:
+    api_error:
+      bad_credentials: 'Банковские учетные данные: Проверьте правильность имени пользователя
+        и пароля'
+      check_provider_settings: Проверьте настройки провайдера
+      common_issues_title: 'Распространенные проблемы:'
+      expired_credentials: 'Истекшие учетные данные: Создайте новый ID пользователя
+        и ключ доступа в Sophtron'
+      incorrect_user_id: 'Неверный ID пользователя: Проверьте ваш ID пользователя
+        в настройках провайдера'
+      institution_timeout: 'Тайм-аут учреждения: Страница входа в банк не завершилась
+        вовремя'
+      institution_unable_to_connect: Не удалось подключиться к учреждению
+      invalid_access_key: 'Неверный ключ доступа: Проверьте ваш ключ доступа в настройках
+        провайдера'
+      network_issue: 'Проблема с сетью: Проверьте ваше интернет-соединение'
+      service_down: 'Сервис недоступен: API Sophtron может быть временно недоступен'
+      title: Ошибка подключения Sophtron
+      try_again: Попробуйте подключиться снова
+      unable_to_connect: Не удалось подключиться к Sophtron
+      unsupported_mfa: 'Поддержка MFA: Sophtron может не поддерживать текущий процесс
+        верификации этого учреждения'
+      verification_code: 'Код подтверждения: Убедитесь, что введен последний код до
+        его истечения'
+    complete_account_setup:
+      all_skipped: Все счета были пропущены. Счета не были созданы.
+      api_error: Ошибка подключения API
+      creation_failed: Не удалось создать счета
+      no_accounts: Нет счетов для настройки.
+      success: Успешно создано %{count} счёт(а).
+      unexpected_error: Произошла непредвиденная ошибка
+    connect:
+      cancel: Отмена
+      captcha: Капча
+      connect: Подключить
+      institution_search_label: Учреждение
+      institution_search_placeholder: Поиск по названию банка
+      no_institutions: Соответствующих учреждений не найдено.
+      password: Пароль
+      search: Поиск
+      search_too_short: Введите как минимум два символа для поиска.
+      title: Подключить учреждение Sophtron
+      username: Имя пользователя
+    connect_institution:
+      api_error: 'Не удалось подключиться к Sophtron: %{message}'
+      missing_parameters: Выберите учреждение и введите свои банковские учетные данные.
+    connection_status:
+      api_error: 'Ошибка подключения API: %{message}'
+      attempt: Попытка %{attempt} из %{max}
+      check_again: Проверить снова
+      failed: Sophtron не смог завершить подключение к этому учреждению.
+      failed_timeout: Время ожидания Sophtron истекло, пока учреждение завершало вход.
+      timeout: Sophtron не завершил подключение в ожидаемое время. Вы можете проверить
+        снова или попробовать подключиться позже.
+      title: Подключение Sophtron
+      waiting: Sophtron все еще подключается к вашему учреждению.
+    create:
+      success: Подключение Sophtron успешно создано
+    defaults:
+      name: Подключение Sophtron
+    destroy:
+      success: Подключение Sophtron удалено
+    edit:
+      access_key:
+        help_text: Ключ доступа должен быть длинной строкой, начинающейся с букв и
+          цифр
+        label: 'Ключ доступа Sophtron:'
+        placeholder: Вставьте ваш ключ доступа Sophtron здесь...
+      user_id:
+        help_text: ID пользователя должен быть длинной строкой, начинающейся с букв
+          и цифр
+        label: 'ID пользователя Sophtron:'
+        placeholder: Вставьте ваш ID пользователя Sophtron здесь...
+    index:
+      title: Подключения Sophtron
+    link_accounts:
+      all_already_linked:
+        few: "%{count} выбранных счёта уже связаны: %{names}"
+        many: "%{count} выбранных счетов уже связаны: %{names}"
+        one: Выбранный счёт (%{names}) уже связан
+        other: "%{count} выбранных счёта уже связаны: %{names}"
+      api_error: Ошибка подключения API
+      invalid_account_names:
+        few: Невозможно связать %{count} счёта с пустыми именами
+        many: Невозможно связать %{count} счетов с пустыми именами
+        one: Невозможно связать счёт с пустым именем
+        other: Невозможно связать %{count} счёта с пустыми именами
+      link_failed: Не удалось связать счета
+      no_access_key: Ключ доступа Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте конфигурацию вашего
+        API ключа.
+      no_accounts_selected: Пожалуйста, выберите хотя бы один счёт
+      no_credentials_configured: Пожалуйста, сначала настройте ваш ID пользователя
+        и ключ доступа Sophtron в настройках провайдера.
+      no_institution_connected: Пожалуйста, сначала подключите банковское учреждение
+        к Sophtron.
+      no_user_id: ID пользователя Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      partial_invalid: Успешно связаны %{created_count} счёт(а), %{already_linked_count}
+        уже были связаны, %{invalid_count} счёт(а) имели недопустимые имена
+      partial_success: 'Успешно связаны %{created_count} счёт(а). %{already_linked_count}
+        счёт(а) уже были связаны: %{already_linked_names}'
+      success:
+        few: Успешно связаны %{count} счёта
+        many: Успешно связано %{count} счетов
+        one: Успешно связан %{count} счёт
+        other: Успешно связаны %{count} счёта
+    link_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      api_error: Ошибка подключения API
+      invalid_account_name: Невозможно связать счёт с пустым именем
+      missing_parameters: Отсутствуют необходимые параметры
+      no_institution_connected: Пожалуйста, сначала подключите банковское учреждение
+        к Sophtron.
+      sophtron_account_already_linked: Этот счёт Sophtron уже связан с другим счётом
+      sophtron_account_not_found: Счёт Sophtron не найден
+      success: Успешно связан %{account_name} с Sophtron
+      unexpected_error: Произошла непредвиденная ошибка
+    loading:
+      loading_message: Загрузка счетов Sophtron...
+      loading_title: Загрузка
+    manual_sync_complete:
+      close: Закрыть
+      description: Балансы счетов будут обновлены в фоновом режиме.
+      message: Операции были загружены после верификации Sophtron.
+      title: Синхронизация Sophtron начата
+    mfa:
+      captcha: Текст капчи
+      captcha_alt: Капча Sophtron
+      phone_confirmed: Я подтвердил по телефону
+      submit: Отправить
+      title: Верификация Sophtron
+      token: Код подтверждения
+    new:
+      access_key: Ключ доступа
+      access_key_placeholder: вставьте ваш ключ доступа Sophtron
+      cancel: Отмена
+      connect: Подключить
+      title: Подключить Sophtron
+      user_id: ID пользователя
+      user_id_placeholder: вставьте ваш ID пользователя Sophtron
+    preload_accounts:
+      api_error: Ошибка подключения API
+      no_access_key: Ключ доступа Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте конфигурацию вашего
+        API ключа.
+      no_credentials_configured: Пожалуйста, сначала настройте ваш ID пользователя
+        и ключ доступа Sophtron в настройках провайдера.
+      no_user_id: ID пользователя Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      preload_accounts: предварительная загрузка счетов
+      unexpected_error: Произошла непредвиденная ошибка
+    redirect_after_account_link:
+      all_already_linked:
+        few: "%{count} выбранных счёта уже связаны"
+        many: "%{count} выбранных счетов уже связаны"
+        one: Выбранный счёт уже связан
+        other: "%{count} выбранных счёта уже связаны"
+      invalid_account_names:
+        few: Невозможно связать %{count} счёта с пустыми именами
+        many: Невозможно связать %{count} счетов с пустыми именами
+        one: Невозможно связать %{count} счёт с пустым именем
+        other: Невозможно связать %{count} счёта с пустыми именами
+      link_failed: Не удалось связать счета
+      partial_invalid: Связано %{created_count} счёт(а). %{already_linked_count} уже
+        были связаны, %{invalid_count} имеют недопустимые имена.
+      partial_success: Связано %{created_count} счёт(а). %{already_linked_count} уже
+        были связаны.
+      success:
+        few: Успешно связаны %{count} счёта.
+        many: Успешно связано %{count} счетов.
+        one: Успешно связан %{count} счёт.
+        other: Успешно связаны %{count} счёта.
+    render_connection_timeout:
+      timeout: Время подключения истекло. Пожалуйста, попробуйте снова.
+    select_accounts:
+      accounts_selected: счета выбраны
+      api_error: Ошибка подключения API
+      cancel: Отмена
+      configure_name_in_sophtron: Невозможно импортировать - пожалуйста, настройте
+        имя счета в Sophtron
+      description: Выберите счета, которые вы хотите связать с вашим счётом %{product_name}.
+      link_accounts: Связать выбранные счета
+      no_access_key: Ключ доступа Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      no_accounts_found: Счета не найдены. Пожалуйста, проверьте конфигурацию вашего
+        API ключа.
+      no_credentials_configured: Пожалуйста, сначала настройте ваш ID пользователя
+        и ключ доступа Sophtron в настройках провайдера.
+      no_institution_connected: Пожалуйста, сначала подключите банковское учреждение
+        к Sophtron.
+      no_name_placeholder: "(Без имени)"
+      no_user_id: ID пользователя Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      title: Выберите счета Sophtron
+      unexpected_error: Произошла непредвиденная ошибка
+    select_existing_account:
+      account_already_linked: Этот счёт уже связан с провайдером
+      all_accounts_already_linked: Все счета Sophtron уже связаны
+      api_error: Ошибка подключения API
+      cancel: Отмена
+      configure_name_in_sophtron: Невозможно импортировать - пожалуйста, настройте
+        имя счета в Sophtron
+      description: Выберите счёт Sophtron для связи с этим счётом. Операции будут
+        синхронизированы и дубли удалены автоматически.
+      link_account: Связать счёт
+      no_access_key: Ключ доступа Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      no_account_specified: Счёт не указан
+      no_accounts_found: Счета Sophtron не найдены. Пожалуйста, проверьте конфигурацию
+        вашего API ключа.
+      no_institution_connected: Пожалуйста, сначала подключите банковское учреждение
+        к Sophtron.
+      no_name_placeholder: "(Без имени)"
+      no_user_id: ID пользователя Sophtron не настроен. Пожалуйста, настройте его
+        в Настройках.
+      title: Связать %{account_name} с Sophtron
+      unexpected_error: Произошла непредвиденная ошибка
+    select_option: Выберите %{type}
+    setup_accounts:
+      account_type_label: 'Тип счёта:'
+      account_types:
+        credit_card: Кредитная карта
+        depository: Текущий или сберегательный счёт
+        investment: Инвестиционный счёт
+        loan: Кредит или ипотека
+        other_asset: Другой актив
+        skip: Пропустить этот счёт
+      all_accounts_linked: Все ваши счета Sophtron уже настроены.
+      api_error: Ошибка подключения API
+      balance: Баланс
+      cancel: Отмена
+      choose_account_type: 'Выберите правильный тип счёта для каждого счёта Sophtron:'
+      create_accounts: Создать счета
+      creating_accounts: Создание счетов...
+      fetch_failed: Не удалось получить счета
+      historical_data_range: 'Диапазон исторических данных:'
+      no_access_key: Ключ доступа Sophtron не настроен. Пожалуйста, проверьте настройки
+        подключения.
+      no_accounts_to_setup: Нет счетов для настройки
+      no_institution_connected: Учреждение Sophtron еще не подключено.
+      no_user_id: ID пользователя Sophtron не настроен. Пожалуйста, проверьте настройки
+        подключения.
+      subtitle: Выберите правильные типы счетов для ваших импортированных счетов
+      subtype_labels:
+        credit_card: ''
+        depository: 'Подтип счёта:'
+        investment: 'Тип инвестиций:'
+        loan: 'Тип кредита:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Кредитные карты будут автоматически настроены как кредитные счета.
+        other_asset: Дополнительные параметры для других активов не требуются.
+      sync_start_date_help: Выберите, насколько далеко назад вы хотите синхронизировать
+        историю операций. Максимум доступно 3 года истории.
+      sync_start_date_label: 'Начать синхронизацию операций с:'
+      title: Настройте ваши счета Sophtron
+      unexpected_error: Произошла непредвиденная ошибка
+    sophtron_entry:
+      processor:
+        unknown_transaction: Неизвестная операция
+    sophtron_item:
+      accounts_need_setup: Счета требуют настройки
+      automatic_sync: Использовать автоматическую синхронизацию
+      automatic_sync_for: Использовать автоматическую синхронизацию для %{institution}
+      delete: Удалить подключение
+      deletion_in_progress: удаление в процессе...
+      error: Ошибка
+      manual_sync: Ручная синхронизация
+      manual_sync_action: Требуется ручная синхронизация
+      manual_sync_action_for: Требуется ручная синхронизация для %{institution}
+      no_accounts_description: Это подключение еще не имеет связанных счетов.
+      no_accounts_title: Нет счетов
+      setup_action: Настроить новые счета
+      setup_description: "%{linked} из %{total} счетов связаны. Выберите типы счетов
+        для ваших недавно импортированных счетов Sophtron."
+      setup_needed: Новые счета готовы к настройке
+      status: Синхронизировано %{timestamp} назад
+      status_never: Никогда не синхронизировалось
+      status_with_summary: Последняя синхронизация %{timestamp} назад • %{summary}
+      sync_now: Синхронизировать сейчас
+      syncing: Синхронизация...
+      total: Всего
+      unlinked: Несвязанные
+    sophtron_panel:
+      field_descriptions:
+        access_key_html: "<strong>Ключ доступа:</strong> Ваше учетное данное ключа
+          доступа Sophtron"
+        base_url_html: "<strong>Базовый URL:</strong> URL конечной точки API Sophtron,
+          обычно https://api.sophtron.com/api"
+        user_id_html: "<strong>ID пользователя:</strong> Ваше учетное данное ID пользователя
+          Sophtron"
+      field_descriptions_title: 'Описание полей:'
+      fields:
+        access_key:
+          label: Ключ доступа
+          placeholder_edit: "••••••••"
+          placeholder_new: Вставьте ваш ключ доступа Sophtron
+        base_url:
+          label: Базовый URL
+          placeholder: https://api.sophtron.com/api
+        user_id:
+          label: ID пользователя
+          placeholder_edit: "••••••••"
+          placeholder_new: Вставьте ваш ID пользователя Sophtron
+      save: Сохранить конфигурацию
+      setup_instructions:
+        step_1_html: Посетите <a href="%{url}" target="_blank" rel="noopener noreferrer"
+          class="link">Sophtron</a>, чтобы получить ваши учетные данные API
+        step_2: Скопируйте ваш ID пользователя и ключ доступа из настроек вашего аккаунта
+          Sophtron
+        step_3: Вставьте учетные данные ниже и нажмите Сохранить; Sure автоматически
+          создаст или использует ваш ID клиента Sophtron
+      setup_instructions_title: 'Инструкции по настройке:'
+      update: Обновить конфигурацию
+    sophtron_setup_required:
+      description: Прежде чем вы сможете связать счета Sophtron, вам нужно настроить
+        ваш ID пользователя и ключ доступа Sophtron.
+      go_to_provider_settings: Перейти к настройкам провайдера
+      heading: ID пользователя и ключ доступа не настроены
+      message: 'Чтобы завершить настройку подключения Sophtron, пожалуйста, перейдите
+        на страницу настроек провайдера и следуйте инструкциям для авторизации и настройки
+        вашего подключения Sophtron.
+
+        '
+      setup_steps_title: 'Шаги настройки:'
+      step_1_html: Перейдите в <strong>Настройки → Провайдеры синхронизации банков</strong>
+      step_2_html: Найдите раздел <strong>Sophtron</strong>
+      step_3_html: Введите ваш ID пользователя и ключ доступа Sophtron
+      step_4: Вернитесь сюда, чтобы связать ваши счета
+      title: Требуется настройка Sophtron
+    start_manual_sync:
+      already_running: Синхронизация уже выполняется.
+      api_error: 'Ошибка API: %{message}'
+      no_linked_accounts: Нет связанных счетов для синхронизации.
+    start_manual_sync_for_account:
+      failed: Не удалось синхронизировать счёт
+    submit_mfa:
+      api_error: 'Не удалось пройти верификацию: %{message}'
+      invalid_security_answers: Ответы на вопросы безопасности отсутствуют или слишком
+        длинные.
+      unknown_challenge: Неизвестный шаг верификации Sophtron.
+    subtype: подтип
+    sync:
+      already_running: Ручная синхронизация Sophtron уже выполняется.
+      api_error: 'Не удалось выполнить ручную синхронизацию Sophtron: %{message}'
+      failed: Не удалось выполнить ручную синхронизацию Sophtron
+      no_linked_accounts: У этого учреждения Sophtron нет связанных счетов для синхронизации.
+      processing_failed: Ручная синхронизация Sophtron не смогла обработать обновленные
+        операции.
+      success: Синхронизация начата
+    syncer:
+      accounts_need_setup: "%{count} счёт(а) требуют настройки"
+      calculating_balances: Расчет балансов для связанных счетов...
+      checking_account_configuration: Проверка конфигурации счетов...
+      importing_accounts: Импорт счетов из Sophtron...
+      manual_sync_required: Для этого учреждения требуется ручная синхронизация Sophtron;
+        эти счета будут пропущены во время автоматической синхронизации.
+      processing_transactions: Обработка операций для связанных счетов...
+    toggle_manual_sync:
+      success_disabled: Учреждение Sophtron будет синхронизироваться автоматически.
+      success_enabled: Учреждение Sophtron теперь требует ручной синхронизации.
+    type: тип
+    update:
+      errors:
+        access_key_compromised: Ключ доступа может быть скомпрометирован, истек или
+          уже использован. Пожалуйста, создайте новый.
+        blank_access_key: Пожалуйста, введите ключ доступа Sophtron.
+        blank_user_id: Пожалуйста, введите ID пользователя Sophtron.
+        invalid_access_key: Неверный ключ доступа. Пожалуйста, проверьте, что вы скопировали
+          полный ключ доступа из Sophtron.
+        invalid_user_id: Неверный ID пользователя. Пожалуйста, проверьте, что вы скопировали
+          полный ID пользователя из Sophtron.
+        unexpected: Произошла непредвиденная ошибка. Пожалуйста, попробуйте снова
+          или свяжитесь с поддержкой.
+        update_failed: 'Не удалось обновить подключение: %{message}'
+        user_id_compromised: ID пользователя может быть скомпрометирован, истек или
+          уже использован. Пожалуйста, создайте новый.
+      success: Подключение Sophtron успешно обновлено! Ваши счета переподключаются.
diff --git a/config/locales/views/sophtron_items/tr.yml b/config/locales/views/sophtron_items/tr.yml
new file mode 100644
index 000000000..9d54a3365
--- /dev/null
+++ b/config/locales/views/sophtron_items/tr.yml
@@ -0,0 +1,365 @@
+---
+tr:
+  sophtron_items:
+    api_error:
+      bad_credentials: 'Banka kimlik bilgileri: Kullanıcı adı ve şifrenin doğru olduğunu
+        kontrol edin'
+      check_provider_settings: Sağlayıcı Ayarlarını Kontrol Et
+      common_issues_title: 'Yaygın Sorunlar:'
+      expired_credentials: 'Süresi Dolmuş Kimlik Bilgileri: Sophtron''dan yeni bir
+        Kullanıcı Kimliği ve Erişim Anahtarı oluşturun'
+      incorrect_user_id: 'Hatalı Kullanıcı Kimliği: Sağlayıcı Ayarları''nda Kullanıcı
+        Kimliğinizi doğrulayın'
+      institution_timeout: 'Kurum zaman aşımı: Banka giriş sayfası zamanında tamamlanmadı'
+      institution_unable_to_connect: Kuruma bağlanılamıyor
+      invalid_access_key: 'Geçersiz Erişim Anahtarı: Sağlayıcı Ayarları''nda Erişim
+        Anahtarınızı kontrol edin'
+      network_issue: 'Ağ Sorunu: İnternet bağlantınızı kontrol edin'
+      service_down: 'Hizmet Kapalı: Sophtron API geçici olarak kullanılamıyor olabilir'
+      title: Sophtron Bağlantı Hatası
+      try_again: Yeniden bağlanmayı deneyin
+      unable_to_connect: Sophtron'a bağlanılamıyor
+      unsupported_mfa: 'MFA desteği: Sophtron bu kurumun mevcut doğrulama akışını
+        desteklemiyor olabilir'
+      verification_code: 'Doğrulama kodu: Son kodun süresi dolmadan önce girildiğinden
+        emin olun'
+    complete_account_setup:
+      all_skipped: Tüm hesaplar atlandı. Hiçbir hesap oluşturulmadı.
+      api_error: API bağlantı hatası
+      creation_failed: Hesaplar oluşturulamadı
+      no_accounts: Kurulacak hesap yok.
+      success: "%{count} hesap başarıyla oluşturuldu."
+      unexpected_error: Beklenmeyen bir hata oluştu
+    connect:
+      cancel: İptal
+      captcha: Captcha
+      connect: Bağlan
+      institution_search_label: Kurum
+      institution_search_placeholder: Banka adına göre arayın
+      no_institutions: Eşleşen kurum bulunamadı.
+      password: Şifre
+      search: Ara
+      search_too_short: Aramak için en az iki karakter girin.
+      title: Sophtron Kurumuna Bağlan
+      username: Kullanıcı adı
+    connect_institution:
+      api_error: 'Sophtron bağlantısı başarısız oldu: %{message}'
+      missing_parameters: Bir kurum seçin ve banka giriş kimlik bilgilerinizi girin.
+    connection_status:
+      api_error: 'API bağlantı hatası: %{message}'
+      attempt: "%{max} denemeden %{attempt}. deneme"
+      check_again: Tekrar kontrol et
+      failed: Sophtron bu kurum bağlantısını tamamlayamadı.
+      failed_timeout: Kurum girişini tamamlarken Sophtron zaman aşımına uğradı.
+      timeout: Sophtron beklenen sürede bağlantıyı tamamlayamadı. Tekrar kontrol edebilir
+        veya daha sonra yeniden bağlanmayı deneyebilirsiniz.
+      title: Sophtron'a Bağlanıyor
+      waiting: Sophtron kurumunuza bağlanmaya devam ediyor.
+    create:
+      success: Sophtron bağlantısı başarıyla oluşturuldu
+    defaults:
+      name: Sophtron Bağlantısı
+    destroy:
+      success: Sophtron bağlantısı kaldırıldı
+    edit:
+      access_key:
+        help_text: Erişim Anahtarı, harflerle ve rakamlarla başlayan uzun bir dize
+          olmalıdır
+        label: 'Sophtron Erişim Anahtarı:'
+        placeholder: Sophtron Erişim Anahtarınızı buraya yapıştırın...
+      user_id:
+        help_text: Kullanıcı Kimliği, harflerle ve rakamlarla başlayan uzun bir dize
+          olmalıdır
+        label: 'Sophtron Kullanıcı Kimliği:'
+        placeholder: Sophtron Kullanıcı Kimliğinizi buraya yapıştırın...
+    index:
+      title: Sophtron Bağlantıları
+    link_accounts:
+      all_already_linked:
+        one: Seçilen hesap (%{names}) zaten bağlı
+        other: 'Seçilen %{count} hesabın tümü zaten bağlı: %{names}'
+      api_error: API bağlantı hatası
+      invalid_account_names:
+        one: Boş adlı hesap bağlanamaz
+        other: "%{count} boş adlı hesap bağlanamaz"
+      link_failed: Hesaplar bağlanamadı
+      no_access_key: Sophtron Erişim Anahtarı yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      no_accounts_found: Hesap bulunamadı. Lütfen API anahtarı yapılandırmanızı kontrol
+        edin.
+      no_accounts_selected: Lütfen en az bir hesap seçin
+      no_credentials_configured: Lütfen önce Sağlayıcı Ayarları'nda Sophtron API Kullanıcı
+        Kimliğinizi ve Erişim Anahtarınızı yapılandırın.
+      no_institution_connected: Lütfen önce Sophtron ile bir banka kurumu bağlayın.
+      no_user_id: Sophtron Kullanıcı Kimliği yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      partial_invalid: "%{created_count} hesap başarıyla bağlandı, %{already_linked_count}
+        zaten bağlıydı, %{invalid_count} hesabın adı geçersizdi"
+      partial_success: "%{created_count} hesap başarıyla bağlandı. %{already_linked_count}
+        hesap zaten bağlıydı: %{already_linked_names}"
+      success:
+        one: "%{count} hesap başarıyla bağlandı"
+        other: "%{count} hesap başarıyla bağlandı"
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      api_error: API bağlantı hatası
+      invalid_account_name: Boş adlı hesap bağlanamaz
+      missing_parameters: Gerekli parametreler eksik
+      no_institution_connected: Lütfen önce Sophtron ile bir banka kurumu bağlayın.
+      sophtron_account_already_linked: Bu Sophtron hesabı zaten başka bir hesaba bağlı
+      sophtron_account_not_found: Sophtron hesabı bulunamadı
+      success: "%{account_name} Sophtron ile başarıyla bağlandı"
+      unexpected_error: Beklenmeyen bir hata oluştu
+    loading:
+      loading_message: Sophtron hesapları yükleniyor...
+      loading_title: Yükleniyor
+    manual_sync_complete:
+      close: Kapat
+      description: Hesap bakiyeleri arka planda güncellenmeye devam edecek.
+      message: Sophtron doğrulamasından sonra işlemler indirildi.
+      title: Sophtron Senkronizasyonu Başladı
+    mfa:
+      captcha: Captcha metni
+      captcha_alt: Sophtron captcha
+      phone_confirmed: Telefonla onayladım
+      submit: Gönder
+      title: Sophtron Doğrulama
+      token: Doğrulama kodu
+    new:
+      access_key: Erişim Anahtarı
+      access_key_placeholder: Sophtron Erişim Anahtarınızı yapıştırın
+      cancel: İptal
+      connect: Bağlan
+      title: Sophtron'a Bağlan
+      user_id: Kullanıcı Kimliği
+      user_id_placeholder: Sophtron Kullanıcı Kimliğinizi yapıştırın
+    preload_accounts:
+      api_error: API bağlantı hatası
+      no_access_key: Sophtron Erişim Anahtarı yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      no_accounts_found: Hesap bulunamadı. Lütfen API anahtarı yapılandırmanızı kontrol
+        edin.
+      no_credentials_configured: Lütfen önce Sağlayıcı Ayarları'nda Sophtron API Kullanıcı
+        Kimliğinizi ve Erişim Anahtarınızı yapılandırın.
+      no_user_id: Sophtron Kullanıcı Kimliği yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      preload_accounts: hesapları önceden yükle
+      unexpected_error: Beklenmeyen bir hata oluştu
+    redirect_after_account_link:
+      all_already_linked:
+        one: Seçilen hesap zaten bağlı
+        other: Seçilen %{count} hesabın tümü zaten bağlı
+      invalid_account_names:
+        one: Boş adlı %{count} hesap bağlanamaz
+        other: Boş adlı %{count} hesap bağlanamaz
+      link_failed: Hesaplar bağlanamadı
+      partial_invalid: "%{created_count} hesap bağlandı. %{already_linked_count} zaten
+        bağlıydı, %{invalid_count} hesabın adı geçersizdi."
+      partial_success: "%{created_count} hesap bağlandı. %{already_linked_count} hesap
+        zaten bağlıydı."
+      success:
+        one: "%{count} hesap başarıyla bağlandı."
+        other: "%{count} hesap başarıyla bağlandı."
+    render_connection_timeout:
+      timeout: Bağlantı zaman aşımına uğradı. Lütfen tekrar deneyin.
+    select_accounts:
+      accounts_selected: hesap seçildi
+      api_error: API bağlantı hatası
+      cancel: İptal
+      configure_name_in_sophtron: İçe aktarılamıyor - lütfen Sophtron'da hesap adını
+        yapılandırın
+      description: "%{product_name} hesabınıza bağlamak istediğiniz hesapları seçin."
+      link_accounts: Seçilen hesapları bağla
+      no_access_key: Sophtron Erişim Anahtarı yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      no_accounts_found: Hesap bulunamadı. Lütfen API anahtarı yapılandırmanızı kontrol
+        edin.
+      no_credentials_configured: Lütfen önce Sağlayıcı Ayarları'nda Sophtron API Kullanıcı
+        Kimliğinizi ve Erişim Anahtarınızı yapılandırın.
+      no_institution_connected: Lütfen önce Sophtron ile bir banka kurumu bağlayın.
+      no_name_placeholder: "(İsim yok)"
+      no_user_id: Sophtron Kullanıcı Kimliği yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      title: Sophtron Hesaplarını Seç
+      unexpected_error: Beklenmeyen bir hata oluştu
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı
+      all_accounts_already_linked: Tüm Sophtron hesapları zaten bağlı
+      api_error: API bağlantı hatası
+      cancel: İptal
+      configure_name_in_sophtron: İçe aktarılamıyor - lütfen Sophtron'da hesap adını
+        yapılandırın
+      description: Bu hesapla bağlanacak bir Sophtron hesabı seçin. İşlemler otomatik
+        olarak senkronize edilecek ve tekrarlar kaldırılacaktır.
+      link_account: Hesabı bağla
+      no_access_key: Sophtron Erişim Anahtarı yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      no_account_specified: Hesap belirtilmedi
+      no_accounts_found: Sophtron hesabı bulunamadı. Lütfen API anahtarı yapılandırmanızı
+        kontrol edin.
+      no_institution_connected: Lütfen önce Sophtron ile bir banka kurumu bağlayın.
+      no_name_placeholder: "(İsim yok)"
+      no_user_id: Sophtron Kullanıcı Kimliği yapılandırılmamış. Lütfen Ayarlar'dan
+        yapılandırın.
+      title: "%{account_name} hesabını Sophtron ile bağla"
+      unexpected_error: Beklenmeyen bir hata oluştu
+    select_option: "%{type} Seç"
+    setup_accounts:
+      account_type_label: 'Hesap Türü:'
+      account_types:
+        credit_card: Kredi Kartı
+        depository: Vadesiz veya Vadeli Hesap
+        investment: Yatırım Hesabı
+        loan: Kredi veya İpotek
+        other_asset: Diğer Varlık
+        skip: Bu hesabı atla
+      all_accounts_linked: Tüm Sophtron hesaplarınız zaten kuruldu.
+      api_error: API bağlantı hatası
+      balance: Bakiye
+      cancel: İptal
+      choose_account_type: 'Her Sophtron hesabı için doğru hesap türünü seçin:'
+      create_accounts: Hesapları Oluştur
+      creating_accounts: Hesaplar Oluşturuluyor...
+      fetch_failed: Hesaplar Alınamadı
+      historical_data_range: 'Geçmiş Veri Aralığı:'
+      no_access_key: Sophtron Erişim Anahtarı yapılandırılmamış. Lütfen bağlantı ayarlarınızı
+        kontrol edin.
+      no_accounts_to_setup: Kurulacak Hesap Yok
+      no_institution_connected: Sophtron kurumu henüz bağlı değil.
+      no_user_id: Sophtron Kullanıcı Kimliği yapılandırılmamış. Lütfen bağlantı ayarlarınızı
+        kontrol edin.
+      subtitle: İçe aktarılan hesaplarınız için doğru hesap türlerini seçin
+      subtype_labels:
+        credit_card: ''
+        depository: 'Hesap Alt Türü:'
+        investment: 'Yatırım Türü:'
+        loan: 'Kredi Türü:'
+        other_asset: ''
+      subtype_messages:
+        credit_card: Kredi kartları otomatik olarak kredi kartı hesabı olarak kurulacaktır.
+        other_asset: Diğer Varlıklar için ek seçenek gerekmez.
+      sync_start_date_help: İşlem geçmişini ne kadar geriye götürerek senkronize etmek
+        istediğinizi seçin. En fazla 3 yıllık geçmiş mevcuttur.
+      sync_start_date_label: 'Şu tarihten itibaren işlemleri senkronize et:'
+      title: Sophtron Hesaplarınızı Kurun
+      unexpected_error: Beklenmeyen bir hata oluştu
+    sophtron_entry:
+      processor:
+        unknown_transaction: Bilinmeyen işlem
+    sophtron_item:
+      accounts_need_setup: Hesapların kurulumu gerekiyor
+      automatic_sync: Otomatik senkronizasyon kullan
+      automatic_sync_for: "%{institution} için otomatik senkronizasyon kullan"
+      delete: Bağlantıyı sil
+      deletion_in_progress: silme işlemi devam ediyor...
+      error: Hata
+      manual_sync: Manuel senkronizasyon
+      manual_sync_action: Manuel senkronizasyon gerektir
+      manual_sync_action_for: "%{institution} için manuel senkronizasyon gerektir"
+      no_accounts_description: Bu bağlantının henüz bağlı hesabı yok.
+      no_accounts_title: Hesap yok
+      setup_action: Yeni Hesapları Kur
+      setup_description: "%{total} hesaptan %{linked} tanesi bağlı. Yeni içe aktarılan
+        Sophtron hesaplarınız için hesap türlerini seçin."
+      setup_needed: Kurulmaya hazır yeni hesaplar
+      status: "%{timestamp} önce senkronize edildi"
+      status_never: Hiç senkronize edilmedi
+      status_with_summary: Son senkronizasyon %{timestamp} önce • %{summary}
+      sync_now: Şimdi senkronize et
+      syncing: Senkronize ediliyor...
+      total: Toplam
+      unlinked: Bağlı değil
+    sophtron_panel:
+      field_descriptions:
+        access_key_html: "<strong>Erişim Anahtarı:</strong> Sophtron Erişim Anahtarı
+          kimlik bilginiz"
+        base_url_html: "<strong>Temel URL:</strong> Sophtron API uç nokta URL'si,
+          genellikle https://api.sophtron.com/api"
+        user_id_html: "<strong>Kullanıcı Kimliği:</strong> Sophtron Kullanıcı Kimliği
+          kimlik bilginiz"
+      field_descriptions_title: 'Alan açıklamaları:'
+      fields:
+        access_key:
+          label: Erişim Anahtarı
+          placeholder_edit: "••••••••"
+          placeholder_new: Sophtron Erişim Anahtarınızı yapıştırın
+        base_url:
+          label: Temel URL
+          placeholder: https://api.sophtron.com/api
+        user_id:
+          label: Kullanıcı Kimliği
+          placeholder_edit: "••••••••"
+          placeholder_new: Sophtron Kullanıcı Kimliğinizi yapıştırın
+      save: Yapılandırmayı Kaydet
+      setup_instructions:
+        step_1_html: API kimlik bilgilerinizi almak için <a href="%{url}" target="_blank"
+          rel="noopener noreferrer" class="link">Sophtron</a>'u ziyaret edin
+        step_2: Kullanıcı Kimliğinizi ve Erişim Anahtarınızı Sophtron hesap ayarlarınızdan
+          kopyalayın
+        step_3: Kimlik bilgilerini aşağıya yapıştırın ve Kaydet'e tıklayın; Sure,
+          Sophtron Müşteri Kimliğinizi otomatik olarak oluşturacak veya yeniden kullanacaktır
+      setup_instructions_title: 'Kurulum talimatları:'
+      update: Yapılandırmayı Güncelle
+    sophtron_setup_required:
+      description: Sophtron hesaplarını bağlayabilmeniz için önce Sophtron Kullanıcı
+        Kimliğinizi ve Erişim Anahtarınızı yapılandırmanız gerekir.
+      go_to_provider_settings: Sağlayıcı Ayarlarına Git
+      heading: Kullanıcı Kimliği ve Erişim Anahtarı Yapılandırılmamış
+      message: 'Sophtron bağlantınızın kurulumunu tamamlamak için lütfen Sağlayıcı
+        Ayarları sayfasına gidin ve Sophtron bağlantınızı yetkilendirmek ve yapılandırmak
+        için talimatları izleyin.
+
+        '
+      setup_steps_title: 'Kurulum Adımları:'
+      step_1_html: "<strong>Ayarlar → Banka Senkronizasyon Sağlayıcıları</strong>'na
+        gidin"
+      step_2_html: "<strong>Sophtron</strong> bölümünü bulun"
+      step_3_html: Sophtron Kullanıcı Kimliğinizi ve Erişim Anahtarınızı girin
+      step_4: Hesaplarınızı bağlamak için buraya geri dönün
+      title: Sophtron Kurulumu Gerekli
+    start_manual_sync:
+      already_running: Bir senkronizasyon zaten devam ediyor.
+      api_error: 'API hatası: %{message}'
+      no_linked_accounts: Senkronize edilecek bağlı hesap yok.
+    start_manual_sync_for_account:
+      failed: Hesap senkronize edilemedi
+    submit_mfa:
+      api_error: 'Doğrulama başarısız oldu: %{message}'
+      invalid_security_answers: Güvenlik cevapları eksik veya çok uzun.
+      unknown_challenge: Bilinmeyen Sophtron doğrulama adımı.
+    subtype: alt tür
+    sync:
+      already_running: Sophtron manuel senkronizasyonu zaten devam ediyor.
+      api_error: 'Sophtron manuel senkronizasyonu başarısız oldu: %{message}'
+      failed: Sophtron manuel senkronizasyonu başarısız oldu
+      no_linked_accounts: Bu Sophtron kurumunun senkronize edilecek bağlı hesabı yok.
+      processing_failed: Sophtron manuel senkronizasyonu yenilenen işlemleri işleyemedi.
+      success: Senkronizasyon başladı
+    syncer:
+      accounts_need_setup: "%{count} hesabın kurulumu gerekiyor"
+      calculating_balances: Bağlı hesaplar için bakiyeler hesaplanıyor...
+      checking_account_configuration: Hesap yapılandırması kontrol ediliyor...
+      importing_accounts: Hesaplar Sophtron'dan içe aktarılıyor...
+      manual_sync_required: Bu kurum için manuel Sophtron senkronizasyonu gereklidir;
+        bu hesaplar otomatik senkronizasyon sırasında atlanıyor.
+      processing_transactions: Bağlı hesaplar için işlemler işleniyor...
+    toggle_manual_sync:
+      success_disabled: Sophtron kurumu otomatik olarak senkronize olacak.
+      success_enabled: Sophtron kurumu artık manuel senkronizasyon gerektiriyor.
+    type: tür
+    update:
+      errors:
+        access_key_compromised: Erişim Anahtarı ele geçirilmiş, süresi dolmuş veya
+          zaten kullanılmış olabilir. Lütfen yeni bir tane oluşturun.
+        blank_access_key: Lütfen bir Sophtron Erişim Anahtarı girin.
+        blank_user_id: Lütfen bir Sophtron Kullanıcı Kimliği girin.
+        invalid_access_key: Geçersiz Erişim Anahtarı. Sophtron'dan tam Erişim Anahtarını
+          kopyaladığınızdan emin olun.
+        invalid_user_id: Geçersiz Kullanıcı Kimliği. Sophtron'dan tam Kullanıcı Kimliğini
+          kopyaladığınızdan emin olun.
+        unexpected: Beklenmeyen bir hata oluştu. Lütfen tekrar deneyin veya destek
+          ekibiyle iletişime geçin.
+        update_failed: 'Bağlantı güncellenemedi: %{message}'
+        user_id_compromised: Kullanıcı Kimliği ele geçirilmiş, süresi dolmuş veya
+          zaten kullanılmış olabilir. Lütfen yeni bir tane oluşturun.
+      success: Sophtron bağlantısı başarıyla güncellendi! Hesaplarınız yeniden bağlanıyor.
diff --git a/config/locales/views/splits/de.yml b/config/locales/views/splits/de.yml
new file mode 100644
index 000000000..79ea40ab9
--- /dev/null
+++ b/config/locales/views/splits/de.yml
@@ -0,0 +1,47 @@
+---
+de:
+  splits:
+    new:
+      title: Transaktion aufteilen
+      description: Teilen Sie diese Transaktion in mehrere Einträge mit unterschiedlichen Kategorien und Beträgen auf.
+      submit: Transaktion aufteilen
+      cancel: Abbrechen
+      add_row: Aufteilung hinzufügen
+      remove_row: Entfernen
+      remaining: Verbleibend
+      amounts_must_match: Die Teilbeträge müssen dem ursprünglichen Transaktionsbetrag entsprechen.
+      name_label: Name
+      name_placeholder: Name der Aufteilung
+      amount_label: Betrag
+      category_label: Kategorie
+      uncategorized: "(nicht kategorisiert)"
+      original_name: "Name:"
+      original_date: "Datum:"
+      original_amount: "Betrag"
+      split_number: "Aufteilung #%{number}"
+    create:
+      success: Transaktion erfolgreich aufgeteilt
+      not_splittable: Diese Transaktion kann nicht aufgeteilt werden.
+    destroy:
+      success: Aufteilung der Transaktion erfolgreich aufgehoben
+    show:
+      title: Aufgeteilte Einträge
+      description: Diese Transaktion wurde in die folgenden Einträge aufgeteilt.
+      button_title: Transaktion aufteilen
+      button_description: Teilen Sie diese Transaktion in mehrere Einträge mit unterschiedlichen Kategorien und Beträgen auf.
+      button: Aufteilen
+      unsplit_title: Aufteilung aufheben
+      unsplit_button: Aufteilung aufheben
+      unsplit_confirm: Dadurch werden alle aufgeteilten Einträge entfernt und die ursprüngliche Transaktion wiederhergestellt.
+    edit:
+      title: Aufteilung bearbeiten
+      description: Bearbeiten Sie die aufgeteilten Einträge für diese Transaktion.
+      submit: Aufteilung aktualisieren
+      not_split: Diese Transaktion ist nicht aufgeteilt.
+    update:
+      success: Aufteilung erfolgreich aktualisiert
+    child:
+      title: Teil einer Aufteilung
+      description: Dieser Eintrag ist Teil einer aufgeteilten Transaktion.
+      edit_split: Aufteilung bearbeiten
+      unsplit: Aufteilung aufheben
diff --git a/config/locales/views/splits/es.yml b/config/locales/views/splits/es.yml
new file mode 100644
index 000000000..dc378a8c5
--- /dev/null
+++ b/config/locales/views/splits/es.yml
@@ -0,0 +1,47 @@
+---
+es:
+  splits:
+    new:
+      title: Dividir transacción
+      description: Divide esta transacción en varias entradas con categorías e importes diferentes.
+      submit: Dividir transacción
+      cancel: Cancelar
+      add_row: Añadir división
+      remove_row: Eliminar
+      remaining: Restante
+      amounts_must_match: Los importes de las divisiones deben sumar el importe original de la transacción.
+      name_label: Nombre
+      name_placeholder: Nombre de la división
+      amount_label: Importe
+      category_label: Categoría
+      uncategorized: "(sin categoría)"
+      original_name: "Nombre:"
+      original_date: "Fecha:"
+      original_amount: "Importe"
+      split_number: "División n.º %{number}"
+    create:
+      success: Transacción dividida correctamente
+      not_splittable: Esta transacción no se puede dividir.
+    destroy:
+      success: División de la transacción deshecha correctamente
+    show:
+      title: Entradas divididas
+      description: Esta transacción se ha dividido en las siguientes entradas.
+      button_title: Dividir transacción
+      button_description: Divide esta transacción en varias entradas con categorías e importes diferentes.
+      button: Dividir
+      unsplit_title: Deshacer división
+      unsplit_button: Deshacer división
+      unsplit_confirm: Esto eliminará todas las entradas divididas y restaurará la transacción original.
+    edit:
+      title: Editar división
+      description: Modifica las entradas divididas de esta transacción.
+      submit: Actualizar división
+      not_split: Esta transacción no está dividida.
+    update:
+      success: División actualizada correctamente
+    child:
+      title: Parte de una división
+      description: Esta entrada forma parte de una transacción dividida.
+      edit_split: Editar división
+      unsplit: Deshacer división
diff --git a/config/locales/views/splits/fr.yml b/config/locales/views/splits/fr.yml
index 5e899f513..343b72fd8 100644
--- a/config/locales/views/splits/fr.yml
+++ b/config/locales/views/splits/fr.yml
@@ -1,47 +1,51 @@
 ---
 fr:
   splits:
-    new:
-      title: Diviser la transaction
-      description: Divisez cette transaction en plusieurs entrées avec différentes catégories et montants.
-      submit: Diviser la transaction
-      cancel: Annuler
-      add_row: Ajouter une division
-      remove_row: Retirer
-      remaining: Restant
-      amounts_must_match: Les montants des divisions doivent être égaux au montant initial de la transaction.
-      name_label: Nom
-      name_placeholder: Nom de la division
-      amount_label: Montant
-      category_label: Catégorie
-      uncategorized: "(sans catégorie)"
-      original_name: "Nom :"
-      original_date: "Date :"
-      original_amount: "Montant"
-      split_number: "Division n°%{number}"
-    create:
-      success: Transaction divisée avec succès
-      not_splittable: Cette transaction ne peut pas être divisée.
-    destroy:
-      success: Division de la transaction annulée avec succès
-    show:
-      title: Entrées de la division
-      description: Cette transaction a été divisée en plusieurs entrées.
-      button_title: Diviser la transaction
-      button_description: Divisez cette transaction en plusieurs entrées avec différentes catégories et montants.
-      button: Diviser
-      unsplit_title: Annuler la division
-      unsplit_button: Annuler la division
-      unsplit_confirm: Cela supprimera toutes les entrées de division et restaurera la transaction initiale.
-    edit:
-      title: Modifier la division
-      description: Modifiez les entrées de division de cette transaction.
-      submit: Mettre à jour la division
-      not_split: Cette transaction n'est pas divisée.
-    update:
-      success: Division mise à jour avec succès
     child:
-      title: Partie d'une division
       description: Cette entrée fait partie d'une transaction divisée.
       edit_split: Modifier la division
+      title: Partie d'une division
       unsplit: Annuler la division
+    create:
+      not_splittable: Cette transaction ne peut pas être divisée.
+      success: Transaction divisée avec succès
+    destroy:
+      success: Division de la transaction annulée avec succès
+    edit:
+      description: Modifiez les entrées de division de cette transaction.
+      not_split: Cette transaction n'est pas divisée.
+      submit: Mettre à jour la division
+      title: Modifier la division
+    new:
+      add_row: Ajouter une division
+      amount_label: Montant
+      amounts_must_match: Les montants des divisions doivent être égaux au montant
+        initial de la transaction.
+      cancel: Annuler
+      category_label: Catégorie
+      description: Divisez cette transaction en plusieurs entrées avec différentes
+        catégories et montants.
+      name_label: Nom
+      name_placeholder: Nom de la division
+      original_amount: Montant
+      original_date: 'Date :'
+      original_name: 'Nom :'
+      remaining: Restant
+      remove_row: Retirer
+      split_number: Division n°%{number}
+      submit: Diviser la transaction
+      title: Diviser la transaction
+      uncategorized: "(sans catégorie)"
+    show:
+      button: Diviser
+      button_description: Divisez cette transaction en plusieurs entrées avec différentes
+        catégories et montants.
+      button_title: Diviser la transaction
+      description: Cette transaction a été divisée en plusieurs entrées.
+      title: Entrées de la division
+      unsplit_button: Annuler la division
+      unsplit_confirm: Cela supprimera toutes les entrées de division et restaurera
+        la transaction initiale.
+      unsplit_title: Annuler la division
+    update:
+      success: Division mise à jour avec succès
diff --git a/config/locales/views/splits/it.yml b/config/locales/views/splits/it.yml
new file mode 100644
index 000000000..83f1127a4
--- /dev/null
+++ b/config/locales/views/splits/it.yml
@@ -0,0 +1,47 @@
+---
+it:
+  splits:
+    new:
+      title: Dividi transazione
+      description: Dividi questa transazione in più voci con categorie e importi diversi.
+      submit: Dividi transazione
+      cancel: Annulla
+      add_row: Aggiungi divisione
+      remove_row: Rimuovi
+      remaining: Rimanente
+      amounts_must_match: Gli importi delle divisioni devono essere uguali all'importo della transazione originale.
+      name_label: Nome
+      name_placeholder: Nome divisione
+      amount_label: Importo
+      category_label: Categoria
+      uncategorized: "(non categorizzata)"
+      original_name: "Nome:"
+      original_date: "Data:"
+      original_amount: "Importo"
+      split_number: "Divisione n.%{number}"
+    create:
+      success: Transazione divisa con successo
+      not_splittable: Questa transazione non può essere divisa.
+    destroy:
+      success: Divisione transazione annullata con successo
+    show:
+      title: Voci divise
+      description: Questa transazione è stata divisa nelle seguenti voci.
+      button_title: Dividi transazione
+      button_description: Dividi questa transazione in più voci con categorie e importi diversi.
+      button: Dividi
+      unsplit_title: Annulla divisione
+      unsplit_button: Annulla divisione
+      unsplit_confirm: Questo rimuoverà tutte le voci divise e ripristinerà la transazione originale.
+    edit:
+      title: Modifica divisione
+      description: Modifica le voci divise per questa transazione.
+      submit: Aggiorna divisione
+      not_split: Questa transazione non è divisa.
+    update:
+      success: Divisione aggiornata con successo
+    child:
+      title: Parte di una divisione
+      description: Questa voce fa parte di una transazione divisa.
+      edit_split: Modifica divisione
+      unsplit: Annulla divisione
diff --git a/config/locales/views/splits/nl.yml b/config/locales/views/splits/nl.yml
new file mode 100644
index 000000000..b509b12d4
--- /dev/null
+++ b/config/locales/views/splits/nl.yml
@@ -0,0 +1,47 @@
+---
+nl:
+  splits:
+    new:
+      title: Transactie splitsen
+      description: Splits deze transactie in meerdere boekingen met verschillende categorieën en bedragen.
+      submit: Transactie splitsen
+      cancel: Annuleren
+      add_row: Splitsing toevoegen
+      remove_row: Verwijderen
+      remaining: Resterend
+      amounts_must_match: De splitsbedragen moeten gelijk zijn aan het oorspronkelijke transactiebedrag.
+      name_label: Naam
+      name_placeholder: Naam van splitsing
+      amount_label: Bedrag
+      category_label: Categorie
+      uncategorized: "(geen categorie)"
+      original_name: "Naam:"
+      original_date: "Datum:"
+      original_amount: "Bedrag"
+      split_number: "Splitsing #%{number}"
+    create:
+      success: Transactie succesvol gesplitst
+      not_splittable: Deze transactie kan niet worden gesplitst.
+    destroy:
+      success: Splitsing van transactie succesvol ongedaan gemaakt
+    show:
+      title: Gesplitste boekingen
+      description: Deze transactie is gesplitst in de volgende boekingen.
+      button_title: Transactie splitsen
+      button_description: Splits deze transactie in meerdere boekingen met verschillende categorieën en bedragen.
+      button: Splitsen
+      unsplit_title: Splitsing ongedaan maken
+      unsplit_button: Splitsing ongedaan maken
+      unsplit_confirm: Hiermee worden alle gesplitste boekingen verwijderd en wordt de oorspronkelijke transactie hersteld.
+    edit:
+      title: Splitsing bewerken
+      description: Pas de gesplitste boekingen voor deze transactie aan.
+      submit: Splitsing bijwerken
+      not_split: Deze transactie is niet gesplitst.
+    update:
+      success: Splitsing succesvol bijgewerkt
+    child:
+      title: Onderdeel van splitsing
+      description: Deze boeking maakt deel uit van een gesplitste transactie.
+      edit_split: Splitsing bewerken
+      unsplit: Splitsing ongedaan maken
diff --git a/config/locales/views/splits/pt-BR.yml b/config/locales/views/splits/pt-BR.yml
new file mode 100644
index 000000000..c07c90f52
--- /dev/null
+++ b/config/locales/views/splits/pt-BR.yml
@@ -0,0 +1,47 @@
+---
+pt-BR:
+  splits:
+    new:
+      title: Dividir transação
+      description: Divida esta transação em vários lançamentos com categorias e valores diferentes.
+      submit: Dividir transação
+      cancel: Cancelar
+      add_row: Adicionar divisão
+      remove_row: Remover
+      remaining: Restante
+      amounts_must_match: Os valores das divisões devem ser iguais ao valor original da transação.
+      name_label: Nome
+      name_placeholder: Nome da divisão
+      amount_label: Valor
+      category_label: Categoria
+      uncategorized: "(sem categoria)"
+      original_name: "Nome:"
+      original_date: "Data:"
+      original_amount: "Valor"
+      split_number: "Divisão nº %{number}"
+    create:
+      success: Transação dividida com sucesso
+      not_splittable: Esta transação não pode ser dividida.
+    destroy:
+      success: Divisão da transação desfeita com sucesso
+    show:
+      title: Lançamentos divididos
+      description: Esta transação foi dividida nos seguintes lançamentos.
+      button_title: Dividir transação
+      button_description: Divida esta transação em vários lançamentos com categorias e valores diferentes.
+      button: Dividir
+      unsplit_title: Desfazer divisão
+      unsplit_button: Desfazer divisão
+      unsplit_confirm: Isso removerá todos os lançamentos divididos e restaurará a transação original.
+    edit:
+      title: Editar divisão
+      description: Modifique os lançamentos divididos desta transação.
+      submit: Atualizar divisão
+      not_split: Esta transação não está dividida.
+    update:
+      success: Divisão atualizada com sucesso
+    child:
+      title: Parte de uma divisão
+      description: Este lançamento faz parte de uma transação dividida.
+      edit_split: Editar divisão
+      unsplit: Desfazer divisão
diff --git a/config/locales/views/splits/ru.yml b/config/locales/views/splits/ru.yml
new file mode 100644
index 000000000..b6a0aa07d
--- /dev/null
+++ b/config/locales/views/splits/ru.yml
@@ -0,0 +1,49 @@
+---
+ru:
+  splits:
+    child:
+      description: Эта запись является частью разделённой операции.
+      edit_split: Редактировать разделение
+      title: Часть разделения
+      unsplit: Объединить
+    create:
+      not_splittable: Эту операцию нельзя разделить.
+      success: Операция успешно разделена
+    destroy:
+      success: Операция успешно объединена
+    edit:
+      description: Измените записи разделения для этой операции.
+      not_split: Эта операция не разделена.
+      submit: Обновить разделение
+      title: Редактировать разделение
+    new:
+      add_row: Добавить разделение
+      amount_label: Сумма
+      amounts_must_match: Суммы разделений должны совпадать с исходной суммой операции.
+      cancel: Отмена
+      category_label: Категория
+      description: Разделите эту операцию на несколько записей с разными категориями
+        и суммами.
+      name_label: Название
+      name_placeholder: Название разделения
+      original_amount: Сумма
+      original_date: 'Дата:'
+      original_name: 'Название:'
+      remaining: Остаток
+      remove_row: Удалить
+      split_number: Разделение №%{number}
+      submit: Разделить операцию
+      title: Разделить операцию
+      uncategorized: "(без категории)"
+    show:
+      button: Разделить
+      button_description: Разделите эту операцию на несколько записей с разными категориями
+        и суммами.
+      button_title: Разделить операцию
+      description: Эта операция была разделена на следующие записи.
+      title: Разделённые записи
+      unsplit_button: Объединить
+      unsplit_confirm: Это удалит все разделённые записи и восстановит исходную операцию.
+      unsplit_title: Объединить операцию
+    update:
+      success: Разделение успешно обновлено
diff --git a/config/locales/views/splits/tr.yml b/config/locales/views/splits/tr.yml
new file mode 100644
index 000000000..dc60f487b
--- /dev/null
+++ b/config/locales/views/splits/tr.yml
@@ -0,0 +1,49 @@
+---
+tr:
+  splits:
+    child:
+      description: Bu kayıt, bölünmüş bir işlemin parçasıdır.
+      edit_split: Bölünmeyi Düzenle
+      title: Bölünmenin Parçası
+      unsplit: Bölünmeyi Geri Al
+    create:
+      not_splittable: Bu işlem bölünemez.
+      success: İşlem başarıyla bölündü
+    destroy:
+      success: İşlemin bölünmesi başarıyla geri alındı
+    edit:
+      description: Bu işlem için bölünmüş kayıtları düzenleyin.
+      not_split: Bu işlem bölünmemiş.
+      submit: Bölünmeyi Güncelle
+      title: Bölünmeyi Düzenle
+    new:
+      add_row: Bölüm ekle
+      amount_label: Tutar
+      amounts_must_match: Bölüm tutarları, orijinal işlem tutarına eşit olmalıdır.
+      cancel: İptal
+      category_label: Kategori
+      description: Bu işlemi farklı kategoriler ve tutarlarla birden fazla kayda bölün.
+      name_label: Ad
+      name_placeholder: Bölüm adı
+      original_amount: Tutar
+      original_date: 'Tarih:'
+      original_name: 'Ad:'
+      remaining: Kalan
+      remove_row: Kaldır
+      split_number: 'Bölüm #%{number}'
+      submit: İşlemi Böl
+      title: İşlemi Böl
+      uncategorized: "(kategorisiz)"
+    show:
+      button: Böl
+      button_description: Bu işlemi farklı kategoriler ve tutarlarla birden fazla
+        kayda bölün.
+      button_title: İşlemi Böl
+      description: Bu işlem aşağıdaki kayıtlara bölündü.
+      title: Bölünmüş Kayıtlar
+      unsplit_button: Bölünmeyi Geri Al
+      unsplit_confirm: Bu, tüm bölünmüş kayıtları kaldıracak ve orijinal işlemi geri
+        yükleyecektir.
+      unsplit_title: İşlemin Bölünmesini Geri Al
+    update:
+      success: Bölünme başarıyla güncellendi
diff --git a/config/locales/views/subscriptions/fr.yml b/config/locales/views/subscriptions/fr.yml
index 61965fc21..3e916b331 100644
--- a/config/locales/views/subscriptions/fr.yml
+++ b/config/locales/views/subscriptions/fr.yml
@@ -1,13 +1,28 @@
+---
 fr:
   subscriptions:
+    create:
+      trial_already_used: Vous avez déjà commencé ou terminé un essai. Veuillez mettre
+        à niveau pour continuer.
+      welcome: Bienvenue sur Bien sûr !
     self_hosted_alert: "%{product_name} n'est pas disponible en mode auto-hébergé."
+    success:
+      contribution_failed: Une erreur s'est produite lors du traitement de votre contribution.
+        Veuillez réessayer.
+      welcome_with_contribution: Bienvenue sur Bien sûr !  Votre contribution est
+        appréciée.
     upgrade:
-      contribute_and_support_sure: "Contribuer et soutenir Sure"
-      cta: "Continuez à soutenir le développement de cette base de code !"
+      account_settings: Paramètres du compte
+      already_contributing: Vous contribuez déjà. Merci!
+      contribute_and_support_sure: Contribuer et soutenir Sure
+      cta: Continuez à soutenir le développement de cette base de code !
       header:
-        support: "Soutenir"
-        sure: "Sure"
-        today: "aujourd'hui"
-      redirect_to_stripe: "Dans l'étape suivante, vous serez redirigé vers Stripe, qui gère les cartes de crédit pour nous."
-      trialing: "Vos données seront supprimées dans %{days} jours"
-      trial_over: "Votre période d'essai est terminée"
\ No newline at end of file
+        support: Soutenir
+        sure: Sure
+        today: aujourd'hui
+      page_title: Mise à niveau
+      redirect_to_stripe: Dans l'étape suivante, vous serez redirigé vers Stripe,
+        qui gère les cartes de crédit pour nous.
+      sign_out: Se déconnecter
+      trial_over: Votre période d'essai est terminée
+      trialing: Vos données seront supprimées dans %{days} jours
diff --git a/config/locales/views/subscriptions/it.yml b/config/locales/views/subscriptions/it.yml
new file mode 100644
index 000000000..58ea65fd8
--- /dev/null
+++ b/config/locales/views/subscriptions/it.yml
@@ -0,0 +1,24 @@
+---
+it:
+  subscriptions:
+    self_hosted_alert: "%{product_name} non è disponibile in modalità self-hosted."
+    upgrade:
+      already_contributing: Stai già contribuendo. Grazie!
+      page_title: "Aggiorna"
+      account_settings: "Impostazioni account"
+      sign_out: "Esci"
+      contribute_and_support_sure: "Contribuisci e supporta Sure"
+      cta: "Continua a supportare lo sviluppo di questo progetto!"
+      header:
+        support: "Supporta"
+        sure: "Sure"
+        today: "oggi"
+      redirect_to_stripe: "Nel passo successivo, verrai reindirizzato a Stripe che gestisce le carte di credito per noi."
+      trialing: "I tuoi dati verranno eliminati tra %{days} giorni"
+      trial_over: "Il tuo periodo di prova è terminato"
+    create:
+      welcome: "Benvenuto su Sure!"
+      trial_already_used: "Hai già iniziato o completato una prova. Effettua l'upgrade per continuare."
+    success:
+      welcome_with_contribution: "Benvenuto su Sure! Il tuo contributo è apprezzato."
+      contribution_failed: "Si è verificato un errore nell'elaborazione del tuo contributo. Riprova."
diff --git a/config/locales/views/subscriptions/ru.yml b/config/locales/views/subscriptions/ru.yml
new file mode 100644
index 000000000..1487c046e
--- /dev/null
+++ b/config/locales/views/subscriptions/ru.yml
@@ -0,0 +1,27 @@
+---
+ru:
+  subscriptions:
+    create:
+      trial_already_used: Вы уже начали или завершили пробный период. Пожалуйста,
+        обновитесь, чтобы продолжить.
+      welcome: Добро пожаловать в Sure!
+    self_hosted_alert: "%{product_name} недоступен в режиме с собственным хостингом."
+    success:
+      contribution_failed: Произошла ошибка при обработке вашего взноса. Пожалуйста,
+        попробуйте снова.
+      welcome_with_contribution: Добро пожаловать в Sure! Ваша поддержка очень ценна.
+    upgrade:
+      account_settings: Настройки счёта
+      already_contributing: Вы уже поддерживаете нас. Спасибо!
+      contribute_and_support_sure: Поддержите и помогите Sure
+      cta: Продолжайте поддерживать разработку этого кода!
+      header:
+        support: Поддержка
+        sure: Sure
+        today: сегодня
+      page_title: Обновление
+      redirect_to_stripe: На следующем шаге вы будете перенаправлены на Stripe, который
+        обрабатывает наши кредитные карты.
+      sign_out: Выйти
+      trial_over: Ваш пробный период завершён
+      trialing: Ваши данные будут удалены через %{days} дней
diff --git a/config/locales/views/subscriptions/tr.yml b/config/locales/views/subscriptions/tr.yml
index 416c1b7b2..53e7c6372 100644
--- a/config/locales/views/subscriptions/tr.yml
+++ b/config/locales/views/subscriptions/tr.yml
@@ -1,14 +1,26 @@
 ---
 tr:
   subscriptions:
+    create:
+      trial_already_used: Zaten bir deneme süresi başlatmış veya tamamlamışsınız.
+        Devam etmek için yükseltme yapın.
+      welcome: Sure'a hoş geldiniz!
     self_hosted_alert: "%{product_name} kendi sunucunda barındırılan modda kullanılamaz."
+    success:
+      contribution_failed: Katkınız işlenirken bir sorun oluştu. Lütfen tekrar deneyin.
+      welcome_with_contribution: Sure'a hoş geldiniz! Katkınız için teşekkür ederiz.
     upgrade:
-      contribute_and_support_sure: "Katkıda bulun ve Sure'u destekle"
-      cta: "Bu kod tabanının geliştirilmesini desteklemeye devam edin!"
+      account_settings: Hesap Ayarları
+      already_contributing: Zaten katkıda bulunuyorsunuz. Teşekkür ederiz!
+      contribute_and_support_sure: Katkıda bulun ve Sure'u destekle
+      cta: Bu kod tabanının geliştirilmesini desteklemeye devam edin!
       header:
-        support: "Destekle"
-        sure: "Sure"
-        today: "bugün"
-      redirect_to_stripe: "Bir sonraki adımda, kredi kartlarını bizim için işleyen Stripe'a yönlendirileceksiniz."
-      trialing: "Verileriniz %{days} gün içinde silinecek"
-      trial_over: "Deneme süreniz sona erdi"
\ No newline at end of file
+        support: Destekle
+        sure: Sure
+        today: bugün
+      page_title: Yükselt
+      redirect_to_stripe: Bir sonraki adımda, kredi kartlarını bizim için işleyen
+        Stripe'a yönlendirileceksiniz.
+      sign_out: Çıkış yap
+      trial_over: Deneme süreniz sona erdi
+      trialing: Verileriniz %{days} gün içinde silinecek
diff --git a/config/locales/views/subscriptions/zh-CN.yml b/config/locales/views/subscriptions/zh-CN.yml
index 41da3c50a..eab05cd1d 100644
--- a/config/locales/views/subscriptions/zh-CN.yml
+++ b/config/locales/views/subscriptions/zh-CN.yml
@@ -11,4 +11,14 @@ zh-CN:
         today: "今天"
       redirect_to_stripe: "在下一步中，您将被重定向到 Stripe，它为我们处理信用卡。"
       trialing: "您的数据将在 %{days} 天后删除"
-      trial_over: "您的试用期已结束"
\ No newline at end of file
+      trial_over: "您的试用期已结束"
+      already_contributing: 你已经在贡献。谢谢！
+      page_title: 升级
+      account_settings: 账户设置
+      sign_out: 退出登录
+    create:
+      welcome: 欢迎使用 Sure！
+      trial_already_used: 你已经开始或完成过试用。请升级以继续使用。
+    success:
+      welcome_with_contribution: 欢迎使用 Sure！感谢你的贡献。
+      contribution_failed: 处理贡献时出现问题。请重试。
diff --git a/config/locales/views/syncs/en.yml b/config/locales/views/syncs/en.yml
new file mode 100644
index 000000000..66cd17afe
--- /dev/null
+++ b/config/locales/views/syncs/en.yml
@@ -0,0 +1,6 @@
+---
+en:
+  syncs:
+    cancel:
+      cancelled: Sync cancelled. Anything already synced is kept; queued work was stopped.
+      not_cancellable: This sync has already finished.
diff --git a/config/locales/views/syncs/pl.yml b/config/locales/views/syncs/pl.yml
new file mode 100644
index 000000000..04bd436b3
--- /dev/null
+++ b/config/locales/views/syncs/pl.yml
@@ -0,0 +1,6 @@
+---
+pl:
+  syncs:
+    cancel:
+      cancelled: Synchronizacja anulowana. Wszystko, co już zostało zsynchronizowane, jest zachowane; oczekujące prace zostały zatrzymane.
+      not_cancellable: Ta synchronizacja już się zakończyła.
diff --git a/config/locales/views/syncs/tr.yml b/config/locales/views/syncs/tr.yml
new file mode 100644
index 000000000..6a47d7c72
--- /dev/null
+++ b/config/locales/views/syncs/tr.yml
@@ -0,0 +1,7 @@
+---
+tr:
+  syncs:
+    cancel:
+      cancelled: Senkronizasyon iptal edildi. Zaten senkronize edilenler korunur;
+        sıradaki işler durduruldu.
+      not_cancellable: Bu senkronizasyon zaten tamamlandı.
diff --git a/config/locales/views/tag/deletions/fr.yml b/config/locales/views/tag/deletions/fr.yml
index 1cee1ee9a..e93b186fb 100644
--- a/config/locales/views/tag/deletions/fr.yml
+++ b/config/locales/views/tag/deletions/fr.yml
@@ -6,8 +6,12 @@ fr:
         deleted: Étiquette supprimée
       new:
         delete_and_leave_uncategorized: Supprimer "%{tag_name}"
-        delete_and_recategorize: Supprimer "%{tag_name}" et attribuer une nouvelle étiquette
+        delete_and_reassign: Supprimer et réaffecter
+        delete_and_recategorize: Supprimer "%{tag_name}" et attribuer une nouvelle
+          étiquette
         delete_tag: Supprimer l'étiquette ?
-        explanation: "%{tag_name} sera supprimé des transactions et d'autres entités catégorisables. Au lieu de les laisser non catégorisées, vous pouvez également attribuer une nouvelle étiquette ci-dessous."
+        explanation: "%{tag_name} sera supprimé des transactions et d'autres entités
+          catégorisables. Au lieu de les laisser non catégorisées, vous pouvez également
+          attribuer une nouvelle étiquette ci-dessous."
         replacement_tag_prompt: Sélectionnez l'étiquette
         tag: Étiquette
diff --git a/config/locales/views/tag/deletions/it.yml b/config/locales/views/tag/deletions/it.yml
new file mode 100644
index 000000000..5c998bf1d
--- /dev/null
+++ b/config/locales/views/tag/deletions/it.yml
@@ -0,0 +1,14 @@
+---
+it:
+  tag:
+    deletions:
+      create:
+        deleted: Etichetta eliminata
+      new:
+        delete_and_leave_uncategorized: Elimina "%{tag_name}"
+        delete_and_recategorize: Elimina "%{tag_name}" e assegna nuova etichetta
+        delete_and_reassign: Elimina e riassegna
+        delete_tag: Eliminare l'etichetta?
+        explanation: "%{tag_name} verrà rimossa dalle transazioni e da altre entità con etichetta. Invece di lasciarle senza etichetta, puoi anche assegnare una nuova etichetta qui sotto."
+        replacement_tag_prompt: Seleziona etichetta
+        tag: Etichetta
diff --git a/config/locales/views/tag/deletions/ru.yml b/config/locales/views/tag/deletions/ru.yml
new file mode 100644
index 000000000..200b634f4
--- /dev/null
+++ b/config/locales/views/tag/deletions/ru.yml
@@ -0,0 +1,16 @@
+---
+ru:
+  tag:
+    deletions:
+      create:
+        deleted: Тег удалён
+      new:
+        delete_and_leave_uncategorized: Удалить "%{tag_name}"
+        delete_and_reassign: Удалить и переназначить
+        delete_and_recategorize: Удалить "%{tag_name}" и назначить новый тег
+        delete_tag: Удалить тег?
+        explanation: "%{tag_name} будет удалён из операций и других объектов, к которым
+          можно применить теги. Вместо того чтобы оставить их без тегов, вы можете
+          назначить новый тег ниже."
+        replacement_tag_prompt: Выберите тег
+        tag: Тег
diff --git a/config/locales/views/tag/deletions/tr.yml b/config/locales/views/tag/deletions/tr.yml
index fd12cf5e5..0244d334f 100644
--- a/config/locales/views/tag/deletions/tr.yml
+++ b/config/locales/views/tag/deletions/tr.yml
@@ -6,8 +6,11 @@ tr:
         deleted: Etiket silindi
       new:
         delete_and_leave_uncategorized: "%{tag_name} etiketini sil"
+        delete_and_reassign: Sil ve yeniden ata
         delete_and_recategorize: "%{tag_name} etiketini sil ve yeni bir etiket ata"
         delete_tag: Etiket silinsin mi?
-        explanation: "%{tag_name} işlemlerden ve diğer etiketlenebilir varlıklardan kaldırılacak. Onları etiketsiz bırakmak yerine aşağıdan yeni bir etiket de atayabilirsin."
+        explanation: "%{tag_name} işlemlerden ve diğer etiketlenebilir varlıklardan
+          kaldırılacak. Onları etiketsiz bırakmak yerine aşağıdan yeni bir etiket
+          de atayabilirsin."
         replacement_tag_prompt: Etiket seç
         tag: Etiket
diff --git a/config/locales/views/tag/deletions/zh-CN.yml b/config/locales/views/tag/deletions/zh-CN.yml
index 816eecfd2..7fd19adc5 100644
--- a/config/locales/views/tag/deletions/zh-CN.yml
+++ b/config/locales/views/tag/deletions/zh-CN.yml
@@ -11,3 +11,4 @@ zh-CN:
         explanation: "“%{tag_name}”将从交易及其他可标记实体中移除。您也可以在下述选项中选择一个新标签进行重新分配，而不是保留为未标记状态。"
         replacement_tag_prompt: 选择新标签
         tag: 标签
+        delete_and_reassign: 删除并重新分配
diff --git a/config/locales/views/tags/fr.yml b/config/locales/views/tags/fr.yml
index 898cc97f6..1f8f15a71 100644
--- a/config/locales/views/tags/fr.yml
+++ b/config/locales/views/tags/fr.yml
@@ -3,14 +3,17 @@ fr:
   tags:
     create:
       created: Étiquette créée
-      error: "Erreur lors de la création de l'étiquette : %{error}"
+      error: 'Erreur lors de la création de l''étiquette : %{error}'
     destroy:
       deleted: Étiquette supprimée
+    destroy_all:
+      all_deleted: Toutes les balises supprimées
     edit:
       edit: Éditer l'étiquette
     form:
       placeholder: Nom de l'étiquette
     index:
+      delete_all: Supprimer tout
       empty: Aucune étiquette pour le moment
       new: Nouvelle étiquette
       tags: Étiquettes
diff --git a/config/locales/views/tags/it.yml b/config/locales/views/tags/it.yml
new file mode 100644
index 000000000..f4ba12c71
--- /dev/null
+++ b/config/locales/views/tags/it.yml
@@ -0,0 +1,26 @@
+---
+it:
+  tags:
+    create:
+      created: Etichetta creata
+      error: "Errore nella creazione dell'etichetta: %{error}"
+    destroy:
+      deleted: Etichetta eliminata
+    destroy_all:
+      all_deleted: Tutte le etichette eliminate
+    edit:
+      edit: Modifica etichetta
+    form:
+      placeholder: Nome etichetta
+    index:
+      empty: Nessuna etichetta ancora
+      new: Nuova etichetta
+      tags: Etichette
+      delete_all: Elimina tutto
+    new:
+      new: Nuova etichetta
+    tag:
+      delete: Elimina
+      edit: Modifica
+    update:
+      updated: Etichetta aggiornata
diff --git a/config/locales/views/tags/ru.yml b/config/locales/views/tags/ru.yml
new file mode 100644
index 000000000..093a1ab3a
--- /dev/null
+++ b/config/locales/views/tags/ru.yml
@@ -0,0 +1,26 @@
+---
+ru:
+  tags:
+    create:
+      created: Тег создан
+      error: 'Ошибка при создании тега: %{error}'
+    destroy:
+      deleted: Тег удалён
+    destroy_all:
+      all_deleted: Все теги удалены
+    edit:
+      edit: Редактировать тег
+    form:
+      placeholder: Название тега
+    index:
+      delete_all: Удалить все
+      empty: Тегов пока нет
+      new: Новый тег
+      tags: Теги
+    new:
+      new: Новый тег
+    tag:
+      delete: Удалить
+      edit: Редактировать
+    update:
+      updated: Тег обновлён
diff --git a/config/locales/views/tags/tr.yml b/config/locales/views/tags/tr.yml
index 57895d1a6..1c4bb8dbb 100644
--- a/config/locales/views/tags/tr.yml
+++ b/config/locales/views/tags/tr.yml
@@ -6,11 +6,14 @@ tr:
       error: 'Etiket oluşturulurken hata: %{error}'
     destroy:
       deleted: Etiket silindi
+    destroy_all:
+      all_deleted: Tüm etiketler silindi
     edit:
       edit: Etiketi düzenle
     form:
       placeholder: Etiket adı
     index:
+      delete_all: Tümünü sil
       empty: Henüz hiç etiket yok
       new: Yeni etiket
       tags: Etiketler
@@ -20,4 +23,4 @@ tr:
       delete: Sil
       edit: Düzenle
     update:
-      updated: Etiket güncellendi
\ No newline at end of file
+      updated: Etiket güncellendi
diff --git a/config/locales/views/tags/zh-CN.yml b/config/locales/views/tags/zh-CN.yml
index c133ffe3f..43abe87a5 100644
--- a/config/locales/views/tags/zh-CN.yml
+++ b/config/locales/views/tags/zh-CN.yml
@@ -14,6 +14,7 @@ zh-CN:
       empty: 暂无标签
       new: 新建标签
       tags: 标签管理
+      delete_all: 删除全部
     new:
       new: 新建标签
     tag:
@@ -21,3 +22,5 @@ zh-CN:
       edit: 编辑
     update:
       updated: 标签已更新
+    destroy_all:
+      all_deleted: 所有标签已删除
diff --git a/config/locales/views/trades/en.yml b/config/locales/views/trades/en.yml
index f8e1fb418..72577b500 100644
--- a/config/locales/views/trades/en.yml
+++ b/config/locales/views/trades/en.yml
@@ -20,6 +20,7 @@ en:
       type_dividend: Dividend
       type_interest: Interest
       dividend_requires_security: Security is required for dividends
+      trade_requires_security: A security (ticker) is required for buy and sell trades
     header:
       buy: Buy
       sell: Sell
diff --git a/config/locales/views/trades/fr.yml b/config/locales/views/trades/fr.yml
index a39330e14..19c4a5bea 100644
--- a/config/locales/views/trades/fr.yml
+++ b/config/locales/views/trades/fr.yml
@@ -5,6 +5,7 @@ fr:
       account: Compte de transfert (facultatif)
       account_prompt: Rechercher un compte
       amount: Montant
+      dividend_requires_security: Un titre est requis pour les dividendes
       fee: Frais de transaction
       holding: Symbole boursier
       holding_optional: Symbole boursier (facultatif)
@@ -12,23 +13,23 @@ fr:
       qty: Quantité
       submit: Ajouter la transaction
       ticker_placeholder: AAPL
+      trade_requires_security: Un titre (ticker) est requis pour les transactions d'achat et de vente
       type: Type
       type_buy: Acheter
-      type_sell: Vendre
       type_deposit: Dépôt
-      type_withdrawal: Retrait
       type_dividend: Dividende
       type_interest: Intérêts
-      dividend_requires_security: Un titre est requis pour les dividendes
+      type_sell: Vendre
+      type_withdrawal: Retrait
     header:
       buy: Acheter
-      sell: Vendre
+      current_market_price_label: Prix du marché actuel
       dividend: Dividende
       interest: Intérêts
-      current_market_price_label: Prix du marché actuel
       overview: Aperçu
       purchase_price_label: Prix d'achat
       purchase_qty_label: Quantité achetée
+      sell: Vendre
       symbol_label: Symbole
       total_return_label: Gain/perte non réalisé(e)
     new:
@@ -41,16 +42,16 @@ fr:
       cost_per_share_label: Coût par action
       date_label: Date
       delete: Supprimer
-      fee_label: Frais de transaction
       delete_subtitle: Cette action ne peut pas être annulée
       delete_title: Supprimer la transaction boursière
       details: Détails
-      provider_disabled_warning: "Mises à jour des prix en pause — le fournisseur %{provider} est désactivé. Réactivez-le dans les paramètres ou réassociez l'avoir à un autre fournisseur."
       exclude_subtitle: Cette transaction ne sera pas incluse dans les rapports et les calculs
       exclude_title: Exclure des analyses
+      fee_label: Frais de transaction
       no_category: Aucune catégorie
       note_label: Note
       note_placeholder: Ajoutez tout commentaire supplémentaire ici...
+      provider_disabled_warning: Mises à jour des prix en pause — le fournisseur %{provider} est désactivé. Réactivez-le dans les paramètres ou réassociez l'holding à un autre fournisseur.
       quantity_label: Quantité
       sell: Vendre
       settings: Paramètres
diff --git a/config/locales/views/trades/it.yml b/config/locales/views/trades/it.yml
new file mode 100644
index 000000000..de3425bf6
--- /dev/null
+++ b/config/locales/views/trades/it.yml
@@ -0,0 +1,58 @@
+---
+it:
+  trades:
+    form:
+      account: Conto di trasferimento (facoltativo)
+      account_prompt: Cerca conto
+      amount: Importo
+      fee: Commissione transazione
+      holding: Simbolo ticker
+      holding_optional: Simbolo ticker (facoltativo)
+      price: Prezzo per azione
+      qty: Quantità
+      submit: Aggiungi transazione
+      ticker_placeholder: AAPL
+      type: Tipo
+      type_buy: Acquisto
+      type_sell: Vendita
+      type_deposit: Deposito
+      type_withdrawal: Prelievo
+      type_dividend: Dividendo
+      type_interest: Interessi
+      dividend_requires_security: Il titolo è obbligatorio per i dividendi
+      trade_requires_security: Un titolo (ticker) è obbligatorio per le operazioni di acquisto e vendita
+    header:
+      buy: Acquisto
+      sell: Vendita
+      dividend: Dividendo
+      interest: Interessi
+      current_market_price_label: Prezzo di Mercato Attuale
+      overview: Panoramica
+      purchase_price_label: Prezzo di Acquisto
+      purchase_qty_label: Quantità Acquistata
+      symbol_label: Simbolo
+      total_return_label: Utile/perdita non realizzato
+    new:
+      title: Nuova transazione
+    show:
+      additional: Aggiuntivo
+      amount_label: Importo
+      buy: Acquisto
+      category_label: Categoria
+      cost_per_share_label: Costo per Azione
+      date_label: Data
+      delete: Elimina
+      fee_label: Commissione transazione
+      delete_subtitle: Questa azione non può essere annullata
+      delete_title: Elimina Movimento
+      details: Dettagli
+      provider_disabled_warning: "Aggiornamenti prezzi in pausa — il provider %{provider} è disabilitato. Riabilitalo nelle Impostazioni o rimappa la posizione su un altro provider."
+      exclude_subtitle: Questo movimento non verrà incluso nei rapporti e nei calcoli
+      exclude_title: Escludi dall'analisi
+      no_category: Nessuna categoria
+      note_label: Nota
+      note_placeholder: Aggiungi qui eventuali note aggiuntive...
+      quantity_label: Quantità
+      sell: Vendita
+      settings: Impostazioni
+      type_label: Tipo
diff --git a/config/locales/views/trades/ru.yml b/config/locales/views/trades/ru.yml
new file mode 100644
index 000000000..5e7203e6e
--- /dev/null
+++ b/config/locales/views/trades/ru.yml
@@ -0,0 +1,60 @@
+---
+ru:
+  trades:
+    form:
+      account: Счёт для перевода (необязательно)
+      account_prompt: Поиск счёта
+      amount: Сумма
+      dividend_requires_security: Для дивидендов требуется актив
+      fee: Комиссия за операцию
+      holding: Символ тикера
+      holding_optional: Символ тикера (необязательно)
+      price: Цена за акцию
+      qty: Количество
+      submit: Добавить операцию
+      ticker_placeholder: AAPL
+      trade_requires_security: Для операций покупки и продажи требуется указать инструмент 
+        (тикер)
+      type: Тип
+      type_buy: Покупка
+      type_deposit: Депозит
+      type_dividend: Дивиденды
+      type_interest: Проценты
+      type_sell: Продажа
+      type_withdrawal: Снятие
+    header:
+      buy: Покупка
+      current_market_price_label: Текущая рыночная цена
+      dividend: Дивиденды
+      interest: Проценты
+      overview: Обзор
+      purchase_price_label: Цена покупки
+      purchase_qty_label: Количество покупки
+      sell: Продажа
+      symbol_label: Символ
+      total_return_label: Нереализованная прибыль/убыток
+    new:
+      title: Новая операция
+    show:
+      additional: Дополнительно
+      amount_label: Сумма
+      buy: Покупка
+      category_label: Категория
+      cost_per_share_label: Стоимость за акцию
+      date_label: Дата
+      delete: Удалить
+      delete_subtitle: Это действие нельзя отменить
+      delete_title: Удалить операцию
+      details: Детали
+      exclude_subtitle: Эта операция не будет включена в отчёты и расчёты
+      exclude_title: Исключить из аналитики
+      fee_label: Комиссия за операцию
+      no_category: Без категории
+      note_label: Заметка
+      note_placeholder: Добавьте любые дополнительные заметки здесь...
+      provider_disabled_warning: Обновления цен приостановлены — провайдер %{provider}
+        отключен. Включите его в Настройках или переназначьте актив другому провайдеру.
+      quantity_label: Количество
+      sell: Продажа
+      settings: Настройки
+      type_label: Тип
diff --git a/config/locales/views/trades/tr.yml b/config/locales/views/trades/tr.yml
index a23fc5f14..34cabf2ab 100644
--- a/config/locales/views/trades/tr.yml
+++ b/config/locales/views/trades/tr.yml
@@ -5,15 +5,28 @@ tr:
       account: Transfer hesabı (isteğe bağlı)
       account_prompt: Hesap ara
       amount: Tutar
+      dividend_requires_security: Temettüler için menkul kıymet gereklidir
+      fee: İşlem ücreti
       holding: Sembol
+      holding_optional: Sembol (isteğe bağlı)
       price: Hisse başı fiyat
       qty: Miktar
       submit: İşlem ekle
       ticker_placeholder: AAPL
+      trade_requires_security: Alım ve satım işlemleri için bir menkul kıymet (sembol)
+        gereklidir
       type: Tür
+      type_buy: Al
+      type_deposit: Yatırma
+      type_dividend: Temettü
+      type_interest: Faiz
+      type_sell: Sat
+      type_withdrawal: Çekme
     header:
       buy: Al
       current_market_price_label: Güncel Piyasa Fiyatı
+      dividend: Temettü
+      interest: Faiz
       overview: Genel Bakış
       purchase_price_label: Alış Fiyatı
       purchase_qty_label: Alış Miktarı
@@ -24,6 +37,9 @@ tr:
       title: Yeni işlem
     show:
       additional: Ekstra
+      amount_label: Tutar
+      buy: Al
+      category_label: Kategori
       cost_per_share_label: Hisse başı maliyet
       date_label: Tarih
       delete: Sil
@@ -32,7 +48,14 @@ tr:
       details: Detaylar
       exclude_subtitle: Bu işlem rapor ve hesaplamalara dahil edilmeyecek
       exclude_title: Analizlerden hariç tut
+      fee_label: İşlem ücreti
+      no_category: Kategori yok
       note_label: Not
       note_placeholder: Ek notlarınızı buraya ekleyin...
+      provider_disabled_warning: Fiyat güncellemeleri duraklatıldı — %{provider} sağlayıcısı
+        devre dışı. Ayarlar'dan yeniden etkinleştirin veya varlığı başka bir sağlayıcıya
+        yeniden eşleyin.
       quantity_label: Miktar
-      settings: Ayarlar
\ No newline at end of file
+      sell: Sat
+      settings: Ayarlar
+      type_label: Tür
diff --git a/config/locales/views/trading212_items/en.yml b/config/locales/views/trading212_items/en.yml
new file mode 100644
index 000000000..a45fa0a55
--- /dev/null
+++ b/config/locales/views/trading212_items/en.yml
@@ -0,0 +1,102 @@
+---
+en:
+  providers:
+    trading212:
+      name: Trading 212
+      connection_description: Connect a Trading 212 investment account via API key
+      institution_name: Trading 212
+  trading212_items:
+    defaults:
+      name: Trading 212
+    trading212_item:
+      deletion_in_progress: Deletion in progress
+      environment_label_live: Live account
+      environment_label_demo: Demo account
+      syncing: Syncing
+      requires_update: API key needs attention
+      error: Error
+      synced: Synced %{time} ago. %{summary}.
+      never_synced: Never synced.
+      setup_accounts: Set up accounts
+      delete: Delete
+      accounts_need_setup: Account needs setup
+      accounts_need_setup_description: Your Trading 212 account needs to be linked to a Sure account.
+      no_accounts_discovered: No Trading 212 account discovered yet.
+      no_accounts_discovered_description: Run a sync after saving your API key to discover your account.
+    setup_accounts:
+      page_title: Set Up Trading 212 Account
+      dialog_title: Set Up Your Trading 212 Account
+      subtitle: Link your Trading 212 investment account.
+      info_box:
+        title: Trading 212 API Import
+        items:
+          item_1: Current positions with prices and quantities
+          item_2: Full order history (buys and sells)
+          item_3: Dividends and cash transactions
+      status:
+        fetching_accounts: Fetching account from Trading 212...
+        no_accounts_found_title: No account found.
+        no_accounts_found_description: Sure could not find a Trading 212 account. Check that your API key is valid.
+      available_accounts:
+        title: Available account
+        account_type_investment: Investment
+        account_summary: "%{account_type} • Balance: %{balance}"
+        account_id: "Account ID: %{account_id}"
+      link_existing:
+        description: Or link the discovered Trading 212 account to an existing manual investment account.
+        manual_account_option: "%{name} (%{balance})"
+        select_prompt: Select an account...
+      linked_accounts:
+        title: Already linked
+        linked_to_html: "Linked to: %{account}"
+      buttons:
+        refresh: Refresh
+        cancel: Cancel
+        back_to_settings: Back to Settings
+        create_selected_accounts: Create selected accounts
+        link: Link
+        done: Done
+    sync:
+      status:
+        checking_credentials: Checking Trading 212 credentials...
+        importing_account: Importing Trading 212 account...
+        checking_configuration: Checking account configuration...
+        accounts_need_setup:
+          one: 1 Trading 212 account needs setup...
+          other: "%{count} Trading 212 accounts need setup..."
+        processing_activity: Processing positions and activity...
+        calculating_balances: Calculating balances...
+    sync_status:
+      no_accounts: No Trading 212 account discovered yet
+      all_linked:
+        one: 1 account linked
+        other: "%{count} accounts linked"
+      partial: "%{linked} linked, %{unlinked} need setup"
+    select_existing_account:
+      title: Link Trading 212 account
+      no_accounts_available: No unlinked Trading 212 accounts are available yet.
+      run_sync_hint: "Run a sync from Settings > Providers after saving your API key."
+      wait_for_sync: Wait for the account discovery sync to finish.
+      balance: Balance
+      link: Link
+      cancel: Cancel
+    create:
+      success: Successfully configured Trading 212.
+    update:
+      success: Successfully updated Trading 212 configuration.
+    destroy:
+      success: Scheduled Trading 212 connection for deletion.
+    select_accounts:
+      not_configured: Trading 212 is not configured.
+    link_existing_account:
+      not_found: Account or Trading 212 configuration not found.
+      only_manual_investment: Only manual investment accounts can be linked to Trading 212.
+      already_linked: This Trading 212 account is already linked.
+      success: Successfully linked to Trading 212 account.
+      failed: Failed to link Trading 212 account.
+    complete_account_setup:
+      success:
+        one: Successfully created %{count} Trading 212 account.
+        other: Successfully created %{count} Trading 212 accounts.
+      none_selected: No accounts were selected.
+      none_created: No accounts were created.
diff --git a/config/locales/views/transactions/fr.yml b/config/locales/views/transactions/fr.yml
index ae93c78ca..b49f79262 100644
--- a/config/locales/views/transactions/fr.yml
+++ b/config/locales/views/transactions/fr.yml
@@ -1,120 +1,158 @@
 ---
 fr:
   transactions:
-    unknown_name: Transaction inconnue
-    selection_bar:
-      duplicate: Dupliquer
-      edit: Modifier
+    activity_labels:
+      buy: Achat
+      contribution: Contribution
+      dividend: Dividende
+      exchange: Échange
+      fee: Frais
+      interest: Intérêts
+      other: Autre
+      reinvestment: Réinvestissement
+      sell: Vente
+      sweep_in: Balayage entrant
+      sweep_out: Balayage sortant
+      transfer: Transfert
+      withdrawal: Retrait
+    attachments:
+      attachment_deleted: Pièce jointe supprimée avec succès
+      browse_to_add: Parcourir pour ajouter des fichiers
+      cannot_exceed: Ne peut dépasser %{count} pièces jointes par transaction
+      delete_failed: Échec de la suppression de la pièce jointe. Veuillez réessayer ou contacter le support.
+      failed_delete: 'Échec de la suppression de la pièce jointe : %{error}'
+      failed_upload: 'Échec du téléversement de la pièce jointe : %{error}'
+      files:
+        one: Fichier (1)
+        other: Fichiers (%{count})
+      max_reached: Limite maximale de fichiers atteinte (%{count}/%{max}). Supprimez un fichier existant pour en téléverser un autre.
+      no_attachments: Aucune pièce jointe pour l'instant
+      no_files_selected: Aucun fichier sélectionné pour le téléversement
+      select_up_to: Sélectionnez jusqu'à %{count} fichiers (images ou PDF, %{size} Mo max chacun) • %{used} sur %{count} utilisés
+      upload: Téléverser
+      upload_failed: Échec du téléversement de la pièce jointe. Veuillez réessayer ou contacter le support.
+      uploaded_many: "%{count} pièces jointes téléversées avec succès"
+      uploaded_one: Pièce jointe téléversée avec succès
+    bulk_updates:
+      new:
+        cancel: Annuler
+        category_label: Catégorie
+        category_prompt: Sélectionnez une catégorie
+        date_label: Date
+        header_title: Modifier les transactions
+        merchant_label: Marchand
+        merchant_prompt: Sélectionnez un commerçant
+        name_label: Nom
+        name_placeholder: Entrez un nom qui sera appliqué aux transactions sélectionnées
+        none: "(aucun)"
+        notes_label: Remarques
+        notes_placeholder: Saisissez une note qui sera appliquée aux transactions sélectionnées
+        overview: Aperçu
+        save: Enregistrer
+        tags_label: Balises
+        transactions_section: Opérations
+    categorizes:
+      create:
+        categorized:
+          one: 1 transaction catégorisée
+          other: "%{count} transactions catégorisées"
+        rule_creation_failed: Transactions catégorisées, mais la règle n'a pas pu être créée (elle existe peut-être déjà).
+      entry_row:
+        assign_category_select: Assigner une catégorie pour %{name}
+        include_checkbox: Inclure %{name}
+      show:
+        all_done: Toutes les transactions sont catégorisées
+        assign_category: Assigner une catégorie
+        assign_category_prompt: "→ assigner"
+        col_amount: Montant
+        col_category: Catégorie
+        col_date: Date
+        col_transaction: Transaction
+        create_rule_label: Créer une règle de catégorisation
+        exit: Quitter
+        filter_placeholder: Rechercher des catégories…
+        no_categories: Aucune catégorie correspondante
+        remaining:
+          one: 1 transaction non catégorisée restante
+          other: "%{count} transactions non catégorisées restantes"
+        rule_description_prefix: Les futures transactions de type %{type} dont le nom contient
+        rule_description_suffix: devraient également recevoir cette catégorie.
+        skip: Ignorer
+        transaction_count:
+          one: 1 transaction
+          other: "%{count} transactions"
+        transactions_hint: Décochez pour exclure une transaction, ou assignez-lui une catégorie différente directement dans sa ligne.
+        type_expense: Dépense
+        type_income: Revenu
+    convert_to_trade:
+      account_label: 'Compte :'
+      amount_label: 'Montant :'
+      cancel: Annuler
+      conversion_note: 'Convertie depuis la transaction : %{original_name} (%{original_date})'
+      date_label: 'Date :'
+      description: Convertir cette transaction en une transaction boursière avec les détails du titre
+      errors:
+        already_converted: Cette transaction a déjà été convertie ou exclue
+        conversion_failed: 'Échec de la conversion de la transaction : %{error}'
+        enter_qty_or_price: Veuillez saisir la quantité ou le prix par action. L'autre sera calculé à partir du montant de la transaction.
+        enter_ticker: Veuillez saisir un symbole ticker
+        invalid_qty_or_price: Quantité ou prix invalide. Veuillez saisir des valeurs positives valides.
+        not_investment_account: Seules les transactions des comptes d'investissement peuvent être converties en transactions boursières
+        security_not_found: Le titre sélectionné n'existe plus. Veuillez en sélectionner un autre.
+        select_security: Veuillez sélectionner ou saisir un titre
+        unexpected_error: 'Erreur inattendue lors de la conversion : %{error}'
+      exchange_hint: Laissez vide pour une détection automatique
+      exchange_label: Place de cotation (Facultatif)
+      exchange_placeholder: XNAS
+      price_hint: Prix par action (%{currency})
+      price_label: Prix par action
+      price_mismatch_message: Votre prix (%{entered_price}/action) diffère significativement du prix de marché actuel de %{ticker} (%{market_price}). Si cela semble erroné, il se peut que vous ayez sélectionné le mauvais titre — essayez « Saisir un ticker personnalisé » pour indiquer le bon.
+      price_mismatch_title: Le prix ne correspond peut-être pas
+      price_placeholder: ex. 52.15
+      qty_or_price_hint: Saisissez au moins la quantité OU le prix. L'autre sera calculé à partir du montant de la transaction (%{amount}).
+      quantity_hint: Nombre d'actions négociées
+      quantity_label: Quantité (Actions)
+      quantity_placeholder: ex. 20
+      security_custom: "+ Saisir un ticker personnalisé"
+      security_label: Titre
+      security_not_listed_hint: Vous ne voyez pas votre titre ? Sélectionnez « Saisir un ticker personnalisé » au bas de la liste.
+      security_prompt: Sélectionnez un titre…
+      submit: Convertir en transaction boursière
+      success: Transaction convertie en transaction boursière
+      ticker_hint: Saisissez le symbole ticker de l'action ou de l'ETF (ex. AAPL, MSFT)
+      ticker_placeholder: AAPL
+      ticker_search_hint: Recherchez par symbole ticker ou nom d'entreprise, ou saisissez un ticker personnalisé
+      ticker_search_placeholder: Rechercher un ticker…
+      title: Convertir en transaction boursière
+      trade_type_hint: Acheter ou vendre des actions d'un titre
+      trade_type_label: Type de transaction boursière
+    create:
+      created: Transaction créée
+    dismiss_duplicate:
+      failure: Impossible d'écarter la suggestion de doublon
+      success: Conservées comme transactions distinctes
     form:
       account: Compte
       account_prompt: Sélectionnez un compte
       amount: Montant
       category: Catégorie
+      category_label: Catégorie
       category_prompt: Sélectionnez une catégorie
+      create_tag: Créer
       date: Date
       description: Libellé
       description_placeholder: Libellé de la transaction
+      details: Détails
       expense: Dépense
       income: Revenu
       merchant_label: Marchand
-      none: (aucun)
+      none: "(aucun)"
       note_label: Notes
       note_placeholder: Entrez une note
-      create_tag: Créer
       submit: Ajouter la transaction
       tag_search_placeholder: Rechercher ou créer une étiquette
       tags_label: Étiquettes
       transfer: Virement
-    new:
-      new_transaction: Nouvelle transaction
-    show:
-      account_label: Compte
-      amount: Montant
-      category_label: Catégorie
-      date_label: Date
-      delete: Supprimer
-      delete_subtitle: Cette action supprime définitivement la transaction, affecte vos soldes historiques et ne peut pas être annulée.
-      delete_title: Supprimer la transaction
-      details: Détails
-      attachments: Pièces jointes
-      exclude: Exclure
-      exclude_description: Les transactions exclues seront retirées des calculs budgétaires et des rapports.
-      activity_type: Type d'activité
-      activity_type_description: Type d'activité d'investissement (Achat, Vente, Dividende, etc.). Détecté automatiquement ou défini manuellement.
-      one_time_title: "Transaction ponctuelle (%{type})"
-      one_time_description: Les transactions ponctuelles seront exclues de certains calculs budgétaires et rapports afin de vous aider à voir ce qui compte vraiment.
-      convert_to_trade_title: Convertir en transaction boursière
-      convert_to_trade_description: Convertissez cette transaction en une transaction boursière d'achat ou de vente avec les détails du titre pour le suivi du portefeuille.
-      convert_to_trade_button: Convertir en transaction boursière
-      pending_duplicate_merger_title: Doublon d'une transaction validée ?
-      pending_duplicate_merger_description: Fusionnez manuellement cette transaction en attente avec sa version validée.
-      pending_duplicate_merger_button: Ouvrir la fusion
-      merchant_label: Marchand
-      name_label: Nom
-      nature: Type
-      none: "(aucun)"
-      note_label: Notes
-      note_placeholder: Entrez une note
-      overview: Aperçu
-      settings: Paramètres
-      tags_label: Étiquettes
-      tab_transactions: Transactions
-      tab_upcoming: À venir
-      uncategorized: "(non catégorisée)"
-    activity_labels:
-      buy: Achat
-      sell: Vente
-      sweep_in: Balayage entrant
-      sweep_out: Balayage sortant
-      dividend: Dividende
-      reinvestment: Réinvestissement
-      interest: Intérêts
-      fee: Frais
-      transfer: Transfert
-      contribution: Contribution
-      withdrawal: Retrait
-      exchange: Échange
-      other: Autre
-    mark_recurring: Marquer comme récurrente
-    mark_recurring_subtitle: Suivez cette transaction comme récurrente. La variance du montant est calculée automatiquement à partir des 6 derniers mois de transactions similaires.
-    mark_recurring_title: Transaction récurrente
-    potential_duplicate_title: Doublon possible détecté
-    potential_duplicate_description: Cette transaction en attente peut être identique à la transaction validée ci-dessous. Si c'est le cas, fusionnez-les pour éviter le double comptage.
-    merge_duplicate: Oui, les fusionner
-    keep_both: Non, garder les deux
-    split_parent_row:
-      split_label: "Fractionner"
-    transaction:
-      pending: En attente
-      pending_tooltip: Transaction en attente — peut changer une fois validée
-      linked_with_provider: Lié avec %{provider}
-      activity_type_tooltip: Type d'activité d'investissement
-      possible_duplicate: Doublon ?
-      potential_duplicate_tooltip: Cette transaction peut être un doublon d'une autre transaction
-      review_recommended: Vérifier
-      review_recommended_tooltip: Écart de montant important — vérification recommandée pour vérifier s'il s'agit d'un doublon
-      split: Fractionner
-      split_tooltip: Cette transaction a été fractionnée en plusieurs entrées
-      split_child_tooltip: Partie d'une transaction fractionnée
-    merge_duplicate:
-      success: Transactions fusionnées avec succès
-      failure: Impossible de fusionner les transactions
-    dismiss_duplicate:
-      success: Conservées comme transactions distinctes
-      failure: Impossible d'écarter la suggestion de doublon
-    pending_duplicate_merge:
-      possible_duplicate: Doublon ?
-      possible_duplicate_short: Dbl ?
-      review_recommended: Vérifier
-      review_recommended_short: Vérif
-      confirm_title: "Fusionner avec la transaction validée (%{posted_amount})"
-      reject_title: Conserver comme transactions distinctes
-    summary:
-      total_transactions: Total des transactions
-      income: Revenus
-      expenses: Dépenses
-      inflow: Entrées
-      outflow: Sorties
     header:
       edit_categories: Modifier les catégories
       edit_imports: Modifier les importations
@@ -122,125 +160,90 @@ fr:
       edit_tags: Modifier les étiquettes
       import: Importer
     index:
-      transaction: transaction
-      transactions: transactions
-      import: Importer
       categorize_button:
-        one: "Catégoriser (1)"
-        other: "Catégoriser (%{count})"
-    categorizes:
-      show:
-        exit: "Quitter"
-        skip: "Ignorer"
-        remaining:
-          one: "1 transaction non catégorisée restante"
-          other: "%{count} transactions non catégorisées restantes"
-        transaction_count:
-          one: "1 transaction"
-          other: "%{count} transactions"
-        transactions_hint: "Décochez pour exclure une transaction, ou assignez-lui une catégorie différente directement dans sa ligne."
-        assign_category: "Assigner une catégorie"
-        assign_category_prompt: "→ assigner"
-        filter_placeholder: "Rechercher des catégories…"
-        col_transaction: "Transaction"
-        col_date: "Date"
-        col_amount: "Montant"
-        col_category: "Catégorie"
-        type_income: "Revenu"
-        type_expense: "Dépense"
-        create_rule_label: "Créer une règle de catégorisation"
-        rule_description_prefix: "Les futures transactions de type %{type} dont le nom contient"
-        rule_description_suffix: "devraient également recevoir cette catégorie."
-        no_categories: "Aucune catégorie correspondante"
-        all_done: "Toutes les transactions sont catégorisées"
-      create:
-        categorized:
-          one: "1 transaction catégorisée"
-          other: "%{count} transactions catégorisées"
-        rule_creation_failed: "Transactions catégorisées, mais la règle n'a pas pu être créée (elle existe peut-être déjà)."
-      entry_row:
-        include_checkbox: "Inclure %{name}"
-        assign_category_select: "Assigner une catégorie pour %{name}"
-    list:
-      drag_drop_title: Déposez un CSV à importer
-      drag_drop_subtitle: Téléversez directement les transactions
+        one: Catégoriser (1)
+        other: Catégoriser (%{count})
+      edit_categories: Modifier les catégories
+      edit_imports: Modifier les importations
+      edit_merchants: Modifier les marchands
+      edit_rules: Modifier les règles
+      edit_tags: Modifier les balises
+      import: Importer
+      new_rule: Nouvelle règle
+      new_transaction: Nouvelle transaction
+      title: Opérations
       transaction: transaction
       transactions: transactions
-    toggle_recurring_section: Afficher/masquer les transactions récurrentes à venir
+    keep_both: Non, garder les deux
+    list:
+      drag_drop_subtitle: Téléversez directement les transactions
+      drag_drop_title: Déposez un CSV à importer
+      transaction: transaction
+      transactions: transactions
+    mark_recurring: Marquer comme récurrente
+    mark_recurring_subtitle: Suivez cette transaction comme récurrente. La variance du montant est calculée automatiquement à partir des 6 derniers mois de transactions similaires.
+    mark_recurring_title: Transaction récurrente
+    merge_duplicate:
+      failure: Impossible de fusionner les transactions
+      success: Transactions fusionnées avec succès
+    new:
+      new_transaction: Nouvelle transaction
+    pending_duplicate_merge:
+      confirm_title: Fusionner avec la transaction validée (%{posted_amount})
+      possible_duplicate: Doublon ?
+      possible_duplicate_short: Dbl ?
+      reject_title: Conserver comme transactions distinctes
+      review_recommended: Vérifier
+      review_recommended_short: Vérif
+    potential_duplicate_description: Cette transaction en attente peut être identique à la transaction validée ci-dessous. Si c'est le cas, fusionnez-les pour éviter le double comptage.
+    potential_duplicate_title: Doublon possible détecté
     search:
       filters:
         account: Compte
-        date: Date
-        type: Type
-        status: Statut
         amount: Montant
         category: Catégorie
-        tag: Étiquette
+        date: Date
         merchant: Marchand
-    convert_to_trade:
-      title: Convertir en transaction boursière
-      description: Convertir cette transaction en une transaction boursière avec les détails du titre
-      date_label: "Date :"
-      account_label: "Compte :"
-      amount_label: "Montant :"
-      security_label: Titre
-      security_prompt: Sélectionnez un titre…
-      security_custom: "+ Saisir un ticker personnalisé"
-      security_not_listed_hint: Vous ne voyez pas votre titre ? Sélectionnez « Saisir un ticker personnalisé » au bas de la liste.
-      ticker_placeholder: AAPL
-      ticker_hint: Saisissez le symbole ticker de l'action ou de l'ETF (ex. AAPL, MSFT)
-      ticker_search_placeholder: Rechercher un ticker…
-      ticker_search_hint: Recherchez par symbole ticker ou nom d'entreprise, ou saisissez un ticker personnalisé
-      price_mismatch_title: Le prix ne correspond peut-être pas
-      price_mismatch_message: "Votre prix (%{entered_price}/action) diffère significativement du prix de marché actuel de %{ticker} (%{market_price}). Si cela semble erroné, il se peut que vous ayez sélectionné le mauvais titre — essayez « Saisir un ticker personnalisé » pour indiquer le bon."
-      quantity_label: Quantité (Actions)
-      quantity_placeholder: ex. 20
-      quantity_hint: Nombre d'actions négociées
-      price_label: Prix par action
-      price_placeholder: ex. 52.15
-      price_hint: Prix par action (%{currency})
-      qty_or_price_hint: Saisissez au moins la quantité OU le prix. L'autre sera calculé à partir du montant de la transaction (%{amount}).
-      trade_type_label: Type de transaction boursière
-      trade_type_hint: Acheter ou vendre des actions d'un titre
-      exchange_label: Place de cotation (Facultatif)
-      exchange_placeholder: XNAS
-      exchange_hint: Laissez vide pour une détection automatique
-      cancel: Annuler
-      submit: Convertir en transaction boursière
-      success: Transaction convertie en transaction boursière
-      conversion_note: "Convertie depuis la transaction : %{original_name} (%{original_date})"
-      errors:
-        not_investment_account: Seules les transactions des comptes d'investissement peuvent être converties en transactions boursières
-        already_converted: Cette transaction a déjà été convertie ou exclue
-        enter_ticker: Veuillez saisir un symbole ticker
-        security_not_found: Le titre sélectionné n'existe plus. Veuillez en sélectionner un autre.
-        select_security: Veuillez sélectionner ou saisir un titre
-        enter_qty_or_price: Veuillez saisir la quantité ou le prix par action. L'autre sera calculé à partir du montant de la transaction.
-        invalid_qty_or_price: Quantité ou prix invalide. Veuillez saisir des valeurs positives valides.
-        conversion_failed: "Échec de la conversion de la transaction : %{error}"
-        unexpected_error: "Erreur inattendue lors de la conversion : %{error}"
+        status: Statut
+        tag: Étiquette
+        type: Type
     searches:
       filters:
+        account_filter:
+          filter_accounts: Filtrer les comptes
         amount_filter:
           equal_to: Égal à
           greater_than: Supérieur à
           less_than: Inférieur à
           placeholder: '0'
         badge:
+          confirmed: Confirmée
           expense: Dépense
           income: Revenu
           on_or_after: le %{date} et après
           on_or_before: le %{date} et avant
+          pending: En attente
           transfer: Virement
+        category_filter:
+          filter_category: Filtrer les catégories
+        date_filter:
+          end_date: Date de fin
+          start_date: Date de début
+        merchant_filter:
+          filter_merchants: Filtrer les commerçants
+        status_filter:
           confirmed: Confirmée
           pending: En attente
+        tag_filter:
+          filter_tags: Filtrer les étiquettes
         type_filter:
           expense: Dépense
           income: Revenu
           transfer: Virement
-        status_filter:
-          confirmed: Confirmée
-          pending: En attente
+      form:
+        filter: Filtrer
+        search_placeholder: Rechercher des transactions...
+        toggle_selection_checkboxes: Basculer toutes les cases à cocher
       menu:
         account_filter: Compte
         amount_filter: Montant
@@ -257,23 +260,90 @@ fr:
         equal_to: égal à
         greater_than: supérieur à
         less_than: inférieur à
-      form:
-        toggle_selection_checkboxes: Basculer toutes les cases à cocher
-    attachments:
-      cannot_exceed: "Ne peut dépasser %{count} pièces jointes par transaction"
-      uploaded_one: "Pièce jointe téléversée avec succès"
-      uploaded_many: "%{count} pièces jointes téléversées avec succès"
-      failed_upload: "Échec du téléversement de la pièce jointe : %{error}"
-      no_files_selected: "Aucun fichier sélectionné pour le téléversement"
-      attachment_deleted: "Pièce jointe supprimée avec succès"
-      failed_delete: "Échec de la suppression de la pièce jointe : %{error}"
-      upload_failed: "Échec du téléversement de la pièce jointe. Veuillez réessayer ou contacter le support."
-      delete_failed: "Échec de la suppression de la pièce jointe. Veuillez réessayer ou contacter le support."
-      upload: "Téléverser"
-      no_attachments: "Aucune pièce jointe pour l'instant"
-      select_up_to: "Sélectionnez jusqu'à %{count} fichiers (images ou PDF, %{size} Mo max chacun) • %{used} sur %{count} utilisés"
-      files:
-        one: "Fichier (1)"
-        other: "Fichiers (%{count})"
-      browse_to_add: "Parcourir pour ajouter des fichiers"
-      max_reached: "Limite maximale de fichiers atteinte (%{count}/%{max}). Supprimez un fichier existant pour en téléverser un autre."
+    selection_bar:
+      duplicate: Dupliquer
+      edit: Modifier
+      selected: sélectionné
+    show:
+      account_label: Compte
+      activity_type: Type d'activité
+      activity_type_description: Type d'activité d'investissement (Achat, Vente, Dividende, etc.). Détecté automatiquement ou défini manuellement.
+      additional_details: Détails supplémentaires
+      amount: Montant
+      attachments: Pièces jointes
+      category_label: Catégorie
+      convert: Convertir
+      convert_to_trade_button: Convertir en transaction boursière
+      convert_to_trade_description: Convertissez cette transaction en une transaction boursière d'achat ou de vente avec les détails du titre pour le suivi du portefeuille.
+      convert_to_trade_title: Convertir en transaction boursière
+      date_label: Date
+      delete: Supprimer
+      delete_subtitle: Cette action supprime définitivement la transaction, affecte vos soldes historiques et ne peut pas être annulée.
+      delete_title: Supprimer la transaction
+      description: Descriptif
+      details: Détails
+      exclude: Exclure
+      exclude_description: Les transactions exclues seront retirées des calculs budgétaires et des rapports.
+      keep_both: Non, garde les deux
+      loan_payment: Paiement du prêt
+      mark_recurring: Marquer comme récurrent
+      mark_recurring_subtitle: Suivez cela comme une transaction récurrente. L’écart de montant est automatiquement calculé à partir des 6 derniers mois de transactions similaires.
+      mark_recurring_title: Transaction récurrente
+      memo: Mémo
+      merchant_label: Marchand
+      merge_duplicate: Oui, fusionne-les
+      name_label: Nom
+      nature: Type
+      none: "(aucun)"
+      note_label: Notes
+      note_placeholder: Entrez une note
+      one_time_description: Les transactions ponctuelles seront exclues de certains calculs budgétaires et rapports afin de vous aider à voir ce qui compte vraiment.
+      one_time_title: Transaction ponctuelle (%{type})
+      open_matcher: Matcheur ouvert
+      overview: Aperçu
+      payee: Bénéficiaire
+      pending_duplicate_merger_button: Ouvrir la fusion
+      pending_duplicate_merger_description: Fusionnez manuellement cette transaction en attente avec sa version validée.
+      pending_duplicate_merger_title: Doublon d'une transaction validée ?
+      potential_duplicate_description: Cette transaction en attente peut être la même que la transaction publiée ci-dessous. Si tel est le cas, fusionnez-les pour éviter un double comptage.
+      potential_duplicate_title: Double possible détecté
+      provider_extras: Suppléments du fournisseur
+      settings: Paramètres
+      tab_transactions: Transactions
+      tab_upcoming: À venir
+      tags_label: Étiquettes
+      transfer: Transfert
+      transfer_matcher_description: Connectez cette transaction à sa contrepartie dans un autre compte.
+      transfer_or_debt_payment: Transfert ou paiement de la dette ?
+      uncategorized: "(non catégorisée)"
+    split_parent_row:
+      split_label: Fractionner
+    summary:
+      expenses: Dépenses
+      income: Revenus
+      inflow: Entrées
+      outflow: Sorties
+      total_transactions: Total des transactions
+    toggle_recurring_section: Afficher/masquer les transactions récurrentes à venir
+    transaction:
+      activity_type_tooltip: Type d'activité d'investissement
+      linked_with_provider: Lié avec %{provider}
+      pending: En attente
+      pending_tooltip: Transaction en attente — peut changer une fois validée
+      possible_duplicate: Doublon ?
+      potential_duplicate_tooltip: Cette transaction peut être un doublon d'une autre transaction
+      review_recommended: Vérifier
+      review_recommended_tooltip: Écart de montant important — vérification recommandée pour vérifier s'il s'agit d'un doublon
+      split: Fractionner
+      split_child_tooltip: Partie d'une transaction fractionnée
+      split_tooltip: Cette transaction a été fractionnée en plusieurs entrées
+    transfer_match:
+      auto_matched: Correspondance automatique
+      auto_matched_short: C/A
+      confirm_match: Confirmer la correspondance
+      payment_confirmed: Le paiement est confirmé
+      reject_match: Rejeter la correspondance
+      transfer_confirmed: Le transfert est confirmé
+    unknown_name: Transaction inconnue
+    update:
+      updated: Transaction mise à jour
diff --git a/config/locales/views/transactions/it.yml b/config/locales/views/transactions/it.yml
new file mode 100644
index 000000000..01e789387
--- /dev/null
+++ b/config/locales/views/transactions/it.yml
@@ -0,0 +1,349 @@
+---
+it:
+  transactions:
+    bulk_updates:
+      new:
+        cancel: Annulla
+        category_label: Categoria
+        category_prompt: Seleziona una categoria
+        date_label: Data
+        header_title: Modifica transazioni
+        merchant_label: Esercente
+        merchant_prompt: Seleziona un esercente
+        name_label: Nome
+        name_placeholder: Inserisci un nome da applicare alle transazioni selezionate
+        none: "(nessuno)"
+        notes_label: Note
+        notes_placeholder: Inserisci una nota da applicare alle transazioni selezionate
+        overview: Panoramica
+        save: Salva
+        tags_label: Etichette
+        transactions_section: Transazioni
+    unknown_name: Transazione sconosciuta
+    selection_bar:
+      duplicate: Duplica
+      edit: Modifica
+      selected: selezionate
+    form:
+      details: Dettagli
+      account: Conto
+      account_prompt: Seleziona un conto
+      amount: Importo
+      category: Categoria
+      category_label: Categoria
+      category_prompt: Seleziona una categoria
+      date: Data
+      description: Descrizione
+      description_placeholder: Descrivi la transazione
+      expense: Spesa
+      income: Entrata
+      merchant_label: Esercente
+      none: (nessuno)
+      note_label: Note
+      note_placeholder: Inserisci una nota
+      create_tag: Crea
+      submit: Aggiungi transazione
+      tag_search_placeholder: Cerca o crea etichetta
+      tags_label: Etichette
+      transfer: Bonifico
+    create:
+      created: Transazione creata
+    update:
+      updated: Transazione aggiornata
+    new:
+      new_transaction: Nuova transazione
+    show:
+      keep_both: No, tienile entrambe
+      loan_payment: Pagamento prestito
+      mark_recurring: Segna come ricorrente
+      mark_recurring_subtitle: Monitora questa come transazione ricorrente. La varianza dell'importo viene calcolata automaticamente dagli ultimi 6 mesi di transazioni simili.
+      mark_recurring_title: Transazione ricorrente
+      merge_duplicate: Sì, uniscile
+      potential_duplicate_description: Questa transazione in attesa potrebbe essere la stessa di quella registrata qui sotto. In caso affermativo, uniscile per evitare il doppio conteggio.
+      potential_duplicate_title: Possibile duplicato rilevato
+      transfer: Bonifico
+      account_label: Conto
+      amount: Importo
+      category_label: Categoria
+      date_label: Data
+      delete: Elimina
+      delete_subtitle: Questa operazione elimina permanentemente la transazione, influisce sui saldi storici e non può essere annullata.
+      delete_title: Elimina transazione
+      details: Dettagli
+      attachments: Allegati
+      exclude: Escludi
+      exclude_description: Le transazioni escluse verranno rimosse dai calcoli del budget e dai rapporti.
+      activity_type: Tipo di attività
+      activity_type_description: Tipo di attività di investimento (Acquisto, Vendita, Dividendo, ecc.). Rilevato automaticamente o impostato manualmente.
+      one_time_title: "%{type} una tantum"
+      one_time_description: Le transazioni una tantum verranno escluse da alcuni calcoli del budget e rapporti per aiutarti a vedere ciò che conta davvero.
+      convert_to_trade_title: Converti in operazione su titolo
+      convert_to_trade_description: Converti questa transazione in un'operazione di Acquisto o Vendita con dettagli del titolo per il monitoraggio del portafoglio.
+      convert_to_trade_button: Converti in operazione
+      transfer_matcher_description: Collega questa transazione alla sua controparte in un altro conto.
+      pending_duplicate_merger_title: Duplicato della transazione registrata?
+      pending_duplicate_merger_description: Unisci manualmente questa transazione in attesa con la sua versione registrata.
+      pending_duplicate_merger_button: Apri fusione
+      merchant_label: Esercente
+      name_label: Nome
+      nature: Tipo
+      none: "(nessuno)"
+      note_label: Note
+      note_placeholder: Inserisci una nota
+      overview: Panoramica
+      settings: Impostazioni
+      tags_label: Etichette
+      tab_transactions: Transazioni
+      tab_upcoming: In arrivo
+      uncategorized: "(non categorizzata)"
+      additional_details: "Dettagli aggiuntivi"
+      payee: "Beneficiario"
+      description: "Descrizione"
+      memo: "Memo"
+      provider_extras: "Dati provider"
+      transfer_or_debt_payment: "Bonifico o pagamento debito?"
+      open_matcher: "Apri corrispondenza"
+      convert: "Converti"
+    activity_labels:
+      buy: Acquisto
+      sell: Vendita
+      sweep_in: Trasferimento in entrata
+      sweep_out: Trasferimento in uscita
+      dividend: Dividendo
+      reinvestment: Reinvestimento
+      interest: Interessi
+      fee: Commissione
+      transfer: Bonifico
+      contribution: Contributo
+      withdrawal: Prelievo
+      exchange: Cambio
+      other: Altro
+    mark_recurring: Segna come ricorrente
+    mark_recurring_subtitle: Monitora questa come transazione ricorrente. La varianza dell'importo viene calcolata automaticamente dagli ultimi 6 mesi di transazioni simili.
+    mark_recurring_title: Transazione ricorrente
+    potential_duplicate_title: Possibile duplicato rilevato
+    potential_duplicate_description: Questa transazione in attesa potrebbe essere la stessa di quella registrata qui sotto. In caso affermativo, uniscile per evitare il doppio conteggio.
+    keep_both: No, tienile entrambe
+    split_parent_row:
+      split_label: "Suddivisa"
+    transfer_match:
+      auto_matched: Abbinato automaticamente
+      auto_matched_short: A/A
+      confirm_match: Conferma abbinamento
+      payment_confirmed: Pagamento confermato
+      reject_match: Rifiuta abbinamento
+      transfer_confirmed: Bonifico confermato
+    transaction:
+      pending: In attesa
+      pending_tooltip: Transazione in attesa — potrebbe cambiare alla registrazione
+      linked_with_provider: Collegata con %{provider}
+      activity_type_tooltip: Tipo di attività di investimento
+      possible_duplicate: Duplicato?
+      potential_duplicate_tooltip: Questa potrebbe essere un duplicato di un'altra transazione
+      review_recommended: Da rivedere
+      review_recommended_tooltip: Grande differenza di importo — si consiglia revisione per verificare se è un duplicato
+      split: Suddivisa
+      split_tooltip: Questa transazione è stata suddivisa in più voci
+      split_child_tooltip: Parte di una transazione suddivisa
+    merge_duplicate:
+      success: Transazioni unite con successo
+      failure: Impossibile unire le transazioni
+    dismiss_duplicate:
+      success: Mantenute come transazioni separate
+      failure: Impossibile ignorare il suggerimento di duplicato
+    pending_duplicate_merge:
+      possible_duplicate: Duplicato?
+      possible_duplicate_short: Dup?
+      review_recommended: Da rivedere
+      review_recommended_short: Rev
+      confirm_title: "Unisci con la transazione registrata (%{posted_amount})"
+      reject_title: Mantieni come transazioni separate
+    summary:
+      total_transactions: Totale transazioni
+      income: Entrate
+      expenses: Spese
+      inflow: Entrate
+      outflow: Uscite
+    header:
+      edit_categories: Modifica categorie
+      edit_imports: Modifica importazioni
+      edit_merchants: Modifica esercenti
+      edit_tags: Modifica etichette
+      import: Importa
+    index:
+      title: "Transazioni"
+      transaction: transazione
+      transactions: transazioni
+      import: Importa
+      new_rule: "Nuova regola"
+      edit_rules: "Modifica regole"
+      edit_categories: "Modifica categorie"
+      edit_tags: "Modifica etichette"
+      edit_merchants: "Modifica esercenti"
+      edit_imports: "Modifica importazioni"
+      new_transaction: "Nuova transazione"
+      categorize_button:
+        one: "Categorizza (1)"
+        other: "Categorizza (%{count})"
+    categorizes:
+      show:
+        exit: "Esci"
+        skip: "Salta"
+        remaining:
+          one: "1 transazione non categorizzata rimanente"
+          other: "%{count} transazioni non categorizzate rimanenti"
+        transaction_count:
+          one: "1 transazione"
+          other: "%{count} transazioni"
+        transactions_hint: "Deseleziona per escludere una transazione, o assegnale direttamente una categoria diversa nella sua riga."
+        assign_category: "Assegna una categoria"
+        assign_category_prompt: "→ assegna"
+        filter_placeholder: "Cerca categorie..."
+        col_transaction: "Transazione"
+        col_date: "Data"
+        col_amount: "Importo"
+        col_category: "Categoria"
+        type_income: "Entrata"
+        type_expense: "Spesa"
+        create_rule_label: "Crea regola di categorizzazione"
+        rule_description_prefix: "Le future transazioni di tipo %{type} con nome contenente"
+        rule_description_suffix: "dovrebbero ricevere questa categoria."
+        no_categories: "Nessuna categoria corrispondente"
+        all_done: "Tutte le transazioni sono categorizzate"
+      create:
+        categorized:
+          one: "1 transazione categorizzata"
+          other: "%{count} transazioni categorizzate"
+        rule_creation_failed: "Transazioni categorizzate, ma la regola non è stata creata (potrebbe già esistere)."
+      entry_row:
+        include_checkbox: "Includi %{name}"
+        assign_category_select: "Assegna categoria per %{name}"
+    list:
+      drag_drop_title: Trascina CSV per importare
+      drag_drop_subtitle: Carica transazioni direttamente
+      transaction: transazione
+      transactions: transazioni
+    toggle_recurring_section: Mostra/nascondi transazioni ricorrenti in arrivo
+    search:
+      filters:
+        account: Conto
+        date: Data
+        type: Tipo
+        status: Stato
+        amount: Importo
+        category: Categoria
+        tag: Etichetta
+        merchant: Esercente
+    convert_to_trade:
+      title: Converti in operazione su titolo
+      description: Converti questa transazione in un'operazione con dettagli del titolo
+      date_label: "Data:"
+      account_label: "Conto:"
+      amount_label: "Importo:"
+      security_label: Titolo
+      security_prompt: Seleziona un titolo...
+      security_custom: "+ Inserisci ticker personalizzato"
+      security_not_listed_hint: Non trovi il tuo titolo? Seleziona "Inserisci ticker personalizzato" in fondo alla lista.
+      ticker_placeholder: ENEL
+      ticker_hint: Inserisci il simbolo del titolo/ETF (es. ENEL, ISP)
+      ticker_search_placeholder: Cerca un ticker...
+      ticker_search_hint: Cerca per simbolo ticker o nome azienda, o digita un ticker personalizzato
+      price_mismatch_title: Il prezzo potrebbe non corrispondere
+      price_mismatch_message: "Il tuo prezzo (%{entered_price}/azione) differisce significativamente dal prezzo di mercato attuale di %{ticker} (%{market_price}). Se sembra errato, potresti aver selezionato il titolo sbagliato — prova a usare \"Inserisci ticker personalizzato\" per specificare quello corretto."
+      quantity_label: Quantità (Azioni)
+      quantity_placeholder: es. 20
+      quantity_hint: Numero di azioni scambiate
+      price_label: Prezzo per azione
+      price_placeholder: es. 52,15
+      price_hint: Prezzo per azione (%{currency})
+      qty_or_price_hint: Inserisci almeno la quantità O il prezzo. L'altro verrà calcolato dall'importo della transazione (%{amount}).
+      trade_type_label: Tipo di operazione
+      trade_type_hint: Acquisto o vendita di azioni di un titolo
+      exchange_label: Borsa (opzionale)
+      exchange_placeholder: XMIL
+      exchange_hint: Lascia vuoto per rilevamento automatico
+      cancel: Annulla
+      submit: Converti in operazione
+      success: Transazione convertita in operazione
+      conversion_note: "Convertita dalla transazione: %{original_name} (%{original_date})"
+      errors:
+        not_investment_account: Solo le transazioni nei conti di investimento possono essere convertite in operazioni
+        already_converted: Questa transazione è già stata convertita o esclusa
+        enter_ticker: Inserisci un simbolo ticker
+        security_not_found: Il titolo selezionato non esiste più. Selezionane un altro.
+        select_security: Seleziona o inserisci un titolo
+        enter_qty_or_price: Inserisci la quantità o il prezzo per azione. L'altro verrà calcolato dall'importo della transazione.
+        invalid_qty_or_price: Quantità o prezzo non validi. Inserisci valori positivi validi.
+        conversion_failed: "Impossibile convertire la transazione: %{error}"
+        unexpected_error: "Errore imprevisto durante la conversione: %{error}"
+    searches:
+      filters:
+        account_filter:
+          filter_accounts: Filtra conti
+        category_filter:
+          filter_category: Filtra categoria
+        date_filter:
+          start_date: "Data inizio"
+          end_date: "Data fine"
+        merchant_filter:
+          filter_merchants: Filtra esercenti
+        tag_filter:
+          filter_tags: Filtra etichette
+        amount_filter:
+          equal_to: Uguale a
+          greater_than: Maggiore di
+          less_than: Minore di
+          placeholder: '0'
+        badge:
+          expense: Spesa
+          income: Entrata
+          on_or_after: dal %{date}
+          on_or_before: fino al %{date}
+          transfer: Bonifico
+          confirmed: Confermata
+          pending: In attesa
+        type_filter:
+          expense: Spesa
+          income: Entrata
+          transfer: Bonifico
+        status_filter:
+          confirmed: Confermata
+          pending: In attesa
+      menu:
+        account_filter: Conto
+        amount_filter: Importo
+        apply: Applica
+        cancel: Annulla
+        category_filter: Categoria
+        clear_filters: Rimuovi filtri
+        date_filter: Data
+        merchant_filter: Esercente
+        status_filter: Stato
+        tag_filter: Etichetta
+        type_filter: Tipo
+      search:
+        equal_to: uguale a
+        greater_than: maggiore di
+        less_than: minore di
+      form:
+        toggle_selection_checkboxes: Seleziona/deseleziona tutto
+        search_placeholder: "Cerca transazioni ..."
+        filter: "Filtra"
+    attachments:
+      cannot_exceed: "Non è possibile superare %{count} allegati per transazione"
+      uploaded_one: "Allegato caricato con successo"
+      uploaded_many: "%{count} allegati caricati con successo"
+      failed_upload: "Impossibile caricare l'allegato: %{error}"
+      no_files_selected: "Nessun file selezionato per il caricamento"
+      attachment_deleted: "Allegato eliminato con successo"
+      failed_delete: "Impossibile eliminare l'allegato: %{error}"
+      upload_failed: "Impossibile caricare l'allegato. Riprova o contatta il supporto."
+      delete_failed: "Impossibile eliminare l'allegato. Riprova o contatta il supporto."
+      upload: "Carica"
+      no_attachments: "Nessun allegato ancora"
+      select_up_to: "Seleziona fino a %{count} file (immagini o PDF, max %{size}MB ciascuno) • %{used} di %{count} utilizzati"
+      files:
+        one: "File (1)"
+        other: "File (%{count})"
+      browse_to_add: "Sfoglia per aggiungere file"
+      max_reached: "Limite massimo di file raggiunto (%{count}/%{max}). Elimina un file esistente per caricarne un altro."
diff --git a/config/locales/views/transactions/ru.yml b/config/locales/views/transactions/ru.yml
new file mode 100644
index 000000000..da8f06084
--- /dev/null
+++ b/config/locales/views/transactions/ru.yml
@@ -0,0 +1,389 @@
+---
+ru:
+  transactions:
+    activity_labels:
+      buy: Покупка
+      contribution: Вклад
+      dividend: Дивиденды
+      exchange: Обмен
+      fee: Комиссия
+      interest: Проценты
+      other: Другое
+      reinvestment: Реинвестирование
+      sell: Продажа
+      sweep_in: Ввод
+      sweep_out: Вывод
+      transfer: Перевод
+      withdrawal: Снятие
+    attachments:
+      attachment_deleted: Вложение успешно удалено
+      browse_to_add: Просмотреть для добавления файлов
+      cannot_exceed: Не может превышать %{count} вложений на операцию
+      delete_failed: Не удалось удалить вложение. Пожалуйста, попробуйте снова или
+        свяжитесь с поддержкой.
+      failed_delete: 'Не удалось удалить вложение: %{error}'
+      failed_upload: 'Не удалось загрузить вложение: %{error}'
+      files:
+        few: Файлы (%{count})
+        many: Файлы (%{count})
+        one: Файл (%{count})
+        other: Файлы (%{count})
+      max_reached: Достигнут максимальный лимит файлов (%{count}/%{max}). Удалите
+        существующий файл, чтобы загрузить другой.
+      no_attachments: Пока нет вложений
+      no_files_selected: Файлы для загрузки не выбраны
+      select_up_to: Выберите до %{count} файлов (изображения или PDF, макс. %{size}МБ
+        каждый) • %{used} из %{count} использовано
+      upload: Загрузить
+      upload_failed: Не удалось загрузить вложение. Пожалуйста, попробуйте снова или
+        свяжитесь с поддержкой.
+      uploaded_many: "%{count} вложений успешно загружено"
+      uploaded_one: Вложение успешно загружено
+    bulk_updates:
+      new:
+        cancel: Отмена
+        category_label: Категория
+        category_prompt: Выберите категорию
+        date_label: Дата
+        header_title: Редактировать операции
+        merchant_label: Продавец
+        merchant_prompt: Выберите продавца
+        name_label: Название
+        name_placeholder: Введите название, которое будет применено к выбранным операциям
+        none: "(нет)"
+        notes_label: Заметки
+        notes_placeholder: Введите заметку, которая будет применена к выбранным операциям
+        overview: Обзор
+        save: Сохранить
+        tags_label: Теги
+        transactions_section: Операции
+    categorizes:
+      create:
+        categorized:
+          few: "%{count} операции категоризированы"
+          many: "%{count} операций категоризировано"
+          one: 1 операция категоризирована
+          other: "%{count} операции категоризированы"
+        rule_creation_failed: Операции категоризированы, но правило не удалось создать
+          (возможно, оно уже существует).
+      entry_row:
+        assign_category_select: Назначить категорию для %{name}
+        include_checkbox: Включить %{name}
+      show:
+        all_done: Все операции категоризированы
+        assign_category: Назначить категорию
+        assign_category_prompt: "→ назначить"
+        col_amount: Сумма
+        col_category: Категория
+        col_date: Дата
+        col_transaction: Операция
+        create_rule_label: Создать правило категоризации
+        exit: Выход
+        filter_placeholder: Поиск категорий...
+        no_categories: Нет подходящих категорий
+        remaining:
+          few: Осталось %{count} операции без категории
+          many: Осталось %{count} операций без категории
+          one: Осталась %{count} операция без категории
+          other: Осталось %{count} операции без категории
+        rule_description_prefix: Будущие %{type} операции с именем, содержащим
+        rule_description_suffix: также должны получить эту категорию.
+        skip: Пропустить
+        transaction_count:
+          few: "%{count} операции"
+          many: "%{count} операций"
+          one: 1 операция
+          other: "%{count} операции"
+        transactions_hint: Снимите галочку, чтобы исключить операцию, или назначьте
+          ей другую категорию прямо в её строке.
+        type_expense: Расход
+        type_income: Доход
+    convert_to_trade:
+      account_label: 'Счёт:'
+      amount_label: 'Сумма:'
+      cancel: Отмена
+      conversion_note: 'Преобразовано из операции: %{original_name} (%{original_date})'
+      date_label: 'Дата:'
+      description: Преобразуйте эту операцию в торговлю с деталями безопасности
+      errors:
+        already_converted: Эта операция уже была преобразована или исключена
+        conversion_failed: 'Не удалось преобразовать операцию: %{error}'
+        enter_qty_or_price: Пожалуйста, введите либо количество, либо цену за акцию.
+          Остальное будет рассчитано из суммы операции.
+        enter_ticker: Пожалуйста, введите символ тикера
+        invalid_qty_or_price: Неверное количество или цена. Пожалуйста, введите допустимые
+          положительные значения.
+        not_investment_account: Только операции на инвестиционных счетах могут быть
+          преобразованы в сделки
+        security_not_found: Выбранная ценная бумага больше не существует. Пожалуйста,
+          выберите другую.
+        select_security: Пожалуйста, выберите или введите ценную бумагу
+        unexpected_error: 'Неожиданная ошибка при преобразовании: %{error}'
+      exchange_hint: Оставьте пустым для автоматического определения
+      exchange_label: Биржа (необязательно)
+      exchange_placeholder: XNAS
+      price_hint: Цена за акцию (%{currency})
+      price_label: Цена за акцию
+      price_mismatch_message: Ваша цена (%{entered_price}/акция) значительно отличается
+        от текущей рыночной цены %{ticker} (%{market_price}). Если это кажется неправильным,
+        возможно, вы выбрали неверную ценную бумагу — попробуйте использовать "Введите
+        пользовательский тикер", чтобы указать правильную.
+      price_mismatch_title: Цена может не совпадать
+      price_placeholder: например, 52.15
+      qty_or_price_hint: Введите хотя бы количество ИЛИ цену. Остальное будет рассчитано
+        из суммы операции (%{amount}).
+      quantity_hint: Количество проданных акций
+      quantity_label: Количество (Акции)
+      quantity_placeholder: например, 20
+      security_custom: "+ Введите пользовательский тикер"
+      security_label: Ценная бумага
+      security_not_listed_hint: Не видите свою ценную бумагу? Выберите "Введите пользовательский
+        тикер" внизу списка.
+      security_prompt: Выберите ценную бумагу...
+      submit: Преобразовать в торговлю
+      success: Операция преобразована в торговлю
+      ticker_hint: Введите символ тикера акции/ETF (например, AAPL, MSFT)
+      ticker_placeholder: AAPL
+      ticker_search_hint: Поиск по символу тикера или названию компании, или введите
+        пользовательский тикер
+      ticker_search_placeholder: Поиск тикера...
+      title: Преобразовать в торговлю ценными бумагами
+      trade_type_hint: Покупка или продажа акций ценной бумаги
+      trade_type_label: Тип сделки
+    create:
+      created: Операция создана
+    dismiss_duplicate:
+      failure: Не удалось отклонить предложение о дубликате
+      success: Оставлено как отдельные операции
+    form:
+      account: Счёт
+      account_prompt: Выберите счёт
+      amount: Сумма
+      category: Категория
+      category_label: Категория
+      category_prompt: Выберите категорию
+      create_tag: Создать
+      date: Дата
+      description: Описание
+      description_placeholder: Опишите операцию
+      details: Детали
+      expense: Расход
+      income: Доход
+      merchant_label: Продавец
+      none: "(нет)"
+      note_label: Заметки
+      note_placeholder: Введите заметку
+      submit: Добавить операцию
+      tag_search_placeholder: Найти или создать тег
+      tags_label: Теги
+      transfer: Перевод
+    header:
+      edit_categories: Редактировать категории
+      edit_imports: Редактировать импорты
+      edit_merchants: Редактировать продавцов
+      edit_tags: Редактировать теги
+      import: Импорт
+    index:
+      categorize_button:
+        few: Категоризировать (%{count})
+        many: Категоризировать (%{count})
+        one: Категоризировать (%{count})
+        other: Категоризировать (%{count})
+      edit_categories: Редактировать категории
+      edit_imports: Редактировать импорты
+      edit_merchants: Редактировать продавцов
+      edit_rules: Редактировать правила
+      edit_tags: Редактировать теги
+      import: Импорт
+      new_rule: Новое правило
+      new_transaction: Новая операция
+      title: Операции
+      transaction: операция
+      transactions: операции
+    keep_both: Нет, оставить обе
+    list:
+      drag_drop_subtitle: Загрузите операции напрямую
+      drag_drop_title: Перетащите CSV для импорта
+      transaction: операция
+      transactions: операции
+    mark_recurring: Отметить как повторяющуюся
+    mark_recurring_subtitle: Отслеживайте это как повторяющуюся операцию. Разница
+      в сумме автоматически рассчитывается на основе последних 6 месяцев аналогичных
+      операций.
+    mark_recurring_title: Повторяющаяся операция
+    merge_duplicate:
+      failure: Не удалось объединить операции
+      success: Операции успешно объединены
+    new:
+      new_transaction: Новая операция
+    pending_duplicate_merge:
+      confirm_title: Объединить с проведенной операцией (%{posted_amount})
+      possible_duplicate: Дубликат?
+      possible_duplicate_short: Дубль?
+      reject_title: Оставить как отдельные операции
+      review_recommended: Проверка
+      review_recommended_short: Пров
+    potential_duplicate_description: Эта ожидающая операция может быть такой же, как
+      и проведенная ниже. Если это так, объедините их, чтобы избежать двойного учета.
+    potential_duplicate_title: Обнаружен возможный дубликат
+    search:
+      filters:
+        account: Счёт
+        amount: Сумма
+        category: Категория
+        date: Дата
+        merchant: Продавец
+        status: Статус
+        tag: Тег
+        type: Тип
+    searches:
+      filters:
+        account_filter:
+          filter_accounts: Фильтр по счетам
+        amount_filter:
+          equal_to: Равно
+          greater_than: Больше чем
+          less_than: Меньше чем
+          placeholder: '0'
+        badge:
+          confirmed: Подтверждено
+          expense: Расход
+          income: Доход
+          on_or_after: не ранее %{date}
+          on_or_before: не позднее %{date}
+          pending: В ожидании
+          transfer: Перевод
+        category_filter:
+          filter_category: Фильтр по категориям
+        date_filter:
+          end_date: Дата окончания
+          start_date: Дата начала
+        merchant_filter:
+          filter_merchants: Фильтр по продавцам
+        status_filter:
+          confirmed: Подтверждено
+          pending: В ожидании
+        tag_filter:
+          filter_tags: Фильтр по тегам
+        type_filter:
+          expense: Расход
+          income: Доход
+          transfer: Перевод
+      form:
+        filter: Фильтр
+        search_placeholder: Поиск операций ...
+        toggle_selection_checkboxes: Переключить все флажки
+      menu:
+        account_filter: Счёт
+        amount_filter: Сумма
+        apply: Применить
+        cancel: Отмена
+        category_filter: Категория
+        clear_filters: Очистить фильтры
+        date_filter: Дата
+        merchant_filter: Продавец
+        status_filter: Статус
+        tag_filter: Тег
+        type_filter: Тип
+      search:
+        equal_to: равно
+        greater_than: больше чем
+        less_than: меньше чем
+    selection_bar:
+      duplicate: Дублировать
+      edit: Редактировать
+      selected: выбрано
+    show:
+      account_label: Счёт
+      activity_type: Тип активности
+      activity_type_description: Тип инвестиционной активности (Покупка, Продажа,
+        Дивиденды и т.д.). Автоматически определяется или устанавливается вручную.
+      additional_details: Дополнительные детали
+      amount: Сумма
+      attachments: Вложения
+      category_label: Категория
+      convert: Преобразовать
+      convert_to_trade_button: Преобразовать в торговлю
+      convert_to_trade_description: Преобразуйте эту операцию в покупку или продажу
+        с деталями безопасности для отслеживания портфеля.
+      convert_to_trade_title: Преобразовать в торговлю ценными бумагами
+      date_label: Дата
+      delete: Удалить
+      delete_subtitle: Это навсегда удалит операцию, повлияет на ваши исторические
+        балансы и не может быть отменено.
+      delete_title: Удалить операцию
+      description: Описание
+      details: Детали
+      exclude: Исключить
+      exclude_description: Исключенные операции будут удалены из расчетов бюджета
+        и отчетов.
+      keep_both: Нет, оставить обе
+      loan_payment: Платеж по кредиту
+      mark_recurring: Отметить как повторяющуюся
+      mark_recurring_subtitle: Отслеживайте это как повторяющуюся операцию. Разница
+        в сумме автоматически рассчитывается на основе последних 6 месяцев аналогичных
+        операций.
+      mark_recurring_title: Повторяющаяся операция
+      memo: Заметка
+      merchant_label: Продавец
+      merge_duplicate: Да, объединить их
+      name_label: Название
+      nature: Тип
+      none: "(нет)"
+      note_label: Заметки
+      note_placeholder: Введите заметку
+      one_time_description: Одноразовые операции будут исключены из некоторых расчетов
+        бюджета и отчетов, чтобы помочь вам увидеть, что действительно важно.
+      one_time_title: Одноразовая %{type}
+      open_matcher: Открыть сопоставитель
+      overview: Обзор
+      payee: Получатель
+      pending_duplicate_merger_button: Открыть объединение
+      pending_duplicate_merger_description: Вручную объедините эту ожидающую операцию
+        с ее проведенной версией.
+      pending_duplicate_merger_title: Дубликат проведенной операции?
+      potential_duplicate_description: Эта ожидающая операция может быть такой же,
+        как и проведенная ниже. Если это так, объедините их, чтобы избежать двойного
+        учета.
+      potential_duplicate_title: Обнаружен возможный дубликат
+      provider_extras: Дополнения провайдера
+      settings: Настройки
+      tab_transactions: Операции
+      tab_upcoming: Предстоящие
+      tags_label: Теги
+      transfer: Перевод
+      transfer_matcher_description: Свяжите эту операцию с ее аналогом на другом счете.
+      transfer_or_debt_payment: Перевод или платеж по долгу?
+      uncategorized: "(без категории)"
+    split_parent_row:
+      split_label: Разделить
+    summary:
+      expenses: Расходы
+      income: Доход
+      inflow: Поступления
+      outflow: Отток
+      total_transactions: Всего операций
+    toggle_recurring_section: Переключить предстоящие повторяющиеся операции
+    transaction:
+      activity_type_tooltip: Тип инвестиционной активности
+      linked_with_provider: Связано с %{provider}
+      pending: В ожидании
+      pending_tooltip: Операция в ожидании — может измениться при проведении
+      possible_duplicate: Дубликат?
+      potential_duplicate_tooltip: Это может быть дубликат другой операции
+      review_recommended: Рекомендуется проверка
+      review_recommended_tooltip: Большая разница в сумме — рекомендуется проверить,
+        не является ли это дубликатом
+      split: Разделить
+      split_child_tooltip: Часть разделенной операции
+      split_tooltip: Эта операция была разделена на несколько записей
+    transfer_match:
+      auto_matched: Автоматически сопоставлено
+      auto_matched_short: А/С
+      confirm_match: Подтвердить сопоставление
+      payment_confirmed: Платеж подтвержден
+      reject_match: Отклонить сопоставление
+      transfer_confirmed: Перевод подтвержден
+    unknown_name: Неизвестная операция
+    update:
+      updated: Операция обновлена
diff --git a/config/locales/views/transactions/tr.yml b/config/locales/views/transactions/tr.yml
index f950c4f36..585451906 100644
--- a/config/locales/views/transactions/tr.yml
+++ b/config/locales/views/transactions/tr.yml
@@ -1,74 +1,267 @@
 ---
 tr:
   transactions:
+    activity_labels:
+      buy: Alış
+      contribution: Katkı
+      dividend: Temettü
+      exchange: Değişim
+      fee: Ücret
+      interest: Faiz
+      other: Diğer
+      reinvestment: Yeniden yatırım
+      sell: Satış
+      sweep_in: Sweep Girişi
+      sweep_out: Sweep Çıkışı
+      transfer: Transfer
+      withdrawal: Çekim
+    attachments:
+      attachment_deleted: Ek başarıyla silindi
+      browse_to_add: Dosya eklemek için gözat
+      cannot_exceed: İşlem başına %{count} ekten fazla olamaz
+      delete_failed: Ek silinemedi. Lütfen tekrar deneyin veya destek ile iletişime
+        geçin.
+      failed_delete: 'Ek silinemedi: %{error}'
+      failed_upload: 'Ek yüklenemedi: %{error}'
+      files:
+        one: Dosya (1)
+        other: Dosyalar (%{count})
+      max_reached: Maksimum dosya sınırına ulaşıldı (%{count}/%{max}). Başka bir dosya
+        yüklemek için mevcut bir dosyayı silin.
+      no_attachments: Henüz ek yok
+      no_files_selected: Yükleme için dosya seçilmedi
+      select_up_to: En fazla %{count} dosya seçin (görsel veya PDF, her biri en fazla
+        %{size}MB) • %{count} dosyadan %{used} kullanıldı
+      upload: Yükle
+      upload_failed: Ek yüklenemedi. Lütfen tekrar deneyin veya destek ile iletişime
+        geçin.
+      uploaded_many: "%{count} ek başarıyla yüklendi"
+      uploaded_one: Ek başarıyla yüklendi
+    bulk_updates:
+      new:
+        cancel: İptal
+        category_label: Kategori
+        category_prompt: Bir kategori seçin
+        date_label: Tarih
+        header_title: İşlemleri düzenle
+        merchant_label: Satıcı
+        merchant_prompt: Bir satıcı seçin
+        name_label: İsim
+        name_placeholder: Seçilen işlemlere uygulanacak bir isim girin
+        none: "(yok)"
+        notes_label: Notlar
+        notes_placeholder: Seçilen işlemlere uygulanacak bir not girin
+        overview: Genel Bakış
+        save: Kaydet
+        tags_label: Etiketler
+        transactions_section: İşlemler
+    categorizes:
+      create:
+        categorized:
+          one: 1 işlem kategorilendirildi
+          other: "%{count} işlem kategorilendirildi"
+        rule_creation_failed: İşlemler kategorilendirildi, ancak kural oluşturulamadı
+          (zaten var olabilir).
+      entry_row:
+        assign_category_select: "%{name} için kategori ata"
+        include_checkbox: "%{name} dahil et"
+      show:
+        all_done: Tüm işlemler kategorilendirildi
+        assign_category: Bir kategori ata
+        assign_category_prompt: "→ ata"
+        col_amount: Tutar
+        col_category: Kategori
+        col_date: Tarih
+        col_transaction: İşlem
+        create_rule_label: Kategorilendirme Kuralı Oluştur
+        exit: Çıkış
+        filter_placeholder: Kategori ara...
+        no_categories: Eşleşen kategori yok
+        remaining:
+          one: 1 kategorilendirilmemiş işlem kaldı
+          other: "%{count} kategorilendirilmemiş işlem kaldı"
+        rule_description_prefix: İsminde şunu içeren gelecekteki %{type} işlemleri
+        rule_description_suffix: bu kategoriyi de almalı.
+        skip: Atla
+        transaction_count:
+          one: 1 işlem
+          other: "%{count} işlem"
+        transactions_hint: Bir işlemi hariç tutmak için işareti kaldırın veya satırında
+          doğrudan farklı bir kategori atayın.
+        type_expense: Gider
+        type_income: Gelir
+    convert_to_trade:
+      account_label: 'Hesap:'
+      amount_label: 'Tutar:'
+      cancel: İptal
+      conversion_note: 'İşlemden dönüştürüldü: %{original_name} (%{original_date})'
+      date_label: 'Tarih:'
+      description: Bu işlemi menkul kıymet detaylarıyla bir alım satım işlemine dönüştürün
+      errors:
+        already_converted: Bu işlem zaten dönüştürülmüş veya hariç tutulmuş
+        conversion_failed: 'İşlem dönüştürülemedi: %{error}'
+        enter_qty_or_price: Lütfen miktar veya hisse başına fiyat girin. Diğeri işlem
+          tutarından hesaplanacaktır.
+        enter_ticker: Lütfen bir sembol (ticker) girin
+        invalid_qty_or_price: Geçersiz miktar veya fiyat. Lütfen geçerli pozitif değerler
+          girin.
+        not_investment_account: Yalnızca yatırım hesaplarındaki işlemler alım satıma
+          dönüştürülebilir
+        security_not_found: Seçilen menkul kıymet artık mevcut değil. Lütfen başka
+          birini seçin.
+        select_security: Lütfen bir menkul kıymet seçin veya girin
+        unexpected_error: 'Dönüştürme sırasında beklenmeyen hata: %{error}'
+      exchange_hint: Otomatik algılama için boş bırakın
+      exchange_label: Borsa (İsteğe Bağlı)
+      exchange_placeholder: XNAS
+      price_hint: Hisse başına fiyat (%{currency})
+      price_label: Hisse Başına Fiyat
+      price_mismatch_message: Fiyatınız (%{entered_price}/hisse), %{ticker}'ın güncel
+        piyasa fiyatından (%{market_price}) önemli ölçüde farklı. Bu yanlış görünüyorsa,
+        yanlış menkul kıymeti seçmiş olabilirsiniz — doğru olanı belirtmek için "Özel
+        sembol gir" seçeneğini kullanmayı deneyin.
+      price_mismatch_title: Fiyat eşleşmeyebilir
+      price_placeholder: örn. 52.15
+      qty_or_price_hint: En azından miktar VEYA fiyat girin. Diğeri işlem tutarından
+        (%{amount}) hesaplanacaktır.
+      quantity_hint: İşlem gören hisse sayısı
+      quantity_label: Miktar (Hisse)
+      quantity_placeholder: örn. 20
+      security_custom: "+ Özel sembol gir"
+      security_label: Menkul Kıymet
+      security_not_listed_hint: Menkul kıymetinizi görmüyor musunuz? Listenin altındaki
+        "Özel sembol gir" seçeneğini seçin.
+      security_prompt: Bir menkul kıymet seçin...
+      submit: Alım Satıma Dönüştür
+      success: İşlem alım satıma dönüştürüldü
+      ticker_hint: Hisse senedi/ETF sembolünü girin (örn. AAPL, MSFT)
+      ticker_placeholder: AAPL
+      ticker_search_hint: Sembol veya şirket adına göre arayın ya da özel bir sembol
+        yazın
+      ticker_search_placeholder: Sembol ara...
+      title: Menkul Kıymet Alım Satımına Dönüştür
+      trade_type_hint: Bir menkul kıymetin hisselerini alın veya satın
+      trade_type_label: Alım Satım Türü
+    create:
+      created: İşlem oluşturuldu
+    dismiss_duplicate:
+      failure: Kopya önerisi yoksayılamadı
+      success: Ayrı işlemler olarak tutuldu
     form:
       account: Hesap
       account_prompt: Bir Hesap Seçin
       amount: Tutar
       category: Kategori
+      category_label: Kategori
       category_prompt: Bir Kategori Seçin
+      create_tag: Oluştur
       date: Tarih
       description: Açıklama
       description_placeholder: İşlemi açıklayın
+      details: Detaylar
       expense: Gider
       income: Gelir
-      none: (yok)
+      merchant_label: Satıcı
+      none: "(yok)"
       note_label: Notlar
       note_placeholder: Not girin
-      create_tag: Oluştur
       submit: İşlem ekle
       tag_search_placeholder: Etiket ara veya oluştur
       tags_label: Etiketler
       transfer: Transfer
-    new:
-      new_transaction: Yeni işlem
-    show:
-      account_label: Hesap
-      amount: Tutar
-      category_label: Kategori
-      date_label: Tarih
-      delete: Sil
-      delete_subtitle: Bu işlem kalıcı olarak silinir, geçmiş bakiyelerinizi etkiler ve geri alınamaz.
-      delete_title: İşlemi sil
-      details: Detaylar
-      merchant_label: Satıcı
-      name_label: İsim
-      nature: Tür
-      none: "(yok)"
-      note_label: Notlar
-      note_placeholder: Not girin
-      overview: Genel Bakış
-      settings: Ayarlar
-      tags_label: Etiketler
-      uncategorized: "(kategorilendirilmemiş)"
     header:
       edit_categories: Kategorileri düzenle
       edit_imports: İçe aktarımları düzenle
       edit_merchants: Satıcıları düzenle
       edit_tags: Etiketleri düzenle
       import: İçe aktar
-    transaction:
-      linked_with_provider: "%{provider} ile bağlantılı"
     index:
+      categorize_button:
+        one: Kategorilendir (1)
+        other: Kategorilendir (%{count})
+      edit_categories: Kategorileri düzenle
+      edit_imports: İçe aktarımları düzenle
+      edit_merchants: Satıcıları düzenle
+      edit_rules: Kuralları düzenle
+      edit_tags: Etiketleri düzenle
+      import: İçe aktar
+      new_rule: Yeni kural
+      new_transaction: Yeni işlem
+      title: İşlemler
       transaction: işlem
       transactions: işlemler
+    keep_both: Hayır, ikisini de tut
+    list:
+      drag_drop_subtitle: İşlemleri doğrudan yükleyin
+      drag_drop_title: İçe aktarmak için CSV dosyasını bırakın
+      transaction: işlem
+      transactions: işlemler
+    mark_recurring: Yinelenen olarak işaretle
+    mark_recurring_subtitle: Bunu yinelenen bir işlem olarak takip edin. Tutar farkı,
+      geçmiş 6 aydaki benzer işlemlerden otomatik olarak hesaplanır.
+    mark_recurring_title: Yinelenen İşlem
+    merge_duplicate:
+      failure: İşlemler birleştirilemedi
+      success: İşlemler başarıyla birleştirildi
+    new:
+      new_transaction: Yeni işlem
+    pending_duplicate_merge:
+      confirm_title: Gerçekleşen işlemle birleştir (%{posted_amount})
+      possible_duplicate: Kopya mı?
+      possible_duplicate_short: Kopya?
+      reject_title: Ayrı işlemler olarak tut
+      review_recommended: İncele
+      review_recommended_short: İncele
+    potential_duplicate_description: Bu bekleyen işlem aşağıdaki gerçekleşen işlemle
+      aynı olabilir. Öyleyse, çift sayımı önlemek için bunları birleştirin.
+    potential_duplicate_title: Olası kopya tespit edildi
+    search:
+      filters:
+        account: Hesap
+        amount: Tutar
+        category: Kategori
+        date: Tarih
+        merchant: Satıcı
+        status: Durum
+        tag: Etiket
+        type: Tür
     searches:
       filters:
+        account_filter:
+          filter_accounts: Hesapları filtrele
         amount_filter:
           equal_to: Eşit
           greater_than: Daha büyük
           less_than: Daha küçük
           placeholder: '0'
         badge:
+          confirmed: Onaylandı
           expense: Gider
           income: Gelir
           on_or_after: "%{date} veya sonrasında"
           on_or_before: "%{date} veya öncesinde"
+          pending: Beklemede
           transfer: Transfer
+        category_filter:
+          filter_category: Kategoriyi filtrele
+        date_filter:
+          end_date: Bitiş tarihi
+          start_date: Başlangıç tarihi
+        merchant_filter:
+          filter_merchants: Satıcıları filtrele
+        status_filter:
+          confirmed: Onaylandı
+          pending: Beklemede
+        tag_filter:
+          filter_tags: Etiketleri filtrele
         type_filter:
           expense: Gider
           income: Gelir
           transfer: Transfer
+      form:
+        filter: Filtrele
+        search_placeholder: İşlemleri ara...
+        toggle_selection_checkboxes: Tüm onay kutularını değiştir
       menu:
         account_filter: Hesap
         amount_filter: Tutar
@@ -78,11 +271,106 @@ tr:
         clear_filters: Filtreleri temizle
         date_filter: Tarih
         merchant_filter: Satıcı
+        status_filter: Durum
         tag_filter: Etiket
         type_filter: Tür
       search:
         equal_to: eşit
         greater_than: daha büyük
         less_than: daha küçük
-      form:
-        toggle_selection_checkboxes: Tüm onay kutularını değiştir
+    selection_bar:
+      duplicate: Kopya
+      edit: Düzenle
+      selected: seçildi
+    show:
+      account_label: Hesap
+      activity_type: Aktivite Türü
+      activity_type_description: Yatırım aktivitesinin türü (Alış, Satış, Temettü
+        vb.). Otomatik algılanır veya manuel olarak ayarlanır.
+      additional_details: Ek detaylar
+      amount: Tutar
+      attachments: Ekler
+      category_label: Kategori
+      convert: Dönüştür
+      convert_to_trade_button: Alım Satıma Dönüştür
+      convert_to_trade_description: Bu işlemi, portföy takibi için menkul kıymet detaylarıyla
+        bir Alış veya Satış işlemine dönüştürün.
+      convert_to_trade_title: Menkul Kıymet Alım Satımına Dönüştür
+      date_label: Tarih
+      delete: Sil
+      delete_subtitle: Bu işlem kalıcı olarak silinir, geçmiş bakiyelerinizi etkiler
+        ve geri alınamaz.
+      delete_title: İşlemi sil
+      description: Açıklama
+      details: Detaylar
+      exclude: Hariç Tut
+      exclude_description: Hariç tutulan işlemler bütçe hesaplamalarından ve raporlardan
+        çıkarılacaktır.
+      keep_both: Hayır, ikisini de tut
+      loan_payment: Kredi Ödemesi
+      mark_recurring: Yinelenen olarak işaretle
+      mark_recurring_subtitle: Bunu yinelenen bir işlem olarak takip edin. Tutar farkı,
+        geçmiş 6 aydaki benzer işlemlerden otomatik olarak hesaplanır.
+      mark_recurring_title: Yinelenen İşlem
+      memo: Not
+      merchant_label: Satıcı
+      merge_duplicate: Evet, birleştir
+      name_label: İsim
+      nature: Tür
+      none: "(yok)"
+      note_label: Notlar
+      note_placeholder: Not girin
+      one_time_description: Tek seferlik işlemler, gerçekten önemli olanı görmenize
+        yardımcı olmak için bazı bütçe hesaplamalarından ve raporlardan hariç tutulacaktır.
+      one_time_title: Tek seferlik %{type}
+      open_matcher: Eşleştiriciyi aç
+      overview: Genel Bakış
+      payee: Alıcı
+      pending_duplicate_merger_button: Birleştiriciyi aç
+      pending_duplicate_merger_description: Bu bekleyen işlemi gerçekleşen sürümüyle
+        manuel olarak birleştirin.
+      pending_duplicate_merger_title: Gerçekleşen İşlemin Kopyası mı?
+      potential_duplicate_description: Bu bekleyen işlem aşağıdaki gerçekleşen işlemle
+        aynı olabilir. Öyleyse, çift sayımı önlemek için bunları birleştirin.
+      potential_duplicate_title: Olası kopya tespit edildi
+      provider_extras: Sağlayıcı ek bilgileri
+      settings: Ayarlar
+      tab_transactions: İşlemler
+      tab_upcoming: Yaklaşan
+      tags_label: Etiketler
+      transfer: Transfer
+      transfer_matcher_description: Bu işlemi başka bir hesaptaki karşılığına bağlayın.
+      transfer_or_debt_payment: Transfer mi yoksa Borç Ödemesi mi?
+      uncategorized: "(kategorilendirilmemiş)"
+    split_parent_row:
+      split_label: Bölünmüş
+    summary:
+      expenses: Giderler
+      income: Gelir
+      inflow: Giren
+      outflow: Çıkan
+      total_transactions: Toplam işlem
+    toggle_recurring_section: Yaklaşan yinelenen işlemleri aç/kapat
+    transaction:
+      activity_type_tooltip: Yatırım aktivite türü
+      linked_with_provider: "%{provider} ile bağlantılı"
+      pending: Beklemede
+      pending_tooltip: Bekleyen işlem — gerçekleştiğinde değişebilir
+      possible_duplicate: Kopya mı?
+      potential_duplicate_tooltip: Bu, başka bir işlemin kopyası olabilir
+      review_recommended: İncele
+      review_recommended_tooltip: Büyük tutar farkı — bunun bir kopya olup olmadığını
+        kontrol etmek için incelemeniz önerilir
+      split: Bölünmüş
+      split_child_tooltip: Bölünmüş bir işlemin parçası
+      split_tooltip: Bu işlem birden fazla kayda bölünmüş
+    transfer_match:
+      auto_matched: Otomatik eşleşti
+      auto_matched_short: O/E
+      confirm_match: Eşleşmeyi onayla
+      payment_confirmed: Ödeme onaylandı
+      reject_match: Eşleşmeyi reddet
+      transfer_confirmed: Transfer onaylandı
+    unknown_name: Bilinmeyen işlem
+    update:
+      updated: İşlem güncellendi
diff --git a/config/locales/views/transactions/zh-CN.yml b/config/locales/views/transactions/zh-CN.yml
index ebf13802a..3f14fc218 100644
--- a/config/locales/views/transactions/zh-CN.yml
+++ b/config/locales/views/transactions/zh-CN.yml
@@ -288,6 +288,14 @@ zh-CN:
         status_filter:
           confirmed: 已确认
           pending: 待处理
+        account_filter:
+          filter_accounts: 筛选账户
+        category_filter:
+          filter_category: 筛选分类
+        merchant_filter:
+          filter_merchants: 筛选商户
+        tag_filter:
+          filter_tags: 筛选标签
       menu:
         account_filter: 账户
         amount_filter: 金额
@@ -326,3 +334,16 @@ zh-CN:
         other: 文件（%{count}）
       browse_to_add: 浏览并添加文件
       max_reached: 已达到最大文件数（%{count}/%{max}）。删除现有文件后才能上传另一个。
+    potential_duplicate_description: 这笔待处理交易可能与下方已入账交易相同。如是，请合并以避免重复计算。
+    transaction:
+      pending: 待处理
+      pending_tooltip: 待处理交易，入账后可能变化
+      linked_with_provider: 已关联 %{provider}
+      activity_type_tooltip: 投资活动类型
+      possible_duplicate: 重复？
+      potential_duplicate_tooltip: 这可能是另一笔交易的重复项
+      review_recommended: 查看
+      review_recommended_tooltip: 金额差异较大，建议检查是否重复
+      split: 拆分
+      split_tooltip: 此交易已拆分为多条记录
+      split_child_tooltip: 拆分交易的一部分
diff --git a/config/locales/views/transfer_matches/de.yml b/config/locales/views/transfer_matches/de.yml
new file mode 100644
index 000000000..63b930aa6
--- /dev/null
+++ b/config/locales/views/transfer_matches/de.yml
@@ -0,0 +1,24 @@
+---
+de:
+  transfer_matches:
+    create:
+      success: Übertragung erstellt
+    new:
+      header:
+        title: Übertragung oder Zahlung zuordnen
+        subtitle: Ordnen Sie die entsprechende Transaktion in einem anderen Konto zu oder erstellen Sie eine, falls keine vorhanden ist.
+      from_account: Von Konto
+      from_account_named: "Von Konto: %{name}"
+      to_account: Zu Konto
+      to_account_named: "Zu Konto: %{name}"
+      outflow_transaction: Abgangstransaktion
+      inflow_transaction: Zugangstransaktion
+      create_transfer_match: Übertragungszuordnung erstellen
+    matching_fields:
+      select_method: Wählen Sie eine Methode zum Zuordnen Ihrer Transaktionen.
+      match_existing_recommended: Vorhandene Transaktion zuordnen (empfohlen)
+      create_new_transaction: Neue Transaktion erstellen
+      matching_method: Zuordnungsmethode
+      matching_transaction: Zuzuordnende Transaktion
+      target_account: Zielkonto
+      no_matching_transactions: Wir konnten in Ihren anderen Konten keine zuzuordnenden Transaktionen finden. Bitte wählen Sie ein Konto aus, und wir erstellen für Sie eine neue Zugangstransaktion.
diff --git a/config/locales/views/transfer_matches/fr.yml b/config/locales/views/transfer_matches/fr.yml
new file mode 100644
index 000000000..29f4240d9
--- /dev/null
+++ b/config/locales/views/transfer_matches/fr.yml
@@ -0,0 +1,27 @@
+---
+fr:
+  transfer_matches:
+    create:
+      success: Transfert créé
+    matching_fields:
+      create_new_transaction: Créer une nouvelle transaction
+      match_existing_recommended: Faire correspondre la transaction existante (recommandé)
+      matching_method: Méthode de correspondance
+      matching_transaction: Transaction correspondante
+      no_matching_transactions: Nous n'avons trouvé aucune transaction correspondant
+        à vos autres comptes. Veuillez sélectionner un compte et nous créerons une
+        nouvelle transaction d'entrée pour vous.
+      select_method: Sélectionnez une méthode pour faire correspondre vos transactions.
+      target_account: Compte cible
+    new:
+      create_transfer_match: Créer une correspondance de transfert
+      from_account: Depuis le compte
+      from_account_named: 'Depuis le compte : %{name}'
+      header:
+        subtitle: Faites correspondre la transaction correspondante dans un autre
+          compte ou créez-en une si elle n'existe pas.
+        title: Correspondre au transfert ou au paiement
+      inflow_transaction: Opération d'entrée
+      outflow_transaction: Opération de sortie
+      to_account: Pour rendre compte
+      to_account_named: 'Au compte : %{name}'
diff --git a/config/locales/views/transfer_matches/it.yml b/config/locales/views/transfer_matches/it.yml
new file mode 100644
index 000000000..468a8d9cb
--- /dev/null
+++ b/config/locales/views/transfer_matches/it.yml
@@ -0,0 +1,24 @@
+---
+it:
+  transfer_matches:
+    create:
+      success: Bonifico creato
+    new:
+      header:
+        title: Abbina bonifico o pagamento
+        subtitle: Abbina la transazione corrispondente in un altro conto o creane una nuova se non esiste.
+      from_account: Conto di origine
+      from_account_named: "Conto di origine: %{name}"
+      to_account: Conto di destinazione
+      to_account_named: "Conto di destinazione: %{name}"
+      outflow_transaction: Transazione in uscita
+      inflow_transaction: Transazione in entrata
+      create_transfer_match: Crea abbinamento bonifico
+    matching_fields:
+      select_method: Seleziona un metodo per abbinare le tue transazioni.
+      match_existing_recommended: Abbina transazione esistente (consigliato)
+      create_new_transaction: Crea nuova transazione
+      matching_method: Metodo di abbinamento
+      matching_transaction: Transazione corrispondente
+      target_account: Conto di destinazione
+      no_matching_transactions: Non abbiamo trovato transazioni corrispondenti dagli altri tuoi conti. Seleziona un conto e creeremo una nuova transazione in entrata per te.
diff --git a/config/locales/views/transfer_matches/nl.yml b/config/locales/views/transfer_matches/nl.yml
new file mode 100644
index 000000000..2c4631f45
--- /dev/null
+++ b/config/locales/views/transfer_matches/nl.yml
@@ -0,0 +1,24 @@
+---
+nl:
+  transfer_matches:
+    create:
+      success: Overboeking aangemaakt
+    new:
+      header:
+        title: Overboeking of betaling koppelen
+        subtitle: Koppel de bijbehorende transactie in een ander account of maak er een aan als die niet bestaat.
+      from_account: Vanaf account
+      from_account_named: "Vanaf account: %{name}"
+      to_account: Naar account
+      to_account_named: "Naar account: %{name}"
+      outflow_transaction: Uitgaande transactie
+      inflow_transaction: Inkomende transactie
+      create_transfer_match: Overboekingskoppeling aanmaken
+    matching_fields:
+      select_method: Selecteer een methode om uw transacties te koppelen.
+      match_existing_recommended: Bestaande transactie koppelen (aanbevolen)
+      create_new_transaction: Nieuwe transactie aanmaken
+      matching_method: Koppelmethode
+      matching_transaction: Te koppelen transactie
+      target_account: Doelaccount
+      no_matching_transactions: We konden geen transacties vinden om te koppelen vanuit uw andere accounts. Selecteer een account en wij maken een nieuwe inkomende transactie voor u aan.
diff --git a/config/locales/views/transfer_matches/pl.yml b/config/locales/views/transfer_matches/pl.yml
new file mode 100644
index 000000000..dd4ef9968
--- /dev/null
+++ b/config/locales/views/transfer_matches/pl.yml
@@ -0,0 +1,24 @@
+---
+pl:
+  transfer_matches:
+    create:
+      success: Przelew utworzony
+    new:
+      header:
+        title: Dopasuj przelew lub płatność
+        subtitle: Dopasuj odpowiadającą transakcję na innym koncie lub utwórz nową, jeśli nie istnieje.
+      from_account: Z konta
+      from_account_named: "Z konta: %{name}"
+      to_account: Na konto
+      to_account_named: "Na konto: %{name}"
+      outflow_transaction: Transakcja wychodząca
+      inflow_transaction: Transakcja przychodząca
+      create_transfer_match: Utwórz dopasowanie przelewu
+    matching_fields:
+      select_method: Wybierz metodę dopasowania transakcji.
+      match_existing_recommended: Dopasuj istniejącą transakcję (zalecane)
+      create_new_transaction: Utwórz nową transakcję
+      matching_method: Metoda dopasowania
+      matching_transaction: Dopasowywana transakcja
+      target_account: Konto docelowe
+      no_matching_transactions: Nie znaleźliśmy żadnych transakcji do dopasowania z twoich innych kont. Wybierz konto, a utworzymy dla ciebie nową transakcję przychodzącą.
diff --git a/config/locales/views/transfer_matches/pt-BR.yml b/config/locales/views/transfer_matches/pt-BR.yml
new file mode 100644
index 000000000..11b064995
--- /dev/null
+++ b/config/locales/views/transfer_matches/pt-BR.yml
@@ -0,0 +1,24 @@
+---
+pt-BR:
+  transfer_matches:
+    create:
+      success: Transferência criada
+    new:
+      header:
+        title: Vincular transferência ou pagamento
+        subtitle: Vincule a transação correspondente em outra conta ou crie uma caso não exista.
+      from_account: Conta de origem
+      from_account_named: "Conta de origem: %{name}"
+      to_account: Conta de destino
+      to_account_named: "Conta de destino: %{name}"
+      outflow_transaction: Transação de saída
+      inflow_transaction: Transação de entrada
+      create_transfer_match: Criar vínculo de transferência
+    matching_fields:
+      select_method: Selecione um método para vincular suas transações.
+      match_existing_recommended: Vincular transação existente (recomendado)
+      create_new_transaction: Criar nova transação
+      matching_method: Método de vínculo
+      matching_transaction: Transação a vincular
+      target_account: Conta de destino
+      no_matching_transactions: Não encontramos nenhuma transação para vincular em suas outras contas. Selecione uma conta e criaremos uma nova transação de entrada para você.
diff --git a/config/locales/views/transfer_matches/ru.yml b/config/locales/views/transfer_matches/ru.yml
new file mode 100644
index 000000000..4cc992741
--- /dev/null
+++ b/config/locales/views/transfer_matches/ru.yml
@@ -0,0 +1,27 @@
+---
+ru:
+  transfer_matches:
+    create:
+      success: Перевод создан
+    matching_fields:
+      create_new_transaction: Создать новую операцию
+      match_existing_recommended: Соответствие существующей операции (рекомендуется)
+      matching_method: Метод сопоставления
+      matching_transaction: Соответствующая операция
+      no_matching_transactions: Мы не смогли найти операции для сопоставления с ваших
+        других счетов. Пожалуйста, выберите счёт, и мы создадим для вас новую операцию
+        зачисления.
+      select_method: Выберите метод для сопоставления ваших операций.
+      target_account: Целевой счёт
+    new:
+      create_transfer_match: Создать соответствие перевода
+      from_account: Со счёта
+      from_account_named: 'Со счёта: %{name}'
+      header:
+        subtitle: Найдите соответствующую операцию в другом счёте или создайте её,
+          если она не существует.
+        title: Соответствие перевода или платежа
+      inflow_transaction: Операция зачисления
+      outflow_transaction: Операция списания
+      to_account: На счёт
+      to_account_named: 'На счёт: %{name}'
diff --git a/config/locales/views/transfer_matches/tr.yml b/config/locales/views/transfer_matches/tr.yml
new file mode 100644
index 000000000..deec99600
--- /dev/null
+++ b/config/locales/views/transfer_matches/tr.yml
@@ -0,0 +1,25 @@
+---
+tr:
+  transfer_matches:
+    create:
+      success: Transfer oluşturuldu
+    matching_fields:
+      create_new_transaction: Yeni işlem oluştur
+      match_existing_recommended: Mevcut işlemle eşleştir (önerilen)
+      matching_method: Eşleştirme yöntemi
+      matching_transaction: Eşleştirme işlemi
+      no_matching_transactions: Diğer hesaplarınızdan eşleştirilecek işlem bulunamadı.
+        Lütfen bir hesap seçin, sizin için yeni bir giriş işlemi oluşturalım.
+      select_method: İşlemlerinizi eşleştirmek için bir yöntem seçin.
+      target_account: Hedef hesap
+    new:
+      create_transfer_match: Transfer eşleşmesi oluştur
+      from_account: Kaynak hesap
+      from_account_named: 'Kaynak hesap: %{name}'
+      header:
+        subtitle: Karşılık gelen işlemi başka bir hesapla eşleştirin veya yoksa oluşturun.
+        title: Transfer veya ödeme eşleştir
+      inflow_transaction: Giriş işlemi
+      outflow_transaction: Çıkış işlemi
+      to_account: Hedef hesap
+      to_account_named: 'Hedef hesap: %{name}'
diff --git a/config/locales/views/transfers/ca.yml b/config/locales/views/transfers/ca.yml
index dcce62762..1ee8d9bef 100644
--- a/config/locales/views/transfers/ca.yml
+++ b/config/locales/views/transfers/ca.yml
@@ -7,14 +7,10 @@ ca:
       success: Transferència eliminada
     form:
       amount: Import
-      calculate_rate_tab: Calcula la taxa de canvi
-      convert_tab: Converteix amb la taxa de canvi
       date: Data
       destination_amount: Import rebut
       destination_amount_display: 'Import rebut: %{amount}'
-      exchange_rate: Taxa de canvi
       exchange_rate_display: 'Taxa de canvi: %{rate}'
-      exchange_rate_help: Tria com introduir l'import de la transferència.
       expense: Despesa
       from: Des de
       income: Ingrés
@@ -44,6 +40,8 @@ ca:
       overview: Resum
       settings: Configuració
       to: A
+      total: Total
+      transfer_amount: Import de la transferència
       uncategorized: Sense categoria
     update:
       success: Transferència actualitzada
diff --git a/config/locales/views/transfers/en.yml b/config/locales/views/transfers/en.yml
index aa9c40104..8c483e872 100644
--- a/config/locales/views/transfers/en.yml
+++ b/config/locales/views/transfers/en.yml
@@ -7,14 +7,13 @@ en:
       success: Transfer removed
     form:
       amount: Amount
-      calculate_rate_tab: Calculate FX rate
-      convert_tab: Convert with FX rate
+      bank_charges: Bank Charges
+      outgoing_fee: Outgoing transfer fee
+      incoming_fee: Incoming transfer fee
       date: Date
       destination_amount: Destination amount
       destination_amount_display: "Destination amount: %{amount}"
-      exchange_rate: Exchange rate
       exchange_rate_display: "Exchange rate: %{rate}"
-      exchange_rate_help: Choose how to enter the transfer amount.
       expense: Expense
       from: From
       income: Income
@@ -42,7 +41,11 @@ en:
       from: From
       to: To
       date: Date
-      amount: Amount
+      transfer_amount: Transfer amount
+      total: Total
+      bank_charges: Bank Charges
+      source_fee: Source fee
+      destination_fee: Destination fee
       category: Category
       uncategorized: Uncategorized
     update:
diff --git a/config/locales/views/transfers/es.yml b/config/locales/views/transfers/es.yml
index 419c9b719..1f438d08a 100644
--- a/config/locales/views/transfers/es.yml
+++ b/config/locales/views/transfers/es.yml
@@ -7,14 +7,10 @@ es:
       success: Transferencia eliminada
     form:
       amount: Importe
-      calculate_rate_tab: Calcular tasa
-      convert_tab: Convertir con tasa
       date: Fecha
       destination_amount: Importe de destino
       destination_amount_display: "Importe de destino: %{amount}"
-      exchange_rate: Tasa de cambio
       exchange_rate_display: "Tasa de cambio: %{rate}"
-      exchange_rate_help: Elige cómo introducir el importe de la transferencia.
       expense: Gasto
       from: Desde
       income: Ingreso
@@ -34,5 +30,7 @@ es:
       note_placeholder: Añade una nota a esta transferencia
       overview: Resumen
       settings: Configuración
+      total: Total
+      transfer_amount: Importe de la transferencia
     update:
       success: Transferencia actualizada
diff --git a/config/locales/views/transfers/fr.yml b/config/locales/views/transfers/fr.yml
index e13023bc0..c59876136 100644
--- a/config/locales/views/transfers/fr.yml
+++ b/config/locales/views/transfers/fr.yml
@@ -7,17 +7,16 @@ fr:
       success: Transfert supprimé
     form:
       amount: Montant
-      calculate_rate_tab: Calculer le taux de change
-      convert_tab: Convertir avec taux de change
       date: Date
       destination_amount: Montant de destination
       destination_amount_display: "Montant de destination : %{amount}"
-      exchange_rate: Taux de change
       exchange_rate_display: "Taux de change : %{rate}"
-      exchange_rate_help: Choisissez comment saisir le montant du transfert.
       expense: Dépense
+      bank_charges: Frais bancaires
       from: De
       income: Revenu
+      incoming_fee: Frais de transfert entrant
+      outgoing_fee: Frais de transfert sortant
       select_account: Sélectionner un compte
       source_amount: Montant source
       submit: Créer le transfert
@@ -26,13 +25,31 @@ fr:
     new:
       title: Nouveau transfert
     show:
+      amount: Montant
+      category: Catégorie
+      date: Date
       delete: Supprimer le transfert
-      delete_subtitle: Ce transfert est supprimé. Il ne supprimera pas les transactions sous-jacentes.
+      delete_subtitle:
+        Ce transfert est supprimé. Il ne supprimera pas les transactions
+        sous-jacentes.
       delete_title: Voulez-vous vraiment supprimer ce transfert?
       details: Détails
+      from: De
+      mark_recurring: Marquer comme récurrent
+      mark_recurring_subtitle:
+        Suivez ce transfert comme un modèle récurrent dans
+        le prochain flux et la page récurrente.
+      mark_recurring_title: Marquer le transfert comme récurrent
       note_label: Notes
       note_placeholder: Ajoutez une note à ce transfert
       overview: Aperçu
       settings: Paramètres
+      bank_charges: Frais bancaires
+      destination_fee: Frais de destination
+      source_fee: Frais d'origine
+      to: À
+      total: Total
+      transfer_amount: Montant du transfert
+      uncategorized: Non classé
     update:
       success: Transfert mis à jour
diff --git a/config/locales/views/transfers/hu.yml b/config/locales/views/transfers/hu.yml
index 18df870c0..2caf17385 100644
--- a/config/locales/views/transfers/hu.yml
+++ b/config/locales/views/transfers/hu.yml
@@ -7,14 +7,10 @@ hu:
       success: Átutalás eltávolítva
     form:
       amount: Összeg
-      calculate_rate_tab: Árfolyam kiszámítása
-      convert_tab: Átváltás árfolyammal
       date: Dátum
       destination_amount: Célösszeg
       destination_amount_display: "Célösszeg: %{amount}"
-      exchange_rate: Árfolyam
       exchange_rate_display: "Árfolyam: %{rate}"
-      exchange_rate_help: Válaszd meg, hogyan adod meg az átutalás összegét.
       expense: Kiadás
       from: Honnan
       income: Bevétel
@@ -43,5 +39,7 @@ hu:
       amount: Összeg
       category: Kategória
       uncategorized: Kategorizálatlan
+      total: '[Total]'
+      transfer_amount: '[Transfer amount]'
     update:
       success: Átutalás frissítve
diff --git a/config/locales/views/transfers/it.yml b/config/locales/views/transfers/it.yml
new file mode 100644
index 000000000..a3f05ec80
--- /dev/null
+++ b/config/locales/views/transfers/it.yml
@@ -0,0 +1,50 @@
+---
+it:
+  transfers:
+    create:
+      success: Bonifico creato
+    destroy:
+      success: Bonifico rimosso
+    form:
+      amount: Importo
+      bank_charges: Commissioni bancarie
+      outgoing_fee: Commissione bonifico in uscita
+      incoming_fee: Commissione bonifico in entrata
+      date: Data
+      destination_amount: Importo di destinazione
+      destination_amount_display: "Importo di destinazione: %{amount}"
+      exchange_rate_display: "Tasso di cambio: %{rate}"
+      expense: Spesa
+      from: Da
+      income: Entrata
+      select_account: Seleziona conto
+      source_amount: Importo di origine
+      submit: Crea bonifico
+      to: A
+      transfer: Bonifico
+    new:
+      title: Nuovo bonifico
+    show:
+      delete: Rimuovi bonifico
+      delete_subtitle: Questo rimuove il bonifico. Non eliminerà le transazioni sottostanti.
+      delete_title: Rimuovere il bonifico?
+      details: Dettagli
+      mark_recurring: Segna come ricorrente
+      mark_recurring_subtitle: Traccia questo bonifico come schema ricorrente nel feed delle prossime uscite e nella pagina dei ricorrenti.
+      mark_recurring_title: Segna il bonifico come ricorrente
+      note_label: Note
+      note_placeholder: Aggiungi una nota a questo bonifico
+      overview: Panoramica
+      settings: Impostazioni
+      from: Da
+      to: A
+      date: Data
+      transfer_amount: Importo bonifico
+      total: Totale
+      bank_charges: Commissioni bancarie
+      source_fee: Commissione origine
+      destination_fee: Commissione destinazione
+      category: Categoria
+      uncategorized: Non categorizzata
+    update:
+      success: Bonifico aggiornato
diff --git a/config/locales/views/transfers/ru.yml b/config/locales/views/transfers/ru.yml
new file mode 100644
index 000000000..d498da8e6
--- /dev/null
+++ b/config/locales/views/transfers/ru.yml
@@ -0,0 +1,48 @@
+---
+ru:
+  transfers:
+    create:
+      success: Перевод создан
+    destroy:
+      success: Перевод удалён
+    form:
+      amount: Сумма
+      calculate_rate_tab: Рассчитать курс валют
+      convert_tab: Конвертировать по курсу валют
+      date: Дата
+      destination_amount: Сумма на счёт назначения
+      destination_amount_display: 'Сумма на счёт назначения: %{amount}'
+      exchange_rate: Курс валют
+      exchange_rate_display: 'Курс валют: %{rate}'
+      exchange_rate_help: Выберите, как ввести сумму перевода.
+      expense: Расход
+      from: Откуда
+      income: Доход
+      select_account: Выберите счёт
+      source_amount: Сумма со счёта отправления
+      submit: Создать перевод
+      to: Куда
+      transfer: Перевод
+    new:
+      title: Новый перевод
+    show:
+      amount: Сумма
+      category: Категория
+      date: Дата
+      delete: Удалить перевод
+      delete_subtitle: Это удалит перевод. Это не удалит связанные операции.
+      delete_title: Удалить перевод?
+      details: Подробности
+      from: Откуда
+      mark_recurring: Отметить как регулярный
+      mark_recurring_subtitle: Отслеживайте этот перевод как регулярный в ленте и
+        на странице регулярных операций.
+      mark_recurring_title: Отметить перевод как регулярный
+      note_label: Заметки
+      note_placeholder: Добавьте заметку к этому переводу
+      overview: Обзор
+      settings: Настройки
+      to: Куда
+      uncategorized: Без категории
+    update:
+      success: Перевод обновлён
diff --git a/config/locales/views/transfers/tr.yml b/config/locales/views/transfers/tr.yml
index b1a53d605..3098d3828 100644
--- a/config/locales/views/transfers/tr.yml
+++ b/config/locales/views/transfers/tr.yml
@@ -7,24 +7,45 @@ tr:
       success: Transfer kaldırıldı
     form:
       amount: Tutar
+      bank_charges: Banka ücretleri
       date: Tarih
+      destination_amount: Hedef tutar
+      destination_amount_display: 'Hedef tutar: %{amount}'
+      exchange_rate_display: 'Döviz kuru: %{rate}'
       expense: Gider
       from: Kimden
       income: Gelir
+      incoming_fee: Gelen transfer ücreti
+      outgoing_fee: Giden transfer ücreti
       select_account: Hesap seçin
+      source_amount: Kaynak tutar
       submit: Transfer oluştur
       to: Kime
       transfer: Transfer
     new:
       title: Yeni transfer
     show:
+      bank_charges: Banka ücretleri
+      category: Kategori
+      date: Tarih
       delete: Transferi kaldır
       delete_subtitle: Bu işlem transferi kaldırır. Altta yatan işlemler silinmeyecektir.
       delete_title: Transfer kaldırılsın mı?
+      destination_fee: Hedef ücret
       details: Detaylar
+      from: Kaynak
+      mark_recurring: Yinelenen olarak işaretle
+      mark_recurring_subtitle: Bu transferi yaklaşan işlemler akışında ve yinelenen
+        sayfasında yinelenen bir desen olarak izleyin.
+      mark_recurring_title: Transferi yinelenen olarak işaretle
       note_label: Notlar
       note_placeholder: Bu transfere bir not ekleyin
       overview: Genel Bakış
       settings: Ayarlar
+      source_fee: Kaynak ücret
+      to: Hedef
+      total: Toplam
+      transfer_amount: Transfer tutarı
+      uncategorized: Kategorisiz
     update:
-      success: Transfer güncellendi
\ No newline at end of file
+      success: Transfer güncellendi
diff --git a/config/locales/views/transfers/vi.yml b/config/locales/views/transfers/vi.yml
index 05c23cf04..829fe5799 100644
--- a/config/locales/views/transfers/vi.yml
+++ b/config/locales/views/transfers/vi.yml
@@ -7,14 +7,10 @@ vi:
       success: Chuyển khoản đã được xóa
     form:
       amount: Số tiền
-      calculate_rate_tab: Tính tỷ giá ngoại hối
-      convert_tab: Chuyển đổi với tỷ giá ngoại hối
       date: Ngày
       destination_amount: Số tiền đích
       destination_amount_display: "Số tiền đích: %{amount}"
-      exchange_rate: Tỷ giá
       exchange_rate_display: "Tỷ giá: %{rate}"
-      exchange_rate_help: Chọn cách nhập số tiền chuyển khoản.
       expense: Chi tiêu
       from: Từ
       income: Thu nhập
@@ -43,5 +39,7 @@ vi:
       amount: Số tiền
       category: Danh mục
       uncategorized: Chưa phân loại
+      total: '[Total]'
+      transfer_amount: '[Transfer amount]'
     update:
       success: Chuyển khoản đã được cập nhật
diff --git a/config/locales/views/transfers/zh-CN.yml b/config/locales/views/transfers/zh-CN.yml
index ec1f1d714..a8c3e0f8a 100644
--- a/config/locales/views/transfers/zh-CN.yml
+++ b/config/locales/views/transfers/zh-CN.yml
@@ -15,6 +15,14 @@ zh-CN:
       submit: 创建转账
       to: 转入账户
       transfer: 转账
+      calculate_rate_tab: 计算外汇汇率
+      convert_tab: 按外汇汇率换算
+      destination_amount: 目标金额
+      destination_amount_display: 目标金额：%{amount}
+      exchange_rate: 汇率
+      exchange_rate_display: 汇率：%{rate}
+      exchange_rate_help: 选择转账金额的输入方式。
+      source_amount: 来源金额
     new:
       title: 新建转账
     show:
@@ -26,5 +34,16 @@ zh-CN:
       note_placeholder: 为此转账添加备注
       overview: 概览
       settings: 设置
+      mark_recurring: 标记为循环
+      mark_recurring_subtitle: 在后续流水和循环页面中按循环模式跟踪此转账。
+      mark_recurring_title: 标记为循环转账
+      from: 从
+      to: 到
+      date: 日期
+      amount: 金额
+      category: 分类
+      uncategorized: 未分类
+      total: 总计
+      transfer_amount: 转账金额
     update:
       success: 转账已更新
diff --git a/config/locales/views/up_items/en.yml b/config/locales/views/up_items/en.yml
new file mode 100644
index 000000000..bdc8e07f1
--- /dev/null
+++ b/config/locales/views/up_items/en.yml
@@ -0,0 +1,116 @@
+---
+en:
+  providers:
+    up:
+      name: Up
+      description: Connect Australian Up bank accounts via a personal access token
+  family:
+    up:
+      create_up_item:
+        default_name: Up Connection
+  up_account:
+    fallback: Up account
+  up_item:
+    errors:
+      account_processing_failed: Could not sync Up account
+      account_sync_schedule_failed: Could not schedule Up account sync
+      transactions_failed: Could not fetch Up transactions
+      sync_failed: Could not sync Up connection
+    sync_status:
+      no_accounts: No accounts found
+      all_synced:
+        one: 1 account synced
+        other: "%{count} accounts synced"
+      partial: "%{linked} synced, %{unlinked} need setup"
+    institution_summary:
+      none: No institutions connected
+      one: 1 institution
+      count:
+        one: 1 institution
+        other: "%{count} institutions"
+  up_items:
+    provider_panel:
+      default_connection_name: Up Connection
+      add_connection: Add Up connection
+      update_connection: Update connection
+      connection_name_label: Connection name
+      connection_name_placeholder: Main Up
+      access_token_label: Personal Access Token
+      access_token_placeholder: Paste your Up personal access token
+      keep_access_token_placeholder: Leave blank to keep the existing token
+      setup_accounts: Setup accounts
+      syncing: Syncing...
+      sync: Sync
+      disconnect: Disconnect
+      disconnect_confirm: "Are you sure you want to disconnect %{name}?"
+    create:
+      success: Up connection saved.
+    update:
+      success: Up connection updated.
+    destroy:
+      success: Scheduled Up connection for deletion.
+      unlink_failed: Could not disconnect Up connection
+    select_accounts:
+      title: Link Up accounts
+      description: Choose the Up accounts to add.
+      no_accounts_found: No unlinked Up accounts were found.
+      no_credentials_configured: Configure Up in provider settings first.
+      cancel: Cancel
+      link_accounts: Link accounts
+    link_accounts:
+      success:
+        one: Linked 1 Up account.
+        other: "Linked %{count} Up accounts."
+      no_accounts_selected: Select at least one account.
+      no_credentials_configured: Configure Up in provider settings first.
+      unsupported_account_type: Up does not support that account type.
+      link_failed: No accounts were linked.
+    select_existing_account:
+      title: "Link Up account to %{account_name}"
+      description: Choose an unlinked Up account to connect to this account.
+      no_accounts_found: No unlinked Up accounts were found.
+      no_credentials_configured: Configure Up in provider settings first.
+      account_already_linked: This account is already linked to a provider.
+      cancel: Cancel
+      link_account: Link account
+    link_existing_account:
+      success: "Linked Up account to %{account_name}."
+      account_already_linked: This account is already linked to a provider.
+      up_account_already_linked: This Up account is already linked.
+      no_account_selected: Select an Up account to link.
+    setup_accounts:
+      title: Link Up Accounts
+      subtitle: Choose how each Up account should appear in Sure.
+      no_credentials: Configure Up credentials first.
+      api_error: Could not fetch Up accounts.
+      fetch_failed: Could not fetch accounts
+      no_accounts_to_setup: No accounts to set up
+      all_accounts_linked: All Up accounts are already linked.
+      choose_account_type: Choose an account type
+      choose_account_type_description: Skip accounts you do not want to track.
+      account_type_label: Account type
+      account_types:
+        skip: Skip
+        depository: Cash
+        loan: Loan
+      create_accounts: Create accounts
+      cancel: Cancel
+    complete_account_setup:
+      success:
+        one: Created 1 Up account.
+        other: "Created %{count} Up accounts."
+      all_skipped: No Up accounts were created.
+      no_accounts: No Up accounts were selected.
+      creation_failed: Could not create Up accounts.
+    up_item:
+      deletion_in_progress: Deletion in progress
+      syncing: Syncing
+      error: Error
+      status_with_summary: "Synced %{timestamp} ago · %{summary}"
+      status_never: Never synced
+      delete: Delete
+      setup_needed: Account setup needed
+      setup_description: "%{linked} of %{total} accounts linked."
+      setup_action: Setup accounts
+      no_accounts_title: No accounts imported yet
+      no_accounts_description: Fetch Up accounts and choose which ones to link.
diff --git a/config/locales/views/up_items/fr.yml b/config/locales/views/up_items/fr.yml
new file mode 100644
index 000000000..4dea0890a
--- /dev/null
+++ b/config/locales/views/up_items/fr.yml
@@ -0,0 +1,116 @@
+---
+fr:
+  family:
+    up:
+      create_up_item:
+        default_name: Connexion Up
+  providers:
+    up:
+      description: Connectez des comptes bancaires australiens Up via un jeton d'accès personnel
+      name: Up
+  up_account:
+    fallback: Compte Up
+  up_item:
+    errors:
+      account_processing_failed: Impossible de synchroniser le compte Up
+      account_sync_schedule_failed: Impossible de planifier la synchronisation du compte Up
+      sync_failed: Impossible de synchroniser la connexion Up
+      transactions_failed: Impossible de récupérer les transactions Up
+    institution_summary:
+      count:
+        one: 1 institution
+        other: "%{count} institutions"
+      none: Aucune institution connectée
+      one: 1 institution
+    sync_status:
+      all_synced:
+        one: 1 compte synchronisé
+        other: "%{count} comptes synchronisés"
+      no_accounts: Aucun compte trouvé
+      partial: "%{linked} synchronisés, %{unlinked} à configurer"
+  up_items:
+    complete_account_setup:
+      all_skipped: Aucun compte Up n'a été créé.
+      creation_failed: Impossible de créer les comptes Up.
+      no_accounts: Aucun compte Up n'a été sélectionné.
+      success:
+        one: 1 compte Up créé.
+        other: "%{count} comptes Up créés."
+    create:
+      success: Connexion Up enregistrée.
+    destroy:
+      success: Suppression de la connexion Up planifiée.
+      unlink_failed: Impossible de déconnecter la connexion Up
+    link_accounts:
+      link_failed: Aucun compte n'a été lié.
+      no_accounts_selected: Sélectionnez au moins un compte.
+      no_credentials_configured: Configurez d'abord Up dans les paramètres des fournisseurs.
+      success:
+        one: 1 compte Up lié.
+        other: "%{count} comptes Up liés."
+      unsupported_account_type: Up ne prend pas en charge ce type de compte.
+    link_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur.
+      no_account_selected: Sélectionnez un compte Up à lier.
+      success: Compte Up lié à %{account_name}.
+      up_account_already_linked: Ce compte Up est déjà lié.
+    provider_panel:
+      access_token_label: Jeton d'accès personnel
+      access_token_placeholder: Collez votre jeton d'accès personnel Up
+      add_connection: Ajouter une connexion Up
+      connection_name_label: Nom de la connexion
+      connection_name_placeholder: Up principal
+      default_connection_name: Connexion Up
+      disconnect: Déconnecter
+      disconnect_confirm: Voulez-vous vraiment déconnecter %{name} ?
+      keep_access_token_placeholder: Laissez vide pour conserver le jeton existant
+      setup_accounts: Configurer les comptes
+      sync: Synchroniser
+      syncing: Synchronisation...
+      update_connection: Mettre à jour la connexion
+    select_accounts:
+      cancel: Annuler
+      description: Choisissez les comptes Up à ajouter.
+      link_accounts: Lier les comptes
+      no_accounts_found: Aucun compte Up non lié n'a été trouvé.
+      no_credentials_configured: Configurez d'abord Up dans les paramètres des fournisseurs.
+      title: Lier les comptes Up
+    select_existing_account:
+      account_already_linked: Ce compte est déjà lié à un fournisseur.
+      cancel: Annuler
+      description: Choisissez un compte Up non lié pour le connecter à ce compte.
+      link_account: Lier le compte
+      no_accounts_found: Aucun compte Up non lié n'a été trouvé.
+      no_credentials_configured: Configurez d'abord Up dans les paramètres des fournisseurs.
+      title: Lier le compte Up à %{account_name}
+    setup_accounts:
+      account_type_label: Type de compte
+      account_types:
+        depository: Trésorerie
+        loan: Emprunt
+        skip: Ignorer
+      all_accounts_linked: Tous les comptes Up sont déjà liés.
+      api_error: Impossible de récupérer les comptes Up.
+      cancel: Annuler
+      choose_account_type: Choisissez un type de compte
+      choose_account_type_description: Ignorez les comptes que vous ne souhaitez pas suivre.
+      create_accounts: Créer les comptes
+      fetch_failed: Impossible de récupérer les comptes
+      no_accounts_to_setup: Aucun compte à configurer
+      no_credentials: Configurez d'abord les identifiants Up.
+      subtitle: Choisissez comment chaque compte Up doit apparaître dans Sure.
+      title: Lier les comptes Up
+    up_item:
+      delete: Supprimer
+      deletion_in_progress: Suppression en cours
+      error: Erreur
+      no_accounts_description: Récupérez les comptes Up et choisissez ceux à lier.
+      no_accounts_title: Aucun compte importé pour l'instant
+      setup_action: Configurer les comptes
+      setup_description: "%{linked} sur %{total} comptes liés."
+      setup_needed: Configuration requise
+      status_never: Jamais synchronisé
+      status_with_summary: Synchronisé il y a %{timestamp} · %{summary}
+      syncing: Synchronisation
+    update:
+      success: Connexion Up mise à jour.
diff --git a/config/locales/views/up_items/it.yml b/config/locales/views/up_items/it.yml
new file mode 100644
index 000000000..cbc8242c0
--- /dev/null
+++ b/config/locales/views/up_items/it.yml
@@ -0,0 +1,116 @@
+---
+it:
+  providers:
+    up:
+      name: Up
+      description: Collega i conti bancari australiani Up tramite un token di accesso personale
+  family:
+    up:
+      create_up_item:
+        default_name: Connessione Up
+  up_account:
+    fallback: Conto Up
+  up_item:
+    errors:
+      account_processing_failed: Impossibile sincronizzare il conto Up
+      account_sync_schedule_failed: Impossibile pianificare la sincronizzazione del conto Up
+      transactions_failed: Impossibile recuperare le transazioni Up
+      sync_failed: Impossibile sincronizzare la connessione Up
+    sync_status:
+      no_accounts: Nessun conto trovato
+      all_synced:
+        one: 1 conto sincronizzato
+        other: "%{count} conti sincronizzati"
+      partial: "%{linked} sincronizzati, %{unlinked} da configurare"
+    institution_summary:
+      none: Nessuna istituzione collegata
+      one: 1 istituzione
+      count:
+        one: 1 istituzione
+        other: "%{count} istituzioni"
+  up_items:
+    provider_panel:
+      default_connection_name: Connessione Up
+      add_connection: Aggiungi connessione Up
+      update_connection: Aggiorna connessione
+      connection_name_label: Nome connessione
+      connection_name_placeholder: Up principale
+      access_token_label: Token di accesso personale
+      access_token_placeholder: Incolla il tuo token di accesso personale Up
+      keep_access_token_placeholder: Lascia vuoto per mantenere il token esistente
+      setup_accounts: Configura conti
+      syncing: Sincronizzazione in corso...
+      sync: Sincronizza
+      disconnect: Disconnetti
+      disconnect_confirm: "Sei sicuro di voler disconnettere %{name}?"
+    create:
+      success: Connessione Up salvata.
+    update:
+      success: Connessione Up aggiornata.
+    destroy:
+      success: Eliminazione della connessione Up pianificata.
+      unlink_failed: Impossibile disconnettere la connessione Up
+    select_accounts:
+      title: Collega conti Up
+      description: Scegli i conti Up da aggiungere.
+      no_accounts_found: Non è stato trovato alcun conto Up non collegato.
+      no_credentials_configured: Configura prima Up nelle impostazioni provider.
+      cancel: Annulla
+      link_accounts: Collega conti
+    link_accounts:
+      success:
+        one: Collegato 1 conto Up.
+        other: "Collegati %{count} conti Up."
+      no_accounts_selected: Seleziona almeno un conto.
+      no_credentials_configured: Configura prima Up nelle impostazioni provider.
+      unsupported_account_type: Up non supporta questo tipo di conto.
+      link_failed: Nessun conto è stato collegato.
+    select_existing_account:
+      title: "Collega conto Up a %{account_name}"
+      description: Scegli un conto Up non collegato da connettere a questo conto.
+      no_accounts_found: Non è stato trovato alcun conto Up non collegato.
+      no_credentials_configured: Configura prima Up nelle impostazioni provider.
+      account_already_linked: Questo conto è già collegato a un provider.
+      cancel: Annulla
+      link_account: Collega conto
+    link_existing_account:
+      success: "Collegato conto Up a %{account_name}."
+      account_already_linked: Questo conto è già collegato a un provider.
+      up_account_already_linked: Questo conto Up è già collegato.
+      no_account_selected: Seleziona un conto Up da collegare.
+    setup_accounts:
+      title: Collega conti Up
+      subtitle: Scegli come deve apparire ogni conto Up in Sure.
+      no_credentials: Configura prima le credenziali Up.
+      api_error: Impossibile recuperare i conti Up.
+      fetch_failed: Impossibile recuperare i conti
+      no_accounts_to_setup: Nessun conto da configurare
+      all_accounts_linked: Tutti i conti Up sono già collegati.
+      choose_account_type: Scegli un tipo di conto
+      choose_account_type_description: Salta i conti che non vuoi monitorare.
+      account_type_label: Tipo di conto
+      account_types:
+        skip: Salta
+        depository: Contanti
+        loan: Prestito
+      create_accounts: Crea conti
+      cancel: Annulla
+    complete_account_setup:
+      success:
+        one: Creato 1 conto Up.
+        other: "Creati %{count} conti Up."
+      all_skipped: Nessun conto Up è stato creato.
+      no_accounts: Nessun conto Up è stato selezionato.
+      creation_failed: Impossibile creare i conti Up.
+    up_item:
+      deletion_in_progress: Eliminazione in corso
+      syncing: Sincronizzazione in corso
+      error: Errore
+      status_with_summary: "Sincronizzato %{timestamp} fa · %{summary}"
+      status_never: Mai sincronizzato
+      delete: Elimina
+      setup_needed: Configurazione conto necessaria
+      setup_description: "%{linked} di %{total} conti collegati."
+      setup_action: Configura conti
+      no_accounts_title: Nessun conto importato
+      no_accounts_description: Recupera i conti Up e scegli quali collegare.
diff --git a/config/locales/views/up_items/pl.yml b/config/locales/views/up_items/pl.yml
new file mode 100644
index 000000000..9ee1cd30b
--- /dev/null
+++ b/config/locales/views/up_items/pl.yml
@@ -0,0 +1,124 @@
+---
+pl:
+  providers:
+    up:
+      name: Up
+      description: Połącz australijskie konta bankowe Up przez osobisty token dostępowy
+  family:
+    up:
+      create_up_item:
+        default_name: Połączenie Up
+  up_account:
+    fallback: Konto Up
+  up_item:
+    errors:
+      account_processing_failed: Nie można zsynchronizować konta Up
+      account_sync_schedule_failed: Nie można zaplanować synchronizacji konta Up
+      transactions_failed: Nie można pobrać transakcji Up
+      sync_failed: Nie można zsynchronizować połączenia Up
+    sync_status:
+      no_accounts: Nie znaleziono kont
+      all_synced:
+        few: "%{count} konta zsynchronizowane"
+        many: "%{count} kont zsynchronizowanych"
+        one: 1 konto zsynchronizowane
+        other: "%{count} kont zsynchronizowanych"
+      partial: "%{linked} zsynchronizowanych, %{unlinked} wymaga konfiguracji"
+    institution_summary:
+      none: Brak połączonych instytucji
+      one: 1 instytucja
+      count:
+        few: "%{count} instytucje"
+        many: "%{count} instytucji"
+        one: 1 instytucja
+        other: "%{count} instytucji"
+  up_items:
+    provider_panel:
+      default_connection_name: Połączenie Up
+      add_connection: Dodaj połączenie Up
+      update_connection: Aktualizuj połączenie
+      connection_name_label: Nazwa połączenia
+      connection_name_placeholder: Główne Up
+      access_token_label: Osobisty token dostępowy
+      access_token_placeholder: Wklej swój osobisty token dostępowy Up
+      keep_access_token_placeholder: Pozostaw puste, aby zachować istniejący token
+      setup_accounts: Konfiguruj konta
+      syncing: Synchronizowanie...
+      sync: Synchronizuj
+      disconnect: Rozłącz
+      disconnect_confirm: "Czy na pewno chcesz rozłączyć %{name}?"
+    create:
+      success: Połączenie Up zapisane.
+    update:
+      success: Połączenie Up zaktualizowane.
+    destroy:
+      success: Zaplanowano usunięcie połączenia Up.
+      unlink_failed: Nie można rozłączyć połączenia Up
+    select_accounts:
+      title: Połącz konta Up
+      description: Wybierz konta Up do dodania.
+      no_accounts_found: Nie znaleziono niepołączonych kont Up.
+      no_credentials_configured: Skonfiguruj Up w ustawieniach dostawcy.
+      cancel: Anuluj
+      link_accounts: Połącz konta
+    link_accounts:
+      success:
+        few: "Połączono %{count} konta Up."
+        many: "Połączono %{count} kont Up."
+        one: Połączono 1 konto Up.
+        other: "Połączono %{count} kont Up."
+      no_accounts_selected: Wybierz co najmniej jedno konto.
+      no_credentials_configured: Skonfiguruj Up w ustawieniach dostawcy.
+      unsupported_account_type: Up nie obsługuje tego typu konta.
+      link_failed: Nie połączono żadnych kont.
+    select_existing_account:
+      title: "Połącz konto Up z %{account_name}"
+      description: Wybierz niepołączone konto Up do połączenia z tym kontem.
+      no_accounts_found: Nie znaleziono niepołączonych kont Up.
+      no_credentials_configured: Skonfiguruj Up w ustawieniach dostawcy.
+      account_already_linked: To konto jest już połączone z dostawcą.
+      cancel: Anuluj
+      link_account: Połącz konto
+    link_existing_account:
+      success: "Połączono konto Up z %{account_name}."
+      account_already_linked: To konto jest już połączone z dostawcą.
+      up_account_already_linked: To konto Up jest już połączone.
+      no_account_selected: Wybierz konto Up do połączenia.
+    setup_accounts:
+      title: Połącz konta Up
+      subtitle: Wybierz, jak każde konto Up ma być wyświetlane w Sure.
+      no_credentials: Najpierw skonfiguruj dane uwierzytelniające Up.
+      api_error: Nie można pobrać kont Up.
+      fetch_failed: Nie można pobrać kont
+      no_accounts_to_setup: Brak kont do skonfigurowania
+      all_accounts_linked: Wszystkie konta Up są już połączone.
+      choose_account_type: Wybierz typ konta
+      choose_account_type_description: Pomiń konta, których nie chcesz śledzić.
+      account_type_label: Typ konta
+      account_types:
+        skip: Pomiń
+        depository: Gotówkowe
+        loan: Pożyczka
+      create_accounts: Utwórz konta
+      cancel: Anuluj
+    complete_account_setup:
+      success:
+        few: "Utworzono %{count} konta Up."
+        many: "Utworzono %{count} kont Up."
+        one: Utworzono 1 konto Up.
+        other: "Utworzono %{count} kont Up."
+      all_skipped: Nie utworzono żadnych kont Up.
+      no_accounts: Nie wybrano żadnych kont Up.
+      creation_failed: Nie można utworzyć kont Up.
+    up_item:
+      deletion_in_progress: Trwa usuwanie
+      syncing: Synchronizowanie
+      error: Błąd
+      status_with_summary: "Zsynchronizowano %{timestamp} temu · %{summary}"
+      status_never: Nigdy nie synchronizowano
+      delete: Usuń
+      setup_needed: Wymagana konfiguracja konta
+      setup_description: "%{linked} z %{total} kont połączonych."
+      setup_action: Konfiguruj konta
+      no_accounts_title: Brak zaimportowanych kont
+      no_accounts_description: Pobierz konta Up i wybierz, które połączyć.
diff --git a/config/locales/views/up_items/ru.yml b/config/locales/views/up_items/ru.yml
new file mode 100644
index 000000000..cdf745429
--- /dev/null
+++ b/config/locales/views/up_items/ru.yml
@@ -0,0 +1,116 @@
+---
+ru:
+  family:
+    up:
+      create_up_item:
+        default_name: Up Connection
+  providers:
+    up:
+      description: Connect Australian Up bank accounts via a personal access token
+      name: Up
+  up_account:
+    fallback: Up account
+  up_item:
+    errors:
+      account_processing_failed: Could not sync Up account
+      account_sync_schedule_failed: Could not schedule Up account sync
+      sync_failed: Could not sync Up connection
+      transactions_failed: Could not fetch Up transactions
+    institution_summary:
+      count:
+        one: 1 institution
+        other: "%{count} institutions"
+      none: No institutions connected
+      one: 1 institution
+    sync_status:
+      all_synced:
+        one: 1 account synced
+        other: "%{count} accounts synced"
+      no_accounts: No accounts found
+      partial: "%{linked} synced, %{unlinked} need setup"
+  up_items:
+    complete_account_setup:
+      all_skipped: No Up accounts were created.
+      creation_failed: Could not create Up accounts.
+      no_accounts: No Up accounts were selected.
+      success:
+        one: Created 1 Up account.
+        other: Created %{count} Up accounts.
+    create:
+      success: Up connection saved.
+    destroy:
+      success: Scheduled Up connection for deletion.
+      unlink_failed: Could not disconnect Up connection
+    link_accounts:
+      link_failed: No accounts were linked.
+      no_accounts_selected: Select at least one account.
+      no_credentials_configured: Configure Up in provider settings first.
+      success:
+        one: Linked 1 Up account.
+        other: Linked %{count} Up accounts.
+      unsupported_account_type: Up does not support that account type.
+    link_existing_account:
+      account_already_linked: This account is already linked to a provider.
+      no_account_selected: Select an Up account to link.
+      success: Linked Up account to %{account_name}.
+      up_account_already_linked: This Up account is already linked.
+    provider_panel:
+      access_token_label: Personal Access Token
+      access_token_placeholder: Paste your Up personal access token
+      add_connection: Add Up connection
+      connection_name_label: Connection name
+      connection_name_placeholder: Main Up
+      default_connection_name: Up Connection
+      disconnect: Disconnect
+      disconnect_confirm: Are you sure you want to disconnect %{name}?
+      keep_access_token_placeholder: Leave blank to keep the existing token
+      setup_accounts: Setup accounts
+      sync: Sync
+      syncing: Syncing...
+      update_connection: Update connection
+    select_accounts:
+      cancel: Cancel
+      description: Choose the Up accounts to add.
+      link_accounts: Link accounts
+      no_accounts_found: No unlinked Up accounts were found.
+      no_credentials_configured: Configure Up in provider settings first.
+      title: Link Up accounts
+    select_existing_account:
+      account_already_linked: This account is already linked to a provider.
+      cancel: Cancel
+      description: Choose an unlinked Up account to connect to this account.
+      link_account: Link account
+      no_accounts_found: No unlinked Up accounts were found.
+      no_credentials_configured: Configure Up in provider settings first.
+      title: Link Up account to %{account_name}
+    setup_accounts:
+      account_type_label: Account type
+      account_types:
+        depository: Cash
+        loan: Loan
+        skip: Skip
+      all_accounts_linked: All Up accounts are already linked.
+      api_error: Could not fetch Up accounts.
+      cancel: Cancel
+      choose_account_type: Choose an account type
+      choose_account_type_description: Skip accounts you do not want to track.
+      create_accounts: Create accounts
+      fetch_failed: Could not fetch accounts
+      no_accounts_to_setup: No accounts to set up
+      no_credentials: Configure Up credentials first.
+      subtitle: Choose how each Up account should appear in Sure.
+      title: Link Up Accounts
+    up_item:
+      delete: Delete
+      deletion_in_progress: Deletion in progress
+      error: Error
+      no_accounts_description: Fetch Up accounts and choose which ones to link.
+      no_accounts_title: No accounts imported yet
+      setup_action: Setup accounts
+      setup_description: "%{linked} of %{total} accounts linked."
+      setup_needed: Account setup needed
+      status_never: Never synced
+      status_with_summary: Synced %{timestamp} ago · %{summary}
+      syncing: Syncing
+    update:
+      success: Up connection updated.
diff --git a/config/locales/views/up_items/tr.yml b/config/locales/views/up_items/tr.yml
new file mode 100644
index 000000000..832f2213d
--- /dev/null
+++ b/config/locales/views/up_items/tr.yml
@@ -0,0 +1,118 @@
+---
+tr:
+  family:
+    up:
+      create_up_item:
+        default_name: Up Bağlantısı
+  providers:
+    up:
+      description: Kişisel erişim token'ı aracılığıyla Avustralya Up banka hesaplarınızı
+        bağlayın
+      name: Up
+  up_account:
+    fallback: Up hesabı
+  up_item:
+    errors:
+      account_processing_failed: Up hesabı eşitlenemedi
+      account_sync_schedule_failed: Up hesap eşitlemesi zamanlanamadı
+      sync_failed: Up bağlantısı eşitlenemedi
+      transactions_failed: Up işlemleri getirilemedi
+    institution_summary:
+      count:
+        one: 1 kurum
+        other: "%{count} kurum"
+      none: Bağlı kurum yok
+      one: 1 kurum
+    sync_status:
+      all_synced:
+        one: 1 hesap eşitlendi
+        other: "%{count} hesap eşitlendi"
+      no_accounts: Hesap bulunamadı
+      partial: "%{linked} eşitlendi, %{unlinked} kurulum gerektiriyor"
+  up_items:
+    complete_account_setup:
+      all_skipped: Hiçbir Up hesabı oluşturulmadı.
+      creation_failed: Up hesapları oluşturulamadı.
+      no_accounts: Hiçbir Up hesabı seçilmedi.
+      success:
+        one: 1 Up hesabı oluşturuldu.
+        other: "%{count} Up hesabı oluşturuldu."
+    create:
+      success: Up bağlantısı kaydedildi.
+    destroy:
+      success: Up bağlantısı silinmek üzere zamanlandı.
+      unlink_failed: Up bağlantısı kesilemedi
+    link_accounts:
+      link_failed: Hiçbir hesap bağlanmadı.
+      no_accounts_selected: En az bir hesap seçin.
+      no_credentials_configured: Önce Up'ı sağlayıcı ayarlarında yapılandırın.
+      success:
+        one: 1 Up hesabı bağlandı.
+        other: "%{count} Up hesabı bağlandı."
+      unsupported_account_type: Up bu hesap türünü desteklemiyor.
+    link_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı.
+      no_account_selected: Bağlanacak bir Up hesabı seçin.
+      success: Up hesabı %{account_name} ile bağlandı.
+      up_account_already_linked: Bu Up hesabı zaten bağlı.
+    provider_panel:
+      access_token_label: Kişisel Erişim Token'ı
+      access_token_placeholder: Up kişisel erişim token'ınızı yapıştırın
+      add_connection: Up bağlantısı ekle
+      connection_name_label: Bağlantı adı
+      connection_name_placeholder: Ana Up
+      default_connection_name: Up Bağlantısı
+      disconnect: Bağlantıyı kes
+      disconnect_confirm: "%{name} bağlantısını kesmek istediğinizden emin misiniz?"
+      keep_access_token_placeholder: Mevcut token'ı korumak için boş bırakın
+      setup_accounts: Hesapları kur
+      sync: Eşitle
+      syncing: Eşitleniyor...
+      update_connection: Bağlantıyı güncelle
+    select_accounts:
+      cancel: İptal
+      description: Eklenecek Up hesaplarını seçin.
+      link_accounts: Hesapları bağla
+      no_accounts_found: Bağlantısız Up hesabı bulunamadı.
+      no_credentials_configured: Önce Up'ı sağlayıcı ayarlarında yapılandırın.
+      title: Up hesaplarını bağla
+    select_existing_account:
+      account_already_linked: Bu hesap zaten bir sağlayıcıya bağlı.
+      cancel: İptal
+      description: Bu hesaba bağlamak için bağlantısız bir Up hesabı seçin.
+      link_account: Hesabı bağla
+      no_accounts_found: Bağlantısız Up hesabı bulunamadı.
+      no_credentials_configured: Önce Up'ı sağlayıcı ayarlarında yapılandırın.
+      title: Up hesabını %{account_name} ile bağla
+    setup_accounts:
+      account_type_label: Hesap türü
+      account_types:
+        depository: Nakit
+        loan: Kredi
+        skip: Atla
+      all_accounts_linked: Tüm Up hesapları zaten bağlı.
+      api_error: Up hesapları getirilemedi.
+      cancel: İptal
+      choose_account_type: Bir hesap türü seçin
+      choose_account_type_description: Takip etmek istemediğiniz hesapları atlayın.
+      create_accounts: Hesapları oluştur
+      fetch_failed: Hesaplar getirilemedi
+      no_accounts_to_setup: Kurulacak hesap yok
+      no_credentials: Önce Up kimlik bilgilerini yapılandırın.
+      subtitle: Her Up hesabının Sure'da nasıl görüneceğini seçin.
+      title: Up Hesaplarını Bağla
+    up_item:
+      delete: Sil
+      deletion_in_progress: Silme işlemi devam ediyor
+      error: Hata
+      no_accounts_description: Up hesaplarını getirin ve hangilerini bağlayacağınızı
+        seçin.
+      no_accounts_title: Henüz hesap içe aktarılmadı
+      setup_action: Hesapları kur
+      setup_description: "%{total} hesaptan %{linked} tanesi bağlandı."
+      setup_needed: Hesap kurulumu gerekiyor
+      status_never: Hiç eşitlenmedi
+      status_with_summary: "%{timestamp} önce eşitlendi · %{summary}"
+      syncing: Eşitleniyor
+    update:
+      success: Up bağlantısı güncellendi.
diff --git a/config/locales/views/users/fr.yml b/config/locales/views/users/fr.yml
index f411a4869..15ef8b2c9 100644
--- a/config/locales/views/users/fr.yml
+++ b/config/locales/views/users/fr.yml
@@ -3,15 +3,31 @@ fr:
   users:
     destroy:
       success: Votre compte a été supprimé.
-    update:
-      email_change_failed: Échec du changement d'adresse e-mail.
-      email_change_initiated: Veuillez vérifier votre nouvelle adresse e-mail pour les instructions de confirmation.
-      success: Votre profil a été mis à jour.
     resend_confirmation_email:
+      no_pending_change: Aucun changement d'adresse e-mail n'est actuellement en attente
+        !
       success: Un nouvel e-mail de confirmation est en file d'attente pour être envoyé.
-      no_pending_change: Aucun changement d'adresse e-mail n'est actuellement en attente !
     reset:
-      success: Votre compte a été réinitialisé. Les données seront supprimées en arrière-plan dans un certain temps.
+      success: Votre compte a été réinitialisé. Les données seront supprimées en arrière-plan
+        dans un certain temps.
       unauthorized: Vous n'êtes pas autorisé à effectuer cette action.
     reset_with_sample_data:
-      success: Votre compte a été réinitialisé et les données d'exemple sont en cours de préparation. Vous verrez les données de démonstration sous peu.
+      success: Votre compte a été réinitialisé et les données d'exemple sont en cours
+        de préparation. Vous verrez les données de démonstration sous peu.
+    roles:
+      admin: Administrateur
+      member: Membre
+      super_admin: Super administrateur
+    update:
+      email_change_failed: Échec du changement d'adresse e-mail.
+      email_change_initiated: Veuillez vérifier votre nouvelle adresse e-mail pour
+        les instructions de confirmation.
+      success: Votre profil a été mis à jour.
+    user_menu:
+      aria_label: Menu Ouvrir un compte
+      changelog: Journal des modifications
+      contact: Contacter
+      feedback: Commentaires
+      log_out: Se déconnecter
+      settings: Paramètres
+      version: Version
diff --git a/config/locales/views/users/it.yml b/config/locales/views/users/it.yml
new file mode 100644
index 000000000..a52594be5
--- /dev/null
+++ b/config/locales/views/users/it.yml
@@ -0,0 +1,29 @@
+---
+it:
+  users:
+    destroy:
+      success: Il tuo account è stato eliminato.
+    update:
+      email_change_failed: Impossibile cambiare l'indirizzo email.
+      email_change_initiated: Controlla il tuo nuovo indirizzo email per le istruzioni di conferma.
+      success: Il tuo profilo è stato aggiornato.
+    resend_confirmation_email:
+      success: Una nuova email di conferma è in coda per essere inviata.
+      no_pending_change: Nessuna modifica email attualmente in sospeso!
+    reset:
+      success: Il tuo account è stato ripristinato. I dati verranno eliminati in background tra un po'.
+      unauthorized: Non sei autorizzato a eseguire questa azione
+    reset_with_sample_data:
+      success: Il tuo account è stato ripristinato e i dati di esempio sono in fase di preparazione. Vedrai i dati demo a breve.
+    roles:
+      admin: Amministratore
+      member: Membro
+      super_admin: Super amministratore
+    user_menu:
+      aria_label: Apri menu account
+      version: Versione
+      settings: Impostazioni
+      changelog: Registro modifiche
+      feedback: Feedback
+      contact: Contatto
+      log_out: Disconnetti
diff --git a/config/locales/views/users/ru.yml b/config/locales/views/users/ru.yml
new file mode 100644
index 000000000..49efaa388
--- /dev/null
+++ b/config/locales/views/users/ru.yml
@@ -0,0 +1,33 @@
+---
+ru:
+  users:
+    destroy:
+      success: Ваш счёт был удалён.
+    resend_confirmation_email:
+      no_pending_change: В настоящее время нет ожидающих изменений адреса электронной
+        почты!
+      success: Новое письмо с подтверждением поставлено в очередь на отправку.
+    reset:
+      success: Ваш счёт был сброшен. Данные будут удалены в фоновом режиме через некоторое
+        время.
+      unauthorized: У вас нет прав для выполнения этого действия.
+    reset_with_sample_data:
+      success: Ваш счёт был сброшен, и данные для примера подготавливаются. Вы скоро
+        увидите демонстрационные данные.
+    roles:
+      admin: Администратор
+      member: Участник
+      super_admin: Супер администратор
+    update:
+      email_change_failed: Не удалось изменить адрес электронной почты.
+      email_change_initiated: Пожалуйста, проверьте ваш новый адрес электронной почты
+        для получения инструкций по подтверждению.
+      success: Ваш профиль был обновлён.
+    user_menu:
+      aria_label: Открыть меню счёта
+      changelog: Изменения
+      contact: Контакты
+      feedback: Обратная связь
+      log_out: Выйти
+      settings: Настройки
+      version: Версия
diff --git a/config/locales/views/users/tr.yml b/config/locales/views/users/tr.yml
index 971b18186..9831b15b7 100644
--- a/config/locales/views/users/tr.yml
+++ b/config/locales/views/users/tr.yml
@@ -3,13 +3,29 @@ tr:
   users:
     destroy:
       success: Hesabınız silindi.
-    update:
-      email_change_failed: E-posta adresi değiştirilemedi.
-      email_change_initiated: Lütfen yeni e-posta adresinizi kontrol edin ve onay talimatlarını izleyin.
-      success: Profiliniz güncellendi.
+    resend_confirmation_email:
+      no_pending_change: Şu anda bekleyen bir e-posta değişikliği yok!
+      success: Yeni bir onay e-postası gönderilmek üzere sıraya alındı.
     reset:
       success: Hesabınız sıfırlandı. Verileriniz arka planda bir süre sonra silinecek.
       unauthorized: Bu işlemi gerçekleştirmeye yetkiniz yok.
     reset_with_sample_data:
-      success: Hesabınız sıfırlandı ve örnek veriler hazırlanıyor. Kısa süre içinde demo verileri göreceksiniz.
-
+      success: Hesabınız sıfırlandı ve örnek veriler hazırlanıyor. Kısa süre içinde
+        demo verileri göreceksiniz.
+    roles:
+      admin: Yönetici
+      member: Üye
+      super_admin: Süper yönetici
+    update:
+      email_change_failed: E-posta adresi değiştirilemedi.
+      email_change_initiated: Lütfen yeni e-posta adresinizi kontrol edin ve onay
+        talimatlarını izleyin.
+      success: Profiliniz güncellendi.
+    user_menu:
+      aria_label: Hesap menüsünü aç
+      changelog: Yenilikler
+      contact: İletişim
+      feedback: Geri bildirim
+      log_out: Çıkış yap
+      settings: Ayarlar
+      version: Sürüm
diff --git a/config/locales/views/users/zh-CN.yml b/config/locales/views/users/zh-CN.yml
index 5c9d5890f..3b4da5f8a 100644
--- a/config/locales/views/users/zh-CN.yml
+++ b/config/locales/views/users/zh-CN.yml
@@ -16,3 +16,15 @@ zh-CN:
       email_change_failed: 邮箱地址更改失败。
       email_change_initiated: 请查收新邮箱地址的确认邮件以完成更改。
       success: 个人资料已更新成功。
+    user_menu:
+      aria_label: 打开账户菜单
+      version: 版本
+      settings: 设置
+      changelog: 更新日志
+      feedback: 反馈
+      contact: 联系我们
+      log_out: 退出登录
+    roles:
+      admin: 管理员
+      member: 成员
+      super_admin: 超级管理员
diff --git a/config/locales/views/valuations/fr.yml b/config/locales/views/valuations/fr.yml
index ccd22d4af..4e62801e9 100644
--- a/config/locales/views/valuations/fr.yml
+++ b/config/locales/views/valuations/fr.yml
@@ -1,6 +1,31 @@
 ---
 fr:
   valuations:
+    confirmation_contents:
+      account_balance: solde du compte
+      asset_value: valeur de l'actif
+      balance: équilibre
+      brokerage_cash: Trésorerie de courtage
+      change: changement
+      credit_card_balance: solde de la carte de crédit
+      crypto_balance: solde cryptographique
+      holdings_value: Valeur des holdings
+      liability_balance: solde du passif
+      loan_balance: solde du prêt
+      'on': sur
+      property_value: valeur de la propriété
+      recalculate_notice: Toutes les transactions et soldes futurs seront recalculés
+        sur la base de ce %{change_or_update}.
+      this_will: Cela %{action_verb} la valeur du compte sur
+      to: à
+      to_colon: 'à:'
+      total_account_value: Valeur totale du compte
+      update: mise à jour
+      vehicle_value: valeur du véhicule
+    create:
+      account_updated: Compte mis à jour
+    errors:
+      amount_required: Le montant est requis
     form:
       amount: Montant
       submit: Ajouter une mise à jour du solde
@@ -17,6 +42,7 @@ fr:
       title: Nouveau solde
     show:
       amount: Montant
+      amount_label: Valeur du compte à ce jour
       date_label: Date
       delete: Supprimer
       delete_subtitle: Cette action ne peut pas être annulée
@@ -26,6 +52,10 @@ fr:
       name_placeholder: Entrez un nom pour cette entrée
       note_label: Notes
       note_placeholder: Ajoutez tout détail supplémentaire à ce bilan
+      opening_balance: Solde d'ouverture
       overview: Aperçu
       settings: Paramètres
-      opening_balance: Solde d'ouverture
+      update_value: Mettre à jour la valeur
+    update:
+      account_updated: Compte mis à jour
+      entry_updated: Entrée mise à jour
diff --git a/config/locales/views/valuations/it.yml b/config/locales/views/valuations/it.yml
new file mode 100644
index 000000000..795d6a1c3
--- /dev/null
+++ b/config/locales/views/valuations/it.yml
@@ -0,0 +1,60 @@
+---
+it:
+  valuations:
+    confirmation_contents:
+      this_will: "Questo %{action_verb} il valore del conto"
+      to_colon: "a:"
+      total_account_value: Valore totale del conto
+      holdings_value: Valore posizioni
+      brokerage_cash: Liquidità di conto
+      account_balance: saldo del conto
+      credit_card_balance: saldo della carta di credito
+      loan_balance: saldo del prestito
+      property_value: valore dell'immobile
+      vehicle_value: valore del veicolo
+      crypto_balance: saldo crypto
+      asset_value: valore dell'asset
+      liability_balance: saldo della passività
+      balance: saldo
+      "on": "il"
+      to: "a"
+      recalculate_notice: "Tutte le transazioni e i saldi futuri verranno ricalcolati sulla base di questa %{change_or_update}."
+      change: modifica
+      update: aggiornamento
+    create:
+      account_updated: Conto aggiornato
+    update:
+      account_updated: Conto aggiornato
+      entry_updated: Voce aggiornata
+    errors:
+      amount_required: L'importo è obbligatorio
+    form:
+      amount: Importo
+      submit: Aggiungi aggiornamento saldo
+    header:
+      balance: Saldo
+    index:
+      change: modifica
+      date: data
+      new_entry: Nuova voce
+      no_valuations: Nessuna valutazione per questo conto ancora
+      valuations: Valore
+      value: valore
+    new:
+      title: Nuovo saldo
+    show:
+      amount: Importo
+      amount_label: Valore del conto alla data
+      date_label: Data
+      delete: Elimina
+      delete_subtitle: Questa azione non può essere annullata
+      delete_title: Elimina voce
+      details: Dettagli
+      name_label: Nome
+      name_placeholder: Inserisci un nome per questa voce
+      note_label: Note
+      note_placeholder: Aggiungi eventuali dettagli aggiuntivi su questa voce
+      overview: Panoramica
+      settings: Impostazioni
+      opening_balance: "Saldo iniziale"
+      update_value: Aggiorna valore
diff --git a/config/locales/views/valuations/ru.yml b/config/locales/views/valuations/ru.yml
new file mode 100644
index 000000000..96bd4a2ec
--- /dev/null
+++ b/config/locales/views/valuations/ru.yml
@@ -0,0 +1,63 @@
+---
+ru:
+  valuations:
+    confirmation_contents:
+      account_balance: баланс счёта
+      asset_value: стоимость актива
+      balance: баланс
+      brokerage_cash: Брокерский счёт
+      change: изменение
+      credit_card_balance: баланс кредитной карты
+      crypto_balance: баланс криптовалюты
+      holdings_value: Стоимость активов
+      liability_balance: баланс обязательств
+      loan_balance: баланс по кредиту
+      'on': на
+      property_value: стоимость недвижимости
+      recalculate_notice: Все будущие операции и балансы будут пересчитаны на основе
+        этого %{change_or_update}.
+      this_will: Это %{action_verb} стоимость счёта на
+      to: до
+      to_colon: 'до:'
+      total_account_value: Общая стоимость счёта
+      update: обновление
+      vehicle_value: стоимость транспортного средства
+    create:
+      account_updated: Счёт обновлён
+    errors:
+      amount_required: Требуется указать сумму
+    form:
+      amount: Сумма
+      submit: Добавить обновление баланса
+    header:
+      balance: Баланс
+    index:
+      change: изменение
+      date: дата
+      new_entry: Новая запись
+      no_valuations: Оценок для этого счёта пока нет
+      valuations: Стоимость
+      value: стоимость
+    new:
+      amount: Сумма
+      submit: Сохранить
+      title: Новый баланс
+    show:
+      amount: Сумма
+      amount_label: Стоимость счёта на дату
+      date_label: Дата
+      delete: Удалить
+      delete_subtitle: Это действие нельзя отменить
+      delete_title: Удалить запись
+      details: Подробности
+      name_label: Название
+      name_placeholder: Введите название для этой записи
+      note_label: Заметки
+      note_placeholder: Добавьте любые дополнительные детали об этой записи
+      opening_balance: Начальный баланс
+      overview: Обзор
+      settings: Настройки
+      update_value: Обновить стоимость
+    update:
+      account_updated: Счёт обновлён
+      entry_updated: Запись обновлена
diff --git a/config/locales/views/valuations/tr.yml b/config/locales/views/valuations/tr.yml
index 461876e95..58f303051 100644
--- a/config/locales/views/valuations/tr.yml
+++ b/config/locales/views/valuations/tr.yml
@@ -1,6 +1,31 @@
 ---
 tr:
   valuations:
+    confirmation_contents:
+      account_balance: hesap bakiyesi
+      asset_value: varlık değeri
+      balance: bakiye
+      brokerage_cash: Aracı kurum nakdi
+      change: değişiklik
+      credit_card_balance: kredi kartı bakiyesi
+      crypto_balance: kripto bakiyesi
+      holdings_value: Varlık değeri
+      liability_balance: borç bakiyesi
+      loan_balance: kredi bakiyesi
+      'on': tarihinde
+      property_value: mülk değeri
+      recalculate_notice: Bu %{change_or_update} temel alınarak gelecekteki tüm işlemler
+        ve bakiyeler yeniden hesaplanacaktır.
+      this_will: Bu, hesap değerini %{action_verb} yapacak
+      to: şuraya
+      to_colon: 'şuraya:'
+      total_account_value: Toplam hesap değeri
+      update: güncelleme
+      vehicle_value: araç değeri
+    create:
+      account_updated: Hesap güncellendi
+    errors:
+      amount_required: Tutar gereklidir
     form:
       amount: Tutar
       submit: Bakiye güncellemesi ekle
@@ -14,9 +39,12 @@ tr:
       valuations: Değer
       value: Değer
     new:
+      amount: ''
+      submit: ''
       title: Yeni bakiye
     show:
       amount: Tutar
+      amount_label: Tarihindeki hesap değeri
       date_label: Tarih
       delete: Sil
       delete_subtitle: Bu işlem geri alınamaz
@@ -26,6 +54,10 @@ tr:
       name_placeholder: Bu giriş için bir isim girin
       note_label: Notlar
       note_placeholder: Bu girişle ilgili ek detaylar ekleyin
+      opening_balance: Açılış bakiyesi
       overview: Genel Bakış
       settings: Ayarlar
-      opening_balance: Açılış bakiyesi
+      update_value: Değeri güncelle
+    update:
+      account_updated: Hesap güncellendi
+      entry_updated: Giriş güncellendi
diff --git a/config/locales/views/valuations/zh-CN.yml b/config/locales/views/valuations/zh-CN.yml
index d0b1efc7a..773e15ebf 100644
--- a/config/locales/views/valuations/zh-CN.yml
+++ b/config/locales/views/valuations/zh-CN.yml
@@ -2,7 +2,7 @@
 zh-CN:
   valuations:
     confirmation_contents:
-      this_will: 这将把账户价值在
+      this_will: 这将%{action_verb}账户在
       to_colon: 改为：
       total_account_value: 账户总价值
       holdings_value: 持仓价值
@@ -16,7 +16,7 @@ zh-CN:
       asset_value: 资产价值
       liability_balance: 负债余额
       balance: 余额
-      on: 在
+      "on": 在
       to: 到
       recalculate_notice: 所有未来的交易和余额都将根据此%{change_or_update}重新计算。
       change: 变更
@@ -42,6 +42,8 @@ zh-CN:
       value: 价值
     new:
       title: 新余额
+      amount: 金额
+      submit: 保存估值
     show:
       amount: 金额
       amount_label: 此日期的账户价值
diff --git a/config/locales/views/vehicles/fr.yml b/config/locales/views/vehicles/fr.yml
index 5d99e2809..e44c11b9a 100644
--- a/config/locales/views/vehicles/fr.yml
+++ b/config/locales/views/vehicles/fr.yml
@@ -23,3 +23,13 @@ fr:
       trend: Tendance
       unknown: Inconnu
       year: Année
+    tabs:
+      overview:
+        current_price: Prix actuel
+        edit_account_details: Modifier les détails du compte
+        make_model: Marque et modèle
+        mileage: Kilométrage
+        purchase_price: Prix d'achat
+        trend: Tendance
+        unknown: Inconnu
+        year: Année
diff --git a/config/locales/views/vehicles/it.yml b/config/locales/views/vehicles/it.yml
new file mode 100644
index 000000000..8a8c5df16
--- /dev/null
+++ b/config/locales/views/vehicles/it.yml
@@ -0,0 +1,35 @@
+---
+it:
+  vehicles:
+    edit:
+      edit: Modifica %{account}
+    form:
+      make: Marca
+      make_placeholder: Toyota
+      mileage: Chilometraggio
+      mileage_placeholder: '15000'
+      mileage_unit: Unità
+      model: Modello
+      model_placeholder: Camry
+      year: Anno
+      year_placeholder: '2023'
+    new:
+      title: Inserisci i dettagli del veicolo
+    overview:
+      current_price: Prezzo Attuale
+      make_model: Marca e Modello
+      mileage: Chilometraggio
+      purchase_price: Prezzo di Acquisto
+      trend: Tendenza
+      unknown: Sconosciuto
+      year: Anno
+    tabs:
+      overview:
+        current_price: Prezzo Attuale
+        make_model: Marca e Modello
+        mileage: Chilometraggio
+        purchase_price: Prezzo di Acquisto
+        trend: Tendenza
+        unknown: Sconosciuto
+        year: Anno
+        edit_account_details: "Modifica dettagli conto"
diff --git a/config/locales/views/vehicles/ru.yml b/config/locales/views/vehicles/ru.yml
new file mode 100644
index 000000000..c10a80499
--- /dev/null
+++ b/config/locales/views/vehicles/ru.yml
@@ -0,0 +1,35 @@
+---
+ru:
+  vehicles:
+    edit:
+      edit: Редактировать %{account}
+    form:
+      make: Марка
+      make_placeholder: Toyota
+      mileage: Пробег
+      mileage_placeholder: '15000'
+      mileage_unit: Единица измерения
+      model: Модель
+      model_placeholder: Camry
+      year: Год
+      year_placeholder: '2023'
+    new:
+      title: Введите данные транспортного средства
+    overview:
+      current_price: Текущая цена
+      make_model: Марка и модель
+      mileage: Пробег
+      purchase_price: Цена покупки
+      trend: Тенденция
+      unknown: Неизвестно
+      year: Год
+    tabs:
+      overview:
+        current_price: Текущая цена
+        edit_account_details: Редактировать данные счёта
+        make_model: Марка и модель
+        mileage: Пробег
+        purchase_price: Цена покупки
+        trend: Тенденция
+        unknown: Неизвестно
+        year: Год
diff --git a/config/locales/views/vehicles/tr.yml b/config/locales/views/vehicles/tr.yml
index 5419c8899..ac0adebb6 100644
--- a/config/locales/views/vehicles/tr.yml
+++ b/config/locales/views/vehicles/tr.yml
@@ -22,4 +22,14 @@ tr:
       purchase_price: Satın Alma Fiyatı
       trend: Eğilim
       unknown: Bilinmiyor
-      year: Yıl
\ No newline at end of file
+      year: Yıl
+    tabs:
+      overview:
+        current_price: Güncel Fiyat
+        edit_account_details: Hesap detaylarını düzenle
+        make_model: Marka & Model
+        mileage: Kilometre
+        purchase_price: Satın Alma Fiyatı
+        trend: Eğilim
+        unknown: Bilinmiyor
+        year: Yıl
diff --git a/config/locales/views/vehicles/zh-CN.yml b/config/locales/views/vehicles/zh-CN.yml
index 01c1f3f0c..c64c92a97 100644
--- a/config/locales/views/vehicles/zh-CN.yml
+++ b/config/locales/views/vehicles/zh-CN.yml
@@ -32,3 +32,4 @@ zh-CN:
         trend: 走势
         unknown: 未知
         year: 年份
+        edit_account_details: 编辑账户详情
diff --git a/config/locales/views/wise_items/en.yml b/config/locales/views/wise_items/en.yml
new file mode 100644
index 000000000..2da7f2613
--- /dev/null
+++ b/config/locales/views/wise_items/en.yml
@@ -0,0 +1,150 @@
+---
+en:
+  wise_items:
+    profile_types:
+      personal: Personal
+      business: Business
+    entries:
+      default_name: Wise transaction
+      fee_name: Wise fee
+    activities:
+      jar_deposit: Transfer to Jar
+      jar_withdrawal: Transfer from Jar
+      transfer_to_jar: "Transfer to %{jar}"
+      transfer_from_jar: "Transfer from %{jar}"
+      interest: Wise interest
+      asset_fee: Wise Assets fee
+      default_name: Wise activity
+    sync_status:
+      no_accounts: No accounts found
+      all_synced:
+        one: "%{count} account synced"
+        other: "%{count} accounts synced"
+      partial_setup: "%{synced} synced, %{pending} need setup"
+    create:
+      no_profiles_found: No Wise profiles found. Please check your API token.
+      invalid_token: Invalid API token. Please check and try again.
+      connection_failed: Could not connect to Wise. Please try again later.
+    destroy:
+      success: Wise connection removed
+    update:
+      success: Wise connection updated
+    sync:
+      success: Sync started
+    syncer:
+      importing_accounts: Importing accounts from Wise...
+      checking_account_configuration: Checking account configuration...
+      accounts_need_setup:
+        one: "%{count} account needs setup..."
+        other: "%{count} accounts need setup..."
+      processing_transactions: Processing transactions...
+      calculating_balances: Calculating balances...
+      credentials_invalid: Invalid Wise API token or insufficient permissions
+      failed: Sync failed. Please try again or contact support.
+      import_failed: Wise import failed.
+      accounts_failed:
+        one: "%{count} balance failed to import."
+        other: "%{count} balances failed to import."
+      transactions_failed:
+        one: "%{count} balance had transaction import failures."
+        other: "%{count} balances had transaction import failures."
+      account_processing_failed:
+        one: "%{count} Wise account failed while processing."
+        other: "%{count} Wise accounts failed while processing."
+      account_sync_failed:
+        one: "%{count} Wise account sync could not be scheduled."
+        other: "%{count} Wise account syncs could not be scheduled."
+    provider_panel:
+      setup_title: "Setup instructions:"
+      add_connection: Add Wise connection
+      token_label: API token
+      token_placeholder: Paste your Wise personal API token
+      keep_token_placeholder: Leave blank to keep the current token
+      connection_name_label: Connection name
+      connection_name_placeholder: Wise Personal
+      connect: Connect Wise
+      update_connection: Update connection
+      setup_accounts: Set up accounts
+      sync: Sync
+      disconnect: Disconnect
+      disconnect_label: "Disconnect %{name}"
+      disconnect_confirm: "Are you sure you want to disconnect %{name}? This will remove all synced account data."
+      accounts_link: Accounts
+      configured_html: "Connected and syncing. Visit the %{accounts_link} tab to manage your accounts."
+      not_configured: Not configured
+      sandbox_note_html: "Use the <strong>sandbox</strong> base URL (<code>https://api.sandbox.transferwise.tech</code>) for testing. Set <code>WISE_BASE_URL</code> in your environment."
+      encryption_warning:
+        title: Database encryption is not configured
+        message: Configure Active Record encryption keys before adding Wise tokens in production. Without encryption, tokens are stored in plaintext.
+      instructions:
+        sign_in_html: "Visit %{link} and log in to your account"
+        open_tokens: "Go to Settings → API tokens"
+        create_token: "Create a new personal API token with read-only access"
+        copy_token_html: "Copy the token and paste it below. Sure uses it only to sync your balances and transactions."
+    provider_connection:
+      default_name: Wise
+      default_description: Connect your Wise multi-currency account
+      name: "Wise — %{name}"
+      description: "Connect using %{name}"
+    link_profiles:
+      session_expired: Session expired. Please try connecting again.
+      no_profiles_selected: Please select at least one profile.
+      already_connected: All selected profiles are already connected.
+      success:
+        one: "Successfully connected %{count} Wise profile"
+        other: "Successfully connected %{count} Wise profiles"
+    select_profiles:
+      session_expired: Session expired. Please try connecting again.
+      title: Select Wise Profiles
+      subtitle: Choose which profiles to connect
+      description: Your Wise account has multiple profiles. Select the ones you want to sync with Sure.
+      unnamed_profile: "(Unnamed profile)"
+      already_connected_label: Already connected
+      connect: Connect selected profiles
+      cancel: Cancel
+    wise_item:
+      deletion_in_progress: deletion in progress...
+      syncing: Syncing...
+      error: Sync error
+      status: "Synced %{timestamp} ago"
+      status_never: Never synced
+      status_with_summary: "Last synced %{timestamp} ago — %{summary}"
+      delete: Disconnect
+      setup_needed: New accounts ready to set up
+      setup_description: "%{linked} of %{total} accounts linked. Create Sure accounts for your Wise currency balances."
+      setup_action: Set Up Accounts
+      no_accounts_title: No accounts linked yet
+      no_accounts_description: Run a sync to discover your Wise balances, then link them to Sure accounts.
+    setup_accounts:
+      title: Set Up Wise Accounts
+      subtitle: Link your Wise currency balances
+      description: Create a Sure account for each Wise currency balance you want to track. Each currency becomes its own account.
+      no_accounts_to_setup: All accounts are set up
+      all_accounts_linked: All your Wise currency balances have been linked to Sure accounts.
+      create_account: Create Account
+      done: Done
+    select_accounts:
+      title: Select Wise Balance
+      description: Select the Wise currency balance you want to link to your %{product_name} account.
+      no_accounts_found: All Wise balances are already linked to Sure accounts.
+      no_connection: No Wise connection found. Please connect Wise in Provider Settings first.
+      link_account: Link balance
+      cancel: Cancel
+    select_existing_account:
+      title: "Link %{account_name} with Wise"
+      description: Select the Wise currency balance to link with this account. Transactions will be synced automatically.
+      no_accounts_found: No unlinked Wise balances found.
+      link_account: Link balance
+      cancel: Cancel
+    link_accounts:
+      not_found: Wise balance not found.
+      success: Successfully linked Wise balance to account.
+      failed: Failed to link Wise balance. Please try again.
+    link_existing_account:
+      not_found: Account or Wise balance not found.
+      success: "Successfully linked %{account_name} with Wise"
+      failed: Failed to link account. Please try again.
+    complete_account_setup:
+      not_found: Wise balance not found.
+      success: Account created and linked successfully.
+      failed: Failed to create account. Please try again.
diff --git a/config/locales/views/wise_items/fr.yml b/config/locales/views/wise_items/fr.yml
new file mode 100644
index 000000000..023a6177c
--- /dev/null
+++ b/config/locales/views/wise_items/fr.yml
@@ -0,0 +1,167 @@
+---
+fr:
+  wise_items:
+    activities:
+      asset_fee: Frais Wise Assets
+      default_name: Activité Wise
+      interest: Intérêts Wise
+      jar_deposit: Transfert vers Jar
+      jar_withdrawal: Transfert depuis Jar
+      transfer_from_jar: "Transfert depuis %{jar}"
+      transfer_to_jar: "Transfert vers %{jar}"
+    complete_account_setup:
+      failed: Échec de la création du compte. Veuillez réessayer.
+      not_found: Solde Wise introuvable.
+      success: Compte créé et lié avec succès.
+    create:
+      connection_failed: Impossible de se connecter à Wise. Veuillez réessayer plus
+        tard.
+      invalid_token: Jeton API invalide. Veuillez vérifier et réessayer.
+      no_profiles_found: Aucun profil Wise trouvé. Veuillez vérifier votre jeton
+        API.
+    destroy:
+      success: Connexion Wise supprimée
+    entries:
+      default_name: Transaction Wise
+      fee_name: Frais Wise
+    link_accounts:
+      failed: Échec de la liaison du solde Wise. Veuillez réessayer.
+      not_found: Solde Wise introuvable.
+      success: Solde Wise lié au compte avec succès.
+    link_existing_account:
+      failed: Échec de la liaison du compte. Veuillez réessayer.
+      not_found: Compte ou solde Wise introuvable.
+      success: "Liaison de %{account_name} à Wise réussie"
+    link_profiles:
+      already_connected: Tous les profils sélectionnés sont déjà connectés.
+      no_profiles_selected: Veuillez sélectionner au moins un profil.
+      session_expired: Session expirée. Veuillez réessayer de vous connecter.
+      success:
+        one: "%{count} profil Wise connecté avec succès"
+        other: "%{count} profils Wise connectés avec succès"
+    profile_types:
+      business: Professionnel
+      personal: Personnel
+    provider_connection:
+      default_description: Connectez votre compte multi-devises Wise
+      default_name: Wise
+      description: Connectez-vous en utilisant %{name}
+      name: "Wise — %{name}"
+    provider_panel:
+      accounts_link: Comptes
+      add_connection: Ajouter une connexion Wise
+      configured_html: Connecté et synchronisation en cours. Rendez-vous sur l'onglet
+        %{accounts_link} pour gérer vos comptes.
+      connect: Connecter Wise
+      connection_name_label: Nom de la connexion
+      connection_name_placeholder: Wise Personnel
+      disconnect: Déconnecter
+      disconnect_confirm: Voulez-vous vraiment déconnecter %{name} ? Cela supprimera
+        toutes les données de compte synchronisées.
+      disconnect_label: "Déconnecter %{name}"
+      encryption_warning:
+        message: Configurez les clés de chiffrement Active Record avant d'ajouter
+          des jetons Wise en production. Sans chiffrement, les jetons sont stockés
+          en texte brut.
+        title: Le chiffrement de la base de données n'est pas configuré
+      instructions:
+        copy_token_html: Copiez le jeton et collez-le ci-dessous. Sure l'utilise
+          uniquement pour synchroniser vos soldes et transactions.
+        create_token: Créez un nouveau jeton API personnel avec un accès en lecture
+          seule
+        open_tokens: Accédez à Paramètres → Jetons API
+        sign_in_html: Visitez %{link} et connectez-vous à votre compte
+      keep_token_placeholder: Laisser vide pour conserver le jeton actuel
+      not_configured: Non configuré
+      sandbox_note_html: Utilisez l'URL de base <strong>sandbox</strong> (<code>https://api.sandbox.transferwise.tech</code>)
+        pour les tests. Définissez <code>WISE_BASE_URL</code> dans votre environnement.
+      setup_accounts: Configurer des comptes
+      setup_title: 'Instructions de configuration :'
+      sync: Synchroniser
+      token_label: Jeton API
+      token_placeholder: Collez votre jeton API personnel Wise
+      update_connection: Mettre à jour la connexion
+    select_accounts:
+      cancel: Annuler
+      description: Sélectionnez le solde en devise Wise que vous souhaitez lier à
+        votre compte %{product_name}.
+      link_account: Lier le solde
+      no_accounts_found: Tous les soldes Wise sont déjà liés à des comptes Sure.
+      no_connection: Aucune connexion Wise trouvée. Veuillez d'abord connecter Wise
+        dans les paramètres du fournisseur.
+      title: Sélectionner un solde Wise
+    select_existing_account:
+      cancel: Annuler
+      description: Sélectionnez le solde en devise Wise à lier à ce compte. Les transactions
+        seront synchronisées automatiquement.
+      link_account: Lier le solde
+      no_accounts_found: Aucun solde Wise non lié trouvé.
+      title: Lier %{account_name} avec Wise
+    select_profiles:
+      already_connected_label: Déjà connecté
+      cancel: Annuler
+      connect: Connecter les profils sélectionnés
+      description: Votre compte Wise a plusieurs profils. Sélectionnez ceux que vous
+        souhaitez synchroniser avec Sure.
+      session_expired: Session expirée. Veuillez réessayer de vous connecter.
+      subtitle: Choisissez les profils à connecter
+      title: Sélectionner les profils Wise
+      unnamed_profile: "(Profil sans nom)"
+    setup_accounts:
+      all_accounts_linked: Tous vos soldes en devises Wise ont été liés à des comptes
+        Sure.
+      create_account: Créer le compte
+      description: Créez un compte Sure pour chaque solde en devise Wise que vous
+        souhaitez suivre. Chaque devise devient son propre compte.
+      done: Terminé
+      no_accounts_to_setup: Tous les comptes sont configurés
+      subtitle: Liez vos soldes en devises Wise
+      title: Configurer les comptes Wise
+    sync:
+      success: Synchronisation démarrée
+    sync_status:
+      all_synced:
+        one: "%{count} compte synchronisé"
+        other: "%{count} comptes synchronisés"
+      no_accounts: Aucun compte trouvé
+      partial_setup: "%{synced} synchronisé(s), %{pending} à configurer"
+    syncer:
+      account_processing_failed:
+        one: "%{count} compte Wise a échoué lors du traitement."
+        other: "%{count} comptes Wise ont échoué lors du traitement."
+      account_sync_failed:
+        one: La synchronisation de %{count} compte Wise n'a pas pu être planifiée.
+        other: La synchronisation de %{count} comptes Wise n'a pas pu être planifiée.
+      accounts_failed:
+        one: "%{count} solde n'a pas pu être importé."
+        other: "%{count} soldes n'ont pas pu être importés."
+      accounts_need_setup:
+        one: "%{count} compte doit être configuré…"
+        other: "%{count} comptes doivent être configurés…"
+      calculating_balances: Calcul des soldes…
+      checking_account_configuration: Vérification de la configuration du compte…
+      credentials_invalid: Jeton API Wise invalide ou autorisations insuffisantes
+      failed: Échec de la synchronisation. Veuillez réessayer ou contacter le support.
+      import_failed: Échec de l'importation Wise.
+      importing_accounts: Importation des comptes depuis Wise…
+      processing_transactions: Traitement des transactions…
+      transactions_failed:
+        one: "%{count} solde a rencontré des échecs d'importation de transactions."
+        other: "%{count} soldes ont rencontré des échecs d'importation de transactions."
+    update:
+      success: Connexion Wise mise à jour
+    wise_item:
+      delete: Déconnecter
+      deletion_in_progress: suppression en cours…
+      error: Erreur de synchronisation
+      no_accounts_description: Lancez une synchronisation pour découvrir vos soldes
+        Wise, puis liez-les à des comptes Sure.
+      no_accounts_title: Aucun compte lié pour l'instant
+      setup_action: Configurer les comptes
+      setup_description: "%{linked} sur %{total} comptes liés. Créez des comptes
+        Sure pour vos soldes en devises Wise."
+      setup_needed: Nouveaux comptes prêts à être configurés
+      status: Synchronisé il y a %{timestamp}
+      status_never: Jamais synchronisé
+      status_with_summary: Dernière synchronisation il y a %{timestamp} — %{summary}
+      syncing: Synchronisation…
diff --git a/config/locales/views/wise_items/pl.yml b/config/locales/views/wise_items/pl.yml
new file mode 100644
index 000000000..b86f3fb47
--- /dev/null
+++ b/config/locales/views/wise_items/pl.yml
@@ -0,0 +1,164 @@
+---
+pl:
+  wise_items:
+    profile_types:
+      personal: Osobisty
+      business: Firmowy
+    entries:
+      default_name: Transakcja Wise
+      fee_name: Opłata Wise
+    activities:
+      jar_deposit: Przelew do Jara
+      jar_withdrawal: Wypłata z Jara
+      transfer_to_jar: "Przelew do %{jar}"
+      transfer_from_jar: "Przelew z %{jar}"
+      interest: Odsetki Wise
+      asset_fee: Opłata za aktywa Wise
+      default_name: Aktywność Wise
+    sync_status:
+      no_accounts: Nie znaleziono kont
+      all_synced:
+        few: "%{count} konta zsynchronizowane"
+        many: "%{count} kont zsynchronizowanych"
+        one: "%{count} konto zsynchronizowane"
+        other: "%{count} kont zsynchronizowanych"
+      partial_setup: "%{synced} zsynchronizowanych, %{pending} wymaga konfiguracji"
+    create:
+      no_profiles_found: Nie znaleziono profili Wise. Sprawdź swój token API.
+      invalid_token: Nieprawidłowy token API. Sprawdź i spróbuj ponownie.
+      connection_failed: Nie można połączyć z Wise. Spróbuj ponownie później.
+    destroy:
+      success: Połączenie Wise usunięte
+    update:
+      success: Połączenie Wise zaktualizowane
+    sync:
+      success: Synchronizacja rozpoczęta
+    syncer:
+      importing_accounts: Importowanie kont z Wise...
+      checking_account_configuration: Sprawdzanie konfiguracji konta...
+      accounts_need_setup:
+        few: "%{count} konta wymagają konfiguracji..."
+        many: "%{count} kont wymaga konfiguracji..."
+        one: "%{count} konto wymaga konfiguracji..."
+        other: "%{count} kont wymaga konfiguracji..."
+      processing_transactions: Przetwarzanie transakcji...
+      calculating_balances: Obliczanie sald...
+      credentials_invalid: Nieprawidłowy token API Wise lub niewystarczające uprawnienia
+      failed: Synchronizacja nie powiodła się. Spróbuj ponownie lub skontaktuj się z pomocą techniczną.
+      import_failed: Import Wise nie powiódł się.
+      accounts_failed:
+        few: "Nie udało się zaimportować %{count} salda."
+        many: "Nie udało się zaimportować %{count} sald."
+        one: "Nie udało się zaimportować %{count} salda."
+        other: "Nie udało się zaimportować %{count} sald."
+      transactions_failed:
+        few: "%{count} salda miały błędy importu transakcji."
+        many: "%{count} sald miało błędy importu transakcji."
+        one: "%{count} saldo miało błędy importu transakcji."
+        other: "%{count} sald miało błędy importu transakcji."
+      account_processing_failed:
+        few: "%{count} konta Wise nie powiodły się podczas przetwarzania."
+        many: "%{count} kont Wise nie powiodło się podczas przetwarzania."
+        one: "%{count} konto Wise nie powiodło się podczas przetwarzania."
+        other: "%{count} kont Wise nie powiodło się podczas przetwarzania."
+      account_sync_failed:
+        few: "Nie można zaplanować synchronizacji %{count} kont Wise."
+        many: "Nie można zaplanować synchronizacji %{count} kont Wise."
+        one: "Nie można zaplanować synchronizacji %{count} konta Wise."
+        other: "Nie można zaplanować synchronizacji %{count} kont Wise."
+    provider_panel:
+      setup_title: "Instrukcje konfiguracji:"
+      add_connection: Dodaj połączenie Wise
+      token_label: Token API
+      token_placeholder: Wklej swój osobisty token API Wise
+      keep_token_placeholder: Pozostaw puste, aby zachować bieżący token
+      connection_name_label: Nazwa połączenia
+      connection_name_placeholder: Wise Osobiste
+      connect: Połącz Wise
+      update_connection: Aktualizuj połączenie
+      setup_accounts: Konfiguruj konta
+      sync: Synchronizuj
+      disconnect: Rozłącz
+      disconnect_label: "Rozłącz %{name}"
+      disconnect_confirm: "Czy na pewno chcesz rozłączyć %{name}? Spowoduje to usunięcie wszystkich zsynchronizowanych danych kont."
+      accounts_link: Konta
+      configured_html: "Połączone i synchronizujące. Przejdź do zakładki %{accounts_link}, aby zarządzać kontami."
+      not_configured: Nieskonfigurowane
+      sandbox_note_html: "Użyj <strong>sandbox</strong> base URL (<code>https://api.sandbox.transferwise.tech</code>) do testowania. Ustaw <code>WISE_BASE_URL</code> w swoim środowisku."
+      encryption_warning:
+        title: Szyfrowanie bazy danych nie jest skonfigurowane
+        message: Skonfiguruj klucze szyfrowania Active Record przed dodaniem tokenów Wise w produkcji. Bez szyfrowania tokeny są przechowywane w postaci zwykłego tekstu.
+      instructions:
+        sign_in_html: "Odwiedź %{link} i zaloguj się na swoje konto"
+        open_tokens: "Przejdź do Ustawienia → Tokeny API"
+        create_token: "Utwórz nowy osobisty token API z dostępem tylko do odczytu"
+        copy_token_html: "Skopiuj token i wklej go poniżej. Sure używa go tylko do synchronizacji sald i transakcji."
+    provider_connection:
+      default_name: Wise
+      default_description: Połącz swoje wielowalutowe konto Wise
+      name: "Wise — %{name}"
+      description: "Połącz przez %{name}"
+    link_profiles:
+      session_expired: Sesja wygasła. Spróbuj połączyć ponownie.
+      no_profiles_selected: Wybierz co najmniej jeden profil.
+      already_connected: Wszystkie wybrane profile są już połączone.
+      success:
+        few: "Połączono %{count} profile Wise"
+        many: "Połączono %{count} profili Wise"
+        one: "Połączono %{count} profil Wise"
+        other: "Połączono %{count} profili Wise"
+    select_profiles:
+      session_expired: Sesja wygasła. Spróbuj połączyć ponownie.
+      title: Wybierz profile Wise
+      subtitle: Wybierz, które profile połączyć
+      description: Twoje konto Wise ma wiele profili. Wybierz te, które chcesz synchronizować z Sure.
+      unnamed_profile: "(Profil bez nazwy)"
+      already_connected_label: Już połączone
+      connect: Połącz wybrane profile
+      cancel: Anuluj
+    wise_item:
+      deletion_in_progress: trwa usuwanie...
+      syncing: Synchronizowanie...
+      error: Błąd synchronizacji
+      status: "Zsynchronizowano %{timestamp} temu"
+      status_never: Nigdy nie synchronizowano
+      status_with_summary: "Ostatnia synchronizacja %{timestamp} temu — %{summary}"
+      delete: Rozłącz
+      setup_needed: Nowe konta gotowe do konfiguracji
+      setup_description: "%{linked} z %{total} kont połączonych. Utwórz konta Sure dla swoich sald walutowych Wise."
+      setup_action: Konfiguruj konta
+      no_accounts_title: Brak połączonych kont
+      no_accounts_description: Uruchom synchronizację, aby odkryć salda Wise, a następnie połącz je z kontami Sure.
+    setup_accounts:
+      title: Skonfiguruj konta Wise
+      subtitle: Połącz swoje salda walutowe Wise
+      description: Utwórz konto Sure dla każdego salda walutowego Wise, które chcesz śledzić. Każda waluta staje się osobnym kontem.
+      no_accounts_to_setup: Wszystkie konta są skonfigurowane
+      all_accounts_linked: Wszystkie salda walutowe Wise zostały połączone z kontami Sure.
+      create_account: Utwórz konto
+      done: Gotowe
+    select_accounts:
+      title: Wybierz saldo Wise
+      description: Wybierz saldo walutowe Wise, które chcesz połączyć z kontem %{product_name}.
+      no_accounts_found: Wszystkie salda Wise są już połączone z kontami Sure.
+      no_connection: Nie znaleziono połączenia Wise. Najpierw połącz Wise w ustawieniach dostawcy.
+      link_account: Połącz saldo
+      cancel: Anuluj
+    select_existing_account:
+      title: "Połącz %{account_name} z Wise"
+      description: Wybierz saldo walutowe Wise do połączenia z tym kontem. Transakcje będą synchronizowane automatycznie.
+      no_accounts_found: Nie znaleziono niepołączonych sald Wise.
+      link_account: Połącz saldo
+      cancel: Anuluj
+    link_accounts:
+      not_found: Nie znaleziono salda Wise.
+      success: Połączono saldo Wise z kontem.
+      failed: Nie można połączyć salda Wise. Spróbuj ponownie.
+    link_existing_account:
+      not_found: Nie znaleziono konta lub salda Wise.
+      success: "Połączono %{account_name} z Wise"
+      failed: Nie można połączyć konta. Spróbuj ponownie.
+    complete_account_setup:
+      not_found: Nie znaleziono salda Wise.
+      success: Konto utworzone i połączone pomyślnie.
+      failed: Nie można utworzyć konta. Spróbuj ponownie.
diff --git a/config/locales/views/wise_items/tr.yml b/config/locales/views/wise_items/tr.yml
new file mode 100644
index 000000000..055495a23
--- /dev/null
+++ b/config/locales/views/wise_items/tr.yml
@@ -0,0 +1,163 @@
+---
+tr:
+  wise_items:
+    activities:
+      asset_fee: Wise Assets ücreti
+      default_name: Wise etkinliği
+      interest: Wise faizi
+      jar_deposit: Jar'a transfer
+      jar_withdrawal: Jar'dan transfer
+      transfer_from_jar: "%{jar} kaynağından transfer"
+      transfer_to_jar: "%{jar} hedefine transfer"
+    complete_account_setup:
+      failed: Hesap oluşturulamadı. Lütfen tekrar deneyin.
+      not_found: Wise bakiyesi bulunamadı.
+      success: Hesap başarıyla oluşturuldu ve bağlandı.
+    create:
+      connection_failed: Wise'a bağlanılamadı. Lütfen daha sonra tekrar deneyin.
+      invalid_token: Geçersiz API token'ı. Lütfen kontrol edip tekrar deneyin.
+      no_profiles_found: Wise profili bulunamadı. Lütfen API token'ınızı kontrol edin.
+    destroy:
+      success: Wise bağlantısı kaldırıldı
+    entries:
+      default_name: Wise işlemi
+      fee_name: Wise ücreti
+    link_accounts:
+      failed: Wise bakiyesi bağlanamadı. Lütfen tekrar deneyin.
+      not_found: Wise bakiyesi bulunamadı.
+      success: Wise bakiyesi hesaba başarıyla bağlandı.
+    link_existing_account:
+      failed: Hesap bağlanamadı. Lütfen tekrar deneyin.
+      not_found: Hesap veya Wise bakiyesi bulunamadı.
+      success: "%{account_name} Wise ile başarıyla bağlandı"
+    link_profiles:
+      already_connected: Seçilen tüm profiller zaten bağlı.
+      no_profiles_selected: Lütfen en az bir profil seçin.
+      session_expired: Oturum süresi doldu. Lütfen tekrar bağlanmayı deneyin.
+      success:
+        one: "%{count} Wise profili başarıyla bağlandı"
+        other: "%{count} Wise profili başarıyla bağlandı"
+    profile_types:
+      business: İşletme
+      personal: Bireysel
+    provider_connection:
+      default_description: Çoklu para birimli Wise hesabınızı bağlayın
+      default_name: Wise
+      description: "%{name} kullanarak bağlan"
+      name: Wise — %{name}
+    provider_panel:
+      accounts_link: Hesaplar
+      add_connection: Wise bağlantısı ekle
+      configured_html: Bağlandı ve eşitleniyor. Hesaplarınızı yönetmek için %{accounts_link}
+        sekmesini ziyaret edin.
+      connect: Wise'ı Bağla
+      connection_name_label: Bağlantı adı
+      connection_name_placeholder: Wise Bireysel
+      disconnect: Bağlantıyı kes
+      disconnect_confirm: "%{name} bağlantısını kesmek istediğinizden emin misiniz?
+        Bu, tüm eşitlenmiş hesap verilerini kaldıracaktır."
+      disconnect_label: "%{name} bağlantısını kes"
+      encryption_warning:
+        message: Üretimde Wise token'ları eklemeden önce Active Record şifreleme anahtarlarını
+          yapılandırın. Şifreleme olmadan, token'lar düz metin olarak saklanır.
+        title: Veritabanı şifrelemesi yapılandırılmamış
+      instructions:
+        copy_token_html: Token'ı kopyalayın ve aşağıya yapıştırın. Sure bunu yalnızca
+          bakiyelerinizi ve işlemlerinizi eşitlemek için kullanır.
+        create_token: Salt okunur erişimle yeni bir kişisel API token'ı oluşturun
+        open_tokens: Ayarlar → API token'ları bölümüne gidin
+        sign_in_html: "%{link} adresini ziyaret edin ve hesabınıza giriş yapın"
+      keep_token_placeholder: Mevcut token'ı korumak için boş bırakın
+      not_configured: Yapılandırılmamış
+      sandbox_note_html: Test için <strong>sandbox</strong> temel URL'sini (<code>https://api.sandbox.transferwise.tech</code>)
+        kullanın. Ortamınızda <code>WISE_BASE_URL</code> değerini ayarlayın.
+      setup_accounts: Hesapları kur
+      setup_title: 'Kurulum talimatları:'
+      sync: Eşitle
+      token_label: API token'ı
+      token_placeholder: Wise kişisel API token'ınızı yapıştırın
+      update_connection: Bağlantıyı güncelle
+    select_accounts:
+      cancel: İptal
+      description: "%{product_name} hesabınıza bağlamak istediğiniz Wise para birimi
+        bakiyesini seçin."
+      link_account: Bakiyeyi bağla
+      no_accounts_found: Tüm Wise bakiyeleri zaten Sure hesaplarına bağlı.
+      no_connection: Wise bağlantısı bulunamadı. Lütfen önce Sağlayıcı Ayarlarında
+        Wise'ı bağlayın.
+      title: Wise Bakiyesini Seç
+    select_existing_account:
+      cancel: İptal
+      description: Bu hesapla bağlamak için Wise para birimi bakiyesini seçin. İşlemler
+        otomatik olarak eşitlenecektir.
+      link_account: Bakiyeyi bağla
+      no_accounts_found: Bağlantısız Wise bakiyesi bulunamadı.
+      title: "%{account_name} hesabını Wise ile bağla"
+    select_profiles:
+      already_connected_label: Zaten bağlı
+      cancel: İptal
+      connect: Seçilen profilleri bağla
+      description: Wise hesabınızın birden fazla profili var. Sure ile eşitlemek istediklerinizi
+        seçin.
+      session_expired: Oturum süresi doldu. Lütfen tekrar bağlanmayı deneyin.
+      subtitle: Hangi profillerin bağlanacağını seçin
+      title: Wise Profillerini Seç
+      unnamed_profile: "(Adsız profil)"
+    setup_accounts:
+      all_accounts_linked: Tüm Wise para birimi bakiyeleriniz Sure hesaplarına bağlandı.
+      create_account: Hesap Oluştur
+      description: Takip etmek istediğiniz her Wise para birimi bakiyesi için bir
+        Sure hesabı oluşturun. Her para birimi kendi hesabı olur.
+      done: Bitti
+      no_accounts_to_setup: Tüm hesaplar kuruldu
+      subtitle: Wise para birimi bakiyelerinizi bağlayın
+      title: Wise Hesaplarını Kur
+    sync:
+      success: Eşitleme başlatıldı
+    sync_status:
+      all_synced:
+        one: "%{count} hesap eşitlendi"
+        other: "%{count} hesap eşitlendi"
+      no_accounts: Hesap bulunamadı
+      partial_setup: "%{synced} eşitlendi, %{pending} kurulum gerektiriyor"
+    syncer:
+      account_processing_failed:
+        one: "%{count} Wise hesabı işlenirken başarısız oldu."
+        other: "%{count} Wise hesabı işlenirken başarısız oldu."
+      account_sync_failed:
+        one: "%{count} Wise hesap eşitlemesi zamanlanamadı."
+        other: "%{count} Wise hesap eşitlemesi zamanlanamadı."
+      accounts_failed:
+        one: "%{count} bakiye içe aktarılamadı."
+        other: "%{count} bakiye içe aktarılamadı."
+      accounts_need_setup:
+        one: "%{count} hesap kurulum gerektiriyor..."
+        other: "%{count} hesap kurulum gerektiriyor..."
+      calculating_balances: Bakiyeler hesaplanıyor...
+      checking_account_configuration: Hesap yapılandırması kontrol ediliyor...
+      credentials_invalid: Geçersiz Wise API token'ı veya yetersiz izinler
+      failed: Eşitleme başarısız oldu. Lütfen tekrar deneyin veya destek ile iletişime
+        geçin.
+      import_failed: Wise içe aktarma başarısız oldu.
+      importing_accounts: Wise'dan hesaplar içe aktarılıyor...
+      processing_transactions: İşlemler işleniyor...
+      transactions_failed:
+        one: "%{count} bakiyede işlem içe aktarma hataları oluştu."
+        other: "%{count} bakiyede işlem içe aktarma hataları oluştu."
+    update:
+      success: Wise bağlantısı güncellendi
+    wise_item:
+      delete: Bağlantıyı kes
+      deletion_in_progress: silme işlemi devam ediyor...
+      error: Eşitleme hatası
+      no_accounts_description: Wise bakiyelerinizi keşfetmek için bir eşitleme çalıştırın,
+        ardından bunları Sure hesaplarına bağlayın.
+      no_accounts_title: Henüz bağlı hesap yok
+      setup_action: Hesapları Kur
+      setup_description: "%{total} hesaptan %{linked} tanesi bağlandı. Wise para birimi
+        bakiyeleriniz için Sure hesapları oluşturun."
+      setup_needed: Kurulmaya hazır yeni hesaplar var
+      status: "%{timestamp} önce eşitlendi"
+      status_never: Hiç eşitlenmedi
+      status_with_summary: Son eşitleme %{timestamp} önce — %{summary}
+      syncing: Eşitleniyor...
diff --git a/config/routes.rb b/config/routes.rb
index fb4355deb..b0c4f0052 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,9 +1,22 @@
-unless Rails.env.production?
-  require "sidekiq/web"
-  require "sidekiq/cron/web"
-end
+require "sidekiq/web"
+require "sidekiq/cron/web"
 
 Rails.application.routes.draw do
+  resources :questrade_items, only: [ :index, :new, :create, :show, :edit, :update, :destroy ] do
+    collection do
+      get :preload_accounts
+      get :select_accounts
+      post :link_accounts
+      get :select_existing_account
+      post :link_existing_account
+    end
+
+    member do
+      post :sync
+      get :setup_accounts
+      post :complete_account_setup
+    end
+  end
   resources :indexa_capital_items, only: [ :index, :new, :create, :show, :edit, :update, :destroy ] do
     collection do
       get :preload_accounts
@@ -35,6 +48,23 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :wise_items, only: %i[index new create show edit update destroy] do
+    collection do
+      get :select_profiles
+      post :link_profiles
+      get :select_accounts
+      post :link_accounts
+      get :select_existing_account
+      post :link_existing_account
+    end
+
+    member do
+      post :sync
+      get :setup_accounts
+      post :complete_account_setup
+    end
+  end
+
   resources :brex_items, only: %i[index new create show edit update destroy] do
     collection do
       get :preload_accounts, to: "brex_items/account_flows#preload_accounts"
@@ -97,14 +127,15 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :snaptrade_items, only: [ :index, :new, :create, :show, :edit, :update, :destroy ] do
+  resources :snaptrade_items, only: [ :index, :show, :destroy ] do
     collection do
       get :preload_accounts
       get :select_accounts
-      post :link_accounts
       get :select_existing_account
       post :link_existing_account
       get :callback
+      get :oauth_authorize
+      get :oauth_callback
     end
 
     member do
@@ -114,7 +145,6 @@ Rails.application.routes.draw do
       post :complete_account_setup
       get :connections
       delete :delete_connection
-      delete :delete_orphaned_user
     end
   end
 
@@ -132,6 +162,20 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :trading212_items, only: [ :create, :update, :destroy ] do
+    collection do
+      get :select_accounts
+      get :select_existing_account
+      post :link_existing_account
+    end
+
+    member do
+      post :sync
+      get :setup_accounts
+      post :complete_account_setup
+    end
+  end
+
   # CoinStats routes
   resources :coinstats_items, only: [ :index, :new, :create, :update, :destroy ] do
     collection do
@@ -160,6 +204,9 @@ Rails.application.routes.draw do
       post :new_connection
     end
   end
+  get ".well-known/oauth-protected-resource", to: "oauth_metadata#protected_resource"
+  get ".well-known/oauth-authorization-server", to: "oauth_metadata#authorization_server"
+  post "register", to: "oauth_registration#create"
   use_doorkeeper
   # MFA routes
   resource :mfa, controller: "mfa", only: [ :new, :create ] do
@@ -177,12 +224,28 @@ Rails.application.routes.draw do
     mount Rswag::Ui::Engine => "/api-docs"
   end
 
-  # Uses basic auth - see config/initializers/sidekiq.rb
-  mount Sidekiq::Web => "/sidekiq" unless Rails.env.production?
+  # Break-glass queue tooling. Development mounts it open for convenience;
+  # everywhere else (production, staging, test) the route only exists for a
+  # signed-in super admin — see app/constraints/super_admin_constraint.rb.
+  # An optional basic-auth second layer can be enabled via SIDEKIQ_WEB_USERNAME
+  # and SIDEKIQ_WEB_PASSWORD (config/initializers/sidekiq.rb).
+  if Rails.env.development?
+    mount Sidekiq::Web => "/sidekiq"
+  else
+    constraints SuperAdminConstraint.new do
+      mount Sidekiq::Web => "/sidekiq"
+    end
+  end
 
   # AI chats
   resources :chats do
-    resources :messages, only: :create
+    resources :messages, only: :create do
+      member do
+        # Client-side watchdog reports a "Thinking…" bubble that never received
+        # a response (e.g. the background worker is down) so it can be failed.
+        post :report_timeout
+      end
+    end
 
     member do
       post :retry
@@ -192,6 +255,13 @@ Rails.application.routes.draw do
   resources :family_exports, only: %i[new create index destroy] do
     member do
       get :download
+      post :cancel
+    end
+  end
+
+  resources :syncs, only: [] do
+    member do
+      post :cancel
     end
   end
 
@@ -205,6 +275,11 @@ Rails.application.routes.draw do
 
   resource :registration, only: %i[new create]
   resources :sessions, only: %i[index new create destroy]
+  # Desktop app SSO: opens the flow in the system browser (so passkeys/WebAuthn
+  # work), then hands a single-use, PKCE-bound code back via the sure:// scheme
+  # which the desktop webview exchanges for a normal web session.
+  post "/sessions/desktop_exchange", to: "sessions#desktop_exchange", as: :desktop_sso_exchange
+  get "/auth/desktop/:provider", to: "sessions#desktop_sso_start"
   get "/auth/mobile/:provider", to: "sessions#mobile_sso_start"
   match "/auth/:provider/callback", to: "sessions#openid_connect", via: %i[get post]
   match "/auth/failure", to: "sessions#failure", via: %i[get post]
@@ -239,6 +314,9 @@ Rails.application.routes.draw do
     resource :preferences, only: %i[show update]
     resource :appearance, only: %i[show update]
     resource :debug, only: :show
+    resource :background_jobs, controller: "background_jobs", only: :show do
+      post :cancel
+    end
     resource :hosting, only: %i[show update] do
       delete :clear_cache, on: :collection
       delete :disconnect_external_assistant, on: :collection
@@ -249,7 +327,10 @@ Rails.application.routes.draw do
       post :options, on: :collection
     end
     resources :sso_identities, only: :destroy
-    resource :api_key, only: [ :show, :new, :create, :destroy ]
+    resources :api_keys, only: [ :index, :show, :new, :create, :destroy ]
+    resource :mcp, controller: "mcp", only: :show do
+      delete "tokens/:token_id", to: "mcp#revoke", as: :revoke_token
+    end
     resource :ai_prompts, only: :show
     resource :llm_usage, only: :show
     resource :guides, only: :show
@@ -310,6 +391,7 @@ Rails.application.routes.draw do
       patch :complete
       patch :archive
       patch :unarchive
+      patch :reopen
     end
 
     resources :pledges, only: %i[new create destroy], controller: "goal_pledges" do
@@ -340,6 +422,7 @@ Rails.application.routes.draw do
       post :publish
       put :revert
       put :apply_template
+      post :cancel
     end
 
     resource :upload, only: %i[show update], module: :import
@@ -414,6 +497,17 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :insights, only: %i[index] do
+    collection do
+      post :refresh
+    end
+
+    member do
+      patch :dismiss
+      patch :undismiss
+    end
+  end
+
   resources :accountable_sparklines, only: :show, param: :accountable_type
 
   direct :entry do |entry, options|
@@ -443,6 +537,7 @@ Rails.application.routes.draw do
       post :sync
       get :sparkline
       patch :toggle_active
+      patch :toggle_exclude_from_reports
       patch :set_default
       patch :remove_default
       get :select_provider
@@ -515,7 +610,7 @@ Rails.application.routes.draw do
       resources :budgets, only: [ :index, :show ]
       resources :budget_categories, only: [ :index, :show ]
       resources :categories, only: [ :index, :show, :create ]
-      resources :merchants, only: [ :index, :show ]
+      resources :merchants, only: [ :index, :show, :create ]
       resources :rules, only: [ :index, :show ]
       resources :rule_runs, only: [ :index, :show ]
       resources :securities, only: [ :index, :show ]
@@ -536,6 +631,10 @@ Rails.application.routes.draw do
         post :preflight, on: :collection
         get :rows, on: :member
       end
+      resources :import_sessions, only: [ :show, :create ] do
+        post :chunks, on: :member, action: :create_chunk
+        post :publish, on: :member
+      end
       resource :usage, only: [ :show ], controller: :usage
       resource :balance_sheet, only: [ :show ], controller: :balance_sheet
       resource :family_settings, only: [ :show ], controller: :family_settings
@@ -623,6 +722,20 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :redbark_items, only: %i[create update destroy] do
+    collection do
+      get :select_accounts
+      get :select_existing_account
+      post :link_existing_account
+    end
+
+    member do
+      post :sync
+      get :setup_accounts
+      post :complete_account_setup
+    end
+  end
+
   resources :akahu_items, only: %i[index new create show edit update destroy] do
     collection do
       get :preload_accounts
@@ -639,6 +752,22 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :up_items, only: %i[index new create show edit update destroy] do
+    collection do
+      get :preload_accounts
+      get :select_accounts
+      post :link_accounts
+      get :select_existing_account
+      post :link_existing_account
+    end
+
+    member do
+      post :sync
+      get :setup_accounts
+      post :complete_account_setup
+    end
+  end
+
   resources :sophtron_items, only: %i[index new create show edit update destroy] do
     collection do
       get :preload_accounts
diff --git a/config/schedule.yml b/config/schedule.yml
index 6e1c8bb3a..795ccab7e 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -11,7 +11,7 @@ clean_syncs:
   cron: "0 * * * *" # every hour
   class: "SyncCleanerJob"
   queue: "scheduled"
-  description: "Cleans up stale syncs"
+  description: "Cleans up stale syncs and reaps imports, exports, and provider fetch flags stuck by lost jobs"
 
 run_security_health_checks:
   cron: "0 2 * * 1-5" # 2:00 AM EST / 3:00 AM EDT (NY time) Monday through Friday
@@ -25,6 +25,12 @@ sync_hourly:
   queue: "scheduled"
   description: "Syncs provider items that opt-in to hourly syncing"
 
+sync_property_valuations:
+  cron: "30 1 1 * *" # monthly on the 1st at 1:30 AM
+  class: "SyncPropertyValuationsJob"
+  queue: "scheduled"
+  description: "Refreshes AVM property valuations once a month (providers enforce tight monthly request caps)"
+
 clean_data:
   cron: "0 3 * * *" # daily at 3:00 AM
   class: "DataCleanerJob"
@@ -49,6 +55,12 @@ refresh_demo_family:
   queue: "scheduled"
   description: "Refreshes demo family data and emails super admins with daily usage summary"
 
+generate_insights:
+  cron: "0 6 * * *" # daily at 6:00 AM UTC, after the nightly cleanup jobs
+  class: "GenerateInsightsJob"
+  queue: "scheduled"
+  description: "Generates proactive financial insights for families with preview features enabled"
+
 sweep_expired_goal_pledges:
   cron: "*/15 * * * *" # every 15 minutes
   class: "SweepExpiredGoalPledgesJob"
diff --git a/db/migrate/20260316120000_create_vector_store_chunks.rb b/db/migrate/20260316120000_create_vector_store_chunks.rb
index 216768486..c65e33c1a 100644
--- a/db/migrate/20260316120000_create_vector_store_chunks.rb
+++ b/db/migrate/20260316120000_create_vector_store_chunks.rb
@@ -28,14 +28,20 @@ class CreateVectorStoreChunks < ActiveRecord::Migration[7.2]
 
   private
 
-    # Only run this migration when pgvector is explicitly configured as the
-    # vector store provider AND the extension is actually available on the
-    # PostgreSQL server. Previously we only checked server availability,
-    # which caused failures in production Docker environments where the
-    # extension may be present but the DB user lacks superuser privileges
+    # Only run this migration when pgvector is the effective vector store AND
+    # the extension is actually available on the PostgreSQL server.
+    #
+    # Provider selection goes through VectorStore::Registry.pgvector_effective?
+    # (the single source of truth) rather than a raw VECTOR_STORE_PROVIDER check,
+    # so an Anthropic-default install — which selects pgvector implicitly via
+    # Setting.llm_provider without setting VECTOR_STORE_PROVIDER — still
+    # provisions the table instead of failing later on a missing relation.
+    #
+    # The server-availability check stays: production Docker environments may
+    # have the extension present but the DB user may lack superuser privileges
     # to enable it.
     def pgvector_available?
-      return false unless ENV["VECTOR_STORE_PROVIDER"].to_s.downcase == "pgvector"
+      return false unless VectorStore::Registry.pgvector_effective?
 
       result = ActiveRecord::Base.connection.execute(
         "SELECT 1 FROM pg_available_extensions WHERE name = 'vector' LIMIT 1"
diff --git a/db/migrate/20260405120000_add_aspsp_metadata_to_enable_banking.rb b/db/migrate/20260405120000_add_aspsp_metadata_to_enable_banking.rb
index b1553e87e..2e4b60920 100644
--- a/db/migrate/20260405120000_add_aspsp_metadata_to_enable_banking.rb
+++ b/db/migrate/20260405120000_add_aspsp_metadata_to_enable_banking.rb
@@ -1,15 +1,15 @@
 class AddAspspMetadataToEnableBanking < ActiveRecord::Migration[7.2]
   def change
     # ASPSP-level metadata on the item (stored when user selects a bank)
-    add_column :enable_banking_items, :aspsp_required_psu_headers, :jsonb, default: []
-    add_column :enable_banking_items, :aspsp_maximum_consent_validity, :integer  # in seconds
-    add_column :enable_banking_items, :aspsp_auth_approach, :string              # REDIRECT | EMBEDDED | DECOUPLED
-    add_column :enable_banking_items, :aspsp_psu_types, :jsonb, default: []
+    add_column :enable_banking_items, :aspsp_required_psu_headers, :jsonb, default: [] unless column_exists?(:enable_banking_items, :aspsp_required_psu_headers)
+    add_column :enable_banking_items, :aspsp_maximum_consent_validity, :integer unless column_exists?(:enable_banking_items, :aspsp_maximum_consent_validity)  # in seconds
+    add_column :enable_banking_items, :aspsp_auth_approach, :string unless column_exists?(:enable_banking_items, :aspsp_auth_approach)              # REDIRECT | EMBEDDED | DECOUPLED
+    add_column :enable_banking_items, :aspsp_psu_types, :jsonb, default: [] unless column_exists?(:enable_banking_items, :aspsp_psu_types)
     # PII/GDPR Notice: last_psu_ip stores the user's IP address.
     # - Required for the Psu-Ip-Address header in Enable Banking API requests
     # - Must be declared in the privacy policy
     # - Data retention: consider nullifying after session expiry or 90 days
-    add_column :enable_banking_items, :last_psu_ip, :string                      # user IP captured at request time
+    add_column :enable_banking_items, :last_psu_ip, :string unless column_exists?(:enable_banking_items, :last_psu_ip)                      # user IP captured at request time
 
     # Fix sync_start_date type: was datetime, should be date
     reversible do |dir|
@@ -28,8 +28,8 @@ class AddAspspMetadataToEnableBanking < ActiveRecord::Migration[7.2]
     end
 
     # Account-level fields from AccountResource
-    add_column :enable_banking_accounts, :product, :string                       # bank's proprietary product name
-    add_column :enable_banking_accounts, :credit_limit, :decimal, precision: 19, scale: 4
-    add_column :enable_banking_accounts, :identification_hashes, :jsonb, default: []
+    add_column :enable_banking_accounts, :product, :string unless column_exists?(:enable_banking_accounts, :product)                       # bank's proprietary product name
+    add_column :enable_banking_accounts, :credit_limit, :decimal, precision: 19, scale: 4 unless column_exists?(:enable_banking_accounts, :credit_limit)
+    add_column :enable_banking_accounts, :identification_hashes, :jsonb, default: [] unless column_exists?(:enable_banking_accounts, :identification_hashes)
   end
 end
diff --git a/db/migrate/20260513013000_create_import_sessions.rb b/db/migrate/20260513013000_create_import_sessions.rb
new file mode 100644
index 000000000..743d7f4bd
--- /dev/null
+++ b/db/migrate/20260513013000_create_import_sessions.rb
@@ -0,0 +1,78 @@
+class CreateImportSessions < ActiveRecord::Migration[7.2]
+  def change
+    create_table :import_sessions, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.string :import_type, null: false, default: "SureImport"
+      t.string :status, null: false, default: "pending"
+      t.string :client_session_id, limit: 255
+      t.integer :expected_chunks
+      t.jsonb :summary, null: false, default: {}
+      t.jsonb :error_details, null: false, default: {}
+
+      t.timestamps
+
+      t.index [ :family_id, :client_session_id ],
+              unique: true,
+              where: "client_session_id IS NOT NULL",
+              name: "idx_import_sessions_on_family_client_session"
+      t.index [ :family_id, :status ]
+      t.index [ :id, :family_id ], unique: true, name: "idx_import_sessions_on_id_family"
+      t.check_constraint "expected_chunks IS NULL OR expected_chunks > 0", name: "chk_import_sessions_expected_chunks_positive"
+      t.check_constraint "client_session_id IS NULL OR btrim(client_session_id) <> ''",
+                         name: "chk_import_sessions_client_session_id_present"
+      t.check_constraint "import_type = 'SureImport'", name: "chk_import_sessions_import_type"
+      t.check_constraint "status IN ('pending', 'importing', 'complete', 'failed')", name: "chk_import_sessions_status"
+      t.check_constraint "jsonb_typeof(summary) = 'object'", name: "chk_import_sessions_summary_object"
+      t.check_constraint "jsonb_typeof(error_details) = 'object'", name: "chk_import_sessions_error_details_object"
+    end
+
+    create_table :import_source_mappings, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.references :import_session, null: false, type: :uuid
+      t.string :source_type, null: false, limit: 64
+      t.string :source_id, null: false, limit: 255
+      t.references :target, polymorphic: true, null: false, type: :uuid,
+                            index: { name: "idx_import_source_mappings_on_target" }
+
+      t.timestamps
+
+      t.index [ :import_session_id, :source_type, :source_id ],
+              unique: true,
+              name: "index_import_source_mappings_on_session_type_and_source"
+      t.index [ :family_id, :source_type, :source_id ], name: "idx_import_source_mappings_on_family_source"
+      t.check_constraint "btrim(source_type) <> ''", name: "chk_import_source_mappings_source_type_present"
+      t.check_constraint "source_type IN ('Account', 'Category', 'Tag', 'Merchant', 'RecurringTransaction', 'Transaction', 'Budget', 'Security', 'Rule')",
+                         name: "chk_import_source_mappings_source_type"
+      t.check_constraint "btrim(source_id) <> ''", name: "chk_import_source_mappings_source_id_present"
+      t.check_constraint "btrim(target_type) <> ''", name: "chk_import_source_mappings_target_type_present"
+      t.check_constraint "target_type IN ('Account', 'Category', 'Tag', 'Merchant', 'RecurringTransaction', 'Transaction', 'Budget', 'Security', 'Rule')",
+                         name: "chk_import_source_mappings_target_type"
+    end
+
+    add_foreign_key :import_source_mappings, :import_sessions,
+                    column: [ :import_session_id, :family_id ], primary_key: [ :id, :family_id ],
+                    on_delete: :cascade, name: "fk_import_source_mappings_session_family"
+
+    add_reference :imports, :import_session, type: :uuid
+    add_column :imports, :sequence, :integer
+    add_column :imports, :client_chunk_id, :string, limit: 255
+    add_column :imports, :checksum, :string, limit: 64
+    add_column :imports, :summary, :jsonb, null: false, default: {}
+    add_column :imports, :error_details, :jsonb, null: false, default: {}
+
+    add_index :imports, [ :import_session_id, :sequence ], unique: true,
+              where: "import_session_id IS NOT NULL AND sequence IS NOT NULL", name: "idx_imports_on_session_sequence"
+    add_index :imports, [ :import_session_id, :client_chunk_id ], unique: true,
+              where: "import_session_id IS NOT NULL AND client_chunk_id IS NOT NULL", name: "idx_imports_on_session_client_chunk"
+    add_foreign_key :imports, :import_sessions,
+                    column: [ :import_session_id, :family_id ], primary_key: [ :id, :family_id ],
+                    on_delete: :cascade, name: "fk_imports_session_family"
+    add_check_constraint :imports, "sequence IS NULL OR sequence > 0", name: "chk_imports_session_sequence_positive"
+    add_check_constraint :imports, "client_chunk_id IS NULL OR btrim(client_chunk_id) <> ''", name: "chk_imports_client_chunk_id_present"
+    add_check_constraint :imports, "checksum IS NULL OR length(checksum) = 64", name: "chk_imports_checksum_sha256_length"
+    add_check_constraint :imports, "import_session_id IS NULL OR sequence IS NOT NULL", name: "chk_imports_session_sequence_present"
+    add_check_constraint :imports, "import_session_id IS NULL OR checksum IS NOT NULL", name: "chk_imports_session_checksum_present"
+    add_check_constraint :imports, "jsonb_typeof(summary) = 'object'", name: "chk_imports_summary_object"
+    add_check_constraint :imports, "jsonb_typeof(error_details) = 'object'", name: "chk_imports_error_details_object"
+  end
+end
diff --git a/db/migrate/20260525202505_add_merchant_columns_to_import_rows.rb b/db/migrate/20260525202505_add_merchant_columns_to_import_rows.rb
new file mode 100644
index 000000000..2a6573074
--- /dev/null
+++ b/db/migrate/20260525202505_add_merchant_columns_to_import_rows.rb
@@ -0,0 +1,6 @@
+class AddMerchantColumnsToImportRows < ActiveRecord::Migration[7.2]
+  def change
+    add_column :import_rows, :merchant_color, :string
+    add_column :import_rows, :merchant_website, :string
+  end
+end
diff --git a/db/migrate/20260531213000_add_disabled_at_to_accounts.rb b/db/migrate/20260531213000_add_disabled_at_to_accounts.rb
new file mode 100644
index 000000000..4f33e08b8
--- /dev/null
+++ b/db/migrate/20260531213000_add_disabled_at_to_accounts.rb
@@ -0,0 +1,16 @@
+class AddDisabledAtToAccounts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :accounts, :disabled_at, :datetime
+
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL.squish
+          UPDATE accounts
+          SET disabled_at = updated_at
+          WHERE status = 'disabled'
+            AND disabled_at IS NULL
+        SQL
+      end
+    end
+  end
+end
diff --git a/db/migrate/20260601120000_ensure_vector_store_chunks_for_default_pgvector.rb b/db/migrate/20260601120000_ensure_vector_store_chunks_for_default_pgvector.rb
new file mode 100644
index 000000000..452717d7b
--- /dev/null
+++ b/db/migrate/20260601120000_ensure_vector_store_chunks_for_default_pgvector.rb
@@ -0,0 +1,55 @@
+class EnsureVectorStoreChunksForDefaultPgvector < ActiveRecord::Migration[7.2]
+  # CreateVectorStoreChunks only provisions the table when
+  # VECTOR_STORE_PROVIDER == "pgvector" is set explicitly. Since #1986 makes
+  # pgvector the *default* vector store for Anthropic installs (no
+  # VECTOR_STORE_PROVIDER needed), a fresh Anthropic-only install would migrate
+  # without the table and then fail on uploads/searches. Backfill it whenever
+  # pgvector is the effective store, idempotently, so fresh and already-migrated
+  # installs converge. Gating uses the same VectorStore::Registry predicate as
+  # the runtime adapter selection, so the two can't drift again.
+  def up
+    return unless pgvector_effective?
+    return unless pgvector_extension_available?
+    return if table_exists?(:vector_store_chunks)
+
+    enable_extension "vector" unless extension_enabled?("vector")
+
+    create_table :vector_store_chunks, id: :uuid do |t|
+      t.string :store_id, null: false
+      t.string :file_id, null: false
+      t.string :filename
+      t.integer :chunk_index, null: false, default: 0
+      t.text :content, null: false
+      t.column :embedding, "vector(#{ENV.fetch('EMBEDDING_DIMENSIONS', '1024')})", null: false
+      t.jsonb :metadata, null: false, default: {}
+      t.timestamps null: false
+    end
+
+    add_index :vector_store_chunks, :store_id
+    add_index :vector_store_chunks, :file_id
+    add_index :vector_store_chunks, [ :store_id, :file_id, :chunk_index ], unique: true,
+      name: "index_vector_store_chunks_on_store_file_chunk"
+  end
+
+  def down
+    # No-op: the table's lifecycle is owned by CreateVectorStoreChunks. This
+    # migration only backfills it for the pgvector-by-default case, so reverting
+    # must not drop a table other installs rely on.
+  end
+
+  private
+
+    def pgvector_effective?
+      VectorStore::Registry.pgvector_effective?
+    rescue StandardError
+      false
+    end
+
+    def pgvector_extension_available?
+      ActiveRecord::Base.connection.execute(
+        "SELECT 1 FROM pg_available_extensions WHERE name = 'vector' LIMIT 1"
+      ).any?
+    rescue StandardError
+      false
+    end
+end
diff --git a/db/migrate/20260604000000_add_fees_to_transfers.rb b/db/migrate/20260604000000_add_fees_to_transfers.rb
new file mode 100644
index 000000000..f22a54ee5
--- /dev/null
+++ b/db/migrate/20260604000000_add_fees_to_transfers.rb
@@ -0,0 +1,9 @@
+class AddFeesToTransfers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :transfers, :source_fee_amount, :decimal, precision: 19, scale: 4, null: false, default: 0
+    add_column :transfers, :destination_fee_amount, :decimal, precision: 19, scale: 4, null: false, default: 0
+
+    add_check_constraint :transfers, "source_fee_amount >= 0", name: "check_source_fee_non_negative"
+    add_check_constraint :transfers, "destination_fee_amount >= 0", name: "check_destination_fee_non_negative"
+  end
+end
diff --git a/db/migrate/20260606000000_add_cascade_to_rejected_transfers_foreign_keys.rb b/db/migrate/20260606000000_add_cascade_to_rejected_transfers_foreign_keys.rb
new file mode 100644
index 000000000..2cc3f486e
--- /dev/null
+++ b/db/migrate/20260606000000_add_cascade_to_rejected_transfers_foreign_keys.rb
@@ -0,0 +1,11 @@
+class AddCascadeToRejectedTransfersForeignKeys < ActiveRecord::Migration[7.2]
+  def change
+    remove_foreign_key :rejected_transfers, to_table: :transactions, column: :inflow_transaction_id
+    remove_foreign_key :rejected_transfers, to_table: :transactions, column: :outflow_transaction_id
+
+    add_foreign_key :rejected_transfers, :transactions,
+                    column: :inflow_transaction_id, on_delete: :cascade
+    add_foreign_key :rejected_transfers, :transactions,
+                    column: :outflow_transaction_id, on_delete: :cascade
+  end
+end
diff --git a/db/migrate/20260607071000_tighten_transfer_match_lookup_index.rb b/db/migrate/20260607071000_tighten_transfer_match_lookup_index.rb
new file mode 100644
index 000000000..d9e1ea416
--- /dev/null
+++ b/db/migrate/20260607071000_tighten_transfer_match_lookup_index.rb
@@ -0,0 +1,29 @@
+class TightenTransferMatchLookupIndex < ActiveRecord::Migration[7.2]
+  disable_ddl_transaction!
+
+  def up
+    remove_index :entries,
+                 name: "index_entries_on_transfer_match_lookup",
+                 if_exists: true,
+                 algorithm: :concurrently
+
+    add_index :entries,
+              [ :currency, :amount, :date, :account_id ],
+              name: "index_entries_on_transfer_match_lookup",
+              where: "entryable_type = 'Transaction' AND excluded = false",
+              algorithm: :concurrently
+  end
+
+  def down
+    remove_index :entries,
+                 name: "index_entries_on_transfer_match_lookup",
+                 if_exists: true,
+                 algorithm: :concurrently
+
+    add_index :entries,
+              [ :currency, :amount, :date, :account_id ],
+              name: "index_entries_on_transfer_match_lookup",
+              where: "entryable_type = 'Transaction'",
+              algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20260608160000_add_investment_totals_lookup_index_to_entries.rb b/db/migrate/20260608160000_add_investment_totals_lookup_index_to_entries.rb
new file mode 100644
index 000000000..df9e42b6b
--- /dev/null
+++ b/db/migrate/20260608160000_add_investment_totals_lookup_index_to_entries.rb
@@ -0,0 +1,11 @@
+class AddInvestmentTotalsLookupIndexToEntries < ActiveRecord::Migration[7.2]
+  disable_ddl_transaction!
+
+  def change
+    add_index :entries,
+              [ :account_id, :date, :entryable_id ],
+              name: "index_entries_on_investment_totals_lookup",
+              where: "entryable_type = 'Trade' AND excluded = false",
+              algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20260611120000_add_syncs_distinct_on_index.rb b/db/migrate/20260611120000_add_syncs_distinct_on_index.rb
new file mode 100644
index 000000000..c12b1de80
--- /dev/null
+++ b/db/migrate/20260611120000_add_syncs_distinct_on_index.rb
@@ -0,0 +1,8 @@
+class AddSyncsDistinctOnIndex < ActiveRecord::Migration[7.2]
+  def change
+    add_index :syncs,
+              [ :syncable_type, :syncable_id, :created_at, :id ],
+              order: { created_at: :desc, id: :desc },
+              name: "index_syncs_on_syncable_and_created_at_and_id"
+  end
+end
diff --git a/db/migrate/20260617120000_create_up_items_and_accounts.rb b/db/migrate/20260617120000_create_up_items_and_accounts.rb
new file mode 100644
index 000000000..89288641a
--- /dev/null
+++ b/db/migrate/20260617120000_create_up_items_and_accounts.rb
@@ -0,0 +1,49 @@
+class CreateUpItemsAndAccounts < ActiveRecord::Migration[7.2]
+  def change
+    create_table :up_items, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.string :name
+      t.string :institution_id
+      t.string :institution_name
+      t.string :institution_domain
+      t.string :institution_url
+      t.string :institution_color
+      t.string :status, default: "good", null: false
+      t.boolean :scheduled_for_deletion, default: false, null: false
+      t.boolean :pending_account_setup, default: false, null: false
+      t.date :sync_start_date
+      t.jsonb :raw_payload
+      t.jsonb :raw_institution_payload
+      t.text :access_token
+      t.timestamps
+    end
+
+    add_index :up_items, :status
+
+    create_table :up_accounts, id: :uuid do |t|
+      t.references :up_item, null: false, foreign_key: true, type: :uuid
+      t.string :name, null: false
+      t.string :account_id
+      t.string :currency, null: false
+      t.decimal :current_balance, precision: 19, scale: 4
+      t.string :account_status
+      t.string :account_type
+      t.string :ownership_type
+      t.string :provider
+      t.boolean :ignored, default: false, null: false
+      t.jsonb :institution_metadata
+      t.jsonb :raw_payload
+      t.jsonb :raw_transactions_payload
+      t.date :sync_start_date
+
+      t.timestamps
+    end
+
+    add_index :up_accounts, :account_id
+    add_index :up_accounts,
+              [ :up_item_id, :account_id ],
+              unique: true,
+              where: "account_id IS NOT NULL",
+              name: "index_up_accounts_on_item_and_account_id"
+  end
+end
diff --git a/db/migrate/20260618120000_create_wise_items_and_accounts.rb b/db/migrate/20260618120000_create_wise_items_and_accounts.rb
new file mode 100644
index 000000000..55206216c
--- /dev/null
+++ b/db/migrate/20260618120000_create_wise_items_and_accounts.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+class CreateWiseItemsAndAccounts < ActiveRecord::Migration[7.2]
+  def change
+    create_table :wise_items, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+
+      t.string :profile_id, null: false
+      t.string :profile_type, null: false
+      t.string :name, null: false
+
+      t.string :status, null: false, default: "good"
+      t.boolean :scheduled_for_deletion, null: false, default: false
+      t.boolean :pending_account_setup, null: false, default: false
+
+      t.datetime :sync_start_date
+
+      t.text :token, null: false
+      t.jsonb :raw_payload
+
+      t.timestamps
+    end
+
+    add_index :wise_items, :status
+    add_index :wise_items, [ :family_id, :profile_id ], unique: true
+
+    create_table :wise_accounts, id: :uuid do |t|
+      t.references :wise_item, null: false, foreign_key: { on_delete: :cascade }, type: :uuid
+
+      t.string :balance_id, null: false
+      t.string :currency, null: false
+      t.string :name
+
+      t.decimal :current_balance, precision: 19, scale: 4
+      t.decimal :reserved_balance, precision: 19, scale: 4
+
+      t.jsonb :raw_payload
+      t.jsonb :raw_transactions_payload
+
+      t.timestamps
+    end
+
+    add_index :wise_accounts, [ :wise_item_id, :balance_id ], unique: true
+  end
+end
diff --git a/db/migrate/20260621000000_add_exclude_from_reports_to_accounts.rb b/db/migrate/20260621000000_add_exclude_from_reports_to_accounts.rb
new file mode 100644
index 000000000..9f88f8f92
--- /dev/null
+++ b/db/migrate/20260621000000_add_exclude_from_reports_to_accounts.rb
@@ -0,0 +1,6 @@
+class AddExcludeFromReportsToAccounts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :accounts, :exclude_from_reports, :boolean, default: false, null: false
+    add_index :accounts, [ :family_id, :exclude_from_reports ]
+  end
+end
diff --git a/db/migrate/20260622212404_create_trading212_items_and_accounts.rb b/db/migrate/20260622212404_create_trading212_items_and_accounts.rb
new file mode 100644
index 000000000..d932cadc4
--- /dev/null
+++ b/db/migrate/20260622212404_create_trading212_items_and_accounts.rb
@@ -0,0 +1,42 @@
+class CreateTrading212ItemsAndAccounts < ActiveRecord::Migration[7.2]
+  def change
+    create_table :trading212_items, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.string :name
+      t.string :status, default: "good", null: false
+      t.string :environment, default: "live", null: false
+      t.string :currency
+      t.boolean :scheduled_for_deletion, default: false, null: false
+      t.boolean :pending_account_setup, default: false, null: false
+      t.string :api_key
+      t.jsonb :raw_instruments_payload, default: [], null: false
+
+      t.timestamps
+    end
+
+    add_index :trading212_items, :status
+
+    create_table :trading212_accounts, id: :uuid do |t|
+      t.references :trading212_item, null: false, foreign_key: true, type: :uuid
+      t.string :name
+      t.string :trading212_account_id
+      t.string :account_type
+      t.string :currency
+      t.decimal :current_balance, precision: 19, scale: 4
+      t.decimal :cash_balance, precision: 19, scale: 4
+      t.jsonb :raw_positions_payload, default: [], null: false
+      t.jsonb :raw_orders_payload, default: [], null: false
+      t.jsonb :raw_dividends_payload, default: [], null: false
+      t.jsonb :raw_transactions_payload, default: [], null: false
+      t.datetime :last_positions_sync
+      t.datetime :last_orders_sync
+
+      t.timestamps
+    end
+
+    add_index :trading212_accounts, [ :trading212_item_id, :trading212_account_id ],
+      unique: true,
+      where: "(trading212_account_id IS NOT NULL)",
+      name: "index_trading212_accounts_on_item_and_account_id"
+  end
+end
diff --git a/db/migrate/20260622224653_add_api_secret_to_trading212_items.rb b/db/migrate/20260622224653_add_api_secret_to_trading212_items.rb
new file mode 100644
index 000000000..c353fb1ab
--- /dev/null
+++ b/db/migrate/20260622224653_add_api_secret_to_trading212_items.rb
@@ -0,0 +1,5 @@
+class AddApiSecretToTrading212Items < ActiveRecord::Migration[7.2]
+  def change
+    add_column :trading212_items, :api_secret, :string
+  end
+end
diff --git a/db/migrate/20260625120000_add_allocation_to_goal_accounts.rb b/db/migrate/20260625120000_add_allocation_to_goal_accounts.rb
new file mode 100644
index 000000000..cdbfe0d39
--- /dev/null
+++ b/db/migrate/20260625120000_add_allocation_to_goal_accounts.rb
@@ -0,0 +1,14 @@
+class AddAllocationToGoalAccounts < ActiveRecord::Migration[7.2]
+  def change
+    # Per-account earmark toward a goal. NULL = "dedicate the whole account
+    # balance" (the v1 behaviour), so every existing goal_accounts row keeps
+    # its current semantics with no backfill. A set amount reserves a fixed
+    # slice of the account, letting one account fund several goals without
+    # double-counting (Goal#current_balance applies the shared-pool math).
+    add_column :goal_accounts, :allocated_amount, :decimal, precision: 19, scale: 4, null: true
+
+    add_check_constraint :goal_accounts,
+                         "allocated_amount IS NULL OR allocated_amount >= 0",
+                         name: "chk_goal_accounts_allocation_non_negative"
+  end
+end
diff --git a/db/migrate/20260625130000_add_progress_basis_to_goals.rb b/db/migrate/20260625130000_add_progress_basis_to_goals.rb
new file mode 100644
index 000000000..f084b76a9
--- /dev/null
+++ b/db/migrate/20260625130000_add_progress_basis_to_goals.rb
@@ -0,0 +1,16 @@
+class AddProgressBasisToGoals < ActiveRecord::Migration[7.2]
+  def change
+    # How a goal measures progress:
+    # - "balance"       : live account balance (market value for investment
+    #                     accounts) — the v1 behaviour, the default.
+    # - "contributions" : net money put in, excluding market gains/losses
+    #                     (balances.net_market_flows) — the default for goals
+    #                     funded by investment accounts so a market swing
+    #                     doesn't move the goal.
+    add_column :goals, :progress_basis, :string, null: false, default: "balance"
+
+    add_check_constraint :goals,
+                         "progress_basis IN ('balance','contributions')",
+                         name: "chk_goals_progress_basis_enum"
+  end
+end
diff --git a/db/migrate/20260625180417_create_questrade_items_and_accounts.rb b/db/migrate/20260625180417_create_questrade_items_and_accounts.rb
new file mode 100644
index 000000000..d6a3490e8
--- /dev/null
+++ b/db/migrate/20260625180417_create_questrade_items_and_accounts.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+class CreateQuestradeItemsAndAccounts < ActiveRecord::Migration[7.2]
+  def change
+    # Create provider items table (stores per-family connection credentials)
+    create_table :questrade_items, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.string :name
+
+      # Institution metadata
+      t.string :institution_id
+      t.string :institution_name
+      t.string :institution_domain
+      t.string :institution_url
+      t.string :institution_color
+
+      # Status and lifecycle
+      t.string :status, default: "good", null: false
+      t.boolean :scheduled_for_deletion, default: false, null: false
+      t.boolean :pending_account_setup, default: false, null: false
+
+      # Sync settings
+      t.datetime :sync_start_date
+
+      # Raw data storage
+      t.jsonb :raw_payload
+      t.jsonb :raw_institution_payload
+
+      # Provider-specific credential fields
+      t.text :refresh_token
+      t.string :api_server
+
+      t.timestamps
+    end
+
+    add_index :questrade_items, :status
+
+    # Create provider accounts table (stores individual account data from provider)
+    create_table :questrade_accounts, id: :uuid do |t|
+      t.references :questrade_item, null: false, foreign_key: true, type: :uuid
+
+      # Account identification
+      t.string :name
+      t.string :questrade_account_id
+      t.string :account_number
+
+      # Account details
+      t.string :currency
+      t.decimal :current_balance, precision: 19, scale: 4
+      t.string :account_status
+      t.string :account_type
+      t.string :provider
+
+      # Metadata and raw data
+      t.jsonb :institution_metadata
+      t.jsonb :raw_payload
+
+      # Investment-specific columns
+      t.string :questrade_authorization_id
+      t.decimal :cash_balance, precision: 19, scale: 4, default: 0.0
+      t.jsonb :raw_holdings_payload, default: []
+      t.jsonb :raw_activities_payload, default: []
+      t.datetime :last_holdings_sync
+      t.datetime :last_activities_sync
+      t.boolean :activities_fetch_pending, default: false
+
+      # Sync settings
+      t.date :sync_start_date
+
+      t.timestamps
+    end
+
+    add_index :questrade_accounts, [ :questrade_item_id, :questrade_account_id ], unique: true
+    add_index :questrade_accounts, :questrade_authorization_id
+  end
+end
diff --git a/db/migrate/20260625230639_add_oauth_device_flow_to_snaptrade_items.rb b/db/migrate/20260625230639_add_oauth_device_flow_to_snaptrade_items.rb
new file mode 100644
index 000000000..19bf5c3d1
--- /dev/null
+++ b/db/migrate/20260625230639_add_oauth_device_flow_to_snaptrade_items.rb
@@ -0,0 +1,9 @@
+class AddOauthDeviceFlowToSnaptradeItems < ActiveRecord::Migration[7.2]
+  def change
+    add_column :snaptrade_items, :oauth_access_token, :text
+    add_column :snaptrade_items, :oauth_refresh_token, :text
+    add_column :snaptrade_items, :oauth_token_type, :string
+    add_column :snaptrade_items, :oauth_scope, :string
+    add_column :snaptrade_items, :oauth_token_expires_at, :datetime
+  end
+end
diff --git a/db/migrate/20260627000000_create_notification_deliveries.rb b/db/migrate/20260627000000_create_notification_deliveries.rb
new file mode 100644
index 000000000..dd6f2c249
--- /dev/null
+++ b/db/migrate/20260627000000_create_notification_deliveries.rb
@@ -0,0 +1,15 @@
+class CreateNotificationDeliveries < ActiveRecord::Migration[7.2]
+  def change
+    create_table :notification_deliveries, id: :uuid do |t|
+      t.references :rule, null: false, foreign_key: { on_delete: :cascade }, type: :uuid
+      # Transactions are deleted and re-ingested frequently during syncs, so we
+      # cascade rather than block their deletion. Dedup keys on this row id.
+      t.references :transaction, null: false, foreign_key: { on_delete: :cascade }, type: :uuid
+
+      t.timestamps
+    end
+
+    add_index :notification_deliveries, [ :rule_id, :transaction_id ],
+      unique: true, name: "index_notification_deliveries_on_rule_and_transaction"
+  end
+end
diff --git a/db/migrate/20260627003348_add_raw_balances_payload_to_questrade_accounts.rb b/db/migrate/20260627003348_add_raw_balances_payload_to_questrade_accounts.rb
new file mode 100644
index 000000000..23c0f4483
--- /dev/null
+++ b/db/migrate/20260627003348_add_raw_balances_payload_to_questrade_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRawBalancesPayloadToQuestradeAccounts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :questrade_accounts, :raw_balances_payload, :jsonb
+  end
+end
diff --git a/db/migrate/20260627101954_add_balance_reversal_to_enable_banking_accounts.rb b/db/migrate/20260627101954_add_balance_reversal_to_enable_banking_accounts.rb
new file mode 100644
index 000000000..d34d7262d
--- /dev/null
+++ b/db/migrate/20260627101954_add_balance_reversal_to_enable_banking_accounts.rb
@@ -0,0 +1,5 @@
+class AddBalanceReversalToEnableBankingAccounts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :enable_banking_accounts, :treat_balance_as_available_credit, :boolean, default: false, null: false unless column_exists?(:enable_banking_accounts, :treat_balance_as_available_credit)
+  end
+end
diff --git a/db/migrate/20260628171409_add_amount_to_transfers.rb b/db/migrate/20260628171409_add_amount_to_transfers.rb
new file mode 100644
index 000000000..3005d5947
--- /dev/null
+++ b/db/migrate/20260628171409_add_amount_to_transfers.rb
@@ -0,0 +1,25 @@
+class AddAmountToTransfers < ActiveRecord::Migration[8.1]
+  def change
+    add_column :transfers, :amount, :decimal, precision: 19, scale: 4, null: false, default: "0.0"
+
+    reversible do |dir|
+      dir.up do
+        # Backfill principal from outflow entries: amount = outflow_entry.amount - source_fee_amount
+        # Historical rows can violate the modern sign convention (negative
+        # outflow amounts) or carry fees larger than the entry amount, which
+        # would produce a negative principal and trip the check constraint
+        # below — aborting the migration and blocking the whole upgrade.
+        # Normalize with ABS and clamp at zero instead (#2653).
+        execute <<~SQL
+          UPDATE transfers
+          SET amount = GREATEST(ABS(e.amount) - COALESCE(transfers.source_fee_amount, 0), 0)
+          FROM entries e
+          WHERE e.entryable_id = transfers.outflow_transaction_id
+            AND e.entryable_type = 'Transaction';
+        SQL
+      end
+    end
+
+    add_check_constraint :transfers, "amount >= 0::numeric", name: "check_transfer_amount_non_negative"
+  end
+end
diff --git a/db/migrate/20260628171431_add_transfer_id_to_transactions.rb b/db/migrate/20260628171431_add_transfer_id_to_transactions.rb
new file mode 100644
index 000000000..96011d574
--- /dev/null
+++ b/db/migrate/20260628171431_add_transfer_id_to_transactions.rb
@@ -0,0 +1,5 @@
+class AddTransferIdToTransactions < ActiveRecord::Migration[8.1]
+  def change
+    add_reference :transactions, :transfer, null: true, foreign_key: true, type: :uuid
+  end
+end
diff --git a/db/migrate/20260628200000_remove_fee_amounts_from_transfers.rb b/db/migrate/20260628200000_remove_fee_amounts_from_transfers.rb
new file mode 100644
index 000000000..b6c07f05d
--- /dev/null
+++ b/db/migrate/20260628200000_remove_fee_amounts_from_transfers.rb
@@ -0,0 +1,8 @@
+class RemoveFeeAmountsFromTransfers < ActiveRecord::Migration[7.2]
+  def change
+    remove_check_constraint :transfers, name: "check_source_fee_non_negative"
+    remove_check_constraint :transfers, name: "check_destination_fee_non_negative"
+    remove_column :transfers, :source_fee_amount, :decimal
+    remove_column :transfers, :destination_fee_amount, :decimal
+  end
+end
diff --git a/db/migrate/20260701120000_create_insights.rb b/db/migrate/20260701120000_create_insights.rb
new file mode 100644
index 000000000..4321f186a
--- /dev/null
+++ b/db/migrate/20260701120000_create_insights.rb
@@ -0,0 +1,33 @@
+class CreateInsights < ActiveRecord::Migration[7.2]
+  def change
+    create_table :insights, id: :uuid do |t|
+      # index: false — every composite index below leads with family_id, so the
+      # auto-created single-column index would be redundant write overhead.
+      t.references :family, null: false, type: :uuid, foreign_key: true, index: false
+      t.string :insight_type, null: false
+      t.string :priority, null: false, default: "medium"
+      t.string :status, null: false, default: "active"
+      t.string :title, null: false
+      t.text :body, null: false
+      t.jsonb :metadata, null: false, default: {}
+      t.string :currency, null: false, default: "USD"
+      t.date :period_start
+      t.date :period_end
+      t.datetime :generated_at, null: false, default: -> { "CURRENT_TIMESTAMP" }
+      t.datetime :read_at
+      t.datetime :dismissed_at
+      # Embeds the insight type and subject, e.g. "spending_anomaly:<category-id>:2026-07",
+      # so re-running the nightly job refreshes the existing row instead of duplicating it.
+      t.string :dedup_key, null: false
+
+      t.timestamps
+    end
+
+    add_check_constraint :insights, "priority IN ('high', 'medium', 'low')", name: "chk_insights_priority"
+    add_check_constraint :insights, "status IN ('active', 'read', 'dismissed', 'expired')", name: "chk_insights_status"
+
+    add_index :insights, [ :family_id, :status ]
+    add_index :insights, [ :family_id, :dedup_key ], unique: true
+    add_index :insights, [ :family_id, :generated_at ]
+  end
+end
diff --git a/db/migrate/20260708000000_add_enable_category_matcher_to_accounts.rb b/db/migrate/20260708000000_add_enable_category_matcher_to_accounts.rb
new file mode 100644
index 000000000..07b0e15e4
--- /dev/null
+++ b/db/migrate/20260708000000_add_enable_category_matcher_to_accounts.rb
@@ -0,0 +1,5 @@
+class AddEnableCategoryMatcherToAccounts < ActiveRecord::Migration[7.2]
+  def change
+    add_column :accounts, :enable_category_matcher, :boolean, default: true, null: false
+  end
+end
diff --git a/db/migrate/20260710120000_mark_legacy_snaptrade_items_requiring_update.rb b/db/migrate/20260710120000_mark_legacy_snaptrade_items_requiring_update.rb
new file mode 100644
index 000000000..937847420
--- /dev/null
+++ b/db/migrate/20260710120000_mark_legacy_snaptrade_items_requiring_update.rb
@@ -0,0 +1,16 @@
+class MarkLegacySnaptradeItemsRequiringUpdate < ActiveRecord::Migration[7.2]
+  # Data-only: legacy items (connected via client_id/consumer_key, no OAuth
+  # tokens) can no longer sync and must be reconnected via the OAuth flow.
+  def up
+    execute <<~SQL
+      UPDATE snaptrade_items
+      SET status = 'requires_update'
+      WHERE (oauth_access_token IS NULL OR oauth_access_token = '')
+        AND scheduled_for_deletion = FALSE
+    SQL
+  end
+
+  def down
+    # Irreversible data migration; no-op
+  end
+end
diff --git a/db/migrate/20260713090000_add_facts_to_insights.rb b/db/migrate/20260713090000_add_facts_to_insights.rb
new file mode 100644
index 000000000..e34861c3f
--- /dev/null
+++ b/db/migrate/20260713090000_add_facts_to_insights.rb
@@ -0,0 +1,8 @@
+class AddFactsToInsights < ActiveRecord::Migration[7.2]
+  def change
+    # Display values (formatted money, localized dates) used to render key
+    # figures and contextual links. Refreshed on every run — unlike
+    # `metadata`, which holds only the bucketed change-detection signals.
+    add_column :insights, :facts, :jsonb, null: false, default: {}
+  end
+end
diff --git a/db/migrate/20260714120000_add_cancel_requested_at_to_syncs.rb b/db/migrate/20260714120000_add_cancel_requested_at_to_syncs.rb
new file mode 100644
index 000000000..91be06a8c
--- /dev/null
+++ b/db/migrate/20260714120000_add_cancel_requested_at_to_syncs.rb
@@ -0,0 +1,5 @@
+class AddCancelRequestedAtToSyncs < ActiveRecord::Migration[7.2]
+  def change
+    add_column :syncs, :cancel_requested_at, :datetime
+  end
+end
diff --git a/db/migrate/20260718000000_add_avm_provider_to_properties.rb b/db/migrate/20260718000000_add_avm_provider_to_properties.rb
new file mode 100644
index 000000000..c85de8458
--- /dev/null
+++ b/db/migrate/20260718000000_add_avm_provider_to_properties.rb
@@ -0,0 +1,6 @@
+class AddAvmProviderToProperties < ActiveRecord::Migration[7.2]
+  def change
+    add_column :properties, :avm_provider, :string
+    add_column :properties, :avm_last_synced_on, :date
+  end
+end
diff --git a/db/migrate/20260719000000_create_provider_request_counts.rb b/db/migrate/20260719000000_create_provider_request_counts.rb
new file mode 100644
index 000000000..04d27f439
--- /dev/null
+++ b/db/migrate/20260719000000_create_provider_request_counts.rb
@@ -0,0 +1,13 @@
+class CreateProviderRequestCounts < ActiveRecord::Migration[7.2]
+  def change
+    create_table :provider_request_counts, id: :uuid do |t|
+      t.string :provider_key, null: false
+      t.string :period, null: false
+      t.integer :count, null: false, default: 0
+
+      t.timestamps
+    end
+
+    add_index :provider_request_counts, [ :provider_key, :period ], unique: true
+  end
+end
diff --git a/db/migrate/20260719000001_add_avm_provider_check_to_properties.rb b/db/migrate/20260719000001_add_avm_provider_check_to_properties.rb
new file mode 100644
index 000000000..c667aa688
--- /dev/null
+++ b/db/migrate/20260719000001_add_avm_provider_check_to_properties.rb
@@ -0,0 +1,7 @@
+class AddAvmProviderCheckToProperties < ActiveRecord::Migration[7.2]
+  def change
+    add_check_constraint :properties,
+      "avm_provider IS NULL OR avm_provider IN ('rentcast', 'realie')",
+      name: "properties_avm_provider_check"
+  end
+end
diff --git a/db/migrate/20260719000002_add_avm_sync_index_to_properties.rb b/db/migrate/20260719000002_add_avm_sync_index_to_properties.rb
new file mode 100644
index 000000000..7f8d3bc3a
--- /dev/null
+++ b/db/migrate/20260719000002_add_avm_sync_index_to_properties.rb
@@ -0,0 +1,11 @@
+class AddAvmSyncIndexToProperties < ActiveRecord::Migration[7.2]
+  def change
+    # Keyed on avm_last_synced_on (matching the daily job's
+    # ORDER BY avm_last_synced_on ASC NULLS FIRST) so the index also
+    # serves the sort, not just the avm_provider IS NOT NULL filter.
+    add_index :properties, :avm_last_synced_on,
+      order: { avm_last_synced_on: "ASC NULLS FIRST" },
+      where: "avm_provider IS NOT NULL",
+      name: "index_properties_on_avm_provider_sync"
+  end
+end
diff --git a/db/migrate/20260725000000_create_redbark_items_and_accounts.rb b/db/migrate/20260725000000_create_redbark_items_and_accounts.rb
new file mode 100644
index 000000000..28b04b495
--- /dev/null
+++ b/db/migrate/20260725000000_create_redbark_items_and_accounts.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+class CreateRedbarkItemsAndAccounts < ActiveRecord::Migration[7.2]
+  def change
+    # Create provider items table (stores per-family connection credentials)
+    create_table :redbark_items, id: :uuid do |t|
+      t.references :family, null: false, foreign_key: true, type: :uuid
+      t.string :name, null: false
+
+      # Institution metadata
+      t.string :institution_id
+      t.string :institution_name
+      t.string :institution_domain
+      t.string :institution_url
+      t.string :institution_color
+
+      # Status and lifecycle
+      t.string :status, default: "good", null: false
+      t.boolean :scheduled_for_deletion, default: false, null: false
+      t.boolean :pending_account_setup, default: false, null: false
+
+      # Sync settings
+      t.datetime :sync_start_date
+
+      # Raw data storage
+      t.jsonb :raw_payload
+      t.jsonb :raw_institution_payload
+
+      # Provider-specific credential fields
+      t.text :api_key, null: false
+
+      t.timestamps
+    end
+
+    add_index :redbark_items, :status
+
+    # Create provider accounts table (stores individual account data from provider)
+    create_table :redbark_accounts, id: :uuid do |t|
+      t.references :redbark_item, null: false, foreign_key: true, type: :uuid
+
+      # Account identification
+      t.string :name, null: false
+      t.string :redbark_account_id, null: false
+      t.string :connection_id
+      t.string :account_number
+
+      # Account details
+      t.string :currency, null: false
+      t.decimal :current_balance, precision: 19, scale: 4
+      t.string :account_status
+      t.string :account_type
+      t.string :provider
+
+      # Setup state - accounts the user chose to skip stay hidden from setup prompts
+      t.boolean :ignored, default: false, null: false
+
+      # Metadata and raw data
+      t.jsonb :institution_metadata
+      t.jsonb :raw_payload
+      t.jsonb :raw_transactions_payload
+
+      # Sync settings
+      t.date :sync_start_date
+
+      t.timestamps
+    end
+
+    add_index :redbark_accounts, [ :redbark_item_id, :redbark_account_id ], unique: true, name: "index_redbark_accounts_on_item_and_account_id"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1faa87b27..d209269a5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
+ActiveRecord::Schema[7.2].define(version: 2026_07_25_000000) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
@@ -53,7 +53,6 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "content_type", limit: 100, null: false
     t.bigint "byte_size", null: false
     t.string "checksum", limit: 64, null: false
-    t.string "content_sha256"
     t.string "source", default: "manual_upload", null: false
     t.string "upload_status", default: "stored", null: false
     t.string "institution_name_hint", limit: 200
@@ -70,6 +69,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.jsonb "sanitized_parser_output", default: {}, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "content_sha256"
     t.index ["account_id", "period_start_on", "period_end_on"], name: "index_account_statements_on_account_period"
     t.index ["account_id"], name: "index_account_statements_on_account_id"
     t.index ["family_id", "checksum"], name: "index_account_statements_on_family_checksum"
@@ -117,6 +117,10 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "institution_domain"
     t.text "notes"
     t.uuid "owner_id"
+    t.datetime "disabled_at"
+    t.boolean "exclude_from_reports", default: false, null: false
+    t.integer "account_providers_count", default: 0, null: false
+    t.boolean "enable_category_matcher", default: true, null: false
     t.index ["accountable_id", "accountable_type"], name: "index_accounts_on_accountable_id_and_accountable_type"
     t.index ["accountable_type"], name: "index_accounts_on_accountable_type"
     t.index ["currency"], name: "index_accounts_on_currency"
@@ -124,6 +128,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.index ["family_id", "id"], name: "index_accounts_on_family_id_and_id"
     t.index ["family_id", "status", "accountable_type"], name: "index_accounts_on_family_id_status_accountable_type"
     t.index ["family_id", "status"], name: "index_accounts_on_family_id_and_status"
+    t.index ["family_id", "exclude_from_reports"], name: "index_accounts_on_family_id_and_exclude_from_reports"
     t.index ["family_id"], name: "index_accounts_on_family_id"
     t.index ["import_id"], name: "index_accounts_on_import_id"
     t.index ["owner_id"], name: "index_accounts_on_owner_id"
@@ -299,9 +304,9 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "institution_domain"
     t.string "institution_url"
     t.string "institution_color"
-    t.string "status", default: "good"
-    t.boolean "scheduled_for_deletion", default: false
-    t.boolean "pending_account_setup", default: false
+    t.string "status", default: "good", null: false
+    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.boolean "pending_account_setup", default: false, null: false
     t.datetime "sync_start_date"
     t.jsonb "raw_payload"
     t.text "api_key"
@@ -574,6 +579,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "product"
     t.decimal "credit_limit", precision: 19, scale: 4
     t.jsonb "identification_hashes", default: []
+    t.boolean "treat_balance_as_available_credit", default: false, null: false
     t.index ["account_id"], name: "index_enable_banking_accounts_on_account_id"
     t.index ["enable_banking_item_id"], name: "index_enable_banking_accounts_on_enable_banking_item_id"
     t.index ["identification_hashes"], name: "index_enable_banking_accounts_on_identification_hashes", using: :gin
@@ -634,15 +640,16 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.boolean "import_locked", default: false, null: false
     t.uuid "parent_entry_id"
     t.index "lower((name)::text)", name: "index_entries_on_lower_name"
+    t.index ["account_id", "date", "entryable_id"], name: "index_entries_on_investment_totals_lookup", where: "(((entryable_type)::text = 'Trade'::text) AND (excluded = false))"
     t.index ["account_id", "date"], name: "index_entries_on_account_id_and_date"
     t.index ["account_id", "source", "external_id"], name: "index_entries_on_account_source_and_external_id", unique: true, where: "((external_id IS NOT NULL) AND (source IS NOT NULL))"
     t.index ["account_id"], name: "index_entries_on_account_id"
+    t.index ["currency", "amount", "date", "account_id"], name: "index_entries_on_transfer_match_lookup", where: "(((entryable_type)::text = 'Transaction'::text) AND (excluded = false))"
     t.index ["date"], name: "index_entries_on_date"
     t.index ["entryable_type"], name: "index_entries_on_entryable_type"
     t.index ["import_id"], name: "index_entries_on_import_id"
     t.index ["import_locked"], name: "index_entries_on_import_locked_true", where: "(import_locked = true)"
     t.index ["parent_entry_id"], name: "index_entries_on_parent_entry_id"
-    t.index ["currency", "amount", "date", "account_id"], name: "index_entries_on_transfer_match_lookup", where: "((entryable_type)::text = 'Transaction'::text)"
     t.index ["user_modified"], name: "index_entries_on_user_modified_true", where: "(user_modified = true)"
   end
 
@@ -809,9 +816,11 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.uuid "account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.decimal "allocated_amount", precision: 19, scale: 4
     t.index ["account_id"], name: "index_goal_accounts_on_account_id"
     t.index ["goal_id", "account_id"], name: "index_savings_goal_accounts_on_goal_and_account", unique: true
     t.index ["goal_id"], name: "index_goal_accounts_on_goal_id"
+    t.check_constraint "allocated_amount IS NULL OR allocated_amount >= 0::numeric", name: "chk_goal_accounts_allocation_non_negative"
   end
 
   create_table "goal_pledges", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -845,10 +854,12 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "icon"
+    t.string "progress_basis", default: "balance", null: false
     t.index ["family_id", "state"], name: "index_goals_on_family_id_and_state"
     t.index ["family_id"], name: "index_goals_on_family_id"
     t.check_constraint "char_length(name::text) <= 255", name: "chk_savings_goals_name_length"
-    t.check_constraint "state::text = ANY (ARRAY['active'::character varying::text, 'paused'::character varying::text, 'completed'::character varying::text, 'archived'::character varying::text])", name: "chk_savings_goals_state_enum"
+    t.check_constraint "progress_basis::text = ANY (ARRAY['balance'::character varying, 'contributions'::character varying]::text[])", name: "chk_goals_progress_basis_enum"
+    t.check_constraint "state::text = ANY (ARRAY['active'::character varying, 'paused'::character varying, 'completed'::character varying, 'archived'::character varying]::text[])", name: "chk_savings_goals_state_enum"
     t.check_constraint "target_amount > 0::numeric", name: "chk_savings_goals_target_amount_positive"
   end
 
@@ -885,9 +896,9 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.decimal "current_balance", precision: 19, scale: 4
     t.decimal "cash_balance", precision: 19, scale: 4
     t.jsonb "institution_metadata"
-    t.jsonb "raw_holdings_payload", default: [], null: false
-    t.jsonb "raw_activities_payload", default: {}, null: false
-    t.jsonb "raw_cash_report_payload", default: [], null: false
+    t.jsonb "raw_holdings_payload", default: []
+    t.jsonb "raw_activities_payload", default: {}
+    t.jsonb "raw_cash_report_payload", default: []
     t.date "report_date"
     t.datetime "last_holdings_sync"
     t.datetime "last_activities_sync"
@@ -901,8 +912,8 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
   create_table "ibkr_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "family_id", null: false
     t.string "name"
-    t.string "status", default: "good", null: false
-    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.string "status", default: "good"
+    t.boolean "scheduled_for_deletion", default: false
     t.boolean "pending_account_setup", default: false, null: false
     t.jsonb "raw_payload"
     t.string "query_id"
@@ -977,11 +988,56 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.text "conditions"
     t.text "actions"
     t.integer "source_row_number", null: false
+    t.string "merchant_color"
+    t.string "merchant_website"
     t.index ["import_id", "source_row_number"], name: "index_import_rows_on_import_id_and_source_row_number", unique: true
     t.index ["import_id"], name: "index_import_rows_on_import_id"
     t.check_constraint "source_row_number > 0", name: "chk_import_rows_source_row_number_positive"
   end
 
+  create_table "import_sessions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.string "import_type", default: "SureImport", null: false
+    t.string "status", default: "pending", null: false
+    t.string "client_session_id", limit: 255
+    t.integer "expected_chunks"
+    t.jsonb "summary", default: {}, null: false
+    t.jsonb "error_details", default: {}, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id", "client_session_id"], name: "idx_import_sessions_on_family_client_session", unique: true, where: "(client_session_id IS NOT NULL)"
+    t.index ["family_id", "status"], name: "index_import_sessions_on_family_id_and_status"
+    t.index ["family_id"], name: "index_import_sessions_on_family_id"
+    t.index ["id", "family_id"], name: "idx_import_sessions_on_id_family", unique: true
+    t.check_constraint "client_session_id IS NULL OR btrim(client_session_id::text) <> ''::text", name: "chk_import_sessions_client_session_id_present"
+    t.check_constraint "expected_chunks IS NULL OR expected_chunks > 0", name: "chk_import_sessions_expected_chunks_positive"
+    t.check_constraint "jsonb_typeof(error_details) = 'object'::text", name: "chk_import_sessions_error_details_object"
+    t.check_constraint "import_type::text = 'SureImport'::text", name: "chk_import_sessions_import_type"
+    t.check_constraint "status::text = ANY (ARRAY['pending'::character varying, 'importing'::character varying, 'complete'::character varying, 'failed'::character varying]::text[])", name: "chk_import_sessions_status"
+    t.check_constraint "jsonb_typeof(summary) = 'object'::text", name: "chk_import_sessions_summary_object"
+  end
+
+  create_table "import_source_mappings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.uuid "import_session_id", null: false
+    t.string "source_type", limit: 64, null: false
+    t.string "source_id", limit: 255, null: false
+    t.string "target_type", null: false
+    t.uuid "target_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id", "source_type", "source_id"], name: "idx_import_source_mappings_on_family_source"
+    t.index ["family_id"], name: "index_import_source_mappings_on_family_id"
+    t.index ["import_session_id", "source_type", "source_id"], name: "index_import_source_mappings_on_session_type_and_source", unique: true
+    t.index ["import_session_id"], name: "index_import_source_mappings_on_import_session_id"
+    t.index ["target_type", "target_id"], name: "idx_import_source_mappings_on_target"
+    t.check_constraint "btrim(source_id::text) <> ''::text", name: "chk_import_source_mappings_source_id_present"
+    t.check_constraint "source_type::text = ANY (ARRAY['Account'::character varying, 'Category'::character varying, 'Tag'::character varying, 'Merchant'::character varying, 'RecurringTransaction'::character varying, 'Transaction'::character varying, 'Budget'::character varying, 'Security'::character varying, 'Rule'::character varying]::text[])", name: "chk_import_source_mappings_source_type"
+    t.check_constraint "btrim(source_type::text) <> ''::text", name: "chk_import_source_mappings_source_type_present"
+    t.check_constraint "target_type::text = ANY (ARRAY['Account'::character varying, 'Category'::character varying, 'Tag'::character varying, 'Merchant'::character varying, 'RecurringTransaction'::character varying, 'Transaction'::character varying, 'Budget'::character varying, 'Security'::character varying, 'Rule'::character varying]::text[])", name: "chk_import_source_mappings_target_type"
+    t.check_constraint "btrim(target_type::text) <> ''::text", name: "chk_import_source_mappings_target_type_present"
+  end
+
   create_table "imports", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.jsonb "column_mappings"
     t.string "status"
@@ -1021,8 +1077,24 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.uuid "account_statement_id"
     t.jsonb "expected_record_counts", default: {}, null: false
     t.jsonb "readback_verification", default: {}, null: false
+    t.uuid "import_session_id"
+    t.integer "sequence"
+    t.string "client_chunk_id", limit: 255
+    t.string "checksum", limit: 64
+    t.jsonb "summary", default: {}, null: false
+    t.jsonb "error_details", default: {}, null: false
     t.index ["account_statement_id"], name: "index_imports_on_account_statement_id"
     t.index ["family_id"], name: "index_imports_on_family_id"
+    t.index ["import_session_id", "client_chunk_id"], name: "idx_imports_on_session_client_chunk", unique: true, where: "((import_session_id IS NOT NULL) AND (client_chunk_id IS NOT NULL))"
+    t.index ["import_session_id", "sequence"], name: "idx_imports_on_session_sequence", unique: true, where: "((import_session_id IS NOT NULL) AND (sequence IS NOT NULL))"
+    t.index ["import_session_id"], name: "index_imports_on_import_session_id"
+    t.check_constraint "checksum IS NULL OR length(checksum::text) = 64", name: "chk_imports_checksum_sha256_length"
+    t.check_constraint "client_chunk_id IS NULL OR btrim(client_chunk_id::text) <> ''::text", name: "chk_imports_client_chunk_id_present"
+    t.check_constraint "jsonb_typeof(error_details) = 'object'::text", name: "chk_imports_error_details_object"
+    t.check_constraint "import_session_id IS NULL OR checksum IS NOT NULL", name: "chk_imports_session_checksum_present"
+    t.check_constraint "import_session_id IS NULL OR sequence IS NOT NULL", name: "chk_imports_session_sequence_present"
+    t.check_constraint "jsonb_typeof(summary) = 'object'::text", name: "chk_imports_summary_object"
+    t.check_constraint "sequence IS NULL OR sequence > 0", name: "chk_imports_session_sequence_positive"
   end
 
   create_table "indexa_capital_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -1083,6 +1155,31 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "subtype"
   end
 
+  create_table "insights", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.text "body", null: false
+    t.datetime "created_at", null: false
+    t.string "currency", default: "USD", null: false
+    t.string "dedup_key", null: false
+    t.datetime "dismissed_at"
+    t.jsonb "facts", default: {}, null: false
+    t.uuid "family_id", null: false
+    t.datetime "generated_at", default: -> { "CURRENT_TIMESTAMP" }, null: false
+    t.string "insight_type", null: false
+    t.jsonb "metadata", default: {}, null: false
+    t.date "period_end"
+    t.date "period_start"
+    t.string "priority", default: "medium", null: false
+    t.datetime "read_at"
+    t.string "status", default: "active", null: false
+    t.string "title", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id", "dedup_key"], name: "index_insights_on_family_id_and_dedup_key", unique: true
+    t.index ["family_id", "generated_at"], name: "index_insights_on_family_id_and_generated_at"
+    t.index ["family_id", "status"], name: "index_insights_on_family_id_and_status"
+    t.check_constraint "priority::text = ANY (ARRAY['high'::character varying, 'medium'::character varying, 'low'::character varying]::text[])", name: "chk_insights_priority"
+    t.check_constraint "status::text = ANY (ARRAY['active'::character varying, 'read'::character varying, 'dismissed'::character varying, 'expired'::character varying]::text[])", name: "chk_insights_status"
+  end
+
   create_table "invitations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "email"
     t.string "role"
@@ -1311,6 +1408,16 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.index ["user_id"], name: "index_mobile_devices_on_user_id"
   end
 
+  create_table "notification_deliveries", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "rule_id", null: false
+    t.uuid "transaction_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["rule_id", "transaction_id"], name: "index_notification_deliveries_on_rule_and_transaction", unique: true
+    t.index ["rule_id"], name: "index_notification_deliveries_on_rule_id"
+    t.index ["transaction_id"], name: "index_notification_deliveries_on_transaction_id"
+  end
+
   create_table "oauth_access_grants", force: :cascade do |t|
     t.string "resource_owner_id", null: false
     t.bigint "application_id", null: false
@@ -1436,6 +1543,69 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "area_unit"
     t.jsonb "locked_attributes", default: {}
     t.string "subtype"
+    t.string "avm_provider"
+    t.date "avm_last_synced_on"
+    t.index ["avm_last_synced_on"], name: "index_properties_on_avm_provider_sync", order: "NULLS FIRST", where: "(avm_provider IS NOT NULL)"
+    t.check_constraint "avm_provider IS NULL OR (avm_provider::text = ANY (ARRAY['rentcast'::character varying, 'realie'::character varying]::text[]))", name: "properties_avm_provider_check"
+  end
+
+  create_table "provider_request_counts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.integer "count", default: 0, null: false
+    t.datetime "created_at", null: false
+    t.string "period", null: false
+    t.string "provider_key", null: false
+    t.datetime "updated_at", null: false
+    t.index ["provider_key", "period"], name: "index_provider_request_counts_on_provider_key_and_period", unique: true
+  end
+
+  create_table "questrade_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "account_number"
+    t.string "account_status"
+    t.string "account_type"
+    t.boolean "activities_fetch_pending", default: false
+    t.decimal "cash_balance", precision: 19, scale: 4, default: "0.0"
+    t.datetime "created_at", null: false
+    t.string "currency"
+    t.decimal "current_balance", precision: 19, scale: 4
+    t.jsonb "institution_metadata"
+    t.datetime "last_activities_sync"
+    t.datetime "last_holdings_sync"
+    t.string "name"
+    t.string "provider"
+    t.string "questrade_account_id"
+    t.string "questrade_authorization_id"
+    t.uuid "questrade_item_id", null: false
+    t.jsonb "raw_activities_payload", default: []
+    t.jsonb "raw_balances_payload"
+    t.jsonb "raw_holdings_payload", default: []
+    t.jsonb "raw_payload"
+    t.date "sync_start_date"
+    t.datetime "updated_at", null: false
+    t.index ["questrade_authorization_id"], name: "index_questrade_accounts_on_questrade_authorization_id"
+    t.index ["questrade_item_id", "questrade_account_id"], name: "idx_on_questrade_item_id_questrade_account_id_c3e6274342", unique: true
+    t.index ["questrade_item_id"], name: "index_questrade_accounts_on_questrade_item_id"
+  end
+
+  create_table "questrade_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "api_server"
+    t.datetime "created_at", null: false
+    t.uuid "family_id", null: false
+    t.string "institution_color"
+    t.string "institution_domain"
+    t.string "institution_id"
+    t.string "institution_name"
+    t.string "institution_url"
+    t.string "name"
+    t.boolean "pending_account_setup", default: false, null: false
+    t.jsonb "raw_institution_payload"
+    t.jsonb "raw_payload"
+    t.text "refresh_token"
+    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.string "status", default: "good", null: false
+    t.datetime "sync_start_date"
+    t.datetime "updated_at", null: false
+    t.index ["family_id"], name: "index_questrade_items_on_family_id"
+    t.index ["status"], name: "index_questrade_items_on_status"
   end
 
   create_table "recurring_transactions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -1471,6 +1641,49 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.check_constraint "destination_account_id IS NULL OR destination_account_id <> account_id", name: "chk_recurring_txns_transfer_distinct_accounts"
   end
 
+  create_table "redbark_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "redbark_item_id", null: false
+    t.string "name", null: false
+    t.string "redbark_account_id", null: false
+    t.string "connection_id"
+    t.string "account_number"
+    t.string "currency", null: false
+    t.decimal "current_balance", precision: 19, scale: 4
+    t.string "account_status"
+    t.string "account_type"
+    t.string "provider"
+    t.boolean "ignored", default: false, null: false
+    t.jsonb "institution_metadata"
+    t.jsonb "raw_payload"
+    t.jsonb "raw_transactions_payload"
+    t.date "sync_start_date"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["redbark_item_id", "redbark_account_id"], name: "index_redbark_accounts_on_item_and_account_id", unique: true
+    t.index ["redbark_item_id"], name: "index_redbark_accounts_on_redbark_item_id"
+  end
+
+  create_table "redbark_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.string "name", null: false
+    t.string "institution_id"
+    t.string "institution_name"
+    t.string "institution_domain"
+    t.string "institution_url"
+    t.string "institution_color"
+    t.string "status", default: "good", null: false
+    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.boolean "pending_account_setup", default: false, null: false
+    t.datetime "sync_start_date"
+    t.jsonb "raw_payload"
+    t.jsonb "raw_institution_payload"
+    t.text "api_key", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id"], name: "index_redbark_items_on_family_id"
+    t.index ["status"], name: "index_redbark_items_on_status"
+  end
+
   create_table "rejected_transfers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "inflow_transaction_id", null: false
     t.uuid "outflow_transaction_id", null: false
@@ -1689,6 +1902,11 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "consumer_key"
     t.string "snaptrade_user_id"
     t.string "snaptrade_user_secret"
+    t.text "oauth_access_token"
+    t.text "oauth_refresh_token"
+    t.string "oauth_token_type"
+    t.string "oauth_scope"
+    t.datetime "oauth_token_expires_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.index ["family_id"], name: "index_snaptrade_items_on_family_id"
@@ -1819,8 +2037,10 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.date "window_start_date"
     t.date "window_end_date"
     t.text "sync_stats"
+    t.datetime "cancel_requested_at"
     t.index ["parent_id"], name: "index_syncs_on_parent_id"
     t.index ["status"], name: "index_syncs_on_status"
+    t.index ["syncable_type", "syncable_id", "created_at", "id"], name: "index_syncs_on_syncable_and_created_at_and_id", order: { created_at: :desc, id: :desc }
     t.index ["syncable_type", "syncable_id"], name: "index_syncs_on_syncable"
   end
 
@@ -1872,6 +2092,43 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.index ["security_id"], name: "index_trades_on_security_id"
   end
 
+  create_table "trading212_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "account_type"
+    t.decimal "cash_balance", precision: 19, scale: 4
+    t.datetime "created_at", null: false
+    t.string "currency"
+    t.decimal "current_balance", precision: 19, scale: 4
+    t.datetime "last_orders_sync"
+    t.datetime "last_positions_sync"
+    t.string "name"
+    t.jsonb "raw_dividends_payload", default: [], null: false
+    t.jsonb "raw_orders_payload", default: [], null: false
+    t.jsonb "raw_positions_payload", default: [], null: false
+    t.jsonb "raw_transactions_payload", default: [], null: false
+    t.string "trading212_account_id"
+    t.uuid "trading212_item_id", null: false
+    t.datetime "updated_at", null: false
+    t.index ["trading212_item_id", "trading212_account_id"], name: "index_trading212_accounts_on_item_and_account_id", unique: true, where: "(trading212_account_id IS NOT NULL)"
+    t.index ["trading212_item_id"], name: "index_trading212_accounts_on_trading212_item_id"
+  end
+
+  create_table "trading212_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "api_key"
+    t.string "api_secret"
+    t.datetime "created_at", null: false
+    t.string "currency"
+    t.string "environment", default: "live", null: false
+    t.uuid "family_id", null: false
+    t.string "name"
+    t.boolean "pending_account_setup", default: false, null: false
+    t.jsonb "raw_instruments_payload", default: [], null: false
+    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.string "status", default: "good", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id"], name: "index_trading212_items_on_family_id"
+    t.index ["status"], name: "index_trading212_items_on_status"
+  end
+
   create_table "transactions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -1882,6 +2139,7 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.string "external_id"
     t.jsonb "extra", default: {}, null: false
     t.string "investment_activity_label"
+    t.uuid "transfer_id"
     t.index "(((extra -> 'goal'::text) ->> 'pledge_id'::text))", name: "ix_transactions_extra_goal_pledge_id", unique: true, where: "(((extra -> 'goal'::text) ->> 'pledge_id'::text) IS NOT NULL)"
     t.index ["category_id"], name: "index_transactions_on_category_id"
     t.index ["external_id"], name: "index_transactions_on_external_id"
@@ -1889,9 +2147,11 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.index ["investment_activity_label"], name: "index_transactions_on_investment_activity_label"
     t.index ["kind"], name: "index_transactions_on_kind"
     t.index ["merchant_id"], name: "index_transactions_on_merchant_id"
+    t.index ["transfer_id"], name: "index_transactions_on_transfer_id"
   end
 
   create_table "transfers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.decimal "amount", precision: 19, scale: 4, default: "0.0", null: false
     t.uuid "inflow_transaction_id", null: false
     t.uuid "outflow_transaction_id", null: false
     t.string "status", default: "pending", null: false
@@ -1902,6 +2162,50 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.index ["inflow_transaction_id"], name: "index_transfers_on_inflow_transaction_id"
     t.index ["outflow_transaction_id"], name: "index_transfers_on_outflow_transaction_id"
     t.index ["status"], name: "index_transfers_on_status"
+    t.check_constraint "amount >= 0::numeric", name: "check_transfer_amount_non_negative"
+  end
+
+  create_table "up_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "up_item_id", null: false
+    t.string "name", null: false
+    t.string "account_id"
+    t.string "currency", null: false
+    t.decimal "current_balance", precision: 19, scale: 4
+    t.string "account_status"
+    t.string "account_type"
+    t.string "ownership_type"
+    t.string "provider"
+    t.boolean "ignored", default: false, null: false
+    t.jsonb "institution_metadata"
+    t.jsonb "raw_payload"
+    t.jsonb "raw_transactions_payload"
+    t.date "sync_start_date"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["account_id"], name: "index_up_accounts_on_account_id"
+    t.index ["up_item_id", "account_id"], name: "index_up_accounts_on_item_and_account_id", unique: true, where: "(account_id IS NOT NULL)"
+    t.index ["up_item_id"], name: "index_up_accounts_on_up_item_id"
+  end
+
+  create_table "up_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.uuid "family_id", null: false
+    t.string "name"
+    t.string "institution_id"
+    t.string "institution_name"
+    t.string "institution_domain"
+    t.string "institution_url"
+    t.string "institution_color"
+    t.string "status", default: "good", null: false
+    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.boolean "pending_account_setup", default: false, null: false
+    t.date "sync_start_date"
+    t.jsonb "raw_payload"
+    t.jsonb "raw_institution_payload"
+    t.text "access_token"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id"], name: "index_up_items_on_family_id"
+    t.index ["status"], name: "index_up_items_on_status"
   end
 
   create_table "users", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -1980,6 +2284,39 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
     t.check_constraint "sign_count >= 0", name: "chk_webauthn_credentials_sign_count_non_negative"
   end
 
+  create_table "wise_accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "balance_id", null: false
+    t.datetime "created_at", null: false
+    t.string "currency", null: false
+    t.decimal "current_balance", precision: 19, scale: 4
+    t.string "name"
+    t.jsonb "raw_payload"
+    t.jsonb "raw_transactions_payload"
+    t.decimal "reserved_balance", precision: 19, scale: 4
+    t.datetime "updated_at", null: false
+    t.uuid "wise_item_id", null: false
+    t.index ["wise_item_id", "balance_id"], name: "index_wise_accounts_on_wise_item_id_and_balance_id", unique: true
+    t.index ["wise_item_id"], name: "index_wise_accounts_on_wise_item_id"
+  end
+
+  create_table "wise_items", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.datetime "created_at", null: false
+    t.uuid "family_id", null: false
+    t.string "name", null: false
+    t.boolean "pending_account_setup", default: false, null: false
+    t.string "profile_id", null: false
+    t.string "profile_type", null: false
+    t.jsonb "raw_payload"
+    t.boolean "scheduled_for_deletion", default: false, null: false
+    t.string "status", default: "good", null: false
+    t.datetime "sync_start_date"
+    t.text "token", null: false
+    t.datetime "updated_at", null: false
+    t.index ["family_id", "profile_id"], name: "index_wise_items_on_family_id_and_profile_id", unique: true
+    t.index ["family_id"], name: "index_wise_items_on_family_id"
+    t.index ["status"], name: "index_wise_items_on_status"
+  end
+
   add_foreign_key "account_providers", "accounts", on_delete: :cascade
   add_foreign_key "account_shares", "accounts"
   add_foreign_key "account_shares", "users"
@@ -2043,10 +2380,15 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
   add_foreign_key "impersonation_sessions", "users", column: "impersonated_id"
   add_foreign_key "impersonation_sessions", "users", column: "impersonator_id"
   add_foreign_key "import_rows", "imports"
+  add_foreign_key "import_sessions", "families"
+  add_foreign_key "import_source_mappings", "families"
+  add_foreign_key "import_source_mappings", "import_sessions", column: ["import_session_id", "family_id"], primary_key: ["id", "family_id"], name: "fk_import_source_mappings_session_family", on_delete: :cascade
   add_foreign_key "imports", "account_statements", on_delete: :nullify
   add_foreign_key "imports", "families"
+  add_foreign_key "imports", "import_sessions", column: ["import_session_id", "family_id"], primary_key: ["id", "family_id"], name: "fk_imports_session_family", on_delete: :cascade
   add_foreign_key "indexa_capital_accounts", "indexa_capital_items"
   add_foreign_key "indexa_capital_items", "families"
+  add_foreign_key "insights", "families"
   add_foreign_key "invitations", "families"
   add_foreign_key "invitations", "users", column: "inviter_id"
   add_foreign_key "kraken_accounts", "kraken_items"
@@ -2059,17 +2401,23 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
   add_foreign_key "mercury_items", "families"
   add_foreign_key "messages", "chats"
   add_foreign_key "mobile_devices", "users"
+  add_foreign_key "notification_deliveries", "rules", on_delete: :cascade
+  add_foreign_key "notification_deliveries", "transactions", on_delete: :cascade
   add_foreign_key "oauth_access_grants", "oauth_applications", column: "application_id"
   add_foreign_key "oauth_access_tokens", "oauth_applications", column: "application_id"
   add_foreign_key "oidc_identities", "users"
   add_foreign_key "plaid_accounts", "plaid_items"
   add_foreign_key "plaid_items", "families"
+  add_foreign_key "questrade_accounts", "questrade_items"
+  add_foreign_key "questrade_items", "families"
   add_foreign_key "recurring_transactions", "accounts", column: "destination_account_id", on_delete: :cascade
   add_foreign_key "recurring_transactions", "accounts", on_delete: :cascade
   add_foreign_key "recurring_transactions", "families"
   add_foreign_key "recurring_transactions", "merchants"
-  add_foreign_key "rejected_transfers", "transactions", column: "inflow_transaction_id"
-  add_foreign_key "rejected_transfers", "transactions", column: "outflow_transaction_id"
+  add_foreign_key "redbark_accounts", "redbark_items"
+  add_foreign_key "redbark_items", "families"
+  add_foreign_key "rejected_transfers", "transactions", column: "inflow_transaction_id", on_delete: :cascade
+  add_foreign_key "rejected_transfers", "transactions", column: "outflow_transaction_id", on_delete: :cascade
   add_foreign_key "rule_actions", "rules"
   add_foreign_key "rule_conditions", "rule_conditions", column: "parent_id"
   add_foreign_key "rule_conditions", "rules"
@@ -2091,12 +2439,19 @@ ActiveRecord::Schema[7.2].define(version: 2026_05_31_153000) do
   add_foreign_key "tags", "families"
   add_foreign_key "tool_calls", "messages"
   add_foreign_key "trades", "securities"
+  add_foreign_key "trading212_accounts", "trading212_items"
+  add_foreign_key "trading212_items", "families"
   add_foreign_key "transactions", "categories", on_delete: :nullify
   add_foreign_key "transactions", "merchants"
+  add_foreign_key "transactions", "transfers", column: "transfer_id"
   add_foreign_key "transfers", "transactions", column: "inflow_transaction_id", on_delete: :cascade
   add_foreign_key "transfers", "transactions", column: "outflow_transaction_id", on_delete: :cascade
+  add_foreign_key "up_accounts", "up_items"
+  add_foreign_key "up_items", "families"
   add_foreign_key "users", "accounts", column: "default_account_id", on_delete: :nullify
   add_foreign_key "users", "chats", column: "last_viewed_chat_id"
   add_foreign_key "users", "families"
   add_foreign_key "webauthn_credentials", "users"
+  add_foreign_key "wise_accounts", "wise_items", on_delete: :cascade
+  add_foreign_key "wise_items", "families"
 end
diff --git a/design/tokens/sure.tokens.json b/design/tokens/sure.tokens.json
index bf36e8743..a245f3b7f 100644
--- a/design/tokens/sure.tokens.json
+++ b/design/tokens/sure.tokens.json
@@ -11,6 +11,10 @@
     "mono": {
       "$value": "'Geist Mono', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace",
       "$type": "fontFamily"
+    },
+    "weight": {
+      "medium": { "$value": 500, "$type": "fontWeight" },
+      "semibold": { "$value": 600, "$type": "fontWeight" }
     }
   },
 
@@ -20,11 +24,12 @@
 
     "success":     { "$value": "{color.green.700}",  "$type": "color", "$extensions": { "sure.dark": "{color.green.400}" } },
     "warning":     { "$value": "{color.yellow.600}", "$type": "color", "$extensions": { "sure.dark": "{color.yellow.400}" } },
-    "destructive": { "$value": "{color.red.600}",    "$type": "color", "$extensions": { "sure.dark": "{color.red.400}" } },
+    "destructive": { "$value": "{color.red.500}",    "$type": "color", "$extensions": { "sure.dark": "{color.red.400}" } },
     "info":        { "$value": "{color.blue.600}",   "$type": "color", "$extensions": { "sure.dark": "{color.blue.500}" } },
     "shadow":      { "$value": "{color.black|6%}",   "$type": "color", "$extensions": { "sure.dark": "{color.white|8%}" } },
 
     "link":                  { "$value": "{color.blue.600}",         "$type": "color", "$extensions": { "sure.dark": "{color.blue.500}" } },
+    "focus-ring":            { "$value": "{color.alpha-black.700}",  "$type": "color", "$extensions": { "sure.dark": "{color.alpha-white.700}" } },
     "tertiary":              { "$value": "{color.alpha-black.100}",  "$type": "color", "$extensions": { "sure.dark": "{color.alpha-white.200}" } },
     "surface":               { "$value": "{color.gray.50}",          "$type": "color", "$extensions": { "sure.dark": "{color.black}" } },
     "surface-hover":         { "$value": "{color.gray.100}",         "$type": "color", "$extensions": { "sure.dark": "{color.gray.800}" } },
@@ -35,7 +40,7 @@
     "container-inset":       { "$value": "{color.gray.50}",          "$type": "color", "$extensions": { "sure.dark": "{color.gray.800}" } },
     "container-inset-hover": { "$value": "{color.gray.100}",         "$type": "color", "$extensions": { "sure.dark": "{color.gray.700}" } },
     "nav-indicator":         { "$value": "{color.black}",            "$type": "color", "$extensions": { "sure.dark": "{color.white}" } },
-    "toggle-track":          { "$value": "{color.gray.100}",         "$type": "color", "$extensions": { "sure.dark": "{color.gray.700}" } },
+    "toggle-track":          { "$value": "{color.gray.300}",         "$type": "color", "$extensions": { "sure.dark": "{color.gray.700}" } },
     "destructive-subtle":    { "$value": "{color.red.200}",          "$type": "color", "$extensions": { "sure.dark": "{color.red.800}" } },
 
     "gray": {
@@ -285,7 +290,7 @@
     "text-primary":   { "$type": "utility", "$value": "{color.gray.900}", "$extensions": { "sure.utility": { "prefix": "text" }, "sure.dark": "{color.white}" } },
     "text-inverse":   { "$type": "utility", "$value": "{color.white}",    "$extensions": { "sure.utility": { "prefix": "text" }, "sure.dark": "{color.gray.900}" } },
     "text-secondary": { "$type": "utility", "$value": "{color.gray.500}", "$extensions": { "sure.utility": { "prefix": "text" }, "sure.dark": "{color.gray.300}" } },
-    "text-subdued":   { "$type": "utility", "$value": "{color.gray.400}", "$extensions": { "sure.utility": { "prefix": "text" }, "sure.dark": "{color.gray.500}" } },
+    "text-subdued":   { "$type": "utility", "$value": "{color.gray.400}", "$extensions": { "sure.utility": { "prefix": "text" }, "sure.dark": "{color.gray.400}" } },
 
     "shadow-border-xs": {
       "$type": "utility",
@@ -328,10 +333,10 @@
       }
     },
 
-    "border-primary":     { "$type": "utility", "$value": "{color.alpha-black.300}", "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-white.400}" } },
-    "border-secondary":   { "$type": "utility", "$value": "{color.alpha-black.200}", "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-white.300}" } },
+    "border-primary":     { "$type": "utility", "$value": "{color.alpha-black.300}", "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-white.500}" } },
+    "border-secondary":   { "$type": "utility", "$value": "{color.alpha-black.200}", "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-white.400}" } },
     "border-divider":     { "$type": "utility", "$value": "border-tertiary" },
-    "border-subdued":     { "$type": "utility", "$value": "{color.alpha-black.50}",  "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-white.100}" } },
+    "border-subdued":     { "$type": "utility", "$value": "{color.alpha-black.50}",  "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-white.200}" } },
     "border-solid":       { "$type": "utility", "$value": "{color.black}",           "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.white}" } },
     "border-destructive": { "$type": "utility", "$value": "{color.red.500}",         "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.red.400}" } },
     "border-inverse":     { "$type": "utility", "$value": "{color.alpha-white.200}", "$extensions": { "sure.utility": { "prefix": "border" }, "sure.dark": "{color.alpha-black.300}" } },
@@ -343,8 +348,8 @@
     "button-bg-secondary-strong":       { "$type": "utility", "$value": "{color.gray.200}", "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.gray.700}" } },
     "button-bg-secondary-strong-hover": { "$type": "utility", "$value": "{color.gray.300}", "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.gray.600}" } },
     "button-bg-disabled":          { "$type": "utility", "$value": "{color.gray.50}",  "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.gray.700}" } },
-    "button-bg-destructive":       { "$type": "utility", "$value": "{color.red.500}",  "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.red.400}" } },
-    "button-bg-destructive-hover": { "$type": "utility", "$value": "{color.red.600}",  "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.red.500}" } },
+    "button-bg-destructive":       { "$type": "utility", "$value": "{color.red.600}",  "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.red.400}" } },
+    "button-bg-destructive-hover": { "$type": "utility", "$value": "{color.red.700}",  "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.red.500}" } },
     "button-bg-ghost-hover":       { "$type": "utility", "$value": "{color.gray.50}",  "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "bg-gray-800 text-inverse" } },
     "button-bg-outline-hover":     { "$type": "utility", "$value": "{color.gray.100}", "$extensions": { "sure.utility": { "prefix": "bg" }, "sure.dark": "{color.gray.700}" } },
 
diff --git a/desktop/.gitignore b/desktop/.gitignore
new file mode 100644
index 000000000..82242858b
--- /dev/null
+++ b/desktop/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+dist/
+src-tauri/target/
+src-tauri/gen/
diff --git a/desktop/README.md b/desktop/README.md
new file mode 100644
index 000000000..edbe1a974
--- /dev/null
+++ b/desktop/README.md
@@ -0,0 +1,85 @@
+# Sure Desktop (macOS)
+
+Native macOS shell (Tauri 2 + WKWebView) that renders the full Sure web app and
+wraps it in real Mac chrome. It always talks to a Sure server you already run
+(self-hosted or managed) — same trust model as a browser.
+
+## Requirements
+- Rust (stable), Node 18+, Xcode command line tools, macOS 12+.
+
+## Run in development
+```bash
+cd desktop
+npm install
+npm run build      # builds the injected bridge.js + onboarding assets
+npm run tauri dev
+```
+On first launch, enter your Sure server URL (e.g. `http://localhost:3000` when
+running `bin/dev`). The app health-checks `{server}/up`, then loads the real
+`/sessions/new` where you sign in with password or SSO (MFA supported).
+
+## Build a release .dmg (unsigned)
+```bash
+cd desktop
+# Single-arch (host only):
+npm run tauri build
+# Universal (Apple Silicon + Intel) — what releases ship:
+rustup target add aarch64-apple-darwin x86_64-apple-darwin
+npm run tauri build -- --target universal-apple-darwin
+# Output: src-tauri/target/universal-apple-darwin/release/bundle/dmg/Sure_<ver>_universal.dmg
+```
+
+## Publishing a release
+The desktop build runs automatically as part of the normal Sure `v*` release.
+The version comes from `.sure-version` and must match the release tag; it is
+stamped into `desktop/package.json` and `desktop/src-tauri/tauri.conf.json`
+only while building. The universal `.dmg` is attached to that same GitHub
+Release—there is no separate desktop action, tag, or version.
+
+## Installing an unsigned build (end users)
+The published `.dmg` is **not code-signed**, so macOS Gatekeeper blocks the first
+launch. To open it:
+1. Drag Sure to Applications and try to open it; dismiss the warning.
+2. **System Settings → Privacy & Security**, scroll down, click **Open Anyway**,
+   and confirm. (On macOS 15 Sequoia the old right-click→Open shortcut is gone;
+   this Settings path is the way.)
+
+If macOS instead says the app is "damaged", the download was quarantined — strip
+it once in Terminal:
+```bash
+xattr -cr /Applications/Sure.app
+```
+Signing + notarization (below) removes this friction entirely.
+
+## Rust tests
+```bash
+cd desktop/src-tauri
+cargo test
+```
+
+## Deep links
+Registered scheme: `sure://{host}[:port]/{path}` → opens the app to that
+server/page. Example: `open "sure://localhost:3000/accounts"`. (Works from the
+bundled `.app`, not `tauri dev`.)
+
+## Code signing & notarization (required for distribution — NOT wired up)
+No Apple Developer credentials are needed to build/run locally. To ship a
+distributable, signed, notarized `.dmg`, add:
+1. An **Apple Developer ID Application** certificate in your login keychain.
+2. Tauri signing config in `src-tauri/tauri.conf.json` under `bundle.macOS`:
+   `"signingIdentity": "Developer ID Application: <NAME> (<TEAMID>)"`,
+   `"hardenedRuntime": true`, and an `entitlements` plist if needed.
+3. Notarization after build:
+   ```bash
+   VERSION="<release-version>"
+   xcrun notarytool submit "src-tauri/target/universal-apple-darwin/release/bundle/dmg/Sure_${VERSION}_universal.dmg" \
+     --apple-id "<APPLE_ID>" --team-id "<TEAMID>" --password "<APP_SPECIFIC_PW>" --wait
+   xcrun stapler staple "src-tauri/target/universal-apple-darwin/release/bundle/dmg/Sure_${VERSION}_universal.dmg"
+   ```
+These steps require an Apple Developer account and are intentionally left as a
+documented follow-up.
+
+## Not built yet (see spec §9)
+- Balance-with-sparkline glance widget (Tauri floating panel and/or a WidgetKit
+  Notification Center widget with App Group data sharing), fed by an
+  auto-provisioned read-only API key polling `/api/v1`. Deferred by design.
diff --git a/desktop/index.html b/desktop/index.html
new file mode 100644
index 000000000..d89641f2e
--- /dev/null
+++ b/desktop/index.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Sure</title>
+    <link rel="stylesheet" href="/src/styles.css" />
+  </head>
+  <body>
+    <div class="titlebar" data-tauri-drag-region></div>
+    <main id="onboarding" class="onboarding" data-tauri-drag-region>
+      <div class="auth">
+        <img class="logo" id="logo" alt="Sure" draggable="false" />
+        <h1 id="title" class="auth-title"></h1>
+        <form id="server-form" class="auth-form">
+          <div class="form-field">
+            <label class="form-field__label" id="url-label" for="server-url"></label>
+            <input
+              class="form-field__input"
+              id="server-url"
+              type="text"
+              autocomplete="off"
+              autocapitalize="off"
+              spellcheck="false"
+            />
+          </div>
+          <button id="connect" class="btn-primary" type="submit"></button>
+        </form>
+        <p id="status" class="status" role="status"></p>
+        <section id="remembered" class="remembered hidden">
+          <h2 id="remembered-title" class="remembered-title"></h2>
+          <ul id="server-list"></ul>
+        </section>
+      </div>
+    </main>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
new file mode 100644
index 000000000..7452c6f6b
--- /dev/null
+++ b/desktop/package-lock.json
@@ -0,0 +1,1380 @@
+{
+  "name": "sure-desktop",
+  "version": "0.1.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "sure-desktop",
+      "version": "0.1.0",
+      "dependencies": {
+        "@tauri-apps/api": "^2.1.0",
+        "@tauri-apps/plugin-autostart": "^2.0.0",
+        "@tauri-apps/plugin-deep-link": "^2.0.0",
+        "@tauri-apps/plugin-notification": "^2.0.0"
+      },
+      "devDependencies": {
+        "@tauri-apps/cli": "^2.1.0",
+        "typescript": "^5.6.0",
+        "vite": "^6.4.3"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz",
+      "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@tauri-apps/api": {
+      "version": "2.11.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.11.1.tgz",
+      "integrity": "sha512-M2FPuYND2m+wh5hfW9ZpSdxMPdEJovPBWwoHJmwUpysTYNHaOkVFN419m/K0LIgjb/7KU2vBgsUepJWugQCvAA==",
+      "license": "Apache-2.0 OR MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/tauri"
+      }
+    },
+    "node_modules/@tauri-apps/cli": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.11.4.tgz",
+      "integrity": "sha512-R8xGtMpwyetawSqm9kYOuMmEqkhUbvcUy8n0aNXIxollKBLESUu5f4Fx+64hgASYm1H+jSWq6jCW6zqTnH6hqQ==",
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "bin": {
+        "tauri": "tauri.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/tauri"
+      },
+      "optionalDependencies": {
+        "@tauri-apps/cli-darwin-arm64": "2.11.4",
+        "@tauri-apps/cli-darwin-x64": "2.11.4",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "2.11.4",
+        "@tauri-apps/cli-linux-arm64-gnu": "2.11.4",
+        "@tauri-apps/cli-linux-arm64-musl": "2.11.4",
+        "@tauri-apps/cli-linux-riscv64-gnu": "2.11.4",
+        "@tauri-apps/cli-linux-x64-gnu": "2.11.4",
+        "@tauri-apps/cli-linux-x64-musl": "2.11.4",
+        "@tauri-apps/cli-win32-arm64-msvc": "2.11.4",
+        "@tauri-apps/cli-win32-ia32-msvc": "2.11.4",
+        "@tauri-apps/cli-win32-x64-msvc": "2.11.4"
+      }
+    },
+    "node_modules/@tauri-apps/cli-darwin-arm64": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.11.4.tgz",
+      "integrity": "sha512-1ryOF3ZhpZ/nemHV5zVwBQBz9jDGKmKPvWPADOhc83ig0P4bMc2iER4NbC6r9sjeIZ6RVQ4g3RZIYvezhcl4TQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-darwin-x64": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.11.4.tgz",
+      "integrity": "sha512-uFsGQAAfuyz1k/yGLmkWfkBlgKAqZfxqlHmLWx81QU27RJWfmbNHCIq8T8w1e+VClleIuZUjpHWfoE4E3DLo3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.11.4.tgz",
+      "integrity": "sha512-IaHZn5CdBL21oUmjiVOS1ctw6Ip1O0pjp70FwOWmYz1myWe0SY96ZIj2FYf7pT0m8bI2h/hrs5ZbEXXh44/MkQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.11.4.tgz",
+      "integrity": "sha512-N41/ukTRVe6XSuUTESuFdGeOW2i7k62tK+6gHK5Kd5/q5RPvvi19GaWAVPPb9u95HSGmTChSolBfzynUsssFaA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-arm64-musl": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.11.4.tgz",
+      "integrity": "sha512-v277UnT/fB64xAfSroL5N3Km3tLmvATWqJJw/wRI+g6o+HkeD0slyE7gOhNs1MbjE41R7bQOTxMVoL3aomUJmw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-riscv64-gnu": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-riscv64-gnu/-/cli-linux-riscv64-gnu-2.11.4.tgz",
+      "integrity": "sha512-qqgNkQ2u1yZHxjhxsZaxUtRDW8dIqIYm33rx/mzwQv0SfY9x1B+iraj8vWeFiXjjSVVhEMepXSOts1TqPzvXNQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-x64-gnu": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.11.4.tgz",
+      "integrity": "sha512-2VRNWl84FOH0m2giiDkO2h0QXlcMJeX+zJDpI5kDIQAx6s+geF3v48F4DXfJez4GS/FdoDGnPnw1C2iYGbQ7bQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-linux-x64-musl": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.11.4.tgz",
+      "integrity": "sha512-o9GyhYor/nc7xarmwDE3ka2szuW3uuZzXjHWh64Q8YX5AtSgxdQkFWzrY4O8KiGtVNvFBI14H3Q49Qj5TOIP/A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.11.4.tgz",
+      "integrity": "sha512-ld5Ehb598m0VkYyylRPNeCFsBe/km0jxis6KgMpl3IGY6I/i1RwQXO05I1AsXUXO2WC6AvB/Lw4qTf/asiuEiQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.11.4.tgz",
+      "integrity": "sha512-12Hxi0XX/H5VFxO/bGgHkFWhml9VMgEOu9CidjeCeTNQ1l6fpUlbiGgSP7CLI3PFtW9/FfbeHieZ+kyWK5H7CA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/cli-win32-x64-msvc": {
+      "version": "2.11.4",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.11.4.tgz",
+      "integrity": "sha512-+vDiqBIU5dMISg/wNvX3sF+ZHfgJGJ5T0AcO+EHNXV9GGAG+P5fzodlDXD3QdKCRgZxMoCm5PPvj3BqLNjBthw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 OR MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@tauri-apps/plugin-autostart": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-autostart/-/plugin-autostart-2.5.1.tgz",
+      "integrity": "sha512-zS/xx7yzveCcotkA+8TqkI2lysmG2wvQXv2HGAVExITmnFfHAdj1arGsbbfs3o6EktRHf6l34pJxc3YGG2mg7w==",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@tauri-apps/api": "^2.8.0"
+      }
+    },
+    "node_modules/@tauri-apps/plugin-deep-link": {
+      "version": "2.4.9",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-deep-link/-/plugin-deep-link-2.4.9.tgz",
+      "integrity": "sha512-u0SKOUHnJ1wqeqXsDFq2+kASCBj9xxbG0g9XZWPy9SOmU4wXtp6b/wiYpm6oH6/5fBTQsLqnLhIvqLBRpgHJlA==",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@tauri-apps/api": "^2.11.0"
+      }
+    },
+    "node_modules/@tauri-apps/plugin-notification": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-notification/-/plugin-notification-2.3.3.tgz",
+      "integrity": "sha512-Zw+ZH18RJb41G4NrfHgIuofJiymusqN+q8fGUIIV7vyCH+5sSn5coqRv/MWB9qETsUs97vmU045q7OyseCV3Qg==",
+      "license": "MIT OR Apache-2.0",
+      "dependencies": {
+        "@tauri-apps/api": "^2.8.0"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz",
+      "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.25.12",
+        "@esbuild/android-arm": "0.25.12",
+        "@esbuild/android-arm64": "0.25.12",
+        "@esbuild/android-x64": "0.25.12",
+        "@esbuild/darwin-arm64": "0.25.12",
+        "@esbuild/darwin-x64": "0.25.12",
+        "@esbuild/freebsd-arm64": "0.25.12",
+        "@esbuild/freebsd-x64": "0.25.12",
+        "@esbuild/linux-arm": "0.25.12",
+        "@esbuild/linux-arm64": "0.25.12",
+        "@esbuild/linux-ia32": "0.25.12",
+        "@esbuild/linux-loong64": "0.25.12",
+        "@esbuild/linux-mips64el": "0.25.12",
+        "@esbuild/linux-ppc64": "0.25.12",
+        "@esbuild/linux-riscv64": "0.25.12",
+        "@esbuild/linux-s390x": "0.25.12",
+        "@esbuild/linux-x64": "0.25.12",
+        "@esbuild/netbsd-arm64": "0.25.12",
+        "@esbuild/netbsd-x64": "0.25.12",
+        "@esbuild/openbsd-arm64": "0.25.12",
+        "@esbuild/openbsd-x64": "0.25.12",
+        "@esbuild/openharmony-arm64": "0.25.12",
+        "@esbuild/sunos-x64": "0.25.12",
+        "@esbuild/win32-arm64": "0.25.12",
+        "@esbuild/win32-ia32": "0.25.12",
+        "@esbuild/win32-x64": "0.25.12"
+      }
+    },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.16",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz",
+      "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
+      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.21",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.21.tgz",
+      "integrity": "sha512-v4sDNP3fdNiWMfabO7OwOQdOX8TiQSztKyT1Wj0w+j7LDallJThJRBBBmzVGyYj0crMh7jlV4zepPkiNu9UwDQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.16",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.62.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.9"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.17",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
+      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/vite": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz",
+      "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
+      }
+    }
+  }
+}
diff --git a/desktop/package.json b/desktop/package.json
new file mode 100644
index 000000000..237b6ec8e
--- /dev/null
+++ b/desktop/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "sure-desktop",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "tsc --noEmit && vite build",
+    "tauri": "tauri"
+  },
+  "devDependencies": {
+    "@tauri-apps/cli": "^2.1.0",
+    "typescript": "^5.6.0",
+    "vite": "^6.4.3"
+  },
+  "dependencies": {
+    "@tauri-apps/api": "^2.1.0",
+    "@tauri-apps/plugin-notification": "^2.0.0",
+    "@tauri-apps/plugin-autostart": "^2.0.0",
+    "@tauri-apps/plugin-deep-link": "^2.0.0"
+  }
+}
diff --git a/desktop/prefs.html b/desktop/prefs.html
new file mode 100644
index 000000000..0cf09f9bd
--- /dev/null
+++ b/desktop/prefs.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="stylesheet" href="/src/styles.css" />
+    <title>Preferences</title>
+  </head>
+  <body>
+    <div class="titlebar" data-tauri-drag-region></div>
+    <main class="prefs">
+      <h1 id="prefs-title"></h1>
+      <section>
+        <h2 id="servers-title"></h2>
+        <ul id="prefs-server-list"></ul>
+        <form id="prefs-add">
+          <div class="form-field">
+            <input class="form-field__input" id="prefs-url" type="text" autocomplete="off" autocapitalize="off" spellcheck="false" />
+          </div>
+          <button type="submit" id="prefs-add-btn" class="btn-primary"></button>
+        </form>
+        <p id="prefs-status" class="status" role="status"></p>
+      </section>
+      <section class="row">
+        <label id="autostart-label" for="autostart"></label>
+        <input type="checkbox" id="autostart" />
+      </section>
+    </main>
+    <script type="module" src="/src/prefs.ts"></script>
+  </body>
+</html>
diff --git a/desktop/src-tauri/Cargo.lock b/desktop/src-tauri/Cargo.lock
new file mode 100644
index 000000000..235f21660
--- /dev/null
+++ b/desktop/src-tauri/Cargo.lock
@@ -0,0 +1,5646 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "ahash"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
+
+[[package]]
+name = "async-broadcast"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52b5aaafa020cf5053a01f2a60e8ff5dccf550f0f77ec54a4e47285ac2bab485"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.91"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae36dc4177970ef04fde5178d3e2429882def40e57a451f919c098f72baa6cec"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.2",
+]
+
+[[package]]
+name = "atk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241b621213072e993be4f6f3a9e4b45f65b7e6faad43001be957184b7bb1824b"
+dependencies = [
+ "atk-sys",
+ "glib",
+ "libc",
+]
+
+[[package]]
+name = "atk-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5e48b684b0ca77d2bbadeef17424c2ea3c897d44d566a1617e7e8f30614d086"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "auto-launch"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471"
+dependencies = [
+ "dirs 4.0.0",
+ "thiserror 1.0.69",
+ "winreg 0.10.1",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block2"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
+dependencies = [
+ "objc2",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "brotli"
+version = "8.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "bs58"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
+
+[[package]]
+name = "bytemuck"
+version = "1.25.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cairo-rs"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
+dependencies = [
+ "bitflags 2.13.1",
+ "cairo-sys-rs",
+ "glib",
+ "libc",
+ "once_cell",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "cairo-sys-rs"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "camino"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.19.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.19",
+]
+
+[[package]]
+name = "cargo_toml"
+version = "0.22.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
+dependencies = [
+ "serde",
+ "toml 0.9.12+spec-1.1.0",
+]
+
+[[package]]
+name = "cc"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c89588d05638b5b4594a3348a2d6c20277e43a7f5c5202b05cc56888475a47b8"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfb"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
+dependencies = [
+ "byteorder",
+ "fnv",
+ "uuid",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
+
+[[package]]
+name = "chrono"
+version = "0.4.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
+dependencies = [
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "cocoa"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation 0.9.4",
+ "core-graphics 0.23.2",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.17",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "time",
+ "version_check",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "core-graphics-types 0.1.3",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
+dependencies = [
+ "bitflags 2.13.1",
+ "core-foundation 0.10.1",
+ "core-graphics-types 0.2.0",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation 0.9.4",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+dependencies = [
+ "bitflags 2.13.1",
+ "core-foundation 0.10.1",
+ "libc",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d85363c37faeca707aef026efa9f3b34d077bce547e48f770770625c6013679e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61803da095bee82a81bb1a452ecc25d3b2f1416d1897eb86430c6159ef717c17"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "cssparser"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2"
+dependencies = [
+ "cssparser-macros",
+ "dtoa-short",
+ "itoa",
+ "phf",
+ "smallvec",
+]
+
+[[package]]
+name = "cssparser-macros"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+dependencies = [
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "ctor"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98"
+dependencies = [
+ "ctor-proc-macro",
+ "dtor",
+]
+
+[[package]]
+name = "ctor-proc-macro"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1"
+
+[[package]]
+name = "darling"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0"
+dependencies = [
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "dbus"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e"
+dependencies = [
+ "libc",
+ "libdbus-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "derive_more"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys 0.5.0",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users 0.4.6",
+ "winapi",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users 0.5.2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "dispatch2"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2",
+ "libc",
+ "objc2",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "dlopen2"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4"
+dependencies = [
+ "dlopen2_derive",
+ "libc",
+ "once_cell",
+ "winapi",
+]
+
+[[package]]
+name = "dlopen2_derive"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b"
+dependencies = [
+ "rand 0.8.7",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "dom_query"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89"
+dependencies = [
+ "bit-set",
+ "cssparser",
+ "foldhash",
+ "html5ever",
+ "precomputed-hash",
+ "selectors",
+ "tendril",
+]
+
+[[package]]
+name = "dpi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "dtoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
+
+[[package]]
+name = "dtoa-short"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
+dependencies = [
+ "dtoa",
+]
+
+[[package]]
+name = "dtor"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4"
+dependencies = [
+ "dtor-proc-macro",
+]
+
+[[package]]
+name = "dtor-proc-macro"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
+
+[[package]]
+name = "dunce"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
+[[package]]
+name = "embed-resource"
+version = "3.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbfdaacccebec3b28e4866b8973543c7647797db5ada1bdab552e48fe665fbbd"
+dependencies = [
+ "cc",
+ "memchr",
+ "rustc_version",
+ "toml 1.1.3+spec-1.1.0",
+ "vswhom",
+ "winreg 0.55.0",
+]
+
+[[package]]
+name = "embed_plist"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
+
+[[package]]
+name = "endi"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
+
+[[package]]
+name = "enigo"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "802e4b2ae123615659085369b453cba87c5562e46ed8050a909fee18a9bc3157"
+dependencies = [
+ "core-graphics 0.23.2",
+ "libc",
+ "objc",
+ "pkg-config",
+ "windows 0.51.1",
+]
+
+[[package]]
+name = "enumflags2"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "erased-serde"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec"
+dependencies = [
+ "serde",
+ "serde_core",
+ "typeid",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
+
+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "field-offset"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
+dependencies = [
+ "memoffset",
+ "rustc_version",
+]
+
+[[package]]
+name = "file-locker"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75ae8b5984a4863d8a32109a848d038bd6d914f20f010cc141375f7a183c41cf"
+dependencies = [
+ "nix",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
+
+[[package]]
+name = "foreign-types"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "freedesktop_entry_parser"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db9c27b72f19a99a895f8ca89e2d26e4ef31013376e56fdafef697627306c3e4"
+dependencies = [
+ "nom",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "262590f4fe6afeb0bc83be1daa64e52657fe185690a958af7f3ad0e92085c5ae"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cd50c473c80f6d7c3670a752354b8e569b1a7cbfdc0419ec88e5edad85e0dc7"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6754879cc9f2c66f88c6e5c35344bb0bdb0708b0352b1201815667c7eabc7458"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4577ecaa3c4f96589d473f679a71b596316f6641bc350038b962a5daf0085d7a"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d6d3cde68c518367be28956066ddfef33813991b77a55005a69dae04bf3b10b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e34418ac499d6305c2fb5ad0ed2f6ac998c5f8ca209b4510f7f94242c647e307"
+
+[[package]]
+name = "futures-task"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b231ed28831efb4a61a08580c4bc233ec56bc009f4cd8f52da2c3cb97df0c109"
+
+[[package]]
+name = "futures-util"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77a90a256fce34da66415271e30f94ee91c57b04b8a2c042d9cf3220179deaa"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "gdk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9f245958c627ac99d8e529166f9823fb3b838d1d41fd2b297af3075093c2691"
+dependencies = [
+ "cairo-rs",
+ "gdk-pixbuf",
+ "gdk-sys",
+ "gio",
+ "glib",
+ "libc",
+ "pango",
+]
+
+[[package]]
+name = "gdk-pixbuf"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e1f5f1b0bfb830d6ccc8066d18db35c487b1b2b1e8589b5dfe9f07e8defaec"
+dependencies = [
+ "gdk-pixbuf-sys",
+ "gio",
+ "glib",
+ "libc",
+ "once_cell",
+]
+
+[[package]]
+name = "gdk-pixbuf-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gdk-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c2d13f38594ac1e66619e188c6d5a1adb98d11b2fcf7894fc416ad76aa2f3f7"
+dependencies = [
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gdkwayland-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "140071d506d223f7572b9f09b5e155afbd77428cd5cc7af8f2694c41d98dfe69"
+dependencies = [
+ "gdk-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pkg-config",
+ "system-deps",
+]
+
+[[package]]
+name = "gdkx11"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3caa00e14351bebbc8183b3c36690327eb77c49abc2268dd4bd36b856db3fbfe"
+dependencies = [
+ "gdk",
+ "gdkx11-sys",
+ "gio",
+ "glib",
+ "libc",
+ "x11",
+]
+
+[[package]]
+name = "gdkx11-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e7445fe01ac26f11601db260dd8608fe172514eb63b3b5e261ea6b0f4428d"
+dependencies = [
+ "gdk-sys",
+ "glib-sys",
+ "libc",
+ "system-deps",
+ "x11",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 5.3.0",
+ "wasip2",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi 6.0.0",
+]
+
+[[package]]
+name = "gio"
+version = "0.18.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "gio-sys",
+ "glib",
+ "libc",
+ "once_cell",
+ "pin-project-lite",
+ "smallvec",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "gio-sys"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+ "winapi",
+]
+
+[[package]]
+name = "glib"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
+dependencies = [
+ "bitflags 2.13.1",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-task",
+ "futures-util",
+ "gio-sys",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "memchr",
+ "once_cell",
+ "smallvec",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "glib-macros"
+version = "0.18.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-crate 2.0.2",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "glib-sys"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898"
+dependencies = [
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b"
+
+[[package]]
+name = "gobject-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44"
+dependencies = [
+ "glib-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd56fb197bfc42bd5d2751f4f017d44ff59fbb58140c6b49f9b3b2bdab08506a"
+dependencies = [
+ "atk",
+ "cairo-rs",
+ "field-offset",
+ "futures-channel",
+ "gdk",
+ "gdk-pixbuf",
+ "gio",
+ "glib",
+ "gtk-sys",
+ "gtk3-macros",
+ "libc",
+ "pango",
+ "pkg-config",
+]
+
+[[package]]
+name = "gtk-sys"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f29a1c21c59553eb7dd40e918be54dccd60c52b049b75119d5d96ce6b624414"
+dependencies = [
+ "atk-sys",
+ "cairo-sys-rs",
+ "gdk-pixbuf-sys",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "pango-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "gtk3-macros"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52ff3c5b21f14f0736fed6dcfc0bfb4225ebf5725f3c0209edeec181e4d73e9d"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+dependencies = [
+ "ahash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "html5ever"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2"
+dependencies = [
+ "log",
+ "markup5ever",
+]
+
+[[package]]
+name = "http"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
+dependencies = [
+ "bytes",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "hyper"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d22053281f852e11534f5198498373cbb59295120a20771d90f7ed1897490a72"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.65"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core 0.62.2",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ico"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371"
+dependencies = [
+ "byteorder",
+ "png 0.17.16",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "utf8_iter",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
+
+[[package]]
+name = "icu_properties"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
+
+[[package]]
+name = "icu_provider"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.17.1",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "infer"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"
+dependencies = [
+ "cfb",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2"
+
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
+
+[[package]]
+name = "javascriptcore-rs"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca5671e9ffce8ffba57afc24070e906da7fc4b1ba66f2cabebf61bf2ea257fcc"
+dependencies = [
+ "bitflags 1.3.2",
+ "glib",
+ "javascriptcore-rs-sys",
+]
+
+[[package]]
+name = "javascriptcore-rs-sys"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af1be78d14ffa4b75b66df31840478fef72b51f8c2465d4ca7c194da9f7a5124"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys 0.3.1",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "json-patch"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
+dependencies = [
+ "jsonptr",
+ "serde",
+ "serde_json",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "jsonptr"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "keyboard-types"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
+dependencies = [
+ "bitflags 2.13.1",
+ "serde",
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "keyring"
+version = "3.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
+dependencies = [
+ "log",
+ "zeroize",
+]
+
+[[package]]
+name = "libappindicator"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03589b9607c868cc7ae54c0b2a22c8dc03dd41692d48f2d7df73615c6a95dc0a"
+dependencies = [
+ "glib",
+ "gtk",
+ "gtk-sys",
+ "libappindicator-sys",
+ "log",
+]
+
+[[package]]
+name = "libappindicator-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
+dependencies = [
+ "gtk-sys",
+ "libloading",
+ "once_cell",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+
+[[package]]
+name = "libdbus-sys"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043"
+dependencies = [
+ "pkg-config",
+]
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "libredox"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "linicon"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee8c5653188a809616c97296180a0547a61dba205bcdcbdd261dbd022a25fd9"
+dependencies = [
+ "file-locker",
+ "freedesktop_entry_parser",
+ "linicon-theme",
+ "memmap2",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "linicon-theme"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f8240c33bb08c5d8b8cdea87b683b05e61037aa76ff26bef40672cc6ecbb80"
+dependencies = [
+ "freedesktop_entry_parser",
+ "rust-ini 0.17.0",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
+
+[[package]]
+name = "litemap"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
+
+[[package]]
+name = "mac-notification-sys"
+version = "0.6.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd604973958ddcc11b561193c0fb96ba146506ef2f231ef2e7c35fd2cbc9beca"
+dependencies = [
+ "cc",
+ "log",
+ "objc2",
+ "objc2-foundation",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "markup5ever"
+version = "0.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862"
+dependencies = [
+ "log",
+ "tendril",
+ "web_atoms",
+]
+
+[[package]]
+name = "memchr"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "muda"
+version = "0.19.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd04e60bc0b07438a6771710ee1698f98f6ebbc7f89b61264af1563b8aeb878"
+dependencies = [
+ "crossbeam-channel",
+ "dpi",
+ "gtk",
+ "keyboard-types",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "once_cell",
+ "png 0.18.1",
+ "serde",
+ "thiserror 2.0.19",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "ndk"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
+dependencies = [
+ "bitflags 2.13.1",
+ "jni-sys 0.3.1",
+ "log",
+ "ndk-sys",
+ "num_enum",
+ "raw-window-handle",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "ndk-sys"
+version = "0.6.0+11769913"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
+dependencies = [
+ "jni-sys 0.3.1",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags 2.13.1",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "notify-rust"
+version = "4.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b4c1b4f2aa9f25f63a7a49d3dd0ed567b3670da15330a66b29434be899b891"
+dependencies = [
+ "futures-lite",
+ "log",
+ "mac-notification-sys",
+ "serde",
+ "tauri-winrt-notification",
+ "zbus",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26"
+dependencies = [
+ "num_enum_derive",
+ "rustversion",
+]
+
+[[package]]
+name = "num_enum_derive"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "objc"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "objc2"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
+dependencies = [
+ "objc2-encode",
+ "objc2-exception-helper",
+]
+
+[[package]]
+name = "objc2-app-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-cloud-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+dependencies = [
+ "bitflags 2.13.1",
+ "dispatch2",
+ "objc2",
+]
+
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
+dependencies = [
+ "bitflags 2.13.1",
+ "dispatch2",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-io-surface",
+]
+
+[[package]]
+name = "objc2-core-image"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-location"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-core-text"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+]
+
+[[package]]
+name = "objc2-encode"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
+[[package]]
+name = "objc2-exception-helper"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2",
+ "libc",
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-io-surface"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2",
+ "objc2-core-foundation",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags 2.13.1",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-ui-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2",
+ "objc2",
+ "objc2-cloud-kit",
+ "objc2-core-data",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image",
+ "objc2-core-location",
+ "objc2-core-text",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "objc2-user-notifications",
+]
+
+[[package]]
+name = "objc2-user-notifications"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+dependencies = [
+ "objc2",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "objc2-web-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
+
+[[package]]
+name = "open"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0b3d059e795d52b8a72fef45658620edd4d9c359b338564aa14391ffa511ed5"
+dependencies = [
+ "is-wsl",
+ "libc",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "ordered-multimap"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485"
+dependencies = [
+ "dlv-list 0.2.3",
+ "hashbrown 0.9.1",
+]
+
+[[package]]
+name = "ordered-multimap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
+dependencies = [
+ "dlv-list 0.5.2",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "pango"
+version = "0.18.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4"
+dependencies = [
+ "gio",
+ "glib",
+ "libc",
+ "once_cell",
+ "pango-sys",
+]
+
+[[package]]
+name = "pango-sys"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5"
+dependencies = [
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+ "serde",
+]
+
+[[package]]
+name = "phf_codegen"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+dependencies = [
+ "fastrand",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
+
+[[package]]
+name = "piper"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e"
+
+[[package]]
+name = "plist"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da1d65da6dd5d1e44199ac0f58712d241c0f439f80adea8924d832384087f85"
+dependencies = [
+ "base64 0.22.1",
+ "indexmap 2.14.0",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
+[[package]]
+name = "png"
+version = "0.17.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
+dependencies = [
+ "bitflags 1.3.2",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "png"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
+dependencies = [
+ "bitflags 2.13.1",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+dependencies = [
+ "toml_datetime 0.6.3",
+ "toml_edit 0.20.2",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit 0.25.13+spec-1.1.0",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.41.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e660451e55124f798a69a5af3f49ccfbefbd41910eefd25caf2393e1f3473ec1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.47"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
+[[package]]
+name = "rand"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.5",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.17",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
+[[package]]
+name = "raw-window-handle"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.13.1",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+dependencies = [
+ "getrandom 0.2.17",
+ "libredox",
+ "thiserror 2.0.19",
+]
+
+[[package]]
+name = "ref-cast"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216e8f773d7923bcba9ceb86a86c93cabb3903a11872fc3f138c49630e50b96d"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9283685feec7d69af75fb0e858d5e7378f33fe4fc699383b2916ab9273e03c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.2",
+]
+
+[[package]]
+name = "regex"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
+
+[[package]]
+name = "reqwest"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "sync_wrapper",
+ "tokio",
+ "tokio-util",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.17",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap 0.3.1",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap 0.7.3",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags 2.13.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138"
+dependencies = [
+ "log",
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "schemars"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
+dependencies = [
+ "dyn-clone",
+ "indexmap 1.9.3",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "schemars"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "selectors"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
+dependencies = [
+ "bitflags 2.13.1",
+ "cssparser",
+ "derive_more",
+ "log",
+ "new_debug_unreachable",
+ "phf",
+ "phf_codegen",
+ "precomputed-hash",
+ "rustc-hash",
+ "servo_arc",
+ "smallvec",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde-untagged"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9faf48a4a2d2693be24c6289dbe26552776eb7737074e6722891fadbe6c5058"
+dependencies = [
+ "erased-serde",
+ "serde",
+ "serde_core",
+ "typeid",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.229"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.2",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.151"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14"
+dependencies = [
+ "itoa",
+ "memchr",
+ "serde",
+ "serde_core",
+ "zmij",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.2",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
+dependencies = [
+ "base64 0.22.1",
+ "bs58",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.14.0",
+ "schemars 0.9.0",
+ "schemars 1.2.1",
+ "serde_core",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "serialize-to-javascript"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5"
+dependencies = [
+ "serde",
+ "serde_json",
+ "serialize-to-javascript-impl",
+]
+
+[[package]]
+name = "serialize-to-javascript-impl"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "servo_arc"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "170fb83ab34de17dc69aa7c67482b22218ddb85da56546f9bd6b929e32a05930"
+dependencies = [
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b"
+dependencies = [
+ "errno",
+ "libc",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
+
+[[package]]
+name = "siphasher"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+
+[[package]]
+name = "slab"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
+
+[[package]]
+name = "smallvec"
+version = "1.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
+
+[[package]]
+name = "socket2"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "softbuffer"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3"
+dependencies = [
+ "bytemuck",
+ "js-sys",
+ "ndk",
+ "objc2",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "objc2-quartz-core",
+ "raw-window-handle",
+ "redox_syscall",
+ "tracing",
+ "wasm-bindgen",
+ "web-sys",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "soup3"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f"
+dependencies = [
+ "futures-channel",
+ "gio",
+ "glib",
+ "libc",
+ "soup3-sys",
+]
+
+[[package]]
+name = "soup3-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27"
+dependencies = [
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "libc",
+ "system-deps",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "string_cache"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901"
+dependencies = [
+ "new_debug_unreachable",
+ "parking_lot",
+ "phf_shared",
+ "precomputed-hash",
+]
+
+[[package]]
+name = "string_cache_codegen"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "sure-desktop"
+version = "0.1.0"
+dependencies = [
+ "base64 0.22.1",
+ "getrandom 0.2.17",
+ "keyring",
+ "open",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-autostart",
+ "tauri-plugin-decorum",
+ "tauri-plugin-deep-link",
+ "tauri-plugin-notification",
+ "ureq",
+ "url",
+]
+
+[[package]]
+name = "swift-rs"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.119"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a207d6d6a2b7fc470b80443726053f18a2481b7e1eee970597051596567987a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml 0.8.2",
+ "version-compare",
+]
+
+[[package]]
+name = "tao"
+version = "0.35.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
+dependencies = [
+ "bitflags 2.13.1",
+ "block2",
+ "core-foundation 0.10.1",
+ "core-graphics 0.25.0",
+ "crossbeam-channel",
+ "dbus",
+ "dispatch2",
+ "dlopen2",
+ "dpi",
+ "gdkwayland-sys",
+ "gdkx11-sys",
+ "gtk",
+ "jni",
+ "libc",
+ "log",
+ "ndk",
+ "ndk-sys",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "once_cell",
+ "parking_lot",
+ "percent-encoding",
+ "raw-window-handle",
+ "tao-macros",
+ "unicode-segmentation",
+ "url",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+ "windows-version",
+ "x11-dl",
+]
+
+[[package]]
+name = "tao-macros"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "tauri"
+version = "2.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "667b20e2726d572dea2de7370da16e188eb06008faf9a92fab7cdc46791190b5"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "cookie",
+ "dirs 6.0.0",
+ "dunce",
+ "embed_plist",
+ "getrandom 0.3.4",
+ "glob",
+ "gtk",
+ "heck 0.5.0",
+ "http",
+ "jni",
+ "libc",
+ "log",
+ "mime",
+ "muda",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "objc2-web-kit",
+ "percent-encoding",
+ "plist",
+ "raw-window-handle",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "serialize-to-javascript",
+ "swift-rs",
+ "tauri-build",
+ "tauri-macros",
+ "tauri-runtime",
+ "tauri-runtime-wry",
+ "tauri-utils",
+ "thiserror 2.0.19",
+ "tokio",
+ "tray-icon",
+ "url",
+ "webkit2gtk",
+ "webview2-com",
+ "window-vibrancy",
+ "windows 0.61.3",
+]
+
+[[package]]
+name = "tauri-build"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc9ce40b16101cb6ea63d3e221567affd1c3a9205f95d7bc574941a10636b632"
+dependencies = [
+ "anyhow",
+ "cargo_toml",
+ "dirs 6.0.0",
+ "glob",
+ "heck 0.5.0",
+ "json-patch",
+ "schemars 0.8.22",
+ "semver",
+ "serde",
+ "serde_json",
+ "tauri-utils",
+ "tauri-winres",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-codegen"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08279169ff42f8fc45a1dbc9dcae888893ba95288142e5880c59b93a26d2cfc5"
+dependencies = [
+ "base64 0.22.1",
+ "brotli",
+ "ico",
+ "json-patch",
+ "plist",
+ "png 0.17.16",
+ "proc-macro2",
+ "quote",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2",
+ "syn 2.0.119",
+ "tauri-utils",
+ "thiserror 2.0.19",
+ "time",
+ "url",
+ "uuid",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-macros"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8b394794f399a421811d06966343e7933fcae92d59f5180b9388d1174497a45"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "tauri-codegen",
+ "tauri-utils",
+]
+
+[[package]]
+name = "tauri-plugin"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74be5dd4bed9afbd145e5716b5fa2ec28cbc29c34ffa61c258c9273d896c8020"
+dependencies = [
+ "anyhow",
+ "glob",
+ "plist",
+ "schemars 0.8.22",
+ "serde",
+ "serde_json",
+ "tauri-utils",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-plugin-autostart"
+version = "2.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "459383cebc193cdd03d1ba4acc40f2c408a7abce419d64bdcd2d745bc2886f70"
+dependencies = [
+ "auto-launch",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.19",
+]
+
+[[package]]
+name = "tauri-plugin-decorum"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db925c61a04a937028bc91ad8ae64a93b84a1715b964530925a54e793d494999"
+dependencies = [
+ "anyhow",
+ "cocoa",
+ "enigo",
+ "linicon",
+ "objc",
+ "rand 0.8.7",
+ "serde",
+ "tauri",
+ "tauri-plugin",
+]
+
+[[package]]
+name = "tauri-plugin-deep-link"
+version = "2.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ee75bc5627f77bfdf40c913255ebc258117b10ebe2b2239a1a1cf40b0b58aa"
+dependencies = [
+ "dunce",
+ "plist",
+ "rust-ini 0.21.3",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "tauri-utils",
+ "thiserror 2.0.19",
+ "tracing",
+ "url",
+ "windows-registry",
+ "windows-result 0.3.4",
+]
+
+[[package]]
+name = "tauri-plugin-notification"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01fc2c5ff41105bd1f7242d8201fdf3efd70749b82fa013a17f2126357d194cc"
+dependencies = [
+ "log",
+ "notify-rust",
+ "rand 0.9.5",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-plugin",
+ "thiserror 2.0.19",
+ "time",
+ "url",
+]
+
+[[package]]
+name = "tauri-runtime"
+version = "2.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0b4bc95aed361b0019067d189a1174a603d460d0f6c72606512d59fc9c12ec8"
+dependencies = [
+ "cookie",
+ "dpi",
+ "gtk",
+ "http",
+ "jni",
+ "objc2",
+ "objc2-ui-kit",
+ "objc2-web-kit",
+ "raw-window-handle",
+ "serde",
+ "serde_json",
+ "tauri-utils",
+ "thiserror 2.0.19",
+ "url",
+ "webkit2gtk",
+ "webview2-com",
+ "windows 0.61.3",
+]
+
+[[package]]
+name = "tauri-runtime-wry"
+version = "2.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e6fac707727b7a2f48e4ded90976324267371073edbb415ffb73bb0458d203f"
+dependencies = [
+ "gtk",
+ "http",
+ "jni",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "once_cell",
+ "percent-encoding",
+ "raw-window-handle",
+ "softbuffer",
+ "tao",
+ "tauri-runtime",
+ "tauri-utils",
+ "url",
+ "webkit2gtk",
+ "webview2-com",
+ "windows 0.61.3",
+ "wry",
+]
+
+[[package]]
+name = "tauri-utils"
+version = "2.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e176a18e67764923c4f1ce66f25ae4abe5f688384d5eb1a0fa6c77f3d90f887"
+dependencies = [
+ "anyhow",
+ "brotli",
+ "cargo_metadata",
+ "ctor",
+ "dom_query",
+ "dunce",
+ "glob",
+ "http",
+ "infer",
+ "json-patch",
+ "log",
+ "memchr",
+ "phf",
+ "plist",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "schemars 0.8.22",
+ "semver",
+ "serde",
+ "serde-untagged",
+ "serde_json",
+ "serde_with",
+ "swift-rs",
+ "thiserror 2.0.19",
+ "toml 1.1.3+spec-1.1.0",
+ "url",
+ "urlpattern",
+ "uuid",
+ "walkdir",
+]
+
+[[package]]
+name = "tauri-winres"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc65d45c68858bfe420dd29e834b5d15dbecf8a07a8a16cf4d532c7b1f69d4b6"
+dependencies = [
+ "dunce",
+ "embed-resource",
+ "toml 1.1.3+spec-1.1.0",
+]
+
+[[package]]
+name = "tauri-winrt-notification"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade"
+dependencies = [
+ "thiserror 2.0.19",
+ "windows 0.61.3",
+ "windows-version",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom 0.4.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tendril"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fed54709c5b3a53d09bb1c113ea4f5ceafd1e772ddcb0030a82e1d56c087b08"
+dependencies = [
+ "new_debug_unreachable",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09a43598840e33d5b0331f38c5e30d13bb11c11210a4b58f0d9b18a5a5eefcd9"
+dependencies = [
+ "thiserror-impl 2.0.19",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43cbfe0cf76104d42a574802844187e84a305e531ed54455f11fbde0f10541cd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 3.0.2",
+]
+
+[[package]]
+name = "time"
+version = "0.3.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e1d5e639ff6bab73cb6885cc7e7b1de96c3f32c68ec55f3952614bec1092244"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde_core",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
+
+[[package]]
+name = "time-macros"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+dependencies = [
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.3",
+ "toml_edit 0.20.2",
+]
+
+[[package]]
+name = "toml"
+version = "0.9.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
+dependencies = [
+ "indexmap 2.14.0",
+ "serde_core",
+ "serde_spanned 1.1.1",
+ "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 0.7.15",
+]
+
+[[package]]
+name = "toml"
+version = "1.1.3+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c"
+dependencies = [
+ "indexmap 2.14.0",
+ "serde_core",
+ "serde_spanned 1.1.1",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow 1.0.4",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.14.0",
+ "toml_datetime 0.6.3",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+dependencies = [
+ "indexmap 2.14.0",
+ "serde",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.3",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.13+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b"
+dependencies = [
+ "indexmap 2.14.0",
+ "toml_datetime 1.1.1+spec-1.1.0",
+ "toml_parser",
+ "winnow 1.0.4",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow 1.0.4",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2"
+
+[[package]]
+name = "tower"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
+dependencies = [
+ "bitflags 2.13.1",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "pin-project-lite",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "url",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "tray-icon"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65ba1e5f6b9ef9fd87e21b9c6f351554dbd717960089168fcfdef854686961dc"
+dependencies = [
+ "crossbeam-channel",
+ "dirs 6.0.0",
+ "libappindicator",
+ "muda",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "once_cell",
+ "png 0.18.1",
+ "serde",
+ "thiserror 2.0.19",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "typeid"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
+[[package]]
+name = "typenum"
+version = "1.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
+
+[[package]]
+name = "uds_windows"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "unic-char-property"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221"
+dependencies = [
+ "unic-char-range",
+]
+
+[[package]]
+name = "unic-char-range"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc"
+
+[[package]]
+name = "unic-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc"
+
+[[package]]
+name = "unic-ucd-ident"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987"
+dependencies = [
+ "unic-char-property",
+ "unic-char-range",
+ "unic-ucd-version",
+]
+
+[[package]]
+name = "unic-ucd-version"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4"
+dependencies = [
+ "unic-common",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "ureq"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
+dependencies = [
+ "base64 0.22.1",
+ "flate2",
+ "log",
+ "once_cell",
+ "rustls",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "url",
+ "webpki-roots 0.26.11",
+]
+
+[[package]]
+name = "url"
+version = "2.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+ "serde_derive",
+]
+
+[[package]]
+name = "urlpattern"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d"
+dependencies = [
+ "regex",
+ "serde",
+ "unic-ucd-ident",
+ "url",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239"
+dependencies = [
+ "getrandom 0.4.3",
+ "js-sys",
+ "serde_core",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "version-compare"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c2856837ef78f57382f06b2b8563a2f512f7185d732608fd9176cb3b8edf0e"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "vswhom"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b"
+dependencies = [
+ "libc",
+ "vswhom-sys",
+]
+
+[[package]]
+name = "vswhom-sys"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb067e4cbd1ff067d1df46c9194b5de0e98efd2810bbc95c5d5e5f25a3231150"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.4+wasi-0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c62df1340f32221cb9c54d6a27b030e3dba64361d4a95bed55f9aacb44da291d"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.126"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web_atoms"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "075474b12bcb3d2e3d4546580e9de478eeeead668a1761e2a8860c836b7ef297"
+dependencies = [
+ "phf",
+ "phf_codegen",
+ "string_cache",
+ "string_cache_codegen",
+]
+
+[[package]]
+name = "webkit2gtk"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-rs",
+ "gdk",
+ "gdk-sys",
+ "gio",
+ "gio-sys",
+ "glib",
+ "glib-sys",
+ "gobject-sys",
+ "gtk",
+ "gtk-sys",
+ "javascriptcore-rs",
+ "libc",
+ "once_cell",
+ "soup3",
+ "webkit2gtk-sys",
+]
+
+[[package]]
+name = "webkit2gtk-sys"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5"
+dependencies = [
+ "bitflags 1.3.2",
+ "cairo-sys-rs",
+ "gdk-sys",
+ "gio-sys",
+ "glib-sys",
+ "gobject-sys",
+ "gtk-sys",
+ "javascriptcore-rs-sys",
+ "libc",
+ "pkg-config",
+ "soup3-sys",
+ "system-deps",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.9",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dcd9d09a39985f5344844e66b0c530a33843579125f23e21e9f0f220850f22a"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "webview2-com"
+version = "0.38.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
+dependencies = [
+ "webview2-com-macros",
+ "webview2-com-sys",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+ "windows-implement",
+ "windows-interface",
+]
+
+[[package]]
+name = "webview2-com-macros"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "webview2-com-sys"
+version = "0.38.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
+dependencies = [
+ "thiserror 2.0.19",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "window-vibrancy"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
+dependencies = [
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "raw-window-handle",
+ "windows-sys 0.59.0",
+ "windows-version",
+]
+
+[[package]]
+name = "windows"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core 0.51.1",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.61.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
+dependencies = [
+ "windows-collections",
+ "windows-core 0.61.2",
+ "windows-future",
+ "windows-link 0.1.3",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
+dependencies = [
+ "windows-core 0.61.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link 0.2.1",
+ "windows-result 0.4.1",
+ "windows-strings 0.5.1",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
+dependencies = [
+ "windows-core 0.61.2",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+dependencies = [
+ "windows-link 0.1.3",
+ "windows-result 0.3.4",
+ "windows-strings 0.4.2",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b66463ad2e0ea3bbf808b7f1d371311c80e115c0b71d60efc142cafbcfb057a6"
+dependencies = [
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "windows-version"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
+
+[[package]]
+name = "winnow"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winreg"
+version = "0.55.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.57.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
+
+[[package]]
+name = "writeable"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
+
+[[package]]
+name = "wry"
+version = "0.55.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"
+dependencies = [
+ "base64 0.22.1",
+ "block2",
+ "cookie",
+ "crossbeam-channel",
+ "dirs 6.0.0",
+ "dom_query",
+ "dpi",
+ "dunce",
+ "gdkx11",
+ "gtk",
+ "http",
+ "javascriptcore-rs",
+ "jni",
+ "libc",
+ "ndk",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-foundation",
+ "objc2-ui-kit",
+ "objc2-web-kit",
+ "once_cell",
+ "percent-encoding",
+ "raw-window-handle",
+ "sha2",
+ "soup3",
+ "tao-macros",
+ "thiserror 2.0.19",
+ "url",
+ "webkit2gtk",
+ "webkit2gtk-sys",
+ "webview2-com",
+ "windows 0.61.3",
+ "windows-core 0.61.2",
+ "windows-version",
+ "x11-dl",
+]
+
+[[package]]
+name = "x11"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
+dependencies = [
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "x11-dl"
+version = "2.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "pkg-config",
+]
+
+[[package]]
+name = "yoke"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
+
+[[package]]
+name = "zbus"
+version = "5.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe18fb60dc696039e738717b76eaea21e7a4489bbb1885020b43c94236d7e98a"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-lite",
+ "hex",
+ "libc",
+ "ordered-stream",
+ "rustix",
+ "serde",
+ "serde_repr",
+ "tracing",
+ "uds_windows",
+ "uuid",
+ "windows-sys 0.61.2",
+ "winnow 1.0.4",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "5.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe96480bed92df2b442a1a30df364e12d08eed03aeb061f2b8dc6afb2be91119"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "4.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e"
+dependencies = [
+ "serde",
+ "winnow 1.0.4",
+ "zvariant",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5a105cd7b140f6eeec8acff2ea38135d3cab283ada58540f629fe51e46696eb"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fe976fb70c78cd64cccfe3a6fc142244e8a77b70959b30faf9d0ac37ee228eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
+[[package]]
+name = "zmij"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
+
+[[package]]
+name = "zvariant"
+version = "5.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bee2a0bcd2a907786a456fff45aaaaf54c9ba5f50b71ae9ec1a4edd200c94911"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "winnow 1.0.4",
+ "zvariant_derive",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "5.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38a708216a18780796770bfe3f4739c7c83a3e8f789b755534bbbc06e4e23e12"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90cb9383f9b45290407a1258b202d3f8f01db719eb60b4e4055c6375af4fc7c7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.119",
+ "winnow 1.0.4",
+]
diff --git a/desktop/src-tauri/Cargo.toml b/desktop/src-tauri/Cargo.toml
new file mode 100644
index 000000000..2310bb5d0
--- /dev/null
+++ b/desktop/src-tauri/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "sure-desktop"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "sure_desktop_lib"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+[build-dependencies]
+tauri-build = { version = "2", features = [] }
+
+[dependencies]
+tauri = { version = "2", features = ["macos-private-api"] }
+tauri-plugin-notification = "2"
+tauri-plugin-autostart = "2"
+tauri-plugin-deep-link = "2"
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+keyring = "3"
+tauri-plugin-decorum = "1"
+url = "2"
+ureq = { version = "2", features = ["json"] }
+open = "5"
+sha2 = "0.10"
+base64 = "0.22"
+getrandom = "0.2"
+
+[dev-dependencies]
diff --git a/desktop/src-tauri/build.rs b/desktop/src-tauri/build.rs
new file mode 100644
index 000000000..581cd65da
--- /dev/null
+++ b/desktop/src-tauri/build.rs
@@ -0,0 +1,10 @@
+fn main() {
+    let bridge = std::path::Path::new("../dist/bridge.js");
+    if !bridge.exists() {
+        if let Some(parent) = bridge.parent() {
+            let _ = std::fs::create_dir_all(parent);
+        }
+        let _ = std::fs::write(bridge, "/* bridge placeholder */");
+    }
+    tauri_build::build();
+}
diff --git a/desktop/src-tauri/capabilities/default.json b/desktop/src-tauri/capabilities/default.json
new file mode 100644
index 000000000..e3404bffb
--- /dev/null
+++ b/desktop/src-tauri/capabilities/default.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "../gen/schemas/desktop-schema.json",
+  "identifier": "default",
+  "description": "Default capabilities for the main window",
+  "windows": ["main", "prefs"],
+  "permissions": [
+    "core:default",
+    "core:window:allow-start-dragging",
+    "core:window:allow-show",
+    "core:window:allow-set-focus",
+    "core:event:allow-emit",
+    "core:event:allow-listen",
+    "notification:default",
+    "autostart:allow-enable",
+    "autostart:allow-disable",
+    "autostart:allow-is-enabled",
+    "deep-link:default"
+  ]
+}
diff --git a/desktop/src-tauri/icons/128x128.png b/desktop/src-tauri/icons/128x128.png
new file mode 100644
index 000000000..b68b5b261
Binary files /dev/null and b/desktop/src-tauri/icons/128x128.png differ
diff --git a/desktop/src-tauri/icons/128x128@2x.png b/desktop/src-tauri/icons/128x128@2x.png
new file mode 100644
index 000000000..19761e3d1
Binary files /dev/null and b/desktop/src-tauri/icons/128x128@2x.png differ
diff --git a/desktop/src-tauri/icons/32x32.png b/desktop/src-tauri/icons/32x32.png
new file mode 100644
index 000000000..2d49438b2
Binary files /dev/null and b/desktop/src-tauri/icons/32x32.png differ
diff --git a/desktop/src-tauri/icons/64x64.png b/desktop/src-tauri/icons/64x64.png
new file mode 100644
index 000000000..33858a9be
Binary files /dev/null and b/desktop/src-tauri/icons/64x64.png differ
diff --git a/desktop/src-tauri/icons/Square107x107Logo.png b/desktop/src-tauri/icons/Square107x107Logo.png
new file mode 100644
index 000000000..c2652a33b
Binary files /dev/null and b/desktop/src-tauri/icons/Square107x107Logo.png differ
diff --git a/desktop/src-tauri/icons/Square142x142Logo.png b/desktop/src-tauri/icons/Square142x142Logo.png
new file mode 100644
index 000000000..948340444
Binary files /dev/null and b/desktop/src-tauri/icons/Square142x142Logo.png differ
diff --git a/desktop/src-tauri/icons/Square150x150Logo.png b/desktop/src-tauri/icons/Square150x150Logo.png
new file mode 100644
index 000000000..6ba6b1447
Binary files /dev/null and b/desktop/src-tauri/icons/Square150x150Logo.png differ
diff --git a/desktop/src-tauri/icons/Square284x284Logo.png b/desktop/src-tauri/icons/Square284x284Logo.png
new file mode 100644
index 000000000..0ed0324d6
Binary files /dev/null and b/desktop/src-tauri/icons/Square284x284Logo.png differ
diff --git a/desktop/src-tauri/icons/Square30x30Logo.png b/desktop/src-tauri/icons/Square30x30Logo.png
new file mode 100644
index 000000000..88f955486
Binary files /dev/null and b/desktop/src-tauri/icons/Square30x30Logo.png differ
diff --git a/desktop/src-tauri/icons/Square310x310Logo.png b/desktop/src-tauri/icons/Square310x310Logo.png
new file mode 100644
index 000000000..b9bd058eb
Binary files /dev/null and b/desktop/src-tauri/icons/Square310x310Logo.png differ
diff --git a/desktop/src-tauri/icons/Square44x44Logo.png b/desktop/src-tauri/icons/Square44x44Logo.png
new file mode 100644
index 000000000..4fd2ee90e
Binary files /dev/null and b/desktop/src-tauri/icons/Square44x44Logo.png differ
diff --git a/desktop/src-tauri/icons/Square71x71Logo.png b/desktop/src-tauri/icons/Square71x71Logo.png
new file mode 100644
index 000000000..92ed5c179
Binary files /dev/null and b/desktop/src-tauri/icons/Square71x71Logo.png differ
diff --git a/desktop/src-tauri/icons/Square89x89Logo.png b/desktop/src-tauri/icons/Square89x89Logo.png
new file mode 100644
index 000000000..c3b003d40
Binary files /dev/null and b/desktop/src-tauri/icons/Square89x89Logo.png differ
diff --git a/desktop/src-tauri/icons/StoreLogo.png b/desktop/src-tauri/icons/StoreLogo.png
new file mode 100644
index 000000000..c69dcb594
Binary files /dev/null and b/desktop/src-tauri/icons/StoreLogo.png differ
diff --git a/desktop/src-tauri/icons/icon.icns b/desktop/src-tauri/icons/icon.icns
new file mode 100644
index 000000000..548fb641c
Binary files /dev/null and b/desktop/src-tauri/icons/icon.icns differ
diff --git a/desktop/src-tauri/icons/icon.ico b/desktop/src-tauri/icons/icon.ico
new file mode 100644
index 000000000..2a21a8b03
Binary files /dev/null and b/desktop/src-tauri/icons/icon.ico differ
diff --git a/desktop/src-tauri/icons/icon.png b/desktop/src-tauri/icons/icon.png
new file mode 100644
index 000000000..c1430e19f
Binary files /dev/null and b/desktop/src-tauri/icons/icon.png differ
diff --git a/desktop/src-tauri/src/badge.rs b/desktop/src-tauri/src/badge.rs
new file mode 100644
index 000000000..632a00798
--- /dev/null
+++ b/desktop/src-tauri/src/badge.rs
@@ -0,0 +1,27 @@
+use serde::Deserialize;
+use tauri::Listener;
+
+#[derive(Deserialize)]
+struct BadgePayload {
+    count: i64,
+}
+
+pub fn register(app: &tauri::AppHandle) {
+    let handle = app.clone();
+    app.listen("bridge://badge", move |event| {
+        if let Ok(p) = serde_json::from_str::<BadgePayload>(event.payload()) {
+            let label = if p.count > 0 {
+                Some(p.count.to_string())
+            } else {
+                None
+            };
+            #[cfg(target_os = "macos")]
+            {
+                use tauri::Manager;
+                if let Some(w) = handle.get_webview_window("main") {
+                    let _ = w.set_badge_label(label);
+                }
+            }
+        }
+    });
+}
diff --git a/desktop/src-tauri/src/commands.rs b/desktop/src-tauri/src/commands.rs
new file mode 100644
index 000000000..edeb6cf8c
--- /dev/null
+++ b/desktop/src-tauri/src/commands.rs
@@ -0,0 +1,137 @@
+use crate::servers::{
+    health_check_url, is_healthy_status, normalize_server_url, ServerEntry, ServerStore,
+};
+use crate::state::AppState;
+use tauri::{Emitter, Manager, State};
+use tauri_plugin_autostart::ManagerExt;
+
+#[tauri::command]
+pub fn list_servers() -> Vec<ServerEntry> {
+    ServerStore::load()
+}
+
+#[tauri::command]
+pub fn add_server(url: String, label: String) -> Result<Vec<ServerEntry>, String> {
+    let canonical = normalize_server_url(&url).map_err(|e| e.to_string())?;
+    let label = if label.trim().is_empty() { canonical.clone() } else { label };
+    ServerStore::add(ServerEntry { url: canonical, label }).map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+pub fn remove_server(url: String) -> Result<Vec<ServerEntry>, String> {
+    ServerStore::remove(&url).map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+pub fn check_server(url: String) -> Result<bool, String> {
+    let canonical = normalize_server_url(&url).map_err(|e| e.to_string())?;
+    let health = health_check_url(&canonical);
+    match ureq::get(&health).timeout(std::time::Duration::from_secs(6)).call() {
+        Ok(resp) => Ok(is_healthy_status(resp.status())),
+        Err(ureq::Error::Status(code, _)) => Ok(is_healthy_status(code)),
+        Err(e) => Err(e.to_string()),
+    }
+}
+
+#[tauri::command]
+pub fn active_server(state: State<AppState>) -> Option<String> {
+    if let Some(url) = state.active_server.lock().unwrap().clone() {
+        return Some(url);
+    }
+    // Fall back to the persisted value so a relaunch resumes the last server.
+    crate::servers::load_active()
+}
+
+#[tauri::command]
+pub fn set_active_server(url: String, state: State<AppState>, app: tauri::AppHandle) {
+    let _ = crate::servers::save_active(&url);
+    // Grant this origin the runtime IPC capability before we navigate to it, so
+    // the injected bridge works — instead of a static wildcard that would grant
+    // IPC to any origin.
+    grant_server_capability(&app, &url);
+    *state.active_server.lock().unwrap() = Some(url.clone());
+    let _ = app.emit("active-server-changed", url);
+}
+
+/// Grant the main webview IPC access for exactly one server origin, added at
+/// runtime so we never whitelist arbitrary (`https://*`) origins. Idempotent per
+/// origin. Mirrors the minimal permission set the bridge needs.
+pub fn grant_server_capability(app: &tauri::AppHandle, origin: &str) {
+    let Ok(canonical) = normalize_server_url(origin) else {
+        return;
+    };
+    {
+        let state = app.state::<AppState>();
+        let mut granted = state.granted_origins.lock().unwrap();
+        if !granted.insert(canonical.clone()) {
+            return; // already granted this origin
+        }
+    }
+    let id: String = format!(
+        "remote-{}",
+        canonical
+            .chars()
+            .map(|c| if c.is_ascii_alphanumeric() { c } else { '-' })
+            .collect::<String>()
+    );
+    let capability = tauri::ipc::CapabilityBuilder::new(id)
+        .window("main")
+        .remote(format!("{canonical}/**"))
+        .permission("core:window:allow-start-dragging")
+        .permission("core:window:allow-show")
+        .permission("core:window:allow-set-focus")
+        .permission("core:event:allow-emit")
+        .permission("core:event:allow-listen")
+        .permission("notification:default");
+    if let Err(e) = app.add_capability(capability) {
+        eprintln!("[sure] failed to grant capability for {canonical}: {e}");
+    }
+}
+
+/// Begin SSO in the system browser (so passkeys/WebAuthn work). Generates a
+/// PKCE pair, stashes the verifier + server for the sure://sso/callback handoff,
+/// and opens {server}/auth/desktop/{provider}?code_challenge=... in the browser.
+///
+/// Callable directly (local pages) or via the "sure://start-sso" event (the
+/// remote Sure page can emit events but cannot invoke custom commands).
+pub fn begin_sso(app: &tauri::AppHandle, server: String, provider: String) -> Result<(), String> {
+    let canonical = normalize_server_url(&server).map_err(|e| e.to_string())?;
+    // Only start SSO for a server the user has actually added. This event can be
+    // emitted by any page loaded in the webview, so gate it to trusted origins
+    // to prevent a rogue page from opening the browser to an attacker URL.
+    if !crate::servers::is_known_server(&canonical) {
+        return Err("unknown server".into());
+    }
+    // Providers are simple identifiers ([a-z0-9_-]); reject anything else so it
+    // can't smuggle extra path/query into the opened URL.
+    if provider.is_empty() || !provider.chars().all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-') {
+        return Err("invalid provider".into());
+    }
+
+    let pkce = crate::sso::generate_pkce();
+    let url = format!("{}/auth/desktop/{}?code_challenge={}", canonical, provider, pkce.challenge);
+
+    *app.state::<AppState>().pending_sso.lock().unwrap() = Some(crate::state::PendingSso {
+        verifier: pkce.verifier,
+        server: canonical,
+    });
+
+    open::that(url).map_err(|e| e.to_string())
+}
+
+#[tauri::command]
+pub fn start_sso(server: String, provider: String, app: tauri::AppHandle) -> Result<(), String> {
+    begin_sso(&app, server, provider)
+}
+
+#[tauri::command]
+pub fn get_launch_at_login(app: tauri::AppHandle) -> bool {
+    app.autolaunch().is_enabled().unwrap_or(false)
+}
+
+#[tauri::command]
+pub fn set_launch_at_login(app: tauri::AppHandle, enabled: bool) -> Result<(), String> {
+    let mgr = app.autolaunch();
+    let res = if enabled { mgr.enable() } else { mgr.disable() };
+    res.map_err(|e| e.to_string())
+}
diff --git a/desktop/src-tauri/src/deep_link.rs b/desktop/src-tauri/src/deep_link.rs
new file mode 100644
index 000000000..8b24fa186
--- /dev/null
+++ b/desktop/src-tauri/src/deep_link.rs
@@ -0,0 +1,52 @@
+use url::Url;
+
+pub struct DeepLinkTarget {
+    pub server: String,
+    pub path: String,
+}
+
+/// The result of an SSO handoff deep link: `sure://sso/callback?code=...` returns
+/// `Ok(code)`, `sure://sso/callback?error=...` returns `Err(error)`.
+pub enum SsoCallback {
+    Code(String),
+    Error(String),
+}
+
+/// Parse a `sure://sso/callback` deep link, or None if it is not one.
+pub fn parse_sso_callback(url: &str) -> Option<SsoCallback> {
+    let parsed = Url::parse(url).ok()?;
+    if parsed.scheme() != "sure" || parsed.host_str() != Some("sso") || parsed.path() != "/callback" {
+        return None;
+    }
+    let mut code = None;
+    let mut error = None;
+    for (k, v) in parsed.query_pairs() {
+        match k.as_ref() {
+            "code" => code = Some(v.into_owned()),
+            "error" => error = Some(v.into_owned()),
+            _ => {}
+        }
+    }
+    match (code, error) {
+        (Some(c), _) => Some(SsoCallback::Code(c)),
+        (None, Some(e)) => Some(SsoCallback::Error(e)),
+        _ => None,
+    }
+}
+
+pub fn parse(url: &str) -> Option<DeepLinkTarget> {
+    if !url.starts_with("sure://") {
+        return None;
+    }
+    let parsed = Url::parse(url).ok()?;
+    if parsed.scheme() != "sure" {
+        return None;
+    }
+    let host = parsed.host_str()?;
+    let server = match parsed.port() {
+        Some(p) => format!("https://{host}:{p}"),
+        None => format!("https://{host}"),
+    };
+    let path = if parsed.path().is_empty() { "/".to_string() } else { parsed.path().to_string() };
+    Some(DeepLinkTarget { server, path })
+}
diff --git a/desktop/src-tauri/src/lib.rs b/desktop/src-tauri/src/lib.rs
new file mode 100644
index 000000000..7d3ec20e9
--- /dev/null
+++ b/desktop/src-tauri/src/lib.rs
@@ -0,0 +1,151 @@
+pub mod badge;
+pub mod commands;
+pub mod deep_link;
+pub mod menu;
+pub mod notifications;
+pub mod servers;
+pub mod sso;
+pub mod state;
+pub mod window;
+
+use state::AppState;
+
+pub fn run() {
+    tauri::Builder::default()
+        .plugin(tauri_plugin_notification::init())
+        .plugin(tauri_plugin_decorum::init())
+        .plugin(tauri_plugin_autostart::init(
+            tauri_plugin_autostart::MacosLauncher::LaunchAgent,
+            None,
+        ))
+        .plugin(tauri_plugin_deep_link::init())
+        .manage(AppState::default())
+        .invoke_handler(tauri::generate_handler![
+            commands::list_servers,
+            commands::add_server,
+            commands::remove_server,
+            commands::check_server,
+            commands::active_server,
+            commands::set_active_server,
+            commands::get_launch_at_login,
+            commands::set_launch_at_login,
+            commands::start_sso,
+        ])
+        .setup(|app| {
+            window::setup(app)?;
+            let menu = menu::build(app.handle())?;
+            app.set_menu(menu)?;
+            app.on_menu_event(|app, event| menu::on_event(app, event.id().as_ref()));
+            notifications::register(app.handle());
+            badge::register(app.handle());
+            // Grant runtime IPC capabilities for every already-known server
+            // origin (saved + active) so the bridge works when the app resumes
+            // or switches to them — instead of a static wildcard capability.
+            for entry in servers::ServerStore::load() {
+                commands::grant_server_capability(app.handle(), &entry.url);
+            }
+            if let Some(active) = servers::load_active() {
+                commands::grant_server_capability(app.handle(), &active);
+            }
+            {
+                // Hide windows on close instead of destroying them, so reopening
+                // keeps working (a destroyed webview makes get_webview_window
+                // return None). For "main" this also lets the dock icon re-show
+                // it via the RunEvent::Reopen handler below.
+                use tauri::Manager;
+                for label in ["main", "prefs"] {
+                    if let Some(win) = app.get_webview_window(label) {
+                        let win_for_event = win.clone();
+                        win.on_window_event(move |event| {
+                            if let tauri::WindowEvent::CloseRequested { api, .. } = event {
+                                api.prevent_close();
+                                let _ = win_for_event.hide();
+                            }
+                        });
+                    }
+                }
+            }
+            {
+                // The remote Sure page can emit events but cannot invoke custom
+                // commands, so SSO is triggered via an event instead of invoke.
+                use tauri::Listener;
+                let handle = app.handle().clone();
+                app.listen_any("sure://start-sso", move |event| {
+                    #[derive(serde::Deserialize)]
+                    struct StartSso {
+                        server: String,
+                        provider: String,
+                    }
+                    if let Ok(p) = serde_json::from_str::<StartSso>(event.payload()) {
+                        if let Err(e) = commands::begin_sso(&handle, p.server, p.provider) {
+                            eprintln!("[sure] start-sso failed: {e}");
+                        }
+                    }
+                });
+            }
+            {
+                use tauri::Manager;
+                use tauri_plugin_deep_link::DeepLinkExt;
+                let handle = app.handle().clone();
+                app.deep_link().on_open_url(move |event| {
+                    for url in event.urls() {
+                        let u = url.as_str();
+                        // SSO handoff first: exchange the one-time code (bound to
+                        // our stored PKCE verifier) for a session in the webview.
+                        // POST it via a form so the verifier never appears in a
+                        // URL / server log (RFC 7636 keeps the verifier secret).
+                        if let Some(cb) = deep_link::parse_sso_callback(u) {
+                            let pending = handle.state::<AppState>().pending_sso.lock().unwrap().take();
+                            if let (deep_link::SsoCallback::Code(code), Some(p)) = (cb, pending) {
+                                if let Some(w) = handle.get_webview_window("main") {
+                                    let action = format!("{}/sessions/desktop_exchange", p.server);
+                                    let js = format!(
+                                        "(function(){{var f=document.createElement('form');f.method='POST';f.action={};\
+                                         var c=document.createElement('input');c.type='hidden';c.name='code';c.value={};f.appendChild(c);\
+                                         var v=document.createElement('input');v.type='hidden';v.name='code_verifier';v.value={};f.appendChild(v);\
+                                         document.body.appendChild(f);f.submit();}})();",
+                                        serde_json::to_string(&action).unwrap_or_default(),
+                                        serde_json::to_string(&code).unwrap_or_default(),
+                                        serde_json::to_string(&p.verifier).unwrap_or_default(),
+                                    );
+                                    let _ = w.eval(&js);
+                                }
+                            }
+                            continue;
+                        }
+                        // Generic sure://{host}/{path} navigation — only to a
+                        // server the user has saved, so a malicious deep link
+                        // can't load an arbitrary origin into the main webview.
+                        if let Some(target) = deep_link::parse(u) {
+                            if servers::is_known_server(&target.server) {
+                                if let Some(w) = handle.get_webview_window("main") {
+                                    let dest = format!("{}{}", target.server, target.path);
+                                    let _ = w.eval(&format!("window.location.assign({:?})", dest));
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+            Ok(())
+        })
+        .on_page_load(|window, payload| {
+            if payload.event() == tauri::webview::PageLoadEvent::Finished {
+                const BRIDGE: &str = include_str!("../../dist/bridge.js");
+                let _ = window.eval(BRIDGE);
+            }
+        })
+        .build(tauri::generate_context!())
+        .expect("error while running Sure Desktop")
+        .run(|app, event| {
+            // Clicking the dock icon (while the main window is hidden, not
+            // destroyed) fires Reopen — re-show and focus the main window.
+            if let tauri::RunEvent::Reopen { .. } = event {
+                use tauri::Manager;
+                if let Some(w) = app.get_webview_window("main") {
+                    let _ = w.show();
+                    let _ = w.set_focus();
+                }
+            }
+        });
+}
diff --git a/desktop/src-tauri/src/main.rs b/desktop/src-tauri/src/main.rs
new file mode 100644
index 000000000..a79e50cec
--- /dev/null
+++ b/desktop/src-tauri/src/main.rs
@@ -0,0 +1,5 @@
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    sure_desktop_lib::run();
+}
diff --git a/desktop/src-tauri/src/menu.rs b/desktop/src-tauri/src/menu.rs
new file mode 100644
index 000000000..4eae91873
--- /dev/null
+++ b/desktop/src-tauri/src/menu.rs
@@ -0,0 +1,90 @@
+use tauri::menu::{AboutMetadata, Menu, MenuItem, PredefinedMenuItem, Submenu};
+use tauri::Manager;
+
+pub fn build(app: &tauri::AppHandle) -> tauri::Result<Menu<tauri::Wry>> {
+    let pkg = app.package_info().clone();
+
+    let prefs = MenuItem::with_id(app, "preferences", "Preferences…", true, Some("Cmd+,"))?;
+    let switch = MenuItem::with_id(app, "switch_server", "Switch Server…", true, Some("Cmd+Shift+O"))?;
+    let app_menu = Submenu::with_items(
+        app,
+        &pkg.name,
+        true,
+        &[
+            &PredefinedMenuItem::about(app, Some(&pkg.name), Some(AboutMetadata::default()))?,
+            &PredefinedMenuItem::separator(app)?,
+            &prefs,
+            &switch,
+            &PredefinedMenuItem::separator(app)?,
+            &PredefinedMenuItem::hide(app, None)?,
+            &PredefinedMenuItem::hide_others(app, None)?,
+            &PredefinedMenuItem::separator(app)?,
+            &PredefinedMenuItem::quit(app, None)?,
+        ],
+    )?;
+
+    let file_menu = Submenu::with_items(
+        app,
+        "File",
+        true,
+        &[&PredefinedMenuItem::close_window(app, None)?],
+    )?;
+
+    let edit_menu = Submenu::with_items(
+        app,
+        "Edit",
+        true,
+        &[
+            &PredefinedMenuItem::undo(app, None)?,
+            &PredefinedMenuItem::redo(app, None)?,
+            &PredefinedMenuItem::separator(app)?,
+            &PredefinedMenuItem::cut(app, None)?,
+            &PredefinedMenuItem::copy(app, None)?,
+            &PredefinedMenuItem::paste(app, None)?,
+            &PredefinedMenuItem::select_all(app, None)?,
+        ],
+    )?;
+
+    let reload = MenuItem::with_id(app, "reload", "Reload", true, Some("Cmd+R"))?;
+    let view_menu = Submenu::with_items(app, "View", true, &[&reload])?;
+
+    let window_menu = Submenu::with_items(
+        app,
+        "Window",
+        true,
+        &[
+            &PredefinedMenuItem::minimize(app, None)?,
+            &PredefinedMenuItem::maximize(app, None)?,
+        ],
+    )?;
+
+    Menu::with_items(app, &[&app_menu, &file_menu, &edit_menu, &view_menu, &window_menu])
+}
+
+pub fn on_event(app: &tauri::AppHandle, id: &str) {
+    match id {
+        // Handled entirely in Rust: showing the prefs window does not depend on
+        // the remote page's IPC being available, so it works on any page.
+        "preferences" | "switch_server" => {
+            let prefs = app.get_webview_window("prefs");
+            if let Some(main) = app.get_webview_window("main") {
+                let _ = main.eval(&format!(
+                    "console.log('[sure] menu {} -> prefs window present: {}')",
+                    id,
+                    prefs.is_some()
+                ));
+            }
+            if let Some(w) = prefs {
+                let _ = w.show();
+                let _ = w.set_focus();
+                let _ = w.unminimize();
+            }
+        }
+        "reload" => {
+            if let Some(w) = app.get_webview_window("main") {
+                let _ = w.eval("window.location.reload()");
+            }
+        }
+        _ => {}
+    }
+}
diff --git a/desktop/src-tauri/src/notifications.rs b/desktop/src-tauri/src/notifications.rs
new file mode 100644
index 000000000..227e465ca
--- /dev/null
+++ b/desktop/src-tauri/src/notifications.rs
@@ -0,0 +1,23 @@
+use serde::Deserialize;
+use tauri::Listener;
+use tauri_plugin_notification::NotificationExt;
+
+#[derive(Deserialize)]
+struct NotifyPayload {
+    title: String,
+    body: String,
+}
+
+pub fn register(app: &tauri::AppHandle) {
+    let handle = app.clone();
+    app.listen("bridge://notify", move |event| {
+        if let Ok(p) = serde_json::from_str::<NotifyPayload>(event.payload()) {
+            let _ = handle
+                .notification()
+                .builder()
+                .title(p.title)
+                .body(p.body)
+                .show();
+        }
+    });
+}
diff --git a/desktop/src-tauri/src/servers.rs b/desktop/src-tauri/src/servers.rs
new file mode 100644
index 000000000..182d51899
--- /dev/null
+++ b/desktop/src-tauri/src/servers.rs
@@ -0,0 +1,174 @@
+use serde::{Deserialize, Serialize};
+use url::Url;
+
+const KEYRING_SERVICE: &str = "app.sure.desktop";
+const KEYRING_ACCOUNT: &str = "servers";
+const KEYRING_ACTIVE: &str = "active_server";
+
+#[derive(Debug)]
+pub enum ServerError {
+    InvalidUrl(String),
+    Keyring(String),
+}
+
+impl std::fmt::Display for ServerError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            ServerError::InvalidUrl(m) => write!(f, "Invalid server URL: {m}"),
+            ServerError::Keyring(m) => write!(f, "Keychain error: {m}"),
+        }
+    }
+}
+
+impl Serialize for ServerError {
+    fn serialize<S: serde::Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
+        s.serialize_str(&self.to_string())
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+pub struct ServerEntry {
+    pub url: String,
+    pub label: String,
+}
+
+pub fn normalize_server_url(input: &str) -> Result<String, ServerError> {
+    let trimmed = input.trim();
+    if trimmed.is_empty() {
+        return Err(ServerError::InvalidUrl("empty".into()));
+    }
+    let with_scheme = if trimmed.contains("://") {
+        trimmed.to_string()
+    } else {
+        format!("https://{trimmed}")
+    };
+    let parsed = Url::parse(&with_scheme).map_err(|e| ServerError::InvalidUrl(e.to_string()))?;
+    let host = parsed.host_str().ok_or_else(|| ServerError::InvalidUrl("missing host".into()))?;
+    let scheme = parsed.scheme();
+    if scheme != "http" && scheme != "https" {
+        return Err(ServerError::InvalidUrl(format!("unsupported scheme {scheme}")));
+    }
+    let origin = match parsed.port() {
+        Some(p) => format!("{scheme}://{host}:{p}"),
+        None => format!("{scheme}://{host}"),
+    };
+    Ok(origin)
+}
+
+pub fn health_check_url(base: &str) -> String {
+    format!("{}/up", base.trim_end_matches('/'))
+}
+
+pub fn is_healthy_status(status: u16) -> bool {
+    status == 200
+}
+
+fn keyring_entry() -> Result<keyring::Entry, ServerError> {
+    keyring::Entry::new(KEYRING_SERVICE, KEYRING_ACCOUNT)
+        .map_err(|e| ServerError::Keyring(e.to_string()))
+}
+
+// On-disk fallback: Keychain items are unreliable for unsigned/dev builds
+// (they don't persist across launches without proper code signing), so we also
+// mirror the data to the app support directory. Server URLs are not secrets.
+fn data_dir() -> Option<std::path::PathBuf> {
+    let home = std::env::var_os("HOME")?;
+    let dir = std::path::Path::new(&home)
+        .join("Library/Application Support")
+        .join(KEYRING_SERVICE);
+    std::fs::create_dir_all(&dir).ok()?;
+    Some(dir)
+}
+
+fn file_read(name: &str) -> Option<String> {
+    std::fs::read_to_string(data_dir()?.join(name)).ok()
+}
+
+fn file_write(name: &str, contents: &str) -> Result<(), ServerError> {
+    let dir = data_dir().ok_or_else(|| ServerError::Keyring("no data dir".into()))?;
+    // Atomic write: write a temp file in the same dir then rename over the
+    // destination, so an interrupted write can't leave truncated/invalid JSON.
+    let tmp = dir.join(format!(".{name}.tmp"));
+    std::fs::write(&tmp, contents).map_err(|e| ServerError::Keyring(e.to_string()))?;
+    std::fs::rename(&tmp, dir.join(name)).map_err(|e| ServerError::Keyring(e.to_string()))
+}
+
+pub struct ServerStore;
+
+impl ServerStore {
+    pub fn load() -> Vec<ServerEntry> {
+        // The on-disk file is the durable source (Keychain is best-effort and
+        // may not persist on unsigned builds), so read it first and fall back to
+        // Keychain only when the file is missing/invalid.
+        if let Some(list) =
+            file_read("servers.json").and_then(|j| serde_json::from_str::<Vec<ServerEntry>>(&j).ok())
+        {
+            return list;
+        }
+        if let Ok(entry) = keyring_entry() {
+            if let Ok(json) = entry.get_password() {
+                if let Ok(list) = serde_json::from_str::<Vec<ServerEntry>>(&json) {
+                    return list;
+                }
+            }
+        }
+        Vec::new()
+    }
+
+    pub fn save(entries: &[ServerEntry]) -> Result<(), ServerError> {
+        let json = serde_json::to_string(entries).map_err(|e| ServerError::Keyring(e.to_string()))?;
+        // Best-effort Keychain; authoritative on-disk write.
+        if let Ok(entry) = keyring_entry() {
+            let _ = entry.set_password(&json);
+        }
+        file_write("servers.json", &json)
+    }
+
+    pub fn add(entry: ServerEntry) -> Result<Vec<ServerEntry>, ServerError> {
+        let mut list = Self::load();
+        list.retain(|e| e.url != entry.url);
+        list.insert(0, entry);
+        Self::save(&list)?;
+        Ok(list)
+    }
+
+    pub fn remove(url: &str) -> Result<Vec<ServerEntry>, ServerError> {
+        let mut list = Self::load();
+        list.retain(|e| e.url != url);
+        Self::save(&list)?;
+        Ok(list)
+    }
+}
+
+/// The last server the user connected to, persisted so the app can resume
+/// straight to it on the next launch instead of showing the picker again.
+pub fn load_active() -> Option<String> {
+    if let Some(url) = file_read("active_server").filter(|s| !s.is_empty()) {
+        return Some(url);
+    }
+    if let Ok(entry) = keyring::Entry::new(KEYRING_SERVICE, KEYRING_ACTIVE) {
+        if let Ok(url) = entry.get_password() {
+            if !url.is_empty() {
+                return Some(url);
+            }
+        }
+    }
+    None
+}
+
+pub fn save_active(url: &str) -> Result<(), ServerError> {
+    if let Ok(entry) = keyring::Entry::new(KEYRING_SERVICE, KEYRING_ACTIVE) {
+        let _ = entry.set_password(url);
+    }
+    file_write("active_server", url)
+}
+
+/// True if `url` normalizes to a server the user has saved (or the active one).
+/// Gates deep-link navigation and SSO so only trusted origins can drive them.
+pub fn is_known_server(url: &str) -> bool {
+    let Ok(canonical) = normalize_server_url(url) else {
+        return false;
+    };
+    ServerStore::load().iter().any(|e| e.url == canonical)
+        || load_active().as_deref() == Some(canonical.as_str())
+}
diff --git a/desktop/src-tauri/src/sso.rs b/desktop/src-tauri/src/sso.rs
new file mode 100644
index 000000000..fd7ae82c9
--- /dev/null
+++ b/desktop/src-tauri/src/sso.rs
@@ -0,0 +1,20 @@
+use base64::Engine;
+use sha2::{Digest, Sha256};
+
+/// A PKCE (S256) pair. The verifier stays in the desktop app across the browser
+/// round-trip; only the challenge is sent to the server (and on to the IdP), and
+/// only the verifier can redeem the one-time code returned via sure://sso/callback.
+pub struct Pkce {
+    pub verifier: String,
+    pub challenge: String,
+}
+
+pub fn generate_pkce() -> Pkce {
+    let mut bytes = [0u8; 32];
+    getrandom::getrandom(&mut bytes).expect("secure RNG unavailable");
+    // Hex verifier: 64 chars, all within the RFC 7636 unreserved set.
+    let verifier: String = bytes.iter().map(|b| format!("{:02x}", b)).collect();
+    let digest = Sha256::digest(verifier.as_bytes());
+    let challenge = base64::engine::general_purpose::URL_SAFE_NO_PAD.encode(digest);
+    Pkce { verifier, challenge }
+}
diff --git a/desktop/src-tauri/src/state.rs b/desktop/src-tauri/src/state.rs
new file mode 100644
index 000000000..a1746205c
--- /dev/null
+++ b/desktop/src-tauri/src/state.rs
@@ -0,0 +1,18 @@
+use std::collections::HashSet;
+use std::sync::Mutex;
+
+/// A desktop-SSO flow in progress: the PKCE verifier and the server it targets,
+/// held until the sure://sso/callback deep link arrives.
+pub struct PendingSso {
+    pub verifier: String,
+    pub server: String,
+}
+
+#[derive(Default)]
+pub struct AppState {
+    pub active_server: Mutex<Option<String>>,
+    pub pending_sso: Mutex<Option<PendingSso>>,
+    /// Server origins we've already granted a runtime IPC capability to, so we
+    /// don't add a duplicate capability for the same origin.
+    pub granted_origins: Mutex<HashSet<String>>,
+}
diff --git a/desktop/src-tauri/src/window.rs b/desktop/src-tauri/src/window.rs
new file mode 100644
index 000000000..98d4b0c23
--- /dev/null
+++ b/desktop/src-tauri/src/window.rs
@@ -0,0 +1,16 @@
+use tauri::Manager;
+use tauri_plugin_decorum::WebviewWindowExt;
+
+pub fn setup(app: &tauri::App) -> Result<(), Box<dyn std::error::Error>> {
+    let window = app.get_webview_window("main").expect("main window exists");
+
+    // The window is opaque (the app paints its own solid backgrounds), so we
+    // skip the transparent-window vibrancy blur — it never showed through and
+    // forced the compositor to re-blend the webview every frame (high GPU).
+
+    // Overlay titlebar + inset traffic lights so content sits under a clean bar.
+    window.create_overlay_titlebar()?;
+    window.set_traffic_lights_inset(16.0, 20.0)?;
+
+    Ok(())
+}
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
new file mode 100644
index 000000000..eb8cb8907
--- /dev/null
+++ b/desktop/src-tauri/tauri.conf.json
@@ -0,0 +1,54 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "Sure",
+  "version": "0.1.0",
+  "identifier": "app.sure.desktop",
+  "build": {
+    "beforeDevCommand": "npm run dev",
+    "devUrl": "http://localhost:1420",
+    "beforeBuildCommand": "npm run build",
+    "frontendDist": "../dist"
+  },
+  "app": {
+    "macOSPrivateApi": true,
+    "withGlobalTauri": true,
+    "windows": [
+      {
+        "label": "main",
+        "title": "Sure",
+        "width": 1200,
+        "height": 800,
+        "minWidth": 900,
+        "minHeight": 600,
+        "transparent": false,
+        "titleBarStyle": "Overlay",
+        "hiddenTitle": true
+      },
+      {
+        "label": "prefs",
+        "title": "Preferences",
+        "width": 420,
+        "height": 520,
+        "visible": false,
+        "transparent": false,
+        "titleBarStyle": "Overlay",
+        "hiddenTitle": true,
+        "url": "prefs.html"
+      }
+    ],
+    "security": {
+      "csp": "default-src 'self'; base-uri 'self'; object-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' asset: http://asset.localhost data:; connect-src 'self' ipc: http://ipc.localhost"
+    }
+  },
+  "bundle": {
+    "active": true,
+    "targets": ["app", "dmg"],
+    "icon": ["icons/icon.icns"],
+    "category": "public.app-category.finance"
+  },
+  "plugins": {
+    "deep-link": {
+      "desktop": { "schemes": ["sure"] }
+    }
+  }
+}
diff --git a/desktop/src-tauri/tests/config_test.rs b/desktop/src-tauri/tests/config_test.rs
new file mode 100644
index 000000000..0456b6927
--- /dev/null
+++ b/desktop/src-tauri/tests/config_test.rs
@@ -0,0 +1,19 @@
+use serde_json::Value;
+
+#[test]
+fn local_webview_csp_is_enabled_and_restrictive() {
+    let config: Value = serde_json::from_str(include_str!("../tauri.conf.json")).unwrap();
+    let csp = config["app"]["security"]["csp"].as_str().expect("CSP must be a string");
+
+    for directive in [
+        "default-src 'self'",
+        "base-uri 'self'",
+        "object-src 'none'",
+        "script-src 'self'",
+        "style-src 'self' 'unsafe-inline'",
+        "connect-src 'self' ipc: http://ipc.localhost",
+    ] {
+        assert!(csp.contains(directive), "CSP is missing {directive:?}");
+    }
+    assert!(!csp.contains("connect-src *"));
+}
diff --git a/desktop/src-tauri/tests/deep_link_test.rs b/desktop/src-tauri/tests/deep_link_test.rs
new file mode 100644
index 000000000..5f3ed7aad
--- /dev/null
+++ b/desktop/src-tauri/tests/deep_link_test.rs
@@ -0,0 +1,44 @@
+use sure_desktop_lib::deep_link::{parse, parse_sso_callback, SsoCallback};
+
+#[test]
+fn parses_server_and_path() {
+    let t = parse("sure://app.example.com/accounts/123").unwrap();
+    assert_eq!(t.server, "https://app.example.com");
+    assert_eq!(t.path, "/accounts/123");
+}
+
+#[test]
+fn parses_with_port_and_defaults_root_path() {
+    let t = parse("sure://localhost:3000").unwrap();
+    assert_eq!(t.server, "https://localhost:3000");
+    assert_eq!(t.path, "/");
+}
+
+#[test]
+fn rejects_other_schemes() {
+    assert!(parse("https://app.example.com/x").is_none());
+    assert!(parse("sureapp://oauth/callback").is_none());
+}
+
+#[test]
+fn parses_sso_callback_code() {
+    match parse_sso_callback("sure://sso/callback?code=abc123") {
+        Some(SsoCallback::Code(c)) => assert_eq!(c, "abc123"),
+        _ => panic!("expected code"),
+    }
+}
+
+#[test]
+fn parses_sso_callback_error() {
+    match parse_sso_callback("sure://sso/callback?error=account_not_linked") {
+        Some(SsoCallback::Error(e)) => assert_eq!(e, "account_not_linked"),
+        _ => panic!("expected error"),
+    }
+}
+
+#[test]
+fn sso_callback_rejects_non_sso_and_other_schemes() {
+    assert!(parse_sso_callback("sure://app.example.com/accounts").is_none());
+    assert!(parse_sso_callback("sureapp://sso/callback?code=x").is_none());
+    assert!(parse_sso_callback("sure://sso/callback").is_none());
+}
diff --git a/desktop/src-tauri/tests/servers_test.rs b/desktop/src-tauri/tests/servers_test.rs
new file mode 100644
index 000000000..87abea0bc
--- /dev/null
+++ b/desktop/src-tauri/tests/servers_test.rs
@@ -0,0 +1,33 @@
+use sure_desktop_lib::servers::{normalize_server_url, health_check_url, is_healthy_status};
+
+#[test]
+fn normalizes_bare_host_to_https_origin() {
+    assert_eq!(normalize_server_url("app.example.com").unwrap(), "https://app.example.com");
+}
+
+#[test]
+fn preserves_explicit_http_scheme_and_port() {
+    assert_eq!(normalize_server_url("http://localhost:3000/").unwrap(), "http://localhost:3000");
+}
+
+#[test]
+fn strips_path_and_trailing_slash() {
+    assert_eq!(normalize_server_url("https://s.example.com/session/new").unwrap(), "https://s.example.com");
+}
+
+#[test]
+fn rejects_empty_input() {
+    assert!(normalize_server_url("   ").is_err());
+}
+
+#[test]
+fn builds_health_url() {
+    assert_eq!(health_check_url("https://s.example.com"), "https://s.example.com/up");
+}
+
+#[test]
+fn only_200_is_healthy() {
+    assert!(is_healthy_status(200));
+    assert!(!is_healthy_status(302));
+    assert!(!is_healthy_status(500));
+}
diff --git a/desktop/src/assets/logomark.svg b/desktop/src/assets/logomark.svg
new file mode 100644
index 000000000..80e043546
--- /dev/null
+++ b/desktop/src/assets/logomark.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 160 145" fill="none">
+<path d="M116.51 119.37C120.062 119.37 122.809 118.751 124.752 117.513C126.696 116.274 127.701 114.58 127.768 112.429L158.828 122.303C157.621 126.409 155.042 130.156 151.088 133.545C147.201 136.869 142.276 139.509 136.312 141.464C130.348 143.419 123.68 144.397 116.309 144.397C110.01 144.397 104.113 143.712 98.6179 142.344C93.19 140.975 88.3986 138.922 84.2439 136.185C80.1562 133.382 76.9397 129.896 74.5943 125.725C72.2489 121.553 71.0762 116.698 71.0762 111.158C71.0762 105.618 72.2489 100.763 74.5943 96.5919C76.9397 92.4208 80.1562 88.9666 84.2439 86.2293C88.3986 83.4268 93.2234 81.3412 98.7184 79.9726C104.213 78.6039 110.077 77.9196 116.309 77.9196C122.675 77.9196 128.505 78.6039 133.799 79.9726C139.16 81.3412 143.75 83.4594 147.57 86.327C151.456 89.1295 154.438 92.714 156.516 97.0807C158.66 101.382 159.732 106.498 159.732 112.429H104.95C104.95 112.429 104.917 112.429 104.85 112.429C104.85 112.429 104.85 112.462 104.85 112.527C104.85 113.504 105.118 114.417 105.654 115.264C106.19 116.111 106.927 116.861 107.865 117.513C108.871 118.099 110.077 118.555 111.484 118.881C112.958 119.207 114.634 119.37 116.51 119.37ZM116.309 102.653C113.025 102.653 110.311 103.24 108.167 104.413C106.023 105.521 104.95 107.117 104.95 109.203C104.95 109.268 104.95 109.333 104.95 109.399C105.017 109.399 105.051 109.399 105.051 109.399H127.466C127.533 109.399 127.567 109.399 127.567 109.399C127.567 109.333 127.567 109.268 127.567 109.203C127.567 108.16 127.265 107.248 126.662 106.466C126.126 105.618 125.355 104.934 124.35 104.413C123.345 103.826 122.139 103.403 120.732 103.142C119.391 102.816 117.917 102.653 116.309 102.653Z" fill="#62a446"/>
+<path d="M37.5666 81.9011C37.5666 85.8115 37.5666 89.7546 37.5666 93.7301C37.5666 97.6406 37.5666 101.584 37.5666 105.559C37.5666 109.47 37.5666 113.413 37.5666 117.388C37.5666 121.559 37.5666 125.73 37.5666 129.902C37.5666 134.073 37.5666 138.276 37.5666 142.513H2.74774C2.74774 136.06 2.74774 129.608 2.74774 123.156C2.74774 116.704 2.74774 110.252 2.74774 103.799C2.74774 100.15 2.74774 96.5 2.74774 92.8503C2.74774 89.2006 2.74774 85.5508 2.74774 81.9011H37.5666ZM37.466 119.246L42.9001 92.9481C43.5039 90.1456 44.678 87.8319 46.4222 86.0071C48.2336 84.117 50.3469 82.6832 52.7621 81.7056C55.1773 80.728 57.6596 80.1414 60.2089 79.9459C62.7583 79.6852 65.1063 79.783 67.2532 80.2392C69.4 80.6302 71.1108 81.3146 72.3854 82.2922L64.7374 118.659C62.7918 117.095 60.4102 116.02 57.5925 115.433C54.8418 114.846 52.0577 114.651 49.24 114.846C46.4223 114.977 43.94 115.433 41.7932 116.215C39.6463 116.997 38.2039 118.007 37.466 119.246Z" fill="#61a446"/>
+<path d="M155.301 0.291725C155.301 4.65836 155.301 20.0576 155.301 24.4894C155.301 28.9212 155.301 33.353 155.301 37.7848C155.301 41.5649 155.301 45.3776 155.301 49.2228C155.301 53.0029 155.301 56.783 155.301 60.563C155.301 64.3431 155.301 68.1232 155.301 71.9033H121.476C121.476 69.166 121.476 66.3961 121.476 63.5936C121.476 60.7912 121.476 57.9887 121.476 55.1862C121.476 52.3186 121.476 49.5487 121.476 46.8766C121.476 40.8154 121.476 34.8846 121.476 29.0841C121.476 23.2185 121.476 6.28771 121.476 0.291725H155.301ZM111.113 5.29173C111.113 8.74593 111.113 18.2327 111.113 21.7521C111.113 25.2063 111.113 28.6605 111.113 32.1147C111.113 35.5689 111.113 39.0557 111.113 42.5751C111.113 44.0089 111.341 45.182 111.798 46.0945C112.319 46.9417 112.971 47.5609 113.753 47.9519C114.6 48.2778 115.48 48.4407 116.392 48.4407C117.305 48.4407 118.217 48.2778 119.13 47.9519C120.107 47.6261 120.889 47.235 121.476 46.7788L113.655 70.9257C111.83 71.8381 109.582 72.5876 106.909 73.1742C104.303 73.7607 101.565 74.054 98.6976 74.054C96.0906 74.054 93.5163 73.7281 90.9745 73.0764C88.4327 72.4898 86.1191 71.4796 84.0335 70.0458C82.0131 68.612 80.3838 66.722 79.1455 64.3757C77.9072 62.0295 77.288 59.0966 77.288 55.5773C77.288 50.8848 77.288 46.1922 77.288 41.4997C77.288 36.8072 77.288 32.1147 77.288 27.4222C77.288 24.7501 77.288 22.078 77.288 19.4058C77.288 16.6686 77.288 7.96384 77.288 5.29173H111.113Z" fill="grey"/>
+<path d="M0.698853 30.6484C0.698853 26.9335 1.74163 23.7074 3.82719 20.9701C5.97792 18.2328 8.87815 15.9517 12.5279 14.1269C16.1776 12.2368 20.3161 10.8356 24.9435 9.92315C29.5708 9.01072 34.3937 8.5545 39.412 8.5545C45.6035 8.5545 51.3388 9.10848 56.6179 10.2164C61.9621 11.3244 66.785 12.7908 71.0864 14.6157V37.2961C69.2616 35.9275 66.8502 34.7543 63.8522 33.7767C60.9194 32.7991 57.791 32.0496 54.4672 31.5282C51.2085 31.0068 48.1127 30.7461 45.1799 30.7461C43.2247 30.7461 41.4324 30.8765 39.8031 31.1372C38.2389 31.3327 36.968 31.6586 35.9904 32.1148C35.078 32.571 34.6218 33.1576 34.6218 33.8745C34.6218 34.2655 34.7521 34.5588 35.0128 34.7543C35.3387 34.9499 35.7949 35.0802 36.3815 35.1454C36.968 35.2105 37.7175 35.2431 38.63 35.2431C40.1289 35.2431 41.465 35.2431 42.6381 35.2431C43.8113 35.2431 45.1147 35.2431 46.5486 35.2431C49.8072 35.2431 53.0659 35.4712 56.3246 35.9275C59.6485 36.3185 62.6465 37.1332 65.3186 38.3715C68.0559 39.6098 70.2392 41.402 71.8685 43.7483C73.4979 46.0294 74.3125 49.06 74.3125 52.84C74.3125 56.8156 73.2046 60.2047 70.9887 63.0071C68.838 65.7444 65.8726 67.9929 62.0925 69.7526C58.3776 71.4471 54.1739 72.6854 49.4814 73.4675C44.854 74.2496 40.0312 74.6406 35.0128 74.6406C29.082 74.6406 23.2164 74.0867 17.4159 72.9787C11.6806 71.8708 6.76001 70.2414 2.65406 68.0907V44.2371C4.28341 45.9968 6.59707 47.4632 9.59506 48.6363C12.6582 49.7443 15.9495 50.5915 19.4689 51.1781C23.0534 51.6995 26.4099 51.9602 29.5382 51.9602C31.5586 51.9602 33.3835 51.8624 35.0128 51.6669C36.6421 51.4062 37.913 51.0478 38.8255 50.5915C39.8031 50.0701 40.2919 49.4184 40.2919 48.6363C40.2919 48.3105 40.1941 48.0823 39.9986 47.952C39.8031 47.8217 39.4772 47.7239 39.021 47.6587C38.63 47.5936 38.076 47.561 37.3591 47.561C36.3815 47.561 35.3713 47.561 34.3285 47.561C33.2857 47.561 32.3407 47.561 31.4934 47.561C29.2123 47.561 26.6706 47.4958 23.8681 47.3654C21.1308 47.1699 18.3935 46.8115 15.6562 46.2901C12.9189 45.7035 10.4097 44.8237 8.12865 43.6505C5.91275 42.4122 4.12047 40.7503 2.75182 38.6648C1.38318 36.514 0.698853 33.8419 0.698853 30.6484Z" fill="grey"/>
+</svg>
diff --git a/desktop/src/bridge.ts b/desktop/src/bridge.ts
new file mode 100644
index 000000000..2352b8e48
--- /dev/null
+++ b/desktop/src/bridge.ts
@@ -0,0 +1,136 @@
+// Injected into every page loaded in the main window (local onboarding + the
+// remote Sure site). Adds native-titlebar chrome, drags the window, forwards
+// notifications/badge to Rust, intercepts SSO into the system browser, and
+// navigates on server switches.
+(() => {
+  const tauri = (window as any).__TAURI__;
+
+  // Diagnostics — visible in DevTools console. On the remote Sure page, IPC only
+  // works if withGlobalTauri is set AND a capability's remote.urls matches.
+  // eslint-disable-next-line no-console
+  console.log("[sure] bridge loaded", {
+    href: location.href,
+    hasTauri: !!tauri,
+    hasEvent: !!tauri?.event,
+    hasCore: !!tauri?.core,
+    hasWindow: !!tauri?.window,
+  });
+
+  // Native titlebar chrome — offset the left icon rail so its logo clears the
+  // traffic lights, and make the top ~34px band drag the window. Using a
+  // document-level mousedown (rather than a fixed overlay strip) means dragging
+  // works on every page regardless of Sure's own sticky headers, while its
+  // interactive controls in that band stay clickable. Main content is not
+  // pushed down.
+  if (!(window as any).__sureChrome) {
+    (window as any).__sureChrome = true;
+    const style = document.createElement("style");
+    style.textContent = 'nav[class~="w-[84px]"]{padding-top:44px !important;box-sizing:border-box}';
+    (document.head || document.documentElement).appendChild(style);
+
+    const DRAG_H = 34;
+    document.addEventListener(
+      "mousedown",
+      (ev) => {
+        if (ev.button !== 0 || ev.clientY > DRAG_H) return;
+        const el = ev.target as Element | null;
+        if (
+          el &&
+          el.closest("a,button,input,select,textarea,label,[role='button'],[contenteditable],[data-no-drag]")
+        ) {
+          return; // let Sure's own controls in the titlebar band work
+        }
+        try {
+          tauri?.window?.getCurrentWindow?.().startDragging?.();
+        } catch {
+          /* IPC unavailable on this page */
+        }
+      },
+      true
+    );
+  }
+
+  if (!tauri?.event) {
+    // eslint-disable-next-line no-console
+    console.warn("[sure] Tauri IPC unavailable on this page — notifications, SSO, and drag-by-API disabled");
+    return;
+  }
+  const emit = tauri.event.emit as (e: string, p: unknown) => void;
+
+  // SSO must run in the system browser (passkeys/WebAuthn don't work in an
+  // embedded webview). Each provider is a form POSTing to /auth/{provider};
+  // intercept and hand off to Rust, which opens the browser. Password login
+  // (POST /sessions) is untouched.
+  if (!(window as any).__sureSsoHook) {
+    (window as any).__sureSsoHook = true;
+    document.addEventListener(
+      "submit",
+      (ev) => {
+        const form = ev.target as HTMLFormElement | null;
+        if (!form || form.tagName !== "FORM") return;
+        let path: string;
+        try {
+          path = new URL(form.action, location.href).pathname;
+        } catch {
+          return;
+        }
+        const m = path.match(/^\/auth\/([A-Za-z0-9_-]+)$/);
+        if (!m) return; // not an SSO provider form (e.g. /sessions, /auth/x/callback)
+        ev.preventDefault();
+        ev.stopImmediatePropagation();
+        // Emit an event (remote pages can emit but not invoke custom commands);
+        // Rust listens for "sure://start-sso" and opens the browser.
+        // eslint-disable-next-line no-console
+        console.log("[sure] SSO intercept -> emit sure://start-sso", m[1]);
+        Promise.resolve(emit("sure://start-sso", { server: location.origin, provider: m[1] }))
+          // eslint-disable-next-line no-console
+          .then(() => console.log("[sure] start-sso emitted"))
+          // eslint-disable-next-line no-console
+          .catch((e: unknown) => console.error("[sure] start-sso emit failed", e));
+      },
+      true // capture, to beat any page handlers
+    );
+  }
+
+  // Navigate the main window when the active server changes (e.g. switching
+  // servers from the Preferences window while logged in).
+  if (!(window as any).__sureNavListener) {
+    (window as any).__sureNavListener = true;
+    tauri.event.listen("active-server-changed", (e: any) => {
+      const w = window as any;
+      if (w.__sureNav) return;
+      w.__sureNav = e.payload;
+      window.location.assign(`${e.payload}/`);
+    });
+  }
+
+  // Sync-complete + alert toasts: Sure renders flash/notification nodes.
+  const seen = new WeakSet<Element>();
+  const scan = () => {
+    document.querySelectorAll("[data-notification], .flash, [role='alert']").forEach((node) => {
+      if (seen.has(node)) return;
+      seen.add(node);
+      const text = (node.textContent || "").trim();
+      if (!text) return;
+      emit("bridge://notify", { title: "Sure", body: text.slice(0, 180) });
+    });
+    // Dock badge: any element the page exposes with data-attention-count.
+    const badgeEl = document.querySelector("[data-attention-count]");
+    const count = badgeEl ? Number(badgeEl.getAttribute("data-attention-count")) : 0;
+    emit("bridge://badge", { count: Number.isFinite(count) ? count : 0 });
+  };
+
+  // Coalesce bursts of DOM mutations into one scan per frame rather than
+  // re-querying the whole document on every mutation.
+  let scheduled = false;
+  const obs = new MutationObserver(() => {
+    if (scheduled) return;
+    scheduled = true;
+    requestAnimationFrame(() => {
+      scheduled = false;
+      scan();
+    });
+  });
+  obs.observe(document.documentElement, { childList: true, subtree: true });
+  scan();
+})();
diff --git a/desktop/src/main.ts b/desktop/src/main.ts
new file mode 100644
index 000000000..c942dad96
--- /dev/null
+++ b/desktop/src/main.ts
@@ -0,0 +1,113 @@
+import { invoke } from "@tauri-apps/api/core";
+import { listen } from "@tauri-apps/api/event";
+import { S } from "./strings";
+import { serverErrorMessage } from "./status";
+
+interface ServerEntry { url: string; label: string; }
+
+const $ = <T extends HTMLElement>(id: string) => document.getElementById(id) as T;
+
+// Navigate to a server's login page exactly once. connect() and the
+// active-server-changed listener(s) can all request navigation for the same
+// server; without this guard they fire multiple concurrent GET /sessions/new
+// requests, each minting a new session + CSRF token, which race and cause
+// "Can't verify CSRF token authenticity" on the POST.
+function goToServer(url: string) {
+  const w = window as unknown as { __sureNav?: string };
+  if (w.__sureNav) return;
+  w.__sureNav = url;
+  // Navigate to the server root: Rails serves the dashboard if the session
+  // cookie is still valid, or redirects to the login page if not — so a
+  // relaunch with a live session resumes without re-logging in.
+  window.location.assign(`${url}/`);
+}
+
+function fill() {
+  ($("logo") as HTMLImageElement).src = new URL("./assets/logomark.svg", import.meta.url).href;
+  $("title").textContent = S.title;
+  $("url-label").textContent = S.serverLabel;
+  ($("server-url") as HTMLInputElement).placeholder = S.urlPlaceholder;
+  $("connect").textContent = S.connect;
+  $("remembered-title").textContent = S.remembered;
+}
+
+function setStatus(msg: string, kind: "info" | "error" = "info") {
+  const el = $("status");
+  el.textContent = msg;
+  el.dataset.kind = kind;
+}
+
+async function connect(rawUrl: string) {
+  setStatus(S.checking, "info");
+  let healthy: boolean;
+  try {
+    healthy = await invoke<boolean>("check_server", { url: rawUrl });
+  } catch (e) {
+    setStatus(serverErrorMessage(e), "error");
+    return;
+  }
+  if (!healthy) { setStatus(S.unreachable, "error"); return; }
+  try {
+    const list = await invoke<ServerEntry[]>("add_server", { url: rawUrl, label: "" });
+    const canonical = list.find((s) => s.url === rawUrl)?.url ?? list[0].url;
+    await invoke("set_active_server", { url: canonical });
+    goToServer(canonical);
+  } catch (e) {
+    setStatus(serverErrorMessage(e), "error");
+  }
+}
+
+async function renderRemembered() {
+  const servers = await invoke<ServerEntry[]>("list_servers");
+  const section = $("remembered");
+  const listEl = $("server-list");
+  listEl.innerHTML = "";
+  if (servers.length === 0) { section.classList.add("hidden"); return; }
+  section.classList.remove("hidden");
+  for (const s of servers) {
+    const li = document.createElement("li");
+    const open = document.createElement("button");
+    open.className = "server-open";
+    open.textContent = s.label;
+    open.addEventListener("click", () => connect(s.url));
+    const rm = document.createElement("button");
+    rm.className = "server-remove";
+    rm.textContent = S.remove;
+    rm.addEventListener("click", async (e) => {
+      e.stopPropagation();
+      await invoke("remove_server", { url: s.url });
+      renderRemembered();
+    });
+    li.append(open, rm);
+    listEl.append(li);
+  }
+}
+
+$("server-form").addEventListener("submit", (e) => {
+  e.preventDefault();
+  const url = ($("server-url") as HTMLInputElement).value.trim();
+  if (url) connect(url);
+});
+
+// On launch, resume straight to the last server if there is one; otherwise
+// show the picker.
+async function boot() {
+  let active: string | null = null;
+  try {
+    active = await invoke<string | null>("active_server");
+  } catch (e) {
+    // Don't let a failed read abort startup and leave a blank onboarding window.
+    // eslint-disable-next-line no-console
+    console.error("[sure] failed to read active server", e);
+  }
+  if (active) {
+    goToServer(active);
+    return;
+  }
+  fill();
+  renderRemembered();
+}
+boot();
+
+// Navigate when the active server changes (e.g. picked from Preferences).
+listen<string>("active-server-changed", (e) => goToServer(e.payload));
diff --git a/desktop/src/prefs.ts b/desktop/src/prefs.ts
new file mode 100644
index 000000000..432708c90
--- /dev/null
+++ b/desktop/src/prefs.ts
@@ -0,0 +1,70 @@
+import { invoke } from "@tauri-apps/api/core";
+import { getCurrentWindow } from "@tauri-apps/api/window";
+import { P, S } from "./strings";
+import { serverErrorMessage } from "./status";
+
+interface ServerEntry { url: string; label: string; }
+const $ = <T extends HTMLElement>(id: string) => document.getElementById(id) as T;
+
+$("prefs-title").textContent = P.title;
+$("servers-title").textContent = P.servers;
+$("prefs-add-btn").textContent = P.add;
+$("autostart-label").textContent = P.launchAtLogin;
+($("prefs-url") as HTMLInputElement).placeholder = S.urlPlaceholder;
+
+async function renderServers() {
+  const servers = await invoke<ServerEntry[]>("list_servers");
+  const list = $("prefs-server-list");
+  list.innerHTML = "";
+  for (const s of servers) {
+    const li = document.createElement("li");
+    const open = document.createElement("button");
+    open.className = "server-open";
+    open.textContent = s.label;
+    open.addEventListener("click", async () => {
+      try {
+        await invoke("set_active_server", { url: s.url });
+        await getCurrentWindow().hide();
+      } catch (err) {
+        $("prefs-status").textContent = serverErrorMessage(err);
+      }
+    });
+    const rm = document.createElement("button");
+    rm.className = "server-remove";
+    rm.textContent = S.remove;
+    rm.addEventListener("click", async (e) => {
+      e.stopPropagation();
+      try {
+        await invoke("remove_server", { url: s.url });
+        renderServers();
+      } catch (err) {
+        $("prefs-status").textContent = serverErrorMessage(err);
+      }
+    });
+    li.append(open, rm);
+    list.append(li);
+  }
+}
+
+$("prefs-add").addEventListener("submit", async (e) => {
+  e.preventDefault();
+  const url = ($("prefs-url") as HTMLInputElement).value.trim();
+  if (!url) return;
+  $("prefs-status").textContent = S.checking;
+  try {
+    const ok = await invoke<boolean>("check_server", { url });
+    if (!ok) { $("prefs-status").textContent = S.unreachable; return; }
+    await invoke("add_server", { url, label: "" });
+    ($("prefs-url") as HTMLInputElement).value = "";
+    $("prefs-status").textContent = "";
+    renderServers();
+  } catch (err) {
+    $("prefs-status").textContent = serverErrorMessage(err);
+  }
+});
+
+const autostart = $("autostart") as HTMLInputElement;
+invoke<boolean>("get_launch_at_login").then((v) => (autostart.checked = v));
+autostart.addEventListener("change", () => invoke("set_launch_at_login", { enabled: autostart.checked }));
+
+renderServers();
diff --git a/desktop/src/status.ts b/desktop/src/status.ts
new file mode 100644
index 000000000..866779df5
--- /dev/null
+++ b/desktop/src/status.ts
@@ -0,0 +1,8 @@
+import { S } from "./strings";
+
+// Shared mapping of a check_server / server-command failure to a user-facing
+// status. check_server raises ServerError::InvalidUrl (Display "Invalid server
+// URL: …") for malformed URLs; everything else is treated as unreachable.
+export function serverErrorMessage(e: unknown): string {
+  return String(e).includes("Invalid") ? S.invalidUrl : S.unreachable;
+}
diff --git a/desktop/src/strings.ts b/desktop/src/strings.ts
new file mode 100644
index 000000000..a56839a42
--- /dev/null
+++ b/desktop/src/strings.ts
@@ -0,0 +1,19 @@
+export const S = {
+  title: "Connect to your Sure server",
+  serverLabel: "Server address",
+  urlPlaceholder: "https://sure.example.com",
+  connect: "Continue",
+  checking: "Checking server…",
+  unreachable: "Couldn't reach a Sure server at that address.",
+  invalidUrl: "That doesn't look like a valid address.",
+  remembered: "Remembered servers",
+  remove: "Remove",
+} as const;
+
+export const P = {
+  title: "Preferences",
+  servers: "Servers",
+  add: "Add",
+  launchAtLogin: "Launch Sure at login",
+  switchTo: "Switch to",
+} as const;
diff --git a/desktop/src/styles.css b/desktop/src/styles.css
new file mode 100644
index 000000000..d578896c5
--- /dev/null
+++ b/desktop/src/styles.css
@@ -0,0 +1,181 @@
+/* Onboarding chrome styled to match Sure's real auth page (design-system tokens). */
+:root {
+  --titlebar-h: 38px;
+  font-family: -apple-system, system-ui, "Segoe UI", sans-serif;
+  color-scheme: light dark;
+
+  /* Sure light palette */
+  --bg: var(--color-surface);
+  --container: var(--color-container);
+  --text: var(--color-black);
+  --secondary: var(--color-gray-500);
+  --subdued: var(--color-gray-400);
+  --border: var(--color-tertiary);
+  --focus-ring: var(--color-focus-ring);
+  --btn-bg: var(--color-gray-800);
+  --btn-fg: var(--color-white);
+  --error: var(--color-destructive);
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --bg: var(--color-surface);
+    --container: var(--color-container);
+    --text: var(--color-gray-100);
+    --secondary: var(--color-gray-400);
+    --subdued: var(--color-gray-500);
+    --border: var(--color-alpha-white-200);
+    --focus-ring: var(--color-focus-ring);
+    --btn-bg: var(--color-white);
+    --btn-fg: var(--color-black);
+    --error: var(--color-destructive);
+  }
+}
+
+* { box-sizing: border-box; }
+html, body { margin: 0; height: 100%; }
+body { background: var(--bg); color: var(--text); }
+
+/* Draggable titlebar strip (clears the traffic lights). */
+.titlebar {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: var(--titlebar-h);
+  z-index: 1000;
+  -webkit-app-region: drag;
+}
+
+.onboarding {
+  min-height: 100vh;
+  display: grid;
+  place-items: center;
+  padding: calc(var(--titlebar-h) + 8px) 24px 32px;
+  -webkit-app-region: drag;
+}
+
+.auth {
+  width: 100%;
+  max-width: 340px;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.logo { width: 56px; height: auto; margin: 0 auto; display: block; }
+
+.auth-title {
+  margin: -4px 0 4px;
+  font-size: 15px;
+  font-weight: 500;
+  color: var(--secondary);
+  text-align: center;
+}
+
+.auth-form { display: flex; flex-direction: column; gap: 12px; }
+
+/* Mirrors .form-field from Sure's design system. */
+.form-field {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding: 8px 12px;
+  border-radius: 8px;
+  border: 1px solid var(--border);
+  background: var(--container);
+  text-align: left;
+  transition: box-shadow 0.2s ease, border-color 0.2s ease;
+  -webkit-app-region: no-drag;
+}
+.form-field:focus-within { box-shadow: 0 0 0 4px var(--focus-ring); }
+.form-field__label { font-size: 12px; color: var(--secondary); }
+.form-field__input {
+  width: 100%;
+  padding: 0;
+  border: none;
+  outline: none;
+  background: transparent;
+  color: var(--text);
+  font-size: 14px;
+}
+.form-field__input::placeholder { color: var(--subdued); }
+
+.btn-primary {
+  -webkit-app-region: no-drag;
+  width: 100%;
+  padding: 12px;
+  border: none;
+  border-radius: 10px;
+  background: var(--btn-bg);
+  color: var(--btn-fg);
+  font-size: 14px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: opacity 0.2s ease;
+}
+.btn-primary:hover { opacity: 0.9; }
+
+.status {
+  min-height: 16px;
+  margin: 0;
+  font-size: 13px;
+  text-align: center;
+  color: var(--secondary);
+}
+.status[data-kind="error"] { color: var(--error); }
+
+.remembered { -webkit-app-region: no-drag; }
+.remembered-title {
+  margin: 4px 0 8px;
+  font-size: 11px;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: var(--secondary);
+}
+#server-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 6px; }
+#server-list li { display: flex; gap: 8px; align-items: center; }
+.server-open {
+  flex: 1;
+  text-align: left;
+  padding: 8px 12px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--container);
+  color: var(--text);
+  font-size: 13px;
+  cursor: pointer;
+}
+.server-open:hover { border-color: var(--secondary); }
+.server-remove { background: transparent; border: none; color: var(--secondary); font-size: 12px; cursor: pointer; }
+
+.hidden { display: none; }
+
+/* Preferences window — same palette. */
+.prefs {
+  min-height: 100vh;
+  box-sizing: border-box;
+  padding: calc(var(--titlebar-h) + 8px) 24px 24px;
+  background: var(--bg);
+  color: var(--text);
+}
+.prefs h1 { font-size: 16px; margin: 0 0 16px; }
+.prefs section { margin-bottom: 20px; }
+.prefs h2 {
+  margin: 0 0 8px;
+  font-size: 11px;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: var(--secondary);
+}
+#prefs-server-list { list-style: none; margin: 0 0 12px; padding: 0; display: flex; flex-direction: column; gap: 6px; }
+#prefs-server-list li { display: flex; gap: 8px; align-items: center; }
+#prefs-add { display: flex; gap: 8px; margin: 0 0 8px; align-items: stretch; }
+#prefs-add .form-field { flex: 1; }
+#prefs-add .btn-primary { width: auto; padding: 8px 16px; }
+.prefs .status { text-align: left; }
+.prefs .row { display: flex; align-items: center; justify-content: space-between; }
+.prefs .row label { font-size: 13px; }
+
+/* Interactive elements never part of the drag region. */
+input, button, select, a, #server-list, #prefs-server-list { -webkit-app-region: no-drag; }
diff --git a/desktop/tsconfig.json b/desktop/tsconfig.json
new file mode 100644
index 000000000..b6e82731b
--- /dev/null
+++ b/desktop/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2021",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "noUnusedLocals": true,
+    "skipLibCheck": true,
+    "lib": ["ES2021", "DOM", "DOM.Iterable"]
+  },
+  "include": ["src"]
+}
diff --git a/desktop/vite.config.ts b/desktop/vite.config.ts
new file mode 100644
index 000000000..9ad06bf09
--- /dev/null
+++ b/desktop/vite.config.ts
@@ -0,0 +1,28 @@
+import { defineConfig } from "vite";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+// package.json sets "type": "module", so this config loads as ESM where
+// __dirname is undefined; derive it from import.meta.url instead.
+const rootDir = dirname(fileURLToPath(import.meta.url));
+
+export default defineConfig({
+  clearScreen: false,
+  server: { port: 1420, strictPort: true },
+  build: {
+    target: "safari15",
+    outDir: "dist",
+    emptyOutDir: true,
+    rollupOptions: {
+      input: {
+        main: resolve(rootDir, "index.html"),
+        prefs: resolve(rootDir, "prefs.html"),
+        bridge: resolve(rootDir, "src/bridge.ts"),
+      },
+      output: {
+        entryFileNames: (chunk) => (chunk.name === "bridge" ? "bridge.js" : "assets/[name]-[hash].js"),
+        format: "es",
+      },
+    },
+  },
+});
diff --git a/docs/api/merchants.md b/docs/api/merchants.md
index 5e00b3dda..2be69b9e3 100644
--- a/docs/api/merchants.md
+++ b/docs/api/merchants.md
@@ -1,6 +1,6 @@
 # Merchants API
 
-The Merchants API allows external applications to retrieve merchants within Sure. Merchants represent payees or vendors associated with transactions.
+The Merchants API allows external applications to retrieve and bulk-import merchants within Sure. Merchants represent payees or vendors associated with transactions.
 
 ## Generated OpenAPI specification
 
@@ -21,7 +21,10 @@ The Merchants API allows external applications to retrieve merchants within Sure
 
 ## Authentication requirements
 
-All merchant endpoints require an OAuth2 access token or API key that grants the `read` scope.
+| Endpoint | Required scope |
+| --- | --- |
+| `GET` endpoints | `read` |
+| `POST /api/v1/merchants` (CSV import) | `write` |
 
 ## Available endpoints
 
@@ -29,6 +32,7 @@ All merchant endpoints require an OAuth2 access token or API key that grants the
 | --- | --- | --- |
 | `GET /api/v1/merchants` | `read` | List all merchants available to the family. |
 | `GET /api/v1/merchants/{id}` | `read` | Retrieve a single merchant by ID. |
+| `POST /api/v1/merchants` | `write` | Bulk-import merchants from a CSV file. |
 
 Refer to the generated [`openapi.yaml`](openapi.yaml) for request/response schemas, reusable components, and security definitions.
 
@@ -104,6 +108,84 @@ When creating or updating transactions, you can assign a merchant using the `mer
 }
 ```
 
+## Importing merchants via CSV
+
+`POST /api/v1/merchants` accepts a `multipart/form-data` upload and bulk-creates `FamilyMerchant` records. Existing merchants with the same name are skipped (no update, no error).
+
+### Request
+
+```http
+POST /api/v1/merchants
+Content-Type: multipart/form-data
+X-Api-Key: <write-scoped-key>
+
+file=@merchants.csv
+```
+
+### CSV format
+
+| Column | Required | Description |
+| --- | --- | --- |
+| `name` | Yes | Merchant name. Rows with a blank name are skipped. |
+| `color` | No | Hex colour code (e.g. `#e99537`). Defaults to a random palette colour. |
+| `website_url` | No | Merchant website. Aliases accepted: `website url`, `website`. |
+
+The header row is required. Column names are matched case-insensitively and extra spaces, underscores, and asterisks are ignored (e.g. `Name*`, `Website URL`, and `website_url` all match).
+
+Example CSV:
+
+```csv
+name,color,website_url
+Coffee Shop,#e99537,https://coffeeshop.com
+Pizza Palace,#4da568,https://pizzapalace.com
+Bookstore,,
+```
+
+### Response — 201 Created
+
+```json
+{
+  "imported": 2,
+  "skipped": 1,
+  "merchants": [
+    {
+      "id": "550e8400-e29b-41d4-a716-446655440001",
+      "name": "Coffee Shop",
+      "type": "FamilyMerchant",
+      "created_at": "2024-01-15T10:30:00Z",
+      "updated_at": "2024-01-15T10:30:00Z"
+    },
+    {
+      "id": "550e8400-e29b-41d4-a716-446655440002",
+      "name": "Pizza Palace",
+      "type": "FamilyMerchant",
+      "created_at": "2024-01-15T10:30:00Z",
+      "updated_at": "2024-01-15T10:30:00Z"
+    }
+  ]
+}
+```
+
+`skipped` counts rows where a merchant with that name already exists for the family.
+
+### Error responses for CSV import
+
+| HTTP status | `error` value | Cause |
+| --- | --- | --- |
+| `401` | `unauthorized` | Missing or invalid API key. |
+| `403` | `forbidden` | API key lacks the `write` scope. |
+| `422` | `missing_file` | No `file` parameter supplied. |
+| `422` | `file_too_large` | File exceeds 10 MB. |
+| `422` | `invalid_file_type` | File is not a recognised CSV MIME type. |
+| `422` | `missing_column` | CSV has no `name` column. |
+| `422` | `invalid_csv` | CSV is malformed or cannot be parsed. |
+
+## Importing merchants via the web UI
+
+Merchants can also be imported through the built-in multi-step import flow at **Settings → Imports → New Import → Raw Data → Import merchants**. The flow supports the same CSV format as the API endpoint (upload → configure → clean → publish).
+
+A shortcut button ("Import merchants") is also available directly on the **Merchants** page.
+
 ## Error responses
 
 Errors conform to the shared `ErrorResponse` schema in the OpenAPI document:
diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index 1102d6fc6..3d5edb333 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -1676,6 +1676,46 @@ components:
       properties:
         message:
           type: string
+    TransactionResponse:
+      type: object
+      required:
+      - id
+      - date
+      - amount
+      - currency
+      - name
+      - entryable_type
+      - account
+      properties:
+        id:
+          type: string
+          format: uuid
+        date:
+          type: string
+          format: date
+        amount:
+          type: string
+        currency:
+          type: string
+        name:
+          type: string
+        entryable_type:
+          type: string
+        account:
+          type: object
+          required:
+          - id
+          - name
+          - account_type
+          properties:
+            id:
+              type: string
+              format: uuid
+            name:
+              type: string
+            account_type:
+              type: string
+              nullable: true
     ImportConfiguration:
       type: object
       properties:
@@ -1869,8 +1909,12 @@ components:
           - AccountImport
           - MintImport
           - ActualImport
+          - YnabImport
           - CategoryImport
           - RuleImport
+          - MerchantImport
+          - PdfImport
+          - QifImport
           - SureImport
         valid:
           type: boolean
@@ -1957,8 +2001,12 @@ components:
           - AccountImport
           - MintImport
           - ActualImport
+          - YnabImport
           - CategoryImport
           - RuleImport
+          - MerchantImport
+          - PdfImport
+          - QifImport
           - SureImport
         status:
           type: string
@@ -2010,8 +2058,12 @@ components:
           - AccountImport
           - MintImport
           - ActualImport
+          - YnabImport
           - CategoryImport
           - RuleImport
+          - MerchantImport
+          - PdfImport
+          - QifImport
           - SureImport
         status:
           type: string
@@ -2086,6 +2138,115 @@ components:
       properties:
         data:
           "$ref": "#/components/schemas/ImportDetail"
+    ImportSessionChunk:
+      type: object
+      required:
+      - id
+      - sequence
+      - status
+      - rows_count
+      - summary
+      - created_at
+      - updated_at
+      properties:
+        id:
+          type: string
+          format: uuid
+        sequence:
+          type: integer
+          minimum: 1
+        client_chunk_id:
+          type: string
+          nullable: true
+        status:
+          type: string
+          enum:
+          - pending
+          - importing
+          - complete
+          - failed
+        rows_count:
+          type: integer
+          minimum: 0
+        summary:
+          type: object
+          additionalProperties:
+            type: object
+            additionalProperties:
+              type: integer
+        error:
+          type: object
+          nullable: true
+          additionalProperties: true
+        created_at:
+          type: string
+          format: date-time
+        updated_at:
+          type: string
+          format: date-time
+    ImportSession:
+      type: object
+      required:
+      - id
+      - type
+      - status
+      - chunks_count
+      - summary
+      - chunks
+      - created_at
+      - updated_at
+      properties:
+        id:
+          type: string
+          format: uuid
+        type:
+          type: string
+          enum:
+          - SureImport
+        status:
+          type: string
+          enum:
+          - pending
+          - importing
+          - complete
+          - failed
+        client_session_id:
+          type: string
+          nullable: true
+        expected_chunks:
+          type: integer
+          nullable: true
+          minimum: 1
+        chunks_count:
+          type: integer
+          minimum: 0
+        summary:
+          type: object
+          additionalProperties:
+            type: object
+            additionalProperties:
+              type: integer
+        error:
+          type: object
+          nullable: true
+          additionalProperties: true
+        chunks:
+          type: array
+          items:
+            "$ref": "#/components/schemas/ImportSessionChunk"
+        created_at:
+          type: string
+          format: date-time
+        updated_at:
+          type: string
+          format: date-time
+    ImportSessionResponse:
+      type: object
+      required:
+      - data
+      properties:
+        data:
+          "$ref": "#/components/schemas/ImportSession"
     ProviderConnectionInstitution:
       type: object
       required:
@@ -2892,6 +3053,8 @@ components:
           - account_statements
           - family_exports
           - imports
+          - import_sessions
+          - import_source_mappings
           - import_rows
           - import_mappings
           - accounts
@@ -2933,6 +3096,12 @@ components:
             imports:
               type: integer
               minimum: 0
+            import_sessions:
+              type: integer
+              minimum: 0
+            import_source_mappings:
+              type: integer
+              minimum: 0
             import_rows:
               type: integer
               minimum: 0
@@ -4607,6 +4776,266 @@ paths:
             application/json:
               schema:
                 "$ref": "#/components/schemas/ErrorResponse"
+  "/api/v1/import_sessions":
+    post:
+      summary: Create import session
+      description: Create or idempotently retrieve a multi-file SureImport session
+        keyed by client_session_id.
+      tags:
+      - Import Sessions
+      security:
+      - apiKeyAuth: []
+      parameters: []
+      responses:
+        '201':
+          description: import session created
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ImportSessionResponse"
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '403':
+          description: insufficient scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '409':
+          description: client session conflict
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '422':
+          description: validation error
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                type:
+                  type: string
+                  enum:
+                  - SureImport
+                  description: Import session type. Only SureImport is supported.
+                client_session_id:
+                  type: string
+                  nullable: true
+                  description: Client-provided idempotency key for the full import
+                    session.
+                expected_chunks:
+                  type: integer
+                  minimum: 1
+                  nullable: true
+                  description: Expected number of ordered chunks before publish is
+                    allowed.
+  "/api/v1/import_sessions/{id}":
+    parameters:
+    - name: id
+      in: path
+      required: true
+      description: Import session ID
+      schema:
+        type: string
+    get:
+      summary: Retrieve import session
+      description: Retrieve import session status, chunk status, per-entity summary
+        counts, and safe error details.
+      tags:
+      - Import Sessions
+      security:
+      - apiKeyAuth: []
+      responses:
+        '200':
+          description: import session retrieved
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ImportSessionResponse"
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '403':
+          description: insufficient scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '404':
+          description: import session not found
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+  "/api/v1/import_sessions/{id}/chunks":
+    parameters:
+    - name: id
+      in: path
+      required: true
+      description: Import session ID
+      schema:
+        type: string
+    post:
+      summary: Upload import session chunk
+      description: Attach an ordered Sure NDJSON chunk to an import session. Chunks
+        are idempotent by sequence and client_chunk_id with content verification.
+      tags:
+      - Import Sessions
+      security:
+      - apiKeyAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+              - sequence
+              - raw_file_content
+              properties:
+                sequence:
+                  type: integer
+                  minimum: 1
+                  description: One-based chunk sequence. Earlier dependency chunks
+                    must have lower sequence numbers.
+                client_chunk_id:
+                  type: string
+                  nullable: true
+                  description: Client-provided idempotency key for this chunk.
+                raw_file_content:
+                  type: string
+                  description: Raw Sure NDJSON content. Each chunk is limited to 10MB.
+          multipart/form-data:
+            schema:
+              type: object
+              required:
+              - sequence
+              - file
+              properties:
+                sequence:
+                  type: integer
+                  minimum: 1
+                  description: One-based chunk sequence. Earlier dependency chunks
+                    must have lower sequence numbers.
+                client_chunk_id:
+                  type: string
+                  nullable: true
+                  description: Client-provided idempotency key for this chunk.
+                file:
+                  type: string
+                  format: binary
+                  description: Multipart Sure NDJSON file upload. Each chunk is limited
+                    to 10MB.
+      parameters: []
+      responses:
+        '201':
+          description: chunk uploaded
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ImportSessionResponse"
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '403':
+          description: insufficient scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '409':
+          description: chunk conflict
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '404':
+          description: import session not found
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '422':
+          description: missing or invalid content
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+  "/api/v1/import_sessions/{id}/publish":
+    parameters:
+    - name: id
+      in: path
+      required: true
+      description: Import session ID
+      schema:
+        type: string
+    post:
+      summary: Publish import session
+      description: Queue ordered chunk processing for a SureImport session. Later
+        chunks can reference source IDs mapped by earlier chunks.
+      tags:
+      - Import Sessions
+      security:
+      - apiKeyAuth: []
+      responses:
+        '202':
+          description: import session publish queued
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ImportSessionResponse"
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '403':
+          description: insufficient scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '422':
+          description: max_row_count_exceeded
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '409':
+          description: missing expected chunks
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '503':
+          description: enqueue failed
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '404':
+          description: import session not found
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
   "/api/v1/imports":
     get:
       summary: List imports
@@ -4653,8 +5082,12 @@ paths:
           - AccountImport
           - MintImport
           - ActualImport
+          - YnabImport
           - CategoryImport
           - RuleImport
+          - MerchantImport
+          - PdfImport
+          - QifImport
           - SureImport
       responses:
         '200':
@@ -4680,7 +5113,7 @@ paths:
               schema:
                 "$ref": "#/components/schemas/ImportResponse"
         '422':
-          description: validation error - file too large
+          description: validation error or publish rejection
           content:
             application/json:
               schema:
@@ -4712,8 +5145,12 @@ paths:
                   - AccountImport
                   - MintImport
                   - ActualImport
+                  - YnabImport
                   - CategoryImport
                   - RuleImport
+                  - MerchantImport
+                  - PdfImport
+                  - QifImport
                   - SureImport
                   description: Import type (defaults to TransactionImport)
                 account_id:
@@ -4819,8 +5256,12 @@ paths:
                   - AccountImport
                   - MintImport
                   - ActualImport
+                  - YnabImport
                   - CategoryImport
                   - RuleImport
+                  - MerchantImport
+                  - PdfImport
+                  - QifImport
                   - SureImport
                   description: Import type (defaults to TransactionImport)
                 account_id:
@@ -5057,8 +5498,12 @@ paths:
                   - AccountImport
                   - MintImport
                   - ActualImport
+                  - YnabImport
                   - CategoryImport
                   - RuleImport
+                  - MerchantImport
+                  - PdfImport
+                  - QifImport
                   - SureImport
                   description: Import type to validate (defaults to TransactionImport)
                 account_id:
@@ -5168,8 +5613,12 @@ paths:
                   - AccountImport
                   - MintImport
                   - ActualImport
+                  - YnabImport
                   - CategoryImport
                   - RuleImport
+                  - MerchantImport
+                  - PdfImport
+                  - QifImport
                   - SureImport
                   description: Import type to validate (defaults to TransactionImport)
                 account_id:
@@ -6487,13 +6936,25 @@ paths:
       parameters: []
       responses:
         '201':
-          description: trade created
+          description: interest created
           content:
             application/json:
               schema:
-                "$ref": "#/components/schemas/Trade"
+                "$ref": "#/components/schemas/TransactionResponse"
+        '403':
+          description: forbidden - api key missing read_write scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '401':
+          description: unauthorized - missing api key
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
         '422':
-          description: validation error - missing security identifier
+          description: deposit without amount returns error
           content:
             application/json:
               schema:
@@ -6523,15 +6984,23 @@ paths:
                       description: Trade date (required)
                     qty:
                       type: number
-                      description: Quantity (required)
+                      description: Quantity (required for buy/sell)
                     price:
                       type: number
-                      description: Price (required)
+                      description: Price (required for buy/sell)
+                    amount:
+                      type: number
+                      description: Amount (required for dividend, deposit, withdrawal,
+                        interest)
                     type:
                       type: string
                       enum:
                       - buy
                       - sell
+                      - dividend
+                      - deposit
+                      - withdrawal
+                      - interest
                       description: Trade type (required)
                     security_id:
                       type: string
@@ -6554,11 +7023,13 @@ paths:
                       type: string
                       format: uuid
                       description: Category ID
+                    transfer_account_id:
+                      type: string
+                      format: uuid
+                      description: Destination/source account ID for linked transfers
                   required:
                   - account_id
                   - date
-                  - qty
-                  - price
                   - type
               required:
               - trade
@@ -6610,6 +7081,18 @@ paths:
             application/json:
               schema:
                 "$ref": "#/components/schemas/Trade"
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '403':
+          description: forbidden - api key missing read_write scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
         '404':
           description: trade not found
           content:
@@ -6637,6 +7120,10 @@ paths:
                       enum:
                       - buy
                       - sell
+                      - dividend
+                      - deposit
+                      - withdrawal
+                      - interest
                     nature:
                       type: string
                       enum:
@@ -6667,6 +7154,18 @@ paths:
             application/json:
               schema:
                 "$ref": "#/components/schemas/DeleteResponse"
+        '401':
+          description: unauthorized
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
+        '403':
+          description: forbidden - api key missing read_write scope
+          content:
+            application/json:
+              schema:
+                "$ref": "#/components/schemas/ErrorResponse"
         '404':
           description: trade not found
           content:
diff --git a/docs/hosting/ai.md b/docs/hosting/ai.md
index 70c89d557..32912fc1d 100644
--- a/docs/hosting/ai.md
+++ b/docs/hosting/ai.md
@@ -216,6 +216,13 @@ OPENAI_URI_BASE=http://localhost:11434/v1
 # Model you pulled
 OPENAI_MODEL=llama3.1:13b
 
+# Raise this for large-context local models so auto-categorize and merchant detection
+# have enough prompt budget for categories + schemas before transaction rows are added.
+LLM_CONTEXT_WINDOW=8192
+
+# Slow local models often need a longer HTTP timeout once the prompt budget issue is fixed.
+OPENAI_REQUEST_TIMEOUT=180
+
 # Optional: enable debug logging in the AI chat
 AI_DEBUG_MODE=true 
 ```
@@ -224,6 +231,8 @@ AI_DEBUG_MODE=true
 - You **must** set `OPENAI_MODEL` - the system cannot default to `gpt-4.1` as that model won't exist in Ollama
 - The `OPENAI_ACCESS_TOKEN` can be any non-empty value (Ollama ignores it)
 - If you don't set a model, chats will fail with a validation error
+- Auto-categorization uses a conservative default `LLM_CONTEXT_WINDOW=2048`, so large category lists or schemas can exhaust the prompt budget before any transactions are sent
+- If requests start timing out after raising `LLM_CONTEXT_WINDOW`, increase `OPENAI_REQUEST_TIMEOUT` too; these are separate limits
 
 ### Docker Compose Example
 
@@ -234,6 +243,8 @@ services:
       - OPENAI_ACCESS_TOKEN=ollama-local
       - OPENAI_URI_BASE=http://ollama:11434/v1
       - OPENAI_MODEL=llama3.1:13b
+      - LLM_CONTEXT_WINDOW=8192
+      - OPENAI_REQUEST_TIMEOUT=180
       - AI_DEBUG_MODE=true # Optional: enable debug logging in the AI chat
     depends_on:
       - ollama
@@ -448,6 +459,8 @@ When [Pipelock](https://github.com/luckyPipewrench/pipelock) is enabled (`pipelo
 
 Pipelock scans for prompt injection, DLP violations, and tool poisoning. The external agent does not need Pipelock installed. Sure's Pipelock handles both directions.
 
+If you need audit evidence, configure Pipelock's flight recorder as described in [Pipelock signed action receipts](pipelock.md#signed-action-receipts). `pipelock.enabled=true` gives scanning; receipts require mounted evidence storage plus a receipt-signing key.
+
 **`NO_PROXY` behavior (Helm/Kubernetes only):** The Helm chart's env template sets `NO_PROXY` to include `.svc.cluster.local` and other internal domains. This means in-cluster agent URLs (like `http://agent.namespace.svc.cluster.local:18789`) bypass the forward proxy and go directly. If your agent is in-cluster, its traffic won't be forward-proxy scanned (but MCP callbacks from the agent are still scanned by the reverse proxy). Docker Compose deployments use a different `NO_PROXY` set; check your compose file for the exact values.
 
 **`mcpToolPolicy` note:** The Helm chart's `pipelock.mcpToolPolicy.enabled` defaults to `false`. Pipelock rejects an enabled tool policy with no rules, so the chart ships it off by default. To turn it on, define at least one rule and set `enabled: true`:
@@ -1022,6 +1035,34 @@ ollama list  # See what's installed
 ollama pull model-name  # Install a model
 ```
 
+### "Fixed prompt tokens exceed context budget"
+
+**Symptom:** Auto-categorization or merchant detection fails immediately with an error like:
+
+```text
+Fixed prompt tokens (2108) exceed context budget (1280)
+```
+
+**Cause:** Sure computes the usable prompt budget as:
+
+```text
+context_window - max_response_tokens - system_prompt_reserve
+```
+
+The defaults are conservative:
+- `LLM_CONTEXT_WINDOW=2048`
+- `LLM_MAX_RESPONSE_TOKENS=512`
+- `LLM_SYSTEM_PROMPT_RESERVE=256`
+
+That leaves `1280` input tokens. On local or custom models, the fixed prompt can already exceed that budget once you include Sure's instructions, category taxonomy, and schema payloads.
+
+**Fix:**
+```bash
+LLM_CONTEXT_WINDOW=8192
+```
+
+Then restart both `web` and `worker` so the new env var is loaded. If you are using Docker Compose, make sure your compose file forwards `LLM_CONTEXT_WINDOW` into the containers.
+
 ### Slow Responses
 
 **Symptom:** Long wait times for AI responses
@@ -1036,6 +1077,7 @@ ollama pull model-name  # Install a model
 - Try a smaller model
 - Ensure you're using GPU, not CPU
 - Check for thermal throttling
+- If you see `Net::ReadTimeout` after fixing the context budget, raise `OPENAI_REQUEST_TIMEOUT` (for example `180`)
 
 ### No Provider Available
 
@@ -1078,9 +1120,9 @@ ollama pull model-name  # Install a model
    kubectl logs deploy/sure-worker -c sidekiq --tail=50 | grep -i "external\|assistant\|error"
    ```
 
-4. **If using Pipelock:** Check pipelock sidecar logs. A crashed pipelock can block outbound requests:
+4. **If using Pipelock:** Check the Pipelock deployment logs. A crashed Pipelock proxy can block outbound requests:
    ```bash
-   kubectl logs deploy/sure-worker -c pipelock --tail=20
+   kubectl logs deploy/sure-pipelock --tail=20
    ```
 
 ### High Costs
diff --git a/docs/hosting/docker.md b/docs/hosting/docker.md
index afd462752..e6d7d4f44 100644
--- a/docs/hosting/docker.md
+++ b/docs/hosting/docker.md
@@ -180,6 +180,16 @@ The first time you run the app, you will need to register a new account by hitti
 1. Enter your email
 2. Enter a password
 
+### Step 5a: Restrict future signups (optional)
+
+After creating your initial admin account, you can control how other people join your self-hosted instance from **Settings > Self-Hosting > Onboarding**.
+
+- **Open**: Anyone can create an account from the registration page.
+- **Invite-only**: New account creation stays enabled, but signups require a valid invite code.
+- **Closed**: The registration page is disabled for new signups.
+
+If you do not want additional self-service registrations, switch the instance to **Closed** after the initial setup.
+
 ### Step 6: Run the app in the background
 
 Most self-hosting users will want the Sure app to run in the background on their computer so they can access it at all times. To do this, hit `Ctrl+C` to stop the running process, and then run the following command:
@@ -251,6 +261,7 @@ Pipelock sits between Sure and external services, scanning AI traffic for:
 - **Secret exfiltration** (DLP): catches API keys, tokens, or personal data leaking in prompts
 - **Prompt injection**: detects attempts to override system instructions
 - **Tool poisoning**: validates MCP tool calls against known-safe patterns
+- **Signed receipts**: optional hash-chained evidence of mediated decisions when `flight_recorder.dir` and `signing_key_path` are configured
 
 When using `compose.example.ai.yml`, Pipelock is always running. External AI agents should connect to port 8889 (MCP reverse proxy) instead of directly to Sure's `/mcp` on port 3000.
 
@@ -316,3 +327,12 @@ docker compose exec db psql -U sure_user -d sure_development -c "SELECT 1;" # Th
 ### Slow `.csv` import (processing rows taking longer than expected)
 
 Importing comma-separated-value file(s) requires the `sure-worker` container to communicate with Redis. Check your worker logs for any unexpected errors, such as connection timeouts or Redis communication failures.
+
+### Inspecting background jobs (`/sidekiq`)
+
+Sure ships the Sidekiq Web dashboard at `/sidekiq`. The route only exists for a signed-in **super admin** — the first user created on your instance. Anyone else (including logged-out visitors) gets a 404, so there is nothing to configure to keep it safe. If you want a second layer of protection anyway, set both `SIDEKIQ_WEB_USERNAME` and `SIDEKIQ_WEB_PASSWORD` in your environment file to additionally require basic-auth credentials; there are no default credentials.
+
+For day-to-day triage of stuck syncs, imports, and exports, prefer **Settings → Background jobs** — it maps queue state onto the actual records and offers safe recovery actions. The Sidekiq dashboard is a break-glass tool; two warnings when using it directly:
+
+- Never manually retry `SimplefinConnectionUpdateJob` — it consumes a single-use setup token, and a retry permanently breaks that connection attempt.
+- Deleting or retrying jobs does **not** update the corresponding Sure record (a deleted `ImportJob` leaves its import stuck in `importing`) — use Settings → Background jobs for record-level recovery.
diff --git a/docs/hosting/hetzner.md b/docs/hosting/hetzner.md
index b9693d635..c75ab76e5 100644
--- a/docs/hosting/hetzner.md
+++ b/docs/hosting/hetzner.md
@@ -176,6 +176,16 @@ Now you can:
 2. **Create your admin account**: Click "Create your account" on the login page
 3. **Set up your first family**: Follow the onboarding process
 
+### Optional: Disable self-service registration
+
+Once your initial admin account is ready, open **Settings > Self-Hosting > Onboarding** to choose how signups should work:
+
+- **Open**: Anyone can register.
+- **Invite-only**: New signups require a valid invite code.
+- **Closed**: New signups from the registration page are blocked.
+
+For single-admin or tightly controlled deployments, set the onboarding mode to **Closed** after the initial setup.
+
 ## Step 7: Set Up Automated Backups
 
 Create a backup script to protect your data:
diff --git a/docs/hosting/mcp.md b/docs/hosting/mcp.md
index db019163f..39b60bd8e 100644
--- a/docs/hosting/mcp.md
+++ b/docs/hosting/mcp.md
@@ -230,6 +230,7 @@ Pipelock provides:
 - **Prompt injection detection**: Identifies attempts to manipulate the AI
 - **Tool poisoning detection**: Prevents malicious tool call sequences
 - **Policy enforcement**: Block or warn on suspicious patterns
+- **Signed receipts**: Produces verifiable evidence for mediated MCP decisions when the flight recorder is configured with storage and a signing key
 
 See the [Pipelock documentation](pipelock.md) and the example configuration in `compose.example.ai.yml` for setup instructions.
 
diff --git a/docs/hosting/pipelock.md b/docs/hosting/pipelock.md
index 0cd5ed126..09980d08d 100644
--- a/docs/hosting/pipelock.md
+++ b/docs/hosting/pipelock.md
@@ -48,6 +48,38 @@ The `compose.example.ai.yml` file includes Pipelock. To use it:
    # Should show "healthy"
    ```
 
+4. Optional: enable signed action receipts.
+
+   Pipelock's flight recorder is on by default, but it writes nothing until it has a writable evidence directory and a receipt-signing key. Create the directories yourself first (so they are owned by your host user, not root), then generate the key with the Pipelock image so you do not need the binary installed locally:
+
+   ```bash
+   mkdir -p pipelock-evidence pipelock-keys
+   # --out must be an absolute path inside the container. The key is written
+   # 0600 owned by uid 1000, which is the user the Pipelock proxy runs as.
+   docker run --rm -v "$PWD/pipelock-keys:/keys" ghcr.io/luckypipewrench/pipelock:2.8.0 \
+     signing key generate --purpose receipt-signing --out /keys/flight-recorder-signing.key --id sure-compose
+   ```
+
+   If your host user is not uid 1000, use this variant instead so the mounted key and evidence directory are readable and writable by the same user that runs the Pipelock service. `compose.example.ai.yml` already has `user: "${PIPELOCK_UID:-1000}:${PIPELOCK_GID:-1000}"` on the `pipelock` service, so export those variables in the same shell before restarting, or put them in your `.env` file:
+
+   ```bash
+   export PIPELOCK_UID="$(id -u)" PIPELOCK_GID="$(id -g)"
+   docker run --rm --user "$PIPELOCK_UID:$PIPELOCK_GID" -v "$PWD/pipelock-keys:/keys" ghcr.io/luckypipewrench/pipelock:2.8.0 \
+     signing key generate --purpose receipt-signing --out /keys/flight-recorder-signing.key --id sure-compose
+   ```
+
+   Then uncomment the `pipelock-evidence` and `pipelock-keys` volume mounts in `compose.example.ai.yml`, uncomment `flight_recorder.dir` and `flight_recorder.signing_key_path` in `pipelock.example.yaml`, and restart Pipelock from the same shell if you exported `PIPELOCK_UID` and `PIPELOCK_GID`:
+
+   ```bash
+   docker compose -f compose.ai.yml restart pipelock
+   ```
+
+   Print the public verifier key when you need to hand receipts to another system:
+
+   ```bash
+   docker compose -f compose.ai.yml exec pipelock /pipelock signing pubkey --config /etc/pipelock/pipelock.yaml
+   ```
+
 ### Connecting external AI agents
 
 External agents should use the MCP reverse proxy port:
@@ -77,13 +109,65 @@ Enable Pipelock in your Helm values:
 pipelock:
   enabled: true
   image:
-    tag: "2.5.0"
+    tag: "2.8.0"
   mode: balanced
 ```
 
 This creates a separate Deployment, Service, and ConfigMap. The chart auto-injects `HTTPS_PROXY`/`HTTP_PROXY`/`NO_PROXY` into web and worker pods.
 
-Recent pipelock releases add the Audit Packet v0 schema and language-portable verifiers (Go/TypeScript/Rust), request-body prompt-injection blocking, SPIFFE-strict inbound mediation envelopes, scanner attribution on MCP block receipts, trusted domain allowlisting, MCP tool redirect profiles, enhanced tool poisoning detection, per-read kill switch preemption, signed action receipts, per-pattern DLP warn mode, learn-and-lock behavioural contracts, the wedge-detection health watchdog, and the `pipelock posture verify` / `pipelock session` / `pipelock doctor` CLI commands. See the [pipelock changelog](https://github.com/luckyPipewrench/pipelock/releases) for details.
+Recent Pipelock releases add default-on flight recorder receipts, safe-by-default receipt verification, MCP `defer` authorization, request-policy scoring, request-body prompt-injection blocking, SPIFFE-strict inbound mediation envelopes, scanner attribution on MCP block receipts, trusted domain allowlisting, MCP tool redirect profiles, learn-and-lock behavioural contracts, the wedge-detection health watchdog, `pipelock explain`, `pipelock keys status`, `pipelock support bundle`, verified `pipelock update`, and `pipelock doctor` checks for inert exemptions. See the [Pipelock changelog](https://github.com/luckyPipewrench/pipelock/releases) for details.
+
+### Signed action receipts
+
+Pipelock can write hash-chained, Ed25519-signed receipts for proxied decisions. This is the audit trail that proves what crossed the Pipelock boundary and what policy verdict was applied.
+
+The chart exposes `pipelock.flightRecorder`, but recording is inert until you mount both storage and a signing key:
+
+```bash
+# --out must be an absolute path; "$PWD/..." writes the key into the current directory.
+pipelock signing key generate --purpose receipt-signing --out "$PWD/flight-recorder-signing.key" --id sure-k8s
+kubectl create namespace sure
+kubectl create secret generic sure-pipelock-receipts \
+  --namespace sure \
+  --from-file=flight-recorder-signing.key=./flight-recorder-signing.key
+```
+
+If you do not have the `pipelock` binary installed, generate the key with the image instead: `docker run --rm -v "$PWD:/out" ghcr.io/luckypipewrench/pipelock:2.8.0 signing key generate --purpose receipt-signing --out /out/flight-recorder-signing.key --id sure-k8s`.
+
+Example Helm values using an existing PVC named `sure-pipelock-evidence`:
+
+```yaml
+pipelock:
+  enabled: true
+  flightRecorder:
+    enabled: true
+    dir: /var/lib/pipelock/evidence
+    signingKeyPath: /run/secrets/pipelock/flight-recorder-signing.key
+    requireReceipts: false
+    redact: true
+  extraVolumes:
+    - name: pipelock-evidence
+      persistentVolumeClaim:
+        claimName: sure-pipelock-evidence
+    - name: pipelock-receipt-key
+      secret:
+        secretName: sure-pipelock-receipts
+        # 0440 (group-read), not 0400: the chart runs Pipelock as uid 1000 with
+        # fsGroup 1000, so the secret file is owned root:1000. A 0400 file would
+        # be unreadable by the non-root process and Pipelock would crash on
+        # startup with a key-load error. 0440 lets the fsGroup read it.
+        defaultMode: 0440
+  extraVolumeMounts:
+    - name: pipelock-evidence
+      mountPath: /var/lib/pipelock/evidence
+    - name: pipelock-receipt-key
+      # Do not mount this under /etc/pipelock; the chart already mounts the
+      # Pipelock ConfigMap there.
+      mountPath: /run/secrets/pipelock
+      readOnly: true
+```
+
+Keep `requireReceipts: false` until you have confirmed receipts are being written. Turning it on makes allow-path receipt emission fail closed: if Pipelock cannot sign or write the receipt, the request is blocked before egress.
 
 ### Exposing MCP to external agents (Kubernetes)
 
@@ -158,9 +242,10 @@ The `pipelock.example.yaml` file (Docker Compose) or ConfigMap (Helm) controls s
 | `tool_chain_detection` | Multi-step attack patterns |
 | `websocket_proxy` | WebSocket frame scanning (disabled by default) |
 | `health_watchdog` | Wedge-detection on subsystem heartbeats, returns 503 on stall (pipelock 2.4+) |
+| `flight_recorder` | Signed action receipts and hash-chained evidence (inert until storage + signing key are mounted) |
 | `logging` | Output format (json/text), verbosity |
 
-For the Helm chart, most sections are configurable via `values.yaml`. For additional sections not covered by structured values (session profiling, data budgets, kill switch, sandbox, reverse proxy, adaptive enforcement), use the `extraConfig` escape hatch:
+For the Helm chart, most sections are configurable via `values.yaml`. For additional sections not covered by structured values (session profiling, data budgets, kill switch, sandbox, reverse proxy, adaptive enforcement, request policy, redaction), use the `extraConfig` escape hatch:
 
 ```yaml
 pipelock:
@@ -185,6 +270,7 @@ Start with `audit` mode to see what Pipelock detects without blocking anything.
 - Forward proxy only covers Faraday-based HTTP clients. Net::HTTP, HTTParty, and other libraries ignore `HTTPS_PROXY`.
 - Docker Compose has no egress network policies. The `/mcp` endpoint on port 3000 is still reachable directly (auth token required). For enforcement, use Kubernetes NetworkPolicies.
 - Pipelock scans text content. Binary payloads (images, file uploads) are passed through by default.
+- Signed receipts prove traffic that traversed Pipelock. They do not prove traffic could not bypass Pipelock; pair them with NetworkPolicies, containment, or firewall rules for non-bypass claims.
 
 ## Troubleshooting
 
@@ -222,3 +308,14 @@ docker compose -f compose.ai.yml exec pipelock /pipelock healthcheck --addr 127.
 ```
 
 Check that `MCP_API_TOKEN` and `MCP_USER_EMAIL` are set in your `.env` file and that the email matches an existing Sure user.
+
+### Receipts are not being written
+
+Run:
+
+```bash
+docker compose -f compose.ai.yml exec pipelock /pipelock keys status --config /etc/pipelock/pipelock.yaml
+docker compose -f compose.ai.yml exec pipelock /pipelock doctor --config /etc/pipelock/pipelock.yaml
+```
+
+The `receipt-signing` key must be present, readable by the Pipelock process, and valid. The `flight_recorder.dir` path must be writable.
diff --git a/docs/hosting/redbark.md b/docs/hosting/redbark.md
new file mode 100644
index 000000000..91d14767d
--- /dev/null
+++ b/docs/hosting/redbark.md
@@ -0,0 +1,53 @@
+# Setting Up Redbark (Australian Banks)
+
+[Redbark](https://redbark.com) connects Australian bank accounts to Sure through the [Consumer Data Right](https://www.cdr.gov.au/) (CDR) open banking framework. Data flows one way, from your banks into Sure, using read-only consented access.
+
+> [!NOTE]
+> Redbark covers Australian institutions (banks under the CDR regime). If you're outside Australia, see the other provider integrations in the [onboarding guide](/docs/onboarding/guide.md).
+
+## 1. Create Your Redbark Account
+
+1. Go to [app.redbark.com](https://app.redbark.com) and sign up.
+2. Connect your bank accounts. You'll be taken through your bank's official consent flow, so Redbark never sees your bank login.
+
+## 2. Create an API Key
+
+> [!NOTE]
+> API access requires a Redbark Developer or Professional plan. It is not available on the Saver plan.
+
+1. In Redbark, go to **Settings > API Keys**.
+2. Create a new key and copy it. It is only shown once.
+
+## 3. Add Redbark to Sure
+
+1. In Sure, go to **Settings > Providers** and find the **Redbark** panel.
+2. Paste your API key and save.
+3. Your connected bank accounts will appear for setup. Link each one to an existing Sure account or create a new account from it. Accounts you don't want in Sure can be skipped.
+
+## 4. Syncing
+
+- The first sync pulls 90 days of history for each linked account (or from the start date you pick during setup).
+- Later syncs are incremental, with a 7 day lookback to catch late-posting transactions.
+- Balances come from your bank via Redbark on every sync.
+- Transactions are deduplicated by their Redbark transaction id, so re-syncing never creates duplicates.
+
+### Pending transactions
+
+By default only posted transactions are imported. To also import pending transactions, set:
+
+```
+REDBARK_INCLUDE_PENDING=true
+```
+
+When a pending transaction settles, the posted version replaces it automatically.
+
+## Troubleshooting
+
+**Connection requires update**
+Your API key was revoked or expired. Create a new key in Redbark and update it in the Sure provider panel.
+
+**An account is missing**
+Only banking accounts are synced. Brokerage accounts connected to Redbark are not imported by this integration. Also check the account's consent is still active in Redbark under **Settings > Consents**.
+
+**Sync errors**
+Provider sync failures are captured in Sure's debug log (super admin: **Settings > Debug**), including counts of skipped and failed rows.
diff --git a/docs/llm-guides/gating-a-preview-feature.md b/docs/llm-guides/gating-a-preview-feature.md
index 43bec54f5..e396aef3c 100644
--- a/docs/llm-guides/gating-a-preview-feature.md
+++ b/docs/llm-guides/gating-a-preview-feature.md
@@ -140,6 +140,25 @@ Grep for `require_preview_features!` and `preview_features_enabled?` near your f
 
 The flag is per-user, not per-family. Two users in the same family can see different versions of the product if one opts in and the other doesn't. That's intentional. Data is family-scoped, but visibility is a personal preference. If you write a feature that creates family-shared data (goals, budgets, etc.), the data persists when a user toggles preview off. The UI just disappears from their view while still showing up for opted-in family members.
 
-The gate does nothing for background jobs. If your feature has a Sidekiq cron job, it runs regardless of who has preview enabled. That's usually correct (data should keep flowing), but if the job sends notifications or emails, gate those at the send site too.
+The gate does nothing for background jobs on its own — `PreviewGateable` reads `Current.user`, which a Sidekiq worker doesn't have. A cron job runs regardless of who has preview enabled. That's usually correct: data should keep flowing, so it's there when someone opts in. `SweepExpiredGoalPledgesJob` is the typical shape — it only walks pledges that opted-in users created, so it's naturally inert for everyone else and needs no gate.
+
+Gate the job when it does work that isn't free. Two cases: it sends something outward (notifications, emails — gate at the send site), or it *manufactures* data for every family rather than moving existing data around, burning compute or paid API calls per family. `GenerateInsightsJob` is the second case: seven generators over the income statement and balance sheet, plus optional LLM narration, for every family nightly.
+
+For a family-scoped job, roll the per-user flag up to the family:
+
+```ruby
+# app/models/family.rb
+scope :with_preview_features, -> { where(id: User.with_preview_features.select(:family_id)) }
+
+def preview_features_enabled?
+  users.with_preview_features.exists?
+end
+```
+
+Filter the fan-out with the scope (one indexed query — `User.with_preview_features` is a jsonb containment match against the GIN index on `users.preferences`, not a load-and-iterate), and re-check with the predicate inside the per-family path, which is reachable directly from controllers and the console. Keep the same predicate name on both models so the GA-removal grep finds every call site. `GenerateInsightsJob` is the reference implementation.
+
+One opted-in member is enough to generate for the whole family — consistent with the per-user-visibility / family-scoped-data split described above.
+
+Note what the shared name costs: `preview_features_enabled?` means "I opted in" on `User` but "somebody in my household opted in" on `Family`. Only ever gate background work on the family form. Gating UI on it (`Current.family.preview_features_enabled?` reads naturally, which is the trap) would show the feature to someone who explicitly opted out because a family member opted in. For anything a person sees, use the `PreviewGateable` helper, which reads `Current.user`.
 
 The redirect target is `/`. If you want gated controllers to land somewhere else (a docs page, an opt-in nudge), override `require_preview_features!` in the controller, or write a thin custom `before_action` that calls `preview_features_enabled?` directly.
diff --git a/docs/onboarding/guide.md b/docs/onboarding/guide.md
index 45718ea6e..930ab993f 100644
--- a/docs/onboarding/guide.md
+++ b/docs/onboarding/guide.md
@@ -38,6 +38,7 @@ When you arrive at the main dashboard, showing **No accounts yet**, you're all s
 > 
 > - [**Lunch Flow**](https://www.lunchflow.app/)
 > - [**Plaid**](/docs/hosting/plaid.md)
+> - [**Redbark**](/docs/hosting/redbark.md) (Australian banks)
 > - [**SimpleFIN**](https://beta-bridge.simplefin.org/)
 > - [**Enable Banking**](https://enablebanking.com/) (beta)
 > - [**CoinStats**](https://coinstats.app/) (beta)
diff --git a/lib/generators/provider/family/templates/activities_processor.rb.tt b/lib/generators/provider/family/templates/activities_processor.rb.tt
index 956ff5ced..48ca69256 100644
--- a/lib/generators/provider/family/templates/activities_processor.rb.tt
+++ b/lib/generators/provider/family/templates/activities_processor.rb.tt
@@ -131,9 +131,9 @@ class <%= class_name %>Account::ActivitiesProcessor
 
       # Get the activity date
       # TODO: Customize date field names
-      activity_date = parse_date(data[:settlement_date]) ||
-                      parse_date(data[:trade_date]) ||
-                      parse_date(data[:date]) ||
+      activity_date = parse_date(data[:settlement_date], family: account&.family) ||
+                      parse_date(data[:trade_date], family: account&.family) ||
+                      parse_date(data[:date], family: account&.family) ||
                       Date.current
 
       currency = extract_currency(data, fallback: account.currency)
@@ -165,9 +165,9 @@ class <%= class_name %>Account::ActivitiesProcessor
 
       # Get the activity date
       # TODO: Customize date field names
-      activity_date = parse_date(data[:settlement_date]) ||
-                      parse_date(data[:trade_date]) ||
-                      parse_date(data[:date]) ||
+      activity_date = parse_date(data[:settlement_date], family: account&.family) ||
+                      parse_date(data[:trade_date], family: account&.family) ||
+                      parse_date(data[:date], family: account&.family) ||
                       Date.current
 
       # Build description
diff --git a/lib/generators/provider/family/templates/data_helpers.rb.tt b/lib/generators/provider/family/templates/data_helpers.rb.tt
index c3d1555e8..aaeff473a 100644
--- a/lib/generators/provider/family/templates/data_helpers.rb.tt
+++ b/lib/generators/provider/family/templates/data_helpers.rb.tt
@@ -39,17 +39,22 @@ module <%= class_name %>Account::DataHelpers
       nil
     end
 
-    def parse_date(date_value)
+    def parse_date(date_value, family: nil)
       return nil if date_value.nil?
 
+      tz = family&.timezone
+
       case date_value
+      when String
+        if tz && (date_value.include?("T") || date_value.include?(":"))
+          Time.parse(date_value).in_time_zone(tz).to_date
+        else
+          Date.parse(date_value)
+        end
+      when Time, DateTime, ActiveSupport::TimeWithZone
+        date_value.in_time_zone(tz).to_date
       when Date
         date_value
-      when String
-        # Use Time.zone.parse for external timestamps (Rails timezone guidelines)
-        Time.zone.parse(date_value)&.to_date
-      when Time, DateTime, ActiveSupport::TimeWithZone
-        date_value.to_date
       else
         nil
       end
diff --git a/lib/generators/provider/family/templates/transactions_processor.rb.tt b/lib/generators/provider/family/templates/transactions_processor.rb.tt
index d3ef1639a..4d221739c 100644
--- a/lib/generators/provider/family/templates/transactions_processor.rb.tt
+++ b/lib/generators/provider/family/templates/transactions_processor.rb.tt
@@ -96,7 +96,7 @@ class <%= class_name %>Account::Transactions::Processor
       return nil if amount.nil?
 
       # TODO: Customize date field names based on your provider
-      date = parse_date(data[:date] || data[:transaction_date] || data[:posted_at])
+      date = parse_date(data[:date] || data[:transaction_date] || data[:posted_at], family: account&.family)
       return nil if date.nil?
 
       name = data[:name] || data[:description] || data[:merchant_name] || "Transaction"
diff --git a/lib/simplefin/date_utils.rb b/lib/simplefin/date_utils.rb
index c2130cf03..80eaf72bb 100644
--- a/lib/simplefin/date_utils.rb
+++ b/lib/simplefin/date_utils.rb
@@ -4,26 +4,42 @@ module Simplefin
   module DateUtils
     module_function
 
-    # Parses provider-supplied dates that may be String (ISO), Numeric (epoch seconds),
-    # Time/DateTime, or Date. Returns a Date or nil when unparseable.
-    def parse_provider_date(val)
+    # Parses provider-supplied timestamps that may be String (ISO or epoch string),
+    # Numeric (epoch seconds), Time/DateTime, or Date. Returns a Time or nil when
+    # unparseable.
+    def parse_provider_time(val)
       return nil if val.nil?
 
       case val
-      when Date
+      when Time
         val
-      when Time, DateTime
-        val.to_date
+      when DateTime
+        val.to_time
+      when Date
+        val.to_time
       when Integer, Float
         return nil if val.to_i == 0
-        Time.at(val).utc.to_date
+        Time.at(val).utc
       when String
-        Date.parse(val)
+        stripped = val.strip
+        return nil if stripped.empty? || stripped == "0"
+
+        if stripped.match?(/\A\d+(?:\.\d+)?\z/)
+          Time.at(stripped.to_f).utc
+        else
+          Time.parse(stripped)
+        end
       else
         nil
       end
     rescue ArgumentError, TypeError
       nil
     end
+
+    # Parses provider-supplied dates that may be String (ISO), Numeric (epoch seconds),
+    # Time/DateTime, or Date. Returns a Date or nil when unparseable.
+    def parse_provider_date(val)
+      parse_provider_time(val)&.to_date
+    end
   end
 end
diff --git a/lib/tasks/security_backfill.rake b/lib/tasks/security_backfill.rake
index ee2a26191..357a232fe 100644
--- a/lib/tasks/security_backfill.rake
+++ b/lib/tasks/security_backfill.rake
@@ -1,6 +1,15 @@
 # frozen_string_literal: true
 
 namespace :security do
+  # Scope note: this task encrypts values that are still stored as PLAINTEXT.
+  # It cannot detect or repair rows that were double-encoded by the pre-fix
+  # version of this task (issue #2611): those decrypt "successfully" to a
+  # JSON-text String on a json/jsonb column, which is indistinguishable here
+  # from a legitimately stored string value, so mutating them automatically
+  # would risk mangling valid data. If your instance ran the backfill before
+  # the #2611 fix and provider payloads now decrypt to Strings (symptom:
+  # zero balances on every provider-linked account after a sync), run the
+  # manual recovery script in issue #2611 first, then re-run this task.
   desc "Backfill encryption for sensitive fields (idempotent). Args: batch_size, dry_run"
   task :backfill_encryption, [ :batch_size, :dry_run ] => :environment do |_, args|
     raw_batch = args[:batch_size].presence || ENV["BATCH_SIZE"].presence || "100"
@@ -81,8 +90,11 @@ namespace :security do
         # Skip if filter block returns false
         next if block_given? && !filter_block.call(record)
 
-        # Check if any field has data (use safe read to handle plaintext)
-        next unless fields.any? { |f| safe_read_field(record, f).present? }
+        # Check if any field has data (use safe read to handle plaintext).
+        # Nil-check rather than present?: empty values ({}, [], "") are still
+        # plaintext that needs encrypting — present? skips them, leaving data
+        # the encrypted getters raise on once keys are live.
+        next unless fields.any? { |f| !safe_read_field(record, f).nil? }
 
         next if dry_run
 
@@ -91,7 +103,7 @@ namespace :security do
           plaintext_values = {}
           fields.each do |field|
             value = safe_read_field(record, field)
-            plaintext_values[field] = value if value.present?
+            plaintext_values[field] = value unless value.nil?
           end
 
           next if plaintext_values.empty?
@@ -129,11 +141,25 @@ namespace :security do
   # Safely read a field value, handling both encrypted and plaintext data.
   # When encryption is configured but the value is plaintext, the getter
   # raises ActiveRecord::Encryption::Errors::Decryption. In this case,
-  # we fall back to reading the raw database value.
+  # we fall back to reading the raw database value. For json/jsonb columns
+  # the raw value is the JSON text, not the deserialized Array/Hash the
+  # encrypted setter expects, so parse it first — otherwise the backfill
+  # encrypts the JSON text itself and the column thereafter decrypts to a
+  # String, breaking every consumer of the payload.
   def safe_read_field(record, field)
     record.send(field)
   rescue ActiveRecord::Encryption::Errors::Decryption
-    record.read_attribute_before_type_cast(field)
+    raw = record.read_attribute_before_type_cast(field)
+    column = record.class.columns_hash[field.to_s]
+    if raw.is_a?(String) && [ :json, :jsonb ].include?(column&.type)
+      begin
+        JSON.parse(raw)
+      rescue JSON::ParserError
+        raw
+      end
+    else
+      raw
+    end
   end
 
   def backfill_sessions(batch_size, dry_run)
@@ -151,7 +177,7 @@ namespace :security do
 
           # Re-save user_agent to trigger encryption (use safe read for plaintext)
           user_agent_value = safe_read_field(session, :user_agent)
-          if user_agent_value.present?
+          unless user_agent_value.nil?
             # Use temporary instance to encrypt
             encryptor = Session.new
             encryptor.user_agent = user_agent_value
diff --git a/lib/tasks/simplefin_prune_pending.rake b/lib/tasks/simplefin_prune_pending.rake
new file mode 100644
index 000000000..c885bcf44
--- /dev/null
+++ b/lib/tasks/simplefin_prune_pending.rake
@@ -0,0 +1,105 @@
+# frozen_string_literal: true
+
+# Maintenance task to prune pending transactions from the SimpleFin cumulative
+# raw_transactions_payload store.
+#
+# Why: SimplefinAccount#raw_transactions_payload accumulates transactions across syncs
+# and is never pruned. When pending inclusion is disabled, the API stops returning pending
+# rows but ones already stored here keep getting (re)created as entries on every sync -
+# including ones a user manually deleted. SimplefinEntry::Processor now skips pending rows
+# while pending is disabled, but the stale rows remain in the store. This task removes them.
+#
+# Pending detection delegates to SimplefinEntry::Processor.pending?:
+#   - pending: true (explicit flag), OR
+#   - posted == 0 (epoch) AND transacted_at present (implicit pattern from some banks)
+#
+# Usage examples:
+#   # Preview (no writes) across all SimpleFin accounts
+#   bin/rails 'sure:simplefin:prune_pending[dry_run=true]'
+#
+#   # Execute across all SimpleFin accounts (writes enabled)
+#   bin/rails 'sure:simplefin:prune_pending[dry_run=false]'
+#
+#   # Limit to one item or one linked account
+#   bin/rails 'sure:simplefin:prune_pending[item_id=ec255931-62ff-4a68-abda-16067fad0429,dry_run=false]'
+#   bin/rails 'sure:simplefin:prune_pending[account_id=8b46387c-5aa4-4a92-963a-4392c10999c9,dry_run=false]'
+
+namespace :sure do
+  namespace :simplefin do
+    desc "Prune pending transactions from SimpleFin raw_transactions_payload. Args (named): item_id, account_id, dry_run=true"
+    task :prune_pending, [ :item_id, :account_id, :dry_run ] => :environment do |_, args|
+      # Support both positional and named (key=value) args; prefer named.
+      kv = {}
+      [ args[:item_id], args[:account_id], args[:dry_run] ].each do |raw|
+        next unless raw.is_a?(String) && raw.include?("=")
+        k, v = raw.split("=", 2)
+        kv[k.to_s] = v
+      end
+
+      # A key=value string only carries a named arg, so it must not also be reused as a
+      # positional fallback (otherwise `prune_pending[dry_run=true]` lands "dry_run=true"
+      # in the :item_id slot and fails UUID validation).
+      positional = ->(raw) { raw.is_a?(String) && raw.include?("=") ? nil : raw }
+
+      item_id    = (kv["item_id"] || positional.call(args[:item_id])).presence
+      account_id = (kv["account_id"] || positional.call(args[:account_id])).presence
+      dry_raw    = (kv["dry_run"] || positional.call(args[:dry_run])).to_s.downcase
+
+      # Default to dry_run=true unless explicitly disabled, and validate input strictly
+      if dry_raw.blank? || %w[1 true yes y].include?(dry_raw)
+        dry_run = true
+      elsif %w[0 false no n].include?(dry_raw)
+        dry_run = false
+      else
+        puts({ ok: false, error: "invalid_argument", message: "dry_run must be one of: true/yes/1 or false/no/0" }.to_json)
+        exit 1
+      end
+
+      # Basic UUID validation when provided
+      uuid_rx = /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/i
+      if item_id.present? && !item_id.match?(uuid_rx)
+        puts({ ok: false, error: "invalid_argument", message: "item_id must be a hyphenated UUID" }.to_json)
+        exit 1
+      end
+      if account_id.present? && !account_id.match?(uuid_rx)
+        puts({ ok: false, error: "invalid_argument", message: "account_id must be a hyphenated UUID" }.to_json)
+        exit 1
+      end
+
+      # Select SimplefinAccounts to process
+      sfas = if item_id.present?
+        SimplefinItem.find(item_id).simplefin_accounts
+      elsif account_id.present?
+        acct = Account.find(account_id)
+        # Prefer new provider linkage, fallback to legacy foreign key
+        sfa = if acct.account_providers.where(provider_type: "SimplefinAccount").exists?
+          AccountProvider.find_by(account: acct, provider_type: "SimplefinAccount")&.provider
+        else
+          SimplefinAccount.find_by(account: acct)
+        end
+        SimplefinAccount.where(id: Array.wrap(sfa).compact.map(&:id))
+      else
+        SimplefinAccount.all
+      end
+
+      total_accounts = 0
+      total_removed = 0
+
+      sfas.find_each do |sfa|
+        txns = sfa.raw_transactions_payload.to_a
+        kept = txns.reject { |tx| SimplefinEntry::Processor.pending?(tx) }
+        removed = txns.size - kept.size
+        next if removed.zero?
+
+        total_accounts += 1
+        total_removed += removed
+
+        sfa.update!(raw_transactions_payload: kept) unless dry_run
+
+        puts({ sfa_id: sfa.id, name: sfa.name, total: txns.size, removed: removed, kept: kept.size, dry_run: dry_run }.to_json)
+      end
+
+      puts({ ok: true, accounts_pruned: total_accounts, transactions_removed: total_removed, dry_run: dry_run }.to_json)
+    end
+  end
+end
diff --git a/mobile/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/mobile/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
index 976c65844..cee847f2a 100644
--- a/mobile/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
+++ b/mobile/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -50,6 +50,11 @@ public final class GeneratedPluginRegistrant {
     } catch (Exception e) {
       Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
     }
+    try {
+      flutterEngine.getPlugins().add(new io.sentry.flutter.SentryFlutterPlugin());
+    } catch (Exception e) {
+      Log.e(TAG, "Error registering plugin sentry_flutter, io.sentry.flutter.SentryFlutterPlugin", e);
+    }
     try {
       flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
     } catch (Exception e) {
@@ -65,10 +70,5 @@ public final class GeneratedPluginRegistrant {
     } catch (Exception e) {
       Log.e(TAG, "Error registering plugin url_launcher_android, io.flutter.plugins.urllauncher.UrlLauncherPlugin", e);
     }
-    try {
-      flutterEngine.getPlugins().add(new io.flutter.plugins.webviewflutter.WebViewFlutterPlugin());
-    } catch (Exception e) {
-      Log.e(TAG, "Error registering plugin webview_flutter_android, io.flutter.plugins.webviewflutter.WebViewFlutterPlugin", e);
-    }
   }
 }
diff --git a/mobile/assets/fonts/Geist-Bold.ttf b/mobile/assets/fonts/Geist-Bold.ttf
new file mode 100644
index 000000000..646e874c5
Binary files /dev/null and b/mobile/assets/fonts/Geist-Bold.ttf differ
diff --git a/mobile/assets/fonts/Geist-Medium.ttf b/mobile/assets/fonts/Geist-Medium.ttf
new file mode 100644
index 000000000..fbcd0e701
Binary files /dev/null and b/mobile/assets/fonts/Geist-Medium.ttf differ
diff --git a/mobile/assets/fonts/Geist-Regular.ttf b/mobile/assets/fonts/Geist-Regular.ttf
new file mode 100644
index 000000000..87698c428
Binary files /dev/null and b/mobile/assets/fonts/Geist-Regular.ttf differ
diff --git a/mobile/assets/fonts/Geist-SemiBold.ttf b/mobile/assets/fonts/Geist-SemiBold.ttf
new file mode 100644
index 000000000..f680475f3
Binary files /dev/null and b/mobile/assets/fonts/Geist-SemiBold.ttf differ
diff --git a/mobile/assets/fonts/GeistMono-Regular.ttf b/mobile/assets/fonts/GeistMono-Regular.ttf
new file mode 100644
index 000000000..992a650a6
Binary files /dev/null and b/mobile/assets/fonts/GeistMono-Regular.ttf differ
diff --git a/mobile/assets/fonts/OFL.txt b/mobile/assets/fonts/OFL.txt
new file mode 100644
index 000000000..04e95fc55
--- /dev/null
+++ b/mobile/assets/fonts/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2024 The Geist Project Authors (https://github.com/vercel/geist-font)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/mobile/assets/icons/lucide/LICENSE b/mobile/assets/icons/lucide/LICENSE
new file mode 100644
index 000000000..718bb3f0e
--- /dev/null
+++ b/mobile/assets/icons/lucide/LICENSE
@@ -0,0 +1,43 @@
+ISC License
+
+Copyright (c) 2026 Lucide Icons and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+---
+
+The following Lucide icons are derived from the Feather project:
+
+airplay, alert-circle, alert-octagon, alert-triangle, aperture, arrow-down-circle, arrow-down-left, arrow-down-right, arrow-down, arrow-left-circle, arrow-left, arrow-right-circle, arrow-right, arrow-up-circle, arrow-up-left, arrow-up-right, arrow-up, at-sign, calendar, cast, check, chevron-down, chevron-left, chevron-right, chevron-up, chevrons-down, chevrons-left, chevrons-right, chevrons-up, circle, clipboard, clock, code, columns, command, compass, corner-down-left, corner-down-right, corner-left-down, corner-left-up, corner-right-down, corner-right-up, corner-up-left, corner-up-right, crosshair, database, divide-circle, divide-square, dollar-sign, download, external-link, feather, frown, hash, headphones, help-circle, info, italic, key, layout, life-buoy, link-2, link, loader, lock, log-in, log-out, maximize, meh, minimize, minimize-2, minus-circle, minus-square, minus, monitor, moon, more-horizontal, more-vertical, move, music, navigation-2, navigation, octagon, pause-circle, percent, plus-circle, plus-square, plus, power, radio, rss, search, server, share, shopping-bag, sidebar, smartphone, smile, square, table-2, tablet, target, terminal, trash-2, trash, triangle, tv, type, upload, x-circle, x-octagon, x-square, x, zoom-in, zoom-out
+
+The MIT License (MIT) (for the icons listed above)
+
+Copyright (c) 2013-present Cole Bemis
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/mobile/assets/icons/lucide/bitcoin.svg b/mobile/assets/icons/lucide/bitcoin.svg
new file mode 100644
index 000000000..e7346fa37
--- /dev/null
+++ b/mobile/assets/icons/lucide/bitcoin.svg
@@ -0,0 +1,13 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M11.767 19.089c4.924.868 6.14-6.025 1.216-6.894m-1.216 6.894L5.86 18.047m5.908 1.042-.347 1.97m1.563-8.864c4.924.869 6.14-6.025 1.215-6.893m-1.215 6.893-3.94-.694m5.155-6.2L8.29 4.26m5.908 1.042.348-1.97M7.48 20.364l3.126-17.727" />
+</svg>
diff --git a/mobile/assets/icons/lucide/car.svg b/mobile/assets/icons/lucide/car.svg
new file mode 100644
index 000000000..c99feda01
--- /dev/null
+++ b/mobile/assets/icons/lucide/car.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M19 17h2c.6 0 1-.4 1-1v-3c0-.9-.7-1.7-1.5-1.9C18.7 10.6 16 10 16 10s-1.3-1.4-2.2-2.3c-.5-.4-1.1-.7-1.8-.7H5c-.6 0-1.1.4-1.4.9l-1.4 2.9A3.7 3.7 0 0 0 2 12v4c0 .6.4 1 1 1h2" />
+  <circle cx="7" cy="17" r="2" />
+  <path d="M9 17h6" />
+  <circle cx="17" cy="17" r="2" />
+</svg>
diff --git a/mobile/assets/icons/lucide/chevron-down.svg b/mobile/assets/icons/lucide/chevron-down.svg
new file mode 100644
index 000000000..e70d30b88
--- /dev/null
+++ b/mobile/assets/icons/lucide/chevron-down.svg
@@ -0,0 +1,13 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m6 9 6 6 6-6" />
+</svg>
diff --git a/mobile/assets/icons/lucide/chevron-right.svg b/mobile/assets/icons/lucide/chevron-right.svg
new file mode 100644
index 000000000..db62a0c20
--- /dev/null
+++ b/mobile/assets/icons/lucide/chevron-right.svg
@@ -0,0 +1,13 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m9 18 6-6-6-6" />
+</svg>
diff --git a/mobile/assets/icons/lucide/chevron-up.svg b/mobile/assets/icons/lucide/chevron-up.svg
new file mode 100644
index 000000000..b011f7721
--- /dev/null
+++ b/mobile/assets/icons/lucide/chevron-up.svg
@@ -0,0 +1,13 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m18 15-6-6-6 6" />
+</svg>
diff --git a/mobile/assets/icons/lucide/circle-alert.svg b/mobile/assets/icons/lucide/circle-alert.svg
new file mode 100644
index 000000000..578d25c02
--- /dev/null
+++ b/mobile/assets/icons/lucide/circle-alert.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="12" cy="12" r="10" />
+  <line x1="12" x2="12" y1="8" y2="12" />
+  <line x1="12" x2="12.01" y1="16" y2="16" />
+</svg>
diff --git a/mobile/assets/icons/lucide/circle-check.svg b/mobile/assets/icons/lucide/circle-check.svg
new file mode 100644
index 000000000..2690cda6d
--- /dev/null
+++ b/mobile/assets/icons/lucide/circle-check.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <circle cx="12" cy="12" r="10" />
+  <path d="m9 12 2 2 4-4" />
+</svg>
diff --git a/mobile/assets/icons/lucide/cloud-check.svg b/mobile/assets/icons/lucide/cloud-check.svg
new file mode 100644
index 000000000..636242219
--- /dev/null
+++ b/mobile/assets/icons/lucide/cloud-check.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="m17 15-5.5 5.5L9 18" />
+  <path d="M5.516 16.07A7 7 0 1 1 15.71 8h1.79a4.5 4.5 0 0 1 3.501 7.327" />
+</svg>
diff --git a/mobile/assets/icons/lucide/credit-card.svg b/mobile/assets/icons/lucide/credit-card.svg
new file mode 100644
index 000000000..f1476ca74
--- /dev/null
+++ b/mobile/assets/icons/lucide/credit-card.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <rect width="20" height="14" x="2" y="5" rx="2" />
+  <line x1="2" x2="22" y1="10" y2="10" />
+</svg>
diff --git a/mobile/assets/icons/lucide/hand-coins.svg b/mobile/assets/icons/lucide/hand-coins.svg
new file mode 100644
index 000000000..6751e8bdd
--- /dev/null
+++ b/mobile/assets/icons/lucide/hand-coins.svg
@@ -0,0 +1,17 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M11 15h2a2 2 0 1 0 0-4h-3c-.6 0-1.1.2-1.4.6L3 17" />
+  <path d="m7 21 1.6-1.4c.3-.4.8-.6 1.4-.6h4c1.1 0 2.1-.4 2.8-1.2l4.6-4.4a2 2 0 0 0-2.75-2.91l-4.2 3.9" />
+  <path d="m2 16 6 6" />
+  <circle cx="16" cy="9" r="2.9" />
+  <circle cx="6" cy="5" r="3" />
+</svg>
diff --git a/mobile/assets/icons/lucide/house.svg b/mobile/assets/icons/lucide/house.svg
new file mode 100644
index 000000000..10e4097e2
--- /dev/null
+++ b/mobile/assets/icons/lucide/house.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M15 21v-8a1 1 0 0 0-1-1h-4a1 1 0 0 0-1 1v8" />
+  <path d="M3 10a2 2 0 0 1 .709-1.528l7-6a2 2 0 0 1 2.582 0l7 6A2 2 0 0 1 21 10v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
+</svg>
diff --git a/mobile/assets/icons/lucide/landmark.svg b/mobile/assets/icons/lucide/landmark.svg
new file mode 100644
index 000000000..3836f84e6
--- /dev/null
+++ b/mobile/assets/icons/lucide/landmark.svg
@@ -0,0 +1,18 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M10 18v-7" />
+  <path d="M11.119 2.205a2 2 0 0 1 1.762 0l7.84 3.846A.5.5 0 0 1 20.5 7h-17a.5.5 0 0 1-.22-.949z" />
+  <path d="M14 18v-7" />
+  <path d="M18 18v-7" />
+  <path d="M3 22h18" />
+  <path d="M6 18v-7" />
+</svg>
diff --git a/mobile/assets/icons/lucide/receipt.svg b/mobile/assets/icons/lucide/receipt.svg
new file mode 100644
index 000000000..7d32f4ec9
--- /dev/null
+++ b/mobile/assets/icons/lucide/receipt.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M12 17V7" />
+  <path d="M16 8h-6a2 2 0 0 0 0 4h4a2 2 0 0 1 0 4H8" />
+  <path d="M4 3a1 1 0 0 1 1-1 1.3 1.3 0 0 1 .7.2l.933.6a1.3 1.3 0 0 0 1.4 0l.934-.6a1.3 1.3 0 0 1 1.4 0l.933.6a1.3 1.3 0 0 0 1.4 0l.933-.6a1.3 1.3 0 0 1 1.4 0l.934.6a1.3 1.3 0 0 0 1.4 0l.933-.6A1.3 1.3 0 0 1 19 2a1 1 0 0 1 1 1v18a1 1 0 0 1-1 1 1.3 1.3 0 0 1-.7-.2l-.933-.6a1.3 1.3 0 0 0-1.4 0l-.934.6a1.3 1.3 0 0 1-1.4 0l-.933-.6a1.3 1.3 0 0 0-1.4 0l-.933.6a1.3 1.3 0 0 1-1.4 0l-.934-.6a1.3 1.3 0 0 0-1.4 0l-.933.6a1.3 1.3 0 0 1-.7.2 1 1 0 0 1-1-1z" />
+</svg>
diff --git a/mobile/assets/icons/lucide/refresh-cw.svg b/mobile/assets/icons/lucide/refresh-cw.svg
new file mode 100644
index 000000000..c27b3a967
--- /dev/null
+++ b/mobile/assets/icons/lucide/refresh-cw.svg
@@ -0,0 +1,16 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8" />
+  <path d="M21 3v5h-5" />
+  <path d="M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16" />
+  <path d="M8 16H3v5" />
+</svg>
diff --git a/mobile/assets/icons/lucide/shapes.svg b/mobile/assets/icons/lucide/shapes.svg
new file mode 100644
index 000000000..cce512792
--- /dev/null
+++ b/mobile/assets/icons/lucide/shapes.svg
@@ -0,0 +1,15 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M8.3 10a.7.7 0 0 1-.626-1.079L11.4 3a.7.7 0 0 1 1.198-.043L16.3 8.9a.7.7 0 0 1-.572 1.1Z" />
+  <rect x="3" y="14" width="7" height="7" rx="1" />
+  <circle cx="17.5" cy="17.5" r="3.5" />
+</svg>
diff --git a/mobile/assets/icons/lucide/trending-down.svg b/mobile/assets/icons/lucide/trending-down.svg
new file mode 100644
index 000000000..2ec045a07
--- /dev/null
+++ b/mobile/assets/icons/lucide/trending-down.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M16 17h6v-6" />
+  <path d="m22 17-8.5-8.5-5 5L2 7" />
+</svg>
diff --git a/mobile/assets/icons/lucide/trending-up.svg b/mobile/assets/icons/lucide/trending-up.svg
new file mode 100644
index 000000000..2ff1fb202
--- /dev/null
+++ b/mobile/assets/icons/lucide/trending-up.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M16 7h6v6" />
+  <path d="m22 7-8.5 8.5-5-5L2 17" />
+</svg>
diff --git a/mobile/assets/icons/lucide/wallet.svg b/mobile/assets/icons/lucide/wallet.svg
new file mode 100644
index 000000000..9d63559bb
--- /dev/null
+++ b/mobile/assets/icons/lucide/wallet.svg
@@ -0,0 +1,14 @@
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M19 7V4a1 1 0 0 0-1-1H5a2 2 0 0 0 0 4h15a1 1 0 0 1 1 1v4h-3a2 2 0 0 0 0 4h3a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1" />
+  <path d="M3 5v14a2 2 0 0 0 2 2h15a1 1 0 0 0 1-1v-4" />
+</svg>
diff --git a/mobile/assets/images/logomark.svg b/mobile/assets/images/logomark.svg
index 80e043546..538a6fc43 100644
--- a/mobile/assets/images/logomark.svg
+++ b/mobile/assets/images/logomark.svg
@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 160 145" fill="none">
 <path d="M116.51 119.37C120.062 119.37 122.809 118.751 124.752 117.513C126.696 116.274 127.701 114.58 127.768 112.429L158.828 122.303C157.621 126.409 155.042 130.156 151.088 133.545C147.201 136.869 142.276 139.509 136.312 141.464C130.348 143.419 123.68 144.397 116.309 144.397C110.01 144.397 104.113 143.712 98.6179 142.344C93.19 140.975 88.3986 138.922 84.2439 136.185C80.1562 133.382 76.9397 129.896 74.5943 125.725C72.2489 121.553 71.0762 116.698 71.0762 111.158C71.0762 105.618 72.2489 100.763 74.5943 96.5919C76.9397 92.4208 80.1562 88.9666 84.2439 86.2293C88.3986 83.4268 93.2234 81.3412 98.7184 79.9726C104.213 78.6039 110.077 77.9196 116.309 77.9196C122.675 77.9196 128.505 78.6039 133.799 79.9726C139.16 81.3412 143.75 83.4594 147.57 86.327C151.456 89.1295 154.438 92.714 156.516 97.0807C158.66 101.382 159.732 106.498 159.732 112.429H104.95C104.95 112.429 104.917 112.429 104.85 112.429C104.85 112.429 104.85 112.462 104.85 112.527C104.85 113.504 105.118 114.417 105.654 115.264C106.19 116.111 106.927 116.861 107.865 117.513C108.871 118.099 110.077 118.555 111.484 118.881C112.958 119.207 114.634 119.37 116.51 119.37ZM116.309 102.653C113.025 102.653 110.311 103.24 108.167 104.413C106.023 105.521 104.95 107.117 104.95 109.203C104.95 109.268 104.95 109.333 104.95 109.399C105.017 109.399 105.051 109.399 105.051 109.399H127.466C127.533 109.399 127.567 109.399 127.567 109.399C127.567 109.333 127.567 109.268 127.567 109.203C127.567 108.16 127.265 107.248 126.662 106.466C126.126 105.618 125.355 104.934 124.35 104.413C123.345 103.826 122.139 103.403 120.732 103.142C119.391 102.816 117.917 102.653 116.309 102.653Z" fill="#62a446"/>
 <path d="M37.5666 81.9011C37.5666 85.8115 37.5666 89.7546 37.5666 93.7301C37.5666 97.6406 37.5666 101.584 37.5666 105.559C37.5666 109.47 37.5666 113.413 37.5666 117.388C37.5666 121.559 37.5666 125.73 37.5666 129.902C37.5666 134.073 37.5666 138.276 37.5666 142.513H2.74774C2.74774 136.06 2.74774 129.608 2.74774 123.156C2.74774 116.704 2.74774 110.252 2.74774 103.799C2.74774 100.15 2.74774 96.5 2.74774 92.8503C2.74774 89.2006 2.74774 85.5508 2.74774 81.9011H37.5666ZM37.466 119.246L42.9001 92.9481C43.5039 90.1456 44.678 87.8319 46.4222 86.0071C48.2336 84.117 50.3469 82.6832 52.7621 81.7056C55.1773 80.728 57.6596 80.1414 60.2089 79.9459C62.7583 79.6852 65.1063 79.783 67.2532 80.2392C69.4 80.6302 71.1108 81.3146 72.3854 82.2922L64.7374 118.659C62.7918 117.095 60.4102 116.02 57.5925 115.433C54.8418 114.846 52.0577 114.651 49.24 114.846C46.4223 114.977 43.94 115.433 41.7932 116.215C39.6463 116.997 38.2039 118.007 37.466 119.246Z" fill="#61a446"/>
-<path d="M155.301 0.291725C155.301 4.65836 155.301 20.0576 155.301 24.4894C155.301 28.9212 155.301 33.353 155.301 37.7848C155.301 41.5649 155.301 45.3776 155.301 49.2228C155.301 53.0029 155.301 56.783 155.301 60.563C155.301 64.3431 155.301 68.1232 155.301 71.9033H121.476C121.476 69.166 121.476 66.3961 121.476 63.5936C121.476 60.7912 121.476 57.9887 121.476 55.1862C121.476 52.3186 121.476 49.5487 121.476 46.8766C121.476 40.8154 121.476 34.8846 121.476 29.0841C121.476 23.2185 121.476 6.28771 121.476 0.291725H155.301ZM111.113 5.29173C111.113 8.74593 111.113 18.2327 111.113 21.7521C111.113 25.2063 111.113 28.6605 111.113 32.1147C111.113 35.5689 111.113 39.0557 111.113 42.5751C111.113 44.0089 111.341 45.182 111.798 46.0945C112.319 46.9417 112.971 47.5609 113.753 47.9519C114.6 48.2778 115.48 48.4407 116.392 48.4407C117.305 48.4407 118.217 48.2778 119.13 47.9519C120.107 47.6261 120.889 47.235 121.476 46.7788L113.655 70.9257C111.83 71.8381 109.582 72.5876 106.909 73.1742C104.303 73.7607 101.565 74.054 98.6976 74.054C96.0906 74.054 93.5163 73.7281 90.9745 73.0764C88.4327 72.4898 86.1191 71.4796 84.0335 70.0458C82.0131 68.612 80.3838 66.722 79.1455 64.3757C77.9072 62.0295 77.288 59.0966 77.288 55.5773C77.288 50.8848 77.288 46.1922 77.288 41.4997C77.288 36.8072 77.288 32.1147 77.288 27.4222C77.288 24.7501 77.288 22.078 77.288 19.4058C77.288 16.6686 77.288 7.96384 77.288 5.29173H111.113Z" fill="grey"/>
-<path d="M0.698853 30.6484C0.698853 26.9335 1.74163 23.7074 3.82719 20.9701C5.97792 18.2328 8.87815 15.9517 12.5279 14.1269C16.1776 12.2368 20.3161 10.8356 24.9435 9.92315C29.5708 9.01072 34.3937 8.5545 39.412 8.5545C45.6035 8.5545 51.3388 9.10848 56.6179 10.2164C61.9621 11.3244 66.785 12.7908 71.0864 14.6157V37.2961C69.2616 35.9275 66.8502 34.7543 63.8522 33.7767C60.9194 32.7991 57.791 32.0496 54.4672 31.5282C51.2085 31.0068 48.1127 30.7461 45.1799 30.7461C43.2247 30.7461 41.4324 30.8765 39.8031 31.1372C38.2389 31.3327 36.968 31.6586 35.9904 32.1148C35.078 32.571 34.6218 33.1576 34.6218 33.8745C34.6218 34.2655 34.7521 34.5588 35.0128 34.7543C35.3387 34.9499 35.7949 35.0802 36.3815 35.1454C36.968 35.2105 37.7175 35.2431 38.63 35.2431C40.1289 35.2431 41.465 35.2431 42.6381 35.2431C43.8113 35.2431 45.1147 35.2431 46.5486 35.2431C49.8072 35.2431 53.0659 35.4712 56.3246 35.9275C59.6485 36.3185 62.6465 37.1332 65.3186 38.3715C68.0559 39.6098 70.2392 41.402 71.8685 43.7483C73.4979 46.0294 74.3125 49.06 74.3125 52.84C74.3125 56.8156 73.2046 60.2047 70.9887 63.0071C68.838 65.7444 65.8726 67.9929 62.0925 69.7526C58.3776 71.4471 54.1739 72.6854 49.4814 73.4675C44.854 74.2496 40.0312 74.6406 35.0128 74.6406C29.082 74.6406 23.2164 74.0867 17.4159 72.9787C11.6806 71.8708 6.76001 70.2414 2.65406 68.0907V44.2371C4.28341 45.9968 6.59707 47.4632 9.59506 48.6363C12.6582 49.7443 15.9495 50.5915 19.4689 51.1781C23.0534 51.6995 26.4099 51.9602 29.5382 51.9602C31.5586 51.9602 33.3835 51.8624 35.0128 51.6669C36.6421 51.4062 37.913 51.0478 38.8255 50.5915C39.8031 50.0701 40.2919 49.4184 40.2919 48.6363C40.2919 48.3105 40.1941 48.0823 39.9986 47.952C39.8031 47.8217 39.4772 47.7239 39.021 47.6587C38.63 47.5936 38.076 47.561 37.3591 47.561C36.3815 47.561 35.3713 47.561 34.3285 47.561C33.2857 47.561 32.3407 47.561 31.4934 47.561C29.2123 47.561 26.6706 47.4958 23.8681 47.3654C21.1308 47.1699 18.3935 46.8115 15.6562 46.2901C12.9189 45.7035 10.4097 44.8237 8.12865 43.6505C5.91275 42.4122 4.12047 40.7503 2.75182 38.6648C1.38318 36.514 0.698853 33.8419 0.698853 30.6484Z" fill="grey"/>
+<path d="M155.301 0.291725C155.301 4.65836 155.301 20.0576 155.301 24.4894C155.301 28.9212 155.301 33.353 155.301 37.7848C155.301 41.5649 155.301 45.3776 155.301 49.2228C155.301 53.0029 155.301 56.783 155.301 60.563C155.301 64.3431 155.301 68.1232 155.301 71.9033H121.476C121.476 69.166 121.476 66.3961 121.476 63.5936C121.476 60.7912 121.476 57.9887 121.476 55.1862C121.476 52.3186 121.476 49.5487 121.476 46.8766C121.476 40.8154 121.476 34.8846 121.476 29.0841C121.476 23.2185 121.476 6.28771 121.476 0.291725H155.301ZM111.113 5.29173C111.113 8.74593 111.113 18.2327 111.113 21.7521C111.113 25.2063 111.113 28.6605 111.113 32.1147C111.113 35.5689 111.113 39.0557 111.113 42.5751C111.113 44.0089 111.341 45.182 111.798 46.0945C112.319 46.9417 112.971 47.5609 113.753 47.9519C114.6 48.2778 115.48 48.4407 116.392 48.4407C117.305 48.4407 118.217 48.2778 119.13 47.9519C120.107 47.6261 120.889 47.235 121.476 46.7788L113.655 70.9257C111.83 71.8381 109.582 72.5876 106.909 73.1742C104.303 73.7607 101.565 74.054 98.6976 74.054C96.0906 74.054 93.5163 73.7281 90.9745 73.0764C88.4327 72.4898 86.1191 71.4796 84.0335 70.0458C82.0131 68.612 80.3838 66.722 79.1455 64.3757C77.9072 62.0295 77.288 59.0966 77.288 55.5773C77.288 50.8848 77.288 46.1922 77.288 41.4997C77.288 36.8072 77.288 32.1147 77.288 27.4222C77.288 24.7501 77.288 22.078 77.288 19.4058C77.288 16.6686 77.288 7.96384 77.288 5.29173H111.113Z" fill="currentColor"/>
+<path d="M0.698853 30.6484C0.698853 26.9335 1.74163 23.7074 3.82719 20.9701C5.97792 18.2328 8.87815 15.9517 12.5279 14.1269C16.1776 12.2368 20.3161 10.8356 24.9435 9.92315C29.5708 9.01072 34.3937 8.5545 39.412 8.5545C45.6035 8.5545 51.3388 9.10848 56.6179 10.2164C61.9621 11.3244 66.785 12.7908 71.0864 14.6157V37.2961C69.2616 35.9275 66.8502 34.7543 63.8522 33.7767C60.9194 32.7991 57.791 32.0496 54.4672 31.5282C51.2085 31.0068 48.1127 30.7461 45.1799 30.7461C43.2247 30.7461 41.4324 30.8765 39.8031 31.1372C38.2389 31.3327 36.968 31.6586 35.9904 32.1148C35.078 32.571 34.6218 33.1576 34.6218 33.8745C34.6218 34.2655 34.7521 34.5588 35.0128 34.7543C35.3387 34.9499 35.7949 35.0802 36.3815 35.1454C36.968 35.2105 37.7175 35.2431 38.63 35.2431C40.1289 35.2431 41.465 35.2431 42.6381 35.2431C43.8113 35.2431 45.1147 35.2431 46.5486 35.2431C49.8072 35.2431 53.0659 35.4712 56.3246 35.9275C59.6485 36.3185 62.6465 37.1332 65.3186 38.3715C68.0559 39.6098 70.2392 41.402 71.8685 43.7483C73.4979 46.0294 74.3125 49.06 74.3125 52.84C74.3125 56.8156 73.2046 60.2047 70.9887 63.0071C68.838 65.7444 65.8726 67.9929 62.0925 69.7526C58.3776 71.4471 54.1739 72.6854 49.4814 73.4675C44.854 74.2496 40.0312 74.6406 35.0128 74.6406C29.082 74.6406 23.2164 74.0867 17.4159 72.9787C11.6806 71.8708 6.76001 70.2414 2.65406 68.0907V44.2371C4.28341 45.9968 6.59707 47.4632 9.59506 48.6363C12.6582 49.7443 15.9495 50.5915 19.4689 51.1781C23.0534 51.6995 26.4099 51.9602 29.5382 51.9602C31.5586 51.9602 33.3835 51.8624 35.0128 51.6669C36.6421 51.4062 37.913 51.0478 38.8255 50.5915C39.8031 50.0701 40.2919 49.4184 40.2919 48.6363C40.2919 48.3105 40.1941 48.0823 39.9986 47.952C39.8031 47.8217 39.4772 47.7239 39.021 47.6587C38.63 47.5936 38.076 47.561 37.3591 47.561C36.3815 47.561 35.3713 47.561 34.3285 47.561C33.2857 47.561 32.3407 47.561 31.4934 47.561C29.2123 47.561 26.6706 47.4958 23.8681 47.3654C21.1308 47.1699 18.3935 46.8115 15.6562 46.2901C12.9189 45.7035 10.4097 44.8237 8.12865 43.6505C5.91275 42.4122 4.12047 40.7503 2.75182 38.6648C1.38318 36.514 0.698853 33.8419 0.698853 30.6484Z" fill="currentColor"/>
 </svg>
diff --git a/mobile/ios/Runner/GeneratedPluginRegistrant.m b/mobile/ios/Runner/GeneratedPluginRegistrant.m
index 67307bbf3..d33d0bda0 100644
--- a/mobile/ios/Runner/GeneratedPluginRegistrant.m
+++ b/mobile/ios/Runner/GeneratedPluginRegistrant.m
@@ -42,6 +42,12 @@
 @import path_provider_foundation;
 #endif
 
+#if __has_include(<sentry_flutter/SentryFlutterPlugin.h>)
+#import <sentry_flutter/SentryFlutterPlugin.h>
+#else
+@import sentry_flutter;
+#endif
+
 #if __has_include(<shared_preferences_foundation/SharedPreferencesPlugin.h>)
 #import <shared_preferences_foundation/SharedPreferencesPlugin.h>
 #else
@@ -60,12 +66,6 @@
 @import url_launcher_ios;
 #endif
 
-#if __has_include(<webview_flutter_wkwebview/WebViewFlutterPlugin.h>)
-#import <webview_flutter_wkwebview/WebViewFlutterPlugin.h>
-#else
-@import webview_flutter_wkwebview;
-#endif
-
 @implementation GeneratedPluginRegistrant
 
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
@@ -75,10 +75,10 @@
   [LocalAuthPlugin registerWithRegistrar:[registry registrarForPlugin:@"LocalAuthPlugin"]];
   [FPPPackageInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FPPPackageInfoPlusPlugin"]];
   [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]];
+  [SentryFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"SentryFlutterPlugin"]];
   [SharedPreferencesPlugin registerWithRegistrar:[registry registrarForPlugin:@"SharedPreferencesPlugin"]];
   [SqflitePlugin registerWithRegistrar:[registry registrarForPlugin:@"SqflitePlugin"]];
   [URLLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"URLLauncherPlugin"]];
-  [WebViewFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"WebViewFlutterPlugin"]];
 }
 
 @end
diff --git a/mobile/l10n.yaml b/mobile/l10n.yaml
new file mode 100644
index 000000000..a4d323c62
--- /dev/null
+++ b/mobile/l10n.yaml
@@ -0,0 +1,5 @@
+arb-dir: lib/l10n
+template-arb-file: app_en.arb
+output-localization-file: app_localizations.dart
+output-class: AppLocalizations
+nullable-getter: false
diff --git a/mobile/lib/constants/suggested_questions.dart b/mobile/lib/constants/suggested_questions.dart
index 818be7652..0a75e6df3 100644
--- a/mobile/lib/constants/suggested_questions.dart
+++ b/mobile/lib/constants/suggested_questions.dart
@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
+import '../l10n/app_localizations.dart';
 
 /// Suggested questions shown on the empty chat screen.
-///
-/// l10n upgrade path: when Flutter localisation is added to the mobile app,
-/// replace this const list with a function that accepts [BuildContext] and
-/// returns localised strings via AppLocalizations. The call site in
-/// _EmptyState requires only a one-line change.
-const List<({IconData icon, String text})> suggestedQuestions = [
-  (icon: Icons.account_balance_wallet_outlined, text: 'What is my current net worth?'),
-  (icon: Icons.show_chart,                      text: 'How has my spending changed this month?'),
-  (icon: Icons.savings_outlined,                text: 'How can I improve my savings rate?'),
-  (icon: Icons.receipt_long_outlined,           text: 'What are my biggest expenses lately?'),
-];
+List<({IconData icon, String text})> suggestedQuestions(BuildContext context) {
+  final l = AppLocalizations.of(context);
+  return [
+    (icon: Icons.account_balance_wallet_outlined, text: l.chatSuggestionNetWorth),
+    (icon: Icons.show_chart,                      text: l.chatSuggestionSpending),
+    (icon: Icons.savings_outlined,                text: l.chatSuggestionSavings),
+    (icon: Icons.receipt_long_outlined,           text: l.chatSuggestionExpenses),
+  ];
+}
diff --git a/mobile/lib/l10n/app_en.arb b/mobile/lib/l10n/app_en.arb
new file mode 100644
index 000000000..68187912f
--- /dev/null
+++ b/mobile/lib/l10n/app_en.arb
@@ -0,0 +1,978 @@
+{
+  "@@locale": "en",
+
+  "appTitle": "Sure Finances",
+  "@appTitle": { "description": "Application title shown in the OS task switcher." },
+
+  "commonCancel": "Cancel",
+  "@commonCancel": { "description": "Generic cancel action label." },
+
+  "commonSave": "Save",
+  "@commonSave": { "description": "Generic save/confirm action label." },
+
+  "commonTryAgain": "Try Again",
+  "@commonTryAgain": { "description": "Generic retry action label." },
+
+  "commonDelete": "Delete",
+  "@commonDelete": { "description": "Generic delete action label." },
+
+  "commonAll": "All",
+  "@commonAll": { "description": "Label for the 'All' filter chip (currency filter, category filter, etc.)." },
+
+  "commonRefresh": "Refresh",
+  "@commonRefresh": { "description": "Generic refresh action label." },
+
+  "commonClose": "Close",
+  "@commonClose": { "description": "Generic close/dismiss action label." },
+
+  "commonUndo": "Undo",
+  "@commonUndo": { "description": "Generic undo action label." },
+
+  "chatSuggestionNetWorth": "What is my current net worth?",
+  "@chatSuggestionNetWorth": { "description": "Suggested chat prompt on the empty assistant screen." },
+
+  "chatSuggestionSpending": "How has my spending changed this month?",
+  "@chatSuggestionSpending": { "description": "Suggested chat prompt on the empty assistant screen." },
+
+  "chatSuggestionSavings": "How can I improve my savings rate?",
+  "@chatSuggestionSavings": { "description": "Suggested chat prompt on the empty assistant screen." },
+
+  "chatSuggestionExpenses": "What are my biggest expenses lately?",
+  "@chatSuggestionExpenses": { "description": "Suggested chat prompt on the empty assistant screen." },
+
+  "loginEmailLabel": "Email",
+  "@loginEmailLabel": { "description": "Label for the email text field on the login screen." },
+
+  "loginEmailRequired": "Email is required",
+  "@loginEmailRequired": { "description": "Validation error when email field is empty." },
+
+  "loginEmailInvalid": "Please enter a valid email",
+  "@loginEmailInvalid": { "description": "Validation error when email format is invalid." },
+
+  "loginPasswordLabel": "Password",
+  "@loginPasswordLabel": { "description": "Label for the password field on the login screen." },
+
+  "loginPasswordRequired": "Password is required",
+  "@loginPasswordRequired": { "description": "Validation error when password field is empty." },
+
+  "loginSignIn": "Sign in",
+  "@loginSignIn": { "description": "Primary sign-in button label." },
+
+  "loginSignInWithGoogle": "Sign in with Google",
+  "@loginSignInWithGoogle": { "description": "Google SSO button label." },
+
+  "loginMfaLabel": "Authentication Code",
+  "@loginMfaLabel": { "description": "Label for the MFA code input field." },
+
+  "loginApiKeyLabel": "API Key",
+  "@loginApiKeyLabel": { "description": "Label for the API key input field." },
+
+  "navHome": "Home",
+  "@navHome": { "description": "Bottom navigation label for the Home (dashboard) tab." },
+
+  "navIntro": "Intro",
+  "@navIntro": { "description": "Bottom navigation label for the Intro tab." },
+
+  "navAssistant": "Assistant",
+  "@navAssistant": { "description": "Bottom navigation label for the AI assistant tab." },
+
+  "navMore": "More",
+  "@navMore": { "description": "Bottom navigation label for the More tab." },
+
+  "dashboardSyncError": "Sync failed",
+  "@dashboardSyncError": { "description": "Snackbar message when a sync attempt fails." },
+
+  "dashboardSyncFailed": "Sync failed. Please try again.",
+  "@dashboardSyncFailed": { "description": "Snackbar message when a sync attempt fails with retry instruction." },
+
+  "dashboardRefreshing": "Refreshing accounts…",
+  "@dashboardRefreshing": { "description": "Snackbar message while accounts are being refreshed after a transaction." },
+
+  "dashboardAccountsUpdated": "Accounts updated",
+  "@dashboardAccountsUpdated": { "description": "Snackbar message shown after accounts refresh completes." },
+
+  "dashboardSyncing": "Syncing data from server…",
+  "@dashboardSyncing": { "description": "Snackbar message while sync is in progress." },
+
+  "dashboardSynced": "Synced",
+  "@dashboardSynced": { "description": "Label shown in the sync status indicator after a successful sync." },
+
+  "dashboardErrorLoadingAccounts": "Failed to load accounts",
+  "@dashboardErrorLoadingAccounts": { "description": "Error state message when accounts fail to load." },
+
+  "dashboardNoAccounts": "No accounts yet",
+  "@dashboardNoAccounts": { "description": "Empty state message when no accounts exist." },
+
+  "dashboardNoAccountsSubtitle": "Add accounts in the web app to see them here.",
+  "@dashboardNoAccountsSubtitle": { "description": "Empty state subtitle when no accounts exist." },
+
+  "dashboardFilterEmpty": "No accounts match the current filter",
+  "@dashboardFilterEmpty": { "description": "Empty state when the active account filter returns no results." },
+
+  "chatListTitle": "Chats",
+  "@chatListTitle": { "description": "Title for the chat list screen / app bar." },
+
+  "chatListNewChat": "New chat",
+  "@chatListNewChat": { "description": "FAB tooltip for creating a new chat." },
+
+  "chatListEmpty": "No chats yet",
+  "@chatListEmpty": { "description": "Empty-state heading on the chat list screen." },
+
+  "chatListEmptySubtitle": "Start a conversation with your AI assistant",
+  "@chatListEmptySubtitle": { "description": "Empty-state subtitle on the chat list screen." },
+
+  "chatListDeleteTitle": "Delete Chat",
+  "@chatListDeleteTitle": { "description": "Title for the delete-chat confirmation dialog." },
+
+  "chatConversationNewTitle": "New Conversation",
+  "@chatConversationNewTitle": { "description": "Placeholder title for a new conversation before it is saved." },
+
+  "chatConversationMessageHint": "Ask anything about your finances…",
+  "@chatConversationMessageHint": { "description": "Hint text inside the chat message input field." },
+
+  "chatConversationGreetingWithName": "Hi {firstName}, how can I help?",
+  "@chatConversationGreetingWithName": {
+    "description": "Greeting shown in a new conversation when the user's first name is known.",
+    "placeholders": { "firstName": { "type": "String" } }
+  },
+
+  "chatConversationGreetingNoName": "Hi there, how can I help?",
+  "@chatConversationGreetingNoName": { "description": "Greeting shown in a new conversation when the user's first name is not available." },
+
+  "transactionFormNewTitle": "New Transaction",
+  "@transactionFormNewTitle": { "description": "App bar title for the new-transaction form." },
+
+  "transactionFormTypeLabel": "Type",
+  "@transactionFormTypeLabel": { "description": "Label for the transaction type segmented control." },
+
+  "transactionFormTypeExpense": "Expense",
+  "@transactionFormTypeExpense": { "description": "Segment label for an expense transaction." },
+
+  "transactionFormTypeIncome": "Income",
+  "@transactionFormTypeIncome": { "description": "Segment label for an income transaction." },
+
+  "transactionFormAmountLabel": "Amount",
+  "@transactionFormAmountLabel": { "description": "Label for the amount input field." },
+
+  "transactionFormAmountRequired": "Amount is required",
+  "@transactionFormAmountRequired": { "description": "Validation error when amount is empty." },
+
+  "transactionFormAmountInvalid": "Please enter a valid amount",
+  "@transactionFormAmountInvalid": { "description": "Validation error when amount is not a number." },
+
+  "transactionFormDateLabel": "Date",
+  "@transactionFormDateLabel": { "description": "Label for the date picker field." },
+
+  "transactionFormNameLabel": "Name",
+  "@transactionFormNameLabel": { "description": "Label for the transaction name/payee field." },
+
+  "transactionFormCategoryLabel": "Category",
+  "@transactionFormCategoryLabel": { "description": "Label for the category picker field." },
+
+  "transactionEditTitle": "Edit Transaction",
+  "@transactionEditTitle": { "description": "App bar title for the edit-transaction screen." },
+
+  "transactionEditNameLabel": "Name",
+  "@transactionEditNameLabel": { "description": "Label for the name field in the edit form." },
+
+  "transactionEditNameRequired": "Name is required",
+  "@transactionEditNameRequired": { "description": "Validation error when name is empty in edit form." },
+
+  "transactionEditNotesLabel": "Notes",
+  "@transactionEditNotesLabel": { "description": "Label for the notes field in the edit form." },
+
+  "transactionEditCategoryLabel": "Category",
+  "@transactionEditCategoryLabel": { "description": "Label for the category field in the edit form." },
+
+  "transactionEditMerchantLabel": "Merchant",
+  "@transactionEditMerchantLabel": { "description": "Label for the merchant field in the edit form." },
+
+  "transactionEditTagsLabel": "Tags",
+  "@transactionEditTagsLabel": { "description": "Label for the tags field in the edit form." },
+
+  "transactionEditSaving": "Saving…",
+  "@transactionEditSaving": { "description": "In-progress label shown on the save button while saving." },
+
+  "transactionsListDeleteTitle": "Delete Transaction",
+  "@transactionsListDeleteTitle": { "description": "Title for the single-transaction delete confirmation dialog." },
+
+  "transactionsListDeleteSingleContent": "Are you sure you want to delete \"{name}\"?",
+  "@transactionsListDeleteSingleContent": {
+    "description": "Body of the delete confirmation dialog for a named transaction.",
+    "placeholders": { "name": { "type": "String" } }
+  },
+
+  "transactionsListDeleteMultiTitle": "Delete Transactions",
+  "@transactionsListDeleteMultiTitle": { "description": "Title for the multi-transaction delete confirmation dialog." },
+
+  "transactionsListDeleteMultiContent": "Are you sure you want to delete the selected transactions?",
+  "@transactionsListDeleteMultiContent": { "description": "Body of the multi-transaction delete confirmation dialog." },
+
+  "transactionsListEmpty": "No transactions",
+  "@transactionsListEmpty": { "description": "Empty-state message when no transactions exist." },
+
+  "transactionsListAuthFailed": "Authentication failed: Please log in again",
+  "@transactionsListAuthFailed": { "description": "Snackbar message when the API returns an auth failure." },
+
+  "transactionsListNoTransactionsYet": "No transactions yet",
+  "@transactionsListNoTransactionsYet": { "description": "Empty-state heading when an account has no transactions." },
+
+  "transactionsListEmptyAddFirst": "Tap + to add your first transaction",
+  "@transactionsListEmptyAddFirst": { "description": "Empty-state subtitle prompting the user to add their first transaction." },
+
+  "transactionsListNoCategoryMatch": "No transactions match this category",
+  "@transactionsListNoCategoryMatch": { "description": "Empty state shown when category filter returns no transactions." },
+
+  "transactionsListRetry": "Retry",
+  "@transactionsListRetry": { "description": "Button label on the transactions error state." },
+
+  "transactionsListDeletedSuccess": "Transaction deleted",
+  "@transactionsListDeletedSuccess": { "description": "Snackbar after a single transaction is deleted." },
+
+  "transactionsListSingleDeleteFailed": "Failed to delete transaction",
+  "@transactionsListSingleDeleteFailed": { "description": "Snackbar when deleting a single transaction fails." },
+
+  "transactionsListDeletedMulti": "{count, plural, one{Deleted {count} transaction} other{Deleted {count} transactions}}",
+  "@transactionsListDeletedMulti": {
+    "description": "Snackbar message after multiple transactions are deleted.",
+    "placeholders": { "count": { "type": "int" } }
+  },
+
+  "transactionsListDeleteFailed": "Failed to delete transactions",
+  "@transactionsListDeleteFailed": { "description": "Snackbar when multi-delete fails." },
+
+  "transactionsListDeleteNoToken": "Failed to delete: No access token",
+  "@transactionsListDeleteNoToken": { "description": "Snackbar when delete fails due to missing token." },
+
+  "transactionsListUndoTitle": "Undo Transaction",
+  "@transactionsListUndoTitle": { "description": "Title for the undo-transaction dialog." },
+
+  "transactionsListUndoRemovePending": "Remove this pending transaction?",
+  "@transactionsListUndoRemovePending": { "description": "Confirmation question for removing a pending transaction." },
+
+  "transactionsListUndoRestoreConfirm": "Restore this transaction?",
+  "@transactionsListUndoRestoreConfirm": { "description": "Confirmation question for restoring a transaction." },
+
+  "transactionsListUndoPendingRemoved": "Pending transaction removed",
+  "@transactionsListUndoPendingRemoved": { "description": "Snackbar after a pending transaction is removed." },
+
+  "transactionsListUndoRestored": "Transaction restored",
+  "@transactionsListUndoRestored": { "description": "Snackbar after a transaction is restored." },
+
+  "transactionsListUndoFailed": "Failed to undo transaction",
+  "@transactionsListUndoFailed": { "description": "Snackbar when undoing a transaction fails." },
+
+  "settingsSectionDisplay": "Display",
+  "@settingsSectionDisplay": { "description": "Settings section header for display/appearance options." },
+
+  "settingsSectionConnection": "Connection",
+  "@settingsSectionConnection": { "description": "Settings section header for server/connection options." },
+
+  "settingsSectionDataManagement": "Data Management",
+  "@settingsSectionDataManagement": { "description": "Settings section header for data import/export options." },
+
+  "settingsSectionSecurity": "Security",
+  "@settingsSectionSecurity": { "description": "Settings section header for security options." },
+
+  "settingsSectionDangerZone": "Danger Zone",
+  "@settingsSectionDangerZone": { "description": "Settings section header for destructive actions." },
+
+  "settingsThemeLabel": "Theme",
+  "@settingsThemeLabel": { "description": "Label for the theme picker setting." },
+
+  "settingsThemeSystem": "System",
+  "@settingsThemeSystem": { "description": "Theme option: follow system setting." },
+
+  "settingsThemeLight": "Light",
+  "@settingsThemeLight": { "description": "Theme option: light mode." },
+
+  "settingsThemeDark": "Dark",
+  "@settingsThemeDark": { "description": "Theme option: dark mode." },
+
+  "settingsProxyHeadersLabel": "Custom Proxy Headers",
+  "@settingsProxyHeadersLabel": { "description": "Label for the custom proxy headers setting." },
+
+  "settingsPrivacyHideAmountsLabel": "Hide amounts",
+  "@settingsPrivacyHideAmountsLabel": { "description": "Label for the toggle that masks monetary amounts across the app." },
+
+  "settingsPrivacyHideAmountsContent": "Mask money values across the app",
+  "@settingsPrivacyHideAmountsContent": { "description": "Subtitle describing the hide-amounts toggle." },
+
+  "settingsBiometricLabel": "Biometric Lock",
+  "@settingsBiometricLabel": { "description": "Label for the biometric lock toggle." },
+
+  "settingsBiometricEnable": "Enable biometric lock?",
+  "@settingsBiometricEnable": { "description": "Title of the dialog to enable biometric lock." },
+
+  "settingsBiometricEnableContent": "Require biometric authentication when resuming the app.",
+  "@settingsBiometricEnableContent": { "description": "Body text of the enable-biometric dialog." },
+
+  "settingsCheckForUpdates": "Check for Updates",
+  "@settingsCheckForUpdates": { "description": "Label for the check-for-updates action." },
+
+  "settingsUpdateAvailableTitle": "Update Available",
+  "@settingsUpdateAvailableTitle": { "description": "Title for the update-available dialog." },
+
+  "settingsUpdateAvailableContent": "Version {version} is available. Update now?",
+  "@settingsUpdateAvailableContent": {
+    "description": "Body text for the update-available dialog.",
+    "placeholders": { "version": { "type": "String" } }
+  },
+
+  "settingsUpdateNewerVersionFallback": "a newer version",
+  "@settingsUpdateNewerVersionFallback": { "description": "Fallback used in the update-available dialog when the store version number is unknown (e.g. 'Version a newer version is available')." },
+
+  "settingsUpdateNow": "Update Now",
+  "@settingsUpdateNow": { "description": "Confirm button in the update-available dialog." },
+
+  "settingsNoUpdateAvailable": "You're on the latest version.",
+  "@settingsNoUpdateAvailable": { "description": "Snackbar when no update is available." },
+
+  "settingsUpdateError": "Could not check for updates.",
+  "@settingsUpdateError": { "description": "Snackbar when the update check fails." },
+
+  "settingsClearDataTitle": "Clear All Data",
+  "@settingsClearDataTitle": { "description": "Title for the clear-all-data confirmation dialog." },
+
+  "settingsClearDataContent": "This will remove all locally cached data. Your data on the server will not be affected.",
+  "@settingsClearDataContent": { "description": "Body text for the clear-all-data dialog." },
+
+  "settingsClearData": "Clear Data",
+  "@settingsClearData": { "description": "Confirm button in the clear-data dialog." },
+
+  "settingsClearDataSuccess": "Local data cleared",
+  "@settingsClearDataSuccess": { "description": "Snackbar after local data is cleared." },
+
+  "settingsDeleteAccountTitle": "Delete Account",
+  "@settingsDeleteAccountTitle": { "description": "Title for the delete-account confirmation dialog." },
+
+  "settingsDeleteAccount": "Delete Account",
+  "@settingsDeleteAccount": { "description": "Confirm button in the delete-account dialog." },
+
+  "settingsSignOutTitle": "Sign Out",
+  "@settingsSignOutTitle": { "description": "Title for the sign-out confirmation dialog." },
+
+  "settingsSignOutContent": "Are you sure you want to sign out?",
+  "@settingsSignOutContent": { "description": "Body text for the sign-out dialog." },
+
+  "settingsSignOut": "Sign Out",
+  "@settingsSignOut": { "description": "Confirm button in the sign-out dialog and settings list tile label." },
+
+  "settingsDebugLogs": "Debug Logs",
+  "@settingsDebugLogs": { "description": "Label for the debug logs navigation tile." },
+
+  "ssoOnboardingTitle": "Link Your Account",
+  "@ssoOnboardingTitle": { "description": "App bar title for the SSO onboarding screen." },
+
+  "ssoOnboardingTabLink": "Link existing",
+  "@ssoOnboardingTabLink": { "description": "Tab label for linking an existing Sure account via SSO." },
+
+  "ssoOnboardingTabCreate": "Create new",
+  "@ssoOnboardingTabCreate": { "description": "Tab label for creating a new Sure account via SSO." },
+
+  "ssoOnboardingFirstNameLabel": "First Name",
+  "@ssoOnboardingFirstNameLabel": { "description": "Label for the first-name field on the SSO onboarding screen." },
+
+  "ssoOnboardingLastNameLabel": "Last Name",
+  "@ssoOnboardingLastNameLabel": { "description": "Label for the last-name field on the SSO onboarding screen." },
+
+  "ssoOnboardingLinkButton": "Link Account",
+  "@ssoOnboardingLinkButton": { "description": "Button label to link an existing account." },
+
+  "ssoOnboardingCreateButton": "Create Account",
+  "@ssoOnboardingCreateButton": { "description": "Button label to create a new account." },
+
+  "ssoOnboardingAcceptInvitation": "Accept Invitation",
+  "@ssoOnboardingAcceptInvitation": { "description": "Tab and submit button label when the user has a pending household invitation to accept." },
+
+  "calendarTitle": "Account Calendar",
+  "@calendarTitle": { "description": "App bar title for the account calendar screen." },
+
+  "calendarAccountTypeSection": "Account Type",
+  "@calendarAccountTypeSection": { "description": "Section header for the account-type selector on the calendar screen." },
+
+  "calendarSegmentAssets": "Assets",
+  "@calendarSegmentAssets": { "description": "Segment label for asset-type accounts on the calendar." },
+
+  "calendarSegmentLiabilities": "Liabilities",
+  "@calendarSegmentLiabilities": { "description": "Segment label for liability-type accounts on the calendar." },
+
+  "calendarSelectAccount": "Select Account",
+  "@calendarSelectAccount": { "description": "Placeholder shown in the account dropdown when none is selected." },
+
+  "calendarMonthlyChange": "Monthly Change",
+  "@calendarMonthlyChange": { "description": "Label for the monthly-change metric on the calendar screen." },
+
+  "calendarNoTransactions": "No transactions on this day",
+  "@calendarNoTransactions": { "description": "Empty-state message when no transactions exist for the selected day." },
+
+  "moreCalendar": "Account Calendar",
+  "@moreCalendar": { "description": "Menu item title for Account Calendar in the More screen." },
+
+  "moreCalendarSubtitle": "View monthly balance changes by account",
+  "@moreCalendarSubtitle": { "description": "Subtitle for the Account Calendar menu item in the More screen." },
+
+  "moreRecentTransactions": "Recent Transactions",
+  "@moreRecentTransactions": { "description": "Menu item title for Recent Transactions in the More screen." },
+
+  "moreRecentTransactionsSubtitle": "View recent transactions across all accounts",
+  "@moreRecentTransactionsSubtitle": { "description": "Subtitle for the Recent Transactions menu item." },
+
+  "biometricTitle": "App Locked",
+  "@biometricTitle": { "description": "Heading shown on the biometric lock screen." },
+
+  "biometricSubtitle": "Authenticate to continue",
+  "@biometricSubtitle": { "description": "Subtitle shown on the biometric lock screen." },
+
+  "biometricUnlock": "Unlock",
+  "@biometricUnlock": { "description": "Button label when biometric prompt is ready." },
+
+  "biometricAuthenticating": "Authenticating…",
+  "@biometricAuthenticating": { "description": "Button label while the biometric prompt is in progress." },
+
+  "biometricLogOut": "Log out",
+  "@biometricLogOut": { "description": "Button to log out from the biometric lock screen." },
+
+  "backendConfigTitle": "Configuration",
+  "@backendConfigTitle": { "description": "Headline on the backend configuration screen." },
+
+  "backendConfigSubtitle": "Update your Sure server URL",
+  "@backendConfigSubtitle": { "description": "Subtitle below the headline on the backend configuration screen." },
+
+  "backendConfigExampleUrlsLabel": "Example URLs",
+  "@backendConfigExampleUrlsLabel": { "description": "Label for the example URLs info box on the config screen." },
+
+  "backendConfigUrlLabel": "Sure server URL",
+  "@backendConfigUrlLabel": { "description": "Label for the server URL field on the config screen." },
+
+  "backendConfigUrlHint": "https://app.sure.am",
+  "@backendConfigUrlHint": { "description": "Hint text for the server URL field." },
+
+  "backendConfigProxyHeadersLabel": "Custom proxy headers",
+  "@backendConfigProxyHeadersLabel": { "description": "Label for the custom proxy headers section on the config screen." },
+
+  "backendConfigProxyHeadersSubtitle": "Optional headers for a reverse proxy or auth gateway",
+  "@backendConfigProxyHeadersSubtitle": { "description": "Subtitle for the proxy headers expansion tile when no headers are configured." },
+
+  "backendConfigProxyHeadersCount": "{count} configured",
+  "@backendConfigProxyHeadersCount": {
+    "description": "Subtitle for the proxy headers expansion tile when headers are configured.",
+    "placeholders": { "count": { "type": "int" } }
+  },
+
+  "backendConfigTesting": "Testing…",
+  "@backendConfigTesting": { "description": "Label on the test-connection button while the test is in progress." },
+
+  "backendConfigTestButton": "Test Connection",
+  "@backendConfigTestButton": { "description": "Button label to test the server connection." },
+
+  "backendConfigContinueButton": "Continue",
+  "@backendConfigContinueButton": { "description": "Button label to proceed after saving configuration." },
+
+  "backendConfigChangeHint": "You can change this later in the settings.",
+  "@backendConfigChangeHint": { "description": "Helper text below the config form." },
+
+  "recentTransactionsTitle": "Recent Transactions",
+  "@recentTransactionsTitle": { "description": "App bar title for the recent transactions screen." },
+
+  "recentTransactionsEmpty": "No Transactions",
+  "@recentTransactionsEmpty": { "description": "Empty-state message on the recent transactions screen." },
+
+  "recentTransactionsDisplayLimit": "Display Limit",
+  "@recentTransactionsDisplayLimit": { "description": "Tooltip for the display-limit popup menu on the recent transactions screen." },
+
+  "recentTransactionsShowN": "Show {count}",
+  "@recentTransactionsShowN": {
+    "description": "Menu item label to show N recent transactions.",
+    "placeholders": { "count": { "type": "int" } }
+  },
+
+  "recentTransactionsPullToRefresh": "Pull to refresh",
+  "@recentTransactionsPullToRefresh": { "description": "Empty-state subtitle prompting the user to pull to refresh." },
+
+  "logViewerTitle": "Debug Logs",
+  "@logViewerTitle": { "description": "App bar title for the log viewer screen." },
+
+  "logViewerFilterAll": "All",
+  "@logViewerFilterAll": { "description": "Log level filter chip: show all log entries." },
+
+  "logViewerFilterInfo": "Info",
+  "@logViewerFilterInfo": { "description": "Log level filter chip: show info entries only." },
+
+  "logViewerFilterWarning": "Warning",
+  "@logViewerFilterWarning": { "description": "Log level filter chip: show warning entries only." },
+
+  "logViewerFilterError": "Error",
+  "@logViewerFilterError": { "description": "Log level filter chip: show error entries only." },
+
+  "logViewerFilterDebug": "Debug",
+  "@logViewerFilterDebug": { "description": "Log level filter chip: show debug entries only." },
+
+  "logViewerAutoScrollEnable": "Enable auto-scroll",
+  "@logViewerAutoScrollEnable": { "description": "Tooltip for the auto-scroll toggle button when auto-scroll is off." },
+
+  "logViewerAutoScrollDisable": "Disable auto-scroll",
+  "@logViewerAutoScrollDisable": { "description": "Tooltip for the auto-scroll toggle button when auto-scroll is on." },
+
+  "logViewerCopyLogs": "Copy logs",
+  "@logViewerCopyLogs": { "description": "Tooltip for the copy-logs action button." },
+
+  "logViewerClearLogs": "Clear logs",
+  "@logViewerClearLogs": { "description": "Tooltip for the clear-logs action button." },
+
+  "logViewerLogsCopied": "Logs copied to clipboard",
+  "@logViewerLogsCopied": { "description": "Snackbar message after logs are copied to the clipboard." },
+
+  "logViewerEmpty": "No logs yet",
+  "@logViewerEmpty": { "description": "Empty-state message shown when there are no log entries to display." },
+
+  "connectivityOffline": "You are offline",
+  "@connectivityOffline": { "description": "Message shown in the connectivity banner when the device has no network." },
+
+  "connectivityPendingSync": "{count, plural, one{{count} transaction pending sync} other{{count} transactions pending sync}}",
+  "@connectivityPendingSync": {
+    "description": "Connectivity banner message showing how many transactions are queued for sync.",
+    "placeholders": { "count": { "type": "int" } }
+  },
+
+  "connectivitySyncNow": "Sync Now",
+  "@connectivitySyncNow": { "description": "Button label in the connectivity banner to trigger an immediate sync." },
+
+  "proxyHeadersAddHeader": "Add header",
+  "@proxyHeadersAddHeader": { "description": "Button label to add a new custom proxy header." },
+
+  "proxyHeadersNameLabel": "Header name",
+  "@proxyHeadersNameLabel": { "description": "Label for the header-name input field." },
+
+  "proxyHeadersNameHint": "X-Auth-Token",
+  "@proxyHeadersNameHint": { "description": "Hint text for the header-name input (example header name)." },
+
+  "proxyHeadersValueLabel": "Header value",
+  "@proxyHeadersValueLabel": { "description": "Label for the header-value input field." },
+
+  "proxyHeadersRemove": "Remove header",
+  "@proxyHeadersRemove": { "description": "Tooltip for the remove-header icon button." },
+
+  "accountDetailRefreshTooltip": "Refresh account details",
+  "@accountDetailRefreshTooltip": { "description": "Tooltip for the refresh button on the account detail header." },
+
+  "accountDetailRecentBalanceHistory": "Recent balance history",
+  "@accountDetailRecentBalanceHistory": { "description": "Section heading for the balance history chart in the account detail header." },
+
+  "accountDetailTopHoldings": "Top holdings",
+  "@accountDetailTopHoldings": { "description": "Section heading for the top holdings list in the account detail header." },
+
+  "accountDetailHoldingFallback": "Holding",
+  "@accountDetailHoldingFallback": { "description": "Fallback label when a holding has no name." },
+
+  "accountDetailCashChip": "Cash {amount}",
+  "@accountDetailCashChip": {
+    "description": "Label for the cash position chip in the account detail header.",
+    "placeholders": { "amount": { "type": "String" } }
+  },
+
+  "biometricLockFailedRetry": "Authentication failed. Tap Unlock to try again.",
+  "@biometricLockFailedRetry": { "description": "Snackbar shown on the biometric lock screen when authentication fails." },
+
+  "settingsBiometricVerifyReason": "Verify biometric to enable app lock",
+  "@settingsBiometricVerifyReason": { "description": "Reason shown in the system biometric prompt when enabling app lock from settings." },
+
+  "settingsBiometricFailed": "Biometric authentication failed.",
+  "@settingsBiometricFailed": { "description": "Snackbar shown when biometric verification fails while enabling app lock." },
+
+  "settingsUpdateOpenStoreError": "Unable to open store link",
+  "@settingsUpdateOpenStoreError": { "description": "Snackbar shown when the app store update link cannot be opened." },
+
+  "settingsClearDataFailed": "Failed to clear local data.",
+  "@settingsClearDataFailed": { "description": "Snackbar shown when clearing local data fails." },
+
+  "settingsClearDataSuccessDetailed": "Local data cleared successfully. Pull to refresh to sync from server.",
+  "@settingsClearDataSuccessDetailed": { "description": "Snackbar shown after local data is cleared, prompting the user to pull to refresh." },
+
+  "settingsContactOpenLinkError": "Unable to open link",
+  "@settingsContactOpenLinkError": { "description": "Snackbar shown when the contact/Discord link cannot be opened." },
+
+  "settingsResetAccountContent": "Resetting your account will delete all your accounts, categories, merchants, tags, and other data, but keep your user account intact.\n\nThis action cannot be undone. Are you sure?",
+  "@settingsResetAccountContent": { "description": "Body text for the reset-account confirmation dialog." },
+
+  "settingsResetAccount": "Reset Account",
+  "@settingsResetAccount": { "description": "Title and confirm button label for the reset-account action." },
+
+  "settingsResetAccountInitiated": "Account reset has been initiated. This may take a moment.",
+  "@settingsResetAccountInitiated": { "description": "Snackbar shown after an account reset is initiated." },
+
+  "settingsResetAccountFailed": "Failed to reset account",
+  "@settingsResetAccountFailed": { "description": "Snackbar shown when resetting the account fails." },
+
+  "settingsDeleteAccountConfirmContent": "Deleting your account will permanently remove all your data and cannot be undone.\n\nAre you sure you want to delete your account?",
+  "@settingsDeleteAccountConfirmContent": { "description": "Body text for the delete-account confirmation dialog on the settings screen." },
+
+  "settingsDeleteAccountFailed": "Failed to delete account",
+  "@settingsDeleteAccountFailed": { "description": "Snackbar shown when deleting the account fails." },
+
+  "settingsProxyHeadersNote": "Headers are sent by the app with API requests. External browser SSO pages may not receive them.",
+  "@settingsProxyHeadersNote": { "description": "Explanatory note shown in the custom proxy headers dialog." },
+
+  "settingsProxyHeadersSaved": "Custom proxy headers saved",
+  "@settingsProxyHeadersSaved": { "description": "Snackbar shown after custom proxy headers are saved." },
+
+  "settingsProxyHeadersSaveFailed": "Failed to save custom proxy headers.",
+  "@settingsProxyHeadersSaveFailed": { "description": "Snackbar shown when saving custom proxy headers fails." },
+
+  "settingsAppVersion": "App Version: {version}",
+  "@settingsAppVersion": {
+    "description": "App version list tile title on the settings screen.",
+    "placeholders": { "version": { "type": "String" } }
+  },
+
+  "settingsCheckForUpdatesSubtitle": "See if a newer version is available",
+  "@settingsCheckForUpdatesSubtitle": { "description": "Subtitle for the check-for-updates list tile." },
+
+  "settingsContactUs": "Contact us",
+  "@settingsContactUs": { "description": "Title for the contact-us list tile on the settings screen." },
+
+  "settingsDebugLogsSemantics": "Open debug logs",
+  "@settingsDebugLogsSemantics": { "description": "Accessibility label for the debug logs list tile." },
+
+  "settingsDebugLogsSubtitle": "View app diagnostic logs",
+  "@settingsDebugLogsSubtitle": { "description": "Subtitle for the debug logs list tile." },
+
+  "settingsGroupByAccountType": "Group by Account Type",
+  "@settingsGroupByAccountType": { "description": "Title for the group-by-account-type toggle on the settings screen." },
+
+  "settingsGroupByAccountTypeSubtitle": "Group accounts by type (Crypto, Bank, etc.)",
+  "@settingsGroupByAccountTypeSubtitle": { "description": "Subtitle for the group-by-account-type toggle." },
+
+  "settingsProxyHeadersTileTitle": "Custom proxy headers",
+  "@settingsProxyHeadersTileTitle": { "description": "Title for the custom proxy headers list tile on the settings screen." },
+
+  "settingsProxyHeadersTileSubtitleEmpty": "Optional headers for a reverse proxy or auth gateway",
+  "@settingsProxyHeadersTileSubtitleEmpty": { "description": "Subtitle for the custom proxy headers list tile when no headers are configured." },
+
+  "settingsProxyHeadersTileSubtitleCount": "{count} configured",
+  "@settingsProxyHeadersTileSubtitleCount": {
+    "description": "Subtitle for the custom proxy headers list tile when headers are configured.",
+    "placeholders": { "count": { "type": "int" } }
+  },
+
+  "settingsClearDataTileSubtitle": "Remove all cached transactions and accounts",
+  "@settingsClearDataTileSubtitle": { "description": "Subtitle for the clear-local-data list tile." },
+
+  "settingsResetAccountTileSubtitle": "Delete all accounts, categories, merchants, and tags but keep your user account",
+  "@settingsResetAccountTileSubtitle": { "description": "Subtitle for the reset-account list tile in the danger zone." },
+
+  "settingsDeleteAccountTileSubtitle": "Permanently remove all your data. This cannot be undone.",
+  "@settingsDeleteAccountTileSubtitle": { "description": "Subtitle for the delete-account list tile in the danger zone." },
+
+  "settingsUserFallback": "User",
+  "@settingsUserFallback": { "description": "Fallback display name when the user has no name set." },
+
+  "chatListDeleteMultiContent": "{count, plural, one{Delete {count} chat? This cannot be undone.} other{Delete {count} chats? This cannot be undone.}}",
+  "@chatListDeleteMultiContent": {
+    "description": "Body text for the multi-chat delete confirmation dialog.",
+    "placeholders": { "count": { "type": "int" } }
+  },
+
+  "chatListDeletedSuccess": "Chats deleted",
+  "@chatListDeletedSuccess": { "description": "Snackbar shown after multiple chats are deleted." },
+
+  "chatListDeleteFailed": "Failed to delete chats",
+  "@chatListDeleteFailed": { "description": "Snackbar shown when deleting multiple chats fails." },
+
+  "chatListError": "Failed to load chats",
+  "@chatListError": { "description": "Error-state heading on the chat list screen." },
+
+  "chatListJustNow": "Just now",
+  "@chatListJustNow": { "description": "Relative time label for very recent chats." },
+
+  "chatListDeleteSingleContent": "Are you sure you want to delete \"{title}\"?",
+  "@chatListDeleteSingleContent": {
+    "description": "Body text for the single-chat delete confirmation dialog.",
+    "placeholders": { "title": { "type": "String" } }
+  },
+
+  "loginSignUpOpenError": "Unable to open sign up page",
+  "@loginSignUpOpenError": { "description": "Snackbar shown when the sign-up page cannot be opened." },
+
+  "loginApiKeyDialogTitle": "API Key Login",
+  "@loginApiKeyDialogTitle": { "description": "Title for the API key login dialog on the login screen." },
+
+  "loginApiKeyDialogBody": "Enter your API key to sign in.",
+  "@loginApiKeyDialogBody": { "description": "Body text for the API key login dialog." },
+
+  "loginApiKeyInvalid": "Invalid API key",
+  "@loginApiKeyInvalid": { "description": "Fallback error shown when an API key login fails." },
+
+  "loginApiKeySignIn": "Sign In",
+  "@loginApiKeySignIn": { "description": "Sign-in button label in the API key login dialog." },
+
+  "loginDemoOrSignUpPrefix": "Demo account or ",
+  "@loginDemoOrSignUpPrefix": { "description": "Leading text before the Sign Up link on the login screen." },
+
+  "loginSignUpLink": "Sign Up",
+  "@loginSignUpLink": { "description": "Tappable Sign Up link text on the login screen." },
+
+  "loginSignUpSuffix": "!",
+  "@loginSignUpSuffix": { "description": "Trailing punctuation after the Sign Up link on the login screen." },
+
+  "loginMfaInfo": "Two-factor authentication is enabled. Enter your code.",
+  "@loginMfaInfo": { "description": "Info banner shown when MFA is required during login." },
+
+  "loginMfaCodeRequired": "Please enter your authentication code",
+  "@loginMfaCodeRequired": { "description": "Validation error when the MFA code field is empty." },
+
+  "loginOrDivider": "or",
+  "@loginOrDivider": { "description": "Divider label between primary and alternate sign-in options." },
+
+  "loginServerUrlHeading": "Sure server URL:",
+  "@loginServerUrlHeading": { "description": "Heading above the displayed server URL on the login screen." },
+
+  "loginApiKeyLoginButton": "API-Key Login",
+  "@loginApiKeyLoginButton": { "description": "Button label to open the API key login dialog." },
+
+  "loginBackendSettingsTooltip": "Backend Settings",
+  "@loginBackendSettingsTooltip": { "description": "Tooltip for the backend settings button on the login screen." },
+
+  "transactionEditSessionExpired": "Session expired. Please login again.",
+  "@transactionEditSessionExpired": { "description": "Snackbar shown when the session expires while editing a transaction." },
+
+  "transactionEditUpdated": "Transaction updated",
+  "@transactionEditUpdated": { "description": "Snackbar shown after a transaction is updated successfully." },
+
+  "transactionEditUpdateFailed": "Failed to update transaction",
+  "@transactionEditUpdateFailed": { "description": "Fallback snackbar shown when updating a transaction fails." },
+
+  "transactionEditNameMaxLength": "Name must be {max} characters or fewer",
+  "@transactionEditNameMaxLength": {
+    "description": "Validation error when the transaction name exceeds the maximum length.",
+    "placeholders": { "max": { "type": "int" } }
+  },
+
+  "transactionEditNameInvalidChars": "Name contains unsupported characters",
+  "@transactionEditNameInvalidChars": { "description": "Validation error when the transaction name contains control characters." },
+
+  "transactionEditNotesMaxLength": "Notes must be {max} characters or fewer",
+  "@transactionEditNotesMaxLength": {
+    "description": "Validation error when the notes exceed the maximum length.",
+    "placeholders": { "max": { "type": "int" } }
+  },
+
+  "transactionEditNotesInvalidChars": "Notes contain unsupported characters",
+  "@transactionEditNotesInvalidChars": { "description": "Validation error when the notes contain control characters." },
+
+  "transactionEditNoCategory": "No category",
+  "@transactionEditNoCategory": { "description": "Dropdown option representing no selected category in the edit form." },
+
+  "transactionEditCurrentCategory": "Current category",
+  "@transactionEditCurrentCategory": { "description": "Fallback dropdown label for the currently selected category when its name is unknown." },
+
+  "transactionEditNoMerchant": "No merchant",
+  "@transactionEditNoMerchant": { "description": "Dropdown option representing no selected merchant in the edit form." },
+
+  "transactionEditCurrentMerchant": "Current merchant",
+  "@transactionEditCurrentMerchant": { "description": "Fallback dropdown label for the currently selected merchant when its name is unknown." },
+
+  "transactionEditNoTags": "No tags available",
+  "@transactionEditNoTags": { "description": "Message shown when no tags are available to select in the edit form." },
+
+  "transactionEditUnknownTag": "Unknown tag",
+  "@transactionEditUnknownTag": { "description": "Fallback label for a selected tag whose name is unknown." },
+
+  "transactionEditSyncedOnly": "Only synced transactions can be edited from mobile.",
+  "@transactionEditSyncedOnly": { "description": "Notice shown when a transaction cannot be edited because it is not yet synced." },
+
+  "transactionEditCategoryHelper": "Choose a replacement category",
+  "@transactionEditCategoryHelper": { "description": "Helper text under the category dropdown in the edit form." },
+
+  "transactionEditMerchantHelper": "Choose a replacement merchant",
+  "@transactionEditMerchantHelper": { "description": "Helper text under the merchant dropdown in the edit form." },
+
+  "transactionFormSessionExpired": "Session expired. Please login again.",
+  "@transactionFormSessionExpired": { "description": "Snackbar shown when the session expires while creating a transaction." },
+
+  "transactionFormAmountRequiredPrompt": "Please enter an amount",
+  "@transactionFormAmountRequiredPrompt": { "description": "Validation error when the amount field is empty in the create form." },
+
+  "transactionFormAmountInvalidNumber": "Please enter a valid number",
+  "@transactionFormAmountInvalidNumber": { "description": "Validation error when the amount is not a valid number." },
+
+  "transactionFormAmountTooSmall": "Amount must be greater than 0",
+  "@transactionFormAmountTooSmall": { "description": "Validation error when the amount is zero or negative." },
+
+  "transactionFormCreateSuccessOnline": "Transaction created successfully",
+  "@transactionFormCreateSuccessOnline": { "description": "Snackbar shown after a transaction is created while online." },
+
+  "transactionFormCreateSuccessOffline": "Transaction saved (will sync when online)",
+  "@transactionFormCreateSuccessOffline": { "description": "Snackbar shown after a transaction is saved while offline." },
+
+  "transactionFormCreateFailed": "Failed to create transaction",
+  "@transactionFormCreateFailed": { "description": "Snackbar shown when creating a transaction fails." },
+
+  "transactionFormGenericError": "Error: {error}",
+  "@transactionFormGenericError": {
+    "description": "Snackbar shown when an unexpected error occurs while creating a transaction.",
+    "placeholders": { "error": { "type": "String" } }
+  },
+
+  "transactionFormLess": "Less",
+  "@transactionFormLess": { "description": "Toggle label to hide the optional transaction fields." },
+
+  "transactionFormMore": "More",
+  "@transactionFormMore": { "description": "Toggle label to show the optional transaction fields." },
+
+  "transactionFormDateHelper": "Optional (default: today)",
+  "@transactionFormDateHelper": { "description": "Helper text for the date field in the create form." },
+
+  "transactionFormNameHelper": "Optional (default: SureApp)",
+  "@transactionFormNameHelper": { "description": "Helper text for the name field in the create form." },
+
+  "transactionFormCategoryLoading": "Loading categories…",
+  "@transactionFormCategoryLoading": { "description": "Placeholder shown while categories are loading in the create form." },
+
+  "transactionFormCategoryHelper": "Optional",
+  "@transactionFormCategoryHelper": { "description": "Helper text for the category dropdown in the create form." },
+
+  "transactionFormNoCategory": "No category",
+  "@transactionFormNoCategory": { "description": "Dropdown option representing no selected category in the create form." },
+
+  "transactionFormCreateButton": "Create Transaction",
+  "@transactionFormCreateButton": { "description": "Submit button label on the create-transaction form." },
+
+  "transactionFormAmountHelper": "Required",
+  "@transactionFormAmountHelper": { "description": "Helper text under the amount field indicating it is required." },
+
+  "logViewerClearConfirm": "Are you sure you want to clear all logs?",
+  "@logViewerClearConfirm": { "description": "Body text for the clear-logs confirmation dialog." },
+
+  "logViewerClear": "Clear",
+  "@logViewerClear": { "description": "Confirm button label in the clear-logs dialog." },
+
+  "chatConversationEditTitle": "Edit Title",
+  "@chatConversationEditTitle": { "description": "Title for the edit-chat-title dialog." },
+
+  "chatConversationTitleLabel": "Chat Title",
+  "@chatConversationTitleLabel": { "description": "Label for the chat title input field in the edit dialog." },
+
+  "chatConversationRefreshTooltip": "Refresh",
+  "@chatConversationRefreshTooltip": { "description": "Tooltip for the refresh button in the chat conversation screen." },
+
+  "chatConversationLoadError": "Failed to load chat",
+  "@chatConversationLoadError": { "description": "Error-state heading when a chat fails to load." },
+
+  "navEnableAiChatTitle": "Turn on AI Chat?",
+  "@navEnableAiChatTitle": { "description": "Title for the dialog prompting the user to enable AI chat." },
+
+  "navEnableAiChatContent": "AI Chat is currently disabled in your account settings. Would you like to turn it on now?",
+  "@navEnableAiChatContent": { "description": "Body text for the enable-AI-chat dialog." },
+
+  "navEnableAiChatNotNow": "Not now",
+  "@navEnableAiChatNotNow": { "description": "Dismiss button in the enable-AI-chat dialog." },
+
+  "navEnableAiChatConfirm": "Turn on AI",
+  "@navEnableAiChatConfirm": { "description": "Confirm button in the enable-AI-chat dialog." },
+
+  "navEnableAiChatFailed": "Unable to enable AI right now.",
+  "@navEnableAiChatFailed": { "description": "Snackbar shown when enabling AI chat fails." },
+
+  "transactionsListEditTooltip": "Edit transaction",
+  "@transactionsListEditTooltip": { "description": "Tooltip for the edit button on a transaction row." },
+
+  "connectivitySignInToSync": "Please sign in to sync transactions",
+  "@connectivitySignInToSync": { "description": "Snackbar shown when trying to sync without being signed in." },
+
+  "connectivitySyncSuccess": "Transactions synced successfully",
+  "@connectivitySyncSuccess": { "description": "Snackbar shown after transactions sync successfully." },
+
+  "connectivitySyncFailed": "Failed to sync transactions. Please try again.",
+  "@connectivitySyncFailed": { "description": "Snackbar shown when a manual sync fails." },
+
+  "connectivityAuthFailed": "Unable to authenticate. Please try again.",
+  "@connectivityAuthFailed": { "description": "Snackbar shown when authentication fails during a manual sync." },
+
+  "ssoOnboardingSignedInAs": "Signed in as {email}",
+  "@ssoOnboardingSignedInAs": {
+    "description": "Header text on the SSO onboarding screen showing the signed-in Google email.",
+    "placeholders": { "email": { "type": "String" } }
+  },
+
+  "ssoOnboardingGoogleVerified": "Google account verified",
+  "@ssoOnboardingGoogleVerified": { "description": "Header text on the SSO onboarding screen when the Google email is unknown." },
+
+  "ssoOnboardingLinkCredentialsNote": "Enter your existing account credentials to link with Google Sign-In.",
+  "@ssoOnboardingLinkCredentialsNote": { "description": "Explanatory note on the link-existing form prompting the user to enter their credentials." },
+
+  "ssoOnboardingPendingInvitationNote": "You have a pending invitation. Accept it to join an existing household.",
+  "@ssoOnboardingPendingInvitationNote": { "description": "Explanatory note on the create form when the user has a pending household invitation." },
+
+  "ssoOnboardingCreateIdentityNote": "Create a new account using your Google identity.",
+  "@ssoOnboardingCreateIdentityNote": { "description": "Explanatory note on the create form when creating a brand-new account via Google." },
+
+  "ssoOnboardingFirstNameRequired": "First name is required",
+  "@ssoOnboardingFirstNameRequired": { "description": "Validation error when the first-name field is empty on the SSO onboarding screen." },
+
+  "ssoOnboardingLastNameRequired": "Last name is required",
+  "@ssoOnboardingLastNameRequired": { "description": "Validation error when the last-name field is empty on the SSO onboarding screen." },
+
+  "backendConfigTimeout": "Connection timeout. Please check the URL and try again.",
+  "@backendConfigTimeout": { "description": "Error shown when the connection test times out." },
+
+  "backendConfigSuccess": "Connection successful!",
+  "@backendConfigSuccess": { "description": "Message shown when the connection test succeeds." },
+
+  "backendConfigServerError": "Server responded with status {code}. Please check if this is a Sure backend server.",
+  "@backendConfigServerError": {
+    "description": "Error shown when the server returns a non-success status during the connection test.",
+    "placeholders": { "code": { "type": "int" } }
+  },
+
+  "backendConfigConnectionFailed": "Connection failed: {error}",
+  "@backendConfigConnectionFailed": {
+    "description": "Error shown when the connection test fails with an exception.",
+    "placeholders": { "error": { "type": "String" } }
+  },
+
+  "backendConfigSaveFailed": "Failed to save URL: {error}",
+  "@backendConfigSaveFailed": {
+    "description": "Error shown when saving the backend URL fails.",
+    "placeholders": { "error": { "type": "String" } }
+  },
+
+  "backendConfigUrlRequired": "Please enter a backend URL",
+  "@backendConfigUrlRequired": { "description": "Validation error when the backend URL field is empty." },
+
+  "backendConfigUrlScheme": "URL must start with http:// or https://",
+  "@backendConfigUrlScheme": { "description": "Validation error when the backend URL is missing an http(s) scheme." },
+
+  "backendConfigUrlInvalid": "Please enter a valid URL",
+  "@backendConfigUrlInvalid": { "description": "Validation error when the backend URL is malformed." },
+
+  "backendConfigHeadersHelp": "Headers are sent by the app with API requests. External browser SSO pages may not receive them.",
+  "@backendConfigHeadersHelp": { "description": "Helper text below the custom proxy headers section on the backend config screen." },
+
+  "recentTransactionsUnknownAccount": "Unknown Account",
+  "@recentTransactionsUnknownAccount": { "description": "Fallback label when a transaction's account cannot be resolved." },
+
+  "accountDetailUnavailable": "Account details are temporarily unavailable",
+  "@accountDetailUnavailable": { "description": "Error message shown when account detail and balances both fail to load." },
+
+  "chatListMinutesAgo": "{minutes}m ago",
+  "@chatListMinutesAgo": {
+    "description": "Relative time label for a chat updated some minutes ago.",
+    "placeholders": { "minutes": { "type": "int" } }
+  },
+
+  "chatListHoursAgo": "{hours}h ago",
+  "@chatListHoursAgo": {
+    "description": "Relative time label for a chat updated some hours ago.",
+    "placeholders": { "hours": { "type": "int" } }
+  },
+
+  "chatListDaysAgo": "{days}d ago",
+  "@chatListDaysAgo": {
+    "description": "Relative time label for a chat updated some days ago.",
+    "placeholders": { "days": { "type": "int" } }
+  },
+
+  "chatConversationStartFailed": "Failed to start conversation. Please try again.",
+  "@chatConversationStartFailed": { "description": "Fallback snackbar shown when creating a new conversation from the first message fails." }
+}
diff --git a/mobile/lib/l10n/app_localizations.dart b/mobile/lib/l10n/app_localizations.dart
new file mode 100644
index 000000000..a9e92d7cd
--- /dev/null
+++ b/mobile/lib/l10n/app_localizations.dart
@@ -0,0 +1,1945 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:intl/intl.dart' as intl;
+
+import 'app_localizations_en.dart';
+
+// ignore_for_file: type=lint
+
+/// Callers can lookup localized strings with an instance of AppLocalizations
+/// returned by `AppLocalizations.of(context)`.
+///
+/// Applications need to include `AppLocalizations.delegate()` in their app's
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
+///
+/// ```dart
+/// import 'l10n/app_localizations.dart';
+///
+/// return MaterialApp(
+///   localizationsDelegates: AppLocalizations.localizationsDelegates,
+///   supportedLocales: AppLocalizations.supportedLocales,
+///   home: MyApplicationHome(),
+/// );
+/// ```
+///
+/// ## Update pubspec.yaml
+///
+/// Please make sure to update your pubspec.yaml to include the following
+/// packages:
+///
+/// ```yaml
+/// dependencies:
+///   # Internationalization support.
+///   flutter_localizations:
+///     sdk: flutter
+///   intl: any # Use the pinned version from flutter_localizations
+///
+///   # Rest of dependencies
+/// ```
+///
+/// ## iOS Applications
+///
+/// iOS applications define key application metadata, including supported
+/// locales, in an Info.plist file that is built into the application bundle.
+/// To configure the locales supported by your app, you’ll need to edit this
+/// file.
+///
+/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
+/// Then, in the Project Navigator, open the Info.plist file under the Runner
+/// project’s Runner folder.
+///
+/// Next, select the Information Property List item, select Add Item from the
+/// Editor menu, then select Localizations from the pop-up menu.
+///
+/// Select and expand the newly-created Localizations item then, for each
+/// locale your application supports, add a new item and select the locale
+/// you wish to add from the pop-up menu in the Value field. This list should
+/// be consistent with the languages listed in the AppLocalizations.supportedLocales
+/// property.
+abstract class AppLocalizations {
+  AppLocalizations(String locale)
+      : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+
+  final String localeName;
+
+  static AppLocalizations of(BuildContext context) {
+    return Localizations.of<AppLocalizations>(context, AppLocalizations)!;
+  }
+
+  static const LocalizationsDelegate<AppLocalizations> delegate =
+      _AppLocalizationsDelegate();
+
+  /// A list of this localizations delegate along with the default localizations
+  /// delegates.
+  ///
+  /// Returns a list of localizations delegates containing this delegate along with
+  /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
+  /// and GlobalWidgetsLocalizations.delegate.
+  ///
+  /// Additional delegates can be added by appending to this list in
+  /// MaterialApp. This list does not have to be used at all if a custom list
+  /// of delegates is preferred or required.
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
+    delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+  ];
+
+  /// A list of this localizations delegate's supported locales.
+  static const List<Locale> supportedLocales = <Locale>[Locale('en')];
+
+  /// Application title shown in the OS task switcher.
+  ///
+  /// In en, this message translates to:
+  /// **'Sure Finances'**
+  String get appTitle;
+
+  /// Generic cancel action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get commonCancel;
+
+  /// Generic save/confirm action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Save'**
+  String get commonSave;
+
+  /// Generic retry action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Try Again'**
+  String get commonTryAgain;
+
+  /// Generic delete action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete'**
+  String get commonDelete;
+
+  /// Label for the 'All' filter chip (currency filter, category filter, etc.).
+  ///
+  /// In en, this message translates to:
+  /// **'All'**
+  String get commonAll;
+
+  /// Generic refresh action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Refresh'**
+  String get commonRefresh;
+
+  /// Generic close/dismiss action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Close'**
+  String get commonClose;
+
+  /// Generic undo action label.
+  ///
+  /// In en, this message translates to:
+  /// **'Undo'**
+  String get commonUndo;
+
+  /// Suggested chat prompt on the empty assistant screen.
+  ///
+  /// In en, this message translates to:
+  /// **'What is my current net worth?'**
+  String get chatSuggestionNetWorth;
+
+  /// Suggested chat prompt on the empty assistant screen.
+  ///
+  /// In en, this message translates to:
+  /// **'How has my spending changed this month?'**
+  String get chatSuggestionSpending;
+
+  /// Suggested chat prompt on the empty assistant screen.
+  ///
+  /// In en, this message translates to:
+  /// **'How can I improve my savings rate?'**
+  String get chatSuggestionSavings;
+
+  /// Suggested chat prompt on the empty assistant screen.
+  ///
+  /// In en, this message translates to:
+  /// **'What are my biggest expenses lately?'**
+  String get chatSuggestionExpenses;
+
+  /// Label for the email text field on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Email'**
+  String get loginEmailLabel;
+
+  /// Validation error when email field is empty.
+  ///
+  /// In en, this message translates to:
+  /// **'Email is required'**
+  String get loginEmailRequired;
+
+  /// Validation error when email format is invalid.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter a valid email'**
+  String get loginEmailInvalid;
+
+  /// Label for the password field on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Password'**
+  String get loginPasswordLabel;
+
+  /// Validation error when password field is empty.
+  ///
+  /// In en, this message translates to:
+  /// **'Password is required'**
+  String get loginPasswordRequired;
+
+  /// Primary sign-in button label.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign in'**
+  String get loginSignIn;
+
+  /// Google SSO button label.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign in with Google'**
+  String get loginSignInWithGoogle;
+
+  /// Label for the MFA code input field.
+  ///
+  /// In en, this message translates to:
+  /// **'Authentication Code'**
+  String get loginMfaLabel;
+
+  /// Label for the API key input field.
+  ///
+  /// In en, this message translates to:
+  /// **'API Key'**
+  String get loginApiKeyLabel;
+
+  /// Bottom navigation label for the Home (dashboard) tab.
+  ///
+  /// In en, this message translates to:
+  /// **'Home'**
+  String get navHome;
+
+  /// Bottom navigation label for the Intro tab.
+  ///
+  /// In en, this message translates to:
+  /// **'Intro'**
+  String get navIntro;
+
+  /// Bottom navigation label for the AI assistant tab.
+  ///
+  /// In en, this message translates to:
+  /// **'Assistant'**
+  String get navAssistant;
+
+  /// Bottom navigation label for the More tab.
+  ///
+  /// In en, this message translates to:
+  /// **'More'**
+  String get navMore;
+
+  /// Snackbar message when a sync attempt fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Sync failed'**
+  String get dashboardSyncError;
+
+  /// Snackbar message when a sync attempt fails with retry instruction.
+  ///
+  /// In en, this message translates to:
+  /// **'Sync failed. Please try again.'**
+  String get dashboardSyncFailed;
+
+  /// Snackbar message while accounts are being refreshed after a transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Refreshing accounts…'**
+  String get dashboardRefreshing;
+
+  /// Snackbar message shown after accounts refresh completes.
+  ///
+  /// In en, this message translates to:
+  /// **'Accounts updated'**
+  String get dashboardAccountsUpdated;
+
+  /// Snackbar message while sync is in progress.
+  ///
+  /// In en, this message translates to:
+  /// **'Syncing data from server…'**
+  String get dashboardSyncing;
+
+  /// Label shown in the sync status indicator after a successful sync.
+  ///
+  /// In en, this message translates to:
+  /// **'Synced'**
+  String get dashboardSynced;
+
+  /// Error state message when accounts fail to load.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to load accounts'**
+  String get dashboardErrorLoadingAccounts;
+
+  /// Empty state message when no accounts exist.
+  ///
+  /// In en, this message translates to:
+  /// **'No accounts yet'**
+  String get dashboardNoAccounts;
+
+  /// Empty state subtitle when no accounts exist.
+  ///
+  /// In en, this message translates to:
+  /// **'Add accounts in the web app to see them here.'**
+  String get dashboardNoAccountsSubtitle;
+
+  /// Empty state when the active account filter returns no results.
+  ///
+  /// In en, this message translates to:
+  /// **'No accounts match the current filter'**
+  String get dashboardFilterEmpty;
+
+  /// Title for the chat list screen / app bar.
+  ///
+  /// In en, this message translates to:
+  /// **'Chats'**
+  String get chatListTitle;
+
+  /// FAB tooltip for creating a new chat.
+  ///
+  /// In en, this message translates to:
+  /// **'New chat'**
+  String get chatListNewChat;
+
+  /// Empty-state heading on the chat list screen.
+  ///
+  /// In en, this message translates to:
+  /// **'No chats yet'**
+  String get chatListEmpty;
+
+  /// Empty-state subtitle on the chat list screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Start a conversation with your AI assistant'**
+  String get chatListEmptySubtitle;
+
+  /// Title for the delete-chat confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete Chat'**
+  String get chatListDeleteTitle;
+
+  /// Placeholder title for a new conversation before it is saved.
+  ///
+  /// In en, this message translates to:
+  /// **'New Conversation'**
+  String get chatConversationNewTitle;
+
+  /// Hint text inside the chat message input field.
+  ///
+  /// In en, this message translates to:
+  /// **'Ask anything about your finances…'**
+  String get chatConversationMessageHint;
+
+  /// Greeting shown in a new conversation when the user's first name is known.
+  ///
+  /// In en, this message translates to:
+  /// **'Hi {firstName}, how can I help?'**
+  String chatConversationGreetingWithName(String firstName);
+
+  /// Greeting shown in a new conversation when the user's first name is not available.
+  ///
+  /// In en, this message translates to:
+  /// **'Hi there, how can I help?'**
+  String get chatConversationGreetingNoName;
+
+  /// App bar title for the new-transaction form.
+  ///
+  /// In en, this message translates to:
+  /// **'New Transaction'**
+  String get transactionFormNewTitle;
+
+  /// Label for the transaction type segmented control.
+  ///
+  /// In en, this message translates to:
+  /// **'Type'**
+  String get transactionFormTypeLabel;
+
+  /// Segment label for an expense transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Expense'**
+  String get transactionFormTypeExpense;
+
+  /// Segment label for an income transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Income'**
+  String get transactionFormTypeIncome;
+
+  /// Label for the amount input field.
+  ///
+  /// In en, this message translates to:
+  /// **'Amount'**
+  String get transactionFormAmountLabel;
+
+  /// Validation error when amount is empty.
+  ///
+  /// In en, this message translates to:
+  /// **'Amount is required'**
+  String get transactionFormAmountRequired;
+
+  /// Validation error when amount is not a number.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter a valid amount'**
+  String get transactionFormAmountInvalid;
+
+  /// Label for the date picker field.
+  ///
+  /// In en, this message translates to:
+  /// **'Date'**
+  String get transactionFormDateLabel;
+
+  /// Label for the transaction name/payee field.
+  ///
+  /// In en, this message translates to:
+  /// **'Name'**
+  String get transactionFormNameLabel;
+
+  /// Label for the category picker field.
+  ///
+  /// In en, this message translates to:
+  /// **'Category'**
+  String get transactionFormCategoryLabel;
+
+  /// App bar title for the edit-transaction screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Edit Transaction'**
+  String get transactionEditTitle;
+
+  /// Label for the name field in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Name'**
+  String get transactionEditNameLabel;
+
+  /// Validation error when name is empty in edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Name is required'**
+  String get transactionEditNameRequired;
+
+  /// Label for the notes field in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Notes'**
+  String get transactionEditNotesLabel;
+
+  /// Label for the category field in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Category'**
+  String get transactionEditCategoryLabel;
+
+  /// Label for the merchant field in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Merchant'**
+  String get transactionEditMerchantLabel;
+
+  /// Label for the tags field in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Tags'**
+  String get transactionEditTagsLabel;
+
+  /// In-progress label shown on the save button while saving.
+  ///
+  /// In en, this message translates to:
+  /// **'Saving…'**
+  String get transactionEditSaving;
+
+  /// Title for the single-transaction delete confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete Transaction'**
+  String get transactionsListDeleteTitle;
+
+  /// Body of the delete confirmation dialog for a named transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure you want to delete \"{name}\"?'**
+  String transactionsListDeleteSingleContent(String name);
+
+  /// Title for the multi-transaction delete confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete Transactions'**
+  String get transactionsListDeleteMultiTitle;
+
+  /// Body of the multi-transaction delete confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure you want to delete the selected transactions?'**
+  String get transactionsListDeleteMultiContent;
+
+  /// Empty-state message when no transactions exist.
+  ///
+  /// In en, this message translates to:
+  /// **'No transactions'**
+  String get transactionsListEmpty;
+
+  /// Snackbar message when the API returns an auth failure.
+  ///
+  /// In en, this message translates to:
+  /// **'Authentication failed: Please log in again'**
+  String get transactionsListAuthFailed;
+
+  /// Empty-state heading when an account has no transactions.
+  ///
+  /// In en, this message translates to:
+  /// **'No transactions yet'**
+  String get transactionsListNoTransactionsYet;
+
+  /// Empty-state subtitle prompting the user to add their first transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Tap + to add your first transaction'**
+  String get transactionsListEmptyAddFirst;
+
+  /// Empty state shown when category filter returns no transactions.
+  ///
+  /// In en, this message translates to:
+  /// **'No transactions match this category'**
+  String get transactionsListNoCategoryMatch;
+
+  /// Button label on the transactions error state.
+  ///
+  /// In en, this message translates to:
+  /// **'Retry'**
+  String get transactionsListRetry;
+
+  /// Snackbar after a single transaction is deleted.
+  ///
+  /// In en, this message translates to:
+  /// **'Transaction deleted'**
+  String get transactionsListDeletedSuccess;
+
+  /// Snackbar when deleting a single transaction fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to delete transaction'**
+  String get transactionsListSingleDeleteFailed;
+
+  /// Snackbar message after multiple transactions are deleted.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, one{Deleted {count} transaction} other{Deleted {count} transactions}}'**
+  String transactionsListDeletedMulti(int count);
+
+  /// Snackbar when multi-delete fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to delete transactions'**
+  String get transactionsListDeleteFailed;
+
+  /// Snackbar when delete fails due to missing token.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to delete: No access token'**
+  String get transactionsListDeleteNoToken;
+
+  /// Title for the undo-transaction dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Undo Transaction'**
+  String get transactionsListUndoTitle;
+
+  /// Confirmation question for removing a pending transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove this pending transaction?'**
+  String get transactionsListUndoRemovePending;
+
+  /// Confirmation question for restoring a transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Restore this transaction?'**
+  String get transactionsListUndoRestoreConfirm;
+
+  /// Snackbar after a pending transaction is removed.
+  ///
+  /// In en, this message translates to:
+  /// **'Pending transaction removed'**
+  String get transactionsListUndoPendingRemoved;
+
+  /// Snackbar after a transaction is restored.
+  ///
+  /// In en, this message translates to:
+  /// **'Transaction restored'**
+  String get transactionsListUndoRestored;
+
+  /// Snackbar when undoing a transaction fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to undo transaction'**
+  String get transactionsListUndoFailed;
+
+  /// Settings section header for display/appearance options.
+  ///
+  /// In en, this message translates to:
+  /// **'Display'**
+  String get settingsSectionDisplay;
+
+  /// Settings section header for server/connection options.
+  ///
+  /// In en, this message translates to:
+  /// **'Connection'**
+  String get settingsSectionConnection;
+
+  /// Settings section header for data import/export options.
+  ///
+  /// In en, this message translates to:
+  /// **'Data Management'**
+  String get settingsSectionDataManagement;
+
+  /// Settings section header for security options.
+  ///
+  /// In en, this message translates to:
+  /// **'Security'**
+  String get settingsSectionSecurity;
+
+  /// Settings section header for destructive actions.
+  ///
+  /// In en, this message translates to:
+  /// **'Danger Zone'**
+  String get settingsSectionDangerZone;
+
+  /// Label for the theme picker setting.
+  ///
+  /// In en, this message translates to:
+  /// **'Theme'**
+  String get settingsThemeLabel;
+
+  /// Theme option: follow system setting.
+  ///
+  /// In en, this message translates to:
+  /// **'System'**
+  String get settingsThemeSystem;
+
+  /// Theme option: light mode.
+  ///
+  /// In en, this message translates to:
+  /// **'Light'**
+  String get settingsThemeLight;
+
+  /// Theme option: dark mode.
+  ///
+  /// In en, this message translates to:
+  /// **'Dark'**
+  String get settingsThemeDark;
+
+  /// Label for the custom proxy headers setting.
+  ///
+  /// In en, this message translates to:
+  /// **'Custom Proxy Headers'**
+  String get settingsProxyHeadersLabel;
+
+  /// Label for the toggle that masks monetary amounts across the app.
+  ///
+  /// In en, this message translates to:
+  /// **'Hide amounts'**
+  String get settingsPrivacyHideAmountsLabel;
+
+  /// Subtitle describing the hide-amounts toggle.
+  ///
+  /// In en, this message translates to:
+  /// **'Mask money values across the app'**
+  String get settingsPrivacyHideAmountsContent;
+
+  /// Label for the biometric lock toggle.
+  ///
+  /// In en, this message translates to:
+  /// **'Biometric Lock'**
+  String get settingsBiometricLabel;
+
+  /// Title of the dialog to enable biometric lock.
+  ///
+  /// In en, this message translates to:
+  /// **'Enable biometric lock?'**
+  String get settingsBiometricEnable;
+
+  /// Body text of the enable-biometric dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Require biometric authentication when resuming the app.'**
+  String get settingsBiometricEnableContent;
+
+  /// Label for the check-for-updates action.
+  ///
+  /// In en, this message translates to:
+  /// **'Check for Updates'**
+  String get settingsCheckForUpdates;
+
+  /// Title for the update-available dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Update Available'**
+  String get settingsUpdateAvailableTitle;
+
+  /// Body text for the update-available dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Version {version} is available. Update now?'**
+  String settingsUpdateAvailableContent(String version);
+
+  /// Fallback used in the update-available dialog when the store version number is unknown (e.g. 'Version a newer version is available').
+  ///
+  /// In en, this message translates to:
+  /// **'a newer version'**
+  String get settingsUpdateNewerVersionFallback;
+
+  /// Confirm button in the update-available dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Update Now'**
+  String get settingsUpdateNow;
+
+  /// Snackbar when no update is available.
+  ///
+  /// In en, this message translates to:
+  /// **'You\'re on the latest version.'**
+  String get settingsNoUpdateAvailable;
+
+  /// Snackbar when the update check fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Could not check for updates.'**
+  String get settingsUpdateError;
+
+  /// Title for the clear-all-data confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear All Data'**
+  String get settingsClearDataTitle;
+
+  /// Body text for the clear-all-data dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'This will remove all locally cached data. Your data on the server will not be affected.'**
+  String get settingsClearDataContent;
+
+  /// Confirm button in the clear-data dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear Data'**
+  String get settingsClearData;
+
+  /// Snackbar after local data is cleared.
+  ///
+  /// In en, this message translates to:
+  /// **'Local data cleared'**
+  String get settingsClearDataSuccess;
+
+  /// Title for the delete-account confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete Account'**
+  String get settingsDeleteAccountTitle;
+
+  /// Confirm button in the delete-account dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete Account'**
+  String get settingsDeleteAccount;
+
+  /// Title for the sign-out confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign Out'**
+  String get settingsSignOutTitle;
+
+  /// Body text for the sign-out dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure you want to sign out?'**
+  String get settingsSignOutContent;
+
+  /// Confirm button in the sign-out dialog and settings list tile label.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign Out'**
+  String get settingsSignOut;
+
+  /// Label for the debug logs navigation tile.
+  ///
+  /// In en, this message translates to:
+  /// **'Debug Logs'**
+  String get settingsDebugLogs;
+
+  /// App bar title for the SSO onboarding screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Link Your Account'**
+  String get ssoOnboardingTitle;
+
+  /// Tab label for linking an existing Sure account via SSO.
+  ///
+  /// In en, this message translates to:
+  /// **'Link existing'**
+  String get ssoOnboardingTabLink;
+
+  /// Tab label for creating a new Sure account via SSO.
+  ///
+  /// In en, this message translates to:
+  /// **'Create new'**
+  String get ssoOnboardingTabCreate;
+
+  /// Label for the first-name field on the SSO onboarding screen.
+  ///
+  /// In en, this message translates to:
+  /// **'First Name'**
+  String get ssoOnboardingFirstNameLabel;
+
+  /// Label for the last-name field on the SSO onboarding screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Last Name'**
+  String get ssoOnboardingLastNameLabel;
+
+  /// Button label to link an existing account.
+  ///
+  /// In en, this message translates to:
+  /// **'Link Account'**
+  String get ssoOnboardingLinkButton;
+
+  /// Button label to create a new account.
+  ///
+  /// In en, this message translates to:
+  /// **'Create Account'**
+  String get ssoOnboardingCreateButton;
+
+  /// Tab and submit button label when the user has a pending household invitation to accept.
+  ///
+  /// In en, this message translates to:
+  /// **'Accept Invitation'**
+  String get ssoOnboardingAcceptInvitation;
+
+  /// App bar title for the account calendar screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Account Calendar'**
+  String get calendarTitle;
+
+  /// Section header for the account-type selector on the calendar screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Account Type'**
+  String get calendarAccountTypeSection;
+
+  /// Segment label for asset-type accounts on the calendar.
+  ///
+  /// In en, this message translates to:
+  /// **'Assets'**
+  String get calendarSegmentAssets;
+
+  /// Segment label for liability-type accounts on the calendar.
+  ///
+  /// In en, this message translates to:
+  /// **'Liabilities'**
+  String get calendarSegmentLiabilities;
+
+  /// Placeholder shown in the account dropdown when none is selected.
+  ///
+  /// In en, this message translates to:
+  /// **'Select Account'**
+  String get calendarSelectAccount;
+
+  /// Label for the monthly-change metric on the calendar screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Monthly Change'**
+  String get calendarMonthlyChange;
+
+  /// Empty-state message when no transactions exist for the selected day.
+  ///
+  /// In en, this message translates to:
+  /// **'No transactions on this day'**
+  String get calendarNoTransactions;
+
+  /// Menu item title for Account Calendar in the More screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Account Calendar'**
+  String get moreCalendar;
+
+  /// Subtitle for the Account Calendar menu item in the More screen.
+  ///
+  /// In en, this message translates to:
+  /// **'View monthly balance changes by account'**
+  String get moreCalendarSubtitle;
+
+  /// Menu item title for Recent Transactions in the More screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Recent Transactions'**
+  String get moreRecentTransactions;
+
+  /// Subtitle for the Recent Transactions menu item.
+  ///
+  /// In en, this message translates to:
+  /// **'View recent transactions across all accounts'**
+  String get moreRecentTransactionsSubtitle;
+
+  /// Heading shown on the biometric lock screen.
+  ///
+  /// In en, this message translates to:
+  /// **'App Locked'**
+  String get biometricTitle;
+
+  /// Subtitle shown on the biometric lock screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Authenticate to continue'**
+  String get biometricSubtitle;
+
+  /// Button label when biometric prompt is ready.
+  ///
+  /// In en, this message translates to:
+  /// **'Unlock'**
+  String get biometricUnlock;
+
+  /// Button label while the biometric prompt is in progress.
+  ///
+  /// In en, this message translates to:
+  /// **'Authenticating…'**
+  String get biometricAuthenticating;
+
+  /// Button to log out from the biometric lock screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Log out'**
+  String get biometricLogOut;
+
+  /// Headline on the backend configuration screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Configuration'**
+  String get backendConfigTitle;
+
+  /// Subtitle below the headline on the backend configuration screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Update your Sure server URL'**
+  String get backendConfigSubtitle;
+
+  /// Label for the example URLs info box on the config screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Example URLs'**
+  String get backendConfigExampleUrlsLabel;
+
+  /// Label for the server URL field on the config screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Sure server URL'**
+  String get backendConfigUrlLabel;
+
+  /// Hint text for the server URL field.
+  ///
+  /// In en, this message translates to:
+  /// **'https://app.sure.am'**
+  String get backendConfigUrlHint;
+
+  /// Label for the custom proxy headers section on the config screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Custom proxy headers'**
+  String get backendConfigProxyHeadersLabel;
+
+  /// Subtitle for the proxy headers expansion tile when no headers are configured.
+  ///
+  /// In en, this message translates to:
+  /// **'Optional headers for a reverse proxy or auth gateway'**
+  String get backendConfigProxyHeadersSubtitle;
+
+  /// Subtitle for the proxy headers expansion tile when headers are configured.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} configured'**
+  String backendConfigProxyHeadersCount(int count);
+
+  /// Label on the test-connection button while the test is in progress.
+  ///
+  /// In en, this message translates to:
+  /// **'Testing…'**
+  String get backendConfigTesting;
+
+  /// Button label to test the server connection.
+  ///
+  /// In en, this message translates to:
+  /// **'Test Connection'**
+  String get backendConfigTestButton;
+
+  /// Button label to proceed after saving configuration.
+  ///
+  /// In en, this message translates to:
+  /// **'Continue'**
+  String get backendConfigContinueButton;
+
+  /// Helper text below the config form.
+  ///
+  /// In en, this message translates to:
+  /// **'You can change this later in the settings.'**
+  String get backendConfigChangeHint;
+
+  /// App bar title for the recent transactions screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Recent Transactions'**
+  String get recentTransactionsTitle;
+
+  /// Empty-state message on the recent transactions screen.
+  ///
+  /// In en, this message translates to:
+  /// **'No Transactions'**
+  String get recentTransactionsEmpty;
+
+  /// Tooltip for the display-limit popup menu on the recent transactions screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Display Limit'**
+  String get recentTransactionsDisplayLimit;
+
+  /// Menu item label to show N recent transactions.
+  ///
+  /// In en, this message translates to:
+  /// **'Show {count}'**
+  String recentTransactionsShowN(int count);
+
+  /// Empty-state subtitle prompting the user to pull to refresh.
+  ///
+  /// In en, this message translates to:
+  /// **'Pull to refresh'**
+  String get recentTransactionsPullToRefresh;
+
+  /// App bar title for the log viewer screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Debug Logs'**
+  String get logViewerTitle;
+
+  /// Log level filter chip: show all log entries.
+  ///
+  /// In en, this message translates to:
+  /// **'All'**
+  String get logViewerFilterAll;
+
+  /// Log level filter chip: show info entries only.
+  ///
+  /// In en, this message translates to:
+  /// **'Info'**
+  String get logViewerFilterInfo;
+
+  /// Log level filter chip: show warning entries only.
+  ///
+  /// In en, this message translates to:
+  /// **'Warning'**
+  String get logViewerFilterWarning;
+
+  /// Log level filter chip: show error entries only.
+  ///
+  /// In en, this message translates to:
+  /// **'Error'**
+  String get logViewerFilterError;
+
+  /// Log level filter chip: show debug entries only.
+  ///
+  /// In en, this message translates to:
+  /// **'Debug'**
+  String get logViewerFilterDebug;
+
+  /// Tooltip for the auto-scroll toggle button when auto-scroll is off.
+  ///
+  /// In en, this message translates to:
+  /// **'Enable auto-scroll'**
+  String get logViewerAutoScrollEnable;
+
+  /// Tooltip for the auto-scroll toggle button when auto-scroll is on.
+  ///
+  /// In en, this message translates to:
+  /// **'Disable auto-scroll'**
+  String get logViewerAutoScrollDisable;
+
+  /// Tooltip for the copy-logs action button.
+  ///
+  /// In en, this message translates to:
+  /// **'Copy logs'**
+  String get logViewerCopyLogs;
+
+  /// Tooltip for the clear-logs action button.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear logs'**
+  String get logViewerClearLogs;
+
+  /// Snackbar message after logs are copied to the clipboard.
+  ///
+  /// In en, this message translates to:
+  /// **'Logs copied to clipboard'**
+  String get logViewerLogsCopied;
+
+  /// Empty-state message shown when there are no log entries to display.
+  ///
+  /// In en, this message translates to:
+  /// **'No logs yet'**
+  String get logViewerEmpty;
+
+  /// Message shown in the connectivity banner when the device has no network.
+  ///
+  /// In en, this message translates to:
+  /// **'You are offline'**
+  String get connectivityOffline;
+
+  /// Connectivity banner message showing how many transactions are queued for sync.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, one{{count} transaction pending sync} other{{count} transactions pending sync}}'**
+  String connectivityPendingSync(int count);
+
+  /// Button label in the connectivity banner to trigger an immediate sync.
+  ///
+  /// In en, this message translates to:
+  /// **'Sync Now'**
+  String get connectivitySyncNow;
+
+  /// Button label to add a new custom proxy header.
+  ///
+  /// In en, this message translates to:
+  /// **'Add header'**
+  String get proxyHeadersAddHeader;
+
+  /// Label for the header-name input field.
+  ///
+  /// In en, this message translates to:
+  /// **'Header name'**
+  String get proxyHeadersNameLabel;
+
+  /// Hint text for the header-name input (example header name).
+  ///
+  /// In en, this message translates to:
+  /// **'X-Auth-Token'**
+  String get proxyHeadersNameHint;
+
+  /// Label for the header-value input field.
+  ///
+  /// In en, this message translates to:
+  /// **'Header value'**
+  String get proxyHeadersValueLabel;
+
+  /// Tooltip for the remove-header icon button.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove header'**
+  String get proxyHeadersRemove;
+
+  /// Tooltip for the refresh button on the account detail header.
+  ///
+  /// In en, this message translates to:
+  /// **'Refresh account details'**
+  String get accountDetailRefreshTooltip;
+
+  /// Section heading for the balance history chart in the account detail header.
+  ///
+  /// In en, this message translates to:
+  /// **'Recent balance history'**
+  String get accountDetailRecentBalanceHistory;
+
+  /// Section heading for the top holdings list in the account detail header.
+  ///
+  /// In en, this message translates to:
+  /// **'Top holdings'**
+  String get accountDetailTopHoldings;
+
+  /// Fallback label when a holding has no name.
+  ///
+  /// In en, this message translates to:
+  /// **'Holding'**
+  String get accountDetailHoldingFallback;
+
+  /// Label for the cash position chip in the account detail header.
+  ///
+  /// In en, this message translates to:
+  /// **'Cash {amount}'**
+  String accountDetailCashChip(String amount);
+
+  /// Snackbar shown on the biometric lock screen when authentication fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Authentication failed. Tap Unlock to try again.'**
+  String get biometricLockFailedRetry;
+
+  /// Reason shown in the system biometric prompt when enabling app lock from settings.
+  ///
+  /// In en, this message translates to:
+  /// **'Verify biometric to enable app lock'**
+  String get settingsBiometricVerifyReason;
+
+  /// Snackbar shown when biometric verification fails while enabling app lock.
+  ///
+  /// In en, this message translates to:
+  /// **'Biometric authentication failed.'**
+  String get settingsBiometricFailed;
+
+  /// Snackbar shown when the app store update link cannot be opened.
+  ///
+  /// In en, this message translates to:
+  /// **'Unable to open store link'**
+  String get settingsUpdateOpenStoreError;
+
+  /// Snackbar shown when clearing local data fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to clear local data.'**
+  String get settingsClearDataFailed;
+
+  /// Snackbar shown after local data is cleared, prompting the user to pull to refresh.
+  ///
+  /// In en, this message translates to:
+  /// **'Local data cleared successfully. Pull to refresh to sync from server.'**
+  String get settingsClearDataSuccessDetailed;
+
+  /// Snackbar shown when the contact/Discord link cannot be opened.
+  ///
+  /// In en, this message translates to:
+  /// **'Unable to open link'**
+  String get settingsContactOpenLinkError;
+
+  /// Body text for the reset-account confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Resetting your account will delete all your accounts, categories, merchants, tags, and other data, but keep your user account intact.\n\nThis action cannot be undone. Are you sure?'**
+  String get settingsResetAccountContent;
+
+  /// Title and confirm button label for the reset-account action.
+  ///
+  /// In en, this message translates to:
+  /// **'Reset Account'**
+  String get settingsResetAccount;
+
+  /// Snackbar shown after an account reset is initiated.
+  ///
+  /// In en, this message translates to:
+  /// **'Account reset has been initiated. This may take a moment.'**
+  String get settingsResetAccountInitiated;
+
+  /// Snackbar shown when resetting the account fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to reset account'**
+  String get settingsResetAccountFailed;
+
+  /// Body text for the delete-account confirmation dialog on the settings screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Deleting your account will permanently remove all your data and cannot be undone.\n\nAre you sure you want to delete your account?'**
+  String get settingsDeleteAccountConfirmContent;
+
+  /// Snackbar shown when deleting the account fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to delete account'**
+  String get settingsDeleteAccountFailed;
+
+  /// Explanatory note shown in the custom proxy headers dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Headers are sent by the app with API requests. External browser SSO pages may not receive them.'**
+  String get settingsProxyHeadersNote;
+
+  /// Snackbar shown after custom proxy headers are saved.
+  ///
+  /// In en, this message translates to:
+  /// **'Custom proxy headers saved'**
+  String get settingsProxyHeadersSaved;
+
+  /// Snackbar shown when saving custom proxy headers fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to save custom proxy headers.'**
+  String get settingsProxyHeadersSaveFailed;
+
+  /// App version list tile title on the settings screen.
+  ///
+  /// In en, this message translates to:
+  /// **'App Version: {version}'**
+  String settingsAppVersion(String version);
+
+  /// Subtitle for the check-for-updates list tile.
+  ///
+  /// In en, this message translates to:
+  /// **'See if a newer version is available'**
+  String get settingsCheckForUpdatesSubtitle;
+
+  /// Title for the contact-us list tile on the settings screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Contact us'**
+  String get settingsContactUs;
+
+  /// Accessibility label for the debug logs list tile.
+  ///
+  /// In en, this message translates to:
+  /// **'Open debug logs'**
+  String get settingsDebugLogsSemantics;
+
+  /// Subtitle for the debug logs list tile.
+  ///
+  /// In en, this message translates to:
+  /// **'View app diagnostic logs'**
+  String get settingsDebugLogsSubtitle;
+
+  /// Title for the group-by-account-type toggle on the settings screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Group by Account Type'**
+  String get settingsGroupByAccountType;
+
+  /// Subtitle for the group-by-account-type toggle.
+  ///
+  /// In en, this message translates to:
+  /// **'Group accounts by type (Crypto, Bank, etc.)'**
+  String get settingsGroupByAccountTypeSubtitle;
+
+  /// Title for the custom proxy headers list tile on the settings screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Custom proxy headers'**
+  String get settingsProxyHeadersTileTitle;
+
+  /// Subtitle for the custom proxy headers list tile when no headers are configured.
+  ///
+  /// In en, this message translates to:
+  /// **'Optional headers for a reverse proxy or auth gateway'**
+  String get settingsProxyHeadersTileSubtitleEmpty;
+
+  /// Subtitle for the custom proxy headers list tile when headers are configured.
+  ///
+  /// In en, this message translates to:
+  /// **'{count} configured'**
+  String settingsProxyHeadersTileSubtitleCount(int count);
+
+  /// Subtitle for the clear-local-data list tile.
+  ///
+  /// In en, this message translates to:
+  /// **'Remove all cached transactions and accounts'**
+  String get settingsClearDataTileSubtitle;
+
+  /// Subtitle for the reset-account list tile in the danger zone.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete all accounts, categories, merchants, and tags but keep your user account'**
+  String get settingsResetAccountTileSubtitle;
+
+  /// Subtitle for the delete-account list tile in the danger zone.
+  ///
+  /// In en, this message translates to:
+  /// **'Permanently remove all your data. This cannot be undone.'**
+  String get settingsDeleteAccountTileSubtitle;
+
+  /// Fallback display name when the user has no name set.
+  ///
+  /// In en, this message translates to:
+  /// **'User'**
+  String get settingsUserFallback;
+
+  /// Body text for the multi-chat delete confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'{count, plural, one{Delete {count} chat? This cannot be undone.} other{Delete {count} chats? This cannot be undone.}}'**
+  String chatListDeleteMultiContent(int count);
+
+  /// Snackbar shown after multiple chats are deleted.
+  ///
+  /// In en, this message translates to:
+  /// **'Chats deleted'**
+  String get chatListDeletedSuccess;
+
+  /// Snackbar shown when deleting multiple chats fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to delete chats'**
+  String get chatListDeleteFailed;
+
+  /// Error-state heading on the chat list screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to load chats'**
+  String get chatListError;
+
+  /// Relative time label for very recent chats.
+  ///
+  /// In en, this message translates to:
+  /// **'Just now'**
+  String get chatListJustNow;
+
+  /// Body text for the single-chat delete confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure you want to delete \"{title}\"?'**
+  String chatListDeleteSingleContent(String title);
+
+  /// Snackbar shown when the sign-up page cannot be opened.
+  ///
+  /// In en, this message translates to:
+  /// **'Unable to open sign up page'**
+  String get loginSignUpOpenError;
+
+  /// Title for the API key login dialog on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'API Key Login'**
+  String get loginApiKeyDialogTitle;
+
+  /// Body text for the API key login dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter your API key to sign in.'**
+  String get loginApiKeyDialogBody;
+
+  /// Fallback error shown when an API key login fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Invalid API key'**
+  String get loginApiKeyInvalid;
+
+  /// Sign-in button label in the API key login dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign In'**
+  String get loginApiKeySignIn;
+
+  /// Leading text before the Sign Up link on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Demo account or '**
+  String get loginDemoOrSignUpPrefix;
+
+  /// Tappable Sign Up link text on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Sign Up'**
+  String get loginSignUpLink;
+
+  /// Trailing punctuation after the Sign Up link on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'!'**
+  String get loginSignUpSuffix;
+
+  /// Info banner shown when MFA is required during login.
+  ///
+  /// In en, this message translates to:
+  /// **'Two-factor authentication is enabled. Enter your code.'**
+  String get loginMfaInfo;
+
+  /// Validation error when the MFA code field is empty.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter your authentication code'**
+  String get loginMfaCodeRequired;
+
+  /// Divider label between primary and alternate sign-in options.
+  ///
+  /// In en, this message translates to:
+  /// **'or'**
+  String get loginOrDivider;
+
+  /// Heading above the displayed server URL on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Sure server URL:'**
+  String get loginServerUrlHeading;
+
+  /// Button label to open the API key login dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'API-Key Login'**
+  String get loginApiKeyLoginButton;
+
+  /// Tooltip for the backend settings button on the login screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Backend Settings'**
+  String get loginBackendSettingsTooltip;
+
+  /// Snackbar shown when the session expires while editing a transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Session expired. Please login again.'**
+  String get transactionEditSessionExpired;
+
+  /// Snackbar shown after a transaction is updated successfully.
+  ///
+  /// In en, this message translates to:
+  /// **'Transaction updated'**
+  String get transactionEditUpdated;
+
+  /// Fallback snackbar shown when updating a transaction fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to update transaction'**
+  String get transactionEditUpdateFailed;
+
+  /// Validation error when the transaction name exceeds the maximum length.
+  ///
+  /// In en, this message translates to:
+  /// **'Name must be {max} characters or fewer'**
+  String transactionEditNameMaxLength(int max);
+
+  /// Validation error when the transaction name contains control characters.
+  ///
+  /// In en, this message translates to:
+  /// **'Name contains unsupported characters'**
+  String get transactionEditNameInvalidChars;
+
+  /// Validation error when the notes exceed the maximum length.
+  ///
+  /// In en, this message translates to:
+  /// **'Notes must be {max} characters or fewer'**
+  String transactionEditNotesMaxLength(int max);
+
+  /// Validation error when the notes contain control characters.
+  ///
+  /// In en, this message translates to:
+  /// **'Notes contain unsupported characters'**
+  String get transactionEditNotesInvalidChars;
+
+  /// Dropdown option representing no selected category in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'No category'**
+  String get transactionEditNoCategory;
+
+  /// Fallback dropdown label for the currently selected category when its name is unknown.
+  ///
+  /// In en, this message translates to:
+  /// **'Current category'**
+  String get transactionEditCurrentCategory;
+
+  /// Dropdown option representing no selected merchant in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'No merchant'**
+  String get transactionEditNoMerchant;
+
+  /// Fallback dropdown label for the currently selected merchant when its name is unknown.
+  ///
+  /// In en, this message translates to:
+  /// **'Current merchant'**
+  String get transactionEditCurrentMerchant;
+
+  /// Message shown when no tags are available to select in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'No tags available'**
+  String get transactionEditNoTags;
+
+  /// Fallback label for a selected tag whose name is unknown.
+  ///
+  /// In en, this message translates to:
+  /// **'Unknown tag'**
+  String get transactionEditUnknownTag;
+
+  /// Notice shown when a transaction cannot be edited because it is not yet synced.
+  ///
+  /// In en, this message translates to:
+  /// **'Only synced transactions can be edited from mobile.'**
+  String get transactionEditSyncedOnly;
+
+  /// Helper text under the category dropdown in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose a replacement category'**
+  String get transactionEditCategoryHelper;
+
+  /// Helper text under the merchant dropdown in the edit form.
+  ///
+  /// In en, this message translates to:
+  /// **'Choose a replacement merchant'**
+  String get transactionEditMerchantHelper;
+
+  /// Snackbar shown when the session expires while creating a transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Session expired. Please login again.'**
+  String get transactionFormSessionExpired;
+
+  /// Validation error when the amount field is empty in the create form.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter an amount'**
+  String get transactionFormAmountRequiredPrompt;
+
+  /// Validation error when the amount is not a valid number.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter a valid number'**
+  String get transactionFormAmountInvalidNumber;
+
+  /// Validation error when the amount is zero or negative.
+  ///
+  /// In en, this message translates to:
+  /// **'Amount must be greater than 0'**
+  String get transactionFormAmountTooSmall;
+
+  /// Snackbar shown after a transaction is created while online.
+  ///
+  /// In en, this message translates to:
+  /// **'Transaction created successfully'**
+  String get transactionFormCreateSuccessOnline;
+
+  /// Snackbar shown after a transaction is saved while offline.
+  ///
+  /// In en, this message translates to:
+  /// **'Transaction saved (will sync when online)'**
+  String get transactionFormCreateSuccessOffline;
+
+  /// Snackbar shown when creating a transaction fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to create transaction'**
+  String get transactionFormCreateFailed;
+
+  /// Snackbar shown when an unexpected error occurs while creating a transaction.
+  ///
+  /// In en, this message translates to:
+  /// **'Error: {error}'**
+  String transactionFormGenericError(String error);
+
+  /// Toggle label to hide the optional transaction fields.
+  ///
+  /// In en, this message translates to:
+  /// **'Less'**
+  String get transactionFormLess;
+
+  /// Toggle label to show the optional transaction fields.
+  ///
+  /// In en, this message translates to:
+  /// **'More'**
+  String get transactionFormMore;
+
+  /// Helper text for the date field in the create form.
+  ///
+  /// In en, this message translates to:
+  /// **'Optional (default: today)'**
+  String get transactionFormDateHelper;
+
+  /// Helper text for the name field in the create form.
+  ///
+  /// In en, this message translates to:
+  /// **'Optional (default: SureApp)'**
+  String get transactionFormNameHelper;
+
+  /// Placeholder shown while categories are loading in the create form.
+  ///
+  /// In en, this message translates to:
+  /// **'Loading categories…'**
+  String get transactionFormCategoryLoading;
+
+  /// Helper text for the category dropdown in the create form.
+  ///
+  /// In en, this message translates to:
+  /// **'Optional'**
+  String get transactionFormCategoryHelper;
+
+  /// Dropdown option representing no selected category in the create form.
+  ///
+  /// In en, this message translates to:
+  /// **'No category'**
+  String get transactionFormNoCategory;
+
+  /// Submit button label on the create-transaction form.
+  ///
+  /// In en, this message translates to:
+  /// **'Create Transaction'**
+  String get transactionFormCreateButton;
+
+  /// Helper text under the amount field indicating it is required.
+  ///
+  /// In en, this message translates to:
+  /// **'Required'**
+  String get transactionFormAmountHelper;
+
+  /// Body text for the clear-logs confirmation dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure you want to clear all logs?'**
+  String get logViewerClearConfirm;
+
+  /// Confirm button label in the clear-logs dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear'**
+  String get logViewerClear;
+
+  /// Title for the edit-chat-title dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Edit Title'**
+  String get chatConversationEditTitle;
+
+  /// Label for the chat title input field in the edit dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Chat Title'**
+  String get chatConversationTitleLabel;
+
+  /// Tooltip for the refresh button in the chat conversation screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Refresh'**
+  String get chatConversationRefreshTooltip;
+
+  /// Error-state heading when a chat fails to load.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to load chat'**
+  String get chatConversationLoadError;
+
+  /// Title for the dialog prompting the user to enable AI chat.
+  ///
+  /// In en, this message translates to:
+  /// **'Turn on AI Chat?'**
+  String get navEnableAiChatTitle;
+
+  /// Body text for the enable-AI-chat dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'AI Chat is currently disabled in your account settings. Would you like to turn it on now?'**
+  String get navEnableAiChatContent;
+
+  /// Dismiss button in the enable-AI-chat dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Not now'**
+  String get navEnableAiChatNotNow;
+
+  /// Confirm button in the enable-AI-chat dialog.
+  ///
+  /// In en, this message translates to:
+  /// **'Turn on AI'**
+  String get navEnableAiChatConfirm;
+
+  /// Snackbar shown when enabling AI chat fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Unable to enable AI right now.'**
+  String get navEnableAiChatFailed;
+
+  /// Tooltip for the edit button on a transaction row.
+  ///
+  /// In en, this message translates to:
+  /// **'Edit transaction'**
+  String get transactionsListEditTooltip;
+
+  /// Snackbar shown when trying to sync without being signed in.
+  ///
+  /// In en, this message translates to:
+  /// **'Please sign in to sync transactions'**
+  String get connectivitySignInToSync;
+
+  /// Snackbar shown after transactions sync successfully.
+  ///
+  /// In en, this message translates to:
+  /// **'Transactions synced successfully'**
+  String get connectivitySyncSuccess;
+
+  /// Snackbar shown when a manual sync fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to sync transactions. Please try again.'**
+  String get connectivitySyncFailed;
+
+  /// Snackbar shown when authentication fails during a manual sync.
+  ///
+  /// In en, this message translates to:
+  /// **'Unable to authenticate. Please try again.'**
+  String get connectivityAuthFailed;
+
+  /// Header text on the SSO onboarding screen showing the signed-in Google email.
+  ///
+  /// In en, this message translates to:
+  /// **'Signed in as {email}'**
+  String ssoOnboardingSignedInAs(String email);
+
+  /// Header text on the SSO onboarding screen when the Google email is unknown.
+  ///
+  /// In en, this message translates to:
+  /// **'Google account verified'**
+  String get ssoOnboardingGoogleVerified;
+
+  /// Explanatory note on the link-existing form prompting the user to enter their credentials.
+  ///
+  /// In en, this message translates to:
+  /// **'Enter your existing account credentials to link with Google Sign-In.'**
+  String get ssoOnboardingLinkCredentialsNote;
+
+  /// Explanatory note on the create form when the user has a pending household invitation.
+  ///
+  /// In en, this message translates to:
+  /// **'You have a pending invitation. Accept it to join an existing household.'**
+  String get ssoOnboardingPendingInvitationNote;
+
+  /// Explanatory note on the create form when creating a brand-new account via Google.
+  ///
+  /// In en, this message translates to:
+  /// **'Create a new account using your Google identity.'**
+  String get ssoOnboardingCreateIdentityNote;
+
+  /// Validation error when the first-name field is empty on the SSO onboarding screen.
+  ///
+  /// In en, this message translates to:
+  /// **'First name is required'**
+  String get ssoOnboardingFirstNameRequired;
+
+  /// Validation error when the last-name field is empty on the SSO onboarding screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Last name is required'**
+  String get ssoOnboardingLastNameRequired;
+
+  /// Error shown when the connection test times out.
+  ///
+  /// In en, this message translates to:
+  /// **'Connection timeout. Please check the URL and try again.'**
+  String get backendConfigTimeout;
+
+  /// Message shown when the connection test succeeds.
+  ///
+  /// In en, this message translates to:
+  /// **'Connection successful!'**
+  String get backendConfigSuccess;
+
+  /// Error shown when the server returns a non-success status during the connection test.
+  ///
+  /// In en, this message translates to:
+  /// **'Server responded with status {code}. Please check if this is a Sure backend server.'**
+  String backendConfigServerError(int code);
+
+  /// Error shown when the connection test fails with an exception.
+  ///
+  /// In en, this message translates to:
+  /// **'Connection failed: {error}'**
+  String backendConfigConnectionFailed(String error);
+
+  /// Error shown when saving the backend URL fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to save URL: {error}'**
+  String backendConfigSaveFailed(String error);
+
+  /// Validation error when the backend URL field is empty.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter a backend URL'**
+  String get backendConfigUrlRequired;
+
+  /// Validation error when the backend URL is missing an http(s) scheme.
+  ///
+  /// In en, this message translates to:
+  /// **'URL must start with http:// or https://'**
+  String get backendConfigUrlScheme;
+
+  /// Validation error when the backend URL is malformed.
+  ///
+  /// In en, this message translates to:
+  /// **'Please enter a valid URL'**
+  String get backendConfigUrlInvalid;
+
+  /// Helper text below the custom proxy headers section on the backend config screen.
+  ///
+  /// In en, this message translates to:
+  /// **'Headers are sent by the app with API requests. External browser SSO pages may not receive them.'**
+  String get backendConfigHeadersHelp;
+
+  /// Fallback label when a transaction's account cannot be resolved.
+  ///
+  /// In en, this message translates to:
+  /// **'Unknown Account'**
+  String get recentTransactionsUnknownAccount;
+
+  /// Error message shown when account detail and balances both fail to load.
+  ///
+  /// In en, this message translates to:
+  /// **'Account details are temporarily unavailable'**
+  String get accountDetailUnavailable;
+
+  /// Relative time label for a chat updated some minutes ago.
+  ///
+  /// In en, this message translates to:
+  /// **'{minutes}m ago'**
+  String chatListMinutesAgo(int minutes);
+
+  /// Relative time label for a chat updated some hours ago.
+  ///
+  /// In en, this message translates to:
+  /// **'{hours}h ago'**
+  String chatListHoursAgo(int hours);
+
+  /// Relative time label for a chat updated some days ago.
+  ///
+  /// In en, this message translates to:
+  /// **'{days}d ago'**
+  String chatListDaysAgo(int days);
+
+  /// Fallback snackbar shown when creating a new conversation from the first message fails.
+  ///
+  /// In en, this message translates to:
+  /// **'Failed to start conversation. Please try again.'**
+  String get chatConversationStartFailed;
+}
+
+class _AppLocalizationsDelegate
+    extends LocalizationsDelegate<AppLocalizations> {
+  const _AppLocalizationsDelegate();
+
+  @override
+  Future<AppLocalizations> load(Locale locale) {
+    return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
+  }
+
+  @override
+  bool isSupported(Locale locale) =>
+      <String>['en'].contains(locale.languageCode);
+
+  @override
+  bool shouldReload(_AppLocalizationsDelegate old) => false;
+}
+
+AppLocalizations lookupAppLocalizations(Locale locale) {
+  // Lookup logic when only language code is specified.
+  switch (locale.languageCode) {
+    case 'en':
+      return AppLocalizationsEn();
+  }
+
+  throw FlutterError(
+      'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+      'an issue with the localizations generation tool. Please file an issue '
+      'on GitHub with a reproducible sample app and the gen-l10n configuration '
+      'that was used.');
+}
diff --git a/mobile/lib/l10n/app_localizations_en.dart b/mobile/lib/l10n/app_localizations_en.dart
new file mode 100644
index 000000000..9ab333828
--- /dev/null
+++ b/mobile/lib/l10n/app_localizations_en.dart
@@ -0,0 +1,1033 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for English (`en`).
+class AppLocalizationsEn extends AppLocalizations {
+  AppLocalizationsEn([String locale = 'en']) : super(locale);
+
+  @override
+  String get appTitle => 'Sure Finances';
+
+  @override
+  String get commonCancel => 'Cancel';
+
+  @override
+  String get commonSave => 'Save';
+
+  @override
+  String get commonTryAgain => 'Try Again';
+
+  @override
+  String get commonDelete => 'Delete';
+
+  @override
+  String get commonAll => 'All';
+
+  @override
+  String get commonRefresh => 'Refresh';
+
+  @override
+  String get commonClose => 'Close';
+
+  @override
+  String get commonUndo => 'Undo';
+
+  @override
+  String get chatSuggestionNetWorth => 'What is my current net worth?';
+
+  @override
+  String get chatSuggestionSpending =>
+      'How has my spending changed this month?';
+
+  @override
+  String get chatSuggestionSavings => 'How can I improve my savings rate?';
+
+  @override
+  String get chatSuggestionExpenses => 'What are my biggest expenses lately?';
+
+  @override
+  String get loginEmailLabel => 'Email';
+
+  @override
+  String get loginEmailRequired => 'Email is required';
+
+  @override
+  String get loginEmailInvalid => 'Please enter a valid email';
+
+  @override
+  String get loginPasswordLabel => 'Password';
+
+  @override
+  String get loginPasswordRequired => 'Password is required';
+
+  @override
+  String get loginSignIn => 'Sign in';
+
+  @override
+  String get loginSignInWithGoogle => 'Sign in with Google';
+
+  @override
+  String get loginMfaLabel => 'Authentication Code';
+
+  @override
+  String get loginApiKeyLabel => 'API Key';
+
+  @override
+  String get navHome => 'Home';
+
+  @override
+  String get navIntro => 'Intro';
+
+  @override
+  String get navAssistant => 'Assistant';
+
+  @override
+  String get navMore => 'More';
+
+  @override
+  String get dashboardSyncError => 'Sync failed';
+
+  @override
+  String get dashboardSyncFailed => 'Sync failed. Please try again.';
+
+  @override
+  String get dashboardRefreshing => 'Refreshing accounts…';
+
+  @override
+  String get dashboardAccountsUpdated => 'Accounts updated';
+
+  @override
+  String get dashboardSyncing => 'Syncing data from server…';
+
+  @override
+  String get dashboardSynced => 'Synced';
+
+  @override
+  String get dashboardErrorLoadingAccounts => 'Failed to load accounts';
+
+  @override
+  String get dashboardNoAccounts => 'No accounts yet';
+
+  @override
+  String get dashboardNoAccountsSubtitle =>
+      'Add accounts in the web app to see them here.';
+
+  @override
+  String get dashboardFilterEmpty => 'No accounts match the current filter';
+
+  @override
+  String get chatListTitle => 'Chats';
+
+  @override
+  String get chatListNewChat => 'New chat';
+
+  @override
+  String get chatListEmpty => 'No chats yet';
+
+  @override
+  String get chatListEmptySubtitle =>
+      'Start a conversation with your AI assistant';
+
+  @override
+  String get chatListDeleteTitle => 'Delete Chat';
+
+  @override
+  String get chatConversationNewTitle => 'New Conversation';
+
+  @override
+  String get chatConversationMessageHint => 'Ask anything about your finances…';
+
+  @override
+  String chatConversationGreetingWithName(String firstName) {
+    return 'Hi $firstName, how can I help?';
+  }
+
+  @override
+  String get chatConversationGreetingNoName => 'Hi there, how can I help?';
+
+  @override
+  String get transactionFormNewTitle => 'New Transaction';
+
+  @override
+  String get transactionFormTypeLabel => 'Type';
+
+  @override
+  String get transactionFormTypeExpense => 'Expense';
+
+  @override
+  String get transactionFormTypeIncome => 'Income';
+
+  @override
+  String get transactionFormAmountLabel => 'Amount';
+
+  @override
+  String get transactionFormAmountRequired => 'Amount is required';
+
+  @override
+  String get transactionFormAmountInvalid => 'Please enter a valid amount';
+
+  @override
+  String get transactionFormDateLabel => 'Date';
+
+  @override
+  String get transactionFormNameLabel => 'Name';
+
+  @override
+  String get transactionFormCategoryLabel => 'Category';
+
+  @override
+  String get transactionEditTitle => 'Edit Transaction';
+
+  @override
+  String get transactionEditNameLabel => 'Name';
+
+  @override
+  String get transactionEditNameRequired => 'Name is required';
+
+  @override
+  String get transactionEditNotesLabel => 'Notes';
+
+  @override
+  String get transactionEditCategoryLabel => 'Category';
+
+  @override
+  String get transactionEditMerchantLabel => 'Merchant';
+
+  @override
+  String get transactionEditTagsLabel => 'Tags';
+
+  @override
+  String get transactionEditSaving => 'Saving…';
+
+  @override
+  String get transactionsListDeleteTitle => 'Delete Transaction';
+
+  @override
+  String transactionsListDeleteSingleContent(String name) {
+    return 'Are you sure you want to delete \"$name\"?';
+  }
+
+  @override
+  String get transactionsListDeleteMultiTitle => 'Delete Transactions';
+
+  @override
+  String get transactionsListDeleteMultiContent =>
+      'Are you sure you want to delete the selected transactions?';
+
+  @override
+  String get transactionsListEmpty => 'No transactions';
+
+  @override
+  String get transactionsListAuthFailed =>
+      'Authentication failed: Please log in again';
+
+  @override
+  String get transactionsListNoTransactionsYet => 'No transactions yet';
+
+  @override
+  String get transactionsListEmptyAddFirst =>
+      'Tap + to add your first transaction';
+
+  @override
+  String get transactionsListNoCategoryMatch =>
+      'No transactions match this category';
+
+  @override
+  String get transactionsListRetry => 'Retry';
+
+  @override
+  String get transactionsListDeletedSuccess => 'Transaction deleted';
+
+  @override
+  String get transactionsListSingleDeleteFailed =>
+      'Failed to delete transaction';
+
+  @override
+  String transactionsListDeletedMulti(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Deleted $count transactions',
+      one: 'Deleted $count transaction',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get transactionsListDeleteFailed => 'Failed to delete transactions';
+
+  @override
+  String get transactionsListDeleteNoToken =>
+      'Failed to delete: No access token';
+
+  @override
+  String get transactionsListUndoTitle => 'Undo Transaction';
+
+  @override
+  String get transactionsListUndoRemovePending =>
+      'Remove this pending transaction?';
+
+  @override
+  String get transactionsListUndoRestoreConfirm => 'Restore this transaction?';
+
+  @override
+  String get transactionsListUndoPendingRemoved =>
+      'Pending transaction removed';
+
+  @override
+  String get transactionsListUndoRestored => 'Transaction restored';
+
+  @override
+  String get transactionsListUndoFailed => 'Failed to undo transaction';
+
+  @override
+  String get settingsSectionDisplay => 'Display';
+
+  @override
+  String get settingsSectionConnection => 'Connection';
+
+  @override
+  String get settingsSectionDataManagement => 'Data Management';
+
+  @override
+  String get settingsSectionSecurity => 'Security';
+
+  @override
+  String get settingsSectionDangerZone => 'Danger Zone';
+
+  @override
+  String get settingsThemeLabel => 'Theme';
+
+  @override
+  String get settingsThemeSystem => 'System';
+
+  @override
+  String get settingsThemeLight => 'Light';
+
+  @override
+  String get settingsThemeDark => 'Dark';
+
+  @override
+  String get settingsProxyHeadersLabel => 'Custom Proxy Headers';
+
+  @override
+  String get settingsPrivacyHideAmountsLabel => 'Hide amounts';
+
+  @override
+  String get settingsPrivacyHideAmountsContent =>
+      'Mask money values across the app';
+
+  @override
+  String get settingsBiometricLabel => 'Biometric Lock';
+
+  @override
+  String get settingsBiometricEnable => 'Enable biometric lock?';
+
+  @override
+  String get settingsBiometricEnableContent =>
+      'Require biometric authentication when resuming the app.';
+
+  @override
+  String get settingsCheckForUpdates => 'Check for Updates';
+
+  @override
+  String get settingsUpdateAvailableTitle => 'Update Available';
+
+  @override
+  String settingsUpdateAvailableContent(String version) {
+    return 'Version $version is available. Update now?';
+  }
+
+  @override
+  String get settingsUpdateNewerVersionFallback => 'a newer version';
+
+  @override
+  String get settingsUpdateNow => 'Update Now';
+
+  @override
+  String get settingsNoUpdateAvailable => 'You\'re on the latest version.';
+
+  @override
+  String get settingsUpdateError => 'Could not check for updates.';
+
+  @override
+  String get settingsClearDataTitle => 'Clear All Data';
+
+  @override
+  String get settingsClearDataContent =>
+      'This will remove all locally cached data. Your data on the server will not be affected.';
+
+  @override
+  String get settingsClearData => 'Clear Data';
+
+  @override
+  String get settingsClearDataSuccess => 'Local data cleared';
+
+  @override
+  String get settingsDeleteAccountTitle => 'Delete Account';
+
+  @override
+  String get settingsDeleteAccount => 'Delete Account';
+
+  @override
+  String get settingsSignOutTitle => 'Sign Out';
+
+  @override
+  String get settingsSignOutContent => 'Are you sure you want to sign out?';
+
+  @override
+  String get settingsSignOut => 'Sign Out';
+
+  @override
+  String get settingsDebugLogs => 'Debug Logs';
+
+  @override
+  String get ssoOnboardingTitle => 'Link Your Account';
+
+  @override
+  String get ssoOnboardingTabLink => 'Link existing';
+
+  @override
+  String get ssoOnboardingTabCreate => 'Create new';
+
+  @override
+  String get ssoOnboardingFirstNameLabel => 'First Name';
+
+  @override
+  String get ssoOnboardingLastNameLabel => 'Last Name';
+
+  @override
+  String get ssoOnboardingLinkButton => 'Link Account';
+
+  @override
+  String get ssoOnboardingCreateButton => 'Create Account';
+
+  @override
+  String get ssoOnboardingAcceptInvitation => 'Accept Invitation';
+
+  @override
+  String get calendarTitle => 'Account Calendar';
+
+  @override
+  String get calendarAccountTypeSection => 'Account Type';
+
+  @override
+  String get calendarSegmentAssets => 'Assets';
+
+  @override
+  String get calendarSegmentLiabilities => 'Liabilities';
+
+  @override
+  String get calendarSelectAccount => 'Select Account';
+
+  @override
+  String get calendarMonthlyChange => 'Monthly Change';
+
+  @override
+  String get calendarNoTransactions => 'No transactions on this day';
+
+  @override
+  String get moreCalendar => 'Account Calendar';
+
+  @override
+  String get moreCalendarSubtitle => 'View monthly balance changes by account';
+
+  @override
+  String get moreRecentTransactions => 'Recent Transactions';
+
+  @override
+  String get moreRecentTransactionsSubtitle =>
+      'View recent transactions across all accounts';
+
+  @override
+  String get biometricTitle => 'App Locked';
+
+  @override
+  String get biometricSubtitle => 'Authenticate to continue';
+
+  @override
+  String get biometricUnlock => 'Unlock';
+
+  @override
+  String get biometricAuthenticating => 'Authenticating…';
+
+  @override
+  String get biometricLogOut => 'Log out';
+
+  @override
+  String get backendConfigTitle => 'Configuration';
+
+  @override
+  String get backendConfigSubtitle => 'Update your Sure server URL';
+
+  @override
+  String get backendConfigExampleUrlsLabel => 'Example URLs';
+
+  @override
+  String get backendConfigUrlLabel => 'Sure server URL';
+
+  @override
+  String get backendConfigUrlHint => 'https://app.sure.am';
+
+  @override
+  String get backendConfigProxyHeadersLabel => 'Custom proxy headers';
+
+  @override
+  String get backendConfigProxyHeadersSubtitle =>
+      'Optional headers for a reverse proxy or auth gateway';
+
+  @override
+  String backendConfigProxyHeadersCount(int count) {
+    return '$count configured';
+  }
+
+  @override
+  String get backendConfigTesting => 'Testing…';
+
+  @override
+  String get backendConfigTestButton => 'Test Connection';
+
+  @override
+  String get backendConfigContinueButton => 'Continue';
+
+  @override
+  String get backendConfigChangeHint =>
+      'You can change this later in the settings.';
+
+  @override
+  String get recentTransactionsTitle => 'Recent Transactions';
+
+  @override
+  String get recentTransactionsEmpty => 'No Transactions';
+
+  @override
+  String get recentTransactionsDisplayLimit => 'Display Limit';
+
+  @override
+  String recentTransactionsShowN(int count) {
+    return 'Show $count';
+  }
+
+  @override
+  String get recentTransactionsPullToRefresh => 'Pull to refresh';
+
+  @override
+  String get logViewerTitle => 'Debug Logs';
+
+  @override
+  String get logViewerFilterAll => 'All';
+
+  @override
+  String get logViewerFilterInfo => 'Info';
+
+  @override
+  String get logViewerFilterWarning => 'Warning';
+
+  @override
+  String get logViewerFilterError => 'Error';
+
+  @override
+  String get logViewerFilterDebug => 'Debug';
+
+  @override
+  String get logViewerAutoScrollEnable => 'Enable auto-scroll';
+
+  @override
+  String get logViewerAutoScrollDisable => 'Disable auto-scroll';
+
+  @override
+  String get logViewerCopyLogs => 'Copy logs';
+
+  @override
+  String get logViewerClearLogs => 'Clear logs';
+
+  @override
+  String get logViewerLogsCopied => 'Logs copied to clipboard';
+
+  @override
+  String get logViewerEmpty => 'No logs yet';
+
+  @override
+  String get connectivityOffline => 'You are offline';
+
+  @override
+  String connectivityPendingSync(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: '$count transactions pending sync',
+      one: '$count transaction pending sync',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get connectivitySyncNow => 'Sync Now';
+
+  @override
+  String get proxyHeadersAddHeader => 'Add header';
+
+  @override
+  String get proxyHeadersNameLabel => 'Header name';
+
+  @override
+  String get proxyHeadersNameHint => 'X-Auth-Token';
+
+  @override
+  String get proxyHeadersValueLabel => 'Header value';
+
+  @override
+  String get proxyHeadersRemove => 'Remove header';
+
+  @override
+  String get accountDetailRefreshTooltip => 'Refresh account details';
+
+  @override
+  String get accountDetailRecentBalanceHistory => 'Recent balance history';
+
+  @override
+  String get accountDetailTopHoldings => 'Top holdings';
+
+  @override
+  String get accountDetailHoldingFallback => 'Holding';
+
+  @override
+  String accountDetailCashChip(String amount) {
+    return 'Cash $amount';
+  }
+
+  @override
+  String get biometricLockFailedRetry =>
+      'Authentication failed. Tap Unlock to try again.';
+
+  @override
+  String get settingsBiometricVerifyReason =>
+      'Verify biometric to enable app lock';
+
+  @override
+  String get settingsBiometricFailed => 'Biometric authentication failed.';
+
+  @override
+  String get settingsUpdateOpenStoreError => 'Unable to open store link';
+
+  @override
+  String get settingsClearDataFailed => 'Failed to clear local data.';
+
+  @override
+  String get settingsClearDataSuccessDetailed =>
+      'Local data cleared successfully. Pull to refresh to sync from server.';
+
+  @override
+  String get settingsContactOpenLinkError => 'Unable to open link';
+
+  @override
+  String get settingsResetAccountContent =>
+      'Resetting your account will delete all your accounts, categories, merchants, tags, and other data, but keep your user account intact.\n\nThis action cannot be undone. Are you sure?';
+
+  @override
+  String get settingsResetAccount => 'Reset Account';
+
+  @override
+  String get settingsResetAccountInitiated =>
+      'Account reset has been initiated. This may take a moment.';
+
+  @override
+  String get settingsResetAccountFailed => 'Failed to reset account';
+
+  @override
+  String get settingsDeleteAccountConfirmContent =>
+      'Deleting your account will permanently remove all your data and cannot be undone.\n\nAre you sure you want to delete your account?';
+
+  @override
+  String get settingsDeleteAccountFailed => 'Failed to delete account';
+
+  @override
+  String get settingsProxyHeadersNote =>
+      'Headers are sent by the app with API requests. External browser SSO pages may not receive them.';
+
+  @override
+  String get settingsProxyHeadersSaved => 'Custom proxy headers saved';
+
+  @override
+  String get settingsProxyHeadersSaveFailed =>
+      'Failed to save custom proxy headers.';
+
+  @override
+  String settingsAppVersion(String version) {
+    return 'App Version: $version';
+  }
+
+  @override
+  String get settingsCheckForUpdatesSubtitle =>
+      'See if a newer version is available';
+
+  @override
+  String get settingsContactUs => 'Contact us';
+
+  @override
+  String get settingsDebugLogsSemantics => 'Open debug logs';
+
+  @override
+  String get settingsDebugLogsSubtitle => 'View app diagnostic logs';
+
+  @override
+  String get settingsGroupByAccountType => 'Group by Account Type';
+
+  @override
+  String get settingsGroupByAccountTypeSubtitle =>
+      'Group accounts by type (Crypto, Bank, etc.)';
+
+  @override
+  String get settingsProxyHeadersTileTitle => 'Custom proxy headers';
+
+  @override
+  String get settingsProxyHeadersTileSubtitleEmpty =>
+      'Optional headers for a reverse proxy or auth gateway';
+
+  @override
+  String settingsProxyHeadersTileSubtitleCount(int count) {
+    return '$count configured';
+  }
+
+  @override
+  String get settingsClearDataTileSubtitle =>
+      'Remove all cached transactions and accounts';
+
+  @override
+  String get settingsResetAccountTileSubtitle =>
+      'Delete all accounts, categories, merchants, and tags but keep your user account';
+
+  @override
+  String get settingsDeleteAccountTileSubtitle =>
+      'Permanently remove all your data. This cannot be undone.';
+
+  @override
+  String get settingsUserFallback => 'User';
+
+  @override
+  String chatListDeleteMultiContent(int count) {
+    String _temp0 = intl.Intl.pluralLogic(
+      count,
+      locale: localeName,
+      other: 'Delete $count chats? This cannot be undone.',
+      one: 'Delete $count chat? This cannot be undone.',
+    );
+    return '$_temp0';
+  }
+
+  @override
+  String get chatListDeletedSuccess => 'Chats deleted';
+
+  @override
+  String get chatListDeleteFailed => 'Failed to delete chats';
+
+  @override
+  String get chatListError => 'Failed to load chats';
+
+  @override
+  String get chatListJustNow => 'Just now';
+
+  @override
+  String chatListDeleteSingleContent(String title) {
+    return 'Are you sure you want to delete \"$title\"?';
+  }
+
+  @override
+  String get loginSignUpOpenError => 'Unable to open sign up page';
+
+  @override
+  String get loginApiKeyDialogTitle => 'API Key Login';
+
+  @override
+  String get loginApiKeyDialogBody => 'Enter your API key to sign in.';
+
+  @override
+  String get loginApiKeyInvalid => 'Invalid API key';
+
+  @override
+  String get loginApiKeySignIn => 'Sign In';
+
+  @override
+  String get loginDemoOrSignUpPrefix => 'Demo account or ';
+
+  @override
+  String get loginSignUpLink => 'Sign Up';
+
+  @override
+  String get loginSignUpSuffix => '!';
+
+  @override
+  String get loginMfaInfo =>
+      'Two-factor authentication is enabled. Enter your code.';
+
+  @override
+  String get loginMfaCodeRequired => 'Please enter your authentication code';
+
+  @override
+  String get loginOrDivider => 'or';
+
+  @override
+  String get loginServerUrlHeading => 'Sure server URL:';
+
+  @override
+  String get loginApiKeyLoginButton => 'API-Key Login';
+
+  @override
+  String get loginBackendSettingsTooltip => 'Backend Settings';
+
+  @override
+  String get transactionEditSessionExpired =>
+      'Session expired. Please login again.';
+
+  @override
+  String get transactionEditUpdated => 'Transaction updated';
+
+  @override
+  String get transactionEditUpdateFailed => 'Failed to update transaction';
+
+  @override
+  String transactionEditNameMaxLength(int max) {
+    return 'Name must be $max characters or fewer';
+  }
+
+  @override
+  String get transactionEditNameInvalidChars =>
+      'Name contains unsupported characters';
+
+  @override
+  String transactionEditNotesMaxLength(int max) {
+    return 'Notes must be $max characters or fewer';
+  }
+
+  @override
+  String get transactionEditNotesInvalidChars =>
+      'Notes contain unsupported characters';
+
+  @override
+  String get transactionEditNoCategory => 'No category';
+
+  @override
+  String get transactionEditCurrentCategory => 'Current category';
+
+  @override
+  String get transactionEditNoMerchant => 'No merchant';
+
+  @override
+  String get transactionEditCurrentMerchant => 'Current merchant';
+
+  @override
+  String get transactionEditNoTags => 'No tags available';
+
+  @override
+  String get transactionEditUnknownTag => 'Unknown tag';
+
+  @override
+  String get transactionEditSyncedOnly =>
+      'Only synced transactions can be edited from mobile.';
+
+  @override
+  String get transactionEditCategoryHelper => 'Choose a replacement category';
+
+  @override
+  String get transactionEditMerchantHelper => 'Choose a replacement merchant';
+
+  @override
+  String get transactionFormSessionExpired =>
+      'Session expired. Please login again.';
+
+  @override
+  String get transactionFormAmountRequiredPrompt => 'Please enter an amount';
+
+  @override
+  String get transactionFormAmountInvalidNumber =>
+      'Please enter a valid number';
+
+  @override
+  String get transactionFormAmountTooSmall => 'Amount must be greater than 0';
+
+  @override
+  String get transactionFormCreateSuccessOnline =>
+      'Transaction created successfully';
+
+  @override
+  String get transactionFormCreateSuccessOffline =>
+      'Transaction saved (will sync when online)';
+
+  @override
+  String get transactionFormCreateFailed => 'Failed to create transaction';
+
+  @override
+  String transactionFormGenericError(String error) {
+    return 'Error: $error';
+  }
+
+  @override
+  String get transactionFormLess => 'Less';
+
+  @override
+  String get transactionFormMore => 'More';
+
+  @override
+  String get transactionFormDateHelper => 'Optional (default: today)';
+
+  @override
+  String get transactionFormNameHelper => 'Optional (default: SureApp)';
+
+  @override
+  String get transactionFormCategoryLoading => 'Loading categories…';
+
+  @override
+  String get transactionFormCategoryHelper => 'Optional';
+
+  @override
+  String get transactionFormNoCategory => 'No category';
+
+  @override
+  String get transactionFormCreateButton => 'Create Transaction';
+
+  @override
+  String get transactionFormAmountHelper => 'Required';
+
+  @override
+  String get logViewerClearConfirm =>
+      'Are you sure you want to clear all logs?';
+
+  @override
+  String get logViewerClear => 'Clear';
+
+  @override
+  String get chatConversationEditTitle => 'Edit Title';
+
+  @override
+  String get chatConversationTitleLabel => 'Chat Title';
+
+  @override
+  String get chatConversationRefreshTooltip => 'Refresh';
+
+  @override
+  String get chatConversationLoadError => 'Failed to load chat';
+
+  @override
+  String get navEnableAiChatTitle => 'Turn on AI Chat?';
+
+  @override
+  String get navEnableAiChatContent =>
+      'AI Chat is currently disabled in your account settings. Would you like to turn it on now?';
+
+  @override
+  String get navEnableAiChatNotNow => 'Not now';
+
+  @override
+  String get navEnableAiChatConfirm => 'Turn on AI';
+
+  @override
+  String get navEnableAiChatFailed => 'Unable to enable AI right now.';
+
+  @override
+  String get transactionsListEditTooltip => 'Edit transaction';
+
+  @override
+  String get connectivitySignInToSync => 'Please sign in to sync transactions';
+
+  @override
+  String get connectivitySyncSuccess => 'Transactions synced successfully';
+
+  @override
+  String get connectivitySyncFailed =>
+      'Failed to sync transactions. Please try again.';
+
+  @override
+  String get connectivityAuthFailed =>
+      'Unable to authenticate. Please try again.';
+
+  @override
+  String ssoOnboardingSignedInAs(String email) {
+    return 'Signed in as $email';
+  }
+
+  @override
+  String get ssoOnboardingGoogleVerified => 'Google account verified';
+
+  @override
+  String get ssoOnboardingLinkCredentialsNote =>
+      'Enter your existing account credentials to link with Google Sign-In.';
+
+  @override
+  String get ssoOnboardingPendingInvitationNote =>
+      'You have a pending invitation. Accept it to join an existing household.';
+
+  @override
+  String get ssoOnboardingCreateIdentityNote =>
+      'Create a new account using your Google identity.';
+
+  @override
+  String get ssoOnboardingFirstNameRequired => 'First name is required';
+
+  @override
+  String get ssoOnboardingLastNameRequired => 'Last name is required';
+
+  @override
+  String get backendConfigTimeout =>
+      'Connection timeout. Please check the URL and try again.';
+
+  @override
+  String get backendConfigSuccess => 'Connection successful!';
+
+  @override
+  String backendConfigServerError(int code) {
+    return 'Server responded with status $code. Please check if this is a Sure backend server.';
+  }
+
+  @override
+  String backendConfigConnectionFailed(String error) {
+    return 'Connection failed: $error';
+  }
+
+  @override
+  String backendConfigSaveFailed(String error) {
+    return 'Failed to save URL: $error';
+  }
+
+  @override
+  String get backendConfigUrlRequired => 'Please enter a backend URL';
+
+  @override
+  String get backendConfigUrlScheme =>
+      'URL must start with http:// or https://';
+
+  @override
+  String get backendConfigUrlInvalid => 'Please enter a valid URL';
+
+  @override
+  String get backendConfigHeadersHelp =>
+      'Headers are sent by the app with API requests. External browser SSO pages may not receive them.';
+
+  @override
+  String get recentTransactionsUnknownAccount => 'Unknown Account';
+
+  @override
+  String get accountDetailUnavailable =>
+      'Account details are temporarily unavailable';
+
+  @override
+  String chatListMinutesAgo(int minutes) {
+    return '${minutes}m ago';
+  }
+
+  @override
+  String chatListHoursAgo(int hours) {
+    return '${hours}h ago';
+  }
+
+  @override
+  String chatListDaysAgo(int days) {
+    return '${days}d ago';
+  }
+
+  @override
+  String get chatConversationStartFailed =>
+      'Failed to start conversation. Please try again.';
+}
diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart
index bc1b4afc6..7662bf71b 100644
--- a/mobile/lib/main.dart
+++ b/mobile/lib/main.dart
@@ -5,9 +5,12 @@ import 'package:provider/provider.dart';
 import 'providers/auth_provider.dart';
 import 'providers/accounts_provider.dart';
 import 'providers/categories_provider.dart';
+import 'providers/merchants_provider.dart';
+import 'providers/tags_provider.dart';
 import 'providers/transactions_provider.dart';
 import 'providers/chat_provider.dart';
 import 'providers/theme_provider.dart';
+import 'providers/privacy_provider.dart';
 import 'screens/backend_config_screen.dart';
 import 'screens/login_screen.dart';
 import 'screens/biometric_lock_screen.dart';
@@ -17,6 +20,10 @@ import 'services/api_config.dart';
 import 'services/connectivity_service.dart';
 import 'services/log_service.dart';
 import 'services/preferences_service.dart';
+import 'services/telemetry_service.dart';
+import 'theme/sure_theme.dart';
+import 'l10n/app_localizations.dart';
+import 'package:upgrader/upgrader.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -25,11 +32,31 @@ void main() async {
   // Add initial log entry
   LogService.instance.info('App', 'Sure app starting...');
 
-  runApp(const SureApp());
+  // Read the privacy preference before the first frame so money values are
+  // never briefly rendered unmasked for a user who enabled "Hide amounts".
+  // Default to masked (fail-closed) if it can't be read.
+  bool moneyHidden = true;
+  try {
+    moneyHidden = await PreferencesService.instance.getMoneyHidden();
+  } catch (e) {
+    LogService.instance.warning(
+      'App',
+      'Failed to read privacy preference at startup with ${e.runtimeType}',
+    );
+  }
+
+  await TelemetryService.instance.initialize(
+    appRunner: () => runApp(SureApp(moneyHidden: moneyHidden)),
+  );
 }
 
 class SureApp extends StatelessWidget {
-  const SureApp({super.key});
+  // Fail-closed default (masked) for the no-argument path; main() always passes
+  // the persisted value explicitly.
+  const SureApp({super.key, this.moneyHidden = true});
+
+  /// The persisted "hide amounts" state, read before `runApp` (see `main`).
+  final bool moneyHidden;
 
   @override
   Widget build(BuildContext context) {
@@ -40,7 +67,11 @@ class SureApp extends StatelessWidget {
         ChangeNotifierProvider(create: (_) => AuthProvider()),
         ChangeNotifierProvider(create: (_) => ChatProvider()),
         ChangeNotifierProvider(create: (_) => CategoriesProvider()),
+        ChangeNotifierProvider(create: (_) => MerchantsProvider()),
+        ChangeNotifierProvider(create: (_) => TagsProvider()),
         ChangeNotifierProvider(create: (_) => ThemeProvider()),
+        ChangeNotifierProvider(
+            create: (_) => PrivacyProvider(initialHidden: moneyHidden)),
         ChangeNotifierProxyProvider<ConnectivityService, AccountsProvider>(
           create: (_) => AccountsProvider(),
           update: (_, connectivityService, accountsProvider) {
@@ -70,90 +101,22 @@ class SureApp extends StatelessWidget {
       ],
       child: Consumer<ThemeProvider>(
         builder: (context, themeProvider, _) => MaterialApp(
-        title: 'Sure Finances',
-        debugShowCheckedModeBanner: false,
-        theme: ThemeData(
-          fontFamily: 'Geist',
-          fontFamilyFallback: const [
-            'Inter',
-            'Arial',
-            'sans-serif',
-          ],
-          colorScheme: ColorScheme.fromSeed(
-            seedColor: const Color(0xFF6366F1),
-            brightness: Brightness.light,
-          ),
-          useMaterial3: true,
-          appBarTheme: const AppBarTheme(
-            centerTitle: true,
-            elevation: 0,
-          ),
-          cardTheme: CardThemeData(
-            elevation: 2,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(12),
-            ),
-          ),
-          inputDecorationTheme: InputDecorationTheme(
-            border: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(12),
-            ),
-            filled: true,
-          ),
-          elevatedButtonTheme: ElevatedButtonThemeData(
-            style: ElevatedButton.styleFrom(
-              minimumSize: const Size(double.infinity, 50),
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(12),
-              ),
-            ),
-          ),
+          onGenerateTitle: (ctx) => AppLocalizations.of(ctx).appTitle,
+          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          supportedLocales: AppLocalizations.supportedLocales,
+          debugShowCheckedModeBanner: false,
+          navigatorObservers: TelemetryService.instance.navigatorObservers,
+          theme: SureTheme.light,
+          darkTheme: SureTheme.dark,
+          themeMode: themeProvider.themeMode,
+          routes: {
+            '/config': (context) => const BackendConfigScreen(),
+            '/login': (context) => const LoginScreen(),
+            '/home': (context) => const MainNavigationScreen(),
+          },
+          home: const AppWrapper(),
         ),
-        darkTheme: ThemeData(
-          fontFamily: 'Geist',
-          fontFamilyFallback: const [
-            'Inter',
-            'Arial',
-            'sans-serif',
-          ],
-          colorScheme: ColorScheme.fromSeed(
-            seedColor: const Color(0xFF6366F1),
-            brightness: Brightness.dark,
-          ),
-          useMaterial3: true,
-          appBarTheme: const AppBarTheme(
-            centerTitle: true,
-            elevation: 0,
-          ),
-          cardTheme: CardThemeData(
-            elevation: 2,
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(12),
-            ),
-          ),
-          inputDecorationTheme: InputDecorationTheme(
-            border: OutlineInputBorder(
-              borderRadius: BorderRadius.circular(12),
-            ),
-            filled: true,
-          ),
-          elevatedButtonTheme: ElevatedButtonThemeData(
-            style: ElevatedButton.styleFrom(
-              minimumSize: const Size(double.infinity, 50),
-              shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.circular(12),
-              ),
-            ),
-          ),
-        ),
-        themeMode: themeProvider.themeMode,
-        routes: {
-          '/config': (context) => const BackendConfigScreen(),
-          '/login': (context) => const LoginScreen(),
-          '/home': (context) => const MainNavigationScreen(),
-        },
-        home: const AppWrapper(),
-      )),
+      ),
     );
   }
 }
@@ -172,6 +135,12 @@ class _AppWrapperState extends State<AppWrapper> with WidgetsBindingObserver {
   late final AppLinks _appLinks;
   StreamSubscription<Uri>? _linkSubscription;
 
+  final _upgrader = Upgrader(
+    durationUntilAlertAgain: const Duration(days: 7),
+    countryCode: 'us',
+    messages: _SureUpgraderMessages(),
+  );
+
   @override
   void initState() {
     super.initState();
@@ -220,29 +189,71 @@ class _AppWrapperState extends State<AppWrapper> with WidgetsBindingObserver {
 
     // Handle deep link that launched the app (cold start)
     _appLinks.getInitialLink().then((uri) {
-      if (uri != null) _handleDeepLink(uri);
+      if (uri != null) {
+        TelemetryService.instance.addBreadcrumb(
+          'deep_links',
+          'initial_link_received',
+          data: {'recognized': _isSsoCallback(uri)},
+        );
+        _handleDeepLink(uri);
+      }
     }).catchError((e, stackTrace) {
-      LogService.instance.error('DeepLinks', 'Initial link error: $e\n$stackTrace');
+      LogService.instance.error(
+        'DeepLinks',
+        'Initial link failed with ${e.runtimeType}',
+      );
+      unawaited(TelemetryService.instance.captureHandledException(
+        e,
+        stackTrace,
+        operation: 'deep_links.initial_link',
+      ));
     });
 
     // Listen for deep links while app is running
     _linkSubscription = _appLinks.uriLinkStream.listen(
       (uri) => _handleDeepLink(uri),
       onError: (e, stackTrace) {
-        LogService.instance.error('DeepLinks', 'Link stream error: $e\n$stackTrace');
+        LogService.instance.error(
+          'DeepLinks',
+          'Link stream failed with ${e.runtimeType}',
+        );
+        unawaited(TelemetryService.instance.captureHandledException(
+          e,
+          stackTrace,
+          operation: 'deep_links.stream',
+        ));
       },
     );
   }
 
   void _handleDeepLink(Uri uri) {
-    if (uri.scheme == 'sureapp' && uri.host == 'oauth') {
+    final isSsoCallback = _isSsoCallback(uri);
+    TelemetryService.instance.addBreadcrumb(
+      'deep_links',
+      'link_received',
+      data: {'recognized': isSsoCallback},
+    );
+
+    if (isSsoCallback) {
       final authProvider = Provider.of<AuthProvider>(context, listen: false);
       authProvider.handleSsoCallback(uri);
     }
   }
 
+  bool _isSsoCallback(Uri uri) =>
+      uri.scheme == 'sureapp' && uri.host == 'oauth';
+
   Future<void> _checkBackendConfig() async {
-    final hasUrl = await ApiConfig.initialize();
+    final hasUrl = await TelemetryService.instance.traceAsync(
+      'app.backend_config_check',
+      'Backend configuration check',
+      ApiConfig.initialize,
+    );
+    TelemetryService.instance.addBreadcrumb(
+      'app',
+      'backend_config_checked',
+      data: {'configured': hasUrl},
+    );
     if (mounted) {
       setState(() {
         _hasBackendUrl = hasUrl;
@@ -287,7 +298,11 @@ class _AppWrapperState extends State<AppWrapper> with WidgetsBindingObserver {
         if (authProvider.isAuthenticated) {
           return Stack(
             children: [
-              const MainNavigationScreen(),
+              UpgradeAlert(
+                upgrader: _upgrader,
+                showIgnore: false,
+                child: const MainNavigationScreen(),
+              ),
               if (_isLocked)
                 BiometricLockScreen(
                   onUnlocked: _onUnlocked,
@@ -313,3 +328,23 @@ class _AppWrapperState extends State<AppWrapper> with WidgetsBindingObserver {
     );
   }
 }
+
+class _SureUpgraderMessages extends UpgraderMessages {
+  @override
+  String get title => 'Update available';
+
+  @override
+  String get body =>
+      '{{appName}} {{currentAppStoreVersion}} is now available — '
+      'you have {{currentInstalledVersion}}.\n\n'
+      "What's new? Check the store for release notes.";
+
+  @override
+  String get buttonTitleUpdate => 'Update now';
+
+  @override
+  String get buttonTitleLater => 'Later';
+
+  @override
+  String get releaseNotes => '';
+}
diff --git a/mobile/lib/models/account.dart b/mobile/lib/models/account.dart
index 046aa0601..23bf00bbd 100644
--- a/mobile/lib/models/account.dart
+++ b/mobile/lib/models/account.dart
@@ -1,28 +1,66 @@
+import '../utils/json_parsing.dart';
+
 class Account {
   final String id;
   final String name;
   final String balance;
+  final int? balanceCents;
+  final String? cashBalance;
+  final int? cashBalanceCents;
   final String currency;
   final String? classification;
   final String accountType;
+  final String? subtype;
+  final String? status;
+  final String? institutionName;
+  final String? institutionDomain;
+  final DateTime? createdAt;
+  final DateTime? updatedAt;
 
   Account({
     required this.id,
     required this.name,
     required this.balance,
+    this.balanceCents,
+    this.cashBalance,
+    this.cashBalanceCents,
     required this.currency,
     this.classification,
     required this.accountType,
+    this.subtype,
+    this.status,
+    this.institutionName,
+    this.institutionDomain,
+    this.createdAt,
+    this.updatedAt,
   });
 
   factory Account.fromJson(Map<String, dynamic> json) {
     return Account(
       id: json['id'].toString(),
-      name: json['name'] as String,
-      balance: json['balance'] as String,
-      currency: json['currency'] as String,
-      classification: json['classification'] as String?,
-      accountType: json['account_type'] as String,
+      name: JsonParsing.parseRequiredString(json['name'], 'account name'),
+      balance: JsonParsing.parseRequiredString(
+        json['balance'],
+        'account balance',
+      ),
+      balanceCents: JsonParsing.parseInt(json['balance_cents']),
+      cashBalance: JsonParsing.parseString(json['cash_balance']),
+      cashBalanceCents: JsonParsing.parseInt(json['cash_balance_cents']),
+      currency: JsonParsing.parseRequiredString(
+        json['currency'],
+        'account currency',
+      ),
+      classification: JsonParsing.parseString(json['classification']),
+      accountType: JsonParsing.parseRequiredString(
+        json['account_type'],
+        'account type',
+      ),
+      subtype: JsonParsing.parseString(json['subtype']),
+      status: JsonParsing.parseString(json['status']),
+      institutionName: JsonParsing.parseString(json['institution_name']),
+      institutionDomain: JsonParsing.parseString(json['institution_domain']),
+      createdAt: JsonParsing.parseDateTime(json['created_at']),
+      updatedAt: JsonParsing.parseDateTime(json['updated_at']),
     );
   }
 
diff --git a/mobile/lib/models/account_balance.dart b/mobile/lib/models/account_balance.dart
new file mode 100644
index 000000000..66d171152
--- /dev/null
+++ b/mobile/lib/models/account_balance.dart
@@ -0,0 +1,39 @@
+import '../utils/json_parsing.dart';
+
+class AccountBalance {
+  final String id;
+  final DateTime date;
+  final String currency;
+  final String balance;
+  final int? balanceCents;
+  final String? cashBalance;
+  final int? cashBalanceCents;
+
+  AccountBalance({
+    required this.id,
+    required this.date,
+    required this.currency,
+    required this.balance,
+    this.balanceCents,
+    this.cashBalance,
+    this.cashBalanceCents,
+  });
+
+  factory AccountBalance.fromJson(Map<String, dynamic> json) {
+    return AccountBalance(
+      id: json['id'].toString(),
+      date: JsonParsing.parseRequiredDateTime(json['date'], 'account balance'),
+      currency: JsonParsing.parseRequiredString(
+        json['currency'],
+        'account balance currency',
+      ),
+      balance: JsonParsing.parseRequiredString(
+        json['balance'],
+        'account balance',
+      ),
+      balanceCents: JsonParsing.parseInt(json['balance_cents']),
+      cashBalance: JsonParsing.parseString(json['cash_balance']),
+      cashBalanceCents: JsonParsing.parseInt(json['cash_balance_cents']),
+    );
+  }
+}
diff --git a/mobile/lib/models/account_holding.dart b/mobile/lib/models/account_holding.dart
new file mode 100644
index 000000000..dc2537b2c
--- /dev/null
+++ b/mobile/lib/models/account_holding.dart
@@ -0,0 +1,51 @@
+import '../utils/json_parsing.dart';
+
+class AccountHolding {
+  final String id;
+  final DateTime date;
+  final String quantity;
+  final String price;
+  final String amount;
+  final String currency;
+  final String? ticker;
+  final String? securityName;
+
+  AccountHolding({
+    required this.id,
+    required this.date,
+    required this.quantity,
+    required this.price,
+    required this.amount,
+    required this.currency,
+    this.ticker,
+    this.securityName,
+  });
+
+  factory AccountHolding.fromJson(Map<String, dynamic> json) {
+    final securityJson = json['security'];
+    final security = securityJson is Map<String, dynamic> ? securityJson : null;
+
+    return AccountHolding(
+      id: json['id'].toString(),
+      date: JsonParsing.parseRequiredDateTime(json['date'], 'account holding'),
+      quantity: JsonParsing.parseRequiredString(
+        json['qty'],
+        'account holding quantity',
+      ),
+      price: JsonParsing.parseRequiredString(
+        json['price'],
+        'account holding price',
+      ),
+      amount: JsonParsing.parseRequiredString(
+        json['amount'],
+        'account holding amount',
+      ),
+      currency: JsonParsing.parseRequiredString(
+        json['currency'],
+        'account holding currency',
+      ),
+      ticker: JsonParsing.parseString(security?['ticker']),
+      securityName: JsonParsing.parseString(security?['name']),
+    );
+  }
+}
diff --git a/mobile/lib/models/chat.dart b/mobile/lib/models/chat.dart
index 9082b2cc8..e72fae8b4 100644
--- a/mobile/lib/models/chat.dart
+++ b/mobile/lib/models/chat.dart
@@ -45,11 +45,11 @@ class Chat {
       'id': id,
       'title': title,
       'error': error,
-      'created_at': createdAt.toIso8601String(),
-      'updated_at': updatedAt.toIso8601String(),
+      'created_at': createdAt.toUtc().toIso8601String(),
+      'updated_at': updatedAt.toUtc().toIso8601String(),
       'messages': messages.map((m) => m.toJson()).toList(),
       'message_count': messageCount,
-      'last_message_at': lastMessageAt?.toIso8601String(),
+      'last_message_at': lastMessageAt?.toUtc().toIso8601String(),
     };
   }
 
diff --git a/mobile/lib/models/merchant.dart b/mobile/lib/models/merchant.dart
new file mode 100644
index 000000000..a8ef8143d
--- /dev/null
+++ b/mobile/lib/models/merchant.dart
@@ -0,0 +1,20 @@
+class Merchant {
+  final String id;
+  final String name;
+  final String? type;
+
+  Merchant({required this.id, required this.name, this.type});
+
+  factory Merchant.fromJson(Map<String, dynamic> json) {
+    final id = json['id']?.toString().trim();
+    if (id == null || id.isEmpty) {
+      throw FormatException('Merchant response is missing id: $json');
+    }
+
+    return Merchant(
+      id: id,
+      name: json['name']?.toString() ?? '',
+      type: json['type']?.toString(),
+    );
+  }
+}
diff --git a/mobile/lib/models/message.dart b/mobile/lib/models/message.dart
index 264f4e940..46779e36b 100644
--- a/mobile/lib/models/message.dart
+++ b/mobile/lib/models/message.dart
@@ -74,8 +74,8 @@ class Message {
       'role': role,
       'content': content,
       'model': model,
-      'created_at': createdAt.toIso8601String(),
-      'updated_at': updatedAt.toIso8601String(),
+      'created_at': createdAt.toUtc().toIso8601String(),
+      'updated_at': updatedAt.toUtc().toIso8601String(),
       'tool_calls': toolCalls?.map((tc) => tc.toJson()).toList(),
     };
   }
diff --git a/mobile/lib/models/offline_transaction.dart b/mobile/lib/models/offline_transaction.dart
index 0f8a877f4..1fafd40a5 100644
--- a/mobile/lib/models/offline_transaction.dart
+++ b/mobile/lib/models/offline_transaction.dart
@@ -1,10 +1,12 @@
+import 'dart:convert';
+
 import 'transaction.dart';
 
 enum SyncStatus {
-  synced,         // Transaction is synced with server
-  pending,        // Transaction is waiting to be synced (create)
-  failed,         // Last sync attempt failed
-  pendingDelete,  // Transaction is waiting to be deleted on server
+  synced, // Transaction is synced with server
+  pending, // Transaction is waiting to be synced (create)
+  failed, // Last sync attempt failed
+  pendingDelete, // Transaction is waiting to be deleted on server
 }
 
 class OfflineTransaction extends Transaction {
@@ -25,6 +27,13 @@ class OfflineTransaction extends Transaction {
     super.notes,
     super.categoryId,
     super.categoryName,
+    super.categoryProvided = true,
+    super.merchantId,
+    super.merchantName,
+    super.merchantProvided = true,
+    super.tagIds,
+    super.tagNames,
+    super.tagsProvided = true,
     this.syncStatus = SyncStatus.pending,
     DateTime? createdAt,
     DateTime? updatedAt,
@@ -48,11 +57,23 @@ class OfflineTransaction extends Transaction {
       notes: transaction.notes,
       categoryId: transaction.categoryId,
       categoryName: transaction.categoryName,
+      categoryProvided: transaction.categoryProvided,
+      merchantId: transaction.merchantId,
+      merchantName: transaction.merchantName,
+      merchantProvided: transaction.merchantProvided,
+      tagIds: transaction.tagIds,
+      tagNames: transaction.tagNames,
+      tagsProvided: transaction.tagsProvided,
       syncStatus: syncStatus,
     );
   }
 
   factory OfflineTransaction.fromDatabaseMap(Map<String, dynamic> map) {
+    final tagIds = _decodeStringList(map['tag_ids'] as String?);
+    final tagNames = _decodeStringList(map['tag_names'] as String?);
+    final tagsProvided =
+        map.containsKey('tag_ids') || map.containsKey('tag_names');
+
     return OfflineTransaction(
       id: map['server_id'] as String?,
       localId: map['local_id'] as String,
@@ -65,6 +86,11 @@ class OfflineTransaction extends Transaction {
       notes: map['notes'] as String?,
       categoryId: map['category_id'] as String?,
       categoryName: map['category_name'] as String?,
+      merchantId: map['merchant_id'] as String?,
+      merchantName: map['merchant_name'] as String?,
+      tagIds: tagIds,
+      tagNames: tagNames,
+      tagsProvided: tagsProvided,
       syncStatus: _parseSyncStatus(map['sync_status'] as String),
       createdAt: DateTime.parse(map['created_at'] as String),
       updatedAt: DateTime.parse(map['updated_at'] as String),
@@ -84,6 +110,10 @@ class OfflineTransaction extends Transaction {
       'notes': notes,
       'category_id': categoryId,
       'category_name': categoryName,
+      'merchant_id': merchantId,
+      'merchant_name': merchantName,
+      'tag_ids': jsonEncode(tagIds),
+      'tag_names': jsonEncode(tagNames),
       'sync_status': _syncStatusToString(syncStatus),
       'created_at': createdAt.toIso8601String(),
       'updated_at': updatedAt.toIso8601String(),
@@ -102,6 +132,82 @@ class OfflineTransaction extends Transaction {
       notes: notes,
       categoryId: categoryId,
       categoryName: categoryName,
+      categoryProvided: categoryProvided,
+      merchantId: merchantId,
+      merchantName: merchantName,
+      merchantProvided: merchantProvided,
+      tagIds: tagIds,
+      tagNames: tagNames,
+      tagsProvided: tagsProvided,
+    );
+  }
+
+  Transaction toTransactionWithSubmittedUpdate({
+    String? name,
+    String? notes,
+    String? categoryId,
+    String? merchantId,
+    List<String>? tagIds,
+  }) {
+    final nextTagIds = tagIds ?? this.tagIds;
+    final tagNamesById = <String, String>{};
+    for (var i = 0; i < this.tagIds.length; i++) {
+      tagNamesById[this.tagIds[i]] = i < tagNames.length ? tagNames[i] : '';
+    }
+
+    final nextCategoryId = categoryId ?? this.categoryId;
+    final nextMerchantId = merchantId ?? this.merchantId;
+
+    return Transaction(
+      id: id,
+      accountId: accountId,
+      name: name ?? this.name,
+      date: date,
+      amount: amount,
+      currency: currency,
+      nature: nature,
+      notes: notes ?? this.notes,
+      categoryId: nextCategoryId,
+      categoryName: nextCategoryId == this.categoryId ? categoryName : null,
+      categoryProvided: true,
+      merchantId: nextMerchantId,
+      merchantName: nextMerchantId == this.merchantId ? merchantName : null,
+      merchantProvided: true,
+      tagIds: nextTagIds,
+      tagNames: nextTagIds.map((tagId) => tagNamesById[tagId] ?? '').toList(),
+      tagsProvided: true,
+    );
+  }
+
+  OfflineTransaction mergeServerTransaction(
+    Transaction transaction, {
+    required String accountId,
+  }) {
+    return OfflineTransaction(
+      id: transaction.id,
+      localId: localId,
+      accountId: accountId,
+      name: transaction.name,
+      date: transaction.date,
+      amount: transaction.amount,
+      currency: transaction.currency,
+      nature: transaction.nature,
+      notes: transaction.notes,
+      categoryId:
+          transaction.categoryProvided ? transaction.categoryId : categoryId,
+      categoryName: transaction.categoryProvided
+          ? transaction.categoryName
+          : categoryName,
+      merchantId:
+          transaction.merchantProvided ? transaction.merchantId : merchantId,
+      merchantName: transaction.merchantProvided
+          ? transaction.merchantName
+          : merchantName,
+      tagIds: transaction.tagsProvided ? transaction.tagIds : tagIds,
+      tagNames: transaction.tagsProvided ? transaction.tagNames : tagNames,
+      syncStatus: SyncStatus.synced,
+      createdAt: createdAt,
+      updatedAt: DateTime.now(),
     );
   }
 
@@ -117,6 +223,13 @@ class OfflineTransaction extends Transaction {
     String? notes,
     String? categoryId,
     String? categoryName,
+    bool? categoryProvided,
+    String? merchantId,
+    String? merchantName,
+    bool? merchantProvided,
+    List<String>? tagIds,
+    List<String>? tagNames,
+    bool? tagsProvided,
     SyncStatus? syncStatus,
     DateTime? createdAt,
     DateTime? updatedAt,
@@ -133,6 +246,13 @@ class OfflineTransaction extends Transaction {
       notes: notes ?? this.notes,
       categoryId: categoryId ?? this.categoryId,
       categoryName: categoryName ?? this.categoryName,
+      categoryProvided: categoryProvided ?? this.categoryProvided,
+      merchantId: merchantId ?? this.merchantId,
+      merchantName: merchantName ?? this.merchantName,
+      merchantProvided: merchantProvided ?? this.merchantProvided,
+      tagIds: tagIds ?? this.tagIds,
+      tagNames: tagNames ?? this.tagNames,
+      tagsProvided: tagsProvided ?? this.tagsProvided,
       syncStatus: syncStatus ?? this.syncStatus,
       createdAt: createdAt ?? this.createdAt,
       updatedAt: updatedAt ?? this.updatedAt,
@@ -158,6 +278,26 @@ class OfflineTransaction extends Transaction {
     }
   }
 
+  static List<String> _decodeStringList(String? jsonText) {
+    if (jsonText == null || jsonText.isEmpty) {
+      return const [];
+    }
+
+    try {
+      final decoded = jsonDecode(jsonText);
+      if (decoded is List) {
+        return decoded
+            .where((item) => item != null)
+            .map((item) => item.toString())
+            .toList();
+      }
+    } catch (_) {
+      return const [];
+    }
+
+    return const [];
+  }
+
   static String _syncStatusToString(SyncStatus status) {
     switch (status) {
       case SyncStatus.synced:
diff --git a/mobile/lib/models/transaction.dart b/mobile/lib/models/transaction.dart
index e20e536b3..d6e0b6a12 100644
--- a/mobile/lib/models/transaction.dart
+++ b/mobile/lib/models/transaction.dart
@@ -9,6 +9,13 @@ class Transaction {
   final String? notes;
   final String? categoryId;
   final String? categoryName;
+  final bool categoryProvided;
+  final String? merchantId;
+  final String? merchantName;
+  final bool merchantProvided;
+  final List<String> tagIds;
+  final List<String> tagNames;
+  final bool tagsProvided;
 
   Transaction({
     this.id,
@@ -21,7 +28,21 @@ class Transaction {
     this.notes,
     this.categoryId,
     this.categoryName,
-  });
+    bool? categoryProvided,
+    this.merchantId,
+    this.merchantName,
+    bool? merchantProvided,
+    List<String> tagIds = const [],
+    List<String> tagNames = const [],
+    bool? tagsProvided,
+  })  : tagIds = List.unmodifiable(tagIds),
+        tagNames = List.unmodifiable(tagNames),
+        categoryProvided =
+            categoryProvided ?? (categoryId != null || categoryName != null),
+        merchantProvided =
+            merchantProvided ?? (merchantId != null || merchantName != null),
+        tagsProvided =
+            tagsProvided ?? (tagIds.isNotEmpty || tagNames.isNotEmpty);
 
   factory Transaction.fromJson(Map<String, dynamic> json) {
     // Handle both API formats:
@@ -37,7 +58,8 @@ class Transaction {
     // Handle classification (from backend) or nature (from mobile)
     String nature = 'expense';
     if (json['classification'] != null) {
-      final classification = json['classification']?.toString().toLowerCase() ?? '';
+      final classification =
+          json['classification']?.toString().toLowerCase() ?? '';
       nature = classification == 'income' ? 'income' : 'expense';
     } else if (json['nature'] != null) {
       nature = json['nature']?.toString() ?? 'expense';
@@ -46,6 +68,9 @@ class Transaction {
     // Parse category from API response
     String? categoryId;
     String? categoryName;
+    final categoryProvided = json.containsKey('category') ||
+        json.containsKey('category_id') ||
+        json.containsKey('category_name');
     if (json['category'] != null && json['category'] is Map) {
       categoryId = json['category']['id']?.toString();
       categoryName = json['category']['name']?.toString();
@@ -54,6 +79,51 @@ class Transaction {
       categoryName = json['category_name']?.toString();
     }
 
+    String? merchantId;
+    String? merchantName;
+    final merchantProvided = json.containsKey('merchant') ||
+        json.containsKey('merchant_id') ||
+        json.containsKey('merchant_name');
+    if (json['merchant'] != null && json['merchant'] is Map) {
+      merchantId = json['merchant']['id']?.toString();
+      merchantName = json['merchant']['name']?.toString();
+    } else if (json['merchant_id'] != null) {
+      merchantId = json['merchant_id']?.toString();
+      merchantName = json['merchant_name']?.toString();
+    }
+
+    final tagIds = <String>[];
+    final tagNames = <String>[];
+    final tagsProvided = json.containsKey('tags') ||
+        json.containsKey('tag_ids') ||
+        json.containsKey('tag_names');
+    if (json['tags'] is List) {
+      for (final tag in json['tags']) {
+        if (tag is Map) {
+          final id = tag['id']?.toString().trim();
+          if (id != null && id.isNotEmpty) {
+            tagIds.add(id);
+            tagNames.add(tag['name']?.toString() ?? '');
+          }
+        }
+      }
+    } else if (json['tag_ids'] is List) {
+      final rawIds = json['tag_ids'] as List;
+      final rawNames =
+          json['tag_names'] is List ? json['tag_names'] as List : const [];
+      for (var i = 0; i < rawIds.length; i++) {
+        final id = rawIds[i]?.toString().trim() ?? '';
+        if (id.isNotEmpty) {
+          tagIds.add(id);
+          tagNames
+              .add(i < rawNames.length ? rawNames[i]?.toString() ?? '' : '');
+        }
+      }
+    }
+    while (tagNames.length < tagIds.length) {
+      tagNames.add('');
+    }
+
     return Transaction(
       id: json['id']?.toString(),
       accountId: accountId,
@@ -65,6 +135,13 @@ class Transaction {
       notes: json['notes']?.toString(),
       categoryId: categoryId,
       categoryName: categoryName,
+      categoryProvided: categoryProvided,
+      merchantId: merchantId,
+      merchantName: merchantName,
+      merchantProvided: merchantProvided,
+      tagIds: tagIds,
+      tagNames: tagNames,
+      tagsProvided: tagsProvided,
     );
   }
 
@@ -80,6 +157,10 @@ class Transaction {
       if (notes != null) 'notes': notes,
       if (categoryId != null) 'category_id': categoryId,
       if (categoryName != null) 'category_name': categoryName,
+      if (merchantId != null) 'merchant_id': merchantId,
+      if (merchantName != null) 'merchant_name': merchantName,
+      if (tagIds.isNotEmpty) 'tag_ids': tagIds,
+      if (tagNames.isNotEmpty) 'tag_names': tagNames,
     };
   }
 
diff --git a/mobile/lib/models/transaction_tag.dart b/mobile/lib/models/transaction_tag.dart
new file mode 100644
index 000000000..90315fca1
--- /dev/null
+++ b/mobile/lib/models/transaction_tag.dart
@@ -0,0 +1,15 @@
+class TransactionTag {
+  final String id;
+  final String name;
+  final String? color;
+
+  TransactionTag({required this.id, required this.name, this.color});
+
+  factory TransactionTag.fromJson(Map<String, dynamic> json) {
+    return TransactionTag(
+      id: json['id']?.toString() ?? '',
+      name: json['name']?.toString() ?? '',
+      color: json['color']?.toString(),
+    );
+  }
+}
diff --git a/mobile/lib/providers/accounts_provider.dart b/mobile/lib/providers/accounts_provider.dart
index 35c85a928..885163c40 100644
--- a/mobile/lib/providers/accounts_provider.dart
+++ b/mobile/lib/providers/accounts_provider.dart
@@ -54,7 +54,8 @@ class AccountsProvider with ChangeNotifier {
   Map<String, double> get assetTotalsByCurrency {
     final totals = <String, double>{};
     for (var account in _accounts.where((a) => a.isAsset)) {
-      totals[account.currency] = (totals[account.currency] ?? 0.0) + account.balanceAsDouble;
+      totals[account.currency] =
+          (totals[account.currency] ?? 0.0) + account.balanceAsDouble;
     }
     return totals;
   }
@@ -62,7 +63,8 @@ class AccountsProvider with ChangeNotifier {
   Map<String, double> get liabilityTotalsByCurrency {
     final totals = <String, double>{};
     for (var account in _accounts.where((a) => a.isLiability)) {
-      totals[account.currency] = (totals[account.currency] ?? 0.0) + account.balanceAsDouble;
+      totals[account.currency] =
+          (totals[account.currency] ?? 0.0) + account.balanceAsDouble;
     }
     return totals;
   }
@@ -120,7 +122,8 @@ class AccountsProvider with ChangeNotifier {
         );
 
         if (result['success'] == true && result.containsKey('accounts')) {
-          final serverAccounts = (result['accounts'] as List<dynamic>?)?.cast<Account>() ?? [];
+          final serverAccounts =
+              (result['accounts'] as List<dynamic>?)?.cast<Account>() ?? [];
           _pagination = result['pagination'] as Map<String, dynamic>?;
 
           // Save to local cache
@@ -133,11 +136,13 @@ class AccountsProvider with ChangeNotifier {
         } else {
           // If server fetch failed but we have cached data, that's OK
           if (_accounts.isEmpty) {
-            _errorMessage = result['error'] as String? ?? 'Failed to fetch accounts';
+            _errorMessage =
+                result['error'] as String? ?? 'Failed to fetch accounts';
           }
         }
       } else if (!isOnline && _accounts.isEmpty) {
-        _errorMessage = 'You are offline. Please connect to the internet to load accounts.';
+        _errorMessage =
+            'You are offline. Please connect to the internet to load accounts.';
       }
 
       // Fetch balance sheet independently — works even with cached accounts
@@ -150,30 +155,31 @@ class AccountsProvider with ChangeNotifier {
       notifyListeners();
       return _accounts.isNotEmpty;
     } catch (e) {
-      _log.error('AccountsProvider', 'Error in fetchAccounts: $e');
+      _log.error(
+        'AccountsProvider',
+        'fetchAccounts failed with ${e.runtimeType}',
+      );
       // If we have cached accounts, show them even if sync fails
       if (_accounts.isEmpty) {
         // Provide more specific error messages based on exception type
         if (e is SocketException) {
-          _errorMessage = 'Network error. Please check your internet connection and try again.';
-          _log.error('AccountsProvider', 'SocketException: $e');
+          _errorMessage =
+              'Network error. Please check your internet connection and try again.';
         } else if (e is TimeoutException) {
-          _errorMessage = 'Request timed out. Please check your connection and try again.';
-          _log.error('AccountsProvider', 'TimeoutException: $e');
+          _errorMessage =
+              'Request timed out. Please check your connection and try again.';
         } else if (e is FormatException) {
           _errorMessage = 'Server response error. Please try again later.';
-          _log.error('AccountsProvider', 'FormatException: $e');
-        } else if (e.toString().contains('401') || e.toString().contains('unauthorized')) {
+        } else if (e.toString().contains('401') ||
+            e.toString().contains('unauthorized')) {
           _errorMessage = 'unauthorized';
-          _log.error('AccountsProvider', 'Unauthorized error: $e');
         } else if (e.toString().contains('HandshakeException') ||
-                   e.toString().contains('certificate') ||
-                   e.toString().contains('SSL')) {
-          _errorMessage = 'Secure connection error. Please check your internet connection and try again.';
-          _log.error('AccountsProvider', 'SSL/Certificate error: $e');
+            e.toString().contains('certificate') ||
+            e.toString().contains('SSL')) {
+          _errorMessage =
+              'Secure connection error. Please check your internet connection and try again.';
         } else {
           _errorMessage = 'Something went wrong. Please try again.';
-          _log.error('AccountsProvider', 'Unhandled exception: $e');
         }
       }
       _isLoading = false;
@@ -188,7 +194,8 @@ class AccountsProvider with ChangeNotifier {
   /// values as stale rather than clearing them.
   Future<void> _fetchBalanceSheet(String accessToken) async {
     try {
-      final result = await _balanceSheetService.getBalanceSheet(accessToken: accessToken);
+      final result =
+          await _balanceSheetService.getBalanceSheet(accessToken: accessToken);
       if (result['success'] == true) {
         _familyCurrency = result['currency'] as String?;
         final netWorth = result['net_worth'] as Map<String, dynamic>?;
@@ -205,7 +212,10 @@ class AccountsProvider with ChangeNotifier {
         }
       }
     } catch (e) {
-      _log.error('AccountsProvider', 'Error fetching balance sheet: $e');
+      _log.error(
+        'AccountsProvider',
+        'Balance sheet fetch failed with ${e.runtimeType}',
+      );
       // Keep existing values but mark as stale
       if (_netWorthFormatted != null) {
         _isBalanceSheetStale = true;
diff --git a/mobile/lib/providers/auth_provider.dart b/mobile/lib/providers/auth_provider.dart
index 884ef3d53..d3d570d50 100644
--- a/mobile/lib/providers/auth_provider.dart
+++ b/mobile/lib/providers/auth_provider.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -7,6 +9,7 @@ import '../services/auth_service.dart';
 import '../services/device_service.dart';
 import '../services/api_config.dart';
 import '../services/log_service.dart';
+import '../services/telemetry_service.dart';
 
 class AuthProvider with ChangeNotifier {
   final AuthService _authService = AuthService();
@@ -58,6 +61,13 @@ class AuthProvider with ChangeNotifier {
     _loadStoredAuth();
   }
 
+  void _logAuthException(String operation, Object error) {
+    LogService.instance.error(
+      'AuthProvider',
+      '$operation failed with ${error.runtimeType}',
+    );
+  }
+
   Future<void> _loadStoredAuth() async {
     _isLoading = true;
     _isInitializing = true;
@@ -92,11 +102,26 @@ class AuthProvider with ChangeNotifier {
           }
         }
       }
-    } catch (e) {
+      _updateTelemetryUser(_user);
+      _addTelemetryBreadcrumb(
+        'auth',
+        'stored_auth_loaded',
+        data: {
+          'authenticated': isAuthenticated,
+          'api_key_mode': _isApiKeyAuth,
+        },
+      );
+    } catch (e, stackTrace) {
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.load_stored',
+      );
       _tokens = null;
       _user = null;
       _apiKey = null;
       _isApiKeyAuth = false;
+      _clearTelemetryUser();
     }
 
     _isLoading = false;
@@ -127,13 +152,18 @@ class AuthProvider with ChangeNotifier {
         otpCode: otpCode,
       );
 
-      LogService.instance.debug('AuthProvider', 'Login result: $result');
+      LogService.instance.debug(
+        'AuthProvider',
+        'Login result received: success=${result['success'] == true}, mfa_required=${result['mfa_required'] == true}',
+      );
 
       if (result['success'] == true) {
         _tokens = result['tokens'] as AuthTokens?;
         _user = result['user'] as User?;
         _mfaRequired = false;
         _showMfaInput = false; // Reset on successful login
+        _updateTelemetryUser(_user);
+        _addTelemetryBreadcrumb('auth', 'login_success');
         _isLoading = false;
         notifyListeners();
         return true;
@@ -141,7 +171,8 @@ class AuthProvider with ChangeNotifier {
         if (result['mfa_required'] == true) {
           _mfaRequired = true;
           _showMfaInput = true; // Show MFA input field
-          LogService.instance.debug('AuthProvider', 'MFA required! Setting _showMfaInput to true');
+          LogService.instance.debug(
+              'AuthProvider', 'MFA required! Setting _showMfaInput to true');
 
           // If user already submitted an OTP code, this is likely an invalid OTP error
           // Show the error message so user knows the code was wrong
@@ -160,12 +191,27 @@ class AuthProvider with ChangeNotifier {
             _showMfaInput = true;
           }
         }
+        _addTelemetryBreadcrumb(
+          'auth',
+          'login_failed',
+          data: {
+            'mfa_required': _mfaRequired,
+            'otp_submitted': otpCode != null,
+          },
+        );
         _isLoading = false;
         notifyListeners();
         return false;
       }
-    } catch (e) {
-      _errorMessage = 'Connection error: ${e.toString()}';
+    } catch (e, stackTrace) {
+      _logAuthException('Login', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.login',
+      );
+      _errorMessage =
+          'Unable to connect. Please check your network and try again.';
       _isLoading = false;
       notifyListeners();
       return false;
@@ -182,24 +228,42 @@ class AuthProvider with ChangeNotifier {
     try {
       final result = await _authService.loginWithApiKey(apiKey: apiKey);
 
-      LogService.instance.debug('AuthProvider', 'API key login result: $result');
+      LogService.instance.debug(
+        'AuthProvider',
+        'API key login result received: success=${result['success'] == true}',
+      );
 
       if (result['success'] == true) {
         _apiKey = apiKey;
         _isApiKeyAuth = true;
         ApiConfig.setApiKeyAuth(apiKey);
+        _clearTelemetryUser();
+        _addTelemetryBreadcrumb(
+          'auth',
+          'api_key_login_success',
+        );
         _isLoading = false;
         notifyListeners();
         return true;
       } else {
+        _addTelemetryBreadcrumb(
+          'auth',
+          'api_key_login_failed',
+        );
         _errorMessage = result['error'] as String?;
         _isLoading = false;
         notifyListeners();
         return false;
       }
     } catch (e, stackTrace) {
-      LogService.instance.error('AuthProvider', 'API key login error: $e\n$stackTrace');
-      _errorMessage = 'Unable to connect. Please check your network and try again.';
+      _logAuthException('API key login', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.api_key_login',
+      );
+      _errorMessage =
+          'Unable to connect. Please check your network and try again.';
       _isLoading = false;
       notifyListeners();
       return false;
@@ -231,17 +295,27 @@ class AuthProvider with ChangeNotifier {
       if (result['success'] == true) {
         _tokens = result['tokens'] as AuthTokens?;
         _user = result['user'] as User?;
+        _updateTelemetryUser(_user);
+        _addTelemetryBreadcrumb('auth', 'signup_success');
         _isLoading = false;
         notifyListeners();
         return true;
       } else {
+        _addTelemetryBreadcrumb('auth', 'signup_failed');
         _errorMessage = result['error'] as String?;
         _isLoading = false;
         notifyListeners();
         return false;
       }
-    } catch (e) {
-      _errorMessage = 'Connection error: ${e.toString()}';
+    } catch (e, stackTrace) {
+      _logAuthException('Signup', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.signup',
+      );
+      _errorMessage =
+          'Unable to connect. Please check your network and try again.';
       _isLoading = false;
       notifyListeners();
       return false;
@@ -260,12 +334,23 @@ class AuthProvider with ChangeNotifier {
         deviceInfo: deviceInfo,
       );
 
-      final launched = await launchUrl(Uri.parse(ssoUrl), mode: LaunchMode.externalApplication);
+      final launched = await launchUrl(Uri.parse(ssoUrl),
+          mode: LaunchMode.externalApplication);
+      _addTelemetryBreadcrumb(
+        'auth',
+        'sso_launch_result',
+        data: {'launched': launched},
+      );
       if (!launched) {
         _errorMessage = 'Unable to open browser for sign-in.';
       }
     } catch (e, stackTrace) {
-      LogService.instance.error('AuthProvider', 'SSO launch error: $e\n$stackTrace');
+      _logAuthException('SSO launch', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.sso_launch',
+      );
       _errorMessage = 'Unable to start sign-in. Please try again.';
     } finally {
       _isLoading = false;
@@ -285,6 +370,11 @@ class AuthProvider with ChangeNotifier {
         _tokens = result['tokens'] as AuthTokens?;
         _user = result['user'] as User?;
         _ssoOnboardingPending = false;
+        _updateTelemetryUser(_user);
+        _addTelemetryBreadcrumb(
+          'auth',
+          'sso_callback_success',
+        );
         _isLoading = false;
         notifyListeners();
         return true;
@@ -297,17 +387,34 @@ class AuthProvider with ChangeNotifier {
         _ssoLastName = result['last_name'] as String?;
         _ssoAllowAccountCreation = result['allow_account_creation'] == true;
         _ssoHasPendingInvitation = result['has_pending_invitation'] == true;
+        _addTelemetryBreadcrumb(
+          'auth',
+          'sso_onboarding_required',
+          data: {
+            'account_creation_allowed': _ssoAllowAccountCreation,
+            'has_pending_invitation': _ssoHasPendingInvitation,
+          },
+        );
         _isLoading = false;
         notifyListeners();
         return false;
       } else {
+        _addTelemetryBreadcrumb(
+          'auth',
+          'sso_callback_failed',
+        );
         _errorMessage = result['error'] as String?;
         _isLoading = false;
         notifyListeners();
         return false;
       }
     } catch (e, stackTrace) {
-      LogService.instance.error('AuthProvider', 'SSO callback error: $e\n$stackTrace');
+      _logAuthException('SSO callback', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.sso_callback',
+      );
       _errorMessage = 'Sign-in failed. Please try again.';
       _isLoading = false;
       notifyListeners();
@@ -340,17 +447,28 @@ class AuthProvider with ChangeNotifier {
         _tokens = result['tokens'] as AuthTokens?;
         _user = result['user'] as User?;
         _clearSsoOnboardingState();
+        _updateTelemetryUser(_user);
+        _addTelemetryBreadcrumb(
+          'auth',
+          'sso_link_success',
+        );
         _isLoading = false;
         notifyListeners();
         return true;
       } else {
+        _addTelemetryBreadcrumb('auth', 'sso_link_failed');
         _errorMessage = result['error'] as String?;
         _isLoading = false;
         notifyListeners();
         return false;
       }
     } catch (e, stackTrace) {
-      LogService.instance.error('AuthProvider', 'SSO link error: $e\n$stackTrace');
+      _logAuthException('SSO link', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.sso_link',
+      );
       _errorMessage = 'Failed to link account. Please try again.';
       _isLoading = false;
       notifyListeners();
@@ -383,17 +501,31 @@ class AuthProvider with ChangeNotifier {
         _tokens = result['tokens'] as AuthTokens?;
         _user = result['user'] as User?;
         _clearSsoOnboardingState();
+        _updateTelemetryUser(_user);
+        _addTelemetryBreadcrumb(
+          'auth',
+          'sso_create_account_success',
+        );
         _isLoading = false;
         notifyListeners();
         return true;
       } else {
+        _addTelemetryBreadcrumb(
+          'auth',
+          'sso_create_account_failed',
+        );
         _errorMessage = result['error'] as String?;
         _isLoading = false;
         notifyListeners();
         return false;
       }
     } catch (e, stackTrace) {
-      LogService.instance.error('AuthProvider', 'SSO create account error: $e\n$stackTrace');
+      _logAuthException('SSO create account', e);
+      _captureTelemetryException(
+        e,
+        stackTrace,
+        operation: 'auth.sso_create_account',
+      );
       _errorMessage = 'Failed to create account. Please try again.';
       _isLoading = false;
       notifyListeners();
@@ -425,6 +557,10 @@ class AuthProvider with ChangeNotifier {
     _errorMessage = null;
     _mfaRequired = false;
     ApiConfig.clearApiKeyAuth();
+    _safeTelemetry(() async {
+      TelemetryService.instance.addBreadcrumb('auth', 'logout');
+      await TelemetryService.instance.clearUser();
+    });
     notifyListeners();
   }
 
@@ -452,6 +588,64 @@ class AuthProvider with ChangeNotifier {
     }
   }
 
+  Future<void> _setTelemetryUser(User? user) async {
+    if (user == null) {
+      await TelemetryService.instance.clearUser();
+      return;
+    }
+
+    await TelemetryService.instance.setUserId(user.id);
+  }
+
+  void _updateTelemetryUser(User? user) {
+    _safeTelemetry(() => _setTelemetryUser(user));
+  }
+
+  void _clearTelemetryUser() {
+    _safeTelemetry(() => TelemetryService.instance.clearUser());
+  }
+
+  void _addTelemetryBreadcrumb(
+    String category,
+    String message, {
+    Map<String, dynamic>? data,
+  }) {
+    _safeTelemetry(
+      () => TelemetryService.instance.addBreadcrumb(
+        category,
+        message,
+        data: data,
+      ),
+    );
+  }
+
+  void _captureTelemetryException(
+    Object error,
+    StackTrace stackTrace, {
+    required String operation,
+  }) {
+    _safeTelemetry(
+      () => TelemetryService.instance.captureHandledException(
+        error,
+        stackTrace,
+        operation: operation,
+      ),
+    );
+  }
+
+  void _safeTelemetry(FutureOr<void> Function() action) {
+    unawaited(Future<void>(() async {
+      try {
+        await action();
+      } catch (error) {
+        LogService.instance.warning(
+          'AuthProvider',
+          'Telemetry operation failed: ${error.runtimeType}',
+        );
+      }
+    }));
+  }
+
   Future<String?> getValidAccessToken() async {
     if (_isApiKeyAuth && _apiKey != null) {
       return _apiKey;
diff --git a/mobile/lib/providers/chat_provider.dart b/mobile/lib/providers/chat_provider.dart
index 2eb6ed212..6fc02e715 100644
--- a/mobile/lib/providers/chat_provider.dart
+++ b/mobile/lib/providers/chat_provider.dart
@@ -3,9 +3,11 @@ import 'package:flutter/foundation.dart';
 import '../models/chat.dart';
 import '../models/message.dart';
 import '../services/chat_service.dart';
+import '../services/log_service.dart';
 
 class ChatProvider with ChangeNotifier {
   final ChatService _chatService = ChatService();
+  final LogService _log = LogService.instance;
 
   List<Chat> _chats = [];
   Chat? _currentChat;
@@ -60,7 +62,7 @@ class ChatProvider with ChangeNotifier {
         _errorMessage = result['error'] ?? 'Failed to fetch chats';
       }
     } catch (e) {
-      debugPrint('fetchChats error: $e');
+      _log.warning('ChatProvider', 'fetchChats failed: ${e.runtimeType}');
       _errorMessage = 'Something went wrong. Please try again.';
     } finally {
       _isLoading = false;
@@ -94,7 +96,7 @@ class ChatProvider with ChangeNotifier {
         _errorMessage = result['error'] ?? 'Failed to fetch chat';
       }
     } catch (e) {
-      debugPrint('fetchChat error: $e');
+      _log.warning('ChatProvider', 'fetchChat failed: ${e.runtimeType}');
       _errorMessage = 'Something went wrong. Please try again.';
     } finally {
       _isLoading = false;
@@ -153,7 +155,7 @@ class ChatProvider with ChangeNotifier {
         return null;
       }
     } catch (e) {
-      debugPrint('createChat error: $e');
+      _log.warning('ChatProvider', 'createChat failed: ${e.runtimeType}');
       _errorMessage = 'Something went wrong. Please try again.';
       _isLoading = false;
       notifyListeners();
@@ -164,9 +166,8 @@ class ChatProvider with ChangeNotifier {
   void _rollbackOptimisticMessage(String optimisticId, String chatId) {
     if (_currentChat != null && _currentChat!.id == chatId) {
       _currentChat = _currentChat!.copyWith(
-        messages: _currentChat!.messages
-            .where((m) => m.id != optimisticId)
-            .toList(),
+        messages:
+            _currentChat!.messages.where((m) => m.id != optimisticId).toList(),
       );
     }
     _isWaitingForResponse = false;
@@ -236,7 +237,7 @@ class ChatProvider with ChangeNotifier {
     } catch (e) {
       // Roll back the optimistic message on error.
       _rollbackOptimisticMessage(optimisticId, chatId);
-      debugPrint('sendMessage error: $e');
+      _log.warning('ChatProvider', 'sendMessage failed: ${e.runtimeType}');
       _errorMessage = 'Something went wrong. Please try again.';
       return false;
     } finally {
@@ -282,7 +283,7 @@ class ChatProvider with ChangeNotifier {
         notifyListeners();
       }
     } catch (e) {
-      debugPrint('updateChatTitle error: $e');
+      _log.warning('ChatProvider', 'updateChatTitle failed: ${e.runtimeType}');
       _errorMessage = 'Something went wrong. Please try again.';
       notifyListeners();
     }
@@ -314,7 +315,7 @@ class ChatProvider with ChangeNotifier {
         return false;
       }
     } catch (e) {
-      debugPrint('deleteChat error: $e');
+      _log.warning('ChatProvider', 'deleteChat failed: ${e.runtimeType}');
       _errorMessage = 'Something went wrong. Please try again.';
       notifyListeners();
       return false;
@@ -334,7 +335,8 @@ class ChatProvider with ChangeNotifier {
 
       final deletedCount = (result['deletedCount'] as int?) ?? 0;
       if (result['success'] == true || deletedCount > 0) {
-        final failedIds = ((result['failedIds'] as List?) ?? []).cast<String>().toSet();
+        final failedIds =
+            ((result['failedIds'] as List?) ?? []).cast<String>().toSet();
         final deleted = chatIds.toSet().difference(failedIds);
         _chats.removeWhere((c) => deleted.contains(c.id));
 
@@ -350,7 +352,10 @@ class ChatProvider with ChangeNotifier {
       notifyListeners();
       return false;
     } catch (e) {
-      debugPrint('deleteMultipleChats error: $e');
+      _log.warning(
+        'ChatProvider',
+        'deleteMultipleChats failed: ${e.runtimeType}',
+      );
       _errorMessage = 'Something went wrong. Please try again.';
       notifyListeners();
       return false;
@@ -477,14 +482,15 @@ class ChatProvider with ChangeNotifier {
     } catch (e) {
       // Network error — allow polling to continue; timeout check below will
       // stop it if the deadline has passed.
-      debugPrint('Polling error: ${e.toString()}');
+      _log.warning('ChatProvider', 'Polling failed: ${e.runtimeType}');
     }
 
     // Evaluate timeout only after the attempt, and only when no progress was made.
     if (_pollingStartTime != null &&
         DateTime.now().difference(_pollingStartTime!) >= _pollingTimeout) {
       _stopPolling();
-      _errorMessage = 'The assistant took too long to respond. Please try again.';
+      _errorMessage =
+          'The assistant took too long to respond. Please try again.';
       notifyListeners();
     }
   }
diff --git a/mobile/lib/providers/merchants_provider.dart b/mobile/lib/providers/merchants_provider.dart
new file mode 100644
index 000000000..996479646
--- /dev/null
+++ b/mobile/lib/providers/merchants_provider.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/foundation.dart';
+import '../models/merchant.dart';
+import '../services/log_service.dart';
+import '../services/merchants_service.dart';
+
+class MerchantsProvider with ChangeNotifier {
+  final MerchantsService _merchantsService = MerchantsService();
+  final LogService _log = LogService.instance;
+
+  List<Merchant> _merchants = [];
+  bool _isLoading = false;
+  String? _error;
+  bool _hasFetched = false;
+
+  List<Merchant> get merchants => List.unmodifiable(_merchants);
+  bool get isLoading => _isLoading;
+  String? get error => _error;
+  bool get hasFetched => _hasFetched;
+
+  Future<void> fetchMerchants({
+    required String accessToken,
+    bool forceRefresh = false,
+  }) async {
+    if (_isLoading || (_hasFetched && !forceRefresh)) return;
+
+    _isLoading = true;
+    _error = null;
+    notifyListeners();
+
+    try {
+      final result = await _merchantsService.getMerchants(
+        accessToken: accessToken,
+      );
+
+      if (result['success'] == true) {
+        _merchants =
+            (result['merchants'] as List? ?? const []).cast<Merchant>();
+        _hasFetched = true;
+        _log.info(
+          'MerchantsProvider',
+          'Fetched ${_merchants.length} merchants',
+        );
+      } else {
+        _error = result['error'] as String?;
+        _log.error('MerchantsProvider', 'Failed to fetch merchants: $_error');
+      }
+    } catch (e) {
+      _error = 'Failed to load merchants';
+      _log.error('MerchantsProvider', 'Exception fetching merchants: $e');
+    } finally {
+      _isLoading = false;
+      notifyListeners();
+    }
+  }
+
+  void clear() {
+    _merchants = [];
+    _hasFetched = false;
+    _error = null;
+    notifyListeners();
+  }
+}
diff --git a/mobile/lib/providers/privacy_provider.dart b/mobile/lib/providers/privacy_provider.dart
new file mode 100644
index 000000000..dc868981c
--- /dev/null
+++ b/mobile/lib/providers/privacy_provider.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/foundation.dart';
+import '../services/log_service.dart';
+import '../services/preferences_service.dart';
+
+/// App-wide "privacy mode" toggle. When [hidden] is true, money values are
+/// masked across the app (see [MoneyMasker]). The choice is persisted so it
+/// survives relaunches, and changes notify listeners so every money widget
+/// rebuilds immediately.
+///
+/// The preference is read before `runApp` and passed in as [initialHidden], so
+/// the very first build already has the correct value — no startup window where
+/// balances could flash. When [initialHidden] is omitted (e.g. in tests) the
+/// provider starts masked (fail-closed) and hydrates asynchronously, so a user
+/// who had privacy mode on still never flashes their balances.
+class PrivacyProvider extends ChangeNotifier {
+  // Fail closed: assume masked until the stored preference is known.
+  bool _hidden;
+
+  // Set once the user explicitly toggles, so a late-completing initial load
+  // can't clobber their choice (see _load).
+  bool _userOverrode = false;
+
+  /// Whether monetary values should be masked.
+  bool get hidden => _hidden;
+
+  PrivacyProvider({bool? initialHidden}) : _hidden = initialHidden ?? true {
+    if (initialHidden == null) {
+      _load();
+    }
+  }
+
+  Future<void> _load() async {
+    bool? stored;
+    try {
+      stored = await PreferencesService.instance.getMoneyHidden();
+    } catch (e) {
+      // Keep the fail-closed default (masked) if the preference can't be read.
+      LogService.instance.warning(
+        'PrivacyProvider',
+        'Failed to load privacy preference with ${e.runtimeType}',
+      );
+    }
+    // Only apply the loaded value if the user hasn't toggled in the meantime,
+    // so the initial hydration never overwrites an explicit choice.
+    if (!_userOverrode && stored != null) {
+      _hidden = stored;
+    }
+    notifyListeners();
+  }
+
+  /// Sets the masked state and persists it. No-ops if unchanged. If persistence
+  /// fails the in-memory state is reverted so the UI stays consistent with what
+  /// is actually stored.
+  Future<void> setHidden(bool value) async {
+    _userOverrode = true;
+    if (_hidden == value) return;
+    final previous = _hidden;
+    _hidden = value;
+    notifyListeners();
+    try {
+      await PreferencesService.instance.setMoneyHidden(value);
+    } catch (e) {
+      _hidden = previous;
+      notifyListeners();
+      LogService.instance.warning(
+        'PrivacyProvider',
+        'Failed to persist privacy preference with ${e.runtimeType}',
+      );
+    }
+  }
+
+  /// Flips the masked state.
+  Future<void> toggle() => setHidden(!_hidden);
+}
diff --git a/mobile/lib/providers/tags_provider.dart b/mobile/lib/providers/tags_provider.dart
new file mode 100644
index 000000000..944b7ff56
--- /dev/null
+++ b/mobile/lib/providers/tags_provider.dart
@@ -0,0 +1,56 @@
+import 'package:flutter/foundation.dart';
+import '../models/transaction_tag.dart';
+import '../services/log_service.dart';
+import '../services/tags_service.dart';
+
+class TagsProvider with ChangeNotifier {
+  final TagsService _tagsService = TagsService();
+  final LogService _log = LogService.instance;
+
+  List<TransactionTag> _tags = [];
+  bool _isLoading = false;
+  String? _error;
+  bool _hasFetched = false;
+
+  List<TransactionTag> get tags => List.unmodifiable(_tags);
+  bool get isLoading => _isLoading;
+  String? get error => _error;
+  bool get hasFetched => _hasFetched;
+
+  Future<void> fetchTags({
+    required String accessToken,
+    bool forceRefresh = false,
+  }) async {
+    if (_isLoading || (_hasFetched && !forceRefresh)) return;
+
+    _isLoading = true;
+    _error = null;
+    notifyListeners();
+
+    try {
+      final result = await _tagsService.getTags(accessToken: accessToken);
+
+      if (result['success'] == true) {
+        _tags = (result['tags'] as List? ?? const []).cast<TransactionTag>();
+        _hasFetched = true;
+        _log.info('TagsProvider', 'Fetched ${_tags.length} tags');
+      } else {
+        _error = result['error'] as String?;
+        _log.error('TagsProvider', 'Failed to fetch tags: $_error');
+      }
+    } catch (e) {
+      _error = 'Failed to load tags';
+      _log.error('TagsProvider', 'Exception fetching tags: $e');
+    } finally {
+      _isLoading = false;
+      notifyListeners();
+    }
+  }
+
+  void clear() {
+    _tags = [];
+    _hasFetched = false;
+    _error = null;
+    notifyListeners();
+  }
+}
diff --git a/mobile/lib/providers/transactions_provider.dart b/mobile/lib/providers/transactions_provider.dart
index 634f1f520..e27364103 100644
--- a/mobile/lib/providers/transactions_provider.dart
+++ b/mobile/lib/providers/transactions_provider.dart
@@ -32,10 +32,14 @@ class TransactionsProvider with ChangeNotifier {
 
   bool get isLoading => _isLoading;
   String? get error => _error;
-  bool get hasPendingTransactions =>
-      _transactions.any((t) => t.syncStatus == SyncStatus.pending || t.syncStatus == SyncStatus.pendingDelete);
-  int get pendingCount =>
-      _transactions.where((t) => t.syncStatus == SyncStatus.pending || t.syncStatus == SyncStatus.pendingDelete).length;
+  bool get hasPendingTransactions => _transactions.any((t) =>
+      t.syncStatus == SyncStatus.pending ||
+      t.syncStatus == SyncStatus.pendingDelete);
+  int get pendingCount => _transactions
+      .where((t) =>
+          t.syncStatus == SyncStatus.pending ||
+          t.syncStatus == SyncStatus.pendingDelete)
+      .length;
 
   SyncService get syncService => _syncService;
 
@@ -49,33 +53,34 @@ class TransactionsProvider with ChangeNotifier {
 
   void _onConnectivityChanged() {
     if (_isDisposed) return;
-    
+
     // Auto-sync when connectivity is restored
     if (_connectivityService?.isOnline == true &&
         hasPendingTransactions &&
         _lastAccessToken != null &&
         !_isAutoSyncing) {
-      _log.info('TransactionsProvider', 'Connectivity restored, auto-syncing $pendingCount pending transactions');
+      _log.info('TransactionsProvider',
+          'Connectivity restored, auto-syncing $pendingCount pending transactions');
       _isAutoSyncing = true;
 
       // Fire and forget - we don't await to avoid blocking connectivity listener
       // Use callbacks to handle completion and errors asynchronously
-      syncTransactions(accessToken: _lastAccessToken!)
-          .then((_) {
-            if (!_isDisposed) {
-              _log.info('TransactionsProvider', 'Auto-sync completed successfully');
-            }
-          })
-          .catchError((e) {
-            if (!_isDisposed) {
-              _log.error('TransactionsProvider', 'Auto-sync failed: $e');
-            }
-          })
-          .whenComplete(() {
-            if (!_isDisposed) {
-              _isAutoSyncing = false;
-            }
-          });
+      syncTransactions(accessToken: _lastAccessToken!).then((_) {
+        if (!_isDisposed) {
+          _log.info('TransactionsProvider', 'Auto-sync completed successfully');
+        }
+      }).catchError((e) {
+        if (!_isDisposed) {
+          _log.error(
+            'TransactionsProvider',
+            'Auto-sync failed with ${e.runtimeType}',
+          );
+        }
+      }).whenComplete(() {
+        if (!_isDisposed) {
+          _isAutoSyncing = false;
+        }
+      });
     }
   }
 
@@ -100,29 +105,38 @@ class TransactionsProvider with ChangeNotifier {
         accountId: accountId,
       );
 
-      _log.debug('TransactionsProvider', 'Loaded ${localTransactions.length} transactions from local storage (accountId: $accountId)');
+      _log.debug(
+        'TransactionsProvider',
+        'Loaded ${localTransactions.length} transactions from local storage${accountId != null ? " with account filter" : ""}',
+      );
 
       _transactions = localTransactions;
       notifyListeners();
 
       // If online and force sync, or if local storage is empty, sync from server
       final isOnline = _connectivityService?.isOnline ?? true;
-      _log.debug('TransactionsProvider', 'Online: $isOnline, ForceSync: $forceSync, LocalEmpty: ${localTransactions.isEmpty}');
+      _log.debug('TransactionsProvider',
+          'Online: $isOnline, ForceSync: $forceSync, LocalEmpty: ${localTransactions.isEmpty}');
 
       if (isOnline && (forceSync || localTransactions.isEmpty)) {
-        _log.debug('TransactionsProvider', 'Syncing from server for accountId: $accountId');
+        _log.debug(
+          'TransactionsProvider',
+          'Syncing transactions from server${accountId != null ? " with account filter" : ""}',
+        );
         final result = await _syncService.syncFromServer(
           accessToken: accessToken,
           accountId: accountId,
         );
 
         if (result.success) {
-          _log.info('TransactionsProvider', 'Sync successful, synced ${result.syncedCount} transactions');
+          _log.info('TransactionsProvider',
+              'Sync successful, synced ${result.syncedCount} transactions');
           // Reload from local storage after sync
           final updatedTransactions = await _offlineStorage.getTransactions(
             accountId: accountId,
           );
-          _log.debug('TransactionsProvider', 'After sync, loaded ${updatedTransactions.length} transactions from local storage');
+          _log.debug('TransactionsProvider',
+              'After sync, loaded ${updatedTransactions.length} transactions from local storage');
           _transactions = updatedTransactions;
           _error = null;
         } else {
@@ -131,7 +145,10 @@ class TransactionsProvider with ChangeNotifier {
         }
       }
     } catch (e) {
-      _log.error('TransactionsProvider', 'Error in fetchTransactions: $e');
+      _log.error(
+        'TransactionsProvider',
+        'fetchTransactions failed with ${e.runtimeType}',
+      );
       _error = 'Something went wrong. Please try again.';
     } finally {
       _isLoading = false;
@@ -151,13 +168,20 @@ class TransactionsProvider with ChangeNotifier {
     String? notes,
     String? categoryId,
     String? categoryName,
+    String? merchantId,
+    String? merchantName,
+    List<String>? tagIds,
+    List<String>? tagNames,
   }) async {
     _lastAccessToken = accessToken; // Store for auto-sync
 
     try {
       final isOnline = _connectivityService?.isOnline ?? false;
 
-      _log.info('TransactionsProvider', 'Creating transaction: $name, amount: $amount, online: $isOnline');
+      _log.info(
+        'TransactionsProvider',
+        'Creating transaction locally, online: $isOnline',
+      );
 
       // ALWAYS save locally first (offline-first strategy)
       final localTransaction = await _offlineStorage.saveTransaction(
@@ -170,20 +194,26 @@ class TransactionsProvider with ChangeNotifier {
         notes: notes,
         categoryId: categoryId,
         categoryName: categoryName,
+        merchantId: merchantId,
+        merchantName: merchantName,
+        tagIds: tagIds ?? const [],
+        tagNames: tagNames ?? const [],
         syncStatus: SyncStatus.pending, // Start as pending
       );
 
-      _log.info('TransactionsProvider', 'Transaction saved locally with ID: ${localTransaction.localId}');
+      _log.info('TransactionsProvider', 'Transaction saved locally');
 
       // Reload transactions to show the new one immediately
       await fetchTransactions(accessToken: accessToken, accountId: accountId);
 
       // If online, try to upload in background
       if (isOnline) {
-        _log.info('TransactionsProvider', 'Attempting to upload transaction to server...');
+        _log.info('TransactionsProvider',
+            'Attempting to upload transaction to server...');
 
         // Don't await - upload in background
-        _transactionsService.createTransaction(
+        _transactionsService
+            .createTransaction(
           accessToken: accessToken,
           accountId: accountId,
           name: name,
@@ -193,11 +223,17 @@ class TransactionsProvider with ChangeNotifier {
           nature: nature,
           notes: notes,
           categoryId: categoryId,
-        ).then((result) async {
+          merchantId: merchantId,
+          tagIds: tagIds == null || tagIds.isEmpty ? null : tagIds,
+          externalId: localTransaction.localId,
+          source: TransactionsService.mobileIdempotencySource,
+        )
+            .then((result) async {
           if (_isDisposed) return;
-          
+
           if (result['success'] == true) {
-            _log.info('TransactionsProvider', 'Transaction uploaded successfully');
+            _log.info(
+                'TransactionsProvider', 'Transaction uploaded successfully');
             final serverTransaction = result['transaction'] as Transaction;
             // Update local transaction with server ID and mark as synced
             await _offlineStorage.updateTransactionSyncStatus(
@@ -206,30 +242,126 @@ class TransactionsProvider with ChangeNotifier {
               serverId: serverTransaction.id,
             );
             // Reload to update UI
-            await fetchTransactions(accessToken: accessToken, accountId: accountId);
+            await fetchTransactions(
+                accessToken: accessToken, accountId: accountId);
           } else {
-            _log.warning('TransactionsProvider', 'Server upload failed: ${result['error']}. Transaction will sync later.');
+            _log.warning('TransactionsProvider',
+                'Server upload failed: ${result['error']}. Transaction will sync later.');
           }
         }).catchError((e) {
           if (_isDisposed) return;
-          
-          _log.error('TransactionsProvider', 'Exception during upload: $e');
+
+          _log.error(
+            'TransactionsProvider',
+            'Upload failed with ${e.runtimeType}',
+          );
           _error = 'Failed to upload transaction. It will sync when online.';
           notifyListeners();
         });
       } else {
-        _log.info('TransactionsProvider', 'Offline: Transaction will sync when online');
+        _log.info('TransactionsProvider',
+            'Offline: Transaction will sync when online');
       }
 
       return true; // Always return true because it's saved locally
     } catch (e) {
-      _log.error('TransactionsProvider', 'Failed to create transaction: $e');
+      _log.error(
+        'TransactionsProvider',
+        'Failed to create transaction with ${e.runtimeType}',
+      );
       _error = 'Something went wrong. Please try again.';
       notifyListeners();
       return false;
     }
   }
 
+  /// Update an existing synced transaction. Edits are online-only because the
+  /// current offline queue supports create/delete but not pending updates.
+  Future<bool> updateTransaction({
+    required String accessToken,
+    required OfflineTransaction transaction,
+    String? name,
+    String? notes,
+    String? categoryId,
+    String? merchantId,
+    List<String>? tagIds,
+  }) async {
+    _lastAccessToken = accessToken;
+    _currentAccountId = transaction.accountId;
+    _isLoading = true;
+    _error = null;
+    notifyListeners();
+
+    try {
+      final transactionId = transaction.id;
+      if (transactionId == null || transactionId.isEmpty) {
+        _error = 'Only synced transactions can be edited from mobile.';
+        return false;
+      }
+
+      final isOnline = _connectivityService?.isOnline ?? false;
+      if (!isOnline) {
+        _error = 'Connect to the internet before editing synced transactions.';
+        return false;
+      }
+
+      final result = await _transactionsService.updateTransaction(
+        accessToken: accessToken,
+        transactionId: transactionId,
+        name: name,
+        notes: notes,
+        categoryId: categoryId,
+        merchantId: merchantId,
+        tagIds: tagIds,
+      );
+
+      if (result['success'] == true) {
+        var updatedTransaction = result['transaction'];
+        if (updatedTransaction is! Transaction) {
+          final refreshed = await _transactionsService.getTransaction(
+            accessToken: accessToken,
+            transactionId: transactionId,
+          );
+          updatedTransaction = refreshed['transaction'];
+        }
+
+        final transactionToCache = updatedTransaction is Transaction
+            ? updatedTransaction
+            : transaction.toTransactionWithSubmittedUpdate(
+                name: name,
+                notes: notes,
+                categoryId: categoryId,
+                merchantId: merchantId,
+                tagIds: tagIds,
+              );
+
+        await _offlineStorage.upsertTransactionFromServer(
+          transactionToCache,
+          accountId: transaction.accountId,
+        );
+        final updatedTransactions = await _offlineStorage.getTransactions(
+          accountId: transaction.accountId,
+        );
+        _transactions = updatedTransactions;
+        _error = null;
+        return true;
+      }
+
+      _error = result['error'] as String? ?? 'Failed to update transaction';
+      return false;
+    } catch (e) {
+      _log.error(
+        'TransactionsProvider',
+        'Failed to update transaction with ${e.runtimeType}',
+      );
+      _error = 'Something went wrong. Please try again.';
+      return false;
+    } finally {
+      _isLoading = false;
+      notifyListeners();
+    }
+  }
+
   /// Delete a transaction
   Future<bool> deleteTransaction({
     required String accessToken,
@@ -258,7 +390,8 @@ class TransactionsProvider with ChangeNotifier {
         }
       } else {
         // Offline - mark for deletion and sync later
-        _log.info('TransactionsProvider', 'Offline: Marking transaction for deletion');
+        _log.info('TransactionsProvider',
+            'Offline: Marking transaction for deletion');
         await _offlineStorage.markTransactionForDeletion(transactionId);
 
         // Reload from storage to update UI with pending delete status
@@ -270,7 +403,10 @@ class TransactionsProvider with ChangeNotifier {
         return true;
       }
     } catch (e) {
-      _log.error('TransactionsProvider', 'Failed to delete transaction: $e');
+      _log.error(
+        'TransactionsProvider',
+        'Failed to delete transaction with ${e.runtimeType}',
+      );
       _error = 'Something went wrong. Please try again.';
       notifyListeners();
       return false;
@@ -300,13 +436,15 @@ class TransactionsProvider with ChangeNotifier {
           notifyListeners();
           return true;
         } else {
-          _error = result['error'] as String? ?? 'Failed to delete transactions';
+          _error =
+              result['error'] as String? ?? 'Failed to delete transactions';
           notifyListeners();
           return false;
         }
       } else {
         // Offline - mark all for deletion and sync later
-        _log.info('TransactionsProvider', 'Offline: Marking ${transactionIds.length} transactions for deletion');
+        _log.info('TransactionsProvider',
+            'Offline: Marking ${transactionIds.length} transactions for deletion');
         for (final id in transactionIds) {
           await _offlineStorage.markTransactionForDeletion(id);
         }
@@ -320,7 +458,10 @@ class TransactionsProvider with ChangeNotifier {
         return true;
       }
     } catch (e) {
-      _log.error('TransactionsProvider', 'Failed to delete multiple transactions: $e');
+      _log.error(
+        'TransactionsProvider',
+        'Failed to delete multiple transactions with ${e.runtimeType}',
+      );
       _error = 'Something went wrong. Please try again.';
       notifyListeners();
       return false;
@@ -332,10 +473,14 @@ class TransactionsProvider with ChangeNotifier {
     required String localId,
     required SyncStatus syncStatus,
   }) async {
-    _log.info('TransactionsProvider', 'Undoing transaction $localId with status $syncStatus');
+    _log.info(
+      'TransactionsProvider',
+      'Undoing transaction with status $syncStatus',
+    );
 
     try {
-      final success = await _offlineStorage.undoPendingTransaction(localId, syncStatus);
+      final success =
+          await _offlineStorage.undoPendingTransaction(localId, syncStatus);
 
       if (success) {
         // Reload from storage to update UI
@@ -352,7 +497,10 @@ class TransactionsProvider with ChangeNotifier {
         return false;
       }
     } catch (e) {
-      _log.error('TransactionsProvider', 'Failed to undo transaction: $e');
+      _log.error(
+        'TransactionsProvider',
+        'Failed to undo transaction with ${e.runtimeType}',
+      );
       _error = 'Something went wrong. Please try again.';
       notifyListeners();
       return false;
@@ -384,7 +532,10 @@ class TransactionsProvider with ChangeNotifier {
         _error = result.error;
       }
     } catch (e) {
-      _log.error('TransactionsProvider', 'Failed to sync transactions: $e');
+      _log.error(
+        'TransactionsProvider',
+        'Failed to sync transactions with ${e.runtimeType}',
+      );
       _error = 'Something went wrong. Please try again.';
     } finally {
       _isLoading = false;
diff --git a/mobile/lib/screens/backend_config_screen.dart b/mobile/lib/screens/backend_config_screen.dart
index b5cbf5519..5fb20dea7 100644
--- a/mobile/lib/screens/backend_config_screen.dart
+++ b/mobile/lib/screens/backend_config_screen.dart
@@ -4,7 +4,9 @@ import 'package:http/http.dart' as http;
 import '../models/custom_proxy_header.dart';
 import '../services/api_config.dart';
 import '../services/custom_proxy_headers_service.dart';
+import '../services/log_service.dart';
 import '../widgets/custom_proxy_headers_editor.dart';
+import '../l10n/app_localizations.dart';
 
 class BackendConfigScreen extends StatefulWidget {
   final VoidCallback? onConfigSaved;
@@ -47,10 +49,13 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
       if (savedUrl != null && savedUrl.isNotEmpty) {
         urlToShow = savedUrl;
       }
-    } catch (e, stack) {
+    } catch (e) {
       // Swallow storage failures so the screen still becomes interactive with
       // sensible defaults; the user can re-enter and re-save.
-      debugPrint('BackendConfigScreen: failed to load saved config: $e\n$stack');
+      LogService.instance.warning(
+        'BackendConfigScreen',
+        'Failed to load saved backend config with ${e.runtimeType}',
+      );
     } finally {
       if (mounted) {
         setState(() {
@@ -65,6 +70,8 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
   Future<void> _testConnection() async {
     if (!_formKey.currentState!.validate()) return;
 
+    final l = AppLocalizations.of(context);
+
     setState(() {
       _isTesting = true;
       _errorMessage = null;
@@ -75,9 +82,9 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
     try {
       // Normalize base URL by removing trailing slashes
       final normalizedUrl = _urlController.text.trim().replaceAll(
-        RegExp(r'/+$'),
-        '',
-      );
+            RegExp(r'/+$'),
+            '',
+          );
 
       // Apply the unsaved edits only for the duration of this probe so the
       // test reflects what the user is about to save. Restored in `finally`.
@@ -85,37 +92,33 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
 
       // Check /sessions/new page to verify it's a Sure backend
       final sessionsUrl = Uri.parse('$normalizedUrl/sessions/new');
-      final sessionsResponse = await http
-          .get(sessionsUrl, headers: ApiConfig.htmlHeaders())
-          .timeout(
-            const Duration(seconds: 10),
-            onTimeout: () {
-              throw Exception(
-                'Connection timeout. Please check the URL and try again.',
-              );
-            },
-          );
+      final sessionsResponse =
+          await http.get(sessionsUrl, headers: ApiConfig.htmlHeaders()).timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          throw Exception(l.backendConfigTimeout);
+        },
+      );
 
       if (sessionsResponse.statusCode >= 200 &&
           sessionsResponse.statusCode < 400) {
         if (mounted) {
           setState(() {
-            _successMessage =
-                'Connection successful!';
+            _successMessage = l.backendConfigSuccess;
           });
         }
       } else {
         if (mounted) {
           setState(() {
             _errorMessage =
-                'Server responded with status ${sessionsResponse.statusCode}. Please check if this is a Sure backend server.';
+                l.backendConfigServerError(sessionsResponse.statusCode);
           });
         }
       }
     } catch (e) {
       if (mounted) {
         setState(() {
-          _errorMessage = 'Connection failed: ${e.toString()}';
+          _errorMessage = l.backendConfigConnectionFailed(e.toString());
         });
       }
     } finally {
@@ -131,6 +134,8 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
   Future<void> _saveAndContinue() async {
     if (!_formKey.currentState!.validate()) return;
 
+    final l = AppLocalizations.of(context);
+
     setState(() {
       _isLoading = true;
       _errorMessage = null;
@@ -139,9 +144,9 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
     try {
       // Normalize base URL by removing trailing slashes
       final normalizedUrl = _urlController.text.trim().replaceAll(
-        RegExp(r'/+$'),
-        '',
-      );
+            RegExp(r'/+$'),
+            '',
+          );
 
       // Save URL to SharedPreferences
       final prefs = await SharedPreferences.getInstance();
@@ -161,7 +166,7 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
     } catch (e) {
       if (mounted) {
         setState(() {
-          _errorMessage = 'Failed to save URL: ${e.toString()}';
+          _errorMessage = l.backendConfigSaveFailed(e.toString());
         });
       }
     } finally {
@@ -173,9 +178,9 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
     }
   }
 
-  String? _validateUrl(String? value) {
+  String? _validateUrl(String? value, AppLocalizations l) {
     if (value == null || value.isEmpty) {
-      return 'Please enter a backend URL';
+      return l.backendConfigUrlRequired;
     }
 
     final trimmedValue = value.trim();
@@ -183,17 +188,17 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
     // Check if it starts with http:// or https://
     if (!trimmedValue.startsWith('http://') &&
         !trimmedValue.startsWith('https://')) {
-      return 'URL must start with http:// or https://';
+      return l.backendConfigUrlScheme;
     }
 
     // Basic URL validation
     try {
       final uri = Uri.parse(trimmedValue);
       if (!uri.hasScheme || uri.host.isEmpty) {
-        return 'Please enter a valid URL';
+        return l.backendConfigUrlInvalid;
       }
     } catch (e) {
-      return 'Please enter a valid URL';
+      return l.backendConfigUrlInvalid;
     }
 
     return null;
@@ -201,6 +206,7 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
 
     return Scaffold(
@@ -221,19 +227,19 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
                 ),
                 const SizedBox(height: 16),
                 Text(
-                  'Configuration',
+                  l.backendConfigTitle,
                   style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                    fontWeight: FontWeight.bold,
-                    color: colorScheme.primary,
-                  ),
+                        fontWeight: FontWeight.bold,
+                        color: colorScheme.primary,
+                      ),
                   textAlign: TextAlign.center,
                 ),
                 const SizedBox(height: 8),
                 Text(
-                  'Update your Sure server URL',
+                  l.backendConfigSubtitle,
                   style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                    color: colorScheme.onSurfaceVariant,
-                  ),
+                        color: colorScheme.onSurfaceVariant,
+                      ),
                   textAlign: TextAlign.center,
                 ),
                 const SizedBox(height: 48),
@@ -253,7 +259,7 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
                           Icon(Icons.info_outline, color: colorScheme.primary),
                           const SizedBox(width: 12),
                           Text(
-                            'Example URLs',
+                            l.backendConfigExampleUrlsLabel,
                             style: TextStyle(
                               color: colorScheme.primary,
                               fontWeight: FontWeight.bold,
@@ -352,23 +358,23 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
                   keyboardType: TextInputType.url,
                   autocorrect: false,
                   textInputAction: TextInputAction.done,
-                  decoration: const InputDecoration(
-                    labelText: 'Sure server URL',
-                    prefixIcon: Icon(Icons.cloud_outlined),
-                    hintText: 'https://app.sure.am',
+                  decoration: InputDecoration(
+                    labelText: l.backendConfigUrlLabel,
+                    prefixIcon: const Icon(Icons.cloud_outlined),
+                    hintText: l.backendConfigUrlHint,
                   ),
-                  validator: _validateUrl,
+                  validator: (value) => _validateUrl(value, l),
                   onFieldSubmitted: (_) => _saveAndContinue(),
                 ),
                 const SizedBox(height: 24),
                 ExpansionTile(
                   tilePadding: EdgeInsets.zero,
                   leading: const Icon(Icons.http_outlined),
-                  title: const Text('Custom proxy headers'),
+                  title: Text(l.backendConfigProxyHeadersLabel),
                   subtitle: Text(
                     _customHeaders.isEmpty
-                        ? 'Optional headers for a reverse proxy or auth gateway'
-                        : '${_customHeaders.length} configured',
+                        ? l.backendConfigProxyHeadersSubtitle
+                        : l.backendConfigProxyHeadersCount(_customHeaders.length),
                   ),
                   children: [
                     const SizedBox(height: 8),
@@ -388,7 +394,7 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
                       ),
                     const SizedBox(height: 8),
                     Text(
-                      'Headers are sent by the app with API requests. External browser SSO pages may not receive them.',
+                      l.backendConfigHeadersHelp,
                       style: Theme.of(context).textTheme.bodySmall?.copyWith(
                             color: colorScheme.onSurfaceVariant,
                           ),
@@ -407,7 +413,7 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
                           child: CircularProgressIndicator(strokeWidth: 2),
                         )
                       : const Icon(Icons.cable),
-                  label: Text(_isTesting ? 'Testing...' : 'Test Connection'),
+                  label: Text(_isTesting ? l.backendConfigTesting : l.backendConfigTestButton),
                 ),
 
                 const SizedBox(height: 12),
@@ -421,17 +427,17 @@ class _BackendConfigScreenState extends State<BackendConfigScreen> {
                           width: 20,
                           child: CircularProgressIndicator(strokeWidth: 2),
                         )
-                      : const Text('Continue'),
+                      : Text(l.backendConfigContinueButton),
                 ),
 
                 const SizedBox(height: 24),
 
                 // Info text
                 Text(
-                  'You can change this later in the settings.',
+                  l.backendConfigChangeHint,
                   style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                    color: colorScheme.onSurfaceVariant,
-                  ),
+                        color: colorScheme.onSurfaceVariant,
+                      ),
                   textAlign: TextAlign.center,
                 ),
               ],
diff --git a/mobile/lib/screens/biometric_lock_screen.dart b/mobile/lib/screens/biometric_lock_screen.dart
index 536e0a9c0..5ebb88e01 100644
--- a/mobile/lib/screens/biometric_lock_screen.dart
+++ b/mobile/lib/screens/biometric_lock_screen.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import '../l10n/app_localizations.dart';
 import '../services/biometric_service.dart';
 
 class BiometricLockScreen extends StatefulWidget {
@@ -38,13 +39,14 @@ class _BiometricLockScreenState extends State<BiometricLockScreen> {
       widget.onUnlocked();
     } else {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('Authentication failed. Tap Unlock to try again.')),
+        SnackBar(content: Text(AppLocalizations.of(context).biometricLockFailedRetry)),
       );
     }
   }
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
 
     return Scaffold(
@@ -61,21 +63,21 @@ class _BiometricLockScreenState extends State<BiometricLockScreen> {
               ),
               const SizedBox(height: 24),
               Text(
-                'App Locked',
+                l.biometricTitle,
                 style: Theme.of(context).textTheme.headlineSmall?.copyWith(
                       fontWeight: FontWeight.w600,
                     ),
               ),
               const SizedBox(height: 8),
               Text(
-                'Authenticate to continue',
+                l.biometricSubtitle,
                 style: TextStyle(color: colorScheme.onSurfaceVariant),
               ),
               const SizedBox(height: 40),
               FilledButton.icon(
                 onPressed: _isAuthenticating ? null : _authenticate,
                 icon: const Icon(Icons.fingerprint),
-                label: Text(_isAuthenticating ? 'Authenticating…' : 'Unlock'),
+                label: Text(_isAuthenticating ? l.biometricAuthenticating : l.biometricUnlock),
                 style: FilledButton.styleFrom(
                   minimumSize: const Size(200, 50),
                   shape: RoundedRectangleBorder(
@@ -87,7 +89,7 @@ class _BiometricLockScreenState extends State<BiometricLockScreen> {
                 const SizedBox(height: 16),
                 TextButton(
                   onPressed: widget.onLogout,
-                  child: const Text('Log out'),
+                  child: Text(l.biometricLogOut),
                 ),
               ],
             ],
diff --git a/mobile/lib/screens/calendar_screen.dart b/mobile/lib/screens/calendar_screen.dart
index 611d54f86..074278970 100644
--- a/mobile/lib/screens/calendar_screen.dart
+++ b/mobile/lib/screens/calendar_screen.dart
@@ -6,7 +6,11 @@ import '../models/transaction.dart';
 import '../providers/accounts_provider.dart';
 import '../providers/transactions_provider.dart';
 import '../providers/auth_provider.dart';
+import '../providers/privacy_provider.dart';
 import '../services/log_service.dart';
+import '../utils/amount_parser.dart';
+import '../l10n/app_localizations.dart';
+import '../utils/money_masker.dart';
 
 class CalendarScreen extends StatefulWidget {
   const CalendarScreen({super.key});
@@ -50,7 +54,8 @@ class _CalendarScreenState extends State<CalendarScreen> {
       // Select first account of the selected type
       final filteredAccounts = _getFilteredAccounts(accountsProvider.accounts);
       setState(() {
-        _selectedAccount = filteredAccounts.isNotEmpty ? filteredAccounts.first : null;
+        _selectedAccount =
+            filteredAccounts.isNotEmpty ? filteredAccounts.first : null;
       });
       if (_selectedAccount != null) {
         await _loadTransactionsForAccount();
@@ -86,17 +91,17 @@ class _CalendarScreenState extends State<CalendarScreen> {
       );
 
       final transactions = transactionsProvider.transactions;
-      _log.info('CalendarScreen', 'Loaded ${transactions.length} transactions for account ${_selectedAccount!.name}');
-
-      if (transactions.isNotEmpty) {
-        _log.debug('CalendarScreen', 'Sample transaction - name: ${transactions.first.name}, amount: ${transactions.first.amount}, nature: ${transactions.first.nature}');
-      }
+      _log.info(
+        'CalendarScreen',
+        'Loaded ${transactions.length} transactions for selected account',
+      );
 
       // Store transactions for date filtering
       _transactions = List.from(transactions);
 
       _calculateDailyChanges(transactions);
-      _log.info('CalendarScreen', 'Calculated ${_dailyChanges.length} days with changes');
+      _log.info('CalendarScreen',
+          'Calculated ${_dailyChanges.length} days with changes');
     }
 
     setState(() {
@@ -107,50 +112,36 @@ class _CalendarScreenState extends State<CalendarScreen> {
   void _calculateDailyChanges(List<Transaction> transactions) {
     final changes = <String, double>{};
 
-    _log.debug('CalendarScreen', 'Starting to calculate daily changes for ${transactions.length} transactions');
+    _log.debug('CalendarScreen',
+        'Starting to calculate daily changes for ${transactions.length} transactions');
 
     for (var transaction in transactions) {
       try {
         final date = DateTime.parse(transaction.date);
         final dateKey = DateFormat('yyyy-MM-dd').format(date);
 
-        // Parse amount with proper sign handling
-        String trimmedAmount = transaction.amount.trim();
-        trimmedAmount = trimmedAmount.replaceAll('\u2212', '-'); // Normalize minus sign
-
-        // Detect if the amount has a negative sign
-        bool hasNegativeSign = trimmedAmount.startsWith('-') || trimmedAmount.endsWith('-');
-
-        // Remove all non-numeric characters except decimal point and minus sign
-        String numericString = trimmedAmount.replaceAll(RegExp(r'[^\d.\-]'), '');
-
-        // Parse the numeric value
-        double amount = double.tryParse(numericString.replaceAll('-', '')) ?? 0.0;
-
-        // Apply the sign from the string
-        if (hasNegativeSign) {
-          amount = -amount;
-        }
+        var amount = AmountParser.parse(transaction.amount).value;
 
         // For asset accounts, flip the sign to match accounting conventions
         // For liability accounts, also flip the sign
-        if (_selectedAccount?.isAsset == true || _selectedAccount?.isLiability == true) {
+        if (_selectedAccount?.isAsset == true ||
+            _selectedAccount?.isLiability == true) {
           amount = -amount;
         }
 
-        _log.debug('CalendarScreen', 'Processing transaction ${transaction.name} - date: $dateKey, raw amount: ${transaction.amount}, parsed: $amount, isAsset: ${_selectedAccount?.isAsset}, isLiability: ${_selectedAccount?.isLiability}');
-
         changes[dateKey] = (changes[dateKey] ?? 0.0) + amount;
-        _log.debug('CalendarScreen', 'Date $dateKey now has total: ${changes[dateKey]}');
       } catch (e) {
-        _log.error('CalendarScreen', 'Failed to parse transaction date: ${transaction.date}, error: $e');
+        final sanitizedError = LogService.sanitize(e.toString());
+        final errorSummary = sanitizedError.length > 120
+            ? '${sanitizedError.substring(0, 120)}...'
+            : sanitizedError;
+        _log.error('CalendarScreen',
+            'Failed to process transaction for calendar: $errorSummary');
       }
     }
 
-    _log.info('CalendarScreen', 'Final changes map has ${changes.length} entries');
-    changes.forEach((date, amount) {
-      _log.debug('CalendarScreen', '$date -> $amount');
-    });
+    _log.info(
+        'CalendarScreen', 'Final changes map has ${changes.length} entries');
 
     setState(() {
       _dailyChanges = changes;
@@ -191,7 +182,8 @@ class _CalendarScreenState extends State<CalendarScreen> {
     return _transactions.where((transaction) {
       try {
         final transactionDate = DateTime.parse(transaction.date);
-        final transactionDateKey = DateFormat('yyyy-MM-dd').format(transactionDate);
+        final transactionDateKey =
+            DateFormat('yyyy-MM-dd').format(transactionDate);
         return transactionDateKey == dateKey;
       } catch (e) {
         return false;
@@ -201,12 +193,17 @@ class _CalendarScreenState extends State<CalendarScreen> {
 
   void _showTransactionsDialog(DateTime date) {
     final transactions = _getTransactionsForDate(date);
-    final formattedDate = DateFormat('yyyy-MM-dd').format(date);
+    final formattedDate = DateFormat.yMMMd(
+      Localizations.localeOf(context).toString(),
+    ).format(date);
     final colorScheme = Theme.of(context).colorScheme;
-
+    final l = AppLocalizations.of(context);
     showDialog(
       context: context,
       builder: (BuildContext context) {
+        // Watch inside the dialog builder so the amounts re-mask if the user
+        // toggles privacy while the dialog is open.
+        final hideAmounts = context.watch<PrivacyProvider>().hidden;
         return AlertDialog(
           title: Text(
             formattedDate,
@@ -219,7 +216,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
                     child: Padding(
                       padding: const EdgeInsets.all(16.0),
                       child: Text(
-                        'No transactions on this day',
+                        l.calendarNoTransactions,
                         style: TextStyle(
                           color: colorScheme.onSurfaceVariant,
                         ),
@@ -231,14 +228,14 @@ class _CalendarScreenState extends State<CalendarScreen> {
                     itemCount: transactions.length,
                     itemBuilder: (context, index) {
                       final transaction = transactions[index];
-                      return _buildTransactionTile(transaction);
+                      return _buildTransactionTile(transaction, hideAmounts);
                     },
                   ),
           ),
           actions: [
             TextButton(
               onPressed: () => Navigator.of(context).pop(),
-              child: const Text('Close'),
+              child: Text(l.commonClose),
             ),
           ],
         );
@@ -246,14 +243,18 @@ class _CalendarScreenState extends State<CalendarScreen> {
     );
   }
 
-  Widget _buildTransactionTile(Transaction transaction) {
+  Widget _buildTransactionTile(Transaction transaction, bool hideAmounts) {
     // Parse amount to determine if positive or negative
-    String trimmedAmount = transaction.amount.trim();
-    trimmedAmount = trimmedAmount.replaceAll('\u2212', '-');
-    bool isNegative = trimmedAmount.startsWith('-') || trimmedAmount.endsWith('-');
+    var isNegative = false;
+    try {
+      isNegative = AmountParser.parse(transaction.amount).value < 0;
+    } on FormatException {
+      // Keep the dialog renderable if the server returns a malformed amount.
+    }
 
     // For asset accounts, flip the sign interpretation
-    if (_selectedAccount?.isAsset == true || _selectedAccount?.isLiability == true) {
+    if (_selectedAccount?.isAsset == true ||
+        _selectedAccount?.isLiability == true) {
       isNegative = !isNegative;
     }
 
@@ -286,7 +287,10 @@ class _CalendarScreenState extends State<CalendarScreen> {
             )
           : null,
       trailing: Text(
-        transaction.amount,
+        MoneyMasker.mask(
+          transaction.amount,
+          hidden: hideAmounts,
+        ),
         style: TextStyle(
           color: amountColor,
           fontWeight: FontWeight.bold,
@@ -310,12 +314,14 @@ class _CalendarScreenState extends State<CalendarScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
     final accountsProvider = context.watch<AccountsProvider>();
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
 
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Account Calendar'),
+        title: Text(l.calendarTitle),
       ),
       body: Column(
         children: [
@@ -335,23 +341,23 @@ class _CalendarScreenState extends State<CalendarScreen> {
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Text(
-                  'Account Type',
+                  l.calendarAccountTypeSection,
                   style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                    fontWeight: FontWeight.w600,
-                  ),
+                        fontWeight: FontWeight.w600,
+                      ),
                 ),
                 const SizedBox(height: 8),
                 SegmentedButton<String>(
-                  segments: const [
+                  segments: [
                     ButtonSegment<String>(
                       value: 'asset',
-                      label: Text('Assets'),
-                      icon: Icon(Icons.account_balance_wallet),
+                      label: Text(l.calendarSegmentAssets),
+                      icon: const Icon(Icons.account_balance_wallet),
                     ),
                     ButtonSegment<String>(
                       value: 'liability',
-                      label: Text('Liabilities'),
-                      icon: Icon(Icons.credit_card),
+                      label: Text(l.calendarSegmentLiabilities),
+                      icon: const Icon(Icons.credit_card),
                     ),
                   ],
                   selected: {_accountType},
@@ -359,11 +365,15 @@ class _CalendarScreenState extends State<CalendarScreen> {
                     setState(() {
                       _accountType = newSelection.first;
                       // Switch to first account of new type
-                      final filteredAccounts = _getFilteredAccounts(accountsProvider.accounts);
-                      _selectedAccount = filteredAccounts.isNotEmpty ? filteredAccounts.first : null;
+                      final filteredAccounts =
+                          _getFilteredAccounts(accountsProvider.accounts);
+                      _selectedAccount = filteredAccounts.isNotEmpty
+                          ? filteredAccounts.first
+                          : null;
                       _dailyChanges = {};
                       _transactions = [];
-                      _selectedDate = null; // Clear selection when changing account type
+                      _selectedDate =
+                          null; // Clear selection when changing account type
                     });
                     if (_selectedAccount != null) {
                       _loadTransactionsForAccount();
@@ -389,7 +399,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
             child: DropdownButtonFormField<Account>(
               value: _selectedAccount,
               decoration: InputDecoration(
-                labelText: 'Select Account',
+                labelText: l.calendarSelectAccount,
                 border: OutlineInputBorder(
                   borderRadius: BorderRadius.circular(8),
                 ),
@@ -398,7 +408,8 @@ class _CalendarScreenState extends State<CalendarScreen> {
                   vertical: 12,
                 ),
               ),
-              items: _getFilteredAccounts(accountsProvider.accounts).map((account) {
+              items: _getFilteredAccounts(accountsProvider.accounts)
+                  .map((account) {
                 return DropdownMenuItem(
                   value: account,
                   child: Text('${account.name} (${account.currency})'),
@@ -436,7 +447,9 @@ class _CalendarScreenState extends State<CalendarScreen> {
                   onPressed: _previousMonth,
                 ),
                 Text(
-                  DateFormat('yyyy-MM').format(_currentMonth),
+                  DateFormat.yMMM(
+                    Localizations.localeOf(context).toString(),
+                  ).format(_currentMonth),
                   style: Theme.of(context).textTheme.titleLarge,
                 ),
                 IconButton(
@@ -463,17 +476,20 @@ class _CalendarScreenState extends State<CalendarScreen> {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
                 Text(
-                  'Monthly Change',
+                  l.calendarMonthlyChange,
                   style: Theme.of(context).textTheme.titleMedium,
                 ),
                 Text(
-                  _formatCurrency(_getTotalForMonth()),
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                    color: _getTotalForMonth() >= 0
-                        ? Colors.green
-                        : Colors.red,
-                    fontWeight: FontWeight.bold,
+                  MoneyMasker.mask(
+                    _formatCurrency(_getTotalForMonth()),
+                    hidden: hideAmounts,
                   ),
+                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        color: _getTotalForMonth() >= 0
+                            ? Colors.green
+                            : Colors.red,
+                        fontWeight: FontWeight.bold,
+                      ),
                 ),
               ],
             ),
@@ -483,19 +499,32 @@ class _CalendarScreenState extends State<CalendarScreen> {
           Expanded(
             child: _isLoading
                 ? const Center(child: CircularProgressIndicator())
-                : _buildCalendar(colorScheme),
+                : _buildCalendar(colorScheme, hideAmounts),
           ),
         ],
       ),
     );
   }
 
-  Widget _buildCalendar(ColorScheme colorScheme) {
-    final firstDayOfMonth = DateTime(_currentMonth.year, _currentMonth.month, 1);
-    final lastDayOfMonth = DateTime(_currentMonth.year, _currentMonth.month + 1, 0);
+  Widget _buildCalendar(ColorScheme colorScheme, bool hideAmounts) {
+    final firstDayOfMonth =
+        DateTime(_currentMonth.year, _currentMonth.month, 1);
+    final lastDayOfMonth =
+        DateTime(_currentMonth.year, _currentMonth.month + 1, 0);
     final daysInMonth = lastDayOfMonth.day;
     final startWeekday = firstDayOfMonth.weekday % 7; // 0 = Sunday
 
+    // Localized narrow weekday labels, Sunday→Saturday to match the
+    // Sunday-anchored grid math above. 2024-01-07 is a Sunday, so indices
+    // 0..6 map Sunday..Saturday.
+    final localeName = Localizations.localeOf(context).toString();
+    final weekdayLabels = List.generate(
+      7,
+      (i) => DateFormat.E(localeName)
+          .format(DateTime(2024, 1, 7 + i))
+          .substring(0, 1),
+    );
+
     return SingleChildScrollView(
       child: Padding(
         padding: const EdgeInsets.all(8),
@@ -505,7 +534,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
             SizedBox(
               height: 40,
               child: Row(
-                children: ['S', 'M', 'T', 'W', 'T', 'F', 'S'].map((day) {
+                children: weekdayLabels.map((day) {
                   return Expanded(
                     child: Center(
                       child: Text(
@@ -522,18 +551,21 @@ class _CalendarScreenState extends State<CalendarScreen> {
             ),
 
             // Calendar grid
-            ...List.generate((daysInMonth + startWeekday + 6) ~/ 7, (weekIndex) {
+            ...List.generate((daysInMonth + startWeekday + 6) ~/ 7,
+                (weekIndex) {
               return SizedBox(
                 height: 70,
                 child: Row(
                   children: List.generate(7, (dayIndex) {
-                    final dayNumber = weekIndex * 7 + dayIndex - startWeekday + 1;
+                    final dayNumber =
+                        weekIndex * 7 + dayIndex - startWeekday + 1;
 
                     if (dayNumber < 1 || dayNumber > daysInMonth) {
                       return const Expanded(child: SizedBox.shrink());
                     }
 
-                    final date = DateTime(_currentMonth.year, _currentMonth.month, dayNumber);
+                    final date = DateTime(
+                        _currentMonth.year, _currentMonth.month, dayNumber);
                     final dateKey = DateFormat('yyyy-MM-dd').format(date);
                     final change = _dailyChanges[dateKey] ?? 0.0;
                     final hasChange = _dailyChanges.containsKey(dateKey);
@@ -545,6 +577,7 @@ class _CalendarScreenState extends State<CalendarScreen> {
                         change,
                         hasChange,
                         colorScheme,
+                        hideAmounts,
                       ),
                     );
                   }).toList(),
@@ -557,7 +590,8 @@ class _CalendarScreenState extends State<CalendarScreen> {
     );
   }
 
-  Widget _buildDayCell(DateTime date, int day, double change, bool hasChange, ColorScheme colorScheme) {
+  Widget _buildDayCell(DateTime date, int day, double change, bool hasChange,
+      ColorScheme colorScheme, bool hideAmounts) {
     Color? backgroundColor;
     Color? textColor;
 
@@ -585,7 +619,9 @@ class _CalendarScreenState extends State<CalendarScreen> {
           color: backgroundColor ?? colorScheme.surface,
           borderRadius: BorderRadius.circular(8),
           border: Border.all(
-            color: isSelected ? Theme.of(context).primaryColor : colorScheme.outlineVariant,
+            color: isSelected
+                ? Theme.of(context).primaryColor
+                : colorScheme.outlineVariant,
             width: isSelected ? 3 : 1,
           ),
         ),
@@ -608,7 +644,10 @@ class _CalendarScreenState extends State<CalendarScreen> {
                   child: FittedBox(
                     fit: BoxFit.scaleDown,
                     child: Text(
-                      _formatAmount(change),
+                      MoneyMasker.mask(
+                        _formatAmount(change),
+                        hidden: hideAmounts,
+                      ),
                       style: TextStyle(
                         fontSize: 10,
                         color: textColor,
diff --git a/mobile/lib/screens/chat_conversation_screen.dart b/mobile/lib/screens/chat_conversation_screen.dart
index e521eb4c6..0d4e2950c 100644
--- a/mobile/lib/screens/chat_conversation_screen.dart
+++ b/mobile/lib/screens/chat_conversation_screen.dart
@@ -8,6 +8,7 @@ import '../providers/chat_provider.dart';
 import '../models/message.dart';
 import '../constants/suggested_questions.dart';
 import '../widgets/typing_indicator.dart';
+import '../l10n/app_localizations.dart';
 
 class _SendMessageIntent extends Intent {
   const _SendMessageIntent();
@@ -135,6 +136,8 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
     if (content.isEmpty) return;
     setState(() => _isSendInFlight = true);
 
+    final l = AppLocalizations.of(context);
+
     try {
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
     final chatProvider = Provider.of<ChatProvider>(context, listen: false);
@@ -160,7 +163,7 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
         _messageController.text = content;
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(chatProvider.errorMessage ?? 'Failed to start conversation. Please try again.'),
+            content: Text(chatProvider.errorMessage ?? l.chatConversationStartFailed),
             backgroundColor: Colors.red,
           ),
         );
@@ -207,25 +210,26 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
     final newTitle = await showDialog<String>(
       context: context,
       builder: (context) {
+        final dl = AppLocalizations.of(context);
         final controller = TextEditingController(text: currentTitle);
         return AlertDialog(
-          title: const Text('Edit Title'),
+          title: Text(dl.chatConversationEditTitle),
           content: TextField(
             controller: controller,
-            decoration: const InputDecoration(
-              labelText: 'Chat Title',
-              border: OutlineInputBorder(),
+            decoration: InputDecoration(
+              labelText: dl.chatConversationTitleLabel,
+              border: const OutlineInputBorder(),
             ),
             autofocus: true,
           ),
           actions: [
             TextButton(
               onPressed: () => Navigator.pop(context),
-              child: const Text('Cancel'),
+              child: Text(dl.commonCancel),
             ),
             TextButton(
               onPressed: () => Navigator.pop(context, controller.text.trim()),
-              child: const Text('Save'),
+              child: Text(dl.commonSave),
             ),
           ],
         );
@@ -250,20 +254,22 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
   }
 
   String _formatTime(DateTime dateTime) {
-    final hour = dateTime.hour.toString().padLeft(2, '0');
-    final minute = dateTime.minute.toString().padLeft(2, '0');
+    final local = dateTime.toLocal();
+    final hour = local.hour.toString().padLeft(2, '0');
+    final minute = local.minute.toString().padLeft(2, '0');
     return '$hour:$minute';
   }
 
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final l = AppLocalizations.of(context);
 
     return Scaffold(
       appBar: AppBar(
         title: Consumer<ChatProvider>(
           builder: (context, chatProvider, _) {
-            final title = chatProvider.currentChat?.title ?? 'New Conversation';
+            final title = chatProvider.currentChat?.title ?? AppLocalizations.of(context).chatConversationNewTitle;
             return GestureDetector(
               onTap: _chatId != null ? _editTitle : null,
               child: Row(
@@ -289,7 +295,7 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
             IconButton(
               icon: const Icon(Icons.refresh),
               onPressed: () => _loadChat(forceRefresh: true),
-              tooltip: 'Refresh',
+              tooltip: l.chatConversationRefreshTooltip,
             ),
         ],
       ),
@@ -311,7 +317,7 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
                     Icon(Icons.error_outline,
                         size: 64, color: colorScheme.error),
                     const SizedBox(height: 16),
-                    Text('Failed to load chat',
+                    Text(l.chatConversationLoadError,
                         style: Theme.of(context).textTheme.titleLarge),
                     const SizedBox(height: 8),
                     Text(
@@ -323,7 +329,7 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
                     ElevatedButton.icon(
                       onPressed: _loadChat,
                       icon: const Icon(Icons.refresh),
-                      label: const Text('Try Again'),
+                      label: Text(l.commonTryAgain),
                     ),
                   ],
                 ),
@@ -410,7 +416,7 @@ class _ChatConversationScreenState extends State<ChatConversationScreen> {
                           child: TextField(
                             controller: _messageController,
                             decoration: InputDecoration(
-                              hintText: 'Type a message...',
+                              hintText: l.chatConversationMessageHint,
                               border: OutlineInputBorder(
                                 borderRadius: BorderRadius.circular(24),
                               ),
@@ -598,8 +604,9 @@ class _EmptyState extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final l = AppLocalizations.of(context);
     final name = (firstName ?? '').trim();
-    final greeting = name.isNotEmpty ? 'Hi $name, how can I help?' : 'How can I help?';
+    final greeting = name.isNotEmpty ? l.chatConversationGreetingWithName(name) : l.chatConversationGreetingNoName;
 
     return ListView(
       padding: const EdgeInsets.all(24),
@@ -613,7 +620,7 @@ class _EmptyState extends StatelessWidget {
           textAlign: TextAlign.center,
         ),
         const SizedBox(height: 32),
-        ...suggestedQuestions.map(
+        ...suggestedQuestions(context).map(
           (q) => Padding(
             padding: const EdgeInsets.only(bottom: 12),
             child: OutlinedButton.icon(
diff --git a/mobile/lib/screens/chat_list_screen.dart b/mobile/lib/screens/chat_list_screen.dart
index 7868a30f5..4262554b7 100644
--- a/mobile/lib/screens/chat_list_screen.dart
+++ b/mobile/lib/screens/chat_list_screen.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
 import 'package:provider/provider.dart';
 import '../providers/auth_provider.dart';
 import '../providers/chat_provider.dart';
 import 'chat_conversation_screen.dart';
+import '../l10n/app_localizations.dart';
 
 class ChatListScreen extends StatefulWidget {
   const ChatListScreen({super.key});
@@ -68,27 +70,31 @@ class _ChatListScreenState extends State<ChatListScreen> {
   }
 
   Future<void> _deleteSelectedChats() async {
+    final l = AppLocalizations.of(context);
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
     final chatProvider = Provider.of<ChatProvider>(context, listen: false);
 
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Delete Chats'),
-        content: Text(
-          'Delete ${_selectedChatIds.length} chat(s)? This cannot be undone.',
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.chatListDeleteTitle),
+          content: Text(
+            dl.chatListDeleteMultiContent(_selectedChatIds.length),
           ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            child: const Text('Delete', style: TextStyle(color: Colors.red)),
-          ),
-        ],
-      ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: Text(dl.commonCancel),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              child: Text(dl.commonDelete, style: const TextStyle(color: Colors.red)),
+            ),
+          ],
+        );
+      },
     );
 
     if (confirmed != true || !mounted) return;
@@ -114,7 +120,7 @@ class _ChatListScreenState extends State<ChatListScreen> {
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
         content: Text(
-          success ? 'Chats deleted' : 'Failed to delete chats',
+          success ? l.chatListDeletedSuccess : l.chatListDeleteFailed,
         ),
         backgroundColor: success ? Colors.green : Colors.red,
       ),
@@ -138,26 +144,29 @@ class _ChatListScreenState extends State<ChatListScreen> {
     final now = DateTime.now();
     final difference = now.difference(dateTime);
 
+    final l = AppLocalizations.of(context);
     if (difference.inMinutes < 1) {
-      return 'Just now';
+      return l.chatListJustNow;
     } else if (difference.inHours < 1) {
-      return '${difference.inMinutes}m ago';
+      return l.chatListMinutesAgo(difference.inMinutes);
     } else if (difference.inDays < 1) {
-      return '${difference.inHours}h ago';
+      return l.chatListHoursAgo(difference.inHours);
     } else if (difference.inDays < 7) {
-      return '${difference.inDays}d ago';
+      return l.chatListDaysAgo(difference.inDays);
     } else {
-      return '${dateTime.day}/${dateTime.month}/${dateTime.year}';
+      return DateFormat.yMd(Localizations.localeOf(context).toString())
+          .format(dateTime.toLocal());
     }
   }
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
 
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Chats'),
+        title: Text(l.chatListTitle),
         centerTitle: false,
         actions: [
           if (_isSelectionMode) ...[
@@ -216,7 +225,7 @@ class _ChatListScreenState extends State<ChatListScreen> {
                     ),
                     const SizedBox(height: 16),
                     Text(
-                      'Failed to load chats',
+                      l.chatListError,
                       style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(height: 8),
@@ -229,7 +238,7 @@ class _ChatListScreenState extends State<ChatListScreen> {
                     ElevatedButton.icon(
                       onPressed: _handleRefresh,
                       icon: const Icon(Icons.refresh),
-                      label: const Text('Try Again'),
+                      label: Text(l.commonTryAgain),
                     ),
                   ],
                 ),
@@ -251,12 +260,12 @@ class _ChatListScreenState extends State<ChatListScreen> {
                     ),
                     const SizedBox(height: 16),
                     Text(
-                      'No chats yet',
+                      l.chatListEmpty,
                       style: Theme.of(context).textTheme.titleLarge,
                     ),
                     const SizedBox(height: 8),
                     Text(
-                      'Start a new conversation with the AI assistant.',
+                      l.chatListEmptySubtitle,
                       style: TextStyle(color: colorScheme.onSurfaceVariant),
                       textAlign: TextAlign.center,
                     ),
@@ -291,20 +300,23 @@ class _ChatListScreenState extends State<ChatListScreen> {
                   confirmDismiss: (direction) async {
                     return await showDialog<bool>(
                       context: context,
-                      builder: (context) => AlertDialog(
-                        title: const Text('Delete Chat'),
-                        content: Text('Are you sure you want to delete "${chat.title}"?'),
-                        actions: [
-                          TextButton(
-                            onPressed: () => Navigator.pop(context, false),
-                            child: const Text('Cancel'),
-                          ),
-                          TextButton(
-                            onPressed: () => Navigator.pop(context, true),
-                            child: const Text('Delete', style: TextStyle(color: Colors.red)),
-                          ),
-                        ],
-                      ),
+                      builder: (context) {
+                        final l = AppLocalizations.of(context);
+                        return AlertDialog(
+                          title: Text(l.chatListDeleteTitle),
+                          content: Text(l.chatListDeleteSingleContent(chat.title)),
+                          actions: [
+                            TextButton(
+                              onPressed: () => Navigator.pop(context, false),
+                              child: Text(l.commonCancel),
+                            ),
+                            TextButton(
+                              onPressed: () => Navigator.pop(context, true),
+                              child: Text(l.commonDelete, style: const TextStyle(color: Colors.red)),
+                            ),
+                          ],
+                        );
+                      },
                     );
                   },
                   onDismissed: (direction) async {
@@ -385,7 +397,7 @@ class _ChatListScreenState extends State<ChatListScreen> {
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: _openNewChat,
-        tooltip: 'New Chat',
+        tooltip: l.chatListNewChat,
         child: const Icon(Icons.add),
       ),
     );
diff --git a/mobile/lib/screens/dashboard_screen.dart b/mobile/lib/screens/dashboard_screen.dart
index b42c75ec8..0d71d6802 100644
--- a/mobile/lib/screens/dashboard_screen.dart
+++ b/mobile/lib/screens/dashboard_screen.dart
@@ -11,8 +11,15 @@ import '../widgets/account_card.dart';
 import '../widgets/connectivity_banner.dart';
 import '../widgets/net_worth_card.dart';
 import '../widgets/currency_filter.dart';
+import '../widgets/sure_button.dart';
+import '../widgets/sure_icon.dart';
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+import '../theme/sure_tokens.dart';
+import '../theme/sure_typography.dart';
 import 'transaction_form_screen.dart';
 import 'transactions_list_screen.dart';
+import '../l10n/app_localizations.dart';
 
 class DashboardScreen extends StatefulWidget {
   const DashboardScreen({super.key});
@@ -129,6 +136,8 @@ class DashboardScreenState extends State<DashboardScreen> {
   Future<void> _performManualSync() async {
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
     final transactionsProvider = Provider.of<TransactionsProvider>(context, listen: false);
+    final l = AppLocalizations.of(context);
+    final palette = SureColors.of(context).palette;
 
     final accessToken = await authProvider.getValidAccessToken();
     if (accessToken == null) {
@@ -139,10 +148,10 @@ class DashboardScreenState extends State<DashboardScreen> {
     // Show syncing indicator
     if (mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
+        SnackBar(
           content: Row(
             children: [
-              SizedBox(
+              const SizedBox(
                 width: 16,
                 height: 16,
                 child: CircularProgressIndicator(
@@ -150,11 +159,11 @@ class DashboardScreenState extends State<DashboardScreen> {
                   valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
                 ),
               ),
-              SizedBox(width: 12),
-              Text('Syncing data from server...'),
+              const SizedBox(width: 12),
+              Expanded(child: Text(l.dashboardSyncing)),
             ],
           ),
-          duration: Duration(seconds: 30),
+          duration: const Duration(seconds: 30),
         ),
       );
     }
@@ -173,12 +182,17 @@ class DashboardScreenState extends State<DashboardScreen> {
             SnackBar(
               content: Row(
                 children: [
-                  const Icon(Icons.error, color: Colors.white),
+                  SureIcon(SureIcons.circleAlert, color: palette.textInverse),
                   const SizedBox(width: 12),
-                  const Expanded(child: Text('Sync failed. Please try again.')),
+                  Expanded(
+                    child: Text(
+                      l.dashboardSyncFailed,
+                      style: TextStyle(color: palette.textInverse),
+                    ),
+                  ),
                 ],
               ),
-              backgroundColor: Colors.red,
+              backgroundColor: palette.destructive,
               duration: const Duration(seconds: 3),
             ),
           );
@@ -191,16 +205,21 @@ class DashboardScreenState extends State<DashboardScreen> {
       if (mounted) {
         ScaffoldMessenger.of(context).clearSnackBars();
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
+          SnackBar(
             content: Row(
               children: [
-                Icon(Icons.error, color: Colors.white),
-                SizedBox(width: 12),
-                Expanded(child: Text('Sync failed. Please try again.')),
+                SureIcon(SureIcons.circleAlert, color: palette.textInverse),
+                const SizedBox(width: 12),
+                Expanded(
+                  child: Text(
+                    l.dashboardSyncError,
+                    style: TextStyle(color: palette.textInverse),
+                  ),
+                ),
               ],
             ),
-            backgroundColor: Colors.red,
-            duration: Duration(seconds: 3),
+            backgroundColor: palette.destructive,
+            duration: const Duration(seconds: 3),
           ),
         );
       }
@@ -280,6 +299,8 @@ class DashboardScreenState extends State<DashboardScreen> {
   }
 
   Future<void> _handleAccountTap(Account account) async {
+    final l = AppLocalizations.of(context);
+    final palette = SureColors.of(context).palette;
     final result = await showModalBottomSheet<bool>(
       context: context,
       isScrollControlled: true,
@@ -291,10 +312,10 @@ class DashboardScreenState extends State<DashboardScreen> {
     if (result == true && mounted) {
       // Show loading indicator
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
+        SnackBar(
           content: Row(
             children: [
-              SizedBox(
+              const SizedBox(
                 width: 16,
                 height: 16,
                 child: CircularProgressIndicator(
@@ -302,11 +323,11 @@ class DashboardScreenState extends State<DashboardScreen> {
                   valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
                 ),
               ),
-              SizedBox(width: 12),
-              Text('Refreshing accounts...'),
+              const SizedBox(width: 12),
+              Expanded(child: Text(l.dashboardRefreshing)),
             ],
           ),
-          duration: Duration(seconds: 2),
+          duration: const Duration(seconds: 2),
         ),
       );
 
@@ -320,16 +341,19 @@ class DashboardScreenState extends State<DashboardScreen> {
       if (mounted) {
         ScaffoldMessenger.of(context).clearSnackBars();
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
+          SnackBar(
             content: Row(
               children: [
-                Icon(Icons.check_circle, color: Colors.white),
-                SizedBox(width: 12),
-                Text('Accounts updated'),
+                SureIcon(SureIcons.circleCheck, color: palette.textInverse),
+                const SizedBox(width: 12),
+                Text(
+                  l.dashboardAccountsUpdated,
+                  style: TextStyle(color: palette.textInverse),
+                ),
               ],
             ),
-            backgroundColor: Colors.green,
-            duration: Duration(seconds: 1),
+            backgroundColor: palette.success,
+            duration: const Duration(seconds: 1),
           ),
         );
       }
@@ -352,7 +376,8 @@ class DashboardScreenState extends State<DashboardScreen> {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
+    final l = AppLocalizations.of(context);
+    final palette = SureColors.of(context).palette;
 
     return Scaffold(
       body: Column(
@@ -363,16 +388,22 @@ class DashboardScreenState extends State<DashboardScreen> {
               opacity: _showSyncSuccess ? 1.0 : 0.0,
               duration: const Duration(milliseconds: 300),
               child: Container(
-                padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
-                color: Colors.green.withValues(alpha: 0.1),
-                child: const Row(
+                padding: const EdgeInsets.symmetric(
+                    horizontal: SureSpacing.xl, vertical: SureSpacing.sm),
+                color: palette.success.withValues(alpha: 0.1),
+                child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Icon(Icons.cloud_done, color: Colors.green, size: 18),
-                    SizedBox(width: 8),
+                    SureIcon(
+                      SureIcons.cloudCheck,
+                      color: palette.success,
+                      size: 18,
+                    ),
+                    const SizedBox(width: SureSpacing.md),
                     Text(
-                      'Synced',
-                      style: TextStyle(color: Colors.green, fontSize: 13),
+                      l.dashboardSynced,
+                      style: TextStyle(
+                          color: palette.success, fontSize: SureTypography.sm),
                     ),
                   ],
                 ),
@@ -397,27 +428,27 @@ class DashboardScreenState extends State<DashboardScreen> {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Icon(
-                      Icons.error_outline,
+                    SureIcon(
+                      SureIcons.circleAlert,
                       size: 64,
-                      color: colorScheme.error,
+                      color: palette.destructive,
                     ),
-                    const SizedBox(height: 16),
+                    const SizedBox(height: SureSpacing.xl),
                     Text(
-                      'Failed to load accounts',
+                      l.dashboardErrorLoadingAccounts,
                       style: Theme.of(context).textTheme.titleLarge,
                     ),
-                    const SizedBox(height: 8),
+                    const SizedBox(height: SureSpacing.md),
                     Text(
                       accountsProvider.errorMessage!,
-                      style: TextStyle(color: colorScheme.onSurfaceVariant),
+                      style: TextStyle(color: palette.textSecondary),
                       textAlign: TextAlign.center,
                     ),
-                    const SizedBox(height: 24),
-                    ElevatedButton.icon(
+                    const SizedBox(height: SureSpacing.xxxl),
+                    SureButton(
+                      label: l.commonTryAgain,
                       onPressed: _handleRefresh,
-                      icon: const Icon(Icons.refresh),
-                      label: const Text('Try Again'),
+                      leading: const SureIcon(SureIcons.refresh, size: 18),
                     ),
                   ],
                 ),
@@ -433,27 +464,27 @@ class DashboardScreenState extends State<DashboardScreen> {
                 child: Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    Icon(
-                      Icons.account_balance_wallet_outlined,
+                    SureIcon(
+                      SureIcons.wallet,
                       size: 64,
-                      color: colorScheme.onSurfaceVariant,
+                      color: palette.textSubdued,
                     ),
-                    const SizedBox(height: 16),
+                    const SizedBox(height: SureSpacing.xl),
                     Text(
-                      'No accounts yet',
+                      l.dashboardNoAccounts,
                       style: Theme.of(context).textTheme.titleLarge,
                     ),
-                    const SizedBox(height: 8),
+                    const SizedBox(height: SureSpacing.md),
                     Text(
-                      'Add accounts in the web app to see them here.',
-                      style: TextStyle(color: colorScheme.onSurfaceVariant),
+                      l.dashboardNoAccountsSubtitle,
+                      style: TextStyle(color: palette.textSecondary),
                       textAlign: TextAlign.center,
                     ),
-                    const SizedBox(height: 24),
-                    ElevatedButton.icon(
+                    const SizedBox(height: SureSpacing.xxxl),
+                    SureButton(
+                      label: l.commonRefresh,
                       onPressed: _handleRefresh,
-                      icon: const Icon(Icons.refresh),
-                      label: const Text('Refresh'),
+                      leading: const SureIcon(SureIcons.refresh, size: 18),
                     ),
                   ],
                 ),
@@ -521,25 +552,28 @@ class DashboardScreenState extends State<DashboardScreen> {
 
   List<Widget> _buildFilteredAccountsSection(AccountsProvider accountsProvider) {
     final filteredAccounts = _getFilteredAccounts(accountsProvider);
+    final l = AppLocalizations.of(context);
+
+    final palette = SureColors.of(context).palette;
 
     if (filteredAccounts.isEmpty) {
       return [
         SliverToBoxAdapter(
           child: Center(
             child: Padding(
-              padding: const EdgeInsets.all(32),
+              padding: const EdgeInsets.all(SureSpacing.huge),
               child: Column(
                 children: [
-                  Icon(
-                    Icons.account_balance_wallet_outlined,
+                  SureIcon(
+                    SureIcons.wallet,
                     size: 48,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                    color: palette.textSubdued,
                   ),
-                  const SizedBox(height: 16),
+                  const SizedBox(height: SureSpacing.xl),
                   Text(
-                    'No accounts match the current filter',
+                    l.dashboardFilterEmpty,
                     style: TextStyle(
-                      color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      color: palette.textSecondary,
                     ),
                   ),
                 ],
@@ -666,74 +700,75 @@ class _CollapsibleTypeHeader extends StatelessWidget {
     required this.onToggle,
   });
 
-  IconData _getTypeIcon() {
+  String _getTypeIconName() {
     switch (accountType) {
       case 'depository':
-        return Icons.account_balance;
+        return SureIcons.landmark;
       case 'credit_card':
-        return Icons.credit_card;
+        return SureIcons.creditCard;
       case 'investment':
-        return Icons.trending_up;
+        return SureIcons.trendingUp;
       case 'loan':
-        return Icons.receipt_long;
+        return SureIcons.receipt;
       case 'property':
-        return Icons.home;
+        return SureIcons.house;
       case 'vehicle':
-        return Icons.directions_car;
+        return SureIcons.car;
       case 'crypto':
-        return Icons.currency_bitcoin;
+        return SureIcons.bitcoin;
       case 'other_asset':
-        return Icons.category;
+        return SureIcons.shapes;
       case 'other_liability':
-        return Icons.payment;
+        return SureIcons.handCoins;
       default:
-        return Icons.account_balance_wallet;
+        return SureIcons.wallet;
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
+    final palette = SureColors.of(context).palette;
 
     return InkWell(
       onTap: onToggle,
       child: Padding(
-        padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
+        padding: const EdgeInsets.fromLTRB(
+            SureSpacing.xl, SureSpacing.xl, SureSpacing.xl, SureSpacing.md),
         child: Row(
           children: [
-            Icon(
-              _getTypeIcon(),
+            SureIcon(
+              _getTypeIconName(),
               size: 18,
-              color: colorScheme.onSurfaceVariant,
+              color: palette.textSubdued,
             ),
-            const SizedBox(width: 10),
+            const SizedBox(width: SureSpacing.lg),
             Text(
               title,
               style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                    fontWeight: FontWeight.w600,
+                    fontWeight: SureTokens.weightMedium,
                   ),
             ),
-            const SizedBox(width: 8),
+            const SizedBox(width: SureSpacing.md),
             Container(
               padding: const EdgeInsets.symmetric(horizontal: 7, vertical: 1),
               decoration: BoxDecoration(
-                color: colorScheme.primaryContainer.withValues(alpha: 0.5),
-                borderRadius: BorderRadius.circular(10),
+                color: palette.surfaceInset,
+                borderRadius: BorderRadius.circular(SureTokens.radiusLg),
               ),
               child: Text(
                 count.toString(),
                 style: TextStyle(
-                  color: colorScheme.onPrimaryContainer,
-                  fontWeight: FontWeight.bold,
-                  fontSize: 11,
+                  color: palette.textSecondary,
+                  fontWeight: SureTokens.weightMedium,
+                  fontSize: SureTypography.xs,
                 ),
               ),
             ),
             const Spacer(),
-            Icon(
-              isCollapsed ? Icons.expand_more : Icons.expand_less,
-              size: 20,
-              color: colorScheme.onSurfaceVariant,
+            SureIcon(
+              isCollapsed ? SureIcons.chevronDown : SureIcons.chevronUp,
+              size: SureIconSize.md,
+              color: palette.textSubdued,
             ),
           ],
         ),
diff --git a/mobile/lib/screens/log_viewer_screen.dart b/mobile/lib/screens/log_viewer_screen.dart
index cbd162793..3f83cd746 100644
--- a/mobile/lib/screens/log_viewer_screen.dart
+++ b/mobile/lib/screens/log_viewer_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
+import '../l10n/app_localizations.dart';
 import '../services/log_service.dart';
 
 class LogViewerScreen extends StatefulWidget {
@@ -74,9 +75,10 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Debug Logs'),
+        title: Text(l.logViewerTitle),
         actions: [
           PopupMenuButton<String>(
             initialValue: _selectedLevel,
@@ -86,11 +88,11 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
               });
             },
             itemBuilder: (context) => [
-              const PopupMenuItem(value: 'ALL', child: Text('All Levels')),
-              const PopupMenuItem(value: 'ERROR', child: Text('Errors Only')),
-              const PopupMenuItem(value: 'WARNING', child: Text('Warnings Only')),
-              const PopupMenuItem(value: 'INFO', child: Text('Info Only')),
-              const PopupMenuItem(value: 'DEBUG', child: Text('Debug Only')),
+              PopupMenuItem(value: 'ALL', child: Text(l.logViewerFilterAll)),
+              PopupMenuItem(value: 'ERROR', child: Text(l.logViewerFilterError)),
+              PopupMenuItem(value: 'WARNING', child: Text(l.logViewerFilterWarning)),
+              PopupMenuItem(value: 'INFO', child: Text(l.logViewerFilterInfo)),
+              PopupMenuItem(value: 'DEBUG', child: Text(l.logViewerFilterDebug)),
             ],
             child: Padding(
               padding: const EdgeInsets.symmetric(horizontal: 16),
@@ -110,7 +112,7 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
                 _autoScroll = !_autoScroll;
               });
             },
-            tooltip: _autoScroll ? 'Disable Auto-scroll' : 'Enable Auto-scroll',
+            tooltip: _autoScroll ? l.logViewerAutoScrollDisable : l.logViewerAutoScrollEnable,
           ),
           IconButton(
             icon: const Icon(Icons.copy),
@@ -118,13 +120,13 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
               final logs = LogService.instance.exportLogs();
               Clipboard.setData(ClipboardData(text: logs));
               ScaffoldMessenger.of(context).showSnackBar(
-                const SnackBar(
-                  content: Text('Logs copied to clipboard'),
-                  duration: Duration(seconds: 2),
+                SnackBar(
+                  content: Text(l.logViewerLogsCopied),
+                  duration: const Duration(seconds: 2),
                 ),
               );
             },
-            tooltip: 'Copy Logs',
+            tooltip: l.logViewerCopyLogs,
           ),
           IconButton(
             icon: const Icon(Icons.delete),
@@ -132,12 +134,12 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
               showDialog(
                 context: context,
                 builder: (context) => AlertDialog(
-                  title: const Text('Clear Logs'),
-                  content: const Text('Are you sure you want to clear all logs?'),
+                  title: Text(l.logViewerClearLogs),
+                  content: Text(l.logViewerClearConfirm),
                   actions: [
                     TextButton(
                       onPressed: () => Navigator.pop(context),
-                      child: const Text('Cancel'),
+                      child: Text(l.commonCancel),
                     ),
                     TextButton(
                       onPressed: () {
@@ -145,13 +147,13 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
                         Navigator.pop(context);
                       },
                       style: TextButton.styleFrom(foregroundColor: Colors.red),
-                      child: const Text('Clear'),
+                      child: Text(l.logViewerClear),
                     ),
                   ],
                 ),
               );
             },
-            tooltip: 'Clear Logs',
+            tooltip: l.logViewerClearLogs,
           ),
         ],
       ),
@@ -164,15 +166,15 @@ class _LogViewerScreenState extends State<LogViewerScreen> {
           WidgetsBinding.instance.addPostFrameCallback((_) => _scrollToBottom());
 
           if (logs.isEmpty) {
-            return const Center(
+            return Center(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Icon(Icons.text_snippet_outlined, size: 64, color: Colors.grey),
-                  SizedBox(height: 16),
+                  const Icon(Icons.text_snippet_outlined, size: 64, color: Colors.grey),
+                  const SizedBox(height: 16),
                   Text(
-                    'No logs yet',
-                    style: TextStyle(fontSize: 16, color: Colors.grey),
+                    AppLocalizations.of(context).logViewerEmpty,
+                    style: const TextStyle(fontSize: 16, color: Colors.grey),
                   ),
                 ],
               ),
diff --git a/mobile/lib/screens/login_screen.dart b/mobile/lib/screens/login_screen.dart
index efff02d6f..61914dfcc 100644
--- a/mobile/lib/screens/login_screen.dart
+++ b/mobile/lib/screens/login_screen.dart
@@ -5,7 +5,10 @@ import 'package:url_launcher/url_launcher.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import '../providers/auth_provider.dart';
 import '../services/api_config.dart';
+import '../widgets/sure_button.dart';
+import '../widgets/sure_logo.dart';
 import 'backend_config_screen.dart';
+import '../l10n/app_localizations.dart';
 
 class LoginScreen extends StatefulWidget {
   final VoidCallback? onGoToSettings;
@@ -71,6 +74,7 @@ class _LoginScreenState extends State<LoginScreen> {
   }
 
   Future<void> _openSignUpPage() async {
+    final l = AppLocalizations.of(context);
     final signUpUrl = Uri.parse('${ApiConfig.defaultBaseUrl}/registration/new');
     final launched = await launchUrl(
       signUpUrl,
@@ -79,109 +83,34 @@ class _LoginScreenState extends State<LoginScreen> {
 
     if (!launched && mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('Unable to open sign up page')),
+        SnackBar(content: Text(l.loginSignUpOpenError)),
       );
     }
   }
 
-  void _showApiKeyDialog() {
-    final apiKeyController = TextEditingController();
-    final outerContext = context;
-    bool isLoading = false;
-
-    showDialog(
+  Future<void> _showApiKeyDialog() async {
+    // The dialog owns its TextEditingController and disposes it in its own
+    // State.dispose(), so the controller's lifecycle is tied to the dialog's
+    // widget tree: no leak on barrier/back dismissal, and it is never disposed
+    // out from under a still-mounted TextField during the exit transition.
+    final result = await showDialog<bool>(
       context: context,
-      builder: (dialogContext) {
-        return StatefulBuilder(
-          builder: (_, setDialogState) {
-            return AlertDialog(
-              title: const Text('API Key Login'),
-              content: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    'Enter your API key to sign in.',
-                    style:
-                        Theme.of(outerContext).textTheme.bodyMedium?.copyWith(
-                              color: Theme.of(outerContext)
-                                  .colorScheme
-                                  .onSurfaceVariant,
-                            ),
-                  ),
-                  const SizedBox(height: 16),
-                  TextField(
-                    controller: apiKeyController,
-                    decoration: const InputDecoration(
-                      labelText: 'API Key',
-                      prefixIcon: Icon(Icons.vpn_key_outlined),
-                    ),
-                    obscureText: true,
-                    maxLines: 1,
-                    enabled: !isLoading,
-                  ),
-                ],
-              ),
-              actions: [
-                TextButton(
-                  onPressed: isLoading
-                      ? null
-                      : () {
-                          apiKeyController.dispose();
-                          Navigator.of(dialogContext).pop();
-                        },
-                  child: const Text('Cancel'),
-                ),
-                ElevatedButton(
-                  onPressed: isLoading
-                      ? null
-                      : () async {
-                          final apiKey = apiKeyController.text.trim();
-                          if (apiKey.isEmpty) return;
-
-                          setDialogState(() {
-                            isLoading = true;
-                          });
-
-                          final authProvider = Provider.of<AuthProvider>(
-                            outerContext,
-                            listen: false,
-                          );
-                          final success = await authProvider.loginWithApiKey(
-                            apiKey: apiKey,
-                          );
-
-                          if (!dialogContext.mounted) return;
-
-                          final errorMsg = authProvider.errorMessage;
-                          apiKeyController.dispose();
-                          Navigator.of(dialogContext).pop();
-
-                          if (!success && mounted) {
-                            ScaffoldMessenger.of(outerContext).showSnackBar(
-                              SnackBar(
-                                content: Text(
-                                  errorMsg ?? 'Invalid API key',
-                                ),
-                                backgroundColor:
-                                    Theme.of(outerContext).colorScheme.error,
-                              ),
-                            );
-                          }
-                        },
-                  child: isLoading
-                      ? const SizedBox(
-                          height: 20,
-                          width: 20,
-                          child: CircularProgressIndicator(strokeWidth: 2),
-                        )
-                      : const Text('Sign In'),
-                ),
-              ],
-            );
-          },
-        );
-      },
+      builder: (_) => const ApiKeyLoginDialog(),
     );
+
+    // result: true = signed in, false = login attempt failed, null = dismissed.
+    if (result == false && mounted) {
+      final authProvider = Provider.of<AuthProvider>(context, listen: false);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(
+            authProvider.errorMessage ??
+                AppLocalizations.of(context).loginApiKeyInvalid,
+          ),
+          backgroundColor: Theme.of(context).colorScheme.error,
+        ),
+      );
+    }
   }
 
   Future<void> _handleLogin() async {
@@ -210,6 +139,7 @@ class _LoginScreenState extends State<LoginScreen> {
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
+    final l = AppLocalizations.of(context);
 
     return Scaffold(
       body: SafeArea(
@@ -224,11 +154,7 @@ class _LoginScreenState extends State<LoginScreen> {
                   children: [
                     const SizedBox(height: 48),
                     // Logo/Title
-                    SvgPicture.asset(
-                      'assets/images/logomark.svg',
-                      width: 80,
-                      height: 80,
-                    ),
+                    const SureLogo(size: 80),
                     const SizedBox(height: 24),
                     Text.rich(
                       TextSpan(
@@ -236,16 +162,16 @@ class _LoginScreenState extends State<LoginScreen> {
                               color: colorScheme.onSurfaceVariant,
                             ),
                         children: [
-                          const TextSpan(text: 'Demo account or '),
+                          TextSpan(text: l.loginDemoOrSignUpPrefix),
                           TextSpan(
-                            text: 'Sign Up',
+                            text: l.loginSignUpLink,
                             style: TextStyle(
                               color: colorScheme.primary,
                               fontWeight: FontWeight.w600,
                             ),
                             recognizer: _signUpTapRecognizer,
                           ),
-                          const TextSpan(text: '!'),
+                          TextSpan(text: l.loginSignUpSuffix),
                         ],
                       ),
                       textAlign: TextAlign.center,
@@ -297,16 +223,16 @@ class _LoginScreenState extends State<LoginScreen> {
                       keyboardType: TextInputType.emailAddress,
                       autocorrect: false,
                       textInputAction: TextInputAction.next,
-                      decoration: const InputDecoration(
-                        labelText: 'Email',
-                        prefixIcon: Icon(Icons.email_outlined),
+                      decoration: InputDecoration(
+                        labelText: l.loginEmailLabel,
+                        prefixIcon: const Icon(Icons.email_outlined),
                       ),
                       validator: (value) {
                         if (value == null || value.isEmpty) {
-                          return 'Please enter your email';
+                          return l.loginEmailRequired;
                         }
                         if (!value.contains('@')) {
-                          return 'Please enter a valid email';
+                          return l.loginEmailInvalid;
                         }
                         return null;
                       },
@@ -330,7 +256,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                   ? TextInputAction.next
                                   : TextInputAction.done,
                               decoration: InputDecoration(
-                                labelText: 'Password',
+                                labelText: l.loginPasswordLabel,
                                 prefixIcon: const Icon(Icons.lock_outlined),
                                 suffixIcon: IconButton(
                                   icon: Icon(
@@ -347,7 +273,7 @@ class _LoginScreenState extends State<LoginScreen> {
                               ),
                               validator: (value) {
                                 if (value == null || value.isEmpty) {
-                                  return 'Please enter your password';
+                                  return l.loginPasswordRequired;
                                 }
                                 return null;
                               },
@@ -374,7 +300,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                     const SizedBox(width: 12),
                                     Expanded(
                                       child: Text(
-                                        'Two-factor authentication is enabled. Enter your code.',
+                                        l.loginMfaInfo,
                                         style: TextStyle(
                                             color: colorScheme.onSurface),
                                       ),
@@ -387,14 +313,14 @@ class _LoginScreenState extends State<LoginScreen> {
                                 controller: _otpController,
                                 keyboardType: TextInputType.number,
                                 textInputAction: TextInputAction.done,
-                                decoration: const InputDecoration(
-                                  labelText: 'Authentication Code',
-                                  prefixIcon: Icon(Icons.pin_outlined),
+                                decoration: InputDecoration(
+                                  labelText: l.loginMfaLabel,
+                                  prefixIcon: const Icon(Icons.pin_outlined),
                                 ),
                                 validator: (value) {
                                   if (showOtp &&
                                       (value == null || value.isEmpty)) {
-                                    return 'Please enter your authentication code';
+                                    return l.loginMfaCodeRequired;
                                   }
                                   return null;
                                 },
@@ -411,17 +337,12 @@ class _LoginScreenState extends State<LoginScreen> {
                     // Login Button
                     Consumer<AuthProvider>(
                       builder: (context, authProvider, _) {
-                        return ElevatedButton(
-                          onPressed:
-                              authProvider.isLoading ? null : _handleLogin,
-                          child: authProvider.isLoading
-                              ? const SizedBox(
-                                  height: 20,
-                                  width: 20,
-                                  child:
-                                      CircularProgressIndicator(strokeWidth: 2),
-                                )
-                              : const Text('Sign In'),
+                        return SureButton(
+                          label: l.loginSignIn,
+                          size: SureButtonSize.lg,
+                          fullWidth: true,
+                          loading: authProvider.isLoading,
+                          onPressed: _handleLogin,
                         );
                       },
                     ),
@@ -436,7 +357,7 @@ class _LoginScreenState extends State<LoginScreen> {
                         Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 16),
                           child: Text(
-                            'or',
+                            l.loginOrDivider,
                             style:
                                 TextStyle(color: colorScheme.onSurfaceVariant),
                           ),
@@ -451,23 +372,20 @@ class _LoginScreenState extends State<LoginScreen> {
                     // Google Sign-In button
                     Consumer<AuthProvider>(
                       builder: (context, authProvider, _) {
-                        return OutlinedButton.icon(
-                          onPressed: authProvider.isLoading
-                              ? null
-                              : () =>
-                                  authProvider.startSsoLogin('google_oauth2'),
-                          icon: SvgPicture.asset(
+                        return SureButton(
+                          label: l.loginSignInWithGoogle,
+                          variant: SureButtonVariant.outline,
+                          size: SureButtonSize.lg,
+                          fullWidth: true,
+                          leading: SvgPicture.asset(
                             'assets/images/google_g_logo.svg',
                             width: 18,
                             height: 18,
                           ),
-                          label: const Text('Sign in with Google'),
-                          style: OutlinedButton.styleFrom(
-                            minimumSize: const Size(double.infinity, 50),
-                            shape: RoundedRectangleBorder(
-                              borderRadius: BorderRadius.circular(12),
-                            ),
-                          ),
+                          onPressed: authProvider.isLoading
+                              ? null
+                              : () =>
+                                  authProvider.startSsoLogin('google_oauth2'),
                         );
                       },
                     ),
@@ -488,7 +406,7 @@ class _LoginScreenState extends State<LoginScreen> {
                         child: Column(
                           children: [
                             Text(
-                              'Sure server URL:',
+                              l.loginServerUrlHeading,
                               style:
                                   Theme.of(context).textTheme.bodySmall?.copyWith(
                                         color: colorScheme.onSurfaceVariant,
@@ -513,10 +431,17 @@ class _LoginScreenState extends State<LoginScreen> {
                     const SizedBox(height: 12),
 
                     // API Key Login Button
-                    TextButton.icon(
-                      onPressed: _showApiKeyDialog,
-                      icon: const Icon(Icons.vpn_key_outlined, size: 18),
-                      label: const Text('API-Key Login'),
+                    Consumer<AuthProvider>(
+                      builder: (context, authProvider, _) {
+                        return SureButton(
+                          label: l.loginApiKeyLoginButton,
+                          variant: SureButtonVariant.ghost,
+                          onPressed:
+                              authProvider.isLoading ? null : _showApiKeyDialog,
+                          leading:
+                              const Icon(Icons.vpn_key_outlined, size: 18),
+                        );
+                      },
                     ),
                   ],
                 ),
@@ -527,7 +452,7 @@ class _LoginScreenState extends State<LoginScreen> {
               top: 8,
               child: IconButton(
                 icon: const Icon(Icons.settings_outlined),
-                tooltip: 'Backend Settings',
+                tooltip: l.loginBackendSettingsTooltip,
                 onPressed: () => widget._openSettings(context),
               ),
             ),
@@ -537,3 +462,101 @@ class _LoginScreenState extends State<LoginScreen> {
     );
   }
 }
+
+/// API-key login dialog. Owns its [TextEditingController] so it is disposed
+/// with the dialog's State — never leaked (barrier/back dismissal) and never
+/// disposed while the field is still mounted. Pops `true` on a successful
+/// sign-in, `false` on a failed attempt, and `null` when dismissed.
+@visibleForTesting
+class ApiKeyLoginDialog extends StatefulWidget {
+  const ApiKeyLoginDialog({super.key, this.controller});
+
+  /// Test seam: a controller the dialog will adopt and dispose, so a test can
+  /// assert disposal. Production passes none and the dialog creates its own.
+  @visibleForTesting
+  final TextEditingController? controller;
+
+  @override
+  State<ApiKeyLoginDialog> createState() => _ApiKeyLoginDialogState();
+}
+
+class _ApiKeyLoginDialogState extends State<ApiKeyLoginDialog> {
+  late final TextEditingController _apiKeyController =
+      widget.controller ?? TextEditingController();
+  bool _isLoading = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _apiKeyController.addListener(_onTextChanged);
+  }
+
+  void _onTextChanged() => setState(() {});
+
+  @override
+  void dispose() {
+    _apiKeyController.removeListener(_onTextChanged);
+    _apiKeyController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _submit() async {
+    final apiKey = _apiKeyController.text.trim();
+    if (apiKey.isEmpty) return;
+
+    setState(() => _isLoading = true);
+
+    final authProvider = Provider.of<AuthProvider>(context, listen: false);
+    final success = await authProvider.loginWithApiKey(apiKey: apiKey);
+
+    if (!mounted) return;
+    Navigator.of(context).pop(success);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
+    return AlertDialog(
+      title: Text(l.loginApiKeyDialogTitle),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Text(
+            l.loginApiKeyDialogBody,
+            style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                  color: Theme.of(context).colorScheme.onSurfaceVariant,
+                ),
+          ),
+          const SizedBox(height: 16),
+          TextField(
+            controller: _apiKeyController,
+            decoration: InputDecoration(
+              labelText: l.loginApiKeyLabel,
+              prefixIcon: const Icon(Icons.vpn_key_outlined),
+            ),
+            obscureText: true,
+            maxLines: 1,
+            enabled: !_isLoading,
+            onSubmitted: (_) => _submit(),
+          ),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: _isLoading ? null : () => Navigator.of(context).pop(),
+          child: Text(l.commonCancel),
+        ),
+        ElevatedButton(
+          onPressed: _isLoading || _apiKeyController.text.trim().isEmpty ? null : _submit,
+          child: _isLoading
+              ? const SizedBox(
+                  height: 20,
+                  width: 20,
+                  child: CircularProgressIndicator(strokeWidth: 2),
+                )
+              : Text(l.loginApiKeySignIn),
+        ),
+      ],
+    );
+  }
+}
diff --git a/mobile/lib/screens/main_navigation_screen.dart b/mobile/lib/screens/main_navigation_screen.dart
index db9236a5a..f292edd62 100644
--- a/mobile/lib/screens/main_navigation_screen.dart
+++ b/mobile/lib/screens/main_navigation_screen.dart
@@ -1,13 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
 import 'package:provider/provider.dart';
 
 import '../providers/auth_provider.dart';
+import '../providers/privacy_provider.dart';
+import '../widgets/sure_logo.dart';
 import 'chat_list_screen.dart';
 import 'dashboard_screen.dart';
 import 'intro_screen.dart';
 import 'more_screen.dart';
 import 'settings_screen.dart';
+import '../l10n/app_localizations.dart';
 
 class MainNavigationScreen extends StatefulWidget {
   const MainNavigationScreen({super.key});
@@ -72,43 +74,43 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
     await _handleDestinationSelected(settingsIndex, authProvider, introLayout);
   }
 
-  List<NavigationDestination> _buildDestinations(bool introLayout) {
+  List<NavigationDestination> _buildDestinations(bool introLayout, AppLocalizations l) {
     final destinations = <NavigationDestination>[];
 
     if (!introLayout) {
       destinations.add(
-        const NavigationDestination(
-          icon: Icon(Icons.home_outlined),
-          selectedIcon: Icon(Icons.home),
-          label: 'Home',
+        NavigationDestination(
+          icon: const Icon(Icons.home_outlined),
+          selectedIcon: const Icon(Icons.home),
+          label: l.navHome,
         ),
       );
     }
 
     if (introLayout) {
       destinations.add(
-        const NavigationDestination(
-          icon: Icon(Icons.auto_awesome_outlined),
-          selectedIcon: Icon(Icons.auto_awesome),
-          label: 'Intro',
+        NavigationDestination(
+          icon: const Icon(Icons.auto_awesome_outlined),
+          selectedIcon: const Icon(Icons.auto_awesome),
+          label: l.navIntro,
         ),
       );
     }
 
     destinations.add(
-      const NavigationDestination(
-        icon: Icon(Icons.chat_bubble_outline),
-        selectedIcon: Icon(Icons.chat_bubble),
-        label: 'Assistant',
+      NavigationDestination(
+        icon: const Icon(Icons.chat_bubble_outline),
+        selectedIcon: const Icon(Icons.chat_bubble),
+        label: l.navAssistant,
       ),
     );
 
     if (!introLayout) {
       destinations.add(
-        const NavigationDestination(
-          icon: Icon(Icons.more_horiz),
-          selectedIcon: Icon(Icons.more_horiz),
-          label: 'More',
+        NavigationDestination(
+          icon: const Icon(Icons.more_horiz),
+          selectedIcon: const Icon(Icons.more_horiz),
+          label: l.navMore,
         ),
       );
     }
@@ -128,16 +130,33 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
         width: 60,
         height: 60,
         alignment: Alignment.topLeft,
-        child: Padding(
-          padding: const EdgeInsets.only(top: 12, left: 12),
-          child: SvgPicture.asset(
-            'assets/images/logomark.svg',
-            width: 36,
-            height: 36,
-          ),
+        child: const Padding(
+          padding: EdgeInsets.only(top: 12, left: 12),
+          child: SureLogo(),
         ),
       ),
       actions: [
+        Padding(
+          padding: const EdgeInsets.only(right: 12),
+          child: Center(
+            child: Tooltip(
+              message: 'Toggle privacy',
+              child: InkWell(
+                onTap: () => context.read<PrivacyProvider>().toggle(),
+                child: SizedBox(
+                  width: 36,
+                  height: 36,
+                  child: Icon(
+                    context.watch<PrivacyProvider>().hidden
+                        ? Icons.visibility_off_outlined
+                        : Icons.visibility_outlined,
+                    semanticLabel: 'Toggle privacy',
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
         Padding(
           padding: const EdgeInsets.only(right: 12),
           child: Center(
@@ -158,24 +177,28 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
   }
 
   Future<bool> _showEnableAiPrompt() async {
+    final l = AppLocalizations.of(context);
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
 
     final shouldEnable = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Turn on AI Chat?'),
-        content: const Text('AI Chat is currently disabled in your account settings. Would you like to turn it on now?'),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.of(context).pop(false),
-            child: const Text('Not now'),
-          ),
-          FilledButton(
-            onPressed: () => Navigator.of(context).pop(true),
-            child: const Text('Turn on AI'),
-          ),
-        ],
-      ),
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.navEnableAiChatTitle),
+          content: Text(dl.navEnableAiChatContent),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.of(context).pop(false),
+              child: Text(dl.navEnableAiChatNotNow),
+            ),
+            FilledButton(
+              onPressed: () => Navigator.of(context).pop(true),
+              child: Text(dl.navEnableAiChatConfirm),
+            ),
+          ],
+        );
+      },
     );
 
     if (shouldEnable != true) {
@@ -187,7 +210,7 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
     if (!enabled && mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text(authProvider.errorMessage ?? 'Unable to enable AI right now.'),
+          content: Text(authProvider.errorMessage ?? l.navEnableAiChatFailed),
           backgroundColor: Colors.red,
         ),
       );
@@ -214,6 +237,7 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     return Consumer<AuthProvider>(
       builder: (context, authProvider, _) {
         final introLayout = authProvider.isIntroLayout;
@@ -222,7 +246,7 @@ class _MainNavigationScreenState extends State<MainNavigationScreen> {
           introLayout,
           () => _handleDestinationSelected(chatIndex, authProvider, introLayout),
         );
-        final destinations = _buildDestinations(introLayout);
+        final destinations = _buildDestinations(introLayout, l);
         final bottomNavIndex = _resolveBottomSelectedIndex(destinations);
 
         if (_currentIndex >= screens.length) {
diff --git a/mobile/lib/screens/more_screen.dart b/mobile/lib/screens/more_screen.dart
index 970b20eab..ae4e594d5 100644
--- a/mobile/lib/screens/more_screen.dart
+++ b/mobile/lib/screens/more_screen.dart
@@ -1,4 +1,8 @@
 import 'package:flutter/material.dart';
+import '../l10n/app_localizations.dart';
+import '../theme/sure_colors.dart';
+import '../theme/sure_tokens.dart';
+import '../widgets/sure_list_group.dart';
 import 'calendar_screen.dart';
 import 'recent_transactions_screen.dart';
 
@@ -7,79 +11,62 @@ class MoreScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
-
+    final l = AppLocalizations.of(context);
     return Scaffold(
-      body: ListView(
-        children: [
-          _buildMenuItem(
-            context: context,
-            icon: Icons.calendar_month,
-            title: 'Account Calendar',
-            subtitle: 'View monthly balance changes by account',
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => const CalendarScreen(),
+      // Setting an explicit ListView padding opts out of the scroll view's
+      // automatic safe-area inset, so restore it with SafeArea (keeps the group
+      // clear of the status bar / home indicator).
+      body: SafeArea(
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            SureListGroup(
+              children: [
+                SureListRow(
+                  leading: _iconBadge(context, Icons.calendar_month),
+                  title: l.moreCalendar,
+                  subtitle: l.moreCalendarSubtitle,
+                  showChevron: true,
+                  onTap: () {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => const CalendarScreen(),
+                      ),
+                    );
+                  },
                 ),
-              );
-            },
-          ),
-          Divider(height: 1, color: colorScheme.outlineVariant),
-          _buildMenuItem(
-            context: context,
-            icon: Icons.receipt_long,
-            title: 'Recent Transactions',
-            subtitle: 'View recent transactions across all accounts',
-            onTap: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(
-                  builder: (context) => const RecentTransactionsScreen(),
+                SureListRow(
+                  leading: _iconBadge(context, Icons.receipt_long),
+                  title: l.moreRecentTransactions,
+                  subtitle: l.moreRecentTransactionsSubtitle,
+                  showChevron: true,
+                  onTap: () {
+                    Navigator.push(
+                      context,
+                      MaterialPageRoute(
+                        builder: (context) => const RecentTransactionsScreen(),
+                      ),
+                    );
+                  },
                 ),
-              );
-            },
-          ),
-        ],
+              ],
+            ),
+          ],
+        ),
       ),
     );
   }
 
-  Widget _buildMenuItem({
-    required BuildContext context,
-    required IconData icon,
-    required String title,
-    required String subtitle,
-    required VoidCallback onTap,
-  }) {
-    final colorScheme = Theme.of(context).colorScheme;
-
-    return ListTile(
-      leading: Container(
-        padding: const EdgeInsets.all(8),
-        decoration: BoxDecoration(
-          color: colorScheme.primaryContainer,
-          borderRadius: BorderRadius.circular(8),
-        ),
-        child: Icon(
-          icon,
-          color: colorScheme.onPrimaryContainer,
-        ),
+  Widget _iconBadge(BuildContext context, IconData icon) {
+    final palette = SureColors.of(context).palette;
+    return Container(
+      padding: const EdgeInsets.all(8),
+      decoration: BoxDecoration(
+        color: palette.surfaceInset,
+        borderRadius: BorderRadius.circular(SureTokens.radiusMd),
       ),
-      title: Text(
-        title,
-        style: Theme.of(context).textTheme.titleMedium,
-      ),
-      subtitle: Text(
-        subtitle,
-        style: TextStyle(color: colorScheme.onSurfaceVariant),
-      ),
-      trailing: Icon(
-        Icons.chevron_right,
-        color: colorScheme.onSurfaceVariant,
-      ),
-      onTap: onTap,
+      child: Icon(icon, color: palette.textPrimary),
     );
   }
 }
diff --git a/mobile/lib/screens/recent_transactions_screen.dart b/mobile/lib/screens/recent_transactions_screen.dart
index 8decc3071..210c4a65e 100644
--- a/mobile/lib/screens/recent_transactions_screen.dart
+++ b/mobile/lib/screens/recent_transactions_screen.dart
@@ -6,6 +6,12 @@ import '../models/account.dart';
 import '../providers/transactions_provider.dart';
 import '../providers/accounts_provider.dart';
 import '../providers/auth_provider.dart';
+import '../theme/sure_tokens.dart';
+import '../providers/privacy_provider.dart';
+import '../utils/amount_parser.dart';
+import '../utils/money_masker.dart';
+import '../widgets/money_text.dart';
+import '../l10n/app_localizations.dart';
 
 class RecentTransactionsScreen extends StatefulWidget {
   const RecentTransactionsScreen({super.key});
@@ -82,8 +88,10 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
     final transactionsProvider = context.watch<TransactionsProvider>();
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
 
     final recentTransactions = _getSortedTransactions(
       transactionsProvider.transactions,
@@ -91,12 +99,12 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
 
     return Scaffold(
       appBar: AppBar(
-        title: const Text('Recent Transactions'),
+        title: Text(l.recentTransactionsTitle),
         actions: [
           PopupMenuButton<int>(
             initialValue: _transactionLimit,
             icon: const Icon(Icons.filter_list),
-            tooltip: 'Display Limit',
+            tooltip: l.recentTransactionsDisplayLimit,
             onSelected: (int value) {
               setState(() {
                 _transactionLimit = value;
@@ -112,7 +120,7 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
                     else
                       const SizedBox(width: 20),
                     const SizedBox(width: 8),
-                    Text('Show $limit'),
+                    Text(l.recentTransactionsShowN(limit)),
                   ],
                 ),
               );
@@ -135,8 +143,10 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
                     itemBuilder: (context, index) {
                       final transaction = recentTransactions[index];
                       return _buildTransactionItem(
+                        context,
                         transaction,
                         colorScheme,
+                        hideAmounts,
                       );
                     },
                   ),
@@ -145,6 +155,7 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
   }
 
   Widget _buildEmptyState(ColorScheme colorScheme) {
+    final l = AppLocalizations.of(context);
     return Center(
       child: Padding(
         padding: const EdgeInsets.all(24),
@@ -158,12 +169,12 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
             ),
             const SizedBox(height: 16),
             Text(
-              'No Transactions',
+              l.recentTransactionsEmpty,
               style: Theme.of(context).textTheme.titleLarge,
             ),
             const SizedBox(height: 8),
             Text(
-              'Pull to refresh',
+              l.recentTransactionsPullToRefresh,
               style: TextStyle(color: colorScheme.onSurfaceVariant),
             ),
           ],
@@ -172,50 +183,43 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
     );
   }
 
-  Widget _buildTransactionItem(Transaction transaction, ColorScheme colorScheme) {
+  Widget _buildTransactionItem(BuildContext context, Transaction transaction,
+      ColorScheme colorScheme, bool hideAmounts) {
     final account = _getAccount(transaction.accountId);
-    final accountName = account?.name ?? 'Unknown Account';
+    final accountName = account?.name ??
+        AppLocalizations.of(context).recentTransactionsUnknownAccount;
 
-    // Parse amount with proper sign handling (same logic as transactions_list_screen.dart)
-    String trimmedAmount = transaction.amount.trim();
-    trimmedAmount = trimmedAmount.replaceAll('\u2212', '-'); // Normalize minus sign
-
-    // Detect if the amount has a negative sign
-    bool hasNegativeSign = trimmedAmount.startsWith('-') || trimmedAmount.endsWith('-');
-
-    // Remove all non-numeric characters except decimal point and minus sign
-    String numericString = trimmedAmount.replaceAll(RegExp(r'[^\d.\-]'), '');
-
-    // Parse the numeric value
-    double amount = double.tryParse(numericString.replaceAll('-', '')) ?? 0.0;
-
-    // Apply the sign from the string
-    if (hasNegativeSign) {
-      amount = -amount;
+    double? amount;
+    try {
+      amount = AmountParser.parse(transaction.amount).value;
+    } on FormatException {
+      // Keep the list renderable if the server returns a malformed amount.
     }
 
     // For asset accounts and liability accounts, flip the sign to match accounting conventions
-    if (account?.isAsset == true || account?.isLiability == true) {
+    if (amount != null &&
+        (account?.isAsset == true || account?.isLiability == true)) {
       amount = -amount;
     }
 
-    // Determine display properties based on final amount
-    final isPositive = amount >= 0;
-    Color amountColor;
-    String sign;
-
-    if (isPositive) {
-      amountColor = Colors.green.shade700;
-      sign = '+';
-    } else {
-      amountColor = Colors.red.shade700;
-      sign = '-';
-    }
+    // Determine display properties based on final amount. The semantic color
+    // comes from the Sure design-system tokens (success/destructive/subdued)
+    // via MoneyTrend, instead of raw Colors.green/red.
+    final isPositive = amount == null || amount >= 0;
+    final moneyTrend = SureMoney.trendForAmount(amount);
+    final amountColor = SureMoney.color(context, moneyTrend);
+    final sign = amount == null
+        ? ''
+        : isPositive
+            ? '+'
+            : '-';
 
     String formattedDate;
     try {
       final date = DateTime.parse(transaction.date);
-      formattedDate = DateFormat('yyyy-MM-dd HH:mm').format(date);
+      formattedDate = DateFormat('yyyy-MM-dd HH:mm',
+              Localizations.localeOf(context).toString())
+          .format(date);
     } catch (e) {
       formattedDate = transaction.date;
     }
@@ -225,19 +229,21 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
       leading: Container(
         padding: const EdgeInsets.all(8),
         decoration: BoxDecoration(
-          color: isPositive
-              ? Colors.green.withValues(alpha: 0.1)
-              : Colors.red.withValues(alpha: 0.1),
+          color: amountColor.withValues(alpha: 0.1),
           borderRadius: BorderRadius.circular(8),
         ),
         child: Icon(
-          isPositive ? Icons.arrow_upward : Icons.arrow_downward,
+          amount == null
+              ? Icons.help_outline
+              : isPositive
+                  ? Icons.arrow_upward
+                  : Icons.arrow_downward,
           color: amountColor,
         ),
       ),
       title: Text(
         transaction.name,
-        style: const TextStyle(fontWeight: FontWeight.w500),
+        style: const TextStyle(fontWeight: SureTokens.weightMedium),
       ),
       subtitle: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -273,12 +279,17 @@ class _RecentTransactionsScreenState extends State<RecentTransactionsScreen> {
           ],
         ],
       ),
-      trailing: Text(
-        '$sign${transaction.currency} ${_formatAmount(amount.abs())}',
-        style: TextStyle(
-          fontWeight: FontWeight.bold,
+      trailing: MoneyText(
+        MoneyMasker.mask(
+          amount == null
+              ? transaction.amount
+              : '$sign${transaction.currency} ${_formatAmount(amount.abs())}',
+          hidden: hideAmounts,
+        ),
+        trend: moneyTrend,
+        style: const TextStyle(
+          fontWeight: SureTokens.weightMedium,
           fontSize: 16,
-          color: amountColor,
         ),
       ),
     );
diff --git a/mobile/lib/screens/settings_screen.dart b/mobile/lib/screens/settings_screen.dart
index 676926153..4306e7dc2 100644
--- a/mobile/lib/screens/settings_screen.dart
+++ b/mobile/lib/screens/settings_screen.dart
@@ -1,10 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:provider/provider.dart';
+import 'package:upgrader/upgrader.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../providers/auth_provider.dart';
 import '../providers/categories_provider.dart';
+import '../providers/merchants_provider.dart';
+import '../providers/tags_provider.dart';
 import '../providers/theme_provider.dart';
+import '../providers/privacy_provider.dart';
 import '../services/offline_storage_service.dart';
 import '../services/log_service.dart';
 import '../services/biometric_service.dart';
@@ -15,6 +19,7 @@ import '../models/custom_proxy_header.dart';
 import '../services/api_config.dart';
 import '../services/custom_proxy_headers_service.dart';
 import '../widgets/custom_proxy_headers_editor.dart';
+import '../l10n/app_localizations.dart';
 
 class SettingsScreen extends StatefulWidget {
   const SettingsScreen({super.key});
@@ -26,12 +31,26 @@ class SettingsScreen extends StatefulWidget {
 class _SettingsScreenState extends State<SettingsScreen> {
   bool _groupByType = false;
   String? _appVersion;
-  bool _isResettingAccount = false;
-  bool _isDeletingAccount = false;
+  // Identifiers for the in-progress destructive action. Defined once so the
+  // discriminator can't drift via a mistyped string literal across handlers and
+  // tiles.
+  static const String _clearAction = 'clear';
+  static const String _resetAction = 'reset';
+  static const String _deleteAction = 'delete';
+  // Tracks which destructive action is in progress (one of the constants above),
+  // or null when idle. Used to disable all three tiles while any one is running.
+  String? _activeDestructiveAction;
   bool _biometricSupported = false;
   bool _biometricEnabled = false;
   bool _isTogglingBiometric = false;
   List<CustomProxyHeader> _customHeaders = [];
+  bool _isCheckingForUpdate = false;
+  late final Upgrader _manualUpgrader;
+
+  String _displayInitial(String? displayName) {
+    final trimmed = displayName?.trim() ?? '';
+    return trimmed.isEmpty ? 'U' : trimmed[0].toUpperCase();
+  }
 
   @override
   void initState() {
@@ -40,6 +59,86 @@ class _SettingsScreenState extends State<SettingsScreen> {
     _loadAppVersion();
     _loadBiometricState();
     _loadCustomHeaders();
+    _manualUpgrader = Upgrader(
+      durationUntilAlertAgain: Duration.zero,
+      countryCode: 'us',
+    );
+  }
+
+  Future<void> _checkForUpdate() async {
+    if (_isCheckingForUpdate) return;
+    setState(() => _isCheckingForUpdate = true);
+    try {
+      await _manualUpgrader.initialize();
+      if (!mounted) {
+        _manualUpgrader.dispose();
+        return;
+      }
+      await _manualUpgrader.updateVersionInfo();
+      if (!mounted) return;
+
+      final available = _manualUpgrader.isUpdateAvailable();
+      final storeVersion = _manualUpgrader.versionInfo?.appStoreVersion?.toString();
+      final storeUrl = _manualUpgrader.versionInfo?.appStoreListingURL;
+
+      if (available) {
+        await _showUpdateDialog(
+          storeVersion ??
+              AppLocalizations.of(context).settingsUpdateNewerVersionFallback,
+          storeUrl,
+        );
+      } else {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(AppLocalizations.of(context).settingsNoUpdateAvailable)),
+        );
+      }
+    } catch (e) {
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(AppLocalizations.of(context).settingsUpdateError)),
+        );
+      }
+    } finally {
+      if (mounted) setState(() => _isCheckingForUpdate = false);
+    }
+  }
+
+  Future<void> _showUpdateDialog(String version, String? storeUrl) async {
+    final launch = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: Text(AppLocalizations.of(ctx).settingsUpdateAvailableTitle),
+        content: Text(AppLocalizations.of(ctx).settingsUpdateAvailableContent(version)),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(ctx, false),
+            child: Text(AppLocalizations.of(ctx).commonCancel),
+          ),
+          TextButton(
+            onPressed: storeUrl == null ? null : () => Navigator.pop(ctx, true),
+            child: Text(AppLocalizations.of(ctx).settingsUpdateNow),
+          ),
+        ],
+      ),
+    );
+
+    if (launch == true && storeUrl != null && mounted) {
+      final uri = Uri.tryParse(storeUrl);
+      final opened = uri != null
+          ? await launchUrl(uri, mode: LaunchMode.externalApplication)
+          : false;
+      if (!opened && mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(AppLocalizations.of(context).settingsUpdateOpenStoreError)),
+        );
+      }
+    }
+  }
+
+  @override
+  void dispose() {
+    _manualUpgrader.dispose();
+    super.dispose();
   }
 
   Future<void> _loadBiometricState() async {
@@ -62,12 +161,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
     try {
       if (value) {
         final success = await BiometricService.instance.authenticate(
-          reason: 'Verify biometric to enable app lock',
+          reason: AppLocalizations.of(context).settingsBiometricVerifyReason,
         );
         if (!mounted) return;
         if (!success) {
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(content: Text('Biometric authentication failed.')),
+            SnackBar(content: Text(AppLocalizations.of(context).settingsBiometricFailed)),
           );
           return;
         }
@@ -84,7 +183,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     if (mounted) {
       final build = packageInfo.buildNumber;
       final display = build.isNotEmpty
-          ? '${packageInfo.version} (${build})'
+          ? '${packageInfo.version} ($build)'
           : packageInfo.version;
       setState(() => _appVersion = display);
     }
@@ -105,39 +204,42 @@ class _SettingsScreenState extends State<SettingsScreen> {
       if (mounted) {
         setState(() => _customHeaders = headers);
       }
-    } catch (e, stack) {
-      debugPrint('SettingsScreen: failed to load custom headers: $e\n$stack');
+    } catch (e) {
+      LogService.instance.warning(
+        'SettingsScreen',
+        'Failed to load custom headers with ${e.runtimeType}',
+      );
       // Keep the existing _customHeaders state so the screen remains usable.
     }
   }
 
   Future<void> _handleClearLocalData(BuildContext context) async {
+    final l = AppLocalizations.of(context);
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Clear Local Data'),
-        content: const Text(
-          'This will delete all locally cached transactions and accounts. '
-          'Your data on the server will not be affected. '
-          'Are you sure you want to continue?'
-        ),
+      builder: (context) {
+        final l = AppLocalizations.of(context);
+        return AlertDialog(
+        title: Text(l.settingsClearDataTitle),
+        content: Text(l.settingsClearDataContent),
         actions: [
           TextButton(
             onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
+            child: Text(l.commonCancel),
           ),
           TextButton(
             onPressed: () => Navigator.pop(context, true),
             style: TextButton.styleFrom(
               foregroundColor: Theme.of(context).colorScheme.error,
             ),
-            child: const Text('Clear Data'),
+            child: Text(l.settingsClearData),
           ),
         ],
-      ),
+      );},
     );
 
     if (confirmed == true && context.mounted) {
+      setState(() => _activeDestructiveAction = _clearAction);
       try {
         final offlineStorage = OfflineStorageService();
         final log = LogService.instance;
@@ -146,74 +248,82 @@ class _SettingsScreenState extends State<SettingsScreen> {
         await offlineStorage.clearAllData();
         if (context.mounted) {
           Provider.of<CategoriesProvider>(context, listen: false).clear();
+          Provider.of<MerchantsProvider>(context, listen: false).clear();
+          Provider.of<TagsProvider>(context, listen: false).clear();
         }
         log.info('Settings', 'Local data cleared successfully');
 
         if (context.mounted) {
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Local data cleared successfully. Pull to refresh to sync from server.'),
+            SnackBar(
+              content: Text(l.settingsClearDataSuccessDetailed),
               backgroundColor: Colors.green,
-              duration: Duration(seconds: 3),
+              duration: const Duration(seconds: 3),
             ),
           );
         }
       } catch (e) {
         final log = LogService.instance;
-        log.error('Settings', 'Failed to clear local data: $e');
+        log.error(
+          'Settings',
+          'Failed to clear local data with ${e.runtimeType}',
+        );
 
         if (context.mounted) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(
-              content: Text('Failed to clear local data: $e'),
+              content: Text(l.settingsClearDataFailed),
               backgroundColor: Colors.red,
               duration: const Duration(seconds: 3),
             ),
           );
         }
+      } finally {
+        if (mounted) setState(() => _activeDestructiveAction = null);
       }
     }
   }
 
   Future<void> _launchContactUrl(BuildContext context) async {
+    final l = AppLocalizations.of(context);
     final uri = Uri.parse('https://discord.com/invite/36ZGBsxYEK');
     final launched = await launchUrl(uri, mode: LaunchMode.externalApplication);
     if (!launched && context.mounted) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('Unable to open link')),
+        SnackBar(content: Text(l.settingsContactOpenLinkError)),
       );
     }
   }
 
   Future<void> _handleResetAccount(BuildContext context) async {
+    final l = AppLocalizations.of(context);
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Reset Account'),
-        content: const Text(
-          'Resetting your account will delete all your accounts, categories, '
-          'merchants, tags, and other data, but keep your user account intact.\n\n'
-          'This action cannot be undone. Are you sure?',
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            style: TextButton.styleFrom(
-              foregroundColor: Theme.of(context).colorScheme.error,
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.settingsResetAccount),
+          content: Text(dl.settingsResetAccountContent),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: Text(dl.commonCancel),
             ),
-            child: const Text('Reset Account'),
-          ),
-        ],
-      ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              style: TextButton.styleFrom(
+                foregroundColor: Theme.of(context).colorScheme.error,
+              ),
+              child: Text(dl.settingsResetAccount),
+            ),
+          ],
+        );
+      },
     );
 
     if (confirmed != true || !context.mounted) return;
 
-    setState(() => _isResettingAccount = true);
+    setState(() => _activeDestructiveAction = _resetAction);
     try {
       final authProvider = Provider.of<AuthProvider>(context, listen: false);
       final accessToken = await authProvider.getValidAccessToken();
@@ -230,13 +340,15 @@ class _SettingsScreenState extends State<SettingsScreen> {
         await OfflineStorageService().clearAllData();
         if (context.mounted) {
           Provider.of<CategoriesProvider>(context, listen: false).clear();
+          Provider.of<MerchantsProvider>(context, listen: false).clear();
+          Provider.of<TagsProvider>(context, listen: false).clear();
         }
 
         if (!context.mounted) return;
 
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
-            content: Text('Account reset has been initiated. This may take a moment.'),
+          SnackBar(
+            content: Text(l.settingsResetAccountInitiated),
             backgroundColor: Colors.green,
           ),
         );
@@ -245,45 +357,45 @@ class _SettingsScreenState extends State<SettingsScreen> {
       } else {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(result['error'] ?? 'Failed to reset account'),
+            content: Text(result['error'] ?? l.settingsResetAccountFailed),
             backgroundColor: Colors.red,
           ),
         );
       }
     } finally {
-      if (mounted) setState(() => _isResettingAccount = false);
+      if (mounted) setState(() => _activeDestructiveAction = null);
     }
   }
 
   Future<void> _handleDeleteAccount(BuildContext context) async {
+    final l = AppLocalizations.of(context);
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Delete Account'),
-        content: const Text(
-          'Deleting your account will permanently remove all your data '
-          'and cannot be undone.\n\n'
-          'Are you sure you want to delete your account?',
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            style: TextButton.styleFrom(
-              foregroundColor: Theme.of(context).colorScheme.error,
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.settingsDeleteAccountTitle),
+          content: Text(dl.settingsDeleteAccountConfirmContent),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: Text(dl.commonCancel),
             ),
-            child: const Text('Delete Account'),
-          ),
-        ],
-      ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              style: TextButton.styleFrom(
+                foregroundColor: Theme.of(context).colorScheme.error,
+              ),
+              child: Text(dl.settingsDeleteAccount),
+            ),
+          ],
+        );
+      },
     );
 
     if (confirmed != true || !context.mounted) return;
 
-    setState(() => _isDeletingAccount = true);
+    setState(() => _activeDestructiveAction = _deleteAction);
     try {
       final authProvider = Provider.of<AuthProvider>(context, listen: false);
       final accessToken = await authProvider.getValidAccessToken();
@@ -292,7 +404,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
         return;
       }
 
-      final result = await UserService().deleteAccount(accessToken: accessToken);
+      final result =
+          await UserService().deleteAccount(accessToken: accessToken);
 
       if (!context.mounted) return;
 
@@ -301,33 +414,35 @@ class _SettingsScreenState extends State<SettingsScreen> {
       } else {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text(result['error'] ?? 'Failed to delete account'),
+            content: Text(result['error'] ?? l.settingsDeleteAccountFailed),
             backgroundColor: Colors.red,
           ),
         );
       }
     } finally {
-      if (mounted) setState(() => _isDeletingAccount = false);
+      if (mounted) setState(() => _activeDestructiveAction = null);
     }
   }
 
   Future<void> _handleLogout(BuildContext context) async {
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Sign Out'),
-        content: const Text('Are you sure you want to sign out?'),
+      builder: (context) {
+        final l = AppLocalizations.of(context);
+        return AlertDialog(
+        title: Text(l.settingsSignOutTitle),
+        content: Text(l.settingsSignOutContent),
         actions: [
           TextButton(
             onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
+            child: Text(l.commonCancel),
           ),
           TextButton(
             onPressed: () => Navigator.pop(context, true),
-            child: const Text('Sign Out'),
+            child: Text(l.settingsSignOut),
           ),
         ],
-      ),
+      );},
     );
 
     if (confirmed == true && context.mounted) {
@@ -337,8 +452,10 @@ class _SettingsScreenState extends State<SettingsScreen> {
   }
 
   Future<void> _showCustomHeadersDialog() async {
+    final l = AppLocalizations.of(context);
     final formKey = GlobalKey<FormState>();
-    final latestHeaders = await CustomProxyHeadersService.instance.loadHeaders();
+    final latestHeaders =
+        await CustomProxyHeadersService.instance.loadHeaders();
     if (!mounted) return;
 
     setState(() => _customHeaders = latestHeaders);
@@ -347,8 +464,9 @@ class _SettingsScreenState extends State<SettingsScreen> {
     final saved = await showDialog<bool>(
       context: context,
       builder: (context) {
+        final l = AppLocalizations.of(context);
         return AlertDialog(
-          title: const Text('Custom proxy headers'),
+          title: Text(l.settingsProxyHeadersLabel),
           content: SingleChildScrollView(
             child: Form(
               key: formKey,
@@ -362,7 +480,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                   ),
                   const SizedBox(height: 12),
                   Text(
-                    'Headers are sent by the app with API requests. External browser SSO pages may not receive them.',
+                    l.settingsProxyHeadersNote,
                     style: Theme.of(context).textTheme.bodySmall?.copyWith(
                           color: Theme.of(context).colorScheme.onSurfaceVariant,
                         ),
@@ -374,14 +492,14 @@ class _SettingsScreenState extends State<SettingsScreen> {
           actions: [
             TextButton(
               onPressed: () => Navigator.pop(context, false),
-              child: const Text('Cancel'),
+              child: Text(l.commonCancel),
             ),
             ElevatedButton(
               onPressed: () {
                 if (formKey.currentState?.validate() != true) return;
                 Navigator.pop(context, true);
               },
-              child: const Text('Save'),
+              child: Text(l.commonSave),
             ),
           ],
         );
@@ -396,13 +514,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
       if (!mounted) return;
       setState(() => _customHeaders = draftHeaders);
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('Custom proxy headers saved')),
+        SnackBar(content: Text(l.settingsProxyHeadersSaved)),
       );
     } catch (e) {
       if (!mounted) return;
+      LogService.instance.warning(
+        'Settings',
+        'Failed to save custom proxy headers with ${e.runtimeType}',
+      );
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
-          content: Text('Failed to save custom proxy headers: $e'),
+          content: Text(l.settingsProxyHeadersSaveFailed),
           backgroundColor: Theme.of(context).colorScheme.error,
         ),
       );
@@ -413,6 +535,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     final authProvider = Provider.of<AuthProvider>(context);
+    final l = AppLocalizations.of(context);
 
     return Scaffold(
       body: ListView(
@@ -432,7 +555,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                           radius: 30,
                           backgroundColor: colorScheme.primary,
                           child: Text(
-                            authProvider.user?.displayName[0].toUpperCase() ?? 'U',
+                            _displayInitial(authProvider.user?.displayName),
                             style: TextStyle(
                               fontSize: 24,
                               color: colorScheme.onPrimary,
@@ -446,10 +569,13 @@ class _SettingsScreenState extends State<SettingsScreen> {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               Text(
-                                authProvider.user?.displayName ?? 'User',
-                                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                  fontWeight: FontWeight.bold,
-                                ),
+                                authProvider.user?.displayName ?? l.settingsUserFallback,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleLarge
+                                    ?.copyWith(
+                                      fontWeight: FontWeight.bold,
+                                    ),
                               ),
                               const SizedBox(height: 4),
                               Text(
@@ -472,7 +598,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           // App version
           ListTile(
             leading: const Icon(Icons.info_outline),
-            title: Text('App Version: ${_appVersion ?? '…'}'),
+            title: Text(l.settingsAppVersion(_appVersion ?? '…')),
             subtitle: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisSize: MainAxisSize.min,
@@ -483,9 +609,23 @@ class _SettingsScreenState extends State<SettingsScreen> {
             ),
           ),
 
+          ListTile(
+            leading: const Icon(Icons.system_update_outlined),
+            title: Text(l.settingsCheckForUpdates),
+            subtitle: Text(l.settingsCheckForUpdatesSubtitle),
+            trailing: _isCheckingForUpdate
+                ? const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                : const Icon(Icons.chevron_right),
+            onTap: _isCheckingForUpdate ? null : _checkForUpdate,
+          ),
+
           ListTile(
             leading: const Icon(Icons.chat_bubble_outline),
-            title: const Text('Contact us'),
+            title: Text(l.settingsContactUs),
             subtitle: Text(
               'https://discord.com/invite/36ZGBsxYEK',
               style: TextStyle(
@@ -497,16 +637,17 @@ class _SettingsScreenState extends State<SettingsScreen> {
           ),
 
           Semantics(
-            label: 'Open debug logs',
+            label: l.settingsDebugLogsSemantics,
             button: true,
             child: ListTile(
               leading: const Icon(Icons.bug_report),
-              title: const Text('Debug Logs'),
-              subtitle: const Text('View app diagnostic logs'),
+              title: Text(l.settingsDebugLogs),
+              subtitle: Text(l.settingsDebugLogsSubtitle),
               onTap: () {
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) => const LogViewerScreen()),
+                  MaterialPageRoute(
+                      builder: (context) => const LogViewerScreen()),
                 );
               },
             ),
@@ -515,11 +656,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
           const Divider(),
 
           // Display Settings Section
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
             child: Text(
-              'Display',
-              style: TextStyle(
+              l.settingsSectionDisplay,
+              style: const TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.bold,
                 color: Colors.grey,
@@ -529,8 +670,8 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
           SwitchListTile(
             secondary: const Icon(Icons.view_list),
-            title: const Text('Group by Account Type'),
-            subtitle: const Text('Group accounts by type (Crypto, Bank, etc.)'),
+            title: Text(l.settingsGroupByAccountType),
+            subtitle: Text(l.settingsGroupByAccountTypeSubtitle),
             value: _groupByType,
             onChanged: (value) async {
               await PreferencesService.instance.setGroupByType(value);
@@ -544,27 +685,28 @@ class _SettingsScreenState extends State<SettingsScreen> {
             builder: (context, themeProvider, _) {
               return ListTile(
                 leading: const Icon(Icons.brightness_6_outlined),
-                title: const Text('Theme'),
+                title: Text(l.settingsThemeLabel),
                 trailing: SegmentedButton<ThemeMode>(
-                  segments: const [
+                  segments: [
                     ButtonSegment(
                       value: ThemeMode.light,
-                      icon: Icon(Icons.light_mode, size: 18),
-                      tooltip: 'Light',
+                      icon: const Icon(Icons.light_mode, size: 18),
+                      tooltip: l.settingsThemeLight,
                     ),
                     ButtonSegment(
                       value: ThemeMode.system,
-                      icon: Icon(Icons.brightness_auto, size: 18),
-                      tooltip: 'System',
+                      icon: const Icon(Icons.brightness_auto, size: 18),
+                      tooltip: l.settingsThemeSystem,
                     ),
                     ButtonSegment(
                       value: ThemeMode.dark,
-                      icon: Icon(Icons.dark_mode, size: 18),
-                      tooltip: 'Dark',
+                      icon: const Icon(Icons.dark_mode, size: 18),
+                      tooltip: l.settingsThemeDark,
                     ),
                   ],
                   selected: {themeProvider.themeMode},
-                  onSelectionChanged: (modes) => themeProvider.setThemeMode(modes.first),
+                  onSelectionChanged: (modes) =>
+                      themeProvider.setThemeMode(modes.first),
                   showSelectedIcon: false,
                 ),
               );
@@ -573,11 +715,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
           const Divider(),
 
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
             child: Text(
-              'Connection',
-              style: TextStyle(
+              l.settingsSectionConnection,
+              style: const TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.bold,
                 color: Colors.grey,
@@ -587,11 +729,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
           ListTile(
             leading: const Icon(Icons.http_outlined),
-            title: const Text('Custom proxy headers'),
+            title: Text(l.settingsProxyHeadersTileTitle),
             subtitle: Text(
               _customHeaders.isEmpty
-                  ? 'Optional headers for a reverse proxy or auth gateway'
-                  : '${_customHeaders.length} configured',
+                  ? l.settingsProxyHeadersTileSubtitleEmpty
+                  : l.settingsProxyHeadersTileSubtitleCount(_customHeaders.length),
             ),
             onTap: _showCustomHeadersDialog,
           ),
@@ -599,11 +741,11 @@ class _SettingsScreenState extends State<SettingsScreen> {
           const Divider(),
 
           // Data Management Section
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
             child: Text(
-              'Data Management',
-              style: TextStyle(
+              l.settingsSectionDataManagement,
+              style: const TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.bold,
                 color: Colors.grey,
@@ -614,43 +756,57 @@ class _SettingsScreenState extends State<SettingsScreen> {
           // Clear local data button
           ListTile(
             leading: const Icon(Icons.delete_outline),
-            title: const Text('Clear Local Data'),
-            subtitle: const Text('Remove all cached transactions and accounts'),
-            onTap: () => _handleClearLocalData(context),
+            title: Text(l.settingsClearDataTitle),
+            subtitle: Text(l.settingsClearDataTileSubtitle),
+            trailing: _activeDestructiveAction == _clearAction
+                ? const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2))
+                : null,
+            enabled: _activeDestructiveAction == null,
+            onTap: _activeDestructiveAction != null
+                ? null
+                : () => _handleClearLocalData(context),
           ),
 
-          if (_biometricSupported) ...[
-            const Divider(),
-
-            const Padding(
-              padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
-              child: Text(
-                'Security',
-                style: TextStyle(
-                  fontSize: 14,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.grey,
-                ),
+          const Divider(),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
+            child: Text(
+              l.settingsSectionSecurity,
+              style: const TextStyle(
+                fontSize: 14,
+                fontWeight: FontWeight.bold,
+                color: Colors.grey,
               ),
             ),
-
+          ),
+          SwitchListTile(
+            secondary: const Icon(Icons.visibility_off_outlined),
+            title: Text(l.settingsPrivacyHideAmountsLabel),
+            subtitle: Text(l.settingsPrivacyHideAmountsContent),
+            value: context.watch<PrivacyProvider>().hidden,
+            onChanged: (value) =>
+                context.read<PrivacyProvider>().setHidden(value),
+          ),
+          if (_biometricSupported)
             SwitchListTile(
               secondary: const Icon(Icons.fingerprint),
-              title: const Text('Biometric Lock'),
-              subtitle: const Text('Require biometric authentication when resuming the app'),
+              title: Text(l.settingsBiometricLabel),
+              subtitle: Text(l.settingsBiometricEnableContent),
               value: _biometricEnabled,
               onChanged: _isTogglingBiometric ? null : _toggleBiometric,
             ),
-          ],
 
           const Divider(),
 
           // Danger Zone Section
-          const Padding(
-            padding: EdgeInsets.fromLTRB(16, 16, 16, 8),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
             child: Text(
-              'Danger Zone',
-              style: TextStyle(
+              l.settingsSectionDangerZone,
+              style: const TextStyle(
                 fontSize: 14,
                 fontWeight: FontWeight.bold,
                 color: Colors.red,
@@ -660,28 +816,34 @@ class _SettingsScreenState extends State<SettingsScreen> {
 
           ListTile(
             leading: const Icon(Icons.restart_alt, color: Colors.red),
-            title: const Text('Reset Account'),
-            subtitle: const Text(
-              'Delete all accounts, categories, merchants, and tags but keep your user account',
-            ),
-            trailing: _isResettingAccount
-                ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2))
+            title: Text(l.settingsResetAccount),
+            subtitle: Text(l.settingsResetAccountTileSubtitle),
+            trailing: _activeDestructiveAction == _resetAction
+                ? const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2))
                 : null,
-            enabled: !_isResettingAccount && !_isDeletingAccount,
-            onTap: _isResettingAccount || _isDeletingAccount ? null : () => _handleResetAccount(context),
+            enabled: _activeDestructiveAction == null,
+            onTap: _activeDestructiveAction != null
+                ? null
+                : () => _handleResetAccount(context),
           ),
 
           ListTile(
             leading: const Icon(Icons.delete_forever, color: Colors.red),
-            title: const Text('Delete Account'),
-            subtitle: const Text(
-              'Permanently remove all your data. This cannot be undone.',
-            ),
-            trailing: _isDeletingAccount
-                ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2))
+            title: Text(l.settingsDeleteAccount),
+            subtitle: Text(l.settingsDeleteAccountTileSubtitle),
+            trailing: _activeDestructiveAction == _deleteAction
+                ? const SizedBox(
+                    width: 20,
+                    height: 20,
+                    child: CircularProgressIndicator(strokeWidth: 2))
                 : null,
-            enabled: !_isDeletingAccount && !_isResettingAccount,
-            onTap: _isDeletingAccount || _isResettingAccount ? null : () => _handleDeleteAccount(context),
+            enabled: _activeDestructiveAction == null,
+            onTap: _activeDestructiveAction != null
+                ? null
+                : () => _handleDeleteAccount(context),
           ),
 
           const Divider(),
@@ -692,7 +854,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             child: ElevatedButton.icon(
               onPressed: () => _handleLogout(context),
               icon: const Icon(Icons.logout),
-              label: const Text('Sign Out'),
+              label: Text(l.settingsSignOut),
               style: ElevatedButton.styleFrom(
                 backgroundColor: colorScheme.error,
                 foregroundColor: colorScheme.onError,
diff --git a/mobile/lib/screens/sso_onboarding_screen.dart b/mobile/lib/screens/sso_onboarding_screen.dart
index 3fee35077..6c26ccfe8 100644
--- a/mobile/lib/screens/sso_onboarding_screen.dart
+++ b/mobile/lib/screens/sso_onboarding_screen.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import '../providers/auth_provider.dart';
+import '../l10n/app_localizations.dart';
 
 class SsoOnboardingScreen extends StatefulWidget {
   const SsoOnboardingScreen({super.key});
@@ -71,7 +72,7 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                 .cancelSsoOnboarding();
           },
         ),
-        title: const Text('Link Your Account'),
+        title: Text(AppLocalizations.of(context).ssoOnboardingTitle),
       ),
       body: SafeArea(
         child: SingleChildScrollView(
@@ -90,8 +91,10 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                   const SizedBox(height: 16),
                   Text(
                     authProvider.ssoEmail != null
-                        ? 'Signed in as ${authProvider.ssoEmail}'
-                        : 'Google account verified',
+                        ? AppLocalizations.of(context)
+                            .ssoOnboardingSignedInAs(authProvider.ssoEmail!)
+                        : AppLocalizations.of(context)
+                            .ssoOnboardingGoogleVerified,
                     textAlign: TextAlign.center,
                     style: Theme.of(context).textTheme.bodyLarge?.copyWith(
                           color: colorScheme.onSurfaceVariant,
@@ -140,7 +143,7 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                         children: [
                           Expanded(
                             child: _TabButton(
-                              label: 'Link Existing',
+                              label: AppLocalizations.of(context).ssoOnboardingTabLink,
                               isSelected: _showLinkForm,
                               onTap: () =>
                                   setState(() => _showLinkForm = true),
@@ -149,8 +152,8 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                           Expanded(
                             child: _TabButton(
                               label: authProvider.ssoHasPendingInvitation
-                                  ? 'Accept Invitation'
-                                  : 'Create New',
+                                  ? AppLocalizations.of(context).ssoOnboardingAcceptInvitation
+                                  : AppLocalizations.of(context).ssoOnboardingTabCreate,
                               isSelected: !_showLinkForm,
                               onTap: () =>
                                   setState(() => _showLinkForm = false),
@@ -195,7 +198,8 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                 const SizedBox(width: 12),
                 Expanded(
                   child: Text(
-                    'Enter your existing account credentials to link with Google Sign-In.',
+                    AppLocalizations.of(context)
+                        .ssoOnboardingLinkCredentialsNote,
                     style: TextStyle(color: colorScheme.onSurface),
                   ),
                 ),
@@ -208,13 +212,13 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
             keyboardType: TextInputType.emailAddress,
             autocorrect: false,
             textInputAction: TextInputAction.next,
-            decoration: const InputDecoration(
-              labelText: 'Email',
-              prefixIcon: Icon(Icons.email_outlined),
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).loginEmailLabel,
+              prefixIcon: const Icon(Icons.email_outlined),
             ),
             validator: (value) {
-              if (value == null || value.isEmpty) return 'Please enter your email';
-              if (!value.contains('@')) return 'Please enter a valid email';
+              if (value == null || value.isEmpty) return AppLocalizations.of(context).loginEmailRequired;
+              if (!value.contains('@')) return AppLocalizations.of(context).loginEmailInvalid;
               return null;
             },
           ),
@@ -224,7 +228,7 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
             obscureText: _obscurePassword,
             textInputAction: TextInputAction.done,
             decoration: InputDecoration(
-              labelText: 'Password',
+              labelText: AppLocalizations.of(context).loginPasswordLabel,
               prefixIcon: const Icon(Icons.lock_outlined),
               suffixIcon: IconButton(
                 icon: Icon(
@@ -238,7 +242,7 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
               ),
             ),
             validator: (value) {
-              if (value == null || value.isEmpty) return 'Please enter your password';
+              if (value == null || value.isEmpty) return AppLocalizations.of(context).loginPasswordRequired;
               return null;
             },
             onFieldSubmitted: (_) => _handleLinkAccount(),
@@ -252,7 +256,7 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                     width: 20,
                     child: CircularProgressIndicator(strokeWidth: 2),
                   )
-                : const Text('Link Account'),
+                : Text(AppLocalizations.of(context).ssoOnboardingLinkButton),
           ),
         ],
       ),
@@ -282,8 +286,10 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                 Expanded(
                   child: Text(
                     hasPendingInvitation
-                        ? 'You have a pending invitation. Accept it to join an existing household.'
-                        : 'Create a new account using your Google identity.',
+                        ? AppLocalizations.of(context)
+                            .ssoOnboardingPendingInvitationNote
+                        : AppLocalizations.of(context)
+                            .ssoOnboardingCreateIdentityNote,
                     style: TextStyle(color: colorScheme.onSurface),
                   ),
                 ),
@@ -294,12 +300,12 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
           TextFormField(
             controller: _firstNameController,
             textInputAction: TextInputAction.next,
-            decoration: const InputDecoration(
-              labelText: 'First Name',
-              prefixIcon: Icon(Icons.person_outlined),
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).ssoOnboardingFirstNameLabel,
+              prefixIcon: const Icon(Icons.person_outlined),
             ),
             validator: (value) {
-              if (value == null || value.isEmpty) return 'Please enter your first name';
+              if (value == null || value.isEmpty) return AppLocalizations.of(context).ssoOnboardingFirstNameRequired;
               return null;
             },
           ),
@@ -307,12 +313,12 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
           TextFormField(
             controller: _lastNameController,
             textInputAction: TextInputAction.done,
-            decoration: const InputDecoration(
-              labelText: 'Last Name',
-              prefixIcon: Icon(Icons.person_outlined),
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).ssoOnboardingLastNameLabel,
+              prefixIcon: const Icon(Icons.person_outlined),
             ),
             validator: (value) {
-              if (value == null || value.isEmpty) return 'Please enter your last name';
+              if (value == null || value.isEmpty) return AppLocalizations.of(context).ssoOnboardingLastNameRequired;
               return null;
             },
             onFieldSubmitted: (_) => _handleCreateAccount(),
@@ -327,8 +333,8 @@ class _SsoOnboardingScreenState extends State<SsoOnboardingScreen> {
                     child: CircularProgressIndicator(strokeWidth: 2),
                   )
                 : Text(hasPendingInvitation
-                        ? 'Accept Invitation'
-                        : 'Create Account'),
+                        ? AppLocalizations.of(context).ssoOnboardingAcceptInvitation
+                        : AppLocalizations.of(context).ssoOnboardingCreateButton),
           ),
         ],
       ),
diff --git a/mobile/lib/screens/transaction_edit_screen.dart b/mobile/lib/screens/transaction_edit_screen.dart
new file mode 100644
index 000000000..97da47f6a
--- /dev/null
+++ b/mobile/lib/screens/transaction_edit_screen.dart
@@ -0,0 +1,428 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import '../models/category.dart' as models;
+import '../models/merchant.dart';
+import '../models/offline_transaction.dart';
+import '../models/transaction_tag.dart';
+import '../providers/auth_provider.dart';
+import '../providers/categories_provider.dart';
+import '../providers/merchants_provider.dart';
+import '../providers/tags_provider.dart';
+import '../providers/transactions_provider.dart';
+import '../l10n/app_localizations.dart';
+
+class TransactionEditScreen extends StatefulWidget {
+  final OfflineTransaction transaction;
+
+  const TransactionEditScreen({super.key, required this.transaction});
+
+  @override
+  State<TransactionEditScreen> createState() => _TransactionEditScreenState();
+}
+
+class _TransactionEditScreenState extends State<TransactionEditScreen> {
+  static const _maxNameLength = 255;
+  static const _maxNotesLength = 2000;
+
+  final _formKey = GlobalKey<FormState>();
+  late final TextEditingController _nameController;
+  late final TextEditingController _notesController;
+  String? _selectedCategoryId;
+  String? _selectedMerchantId;
+  late Set<String> _selectedTagIds;
+  bool _isSaving = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _nameController = TextEditingController(text: widget.transaction.name);
+    _notesController = TextEditingController(
+      text: widget.transaction.notes ?? '',
+    );
+    _selectedCategoryId = widget.transaction.categoryId;
+    _selectedMerchantId = widget.transaction.merchantId;
+    _selectedTagIds = widget.transaction.tagIds.toSet();
+    WidgetsBinding.instance.addPostFrameCallback((_) => _loadMetadata());
+  }
+
+  @override
+  void dispose() {
+    _nameController.dispose();
+    _notesController.dispose();
+    super.dispose();
+  }
+
+  Future<void> _loadMetadata() async {
+    final authProvider = Provider.of<AuthProvider>(context, listen: false);
+    final categoriesProvider = Provider.of<CategoriesProvider>(
+      context,
+      listen: false,
+    );
+    final merchantsProvider = Provider.of<MerchantsProvider>(
+      context,
+      listen: false,
+    );
+    final tagsProvider = Provider.of<TagsProvider>(context, listen: false);
+    final accessToken = await authProvider.getValidAccessToken();
+    if (accessToken == null || !mounted) return;
+
+    try {
+      await Future.wait([
+        categoriesProvider.fetchCategories(accessToken: accessToken),
+        merchantsProvider.fetchMerchants(accessToken: accessToken),
+        tagsProvider.fetchTags(accessToken: accessToken),
+      ]);
+    } catch (_) {
+      // Providers expose their own error state; avoid an uncaught async error.
+    }
+  }
+
+  Future<void> _save() async {
+    final l = AppLocalizations.of(context);
+    if (!_formKey.currentState!.validate() || widget.transaction.id == null) {
+      return;
+    }
+
+    setState(() {
+      _isSaving = true;
+    });
+
+    final authProvider = Provider.of<AuthProvider>(context, listen: false);
+    final transactionsProvider = Provider.of<TransactionsProvider>(
+      context,
+      listen: false,
+    );
+    final accessToken = await authProvider.getValidAccessToken();
+
+    if (accessToken == null) {
+      if (!mounted) return;
+
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(
+          content: Text(l.transactionEditSessionExpired),
+          backgroundColor: Colors.red,
+        ),
+      );
+      setState(() {
+        _isSaving = false;
+      });
+      return;
+    }
+
+    // Empty notes intentionally clear the server-side note.
+    final notesText = _notesController.text.trim();
+
+    final success = await transactionsProvider.updateTransaction(
+      accessToken: accessToken,
+      transaction: widget.transaction,
+      name: _nameController.text.trim(),
+      notes: notesText,
+      categoryId: _selectedCategoryId,
+      merchantId: _selectedMerchantId,
+      tagIds: _selectedTagIds.toList(),
+    );
+
+    if (!mounted) return;
+
+    setState(() {
+      _isSaving = false;
+    });
+
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(
+        content: Text(
+          success
+              ? l.transactionEditUpdated
+              : transactionsProvider.error ?? l.transactionEditUpdateFailed,
+        ),
+        backgroundColor: success ? Colors.green : Colors.red,
+      ),
+    );
+
+    if (success) {
+      Navigator.pop(context, true);
+    }
+  }
+
+  String? _validateName(String? value) {
+    final l = AppLocalizations.of(context);
+    if (value == null || value.trim().isEmpty) {
+      return l.transactionEditNameRequired;
+    }
+
+    if (value.trim().length > _maxNameLength) {
+      return l.transactionEditNameMaxLength(_maxNameLength);
+    }
+
+    if (_containsControlCharacter(value)) {
+      return l.transactionEditNameInvalidChars;
+    }
+
+    return null;
+  }
+
+  String? _validateNotes(String? value) {
+    final l = AppLocalizations.of(context);
+    if (value == null || value.trim().isEmpty) {
+      return null;
+    }
+
+    if (value.trim().length > _maxNotesLength) {
+      return l.transactionEditNotesMaxLength(_maxNotesLength);
+    }
+
+    if (_containsControlCharacter(value, allowWhitespace: true)) {
+      return l.transactionEditNotesInvalidChars;
+    }
+
+    return null;
+  }
+
+  bool _containsControlCharacter(
+    String value, {
+    bool allowWhitespace = false,
+  }) {
+    for (final codeUnit in value.codeUnits) {
+      if (codeUnit == 127) return true;
+      if (codeUnit < 32) {
+        final allowedWhitespace = allowWhitespace &&
+            (codeUnit == 9 || codeUnit == 10 || codeUnit == 13);
+        if (!allowedWhitespace) return true;
+      }
+    }
+
+    return false;
+  }
+
+  List<DropdownMenuItem<String?>> _categoryItems(
+    List<models.Category> categories,
+  ) {
+    final l = AppLocalizations.of(context);
+    final items = <DropdownMenuItem<String?>>[];
+    if (_selectedCategoryId == null) {
+      items.add(
+        DropdownMenuItem<String?>(
+          value: null,
+          child: Text(l.transactionEditNoCategory),
+        ),
+      );
+    }
+
+    final hasCurrent = _selectedCategoryId == null ||
+        categories.any((category) => category.id == _selectedCategoryId);
+    if (!hasCurrent) {
+      items.add(
+        DropdownMenuItem<String?>(
+          value: _selectedCategoryId,
+          child: Text(widget.transaction.categoryName ?? l.transactionEditCurrentCategory),
+        ),
+      );
+    }
+
+    items.addAll(
+      categories.map((category) {
+        return DropdownMenuItem<String?>(
+          value: category.id,
+          child: Text(category.displayName),
+        );
+      }),
+    );
+
+    return items;
+  }
+
+  List<DropdownMenuItem<String?>> _merchantItems(List<Merchant> merchants) {
+    final l = AppLocalizations.of(context);
+    final items = <DropdownMenuItem<String?>>[];
+    if (_selectedMerchantId == null) {
+      items.add(
+        DropdownMenuItem<String?>(
+          value: null,
+          child: Text(l.transactionEditNoMerchant),
+        ),
+      );
+    }
+
+    final hasCurrent = _selectedMerchantId == null ||
+        merchants.any((merchant) => merchant.id == _selectedMerchantId);
+    if (!hasCurrent) {
+      items.add(
+        DropdownMenuItem<String?>(
+          value: _selectedMerchantId,
+          child: Text(widget.transaction.merchantName ?? l.transactionEditCurrentMerchant),
+        ),
+      );
+    }
+
+    items.addAll(
+      merchants.map((merchant) {
+        return DropdownMenuItem<String?>(
+          value: merchant.id,
+          child: Text(merchant.name),
+        );
+      }),
+    );
+
+    return items;
+  }
+
+  Widget _buildTags(List<TransactionTag> tags, {required bool enabled}) {
+    final l = AppLocalizations.of(context);
+    if (tags.isEmpty && _selectedTagIds.isEmpty) {
+      return Text(l.transactionEditNoTags);
+    }
+
+    final tagById = {for (final tag in tags) tag.id: tag};
+    final combinedTags = [...tags];
+    for (final selectedId in _selectedTagIds) {
+      if (!tagById.containsKey(selectedId)) {
+        final nameIndex = widget.transaction.tagIds.indexOf(selectedId);
+        final fallbackName =
+            nameIndex >= 0 && nameIndex < widget.transaction.tagNames.length
+                ? widget.transaction.tagNames[nameIndex]
+                : '';
+        combinedTags.add(
+          TransactionTag(
+            id: selectedId,
+            name: fallbackName.isNotEmpty ? fallbackName : l.transactionEditUnknownTag,
+          ),
+        );
+      }
+    }
+
+    return Wrap(
+      spacing: 8,
+      runSpacing: 8,
+      children: combinedTags.map((tag) {
+        final selected = _selectedTagIds.contains(tag.id);
+        return FilterChip(
+          label: Text(tag.name),
+          selected: selected,
+          onSelected: enabled
+              ? (value) {
+                  setState(() {
+                    if (value) {
+                      _selectedTagIds.add(tag.id);
+                    } else {
+                      _selectedTagIds.remove(tag.id);
+                    }
+                  });
+                }
+              : null,
+        );
+      }).toList(),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final canEdit = widget.transaction.id != null &&
+        widget.transaction.syncStatus == SyncStatus.synced;
+
+    final l = AppLocalizations.of(context);
+
+    return Scaffold(
+      appBar: AppBar(title: Text(l.transactionEditTitle)),
+      body: Form(
+        key: _formKey,
+        child: ListView(
+          padding: const EdgeInsets.all(16),
+          children: [
+            if (!canEdit) ...[
+              Card(
+                color: colorScheme.errorContainer,
+                child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Text(
+                    l.transactionEditSyncedOnly,
+                    style: TextStyle(color: colorScheme.onErrorContainer),
+                  ),
+                ),
+              ),
+              const SizedBox(height: 16),
+            ],
+            TextFormField(
+              controller: _nameController,
+              enabled: canEdit && !_isSaving,
+              validator: _validateName,
+              maxLength: _maxNameLength,
+              decoration: InputDecoration(
+                labelText: l.transactionEditNameLabel,
+                prefixIcon: const Icon(Icons.label),
+              ),
+            ),
+            const SizedBox(height: 16),
+            TextFormField(
+              controller: _notesController,
+              enabled: canEdit && !_isSaving,
+              validator: _validateNotes,
+              maxLength: _maxNotesLength,
+              minLines: 2,
+              maxLines: 4,
+              decoration: InputDecoration(
+                labelText: l.transactionEditNotesLabel,
+                prefixIcon: const Icon(Icons.notes),
+              ),
+            ),
+            const SizedBox(height: 16),
+            Consumer<CategoriesProvider>(
+              builder: (context, categoriesProvider, _) {
+                return DropdownButtonFormField<String?>(
+                  value: _selectedCategoryId,
+                  decoration: InputDecoration(
+                    labelText: l.transactionEditCategoryLabel,
+                    prefixIcon: const Icon(Icons.category),
+                    helperText: l.transactionEditCategoryHelper,
+                  ),
+                  isExpanded: true,
+                  items: _categoryItems(categoriesProvider.categories),
+                  onChanged: canEdit && !_isSaving
+                      ? (value) => setState(() => _selectedCategoryId = value)
+                      : null,
+                );
+              },
+            ),
+            const SizedBox(height: 16),
+            Consumer<MerchantsProvider>(
+              builder: (context, merchantsProvider, _) {
+                return DropdownButtonFormField<String?>(
+                  value: _selectedMerchantId,
+                  decoration: InputDecoration(
+                    labelText: l.transactionEditMerchantLabel,
+                    prefixIcon: const Icon(Icons.storefront),
+                    helperText: l.transactionEditMerchantHelper,
+                  ),
+                  isExpanded: true,
+                  items: _merchantItems(merchantsProvider.merchants),
+                  onChanged: canEdit && !_isSaving
+                      ? (value) => setState(() => _selectedMerchantId = value)
+                      : null,
+                );
+              },
+            ),
+            const SizedBox(height: 24),
+            Text(l.transactionEditTagsLabel, style: Theme.of(context).textTheme.titleMedium),
+            const SizedBox(height: 8),
+            Consumer<TagsProvider>(
+              builder: (context, tagsProvider, _) =>
+                  _buildTags(tagsProvider.tags, enabled: canEdit && !_isSaving),
+            ),
+            const SizedBox(height: 32),
+            ElevatedButton.icon(
+              onPressed: canEdit && !_isSaving ? _save : null,
+              icon: _isSaving
+                  ? const SizedBox(
+                      width: 20,
+                      height: 20,
+                      child: CircularProgressIndicator(strokeWidth: 2),
+                    )
+                  : const Icon(Icons.save),
+              label: Text(_isSaving ? l.transactionEditSaving : l.commonSave),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/screens/transaction_form_screen.dart b/mobile/lib/screens/transaction_form_screen.dart
index d5513615b..c3728ef81 100644
--- a/mobile/lib/screens/transaction_form_screen.dart
+++ b/mobile/lib/screens/transaction_form_screen.dart
@@ -5,17 +5,19 @@ import '../models/account.dart';
 import '../models/category.dart' as models;
 import '../providers/auth_provider.dart';
 import '../providers/categories_provider.dart';
+import '../providers/privacy_provider.dart';
 import '../providers/transactions_provider.dart';
 import '../services/log_service.dart';
 import '../services/connectivity_service.dart';
+import '../utils/amount_parser.dart';
+import '../utils/money_masker.dart';
+import '../widgets/sure_segmented_control.dart';
+import '../l10n/app_localizations.dart';
 
 class TransactionFormScreen extends StatefulWidget {
   final Account account;
 
-  const TransactionFormScreen({
-    super.key,
-    required this.account,
-  });
+  const TransactionFormScreen({super.key, required this.account});
 
   @override
   State<TransactionFormScreen> createState() => _TransactionFormScreenState();
@@ -46,7 +48,10 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
 
   Future<void> _fetchCategories() async {
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
-    final categoriesProvider = Provider.of<CategoriesProvider>(context, listen: false);
+    final categoriesProvider = Provider.of<CategoriesProvider>(
+      context,
+      listen: false,
+    );
     final accessToken = await authProvider.getValidAccessToken();
     if (accessToken != null) {
       categoriesProvider.fetchCategories(accessToken: accessToken);
@@ -62,22 +67,30 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
   }
 
   String? _validateAmount(String? value) {
+    final l = AppLocalizations.of(context);
     if (value == null || value.trim().isEmpty) {
-      return 'Please enter an amount';
+      return l.transactionFormAmountRequiredPrompt;
     }
 
-    final amount = double.tryParse(value.trim());
-    if (amount == null) {
-      return 'Please enter a valid number';
+    final double amount;
+    try {
+      amount = AmountParser.parse(value, locale: _currentLocaleName()).value;
+    } on FormatException {
+      return l.transactionFormAmountInvalidNumber;
     }
 
     if (amount <= 0) {
-      return 'Amount must be greater than 0';
+      return l.transactionFormAmountTooSmall;
     }
 
     return null;
   }
 
+  String _currentLocaleName() {
+    return Localizations.maybeLocaleOf(context)?.toString() ??
+        Intl.getCurrentLocale();
+  }
+
   Future<void> _selectDate() async {
     final DateTime? picked = await showDatePicker(
       context: context,
@@ -104,17 +117,25 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
 
     _log.info('TransactionForm', 'Starting transaction creation...');
 
+    final l = AppLocalizations.of(context);
+
     try {
       final authProvider = Provider.of<AuthProvider>(context, listen: false);
-      final transactionsProvider = Provider.of<TransactionsProvider>(context, listen: false);
+      final transactionsProvider = Provider.of<TransactionsProvider>(
+        context,
+        listen: false,
+      );
       final accessToken = await authProvider.getValidAccessToken();
 
       if (accessToken == null) {
-        _log.warning('TransactionForm', 'Access token is null, session expired');
+        _log.warning(
+          'TransactionForm',
+          'Access token is null, session expired',
+        );
         if (mounted) {
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Session expired. Please login again.'),
+            SnackBar(
+              content: Text(l.transactionFormSessionExpired),
               backgroundColor: Colors.red,
             ),
           );
@@ -126,8 +147,15 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
       // Convert date format from yyyy/MM/dd to yyyy-MM-dd
       final parsedDate = DateFormat('yyyy/MM/dd').parse(_dateController.text);
       final apiDate = DateFormat('yyyy-MM-dd').format(parsedDate);
+      final canonicalAmount = AmountParser.canonicalize(
+        _amountController.text,
+        locale: _currentLocaleName(),
+      );
 
-      _log.info('TransactionForm', 'Calling TransactionsProvider.createTransaction (offline-first)');
+      _log.info(
+        'TransactionForm',
+        'Calling TransactionsProvider.createTransaction (offline-first)',
+      );
 
       // Use TransactionsProvider for offline-first transaction creation
       final success = await transactionsProvider.createTransaction(
@@ -135,7 +163,7 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
         accountId: widget.account.id,
         name: _nameController.text.trim(),
         date: apiDate,
-        amount: _amountController.text.trim(),
+        amount: canonicalAmount,
         currency: widget.account.currency,
         nature: _nature,
         notes: 'This transaction via mobile app.',
@@ -145,18 +173,24 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
 
       if (mounted) {
         if (success) {
-          _log.info('TransactionForm', 'Transaction created successfully (saved locally)');
-          
+          _log.info(
+            'TransactionForm',
+            'Transaction created successfully (saved locally)',
+          );
+
           // Check current connectivity status to show appropriate message
-          final connectivityService = Provider.of<ConnectivityService>(context, listen: false);
+          final connectivityService = Provider.of<ConnectivityService>(
+            context,
+            listen: false,
+          );
           final isOnline = connectivityService.isOnline;
-          
+
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(
               content: Text(
                 isOnline
-                    ? 'Transaction created successfully'
-                    : 'Transaction saved (will sync when online)'
+                    ? l.transactionFormCreateSuccessOnline
+                    : l.transactionFormCreateSuccessOffline,
               ),
               backgroundColor: Colors.green,
             ),
@@ -165,19 +199,22 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
         } else {
           _log.error('TransactionForm', 'Failed to create transaction');
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Failed to create transaction'),
+            SnackBar(
+              content: Text(l.transactionFormCreateFailed),
               backgroundColor: Colors.red,
             ),
           );
         }
       }
     } catch (e) {
-      _log.error('TransactionForm', 'Exception during transaction creation: $e');
+      _log.error(
+        'TransactionForm',
+        'Exception during transaction creation: $e',
+      );
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           SnackBar(
-            content: Text('Error: ${e.toString()}'),
+            content: Text(l.transactionFormGenericError(e.toString())),
             backgroundColor: Colors.red,
           ),
         );
@@ -193,7 +230,9 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
 
     return Container(
       decoration: BoxDecoration(
@@ -223,12 +262,15 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
               ),
               // Title
               Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 24,
+                  vertical: 8,
+                ),
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Text(
-                      'New Transaction',
+                      l.transactionFormNewTitle,
                       style: Theme.of(context).textTheme.titleLarge?.copyWith(
                         fontWeight: FontWeight.bold,
                       ),
@@ -269,20 +311,28 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                                 const SizedBox(width: 12),
                                 Expanded(
                                   child: Column(
-                                    crossAxisAlignment: CrossAxisAlignment.start,
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
                                     children: [
                                       Text(
                                         widget.account.name,
-                                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                          fontWeight: FontWeight.bold,
-                                        ),
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .titleMedium
+                                            ?.copyWith(
+                                              fontWeight: FontWeight.bold,
+                                            ),
                                       ),
                                       const SizedBox(height: 4),
                                       Text(
-                                        '${widget.account.balance} ${widget.account.currency}',
-                                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                                          color: colorScheme.onSurfaceVariant,
-                                        ),
+                                        '${MoneyMasker.mask(widget.account.balance, hidden: hideAmounts)} ${widget.account.currency}',
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodyMedium
+                                            ?.copyWith(
+                                              color:
+                                                  colorScheme.onSurfaceVariant,
+                                            ),
                                       ),
                                     ],
                                   ),
@@ -295,43 +345,44 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
 
                         // Transaction type selection
                         Text(
-                          'Type',
-                          style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                            fontWeight: FontWeight.w600,
-                          ),
+                          l.transactionFormTypeLabel,
+                          style: Theme.of(context).textTheme.titleSmall
+                              ?.copyWith(fontWeight: FontWeight.w600),
                         ),
                         const SizedBox(height: 8),
-                        SegmentedButton<String>(
-                          segments: const [
-                            ButtonSegment<String>(
-                              value: 'expense',
-                              label: Text('Expense'),
-                              icon: Icon(Icons.arrow_downward),
-                            ),
-                            ButtonSegment<String>(
-                              value: 'income',
-                              label: Text('Income'),
-                              icon: Icon(Icons.arrow_upward),
-                            ),
-                          ],
-                          selected: {_nature},
-                          onSelectionChanged: (Set<String> newSelection) {
+                        SureSegmentedControl<String>(
+                          selected: _nature,
+                          onChanged: (value) {
                             setState(() {
-                              _nature = newSelection.first;
+                              _nature = value;
                             });
                           },
+                          segments: [
+                            SureSegment<String>(
+                              value: 'expense',
+                              label: l.transactionFormTypeExpense,
+                              icon: const Icon(Icons.arrow_downward),
+                            ),
+                            SureSegment<String>(
+                              value: 'income',
+                              label: l.transactionFormTypeIncome,
+                              icon: const Icon(Icons.arrow_upward),
+                            ),
+                          ],
                         ),
                         const SizedBox(height: 24),
 
                         // Amount field
                         TextFormField(
                           controller: _amountController,
-                          keyboardType: const TextInputType.numberWithOptions(decimal: true),
+                          keyboardType: const TextInputType.numberWithOptions(
+                            decimal: true,
+                          ),
                           decoration: InputDecoration(
-                            labelText: 'Amount *',
+                            labelText: '${l.transactionFormAmountLabel} *',
                             prefixIcon: const Icon(Icons.attach_money),
                             suffixText: widget.account.currency,
-                            helperText: 'Required',
+                            helperText: l.transactionFormAmountHelper,
                           ),
                           validator: _validateAmount,
                         ),
@@ -344,8 +395,16 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                               _showMoreFields = !_showMoreFields;
                             });
                           },
-                          icon: Icon(_showMoreFields ? Icons.expand_less : Icons.expand_more),
-                          label: Text(_showMoreFields ? 'Less' : 'More'),
+                          icon: Icon(
+                            _showMoreFields
+                                ? Icons.expand_less
+                                : Icons.expand_more,
+                          ),
+                          label: Text(
+                            _showMoreFields
+                                ? l.transactionFormLess
+                                : l.transactionFormMore,
+                          ),
                         ),
 
                         // Optional fields (shown when More is clicked)
@@ -356,10 +415,10 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                           TextFormField(
                             controller: _dateController,
                             readOnly: true,
-                            decoration: const InputDecoration(
-                              labelText: 'Date',
-                              prefixIcon: Icon(Icons.calendar_today),
-                              helperText: 'Optional (default: today)',
+                            decoration: InputDecoration(
+                              labelText: l.transactionFormDateLabel,
+                              prefixIcon: const Icon(Icons.calendar_today),
+                              helperText: l.transactionFormDateHelper,
                             ),
                             onTap: _selectDate,
                           ),
@@ -368,10 +427,10 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                           // Name field
                           TextFormField(
                             controller: _nameController,
-                            decoration: const InputDecoration(
-                              labelText: 'Name',
-                              prefixIcon: Icon(Icons.label),
-                              helperText: 'Optional (default: SureApp)',
+                            decoration: InputDecoration(
+                              labelText: l.transactionFormNameLabel,
+                              prefixIcon: const Icon(Icons.label),
+                              helperText: l.transactionFormNameHelper,
                             ),
                           ),
                           const SizedBox(height: 16),
@@ -380,12 +439,14 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                           Consumer<CategoriesProvider>(
                             builder: (context, categoriesProvider, _) {
                               if (categoriesProvider.isLoading) {
-                                return const InputDecorator(
+                                return InputDecorator(
                                   decoration: InputDecoration(
-                                    labelText: 'Category',
-                                    prefixIcon: Icon(Icons.category),
+                                    labelText: l.transactionFormCategoryLabel,
+                                    prefixIcon: const Icon(Icons.category),
+                                  ),
+                                  child: Text(
+                                    l.transactionFormCategoryLoading,
                                   ),
-                                  child: Text('Loading categories...'),
                                 );
                               }
 
@@ -393,16 +454,16 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
 
                               return DropdownButtonFormField<String?>(
                                 value: _selectedCategory?.id,
-                                decoration: const InputDecoration(
-                                  labelText: 'Category',
-                                  prefixIcon: Icon(Icons.category),
-                                  helperText: 'Optional',
+                                decoration: InputDecoration(
+                                  labelText: l.transactionFormCategoryLabel,
+                                  prefixIcon: const Icon(Icons.category),
+                                  helperText: l.transactionFormCategoryHelper,
                                 ),
                                 isExpanded: true,
                                 items: [
-                                  const DropdownMenuItem<String?>(
+                                  DropdownMenuItem<String?>(
                                     value: null,
-                                    child: Text('No category'),
+                                    child: Text(l.transactionFormNoCategory),
                                   ),
                                   ...categories.map((category) {
                                     return DropdownMenuItem<String?>(
@@ -416,8 +477,9 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                                     if (value == null) {
                                       _selectedCategory = null;
                                     } else {
-                                      _selectedCategory = categories
-                                          .firstWhere((c) => c.id == value);
+                                      _selectedCategory = categories.firstWhere(
+                                        (c) => c.id == value,
+                                      );
                                     }
                                   });
                                 },
@@ -439,7 +501,7 @@ class _TransactionFormScreenState extends State<TransactionFormScreen> {
                                     strokeWidth: 2,
                                   ),
                                 )
-                              : const Text('Create Transaction'),
+                              : Text(l.transactionFormCreateButton),
                         ),
                       ],
                     ),
diff --git a/mobile/lib/screens/transactions_list_screen.dart b/mobile/lib/screens/transactions_list_screen.dart
index 0aa6ab131..1aa156345 100644
--- a/mobile/lib/screens/transactions_list_screen.dart
+++ b/mobile/lib/screens/transactions_list_screen.dart
@@ -6,10 +6,18 @@ import '../models/offline_transaction.dart';
 import '../providers/auth_provider.dart';
 import '../providers/categories_provider.dart';
 import '../providers/transactions_provider.dart';
+import '../screens/transaction_edit_screen.dart';
 import '../screens/transaction_form_screen.dart';
+import '../widgets/account_detail_header.dart';
 import '../widgets/category_filter.dart';
 import '../widgets/sync_status_badge.dart';
 import '../services/log_service.dart';
+import '../theme/sure_tokens.dart';
+import '../providers/privacy_provider.dart';
+import '../utils/amount_parser.dart';
+import '../utils/money_masker.dart';
+import '../widgets/money_text.dart';
+import '../l10n/app_localizations.dart';
 
 class TransactionsListScreen extends StatefulWidget {
   final Account account;
@@ -39,56 +47,39 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
   // Amount is a currency-formatted string returned by the API (e.g. may include
   // currency symbol, grouping separators, locale-dependent decimal separator,
   // and a sign either before or after the symbol)
-  Map<String, dynamic> _getAmountDisplayInfo(String amount, bool isAsset) {
+  Map<String, dynamic> _getAmountDisplayInfo(
+    String amount,
+    bool isAsset,
+    bool isLiability,
+  ) {
     try {
-      // Trim whitespace
-      String trimmedAmount = amount.trim();
+      final parsed = AmountParser.parse(amount);
+      var numericValue = parsed.value;
 
-      // Normalize common minus characters (U+002D HYPHEN-MINUS, U+2212 MINUS SIGN)
-      trimmedAmount = trimmedAmount.replaceAll('\u2212', '-');
-
-      // Detect if the amount has a negative sign (leading or trailing)
-      bool hasNegativeSign = trimmedAmount.startsWith('-') || trimmedAmount.endsWith('-');
-
-      // Remove all non-numeric characters except decimal point and minus sign
-      String numericString = trimmedAmount.replaceAll(RegExp(r'[^\d.\-]'), '');
-
-      // Parse the numeric value
-      double numericValue = double.tryParse(numericString.replaceAll('-', '')) ?? 0.0;
-
-      // Apply the sign from the string
-      if (hasNegativeSign) {
-        numericValue = -numericValue;
-      }
-
-      // For asset accounts, flip the sign to match accounting conventions
-      if (isAsset) {
+      // For asset and liability accounts, flip the sign to match accounting conventions
+      if (isAsset || isLiability) {
         numericValue = -numericValue;
       }
 
       // Determine if the final value is positive
       bool isPositive = numericValue >= 0;
-
-      // Get the display amount by removing the sign and currency symbols
-      String displayAmount = trimmedAmount
-          .replaceAll('-', '')
-          .replaceAll('\u2212', '')
-          .trim();
+      final trend = isPositive ? MoneyTrend.inflow : MoneyTrend.outflow;
 
       return {
         'isPositive': isPositive,
-        'displayAmount': displayAmount,
-        'color': isPositive ? Colors.green : Colors.red,
+        'displayAmount': parsed.displayText,
+        'trend': trend,
+        'color': SureMoney.color(context, trend),
         'icon': isPositive ? Icons.arrow_upward : Icons.arrow_downward,
         'prefix': isPositive ? '' : '-',
       };
-    } catch (e) {
-      // Fallback if parsing fails - log and return neutral state
-      LogService.instance.error('TransactionsListScreen', 'Failed to parse amount "$amount": $e');
+    } on FormatException {
+      LogService.instance.error('TransactionsListScreen', 'Failed to parse transaction amount');
       return {
         'isPositive': true,
         'displayAmount': amount,
-        'color': Colors.grey,
+        'trend': MoneyTrend.neutral,
+        'color': SureMoney.color(context, MoneyTrend.neutral),
         'icon': Icons.help_outline,
         'prefix': '',
       };
@@ -128,8 +119,8 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
     if (accessToken == null) {
       if (mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
-            content: Text('Authentication failed: Please log in again'),
+          SnackBar(
+            content: Text(AppLocalizations.of(context).transactionsListAuthFailed),
             backgroundColor: Colors.red,
           ),
         );
@@ -164,28 +155,33 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
 
   Future<void> _deleteSelectedTransactions() async {
     if (_selectedTransactions.isEmpty) return;
+    final l = AppLocalizations.of(context);
 
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Delete Transactions'),
-        content: Text('Are you sure you want to delete ${_selectedTransactions.length} transaction(s)?'),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            style: TextButton.styleFrom(foregroundColor: Colors.red),
-            child: const Text('Delete'),
-          ),
-        ],
-      ),
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.transactionsListDeleteMultiTitle),
+          content: Text(dl.transactionsListDeleteMultiContent),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: Text(dl.commonCancel),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              style: TextButton.styleFrom(foregroundColor: Colors.red),
+              child: Text(dl.commonDelete),
+            ),
+          ],
+        );
+      },
     );
 
     if (confirmed != true || !mounted) return;
 
+    final count = _selectedTransactions.length;
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
     final transactionsProvider = Provider.of<TransactionsProvider>(context, listen: false);
 
@@ -200,7 +196,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
         if (success) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(
-              content: Text('Deleted ${_selectedTransactions.length} transaction(s)'),
+              content: Text(l.transactionsListDeletedMulti(count)),
               backgroundColor: Colors.green,
             ),
           );
@@ -210,8 +206,8 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
           });
         } else {
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Failed to delete transactions'),
+            SnackBar(
+              content: Text(l.transactionsListDeleteFailed),
               backgroundColor: Colors.red,
             ),
           );
@@ -221,29 +217,34 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
   }
 
   Future<void> _undoTransaction(OfflineTransaction transaction) async {
+    final l = AppLocalizations.of(context);
     final transactionsProvider = Provider.of<TransactionsProvider>(context, listen: false);
     final scaffoldMessenger = ScaffoldMessenger.of(context);
+    final isPending = transaction.syncStatus == SyncStatus.pending;
 
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Undo Transaction'),
-        content: Text(
-          transaction.syncStatus == SyncStatus.pending
-              ? 'Remove this pending transaction?'
-              : 'Restore this transaction?',
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.transactionsListUndoTitle),
+          content: Text(
+            isPending
+                ? dl.transactionsListUndoRemovePending
+                : dl.transactionsListUndoRestoreConfirm,
           ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            child: const Text('Undo'),
-          ),
-        ],
-      ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: Text(dl.commonCancel),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              child: Text(dl.commonUndo),
+            ),
+          ],
+        );
+      },
     );
 
     if (confirmed != true) return;
@@ -258,10 +259,10 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
         SnackBar(
           content: Text(
             success
-                ? (transaction.syncStatus == SyncStatus.pending
-                    ? 'Pending transaction removed'
-                    : 'Transaction restored')
-                : 'Failed to undo transaction',
+                ? (isPending
+                    ? l.transactionsListUndoPendingRemoved
+                    : l.transactionsListUndoRestored)
+                : l.transactionsListUndoFailed,
           ),
           backgroundColor: success ? Colors.green : Colors.red,
         ),
@@ -269,32 +270,49 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
     }
   }
 
+  Future<void> _editTransaction(OfflineTransaction transaction) async {
+    final updated = await Navigator.push<bool>(
+      context,
+      MaterialPageRoute(
+        builder: (context) => TransactionEditScreen(transaction: transaction),
+      ),
+    );
+
+    if (updated == true && mounted) {
+      await _loadTransactions();
+    }
+  }
+
   Future<bool> _confirmAndDeleteTransaction(Transaction transaction) async {
     if (transaction.id == null) return false;
 
     // Show confirmation dialog
-    // Capture providers before async gap
+    // Capture providers and localizations before async gap
+    final l = AppLocalizations.of(context);
     final scaffoldMessenger = ScaffoldMessenger.of(context);
     final authProvider = Provider.of<AuthProvider>(context, listen: false);
     final transactionsProvider = Provider.of<TransactionsProvider>(context, listen: false);
 
     final confirmed = await showDialog<bool>(
       context: context,
-      builder: (context) => AlertDialog(
-        title: const Text('Delete Transaction'),
-        content: Text('Are you sure you want to delete "${transaction.name}"?'),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context, false),
-            child: const Text('Cancel'),
-          ),
-          TextButton(
-            onPressed: () => Navigator.pop(context, true),
-            style: TextButton.styleFrom(foregroundColor: Colors.red),
-            child: const Text('Delete'),
-          ),
-        ],
-      ),
+      builder: (context) {
+        final dl = AppLocalizations.of(context);
+        return AlertDialog(
+          title: Text(dl.transactionsListDeleteTitle),
+          content: Text(dl.transactionsListDeleteSingleContent(transaction.name)),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(context, false),
+              child: Text(dl.commonCancel),
+            ),
+            TextButton(
+              onPressed: () => Navigator.pop(context, true),
+              style: TextButton.styleFrom(foregroundColor: Colors.red),
+              child: Text(dl.commonDelete),
+            ),
+          ],
+        );
+      },
     );
 
     if (confirmed != true) return false;
@@ -304,8 +322,8 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
 
     if (accessToken == null) {
       scaffoldMessenger.showSnackBar(
-        const SnackBar(
-          content: Text('Failed to delete: No access token'),
+        SnackBar(
+          content: Text(l.transactionsListDeleteNoToken),
           backgroundColor: Colors.red,
         ),
       );
@@ -320,7 +338,11 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
     if (mounted) {
       scaffoldMessenger.showSnackBar(
         SnackBar(
-          content: Text(success ? 'Transaction deleted' : 'Failed to delete transaction'),
+          content: Text(
+            success
+                ? l.transactionsListDeletedSuccess
+                : l.transactionsListSingleDeleteFailed,
+          ),
           backgroundColor: success ? Colors.green : Colors.red,
         ),
       );
@@ -344,7 +366,9 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     final colorScheme = Theme.of(context).colorScheme;
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
 
     return Scaffold(
       appBar: AppBar(
@@ -361,8 +385,12 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
           ),
         ],
       ),
-      body: Consumer<TransactionsProvider>(
-        builder: (context, transactionsProvider, child) {
+      body: Column(
+        children: [
+          AccountDetailHeader(account: widget.account),
+          Expanded(
+            child: Consumer<TransactionsProvider>(
+              builder: (context, transactionsProvider, child) {
           if (transactionsProvider.isLoading) {
             return const Center(child: CircularProgressIndicator());
           }
@@ -386,7 +414,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                           const SizedBox(height: 16),
                           ElevatedButton(
                             onPressed: _loadTransactions,
-                            child: const Text('Retry'),
+                            child: Text(l.transactionsListRetry),
                           ),
                         ],
                       ),
@@ -416,7 +444,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                           ),
                           const SizedBox(height: 16),
                           Text(
-                            'No transactions yet',
+                            l.transactionsListNoTransactionsYet,
                             style: TextStyle(
                               fontSize: 16,
                               color: colorScheme.onSurfaceVariant,
@@ -424,7 +452,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                           ),
                           const SizedBox(height: 8),
                           Text(
-                            'Tap + to add your first transaction',
+                            l.transactionsListEmptyAddFirst,
                             style: TextStyle(
                               fontSize: 14,
                               color: colorScheme.onSurfaceVariant.withValues(alpha: 0.7),
@@ -473,7 +501,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                             height: MediaQuery.of(context).size.height * 0.4,
                             child: Center(
                               child: Text(
-                                'No transactions match this category',
+                                l.transactionsListNoCategoryMatch,
                                 style: TextStyle(color: colorScheme.onSurfaceVariant),
                               ),
                             ),
@@ -496,6 +524,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                 final displayInfo = _getAmountDisplayInfo(
                   transaction.amount,
                   widget.account.isAsset,
+                  widget.account.isLiability,
                 );
 
                 return Dismissible(
@@ -559,7 +588,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                                         child: Text(
                                           transaction.name,
                                           style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                                fontWeight: FontWeight.w600,
+                                                fontWeight: SureTokens.weightMedium,
                                               ),
                                           overflow: TextOverflow.ellipsis,
                                         ),
@@ -581,7 +610,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                                               _getCategoryDisplayName(transaction.categoryId, transaction.categoryName) ?? '',
                                               style: Theme.of(context).textTheme.labelSmall?.copyWith(
                                                     color: colorScheme.onPrimaryContainer,
-                                                    fontWeight: FontWeight.w500,
+                                                    fontWeight: SureTokens.weightMedium,
                                                   ),
                                               overflow: TextOverflow.ellipsis,
                                             ),
@@ -597,6 +626,30 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                                           color: colorScheme.onSurfaceVariant,
                                         ),
                                   ),
+                                  if (transaction.merchantName != null ||
+                                      transaction.tagNames.isNotEmpty) ...[
+                                    const SizedBox(height: 4),
+                                    Wrap(
+                                      spacing: 6,
+                                      runSpacing: 4,
+                                      children: [
+                                        if (transaction.merchantName != null)
+                                          Chip(
+                                            label: Text(transaction.merchantName!),
+                                            visualDensity: VisualDensity.compact,
+                                          ),
+                                        ...transaction.tagNames
+                                            .where((name) => name.isNotEmpty)
+                                            .map(
+                                              (name) => Chip(
+                                                label: Text(name),
+                                                visualDensity:
+                                                    VisualDensity.compact,
+                                              ),
+                                            ),
+                                      ],
+                                    ),
+                                  ],
                                 ],
                               ),
                             ),
@@ -614,12 +667,33 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                                           compact: true,
                                         ),
                                       ),
-                                    Text(
-                                      '${displayInfo['prefix']}${displayInfo['displayAmount']}',
-                                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                            fontWeight: FontWeight.bold,
-                                            color: displayInfo['color'] as Color,
-                                          ),
+                                    if (!_isSelectionMode &&
+                                        transaction.syncStatus ==
+                                            SyncStatus.synced)
+                                      SizedBox(
+                                        width: 36,
+                                        height: 36,
+                                        child: IconButton(
+                                          icon: const Icon(Icons.edit),
+                                          tooltip: l.transactionsListEditTooltip,
+                                          visualDensity: VisualDensity.compact,
+                                          padding: EdgeInsets.zero,
+                                          onPressed: () =>
+                                              _editTransaction(transaction),
+                                        ),
+                                      ),
+                                    Flexible(
+                                      child: MoneyText(
+                                        MoneyMasker.mask(
+                                          '${displayInfo['prefix']}${displayInfo['displayAmount']}',
+                                          hidden: hideAmounts,
+                                        ),
+                                        trend: displayInfo['trend'] as MoneyTrend,
+                                        overflow: TextOverflow.ellipsis,
+                                        style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                                              fontWeight: SureTokens.weightMedium,
+                                            ),
+                                      ),
                                     ),
                                   ],
                                 ),
@@ -642,7 +716,7 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
                                         style: TextStyle(
                                           color: Colors.blue,
                                           fontSize: 11,
-                                          fontWeight: FontWeight.w600,
+                                          fontWeight: SureTokens.weightSemibold,
                                         ),
                                       ),
                                     ),
@@ -670,7 +744,10 @@ class _TransactionsListScreenState extends State<TransactionsListScreen> {
               ],
             ),
           );
-        },
+              },
+            ),
+          ),
+        ],
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: _showAddTransactionForm,
diff --git a/mobile/lib/services/account_detail_service.dart b/mobile/lib/services/account_detail_service.dart
new file mode 100644
index 000000000..378d85eff
--- /dev/null
+++ b/mobile/lib/services/account_detail_service.dart
@@ -0,0 +1,258 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+import '../models/account.dart';
+import '../models/account_balance.dart';
+import '../models/account_holding.dart';
+import '../utils/json_parsing.dart';
+import 'api_config.dart';
+import 'log_service.dart';
+
+class AccountDetailService {
+  static const int _holdingsPageSize = 100;
+
+  final http.Client _client;
+  final bool _ownsClient;
+
+  AccountDetailService({http.Client? client})
+      : _client = client ?? http.Client(),
+        _ownsClient = client == null;
+
+  void close() {
+    if (_ownsClient) {
+      _client.close();
+    }
+  }
+
+  Future<Map<String, dynamic>> getAccountDetail({
+    required String accessToken,
+    required String accountId,
+  }) async {
+    final accountPathId = Uri.encodeComponent(accountId);
+    final url =
+        Uri.parse('${ApiConfig.baseUrl}/api/v1/accounts/$accountPathId');
+
+    try {
+      final response = await _client
+          .get(url, headers: ApiConfig.getAuthHeaders(accessToken))
+          .timeout(const Duration(seconds: 30));
+
+      if (response.statusCode == 200) {
+        return {
+          'success': true,
+          'account': Account.fromJson(jsonDecode(response.body)),
+        };
+      }
+
+      return _failureFromStatus(response.statusCode, 'Failed to fetch account');
+    } catch (e) {
+      _logFailure('getAccountDetail', e);
+      return {
+        'success': false,
+        'error': 'Unable to load account details. Please try again later.',
+      };
+    }
+  }
+
+  Future<Map<String, dynamic>> getBalances({
+    required String accessToken,
+    required String accountId,
+    int perPage = 30,
+  }) async {
+    final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/balances').replace(
+      queryParameters: {
+        'account_id': accountId,
+        'per_page': perPage.toString(),
+      },
+    );
+
+    try {
+      final response = await _client
+          .get(url, headers: ApiConfig.getAuthHeaders(accessToken))
+          .timeout(const Duration(seconds: 30));
+
+      if (response.statusCode == 200) {
+        final responseData = jsonDecode(response.body) as Map<String, dynamic>;
+        final balances = (responseData['balances'] as List<dynamic>? ?? [])
+            .map(
+              (json) => AccountBalance.fromJson(json as Map<String, dynamic>),
+            )
+            .toList();
+
+        return {'success': true, 'balances': balances};
+      }
+
+      return _failureFromStatus(
+        response.statusCode,
+        'Failed to fetch balances',
+      );
+    } catch (e) {
+      _logFailure('getBalances', e);
+      return {
+        'success': false,
+        'error': 'Unable to load balance history. Please try again later.',
+      };
+    }
+  }
+
+  Future<Map<String, dynamic>> getHoldings({
+    required String accessToken,
+    required String accountId,
+    int perPage = 5,
+  }) async {
+    final displayLimit = perPage.clamp(1, _holdingsPageSize).toInt();
+
+    try {
+      final firstPage = await _getHoldingsPage(
+        accessToken: accessToken,
+        accountId: accountId,
+        page: 1,
+      );
+
+      if (!firstPage.success) {
+        return _failureFromStatus(
+          firstPage.statusCode,
+          'Failed to fetch holdings',
+        );
+      }
+
+      final currentHoldings = <AccountHolding>[];
+      DateTime? currentDate;
+      final totalPages = firstPage.totalPages < 1 ? 1 : firstPage.totalPages;
+
+      // Holdings are chronological, so the latest positions are at the end of
+      // the final page. Walk backward only until the date changes; this keeps
+      // the common case to page 1 + latest page while still handling accounts
+      // whose current positions span a page boundary.
+      for (var page = totalPages; page >= 1; page -= 1) {
+        final holdingsPage = page == 1
+            ? firstPage
+            : await _getHoldingsPage(
+                accessToken: accessToken,
+                accountId: accountId,
+                page: page,
+              );
+
+        if (!holdingsPage.success) {
+          return _failureFromStatus(
+            holdingsPage.statusCode,
+            'Failed to fetch holdings',
+          );
+        }
+
+        for (final holding in holdingsPage.holdings.reversed) {
+          currentDate ??= holding.date;
+          if (!_sameDate(holding.date, currentDate)) {
+            return {
+              'success': true,
+              'holdings': _topHoldings(currentHoldings, displayLimit),
+            };
+          }
+          currentHoldings.add(holding);
+        }
+      }
+
+      return {
+        'success': true,
+        'holdings': _topHoldings(currentHoldings, displayLimit),
+      };
+    } catch (e) {
+      _logFailure('getHoldings', e);
+      return {
+        'success': false,
+        'error': 'Unable to load holdings. Please try again later.',
+      };
+    }
+  }
+
+  Future<_HoldingsPage> _getHoldingsPage({
+    required String accessToken,
+    required String accountId,
+    required int page,
+  }) async {
+    final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/holdings').replace(
+      queryParameters: {
+        'account_id': accountId,
+        'page': page.toString(),
+        'per_page': _holdingsPageSize.toString(),
+      },
+    );
+
+    final response = await _client
+        .get(url, headers: ApiConfig.getAuthHeaders(accessToken))
+        .timeout(const Duration(seconds: 30));
+
+    if (response.statusCode != 200) {
+      return _HoldingsPage.failure(response.statusCode);
+    }
+
+    final responseData = jsonDecode(response.body) as Map<String, dynamic>;
+    final holdings = (responseData['holdings'] as List<dynamic>? ?? [])
+        .map(
+          (json) => AccountHolding.fromJson(json as Map<String, dynamic>),
+        )
+        .toList();
+    final pagination = responseData['pagination'] as Map<String, dynamic>?;
+    final totalPages = JsonParsing.parseInt(pagination?['total_pages']) ?? 1;
+
+    return _HoldingsPage.success(
+      holdings: holdings,
+      totalPages: totalPages,
+    );
+  }
+
+  List<AccountHolding> _topHoldings(
+    List<AccountHolding> holdings,
+    int displayLimit,
+  ) {
+    final sorted = holdings.toList()
+      ..sort(
+        (left, right) =>
+            _amountValue(right.amount).compareTo(_amountValue(left.amount)),
+      );
+    return sorted.take(displayLimit).toList();
+  }
+
+  double _amountValue(String amount) {
+    final numeric = amount.replaceAll(RegExp(r'[^\d.-]'), '');
+    return double.tryParse(numeric) ?? 0;
+  }
+
+  bool _sameDate(DateTime left, DateTime right) {
+    return left.year == right.year &&
+        left.month == right.month &&
+        left.day == right.day;
+  }
+
+  Map<String, dynamic> _failureFromStatus(int statusCode, String fallback) {
+    if (statusCode == 401) {
+      return {'success': false, 'error': 'unauthorized'};
+    }
+
+    return {'success': false, 'error': fallback};
+  }
+
+  void _logFailure(String operation, Object error) {
+    LogService.instance.error(
+      'AccountDetailService',
+      '$operation failed with ${error.runtimeType}',
+    );
+  }
+}
+
+class _HoldingsPage {
+  final bool success;
+  final int statusCode;
+  final List<AccountHolding> holdings;
+  final int totalPages;
+
+  _HoldingsPage.success({
+    required this.holdings,
+    required this.totalPages,
+  })  : success = true,
+        statusCode = 200;
+
+  _HoldingsPage.failure(this.statusCode)
+      : success = false,
+        holdings = const [],
+        totalPages = 1;
+}
diff --git a/mobile/lib/services/auth_service.dart b/mobile/lib/services/auth_service.dart
index e39ae6254..a0dd4b4ae 100644
--- a/mobile/lib/services/auth_service.dart
+++ b/mobile/lib/services/auth_service.dart
@@ -15,6 +15,75 @@ class AuthService {
   static const String _apiKeyKey = 'api_key';
   static const String _authModeKey = 'auth_mode';
 
+  String _responseErrorMessage(dynamic responseData, String fallback) {
+    if (responseData is! Map) return fallback;
+
+    return _messageFromErrorValue(responseData['error']) ??
+        _messageFromErrorValue(responseData['errors']) ??
+        fallback;
+  }
+
+  String? _messageFromErrorValue(Object? value) {
+    if (value == null) return null;
+
+    if (value is String) {
+      final message = value.trim();
+      return message.isEmpty ? null : message;
+    }
+
+    if (value is Iterable) {
+      final message = value
+          .map(_messageFromErrorValue)
+          .whereType<String>()
+          .where((part) => part.isNotEmpty)
+          .join(', ');
+      return message.isEmpty ? null : message;
+    }
+
+    if (value is Map) {
+      final message = value.values
+          .map(_messageFromErrorValue)
+          .whereType<String>()
+          .where((part) => part.isNotEmpty)
+          .join(', ');
+      if (message.isNotEmpty) return message;
+
+      final encoded = jsonEncode(value);
+      return encoded.isEmpty ? null : encoded;
+    }
+
+    final message = value.toString().trim();
+    return message.isEmpty ? null : message;
+  }
+
+  void _logAuthException(String operation, Object error) {
+    LogService.instance.error(
+      'AuthService',
+      '$operation failed with ${error.runtimeType}',
+    );
+  }
+
+  User? _parseResponseUser(Map<String, dynamic> responseData, String source) {
+    final rawUser = responseData['user'];
+    if (rawUser == null) return null;
+
+    _logUserPayloadShape(source, rawUser);
+    return User.fromJson(rawUser);
+  }
+
+  Future<void> _saveSession(AuthTokens tokens, User? user) async {
+    try {
+      await _saveTokens(tokens);
+      if (user != null) {
+        await _saveUser(user);
+      }
+    } catch (_) {
+      await _storage.delete(key: _tokenKey);
+      await _storage.delete(key: _userKey);
+      rethrow;
+    }
+  }
+
   Future<Map<String, dynamic>> login({
     required String email,
     required String password,
@@ -34,37 +103,34 @@ class AuthService {
         body['otp_code'] = otpCode;
       }
 
-      final response = await http.post(
-        url,
-        headers: ApiConfig.jsonHeaders(),
-        body: jsonEncode(body),
-      ).timeout(const Duration(seconds: 30));
+      final response = await http
+          .post(
+            url,
+            headers: ApiConfig.jsonHeaders(),
+            body: jsonEncode(body),
+          )
+          .timeout(const Duration(seconds: 30));
 
-      LogService.instance.debug('AuthService', 'Login response status: ${response.statusCode}');
-      LogService.instance.debug('AuthService', 'Login response body: ${response.body}');
+      LogService.instance.debug(
+        'AuthService',
+        'Login response received with status ${response.statusCode}',
+      );
 
       final responseData = jsonDecode(response.body);
 
       if (response.statusCode == 200) {
-        // Store tokens
         final tokens = AuthTokens.fromJson(responseData);
-        await _saveTokens(tokens);
+        final user = _parseResponseUser(responseData, 'login');
 
-        // Store user data - parse once and reuse
-        User? user;
-        if (responseData['user'] != null) {
-          final rawUser = responseData['user'];
-          _logRawUserPayload('login', rawUser);
-          user = User.fromJson(rawUser);
-          await _saveUser(user);
-        }
+        await _saveSession(tokens, user);
 
         return {
           'success': true,
           'tokens': tokens,
           'user': user,
         };
-      } else if (response.statusCode == 401 && responseData['mfa_required'] == true) {
+      } else if (response.statusCode == 401 &&
+          responseData['mfa_required'] == true) {
         return {
           'success': false,
           'mfa_required': true,
@@ -73,41 +139,41 @@ class AuthService {
       } else {
         return {
           'success': false,
-          'error': responseData['error'] ?? responseData['errors']?.join(', ') ?? 'Login failed',
+          'error': _responseErrorMessage(responseData, 'Login failed'),
         };
       }
-    } on SocketException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Login SocketException: $e\n$stackTrace');
+    } on SocketException catch (e) {
+      _logAuthException('Login', e);
       return {
         'success': false,
         'error': 'Network unavailable',
       };
-    } on TimeoutException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Login TimeoutException: $e\n$stackTrace');
+    } on TimeoutException catch (e) {
+      _logAuthException('Login', e);
       return {
         'success': false,
         'error': 'Request timed out',
       };
-    } on HttpException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Login HttpException: $e\n$stackTrace');
+    } on HttpException catch (e) {
+      _logAuthException('Login', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } on FormatException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Login FormatException: $e\n$stackTrace');
+    } on FormatException catch (e) {
+      _logAuthException('Login', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } on TypeError catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Login TypeError: $e\n$stackTrace');
+    } on TypeError catch (e) {
+      _logAuthException('Login', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Login unexpected error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('Login', e);
       return {
         'success': false,
         'error': 'An unexpected error occurred',
@@ -140,27 +206,21 @@ class AuthService {
         body['invite_code'] = inviteCode;
       }
 
-      final response = await http.post(
-        url,
-        headers: ApiConfig.jsonHeaders(),
-        body: jsonEncode(body),
-      ).timeout(const Duration(seconds: 30));
+      final response = await http
+          .post(
+            url,
+            headers: ApiConfig.jsonHeaders(),
+            body: jsonEncode(body),
+          )
+          .timeout(const Duration(seconds: 30));
 
       final responseData = jsonDecode(response.body);
 
       if (response.statusCode == 201) {
-        // Store tokens
         final tokens = AuthTokens.fromJson(responseData);
-        await _saveTokens(tokens);
+        final user = _parseResponseUser(responseData, 'signup');
 
-        // Store user data - parse once and reuse
-        User? user;
-        if (responseData['user'] != null) {
-          final rawUser = responseData['user'];
-          _logRawUserPayload('signup', rawUser);
-          user = User.fromJson(rawUser);
-          await _saveUser(user);
-        }
+        await _saveSession(tokens, user);
 
         return {
           'success': true,
@@ -170,41 +230,41 @@ class AuthService {
       } else {
         return {
           'success': false,
-          'error': responseData['error'] ?? responseData['errors']?.join(', ') ?? 'Signup failed',
+          'error': _responseErrorMessage(responseData, 'Signup failed'),
         };
       }
-    } on SocketException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Signup SocketException: $e\n$stackTrace');
+    } on SocketException catch (e) {
+      _logAuthException('Signup', e);
       return {
         'success': false,
         'error': 'Network unavailable',
       };
-    } on TimeoutException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Signup TimeoutException: $e\n$stackTrace');
+    } on TimeoutException catch (e) {
+      _logAuthException('Signup', e);
       return {
         'success': false,
         'error': 'Request timed out',
       };
-    } on HttpException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Signup HttpException: $e\n$stackTrace');
+    } on HttpException catch (e) {
+      _logAuthException('Signup', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } on FormatException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Signup FormatException: $e\n$stackTrace');
+    } on FormatException catch (e) {
+      _logAuthException('Signup', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } on TypeError catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Signup TypeError: $e\n$stackTrace');
+    } on TypeError catch (e) {
+      _logAuthException('Signup', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'Signup unexpected error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('Signup', e);
       return {
         'success': false,
         'error': 'An unexpected error occurred',
@@ -219,14 +279,16 @@ class AuthService {
     try {
       final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/auth/refresh');
 
-      final response = await http.post(
-        url,
-        headers: ApiConfig.jsonHeaders(),
-        body: jsonEncode({
-          'refresh_token': refreshToken,
-          'device': deviceInfo,
-        }),
-      ).timeout(const Duration(seconds: 30));
+      final response = await http
+          .post(
+            url,
+            headers: ApiConfig.jsonHeaders(),
+            body: jsonEncode({
+              'refresh_token': refreshToken,
+              'device': deviceInfo,
+            }),
+          )
+          .timeout(const Duration(seconds: 30));
 
       final responseData = jsonDecode(response.body);
 
@@ -244,38 +306,38 @@ class AuthService {
           'error': responseData['error'] ?? 'Token refresh failed',
         };
       }
-    } on SocketException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'RefreshToken SocketException: $e\n$stackTrace');
+    } on SocketException catch (e) {
+      _logAuthException('RefreshToken', e);
       return {
         'success': false,
         'error': 'Network unavailable',
       };
-    } on TimeoutException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'RefreshToken TimeoutException: $e\n$stackTrace');
+    } on TimeoutException catch (e) {
+      _logAuthException('RefreshToken', e);
       return {
         'success': false,
         'error': 'Request timed out',
       };
-    } on HttpException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'RefreshToken HttpException: $e\n$stackTrace');
+    } on HttpException catch (e) {
+      _logAuthException('RefreshToken', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } on FormatException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'RefreshToken FormatException: $e\n$stackTrace');
+    } on FormatException catch (e) {
+      _logAuthException('RefreshToken', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } on TypeError catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'RefreshToken TypeError: $e\n$stackTrace');
+    } on TypeError catch (e) {
+      _logAuthException('RefreshToken', e);
       return {
         'success': false,
         'error': 'Invalid response from server',
       };
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'RefreshToken unexpected error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('RefreshToken', e);
       return {
         'success': false,
         'error': 'An unexpected error occurred',
@@ -298,7 +360,8 @@ class AuthService {
         },
       ).timeout(const Duration(seconds: 30));
 
-      LogService.instance.debug('AuthService', 'API key login response status: ${response.statusCode}');
+      LogService.instance.debug('AuthService',
+          'API key login response status: ${response.statusCode}');
 
       if (response.statusCode == 200) {
         await _saveApiKey(apiKey);
@@ -316,20 +379,20 @@ class AuthService {
           'error': 'Login failed (status ${response.statusCode})',
         };
       }
-    } on SocketException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'API key login SocketException: $e\n$stackTrace');
+    } on SocketException catch (e) {
+      _logAuthException('API key login', e);
       return {
         'success': false,
         'error': 'Network unavailable',
       };
-    } on TimeoutException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'API key login TimeoutException: $e\n$stackTrace');
+    } on TimeoutException catch (e) {
+      _logAuthException('API key login', e);
       return {
         'success': false,
         'error': 'Request timed out',
       };
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'API key login unexpected error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('API key login', e);
       return {
         'success': false,
         'error': 'An unexpected error occurred',
@@ -388,11 +451,13 @@ class AuthService {
     // Exchange authorization code for tokens via secure POST
     try {
       final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/auth/sso_exchange');
-      final response = await http.post(
-        url,
-        headers: ApiConfig.jsonHeaders(),
-        body: jsonEncode({'code': code}),
-      ).timeout(const Duration(seconds: 30));
+      final response = await http
+          .post(
+            url,
+            headers: ApiConfig.jsonHeaders(),
+            body: jsonEncode({'code': code}),
+          )
+          .timeout(const Duration(seconds: 30));
 
       if (response.statusCode != 200) {
         final errorData = jsonDecode(response.body);
@@ -411,31 +476,33 @@ class AuthService {
         'expires_in': data['expires_in'] ?? 0,
         'created_at': data['created_at'] ?? 0,
       });
-      await _saveTokens(tokens);
 
-      _logRawUserPayload('sso_exchange', data['user']);
-      final user = User.fromJson(data['user']);
-      await _saveUser(user);
+      final user = _parseResponseUser(data, 'sso_exchange');
+      if (user == null) {
+        throw const FormatException('Missing user payload');
+      }
+
+      await _saveSession(tokens, user);
 
       return {
         'success': true,
         'tokens': tokens,
         'user': user,
       };
-    } on SocketException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'SSO exchange SocketException: $e\n$stackTrace');
+    } on SocketException catch (e) {
+      _logAuthException('SSO exchange', e);
       return {
         'success': false,
         'error': 'Network unavailable',
       };
-    } on TimeoutException catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'SSO exchange TimeoutException: $e\n$stackTrace');
+    } on TimeoutException catch (e) {
+      _logAuthException('SSO exchange', e);
       return {
         'success': false,
         'error': 'Request timed out',
       };
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'SSO exchange unexpected error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('SSO exchange', e);
       return {
         'success': false,
         'error': 'Failed to exchange authorization code',
@@ -450,28 +517,25 @@ class AuthService {
   }) async {
     try {
       final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/auth/sso_link');
-      final response = await http.post(
-        url,
-        headers: ApiConfig.jsonHeaders(),
-        body: jsonEncode({
-          'linking_code': linkingCode,
-          'email': email,
-          'password': password,
-        }),
-      ).timeout(const Duration(seconds: 30));
+      final response = await http
+          .post(
+            url,
+            headers: ApiConfig.jsonHeaders(),
+            body: jsonEncode({
+              'linking_code': linkingCode,
+              'email': email,
+              'password': password,
+            }),
+          )
+          .timeout(const Duration(seconds: 30));
 
       final responseData = jsonDecode(response.body);
 
       if (response.statusCode == 200) {
         final tokens = AuthTokens.fromJson(responseData);
-        await _saveTokens(tokens);
+        final user = _parseResponseUser(responseData, 'sso_link');
 
-        User? user;
-        if (responseData['user'] != null) {
-          _logRawUserPayload('sso_link', responseData['user']);
-          user = User.fromJson(responseData['user']);
-          await _saveUser(user);
-        }
+        await _saveSession(tokens, user);
 
         return {
           'success': true,
@@ -481,15 +545,18 @@ class AuthService {
       } else {
         return {
           'success': false,
-          'error': responseData['error'] ?? responseData['errors']?.join(', ') ?? 'Account linking failed',
+          'error':
+              _responseErrorMessage(responseData, 'Account linking failed'),
         };
       }
-    } on SocketException {
+    } on SocketException catch (e) {
+      _logAuthException('SSO link', e);
       return {'success': false, 'error': 'Network unavailable'};
-    } on TimeoutException {
+    } on TimeoutException catch (e) {
+      _logAuthException('SSO link', e);
       return {'success': false, 'error': 'Request timed out'};
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'SSO link error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('SSO link', e);
       return {'success': false, 'error': 'Failed to link account'};
     }
   }
@@ -500,31 +567,29 @@ class AuthService {
     String? lastName,
   }) async {
     try {
-      final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/auth/sso_create_account');
+      final url =
+          Uri.parse('${ApiConfig.baseUrl}/api/v1/auth/sso_create_account');
       final body = <String, dynamic>{
         'linking_code': linkingCode,
       };
       if (firstName != null) body['first_name'] = firstName;
       if (lastName != null) body['last_name'] = lastName;
 
-      final response = await http.post(
-        url,
-        headers: ApiConfig.jsonHeaders(),
-        body: jsonEncode(body),
-      ).timeout(const Duration(seconds: 30));
+      final response = await http
+          .post(
+            url,
+            headers: ApiConfig.jsonHeaders(),
+            body: jsonEncode(body),
+          )
+          .timeout(const Duration(seconds: 30));
 
       final responseData = jsonDecode(response.body);
 
       if (response.statusCode == 200) {
         final tokens = AuthTokens.fromJson(responseData);
-        await _saveTokens(tokens);
+        final user = _parseResponseUser(responseData, 'sso_create_account');
 
-        User? user;
-        if (responseData['user'] != null) {
-          _logRawUserPayload('sso_create_account', responseData['user']);
-          user = User.fromJson(responseData['user']);
-          await _saveUser(user);
-        }
+        await _saveSession(tokens, user);
 
         return {
           'success': true,
@@ -534,15 +599,18 @@ class AuthService {
       } else {
         return {
           'success': false,
-          'error': responseData['error'] ?? responseData['errors']?.join(', ') ?? 'Account creation failed',
+          'error':
+              _responseErrorMessage(responseData, 'Account creation failed'),
         };
       }
-    } on SocketException {
+    } on SocketException catch (e) {
+      _logAuthException('SSO create account', e);
       return {'success': false, 'error': 'Network unavailable'};
-    } on TimeoutException {
+    } on TimeoutException catch (e) {
+      _logAuthException('SSO create account', e);
       return {'success': false, 'error': 'Request timed out'};
-    } catch (e, stackTrace) {
-      LogService.instance.error('AuthService', 'SSO create account error: $e\n$stackTrace');
+    } catch (e) {
+      _logAuthException('SSO create account', e);
       return {'success': false, 'error': 'Failed to create account'};
     }
   }
@@ -563,7 +631,7 @@ class AuthService {
       final responseData = jsonDecode(response.body);
 
       if (response.statusCode == 200) {
-        _logRawUserPayload('enable_ai', responseData['user']);
+        _logUserPayloadShape('enable_ai', responseData['user']);
         final user = User.fromJson(responseData['user']);
         await _saveUser(user);
         return {
@@ -574,12 +642,13 @@ class AuthService {
 
       return {
         'success': false,
-        'error': responseData['error'] ?? responseData['errors']?.join(', ') ?? 'Failed to enable AI',
+        'error': _responseErrorMessage(responseData, 'Failed to enable AI'),
       };
     } catch (e) {
+      _logAuthException('Enable AI', e);
       return {
         'success': false,
-        'error': 'Network error: ${e.toString()}',
+        'error': 'Network error',
       };
     }
   }
@@ -594,7 +663,7 @@ class AuthService {
   Future<AuthTokens?> getStoredTokens() async {
     final tokensJson = await _storage.read(key: _tokenKey);
     if (tokensJson == null) return null;
-    
+
     try {
       return AuthTokens.fromJson(jsonDecode(tokensJson));
     } catch (e) {
@@ -605,7 +674,7 @@ class AuthService {
   Future<User?> getStoredUser() async {
     final userJson = await _storage.read(key: _userKey);
     if (userJson == null) return null;
-    
+
     try {
       return User.fromJson(jsonDecode(userJson));
     } catch (e) {
@@ -627,20 +696,25 @@ class AuthService {
     );
   }
 
-  void _logRawUserPayload(String source, dynamic userPayload) {
+  void _logUserPayloadShape(String source, dynamic userPayload) {
     if (userPayload == null) {
-      LogService.instance.debug('AuthService', '$source user payload: <missing>');
+      LogService.instance.debug(
+        'AuthService',
+        '$source user payload missing',
+      );
       return;
     }
 
     if (userPayload is Map<String, dynamic>) {
-      try {
-        LogService.instance.debug('AuthService', '$source user payload: ${jsonEncode(userPayload)}');
-      } catch (_) {
-        LogService.instance.debug('AuthService', '$source user payload: $userPayload');
-      }
+      LogService.instance.debug(
+        'AuthService',
+        '$source user payload received with ${userPayload.length} fields',
+      );
     } else {
-      LogService.instance.debug('AuthService', '$source user payload type: ${userPayload.runtimeType}');
+      LogService.instance.debug(
+        'AuthService',
+        '$source user payload type: ${userPayload.runtimeType}',
+      );
     }
   }
 
diff --git a/mobile/lib/services/biometric_service.dart b/mobile/lib/services/biometric_service.dart
index b6daa17a4..3d118a982 100644
--- a/mobile/lib/services/biometric_service.dart
+++ b/mobile/lib/services/biometric_service.dart
@@ -39,8 +39,11 @@ class BiometricService {
           biometricOnly: false,
         ),
       );
-    } catch (e, stack) {
-      LogService.instance.error('BiometricService', 'authenticate() failed: $e\n$stack');
+    } catch (e) {
+      LogService.instance.error(
+        'BiometricService',
+        'authenticate() failed with ${e.runtimeType}',
+      );
       return false;
     }
   }
diff --git a/mobile/lib/services/database_helper.dart b/mobile/lib/services/database_helper.dart
index fe893b85f..93a01848d 100644
--- a/mobile/lib/services/database_helper.dart
+++ b/mobile/lib/services/database_helper.dart
@@ -1,7 +1,10 @@
+import 'dart:async';
+
 import 'package:flutter/foundation.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:path/path.dart';
 import 'log_service.dart';
+import 'telemetry_service.dart';
 
 class DatabaseHelper {
   static final DatabaseHelper instance = DatabaseHelper._init();
@@ -38,12 +41,18 @@ class DatabaseHelper {
       throw StateError('sqflite database is not available on web.');
     }
     if (_database != null) return _database!;
-    
+
     try {
       _database = await _initDB('sure_offline.db');
       return _database!;
     } catch (e, stackTrace) {
-      _log.error('DatabaseHelper', 'Error initializing local database sure_offline.db: $e');
+      _log.error('DatabaseHelper',
+          'Error initializing local database sure_offline.db: ${e.runtimeType}');
+      unawaited(TelemetryService.instance.captureHandledException(
+        e,
+        stackTrace,
+        operation: 'database.open',
+      ));
       FlutterError.reportError(
         FlutterErrorDetails(
           exception: e,
@@ -63,12 +72,20 @@ class DatabaseHelper {
 
       return await openDatabase(
         path,
-        version: 2,
+        version: 3,
         onCreate: _createDB,
         onUpgrade: _upgradeDB,
       );
     } catch (e, stackTrace) {
-      _log.error('DatabaseHelper', 'Error opening database file "$filePath": $e');
+      _log.error(
+        'DatabaseHelper',
+        'Error opening database file "$filePath": ${e.runtimeType}',
+      );
+      unawaited(TelemetryService.instance.captureHandledException(
+        e,
+        stackTrace,
+        operation: 'database.initialize',
+      ));
       FlutterError.reportError(
         FlutterErrorDetails(
           exception: e,
@@ -97,6 +114,10 @@ class DatabaseHelper {
           notes TEXT,
           category_id TEXT,
           category_name TEXT,
+          merchant_id TEXT,
+          merchant_name TEXT,
+          tag_ids TEXT DEFAULT '[]',
+          tag_names TEXT DEFAULT '[]',
           sync_status TEXT NOT NULL,
           created_at TEXT NOT NULL,
           updated_at TEXT NOT NULL
@@ -138,7 +159,15 @@ class DatabaseHelper {
         ON transactions(server_id)
       ''');
     } catch (e, stackTrace) {
-      _log.error('DatabaseHelper', 'Error creating local database schema: $e');
+      _log.error(
+        'DatabaseHelper',
+        'Error creating local database schema: ${e.runtimeType}',
+      );
+      unawaited(TelemetryService.instance.captureHandledException(
+        e,
+        stackTrace,
+        operation: 'database.create_schema',
+      ));
       FlutterError.reportError(
         FlutterErrorDetails(
           exception: e,
@@ -156,10 +185,32 @@ class DatabaseHelper {
       final columns = await db.rawQuery('PRAGMA table_info(transactions)');
       final columnNames = columns.map((c) => c['name'] as String).toSet();
       if (!columnNames.contains('category_id')) {
-        await db.execute('ALTER TABLE transactions ADD COLUMN category_id TEXT');
+        await db
+            .execute('ALTER TABLE transactions ADD COLUMN category_id TEXT');
       }
       if (!columnNames.contains('category_name')) {
-        await db.execute('ALTER TABLE transactions ADD COLUMN category_name TEXT');
+        await db
+            .execute('ALTER TABLE transactions ADD COLUMN category_name TEXT');
+      }
+    }
+    if (oldVersion < 3) {
+      final columns = await db.rawQuery('PRAGMA table_info(transactions)');
+      final columnNames = columns.map((c) => c['name'] as String).toSet();
+      if (!columnNames.contains('merchant_id')) {
+        await db
+            .execute('ALTER TABLE transactions ADD COLUMN merchant_id TEXT');
+      }
+      if (!columnNames.contains('merchant_name')) {
+        await db
+            .execute('ALTER TABLE transactions ADD COLUMN merchant_name TEXT');
+      }
+      if (!columnNames.contains('tag_ids')) {
+        await db.execute(
+            "ALTER TABLE transactions ADD COLUMN tag_ids TEXT DEFAULT '[]'");
+      }
+      if (!columnNames.contains('tag_names')) {
+        await db.execute(
+            "ALTER TABLE transactions ADD COLUMN tag_names TEXT DEFAULT '[]'");
       }
     }
   }
@@ -173,7 +224,7 @@ class DatabaseHelper {
       return localId;
     }
     final db = await database;
-    _log.debug('DatabaseHelper', 'Inserting transaction: local_id=${transaction['local_id']}, account_id="${transaction['account_id']}", server_id=${transaction['server_id']}');
+    _log.debug('DatabaseHelper', 'Inserting transaction into local database');
     await db.insert(
       'transactions',
       transaction,
@@ -183,7 +234,8 @@ class DatabaseHelper {
     return transaction['local_id'] as String;
   }
 
-  Future<List<Map<String, dynamic>>> getTransactions({String? accountId}) async {
+  Future<List<Map<String, dynamic>>> getTransactions(
+      {String? accountId}) async {
     if (_useInMemoryStore) {
       _ensureWebStoreReady();
       final results = _memoryTransactions.values
@@ -194,16 +246,18 @@ class DatabaseHelper {
           .map((transaction) => Map<String, dynamic>.from(transaction))
           .toList();
       results.sort((a, b) {
-        final dateCompare = _compareDesc(a['date'] as String?, b['date'] as String?);
+        final dateCompare =
+            _compareDesc(a['date'] as String?, b['date'] as String?);
         if (dateCompare != 0) return dateCompare;
-        return _compareDesc(a['created_at'] as String?, b['created_at'] as String?);
+        return _compareDesc(
+            a['created_at'] as String?, b['created_at'] as String?);
       });
       return results;
     }
     final db = await database;
 
     if (accountId != null) {
-      _log.debug('DatabaseHelper', 'Querying transactions WHERE account_id = "$accountId"');
+      _log.debug('DatabaseHelper', 'Querying scoped transactions');
       final results = await db.query(
         'transactions',
         where: 'account_id = ?',
@@ -227,7 +281,9 @@ class DatabaseHelper {
     if (_useInMemoryStore) {
       _ensureWebStoreReady();
       final transaction = _memoryTransactions[localId];
-      return transaction != null ? Map<String, dynamic>.from(transaction) : null;
+      return transaction != null
+          ? Map<String, dynamic>.from(transaction)
+          : null;
     }
     final db = await database;
     final results = await db.query(
@@ -240,7 +296,8 @@ class DatabaseHelper {
     return results.isNotEmpty ? results.first : null;
   }
 
-  Future<Map<String, dynamic>?> getTransactionByServerId(String serverId) async {
+  Future<Map<String, dynamic>?> getTransactionByServerId(
+      String serverId) async {
     if (_useInMemoryStore) {
       _ensureWebStoreReady();
       for (final transaction in _memoryTransactions.values) {
@@ -269,7 +326,8 @@ class DatabaseHelper {
           .map((transaction) => Map<String, dynamic>.from(transaction))
           .toList();
       results.sort(
-        (a, b) => _compareAsc(a['created_at'] as String?, b['created_at'] as String?),
+        (a, b) =>
+            _compareAsc(a['created_at'] as String?, b['created_at'] as String?),
       );
       return results;
     }
@@ -286,11 +344,13 @@ class DatabaseHelper {
     if (_useInMemoryStore) {
       _ensureWebStoreReady();
       final results = _memoryTransactions.values
-          .where((transaction) => transaction['sync_status'] == 'pending_delete')
+          .where(
+              (transaction) => transaction['sync_status'] == 'pending_delete')
           .map((transaction) => Map<String, dynamic>.from(transaction))
           .toList();
       results.sort(
-        (a, b) => _compareAsc(a['updated_at'] as String?, b['updated_at'] as String?),
+        (a, b) =>
+            _compareAsc(a['updated_at'] as String?, b['updated_at'] as String?),
       );
       return results;
     }
@@ -303,7 +363,8 @@ class DatabaseHelper {
     );
   }
 
-  Future<int> updateTransaction(String localId, Map<String, dynamic> transaction) async {
+  Future<int> updateTransaction(
+      String localId, Map<String, dynamic> transaction) async {
     if (_useInMemoryStore) {
       _ensureWebStoreReady();
       if (!_memoryTransactions.containsKey(localId)) {
@@ -381,7 +442,8 @@ class DatabaseHelper {
       return;
     }
     final db = await database;
-    _log.debug('DatabaseHelper', 'Clearing only synced transactions, keeping pending/failed');
+    _log.debug('DatabaseHelper',
+        'Clearing only synced transactions, keeping pending/failed');
     await db.delete(
       'transactions',
       where: 'sync_status = ?',
diff --git a/mobile/lib/services/log_service.dart b/mobile/lib/services/log_service.dart
index 83c0a389d..ebe66372c 100644
--- a/mobile/lib/services/log_service.dart
+++ b/mobile/lib/services/log_service.dart
@@ -32,17 +32,88 @@ class LogService with ChangeNotifier {
 
   List<LogEntry> get logs => List.unmodifiable(_logs);
 
+  static final List<RegExp> _authPatterns = [
+    RegExp(
+      r'\b(authorization|x-api-key|api[-_]?key|access[-_]?token|refresh[-_]?token|auth[-_]?token|bearer|password|otp[-_]?code|linking[-_]?code|secret|custom[-_]?proxy[-_]?headers?)\b\s*[:=]\s*(Bearer\s+[A-Za-z0-9._~+/=-]+|"[^"]*"|[^\s,}]+)',
+      caseSensitive: false,
+    ),
+    RegExp(
+      r'"(authorization|x-api-key|api[-_]?key|access[-_]?token|refresh[-_]?token|auth[-_]?token|password|otp[-_]?code|linking[-_]?code|secret)"\s*:\s*("[^"]*"|[0-9.]+|true|false|null)',
+      caseSensitive: false,
+    ),
+  ];
+
+  static final List<RegExp> _businessDataPatterns = [
+    RegExp(
+      r'\b(local[-_]?id|account[-_]?id|server[-_]?id|transaction[-_]?id|merchant[-_]?id|category[-_]?id|tag[-_]?ids?|user[-_]?id|backend[-_]?url|base[-_]?url|amount|account[-_]?name|merchant[-_]?name|category[-_]?name|display[-_]?name|transaction[-_]?name|email|first[-_]?name|last[-_]?name)\b\s*[:=]\s*("[^"]*"|[^\s,}]+)',
+      caseSensitive: false,
+    ),
+    RegExp(
+      r'"(local[-_]?id|account[-_]?id|server[-_]?id|transaction[-_]?id|merchant[-_]?id|category[-_]?id|tag[-_]?ids?|user[-_]?id|backend[-_]?url|base[-_]?url|amount|account[-_]?name|merchant[-_]?name|category[-_]?name|display[-_]?name|transaction[-_]?name|email|first[-_]?name|last[-_]?name)"\s*:\s*("[^"]*"|[0-9.]+|true|false|null)',
+      caseSensitive: false,
+    ),
+  ];
+  static final List<RegExp> _sensitiveKeyPatterns = [
+    ..._authPatterns,
+    ..._businessDataPatterns,
+  ];
+
+  static final RegExp _bearerTokenPattern =
+      RegExp(r'\bBearer\s+[A-Za-z0-9._~+/=-]+', caseSensitive: false);
+  static final RegExp _urlPattern = RegExp(r'https?://[^\s,}]+');
+  static final RegExp _hostLookupPattern = RegExp(
+    r'''(Failed host lookup:\s*)['"]?[^'"\s)]+['"]?''',
+    caseSensitive: false,
+  );
+  static final RegExp _socketAddressPattern = RegExp(
+    r'\b(address|host)\s*=\s*([^\s,}]+)',
+    caseSensitive: false,
+  );
+  static final RegExp _emailPattern = RegExp(
+      r'\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}\b',
+      caseSensitive: false);
+  static final RegExp _uuidPattern = RegExp(
+    r'\b[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\b',
+    caseSensitive: false,
+  );
+  static final RegExp _longNumericIdPattern = RegExp(r'\b\d{14,}\b');
+
+  static String sanitize(String message) {
+    var sanitized = message;
+
+    for (final pattern in _sensitiveKeyPatterns) {
+      sanitized = sanitized.replaceAllMapped(pattern, (match) {
+        final key = match.group(1) ?? 'value';
+        return '$key=[redacted]';
+      });
+    }
+
+    sanitized = sanitized
+        .replaceAll(_bearerTokenPattern, 'Bearer [redacted]')
+        .replaceAll(_urlPattern, '[url]')
+        .replaceAllMapped(
+            _hostLookupPattern, (match) => '${match.group(1)}[host]')
+        .replaceAllMapped(
+            _socketAddressPattern, (match) => '${match.group(1)}=[host]')
+        .replaceAll(_emailPattern, '[email]')
+        .replaceAll(_uuidPattern, '[id]')
+        .replaceAll(_longNumericIdPattern, '[id]');
+
+    return sanitized;
+  }
+
   /// Call this when log viewer screen becomes active
   void setLogViewerActive(bool active) {
     _isLogViewerActive = active;
   }
 
   void log(String tag, String message, {String level = 'INFO'}) {
+    final sanitizedMessage = sanitize(message);
     final entry = LogEntry(
       timestamp: DateTime.now(),
       level: level,
       tag: tag,
-      message: message,
+      message: sanitizedMessage,
     );
 
     _logs.add(entry);
@@ -53,7 +124,7 @@ class LogService with ChangeNotifier {
     }
 
     // Also print to console for development
-    debugPrint('[$level][$tag] $message');
+    debugPrint('[$level][$tag] $sanitizedMessage');
 
     // Only notify listeners if log viewer is active to avoid unnecessary rebuilds
     if (_isLogViewerActive) {
@@ -63,7 +134,8 @@ class LogService with ChangeNotifier {
 
   void debug(String tag, String message) => log(tag, message, level: 'DEBUG');
   void info(String tag, String message) => log(tag, message, level: 'INFO');
-  void warning(String tag, String message) => log(tag, message, level: 'WARNING');
+  void warning(String tag, String message) =>
+      log(tag, message, level: 'WARNING');
   void error(String tag, String message) => log(tag, message, level: 'ERROR');
 
   void clear() {
@@ -73,8 +145,10 @@ class LogService with ChangeNotifier {
 
   String exportLogs() {
     final buffer = StringBuffer();
+    // Log messages are sanitized before storage; export should preserve them.
     for (final log in _logs) {
-      buffer.writeln('${log.formattedTime} [${log.level}][${log.tag}] ${log.message}');
+      buffer.writeln(
+          '${log.formattedTime} [${log.level}][${log.tag}] ${log.message}');
     }
     return buffer.toString();
   }
diff --git a/mobile/lib/services/merchants_service.dart b/mobile/lib/services/merchants_service.dart
new file mode 100644
index 000000000..3dbf7d7d1
--- /dev/null
+++ b/mobile/lib/services/merchants_service.dart
@@ -0,0 +1,18 @@
+import '../models/merchant.dart';
+import 'response_list_parser.dart';
+
+class MerchantsService {
+  Future<Map<String, dynamic>> getMerchants({
+    required String accessToken,
+  }) async {
+    return fetchApiList<Merchant>(
+      accessToken: accessToken,
+      path: '/api/v1/merchants',
+      key: 'merchants',
+      resultKey: 'merchants',
+      fromJson: Merchant.fromJson,
+      isValid: (merchant) => merchant.id.isNotEmpty,
+      failureMessage: 'Failed to fetch merchants',
+    );
+  }
+}
diff --git a/mobile/lib/services/offline_storage_service.dart b/mobile/lib/services/offline_storage_service.dart
index 06b0a687b..bf2fc3cb8 100644
--- a/mobile/lib/services/offline_storage_service.dart
+++ b/mobile/lib/services/offline_storage_service.dart
@@ -21,12 +21,23 @@ class OfflineStorageService {
     String? notes,
     String? categoryId,
     String? categoryName,
+    String? merchantId,
+    String? merchantName,
+    List<String> tagIds = const [],
+    List<String> tagNames = const [],
     String? serverId,
     SyncStatus syncStatus = SyncStatus.pending,
   }) async {
-    _log.info('OfflineStorage', 'saveTransaction called: name=$name, amount=$amount, accountId=$accountId, syncStatus=$syncStatus');
-
+    // Generated once when the transaction enters the offline queue, then
+    // persisted as transactions.local_id and reused as the mobile idempotency
+    // key on every replay attempt.
     final localId = _uuid.v4();
+
+    _log.info(
+      'OfflineStorage',
+      'saveTransaction called with syncStatus=$syncStatus',
+    );
+
     final transaction = OfflineTransaction(
       id: serverId,
       localId: localId,
@@ -39,36 +50,41 @@ class OfflineStorageService {
       notes: notes,
       categoryId: categoryId,
       categoryName: categoryName,
+      merchantId: merchantId,
+      merchantName: merchantName,
+      tagIds: tagIds,
+      tagNames: tagNames,
       syncStatus: syncStatus,
     );
 
     try {
       await _dbHelper.insertTransaction(transaction.toDatabaseMap());
-      _log.info('OfflineStorage', 'Transaction saved successfully with localId: $localId');
+      _log.info('OfflineStorage', 'Transaction saved successfully');
       return transaction;
     } catch (e) {
-      _log.error('OfflineStorage', 'Failed to save transaction: $e');
+      _log.error(
+        'OfflineStorage',
+        'Failed to save transaction with ${e.runtimeType}',
+      );
       rethrow;
     }
   }
 
   Future<List<OfflineTransaction>> getTransactions({String? accountId}) async {
-    _log.debug('OfflineStorage', 'getTransactions called with accountId: $accountId');
-    final transactionMaps = await _dbHelper.getTransactions(accountId: accountId);
-    _log.debug('OfflineStorage', 'Retrieved ${transactionMaps.length} transaction maps from database');
-
-    if (transactionMaps.isNotEmpty && accountId != null) {
-      _log.debug('OfflineStorage', 'Sample transaction account_ids:');
-      for (int i = 0; i < transactionMaps.take(3).length; i++) {
-        final map = transactionMaps[i];
-        _log.debug('OfflineStorage', '  - Transaction ${map['server_id']}: account_id="${map['account_id']}"');
-      }
-    }
+    _log.debug(
+      'OfflineStorage',
+      'getTransactions called${accountId != null ? " with account filter" : ""}',
+    );
+    final transactionMaps =
+        await _dbHelper.getTransactions(accountId: accountId);
+    _log.debug('OfflineStorage',
+        'Retrieved ${transactionMaps.length} transaction maps from database');
 
     final transactions = transactionMaps
         .map((map) => OfflineTransaction.fromDatabaseMap(map))
         .toList();
-    _log.debug('OfflineStorage', 'Returning ${transactions.length} transactions');
+    _log.debug(
+        'OfflineStorage', 'Returning ${transactions.length} transactions');
     return transactions;
   }
 
@@ -123,12 +139,15 @@ class OfflineStorageService {
 
   /// Mark a transaction for pending deletion (offline delete)
   Future<void> markTransactionForDeletion(String serverId) async {
-    _log.info('OfflineStorage', 'Marking transaction $serverId for pending deletion');
+    _log.info('OfflineStorage', 'Marking transaction for pending deletion');
 
     // Find the transaction by server ID
     final existing = await getTransactionByServerId(serverId);
     if (existing == null) {
-      _log.warning('OfflineStorage', 'Transaction $serverId not found, cannot mark for deletion');
+      _log.warning(
+        'OfflineStorage',
+        'Transaction not found, cannot mark for deletion',
+      );
       return;
     }
 
@@ -138,28 +157,36 @@ class OfflineStorageService {
       updatedAt: DateTime.now(),
     );
 
-    await _dbHelper.updateTransaction(existing.localId, updated.toDatabaseMap());
-    _log.info('OfflineStorage', 'Transaction ${existing.localId} marked as pending_delete');
+    await _dbHelper.updateTransaction(
+        existing.localId, updated.toDatabaseMap());
+    _log.info('OfflineStorage', 'Transaction marked as pending_delete');
   }
 
   /// Undo a pending transaction operation (either pending create or pending delete)
-  Future<bool> undoPendingTransaction(String localId, SyncStatus currentStatus) async {
-    _log.info('OfflineStorage', 'Undoing pending transaction $localId with status $currentStatus');
+  Future<bool> undoPendingTransaction(
+      String localId, SyncStatus currentStatus) async {
+    _log.info(
+      'OfflineStorage',
+      'Undoing pending transaction with status $currentStatus',
+    );
 
     final existing = await getTransactionByLocalId(localId);
     if (existing == null) {
-      _log.warning('OfflineStorage', 'Transaction $localId not found, cannot undo');
+      _log.warning('OfflineStorage', 'Transaction not found, cannot undo');
       return false;
     }
 
     if (currentStatus == SyncStatus.pending) {
       // For pending creates: delete the transaction completely
-      _log.info('OfflineStorage', 'Deleting pending create transaction $localId');
+      _log.info('OfflineStorage', 'Deleting pending create transaction');
       await deleteTransaction(localId);
       return true;
     } else if (currentStatus == SyncStatus.pendingDelete) {
       // For pending deletes: restore to synced status
-      _log.info('OfflineStorage', 'Restoring pending delete transaction $localId to synced');
+      _log.info(
+        'OfflineStorage',
+        'Restoring pending delete transaction to synced',
+      );
       final updated = existing.copyWith(
         syncStatus: SyncStatus.synced,
         updatedAt: DateTime.now(),
@@ -168,21 +195,19 @@ class OfflineStorageService {
       return true;
     }
 
-    _log.warning('OfflineStorage', 'Cannot undo transaction with status $currentStatus');
+    _log.warning(
+        'OfflineStorage', 'Cannot undo transaction with status $currentStatus');
     return false;
   }
 
-  Future<void> syncTransactionsFromServer(List<Transaction> serverTransactions) async {
-    _log.info('OfflineStorage', 'syncTransactionsFromServer called with ${serverTransactions.length} transactions from server');
-
-    // Log first transaction's accountId for debugging
-    if (serverTransactions.isNotEmpty) {
-      final firstTx = serverTransactions.first;
-      _log.info('OfflineStorage', 'First transaction: id=${firstTx.id}, accountId="${firstTx.accountId}", name="${firstTx.name}"');
-    }
+  Future<void> syncTransactionsFromServer(
+      List<Transaction> serverTransactions) async {
+    _log.info('OfflineStorage',
+        'syncTransactionsFromServer called with ${serverTransactions.length} transactions from server');
 
     // Use upsert logic instead of clear + insert to preserve recently uploaded transactions
-    _log.info('OfflineStorage', 'Upserting all transactions from server (preserving pending/failed)');
+    _log.info('OfflineStorage',
+        'Upserting all transactions from server (preserving pending/failed)');
 
     int upsertedCount = 0;
     int emptyAccountIdCount = 0;
@@ -196,9 +221,11 @@ class OfflineStorageService {
       }
     }
 
-    _log.info('OfflineStorage', 'Upserted $upsertedCount transactions from server');
+    _log.info(
+        'OfflineStorage', 'Upserted $upsertedCount transactions from server');
     if (emptyAccountIdCount > 0) {
-      _log.error('OfflineStorage', 'WARNING: $emptyAccountIdCount transactions had EMPTY accountId!');
+      _log.error('OfflineStorage',
+          'WARNING: $emptyAccountIdCount transactions had EMPTY accountId!');
     }
   }
 
@@ -212,13 +239,18 @@ class OfflineStorageService {
     }
 
     // If accountId is provided and transaction.accountId is empty, use the provided one
-    final effectiveAccountId = transaction.accountId.isEmpty && accountId != null
-        ? accountId
-        : transaction.accountId;
+    final effectiveAccountId =
+        transaction.accountId.isEmpty && accountId != null
+            ? accountId
+            : transaction.accountId;
 
     // Log if transaction has empty accountId
     if (transaction.accountId.isEmpty) {
-      _log.warning('OfflineStorage', 'Transaction ${transaction.id} has empty accountId from server! Provided accountId: $accountId, effective: $effectiveAccountId');
+      final fallbackApplied = accountId != null && accountId.isNotEmpty;
+      _log.warning(
+        'OfflineStorage',
+        'Transaction has empty accountId from server; fallbackApplied=$fallbackApplied',
+      );
     }
 
     // Check if we already have this transaction
@@ -226,31 +258,29 @@ class OfflineStorageService {
 
     if (existing != null) {
       // Update existing transaction, preserving its accountId if effectiveAccountId is empty
-      final finalAccountId = effectiveAccountId.isEmpty ? existing.accountId : effectiveAccountId;
+      final finalAccountId =
+          effectiveAccountId.isEmpty ? existing.accountId : effectiveAccountId;
 
       if (finalAccountId.isEmpty) {
-        _log.error('OfflineStorage', 'CRITICAL: Updating transaction ${transaction.id} with EMPTY accountId!');
+        _log.error(
+          'OfflineStorage',
+          'CRITICAL: Updating transaction with EMPTY accountId; operation=update fallbackApplied=false existingAccountIdPresent=false',
+        );
       }
 
-      final updated = OfflineTransaction(
-        id: transaction.id,
-        localId: existing.localId,
+      final updated = existing.mergeServerTransaction(
+        transaction,
         accountId: finalAccountId,
-        name: transaction.name,
-        date: transaction.date,
-        amount: transaction.amount,
-        currency: transaction.currency,
-        nature: transaction.nature,
-        notes: transaction.notes,
-        categoryId: transaction.categoryId ?? existing.categoryId,
-        categoryName: transaction.categoryName ?? existing.categoryName,
-        syncStatus: SyncStatus.synced,
       );
-      await _dbHelper.updateTransaction(existing.localId, updated.toDatabaseMap());
+      await _dbHelper.updateTransaction(
+          existing.localId, updated.toDatabaseMap());
     } else {
       // Insert new transaction
       if (effectiveAccountId.isEmpty) {
-        _log.error('OfflineStorage', 'CRITICAL: Inserting transaction ${transaction.id} with EMPTY accountId!');
+        _log.error(
+          'OfflineStorage',
+          'CRITICAL: Inserting transaction with EMPTY accountId; operation=insert fallbackApplied=false',
+        );
       }
 
       final offlineTransaction = OfflineTransaction(
@@ -265,6 +295,10 @@ class OfflineStorageService {
         notes: transaction.notes,
         categoryId: transaction.categoryId,
         categoryName: transaction.categoryName,
+        merchantId: transaction.merchantId,
+        merchantName: transaction.merchantName,
+        tagIds: transaction.tagIds,
+        tagNames: transaction.tagNames,
         syncStatus: SyncStatus.synced,
       );
       await _dbHelper.insertTransaction(offlineTransaction.toDatabaseMap());
@@ -291,15 +325,17 @@ class OfflineStorageService {
   }
 
   Future<void> saveAccounts(List<Account> accounts) async {
-    final accountMaps = accounts.map((account) => {
-      'id': account.id,
-      'name': account.name,
-      'balance': account.balance,
-      'currency': account.currency,
-      'classification': account.classification,
-      'account_type': account.accountType,
-      'synced_at': DateTime.now().toIso8601String(),
-    }).toList();
+    final accountMaps = accounts
+        .map((account) => {
+              'id': account.id,
+              'name': account.name,
+              'balance': account.balance,
+              'currency': account.currency,
+              'classification': account.classification,
+              'account_type': account.accountType,
+              'synced_at': DateTime.now().toIso8601String(),
+            })
+        .toList();
 
     await _dbHelper.insertAccounts(accountMaps);
   }
diff --git a/mobile/lib/services/preferences_service.dart b/mobile/lib/services/preferences_service.dart
index 05b2b46c7..5c24a848a 100644
--- a/mobile/lib/services/preferences_service.dart
+++ b/mobile/lib/services/preferences_service.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class PreferencesService {
@@ -5,6 +6,7 @@ class PreferencesService {
   static const _biometricEnabledKey = 'biometric_enabled';
   static const _showCategoryFilterKey = 'dashboard_show_category_filter';
   static const _themeModeKey = 'theme_mode';
+  static const _moneyHiddenKey = 'privacy_money_hidden';
 
   static PreferencesService? _instance;
   SharedPreferences? _prefs;
@@ -16,6 +18,13 @@ class PreferencesService {
     return _instance!;
   }
 
+  /// Drops the cached instance (and its cached [SharedPreferences]) so tests
+  /// can re-read values from freshly mocked storage. Test-only.
+  @visibleForTesting
+  static void resetForTest() {
+    _instance = null;
+  }
+
   Future<SharedPreferences> get _preferences async {
     _prefs ??= await SharedPreferences.getInstance();
     return _prefs!;
@@ -51,6 +60,17 @@ class PreferencesService {
     await prefs.setBool(_showCategoryFilterKey, value);
   }
 
+  /// Whether money values are masked app-wide ("privacy mode"). Default false.
+  Future<bool> getMoneyHidden() async {
+    final prefs = await _preferences;
+    return prefs.getBool(_moneyHiddenKey) ?? false;
+  }
+
+  Future<void> setMoneyHidden(bool value) async {
+    final prefs = await _preferences;
+    await prefs.setBool(_moneyHiddenKey, value);
+  }
+
   /// Returns 'light', 'dark', or 'system' (default).
   Future<String> getThemeMode() async {
     final prefs = await _preferences;
diff --git a/mobile/lib/services/response_list_parser.dart b/mobile/lib/services/response_list_parser.dart
new file mode 100644
index 000000000..45763fae2
--- /dev/null
+++ b/mobile/lib/services/response_list_parser.dart
@@ -0,0 +1,91 @@
+import 'dart:convert';
+
+import 'package:http/http.dart' as http;
+
+import 'api_config.dart';
+
+List<Map<String, dynamic>> extractJsonObjectList(
+  dynamic responseData, {
+  String? key,
+}) {
+  final dynamic rawList;
+  if (responseData is List) {
+    rawList = responseData;
+  } else if (responseData is Map && key != null) {
+    rawList = responseData[key] is List ? responseData[key] : const [];
+  } else if (responseData is Map) {
+    final lists = responseData.values.whereType<List>();
+    rawList = lists.isEmpty ? const [] : lists.first;
+  } else {
+    rawList = const [];
+  }
+
+  return (rawList as List)
+      .whereType<Map>()
+      .map((item) => item.cast<String, dynamic>())
+      .toList();
+}
+
+Future<Map<String, dynamic>> fetchApiList<T>({
+  required String accessToken,
+  required String path,
+  required String key,
+  required String resultKey,
+  required T Function(Map<String, dynamic>) fromJson,
+  required bool Function(T) isValid,
+  required String failureMessage,
+}) async {
+  final url = Uri.parse('${ApiConfig.baseUrl}$path');
+
+  try {
+    final response = await http.get(
+      url,
+      headers: {
+        ...ApiConfig.getAuthHeaders(accessToken),
+        'Content-Type': 'application/json',
+      },
+    ).timeout(const Duration(seconds: 30));
+
+    if (response.statusCode == 200) {
+      final responseData = jsonDecode(response.body);
+      final items = <T>[];
+      for (final json in extractJsonObjectList(responseData, key: key)) {
+        try {
+          final item = fromJson(json);
+          if (isValid(item)) {
+            items.add(item);
+          }
+        } on FormatException {
+          // Skip malformed metadata records instead of failing the whole list.
+        }
+      }
+
+      return {'success': true, resultKey: items};
+    } else if (response.statusCode == 401) {
+      return {'success': false, 'error': 'unauthorized'};
+    }
+
+    return {
+      'success': false,
+      'error': extractErrorMessage(response.body, fallback: failureMessage),
+    };
+  } catch (e) {
+    return {'success': false, 'error': 'Network error: ${e.toString()}'};
+  }
+}
+
+String extractErrorMessage(String responseBody, {required String fallback}) {
+  try {
+    final responseData = jsonDecode(responseBody);
+    if (responseData is Map) {
+      final message = responseData['message'] ?? responseData['error'];
+      if (message != null && message.toString().trim().isNotEmpty) {
+        return message.toString();
+      }
+    }
+  } catch (_) {
+    // Fall through to the static caller-provided fallback.
+  }
+
+  return fallback;
+}
diff --git a/mobile/lib/services/sync_service.dart b/mobile/lib/services/sync_service.dart
index a5dab6543..8b9fa0b1e 100644
--- a/mobile/lib/services/sync_service.dart
+++ b/mobile/lib/services/sync_service.dart
@@ -7,6 +7,7 @@ import 'transactions_service.dart';
 import 'accounts_service.dart';
 import 'connectivity_service.dart';
 import 'log_service.dart';
+import 'telemetry_service.dart';
 
 class SyncService with ChangeNotifier {
   final OfflineStorageService _offlineStorage = OfflineStorageService();
@@ -30,9 +31,23 @@ class SyncService with ChangeNotifier {
 
     try {
       final pendingDeletes = await _offlineStorage.getPendingDeletes();
-      _log.info('SyncService', 'Found ${pendingDeletes.length} pending deletes to process');
+      _log.info('SyncService',
+          'Found ${pendingDeletes.length} pending deletes to process');
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'pending_delete_replay_started',
+        data: {'count': pendingDeletes.length},
+      );
 
       if (pendingDeletes.isEmpty) {
+        TelemetryService.instance.addBreadcrumb(
+          'sync',
+          'pending_delete_replay_finished',
+          data: {
+            'success_count': 0,
+            'failure_count': 0,
+          },
+        );
         return SyncResult(success: true, syncedCount: 0);
       }
 
@@ -40,14 +55,16 @@ class SyncService with ChangeNotifier {
         try {
           // Only attempt to delete on server if the transaction has a server ID
           if (transaction.id != null && transaction.id!.isNotEmpty) {
-            _log.info('SyncService', 'Deleting transaction ${transaction.id} from server');
+            _log.info(
+                'SyncService', 'Deleting pending transaction from server');
             final result = await _transactionsService.deleteTransaction(
               accessToken: accessToken,
               transactionId: transaction.id!,
             );
 
             if (result['success'] == true) {
-              _log.info('SyncService', 'Delete success! Removing from local storage');
+              _log.info(
+                  'SyncService', 'Delete success! Removing from local storage');
               // Delete from local storage completely
               await _offlineStorage.deleteTransaction(transaction.localId);
               successCount++;
@@ -63,13 +80,19 @@ class SyncService with ChangeNotifier {
             }
           } else {
             // No server ID means it was never synced to server, just delete locally
-            _log.info('SyncService', 'Transaction ${transaction.localId} has no server ID, deleting locally only');
+            _log.info(
+              'SyncService',
+              'Pending delete has no server ID, deleting locally only',
+            );
             await _offlineStorage.deleteTransaction(transaction.localId);
             successCount++;
           }
         } catch (e) {
           // Mark as failed
-          _log.error('SyncService', 'Delete exception: $e');
+          _log.error(
+            'SyncService',
+            'Delete failed with ${e.runtimeType}',
+          );
           await _offlineStorage.updateTransactionSyncStatus(
             localId: transaction.localId,
             syncStatus: SyncStatus.failed,
@@ -79,7 +102,16 @@ class SyncService with ChangeNotifier {
         }
       }
 
-      _log.info('SyncService', 'Delete complete: $successCount success, $failureCount failed');
+      _log.info('SyncService',
+          'Delete complete: $successCount success, $failureCount failed');
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'pending_delete_replay_finished',
+        data: {
+          'success_count': successCount,
+          'failure_count': failureCount,
+        },
+      );
 
       return SyncResult(
         success: failureCount == 0,
@@ -88,7 +120,10 @@ class SyncService with ChangeNotifier {
         error: failureCount > 0 ? lastError : null,
       );
     } catch (e) {
-      _log.error('SyncService', 'Sync pending deletes exception: $e');
+      _log.error(
+        'SyncService',
+        'Sync pending deletes failed with ${e.runtimeType}',
+      );
       return SyncResult(
         success: false,
         syncedCount: successCount,
@@ -99,22 +134,38 @@ class SyncService with ChangeNotifier {
   }
 
   /// Sync pending transactions to server (internal method without sync lock check)
-  Future<SyncResult> _syncPendingTransactionsInternal(String accessToken) async {
+  Future<SyncResult> _syncPendingTransactionsInternal(
+      String accessToken) async {
     int successCount = 0;
     int failureCount = 0;
     String? lastError;
 
     try {
-      final pendingTransactions = await _offlineStorage.getPendingTransactions();
-      _log.info('SyncService', 'Found ${pendingTransactions.length} pending transactions to upload');
+      final pendingTransactions =
+          await _offlineStorage.getPendingTransactions();
+      _log.info('SyncService',
+          'Found ${pendingTransactions.length} pending transactions to upload');
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'pending_upload_replay_started',
+        data: {'count': pendingTransactions.length},
+      );
 
       if (pendingTransactions.isEmpty) {
+        TelemetryService.instance.addBreadcrumb(
+          'sync',
+          'pending_upload_replay_finished',
+          data: {
+            'success_count': 0,
+            'failure_count': 0,
+          },
+        );
         return SyncResult(success: true, syncedCount: 0);
       }
 
       for (final transaction in pendingTransactions) {
         try {
-          _log.info('SyncService', 'Uploading transaction ${transaction.localId} (${transaction.name})');
+          _log.info('SyncService', 'Uploading pending transaction');
           // Upload transaction to server
           final result = await _transactionsService.createTransaction(
             accessToken: accessToken,
@@ -126,12 +177,17 @@ class SyncService with ChangeNotifier {
             nature: transaction.nature,
             notes: transaction.notes,
             categoryId: transaction.categoryId,
+            merchantId: transaction.merchantId,
+            tagIds: transaction.tagIds,
+            externalId: transaction.localId,
+            source: TransactionsService.mobileIdempotencySource,
           );
 
           if (result['success'] == true) {
             // Update local transaction with server ID and mark as synced
             final serverTransaction = result['transaction'] as Transaction;
-            _log.info('SyncService', 'Upload success! Server ID: ${serverTransaction.id}');
+            _log.info('SyncService',
+                'Upload success; local transaction marked synced');
             await _offlineStorage.updateTransactionSyncStatus(
               localId: transaction.localId,
               syncStatus: SyncStatus.synced,
@@ -150,7 +206,10 @@ class SyncService with ChangeNotifier {
           }
         } catch (e) {
           // Mark as failed
-          _log.error('SyncService', 'Upload exception: $e');
+          _log.error(
+            'SyncService',
+            'Upload failed with ${e.runtimeType}',
+          );
           await _offlineStorage.updateTransactionSyncStatus(
             localId: transaction.localId,
             syncStatus: SyncStatus.failed,
@@ -160,7 +219,16 @@ class SyncService with ChangeNotifier {
         }
       }
 
-      _log.info('SyncService', 'Upload complete: $successCount success, $failureCount failed');
+      _log.info('SyncService',
+          'Upload complete: $successCount success, $failureCount failed');
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'pending_upload_replay_finished',
+        data: {
+          'success_count': successCount,
+          'failure_count': failureCount,
+        },
+      );
 
       return SyncResult(
         success: failureCount == 0,
@@ -169,7 +237,10 @@ class SyncService with ChangeNotifier {
         error: failureCount > 0 ? lastError : null,
       );
     } catch (e) {
-      _log.error('SyncService', 'Sync pending transactions exception: $e');
+      _log.error(
+        'SyncService',
+        'Sync pending transactions failed with ${e.runtimeType}',
+      );
       return SyncResult(
         success: false,
         syncedCount: successCount,
@@ -200,7 +271,10 @@ class SyncService with ChangeNotifier {
 
       return result;
     } catch (e) {
-      _log.error('SyncService', 'syncPendingTransactions exception: $e');
+      _log.error(
+        'SyncService',
+        'syncPendingTransactions failed with ${e.runtimeType}',
+      );
       _isSyncing = false;
       _syncError = e.toString();
       notifyListeners();
@@ -217,9 +291,42 @@ class SyncService with ChangeNotifier {
     required String accessToken,
     String? accountId,
   }) async {
+    final telemetrySpan = TelemetryService.instance.startSpan(
+      'sync.transactions_fetch',
+      'Mobile transaction fetch',
+      data: {'scoped_account': accountId != null},
+    );
+    var telemetrySpanFinished = false;
+    var telemetrySucceeded = false;
+    Object? telemetryThrowable;
+
+    Future<void> finishTelemetrySpan({
+      required bool success,
+      Object? throwable,
+    }) async {
+      if (telemetrySpanFinished) return;
+
+      telemetrySpanFinished = true;
+      await TelemetryService.instance.finishSpan(
+        telemetrySpan,
+        success: success,
+        throwable: throwable,
+      );
+    }
+
     try {
       _log.info('SyncService', '========== SYNC FROM SERVER START ==========');
-      _log.info('SyncService', 'Fetching transactions from server (accountId: ${accountId ?? "ALL"})');
+      _log.info(
+        'SyncService',
+        accountId == null
+            ? 'Fetching transactions for all accounts'
+            : 'Fetching transactions for scoped account',
+      );
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'transactions_fetch_started',
+        data: {'scoped_account': accountId != null},
+      );
 
       List<Transaction> allTransactions = [];
       int currentPage = 1;
@@ -228,7 +335,17 @@ class SyncService with ChangeNotifier {
 
       // Fetch all pages
       while (currentPage <= totalPages) {
-        _log.info('SyncService', '>>> Fetching page $currentPage of $totalPages (perPage: $perPage)');
+        _log.info('SyncService',
+            '>>> Fetching page $currentPage of $totalPages (perPage: $perPage)');
+        TelemetryService.instance.addBreadcrumb(
+          'sync',
+          'transactions_fetch_page',
+          data: {
+            'page': currentPage,
+            'total_pages': totalPages,
+            'per_page': perPage,
+          },
+        );
 
         final result = await _transactionsService.getTransactions(
           accessToken: accessToken,
@@ -237,15 +354,19 @@ class SyncService with ChangeNotifier {
           perPage: perPage,
         );
 
-        _log.debug('SyncService', 'API call completed for page $currentPage, success: ${result['success']}');
+        _log.debug('SyncService',
+            'API call completed for page $currentPage, success: ${result['success']}');
 
         if (result['success'] == true) {
-          final pageTransactions = (result['transactions'] as List<dynamic>?)
-              ?.cast<Transaction>() ?? [];
+          final pageTransactions =
+              (result['transactions'] as List<dynamic>?)?.cast<Transaction>() ??
+                  [];
 
-          _log.info('SyncService', 'Page $currentPage returned ${pageTransactions.length} transactions');
+          _log.info('SyncService',
+              'Page $currentPage returned ${pageTransactions.length} transactions');
           allTransactions.addAll(pageTransactions);
-          _log.info('SyncService', 'Total transactions accumulated: ${allTransactions.length}');
+          _log.info('SyncService',
+              'Total transactions accumulated: ${allTransactions.length}');
 
           // Extract pagination info if available
           final pagination = result['pagination'] as Map<String, dynamic>?;
@@ -253,24 +374,40 @@ class SyncService with ChangeNotifier {
             final prevTotalPages = totalPages;
             totalPages = pagination['total_pages'] as int? ?? 1;
             final totalCount = pagination['total_count'] as int? ?? 0;
-            final currentPageFromApi = pagination['page'] as int? ?? currentPage;
+            final currentPageFromApi =
+                pagination['page'] as int? ?? currentPage;
             final perPageFromApi = pagination['per_page'] as int? ?? perPage;
 
-            _log.info('SyncService', 'Pagination info: page=$currentPageFromApi/$totalPages, per_page=$perPageFromApi, total_count=$totalCount');
+            if (currentPageFromApi != currentPage) {
+              _log.warning('SyncService',
+                  'Pagination page mismatch: expected $currentPage, received $currentPageFromApi of $totalPages');
+            }
+
+            _log.info('SyncService',
+                'Pagination info: page=$currentPageFromApi/$totalPages, per_page=$perPageFromApi, total_count=$totalCount');
 
             if (prevTotalPages != totalPages) {
-              _log.info('SyncService', 'Total pages updated from $prevTotalPages to $totalPages');
+              _log.info('SyncService',
+                  'Total pages updated from $prevTotalPages to $totalPages');
             }
           } else {
             // No pagination info means this is the only page
-            _log.warning('SyncService', 'No pagination info in response - assuming single page');
+            _log.warning('SyncService',
+                'No pagination info in response - assuming single page');
             totalPages = currentPage;
           }
 
-          _log.info('SyncService', 'Moving to next page (current: $currentPage, total: $totalPages)');
+          _log.info('SyncService',
+              'Moving to next page (current: $currentPage, total: $totalPages)');
           currentPage++;
         } else {
-          _log.error('SyncService', 'Server returned error on page $currentPage: ${result['error']}');
+          _log.error('SyncService',
+              'Server returned error on page $currentPage: ${result['error']}');
+          TelemetryService.instance.addBreadcrumb(
+            'sync',
+            'transactions_fetch_failed',
+            data: {'page': currentPage},
+          );
           return SyncResult(
             success: false,
             error: result['error'] as String? ?? 'Failed to sync from server',
@@ -278,17 +415,23 @@ class SyncService with ChangeNotifier {
         }
       }
 
-      _log.info('SyncService', '>>> Pagination loop completed. Fetched ${currentPage - 1} pages');
-      _log.info('SyncService', '>>> Received total of ${allTransactions.length} transactions from server');
+      _log.info('SyncService',
+          '>>> Pagination loop completed. Fetched ${currentPage - 1} pages');
+      _log.info('SyncService',
+          '>>> Received total of ${allTransactions.length} transactions from server');
 
       // Update local cache with server data
       _log.info('SyncService', '========== UPDATING LOCAL CACHE ==========');
       if (accountId == null) {
-        _log.info('SyncService', 'Full sync - clearing and replacing all transactions');
+        _log.info('SyncService',
+            'Full sync - clearing and replacing all transactions');
         // Full sync - replace all transactions
         await _offlineStorage.syncTransactionsFromServer(allTransactions);
       } else {
-        _log.info('SyncService', 'Partial sync - upserting ${allTransactions.length} transactions for account $accountId');
+        _log.info(
+          'SyncService',
+          'Partial sync - upserting ${allTransactions.length} transactions',
+        );
         // Partial sync - upsert transactions
         int upsertCount = 0;
         for (final transaction in allTransactions) {
@@ -298,13 +441,25 @@ class SyncService with ChangeNotifier {
           );
           upsertCount++;
           if (upsertCount % 50 == 0) {
-            _log.info('SyncService', 'Upserted $upsertCount/${allTransactions.length} transactions');
+            _log.info('SyncService',
+                'Upserted $upsertCount/${allTransactions.length} transactions');
           }
         }
-        _log.info('SyncService', 'Completed upserting $upsertCount transactions');
+        _log.info(
+            'SyncService', 'Completed upserting $upsertCount transactions');
       }
 
-      _log.info('SyncService', '========== SYNC FROM SERVER COMPLETE ==========');
+      _log.info(
+          'SyncService', '========== SYNC FROM SERVER COMPLETE ==========');
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'transactions_fetch_finished',
+        data: {
+          'page_count': currentPage - 1,
+          'transaction_count': allTransactions.length,
+        },
+      );
+      telemetrySucceeded = true;
       _lastSyncTime = DateTime.now();
       notifyListeners();
 
@@ -312,19 +467,34 @@ class SyncService with ChangeNotifier {
         success: true,
         syncedCount: allTransactions.length,
       );
-    } catch (e) {
-      _log.error('SyncService', 'Exception in syncFromServer: $e');
+    } catch (e, stackTrace) {
+      _log.error(
+        'SyncService',
+        'syncFromServer failed with ${e.runtimeType}',
+      );
+      telemetryThrowable = e;
+      await TelemetryService.instance.captureHandledException(
+        e,
+        stackTrace,
+        operation: 'sync.transactions_fetch',
+      );
       return SyncResult(
         success: false,
         error: e.toString(),
       );
+    } finally {
+      await finishTelemetrySpan(
+        success: telemetrySucceeded,
+        throwable: telemetryThrowable,
+      );
     }
   }
 
   /// Sync accounts from server and update local cache
   Future<SyncResult> syncAccounts(String accessToken) async {
     try {
-      final result = await _accountsService.getAccounts(accessToken: accessToken);
+      final result =
+          await _accountsService.getAccounts(accessToken: accessToken);
 
       if (result['success'] == true) {
         final accountsList = result['accounts'] as List<dynamic>? ?? [];
@@ -364,6 +534,7 @@ class SyncService with ChangeNotifier {
     }
 
     _log.info('SyncService', '==== Full Sync Started ====');
+    TelemetryService.instance.addBreadcrumb('sync', 'full_sync_started');
     _isSyncing = true;
     _syncError = null;
     notifyListeners();
@@ -372,17 +543,20 @@ class SyncService with ChangeNotifier {
       // Step 1: Process pending deletes (do this first to free up resources)
       _log.info('SyncService', 'Step 1: Processing pending deletes');
       final deleteResult = await _syncPendingDeletesInternal(accessToken);
-      _log.info('SyncService', 'Step 1 complete: ${deleteResult.syncedCount ?? 0} deleted, ${deleteResult.failedCount ?? 0} failed');
+      _log.info('SyncService',
+          'Step 1 complete: ${deleteResult.syncedCount ?? 0} deleted, ${deleteResult.failedCount ?? 0} failed');
 
       // Step 2: Upload pending transactions
       _log.info('SyncService', 'Step 2: Uploading pending transactions');
       final uploadResult = await _syncPendingTransactionsInternal(accessToken);
-      _log.info('SyncService', 'Step 2 complete: ${uploadResult.syncedCount ?? 0} uploaded, ${uploadResult.failedCount ?? 0} failed');
+      _log.info('SyncService',
+          'Step 2 complete: ${uploadResult.syncedCount ?? 0} uploaded, ${uploadResult.failedCount ?? 0} failed');
 
       // Step 3: Download transactions from server
       _log.info('SyncService', 'Step 3: Downloading transactions from server');
       final downloadResult = await syncFromServer(accessToken: accessToken);
-      _log.info('SyncService', 'Step 3 complete: ${downloadResult.syncedCount ?? 0} downloaded');
+      _log.info('SyncService',
+          'Step 3 complete: ${downloadResult.syncedCount ?? 0} downloaded');
 
       // Step 4: Sync accounts
       _log.info('SyncService', 'Step 4: Syncing accounts');
@@ -392,21 +566,48 @@ class SyncService with ChangeNotifier {
       _isSyncing = false;
       _lastSyncTime = DateTime.now();
 
-      final allSuccess = deleteResult.success && uploadResult.success && downloadResult.success && accountsResult.success;
-      _syncError = allSuccess ? null : (deleteResult.error ?? uploadResult.error ?? downloadResult.error ?? accountsResult.error);
+      final allSuccess = deleteResult.success &&
+          uploadResult.success &&
+          downloadResult.success &&
+          accountsResult.success;
+      _syncError = allSuccess
+          ? null
+          : (deleteResult.error ??
+              uploadResult.error ??
+              downloadResult.error ??
+              accountsResult.error);
 
-      _log.info('SyncService', '==== Full Sync Complete: ${allSuccess ? "SUCCESS" : "PARTIAL/FAILED"} ====');
+      _log.info('SyncService',
+          '==== Full Sync Complete: ${allSuccess ? "SUCCESS" : "PARTIAL/FAILED"} ====');
+      TelemetryService.instance.addBreadcrumb(
+        'sync',
+        'full_sync_finished',
+        data: {
+          'success': allSuccess,
+          'delete_failures': deleteResult.failedCount ?? 0,
+          'upload_failures': uploadResult.failedCount ?? 0,
+          'downloaded_count': downloadResult.syncedCount ?? 0,
+        },
+      );
 
       notifyListeners();
 
       return SyncResult(
         success: allSuccess,
-        syncedCount: (deleteResult.syncedCount ?? 0) + (uploadResult.syncedCount ?? 0) + (downloadResult.syncedCount ?? 0),
-        failedCount: (deleteResult.failedCount ?? 0) + (uploadResult.failedCount ?? 0),
+        syncedCount: (deleteResult.syncedCount ?? 0) +
+            (uploadResult.syncedCount ?? 0) +
+            (downloadResult.syncedCount ?? 0),
+        failedCount:
+            (deleteResult.failedCount ?? 0) + (uploadResult.failedCount ?? 0),
         error: _syncError,
       );
-    } catch (e) {
-      _log.error('SyncService', 'Full sync exception: $e');
+    } catch (e, stackTrace) {
+      _log.error('SyncService', 'Full sync failed with ${e.runtimeType}');
+      await TelemetryService.instance.captureHandledException(
+        e,
+        stackTrace,
+        operation: 'sync.full',
+      );
       _isSyncing = false;
       _syncError = e.toString();
       notifyListeners();
@@ -419,7 +620,8 @@ class SyncService with ChangeNotifier {
   }
 
   /// Auto sync if online - to be called when app regains connectivity
-  Future<void> autoSync(String accessToken, ConnectivityService connectivityService) async {
+  Future<void> autoSync(
+      String accessToken, ConnectivityService connectivityService) async {
     if (connectivityService.isOnline && !_isSyncing) {
       await performFullSync(accessToken);
     }
diff --git a/mobile/lib/services/tags_service.dart b/mobile/lib/services/tags_service.dart
new file mode 100644
index 000000000..da547015a
--- /dev/null
+++ b/mobile/lib/services/tags_service.dart
@@ -0,0 +1,16 @@
+import '../models/transaction_tag.dart';
+import 'response_list_parser.dart';
+
+class TagsService {
+  Future<Map<String, dynamic>> getTags({required String accessToken}) async {
+    return fetchApiList<TransactionTag>(
+      accessToken: accessToken,
+      path: '/api/v1/tags',
+      key: 'tags',
+      resultKey: 'tags',
+      fromJson: TransactionTag.fromJson,
+      isValid: (tag) => tag.id.isNotEmpty,
+      failureMessage: 'Failed to fetch tags',
+    );
+  }
+}
diff --git a/mobile/lib/services/telemetry_service.dart b/mobile/lib/services/telemetry_service.dart
new file mode 100644
index 000000000..52b1c99ea
--- /dev/null
+++ b/mobile/lib/services/telemetry_service.dart
@@ -0,0 +1,568 @@
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+
+import 'log_service.dart';
+
+class TelemetryConfig {
+  static const _dsn = String.fromEnvironment('SENTRY_DSN');
+  static const _environment = String.fromEnvironment(
+    'SENTRY_ENVIRONMENT',
+    defaultValue: 'mobile',
+  );
+  static const _release = String.fromEnvironment('SENTRY_RELEASE');
+  static const _tracesSampleRate = String.fromEnvironment(
+    'SENTRY_TRACES_SAMPLE_RATE',
+  );
+  static const _profilesSampleRate = String.fromEnvironment(
+    'SENTRY_PROFILES_SAMPLE_RATE',
+  );
+
+  final String dsn;
+  final String environment;
+  final String release;
+  final double tracesSampleRate;
+  final double profilesSampleRate;
+
+  const TelemetryConfig({
+    required this.dsn,
+    required this.environment,
+    required this.release,
+    required this.tracesSampleRate,
+    required this.profilesSampleRate,
+  });
+
+  factory TelemetryConfig.fromEnvironment() {
+    return TelemetryConfig(
+      dsn: _dsn,
+      environment: _environment.trim().isEmpty ? 'mobile' : _environment,
+      release: _release,
+      tracesSampleRate: sampleRate(_tracesSampleRate, defaultValue: 0.25),
+      profilesSampleRate: sampleRate(_profilesSampleRate, defaultValue: 0.25),
+    );
+  }
+
+  bool get isConfigured => dsn.trim().isNotEmpty;
+
+  static double sampleRate(
+    String value, {
+    required double defaultValue,
+  }) {
+    final parsed = double.tryParse(value.trim());
+    if (parsed == null || parsed.isNaN || parsed.isInfinite) {
+      return defaultValue;
+    }
+
+    if (parsed < 0) return 0;
+    if (parsed > 1) return 1;
+    return parsed;
+  }
+}
+
+class TelemetryService {
+  static final TelemetryService instance = TelemetryService();
+
+  final TelemetryConfig _config;
+  final SentryNavigatorObserver _navigatorObserver = SentryNavigatorObserver(
+    enableAutoTransactions: false,
+    routeNameExtractor: scrubRouteSettings,
+  );
+  bool _initialized = false;
+
+  TelemetryService({TelemetryConfig? config})
+      : _config = config ?? TelemetryConfig.fromEnvironment();
+
+  bool get isConfigured => _config.isConfigured;
+  bool get isActive => isConfigured && _initialized;
+
+  List<NavigatorObserver> get navigatorObservers =>
+      isConfigured ? [_navigatorObserver] : const [];
+
+  Future<void> initialize({
+    required FutureOr<void> Function() appRunner,
+  }) async {
+    if (!isConfigured) {
+      await appRunner();
+      return;
+    }
+
+    var appRunnerStarted = false;
+
+    try {
+      await SentryFlutter.init(
+        (options) {
+          options.dsn = _config.dsn.trim();
+          options.environment = _config.environment;
+          if (_config.release.trim().isNotEmpty) {
+            options.release = _config.release.trim();
+          }
+          options.tracesSampleRate = _config.tracesSampleRate;
+          // TODO: Remove this suppression once sentry_flutter stabilizes
+          // options.profilesSampleRate, then revalidate _config.profilesSampleRate
+          // against the upstream changelog.
+          // ignore: experimental_member_use
+          options.profilesSampleRate = _config.profilesSampleRate;
+          options.sendDefaultPii = false;
+          options.attachScreenshot = false;
+          options.maxRequestBodySize = MaxRequestBodySize.never;
+          options.maxResponseBodySize = MaxResponseBodySize.never;
+          options.beforeSend = filterEvent;
+          options.beforeSendTransaction = filterTransaction;
+          options.beforeBreadcrumb = filterBreadcrumb;
+          _initialized = true;
+        },
+        appRunner: () async {
+          appRunnerStarted = true;
+          await appRunner();
+        },
+      );
+    } catch (e, stackTrace) {
+      if (appRunnerStarted) rethrow;
+
+      _initialized = false;
+      LogService.instance.warning(
+        'Telemetry',
+        'Sentry initialization failed; continuing without telemetry: '
+            '${e.runtimeType}\n${stackTrace.runtimeType}',
+      );
+      await appRunner();
+    }
+  }
+
+  Future<void> setUserId(String? userId) async {
+    if (!isActive) return;
+
+    await Sentry.configureScope((scope) async {
+      final safeUserId = sanitizeUserId(userId);
+      await scope
+          .setUser(safeUserId == null ? null : SentryUser(id: safeUserId));
+    });
+  }
+
+  Future<void> clearUser() => setUserId(null);
+
+  void addBreadcrumb(
+    String category,
+    String message, {
+    Map<String, dynamic>? data,
+    SentryLevel level = SentryLevel.info,
+  }) {
+    if (!isActive) return;
+
+    unawaited(Sentry.addBreadcrumb(
+      Breadcrumb(
+        category: LogService.sanitize(category),
+        message: _sanitizeFreeformText(message),
+        data: sanitizeData(data),
+        level: level,
+      ),
+    ));
+  }
+
+  Future<T> traceAsync<T>(
+    String operation,
+    String description,
+    Future<T> Function() callback, {
+    Map<String, dynamic>? data,
+    bool Function(T result)? isSuccess,
+  }) async {
+    if (!isActive) return await callback();
+
+    final span = Sentry.startTransaction(
+      _sanitizeFreeformText(description),
+      LogService.sanitize(operation),
+      bindToScope: false,
+    );
+
+    for (final entry in sanitizeData(data).entries) {
+      span.setData(entry.key, entry.value);
+    }
+
+    try {
+      final result = await callback();
+      final status = isSuccess == null || isSuccess(result)
+          ? const SpanStatus.ok()
+          : const SpanStatus.internalError();
+      await span.finish(status: status);
+      return result;
+    } catch (e, stackTrace) {
+      span.throwable = e;
+      await span.finish(status: const SpanStatus.internalError());
+      await captureHandledException(
+        e,
+        stackTrace,
+        operation: operation,
+      );
+      rethrow;
+    }
+  }
+
+  Object? startSpan(
+    String operation,
+    String description, {
+    Map<String, dynamic>? data,
+  }) {
+    if (!isActive) return null;
+
+    final span = Sentry.startTransaction(
+      _sanitizeFreeformText(description),
+      LogService.sanitize(operation),
+      bindToScope: false,
+    );
+
+    for (final entry in sanitizeData(data).entries) {
+      span.setData(entry.key, entry.value);
+    }
+
+    return span;
+  }
+
+  Future<void> finishSpan(
+    Object? span, {
+    required bool success,
+    Object? throwable,
+  }) async {
+    if (span is! ISentrySpan) return;
+
+    if (throwable != null) {
+      span.throwable = throwable;
+    }
+
+    try {
+      await span.finish(
+        status:
+            success ? const SpanStatus.ok() : const SpanStatus.internalError(),
+      );
+    } catch (e) {
+      _logTelemetryFailure('Span finish', e);
+    }
+  }
+
+  Future<void> captureHandledException(
+    Object exception,
+    StackTrace? stackTrace, {
+    required String operation,
+  }) async {
+    if (!isActive) return;
+
+    try {
+      await Sentry.captureException(
+        exception,
+        stackTrace: stackTrace,
+        withScope: (scope) async {
+          await scope.setTag('operation', LogService.sanitize(operation));
+        },
+      );
+    } catch (e) {
+      _logTelemetryFailure('Handled exception capture', e);
+    }
+  }
+
+  static SentryEvent? filterEvent(SentryEvent event, Hint hint) {
+    final eventMessage = event.message;
+    final message = eventMessage?.copyWith(
+      formatted: _sanitizeFreeformText(eventMessage.formatted),
+      template: _sanitizeOptionalString(eventMessage.template),
+      params: eventMessage.params?.map(sanitizeValue).toList(),
+    );
+    final exceptions = event.exceptions
+        ?.map((exception) => exception.copyWith(
+              value: exception.value == null
+                  ? null
+                  : _sanitizeFreeformText(exception.value!),
+            ))
+        .toList();
+    final breadcrumbs = event.breadcrumbs
+        ?.map((crumb) => filterBreadcrumb(crumb, Hint()))
+        .toList()
+      ?..removeWhere((crumb) => crumb == null);
+
+    return event.copyWith(
+      message: message,
+      exceptions: exceptions,
+      breadcrumbs: breadcrumbs?.cast<Breadcrumb>(),
+      user: _scrubUser(event.user),
+      request: event.request == null ? null : _scrubRequest(event.request!),
+      // ignore: deprecated_member_use
+      extra: _sanitizeEventExtra(event),
+      tags: event.tags == null ? null : _sanitizeTags(event.tags!),
+    );
+  }
+
+  static SentryTransaction? filterTransaction(SentryTransaction transaction) {
+    final breadcrumbs = transaction.breadcrumbs
+        ?.map((crumb) => filterBreadcrumb(crumb, Hint()))
+        .toList()
+      ?..removeWhere((crumb) => crumb == null);
+
+    return transaction.copyWith(
+      transaction: transaction.transaction == null
+          ? null
+          : scrubRouteName(transaction.transaction!),
+      breadcrumbs: breadcrumbs?.cast<Breadcrumb>(),
+      request: transaction.request == null
+          ? null
+          : _scrubRequest(transaction.request!),
+      // ignore: deprecated_member_use
+      extra: _sanitizeTransactionExtra(transaction),
+      tags: transaction.tags == null ? null : _sanitizeTags(transaction.tags!),
+    );
+  }
+
+  static Breadcrumb? filterBreadcrumb(Breadcrumb? breadcrumb, Hint hint) {
+    if (breadcrumb == null) return null;
+    if (breadcrumb.type == 'http' || breadcrumb.category == 'http') return null;
+
+    return breadcrumb.copyWith(
+      category: breadcrumb.category == null
+          ? null
+          : LogService.sanitize(breadcrumb.category!),
+      message: breadcrumb.message == null
+          ? null
+          : _sanitizeFreeformText(breadcrumb.message!),
+      data: sanitizeData(breadcrumb.data),
+    );
+  }
+
+  static Map<String, dynamic> sanitizeData(Map<String, dynamic>? data) {
+    if (data == null || data.isEmpty) return const {};
+
+    final sanitized = <String, dynamic>{};
+    for (final entry in data.entries) {
+      final key = LogService.sanitize(entry.key);
+      if (_isSensitiveKey(key)) continue;
+
+      final value = sanitizeValue(entry.value);
+      if (value != null) {
+        sanitized[key] = value;
+      }
+    }
+    return sanitized;
+  }
+
+  static Object? sanitizeValue(Object? value) {
+    if (value == null || value is bool || value is num) return value;
+
+    if (value is String) {
+      final sanitized = LogService.sanitize(value);
+      return sanitized.length > 120 ? sanitized.substring(0, 120) : sanitized;
+    }
+
+    if (value is Map) {
+      final sanitized = <String, dynamic>{};
+      for (final entry in value.entries.take(20)) {
+        final key = LogService.sanitize(entry.key.toString());
+        if (_isSensitiveKey(key)) continue;
+
+        final sanitizedValue = sanitizeValue(entry.value);
+        if (sanitizedValue != null) {
+          sanitized[key] = sanitizedValue;
+        }
+      }
+      return sanitized;
+    }
+
+    if (value is Iterable) {
+      return value
+          .take(20)
+          .map(sanitizeValue)
+          .where((item) => item != null)
+          .toList();
+    }
+
+    return LogService.sanitize(value.runtimeType.toString());
+  }
+
+  static String? sanitizeUserId(String? userId) {
+    final trimmed = userId?.trim();
+    if (trimmed == null || trimmed.isEmpty) return null;
+    if (_looksSensitiveUserId(trimmed)) return null;
+
+    return trimmed.length > 80 ? trimmed.substring(0, 80) : trimmed;
+  }
+
+  static String? _sanitizeOptionalString(String? value) {
+    return value == null ? null : _sanitizeFreeformText(value);
+  }
+
+  static bool _isSensitiveKey(String key) {
+    final normalized = _normalizeDataKey(key);
+    const sensitiveKeys = {
+      'authorization',
+      'token',
+      'access_token',
+      'refresh_token',
+      'auth_token',
+      'password',
+      'secret',
+      'api_key',
+      'apikey',
+      'x_api_key',
+      'header',
+      'headers',
+      'auth_header',
+      'custom_proxy_header',
+      'custom_proxy_headers',
+      'url',
+      'uri',
+      'host',
+      'backend_url',
+      'base_url',
+      'email',
+      'amount',
+      'account_id',
+      'server_id',
+      'transaction_id',
+      'merchant_id',
+      'category_id',
+      'tag_id',
+      'tag_ids',
+      'user_id',
+      'local_id',
+      'account_name',
+      'merchant_name',
+      'category_name',
+      'display_name',
+      'transaction_name',
+      'first_name',
+      'last_name',
+      'payload',
+      'body',
+      'chat',
+      'message',
+      'note',
+      'sqlite',
+      'database',
+      'path',
+    };
+
+    return sensitiveKeys.contains(normalized);
+  }
+
+  static Map<String, String> _sanitizeTags(Map<String, String> tags) {
+    final sanitized = <String, String>{};
+    for (final entry in tags.entries) {
+      final key = LogService.sanitize(entry.key);
+      if (_isSensitiveKey(key)) continue;
+
+      sanitized[key] = LogService.sanitize(entry.value);
+    }
+    return sanitized;
+  }
+
+  static SentryRequest _scrubRequest(SentryRequest request) {
+    return SentryRequest(
+      method: request.method,
+      url: _scrubUrlToPath(request.url),
+    );
+  }
+
+  static SentryUser? _scrubUser(SentryUser? user) {
+    if (user == null) return null;
+
+    final safeUserId = sanitizeUserId(user.id);
+    return SentryUser(id: safeUserId ?? 'redacted');
+  }
+
+  static Map<String, dynamic>? _sanitizeEventExtra(SentryEvent event) {
+    // ignore: deprecated_member_use
+    final extra = event.extra;
+    return extra == null ? null : sanitizeData(extra);
+  }
+
+  static Map<String, dynamic>? _sanitizeTransactionExtra(
+    SentryTransaction transaction,
+  ) {
+    // ignore: deprecated_member_use
+    final extra = transaction.extra;
+    return extra == null ? null : sanitizeData(extra);
+  }
+
+  static bool _looksSensitiveUserId(String userId) {
+    return RegExp(
+      r'(@|https?://|bearer\s+|authorization|token|secret|password|api[-_]?key)',
+      caseSensitive: false,
+    ).hasMatch(userId);
+  }
+
+  static String _sanitizeFreeformText(String value) {
+    final sanitized = LogService.sanitize(value);
+    if (_looksLikeDatabaseDetail(sanitized)) {
+      return 'Local database operation failed';
+    }
+
+    return sanitized.length > 240 ? sanitized.substring(0, 240) : sanitized;
+  }
+
+  static bool _looksLikeDatabaseDetail(String value) {
+    return RegExp(
+      r'\b(sqflite|sqlite|databaseexception|sql\s|select\s|insert\s|update\s|delete\s|pragma\s|from\s+\w+|where\s+\w+|no such table)\b',
+      caseSensitive: false,
+    ).hasMatch(value);
+  }
+
+  static void _logTelemetryFailure(String action, Object error) {
+    LogService.instance.warning(
+      'Telemetry',
+      '$action failed; continuing without interrupting app flow: '
+          '${error.runtimeType}',
+    );
+  }
+
+  static RouteSettings? scrubRouteSettings(RouteSettings? settings) {
+    if (settings == null) return null;
+
+    return RouteSettings(
+      name: settings.name == null ? null : scrubRouteName(settings.name!),
+    );
+  }
+
+  static String scrubRouteName(String value) {
+    final sanitized = _sanitizeFreeformText(value);
+    final parsed = Uri.tryParse(sanitized);
+    final rawPath = parsed?.hasAbsolutePath == true ? parsed!.path : sanitized;
+    final path = rawPath.split('?').first;
+
+    final scrubbed = path.split('/').map((segment) {
+      if (segment.isEmpty) return segment;
+      if (_looksLikeRouteIdentifier(segment)) return ':id';
+
+      return segment;
+    }).join('/');
+
+    return scrubbed.length > 240 ? scrubbed.substring(0, 240) : scrubbed;
+  }
+
+  static String? _scrubUrlToPath(String? value) {
+    if (value == null || value.trim().isEmpty) return null;
+
+    final parsed = Uri.tryParse(value);
+    final path = parsed == null || parsed.path.isEmpty ? value : parsed.path;
+    final scrubbed = scrubRouteName(path);
+
+    return scrubbed.isEmpty ? null : scrubbed;
+  }
+
+  static String _normalizeDataKey(String key) {
+    return key
+        .replaceAllMapped(
+          RegExp(r'([a-z0-9])([A-Z])'),
+          (match) => '${match.group(1)}_${match.group(2)}',
+        )
+        .toLowerCase()
+        .replaceAll(RegExp(r'[^a-z0-9]+'), '_')
+        .replaceAll(RegExp(r'^_+|_+$'), '');
+  }
+
+  static bool _looksLikeRouteIdentifier(String segment) {
+    return RegExp(r'^\d+$').hasMatch(segment) ||
+        RegExp(
+          r'^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$',
+          caseSensitive: false,
+        ).hasMatch(segment) ||
+        RegExp(r'^[a-z]+_[a-z0-9_-]{8,}$', caseSensitive: false)
+            .hasMatch(segment) ||
+        RegExp(r'^[0-9a-f]{16,}$', caseSensitive: false).hasMatch(segment);
+  }
+}
diff --git a/mobile/lib/services/transactions_service.dart b/mobile/lib/services/transactions_service.dart
index 83af27de8..38bd91279 100644
--- a/mobile/lib/services/transactions_service.dart
+++ b/mobile/lib/services/transactions_service.dart
@@ -4,6 +4,13 @@ import '../models/transaction.dart';
 import 'api_config.dart';
 
 class TransactionsService {
+  static const String mobileIdempotencySource = 'sure_mobile';
+
+  final http.Client _client;
+
+  TransactionsService({http.Client? client})
+      : _client = client ?? http.Client();
+
   Future<Map<String, dynamic>> createTransaction({
     required String accessToken,
     required String accountId,
@@ -14,8 +21,17 @@ class TransactionsService {
     required String nature,
     String? notes,
     String? categoryId,
+    String? merchantId,
+    List<String>? tagIds,
+    String? externalId,
+    String? source,
   }) async {
     final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/transactions');
+    // Idempotency is only valid when both halves of the key are present.
+    final hasIdempotencyKey = externalId != null &&
+        externalId.isNotEmpty &&
+        source != null &&
+        source.isNotEmpty;
 
     final body = {
       'transaction': {
@@ -27,18 +43,24 @@ class TransactionsService {
         'nature': nature,
         if (notes != null) 'notes': notes,
         if (categoryId != null) 'category_id': categoryId,
+        if (merchantId != null) 'merchant_id': merchantId,
+        if (tagIds != null) 'tag_ids': tagIds,
+        if (hasIdempotencyKey) 'external_id': externalId,
+        if (hasIdempotencyKey) 'source': source,
       }
     };
 
     try {
-      final response = await http.post(
-        url,
-        headers: {
-          ...ApiConfig.getAuthHeaders(accessToken),
-          'Content-Type': 'application/json',
-        },
-        body: jsonEncode(body),
-      ).timeout(const Duration(seconds: 30));
+      final response = await _client
+          .post(
+            url,
+            headers: {
+              ...ApiConfig.getAuthHeaders(accessToken),
+              'Content-Type': 'application/json',
+            },
+            body: jsonEncode(body),
+          )
+          .timeout(const Duration(seconds: 30));
 
       if (response.statusCode == 200 || response.statusCode == 201) {
         final responseData = jsonDecode(response.body);
@@ -52,18 +74,13 @@ class TransactionsService {
           'error': 'unauthorized',
         };
       } else {
-        try {
-          final responseData = jsonDecode(response.body);
-          return {
-            'success': false,
-            'error': responseData['error'] ?? 'Failed to create transaction',
-          };
-        } catch (e) {
-          return {
-            'success': false,
-            'error': 'Failed to create transaction: ${response.body}',
-          };
-        }
+        return {
+          'success': false,
+          'error': errorMessageFromResponseBody(
+            response.body,
+            fallback: 'Failed to create transaction',
+          ),
+        };
       }
     } catch (e) {
       return {
@@ -97,7 +114,7 @@ class TransactionsService {
         : baseUri;
 
     try {
-      final response = await http.get(
+      final response = await _client.get(
         url,
         headers: {
           ...ApiConfig.getAuthHeaders(accessToken),
@@ -114,7 +131,8 @@ class TransactionsService {
 
         if (responseData is List) {
           transactionsJson = responseData;
-        } else if (responseData is Map && responseData.containsKey('transactions')) {
+        } else if (responseData is Map &&
+            responseData.containsKey('transactions')) {
           transactionsJson = responseData['transactions'];
           // Extract pagination metadata if present
           if (responseData.containsKey('pagination')) {
@@ -124,9 +142,8 @@ class TransactionsService {
           transactionsJson = [];
         }
 
-        final transactions = transactionsJson
-            .map((json) => Transaction.fromJson(json))
-            .toList();
+        final transactions =
+            transactionsJson.map((json) => Transaction.fromJson(json)).toList();
 
         return {
           'success': true,
@@ -152,14 +169,141 @@ class TransactionsService {
     }
   }
 
+  Future<Map<String, dynamic>> getTransaction({
+    required String accessToken,
+    required String transactionId,
+  }) async {
+    final url =
+        Uri.parse('${ApiConfig.baseUrl}/api/v1/transactions/$transactionId');
+
+    try {
+      final response = await _client.get(
+        url,
+        headers: {
+          ...ApiConfig.getAuthHeaders(accessToken),
+          'Content-Type': 'application/json',
+        },
+      ).timeout(const Duration(seconds: 30));
+
+      if (response.statusCode == 200) {
+        final responseData = jsonDecode(response.body);
+        return {
+          'success': true,
+          'transaction': Transaction.fromJson(responseData),
+        };
+      } else if (response.statusCode == 401) {
+        return {
+          'success': false,
+          'error': 'unauthorized',
+        };
+      } else {
+        return {
+          'success': false,
+          'error': errorMessageFromResponseBody(
+            response.body,
+            fallback: 'Failed to fetch transaction',
+          ),
+        };
+      }
+    } catch (e) {
+      return {
+        'success': false,
+        'error': 'Network error: ${e.toString()}',
+      };
+    }
+  }
+
+  Future<Map<String, dynamic>> updateTransaction({
+    required String accessToken,
+    required String transactionId,
+    String? name,
+    String? date,
+    String? amount,
+    String? currency,
+    String? nature,
+    String? notes,
+    String? categoryId,
+    String? merchantId,
+    List<String>? tagIds,
+  }) async {
+    final url =
+        Uri.parse('${ApiConfig.baseUrl}/api/v1/transactions/$transactionId');
+
+    final transaction = <String, dynamic>{
+      if (name != null) 'name': name,
+      if (date != null) 'date': date,
+      if (amount != null) 'amount': amount,
+      if (currency != null) 'currency': currency,
+      if (nature != null) 'nature': nature,
+      if (notes != null) 'notes': notes,
+      if (categoryId != null) 'category_id': categoryId,
+      if (merchantId != null) 'merchant_id': merchantId,
+      if (tagIds != null) 'tag_ids': tagIds,
+    };
+
+    if (transaction.isEmpty) {
+      return {
+        'success': false,
+        'error': 'No fields to update',
+      };
+    }
+
+    try {
+      final response = await _client
+          .patch(
+            url,
+            headers: {
+              ...ApiConfig.getAuthHeaders(accessToken),
+              'Content-Type': 'application/json',
+            },
+            body: jsonEncode({'transaction': transaction}),
+          )
+          .timeout(const Duration(seconds: 30));
+
+      if (response.statusCode == 200 || response.statusCode == 204) {
+        if (response.body.trim().isEmpty) {
+          return {
+            'success': true,
+            'transaction': null,
+          };
+        }
+
+        final responseData = jsonDecode(response.body);
+        return {
+          'success': true,
+          'transaction': Transaction.fromJson(responseData),
+        };
+      } else if (response.statusCode == 401) {
+        return {
+          'success': false,
+          'error': 'unauthorized',
+        };
+      } else {
+        return {
+          'success': false,
+          'error': errorMessageFromResponseBody(
+            response.body,
+            fallback: 'Failed to update transaction',
+          ),
+        };
+      }
+    } catch (e) {
+      return {
+        'success': false,
+        'error': 'Network error: ${e.toString()}',
+      };
+    }
+  }
+
   Future<Map<String, dynamic>> deleteTransaction({
     required String accessToken,
     required String transactionId,
   }) async {
-    final url = Uri.parse('${ApiConfig.baseUrl}/api/v1/transactions/$transactionId');
+    final url =
+        Uri.parse('${ApiConfig.baseUrl}/api/v1/transactions/$transactionId');
 
     try {
-      final response = await http.delete(
+      final response = await _client.delete(
         url,
         headers: {
           ...ApiConfig.getAuthHeaders(accessToken),
@@ -205,9 +349,9 @@ class TransactionsService {
     try {
       final results = await Future.wait(
         transactionIds.map((id) => deleteTransaction(
-          accessToken: accessToken,
-          transactionId: id,
-        )),
+              accessToken: accessToken,
+              transactionId: id,
+            )),
       );
 
       final allSuccess = results.every((result) => result['success'] == true);
@@ -231,4 +375,72 @@ class TransactionsService {
       };
     }
   }
+
+  static String errorMessageFromResponseBody(
+    String body, {
+    required String fallback,
+  }) {
+    try {
+      final responseData = jsonDecode(body);
+      if (responseData is! Map<String, dynamic>) return fallback;
+
+      final message = responseData['message'] ?? responseData['error'];
+      final errors = responseData['errors'];
+      final formattedErrors = _formatErrors(errors);
+
+      if (message != null && formattedErrors != null) {
+        return '${message.toString()}: $formattedErrors';
+      }
+
+      if (formattedErrors != null) return formattedErrors;
+      if (message != null) return message.toString();
+    } catch (_) {
+      return fallback;
+    }
+
+    return fallback;
+  }
+
+  static String? _formatErrors(dynamic errors) {
+    if (errors is List) {
+      final parts = errors
+          .map((error) => error?.toString().trim() ?? '')
+          .where((error) => error.isNotEmpty)
+          .toList();
+      return parts.isEmpty ? null : parts.join('; ');
+    }
+
+    if (errors is Map) {
+      final parts = <String>[];
+      for (final entry in errors.entries) {
+        final field = _humanizeField(entry.key.toString());
+        final value = entry.value;
+        if (value is List) {
+          for (final message in value) {
+            final text = message?.toString().trim() ?? '';
+            if (text.isNotEmpty) parts.add('$field $text');
+          }
+        } else {
+          final text = value?.toString().trim() ?? '';
+          if (text.isNotEmpty) parts.add('$field $text');
+        }
+      }
+      return parts.isEmpty ? null : parts.join('; ');
+    }
+
+    return null;
+  }
+
+  static String _humanizeField(String field) {
+    final words = field
+        .replaceAll('_', ' ')
+        .split(' ')
+        .where((word) => word.isNotEmpty)
+        .toList();
+    if (words.isEmpty) return field;
+
+    final first = words.first;
+    words[0] = first[0].toUpperCase() + first.substring(1);
+    return words.join(' ');
+  }
 }
diff --git a/mobile/lib/theme/sure_colors.dart b/mobile/lib/theme/sure_colors.dart
new file mode 100644
index 000000000..1438dcae9
--- /dev/null
+++ b/mobile/lib/theme/sure_colors.dart
@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+
+import 'sure_tokens.dart';
+
+/// Exposes the full Sure design-system palette to widgets in a brightness-aware
+/// way. The generated [SureTokenPalette] carries semantic colors (success,
+/// destructive, textSubdued, …) that the base [ColorScheme] does not, so without
+/// this extension widgets have to branch on `Theme.of(context).brightness` and
+/// reach into `SureTokens.light`/`SureTokens.dark` by hand. Registering the
+/// active palette here lets them resolve the correct token via
+/// `SureColors.of(context).palette.success` instead.
+@immutable
+class SureColors extends ThemeExtension<SureColors> {
+  const SureColors(this.palette);
+
+  final SureTokenPalette palette;
+
+  /// The active palette for [context]. Falls back to the palette matching the
+  /// active brightness if the extension is missing (e.g. a widget built outside
+  /// [SureTheme] in a test), so dark surfaces don't get light-palette colors.
+  static SureColors of(BuildContext context) {
+    final theme = Theme.of(context);
+    return theme.extension<SureColors>() ??
+        SureColors(
+          theme.brightness == Brightness.dark
+              ? SureTokens.dark
+              : SureTokens.light,
+        );
+  }
+
+  @override
+  SureColors copyWith({SureTokenPalette? palette}) {
+    return SureColors(palette ?? this.palette);
+  }
+
+  @override
+  SureColors lerp(ThemeExtension<SureColors>? other, double t) {
+    // Design tokens are a discrete light/dark pair; a mid-transition blend of
+    // every semantic color is not meaningful, so swap at the midpoint.
+    if (other is! SureColors) {
+      return this;
+    }
+    return t < 0.5 ? this : other;
+  }
+}
diff --git a/mobile/lib/theme/sure_spacing.dart b/mobile/lib/theme/sure_spacing.dart
new file mode 100644
index 000000000..28a3f6a7c
--- /dev/null
+++ b/mobile/lib/theme/sure_spacing.dart
@@ -0,0 +1,39 @@
+/// Sure spacing scale.
+///
+/// Mirrors the Tailwind spacing defaults the web design system relies on
+/// (`1rem = 16px`, so each step is `value * 4px`). Hand-authored rather than
+/// generated from `design/tokens/sure.tokens.json` because spacing is not part
+/// of the canonical token file — it comes from Tailwind's built-in scale, which
+/// is stable and shared across the web and mobile apps.
+///
+/// Use these instead of raw numeric `EdgeInsets`/`SizedBox` values so padding
+/// and gaps stay on the scale. Component-specific dimensions (control heights,
+/// hairline dividers) intentionally stay as literals — they are sizing, not
+/// spacing-scale steps.
+class SureSpacing {
+  const SureSpacing._();
+
+  /// 4 — Tailwind `space-1`.
+  static const double xs = 4;
+
+  /// 6 — Tailwind `space-1.5`.
+  static const double sm = 6;
+
+  /// 8 — Tailwind `space-2`.
+  static const double md = 8;
+
+  /// 12 — Tailwind `space-3`.
+  static const double lg = 12;
+
+  /// 16 — Tailwind `space-4`.
+  static const double xl = 16;
+
+  /// 20 — Tailwind `space-5`.
+  static const double xxl = 20;
+
+  /// 24 — Tailwind `space-6`.
+  static const double xxxl = 24;
+
+  /// 32 — Tailwind `space-8`.
+  static const double huge = 32;
+}
diff --git a/mobile/lib/theme/sure_theme.dart b/mobile/lib/theme/sure_theme.dart
new file mode 100644
index 000000000..eca75aa92
--- /dev/null
+++ b/mobile/lib/theme/sure_theme.dart
@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+
+import 'sure_colors.dart';
+import 'sure_tokens.dart';
+
+class SureTheme {
+  const SureTheme._();
+
+  static ThemeData get light => _build(SureTokens.light, Brightness.light);
+
+  static ThemeData get dark => _build(SureTokens.dark, Brightness.dark);
+
+  static ThemeData _build(SureTokenPalette tokens, Brightness brightness) {
+    final colorScheme = ColorScheme(
+      brightness: brightness,
+      primary: tokens.link,
+      onPrimary: tokens.textInverse,
+      // The container roles were unset, so on screens not yet redesigned with
+      // SureColors (e.g. Chats) Material defaulted them to a blue that read as
+      // off-brand on FAB/badge/avatar surfaces. Pin them to a neutral Sure
+      // surface with primary text on top. `primary`/`secondary` stay link/info so
+      // existing link/accent callers are unchanged; the prominent neutral primary
+      // action color is applied to FABs via floatingActionButtonTheme below.
+      primaryContainer: tokens.surfaceInset,
+      onPrimaryContainer: tokens.textPrimary,
+      secondary: tokens.info,
+      onSecondary: tokens.textInverse,
+      secondaryContainer: tokens.surfaceInset,
+      onSecondaryContainer: tokens.textPrimary,
+      error: tokens.destructive,
+      onError: tokens.textInverse,
+      errorContainer: tokens.destructiveSubtle,
+      onErrorContainer: tokens.textPrimary,
+      surface: tokens.surface,
+      onSurface: tokens.textPrimary,
+      surfaceContainerHighest: tokens.containerInset,
+      outline: tokens.borderSecondary,
+      outlineVariant: tokens.borderSubdued,
+    );
+
+    final inputBorder = OutlineInputBorder(
+      borderRadius: BorderRadius.circular(SureTokens.radiusLg),
+      borderSide: BorderSide(color: tokens.borderSecondary),
+    );
+
+    final base = ThemeData(
+      fontFamily: SureTokens.fontSans,
+      fontFamilyFallback: SureTokens.fontFallback,
+      colorScheme: colorScheme,
+      scaffoldBackgroundColor: tokens.surface,
+      useMaterial3: true,
+      extensions: <ThemeExtension<dynamic>>[SureColors(tokens)],
+      appBarTheme: AppBarTheme(
+        centerTitle: true,
+        elevation: 0,
+        backgroundColor: tokens.surface,
+        foregroundColor: tokens.textPrimary,
+        surfaceTintColor: Colors.transparent,
+      ),
+      cardTheme: CardThemeData(
+        color: tokens.container,
+        surfaceTintColor: Colors.transparent,
+        shadowColor: tokens.shadow,
+        elevation: 2,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(SureTokens.radiusLg),
+        ),
+      ),
+      inputDecorationTheme: InputDecorationTheme(
+        border: inputBorder,
+        enabledBorder: inputBorder,
+        focusedBorder: inputBorder.copyWith(
+          borderSide: BorderSide(color: tokens.borderPrimary),
+        ),
+        filled: true,
+        fillColor: tokens.container,
+      ),
+      elevatedButtonTheme: ElevatedButtonThemeData(
+        style: ElevatedButton.styleFrom(
+          minimumSize: const Size(double.infinity, 50),
+          backgroundColor: tokens.buttonPrimary,
+          foregroundColor: tokens.textInverse,
+          disabledBackgroundColor: tokens.containerInset,
+          disabledForegroundColor: tokens.textSubdued,
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(SureTokens.radiusLg),
+          ),
+        ),
+      ),
+      // The FAB is Sure's primary action surface — use the neutral brand primary
+      // (near-black in light, white in dark) so it reads as the prominent action
+      // instead of the subtle primaryContainer the Material 3 default would use.
+      floatingActionButtonTheme: FloatingActionButtonThemeData(
+        backgroundColor: tokens.buttonPrimary,
+        foregroundColor: tokens.textInverse,
+      ),
+    );
+
+    return base.copyWith(
+      textTheme: base.textTheme.apply(
+        bodyColor: tokens.textPrimary,
+        displayColor: tokens.textPrimary,
+      ),
+      primaryTextTheme: base.primaryTextTheme.apply(
+        bodyColor: tokens.textPrimary,
+        displayColor: tokens.textPrimary,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/theme/sure_tokens.dart b/mobile/lib/theme/sure_tokens.dart
new file mode 100644
index 000000000..60ad0d441
--- /dev/null
+++ b/mobile/lib/theme/sure_tokens.dart
@@ -0,0 +1,171 @@
+// GENERATED CODE - DO NOT EDIT BY HAND.
+// Source: design/tokens/sure.tokens.json
+// Build: node mobile/tool/generate_sure_tokens.mjs
+
+import 'package:flutter/painting.dart';
+
+class SureTokens {
+  const SureTokens._();
+
+  static const String version = '2.1.0';
+  static const String fontSans = 'Geist';
+  static const String fontMono = 'Geist Mono';
+
+  // Keep the existing Flutter fallback behavior until native mobile font assets
+  // are registered. The canonical web stack remains in sure.tokens.json.
+  static const List<String> fontFallback = <String>[
+    'Inter',
+    'Arial',
+    'sans-serif',
+  ];
+
+  static const double radiusMd = 8.0;
+  static const double radiusLg = 10.0;
+
+  static const FontWeight weightMedium = FontWeight.w500;
+  static const FontWeight weightSemibold = FontWeight.w600;
+
+  static const light = SureTokenPalette(
+    surface: Color(0xFFF7F7F7),
+    surfaceHover: Color(0xFFF0F0F0),
+    surfaceInset: Color(0xFFF0F0F0),
+    surfaceInsetHover: Color(0xFFE7E7E7),
+    container: Color(0xFFFFFFFF),
+    containerHover: Color(0xFFF7F7F7),
+    containerInset: Color(0xFFF7F7F7),
+    containerInsetHover: Color(0xFFF0F0F0),
+    success: Color(0xFF078C52),
+    warning: Color(0xFFDC6803),
+    destructive: Color(0xFFF13636),
+    destructiveSubtle: Color(0xFFFEB9B3),
+    info: Color(0xFF1570EF),
+    link: Color(0xFF1570EF),
+    shadow: Color(0x0F0B0B0B),
+    focusRing: Color(0x800B0B0B),
+    bgInverse: Color(0xFF242424),
+    textPrimary: Color(0xFF171717),
+    textInverse: Color(0xFFFFFFFF),
+    textSecondary: Color(0xFF737373),
+    textSubdued: Color(0xFF9E9E9E),
+    borderPrimary: Color(0x260B0B0B),
+    borderSecondary: Color(0x1A0B0B0B),
+    borderSubdued: Color(0x0D0B0B0B),
+    buttonPrimary: Color(0xFF171717),
+    buttonPrimaryHover: Color(0xFF242424),
+    buttonDestructive: Color(0xFFEC2222),
+    buttonDestructiveHover: Color(0xFFC91313),
+    shadowXs: [BoxShadow(color: Color(0x0F0B0B0B), offset: Offset(0.0, 1.0), blurRadius: 2.0, spreadRadius: 0.0)],
+    shadowSm: [BoxShadow(color: Color(0x0F0B0B0B), offset: Offset(0.0, 1.0), blurRadius: 6.0, spreadRadius: 0.0)],
+    shadowMd: [BoxShadow(color: Color(0x0F0B0B0B), offset: Offset(0.0, 4.0), blurRadius: 8.0, spreadRadius: -2.0)],
+    shadowLg: [BoxShadow(color: Color(0x0F0B0B0B), offset: Offset(0.0, 12.0), blurRadius: 16.0, spreadRadius: -4.0)],
+    shadowXl: [BoxShadow(color: Color(0x0F0B0B0B), offset: Offset(0.0, 20.0), blurRadius: 24.0, spreadRadius: -4.0)],
+  );
+
+  static const dark = SureTokenPalette(
+    surface: Color(0xFF0B0B0B),
+    surfaceHover: Color(0xFF242424),
+    surfaceInset: Color(0xFF242424),
+    surfaceInsetHover: Color(0xFF242424),
+    container: Color(0xFF171717),
+    containerHover: Color(0xFF242424),
+    containerInset: Color(0xFF242424),
+    containerInsetHover: Color(0xFF363636),
+    success: Color(0xFF32D583),
+    warning: Color(0xFFFDB022),
+    destructive: Color(0xFFED4E4E),
+    destructiveSubtle: Color(0xFFA40E0E),
+    info: Color(0xFF2E90FA),
+    link: Color(0xFF2E90FA),
+    shadow: Color(0x14FFFFFF),
+    focusRing: Color(0x80FFFFFF),
+    bgInverse: Color(0xFFFFFFFF),
+    textPrimary: Color(0xFFFFFFFF),
+    textInverse: Color(0xFF171717),
+    textSecondary: Color(0xFFCFCFCF),
+    textSubdued: Color(0xFF9E9E9E),
+    borderPrimary: Color(0x4DFFFFFF),
+    borderSecondary: Color(0x33FFFFFF),
+    borderSubdued: Color(0x1AFFFFFF),
+    buttonPrimary: Color(0xFFFFFFFF),
+    buttonPrimaryHover: Color(0xFFF7F7F7),
+    buttonDestructive: Color(0xFFED4E4E),
+    buttonDestructiveHover: Color(0xFFF13636),
+    shadowXs: [BoxShadow(color: Color(0x14FFFFFF), offset: Offset(0.0, 1.0), blurRadius: 2.0, spreadRadius: 0.0)],
+    shadowSm: [BoxShadow(color: Color(0x14FFFFFF), offset: Offset(0.0, 1.0), blurRadius: 6.0, spreadRadius: 0.0)],
+    shadowMd: [BoxShadow(color: Color(0x14FFFFFF), offset: Offset(0.0, 4.0), blurRadius: 8.0, spreadRadius: -2.0)],
+    shadowLg: [BoxShadow(color: Color(0x14FFFFFF), offset: Offset(0.0, 12.0), blurRadius: 16.0, spreadRadius: -4.0)],
+    shadowXl: [BoxShadow(color: Color(0x14FFFFFF), offset: Offset(0.0, 20.0), blurRadius: 24.0, spreadRadius: -4.0)],
+  );
+}
+
+class SureTokenPalette {
+  const SureTokenPalette({
+    required this.surface,
+    required this.surfaceHover,
+    required this.surfaceInset,
+    required this.surfaceInsetHover,
+    required this.container,
+    required this.containerHover,
+    required this.containerInset,
+    required this.containerInsetHover,
+    required this.success,
+    required this.warning,
+    required this.destructive,
+    required this.destructiveSubtle,
+    required this.info,
+    required this.link,
+    required this.shadow,
+    required this.focusRing,
+    required this.bgInverse,
+    required this.textPrimary,
+    required this.textInverse,
+    required this.textSecondary,
+    required this.textSubdued,
+    required this.borderPrimary,
+    required this.borderSecondary,
+    required this.borderSubdued,
+    required this.buttonPrimary,
+    required this.buttonPrimaryHover,
+    required this.buttonDestructive,
+    required this.buttonDestructiveHover,
+    required this.shadowXs,
+    required this.shadowSm,
+    required this.shadowMd,
+    required this.shadowLg,
+    required this.shadowXl,
+  });
+
+  final Color surface;
+  final Color surfaceHover;
+  final Color surfaceInset;
+  final Color surfaceInsetHover;
+  final Color container;
+  final Color containerHover;
+  final Color containerInset;
+  final Color containerInsetHover;
+  final Color success;
+  final Color warning;
+  final Color destructive;
+  final Color destructiveSubtle;
+  final Color info;
+  final Color link;
+  final Color shadow;
+  final Color focusRing;
+  final Color bgInverse;
+  final Color textPrimary;
+  final Color textInverse;
+  final Color textSecondary;
+  final Color textSubdued;
+  final Color borderPrimary;
+  final Color borderSecondary;
+  final Color borderSubdued;
+  final Color buttonPrimary;
+  final Color buttonPrimaryHover;
+  final Color buttonDestructive;
+  final Color buttonDestructiveHover;
+  final List<BoxShadow> shadowXs;
+  final List<BoxShadow> shadowSm;
+  final List<BoxShadow> shadowMd;
+  final List<BoxShadow> shadowLg;
+  final List<BoxShadow> shadowXl;
+}
diff --git a/mobile/lib/theme/sure_typography.dart b/mobile/lib/theme/sure_typography.dart
new file mode 100644
index 000000000..d816d7f5d
--- /dev/null
+++ b/mobile/lib/theme/sure_typography.dart
@@ -0,0 +1,31 @@
+/// Sure type scale.
+///
+/// Mirrors the Tailwind font-size defaults the web design system uses. Like
+/// [SureSpacing], this is hand-authored rather than generated from
+/// `design/tokens/sure.tokens.json` because the type scale comes from Tailwind's
+/// built-in `text-*` ramp, not the canonical token file.
+///
+/// Values are font sizes in logical pixels; the comment on each records the
+/// Tailwind step and its paired line-height for reference. Use these instead of
+/// raw `fontSize` literals so text stays on the scale.
+class SureTypography {
+  const SureTypography._();
+
+  /// 12 / 16 — Tailwind `text-xs`.
+  static const double xs = 12;
+
+  /// 14 / 20 — Tailwind `text-sm`.
+  static const double sm = 14;
+
+  /// 16 / 24 — Tailwind `text-base`.
+  static const double base = 16;
+
+  /// 18 / 28 — Tailwind `text-lg`.
+  static const double lg = 18;
+
+  /// 20 / 28 — Tailwind `text-xl`.
+  static const double xl = 20;
+
+  /// 24 / 32 — Tailwind `text-2xl`.
+  static const double xxl = 24;
+}
diff --git a/mobile/lib/utils/amount_parser.dart b/mobile/lib/utils/amount_parser.dart
new file mode 100644
index 000000000..aa1cf662a
--- /dev/null
+++ b/mobile/lib/utils/amount_parser.dart
@@ -0,0 +1,204 @@
+import 'package:intl/intl.dart';
+
+class ParsedAmount {
+  const ParsedAmount({
+    required this.value,
+    required this.canonicalValue,
+    required this.displayText,
+  });
+
+  final double value;
+  final String canonicalValue;
+  final String displayText;
+}
+
+class AmountParser {
+  static ParsedAmount parse(String input, {String? locale}) {
+    final normalized = _normalizeMinus(input.trim());
+    final negative = _isNegative(normalized);
+    final numericText = normalized.replaceAll(RegExp(r'[^0-9.,]'), '');
+
+    if (!RegExp(r'\d').hasMatch(numericText)) {
+      throw const FormatException('Amount must contain digits');
+    }
+
+    final separators = _Separators.forLocale(locale);
+    final decimalSeparator = _decimalSeparatorFor(numericText, separators);
+    final canonical = _canonicalize(
+      numericText,
+      decimalSeparator: decimalSeparator,
+      negative: negative,
+    );
+
+    return ParsedAmount(
+      value: double.parse(canonical),
+      canonicalValue: canonical,
+      displayText: _displayText(normalized),
+    );
+  }
+
+  static String canonicalize(String input, {String? locale}) {
+    return parse(input, locale: locale).canonicalValue;
+  }
+
+  static String _normalizeMinus(String value) {
+    return value
+        .replaceAll('\u2212', '-')
+        .replaceAll('\u2012', '-')
+        .replaceAll('\u2013', '-')
+        .replaceAll('\u2014', '-');
+  }
+
+  static bool _isNegative(String value) {
+    final trimmed = value.trim();
+    return trimmed.contains('-') ||
+        (trimmed.startsWith('(') && trimmed.endsWith(')'));
+  }
+
+  static String _displayText(String value) {
+    var display = value.trim();
+
+    if (display.startsWith('(') && display.endsWith(')')) {
+      display = display.substring(1, display.length - 1).trim();
+    }
+
+    display = display.replaceAll(RegExp(r'[-+]'), '').trim();
+
+    return display;
+  }
+
+  static String _canonicalize(
+    String numericText, {
+    required String? decimalSeparator,
+    required bool negative,
+  }) {
+    String integerDigits;
+    String fractionDigits = '';
+
+    if (decimalSeparator == null) {
+      integerDigits = numericText.replaceAll(RegExp(r'\D'), '');
+    } else {
+      final decimalIndex = numericText.lastIndexOf(decimalSeparator);
+      integerDigits =
+          numericText.substring(0, decimalIndex).replaceAll(RegExp(r'\D'), '');
+      fractionDigits =
+          numericText.substring(decimalIndex + 1).replaceAll(RegExp(r'\D'), '');
+    }
+
+    integerDigits = integerDigits.replaceFirst(RegExp(r'^0+(?=\d)'), '');
+    if (integerDigits.isEmpty) {
+      integerDigits = '0';
+    }
+
+    fractionDigits = fractionDigits.replaceFirst(RegExp(r'0+$'), '');
+
+    final unsigned = fractionDigits.isEmpty
+        ? integerDigits
+        : '$integerDigits.$fractionDigits';
+
+    if (!negative || unsigned == '0') {
+      return unsigned;
+    }
+
+    return '-$unsigned';
+  }
+
+  static String? _decimalSeparatorFor(
+    String numericText,
+    _Separators separators,
+  ) {
+    final lastDot = numericText.lastIndexOf('.');
+    final lastComma = numericText.lastIndexOf(',');
+
+    if (lastDot == -1 && lastComma == -1) {
+      return null;
+    }
+
+    if (lastDot != -1 && lastComma != -1) {
+      return lastDot > lastComma ? '.' : ',';
+    }
+
+    final separator = lastDot == -1 ? ',' : '.';
+    final parts = numericText.split(separator);
+
+    if (parts.length > 2) {
+      if (_looksGrouped(parts)) {
+        return null;
+      }
+
+      throw const FormatException('Invalid amount format');
+    }
+
+    if (separator == separators.decimalSeparator) {
+      return separator;
+    }
+
+    final lastGroupLength = parts.last.length;
+    if (separator == separators.groupSeparator && lastGroupLength == 3) {
+      return null;
+    }
+
+    if (_looksGrouped(parts)) {
+      return null;
+    }
+
+    return separator;
+  }
+
+  static bool _looksGrouped(List<String> parts) {
+    if (parts.length < 2 || parts.first.isEmpty || parts.first.length > 3) {
+      return false;
+    }
+
+    return parts.skip(1).every((part) => part.length == 3);
+  }
+}
+
+class _Separators {
+  const _Separators({
+    required this.decimalSeparator,
+    required this.groupSeparator,
+  });
+
+  final String decimalSeparator;
+  final String groupSeparator;
+
+  static _Separators forLocale(String? locale) {
+    final effectiveLocale = locale ?? Intl.getCurrentLocale();
+
+    try {
+      final symbols = NumberFormat.decimalPattern(effectiveLocale).symbols;
+      return _Separators(
+        decimalSeparator: symbols.DECIMAL_SEP,
+        groupSeparator: symbols.GROUP_SEP,
+      );
+    } catch (_) {
+      if (_usesDecimalComma(effectiveLocale)) {
+        return const _Separators(decimalSeparator: ',', groupSeparator: '.');
+      }
+
+      return const _Separators(decimalSeparator: '.', groupSeparator: ',');
+    }
+  }
+
+  // Fallback heuristic for common decimal-comma locales when NumberFormat's
+  // locale database cannot resolve the requested locale. Keep the set limited
+  // to languages we intentionally support and extend it with tests as needed.
+  static bool _usesDecimalComma(String locale) {
+    final language = locale.split(RegExp(r'[-_]')).first.toLowerCase();
+    return {
+      'ca',
+      'de',
+      'es',
+      'fr',
+      'hu',
+      'id',
+      'it',
+      'nl',
+      'pl',
+      'pt',
+      'ro',
+      'tr',
+    }.contains(language);
+  }
+}
diff --git a/mobile/lib/utils/json_parsing.dart b/mobile/lib/utils/json_parsing.dart
new file mode 100644
index 000000000..fb372a16f
--- /dev/null
+++ b/mobile/lib/utils/json_parsing.dart
@@ -0,0 +1,33 @@
+class JsonParsing {
+  static String? parseString(dynamic value) {
+    if (value == null) return null;
+    return value.toString();
+  }
+
+  static String parseRequiredString(dynamic value, String fieldName) {
+    final parsed = parseString(value);
+    if (parsed == null) {
+      throw FormatException('Missing $fieldName');
+    }
+    return parsed;
+  }
+
+  static int? parseInt(dynamic value) {
+    if (value == null) return null;
+    if (value is int) return value;
+    return int.tryParse(value.toString());
+  }
+
+  static DateTime? parseDateTime(dynamic value) {
+    if (value == null) return null;
+    return DateTime.tryParse(value.toString());
+  }
+
+  static DateTime parseRequiredDateTime(dynamic value, String fieldName) {
+    final parsed = parseDateTime(value);
+    if (parsed == null) {
+      throw FormatException('Invalid $fieldName date');
+    }
+    return parsed;
+  }
+}
diff --git a/mobile/lib/utils/money_masker.dart b/mobile/lib/utils/money_masker.dart
new file mode 100644
index 000000000..a16f6aa5d
--- /dev/null
+++ b/mobile/lib/utils/money_masker.dart
@@ -0,0 +1,32 @@
+/// Masks monetary values for "privacy mode", where the user wants amounts
+/// hidden from over-the-shoulder view.
+///
+/// The numeric portion of an amount (its digits and any embedded grouping/
+/// decimal separators) is collapsed into a short, fixed run of bullets, while
+/// the currency symbol/code and sign are kept. So `CA$1,234.56` -> `CA$••••`
+/// and `-$42,078.35` -> `-$••••`. A fixed run (rather than one bullet per
+/// digit) avoids leaking the value's magnitude and reads cleanly without stray
+/// separators. Non-numeric characters are untouched, so the masker is currency-
+/// and locale-agnostic — it works on any already-formatted amount string.
+class MoneyMasker {
+  const MoneyMasker._();
+
+  /// The character used to mask digits.
+  static const String maskChar = '•'; // •
+
+  /// The fixed run of [maskChar] that replaces the numeric portion of an amount.
+  static const String maskedNumber = '$maskChar$maskChar$maskChar$maskChar';
+
+  /// A maximal run of digits and the separators embedded within them, requiring
+  /// at least one digit so symbol-only strings (e.g. the `--` placeholder) are
+  /// left alone.
+  static final RegExp _numericRun = RegExp(r'[\d.,]*\d[\d.,]*');
+
+  /// Returns [formatted] with its numeric portion replaced by [maskedNumber],
+  /// preserving the currency symbol/code and sign. If [hidden] is false,
+  /// [formatted] is returned unchanged.
+  static String mask(String formatted, {bool hidden = true}) {
+    if (!hidden) return formatted;
+    return formatted.replaceAll(_numericRun, maskedNumber);
+  }
+}
diff --git a/mobile/lib/widgets/account_card.dart b/mobile/lib/widgets/account_card.dart
index f3cbd8636..26bc1eb5b 100644
--- a/mobile/lib/widgets/account_card.dart
+++ b/mobile/lib/widgets/account_card.dart
@@ -1,5 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import '../models/account.dart';
+import '../providers/privacy_provider.dart';
+import '../theme/sure_colors.dart';
+import '../theme/sure_tokens.dart';
+import '../utils/money_masker.dart';
+import 'money_text.dart';
+import 'sure_card.dart';
+import 'sure_icon.dart';
 
 class AccountCard extends StatelessWidget {
   final Account account;
@@ -13,38 +21,38 @@ class AccountCard extends StatelessWidget {
     this.onSwipe,
   });
 
-  IconData _getAccountIcon() {
+  String _getAccountIconName() {
     switch (account.accountType) {
       case 'depository':
-        return Icons.account_balance;
+        return SureIcons.landmark;
       case 'credit_card':
-        return Icons.credit_card;
+        return SureIcons.creditCard;
       case 'investment':
-        return Icons.trending_up;
+        return SureIcons.trendingUp;
       case 'loan':
-        return Icons.receipt_long;
+        return SureIcons.receipt;
       case 'property':
-        return Icons.home;
+        return SureIcons.house;
       case 'vehicle':
-        return Icons.directions_car;
+        return SureIcons.car;
       case 'crypto':
-        return Icons.currency_bitcoin;
+        return SureIcons.bitcoin;
       case 'other_asset':
-        return Icons.category;
+        return SureIcons.shapes;
       case 'other_liability':
-        return Icons.payment;
+        return SureIcons.handCoins;
       default:
-        return Icons.account_balance_wallet;
+        return SureIcons.wallet;
     }
   }
 
   Color _getAccountColor(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
-    
+
     if (account.isAsset) {
-      return Colors.green;
+      return SureColors.of(context).palette.success;
     } else if (account.isLiability) {
-      return Colors.red;
+      return SureColors.of(context).palette.destructive;
     }
     return colorScheme.primary;
   }
@@ -53,79 +61,78 @@ class AccountCard extends StatelessWidget {
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     final accountColor = _getAccountColor(context);
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
 
-    final cardContent = Card(
+    final cardContent = SureCard(
       margin: const EdgeInsets.only(bottom: 12),
-      child: InkWell(
-        onTap: onTap,
-        borderRadius: BorderRadius.circular(12),
-        child: Padding(
-          padding: const EdgeInsets.all(16),
-          child: Row(
+      onTap: onTap,
+      child: Row(
+        children: [
+          // Account icon
+          Container(
+            width: 48,
+            height: 48,
+            decoration: BoxDecoration(
+              color: accountColor.withValues(alpha: 0.1),
+              borderRadius: BorderRadius.circular(12),
+            ),
+            child: SureIcon(
+              _getAccountIconName(),
+              color: accountColor,
+              size: SureIconSize.lg,
+            ),
+          ),
+          const SizedBox(width: 16),
+
+          // Account info
+          Expanded(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  account.name,
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: SureTokens.weightMedium,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                const SizedBox(height: 4),
+                Text(
+                  account.displayAccountType,
+                  style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                    color: colorScheme.onSurfaceVariant,
+                  ),
+                ),
+              ],
+            ),
+          ),
+
+          // Balance
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.end,
             children: [
-              // Account icon
-              Container(
-                width: 48,
-                height: 48,
-                decoration: BoxDecoration(
-                  color: accountColor.withValues(alpha: 0.1),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: Icon(
-                  _getAccountIcon(),
-                  color: accountColor,
-                  size: 24,
+              Text(
+                MoneyMasker.mask(account.balance, hidden: hideAmounts),
+                style: SureMoney.tabular(
+                  Theme.of(context).textTheme.titleMedium?.copyWith(
+                    fontWeight: SureTokens.weightMedium,
+                    color: account.isLiability
+                        ? SureColors.of(context).palette.destructive
+                        : null,
+                  ),
                 ),
               ),
-              const SizedBox(width: 16),
-
-              // Account info
-              Expanded(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Text(
-                      account.name,
-                      style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                        fontWeight: FontWeight.w600,
-                      ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                    const SizedBox(height: 4),
-                    Text(
-                      account.displayAccountType,
-                      style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                        color: colorScheme.onSurfaceVariant,
-                      ),
-                    ),
-                  ],
+              const SizedBox(height: 4),
+              Text(
+                account.currency,
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
                 ),
               ),
-
-              // Balance
-              Column(
-                crossAxisAlignment: CrossAxisAlignment.end,
-                children: [
-                  Text(
-                    account.balance,
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                      fontWeight: FontWeight.bold,
-                      color: account.isLiability ? Colors.red : null,
-                    ),
-                  ),
-                  const SizedBox(height: 4),
-                  Text(
-                    account.currency,
-                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                      color: colorScheme.onSurfaceVariant,
-                    ),
-                  ),
-                ],
-              ),
             ],
           ),
-        ),
+        ],
       ),
     );
 
@@ -145,12 +152,16 @@ class AccountCard extends StatelessWidget {
           padding: const EdgeInsets.only(right: 20),
           decoration: BoxDecoration(
             color: Colors.blue,
-            borderRadius: BorderRadius.circular(12),
+            borderRadius: BorderRadius.circular(SureTokens.radiusLg),
           ),
           child: const Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Icon(Icons.receipt_long, color: Colors.white, size: 28),
+              SureIcon(
+                SureIcons.receipt,
+                color: Colors.white,
+                size: SureIconSize.xl,
+              ),
               SizedBox(height: 4),
               Text(
                 'Transactions',
diff --git a/mobile/lib/widgets/account_detail_header.dart b/mobile/lib/widgets/account_detail_header.dart
new file mode 100644
index 000000000..0bb013715
--- /dev/null
+++ b/mobile/lib/widgets/account_detail_header.dart
@@ -0,0 +1,450 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:provider/provider.dart';
+import '../models/account.dart';
+import '../models/account_balance.dart';
+import '../models/account_holding.dart';
+import '../providers/auth_provider.dart';
+import '../providers/privacy_provider.dart';
+import '../services/account_detail_service.dart';
+import '../l10n/app_localizations.dart';
+import '../utils/money_masker.dart';
+
+class AccountDetailHeader extends StatefulWidget {
+  final Account account;
+  final AccountDetailService? accountDetailService;
+
+  const AccountDetailHeader({
+    super.key,
+    required this.account,
+    this.accountDetailService,
+  });
+
+  @override
+  State<AccountDetailHeader> createState() => _AccountDetailHeaderState();
+}
+
+class _AccountDetailHeaderState extends State<AccountDetailHeader> {
+  late final AccountDetailService _accountDetailService =
+      widget.accountDetailService ?? AccountDetailService();
+  late final bool _ownsAccountDetailService =
+      widget.accountDetailService == null;
+  late Account _account;
+  bool _isLoading = false;
+  bool _detailsUnavailable = false;
+  List<AccountBalance> _balances = [];
+  List<AccountHolding> _holdings = [];
+  bool _disposed = false;
+  bool _accountDetailServiceClosed = false;
+  int _activeDetailLoads = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    _account = widget.account;
+    _loadDetails();
+  }
+
+  Future<void> _loadDetails() async {
+    if (_disposed) return;
+
+    // NOTE: this runs synchronously from initState(); do not touch inherited
+    // widgets (e.g. AppLocalizations.of) here. The failure message is localized
+    // at render time in build() via the _detailsUnavailable flag.
+    final authProvider = Provider.of<AuthProvider>(context, listen: false);
+    final accessToken = await authProvider.getValidAccessToken();
+    if (_disposed) return;
+
+    if (accessToken == null) {
+      await authProvider.logout();
+      return;
+    }
+
+    _activeDetailLoads += 1;
+
+    if (mounted) {
+      setState(() {
+        _isLoading = true;
+        _detailsUnavailable = false;
+      });
+    }
+
+    try {
+      final results = await Future.wait([
+        _accountDetailService.getAccountDetail(
+          accessToken: accessToken,
+          accountId: widget.account.id,
+        ),
+        _accountDetailService.getBalances(
+          accessToken: accessToken,
+          accountId: widget.account.id,
+        ),
+      ]);
+
+      final accountResult = results[0];
+      final balancesResult = results[1];
+      final resolvedAccount = accountResult['success'] == true &&
+              accountResult['account'] is Account
+          ? accountResult['account'] as Account
+          : _account;
+
+      Map<String, dynamic>? holdingsResult;
+      if (_supportsHoldings(resolvedAccount)) {
+        holdingsResult = await _accountDetailService.getHoldings(
+          accessToken: accessToken,
+          accountId: widget.account.id,
+        );
+      }
+
+      if (!mounted || _disposed) return;
+
+      if (accountResult['error'] == 'unauthorized' ||
+          balancesResult['error'] == 'unauthorized' ||
+          holdingsResult?['error'] == 'unauthorized') {
+        await authProvider.logout();
+        return;
+      }
+
+      setState(() {
+        if (accountResult['success'] == true &&
+            accountResult['account'] is Account) {
+          _account = resolvedAccount;
+        }
+        if (balancesResult['success'] == true) {
+          _balances = (balancesResult['balances'] as List<dynamic>? ?? [])
+              .whereType<AccountBalance>()
+              .toList();
+        }
+        if (holdingsResult?['success'] == true) {
+          _holdings = (holdingsResult?['holdings'] as List<dynamic>? ?? [])
+              .whereType<AccountHolding>()
+              .toList();
+        }
+        if (accountResult['success'] != true &&
+            balancesResult['success'] != true) {
+          _detailsUnavailable = true;
+        }
+        _isLoading = false;
+      });
+    } finally {
+      _activeDetailLoads -= 1;
+      _closeOwnedAccountDetailServiceIfIdle();
+    }
+  }
+
+  bool _supportsHoldings(Account account) {
+    return account.accountType == 'investment' ||
+        account.accountType == 'crypto';
+  }
+
+  @override
+  void dispose() {
+    _disposed = true;
+    _closeOwnedAccountDetailServiceIfIdle();
+    super.dispose();
+  }
+
+  void _closeOwnedAccountDetailServiceIfIdle() {
+    if (_ownsAccountDetailService &&
+        _disposed &&
+        _activeDetailLoads == 0 &&
+        !_accountDetailServiceClosed) {
+      _accountDetailService.close();
+      _accountDetailServiceClosed = true;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
+    final colorScheme = Theme.of(context).colorScheme;
+    final latestBalance = _balances.isNotEmpty ? _balances.first : null;
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
+
+    return Card(
+      margin: const EdgeInsets.fromLTRB(16, 8, 16, 8),
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Expanded(
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        _account.displayAccountType,
+                        style: Theme.of(context).textTheme.labelLarge?.copyWith(
+                              color: colorScheme.onSurfaceVariant,
+                            ),
+                      ),
+                      const SizedBox(height: 4),
+                      Text(
+                        MoneyMasker.mask(_account.balance, hidden: hideAmounts),
+                        style: Theme.of(context)
+                            .textTheme
+                            .headlineSmall
+                            ?.copyWith(
+                              fontWeight: FontWeight.bold,
+                              color: _account.isLiability ? Colors.red : null,
+                            ),
+                      ),
+                    ],
+                  ),
+                ),
+                if (_isLoading)
+                  const SizedBox(
+                    width: 18,
+                    height: 18,
+                    child: CircularProgressIndicator(strokeWidth: 2),
+                  )
+                else
+                  IconButton(
+                    icon: const Icon(Icons.refresh),
+                    tooltip: l.accountDetailRefreshTooltip,
+                    onPressed: _loadDetails,
+                  ),
+              ],
+            ),
+            if (_account.institutionName != null ||
+                _account.subtype != null ||
+                _account.cashBalance != null ||
+                _account.status != null) ...[
+              const SizedBox(height: 12),
+              Wrap(
+                spacing: 8,
+                runSpacing: 8,
+                children: [
+                  if (_account.institutionName != null)
+                    _DetailChip(
+                      label: _account.institutionName!,
+                      icon: Icons.account_balance,
+                    ),
+                  if (_account.subtype != null)
+                    _DetailChip(
+                      label: _account.subtype!,
+                      icon: Icons.category_outlined,
+                    ),
+                  if (_account.cashBalance != null)
+                    _DetailChip(
+                      label: l.accountDetailCashChip(
+                        MoneyMasker.mask(_account.cashBalance!,
+                            hidden: hideAmounts),
+                      ),
+                      icon: Icons.payments_outlined,
+                    ),
+                  if (_account.status != null)
+                    _DetailChip(
+                      label: _account.status!,
+                      icon: Icons.sync,
+                    ),
+                ],
+              ),
+            ],
+            if (_balances.length >= 2) ...[
+              const SizedBox(height: 16),
+              Row(
+                children: [
+                  Expanded(
+                    child: Text(
+                      l.accountDetailRecentBalanceHistory,
+                      style: Theme.of(context).textTheme.titleSmall,
+                    ),
+                  ),
+                  Text(
+                    latestBalance == null
+                        ? ''
+                        : DateFormat.yMMMd(
+                            Localizations.localeOf(context).toString(),
+                          ).format(latestBalance.date),
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: colorScheme.onSurfaceVariant,
+                        ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 8),
+              SizedBox(
+                height: 56,
+                child: _BalanceSparkline(balances: _balances),
+              ),
+            ],
+            if (_holdings.isNotEmpty) ...[
+              const SizedBox(height: 16),
+              Text(
+                l.accountDetailTopHoldings,
+                style: Theme.of(context).textTheme.titleSmall,
+              ),
+              const SizedBox(height: 8),
+              ..._holdings.take(3).map(
+                    (holding) => Padding(
+                      padding: const EdgeInsets.only(bottom: 6),
+                      child: Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              holding.ticker?.isNotEmpty == true
+                                  ? holding.ticker!
+                                  : holding.securityName?.trim().isNotEmpty == true
+                                      ? holding.securityName!
+                                      : l.accountDetailHoldingFallback,
+                              overflow: TextOverflow.ellipsis,
+                            ),
+                          ),
+                          Text(
+                            MoneyMasker.mask(holding.amount,
+                                hidden: hideAmounts),
+                            style: Theme.of(context)
+                                .textTheme
+                                .bodyMedium
+                                ?.copyWith(
+                                  fontWeight: FontWeight.w600,
+                                ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+            ],
+            if (_detailsUnavailable) ...[
+              const SizedBox(height: 8),
+              Text(
+                l.accountDetailUnavailable,
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      color: colorScheme.error,
+                    ),
+              ),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _DetailChip extends StatelessWidget {
+  final String label;
+  final IconData icon;
+
+  const _DetailChip({
+    required this.label,
+    required this.icon,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+      decoration: BoxDecoration(
+        color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.6),
+        borderRadius: BorderRadius.circular(12),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Icon(icon, size: 14, color: colorScheme.onSurfaceVariant),
+          const SizedBox(width: 4),
+          Text(
+            label,
+            style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                  color: colorScheme.onSurfaceVariant,
+                ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class _BalanceSparkline extends StatelessWidget {
+  final List<AccountBalance> balances;
+
+  const _BalanceSparkline({required this.balances});
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+    final points = balances
+        .where((balance) => balance.balanceCents != null)
+        .toList()
+        .reversed
+        .toList();
+
+    if (points.length < 2) {
+      return const SizedBox.shrink();
+    }
+
+    return CustomPaint(
+      painter: _BalanceSparklinePainter(
+        values:
+            points.map((balance) => balance.balanceCents!.toDouble()).toList(),
+        color: colorScheme.primary,
+      ),
+      child: const SizedBox.expand(),
+    );
+  }
+}
+
+class _BalanceSparklinePainter extends CustomPainter {
+  final List<double> values;
+  final Color color;
+
+  const _BalanceSparklinePainter({
+    required this.values,
+    required this.color,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    if (values.length < 2) return;
+
+    var minValue = values.first;
+    var maxValue = values.first;
+    for (final value in values) {
+      if (value < minValue) minValue = value;
+      if (value > maxValue) maxValue = value;
+    }
+
+    final range = maxValue - minValue;
+    final path = Path();
+    for (var index = 0; index < values.length; index++) {
+      final x = size.width * (index / (values.length - 1));
+      final normalized = range == 0 ? 0.5 : (values[index] - minValue) / range;
+      final y = size.height - (normalized * size.height);
+
+      if (index == 0) {
+        path.moveTo(x, y);
+      } else {
+        path.lineTo(x, y);
+      }
+    }
+
+    final guidePaint = Paint()
+      ..color = color.withValues(alpha: 0.12)
+      ..strokeWidth = 1;
+    canvas.drawLine(
+      Offset(0, size.height / 2),
+      Offset(size.width, size.height / 2),
+      guidePaint,
+    );
+
+    final linePaint = Paint()
+      ..color = color
+      ..strokeWidth = 2
+      ..style = PaintingStyle.stroke
+      ..strokeCap = StrokeCap.round
+      ..strokeJoin = StrokeJoin.round;
+    canvas.drawPath(path, linePaint);
+  }
+
+  @override
+  bool shouldRepaint(covariant _BalanceSparklinePainter oldDelegate) {
+    return !listEquals(oldDelegate.values, values) ||
+        oldDelegate.color != color;
+  }
+}
diff --git a/mobile/lib/widgets/category_filter.dart b/mobile/lib/widgets/category_filter.dart
index 448c1fc2b..604d4d31a 100644
--- a/mobile/lib/widgets/category_filter.dart
+++ b/mobile/lib/widgets/category_filter.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import '../l10n/app_localizations.dart';
 import '../models/category.dart' as models;
 
 class CategoryFilter extends StatelessWidget {
@@ -15,6 +16,7 @@ class CategoryFilter extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     if (availableCategories.isEmpty) {
       return const SizedBox.shrink();
     }
@@ -32,7 +34,7 @@ class CategoryFilter extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.only(right: 8),
             child: FilterChip(
-              label: const Text('All'),
+              label: Text(l.commonAll),
               selected: isAllSelected,
               onSelected: (_) {
                 onSelectionChanged({});
diff --git a/mobile/lib/widgets/connectivity_banner.dart b/mobile/lib/widgets/connectivity_banner.dart
index eb8fb01f1..d87de5fd0 100644
--- a/mobile/lib/widgets/connectivity_banner.dart
+++ b/mobile/lib/widgets/connectivity_banner.dart
@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
 import '../services/connectivity_service.dart';
 import '../providers/transactions_provider.dart';
 import '../providers/auth_provider.dart';
+import '../l10n/app_localizations.dart';
 
 class ConnectivityBanner extends StatefulWidget {
   const ConnectivityBanner({super.key});
@@ -15,11 +16,14 @@ class _ConnectivityBannerState extends State<ConnectivityBanner> {
   bool _isSyncing = false;
 
   Future<void> _handleSync(BuildContext context, String? accessToken, TransactionsProvider transactionsProvider) async {
+    // Capture context-derived objects before the async gap so we never touch
+    // `context` after an await.
+    final l = AppLocalizations.of(context);
+    final messenger = ScaffoldMessenger.of(context);
     if (accessToken == null) {
-      if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Please sign in to sync transactions'),
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(l.connectivitySignInToSync),
           backgroundColor: Colors.orange,
         ),
       );
@@ -35,17 +39,17 @@ class _ConnectivityBannerState extends State<ConnectivityBanner> {
       await transactionsProvider.syncTransactions(accessToken: accessToken);
 
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Transactions synced successfully'),
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(l.connectivitySyncSuccess),
           backgroundColor: Colors.green,
         ),
       );
     } catch (e) {
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Failed to sync transactions. Please try again.'),
+      messenger.showSnackBar(
+        SnackBar(
+          content: Text(l.connectivitySyncFailed),
           backgroundColor: Colors.red,
         ),
       );
@@ -62,6 +66,7 @@ class _ConnectivityBannerState extends State<ConnectivityBanner> {
   Widget build(BuildContext context) {
     return Consumer2<ConnectivityService, TransactionsProvider>(
       builder: (context, connectivityService, transactionsProvider, _) {
+        final l = AppLocalizations.of(context);
         final isOffline = connectivityService.isOffline;
         final hasPending = transactionsProvider.hasPendingTransactions;
         final pendingCount = transactionsProvider.pendingCount;
@@ -87,8 +92,8 @@ class _ConnectivityBannerState extends State<ConnectivityBanner> {
                 Expanded(
                   child: Text(
                     isOffline
-                        ? 'You are offline. Changes will sync when online.'
-                        : '$pendingCount transaction${pendingCount == 1 ? '' : 's'} pending sync',
+                        ? l.connectivityOffline
+                        : l.connectivityPendingSync(pendingCount),
                     style: TextStyle(
                       color: isOffline ? Colors.orange.shade900 : Colors.blue.shade900,
                       fontSize: 14,
@@ -113,8 +118,8 @@ class _ConnectivityBannerState extends State<ConnectivityBanner> {
                                 } catch (e) {
                                   if (!context.mounted) return;
                                   ScaffoldMessenger.of(context).showSnackBar(
-                                    const SnackBar(
-                                      content: Text('Unable to authenticate. Please try again.'),
+                                    SnackBar(
+                                      content: Text(l.connectivityAuthFailed),
                                       backgroundColor: Colors.red,
                                     ),
                                   );
@@ -145,7 +150,7 @@ class _ConnectivityBannerState extends State<ConnectivityBanner> {
                                   valueColor: AlwaysStoppedAnimation<Color>(Colors.blue.shade900),
                                 ),
                               )
-                            : const Text('Sync Now'),
+                            : Text(l.connectivitySyncNow),
                       );
                     },
                   ),
diff --git a/mobile/lib/widgets/currency_filter.dart b/mobile/lib/widgets/currency_filter.dart
index ad2e86b47..42eb77330 100644
--- a/mobile/lib/widgets/currency_filter.dart
+++ b/mobile/lib/widgets/currency_filter.dart
@@ -1,5 +1,8 @@
 import 'package:flutter/material.dart';
 
+import '../l10n/app_localizations.dart';
+import 'sure_chip.dart';
+
 class CurrencyFilter extends StatelessWidget {
   final Set<String> availableCurrencies;
   final Set<String> selectedCurrencies;
@@ -37,14 +40,18 @@ class CurrencyFilter extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     if (availableCurrencies.length <= 1) {
       return const SizedBox.shrink();
     }
 
     final sortedCurrencies = availableCurrencies.toList()..sort();
-    final colorScheme = Theme.of(context).colorScheme;
-    final isAllSelected = selectedCurrencies.isEmpty ||
-        selectedCurrencies.length == availableCurrencies.length;
+    // Ignore stale codes that are no longer available, otherwise a leftover
+    // selection could make length-based "All" detection fire incorrectly.
+    final normalizedSelected =
+        selectedCurrencies.intersection(availableCurrencies);
+    final isAllSelected = normalizedSelected.isEmpty ||
+        normalizedSelected.length == availableCurrencies.length;
 
     return Container(
       height: 44,
@@ -55,44 +62,29 @@ class CurrencyFilter extends StatelessWidget {
           // "All" chip
           Padding(
             padding: const EdgeInsets.only(right: 8),
-            child: FilterChip(
-              label: const Text('All'),
+            child: SureChip(
+              label: l.commonAll,
               selected: isAllSelected,
-              onSelected: (_) {
-                onSelectionChanged({});
-              },
-              backgroundColor: colorScheme.surfaceContainerHighest,
-              selectedColor: colorScheme.primaryContainer,
-              checkmarkColor: colorScheme.onPrimaryContainer,
-              labelStyle: TextStyle(
-                color: isAllSelected
-                    ? colorScheme.onPrimaryContainer
-                    : colorScheme.onSurfaceVariant,
-                fontWeight: isAllSelected ? FontWeight.bold : FontWeight.normal,
-              ),
-              side: BorderSide(
-                color: isAllSelected
-                    ? colorScheme.primary
-                    : colorScheme.outline.withValues(alpha: 0.3),
-              ),
-              padding: const EdgeInsets.symmetric(horizontal: 8),
+              onSelected: (_) => onSelectionChanged({}),
             ),
           ),
 
           // Currency chips
           ...sortedCurrencies.map((currency) {
             final isSelected =
-                selectedCurrencies.contains(currency) && !isAllSelected;
+                normalizedSelected.contains(currency) && !isAllSelected;
             final symbol = _getCurrencySymbol(currency);
-            final displayText = symbol.isNotEmpty ? '$currency ($symbol)' : currency;
+            final displayText = symbol.isNotEmpty
+                ? '$currency ($symbol)'
+                : currency;
 
             return Padding(
               padding: const EdgeInsets.only(right: 8),
-              child: FilterChip(
-                label: Text(displayText),
+              child: SureChip(
+                label: displayText,
                 selected: isSelected,
                 onSelected: (_) {
-                  final newSelection = Set<String>.from(selectedCurrencies);
+                  final newSelection = Set<String>.from(normalizedSelected);
                   if (isSelected) {
                     newSelection.remove(currency);
                   } else {
@@ -103,27 +95,13 @@ class CurrencyFilter extends StatelessWidget {
                     newSelection.add(currency);
                   }
                   // If all currencies selected, treat as "All"
-                  if (newSelection.length == availableCurrencies.length) {
+                  if (newSelection.length == availableCurrencies.length &&
+                      newSelection.containsAll(availableCurrencies)) {
                     onSelectionChanged({});
                   } else {
                     onSelectionChanged(newSelection);
                   }
                 },
-                backgroundColor: colorScheme.surfaceContainerHighest,
-                selectedColor: colorScheme.primaryContainer,
-                checkmarkColor: colorScheme.onPrimaryContainer,
-                labelStyle: TextStyle(
-                  color: isSelected
-                      ? colorScheme.onPrimaryContainer
-                      : colorScheme.onSurfaceVariant,
-                  fontWeight: isSelected ? FontWeight.bold : FontWeight.normal,
-                ),
-                side: BorderSide(
-                  color: isSelected
-                      ? colorScheme.primary
-                      : colorScheme.outline.withValues(alpha: 0.3),
-                ),
-                padding: const EdgeInsets.symmetric(horizontal: 8),
               ),
             );
           }),
diff --git a/mobile/lib/widgets/custom_proxy_headers_editor.dart b/mobile/lib/widgets/custom_proxy_headers_editor.dart
index 29dcc95ed..8077b24f3 100644
--- a/mobile/lib/widgets/custom_proxy_headers_editor.dart
+++ b/mobile/lib/widgets/custom_proxy_headers_editor.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
+import '../l10n/app_localizations.dart';
 import '../models/custom_proxy_header.dart';
+import 'sure_text_field.dart';
 
 class CustomProxyHeadersEditor extends StatefulWidget {
   final List<CustomProxyHeader> initialHeaders;
@@ -13,7 +15,8 @@ class CustomProxyHeadersEditor extends StatefulWidget {
   });
 
   @override
-  State<CustomProxyHeadersEditor> createState() => _CustomProxyHeadersEditorState();
+  State<CustomProxyHeadersEditor> createState() =>
+      _CustomProxyHeadersEditorState();
 }
 
 class _CustomProxyHeadersEditorState extends State<CustomProxyHeadersEditor> {
@@ -30,7 +33,12 @@ class _CustomProxyHeadersEditorState extends State<CustomProxyHeadersEditor> {
   void _notifyChanged() {
     widget.onChanged(
       _drafts
-          .map((draft) => CustomProxyHeader(name: draft.name.text, value: draft.value.text))
+          .map(
+            (draft) => CustomProxyHeader(
+              name: draft.name.text,
+              value: draft.value.text,
+            ),
+          )
           .where((header) => header.isComplete)
           .toList(),
     );
@@ -58,6 +66,7 @@ class _CustomProxyHeadersEditorState extends State<CustomProxyHeadersEditor> {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
@@ -72,7 +81,7 @@ class _CustomProxyHeadersEditorState extends State<CustomProxyHeadersEditor> {
         OutlinedButton.icon(
           onPressed: _addHeader,
           icon: const Icon(Icons.add),
-          label: const Text('Add header'),
+          label: Text(l.proxyHeadersAddHeader),
         ),
       ],
     );
@@ -92,36 +101,36 @@ class _HeaderRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final l = AppLocalizations.of(context);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         Expanded(
           child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
             children: [
-              TextFormField(
+              SureTextField(
                 controller: draft.name,
-                decoration: const InputDecoration(
-                  labelText: 'Header name',
-                  hintText: 'X-Auth-Token',
-                ),
-                validator: (value) => CustomProxyHeader.validateName(value ?? ''),
+                label: l.proxyHeadersNameLabel,
+                hint: l.proxyHeadersNameHint,
+                validator: (value) =>
+                    CustomProxyHeader.validateName(value ?? ''),
                 onChanged: (_) => onChanged(),
               ),
-              const SizedBox(height: 8),
-              TextFormField(
+              const SizedBox(height: 12),
+              SureTextField(
                 controller: draft.value,
-                decoration: const InputDecoration(
-                  labelText: 'Header value',
-                ),
+                label: l.proxyHeadersValueLabel,
                 obscureText: true,
-                validator: (value) => CustomProxyHeader.validateValue(value ?? ''),
+                validator: (value) =>
+                    CustomProxyHeader.validateValue(value ?? ''),
                 onChanged: (_) => onChanged(),
               ),
             ],
           ),
         ),
         IconButton(
-          tooltip: 'Remove header',
+          tooltip: l.proxyHeadersRemove,
           icon: const Icon(Icons.delete_outline),
           onPressed: onRemove,
         ),
@@ -135,8 +144,8 @@ class _HeaderDraft {
   final TextEditingController value;
 
   _HeaderDraft({String name = '', String value = ''})
-      : name = TextEditingController(text: name),
-        value = TextEditingController(text: value);
+    : name = TextEditingController(text: name),
+      value = TextEditingController(text: value);
 
   void dispose() {
     name.dispose();
diff --git a/mobile/lib/widgets/money_text.dart b/mobile/lib/widgets/money_text.dart
new file mode 100644
index 000000000..8420b8fcb
--- /dev/null
+++ b/mobile/lib/widgets/money_text.dart
@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+
+import '../theme/sure_colors.dart';
+
+/// Directional meaning of a monetary value, used to pick its semantic color.
+/// This mirrors the app's existing in/out coloring (money in is positive, money
+/// out is negative) but routes it through Sure design-system tokens instead of
+/// raw [Colors.green]/[Colors.red].
+enum MoneyTrend {
+  /// Money coming in (positive change, income, a gain). Uses `success`.
+  inflow,
+
+  /// Money going out (negative change, expense, a loss). Uses `destructive`.
+  outflow,
+
+  /// No directional meaning / unknown amount. Uses `textSubdued`.
+  neutral,
+}
+
+/// Shared money typography + semantic color, so every screen renders monetary
+/// values the same way: tabular figures (digits stay aligned across rows) and a
+/// design-system color chosen from the value's [MoneyTrend].
+///
+/// Convention for callers:
+/// - Directionally-colored amounts (income/expense, +/- changes): use
+///   [MoneyText] (or [style]) with a [MoneyTrend] — it applies the semantic
+///   color *and* tabular figures, so do not also wrap the style in [tabular].
+/// - Neutral amounts that are not directionally colored (account balances, net
+///   worth, per-currency totals): use [tabular] to keep digits aligned without
+///   changing the color. [MoneyTrend.neutral] is reserved for unknown/unparsed
+///   amounts (renders in `textSubdued`).
+class SureMoney {
+  const SureMoney._();
+
+  /// The design-system color for [trend] in the active theme.
+  static Color color(BuildContext context, MoneyTrend trend) {
+    final palette = SureColors.of(context).palette;
+    switch (trend) {
+      case MoneyTrend.inflow:
+        return palette.success;
+      case MoneyTrend.outflow:
+        return palette.destructive;
+      case MoneyTrend.neutral:
+        return palette.textSubdued;
+    }
+  }
+
+  /// Derive a [MoneyTrend] from a signed amount. `null` amounts are [neutral].
+  static MoneyTrend trendForAmount(double? amount) {
+    if (amount == null) {
+      return MoneyTrend.neutral;
+    }
+    return amount >= 0 ? MoneyTrend.inflow : MoneyTrend.outflow;
+  }
+
+  /// A money [TextStyle]: [base] (so callers keep their size) plus the semantic
+  /// color for [trend] and tabular figures for column-aligned digits.
+  static TextStyle style(
+    BuildContext context, {
+    required MoneyTrend trend,
+    TextStyle? base,
+  }) {
+    final resolved = base ?? const TextStyle();
+    return resolved.copyWith(
+      color: color(context, trend),
+      fontWeight: resolved.fontWeight ?? FontWeight.w600,
+      fontFeatures: const <FontFeature>[FontFeature.tabularFigures()],
+    );
+  }
+
+  /// Apply only money typography (tabular figures) to [base], leaving the color
+  /// untouched. For neutral balances/totals (e.g. net worth) that are not
+  /// directionally colored but should still keep digits column-aligned.
+  static TextStyle tabular(TextStyle? base) {
+    return (base ?? const TextStyle()).copyWith(
+      fontFeatures: const <FontFeature>[FontFeature.tabularFigures()],
+    );
+  }
+}
+
+/// Renders a pre-formatted monetary [text] with shared money typography and the
+/// semantic color for [trend].
+class MoneyText extends StatelessWidget {
+  const MoneyText(
+    this.text, {
+    super.key,
+    required this.trend,
+    this.style,
+    this.textAlign,
+    this.overflow,
+  });
+
+  final String text;
+  final MoneyTrend trend;
+
+  /// Base style (size/weight). Color and tabular figures are applied on top.
+  final TextStyle? style;
+  final TextAlign? textAlign;
+  final TextOverflow? overflow;
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      text,
+      textAlign: textAlign,
+      overflow: overflow,
+      style: SureMoney.style(context, trend: trend, base: style),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/net_worth_card.dart b/mobile/lib/widgets/net_worth_card.dart
index 2d0ca03a0..df79bfa69 100644
--- a/mobile/lib/widgets/net_worth_card.dart
+++ b/mobile/lib/widgets/net_worth_card.dart
@@ -1,4 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../providers/privacy_provider.dart';
+import '../theme/sure_colors.dart';
+import '../theme/sure_tokens.dart';
+import '../utils/money_masker.dart';
+import 'money_text.dart';
+import 'sure_icon.dart';
 
 enum AccountFilter { all, assets, liabilities }
 
@@ -24,16 +32,26 @@ class NetWorthCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
+    final palette = SureColors.of(context).palette;
+    final hideAmounts = context.watch<PrivacyProvider>().hidden;
+    final maskedNetWorth = netWorthFormatted == null
+        ? '--'
+        : MoneyMasker.mask(netWorthFormatted!, hidden: hideAmounts);
+    String maskedFormat(String currency, double amount) =>
+        MoneyMasker.mask(formatAmount(currency, amount), hidden: hideAmounts);
 
     return Container(
+      key: const ValueKey('netWorthCardChrome'),
       margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
       decoration: BoxDecoration(
-        color: colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
-        borderRadius: BorderRadius.circular(16),
-        border: Border.all(
-          color: colorScheme.outline.withValues(alpha: 0.2),
-        ),
+        // Align the hero card with the Sure card chrome (mirrors SureCard /
+        // AccountCard): tokenized container fill, hairline border, the subtle
+        // DS shadow, and the canonical radius — instead of Material's
+        // surfaceContainerHighest/outline.
+        color: palette.container,
+        borderRadius: BorderRadius.circular(SureTokens.radiusLg),
+        border: Border.all(color: palette.borderSecondary),
+        boxShadow: palette.shadowXs,
       ),
       child: Column(
         children: [
@@ -49,7 +67,7 @@ class NetWorthCard extends StatelessWidget {
                     Text(
                       'Net Worth',
                       style: Theme.of(context).textTheme.labelMedium?.copyWith(
-                            color: colorScheme.onSurfaceVariant,
+                            color: palette.textSecondary,
                           ),
                     ),
                     if (isStale) ...[
@@ -57,14 +75,14 @@ class NetWorthCard extends StatelessWidget {
                       Container(
                         padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1),
                         decoration: BoxDecoration(
-                          color: colorScheme.secondaryContainer.withValues(alpha: 0.5),
+                          color: palette.surfaceInset,
                           borderRadius: BorderRadius.circular(4),
                         ),
                         child: Text(
                           'Outdated',
                           style: Theme.of(context).textTheme.labelSmall?.copyWith(
-                                color: colorScheme.secondary,
-                                fontWeight: FontWeight.w600,
+                                color: palette.textSubdued,
+                                fontWeight: SureTokens.weightMedium,
                               ),
                         ),
                       ),
@@ -73,11 +91,15 @@ class NetWorthCard extends StatelessWidget {
                 ),
                 const SizedBox(height: 4),
                 Text(
-                  netWorthFormatted ?? '--',
-                  style: Theme.of(context).textTheme.headlineSmall?.copyWith(
-                        fontWeight: FontWeight.bold,
-                        color: isStale ? colorScheme.secondary : colorScheme.onSurface,
-                      ),
+                  maskedNetWorth,
+                  style: SureMoney.tabular(
+                    Theme.of(context).textTheme.headlineSmall?.copyWith(
+                          fontWeight: SureTokens.weightMedium,
+                          color: isStale
+                              ? palette.textSubdued
+                              : palette.textPrimary,
+                        ),
+                  ),
                 ),
               ],
             ),
@@ -86,7 +108,7 @@ class NetWorthCard extends StatelessWidget {
           // Divider
           Divider(
             height: 1,
-            color: colorScheme.outline.withValues(alpha: 0.2),
+            color: palette.borderSecondary,
           ),
 
           // Assets & Liabilities Row
@@ -97,7 +119,7 @@ class NetWorthCard extends StatelessWidget {
                 Expanded(
                   child: _FilterButton(
                     totals: assetTotalsByCurrency,
-                    color: Colors.green,
+                    color: palette.success,
                     isSelected: currentFilter == AccountFilter.assets,
                     onTap: () {
                       if (currentFilter == AccountFilter.assets) {
@@ -110,23 +132,24 @@ class NetWorthCard extends StatelessWidget {
                       context,
                       'Assets',
                       assetTotalsByCurrency,
-                      Colors.green,
+                      palette.success,
+                      maskedFormat,
                     ),
-                    formatAmount: formatAmount,
+                    formatAmount: maskedFormat,
                   ),
                 ),
 
                 // Vertical Divider
                 VerticalDivider(
                   width: 1,
-                  color: colorScheme.outline.withValues(alpha: 0.2),
+                  color: palette.borderSecondary,
                 ),
 
                 // Liabilities
                 Expanded(
                   child: _FilterButton(
                     totals: liabilityTotalsByCurrency,
-                    color: Colors.red,
+                    color: palette.destructive,
                     isSelected: currentFilter == AccountFilter.liabilities,
                     onTap: () {
                       if (currentFilter == AccountFilter.liabilities) {
@@ -139,9 +162,10 @@ class NetWorthCard extends StatelessWidget {
                       context,
                       'Liabilities',
                       liabilityTotalsByCurrency,
-                      Colors.red,
+                      palette.destructive,
+                      maskedFormat,
                     ),
-                    formatAmount: formatAmount,
+                    formatAmount: maskedFormat,
                   ),
                 ),
               ],
@@ -157,6 +181,7 @@ class NetWorthCard extends StatelessWidget {
     String title,
     Map<String, double> totals,
     Color color,
+    String Function(String currency, double amount) formatAmount,
   ) {
     final sortedEntries = totals.entries.toList()
       ..sort((a, b) => b.value.abs().compareTo(a.value.abs()));
@@ -171,7 +196,7 @@ class NetWorthCard extends StatelessWidget {
         borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
       ),
       builder: (context) {
-        final colorScheme = Theme.of(context).colorScheme;
+        final palette = SureColors.of(context).palette;
         return Padding(
           padding: const EdgeInsets.fromLTRB(24, 16, 24, 32),
           child: Column(
@@ -182,7 +207,7 @@ class NetWorthCard extends StatelessWidget {
                 width: 40,
                 height: 4,
                 decoration: BoxDecoration(
-                  color: colorScheme.onSurfaceVariant.withValues(alpha: 0.3),
+                  color: palette.borderSecondary,
                   borderRadius: BorderRadius.circular(2),
                 ),
               ),
@@ -192,16 +217,18 @@ class NetWorthCard extends StatelessWidget {
               Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  Icon(
-                    title == 'Assets' ? Icons.trending_up : Icons.trending_down,
+                  SureIcon(
+                    title == 'Assets'
+                        ? SureIcons.trendingUp
+                        : SureIcons.trendingDown,
                     color: color,
-                    size: 20,
+                    size: SureIconSize.md,
                   ),
                   const SizedBox(width: 8),
                   Text(
                     title,
                     style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                          fontWeight: FontWeight.bold,
+                          fontWeight: SureTokens.weightMedium,
                           color: color,
                         ),
                   ),
@@ -226,14 +253,15 @@ class NetWorthCard extends StatelessWidget {
                         Text(
                           entry.key,
                           style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                fontWeight: FontWeight.w500,
-                                color: colorScheme.onSurfaceVariant,
+                                fontWeight: SureTokens.weightMedium,
+                                color: palette.textSecondary,
                               ),
                         ),
                         Text(
                           formatAmount(entry.key, entry.value),
                           style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                fontWeight: FontWeight.bold,
+                                fontWeight: SureTokens.weightMedium,
+                                color: palette.textPrimary,
                               ),
                         ),
                       ],
@@ -268,7 +296,7 @@ class _FilterButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final colorScheme = Theme.of(context).colorScheme;
+    final palette = SureColors.of(context).palette;
 
     final sortedEntries = totals.entries.toList()
       ..sort((a, b) => b.value.abs().compareTo(a.value.abs()));
@@ -295,8 +323,8 @@ class _FilterButton extends StatelessWidget {
                     child: Text(
                       '--',
                       style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: colorScheme.onSurface,
+                            fontWeight: SureTokens.weightMedium,
+                            color: palette.textPrimary,
                           ),
                     ),
                   )
@@ -304,10 +332,12 @@ class _FilterButton extends StatelessWidget {
                     ? Center(
                         child: Text(
                           formatAmount(sortedEntries.first.key, sortedEntries.first.value),
-                          style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                fontWeight: FontWeight.bold,
-                                color: colorScheme.onSurface,
-                              ),
+                          style: SureMoney.tabular(
+                            Theme.of(context).textTheme.titleMedium?.copyWith(
+                                  fontWeight: SureTokens.weightMedium,
+                                  color: palette.textPrimary,
+                                ),
+                          ),
                         ),
                       )
                     : NotificationListener<ScrollNotification>(
@@ -324,10 +354,12 @@ class _FilterButton extends StatelessWidget {
                               return Center(
                                 child: Text(
                                   formatAmount(entry.key, entry.value),
-                                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                                        fontWeight: FontWeight.bold,
-                                        color: colorScheme.onSurface,
-                                      ),
+                                  style: SureMoney.tabular(
+                                    Theme.of(context).textTheme.titleMedium?.copyWith(
+                                          fontWeight: SureTokens.weightMedium,
+                                          color: palette.textPrimary,
+                                        ),
+                                  ),
                                 ),
                               );
                             },
diff --git a/mobile/lib/widgets/sure_button.dart b/mobile/lib/widgets/sure_button.dart
new file mode 100644
index 000000000..6ddafd989
--- /dev/null
+++ b/mobile/lib/widgets/sure_button.dart
@@ -0,0 +1,298 @@
+import 'package:flutter/cupertino.dart' show CupertinoActivityIndicator;
+import 'package:flutter/material.dart';
+
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+import '../theme/sure_tokens.dart';
+import '../theme/sure_typography.dart';
+
+/// Sure design-system button variants, mirroring the web `DS::Button`
+/// (`DS::Buttonish::VARIANTS`).
+enum SureButtonVariant { primary, secondary, destructive, outline, ghost }
+
+/// Button sizes, mirroring the web `DS::Buttonish::SIZES` (sm/md/lg ≈ 28/36/48).
+enum SureButtonSize { sm, md, lg }
+
+/// Sure design-system button — a custom, non-Material control mirroring the web
+/// `DS::Button`: tokenized variant colors, `font-medium` label, sizes, and a
+/// flat custom press feedback (no Material ripple). `onPressed: null` (or
+/// [loading]) renders a disabled button.
+///
+/// Colors resolve from the active [SureColors] palette, so the button is
+/// brightness-aware and stays in lockstep with `sure.tokens.json`.
+class SureButton extends StatefulWidget {
+  final String label;
+
+  /// Tap handler. When null the button is disabled (50% opacity, no taps).
+  final VoidCallback? onPressed;
+
+  final SureButtonVariant variant;
+  final SureButtonSize size;
+
+  /// Optional leading widget (e.g. a `SureIcon`), kept decoupled so the button
+  /// doesn't depend on any specific icon implementation.
+  final Widget? leading;
+
+  /// Stretch to the available width (mirrors `full_width`).
+  final bool fullWidth;
+
+  /// Show an adaptive spinner in place of the leading slot and disable taps.
+  final bool loading;
+
+  const SureButton({
+    super.key,
+    required this.label,
+    required this.onPressed,
+    this.variant = SureButtonVariant.primary,
+    this.size = SureButtonSize.md,
+    this.leading,
+    this.fullWidth = false,
+    this.loading = false,
+  });
+
+  @override
+  State<SureButton> createState() => _SureButtonState();
+}
+
+class _SureButtonState extends State<SureButton> {
+  bool _pressed = false;
+  bool _focused = false;
+
+  bool get _enabled => widget.onPressed != null && !widget.loading;
+
+  @override
+  void didUpdateWidget(covariant SureButton oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    // If the button is disabled mid-press, onTapUp/onTapCancel never fire — so
+    // clear the pressed state here to avoid it sticking on once re-enabled.
+    if (!_enabled) {
+      _pressed = false;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final palette = SureColors.of(context).palette;
+    final style = _SureButtonStyle.resolve(widget.variant, palette);
+    final metrics = _SureButtonMetrics.resolve(widget.size);
+
+    final background = _pressed && _enabled ? style.pressedBackground : style.background;
+
+    final label = Text(
+      widget.label,
+      style: TextStyle(
+        color: style.foreground,
+        fontSize: metrics.fontSize,
+        fontWeight: FontWeight.w500,
+      ),
+      maxLines: 1,
+      overflow: TextOverflow.ellipsis,
+    );
+
+    // Build the spinner per-platform so the foreground tint is honored on both:
+    // CircularProgressIndicator.adaptive renders a CupertinoActivityIndicator on
+    // Apple platforms, which ignores `valueColor`, so pass `color` to it directly.
+    final platform = Theme.of(context).platform;
+    final isCupertino =
+        platform == TargetPlatform.iOS || platform == TargetPlatform.macOS;
+    final leading = widget.loading
+        ? SizedBox(
+            width: metrics.fontSize,
+            height: metrics.fontSize,
+            child: isCupertino
+                ? CupertinoActivityIndicator(
+                    color: style.foreground,
+                    radius: metrics.fontSize / 2,
+                  )
+                : CircularProgressIndicator(
+                    strokeWidth: 2,
+                    valueColor: AlwaysStoppedAnimation<Color>(style.foreground),
+                  ),
+          )
+        : widget.leading;
+
+    // The button owns the foreground color of its contents: wrap the row in an
+    // IconTheme so leading icons (e.g. a SureIcon) inherit the variant's
+    // foreground automatically — call sites shouldn't pass it (mirrors how
+    // Material's ElevatedButton.icon propagates icon color). Icons that set an
+    // explicit color still win.
+    final content = IconTheme.merge(
+      data: IconThemeData(color: style.foreground),
+      child: Row(
+        mainAxisSize: widget.fullWidth ? MainAxisSize.max : MainAxisSize.min,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          if (leading != null) ...[
+            leading,
+            const SizedBox(width: SureSpacing.md),
+          ],
+          // Flex only when full-width (bounded). A bare Flexible in a min-size
+          // Row asserts under unbounded horizontal constraints, so an inline
+          // button passes the self-sizing label directly.
+          if (widget.fullWidth) Flexible(child: label) else label,
+        ],
+      ),
+    );
+
+    final button = AnimatedContainer(
+      duration: const Duration(milliseconds: 80),
+      constraints: BoxConstraints(minHeight: metrics.height),
+      padding: EdgeInsets.symmetric(horizontal: metrics.horizontalPadding),
+      decoration: BoxDecoration(
+        color: background,
+        borderRadius: BorderRadius.circular(metrics.radius),
+        border: style.border == null
+            ? null
+            : Border.all(color: style.border!),
+        // Keyboard/switch-control focus ring (drawn as a non-displacing ring so
+        // it doesn't shift layout). borderPrimary is brightness-aware.
+        boxShadow: _focused
+            ? [
+                BoxShadow(
+                  color: palette.borderPrimary,
+                  blurRadius: 0,
+                  spreadRadius: 2,
+                ),
+              ]
+            : null,
+      ),
+      child: Center(widthFactor: widget.fullWidth ? null : 1.0, child: content),
+    );
+
+    return Semantics(
+      button: true,
+      enabled: _enabled,
+      label: widget.loading ? '${widget.label}, loading' : widget.label,
+      child: FocusableActionDetector(
+        enabled: _enabled,
+        mouseCursor:
+            _enabled ? SystemMouseCursors.click : SystemMouseCursors.basic,
+        onShowFocusHighlight: (value) => setState(() => _focused = value),
+        actions: <Type, Action<Intent>>{
+          ActivateIntent: CallbackAction<ActivateIntent>(
+            onInvoke: (_) {
+              if (_enabled) widget.onPressed?.call();
+              return null;
+            },
+          ),
+        },
+        child: Opacity(
+          opacity: _enabled ? 1.0 : 0.5,
+          child: GestureDetector(
+            behavior: HitTestBehavior.opaque,
+            // Keep all tap callbacks present (a stable gesture arena) and gate
+            // on `_enabled` inside them. Swapping them to null when the button
+            // is disabled mid-press would dispose the recognizer during the
+            // rebuild and fire onTapCancel -> setState() during build.
+            onTapDown: (_) {
+              if (_enabled) setState(() => _pressed = true);
+            },
+            onTapUp: (_) {
+              if (_pressed) setState(() => _pressed = false);
+            },
+            onTapCancel: () {
+              if (_pressed) setState(() => _pressed = false);
+            },
+            onTap: () {
+              if (_enabled) widget.onPressed?.call();
+            },
+            child: button,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _SureButtonStyle {
+  const _SureButtonStyle({
+    required this.background,
+    required this.pressedBackground,
+    required this.foreground,
+    this.border,
+  });
+
+  final Color background;
+  final Color pressedBackground;
+  final Color foreground;
+  final Color? border;
+
+  static _SureButtonStyle resolve(
+    SureButtonVariant variant,
+    SureTokenPalette p,
+  ) {
+    switch (variant) {
+      case SureButtonVariant.primary:
+        return _SureButtonStyle(
+          background: p.buttonPrimary,
+          pressedBackground: p.buttonPrimaryHover,
+          foreground: p.textInverse,
+        );
+      case SureButtonVariant.destructive:
+        return _SureButtonStyle(
+          background: p.buttonDestructive,
+          pressedBackground: p.buttonDestructiveHover,
+          foreground: p.textInverse,
+        );
+      case SureButtonVariant.secondary:
+        return _SureButtonStyle(
+          background: p.surfaceInset,
+          pressedBackground: p.surfaceInsetHover,
+          foreground: p.textPrimary,
+        );
+      case SureButtonVariant.outline:
+        return _SureButtonStyle(
+          background: const Color(0x00000000),
+          pressedBackground: p.surfaceHover,
+          foreground: p.textPrimary,
+          border: p.borderSecondary,
+        );
+      case SureButtonVariant.ghost:
+        return _SureButtonStyle(
+          background: const Color(0x00000000),
+          pressedBackground: p.surfaceHover,
+          foreground: p.textPrimary,
+        );
+    }
+  }
+}
+
+class _SureButtonMetrics {
+  const _SureButtonMetrics({
+    required this.height,
+    required this.horizontalPadding,
+    required this.fontSize,
+    required this.radius,
+  });
+
+  final double height;
+  final double horizontalPadding;
+  final double fontSize;
+  final double radius;
+
+  static _SureButtonMetrics resolve(SureButtonSize size) {
+    switch (size) {
+      case SureButtonSize.sm:
+        return const _SureButtonMetrics(
+          height: 28,
+          horizontalPadding: SureSpacing.lg,
+          fontSize: SureTypography.sm,
+          radius: SureTokens.radiusMd,
+        );
+      case SureButtonSize.md:
+        return const _SureButtonMetrics(
+          height: 36,
+          horizontalPadding: SureSpacing.xl,
+          fontSize: SureTypography.sm,
+          radius: SureTokens.radiusLg,
+        );
+      case SureButtonSize.lg:
+        return const _SureButtonMetrics(
+          height: 48,
+          horizontalPadding: SureSpacing.xxl,
+          fontSize: SureTypography.base,
+          radius: SureTokens.radiusLg,
+        );
+    }
+  }
+}
diff --git a/mobile/lib/widgets/sure_card.dart b/mobile/lib/widgets/sure_card.dart
new file mode 100644
index 000000000..164befa3b
--- /dev/null
+++ b/mobile/lib/widgets/sure_card.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+import '../theme/sure_tokens.dart';
+
+/// Sure design-system card — a tokenized content surface mirroring the web card
+/// chrome (`bg-container` + a hairline border + rounded corners + the subtle DS
+/// shadow). Use it instead of a Material [Card] so the chrome stays in lockstep
+/// with `sure.tokens.json` and reads correctly in light and dark.
+///
+/// Colors resolve from the active [SureColors] palette (brightness-aware). When
+/// [onTap] is provided the whole card is tappable, with a flat ink response
+/// clipped to the card's radius.
+class SureCard extends StatelessWidget {
+  const SureCard({
+    super.key,
+    required this.child,
+    this.padding = const EdgeInsets.all(SureSpacing.xl),
+    this.margin,
+    this.onTap,
+    this.elevated = true,
+  });
+
+  final Widget child;
+
+  /// Inner padding around [child].
+  final EdgeInsetsGeometry padding;
+
+  /// Outer spacing around the card (e.g. separation in a list).
+  final EdgeInsetsGeometry? margin;
+
+  /// When non-null, the card is tappable.
+  final VoidCallback? onTap;
+
+  /// Apply the subtle DS card shadow. Set false for cards sitting on an inset
+  /// surface, where the border alone provides enough separation.
+  final bool elevated;
+
+  @override
+  Widget build(BuildContext context) {
+    final palette = SureColors.of(context).palette;
+    final radius = BorderRadius.circular(SureTokens.radiusLg);
+
+    Widget content = Padding(padding: padding, child: child);
+    if (onTap != null) {
+      // Material(transparency) gives InkWell a surface to paint on without
+      // covering the card's tokenized background or border.
+      content = Material(
+        type: MaterialType.transparency,
+        child: InkWell(onTap: onTap, borderRadius: radius, child: content),
+      );
+    }
+
+    return Container(
+      margin: margin,
+      clipBehavior: Clip.antiAlias,
+      decoration: BoxDecoration(
+        color: palette.container,
+        borderRadius: radius,
+        border: Border.all(color: palette.borderSecondary),
+        boxShadow: elevated ? palette.shadowXs : null,
+      ),
+      child: content,
+    );
+  }
+}
diff --git a/mobile/lib/widgets/sure_chip.dart b/mobile/lib/widgets/sure_chip.dart
new file mode 100644
index 000000000..881b850e4
--- /dev/null
+++ b/mobile/lib/widgets/sure_chip.dart
@@ -0,0 +1,103 @@
+import 'package:flutter/material.dart';
+
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+
+/// Sure design-system filter chip — a tokenized selectable pill mirroring the web
+/// DS pill: a rounded-full chip that reads as bordered/neutral when unselected
+/// and filled (neutral `buttonPrimary` + inverse label) when selected.
+///
+/// Colors resolve from the active [SureColors] palette, so it's brightness-aware
+/// and stays in lockstep with `sure.tokens.json` (and avoids the Material
+/// `primaryContainer` tint the raw `FilterChip` falls back to).
+///
+/// ```dart
+/// SureChip(
+///   label: 'USD',
+///   selected: isSelected,
+///   onSelected: (next) => toggle(next),
+/// )
+/// ```
+class SureChip extends StatelessWidget {
+  const SureChip({
+    super.key,
+    required this.label,
+    this.selected = false,
+    this.onSelected,
+    this.leading,
+    this.enabled = true,
+  });
+
+  final String label;
+  final bool selected;
+
+  /// Called with the next selected value when tapped. When null the chip is
+  /// non-interactive (still renders its selected/unselected state).
+  final ValueChanged<bool>? onSelected;
+
+  /// Optional leading widget (e.g. a color dot or icon).
+  final Widget? leading;
+
+  final bool enabled;
+
+  @override
+  Widget build(BuildContext context) {
+    final palette = SureColors.of(context).palette;
+    final theme = Theme.of(context);
+    final interactive = enabled && onSelected != null;
+
+    // Selected: filled neutral pill with an inverse label. Unselected: a
+    // transparent pill with a hairline border. The border lives on the shape so
+    // Material paints it and clips the ink to the stadium.
+    final shape = StadiumBorder(
+      side: selected
+          ? BorderSide.none
+          : BorderSide(color: palette.borderSecondary),
+    );
+
+    final content = ConstrainedBox(
+      // Enforce a comfortable minimum tap target regardless of context
+      // (Material FilterChip parity); the chip still sizes to content otherwise.
+      constraints: const BoxConstraints(minHeight: 44),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 14, vertical: SureSpacing.lg),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (leading != null) ...[leading!, const SizedBox(width: SureSpacing.sm)],
+            Text(
+              label,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: theme.textTheme.bodyMedium?.copyWith(
+                color: selected ? palette.textInverse : palette.textSecondary,
+                fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+
+    return Semantics(
+      // Announce as a button only when it's actually tappable; a display-only
+      // chip is just a selected indicator, not a disabled button.
+      button: interactive ? true : null,
+      enabled: interactive ? true : null,
+      selected: selected,
+      child: Opacity(
+        opacity: enabled ? 1.0 : 0.5,
+        child: Material(
+          color: selected ? palette.buttonPrimary : const Color(0x00000000),
+          shape: shape,
+          clipBehavior: Clip.antiAlias,
+          child: InkWell(
+            onTap: interactive ? () => onSelected!(!selected) : null,
+            customBorder: shape,
+            child: content,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/sure_icon.dart b/mobile/lib/widgets/sure_icon.dart
new file mode 100644
index 000000000..8510b8dfe
--- /dev/null
+++ b/mobile/lib/widgets/sure_icon.dart
@@ -0,0 +1,104 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+/// Sure design-system icon primitive.
+///
+/// Renders a bundled Lucide SVG (stroke `currentColor`, 2px) tinted to a single
+/// color, mirroring the web `icon` helper / `DS::FilledIcon` semantics: tokenized
+/// size, color inherited from the surrounding [IconTheme] by default, and
+/// accessibility that distinguishes decorative from meaningful icons.
+///
+/// Use [SureIcons] for the bundled icon names so call sites stay typo-safe and
+/// only reference assets that actually ship in `assets/icons/lucide/`.
+///
+/// ```dart
+/// const SureIcon(SureIcons.wallet, size: SureIconSize.lg)            // decorative
+/// const SureIcon(SureIcons.refresh, semanticLabel: 'Refresh')        // meaningful
+/// ```
+class SureIcon extends StatelessWidget {
+  /// Lucide icon name (kebab-case), e.g. `wallet`. Prefer [SureIcons] constants.
+  final String name;
+
+  /// Square edge length in logical pixels. Prefer a [SureIconSize] token. When
+  /// null, inherits the ambient [IconTheme] size (Material-icon parity), falling
+  /// back to 24 — so dropping `SureIcon` in for `Icon` preserves sizing.
+  final double? size;
+
+  /// Tint applied to the icon. When null, inherits the ambient [IconTheme]
+  /// color (Material-icon parity), falling back to opaque black only if unset.
+  final Color? color;
+
+  /// When provided, the icon is exposed to assistive tech with this label
+  /// (meaningful icon). When null, the icon is decorative and excluded from the
+  /// semantics tree — use this only when an adjacent widget carries the name.
+  final String? semanticLabel;
+
+  const SureIcon(
+    this.name, {
+    super.key,
+    this.size,
+    this.color,
+    this.semanticLabel,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final iconTheme = IconTheme.of(context);
+    final resolvedSize = size ?? iconTheme.size ?? 24;
+    final resolvedColor = color ?? iconTheme.color ?? const Color(0xFF000000);
+    // Mirror Material `Icon`: always paint the glyph at `resolvedSize`, even when
+    // a parent imposes tight constraints larger than the icon (e.g. a fixed-size
+    // Container). The outer SizedBox sets the intrinsic size; the Center loosens
+    // the constraints handed to SvgPicture so its width/height aren't stretched.
+    return SizedBox(
+      width: resolvedSize,
+      height: resolvedSize,
+      child: Center(
+        child: SvgPicture.asset(
+          'assets/icons/lucide/$name.svg',
+          width: resolvedSize,
+          height: resolvedSize,
+          colorFilter: ColorFilter.mode(resolvedColor, BlendMode.srcIn),
+          semanticsLabel: semanticLabel,
+          excludeFromSemantics: semanticLabel == null,
+        ),
+      ),
+    );
+  }
+}
+
+/// Canonical icon sizes, mirroring the web `icon` helper scale
+/// (xs/sm/md/lg/xl/2xl → 12/16/20/24/28/32).
+abstract final class SureIconSize {
+  static const double xs = 12;
+  static const double sm = 16;
+  static const double md = 20;
+  static const double lg = 24;
+  static const double xl = 28;
+  static const double xxl = 32;
+}
+
+/// Names of the Lucide icons bundled under `assets/icons/lucide/`.
+///
+/// Referencing a name here guarantees the asset ships; add the SVG (and a
+/// constant) before using a new icon.
+abstract final class SureIcons {
+  static const String landmark = 'landmark';
+  static const String creditCard = 'credit-card';
+  static const String trendingUp = 'trending-up';
+  static const String trendingDown = 'trending-down';
+  static const String receipt = 'receipt';
+  static const String house = 'house';
+  static const String car = 'car';
+  static const String bitcoin = 'bitcoin';
+  static const String shapes = 'shapes';
+  static const String handCoins = 'hand-coins';
+  static const String wallet = 'wallet';
+  static const String circleAlert = 'circle-alert';
+  static const String circleCheck = 'circle-check';
+  static const String cloudCheck = 'cloud-check';
+  static const String refresh = 'refresh-cw';
+  static const String chevronUp = 'chevron-up';
+  static const String chevronDown = 'chevron-down';
+  static const String chevronRight = 'chevron-right';
+}
diff --git a/mobile/lib/widgets/sure_list_group.dart b/mobile/lib/widgets/sure_list_group.dart
new file mode 100644
index 000000000..c0b0e864b
--- /dev/null
+++ b/mobile/lib/widgets/sure_list_group.dart
@@ -0,0 +1,225 @@
+import 'package:flutter/material.dart';
+
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+import '../theme/sure_tokens.dart';
+import 'sure_icon.dart';
+
+/// Sure design-system grouped list — a tokenized container that stacks
+/// [SureListRow]s behind a single rounded surface with a hairline border, the
+/// subtle DS shadow, and inset dividers between rows. Mirrors the web grouped
+/// inset list (`bg-container` + `rounded-lg` + `shadow-border-xs`, rows clipped
+/// and separated by `border-divider`).
+///
+/// Colors resolve from the active [SureColors] palette, so the chrome stays in
+/// lockstep with `sure.tokens.json` and reads correctly in light and dark.
+///
+/// ```dart
+/// SureListGroup(
+///   header: 'Tools',
+///   children: [
+///     SureListRow(title: 'Calendar', subtitle: 'Monthly view', showChevron: true, onTap: ...),
+///     SureListRow(title: 'Recent', showChevron: true, onTap: ...),
+///   ],
+/// )
+/// ```
+class SureListGroup extends StatelessWidget {
+  const SureListGroup({
+    super.key,
+    required this.children,
+    this.header,
+    this.margin,
+  });
+
+  /// Rows to stack — typically [SureListRow]s. Dividers are inserted between
+  /// them automatically (never before the first or after the last).
+  final List<Widget> children;
+
+  /// Optional uppercase section label rendered above the group.
+  final String? header;
+
+  /// Outer spacing around the group (e.g. separation between sections).
+  final EdgeInsetsGeometry? margin;
+
+  @override
+  Widget build(BuildContext context) {
+    if (children.isEmpty) return const SizedBox.shrink();
+
+    final palette = SureColors.of(context).palette;
+    final radius = BorderRadius.circular(SureTokens.radiusLg);
+
+    final rows = <Widget>[];
+    for (var i = 0; i < children.length; i++) {
+      if (i > 0) {
+        // Inset hairline between rows, lighter than the group's edge so the
+        // separators read as internal (classic grouped-list look).
+        rows.add(Divider(
+          height: 1,
+          thickness: 1,
+          indent: 16,
+          endIndent: 16,
+          color: palette.borderSubdued,
+        ));
+      }
+      rows.add(children[i]);
+    }
+
+    final group = Container(
+      clipBehavior: Clip.antiAlias,
+      decoration: BoxDecoration(
+        color: palette.container,
+        borderRadius: radius,
+        border: Border.all(color: palette.borderSecondary),
+        boxShadow: palette.shadowXs,
+      ),
+      child: Column(mainAxisSize: MainAxisSize.min, children: rows),
+    );
+
+    final content = header == null
+        ? group
+        : Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(
+                  left: SureSpacing.xl,
+                  right: SureSpacing.xl,
+                  bottom: SureSpacing.md,
+                ),
+                child: Text(
+                  header!.toUpperCase(),
+                  style: Theme.of(context).textTheme.labelSmall?.copyWith(
+                        color: palette.textSecondary,
+                        fontWeight: FontWeight.w500,
+                        letterSpacing: 0.4,
+                      ),
+                ),
+              ),
+              group,
+            ],
+          );
+
+    if (margin == null) return content;
+    return Padding(padding: margin!, child: content);
+  }
+}
+
+/// A single row inside a [SureListGroup]. Lays out an optional [leading] widget,
+/// a [title] (+ optional [subtitle]), and a trailing affordance — either an
+/// explicit [trailing] widget or a DS chevron when [showChevron] is set.
+///
+/// The row paints no background or border of its own; it relies on the enclosing
+/// [SureListGroup] for chrome, dividers, and corner clipping. When [onTap] is
+/// provided the whole row is tappable with a flat ink response (clipped to the
+/// group's rounded corners by the group's `antiAlias`).
+class SureListRow extends StatelessWidget {
+  const SureListRow({
+    super.key,
+    required this.title,
+    this.subtitle,
+    this.leading,
+    this.trailing,
+    this.onTap,
+    this.showChevron = false,
+    this.destructive = false,
+  });
+
+  final String title;
+  final String? subtitle;
+
+  /// Leading widget (e.g. an icon badge). Caller's choice — the row is
+  /// icon-agnostic.
+  final Widget? leading;
+
+  /// Trailing widget (e.g. a value or switch). Takes precedence over
+  /// [showChevron] when both are provided.
+  final Widget? trailing;
+
+  /// When non-null, the row is tappable.
+  final VoidCallback? onTap;
+
+  /// Show a DS chevron disclosure indicator on the trailing edge. Ignored when
+  /// an explicit [trailing] is provided.
+  final bool showChevron;
+
+  /// Render the title in the destructive token (for delete/reset actions).
+  final bool destructive;
+
+  @override
+  Widget build(BuildContext context) {
+    final palette = SureColors.of(context).palette;
+    final theme = Theme.of(context);
+
+    Widget? trailingWidget = trailing;
+    if (trailingWidget == null && showChevron) {
+      trailingWidget = SureIcon(
+        SureIcons.chevronRight,
+        size: SureIconSize.md,
+        color: palette.textSubdued,
+      );
+    }
+
+    Widget content = Padding(
+      padding: const EdgeInsets.symmetric(horizontal: SureSpacing.xl, vertical: 14),
+      child: Row(
+        children: [
+          if (leading != null) ...[leading!, const SizedBox(width: SureSpacing.lg)],
+          Expanded(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  title,
+                  style: theme.textTheme.titleMedium?.copyWith(
+                    color:
+                        destructive ? palette.destructive : palette.textPrimary,
+                  ),
+                  maxLines: 1,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                if (subtitle != null) ...[
+                  const SizedBox(height: 2),
+                  Text(
+                    subtitle!,
+                    style: theme.textTheme.bodySmall?.copyWith(
+                      color: palette.textSecondary,
+                    ),
+                    maxLines: 2,
+                    overflow: TextOverflow.ellipsis,
+                  ),
+                ],
+              ],
+            ),
+          ),
+          if (trailingWidget != null) ...[
+            const SizedBox(width: SureSpacing.lg),
+            trailingWidget,
+          ],
+        ],
+      ),
+    );
+
+    if (onTap != null) {
+      // Material(transparency) gives the InkWell a surface to paint on without
+      // covering the group's tokenized background. No borderRadius here — the
+      // group clips the ripple to its rounded corners via clipBehavior.
+      // MergeSemantics + Semantics(button) restores the button/enabled flags a
+      // Material ListTile exposes, so screen readers still announce the whole
+      // row as a single button (parity with the pre-migration ListTile rows).
+      content = MergeSemantics(
+        child: Semantics(
+          button: true,
+          enabled: true,
+          child: Material(
+            type: MaterialType.transparency,
+            child: InkWell(onTap: onTap, child: content),
+          ),
+        ),
+      );
+    }
+
+    return content;
+  }
+}
diff --git a/mobile/lib/widgets/sure_logo.dart b/mobile/lib/widgets/sure_logo.dart
new file mode 100644
index 000000000..e80e1c529
--- /dev/null
+++ b/mobile/lib/widgets/sure_logo.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+import '../theme/sure_colors.dart';
+
+/// The Sure wordmark logomark.
+///
+/// The wordmark's muted strokes are `currentColor` in the asset; this widget
+/// tints them with the theme's secondary text color so the mark stays legible in
+/// both light and dark (a hardcoded grey was too dim on the dark surface), while
+/// the green brand mark keeps its own fill. Use this everywhere the logomark is
+/// shown so no caller renders the `currentColor` strokes as the flutter_svg
+/// default (black).
+class SureLogo extends StatelessWidget {
+  const SureLogo({super.key, this.size = 36});
+
+  /// Square edge length in logical pixels.
+  final double size;
+
+  @override
+  Widget build(BuildContext context) {
+    return SvgPicture.asset(
+      'assets/images/logomark.svg',
+      width: size,
+      height: size,
+      theme: SvgTheme(
+        currentColor: SureColors.of(context).palette.textSecondary,
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/sure_segmented_control.dart b/mobile/lib/widgets/sure_segmented_control.dart
new file mode 100644
index 000000000..898dce419
--- /dev/null
+++ b/mobile/lib/widgets/sure_segmented_control.dart
@@ -0,0 +1,196 @@
+import 'package:flutter/material.dart';
+
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+import '../theme/sure_tokens.dart';
+
+/// One segment of a [SureSegmentedControl].
+class SureSegment<T> {
+  const SureSegment({required this.value, required this.label, this.icon});
+
+  final T value;
+  final String label;
+
+  /// Optional leading icon (e.g. an [Icon] or [SureIcon]); tinted to match the
+  /// segment's selected/unselected label color.
+  final Widget? icon;
+}
+
+/// Sure design-system segmented control — a tokenized single-select toggle
+/// mirroring the web DS `segmented-control`: an inset track holding equal-width
+/// segments, where the selected segment is a raised surface (container fill +
+/// the subtle DS shadow) and unselected segments are flat `textSecondary` labels.
+///
+/// Colors resolve from the active [SureColors] palette, so it's brightness-aware
+/// and stays in lockstep with `sure.tokens.json` (and avoids the Material
+/// `SegmentedButton` `secondaryContainer` look). Expects a bounded width — the
+/// segments share it equally.
+///
+/// ```dart
+/// SureSegmentedControl<String>(
+///   selected: nature,
+///   onChanged: (v) => setState(() => nature = v),
+///   segments: const [
+///     SureSegment(value: 'expense', label: 'Expense', icon: Icon(Icons.arrow_downward)),
+///     SureSegment(value: 'income', label: 'Income', icon: Icon(Icons.arrow_upward)),
+///   ],
+/// )
+/// ```
+class SureSegmentedControl<T> extends StatelessWidget {
+  const SureSegmentedControl({
+    super.key,
+    required this.segments,
+    required this.selected,
+    required this.onChanged,
+  });
+
+  final List<SureSegment<T>> segments;
+  final T selected;
+  final ValueChanged<T> onChanged;
+
+  @override
+  Widget build(BuildContext context) {
+    // Selection is value-based (segment.value == selected), so duplicate values
+    // would render multiple segments as selected at once. Guard in debug builds
+    // (a const constructor can't host this non-constant check).
+    assert(
+      segments.map((s) => s.value).toSet().length == segments.length,
+      'SureSegmentedControl requires unique segment values.',
+    );
+    final palette = SureColors.of(context).palette;
+    final theme = Theme.of(context);
+    // The palette has no single "raised surface" token that reads correctly in
+    // both modes, so pick the brightness-appropriate one: white-ish in light, a
+    // lighter-than-track inset in dark — both sit *above* the track.
+    final isLight = theme.brightness == Brightness.light;
+    final selectedBg =
+        isLight ? palette.container : palette.containerInsetHover;
+
+    return Container(
+      padding: const EdgeInsets.all(3),
+      decoration: BoxDecoration(
+        color: palette.surfaceInset,
+        borderRadius: BorderRadius.circular(SureTokens.radiusLg),
+        border: Border.all(color: palette.borderSecondary),
+      ),
+      child: Row(
+        children: [
+          for (final segment in segments)
+            Expanded(
+              child: _Segment<T>(
+                segment: segment,
+                selected: segment.value == selected,
+                selectedBg: selectedBg,
+                palette: palette,
+                textStyle: theme.textTheme.labelLarge,
+                onTap: () => onChanged(segment.value),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
+
+class _Segment<T> extends StatefulWidget {
+  const _Segment({
+    required this.segment,
+    required this.selected,
+    required this.selectedBg,
+    required this.palette,
+    required this.textStyle,
+    required this.onTap,
+  });
+
+  final SureSegment<T> segment;
+  final bool selected;
+  final Color selectedBg;
+  final SureTokenPalette palette;
+  final TextStyle? textStyle;
+  final VoidCallback onTap;
+
+  @override
+  State<_Segment<T>> createState() => _SegmentState<T>();
+}
+
+class _SegmentState<T> extends State<_Segment<T>> {
+  bool _focused = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final palette = widget.palette;
+    final selected = widget.selected;
+    final fg = selected ? palette.textPrimary : palette.textSecondary;
+
+    return Semantics(
+      button: true,
+      selected: selected,
+      // FocusableActionDetector makes each segment keyboard/switch focusable and
+      // Enter/Space-activatable (parity with the Material SegmentedButton it
+      // replaces), mirroring SureButton — without the Material ripple.
+      child: FocusableActionDetector(
+        mouseCursor: SystemMouseCursors.click,
+        onShowFocusHighlight: (value) => setState(() => _focused = value),
+        actions: <Type, Action<Intent>>{
+          ActivateIntent: CallbackAction<ActivateIntent>(
+            onInvoke: (_) {
+              widget.onTap();
+              return null;
+            },
+          ),
+        },
+        child: GestureDetector(
+          onTap: widget.onTap,
+          behavior: HitTestBehavior.opaque,
+          child: AnimatedContainer(
+            duration: const Duration(milliseconds: 150),
+            curve: Curves.easeOut,
+            padding: const EdgeInsets.symmetric(
+              vertical: SureSpacing.md,
+              horizontal: SureSpacing.md,
+            ),
+            decoration: BoxDecoration(
+              color: selected ? widget.selectedBg : const Color(0x00000000),
+              borderRadius: BorderRadius.circular(SureTokens.radiusMd),
+              boxShadow: [
+                if (selected) ...palette.shadowXs,
+                // Non-displacing focus ring so it doesn't shift the layout.
+                if (_focused)
+                  BoxShadow(
+                    color: palette.focusRing,
+                    blurRadius: 0,
+                    spreadRadius: 2,
+                  ),
+              ],
+            ),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (widget.segment.icon != null) ...[
+                  IconTheme.merge(
+                    data: IconThemeData(color: fg, size: 18),
+                    child: widget.segment.icon!,
+                  ),
+                  const SizedBox(width: SureSpacing.sm),
+                ],
+                Flexible(
+                  child: Text(
+                    widget.segment.label,
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    textAlign: TextAlign.center,
+                    style: widget.textStyle?.copyWith(
+                      color: fg,
+                      fontWeight: selected ? FontWeight.w600 : FontWeight.w500,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/sure_text_field.dart b/mobile/lib/widgets/sure_text_field.dart
new file mode 100644
index 000000000..80ce1858b
--- /dev/null
+++ b/mobile/lib/widgets/sure_text_field.dart
@@ -0,0 +1,191 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+
+import '../theme/sure_colors.dart';
+import '../theme/sure_spacing.dart';
+import '../theme/sure_tokens.dart';
+
+/// Sure design-system text field — a tokenized [TextFormField] wrapper mirroring
+/// the web DS form field: an optional label above a filled `bg-container` input
+/// with a hairline border, rounded corners, a `textSubdued` placeholder, a
+/// stronger border on focus, and the destructive token for errors.
+///
+/// It builds a complete [InputDecoration] from the active [SureColors] palette
+/// (rather than leaning on theme defaults), so the chrome is brightness-aware,
+/// self-contained, and stays in lockstep with `sure.tokens.json`.
+///
+/// ```dart
+/// SureTextField(
+///   controller: _email,
+///   label: 'Email',
+///   hint: 'you@example.com',
+///   keyboardType: TextInputType.emailAddress,
+///   prefixIcon: const Icon(Icons.mail_outline),
+///   validator: (v) => (v == null || v.isEmpty) ? 'Required' : null,
+/// )
+/// ```
+class SureTextField extends StatelessWidget {
+  const SureTextField({
+    super.key,
+    this.controller,
+    this.label,
+    this.hint,
+    this.helperText,
+    this.prefixIcon,
+    this.suffixIcon,
+    this.obscureText = false,
+    this.enabled = true,
+    this.readOnly = false,
+    this.autofocus = false,
+    this.keyboardType,
+    this.textInputAction,
+    this.textCapitalization = TextCapitalization.none,
+    this.inputFormatters,
+    this.maxLines = 1,
+    this.minLines,
+    this.maxLength,
+    this.validator,
+    this.onChanged,
+    this.onFieldSubmitted,
+    this.onTap,
+    this.focusNode,
+    this.autovalidateMode,
+  });
+
+  final TextEditingController? controller;
+
+  /// Optional label rendered above the field (DS style — not a Material floating
+  /// label, so it stays put and reads like the web `form-field__label`).
+  final String? label;
+
+  /// Placeholder text shown when empty (rendered in `textSubdued`).
+  final String? hint;
+
+  /// Optional helper text below the field.
+  final String? helperText;
+
+  final Widget? prefixIcon;
+  final Widget? suffixIcon;
+
+  final bool obscureText;
+  final bool enabled;
+  final bool readOnly;
+  final bool autofocus;
+
+  final TextInputType? keyboardType;
+  final TextInputAction? textInputAction;
+  final TextCapitalization textCapitalization;
+  final List<TextInputFormatter>? inputFormatters;
+
+  final int maxLines;
+  final int? minLines;
+  final int? maxLength;
+
+  final FormFieldValidator<String>? validator;
+  final ValueChanged<String>? onChanged;
+  final ValueChanged<String>? onFieldSubmitted;
+  final VoidCallback? onTap;
+  final FocusNode? focusNode;
+  final AutovalidateMode? autovalidateMode;
+
+  @override
+  Widget build(BuildContext context) {
+    final palette = SureColors.of(context).palette;
+    final theme = Theme.of(context);
+
+    OutlineInputBorder borderOf(Color color, [double width = 1]) {
+      return OutlineInputBorder(
+        borderRadius: BorderRadius.circular(SureTokens.radiusLg),
+        borderSide: BorderSide(color: color, width: width),
+      );
+    }
+
+    // An obscured field is single-line by definition; otherwise grow maxLines to
+    // cover minLines so a caller passing only minLines can't trip Flutter's
+    // `minLines <= maxLines` assert.
+    final resolvedMinLines = obscureText ? null : minLines;
+    final resolvedMaxLines = obscureText
+        ? 1
+        : (minLines != null && minLines! > maxLines ? minLines : maxLines);
+
+    final field = TextFormField(
+      controller: controller,
+      focusNode: focusNode,
+      enabled: enabled,
+      readOnly: readOnly,
+      autofocus: autofocus,
+      obscureText: obscureText,
+      keyboardType: keyboardType,
+      textInputAction: textInputAction,
+      textCapitalization: textCapitalization,
+      inputFormatters: inputFormatters,
+      maxLines: resolvedMaxLines,
+      minLines: resolvedMinLines,
+      maxLength: maxLength,
+      validator: validator,
+      onChanged: onChanged,
+      onFieldSubmitted: onFieldSubmitted,
+      onTap: onTap,
+      autovalidateMode: autovalidateMode,
+      style: theme.textTheme.bodyLarge?.copyWith(color: palette.textPrimary),
+      cursorColor: palette.textPrimary,
+      decoration: InputDecoration(
+        hintText: hint,
+        helperText: helperText,
+        prefixIcon: prefixIcon,
+        suffixIcon: suffixIcon,
+        filled: true,
+        fillColor: palette.container,
+        isDense: true,
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: SureSpacing.xl,
+          vertical: 14,
+        ),
+        hintStyle: theme.textTheme.bodyLarge?.copyWith(
+          color: palette.textSubdued,
+        ),
+        helperStyle: theme.textTheme.bodySmall?.copyWith(
+          color: palette.textSecondary,
+        ),
+        errorStyle: theme.textTheme.bodySmall?.copyWith(
+          color: palette.destructive,
+        ),
+        errorMaxLines: 2,
+        prefixIconColor: palette.textSecondary,
+        suffixIconColor: palette.textSecondary,
+        border: borderOf(palette.borderSecondary),
+        enabledBorder: borderOf(palette.borderSecondary),
+        focusedBorder: borderOf(palette.borderPrimary, 1.5),
+        disabledBorder: borderOf(palette.borderSubdued),
+        errorBorder: borderOf(palette.destructive),
+        focusedErrorBorder: borderOf(palette.destructive, 1.5),
+      ),
+    );
+
+    if (label == null) return field;
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        // The label is shown visually but excluded from semantics; it's attached
+        // to the field below instead, so screen readers announce the field with
+        // its name (parity with Material's `labelText`) rather than reading a
+        // detached label node.
+        ExcludeSemantics(
+          child: Padding(
+            padding: const EdgeInsets.only(left: 2, bottom: SureSpacing.sm),
+            child: Text(
+              label!,
+              style: theme.textTheme.labelMedium?.copyWith(
+                color: enabled ? palette.textSecondary : palette.textSubdued,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+        ),
+        Semantics(label: label, child: field),
+      ],
+    );
+  }
+}
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index a9d66b802..2a93f2df6 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -69,10 +69,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
+    version: "1.4.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -129,6 +129,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.7"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -198,14 +206,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.0"
-  flutter_plugin_android_lifecycle:
-    dependency: transitive
-    description:
-      name: flutter_plugin_android_lifecycle
-      sha256: ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.33"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_markdown:
     dependency: "direct main"
     description:
@@ -214,6 +219,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.7.7+1"
+  flutter_plugin_android_lifecycle:
+    dependency: transitive
+    description:
+      name: flutter_plugin_android_lifecycle
+      sha256: c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.31"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -288,6 +301,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.6"
   http:
     dependency: "direct main"
     description:
@@ -316,10 +337,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.20.2"
   json_annotation:
     dependency: transitive
     description:
@@ -332,26 +353,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.2"
+    version: "10.0.9"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.10"
+    version: "3.0.9"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -372,18 +393,18 @@ packages:
     dependency: transitive
     description:
       name: local_auth_android
-      sha256: a0bdfcc0607050a26ef5b31d6b4b254581c3d3ce3c1816ab4d4f4a9173e84467
+      sha256: "48924f4a8b3cc45994ad5993e2e232d3b00788a305c1bf1c7db32cef281ce9a3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.56"
+    version: "1.0.52"
   local_auth_darwin:
     dependency: transitive
     description:
       name: local_auth_darwin
-      sha256: "699873970067a40ef2f2c09b4c72eb1cfef64224ef041b3df9fdc5c4c1f91f49"
+      sha256: "0e9706a8543a4a2eee60346294d6a633dd7c3ee60fae6b752570457c4ff32055"
       url: "https://pub.dev"
     source: hosted
-    version: "1.6.1"
+    version: "1.6.0"
   local_auth_platform_interface:
     dependency: transitive
     description:
@@ -404,34 +425,34 @@ packages:
     dependency: transitive
     description:
       name: markdown
-      sha256: ee85086ad7698b42522c6ad42fe195f1b9898e4d974a1af4576c1a3a176cada9
+      sha256: "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1"
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.1"
+    version: "7.3.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.16.0"
   nested:
     dependency: transitive
     description:
@@ -448,6 +469,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.0"
+  os_detect:
+    dependency: transitive
+    description:
+      name: os_detect
+      sha256: "7d87c0dd98c6faf110d5aa498e9a6df02ffce4bb78cc9cfc8ad02929be9bb71f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.3"
   package_info_plus:
     dependency: "direct main"
     description:
@@ -568,6 +597,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.5+1"
+  sentry:
+    dependency: transitive
+    description:
+      name: sentry
+      sha256: "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.14.2"
+  sentry_flutter:
+    dependency: "direct main"
+    description:
+      name: sentry_flutter
+      sha256: "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.14.2"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -649,10 +694,10 @@ packages:
     dependency: transitive
     description:
       name: sqflite_android
-      sha256: ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88
+      sha256: "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2+2"
+    version: "2.4.1"
   sqflite_common:
     dependency: transitive
     description:
@@ -721,10 +766,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.4"
   typed_data:
     dependency: transitive
     description:
@@ -733,6 +778,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.0"
+  upgrader:
+    dependency: "direct main"
+    description:
+      name: upgrader
+      sha256: "6282524d4b664e48e24736ce343eedd115dcc1ce79198fc0bd46f14692e1f05e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.5.0"
   url_launcher:
     dependency: "direct main"
     description:
@@ -745,18 +798,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611"
+      sha256: "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.28"
+    version: "6.3.20"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: b1aca26728b7cc7a3af971bb6f601554a8ae9df2e0a006de8450ba06a17ad36a
+      sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.0"
+    version: "6.3.4"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -769,10 +822,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18"
+      sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.5"
+    version: "3.2.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
@@ -785,10 +838,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f
+      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -825,18 +878,26 @@ packages:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b"
+      sha256: d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.20"
+    version: "1.1.19"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.4"
+  version:
+    dependency: transitive
+    description:
+      name: version
+      sha256: "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
   vm_service:
     dependency: transitive
     description:
@@ -886,5 +947,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.10.0 <4.0.0"
-  flutter: ">=3.38.0"
+  dart: ">=3.8.0 <4.0.0"
+  flutter: ">=3.32.0"
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index efcb72b9c..6776b9556 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -10,12 +10,17 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_localizations:
+    sdk: flutter
   cupertino_icons: ^1.0.6
   http: ^1.1.0
   provider: ^6.1.1
   shared_preferences: ^2.2.2
   flutter_secure_storage: ^10.0.0
-  intl: ^0.18.1
+  # flutter_localizations pins intl per Flutter SDK (0.19.x on <3.32, 0.20.x on
+  # 3.32+). Per the Flutter i18n guide, use `any` so the SDK-constrained version
+  # is selected instead of pinning a version that conflicts with our Flutter floor.
+  intl: any
   sqflite: ^2.4.2
   path: ^1.9.1
   connectivity_plus: ^7.0.0
@@ -26,6 +31,8 @@ dependencies:
   package_info_plus: ^8.0.0
   local_auth: ^2.3.0
   flutter_markdown: ^0.7.2
+  sentry_flutter: ^8.14.2
+  upgrader: ^13.5.0
 
 dev_dependencies:
   flutter_test:
@@ -35,9 +42,28 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+  generate: true
   assets:
     - assets/icon/
     - assets/images/
+    - assets/icons/lucide/
+  # Geist + Geist Mono (SIL OFL-1.1 — see assets/fonts/OFL.txt). The theme
+  # (SureTokens.fontSans/fontMono) already names these families; bundling the
+  # assets here makes them actually render instead of falling back to the
+  # platform system font.
+  fonts:
+    - family: Geist
+      fonts:
+        - asset: assets/fonts/Geist-Regular.ttf
+        - asset: assets/fonts/Geist-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/Geist-SemiBold.ttf
+          weight: 600
+        - asset: assets/fonts/Geist-Bold.ttf
+          weight: 700
+    - family: Geist Mono
+      fonts:
+        - asset: assets/fonts/GeistMono-Regular.ttf
 
 flutter_launcher_icons:
   android: true
diff --git a/mobile/test/models/transaction_metadata_test.dart b/mobile/test/models/transaction_metadata_test.dart
new file mode 100644
index 000000000..c74f01306
--- /dev/null
+++ b/mobile/test/models/transaction_metadata_test.dart
@@ -0,0 +1,328 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/models/offline_transaction.dart';
+import 'package:sure_mobile/models/transaction.dart';
+
+void main() {
+  group('Transaction metadata', () {
+    test('parses merchant and tags from API response', () {
+      final transaction = Transaction.fromJson({
+        'id': 'tx_1',
+        'account': {'id': 'acct_1'},
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'classification': 'expense',
+        'notes': 'latte',
+        'category': {'id': 'cat_1', 'name': 'Dining'},
+        'merchant': {'id': 'merchant_1', 'name': 'Cafe'},
+        'tags': [
+          {'id': 'tag_1', 'name': 'Work'},
+          {'id': 'tag_2', 'name': 'Travel'},
+        ],
+      });
+
+      expect(transaction.merchantId, 'merchant_1');
+      expect(transaction.merchantName, 'Cafe');
+      expect(transaction.tagIds, ['tag_1', 'tag_2']);
+      expect(transaction.tagNames, ['Work', 'Travel']);
+    });
+
+    test('round-trips merchant and tag metadata through offline maps', () {
+      final offlineTransaction = OfflineTransaction.fromTransaction(
+        Transaction(
+          id: 'tx_1',
+          accountId: 'acct_1',
+          name: 'Coffee',
+          date: '2026-06-01',
+          amount: r'$4.50',
+          currency: 'USD',
+          nature: 'expense',
+          merchantId: 'merchant_1',
+          merchantName: 'Cafe',
+          tagIds: const ['tag_1', 'tag_2'],
+          tagNames: const ['Work', 'Travel'],
+        ),
+        localId: 'local_1',
+      );
+
+      final restored = OfflineTransaction.fromDatabaseMap(
+        offlineTransaction.toDatabaseMap(),
+      );
+
+      expect(restored.merchantId, 'merchant_1');
+      expect(restored.merchantName, 'Cafe');
+      expect(restored.tagIds, ['tag_1', 'tag_2']);
+      expect(restored.tagNames, ['Work', 'Travel']);
+      expect(restored.syncStatus, SyncStatus.synced);
+    });
+
+    test('pending offline replay keeps the stored local id', () {
+      final pendingTransaction = OfflineTransaction(
+        localId: 'local_123',
+        accountId: 'acct_1',
+        name: 'Coffee',
+        date: '2026-06-01',
+        amount: r'$4.50',
+        currency: 'USD',
+        nature: 'expense',
+        syncStatus: SyncStatus.pending,
+      );
+
+      final restored = OfflineTransaction.fromDatabaseMap(
+        pendingTransaction.toDatabaseMap(),
+      );
+
+      expect(restored.localId, 'local_123');
+      expect(restored.syncStatus, SyncStatus.pending);
+    });
+
+    test('preserves omitted tag state for stored rows without tag columns', () {
+      final restored = OfflineTransaction.fromDatabaseMap({
+        'server_id': 'tx_1',
+        'local_id': 'local_1',
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'notes': null,
+        'category_id': null,
+        'category_name': null,
+        'merchant_id': null,
+        'merchant_name': null,
+        'sync_status': 'synced',
+        'created_at': '2026-06-01T00:00:00.000',
+        'updated_at': '2026-06-01T00:00:00.000',
+      });
+
+      expect(restored.tagsProvided, false);
+      expect(restored.tagIds, isEmpty);
+      expect(restored.tagNames, isEmpty);
+    });
+
+    test('parses flat merchant and tag fields', () {
+      final transaction = Transaction.fromJson({
+        'id': 'tx_1',
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'merchant_id': 'merchant_1',
+        'merchant_name': 'Cafe',
+        'tag_ids': ['tag_1', 'tag_2'],
+        'tag_names': ['Work', 'Travel'],
+      });
+
+      expect(transaction.merchantId, 'merchant_1');
+      expect(transaction.merchantName, 'Cafe');
+      expect(transaction.tagIds, ['tag_1', 'tag_2']);
+      expect(transaction.tagNames, ['Work', 'Travel']);
+    });
+
+    test('normalizes mismatched flat tag name lengths', () {
+      final shortNames = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'tag_ids': ['tag_1', 'tag_2'],
+        'tag_names': ['Work'],
+      });
+
+      final longNames = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'tag_ids': ['tag_1'],
+        'tag_names': ['Work', 'Ignored'],
+      });
+
+      expect(shortNames.tagNames, ['Work', '']);
+      expect(shortNames.tagIds, ['tag_1', 'tag_2']);
+      expect(longNames.tagNames, ['Work']);
+      expect(longNames.tagIds, ['tag_1']);
+    });
+
+    test('filters blank flat tag ids while preserving id-name pairing', () {
+      final transaction = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'tag_ids': ['', 'tag_2'],
+        'tag_names': ['Ignored', 'Travel'],
+      });
+
+      expect(transaction.tagIds, ['tag_2']);
+      expect(transaction.tagNames, ['Travel']);
+    });
+
+    test('distinguishes omitted tags from explicitly empty tags', () {
+      final withoutTags = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+      });
+
+      final clearedTags = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'tags': [],
+      });
+
+      expect(withoutTags.tagsProvided, false);
+      expect(clearedTags.tagsProvided, true);
+    });
+
+    test('distinguishes omitted metadata from explicitly cleared metadata', () {
+      final withoutMetadata = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+      });
+
+      final clearedMetadata = Transaction.fromJson({
+        'account_id': 'acct_1',
+        'name': 'Coffee',
+        'date': '2026-06-01',
+        'amount': r'$4.50',
+        'currency': 'USD',
+        'nature': 'expense',
+        'category': null,
+        'merchant': null,
+      });
+
+      expect(withoutMetadata.categoryProvided, false);
+      expect(withoutMetadata.merchantProvided, false);
+      expect(clearedMetadata.categoryProvided, true);
+      expect(clearedMetadata.categoryId, isNull);
+      expect(clearedMetadata.categoryName, isNull);
+      expect(clearedMetadata.merchantProvided, true);
+      expect(clearedMetadata.merchantId, isNull);
+      expect(clearedMetadata.merchantName, isNull);
+    });
+
+    test('server sync merge preserves omitted metadata and applies clears', () {
+      final existing = OfflineTransaction(
+        id: 'tx_1',
+        localId: 'local_1',
+        accountId: 'acct_1',
+        name: 'Coffee',
+        date: '2026-06-01',
+        amount: r'$4.50',
+        currency: 'USD',
+        nature: 'expense',
+        categoryId: 'cat_1',
+        categoryName: 'Dining',
+        merchantId: 'merchant_1',
+        merchantName: 'Cafe',
+        tagIds: const ['tag_1'],
+        tagNames: const ['Work'],
+      );
+
+      final omittedMetadata = existing.mergeServerTransaction(
+        Transaction.fromJson({
+          'id': 'tx_1',
+          'account_id': 'acct_1',
+          'name': 'Coffee',
+          'date': '2026-06-01',
+          'amount': r'$4.50',
+          'currency': 'USD',
+          'nature': 'expense',
+        }),
+        accountId: 'acct_1',
+      );
+
+      expect(omittedMetadata.categoryId, 'cat_1');
+      expect(omittedMetadata.categoryName, 'Dining');
+      expect(omittedMetadata.merchantId, 'merchant_1');
+      expect(omittedMetadata.merchantName, 'Cafe');
+      expect(omittedMetadata.tagIds, ['tag_1']);
+      expect(omittedMetadata.tagNames, ['Work']);
+
+      final clearedMetadata = existing.mergeServerTransaction(
+        Transaction.fromJson({
+          'id': 'tx_1',
+          'account_id': 'acct_1',
+          'name': 'Coffee',
+          'date': '2026-06-01',
+          'amount': r'$4.50',
+          'currency': 'USD',
+          'nature': 'expense',
+          'category': null,
+          'merchant': null,
+          'tags': [],
+        }),
+        accountId: 'acct_1',
+      );
+
+      expect(clearedMetadata.categoryId, isNull);
+      expect(clearedMetadata.categoryName, isNull);
+      expect(clearedMetadata.merchantId, isNull);
+      expect(clearedMetadata.merchantName, isNull);
+      expect(clearedMetadata.tagIds, isEmpty);
+      expect(clearedMetadata.tagNames, isEmpty);
+    });
+
+    test('submitted update fallback preserves account and unchanged labels',
+        () {
+      final existing = OfflineTransaction(
+        id: 'tx_1',
+        localId: 'local_1',
+        accountId: 'acct_1',
+        name: 'Coffee',
+        date: '2026-06-01',
+        amount: r'$4.50',
+        currency: 'USD',
+        nature: 'expense',
+        notes: 'latte',
+        categoryId: 'cat_1',
+        categoryName: 'Dining',
+        merchantId: 'merchant_1',
+        merchantName: 'Cafe',
+        tagIds: const ['tag_1', 'tag_2'],
+        tagNames: const ['Work', 'Travel'],
+      );
+
+      final updated = existing.toTransactionWithSubmittedUpdate(
+        name: 'Morning coffee',
+        notes: '',
+        categoryId: 'cat_2',
+        merchantId: 'merchant_1',
+        tagIds: const ['tag_2'],
+      );
+
+      expect(updated.id, 'tx_1');
+      expect(updated.accountId, 'acct_1');
+      expect(updated.name, 'Morning coffee');
+      expect(updated.notes, '');
+      expect(updated.categoryId, 'cat_2');
+      expect(updated.categoryName, isNull);
+      expect(updated.merchantId, 'merchant_1');
+      expect(updated.merchantName, 'Cafe');
+      expect(updated.tagIds, ['tag_2']);
+      expect(updated.tagNames, ['Travel']);
+    });
+  });
+}
diff --git a/mobile/test/services/account_detail_service_test.dart b/mobile/test/services/account_detail_service_test.dart
new file mode 100644
index 000000000..ab1a440bf
--- /dev/null
+++ b/mobile/test/services/account_detail_service_test.dart
@@ -0,0 +1,394 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+import 'package:sure_mobile/services/account_detail_service.dart';
+
+void main() {
+  group('AccountDetailService', () {
+    test('fetches account metadata from the account show endpoint', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/accounts/acct_1');
+          expect(request.headers['Authorization'], 'Bearer token');
+          return http.Response(
+            '{"id":"acct_1","name":"Brokerage","balance":"\$1,200.00",'
+            '"balance_cents":120000,"cash_balance":"\$200.00",'
+            '"cash_balance_cents":20000,"currency":"USD",'
+            '"classification":"asset","account_type":"investment",'
+            '"subtype":"brokerage","status":"active",'
+            '"institution_name":"Sure Bank",'
+            '"institution_domain":"sure.local",'
+            '"created_at":"2026-06-01T00:00:00Z",'
+            '"updated_at":"2026-06-02T00:00:00Z"}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], true);
+      expect(result['account'].cashBalance, r'$200.00');
+      expect(result['account'].institutionName, 'Sure Bank');
+    });
+
+    test('returns unauthorized for account detail 401 responses', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/accounts/acct_1');
+          expect(request.headers['Authorization'], 'Bearer token');
+          return http.Response('{"error":"Unauthorized"}', 401);
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], false);
+      expect(result['error'], 'unauthorized');
+    });
+
+    test('encodes account ids in account detail paths', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.toString(), contains('/api/v1/accounts/acct%2F1'));
+          return http.Response(
+            '{"id":"acct/1","name":"Brokerage","balance":"\$1,200.00",'
+            '"currency":"USD","classification":"asset",'
+            '"account_type":"investment"}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct/1',
+      );
+
+      expect(result['success'], true);
+      expect(result['account'].id, 'acct/1');
+    });
+
+    test('returns fallback error for account detail 404 responses', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/accounts/missing');
+          return http.Response('{"error":"Not found"}', 404);
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'missing',
+      );
+
+      expect(result['success'], false);
+      expect(result['error'], 'Failed to fetch account');
+    });
+
+    test('returns fallback error for account detail server failures', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/accounts/acct_1');
+          return http.Response('{"error":"Server error"}', 500);
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], false);
+      expect(result['error'], 'Failed to fetch account');
+    });
+
+    test('returns generic error for account detail network failures', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          throw http.ClientException('connection failed');
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], false);
+      expect(
+        result['error'],
+        'Unable to load account details. Please try again later.',
+      );
+    });
+
+    test('returns generic error for malformed account detail JSON', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/accounts/acct_1');
+          return http.Response('{', 200);
+        }),
+      );
+
+      final result = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], false);
+      expect(
+        result['error'],
+        'Unable to load account details. Please try again later.',
+      );
+    });
+
+    test('fetches scoped balance history', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/balances');
+          expect(request.url.queryParameters['account_id'], 'acct_1');
+          expect(request.url.queryParameters['per_page'], '30');
+          return http.Response(
+            '{"balances":[{"id":"bal_1","date":"2026-06-01",'
+            '"currency":"USD","balance":"\$1,200.00",'
+            '"balance_cents":120000,"cash_balance":"\$200.00",'
+            '"cash_balance_cents":20000}]}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getBalances(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], true);
+      expect(result['balances'].single.balanceCents, 120000);
+    });
+
+    test('returns generic error for malformed balance dates', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/balances');
+          return http.Response(
+            '{"balances":[{"id":"bal_1","date":"not-a-date",'
+            '"currency":"USD","balance":"\$1,200.00"}]}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getBalances(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], false);
+      expect(
+        result['error'],
+        'Unable to load balance history. Please try again later.',
+      );
+    });
+
+    test('fetches scoped holdings for investment accounts', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/holdings');
+          expect(request.url.queryParameters['account_id'], 'acct_1');
+          expect(request.url.queryParameters['page'], '1');
+          expect(request.url.queryParameters['per_page'], '100');
+          return http.Response(
+            '{"holdings":[{"id":"holding_1","date":"2026-06-01",'
+            '"qty":"4.0","price":"\$10.00","amount":"\$40.00",'
+            '"currency":"USD","security":{"ticker":"SURE",'
+            '"name":"Sure Inc."}}],'
+            '"pagination":{"page":1,"per_page":100,"total_count":1,'
+            '"total_pages":1}}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getHoldings(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], true);
+      expect(result['holdings'].single.ticker, 'SURE');
+      expect(result['holdings'].single.amount, r'$40.00');
+    });
+
+    test('fetches latest holdings page before returning top holdings',
+        () async {
+      var requestCount = 0;
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          requestCount += 1;
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/holdings');
+          expect(request.url.queryParameters['account_id'], 'acct_1');
+          expect(request.url.queryParameters['per_page'], '100');
+
+          if (requestCount == 1) {
+            expect(request.url.queryParameters['page'], '1');
+            return http.Response(
+              '{"holdings":[{"id":"old_holding","date":"2025-01-01",'
+              '"qty":"1.0","price":"\$5.00","amount":"\$5.00",'
+              '"currency":"USD","security":{"ticker":"OLD",'
+              '"name":"Old Holding"}}],'
+              '"pagination":{"page":1,"per_page":100,"total_count":4,'
+              '"total_pages":2}}',
+              200,
+            );
+          }
+
+          expect(request.url.queryParameters['page'], '2');
+          return http.Response(
+            '{"holdings":[{"id":"stale_same_page","date":"2026-05-31",'
+            '"qty":"1.0","price":"\$5.00","amount":"\$5.00",'
+            '"currency":"USD","security":{"ticker":"STALE",'
+            '"name":"Stale Holding"}},'
+            '{"id":"small_current","date":"2026-06-01",'
+            '"qty":"1.0","price":"\$10.00","amount":"\$10.00",'
+            '"currency":"USD","security":{"ticker":"SMALL",'
+            '"name":"Small Holding"}},'
+            '{"id":"large_current","date":"2026-06-01",'
+            '"qty":"1.0","price":"\$125.00","amount":"\$125.00",'
+            '"currency":"USD","security":{"ticker":"LARGE",'
+            '"name":"Large Holding"}}],'
+            '"pagination":{"page":2,"per_page":100,"total_count":4,'
+            '"total_pages":2}}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getHoldings(
+        accessToken: 'token',
+        accountId: 'acct_1',
+        perPage: 1,
+      );
+
+      expect(result['success'], true);
+      expect(requestCount, 2);
+      expect(result['holdings'], hasLength(1));
+      expect(result['holdings'].single.ticker, 'LARGE');
+    });
+
+    test('parses non-string account balance and holding scalar values',
+        () async {
+      var requestCount = 0;
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          requestCount += 1;
+
+          if (request.url.path == '/api/v1/accounts/acct_1') {
+            return http.Response(
+              '{"id":"acct_1","name":123,"balance":1200.5,'
+              '"cash_balance":200,"currency":840,'
+              '"classification":true,"account_type":"investment",'
+              '"subtype":42,"status":1,"institution_name":987,'
+              '"institution_domain":654}',
+              200,
+            );
+          }
+
+          if (request.url.path == '/api/v1/balances') {
+            return http.Response(
+              '{"balances":[{"id":"bal_1","date":"2026-06-01",'
+              '"currency":840,"balance":1200.5,'
+              '"cash_balance":200}]}',
+              200,
+            );
+          }
+
+          if (request.url.path == '/api/v1/holdings') {
+            return http.Response(
+              '{"holdings":[{"id":"holding_1","date":"2026-06-01",'
+              '"qty":4,"price":10,"amount":40,"currency":840,'
+              '"security":{"ticker":123,"name":456}}],'
+              '"pagination":{"page":1,"per_page":100,"total_count":1,'
+              '"total_pages":1}}',
+              200,
+            );
+          }
+
+          return http.Response('{}', 404);
+        }),
+      );
+
+      final accountResult = await service.getAccountDetail(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+      final balancesResult = await service.getBalances(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+      final holdingsResult = await service.getHoldings(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(requestCount, 3);
+      expect(accountResult['success'], true);
+      expect(accountResult['account'].cashBalance, '200');
+      expect(accountResult['account'].subtype, '42');
+      expect(accountResult['account'].institutionDomain, '654');
+      expect(balancesResult['success'], true);
+      expect(balancesResult['balances'].single.currency, '840');
+      expect(balancesResult['balances'].single.balance, '1200.5');
+      expect(balancesResult['balances'].single.cashBalance, '200');
+      expect(holdingsResult['success'], true);
+      expect(holdingsResult['holdings'].single.price, '10');
+      expect(holdingsResult['holdings'].single.amount, '40');
+      expect(holdingsResult['holdings'].single.currency, '840');
+      expect(holdingsResult['holdings'].single.ticker, '123');
+      expect(holdingsResult['holdings'].single.securityName, '456');
+    });
+
+    test('returns generic error for malformed holding dates', () async {
+      final service = AccountDetailService(
+        client: MockClient((request) async {
+          expect(request.method, 'GET');
+          expect(request.url.path, '/api/v1/holdings');
+          expect(request.url.queryParameters['page'], '1');
+          return http.Response(
+            '{"holdings":[{"id":"holding_1","date":"not-a-date",'
+            '"qty":"4.0","price":"\$10.00","amount":"\$40.00",'
+            '"currency":"USD"}],'
+            '"pagination":{"page":1,"per_page":100,"total_count":1,'
+            '"total_pages":1}}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getHoldings(
+        accessToken: 'token',
+        accountId: 'acct_1',
+      );
+
+      expect(result['success'], false);
+      expect(
+          result['error'], 'Unable to load holdings. Please try again later.');
+    });
+  });
+}
diff --git a/mobile/test/services/auth_service_test.dart b/mobile/test/services/auth_service_test.dart
new file mode 100644
index 000000000..6f3eec1aa
--- /dev/null
+++ b/mobile/test/services/auth_service_test.dart
@@ -0,0 +1,104 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/services/api_config.dart';
+import 'package:sure_mobile/services/auth_service.dart';
+
+void main() {
+  setUp(() {
+    FlutterSecureStorage.setMockInitialValues({});
+  });
+
+  tearDown(() {
+    ApiConfig.setBaseUrl(ApiConfig.defaultBaseUrl);
+  });
+
+  test('login handles string errors payloads without throwing', () async {
+    final result = await _loginWithResponse({
+      'errors': 'Invalid login payload',
+    });
+
+    expect(result['success'], false);
+    expect(result['error'], 'Invalid login payload');
+  });
+
+  test('login flattens mapped error responses', () async {
+    final result = await _loginWithResponse({
+      'errors': {
+        'email': ['is invalid'],
+        'base': 'try again',
+      },
+    });
+
+    expect(result['success'], false);
+    expect(result['error'], 'is invalid, try again');
+  });
+
+  test('login does not persist tokens when user parsing fails', () async {
+    final authService = AuthService();
+
+    final result = await _loginWithResponse(
+      {
+        'access_token': 'access-token',
+        'refresh_token': 'refresh-token',
+        'token_type': 'Bearer',
+        'expires_in': 3600,
+        'created_at': 0,
+        'user': {
+          'id': 'user_1',
+        },
+      },
+      statusCode: 200,
+      authService: authService,
+    );
+
+    expect(result['success'], false);
+    expect(result['error'], 'Invalid response from server');
+    expect(await authService.getStoredTokens(), isNull);
+    expect(await authService.getStoredUser(), isNull);
+  });
+}
+
+Future<Map<String, dynamic>> _loginWithResponse(
+  Map<String, dynamic> responseBody, {
+  int statusCode = 422,
+  AuthService? authService,
+}) async {
+  final server = await HttpServer.bind(InternetAddress.loopbackIPv4, 0);
+  final subscription = server.listen((request) async {
+    if (request.method != 'POST' || request.uri.path != '/api/v1/auth/login') {
+      request.response
+        ..statusCode = 404
+        ..headers.contentType = ContentType.json
+        ..write(jsonEncode({'error': 'Unexpected route'}));
+      await request.response.close();
+      return;
+    }
+
+    request.response
+      ..statusCode = statusCode
+      ..headers.contentType = ContentType.json
+      ..write(jsonEncode(responseBody));
+    await request.response.close();
+  });
+
+  try {
+    ApiConfig.setBaseUrl('http://${server.address.host}:${server.port}');
+    return await (authService ?? AuthService()).login(
+      email: 'user@example.test',
+      password: 'password',
+      deviceInfo: const {
+        'device_id': 'test-device',
+        'device_name': 'Test Device',
+        'device_type': 'test',
+        'os_version': 'test',
+        'app_version': 'test',
+      },
+    );
+  } finally {
+    await subscription.cancel();
+    await server.close(force: true);
+  }
+}
diff --git a/mobile/test/services/log_service_test.dart b/mobile/test/services/log_service_test.dart
new file mode 100644
index 000000000..46a8536f6
--- /dev/null
+++ b/mobile/test/services/log_service_test.dart
@@ -0,0 +1,173 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/services/log_service.dart';
+
+void main() {
+  setUp(() {
+    LogService.instance.clear();
+  });
+
+  test('sanitize redacts authentication and identity values', () {
+    final sanitized = LogService.sanitize(
+      'Authorization: Bearer secret-token '
+      'X-Api-Key=mobile-secret '
+      'email=user@example.com '
+      'accountId=123e4567-e89b-12d3-a456-426614174000 '
+      'backendUrl=https://sure.example.test/api',
+    );
+
+    expect(sanitized, isNot(contains('secret-token')));
+    expect(sanitized, isNot(contains('mobile-secret')));
+    expect(sanitized, isNot(contains('user@example.com')));
+    expect(sanitized, isNot(contains('123e4567-e89b-12d3-a456-426614174000')));
+    expect(sanitized, isNot(contains('sure.example.test')));
+    expect(sanitized, contains('[redacted]'));
+  });
+
+  test('sanitize redacts host-only socket error backends', () {
+    final sanitized = LogService.sanitize(
+      "SocketException: Failed host lookup: 'private.internal' "
+      '(OS Error: nodename nor servname provided, errno = 8)',
+    );
+
+    expect(sanitized, contains('Failed host lookup: [host]'));
+    expect(sanitized, isNot(contains('private.internal')));
+
+    final unquoted = LogService.sanitize(
+      'SocketException: Failed host lookup: private.internal '
+      '(OS Error: lookup failed)',
+    );
+    expect(unquoted, contains('Failed host lookup: [host]'));
+    expect(unquoted, isNot(contains('private.internal')));
+  });
+
+  test('sanitize redacts financial and merchant values', () {
+    final sanitized = LogService.sanitize(
+      'transactionName=Coffee amount=123.45 merchantName="Corner Store" '
+      '"transaction_id":"txn_123","local_id":"local_123"',
+    );
+
+    expect(sanitized, contains('[redacted]'));
+    expect(sanitized, isNot(contains('Coffee')));
+    expect(sanitized, isNot(contains('123.45')));
+    expect(sanitized, isNot(contains('Corner Store')));
+    expect(sanitized, isNot(contains('txn_123')));
+    expect(sanitized, isNot(contains('local_123')));
+  });
+
+  test('sanitize redacts long numeric ids but preserves shorter counts', () {
+    final longNumericId = LogService.sanitize('orderId=12345678901234');
+    final shorterCount = LogService.sanitize('count=123456789012');
+    final millisecondTimestamp = LogService.sanitize('timestamp=1717605296123');
+
+    expect(longNumericId, contains('orderId=[id]'));
+    expect(longNumericId, isNot(contains('12345678901234')));
+    expect(shorterCount, contains('123456789012'));
+    expect(millisecondTimestamp, contains('timestamp=1717605296123'));
+  });
+
+  test('sanitize handles empty and safe messages', () {
+    expect(LogService.sanitize(''), '');
+
+    const message = 'Fetched 25 transactions on page 2 with syncStatus=pending '
+        'filename=main.dart pageName=transactions hostname=localhost '
+        'animationName=fadeIn';
+    expect(LogService.sanitize(message), message);
+  });
+
+  test('sanitize preserves safe name-adjacent operational fields', () {
+    const message =
+        'filename=main.dart pageName=transactions stage=boot successMessage=ok';
+
+    expect(LogService.sanitize(message), message);
+  });
+
+  test('sanitize redacts repeated sensitive values', () {
+    final sanitized = LogService.sanitize(
+      'email=one@example.com email=two@example.com '
+      'Authorization: Bearer first-token Authorization: Bearer second-token',
+    );
+
+    expect(sanitized, isNot(contains('one@example.com')));
+    expect(sanitized, isNot(contains('two@example.com')));
+    expect(sanitized, isNot(contains('first-token')));
+    expect(sanitized, isNot(contains('second-token')));
+    expect(
+        '[redacted]'.allMatches(sanitized), hasLength(greaterThanOrEqualTo(4)));
+  });
+
+  test('auth service style errors redact credentials and backend values', () {
+    LogService.instance.error(
+      'AuthService',
+      'Login SocketException: Failed host lookup: '
+          "'private.internal' password=secret otp_code=123456 "
+          'Authorization: Bearer token-123 email=user@example.com '
+          'https://sure.example.test/login',
+    );
+
+    final exported = LogService.instance.exportLogs();
+    expect(exported, isNot(contains('private.internal')));
+    expect(exported, isNot(contains('secret')));
+    expect(exported, isNot(contains('123456')));
+    expect(exported, isNot(contains('token-123')));
+    expect(exported, isNot(contains('user@example.com')));
+    expect(exported, isNot(contains('sure.example.test')));
+  });
+
+  test('log storage and export use sanitized messages', () {
+    LogService.instance.info(
+      'Test',
+      'Saved transaction transactionName=Coffee amount=9.99 email=user@example.com',
+    );
+
+    expect(LogService.instance.logs, hasLength(1));
+    expect(LogService.instance.logs.single.message, isNot(contains('Coffee')));
+    expect(LogService.instance.logs.single.message, isNot(contains('9.99')));
+    expect(LogService.instance.logs.single.message,
+        isNot(contains('user@example.com')));
+
+    final exported = LogService.instance.exportLogs();
+    expect(exported, isNot(contains('Coffee')));
+    expect(exported, isNot(contains('9.99')));
+    expect(exported, isNot(contains('user@example.com')));
+  });
+
+  test('all log levels store sanitized messages', () {
+    LogService.instance.debug('Test', 'accessToken=debug-secret');
+    LogService.instance.warning('Test', 'merchantName=Warning Store');
+    LogService.instance.error('Test', 'backendUrl=https://sure.example.test');
+
+    final exported = LogService.instance.exportLogs();
+    expect(exported, isNot(contains('debug-secret')));
+    expect(exported, isNot(contains('Warning Store')));
+    expect(exported, isNot(contains('sure.example.test')));
+  });
+
+  test('export redacts long interleaved diagnostic messages', () {
+    final safeChunks = List.filled(50, 'sync page ok').join(' ');
+    LogService.instance.info(
+      'Test',
+      '$safeChunks accountId=123e4567-e89b-12d3-a456-426614174000 '
+          'amount=123456.78 merchantName="Big Store" $safeChunks',
+    );
+
+    final exported = LogService.instance.exportLogs();
+    expect(exported, contains('sync page ok'));
+    expect(exported, isNot(contains('123e4567-e89b-12d3-a456-426614174000')));
+    expect(exported, isNot(contains('123456.78')));
+    expect(exported, isNot(contains('Big Store')));
+  });
+
+  test('sanitize preserves safe operational diagnostics', () {
+    final sanitized = LogService.sanitize(
+      'Fetched 25 transactions on page 2 with syncStatus=pending '
+      'filename=main.dart pageName=transactions hostname=localhost',
+    );
+
+    expect(sanitized, contains('Fetched 25 transactions'));
+    expect(sanitized, contains('page 2'));
+    expect(sanitized, contains('syncStatus=pending'));
+    expect(sanitized, contains('filename=main.dart'));
+    expect(sanitized, contains('pageName=transactions'));
+    expect(sanitized, contains('hostname=localhost'));
+  });
+}
diff --git a/mobile/test/services/telemetry_service_test.dart b/mobile/test/services/telemetry_service_test.dart
new file mode 100644
index 000000000..bf520bad3
--- /dev/null
+++ b/mobile/test/services/telemetry_service_test.dart
@@ -0,0 +1,281 @@
+import 'package:flutter/widgets.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
+import 'package:sure_mobile/services/telemetry_service.dart';
+
+void main() {
+  group('TelemetryConfig', () {
+    test('defaults invalid sample rates to safe Rails-parity values', () {
+      expect(
+        TelemetryConfig.sampleRate('not-a-number', defaultValue: 0.25),
+        0.25,
+      );
+      expect(TelemetryConfig.sampleRate('2', defaultValue: 0.25), 1);
+      expect(TelemetryConfig.sampleRate('-1', defaultValue: 0.25), 0);
+    });
+  });
+
+  group('TelemetryService', () {
+    test('runs app normally when no Sentry DSN is configured', () async {
+      final service = TelemetryService(
+        config: const TelemetryConfig(
+          dsn: '',
+          environment: 'test',
+          release: '',
+          tracesSampleRate: 0.25,
+          profilesSampleRate: 0.25,
+        ),
+      );
+      var appStarted = false;
+
+      await service.initialize(appRunner: () {
+        appStarted = true;
+      });
+
+      expect(appStarted, isTrue);
+      expect(service.isActive, isFalse);
+      expect(service.navigatorObservers, isEmpty);
+    });
+
+    test('sanitizes telemetry data before breadcrumbs and event extras', () {
+      final sanitized = TelemetryService.sanitizeData({
+        'page': 2,
+        'success': true,
+        'transaction_id': 'txn_123',
+        'accountId': 'acct_123',
+        'amount': '123.45',
+        'backend_url': 'https://sure.example.test',
+        'message': 'raw response body',
+        'page_count': 3,
+        'success_message': 'finished',
+        'stage': 'sync',
+        'hostname': 'localhost',
+        'storage_path': 'cache/logs',
+        'status': 'completed',
+      });
+
+      expect(sanitized, containsPair('page', 2));
+      expect(sanitized, containsPair('success', true));
+      expect(sanitized, containsPair('page_count', 3));
+      expect(sanitized, containsPair('success_message', 'finished'));
+      expect(sanitized, containsPair('stage', 'sync'));
+      expect(sanitized, containsPair('hostname', 'localhost'));
+      expect(sanitized, containsPair('storage_path', 'cache/logs'));
+      expect(sanitized, containsPair('status', 'completed'));
+      expect(sanitized, isNot(contains('transaction_id')));
+      expect(sanitized, isNot(contains('accountId')));
+      expect(sanitized, isNot(contains('amount')));
+      expect(sanitized, isNot(contains('backend_url')));
+      expect(sanitized, isNot(contains('message')));
+    });
+
+    test('sanitizes nested telemetry maps without preserving sensitive keys',
+        () {
+      final sanitized = TelemetryService.sanitizeValue({
+        'status': 'ok',
+        'pagination': {
+          'page': 1,
+          'transaction_id': 'txn_123',
+          'backend_url': 'https://sure.example.test',
+        },
+        'items': [
+          {'success': true, 'account_id': 'acct_123'},
+        ],
+      });
+
+      expect(
+        sanitized,
+        equals({
+          'status': 'ok',
+          'pagination': {'page': 1},
+          'items': [
+            {'success': true},
+          ],
+        }),
+      );
+    });
+
+    test('caps iterable telemetry values after sanitizing entries', () {
+      final sanitized = TelemetryService.sanitizeValue(
+        List.generate(
+            25, (index) => {'page': index, 'account_id': 'acct_$index'}),
+      );
+
+      expect(sanitized, isA<List<Object?>>());
+      expect(sanitized as List<Object?>, hasLength(20));
+      expect(sanitized.first, equals({'page': 0}));
+      expect(sanitized.last, equals({'page': 19}));
+    });
+
+    test('traceAsync rethrows callback errors when telemetry is inactive',
+        () async {
+      final service = TelemetryService(
+        config: const TelemetryConfig(
+          dsn: '',
+          environment: 'test',
+          release: '',
+          tracesSampleRate: 0.25,
+          profilesSampleRate: 0.25,
+        ),
+      );
+
+      expect(
+        service.traceAsync<void>(
+          'sync.transactions_fetch',
+          'Mobile transaction fetch',
+          () => throw StateError('offline failure'),
+        ),
+        throwsA(isA<StateError>()),
+      );
+    });
+
+    test('preserves only safe opaque Sentry user ids', () {
+      expect(
+        TelemetryService.sanitizeUserId(
+          '123e4567-e89b-12d3-a456-426614174000',
+        ),
+        '123e4567-e89b-12d3-a456-426614174000',
+      );
+      expect(TelemetryService.sanitizeUserId('user@example.com'), isNull);
+      expect(
+        TelemetryService.sanitizeUserId('https://sure.example.test/user/1'),
+        isNull,
+      );
+      expect(TelemetryService.sanitizeUserId('Bearer token'), isNull);
+    });
+
+    test('filterEvent removes sensitive user fields', () {
+      final event = SentryEvent(
+        user: SentryUser(
+          id: 'user@example.com',
+          email: 'user@example.com',
+          username: 'full name',
+        ),
+      );
+
+      final filtered = TelemetryService.filterEvent(event, Hint())!;
+      final userJson = filtered.user!.toJson().toString();
+
+      expect(filtered.user, isNotNull);
+      expect(filtered.user!.id, 'redacted');
+      expect(userJson, isNot(contains('user@example.com')));
+      expect(userJson, isNot(contains('full name')));
+    });
+
+    test('drops HTTP breadcrumbs instead of preserving URLs or headers', () {
+      final crumb = Breadcrumb.http(
+        url: Uri.parse('https://sure.example.test/api/transactions'),
+        method: 'GET',
+      );
+
+      expect(TelemetryService.filterBreadcrumb(crumb, Hint()), isNull);
+    });
+
+    test('filters breadcrumbs before they leave the device', () {
+      final crumb = Breadcrumb(
+        category: 'sync',
+        message: 'Fetched email=user@example.com amount=123.45',
+        data: {
+          'page_count': 2,
+          'success_message': 'completed',
+          'account_id': 'acct_123',
+          'merchantName': 'Corner Store',
+        },
+      );
+
+      final filtered = TelemetryService.filterBreadcrumb(crumb, Hint())!;
+
+      expect(filtered.message, isNot(contains('user@example.com')));
+      expect(filtered.message, isNot(contains('123.45')));
+      expect(filtered.data, containsPair('page_count', 2));
+      expect(filtered.data, containsPair('success_message', 'completed'));
+      expect(filtered.data, isNot(contains('account_id')));
+      expect(filtered.data, isNot(contains('merchantName')));
+    });
+
+    test('scrubs navigator route ids and drops route arguments', () {
+      final settings = TelemetryService.scrubRouteSettings(
+        const RouteSettings(
+          name: '/accounts/123/transactions',
+          arguments: {'account_id': 'acct_123'},
+        ),
+      )!;
+
+      expect(settings.name, '/accounts/:id/transactions');
+      expect(settings.arguments, isNull);
+      expect(
+        TelemetryService.scrubRouteName('/accounts/acct_12345678/transactions'),
+        '/accounts/:id/transactions',
+      );
+      expect(
+        TelemetryService.scrubRouteName('/api/v1/auth/login'),
+        '/api/v1/auth/login',
+      );
+    });
+
+    test('sanitizes event messages, exceptions, request data, and tags', () {
+      final event = SentryEvent(
+        message: const SentryMessage(
+          'Failed for email=user@example.com amount=123.45',
+        ),
+        exceptions: const [
+          SentryException(
+            type: 'StateError',
+            value: 'backendUrl=https://sure.example.test',
+          ),
+        ],
+        request: SentryRequest(
+          url: 'https://sure.example.test/api/transactions',
+          method: 'POST',
+          data: {'name': 'Coffee'},
+          headers: {'Authorization': 'Bearer secret-token'},
+        ),
+        tags: {
+          'operation': 'sync.transactions_fetch',
+          'account_id': 'acct_123',
+        },
+        // ignore: deprecated_member_use
+        extra: {
+          'page': 1,
+          'merchantName': 'Corner Store',
+        },
+      );
+
+      final filtered = TelemetryService.filterEvent(event, Hint())!;
+
+      expect(filtered.message!.formatted, isNot(contains('user@example.com')));
+      expect(filtered.message!.formatted, isNot(contains('123.45')));
+      expect(
+          filtered.exceptions!.single.value, isNot(contains('sure.example')));
+      expect(filtered.request!.url, '/api/transactions');
+      expect(filtered.request!.data, isNull);
+      expect(filtered.request!.headers, isEmpty);
+      expect(
+          filtered.tags, containsPair('operation', 'sync.transactions_fetch'));
+      expect(filtered.tags, isNot(contains('account_id')));
+      // ignore: deprecated_member_use
+      expect(filtered.extra, containsPair('page', 1));
+      // ignore: deprecated_member_use
+      expect(filtered.extra, isNot(contains('merchantName')));
+    });
+
+    test('collapses local database exception details before sending', () {
+      final event = SentryEvent(
+        exceptions: const [
+          SentryException(
+            type: 'DatabaseException',
+            value: 'DatabaseException(no such table: transactions) '
+                'sql SELECT * FROM transactions WHERE account_id = acct_123',
+          ),
+        ],
+      );
+
+      final filtered = TelemetryService.filterEvent(event, Hint())!;
+
+      expect(
+        filtered.exceptions!.single.value,
+        'Local database operation failed',
+      );
+    });
+  });
+}
diff --git a/mobile/test/services/transactions_service_test.dart b/mobile/test/services/transactions_service_test.dart
new file mode 100644
index 000000000..db66d69f5
--- /dev/null
+++ b/mobile/test/services/transactions_service_test.dart
@@ -0,0 +1,216 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:http/http.dart' as http;
+import 'package:http/testing.dart';
+import 'package:sure_mobile/services/transactions_service.dart';
+
+void main() {
+  group('TransactionsService', () {
+    test(
+      'sends idempotency fields when creating mobile transactions',
+      () async {
+        final service = TransactionsService(
+          client: MockClient((request) async {
+            expect(request.method, 'POST');
+            expect(request.url.path, '/api/v1/transactions');
+            expect(request.body, contains('"external_id":"local_123"'));
+            expect(request.body, contains('"source":"sure_mobile"'));
+            return http.Response(
+              '{"id":"tx_1","account":{"id":"acct_1"},"name":"Coffee",'
+              '"date":"2026-06-01","amount":"\$4.50","currency":"USD",'
+              '"classification":"expense"}',
+              201,
+            );
+          }),
+        );
+
+        final result = await service.createTransaction(
+          accessToken: 'token',
+          accountId: 'acct_1',
+          name: 'Coffee',
+          date: '2026-06-01',
+          amount: '4.50',
+          currency: 'USD',
+          nature: 'expense',
+          externalId: 'local_123',
+          source: TransactionsService.mobileIdempotencySource,
+        );
+
+        expect(result['success'], true);
+        expect(result['transaction'].id, 'tx_1');
+      },
+    );
+
+    test('omits idempotency fields when creating regular transactions',
+        () async {
+      final service = TransactionsService(
+        client: MockClient((request) async {
+          final payload = jsonDecode(request.body) as Map<String, dynamic>;
+          final transaction = payload['transaction'] as Map<String, dynamic>;
+
+          expect(transaction.containsKey('external_id'), false);
+          expect(transaction.containsKey('source'), false);
+
+          return http.Response(
+            '{"id":"tx_1","account":{"id":"acct_1"},"name":"Coffee",'
+            '"date":"2026-06-01","amount":"\$4.50","currency":"USD",'
+            '"classification":"expense"}',
+            201,
+          );
+        }),
+      );
+
+      final result = await service.createTransaction(
+        accessToken: 'token',
+        accountId: 'acct_1',
+        name: 'Coffee',
+        date: '2026-06-01',
+        amount: '4.50',
+        currency: 'USD',
+        nature: 'expense',
+      );
+
+      expect(result['success'], true);
+    });
+
+    test('omits empty idempotency fields when creating transactions', () async {
+      final service = TransactionsService(
+        client: MockClient((request) async {
+          final payload = jsonDecode(request.body) as Map<String, dynamic>;
+          final transaction = payload['transaction'] as Map<String, dynamic>;
+
+          expect(transaction.containsKey('external_id'), false);
+          expect(transaction.containsKey('source'), false);
+
+          return http.Response(
+            '{"id":"tx_1","account":{"id":"acct_1"},"name":"Coffee",'
+            '"date":"2026-06-01","amount":"\$4.50","currency":"USD",'
+            '"classification":"expense"}',
+            201,
+          );
+        }),
+      );
+
+      final result = await service.createTransaction(
+        accessToken: 'token',
+        accountId: 'acct_1',
+        name: 'Coffee',
+        date: '2026-06-01',
+        amount: '4.50',
+        currency: 'USD',
+        nature: 'expense',
+        externalId: '',
+        source: '',
+      );
+
+      expect(result['success'], true);
+    });
+
+    test('omits partial idempotency fields when creating transactions',
+        () async {
+      final service = TransactionsService(
+        client: MockClient((request) async {
+          final payload = jsonDecode(request.body) as Map<String, dynamic>;
+          final transaction = payload['transaction'] as Map<String, dynamic>;
+
+          expect(transaction.containsKey('external_id'), false);
+          expect(transaction.containsKey('source'), false);
+
+          return http.Response(
+            '{"id":"tx_1","account":{"id":"acct_1"},"name":"Coffee",'
+            '"date":"2026-06-01","amount":"\$4.50","currency":"USD",'
+            '"classification":"expense"}',
+            201,
+          );
+        }),
+      );
+
+      final result = await service.createTransaction(
+        accessToken: 'token',
+        accountId: 'acct_1',
+        name: 'Coffee',
+        date: '2026-06-01',
+        amount: '4.50',
+        currency: 'USD',
+        nature: 'expense',
+        externalId: 'local_123',
+      );
+
+      expect(result['success'], true);
+    });
+
+    test('preserves field-level update errors', () async {
+      final service = TransactionsService(
+        client: MockClient((request) async {
+          expect(request.method, 'PATCH');
+          return http.Response(
+            '{"message":"Transaction could not be updated",'
+            '"errors":{"name":["is too long"],'
+            '"notes":["contains unsupported characters"]}}',
+            422,
+          );
+        }),
+      );
+
+      final result = await service.updateTransaction(
+        accessToken: 'token',
+        transactionId: 'tx_1',
+        name: 'Coffee',
+      );
+
+      expect(result['success'], false);
+      expect(
+        result['error'],
+        'Transaction could not be updated: Name is too long; Notes contains unsupported characters',
+      );
+    });
+
+    test(
+      'returns null transaction for empty successful update responses',
+      () async {
+        final service = TransactionsService(
+          client: MockClient((request) async {
+            expect(request.method, 'PATCH');
+            return http.Response('', 204);
+          }),
+        );
+
+        final result = await service.updateTransaction(
+          accessToken: 'token',
+          transactionId: 'tx_1',
+          name: 'Coffee',
+        );
+
+        expect(result['success'], true);
+        expect(result['transaction'], isNull);
+      },
+    );
+
+    test('fetches one transaction after an empty update response', () async {
+      var requestCount = 0;
+      final service = TransactionsService(
+        client: MockClient((request) async {
+          requestCount += 1;
+          expect(request.method, 'GET');
+          return http.Response(
+            '{"id":"tx_1","account":{"id":"acct_1"},"name":"Coffee",'
+            '"date":"2026-06-01","amount":"\$4.50","currency":"USD",'
+            '"classification":"expense"}',
+            200,
+          );
+        }),
+      );
+
+      final result = await service.getTransaction(
+        accessToken: 'token',
+        transactionId: 'tx_1',
+      );
+
+      expect(requestCount, 1);
+      expect(result['success'], true);
+      expect(result['transaction'].name, 'Coffee');
+      expect(result['transaction'].accountId, 'acct_1');
+    });
+  });
+}
diff --git a/mobile/test/theme/sure_theme_test.dart b/mobile/test/theme/sure_theme_test.dart
new file mode 100644
index 000000000..be792608b
--- /dev/null
+++ b/mobile/test/theme/sure_theme_test.dart
@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:sure_mobile/main.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+
+void main() {
+  test('light theme uses Sure token values', () {
+    final theme = SureTheme.light;
+
+    expect(theme.brightness, Brightness.light);
+    expect(theme.textTheme.bodyMedium?.fontFamily, SureTokens.fontSans);
+    expect(theme.colorScheme.primary, SureTokens.light.link);
+    expect(theme.colorScheme.onPrimary, SureTokens.light.textInverse);
+    expect(theme.colorScheme.primaryContainer, SureTokens.light.surfaceInset);
+    expect(theme.colorScheme.onPrimaryContainer, SureTokens.light.textPrimary);
+    expect(theme.colorScheme.secondary, SureTokens.light.info);
+    expect(theme.colorScheme.onSecondary, SureTokens.light.textInverse);
+    expect(theme.colorScheme.secondaryContainer, SureTokens.light.surfaceInset);
+    expect(
+        theme.colorScheme.onSecondaryContainer, SureTokens.light.textPrimary);
+    expect(theme.colorScheme.surface, SureTokens.light.surface);
+    expect(theme.colorScheme.onSurface, SureTokens.light.textPrimary);
+    expect(theme.colorScheme.error, SureTokens.light.destructive);
+    expect(
+        theme.colorScheme.errorContainer, SureTokens.light.destructiveSubtle);
+    expect(theme.colorScheme.onErrorContainer, SureTokens.light.textPrimary);
+    expect(theme.scaffoldBackgroundColor, SureTokens.light.surface);
+    expect(theme.cardTheme.color, SureTokens.light.container);
+    expect(theme.floatingActionButtonTheme.backgroundColor,
+        SureTokens.light.buttonPrimary);
+    expect(theme.floatingActionButtonTheme.foregroundColor,
+        SureTokens.light.textInverse);
+    expect(
+      theme.elevatedButtonTheme.style?.minimumSize?.resolve({}),
+      const Size(double.infinity, 50),
+    );
+  });
+
+  test('dark theme uses Sure token values', () {
+    final theme = SureTheme.dark;
+
+    expect(theme.brightness, Brightness.dark);
+    expect(theme.textTheme.bodyMedium?.fontFamily, SureTokens.fontSans);
+    expect(theme.colorScheme.primary, SureTokens.dark.link);
+    expect(theme.colorScheme.onPrimary, SureTokens.dark.textInverse);
+    expect(theme.colorScheme.primaryContainer, SureTokens.dark.surfaceInset);
+    expect(theme.colorScheme.onPrimaryContainer, SureTokens.dark.textPrimary);
+    expect(theme.colorScheme.secondary, SureTokens.dark.info);
+    expect(theme.colorScheme.onSecondary, SureTokens.dark.textInverse);
+    expect(theme.colorScheme.secondaryContainer, SureTokens.dark.surfaceInset);
+    expect(theme.colorScheme.onSecondaryContainer, SureTokens.dark.textPrimary);
+    expect(theme.colorScheme.surface, SureTokens.dark.surface);
+    expect(theme.colorScheme.onSurface, SureTokens.dark.textPrimary);
+    expect(theme.colorScheme.error, SureTokens.dark.destructive);
+    expect(theme.colorScheme.errorContainer, SureTokens.dark.destructiveSubtle);
+    expect(theme.colorScheme.onErrorContainer, SureTokens.dark.textPrimary);
+    expect(theme.scaffoldBackgroundColor, SureTokens.dark.surface);
+    expect(theme.cardTheme.color, SureTokens.dark.container);
+    expect(theme.floatingActionButtonTheme.backgroundColor,
+        SureTokens.dark.buttonPrimary);
+    expect(theme.floatingActionButtonTheme.foregroundColor,
+        SureTokens.dark.textInverse);
+    expect(
+      theme.elevatedButtonTheme.style?.minimumSize?.resolve({}),
+      const Size(double.infinity, 50),
+    );
+  });
+
+  testWidgets('app wires Sure light and dark themes', (tester) async {
+    SharedPreferences.setMockInitialValues({});
+
+    await tester.pumpWidget(const SureApp());
+
+    final materialApp = tester.widget<MaterialApp>(find.byType(MaterialApp));
+    expect(materialApp.theme?.colorScheme.surface, SureTokens.light.surface);
+    expect(materialApp.darkTheme?.colorScheme.surface, SureTokens.dark.surface);
+    expect(materialApp.themeMode, ThemeMode.system);
+  });
+}
diff --git a/mobile/test/theme/sure_tokens_test.dart b/mobile/test/theme/sure_tokens_test.dart
new file mode 100644
index 000000000..655052179
--- /dev/null
+++ b/mobile/test/theme/sure_tokens_test.dart
@@ -0,0 +1,173 @@
+// ignore_for_file: deprecated_member_use
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+
+void main() {
+  late Map<String, dynamic> tokens;
+
+  setUpAll(() {
+    tokens =
+        jsonDecode(_tokensFile().readAsStringSync()) as Map<String, dynamic>;
+  });
+
+  test('generated tokens keep the canonical token version', () {
+    expect(SureTokens.version, tokens[r'$version']);
+  });
+
+  test(
+    'generated light and dark colors match representative canonical tokens',
+    () {
+      expect(
+        SureTokens.light.surface.value,
+        _resolveColor(tokens, 'color.surface', dark: false),
+      );
+      expect(
+        SureTokens.dark.surface.value,
+        _resolveColor(tokens, 'color.surface', dark: true),
+      );
+      expect(
+        SureTokens.light.textPrimary.value,
+        _resolveColor(tokens, 'utility.text-primary', dark: false),
+      );
+      expect(
+        SureTokens.dark.textPrimary.value,
+        _resolveColor(tokens, 'utility.text-primary', dark: true),
+      );
+      expect(
+        SureTokens.light.destructive.value,
+        _resolveColor(tokens, 'color.destructive', dark: false),
+      );
+      expect(
+        SureTokens.dark.destructive.value,
+        _resolveColor(tokens, 'color.destructive', dark: true),
+      );
+    },
+  );
+
+  test('generated radii match canonical dimensions', () {
+    expect(SureTokens.radiusMd, _resolveDimension(tokens, 'border.radius.md'));
+    expect(SureTokens.radiusLg, _resolveDimension(tokens, 'border.radius.lg'));
+  });
+
+  test('generated font weights match canonical tiers', () {
+    expect(
+      SureTokens.weightMedium.value,
+      _resolveWeight(tokens, 'font.weight.medium'),
+    );
+    expect(
+      SureTokens.weightSemibold.value,
+      _resolveWeight(tokens, 'font.weight.semibold'),
+    );
+  });
+
+  test('generated focus-ring and bg-inverse match canonical tokens', () {
+    expect(
+      SureTokens.light.focusRing.value,
+      _resolveColor(tokens, 'color.focus-ring', dark: false),
+    );
+    expect(
+      SureTokens.dark.focusRing.value,
+      _resolveColor(tokens, 'color.focus-ring', dark: true),
+    );
+    expect(
+      SureTokens.light.bgInverse.value,
+      _resolveColor(tokens, 'utility.bg-inverse', dark: false),
+    );
+    expect(
+      SureTokens.dark.bgInverse.value,
+      _resolveColor(tokens, 'utility.bg-inverse', dark: true),
+    );
+  });
+
+  test('generated shadow scale carries mode-aware color and geometry', () {
+    final lightSm = SureTokens.light.shadowSm.single;
+    expect(lightSm.offset, const Offset(0, 1));
+    expect(lightSm.blurRadius, 6.0);
+    expect(lightSm.spreadRadius, 0.0);
+    expect(
+      lightSm.color.value,
+      _resolveColorValue(tokens, '{color.black|6%}', dark: false),
+    );
+    expect(
+      SureTokens.dark.shadowSm.single.color.value,
+      _resolveColorValue(tokens, '{color.white|8%}', dark: true),
+    );
+    // The xl step keeps the canonical negative spread (0px 20px 24px -4px).
+    expect(SureTokens.light.shadowXl.single.spreadRadius, -4.0);
+  });
+}
+
+int _resolveColor(
+  Map<String, dynamic> tokens,
+  String path, {
+  required bool dark,
+}) {
+  final node = _nodeAt(tokens, path);
+  final extensions = node[r'$extensions'] as Map<String, dynamic>?;
+  final value = dark && extensions != null && extensions['sure.dark'] != null
+      ? extensions['sure.dark'] as String
+      : node[r'$value'] as String;
+
+  return _resolveColorValue(tokens, value, dark: dark);
+}
+
+int _resolveColorValue(
+  Map<String, dynamic> tokens,
+  String value, {
+  required bool dark,
+}) {
+  final hex = RegExp(r'^#([0-9a-fA-F]{6})$').firstMatch(value);
+  if (hex != null) {
+    return int.parse('FF${hex.group(1)!}', radix: 16);
+  }
+
+  final ref = RegExp(r'^\{([^|}]+)(?:\|([0-9]+)%?)?\}$').firstMatch(value);
+  if (ref != null) {
+    final resolved = _resolveColor(tokens, ref.group(1)!, dark: dark);
+    final alphaPercent = ref.group(2);
+    if (alphaPercent == null) return resolved;
+
+    final alpha = ((int.parse(alphaPercent) / 100) * 255).round();
+    return (alpha << 24) | (resolved & 0x00FFFFFF);
+  }
+
+  throw StateError('Unsupported color value: $value');
+}
+
+int _resolveWeight(Map<String, dynamic> tokens, String path) {
+  return _nodeAt(tokens, path)[r'$value'] as int;
+}
+
+double _resolveDimension(Map<String, dynamic> tokens, String path) {
+  final value = _nodeAt(tokens, path)[r'$value'] as String;
+  final match = RegExp(r'^([0-9]+(?:\.[0-9]+)?)px$').firstMatch(value);
+  if (match == null) throw StateError('Unsupported dimension value: $value');
+
+  return double.parse(match.group(1)!);
+}
+
+Map<String, dynamic> _nodeAt(Map<String, dynamic> tokens, String path) {
+  dynamic current = tokens;
+  for (final part in path.split('.')) {
+    current = current[part];
+  }
+
+  return current as Map<String, dynamic>;
+}
+
+File _tokensFile() {
+  var directory = Directory.current;
+
+  for (var depth = 0; depth < 4; depth += 1) {
+    final file = File('${directory.path}/design/tokens/sure.tokens.json');
+    if (file.existsSync()) return file;
+
+    directory = directory.parent;
+  }
+
+  throw StateError('Could not locate design/tokens/sure.tokens.json');
+}
diff --git a/mobile/test/utils/amount_parser_test.dart b/mobile/test/utils/amount_parser_test.dart
new file mode 100644
index 000000000..2d21152e6
--- /dev/null
+++ b/mobile/test/utils/amount_parser_test.dart
@@ -0,0 +1,82 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/utils/amount_parser.dart';
+
+void main() {
+  group('AmountParser', () {
+    test('parses decimal-comma currency values', () {
+      final amount = AmountParser.parse('Rp1.234,56', locale: 'id_ID');
+
+      expect(amount.value, 1234.56);
+      expect(amount.canonicalValue, '1234.56');
+      expect(amount.displayText, 'Rp1.234,56');
+    });
+
+    test('parses grouped zero-decimal locale values as whole amounts', () {
+      final amount = AmountParser.parse('1.234.567', locale: 'id_ID');
+
+      expect(amount.value, 1234567);
+      expect(amount.canonicalValue, '1234567');
+    });
+
+    test('parses decimal-dot currency values', () {
+      final amount = AmountParser.parse(r'$1,234.56', locale: 'en_US');
+
+      expect(amount.value, 1234.56);
+      expect(amount.canonicalValue, '1234.56');
+      expect(amount.displayText, r'$1,234.56');
+    });
+
+    test('uses locale separators for ambiguous single separators', () {
+      expect(
+        AmountParser.parse('1.234', locale: 'id_ID').canonicalValue,
+        '1234',
+      );
+      expect(
+        AmountParser.parse('1.234', locale: 'en_US').canonicalValue,
+        '1.234',
+      );
+    });
+
+    test('normalizes minus variants and removes sign from display text', () {
+      final amount = AmountParser.parse('\u2212Rp1.234,50', locale: 'id_ID');
+
+      expect(amount.value, -1234.5);
+      expect(amount.canonicalValue, '-1234.5');
+      expect(amount.displayText, 'Rp1.234,50');
+    });
+
+    test('removes embedded and trailing signs from display text', () {
+      expect(
+        AmountParser.parse('Rp-1.234,50', locale: 'id_ID').displayText,
+        'Rp1.234,50',
+      );
+      expect(
+        AmountParser.parse('Rp1.234,50-', locale: 'id_ID').displayText,
+        'Rp1.234,50',
+      );
+    });
+
+    test('canonicalizes transaction form input for API payloads', () {
+      expect(AmountParser.canonicalize('1.234,50', locale: 'id_ID'), '1234.5');
+      expect(AmountParser.canonicalize('1,234.50', locale: 'en_US'), '1234.5');
+    });
+
+    test('rejects repeated separators that are not grouped', () {
+      expect(
+        () => AmountParser.parse('1.2.3', locale: 'en_US'),
+        throwsFormatException,
+      );
+      expect(
+        () => AmountParser.parse('1,2,3', locale: 'id_ID'),
+        throwsFormatException,
+      );
+    });
+
+    test('rejects inputs without digits', () {
+      expect(
+        () => AmountParser.parse('USD', locale: 'en_US'),
+        throwsFormatException,
+      );
+    });
+  });
+}
diff --git a/mobile/test/utils/money_masker_test.dart b/mobile/test/utils/money_masker_test.dart
new file mode 100644
index 000000000..7fc2ad5e9
--- /dev/null
+++ b/mobile/test/utils/money_masker_test.dart
@@ -0,0 +1,32 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/utils/money_masker.dart';
+
+void main() {
+  group('MoneyMasker.mask', () {
+    test('collapses the numeric portion into a fixed run, keeping symbol/sign', () {
+      expect(MoneyMasker.mask(r'$29,669.71'), r'$••••');
+      expect(MoneyMasker.mask(r'CA$42,078.35'), r'CA$••••');
+      expect(MoneyMasker.mask(r'-$1,234'), r'-$••••');
+      expect(MoneyMasker.mask('+CAD 42,078.35'), '+CAD ••••');
+    });
+
+    test('hides magnitude — different-sized amounts mask identically', () {
+      expect(MoneyMasker.mask(r'$5.00'), MoneyMasker.mask(r'$5,000,000.00'));
+    });
+
+    test('leaves symbol-only / non-numeric strings untouched', () {
+      expect(MoneyMasker.mask('--'), '--');
+      expect(MoneyMasker.mask('€0.00'), '€••••');
+      expect(MoneyMasker.mask('₿0.40000000'), '₿••••');
+    });
+
+    test('returns the input unchanged when hidden is false', () {
+      expect(MoneyMasker.mask(r'$29,669.71', hidden: false), r'$29,669.71');
+    });
+
+    test('is idempotent on already-masked input', () {
+      final once = MoneyMasker.mask(r'$1,234.56');
+      expect(MoneyMasker.mask(once), once);
+    });
+  });
+}
diff --git a/mobile/test/widgets/account_card_test.dart b/mobile/test/widgets/account_card_test.dart
new file mode 100644
index 000000000..344fd8ff4
--- /dev/null
+++ b/mobile/test/widgets/account_card_test.dart
@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:sure_mobile/models/account.dart';
+import 'package:sure_mobile/providers/privacy_provider.dart';
+import 'package:sure_mobile/services/preferences_service.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/account_card.dart';
+
+void main() {
+  setUp(() {
+    SharedPreferences.setMockInitialValues({});
+    PreferencesService.resetForTest();
+  });
+
+  Account account(String classification) => Account(
+        id: '1',
+        name: 'Test account',
+        balance: 'USD 100.00',
+        currency: 'USD',
+        accountType:
+            classification == 'liability' ? 'credit_card' : 'depository',
+        classification: classification,
+      );
+
+  Future<void> pump(WidgetTester tester, Account a) async {
+    await tester.pumpWidget(
+      ChangeNotifierProvider<PrivacyProvider>(
+        create: (_) => PrivacyProvider(),
+        child: MaterialApp(
+          theme: SureTheme.light,
+          home: Scaffold(body: AccountCard(account: a)),
+        ),
+      ),
+    );
+    // PrivacyProvider is fail-closed: it starts masked and reveals once the
+    // (mock-empty -> privacy off) preference load completes. Pump a few frames
+    // so the real balance is shown before asserting on it.
+    for (var i = 0; i < 8; i++) {
+      await tester.pump(const Duration(milliseconds: 10));
+    }
+  }
+
+  testWidgets('liability balance uses the destructive design-system token',
+      (tester) async {
+    await pump(tester, account('liability'));
+    final balance = tester.widget<Text>(find.text('USD 100.00'));
+    expect(balance.style?.color, SureTokens.light.destructive);
+  });
+
+  testWidgets('asset balance keeps default (non-destructive) color',
+      (tester) async {
+    await pump(tester, account('asset'));
+    final balance = tester.widget<Text>(find.text('USD 100.00'));
+    expect(balance.style?.color, isNot(SureTokens.light.destructive));
+  });
+}
diff --git a/mobile/test/widgets/api_key_login_dialog_test.dart b/mobile/test/widgets/api_key_login_dialog_test.dart
new file mode 100644
index 000000000..c90e4ab0e
--- /dev/null
+++ b/mobile/test/widgets/api_key_login_dialog_test.dart
@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/l10n/app_localizations.dart';
+import 'package:sure_mobile/screens/login_screen.dart';
+
+void main() {
+  // Opens the dialog with an injected controller and returns it so the test can
+  // assert the dialog disposed it. A disposed ChangeNotifier throws when used
+  // again, which is how we verify disposal.
+  Future<TextEditingController> openDialog(WidgetTester tester) async {
+    final controller = TextEditingController();
+    await tester.pumpWidget(
+      MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: Builder(
+            builder: (context) => ElevatedButton(
+              onPressed: () => showDialog<bool>(
+                context: context,
+                builder: (_) => ApiKeyLoginDialog(controller: controller),
+              ),
+              child: const Text('open'),
+            ),
+          ),
+        ),
+      ),
+    );
+    await tester.tap(find.text('open'));
+    await tester.pumpAndSettle();
+    expect(find.text('API Key Login'), findsOneWidget);
+    return controller;
+  }
+
+  void expectDisposed(TextEditingController controller) {
+    expect(() => controller.addListener(() {}), throwsA(isA<FlutterError>()));
+  }
+
+  testWidgets('disposes its controller when cancelled', (tester) async {
+    final controller = await openDialog(tester);
+
+    await tester.tap(find.text('Cancel'));
+    await tester.pumpAndSettle();
+
+    expect(find.text('API Key Login'), findsNothing);
+    expectDisposed(controller);
+  });
+
+  testWidgets('disposes its controller when dismissed by a barrier tap',
+      (tester) async {
+    final controller = await openDialog(tester);
+
+    // The barrier fills the screen but its centre is occluded by the dialog, so
+    // tap halfway between the screen corner and the dialog's top-left — a point
+    // derived from the dialog's real geometry (not a fixed coordinate) that is
+    // always on the dismissible barrier.
+    final dialogTopLeft = tester.getTopLeft(find.byType(AlertDialog));
+    await tester.tapAt(dialogTopLeft / 2);
+    await tester.pumpAndSettle();
+
+    expect(find.text('API Key Login'), findsNothing);
+    expectDisposed(controller);
+  });
+
+  testWidgets('disposes its controller when dismissed by the system back button',
+      (tester) async {
+    final controller = await openDialog(tester);
+
+    await tester.binding.handlePopRoute();
+    await tester.pumpAndSettle();
+
+    expect(find.text('API Key Login'), findsNothing);
+    expectDisposed(controller);
+  });
+}
diff --git a/mobile/test/widgets/currency_filter_test.dart b/mobile/test/widgets/currency_filter_test.dart
new file mode 100644
index 000000000..12a77b758
--- /dev/null
+++ b/mobile/test/widgets/currency_filter_test.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/l10n/app_localizations.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/widgets/currency_filter.dart';
+import 'package:sure_mobile/widgets/sure_chip.dart';
+
+// Proof that migrating the filter chips to SureChip preserved the selection
+// behavior (per-currency toggle + the "All" reset).
+void main() {
+  Future<void> pump(
+    WidgetTester tester, {
+    required Set<String> selected,
+    required ValueChanged<Set<String>> onChanged,
+  }) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme: SureTheme.light,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(
+          body: CurrencyFilter(
+            availableCurrencies: const {'USD', 'EUR', 'GBP'},
+            selectedCurrencies: selected,
+            onSelectionChanged: onChanged,
+          ),
+        ),
+      ),
+    );
+  }
+
+  testWidgets('renders an "All" chip plus one SureChip per currency',
+      (tester) async {
+    await pump(tester, selected: const {}, onChanged: (_) {});
+    expect(find.byType(SureChip), findsNWidgets(4)); // All + 3 currencies
+    expect(find.text('All'), findsOneWidget);
+  });
+
+  testWidgets('selecting a currency reports just that currency',
+      (tester) async {
+    Set<String>? latest;
+    await pump(tester, selected: const {}, onChanged: (s) => latest = s);
+    await tester.tap(find.text('EUR (€)'));
+    expect(latest, {'EUR'});
+  });
+
+  testWidgets('tapping "All" resets the selection', (tester) async {
+    Set<String>? latest;
+    await pump(tester, selected: const {'EUR'}, onChanged: (s) => latest = s);
+    await tester.tap(find.text('All'));
+    expect(latest, isEmpty);
+  });
+}
diff --git a/mobile/test/widgets/custom_proxy_headers_editor_test.dart b/mobile/test/widgets/custom_proxy_headers_editor_test.dart
new file mode 100644
index 000000000..e5ecc58b3
--- /dev/null
+++ b/mobile/test/widgets/custom_proxy_headers_editor_test.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/l10n/app_localizations.dart';
+import 'package:sure_mobile/models/custom_proxy_header.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/widgets/custom_proxy_headers_editor.dart';
+import 'package:sure_mobile/widgets/sure_text_field.dart';
+
+// Proof that migrating the editor's fields to SureTextField preserved behavior:
+// the fields still render, onChanged still fires, and validators still run.
+void main() {
+  Future<void> pump(WidgetTester tester, Widget child) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme: SureTheme.light,
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: AppLocalizations.supportedLocales,
+        home: Scaffold(body: child),
+      ),
+    );
+  }
+
+  testWidgets('renders SureTextField rows for each header', (tester) async {
+    await pump(
+      tester,
+      CustomProxyHeadersEditor(
+        initialHeaders: [CustomProxyHeader(name: 'X-Token', value: 'abc')],
+        onChanged: (_) {},
+      ),
+    );
+    // Name + value field per header row.
+    expect(find.byType(SureTextField), findsNWidgets(2));
+    expect(find.text('Header name'), findsOneWidget);
+    expect(find.text('Header value'), findsOneWidget);
+  });
+
+  testWidgets('editing a field fires onChanged with the parsed headers',
+      (tester) async {
+    List<CustomProxyHeader>? latest;
+    await pump(
+      tester,
+      CustomProxyHeadersEditor(
+        initialHeaders: [CustomProxyHeader(name: 'X-Token', value: 'abc')],
+        onChanged: (headers) => latest = headers,
+      ),
+    );
+
+    await tester.enterText(find.byType(TextField).first, 'X-Renamed');
+    await tester.pump();
+
+    expect(latest, isNotNull);
+    expect(latest!.single.name, 'X-Renamed');
+    expect(latest!.single.value, 'abc');
+  });
+}
diff --git a/mobile/test/widgets/money_text_test.dart b/mobile/test/widgets/money_text_test.dart
new file mode 100644
index 000000000..d2d0b21e4
--- /dev/null
+++ b/mobile/test/widgets/money_text_test.dart
@@ -0,0 +1,74 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/money_text.dart';
+
+void main() {
+  group('SureMoney.trendForAmount', () {
+    test('null amount is neutral', () {
+      expect(SureMoney.trendForAmount(null), MoneyTrend.neutral);
+    });
+
+    test('positive and zero are inflow, negative is outflow', () {
+      expect(SureMoney.trendForAmount(12.5), MoneyTrend.inflow);
+      expect(SureMoney.trendForAmount(0), MoneyTrend.inflow);
+      expect(SureMoney.trendForAmount(-3), MoneyTrend.outflow);
+    });
+  });
+
+  Future<BuildContext> pumpContext(WidgetTester tester, ThemeData theme) async {
+    late BuildContext captured;
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: theme,
+        home: Builder(
+          builder: (context) {
+            captured = context;
+            return const SizedBox.shrink();
+          },
+        ),
+      ),
+    );
+    return captured;
+  }
+
+  group('SureMoney.color resolves design-system tokens', () {
+    testWidgets('light theme maps trends to success/destructive/subdued',
+        (tester) async {
+      final context = await pumpContext(tester, SureTheme.light);
+      expect(SureMoney.color(context, MoneyTrend.inflow),
+          SureTokens.light.success);
+      expect(SureMoney.color(context, MoneyTrend.outflow),
+          SureTokens.light.destructive);
+      expect(SureMoney.color(context, MoneyTrend.neutral),
+          SureTokens.light.textSubdued);
+    });
+
+    testWidgets('dark theme resolves the dark palette', (tester) async {
+      final context = await pumpContext(tester, SureTheme.dark);
+      expect(
+          SureMoney.color(context, MoneyTrend.inflow), SureTokens.dark.success);
+      expect(SureMoney.color(context, MoneyTrend.outflow),
+          SureTokens.dark.destructive);
+    });
+  });
+
+  group('MoneyText', () {
+    testWidgets('applies semantic color and tabular figures', (tester) async {
+      await tester.pumpWidget(
+        MaterialApp(
+          theme: SureTheme.light,
+          home: const Scaffold(
+            body: MoneyText('+\$10.00', trend: MoneyTrend.inflow),
+          ),
+        ),
+      );
+
+      final text = tester.widget<Text>(find.text('+\$10.00'));
+      expect(text.style?.color, SureTokens.light.success);
+      expect(text.style?.fontFeatures,
+          contains(const FontFeature.tabularFigures()));
+    });
+  });
+}
diff --git a/mobile/test/widgets/net_worth_card_test.dart b/mobile/test/widgets/net_worth_card_test.dart
new file mode 100644
index 000000000..9e0ca349b
--- /dev/null
+++ b/mobile/test/widgets/net_worth_card_test.dart
@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+import 'package:sure_mobile/providers/privacy_provider.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/net_worth_card.dart';
+
+void main() {
+  Future<void> pump(WidgetTester tester, {Brightness brightness = Brightness.light}) {
+    return tester.pumpWidget(
+      ChangeNotifierProvider<PrivacyProvider>(
+        create: (_) => PrivacyProvider(initialHidden: false),
+        child: MaterialApp(
+          theme:
+              brightness == Brightness.light ? SureTheme.light : SureTheme.dark,
+          home: Scaffold(
+            body: NetWorthCard(
+              assetTotalsByCurrency: const {'USD': 125000.0},
+              liabilityTotalsByCurrency: const {'USD': 32000.0},
+              currentFilter: AccountFilter.all,
+              onFilterChanged: (_) {},
+              formatAmount: (currency, amount) =>
+                  '\$${amount.toStringAsFixed(0)} $currency',
+              netWorthFormatted: '\$93,000',
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  // The hero card must resolve the canonical Sure card chrome (mirrors
+  // SureCard) in both themes, so a token regression in either mode is caught.
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets('net worth card paints Sure card chrome from tokens (${brightness.name})',
+        (tester) async {
+      await pump(tester, brightness: brightness);
+
+      final deco = tester
+          .widget<Container>(
+            find.byKey(const ValueKey('netWorthCardChrome')),
+          )
+          .decoration as BoxDecoration;
+
+      expect(deco.color, tokens.container);
+      expect((deco.border as Border).top.color, tokens.borderSecondary);
+      expect(deco.borderRadius, BorderRadius.circular(SureTokens.radiusLg));
+      expect(deco.boxShadow, tokens.shadowXs);
+      expect(find.text('\$93,000'), findsOneWidget);
+    });
+  }
+}
diff --git a/mobile/test/widgets/privacy_mode_test.dart b/mobile/test/widgets/privacy_mode_test.dart
new file mode 100644
index 000000000..42fed04d3
--- /dev/null
+++ b/mobile/test/widgets/privacy_mode_test.dart
@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:provider/provider.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:sure_mobile/providers/privacy_provider.dart';
+import 'package:sure_mobile/services/preferences_service.dart';
+import 'package:sure_mobile/widgets/net_worth_card.dart';
+
+void main() {
+  setUp(() {
+    // PrivacyProvider persists through SharedPreferences; mock it so the
+    // provider can load/save without the platform channel, and reset the
+    // cached PreferencesService so state never leaks between tests.
+    SharedPreferences.setMockInitialValues({});
+    PreferencesService.resetForTest();
+  });
+
+  Widget harness(PrivacyProvider privacy) {
+    return ChangeNotifierProvider<PrivacyProvider>.value(
+      value: privacy,
+      child: MaterialApp(
+        home: Scaffold(
+          body: NetWorthCard(
+            assetTotalsByCurrency: const {'USD': 29669.71},
+            liabilityTotalsByCurrency: const {},
+            currentFilter: AccountFilter.all,
+            onFilterChanged: (_) {},
+            formatAmount: (currency, amount) =>
+                '\$${amount.toStringAsFixed(2)}',
+            netWorthFormatted: r'$29,669.71',
+          ),
+        ),
+      ),
+    );
+  }
+
+  // PrivacyProvider starts masked (fail-closed) and reveals only once the async
+  // preference load completes, so pump a few frames to let it hydrate.
+  Future<void> settleLoad(WidgetTester tester) async {
+    for (var i = 0; i < 8; i++) {
+      await tester.pump(const Duration(milliseconds: 10));
+    }
+  }
+
+  testWidgets('starts masked (fail-closed) before the preference loads',
+      (tester) async {
+    final provider = PrivacyProvider();
+    // Checked synchronously, before the async load can turn the event loop:
+    // the provider masks by default until the stored value is known.
+    expect(provider.hidden, isTrue);
+
+    // Let the load settle so the widget tree and any pending work complete.
+    await tester.pumpWidget(harness(provider));
+    await settleLoad(tester);
+  });
+
+  testWidgets('net worth is visible after hydration when privacy mode is off',
+      (tester) async {
+    await tester.pumpWidget(harness(PrivacyProvider()));
+    await settleLoad(tester);
+
+    expect(find.text(r'$29,669.71'), findsOneWidget);
+    expect(find.text(r'$••••'), findsNothing);
+  });
+
+  testWidgets('toggling privacy mode masks the net worth', (tester) async {
+    final privacy = PrivacyProvider();
+    await tester.pumpWidget(harness(privacy));
+    await settleLoad(tester);
+
+    await privacy.setHidden(true);
+    await tester.pump();
+
+    // The real value is gone, and both amounts the harness renders — the
+    // net-worth headline and the single USD asset total — collapse to the same
+    // fixed mask, so exactly two appear.
+    expect(find.text(r'$29,669.71'), findsNothing);
+    expect(find.text(r'$••••'), findsNWidgets(2));
+  });
+
+  testWidgets('hidden state persists across provider instances',
+      (tester) async {
+    // First provider enables privacy mode, which persists the choice.
+    final first = PrivacyProvider();
+    await tester.pumpWidget(harness(first));
+    await settleLoad(tester);
+    await first.setHidden(true);
+    await tester.pump();
+
+    // A fresh provider reading the same persisted store loads "hidden" and
+    // masks from the start.
+    await tester.pumpWidget(harness(PrivacyProvider()));
+    await settleLoad(tester);
+
+    // Net-worth headline + the single USD asset total both mask.
+    expect(find.text(r'$29,669.71'), findsNothing);
+    expect(find.text(r'$••••'), findsNWidgets(2));
+  });
+}
diff --git a/mobile/test/widgets/sure_button_test.dart b/mobile/test/widgets/sure_button_test.dart
new file mode 100644
index 000000000..96fbcce7c
--- /dev/null
+++ b/mobile/test/widgets/sure_button_test.dart
@@ -0,0 +1,243 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/sure_button.dart';
+
+void main() {
+  Future<void> pump(WidgetTester tester, Widget child) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme: SureTheme.light,
+        home: Scaffold(body: Center(child: child)),
+      ),
+    );
+  }
+
+  BoxDecoration decoration(WidgetTester tester) =>
+      tester.widget<AnimatedContainer>(find.byType(AnimatedContainer)).decoration
+          as BoxDecoration;
+
+  testWidgets('primary uses the button-primary token + inverse label', (tester) async {
+    await pump(
+      tester,
+      SureButton(label: 'Save', onPressed: () {}),
+    );
+    expect(decoration(tester).color, SureTokens.light.buttonPrimary);
+    final label = tester.widget<Text>(find.text('Save'));
+    expect(label.style?.color, SureTokens.light.textInverse);
+    expect(label.style?.fontWeight, FontWeight.w500);
+  });
+
+  testWidgets('destructive uses the destructive token', (tester) async {
+    await pump(
+      tester,
+      SureButton(
+        label: 'Delete',
+        variant: SureButtonVariant.destructive,
+        onPressed: () {},
+      ),
+    );
+    expect(decoration(tester).color, SureTokens.light.buttonDestructive);
+  });
+
+  testWidgets('secondary uses the inset-surface token', (tester) async {
+    await pump(
+      tester,
+      SureButton(
+        label: 'More',
+        variant: SureButtonVariant.secondary,
+        onPressed: () {},
+      ),
+    );
+    expect(decoration(tester).color, SureTokens.light.surfaceInset);
+  });
+
+  testWidgets('outline is transparent with a border and primary text',
+      (tester) async {
+    await pump(
+      tester,
+      SureButton(
+        label: 'Outline',
+        variant: SureButtonVariant.outline,
+        onPressed: () {},
+      ),
+    );
+    final deco = decoration(tester);
+    expect(deco.color, const Color(0x00000000));
+    expect((deco.border as Border).top.color, SureTokens.light.borderSecondary);
+    expect(
+      tester.widget<Text>(find.text('Outline')).style?.color,
+      SureTokens.light.textPrimary,
+    );
+  });
+
+  testWidgets('ghost is transparent with no border', (tester) async {
+    await pump(
+      tester,
+      SureButton(
+        label: 'Ghost',
+        variant: SureButtonVariant.ghost,
+        onPressed: () {},
+      ),
+    );
+    final deco = decoration(tester);
+    expect(deco.color, const Color(0x00000000));
+    expect(deco.border, isNull);
+  });
+
+  testWidgets('renders in an unbounded-width Row without asserting',
+      (tester) async {
+    // Regression: a bare Flexible in the label Row used to throw under
+    // unbounded horizontal constraints; an inline (non-full-width) button must
+    // self-size instead.
+    await pump(
+      tester,
+      Row(children: [SureButton(label: 'Inline', onPressed: () {})]),
+    );
+    expect(tester.takeException(), isNull);
+    expect(find.text('Inline'), findsOneWidget);
+  });
+
+  testWidgets('clears the pressed highlight if disabled mid-press',
+      (tester) async {
+    // Regression: if disabled while pressed, onTapUp/onTapCancel never fire, so
+    // didUpdateWidget must reset _pressed (otherwise the hover bg sticks once
+    // the button is re-enabled).
+    Widget build(bool loading) => MaterialApp(
+          theme: SureTheme.light,
+          home: Scaffold(
+            body: Center(
+              child: SureButton(
+                key: const ValueKey('btn'),
+                label: 'Go',
+                loading: loading,
+                onPressed: () {},
+              ),
+            ),
+          ),
+        );
+
+    await tester.pumpWidget(build(false));
+    final gesture =
+        await tester.startGesture(tester.getCenter(find.byType(SureButton)));
+    await tester.pump(); // onTapDown -> _pressed = true
+    await tester.pumpWidget(build(true)); // disabled mid-press -> reset
+    await tester.pump();
+    await tester.pumpWidget(build(false)); // re-enabled
+    await tester.pump();
+    // Background must be the base token, not the pressed (hover) token.
+    expect(decoration(tester).color, SureTokens.light.buttonPrimary);
+    await gesture.up();
+  });
+
+  testWidgets('tap fires onPressed when enabled', (tester) async {
+    var taps = 0;
+    await pump(tester, SureButton(label: 'Go', onPressed: () => taps++));
+    await tester.tap(find.byType(SureButton));
+    expect(taps, 1);
+  });
+
+  testWidgets('null onPressed disables taps and dims the button', (tester) async {
+    await pump(
+      tester,
+      const SureButton(label: 'Disabled', onPressed: null),
+    );
+    // Tapping a disabled button must not throw, and it stays dimmed.
+    await tester.tap(find.byType(SureButton));
+    expect(tester.widget<Opacity>(find.byType(Opacity)).opacity, 0.5);
+  });
+
+  testWidgets('loading shows a spinner and blocks taps', (tester) async {
+    var taps = 0;
+    await pump(
+      tester,
+      SureButton(label: 'Saving', onPressed: () => taps++, loading: true),
+    );
+    expect(find.byType(CircularProgressIndicator), findsOneWidget);
+    await tester.tap(find.byType(SureButton));
+    expect(taps, 0);
+  });
+
+  testWidgets('activates via the keyboard (focus + Enter)', (tester) async {
+    var taps = 0;
+    await pump(tester, SureButton(label: 'Go', onPressed: () => taps++));
+    await tester.sendKeyEvent(LogicalKeyboardKey.tab);
+    await tester.pumpAndSettle();
+    await tester.sendKeyEvent(LogicalKeyboardKey.enter);
+    await tester.pumpAndSettle();
+    expect(taps, 1);
+  });
+
+  testWidgets('fullWidth fills the available width', (tester) async {
+    await pump(
+      tester,
+      ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 300),
+        child: SureButton(label: 'Wide', fullWidth: true, onPressed: () {}),
+      ),
+    );
+    expect(tester.getSize(find.byType(SureButton)).width, 300);
+  });
+
+  testWidgets('non-fullWidth hugs its content', (tester) async {
+    await pump(
+      tester,
+      ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 300),
+        child: SureButton(label: 'Hi', onPressed: () {}),
+      ),
+    );
+    expect(tester.getSize(find.byType(SureButton)).width, lessThan(300));
+  });
+
+  testWidgets('leading icon inherits the variant foreground via IconTheme',
+      (tester) async {
+    // The button owns its content foreground: a leading icon with no explicit
+    // color must pick up the variant foreground (so call sites don't hardcode
+    // it). SureIcon resolves color from the ambient IconTheme.
+    Color? primaryIconColor;
+    await pump(
+      tester,
+      SureButton(
+        label: 'Retry',
+        onPressed: () {},
+        leading: Builder(builder: (ctx) {
+          primaryIconColor = IconTheme.of(ctx).color;
+          return const SizedBox.shrink();
+        }),
+      ),
+    );
+    expect(primaryIconColor, SureTokens.light.textInverse);
+
+    Color? outlineIconColor;
+    await pump(
+      tester,
+      SureButton(
+        label: 'Edit',
+        variant: SureButtonVariant.outline,
+        onPressed: () {},
+        leading: Builder(builder: (ctx) {
+          outlineIconColor = IconTheme.of(ctx).color;
+          return const SizedBox.shrink();
+        }),
+      ),
+    );
+    expect(outlineIconColor, SureTokens.light.textPrimary);
+  });
+
+  testWidgets('size maps to the canonical min-height', (tester) async {
+    await pump(
+      tester,
+      SureButton(label: 'Big', size: SureButtonSize.lg, onPressed: () {}),
+    );
+    expect(
+      tester
+          .widget<AnimatedContainer>(find.byType(AnimatedContainer))
+          .constraints
+          ?.minHeight,
+      48,
+    );
+  });
+}
diff --git a/mobile/test/widgets/sure_card_test.dart b/mobile/test/widgets/sure_card_test.dart
new file mode 100644
index 000000000..7df369e74
--- /dev/null
+++ b/mobile/test/widgets/sure_card_test.dart
@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/sure_card.dart';
+
+void main() {
+  Future<void> pump(WidgetTester tester, Widget child,
+      {Brightness brightness = Brightness.light}) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme:
+            brightness == Brightness.light ? SureTheme.light : SureTheme.dark,
+        home: Scaffold(body: child),
+      ),
+    );
+  }
+
+  BoxDecoration decorationOf(WidgetTester tester) => tester
+      .widget<Container>(
+        find
+            .descendant(of: find.byType(SureCard), matching: find.byType(Container))
+            .first,
+      )
+      .decoration as BoxDecoration;
+
+  // Brightness-aware by contract — assert the chrome resolves the right palette
+  // in both themes so a token regression in either mode is caught.
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets('paints the Sure card chrome from tokens (${brightness.name})',
+        (tester) async {
+      await pump(tester, const SureCard(child: Text('Body')),
+          brightness: brightness);
+
+      final deco = decorationOf(tester);
+      expect(deco.color, tokens.container);
+      expect((deco.border as Border).top.color, tokens.borderSecondary);
+      expect(deco.borderRadius, BorderRadius.circular(SureTokens.radiusLg));
+      expect(deco.boxShadow, tokens.shadowXs);
+      expect(find.text('Body'), findsOneWidget);
+    });
+  }
+
+  testWidgets('elevated: false drops the shadow', (tester) async {
+    await pump(tester, const SureCard(elevated: false, child: Text('Body')));
+    expect(decorationOf(tester).boxShadow, isNull);
+  });
+
+  testWidgets('onTap fires and is clipped to the card (InkWell present)',
+      (tester) async {
+    var taps = 0;
+    await pump(
+      tester,
+      SureCard(onTap: () => taps++, child: const Text('Tap me')),
+    );
+    final inkWell = tester.widget<InkWell>(find.byType(InkWell));
+    expect(inkWell.borderRadius, BorderRadius.circular(SureTokens.radiusLg));
+    await tester.tap(find.text('Tap me'));
+    expect(taps, 1);
+  });
+
+  testWidgets('is non-interactive without onTap (no InkWell)', (tester) async {
+    await pump(tester, const SureCard(child: Text('Body')));
+    expect(find.byType(InkWell), findsNothing);
+  });
+}
diff --git a/mobile/test/widgets/sure_chip_test.dart b/mobile/test/widgets/sure_chip_test.dart
new file mode 100644
index 000000000..6fb27625f
--- /dev/null
+++ b/mobile/test/widgets/sure_chip_test.dart
@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/semantics.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/sure_chip.dart';
+
+void main() {
+  Future<void> pump(
+    WidgetTester tester,
+    Widget child, {
+    Brightness brightness = Brightness.light,
+  }) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme:
+            brightness == Brightness.light ? SureTheme.light : SureTheme.dark,
+        home: Scaffold(body: Center(child: child)),
+      ),
+    );
+  }
+
+  Material materialOf(WidgetTester tester) => tester.widget<Material>(
+        find
+            .descendant(
+                of: find.byType(SureChip), matching: find.byType(Material))
+            .first,
+      );
+
+  // Brightness-aware by contract — assert both selection states resolve the
+  // right tokens in light and dark.
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets(
+      'selected chip fills with the neutral token (${brightness.name})',
+      (tester) async {
+        await pump(
+          tester,
+          const SureChip(label: 'USD', selected: true),
+          brightness: brightness,
+        );
+        expect(materialOf(tester).color, tokens.buttonPrimary);
+        final label = tester.widget<Text>(find.text('USD'));
+        expect(label.style?.color, tokens.textInverse);
+        expect(label.style?.fontWeight, FontWeight.w600);
+        // Filled chip drops the border.
+        expect(
+          (materialOf(tester).shape as StadiumBorder).side,
+          BorderSide.none,
+        );
+      },
+    );
+
+    testWidgets(
+      'unselected chip is a bordered transparent pill (${brightness.name})',
+      (tester) async {
+        await pump(
+          tester,
+          const SureChip(label: 'USD'),
+          brightness: brightness,
+        );
+        expect(materialOf(tester).color, const Color(0x00000000));
+        expect(
+          (materialOf(tester).shape as StadiumBorder).side.color,
+          tokens.borderSecondary,
+        );
+        final label = tester.widget<Text>(find.text('USD'));
+        expect(label.style?.color, tokens.textSecondary);
+        expect(label.style?.fontWeight, FontWeight.w500);
+      },
+    );
+  }
+
+  testWidgets('tapping reports the next selected value', (tester) async {
+    bool? next;
+    await pump(
+      tester,
+      SureChip(label: 'USD', selected: false, onSelected: (v) => next = v),
+    );
+    await tester.tap(find.byType(SureChip));
+    expect(next, isTrue);
+
+    await pump(
+      tester,
+      SureChip(label: 'USD', selected: true, onSelected: (v) => next = v),
+    );
+    await tester.tap(find.byType(SureChip));
+    expect(next, isFalse);
+  });
+
+  testWidgets('exposes button + selected semantics', (tester) async {
+    final handle = tester.ensureSemantics();
+    await pump(
+      tester,
+      SureChip(label: 'USD', selected: true, onSelected: (_) {}),
+    );
+    final node = tester.getSemantics(find.byType(SureChip));
+    expect(node.hasFlag(SemanticsFlag.isButton), isTrue);
+    expect(node.hasFlag(SemanticsFlag.isSelected), isTrue);
+    handle.dispose();
+  });
+
+  testWidgets('a chip without onSelected is non-interactive', (tester) async {
+    await pump(tester, const SureChip(label: 'USD'));
+    expect(tester.widget<InkWell>(find.byType(InkWell)).onTap, isNull);
+  });
+
+  testWidgets('enabled: false is non-interactive and dimmed', (tester) async {
+    var taps = 0;
+    await pump(
+      tester,
+      SureChip(label: 'USD', enabled: false, onSelected: (_) => taps++),
+    );
+    expect(tester.widget<InkWell>(find.byType(InkWell)).onTap, isNull);
+    expect(tester.widget<Opacity>(find.byType(Opacity)).opacity, 0.5);
+    await tester.tap(find.byType(SureChip));
+    expect(taps, 0);
+  });
+
+  testWidgets('meets the minimum tap-target height', (tester) async {
+    await pump(tester, const SureChip(label: 'USD'));
+    expect(
+        tester.getSize(find.byType(SureChip)).height, greaterThanOrEqualTo(44));
+  });
+}
diff --git a/mobile/test/widgets/sure_icon_test.dart b/mobile/test/widgets/sure_icon_test.dart
new file mode 100644
index 000000000..879014df5
--- /dev/null
+++ b/mobile/test/widgets/sure_icon_test.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/widgets/sure_icon.dart';
+
+void main() {
+  SvgPicture svg(WidgetTester tester) =>
+      tester.widget<SvgPicture>(find.byType(SvgPicture));
+
+  testWidgets('renders the named Lucide asset at the requested size',
+      (tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: SureIcon(SureIcons.wallet, size: SureIconSize.lg),
+      ),
+    );
+    expect(svg(tester).width, SureIconSize.lg);
+    expect(svg(tester).height, SureIconSize.lg);
+  });
+
+  testWidgets('paints at its size inside a larger tight-constrained parent',
+      (tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: Center(
+          child: SizedBox(
+            width: 48,
+            height: 48,
+            child: SureIcon(SureIcons.landmark, size: SureIconSize.lg),
+          ),
+        ),
+      ),
+    );
+    // The glyph must stay 24 (not stretch to the 48 container) — regression for
+    // the account-card icon rendering at 2x.
+    expect(tester.getSize(find.byType(SvgPicture)), const Size(24, 24));
+  });
+
+  testWidgets('falls back to the ambient IconTheme size when size is null',
+      (tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: IconTheme(
+          data: IconThemeData(size: 30),
+          child: SureIcon(SureIcons.refresh),
+        ),
+      ),
+    );
+    expect(svg(tester).width, 30);
+    expect(svg(tester).height, 30);
+  });
+
+  testWidgets('a meaningful icon exposes its label; a decorative one does not',
+      (tester) async {
+    await tester.pumpWidget(
+      const MaterialApp(
+        home: SureIcon(SureIcons.refresh, semanticLabel: 'Refresh'),
+      ),
+    );
+    expect(find.bySemanticsLabel('Refresh'), findsOneWidget);
+
+    await tester.pumpWidget(
+      const MaterialApp(home: SureIcon(SureIcons.wallet)),
+    );
+    expect(find.bySemanticsLabel('wallet'), findsNothing);
+  });
+}
diff --git a/mobile/test/widgets/sure_list_group_test.dart b/mobile/test/widgets/sure_list_group_test.dart
new file mode 100644
index 000000000..53f5bb566
--- /dev/null
+++ b/mobile/test/widgets/sure_list_group_test.dart
@@ -0,0 +1,199 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/semantics.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/sure_icon.dart';
+import 'package:sure_mobile/widgets/sure_list_group.dart';
+
+void main() {
+  Future<void> pump(WidgetTester tester, Widget child,
+      {Brightness brightness = Brightness.light}) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme:
+            brightness == Brightness.light ? SureTheme.light : SureTheme.dark,
+        home: Scaffold(body: child),
+      ),
+    );
+  }
+
+  BoxDecoration groupDecorationOf(WidgetTester tester) => tester
+      .widget<Container>(
+        find
+            .descendant(
+              of: find.byType(SureListGroup),
+              matching: find.byType(Container),
+            )
+            .first,
+      )
+      .decoration as BoxDecoration;
+
+  // Brightness-aware by contract — assert the chrome resolves the right palette
+  // in both themes so a token regression in either mode is caught.
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets('paints the group chrome from tokens (${brightness.name})',
+        (tester) async {
+      await pump(
+        tester,
+        const SureListGroup(children: [SureListRow(title: 'Only row')]),
+        brightness: brightness,
+      );
+
+      final deco = groupDecorationOf(tester);
+      expect(deco.color, tokens.container);
+      expect((deco.border as Border).top.color, tokens.borderSecondary);
+      expect(deco.borderRadius, BorderRadius.circular(SureTokens.radiusLg));
+      expect(deco.boxShadow, tokens.shadowXs);
+    });
+  }
+
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets(
+        'inserts subdued interior dividers but not at the edges (${brightness.name})',
+        (tester) async {
+      await pump(
+        tester,
+        const SureListGroup(children: [
+          SureListRow(title: 'One'),
+          SureListRow(title: 'Two'),
+          SureListRow(title: 'Three'),
+        ]),
+        brightness: brightness,
+      );
+
+      // Three rows => exactly two interior dividers.
+      final dividers =
+          tester.widgetList<Divider>(find.byType(Divider)).toList();
+      expect(dividers, hasLength(2));
+      expect(dividers.first.color, tokens.borderSubdued);
+    });
+  }
+
+  testWidgets('renders an uppercased header above the group', (tester) async {
+    await pump(
+      tester,
+      const SureListGroup(
+        header: 'Tools',
+        children: [SureListRow(title: 'Calendar')],
+      ),
+    );
+    expect(find.text('TOOLS'), findsOneWidget);
+  });
+
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets(
+        'row renders title and subtitle with tokenized colors (${brightness.name})',
+        (tester) async {
+      await pump(
+        tester,
+        const SureListGroup(
+          children: [SureListRow(title: 'Calendar', subtitle: 'Monthly view')],
+        ),
+        brightness: brightness,
+      );
+      final title = tester.widget<Text>(find.text('Calendar'));
+      final subtitle = tester.widget<Text>(find.text('Monthly view'));
+      expect(title.style?.color, tokens.textPrimary);
+      expect(subtitle.style?.color, tokens.textSecondary);
+    });
+
+    testWidgets(
+        'destructive row paints the title in the destructive token (${brightness.name})',
+        (tester) async {
+      await pump(
+        tester,
+        const SureListGroup(
+          children: [SureListRow(title: 'Delete account', destructive: true)],
+        ),
+        brightness: brightness,
+      );
+      final title = tester.widget<Text>(find.text('Delete account'));
+      expect(title.style?.color, tokens.destructive);
+    });
+  }
+
+  testWidgets(
+      'showChevron renders the DS chevron, suppressed by explicit trailing',
+      (tester) async {
+    await pump(
+      tester,
+      const SureListGroup(
+          children: [SureListRow(title: 'Go', showChevron: true)]),
+    );
+    final chevron = tester.widget<SureIcon>(find.byType(SureIcon));
+    expect(chevron.name, SureIcons.chevronRight);
+
+    await pump(
+      tester,
+      const SureListGroup(children: [
+        SureListRow(
+          title: 'Go',
+          showChevron: true,
+          trailing: Text('value'),
+        ),
+      ]),
+    );
+    expect(find.byType(SureIcon), findsNothing);
+    expect(find.text('value'), findsOneWidget);
+  });
+
+  testWidgets('onTap fires and the tappable row uses an InkWell',
+      (tester) async {
+    var taps = 0;
+    await pump(
+      tester,
+      SureListGroup(
+        children: [SureListRow(title: 'Tap me', onTap: () => taps++)],
+      ),
+    );
+    expect(find.byType(InkWell), findsOneWidget);
+    await tester.tap(find.text('Tap me'));
+    expect(taps, 1);
+  });
+
+  testWidgets('a row without onTap is non-interactive (no InkWell)',
+      (tester) async {
+    await pump(
+      tester,
+      const SureListGroup(children: [SureListRow(title: 'Static')]),
+    );
+    expect(find.byType(InkWell), findsNothing);
+  });
+
+  testWidgets('a tappable row exposes button semantics (ListTile parity)',
+      (tester) async {
+    final handle = tester.ensureSemantics();
+    await pump(
+      tester,
+      SureListGroup(children: [SureListRow(title: 'Go', onTap: () {})]),
+    );
+    final node = tester.getSemantics(find.text('Go'));
+    expect(node.hasFlag(SemanticsFlag.isButton), isTrue);
+    expect(node.hasFlag(SemanticsFlag.isEnabled), isTrue);
+    handle.dispose();
+  });
+
+  testWidgets('an empty group builds no chrome', (tester) async {
+    await pump(tester, const SureListGroup(children: []));
+    // No decorated container and no dividers — it collapses rather than
+    // painting an empty bordered/shadowed box.
+    expect(
+      find.descendant(
+        of: find.byType(SureListGroup),
+        matching: find.byType(Container),
+      ),
+      findsNothing,
+    );
+    expect(find.byType(Divider), findsNothing);
+  });
+}
diff --git a/mobile/test/widgets/sure_logo_test.dart b/mobile/test/widgets/sure_logo_test.dart
new file mode 100644
index 000000000..be9d7a7fe
--- /dev/null
+++ b/mobile/test/widgets/sure_logo_test.dart
@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/widgets/sure_logo.dart';
+
+void main() {
+  testWidgets('renders the logomark at the requested size under the Sure theme',
+      (tester) async {
+    // Building under SureTheme.dark exercises the SureColors lookup that themes
+    // the wordmark's `currentColor` strokes — the regression guard for routing
+    // every logomark consumer through SureLogo rather than a bare SvgPicture.
+    await tester.pumpWidget(
+      MaterialApp(
+        theme: SureTheme.dark,
+        home: const Scaffold(body: Center(child: SureLogo(size: 40))),
+      ),
+    );
+
+    final svg = tester.widget<SvgPicture>(find.byType(SvgPicture));
+    expect(svg.width, 40);
+    expect(svg.height, 40);
+  });
+}
diff --git a/mobile/test/widgets/sure_segmented_control_test.dart b/mobile/test/widgets/sure_segmented_control_test.dart
new file mode 100644
index 000000000..aaef2fe52
--- /dev/null
+++ b/mobile/test/widgets/sure_segmented_control_test.dart
@@ -0,0 +1,150 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/semantics.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/sure_segmented_control.dart';
+
+void main() {
+  Future<void> pump(
+    WidgetTester tester,
+    Widget child, {
+    Brightness brightness = Brightness.light,
+  }) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme:
+            brightness == Brightness.light ? SureTheme.light : SureTheme.dark,
+        home: Scaffold(body: Center(child: child)),
+      ),
+    );
+  }
+
+  Widget control(String selected, ValueChanged<String> onChanged) =>
+      SureSegmentedControl<String>(
+        selected: selected,
+        onChanged: onChanged,
+        segments: const [
+          SureSegment(value: 'expense', label: 'Expense'),
+          SureSegment(value: 'income', label: 'Income'),
+        ],
+      );
+
+  // The selected segment's raised fill is the only chrome that differs by
+  // brightness, so assert it resolves correctly in both.
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets(
+        'selected segment is a raised surface above the track '
+        '(${brightness.name})', (tester) async {
+      await pump(tester, control('expense', (_) {}), brightness: brightness);
+
+      // Track decoration — the control's only plain Container (segments use
+      // AnimatedContainer), so this is unambiguous.
+      final track = tester
+          .widget<Container>(find
+              .descendant(
+                of: find.byType(SureSegmentedControl<String>),
+                matching: find.byType(Container),
+              )
+              .first)
+          .decoration as BoxDecoration;
+      expect(track.color, tokens.surfaceInset);
+
+      // Selected segment fill = brightness-appropriate raised token + shadow.
+      final selectedBg = brightness == Brightness.light
+          ? tokens.container
+          : tokens.containerInsetHover;
+      final selectedSeg = tester
+          .widget<AnimatedContainer>(
+            find
+                .ancestor(
+                  of: find.text('Expense'),
+                  matching: find.byType(AnimatedContainer),
+                )
+                .first,
+          )
+          .decoration as BoxDecoration;
+      expect(selectedSeg.color, selectedBg);
+      expect(selectedSeg.boxShadow, tokens.shadowXs);
+
+      // Unselected segment is flat (transparent, no shadow).
+      final unselectedSeg = tester
+          .widget<AnimatedContainer>(
+            find
+                .ancestor(
+                  of: find.text('Income'),
+                  matching: find.byType(AnimatedContainer),
+                )
+                .first,
+          )
+          .decoration as BoxDecoration;
+      expect(unselectedSeg.color, const Color(0x00000000));
+      expect(unselectedSeg.boxShadow, isEmpty);
+    });
+  }
+
+  testWidgets('selected vs unselected labels use the right tokens', (
+    tester,
+  ) async {
+    await pump(tester, control('expense', (_) {}));
+    expect(
+      tester.widget<Text>(find.text('Expense')).style?.color,
+      SureTokens.light.textPrimary,
+    );
+    expect(
+      tester.widget<Text>(find.text('Income')).style?.color,
+      SureTokens.light.textSecondary,
+    );
+  });
+
+  testWidgets('tapping a segment reports its value', (tester) async {
+    String? picked;
+    await pump(tester, control('expense', (v) => picked = v));
+    await tester.tap(find.text('Income'));
+    expect(picked, 'income');
+  });
+
+  testWidgets('each segment is keyboard/switch focusable + activatable',
+      (tester) async {
+    // FocusableActionDetector per segment = keyboard/switch parity with the
+    // Material SegmentedButton it replaced (regression guard for the focus gap).
+    await pump(tester, control('expense', (_) {}));
+    expect(find.byType(FocusableActionDetector), findsNWidgets(2));
+  });
+
+  testWidgets('a selected value matching no segment highlights nothing',
+      (tester) async {
+    await pump(tester, control('neither', (_) {}));
+    for (final t in tester
+        .widgetList<AnimatedContainer>(find.byType(AnimatedContainer))) {
+      expect((t.decoration as BoxDecoration).color, const Color(0x00000000));
+    }
+  });
+
+  testWidgets('each segment exposes button + selected semantics', (
+    tester,
+  ) async {
+    final handle = tester.ensureSemantics();
+    await pump(tester, control('expense', (_) {}));
+    expect(
+      tester
+          .getSemantics(find.text('Expense'))
+          .hasFlag(SemanticsFlag.isSelected),
+      isTrue,
+    );
+    expect(
+      tester
+          .getSemantics(find.text('Income'))
+          .hasFlag(SemanticsFlag.isSelected),
+      isFalse,
+    );
+    expect(
+      tester.getSemantics(find.text('Expense')).hasFlag(SemanticsFlag.isButton),
+      isTrue,
+    );
+    handle.dispose();
+  });
+}
diff --git a/mobile/test/widgets/sure_text_field_test.dart b/mobile/test/widgets/sure_text_field_test.dart
new file mode 100644
index 000000000..2b69f167b
--- /dev/null
+++ b/mobile/test/widgets/sure_text_field_test.dart
@@ -0,0 +1,140 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sure_mobile/theme/sure_theme.dart';
+import 'package:sure_mobile/theme/sure_tokens.dart';
+import 'package:sure_mobile/widgets/sure_text_field.dart';
+
+void main() {
+  Future<void> pump(
+    WidgetTester tester,
+    Widget child, {
+    Brightness brightness = Brightness.light,
+  }) {
+    return tester.pumpWidget(
+      MaterialApp(
+        theme:
+            brightness == Brightness.light ? SureTheme.light : SureTheme.dark,
+        home: Scaffold(body: child),
+      ),
+    );
+  }
+
+  InputDecoration decorationOf(WidgetTester tester) =>
+      tester.widget<TextField>(find.byType(TextField)).decoration!;
+
+  Color sideColorOf(InputBorder? b) =>
+      (b as OutlineInputBorder).borderSide.color;
+
+  // Brightness-aware by contract — the field builds its chrome from the palette,
+  // so assert it resolves the right tokens in both themes.
+  for (final (brightness, tokens) in [
+    (Brightness.light, SureTokens.light),
+    (Brightness.dark, SureTokens.dark),
+  ]) {
+    testWidgets('builds the field chrome from tokens (${brightness.name})', (
+      tester,
+    ) async {
+      await pump(
+        tester,
+        const SureTextField(hint: 'Search'),
+        brightness: brightness,
+      );
+
+      final deco = decorationOf(tester);
+      expect(deco.filled, isTrue);
+      expect(deco.fillColor, tokens.container);
+      expect(sideColorOf(deco.enabledBorder), tokens.borderSecondary);
+      expect(sideColorOf(deco.focusedBorder), tokens.borderPrimary);
+      expect(sideColorOf(deco.errorBorder), tokens.destructive);
+      expect(sideColorOf(deco.disabledBorder), tokens.borderSubdued);
+      expect(
+        (deco.enabledBorder as OutlineInputBorder).borderRadius,
+        BorderRadius.circular(SureTokens.radiusLg),
+      );
+      expect(deco.hintStyle?.color, tokens.textSubdued);
+      expect(deco.errorStyle?.color, tokens.destructive);
+    });
+  }
+
+  testWidgets('renders an external label above the field when provided', (
+    tester,
+  ) async {
+    await pump(tester, const SureTextField(label: 'Email', hint: 'you@x.com'));
+    expect(find.text('Email'), findsOneWidget);
+    // DS label, not a Material floating labelText baked into the decoration.
+    expect(decorationOf(tester).labelText, isNull);
+  });
+
+  testWidgets('omits the label column when label is null', (tester) async {
+    await pump(tester, const SureTextField(hint: 'Search'));
+    // No DS label wrapper — the field is returned directly. (TextField's own
+    // internal Columns are descendants of it, never ancestors.)
+    expect(
+      find.ancestor(
+        of: find.byType(TextField),
+        matching: find.byType(Column),
+      ),
+      findsNothing,
+    );
+  });
+
+  testWidgets('the external label names the field for screen readers',
+      (tester) async {
+    final handle = tester.ensureSemantics();
+    await pump(tester, const SureTextField(label: 'Email'));
+    // The field is reachable by its label (Material labelText parity), and the
+    // visual label is not announced as a separate detached node.
+    expect(find.bySemanticsLabel('Email'), findsOneWidget);
+    handle.dispose();
+  });
+
+  testWidgets('label uses secondary when enabled, subdued when disabled',
+      (tester) async {
+    await pump(tester, const SureTextField(label: 'Email'));
+    expect(tester.widget<Text>(find.text('Email')).style?.color,
+        SureTokens.light.textSecondary);
+
+    await pump(tester, const SureTextField(label: 'Email', enabled: false));
+    expect(tester.widget<Text>(find.text('Email')).style?.color,
+        SureTokens.light.textSubdued);
+  });
+
+  testWidgets('minLines alone does not trip the maxLines assert',
+      (tester) async {
+    // maxLines defaults to 1; a caller passing only minLines must not crash.
+    await pump(tester, const SureTextField(minLines: 3));
+    final field = tester.widget<TextField>(find.byType(TextField));
+    expect(field.minLines, 3);
+    expect(field.maxLines, 3);
+    expect(tester.takeException(), isNull);
+  });
+
+  testWidgets('obscureText is forwarded and forces a single line', (
+    tester,
+  ) async {
+    await pump(tester, const SureTextField(obscureText: true, maxLines: 4));
+    final field = tester.widget<TextField>(find.byType(TextField));
+    expect(field.obscureText, isTrue);
+    expect(field.maxLines, 1);
+  });
+
+  testWidgets('validator surfaces the error in the destructive token', (
+    tester,
+  ) async {
+    final key = GlobalKey<FormState>();
+    await pump(
+      tester,
+      Form(
+        key: key,
+        child: const SureTextField(label: 'Name', validator: _required),
+      ),
+    );
+    key.currentState!.validate();
+    await tester.pump();
+    expect(find.text('Required'), findsOneWidget);
+    final error = tester.widget<Text>(find.text('Required'));
+    expect(error.style?.color, SureTokens.light.destructive);
+  });
+}
+
+String? _required(String? v) => (v == null || v.isEmpty) ? 'Required' : null;
diff --git a/mobile/tool/generate_sure_tokens.mjs b/mobile/tool/generate_sure_tokens.mjs
new file mode 100644
index 000000000..fffd4247c
--- /dev/null
+++ b/mobile/tool/generate_sure_tokens.mjs
@@ -0,0 +1,278 @@
+#!/usr/bin/env node
+import { readFileSync, writeFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), "../..");
+const TOKENS_PATH = resolve(ROOT, "design/tokens/sure.tokens.json");
+const OUT_PATH = resolve(ROOT, "mobile/lib/theme/sure_tokens.dart");
+
+const COLOR_TOKENS = [
+  ["surface", "color.surface"],
+  ["surfaceHover", "color.surface-hover"],
+  ["surfaceInset", "color.surface-inset"],
+  ["surfaceInsetHover", "color.surface-inset-hover"],
+  ["container", "color.container"],
+  ["containerHover", "color.container-hover"],
+  ["containerInset", "color.container-inset"],
+  ["containerInsetHover", "color.container-inset-hover"],
+  ["success", "color.success"],
+  ["warning", "color.warning"],
+  ["destructive", "color.destructive"],
+  ["destructiveSubtle", "color.destructive-subtle"],
+  ["info", "color.info"],
+  ["link", "color.link"],
+  ["shadow", "color.shadow"],
+  ["focusRing", "color.focus-ring"],
+  ["bgInverse", "utility.bg-inverse"],
+  ["textPrimary", "utility.text-primary"],
+  ["textInverse", "utility.text-inverse"],
+  ["textSecondary", "utility.text-secondary"],
+  ["textSubdued", "utility.text-subdued"],
+  ["borderPrimary", "utility.border-primary"],
+  ["borderSecondary", "utility.border-secondary"],
+  ["borderSubdued", "utility.border-subdued"],
+  ["buttonPrimary", "utility.button-bg-primary"],
+  ["buttonPrimaryHover", "utility.button-bg-primary-hover"],
+  ["buttonDestructive", "utility.button-bg-destructive"],
+  ["buttonDestructiveHover", "utility.button-bg-destructive-hover"],
+];
+
+const RADIUS_TOKENS = [
+  ["radiusMd", "border.radius.md"],
+  ["radiusLg", "border.radius.lg"],
+];
+
+// Named font-weight tiers, mirroring the web DS's Tailwind weight utilities
+// (font-medium / font-semibold) so widgets reference a named token instead of a
+// raw FontWeight.
+const WEIGHT_TOKENS = [
+  ["weightMedium", "font.weight.medium"],
+  ["weightSemibold", "font.weight.semibold"],
+];
+
+// Single-layer elevation scale (shadow/*). Mode-aware: each token carries a
+// `sure.dark` extension, so light/dark emit different shadow colors.
+const SHADOW_TOKENS = [
+  ["shadowXs", "shadow.xs"],
+  ["shadowSm", "shadow.sm"],
+  ["shadowMd", "shadow.md"],
+  ["shadowLg", "shadow.lg"],
+  ["shadowXl", "shadow.xl"],
+];
+
+function readTokens() {
+  return JSON.parse(readFileSync(TOKENS_PATH, "utf8"));
+}
+
+function nodeAt(tokens, path) {
+  const node = path.split(".").reduce((current, part) => current?.[part], tokens);
+  if (!node || typeof node !== "object") {
+    throw new Error(`[mobile-tokens] Unknown token path: ${path}`);
+  }
+  return node;
+}
+
+function valueForMode(node, mode) {
+  if (mode === "dark" && node.$extensions?.["sure.dark"] !== undefined) {
+    return node.$extensions["sure.dark"];
+  }
+  if (node.$value === undefined) {
+    throw new Error("[mobile-tokens] Token is missing $value");
+  }
+  return node.$value;
+}
+
+function resolveColor(tokens, path, mode) {
+  const node = nodeAt(tokens, path);
+  const value = valueForMode(node, mode);
+  return resolveColorValue(tokens, value, mode, path);
+}
+
+function resolveColorValue(tokens, value, mode, sourcePath) {
+  if (typeof value !== "string") {
+    throw new Error(`[mobile-tokens] ${sourcePath} must resolve to a string color`);
+  }
+
+  const hexMatch = value.match(/^#([0-9a-fA-F]{6})$/);
+  if (hexMatch) {
+    return `0xFF${hexMatch[1].toUpperCase()}`;
+  }
+
+  const refMatch = value.match(/^\{([^|}]+)(?:\|([0-9]+)%?)?\}$/);
+  if (refMatch) {
+    const [, ref, alphaPercent] = refMatch;
+    const resolved = resolveColor(tokens, ref, mode);
+    if (!alphaPercent) return resolved;
+
+    const alpha = Math.round((Number(alphaPercent) / 100) * 255);
+    if (!Number.isFinite(alpha) || alpha < 0 || alpha > 255) {
+      throw new Error(`[mobile-tokens] Invalid alpha in ${sourcePath}: ${alphaPercent}`);
+    }
+    return `0x${alpha.toString(16).toUpperCase().padStart(2, "0")}${resolved.slice(4)}`;
+  }
+
+  throw new Error(`[mobile-tokens] ${sourcePath} has unsupported color value: ${value}`);
+}
+
+function resolveDimension(tokens, path) {
+  const node = nodeAt(tokens, path);
+  const value = valueForMode(node, "light");
+  const match = String(value).match(/^([0-9]+(?:\.[0-9]+)?)px$/);
+  if (!match) {
+    throw new Error(`[mobile-tokens] ${path} must be a px dimension`);
+  }
+  return Number(match[1]).toFixed(1);
+}
+
+function resolveWeight(tokens, path) {
+  const node = nodeAt(tokens, path);
+  const value = Number(valueForMode(node, "light"));
+  if (!Number.isInteger(value) || value < 100 || value > 900 || value % 100 !== 0) {
+    throw new Error(`[mobile-tokens] ${path} must be a font weight (100-900 in steps of 100)`);
+  }
+  return `FontWeight.w${value}`;
+}
+
+// Parse a single-layer CSS box-shadow ("<x>px <y>px <blur>px <spread>px {color}")
+// into a Dart `BoxShadow(...)` literal. Offsets and spread may be negative
+// (e.g. -4px); blur must be >= 0. A strict number pattern rejects malformed
+// dimensions (e.g. "1.2.3px") instead of emitting NaN into the generated Dart.
+function resolveShadow(tokens, path, mode) {
+  const node = nodeAt(tokens, path);
+  const value = valueForMode(node, mode);
+  const num = "-?[0-9]+(?:\\.[0-9]+)?";
+  const nonNeg = "[0-9]+(?:\\.[0-9]+)?";
+  const match = String(value).match(
+    new RegExp(`^(${num})px (${num})px (${nonNeg})px (${num})px (\\{[^}]+\\})$`),
+  );
+  if (!match) {
+    throw new Error(`[mobile-tokens] ${path} must be a single-layer box shadow: ${value}`);
+  }
+  const [, offsetX, offsetY, blur, spread, colorRef] = match;
+  const color = resolveColorValue(tokens, colorRef, mode, path);
+  const px = (raw) => Number(raw).toFixed(1);
+  return (
+    `BoxShadow(color: Color(${color}), ` +
+    `offset: Offset(${px(offsetX)}, ${px(offsetY)}), ` +
+    `blurRadius: ${px(blur)}, spreadRadius: ${px(spread)})`
+  );
+}
+
+function firstFontFamily(stack) {
+  for (const rawFamily of stack.split(",")) {
+    const family = rawFamily.trim();
+    if (!family) continue;
+
+    return family.replace(/^['"](.+)['"]$/, "$1");
+  }
+
+  throw new Error(`[mobile-tokens] Unsupported font stack: ${stack}`);
+}
+
+function emitPalette(tokens, mode) {
+  const colorLines = COLOR_TOKENS.map(
+    ([name, path]) => `    ${name}: Color(${resolveColor(tokens, path, mode)}),`,
+  );
+  const shadowLines = SHADOW_TOKENS.map(
+    ([name, path]) => `    ${name}: [${resolveShadow(tokens, path, mode)}],`,
+  );
+
+  return `  static const ${mode} = SureTokenPalette(\n${colorLines.join("\n")}\n${shadowLines.join("\n")}\n  );`;
+}
+
+function buildDart(tokens) {
+  const fontSans = firstFontFamily(tokens.font.sans.$value);
+  const fontMono = firstFontFamily(tokens.font.mono.$value);
+  const radiusLines = RADIUS_TOKENS.map(
+    ([name, path]) => `  static const double ${name} = ${resolveDimension(tokens, path)};`,
+  );
+  const weightLines = WEIGHT_TOKENS.map(
+    ([name, path]) => `  static const FontWeight ${name} = ${resolveWeight(tokens, path)};`,
+  );
+
+  return `// GENERATED CODE - DO NOT EDIT BY HAND.
+// Source: design/tokens/sure.tokens.json
+// Build: node mobile/tool/generate_sure_tokens.mjs
+
+import 'package:flutter/painting.dart';
+
+class SureTokens {
+  const SureTokens._();
+
+  static const String version = '${tokens.$version}';
+  static const String fontSans = '${fontSans}';
+  static const String fontMono = '${fontMono}';
+
+  // Keep the existing Flutter fallback behavior until native mobile font assets
+  // are registered. The canonical web stack remains in sure.tokens.json.
+  static const List<String> fontFallback = <String>[
+    'Inter',
+    'Arial',
+    'sans-serif',
+  ];
+
+${radiusLines.join("\n")}
+
+${weightLines.join("\n")}
+
+${emitPalette(tokens, "light")}
+
+${emitPalette(tokens, "dark")}
+}
+
+class SureTokenPalette {
+  const SureTokenPalette({
+${COLOR_TOKENS.map(([name]) => `    required this.${name},`).join("\n")}
+${SHADOW_TOKENS.map(([name]) => `    required this.${name},`).join("\n")}
+  });
+
+${COLOR_TOKENS.map(([name]) => `  final Color ${name};`).join("\n")}
+${SHADOW_TOKENS.map(([name]) => `  final List<BoxShadow> ${name};`).join("\n")}
+}
+`;
+}
+
+function main() {
+  const check = process.argv.includes("--check");
+  const tokens = readTokens();
+  const output = buildDart(tokens);
+
+  if (check) {
+    let existing;
+    try {
+      existing = readFileSync(OUT_PATH, "utf8");
+    } catch (error) {
+      if (error.code === "ENOENT") {
+        console.error(
+          "[mobile-tokens] mobile/lib/theme/sure_tokens.dart is missing. " +
+            "Run node mobile/tool/generate_sure_tokens.mjs.",
+        );
+        process.exit(1);
+      }
+      throw error;
+    }
+    if (existing !== output) {
+      console.error(
+        "[mobile-tokens] mobile/lib/theme/sure_tokens.dart is stale. " +
+          "Run node mobile/tool/generate_sure_tokens.mjs.",
+      );
+      process.exit(1);
+    }
+    console.log("[mobile-tokens] generated Dart tokens are current");
+    return;
+  }
+
+  writeFileSync(OUT_PATH, output);
+  console.log(`mobile tokens -> ${OUT_PATH.replace(ROOT + "/", "")}`);
+}
+
+try {
+  main();
+} catch (error) {
+  if (error.message?.startsWith("[mobile-tokens]")) {
+    console.error(error.message);
+    process.exit(1);
+  }
+  throw error;
+}
diff --git a/pipelock.example.yaml b/pipelock.example.yaml
index 4e2af49f9..8f709e3de 100644
--- a/pipelock.example.yaml
+++ b/pipelock.example.yaml
@@ -1,14 +1,15 @@
 # Pipelock configuration for Docker Compose
 # See https://github.com/luckyPipewrench/pipelock for full options.
 #
-# Recent additions (2.5): Audit Packet v0 schema with Go/TypeScript/Rust
-# verifiers, request-body prompt-injection blocking, SPIFFE-strict inbound
-# mediation envelopes, scanner attribution on MCP block receipts, wedge-
-# detection health watchdog, learn-and-lock behavioural contracts, trusted
-# domains, redirect profiles, attack simulation, security scoring, process
-# sandbox, signed action receipts, per-pattern DLP warn mode, and the
-# `pipelock posture verify` / `pipelock session` / `pipelock doctor` CLIs.
-# Run `pipelock simulate --config <file>` to test your config against 24 attack scenarios.
+# Recent additions through 2.8: default-on flight recorder receipts, safe-by-
+# default receipt verification, request-policy scoring, request-body prompt-
+# injection blocking, SPIFFE-strict inbound mediation envelopes, scanner
+# attribution on MCP block receipts, wedge-detection health watchdog,
+# learn-and-lock behavioural contracts, trusted domains, redirect profiles,
+# MCP `defer` authorization, `pipelock explain`, `pipelock keys status`,
+# `pipelock support bundle`, verified `pipelock update`, and `pipelock doctor`
+# checks for inert exemptions.
+# Run `pipelock assess init --config <file>` to create an assessment workspace.
 # Run `pipelock audit score --config <file>` for a security posture score (0-100).
 # Run `pipelock doctor` to verify configured protections are actually enforceable.
 
@@ -83,7 +84,7 @@ tool_chain_detection:
 # destinations even when action is "warn". Trusted provider hosts (OpenAI,
 # Anthropic, etc.) remain exempt via the response_scanning exemption list.
 request_body_scanning:
-  enabled: false
+  enabled: true
   action: warn
   max_body_bytes: 5242880
   scan_headers: true
@@ -96,3 +97,14 @@ health_watchdog:
   enabled: true
   interval_seconds: 2
   expose_subsystems: false
+
+# Flight recorder (pipelock 2.7+): signed, hash-chained action receipts.
+# Enabled by default, but inert until both `dir` and `signing_key_path` are set.
+# For Docker Compose, mount ./pipelock-evidence and ./pipelock-keys as shown in
+# compose.example.ai.yml, then uncomment these paths.
+flight_recorder:
+  enabled: true
+  require_receipts: false
+  redact: true
+  # dir: /var/lib/pipelock/evidence
+  # signing_key_path: /etc/pipelock/keys/flight-recorder-signing.key
diff --git a/spec/requests/api/v1/import_sessions_spec.rb b/spec/requests/api/v1/import_sessions_spec.rb
new file mode 100644
index 000000000..02c9af9f9
--- /dev/null
+++ b/spec/requests/api/v1/import_sessions_spec.rb
@@ -0,0 +1,430 @@
+# frozen_string_literal: true
+
+require 'swagger_helper'
+
+RSpec.describe 'API V1 Import Sessions', type: :request do
+  let(:user) { users(:empty) }
+  let(:family) { user.family }
+
+  let(:api_key) { api_keys(:active_key) }
+  let(:api_key_without_write_scope) { api_keys(:one) }
+  let(:api_key_without_read_scope) { api_keys(:expired_key) }
+
+  let(:'X-Api-Key') { api_key.plain_key }
+
+  let(:entity_ndjson) do
+    {
+      type: 'Account',
+      data: {
+        id: 'docs-account-1',
+        name: 'Docs Checking',
+        balance: '100.00',
+        currency: 'USD',
+        accountable_type: 'Depository'
+      }
+    }.to_json
+  end
+
+  let(:transaction_ndjson) do
+    {
+      type: 'Transaction',
+      data: {
+        id: 'docs-transaction-1',
+        account_id: 'docs-account-1',
+        date: '2024-01-15',
+        amount: '-12.34',
+        currency: 'USD',
+        name: 'Docs Transaction'
+      }
+    }.to_json
+  end
+
+  path '/api/v1/import_sessions' do
+    post 'Create import session' do
+      description 'Create or idempotently retrieve a multi-file SureImport session keyed by client_session_id.'
+      tags 'Import Sessions'
+      security [ { apiKeyAuth: [] } ]
+      consumes 'application/json'
+      produces 'application/json'
+
+      parameter name: :body, in: :body, required: false, schema: {
+        type: :object,
+        properties: {
+          type: {
+            type: :string,
+            enum: %w[SureImport],
+            description: 'Import session type. Only SureImport is supported.'
+          },
+          client_session_id: {
+            type: :string,
+            nullable: true,
+            description: 'Client-provided idempotency key for the full import session.'
+          },
+          expected_chunks: {
+            type: :integer,
+            minimum: 1,
+            nullable: true,
+            description: 'Expected number of ordered chunks before publish is allowed.'
+          }
+        }
+      }
+
+      response '201', 'import session created' do
+        schema '$ref' => '#/components/schemas/ImportSessionResponse'
+
+        let(:body) do
+          {
+            type: 'SureImport',
+            client_session_id: 'docs-session-1',
+            expected_chunks: 2
+          }
+        end
+
+        run_test!
+      end
+
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { nil }
+        let(:body) { { type: 'SureImport' } }
+
+        run_test!
+      end
+
+      response '403', 'insufficient scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { api_key_without_write_scope.plain_key }
+        let(:body) { { type: 'SureImport' } }
+
+        run_test!
+      end
+
+      response '409', 'client session conflict' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        before do
+          family.import_sessions.create!(
+            client_session_id: 'docs-session-conflict',
+            expected_chunks: 1
+          )
+        end
+
+        let(:body) do
+          {
+            type: 'SureImport',
+            client_session_id: 'docs-session-conflict',
+            expected_chunks: 2
+          }
+        end
+
+        run_test!
+      end
+
+      response '422', 'validation error' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) { { type: 'TransactionImport' } }
+
+        run_test!
+      end
+    end
+  end
+
+  path '/api/v1/import_sessions/{id}' do
+    parameter name: :id, in: :path, type: :string, required: true, description: 'Import session ID'
+
+    let(:import_session) { family.import_sessions.create!(expected_chunks: 1) }
+
+    get 'Retrieve import session' do
+      description 'Retrieve import session status, chunk status, per-entity summary counts, and safe error details.'
+      tags 'Import Sessions'
+      security [ { apiKeyAuth: [] } ]
+      produces 'application/json'
+
+      let(:id) { import_session.id }
+
+      response '200', 'import session retrieved' do
+        schema '$ref' => '#/components/schemas/ImportSessionResponse'
+
+        run_test!
+      end
+
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { nil }
+
+        run_test!
+      end
+
+      response '403', 'insufficient scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { api_key_without_read_scope.plain_key }
+
+        run_test!
+      end
+
+      response '404', 'import session not found' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:id) { SecureRandom.uuid }
+
+        run_test!
+      end
+    end
+  end
+
+  path '/api/v1/import_sessions/{id}/chunks' do
+    parameter name: :id, in: :path, type: :string, required: true, description: 'Import session ID'
+
+    let(:import_session) { family.import_sessions.create!(expected_chunks: 2) }
+    let(:id) { import_session.id }
+
+    post 'Upload import session chunk' do
+      description 'Attach an ordered Sure NDJSON chunk to an import session. Chunks are idempotent by sequence and client_chunk_id with content verification.'
+      tags 'Import Sessions'
+      security [ { apiKeyAuth: [] } ]
+      consumes 'application/json', 'multipart/form-data'
+      produces 'application/json'
+      metadata[:operation][:requestBody] = {
+        required: true,
+        content: {
+          'application/json' => {
+            schema: {
+              type: :object,
+              required: %w[sequence raw_file_content],
+              properties: {
+                sequence: {
+                  type: :integer,
+                  minimum: 1,
+                  description: 'One-based chunk sequence. Earlier dependency chunks must have lower sequence numbers.'
+                },
+                client_chunk_id: {
+                  type: :string,
+                  nullable: true,
+                  description: 'Client-provided idempotency key for this chunk.'
+                },
+                raw_file_content: {
+                  type: :string,
+                  description: 'Raw Sure NDJSON content. Each chunk is limited to 10MB.'
+                }
+              }
+            }
+          },
+          'multipart/form-data' => {
+            schema: {
+              type: :object,
+              required: %w[sequence file],
+              properties: {
+                sequence: {
+                  type: :integer,
+                  minimum: 1,
+                  description: 'One-based chunk sequence. Earlier dependency chunks must have lower sequence numbers.'
+                },
+                client_chunk_id: {
+                  type: :string,
+                  nullable: true,
+                  description: 'Client-provided idempotency key for this chunk.'
+                },
+                file: {
+                  type: :string,
+                  format: :binary,
+                  description: 'Multipart Sure NDJSON file upload. Each chunk is limited to 10MB.'
+                }
+              }
+            }
+          }
+        }
+      }
+
+      parameter name: :body, in: :body, required: false
+
+      response '201', 'chunk uploaded' do
+        schema '$ref' => '#/components/schemas/ImportSessionResponse'
+
+        let(:body) do
+          {
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            raw_file_content: entity_ndjson
+          }
+        end
+
+        run_test!
+      end
+
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { nil }
+        let(:body) { { sequence: 1, raw_file_content: entity_ndjson } }
+
+        run_test!
+      end
+
+      response '403', 'insufficient scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { api_key_without_write_scope.plain_key }
+        let(:body) { { sequence: 1, raw_file_content: entity_ndjson } }
+
+        run_test!
+      end
+
+      response '409', 'chunk conflict' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        before do
+          import_session.attach_chunk!(
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            content: entity_ndjson,
+            filename: 'entities.ndjson',
+            content_type: 'application/x-ndjson'
+          )
+        end
+
+        let(:body) do
+          {
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            raw_file_content: transaction_ndjson
+          }
+        end
+
+        run_test!
+      end
+
+      response '404', 'import session not found' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:id) { SecureRandom.uuid }
+        let(:body) { { sequence: 1, raw_file_content: entity_ndjson } }
+
+        run_test!
+      end
+
+      response '422', 'missing or invalid content' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) { { sequence: 1 } }
+
+        run_test!
+      end
+    end
+  end
+
+  path '/api/v1/import_sessions/{id}/publish' do
+    parameter name: :id, in: :path, type: :string, required: true, description: 'Import session ID'
+
+    let(:import_session) { family.import_sessions.create!(expected_chunks: 1) }
+    let(:id) { import_session.id }
+
+    post 'Publish import session' do
+      description 'Queue ordered chunk processing for a SureImport session. Later chunks can reference source IDs mapped by earlier chunks.'
+      tags 'Import Sessions'
+      security [ { apiKeyAuth: [] } ]
+      produces 'application/json'
+
+      response '202', 'import session publish queued' do
+        schema '$ref' => '#/components/schemas/ImportSessionResponse'
+
+        before do
+          import_session.attach_chunk!(
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            content: entity_ndjson,
+            filename: 'entities.ndjson',
+            content_type: 'application/x-ndjson'
+          )
+        end
+
+        run_test!
+      end
+
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { nil }
+
+        run_test!
+      end
+
+      response '403', 'insufficient scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { api_key_without_write_scope.plain_key }
+
+        run_test!
+      end
+
+      response '422', 'max_row_count_exceeded' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        before do
+          import_session.attach_chunk!(
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            content: entity_ndjson,
+            filename: 'entities.ndjson',
+            content_type: 'application/x-ndjson'
+          )
+          import_session.imports.update_all(rows_count: SureImport.max_row_count + 1)
+        end
+
+        run_test!
+      end
+
+      response '409', 'missing expected chunks' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:import_session) { family.import_sessions.create!(expected_chunks: 2) }
+
+        before do
+          import_session.attach_chunk!(
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            content: entity_ndjson,
+            filename: 'entities.ndjson',
+            content_type: 'application/x-ndjson'
+          )
+        end
+
+        run_test!
+      end
+
+      response '503', 'enqueue failed' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        before do
+          import_session.attach_chunk!(
+            sequence: 1,
+            client_chunk_id: 'docs-entities',
+            content: entity_ndjson,
+            filename: 'entities.ndjson',
+            content_type: 'application/x-ndjson'
+          )
+        end
+
+        around do |example|
+          ImportSessionJob.stub(:perform_later, ->(_import_session) { raise StandardError, 'queue offline' }) do
+            example.run
+          end
+        end
+
+        run_test!
+      end
+
+      response '404', 'import session not found' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:id) { SecureRandom.uuid }
+
+        run_test!
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/imports_spec.rb b/spec/requests/api/v1/imports_spec.rb
index 7d6691612..490af3da1 100644
--- a/spec/requests/api/v1/imports_spec.rb
+++ b/spec/requests/api/v1/imports_spec.rb
@@ -97,7 +97,7 @@ RSpec.describe 'API V1 Imports', type: :request do
                 schema: { type: :string, enum: %w[pending complete importing reverting revert_failed failed] }
       parameter name: :type, in: :query, required: false,
                 description: 'Filter by import type',
-                schema: { type: :string, enum: %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport SureImport] }
+                schema: { type: :string, enum: Import::TYPES }
 
       response '200', 'imports listed' do
         schema '$ref' => '#/components/schemas/ImportCollection'
@@ -138,7 +138,7 @@ RSpec.describe 'API V1 Imports', type: :request do
           },
           type: {
             type: :string,
-            enum: %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport SureImport],
+            enum: Import::TYPES,
             description: 'Import type (defaults to TransactionImport)'
           },
           account_id: {
@@ -250,7 +250,7 @@ RSpec.describe 'API V1 Imports', type: :request do
         run_test!
       end
 
-      response '422', 'validation error - file too large' do
+      response '422', 'validation error or publish rejection' do
         schema oneOf: [
           { '$ref' => '#/components/schemas/ErrorResponse' },
           { '$ref' => '#/components/schemas/ErrorResponseWithImportId' }
@@ -269,9 +269,22 @@ RSpec.describe 'API V1 Imports', type: :request do
       response '500', 'import uploaded but publish enqueue failed' do
         schema '$ref' => '#/components/schemas/ErrorResponseWithImportId'
 
+        before do
+          allow(ImportJob).to receive(:perform_later).and_raise(StandardError, 'queue offline')
+        end
+
         let(:body) do
           {
-            raw_file_content: { type: 'Account', data: { id: 'account_1', name: 'Checking' } }.to_json,
+            raw_file_content: {
+              type: 'Account',
+              data: {
+                id: 'account_1',
+                name: 'Checking',
+                balance: '100',
+                currency: 'USD',
+                accountable_type: 'Depository'
+              }
+            }.to_json,
             type: 'SureImport',
             publish: 'true'
           }
@@ -388,7 +401,7 @@ RSpec.describe 'API V1 Imports', type: :request do
           },
           type: {
             type: :string,
-            enum: %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport SureImport],
+            enum: Import::TYPES,
             description: 'Import type to validate (defaults to TransactionImport)'
           },
           account_id: {
diff --git a/spec/requests/api/v1/merchants_spec.rb b/spec/requests/api/v1/merchants_spec.rb
index adfed1dfd..6d161256a 100644
--- a/spec/requests/api/v1/merchants_spec.rb
+++ b/spec/requests/api/v1/merchants_spec.rb
@@ -47,6 +47,43 @@ RSpec.describe 'API V1 Merchants', type: :request do
         run_test!
       end
     end
+
+    post 'Import merchants from CSV' do
+      tags 'Merchants'
+      security [ { apiKeyAuth: [] } ]
+      consumes 'multipart/form-data'
+      produces 'application/json'
+
+      parameter name: :file, in: :formData, type: :file, required: true,
+                description: 'CSV file with columns: name* (required), color, website_url'
+
+      response '201', 'merchants imported' do
+        schema '$ref' => '#/components/schemas/MerchantImportResult'
+
+        let(:file) do
+          Rack::Test::UploadedFile.new(
+            StringIO.new("name,color,website_url\nCoffee Shop,#e99537,https://coffeeshop.com"),
+            'text/csv',
+            true,
+            original_filename: 'merchants.csv'
+          )
+        end
+
+        run_test!
+      end
+
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+        let(:'X-Api-Key') { nil }
+        run_test!
+      end
+
+      response '422', 'missing file or invalid CSV' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+        let(:file) { nil }
+        run_test!
+      end
+    end
   end
 
   path '/api/v1/merchants/{id}' do
diff --git a/spec/requests/api/v1/trades_spec.rb b/spec/requests/api/v1/trades_spec.rb
index 97a40a03a..2f58668e8 100644
--- a/spec/requests/api/v1/trades_spec.rb
+++ b/spec/requests/api/v1/trades_spec.rb
@@ -160,17 +160,19 @@ RSpec.describe 'API V1 Trades', type: :request do
             properties: {
               account_id: { type: :string, format: :uuid, description: 'Account ID (required)' },
               date: { type: :string, format: :date, description: 'Trade date (required)' },
-              qty: { type: :number, description: 'Quantity (required)' },
-              price: { type: :number, description: 'Price (required)' },
-              type: { type: :string, enum: %w[buy sell], description: 'Trade type (required)' },
+              qty: { type: :number, description: 'Quantity (required for buy/sell)' },
+              price: { type: :number, description: 'Price (required for buy/sell)' },
+              amount: { type: :number, description: 'Amount (required for dividend, deposit, withdrawal, interest)' },
+              type: { type: :string, enum: %w[buy sell dividend deposit withdrawal interest], description: 'Trade type (required)' },
               security_id: { type: :string, format: :uuid, description: 'Security ID (one of security_id, ticker, manual_ticker required)' },
               ticker: { type: :string, description: 'Ticker symbol' },
               manual_ticker: { type: :string, description: 'Manual ticker for offline securities' },
               currency: { type: :string, description: 'Currency (defaults to account currency)' },
               investment_activity_label: { type: :string, description: 'Activity label (e.g. Buy, Sell)' },
-              category_id: { type: :string, format: :uuid, description: 'Category ID' }
+              category_id: { type: :string, format: :uuid, description: 'Category ID' },
+              transfer_account_id: { type: :string, format: :uuid, description: 'Destination/source account ID for linked transfers' }
             },
-            required: %w[account_id date qty price type]
+            required: %w[account_id date type]
           }
         },
         required: %w[trade]
@@ -195,6 +197,51 @@ RSpec.describe 'API V1 Trades', type: :request do
         run_test!
       end
 
+      response '403', 'forbidden - api key missing read_write scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:read_only_api_key) do
+          key = ApiKey.generate_secure_key
+          ApiKey.create!(
+            user: user,
+            name: 'API Docs Read Key',
+            key: key,
+            scopes: %w[read],
+            source: 'mobile'
+          )
+        end
+        let(:'X-Api-Key') { read_only_api_key.plain_key }
+
+        run_test!
+      end
+
+      response '401', 'unauthorized - missing api key' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:'X-Api-Key') { nil }
+
+        run_test!
+      end
+
+      response '422', 'invalid date format' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: 'invalid-date',
+              qty: 10,
+              price: 50,
+              type: 'buy',
+              security_id: security.id
+            }
+          }
+        end
+
+        run_test!
+      end
+
       response '422', 'account does not support trades' do
         schema '$ref' => '#/components/schemas/ErrorResponse'
 
@@ -277,6 +324,145 @@ RSpec.describe 'API V1 Trades', type: :request do
 
         run_test!
       end
+
+      response '201', 'dividend created with security' do
+        schema '$ref' => '#/components/schemas/Trade'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'dividend',
+              amount: 25.50,
+              currency: 'USD',
+              ticker: 'AAPL'
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '422', 'dividend without security returns error' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'dividend',
+              amount: 25.50
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '422', 'dividend without amount returns error' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'dividend',
+              ticker: 'AAPL'
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '422', 'invalid type returns error' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'invalid'
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '201', 'deposit created' do
+        schema '$ref' => '#/components/schemas/TransactionResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'deposit',
+              amount: 175.25,
+              currency: 'USD'
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '201', 'withdrawal created' do
+        schema '$ref' => '#/components/schemas/TransactionResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'withdrawal',
+              amount: 100.00,
+              currency: 'USD'
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '201', 'interest created' do
+        schema '$ref' => '#/components/schemas/TransactionResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'interest',
+              amount: 25.00,
+              currency: 'USD'
+            }
+          }
+        end
+
+        run_test!
+      end
+
+      response '422', 'deposit without amount returns error' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:body) do
+          {
+            trade: {
+              account_id: account.id,
+              date: Date.current.to_s,
+              type: 'deposit'
+            }
+          }
+        end
+
+        run_test!
+      end
     end
   end
 
@@ -329,7 +515,7 @@ RSpec.describe 'API V1 Trades', type: :request do
               date: { type: :string, format: :date },
               qty: { type: :number },
               price: { type: :number },
-              type: { type: :string, enum: %w[buy sell] },
+              type: { type: :string, enum: %w[buy sell dividend deposit withdrawal interest] },
               nature: { type: :string, enum: %w[inflow outflow] },
               name: { type: :string },
               notes: { type: :string },
@@ -359,6 +545,33 @@ RSpec.describe 'API V1 Trades', type: :request do
         run_test!
       end
 
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:id) { trade.id }
+        let(:'X-Api-Key') { nil }
+
+        run_test!
+      end
+
+      response '403', 'forbidden - api key missing read_write scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:read_only_api_key) do
+          key = ApiKey.generate_secure_key
+          ApiKey.create!(
+            user: user,
+            name: 'API Docs Read Key',
+            key: key,
+            scopes: %w[read],
+            source: 'mobile'
+          )
+        end
+        let(:'X-Api-Key') { read_only_api_key.plain_key }
+
+        run_test!
+      end
+
       response '404', 'trade not found' do
         schema '$ref' => '#/components/schemas/ErrorResponse'
 
@@ -381,6 +594,33 @@ RSpec.describe 'API V1 Trades', type: :request do
         run_test!
       end
 
+      response '401', 'unauthorized' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:id) { trade.id }
+        let(:'X-Api-Key') { nil }
+
+        run_test!
+      end
+
+      response '403', 'forbidden - api key missing read_write scope' do
+        schema '$ref' => '#/components/schemas/ErrorResponse'
+
+        let(:read_only_api_key) do
+          key = ApiKey.generate_secure_key
+          ApiKey.create!(
+            user: user,
+            name: 'API Docs Read Key',
+            key: key,
+            scopes: %w[read],
+            source: 'mobile'
+          )
+        end
+        let(:'X-Api-Key') { read_only_api_key.plain_key }
+
+        run_test!
+      end
+
       response '404', 'trade not found' do
         schema '$ref' => '#/components/schemas/ErrorResponse'
 
diff --git a/spec/requests/api/v1/transfers_spec.rb b/spec/requests/api/v1/transfers_spec.rb
index 47fcdd823..0afcfe70e 100644
--- a/spec/requests/api/v1/transfers_spec.rb
+++ b/spec/requests/api/v1/transfers_spec.rb
@@ -139,7 +139,13 @@ RSpec.describe 'API V1 Transfers', type: :request do
       response '200', 'transfer retrieved' do
         schema '$ref' => '#/components/schemas/TransferDecision'
 
-        run_test!
+        run_test! do |response|
+          body = JSON.parse(response.body)
+          expect(body['source_fee_amount']).to eq '0.0'
+          expect(body['destination_fee_amount']).to eq '0.0'
+          expect(body).to have_key('source_fee_currency')
+          expect(body).to have_key('destination_fee_currency')
+        end
       end
 
       response '401', 'unauthorized' do
diff --git a/spec/swagger_helper.rb b/spec/swagger_helper.rb
index c17ec07f2..a8cd88f8d 100644
--- a/spec/swagger_helper.rb
+++ b/spec/swagger_helper.rb
@@ -571,6 +571,15 @@ RSpec.configure do |config|
               updated_at: { type: :string, format: :'date-time' }
             }
           },
+          MerchantImportResult: {
+            type: :object,
+            required: %w[imported skipped merchants],
+            properties: {
+              imported: { type: :integer, description: 'Number of merchants successfully created' },
+              skipped: { type: :integer, description: 'Number of rows skipped (duplicates or invalid)' },
+              merchants: { type: :array, items: { '$ref' => '#/components/schemas/MerchantDetail' } }
+            }
+          },
           Tag: {
             type: :object,
             required: %w[id name color],
@@ -850,6 +859,10 @@ RSpec.configure do |config|
               currency: { type: :string },
               transfer_type: { type: :string, enum: %w[transfer liability_payment loan_payment] },
               notes: { type: :string, nullable: true },
+              source_fee_amount: { type: :string, nullable: true, description: 'Fee charged to the source account' },
+              source_fee_currency: { type: :string, nullable: true },
+              destination_fee_amount: { type: :string, nullable: true, description: 'Fee deducted from the destination account' },
+              destination_fee_currency: { type: :string, nullable: true },
               inflow_transaction: { '$ref' => '#/components/schemas/TransferTransactionSide' },
               outflow_transaction: { '$ref' => '#/components/schemas/TransferTransactionSide' },
               created_at: { type: :string, format: :'date-time' },
@@ -922,6 +935,27 @@ RSpec.configure do |config|
               message: { type: :string }
             }
           },
+          TransactionResponse: {
+            type: :object,
+            required: %w[id date amount currency name entryable_type account],
+            properties: {
+              id: { type: :string, format: :uuid },
+              date: { type: :string, format: :date },
+              amount: { type: :string },
+              currency: { type: :string },
+              name: { type: :string },
+              entryable_type: { type: :string },
+              account: {
+                type: :object,
+                required: %w[id name account_type],
+                properties: {
+                  id: { type: :string, format: :uuid },
+                  name: { type: :string },
+                  account_type: { type: :string, nullable: true }
+                }
+              }
+            }
+          },
           ImportConfiguration: {
             type: :object,
             properties: {
@@ -1052,7 +1086,7 @@ RSpec.configure do |config|
             type: :object,
             required: %w[type valid content stats errors warnings],
             properties: {
-              type: { type: :string, enum: %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport SureImport] },
+              type: { type: :string, enum: Import::TYPES },
               valid: { type: :boolean },
               content: { '$ref' => '#/components/schemas/ImportPreflightContent' },
               stats: { '$ref' => '#/components/schemas/ImportPreflightStats' },
@@ -1116,7 +1150,7 @@ RSpec.configure do |config|
             required: %w[id type status created_at updated_at status_detail],
             properties: {
               id: { type: :string, format: :uuid },
-              type: { type: :string, enum: %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport SureImport] },
+              type: { type: :string, enum: Import::TYPES },
               status: { type: :string, enum: %w[pending complete importing reverting revert_failed failed] },
               created_at: { type: :string, format: :'date-time' },
               updated_at: { type: :string, format: :'date-time' },
@@ -1131,7 +1165,7 @@ RSpec.configure do |config|
             required: %w[id type status created_at updated_at status_detail configuration stats],
             properties: {
               id: { type: :string, format: :uuid },
-              type: { type: :string, enum: %w[TransactionImport TradeImport AccountImport MintImport ActualImport CategoryImport RuleImport SureImport] },
+              type: { type: :string, enum: Import::TYPES },
               status: { type: :string, enum: %w[pending complete importing reverting revert_failed failed] },
               created_at: { type: :string, format: :'date-time' },
               updated_at: { type: :string, format: :'date-time' },
@@ -1172,6 +1206,68 @@ RSpec.configure do |config|
               data: { '$ref' => '#/components/schemas/ImportDetail' }
             }
           },
+          ImportSessionChunk: {
+            type: :object,
+            required: %w[id sequence status rows_count summary created_at updated_at],
+            properties: {
+              id: { type: :string, format: :uuid },
+              sequence: { type: :integer, minimum: 1 },
+              client_chunk_id: { type: :string, nullable: true },
+              status: { type: :string, enum: %w[pending importing complete failed] },
+              rows_count: { type: :integer, minimum: 0 },
+              summary: {
+                type: :object,
+                additionalProperties: {
+                  type: :object,
+                  additionalProperties: { type: :integer }
+                }
+              },
+              error: {
+                type: :object,
+                nullable: true,
+                additionalProperties: true
+              },
+              created_at: { type: :string, format: :'date-time' },
+              updated_at: { type: :string, format: :'date-time' }
+            }
+          },
+          ImportSession: {
+            type: :object,
+            required: %w[id type status chunks_count summary chunks created_at updated_at],
+            properties: {
+              id: { type: :string, format: :uuid },
+              type: { type: :string, enum: %w[SureImport] },
+              status: { type: :string, enum: %w[pending importing complete failed] },
+              client_session_id: { type: :string, nullable: true },
+              expected_chunks: { type: :integer, nullable: true, minimum: 1 },
+              chunks_count: { type: :integer, minimum: 0 },
+              summary: {
+                type: :object,
+                additionalProperties: {
+                  type: :object,
+                  additionalProperties: { type: :integer }
+                }
+              },
+              error: {
+                type: :object,
+                nullable: true,
+                additionalProperties: true
+              },
+              chunks: {
+                type: :array,
+                items: { '$ref' => '#/components/schemas/ImportSessionChunk' }
+              },
+              created_at: { type: :string, format: :'date-time' },
+              updated_at: { type: :string, format: :'date-time' }
+            }
+          },
+          ImportSessionResponse: {
+            type: :object,
+            required: %w[data],
+            properties: {
+              data: { '$ref' => '#/components/schemas/ImportSession' }
+            }
+          },
           ProviderConnectionInstitution: {
             type: :object,
             required: %w[name],
diff --git a/test/architecture/api_current_usage_test.rb b/test/architecture/api_current_usage_test.rb
new file mode 100644
index 000000000..b58ece19c
--- /dev/null
+++ b/test/architecture/api_current_usage_test.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class ApiCurrentUsageTest < ActiveSupport::TestCase
+  API_CONTROLLER_GLOB = Rails.root.join("app/controllers/api/**/*.rb").to_s
+  BASE_CONTROLLER = Rails.root.join("app/controllers/api/v1/base_controller.rb").to_s
+  DISALLOWED_CURRENT_REFERENCES = [
+    "Current.user",
+    "Current.family",
+    "Current.session"
+  ].freeze
+
+  # Api::V1::BaseController may set an unsaved session as a compatibility bridge
+  # for code paths that still derive Current.user from Current.session.user.
+  # Add new entries only when they are part of that bridge and document why.
+  ALLOWED_BASE_CONTROLLER_REFERENCES = [
+    "Current.session = @current_user.sessions.build(",
+    "Current.session.active_impersonator_session = nil"
+  ].freeze
+
+  test "api controllers scope through current_resource_owner instead of Current" do
+    violations = []
+
+    Dir.glob(API_CONTROLLER_GLOB).sort.each do |path|
+      File.readlines(path).each.with_index(1) do |line, line_number|
+        next unless DISALLOWED_CURRENT_REFERENCES.any? { |reference| line.include?(reference) }
+        next if allowed_base_controller_reference?(path, line)
+
+        relative_path = Pathname.new(path).relative_path_from(Rails.root)
+        violations << "#{relative_path}:#{line_number}: #{line.strip}"
+      end
+    end
+
+    assert_empty violations, <<~MESSAGE
+      API controllers should not read Current.user, Current.family, or Current.session.
+
+      Use current_resource_owner/current_resource_owner.family for API auth scoping.
+      The only allowed Current.session usage is the compatibility bridge in Api::V1::BaseController.
+
+      #{violations.join("\n")}
+    MESSAGE
+  end
+
+  private
+    def allowed_base_controller_reference?(path, line)
+      path == BASE_CONTROLLER && ALLOWED_BASE_CONTROLLER_REFERENCES.any? { |reference| line.include?(reference) }
+    end
+end
diff --git a/test/components/DS/disclosure_test.rb b/test/components/DS/disclosure_test.rb
new file mode 100644
index 000000000..583c7f9d2
--- /dev/null
+++ b/test/components/DS/disclosure_test.rb
@@ -0,0 +1,39 @@
+require "test_helper"
+
+class DS::DisclosureTest < ViewComponent::TestCase
+  test "bare variant yields panel content without mt-2 wrapper" do
+    render_inline(DS::Disclosure.new(variant: :bare, summary_class: "cursor-pointer")) do |disclosure|
+      disclosure.with_summary_content { "Toggle" }
+      "Panel"
+    end
+
+    assert page.has_css?("details.group")
+    assert page.has_text?("Panel")
+    assert_no_match(/<div class="mt-2">/, rendered_content)
+  end
+
+  test "body wrapper defaults to an mt-2 margin" do
+    render_inline(DS::Disclosure.new(title: "More", open: true)) { "body text" }
+
+    assert_selector "details > div.mt-2", text: "body text"
+  end
+
+  test "body_class: nil drops the body margin wrapper" do
+    render_inline(DS::Disclosure.new(title: "More", open: true, body_class: nil)) { "body text" }
+
+    assert_no_selector "details > div.mt-2"
+    assert_selector "details > div", text: "body text"
+  end
+
+  test "forwards data attributes and a summary_class override" do
+    render_inline(DS::Disclosure.new(
+      summary_class: "custom-summary",
+      data: { controller: "color-icon-picker", action: "mousedown->color-icon-picker#handleOutsideClick" }
+    )) do |disclosure|
+      disclosure.with_summary_content { "trigger" }
+    end
+
+    assert_selector "details[data-controller='color-icon-picker']"
+    assert_selector "summary.custom-summary", text: "trigger"
+  end
+end
diff --git a/test/components/DS/empty_state_test.rb b/test/components/DS/empty_state_test.rb
new file mode 100644
index 000000000..82503341f
--- /dev/null
+++ b/test/components/DS/empty_state_test.rb
@@ -0,0 +1,32 @@
+require "test_helper"
+
+class DS::EmptyStateTest < ViewComponent::TestCase
+  test "renders a centered wrapper with title and description" do
+    render_inline(DS::EmptyState.new(icon: "repeat", title: "No data yet", description: "Add something."))
+
+    assert_selector "div.text-center.items-center"
+    assert_selector "p.text-primary", text: "No data yet"
+    assert_selector "p.text-secondary", text: "Add something."
+  end
+
+  test "description is optional" do
+    render_inline(DS::EmptyState.new(icon: "repeat", title: "Empty"))
+
+    assert_selector "p.text-primary", text: "Empty"
+    assert_no_selector "p.text-secondary"
+  end
+
+  test "renders the action slot" do
+    render_inline(DS::EmptyState.new(icon: "repeat", title: "Empty")) do |es|
+      es.with_action { "<a href='/go'>Go</a>".html_safe }
+    end
+
+    assert_selector "a[href='/go']", text: "Go"
+  end
+
+  test "passthrough class merges onto the wrapper" do
+    render_inline(DS::EmptyState.new(icon: "repeat", title: "Empty", class: "custom-x"))
+
+    assert_selector "div.custom-x.text-center"
+  end
+end
diff --git a/test/components/DS/menu_item_test.rb b/test/components/DS/menu_item_test.rb
new file mode 100644
index 000000000..944d3d47e
--- /dev/null
+++ b/test/components/DS/menu_item_test.rb
@@ -0,0 +1,32 @@
+require "test_helper"
+
+class DS::MenuItemTest < ViewComponent::TestCase
+  test "selectable item reserves a fixed-width check gutter and shows the check when selected" do
+    render_inline(DS::MenuItem.new(variant: :link, text: "30D", href: "/", selected: true))
+
+    assert_selector "span.shrink-0.w-5", count: 1
+    assert_selector "span.shrink-0.w-5 svg", count: 1
+    # Selection is exposed to assistive tech, not only visually.
+    assert_selector "a[role='menuitemradio'][aria-checked='true']"
+    assert_text "30D"
+  end
+
+  test "selectable item keeps the reserved gutter (no glyph) when not selected" do
+    render_inline(DS::MenuItem.new(variant: :link, text: "90D", href: "/", selected: false))
+
+    # Gutter still present so text stays aligned with the selected row...
+    assert_selector "span.shrink-0.w-5", count: 1
+    # ...but no check glyph is drawn.
+    assert_no_selector "span.shrink-0.w-5 svg"
+    assert_selector "a[role='menuitemradio'][aria-checked='false']"
+  end
+
+  test "plain action item (selected: nil) renders no check gutter" do
+    render_inline(DS::MenuItem.new(variant: :link, text: "Edit", href: "/", icon: "pencil-line"))
+
+    assert_no_selector "span.shrink-0.w-5"
+    assert_selector "a[role='menuitem']"
+    assert_no_selector "[aria-checked]"
+    assert_text "Edit"
+  end
+end
diff --git a/test/components/DS/pill_test.rb b/test/components/DS/pill_test.rb
index a066e6e94..5fbc9a542 100644
--- a/test/components/DS/pill_test.rb
+++ b/test/components/DS/pill_test.rb
@@ -51,6 +51,26 @@ class DS::PillTest < ViewComponent::TestCase
     assert_includes pill.palette[:bg], "color-red-50"
   end
 
+  test "marker mode shows the dot by default" do
+    render_inline(DS::Pill.new(label: "Beta", tone: :violet))
+    assert_selector "span.inline-block.rounded-full"
+  end
+
+  test "badge mode (marker: false) is dot-less by default" do
+    render_inline(DS::Pill.new(label: "Member", tone: :neutral, marker: false))
+    assert_no_selector "span.inline-block.rounded-full"
+  end
+
+  test "badge mode opts back into the dot with show_dot: true" do
+    render_inline(DS::Pill.new(label: "Active", tone: :success, marker: false, show_dot: true))
+    assert_selector "span.inline-block.rounded-full"
+  end
+
+  test "marker mode can drop the dot with show_dot: false" do
+    render_inline(DS::Pill.new(label: "Beta", tone: :violet, show_dot: false))
+    assert_no_selector "span.inline-block.rounded-full"
+  end
+
   test "custom color renders dynamic badge styles" do
     render_inline(DS::Pill.new(label: "Groceries", marker: false, custom_color: "#f97316"))
 
@@ -70,4 +90,37 @@ class DS::PillTest < ViewComponent::TestCase
     # `inline-block.rounded-full` to avoid matching the parent pill.
     assert_no_selector "span.inline-block.rounded-full"
   end
+
+  test "truncate: true lets the pill shrink and ellipsizes the label" do
+    render_inline(DS::Pill.new(label: "A very long category name", marker: false, truncate: true))
+
+    pill = page.find("span[title='A very long category name']")
+    assert_includes pill[:class], "max-w-full"
+    assert_includes pill[:class], "min-w-0"
+    refute_includes pill[:class], "shrink-0"
+    refute_includes pill[:class], "whitespace-nowrap"
+    assert_selector "span.min-w-0.truncate", text: "A very long category name"
+  end
+
+  test "default pills keep intrinsic width (no truncation chrome)" do
+    render_inline(DS::Pill.new(label: "Active", marker: false))
+
+    pill = page.find("span", text: "Active")
+    assert_includes pill[:class], "shrink-0"
+    assert_includes pill[:class], "whitespace-nowrap"
+    assert_no_selector "span.truncate"
+  end
+
+  test "label_testid stamps data-testid on the label span" do
+    render_inline(DS::Pill.new(label: "Groceries", marker: false, label_testid: "category-name"))
+
+    assert_selector "span[data-testid='category-name']", text: "Groceries"
+  end
+
+  test "icon_size passes through to the icon helper" do
+    render_inline(DS::Pill.new(label: "Food", marker: false, icon: "utensils", icon_size: "sm"))
+
+    # sm maps to w-4 h-4 in the icon helper's size table.
+    assert_selector "svg.w-4.h-4"
+  end
 end
diff --git a/test/components/DS/progress_ring_test.rb b/test/components/DS/progress_ring_test.rb
new file mode 100644
index 000000000..14ca25f95
--- /dev/null
+++ b/test/components/DS/progress_ring_test.rb
@@ -0,0 +1,45 @@
+require "test_helper"
+
+class DS::ProgressRingTest < ViewComponent::TestCase
+  test "renders a track circle and a progress arc" do
+    render_inline(DS::ProgressRing.new(percent: 50, tone: :success))
+    assert_selector "svg circle", count: 2
+  end
+
+  test "renders the center percent by default and clamps it" do
+    render_inline(DS::ProgressRing.new(percent: 140))
+    assert_text "100%"
+
+    render_inline(DS::ProgressRing.new(percent: -10))
+    assert_text "0%"
+  end
+
+  test "show_percent: false omits the center label" do
+    render_inline(DS::ProgressRing.new(percent: 40, show_percent: false))
+    assert_no_text "40%"
+  end
+
+  test "exposes a progressbar role and value only when labelled" do
+    render_inline(DS::ProgressRing.new(percent: 30, label: "Goal progress"))
+    assert_selector "[role='progressbar'][aria-valuenow='30'][aria-label='Goal progress']"
+
+    render_inline(DS::ProgressRing.new(percent: 30))
+    assert_no_selector "[role='progressbar']"
+  end
+
+  test "tone selects the arc stroke color token" do
+    assert_equal "var(--color-success)", DS::ProgressRing.new(percent: 1, tone: :success).stroke_color
+    assert_equal "var(--color-warning)", DS::ProgressRing.new(percent: 1, tone: :warning).stroke_color
+    assert_equal "var(--color-destructive)", DS::ProgressRing.new(percent: 1, tone: :destructive).stroke_color
+    # Unknown tone falls back to neutral.
+    assert_equal "var(--color-gray-400)", DS::ProgressRing.new(percent: 1, tone: :bogus).stroke_color
+  end
+
+  test "dash offset runs from full circumference at 0% to zero at 100%" do
+    ring = DS::ProgressRing.new(percent: 0)
+    assert_in_delta ring.circumference, ring.dash_offset, 0.001
+
+    full = DS::ProgressRing.new(percent: 100)
+    assert_in_delta 0.0, full.dash_offset, 0.001
+  end
+end
diff --git a/test/components/DS/segmented_control_test.rb b/test/components/DS/segmented_control_test.rb
new file mode 100644
index 000000000..efb6e193d
--- /dev/null
+++ b/test/components/DS/segmented_control_test.rb
@@ -0,0 +1,51 @@
+require "test_helper"
+
+class DS::SegmentedControlTest < ViewComponent::TestCase
+  test "renders segments as buttons by default with the base + active classes" do
+    render_inline(DS::SegmentedControl.new) do |sc|
+      sc.with_segment("All", active: true)
+      sc.with_segment("Over Budget")
+    end
+
+    assert_selector "div.segmented-control[role=group]"
+    assert_selector "button.segmented-control__segment", count: 2
+    assert_selector "button.segmented-control__segment--active", text: "All", count: 1
+    refute_selector "button.segmented-control__segment--active", text: "Over Budget"
+  end
+
+  test "href renders a segment as a link" do
+    render_inline(DS::SegmentedControl.new) do |sc|
+      sc.with_segment("Sign in", href: "/login", active: true)
+      sc.with_segment("Sign up", href: "/join")
+    end
+
+    assert_selector "a.segmented-control__segment--active[href='/login']", text: "Sign in"
+    assert_selector "a.segmented-control__segment[href='/join']", text: "Sign up"
+  end
+
+  test "full_width stretches the track and each segment" do
+    render_inline(DS::SegmentedControl.new(full_width: true)) do |sc|
+      sc.with_segment("One", active: true)
+      sc.with_segment("Two")
+    end
+
+    assert_selector "div.segmented-control.w-full"
+    assert_selector "button.segmented-control__segment.flex-1", count: 2
+  end
+
+  test "aria_label and passthrough attrs land on the wrapper" do
+    render_inline(DS::SegmentedControl.new(aria_label: "Filter", data: { controller: "x" })) do |sc|
+      sc.with_segment("A", active: true)
+    end
+
+    assert_selector "div.segmented-control[aria-label='Filter'][data-controller='x']"
+  end
+
+  test "per-segment passthrough class and data merge onto the segment" do
+    render_inline(DS::SegmentedControl.new) do |sc|
+      sc.with_segment("A", active: true, class: "custom-x", data: { id: "a" })
+    end
+
+    assert_selector "button.segmented-control__segment--active.custom-x[data-id='a']"
+  end
+end
diff --git a/test/components/UI/account/chart_test.rb b/test/components/UI/account/chart_test.rb
new file mode 100644
index 000000000..8245ff20b
--- /dev/null
+++ b/test/components/UI/account/chart_test.rb
@@ -0,0 +1,57 @@
+require "test_helper"
+
+class UI::Account::ChartTest < ViewComponent::TestCase
+  setup do
+    @account = accounts(:investment)
+    @account.holdings.destroy_all
+  end
+
+  test "renders positive gains with explicit plus sign" do
+    create_holding(cost_basis: 90)
+
+    render_inline(UI::Account::Chart.new(account: @account, view: "gains"))
+
+    assert_text "+$100.00"
+  end
+
+  test "does not sign non-gains views" do
+    component = UI::Account::Chart.new(account: @account, view: "balance")
+
+    assert_equal @account.balance_money.format, component.view_balance_display
+    refute component.view_balance_display.start_with?("+")
+  end
+
+  test "negative gains keep plain money formatting" do
+    create_holding(cost_basis: 110)
+
+    component = UI::Account::Chart.new(account: @account, view: "gains")
+
+    assert_equal "-$100.00", component.view_balance_display
+  end
+
+  test "converted amount is signed like the main indicator for foreign-currency accounts" do
+    @account.update!(currency: "EUR")
+    create_holding(cost_basis: 90)
+    ExchangeRate.create!(date: Date.current, from_currency: "EUR", to_currency: "USD", rate: 1.1)
+
+    component = UI::Account::Chart.new(account: @account, view: "gains")
+
+    assert_equal "+€100.00", component.view_balance_display
+    assert_equal "+$110.00", component.converted_balance_display
+  end
+
+  private
+    # 10 shares at $100 market price; gain = 1000 - cost_basis * 10
+    def create_holding(cost_basis:)
+      Holding.create!(
+        account: @account,
+        security: securities(:aapl),
+        date: Date.current,
+        qty: 10,
+        price: 100,
+        amount: 1000,
+        currency: @account.currency,
+        cost_basis: cost_basis
+      )
+    end
+end
diff --git a/test/components/UI/period_picker_test.rb b/test/components/UI/period_picker_test.rb
new file mode 100644
index 000000000..ee54db16e
--- /dev/null
+++ b/test/components/UI/period_picker_test.rb
@@ -0,0 +1,58 @@
+require "test_helper"
+
+class UI::PeriodPickerTest < ViewComponent::TestCase
+  test "renders one menuitemradio link per period, all carrying the period param and target frame" do
+    render_inline(UI::PeriodPicker.new(selected: "last_30_days", url: "/", frame: "dashboard_sections"))
+
+    links = page.all("a[role='menuitemradio']")
+    assert_equal Period.all.size, links.size
+
+    links.each do |link|
+      assert_match(/period=/, link[:href])
+      assert_equal "dashboard_sections", link["data-turbo-frame"]
+    end
+  end
+
+  test "marks the selected period with aria-checked and a check glyph" do
+    render_inline(UI::PeriodPicker.new(selected: "last_90_days", url: "/", frame: "dashboard_sections"))
+
+    selected = page.all("a[role='menuitemradio'][aria-checked='true']")
+    assert_equal 1, selected.size
+    assert_match(/period=last_90_days/, selected.first[:href])
+    # Check icon (svg) renders inside the selected item only.
+    assert_selector "a[aria-checked='true'] svg"
+  end
+
+  test "trigger button shows the selected period's short label" do
+    render_inline(UI::PeriodPicker.new(selected: "last_30_days", url: "/"))
+
+    assert_text Period.from_key("last_30_days").label_short
+  end
+
+  test "trigger accessible name announces the selected period" do
+    render_inline(UI::PeriodPicker.new(selected: "last_90_days", url: "/"))
+
+    label = Period.from_key("last_90_days").label_short
+    assert_selector "button[aria-label='Time period: #{label}']"
+  end
+
+  test "extra_params are merged into every option href" do
+    render_inline(UI::PeriodPicker.new(
+      selected: "last_30_days",
+      url: "/accounts/abc",
+      extra_params: { chart_view: "balance" }
+    ))
+
+    href = page.first("a[role='menuitemradio']")[:href]
+    assert_match(%r{\A/accounts/abc\?}, href)
+    assert_match(/chart_view=balance/, href)
+    assert_match(/period=/, href)
+  end
+
+  test "accepts a Period object as selected" do
+    render_inline(UI::PeriodPicker.new(selected: Period.last_7_days, url: "/"))
+
+    assert_text Period.from_key("last_7_days").label_short
+    assert_equal 1, page.all("a[aria-checked='true']").size
+  end
+end
diff --git a/test/components/previews/disclosure_component_preview.rb b/test/components/previews/disclosure_component_preview.rb
index 51b9a8a00..77f85b0b8 100644
--- a/test/components/previews/disclosure_component_preview.rb
+++ b/test/components/previews/disclosure_component_preview.rb
@@ -10,4 +10,15 @@ class DisclosureComponentPreview < ViewComponent::Preview
       content_tag(:p, "Sample disclosure content", class: "text-sm")
     end
   end
+
+  # @display container_classes max-w-[400px]
+  def bare
+    render DS::Disclosure.new(variant: :bare, open: true, summary_class: "cursor-pointer") do |disclosure|
+      disclosure.with_summary_content do
+        content_tag(:span, "Edit", class: "text-sm")
+      end
+
+      content_tag(:p, "Absolutely positioned panels should use the bare variant.", class: "text-sm absolute mt-2")
+    end
+  end
 end
diff --git a/test/components/previews/empty_state_component_preview.rb b/test/components/previews/empty_state_component_preview.rb
new file mode 100644
index 000000000..e50cc4f17
--- /dev/null
+++ b/test/components/previews/empty_state_component_preview.rb
@@ -0,0 +1,23 @@
+class EmptyStateComponentPreview < ViewComponent::Preview
+  # @display container_classes max-w-[480px]
+  def default
+    render DS::EmptyState.new(
+      icon: "inbox",
+      title: "No transactions yet",
+      description: "Imported and synced transactions will show up here."
+    )
+  end
+
+  # @display container_classes max-w-[480px]
+  def with_action
+    render DS::EmptyState.new(
+      icon: "repeat",
+      title: "No recurring transactions",
+      description: "We detect patterns automatically, or you can scan now."
+    ) do |es|
+      es.with_action do
+        render DS::Link.new(text: "Scan now", icon: "search", variant: "primary", href: "#")
+      end
+    end
+  end
+end
diff --git a/test/components/previews/menu_component_preview.rb b/test/components/previews/menu_component_preview.rb
index 6fffb7ca3..002aa7969 100644
--- a/test/components/previews/menu_component_preview.rb
+++ b/test/components/previews/menu_component_preview.rb
@@ -18,6 +18,18 @@ class MenuComponentPreview < ViewComponent::Preview
     end
   end
 
+  # Single-select list. `selected:` reserves a fixed-width leading check gutter
+  # so the selected row's text stays aligned with every other row.
+  def selectable
+    render DS::Menu.new(variant: "button") do |menu|
+      menu.with_button(text: "30D", variant: "secondary")
+      menu.with_item(variant: "link", text: "7D", href: "#", selected: false)
+      menu.with_item(variant: "link", text: "30D", href: "#", selected: true)
+      menu.with_item(variant: "link", text: "90D", href: "#", selected: false)
+      menu.with_item(variant: "link", text: "Year to Date", href: "#", selected: false)
+    end
+  end
+
   private
     def menu_contents(menu)
       menu.with_item(variant: "link", text: "Link", href: "#", icon: "plus")
diff --git a/test/components/previews/pill_component_preview.rb b/test/components/previews/pill_component_preview.rb
index ae036179c..135ac209b 100644
--- a/test/components/previews/pill_component_preview.rb
+++ b/test/components/previews/pill_component_preview.rb
@@ -39,8 +39,12 @@ class PillComponentPreview < ViewComponent::Preview
   # @!endgroup
 
   # @!group Status badges (marker: false, semantic tones)
+  # Badge mode is dot-less by default — tone + label carry the signal. Opt the
+  # dot back in with show_dot: true only where it's genuinely additive (live /
+  # temporal status, or a single sparse pill). status_active below shows the
+  # opt-in; status_pending / status_archived show the clean default.
   def status_active
-    render DS::Pill.new(label: "Active", tone: :success, marker: false)
+    render DS::Pill.new(label: "Active", tone: :success, marker: false, show_dot: true)
   end
 
   def status_pending
@@ -65,4 +69,19 @@ class PillComponentPreview < ViewComponent::Preview
     render DS::Pill.new(label: "Past due", tone: :error, marker: false, size: :md)
   end
   # @!endgroup
+
+  # The categories/_badge recipe: user-chosen hex via custom_color, icon at
+  # "sm", and truncate so the label ellipsizes inside a tight min-w-0 column.
+  # @display container_classes max-w-[140px]
+  def category_badge_truncating
+    render DS::Pill.new(
+      label: "Subscriptions & Memberships",
+      custom_color: "#7c3aed",
+      icon: "credit-card",
+      icon_size: "sm",
+      marker: false,
+      size: :md,
+      truncate: true
+    )
+  end
 end
diff --git a/test/components/previews/progress_ring_component_preview.rb b/test/components/previews/progress_ring_component_preview.rb
new file mode 100644
index 000000000..b4476500c
--- /dev/null
+++ b/test/components/previews/progress_ring_component_preview.rb
@@ -0,0 +1,68 @@
+class ProgressRingComponentPreview < ViewComponent::Preview
+  # @param percent number
+  # @param size number
+  # @param stroke_width number
+  # @param tone select ["success", "warning", "destructive", "neutral"]
+  # @param show_percent toggle
+  # @param label text
+  def default(percent: 65, size: 64, stroke_width: 6, tone: "neutral", show_percent: true, label: nil)
+    render DS::ProgressRing.new(
+      percent: percent,
+      size: size,
+      stroke_width: stroke_width,
+      tone: tone.to_sym,
+      show_percent: show_percent,
+      label: label.presence
+    )
+  end
+
+  # @!group Tones (50%)
+  def success
+    render DS::ProgressRing.new(percent: 50, tone: :success)
+  end
+
+  def warning
+    render DS::ProgressRing.new(percent: 50, tone: :warning)
+  end
+
+  def destructive
+    render DS::ProgressRing.new(percent: 50, tone: :destructive)
+  end
+
+  def neutral
+    render DS::ProgressRing.new(percent: 50, tone: :neutral)
+  end
+  # @!endgroup
+
+  # @!group Sizes
+  def small_48
+    render DS::ProgressRing.new(percent: 72, size: 48, stroke_width: 5, tone: :success)
+  end
+
+  def medium_64
+    render DS::ProgressRing.new(percent: 72, size: 64, stroke_width: 6, tone: :success)
+  end
+
+  def large_180
+    render DS::ProgressRing.new(percent: 72, size: 180, stroke_width: 10, tone: :success)
+  end
+  # @!endgroup
+
+  # @!group Edges
+  def empty_0
+    render DS::ProgressRing.new(percent: 0, tone: :neutral)
+  end
+
+  def full_100
+    render DS::ProgressRing.new(percent: 100, tone: :success)
+  end
+
+  def clamps_over_100
+    render DS::ProgressRing.new(percent: 140, tone: :success)
+  end
+
+  def without_center_percent
+    render DS::ProgressRing.new(percent: 40, tone: :warning, show_percent: false)
+  end
+  # @!endgroup
+end
diff --git a/test/components/previews/segmented_control_component_preview.rb b/test/components/previews/segmented_control_component_preview.rb
new file mode 100644
index 000000000..5bc11f330
--- /dev/null
+++ b/test/components/previews/segmented_control_component_preview.rb
@@ -0,0 +1,20 @@
+class SegmentedControlComponentPreview < ViewComponent::Preview
+  # @display container_classes max-w-[480px]
+  # @param full_width toggle
+  def default(full_width: true)
+    render DS::SegmentedControl.new(full_width: full_width, aria_label: "Budget filter") do |sc|
+      sc.with_segment("All", active: true)
+      sc.with_segment("Over Budget")
+      sc.with_segment("On Track")
+    end
+  end
+
+  # Link segments (server-selected mode switch, e.g. the auth sign-in/up tabs).
+  # @display container_classes max-w-[320px]
+  def links
+    render DS::SegmentedControl.new(full_width: true, aria_label: "Auth mode") do |sc|
+      sc.with_segment("Sign in", href: "#", active: true)
+      sc.with_segment("Sign up", href: "#")
+    end
+  end
+end
diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index 4b7604c3e..d62ed2e7d 100644
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -14,11 +14,43 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert_select "p.ml-auto.privacy-sensitive"
   end
 
+  test "index renders kraken items" do
+    kraken_item = kraken_items(:one)
+    get accounts_url
+    assert_response :success
+    assert_select "##{dom_id(kraken_item)}"
+  end
+
   test "should get show" do
     get account_url(@account)
     assert_response :success
   end
 
+  test "show avoids N+1 transfer queries across paginated entries" do
+    queries = capture_sql_queries { get account_url(@account) }
+    assert_response :success
+
+    # Per-row transfer lookups (N+1 pattern) hit transfers with a single id
+    # Preloading batches them into IN(...) — assert no single-id lookups remain
+    per_row_transfer = queries.count { |q|
+      q.match?(/FROM "transfers".*WHERE.*"(inflow|outflow)_transaction_id"/) &&
+        !q.include?(" IN (")
+    }
+    assert_equal 0, per_row_transfer, "N+1 per-row transfer queries detected (#{per_row_transfer})"
+  end
+
+  test "show avoids N+1 split-parent queries across paginated entries" do
+    queries = capture_sql_queries { get account_url(@account) }
+    assert_response :success
+
+    # Per-row child-entry existence checks (N+1) hit entries with a single parent_entry_id
+    # @split_parent_entry_ids preloads this in one batch IN query
+    per_row_split = queries.count { |q|
+      q.match?(/FROM "entries".*WHERE.*"parent_entry_id"/) && !q.include?(" IN (")
+    }
+    assert_equal 0, per_row_split, "N+1 per-row split-parent queries detected (#{per_row_split})"
+  end
+
   test "show lazily loads statement tab data unless statements tab is active" do
     AccountStatement::Coverage.expects(:for_year).never
     AccountStatement.expects(:reconciliation_statuses_for).never
@@ -31,6 +63,39 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert_select "turbo-frame[src='#{statements_path}']"
   end
 
+  test "statements tab links escape turbo frame for full-page navigation" do
+    # Upload a statement to ensure table rows render
+    statement = AccountStatement.create_from_upload!(
+      family: @account.family,
+      file: uploaded_file(
+        filename: "test.pdf",
+        content_type: "application/pdf",
+        content: "%PDF-1.4 test content"
+      ),
+      account: @account
+    )
+
+
+    get account_url(@account, tab: "statements")
+
+    assert_response :success
+
+    # Inbox link escapes frame
+    assert_select "a[href='#{account_statements_path}'][data-turbo-frame='_top']"
+
+    # Statement filename link escapes frame
+    assert_select "a[data-turbo-frame='_top']", text: statement.filename
+
+    # Eye/view icon escapes frame and opens in new tab
+    assert_select "a[target='_blank'][data-turbo-frame='_top'][aria-label='#{I18n.t("account_statements.table.view")}']"
+
+    # Edit icon escapes frame
+    assert_select "a[href='#{account_statement_path(statement)}'][data-turbo-frame='_top'][aria-label='#{I18n.t("account_statements.table.edit")}']"
+
+    # Unlink button escapes frame
+    assert_select "form[action='#{unlink_account_statement_path(statement)}'][data-turbo-frame='_top'] button"
+  end
+
   test "statements tab shows coverage and upload for statement managers with account write access" do
     get account_url(@account, tab: "statements")
 
@@ -106,6 +171,14 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert_select "turbo-frame##{dom_id(trade_entry)} p.privacy-sensitive", text: expected_amount, count: 1
   end
 
+  test "renders investment account with gains chart view" do
+    get account_url(accounts(:investment), chart_view: "gains")
+
+    assert_response :success
+    assert_select "option[value=gains][selected]"
+    assert_select "p", text: I18n.t("UI.account.chart.title.total_gains")
+  end
+
   test "activity pagination keeps activity tab when loaded from holdings tab" do
     investment = accounts(:investment)
 
@@ -171,7 +244,6 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
 
   test "syncing linked account triggers sync for all provider items" do
     plaid_account = plaid_accounts(:one)
-    plaid_item = plaid_account.plaid_item
     AccountProvider.create!(account: @account, provider: plaid_account)
 
     # Reload to ensure the account has the provider association loaded
@@ -287,6 +359,27 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     assert @account.active?
   end
 
+  test "toggle_exclude_from_reports toggles the flag on an account" do
+    assert_not @account.exclude_from_reports?
+
+    patch toggle_exclude_from_reports_account_url(@account)
+    assert_redirected_to accounts_path
+    @account.reload
+    assert @account.exclude_from_reports?
+
+    patch toggle_exclude_from_reports_account_url(@account)
+    assert_redirected_to accounts_path
+    @account.reload
+    assert_not @account.exclude_from_reports?
+  end
+
+  test "toggle_exclude_from_reports requires write permission" do
+    sign_in users(:family_member)
+
+    patch toggle_exclude_from_reports_account_url(accounts(:credit_card))
+    assert_redirected_to account_url(accounts(:credit_card))
+  end
+
   test "select_provider shows available providers" do
     get select_provider_account_url(@account)
     assert_response :success
@@ -373,6 +466,32 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
 
     assert_nil holding.account_provider_id, "Holding should be detached from provider after unlink"
   end
+
+  # Regression for #2516: the account sidebar fragment cache renders DS::* view
+  # components, which Rails' ERB dependency tracker mis-parses as a bogus "Ds/D"
+  # template dependency. With automatic digesting enabled that logged
+  # "Couldn't find template for digesting: Ds/D" on every cache miss. The
+  # fragment is manually versioned and opts out of digesting via skip_digest.
+  test "sidebar fragment cache does not log a bogus template digest error" do
+    log = StringIO.new
+    logger = ActiveSupport::Logger.new(log)
+
+    original_perform_caching = ActionController::Base.perform_caching
+    original_view_logger = ActionView::Base.logger
+    original_rails_logger = Rails.logger
+
+    ActionController::Base.perform_caching = true
+    ActionView::Base.logger = logger
+    Rails.logger = logger
+
+    get accounts_path
+    assert_response :success
+    assert_no_match(/Couldn't find template for digesting/, log.string)
+  ensure
+    ActionController::Base.perform_caching = original_perform_caching
+    ActionView::Base.logger = original_view_logger
+    Rails.logger = original_rails_logger
+  end
 end
 
 class AccountsControllerSimplefinCtaTest < ActionDispatch::IntegrationTest
diff --git a/test/controllers/admin/sso_providers_controller_test.rb b/test/controllers/admin/sso_providers_controller_test.rb
new file mode 100644
index 000000000..c9085055c
--- /dev/null
+++ b/test/controllers/admin/sso_providers_controller_test.rb
@@ -0,0 +1,62 @@
+require "test_helper"
+
+class Admin::SsoProvidersControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    ensure_tailwind_build
+    sign_in users(:sure_support_staff)
+
+    @provider = SsoProvider.create!(
+      strategy: "google_oauth2",
+      name: "google_oauth2_test",
+      label: "Sign in with Google",
+      enabled: true,
+      client_id: "client-id",
+      client_secret: "existing-secret",
+      settings: { "default_role" => "member" }
+    )
+  end
+
+  test "edit form posts nested settings and optional client secret" do
+    get edit_admin_sso_provider_path(@provider)
+
+    assert_response :success
+    assert_includes response.body, 'name="sso_provider[settings][default_role]"'
+    assert_includes response.body, 'name="sso_provider[settings][scopes]"'
+    assert_includes response.body, 'name="sso_provider[settings][prompt]"'
+    assert_includes response.body, 'name="sso_provider[client_secret]"'
+    assert_no_match(/name="sso_provider\[client_secret\]"[^>]*required/, response.body)
+  end
+
+  test "update persists nested default role setting" do
+    patch admin_sso_provider_path(@provider), params: {
+      sso_provider: valid_update_params(settings: { default_role: "guest" })
+    }
+
+    assert_redirected_to admin_sso_providers_path
+    assert_equal "guest", @provider.reload.settings["default_role"]
+  end
+
+  test "update preserves existing client secret when blank" do
+    patch admin_sso_provider_path(@provider), params: {
+      sso_provider: valid_update_params(client_secret: "", label: "Updated Google")
+    }
+
+    assert_redirected_to admin_sso_providers_path
+    @provider.reload
+    assert_equal "Updated Google", @provider.label
+    assert_equal "existing-secret", @provider.client_secret
+  end
+
+  private
+    def valid_update_params(overrides = {})
+      {
+        strategy: @provider.strategy,
+        name: @provider.name,
+        label: @provider.label,
+        enabled: "1",
+        client_id: @provider.client_id,
+        client_secret: @provider.client_secret,
+        settings: @provider.settings
+      }.deep_merge(overrides)
+    end
+end
diff --git a/test/controllers/api/v1/auth_controller_test.rb b/test/controllers/api/v1/auth_controller_test.rb
index 9760c22dc..a091c4eee 100644
--- a/test/controllers/api/v1/auth_controller_test.rb
+++ b/test/controllers/api/v1/auth_controller_test.rb
@@ -784,6 +784,33 @@ class Api::V1::AuthControllerTest < ActionDispatch::IntegrationTest
     assert response_data["errors"].any? { |e| e.match?(/email/i) }, "Expected email validation error in: #{response_data["errors"]}"
   end
 
+  test "sso_create_account rolls back user when OIDC identity creation fails" do
+    email = "mobile-rollback@example.com"
+    linking_code = SecureRandom.urlsafe_base64(32)
+    Rails.cache.write("mobile_sso_link:#{linking_code}", {
+      provider: "google_oauth2",
+      uid: "google-uid-rollback",
+      email: email,
+      first_name: "Mobile",
+      last_name: "Rollback",
+      name: "Mobile Rollback",
+      device_info: @device_info.stringify_keys,
+      allow_account_creation: true
+    }, expires_in: 10.minutes)
+    OidcIdentity.stubs(:create_from_omniauth).raises(ActiveRecord::RecordNotUnique, "duplicate identity")
+
+    assert_no_difference([ "User.count", "OidcIdentity.count", "Family.count" ]) do
+      post "/api/v1/auth/sso_create_account", params: {
+        linking_code: linking_code,
+        first_name: "Mobile",
+        last_name: "Rollback"
+      }
+    end
+
+    assert_response :unprocessable_entity
+    assert_nil User.find_by(email: email)
+  end
+
   test "sso_create_account linking_code single-use under race" do
     linking_code = SecureRandom.urlsafe_base64(32)
     Rails.cache.write("mobile_sso_link:#{linking_code}", {
@@ -837,4 +864,71 @@ class Api::V1::AuthControllerTest < ActionDispatch::IntegrationTest
     assert_equal "AI is not available for your account", response_data["error"]
     assert_not user.reload.ai_enabled
   end
+
+  test "mobile SSO onboarding via invitation shares existing family accounts when family shares by default" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    invitation = family.invitations.create!(
+      email: "mobile-invitee@example.com", role: "member", inviter: users(:family_admin)
+    )
+
+    linking_code = SecureRandom.urlsafe_base64(32)
+    Rails.cache.write("mobile_sso_link:#{linking_code}", {
+      provider: "openid_connect",
+      uid: "mobile-invite-uid-1",
+      email: invitation.email,
+      first_name: "Mobile",
+      last_name: "Invitee",
+      name: "Mobile Invitee",
+      device_info: @device_info.stringify_keys,
+      allow_account_creation: true
+    }, expires_in: 10.minutes)
+
+    assert_difference("User.count", 1) do
+      post "/api/v1/auth/sso_create_account", params: {
+        linking_code: linking_code,
+        first_name: "Mobile",
+        last_name: "Invitee"
+      }
+    end
+
+    assert_response :success
+    invitee = User.find_by(email: invitation.email)
+    assert_not_nil invitee
+    assert_equal family.id, invitee.family_id
+    assert_equal family.accounts.pluck(:id).sort,
+      AccountShare.where(user: invitee).pluck(:account_id).sort
+  end
+
+  test "mobile SSO onboarding via invitation shares nothing when family sharing is private" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "private")
+    invitation = family.invitations.create!(
+      email: "mobile-private@example.com", role: "member", inviter: users(:family_admin)
+    )
+
+    linking_code = SecureRandom.urlsafe_base64(32)
+    Rails.cache.write("mobile_sso_link:#{linking_code}", {
+      provider: "openid_connect",
+      uid: "mobile-private-uid-1",
+      email: invitation.email,
+      first_name: "Mobile",
+      last_name: "Private",
+      name: "Mobile Private",
+      device_info: @device_info.stringify_keys,
+      allow_account_creation: true
+    }, expires_in: 10.minutes)
+
+    post "/api/v1/auth/sso_create_account", params: {
+      linking_code: linking_code,
+      first_name: "Mobile",
+      last_name: "Private"
+    }
+
+    assert_response :success
+    invitee = User.find_by(email: invitation.email)
+    assert_not_nil invitee
+    assert_equal family.id, invitee.family_id
+    assert_equal 0, AccountShare.where(user: invitee).count
+  end
 end
diff --git a/test/controllers/api/v1/chats_controller_test.rb b/test/controllers/api/v1/chats_controller_test.rb
index f56ed3536..c7dbcdf76 100644
--- a/test/controllers/api/v1/chats_controller_test.rb
+++ b/test/controllers/api/v1/chats_controller_test.rb
@@ -125,6 +125,68 @@ class Api::V1::ChatsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "API key authentication should not inherit web session impersonation" do
+    support_user = users(:sure_support_staff)
+    support_user.update!(ai_enabled: true)
+    support_user.api_keys.active.destroy_all
+    support_chat = support_user.chats.create!(title: "Support Chat")
+
+    token_value = ApiKey.generate_secure_key
+    credential = support_user.api_keys.build(
+      name: "Impersonation Guard Credential",
+      scopes: [ "read" ]
+    )
+    credential.key = token_value
+    credential.save!
+
+    impersonation_session = impersonation_sessions(:in_progress)
+    impersonated_chat = impersonation_session.impersonated.chats.create!(title: "Impersonated Chat")
+    support_user.sessions.destroy_all
+    support_user.sessions.create!(
+      user_agent: "Browser session",
+      ip_address: "127.0.0.1",
+      active_impersonator_session: impersonation_session
+    )
+
+    get "/api/v1/chats", headers: { "X-Api-Key" => token_value }
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    chat_ids = response_body["chats"].pluck("id")
+
+    assert_includes chat_ids, support_chat.id
+    assert_not_includes chat_ids, impersonated_chat.id
+  end
+
+  test "OAuth authentication should not inherit web session impersonation" do
+    support_user = users(:sure_support_staff)
+    support_user.update!(ai_enabled: true)
+    support_chat = support_user.chats.create!(title: "Support Chat")
+    support_token = Doorkeeper::AccessToken.create!(
+      application: @oauth_app,
+      resource_owner_id: support_user.id,
+      scopes: "read"
+    )
+
+    impersonation_session = impersonation_sessions(:in_progress)
+    impersonated_chat = impersonation_session.impersonated.chats.create!(title: "Impersonated Chat")
+    support_user.sessions.destroy_all
+    support_user.sessions.create!(
+      user_agent: "Browser session",
+      ip_address: "127.0.0.1",
+      active_impersonator_session: impersonation_session
+    )
+
+    get "/api/v1/chats", headers: bearer_auth_header(support_token)
+
+    assert_response :success
+    response_body = JSON.parse(response.body)
+    chat_ids = response_body["chats"].pluck("id")
+
+    assert_includes chat_ids, support_chat.id
+    assert_not_includes chat_ids, impersonated_chat.id
+  end
+
   private
 
     def bearer_auth_header(token)
diff --git a/test/controllers/api/v1/holdings_controller_test.rb b/test/controllers/api/v1/holdings_controller_test.rb
new file mode 100644
index 000000000..6cf51d966
--- /dev/null
+++ b/test/controllers/api/v1/holdings_controller_test.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::HoldingsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @user.api_keys.active.destroy_all
+
+    @api_key = ApiKey.create!(
+      user: @user,
+      name: "Test Read Key",
+      scopes: [ "read" ],
+      source: "web",
+      display_key: "test_read_#{SecureRandom.hex(8)}"
+    )
+
+    @account = accounts(:investment)
+    @holding = holdings(:one)
+
+    # An account owned by another family member, never shared with @user.
+    @other_member = users(:family_member)
+    @private_account = @family.accounts.create!(
+      name: "Member Brokerage",
+      accountable: Investment.new,
+      balance: 5000,
+      currency: "USD",
+      owner: @other_member
+    )
+    @private_holding = @private_account.holdings.create!(
+      security: securities(:msft),
+      date: Date.current,
+      qty: 5,
+      price: 100,
+      amount: 500,
+      currency: "USD"
+    )
+  end
+
+  test "lists holdings scoped to accessible accounts" do
+    get api_v1_holdings_url, headers: api_headers(@api_key)
+
+    assert_response :success
+    holding_ids = JSON.parse(response.body)["holdings"].map { |holding| holding["id"] }
+    assert_includes holding_ids, @holding.id
+    assert_not_includes holding_ids, @private_holding.id
+  end
+
+  test "account_ids filter cannot reach inaccessible accounts" do
+    get api_v1_holdings_url,
+        params: { account_ids: [ @private_account.id ] },
+        headers: api_headers(@api_key)
+
+    assert_response :success
+    holding_ids = JSON.parse(response.body)["holdings"].map { |holding| holding["id"] }
+    assert_not_includes holding_ids, @private_holding.id
+  end
+
+  test "account_id filter cannot reach inaccessible accounts" do
+    get api_v1_holdings_url,
+        params: { account_id: @private_account.id },
+        headers: api_headers(@api_key)
+
+    assert_response :success
+    holding_ids = JSON.parse(response.body)["holdings"].map { |holding| holding["id"] }
+    assert_not_includes holding_ids, @private_holding.id
+  end
+
+  test "shows an accessible holding" do
+    get api_v1_holding_url(@holding), headers: api_headers(@api_key)
+
+    assert_response :success
+    response_data = JSON.parse(response.body)
+    assert_equal @holding.id, response_data["id"]
+  end
+
+  test "returns not found for an inaccessible holding" do
+    get api_v1_holding_url(@private_holding), headers: api_headers(@api_key)
+
+    assert_response :not_found
+  end
+
+  test "requires authentication" do
+    get api_v1_holdings_url
+
+    assert_response :unauthorized
+  end
+
+  private
+
+    def api_headers(api_key)
+      { "X-Api-Key" => api_key.display_key }
+    end
+end
diff --git a/test/controllers/api/v1/import_sessions_controller_test.rb b/test/controllers/api/v1/import_sessions_controller_test.rb
new file mode 100644
index 000000000..3a90f361d
--- /dev/null
+++ b/test/controllers/api/v1/import_sessions_controller_test.rb
@@ -0,0 +1,308 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::ImportSessionsControllerTest < ActionDispatch::IntegrationTest
+  include ActiveJob::TestHelper
+
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @api_key = api_keys(:active_key)
+    @read_only_api_key = api_keys(:one)
+
+    Redis.new.del("api_rate_limit:#{@api_key.id}")
+    Redis.new.del("api_rate_limit:#{@read_only_api_key.id}")
+  end
+
+  test "creates an idempotent Sure import session" do
+    assert_difference("ImportSession.count", 1) do
+      post api_v1_import_sessions_url,
+           params: {
+             type: "SureImport",
+             client_session_id: "client-session-1",
+             expected_chunks: 2
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :created
+    first_id = JSON.parse(response.body).dig("data", "id")
+
+    assert_no_difference("ImportSession.count") do
+      post api_v1_import_sessions_url,
+           params: {
+             type: "SureImport",
+             client_session_id: "client-session-1",
+             expected_chunks: 2
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :created
+    assert_equal first_id, JSON.parse(response.body).dig("data", "id")
+  end
+
+  test "rejects unsupported import session types" do
+    assert_no_difference("ImportSession.count") do
+      post api_v1_import_sessions_url,
+           params: { type: "TransactionImport" },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :unprocessable_entity
+    assert_equal "validation_failed", JSON.parse(response.body)["error"]
+  end
+
+  test "rejects malformed expected chunk counts" do
+    assert_no_difference("ImportSession.count") do
+      post api_v1_import_sessions_url,
+           params: { type: "SureImport", expected_chunks: "2abc" },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :unprocessable_entity
+    assert_equal "validation_failed", JSON.parse(response.body)["error"]
+  end
+
+  test "requires authentication for session creation" do
+    post api_v1_import_sessions_url, params: { type: "SureImport" }
+
+    assert_response :unauthorized
+    assert_equal "unauthorized", JSON.parse(response.body)["error"]
+  end
+
+  test "uploads ordered chunks and publishes a full-fidelity transaction import" do
+    session = build_import_session
+
+    post chunks_api_v1_import_session_url(session),
+         params: {
+           sequence: 1,
+           client_chunk_id: "entities",
+           raw_file_content: build_ndjson(entity_records)
+         },
+         headers: api_headers(@api_key)
+
+    assert_response :created
+    assert_equal 1, JSON.parse(response.body).dig("data", "chunks_count")
+
+    post chunks_api_v1_import_session_url(session),
+         params: {
+           sequence: 2,
+           client_chunk_id: "transactions",
+           raw_file_content: build_ndjson(transaction_records)
+         },
+         headers: api_headers(@api_key)
+
+    assert_response :created
+
+    perform_enqueued_jobs do
+      post publish_api_v1_import_session_url(session), headers: api_headers(@api_key)
+    end
+
+    assert_response :accepted
+    session.reload
+    assert session.complete?
+    assert_equal 1, session.summary.dig("transactions", "created")
+
+    entry = @family.accounts.find_by!(name: "API Session Checking").entries.find_by!(name: "API Grocery Run")
+    transaction = entry.entryable
+    assert_equal "API Groceries", transaction.category.name
+    assert_equal "API Market", transaction.merchant.name
+    assert_equal [ "API Weekly" ], transaction.tags.map(&:name)
+  end
+
+  test "rejects replayed chunk with different content" do
+    session = build_import_session
+    params = {
+      sequence: 1,
+      client_chunk_id: "entities",
+      raw_file_content: build_ndjson(entity_records)
+    }
+
+    post chunks_api_v1_import_session_url(session), params: params, headers: api_headers(@api_key)
+    assert_response :created
+
+    post chunks_api_v1_import_session_url(session),
+         params: params.merge(raw_file_content: build_ndjson(transaction_records)),
+         headers: api_headers(@api_key)
+
+    assert_response :conflict
+    assert_equal "import_session_conflict", JSON.parse(response.body)["error"]
+  end
+
+  test "requires chunk sequence" do
+    session = build_import_session
+
+    post chunks_api_v1_import_session_url(session),
+         params: { raw_file_content: build_ndjson(entity_records) },
+         headers: api_headers(@api_key)
+
+    assert_response :bad_request
+    assert_equal "bad_request", JSON.parse(response.body)["error"]
+  end
+
+  test "rejects malformed chunk sequence values" do
+    session = build_import_session
+
+    post chunks_api_v1_import_session_url(session),
+         params: { sequence: "1abc", raw_file_content: build_ndjson(entity_records) },
+         headers: api_headers(@api_key)
+
+    assert_response :conflict
+    assert_equal "import_session_conflict", JSON.parse(response.body)["error"]
+  end
+
+  test "shows import session with read scope" do
+    session = build_import_session
+
+    get api_v1_import_session_url(session), headers: api_headers(@read_only_api_key)
+
+    assert_response :success
+    data = JSON.parse(response.body)["data"]
+    assert_equal session.id, data["id"]
+    assert_equal "SureImport", data["type"]
+  end
+
+  test "shows chunks in sequence order" do
+    session = build_import_session
+    session.imports.create!(
+      family: @family,
+      type: "SureImport",
+      sequence: 2,
+      checksum: Digest::SHA256.hexdigest("two")
+    )
+    session.imports.create!(
+      family: @family,
+      type: "SureImport",
+      sequence: 1,
+      checksum: Digest::SHA256.hexdigest("one")
+    )
+
+    get api_v1_import_session_url(session), headers: api_headers(@api_key)
+
+    assert_response :success
+    assert_equal [ 1, 2 ], JSON.parse(response.body).dig("data", "chunks").map { |chunk| chunk["sequence"] }
+  end
+
+  test "requires write scope for session mutation" do
+    assert_no_difference("ImportSession.count") do
+      post api_v1_import_sessions_url,
+           params: { type: "SureImport" },
+           headers: api_headers(@read_only_api_key)
+    end
+
+    assert_response :forbidden
+    assert_equal "insufficient_scope", JSON.parse(response.body)["error"]
+  end
+
+  test "rejects publishing a session with no chunks" do
+    session = @family.import_sessions.create!
+
+    post publish_api_v1_import_session_url(session), headers: api_headers(@api_key)
+
+    assert_response :conflict
+    assert_equal "import_session_conflict", JSON.parse(response.body)["error"]
+  end
+
+  test "returns stable error when publish cannot enqueue" do
+    session = build_import_session
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.attach_chunk!(
+      sequence: 2,
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    ImportSessionJob.stub(:perform_later, ->(_import_session) { raise StandardError, "redis://secret.local/0" }) do
+      post publish_api_v1_import_session_url(session), headers: api_headers(@api_key)
+    end
+
+    assert_response :service_unavailable
+    body = JSON.parse(response.body)
+    assert_equal "import_enqueue_failed", body["error"]
+    assert_equal "Import session could not be queued.", body["message"]
+    assert_no_match(/secret/, response.body)
+  end
+
+  test "does not expose another family's import session" do
+    other_family = Family.create!(name: "Other Family", currency: "USD", locale: "en")
+    other_session = other_family.import_sessions.create!
+
+    get api_v1_import_session_url(other_session), headers: api_headers(@api_key)
+
+    assert_response :not_found
+  end
+
+  private
+    def build_import_session
+      @family.import_sessions.create!(expected_chunks: 2)
+    end
+
+    def entity_records
+      [
+        {
+          type: "Account",
+          data: {
+            id: "api-acct-1",
+            name: "API Session Checking",
+            balance: "100.00",
+            currency: "USD",
+            accountable_type: "Depository"
+          }
+        },
+        {
+          type: "Category",
+          data: {
+            id: "api-cat-1",
+            name: "API Groceries",
+            color: "#407706",
+            classification: "expense"
+          }
+        },
+        {
+          type: "Merchant",
+          data: {
+            id: "api-merchant-1",
+            name: "API Market"
+          }
+        },
+        {
+          type: "Tag",
+          data: {
+            id: "api-tag-1",
+            name: "API Weekly"
+          }
+        }
+      ]
+    end
+
+    def transaction_records
+      [
+        {
+          type: "Transaction",
+          data: {
+            id: "api-txn-1",
+            account_id: "api-acct-1",
+            category_id: "api-cat-1",
+            merchant_id: "api-merchant-1",
+            tag_ids: [ "api-tag-1" ],
+            date: "2024-01-15",
+            amount: "-12.34",
+            currency: "USD",
+            name: "API Grocery Run"
+          }
+        }
+      ]
+    end
+
+    def build_ndjson(records)
+      records.map(&:to_json).join("\n")
+    end
+end
diff --git a/test/controllers/api/v1/imports_controller_test.rb b/test/controllers/api/v1/imports_controller_test.rb
index 41d6c2e43..e7bb3579f 100644
--- a/test/controllers/api/v1/imports_controller_test.rb
+++ b/test/controllers/api/v1/imports_controller_test.rb
@@ -524,7 +524,16 @@ class Api::V1::ImportsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should preserve Sure import if publish queueing fails" do
-    ndjson_content = { type: "Account", data: { id: "account_1", name: "Checking" } }.to_json
+    ndjson_content = {
+      type: "Account",
+      data: {
+        id: "account_1",
+        name: "Checking",
+        balance: "100",
+        currency: "USD",
+        accountable_type: "Depository"
+      }
+    }.to_json
     ImportJob.stubs(:perform_later).raises(StandardError, "queue offline")
 
     assert_difference("Import.count") do
@@ -548,6 +557,91 @@ class Api::V1::ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "pending", import.status
   end
 
+  test "should preserve Sure import and return preflight errors when auto publish fails preflight" do
+    @family.categories.create!(
+      name: "Groceries",
+      color: "#407706",
+      lucide_icon: "shopping-basket"
+    )
+    ndjson_content = [
+      { type: "Category", data: { id: "category_1", name: "Groceries" } }
+    ].map(&:to_json).join("\n")
+
+    assert_difference("Import.count") do
+      post api_v1_imports_url,
+           params: {
+             type: "SureImport",
+             raw_file_content: ndjson_content,
+             publish: "true"
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :unprocessable_entity
+    json_response = JSON.parse(response.body)
+    assert_equal "preflight_failed", json_response["error"]
+    assert_includes json_response["errors"].join("\n"), "Category name \"Groceries\" already exists"
+
+    import = Import.find(json_response["import_id"])
+    assert_equal "failed", import.status
+    assert import.ndjson_file.attached?
+  end
+
+  test "should preserve Sure import and return not publishable when auto publish has no records" do
+    ndjson_content = { type: "Account", data: { id: "account_1", name: "Checking" } }.to_json
+    SureImport.any_instance.stubs(:publish_later).raises(
+      SureImport::NotPublishableError,
+      "raw publishability failure with internal state"
+    )
+
+    assert_difference("Import.count") do
+      post api_v1_imports_url,
+           params: {
+             type: "SureImport",
+             raw_file_content: ndjson_content,
+             publish: "true"
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :unprocessable_entity
+    json_response = JSON.parse(response.body)
+    assert_equal "not_publishable", json_response["error"]
+    assert_equal "Import was uploaded but has no publishable records.", json_response["message"]
+    assert_not json_response.key?("errors")
+    refute_includes response.body, "raw publishability failure"
+
+    import = Import.find(json_response["import_id"])
+    assert_instance_of SureImport, import
+    assert import.ndjson_file.attached?
+    assert_equal 1, import.rows_count
+    assert_equal "pending", import.status
+  end
+
+  test "should return unsupported Sure record errors during auto publish preflight" do
+    ndjson_content = [
+      { type: "MysteryType", data: { id: "mystery_1" } }
+    ].map(&:to_json).join("\n")
+
+    assert_difference("Import.count") do
+      post api_v1_imports_url,
+           params: {
+             type: "SureImport",
+             raw_file_content: ndjson_content,
+             publish: "true"
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :unprocessable_entity
+    json_response = JSON.parse(response.body)
+    assert_equal "preflight_failed", json_response["error"]
+    assert_includes json_response["errors"].join("\n"), "unsupported record type MysteryType"
+
+    import = Import.find(json_response["import_id"])
+    assert_equal "failed", import.status
+  end
+
   test "should preserve Sure import if auto publish exceeds row count" do
     ndjson_content = { type: "Account", data: { id: "account_1", name: "Checking" } }.to_json
     SureImport.any_instance.stubs(:publish_later).raises(Import::MaxRowCountExceededError)
@@ -740,8 +834,8 @@ class Api::V1::ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "invalid_csv", json_response["error"]
   end
 
-  test "should include preflight exception message in internal server error response" do
-    Import::Preflight.any_instance.stubs(:call).raises(StandardError, "boom")
+  test "should hide preflight exception message in internal server error response" do
+    Import::Preflight.any_instance.stubs(:call).raises(StandardError, "boom with raw internals")
 
     post preflight_api_v1_imports_url,
          params: {
@@ -755,7 +849,8 @@ class Api::V1::ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_response :internal_server_error
     json_response = JSON.parse(response.body)
     assert_equal "internal_server_error", json_response["error"]
-    assert_equal "Error: boom", json_response["message"]
+    assert_equal "Import preflight could not be completed.", json_response["message"]
+    refute_includes response.body, "boom with raw internals"
   end
 
   test "should reject unknown preflight import type" do
@@ -816,8 +911,19 @@ class Api::V1::ImportsControllerTest < ActionDispatch::IntegrationTest
 
   test "should preflight Sure import without persisting records" do
     ndjson_content = [
-      { type: "Account", data: { id: "account_1", name: "Checking" } }.to_json,
-      { type: "Transaction", data: { id: "entry_1", account_id: "account_1" } }.to_json
+      { type: "Account", data: {
+        id: "account_1",
+        name: "Checking",
+        balance: "100",
+        currency: "USD",
+        accountable_type: "Depository"
+      } }.to_json,
+      { type: "Transaction", data: {
+        id: "entry_1",
+        account_id: "account_1",
+        date: "2024-01-01",
+        amount: "-5"
+      } }.to_json
     ].join("\n")
 
     assert_no_difference("Import.count") do
@@ -840,6 +946,55 @@ class Api::V1::ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_empty data["errors"]
   end
 
+  test "should preflight Sure import taxonomy collisions in strict mode" do
+    @family.tags.create!(name: "Reviewed", color: "#12B76A")
+    ndjson_content = [
+      { type: "Tag", data: { id: "tag_1", name: "Reviewed" } }
+    ].map(&:to_json).join("\n")
+
+    assert_no_difference("Import.count") do
+      post preflight_api_v1_imports_url,
+           params: {
+             type: "SureImport",
+             raw_file_content: ndjson_content
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :success
+    data = JSON.parse(response.body)["data"]
+    assert_equal false, data["valid"]
+    assert_equal "existing_taxonomy_collision", data["errors"].first["code"]
+  end
+
+  test "should report invalid Sure import accountable type during preflight" do
+    ndjson_content = [
+      { type: "Account", data: {
+        id: "account_1",
+        name: "Checking",
+        balance: "100",
+        currency: "USD",
+        accountable_type: "Kernel"
+      } }.to_json
+    ].join("\n")
+
+    assert_no_difference("Import.count") do
+      post preflight_api_v1_imports_url,
+           params: {
+             type: "SureImport",
+             raw_file_content: ndjson_content
+           },
+           headers: api_headers(@api_key)
+    end
+
+    assert_response :success
+    data = JSON.parse(response.body)["data"]
+
+    assert_equal false, data["valid"]
+    assert_equal "invalid_accountable_type", data["errors"].first["code"]
+    assert_includes data["errors"].first["message"], "Kernel"
+  end
+
   test "should report invalid Sure import NDJSON during preflight" do
     assert_no_difference("Import.count") do
       post preflight_api_v1_imports_url,
diff --git a/test/controllers/api/v1/merchants_controller_test.rb b/test/controllers/api/v1/merchants_controller_test.rb
index 99068836c..8d77d63a5 100644
--- a/test/controllers/api/v1/merchants_controller_test.rb
+++ b/test/controllers/api/v1/merchants_controller_test.rb
@@ -7,10 +7,11 @@ class Api::V1::MerchantsControllerTest < ActionDispatch::IntegrationTest
     @user = users(:family_admin)
     @other_family_user = users(:empty)
 
-    # Verify cross-family isolation setup is correct
     assert_not_equal @user.family_id, @other_family_user.family_id,
       "Test setup error: @other_family_user must belong to a different family"
 
+    @user.api_keys.active.destroy_all
+
     @oauth_app = Doorkeeper::Application.create!(
       name: "Test App",
       redirect_uri: "https://example.com/callback",
@@ -52,7 +53,6 @@ class Api::V1::MerchantsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "index does not return merchants from other families" do
-    # Create a merchant in another family
     other_merchant = @other_family_user.family.merchants.create!(name: "Other Merchant")
 
     get api_v1_merchants_url, headers: auth_headers
@@ -96,9 +96,125 @@ class Api::V1::MerchantsControllerTest < ActionDispatch::IntegrationTest
     assert_response :not_found
   end
 
+  # Create (CSV import) action tests
+  test "create requires authentication" do
+    post api_v1_merchants_url, params: { file: csv_file("name\nNew Merchant") }
+
+    assert_response :unauthorized
+  end
+
+  test "create rejects read-only api key" do
+    post api_v1_merchants_url,
+      params: { file: csv_file("name\nNew Merchant") },
+      headers: api_headers(read_only_api_key)
+
+    assert_response :forbidden
+  end
+
+  test "create imports merchants from csv" do
+    csv_content = "name,color,website_url\nImported Merchant,#ff0000,https://example.com\nAnother Merchant,,"
+
+    assert_difference "@user.family.merchants.count", 2 do
+      post api_v1_merchants_url,
+        params: { file: csv_file(csv_content) },
+        headers: api_headers(read_write_api_key)
+    end
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert_equal 2, body["imported"]
+    assert_equal 0, body["skipped"]
+    assert_equal 2, body["merchants"].length
+
+    imported = body["merchants"].find { |m| m["name"] == "Imported Merchant" }
+    assert imported.present?
+    assert imported["id"].present?
+    assert_equal "FamilyMerchant", imported["type"]
+  end
+
+  test "create skips duplicate merchant names" do
+    csv_content = "name\n#{@merchant.name}\nBrand New Merchant"
+
+    assert_difference "@user.family.merchants.count", 1 do
+      post api_v1_merchants_url,
+        params: { file: csv_file(csv_content) },
+        headers: api_headers(read_write_api_key)
+    end
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert_equal 1, body["imported"]
+    assert_equal 1, body["skipped"]
+  end
+
+  test "create returns 422 when file is missing" do
+    post api_v1_merchants_url, headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "missing_file", body["error"]
+  end
+
+  test "create returns 422 when csv is missing name column" do
+    csv_content = "color,website_url\n#ff0000,https://example.com"
+
+    post api_v1_merchants_url,
+      params: { file: csv_file(csv_content) },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "missing_column", body["error"]
+  end
+
+  test "create returns 422 for invalid file type" do
+    file = Rack::Test::UploadedFile.new(
+      StringIO.new("not a csv"),
+      "application/pdf",
+      true,
+      original_filename: "merchants.pdf"
+    )
+
+    post api_v1_merchants_url,
+      params: { file: file },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "invalid_file_type", body["error"]
+  end
+
   private
 
     def auth_headers
       { "Authorization" => "Bearer #{@access_token.token}" }
     end
+
+    def read_write_api_key
+      @read_write_api_key ||= ApiKey.create!(
+        user: @user,
+        name: "Test RW Key",
+        key: ApiKey.generate_secure_key,
+        scopes: %w[read_write],
+        source: "web"
+      )
+    end
+
+    def read_only_api_key
+      @read_only_api_key ||= ApiKey.create!(
+        user: @user,
+        name: "Test RO Key",
+        key: ApiKey.generate_secure_key,
+        scopes: %w[read],
+        source: "mobile"
+      )
+    end
+
+    def api_headers(api_key)
+      { "X-Api-Key" => api_key.plain_key }
+    end
+
+    def csv_file(content, filename: "merchants.csv")
+      uploaded_file(filename: filename, content_type: "text/csv", content: content)
+    end
 end
diff --git a/test/controllers/api/v1/provider_connections_controller_test.rb b/test/controllers/api/v1/provider_connections_controller_test.rb
index 957b5aa31..6b851077f 100644
--- a/test/controllers/api/v1/provider_connections_controller_test.rb
+++ b/test/controllers/api/v1/provider_connections_controller_test.rb
@@ -144,7 +144,7 @@ class Api::V1::ProviderConnectionsControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "excludes another family's provider connections" do
-    other_item = snaptrade_items(:pending_registration_item)
+    other_item = snaptrade_items(:unauthorized_item)
 
     get api_v1_provider_connections_url, headers: api_headers(@api_key)
     assert_response :success
@@ -176,6 +176,20 @@ class Api::V1::ProviderConnectionsControllerTest < ActionDispatch::IntegrationTe
     assert_equal brex_item.unlinked_accounts_count, brex_connection["accounts"]["unlinked_count"]
   end
 
+  test "reports credentials_configured true for an authorized SnapTrade item" do
+    snaptrade_item = snaptrade_items(:configured_item)
+
+    get api_v1_provider_connections_url, headers: api_headers(@api_key)
+    assert_response :success
+
+    snaptrade_connection = JSON.parse(response.body)["data"].detect do |connection|
+      connection["id"] == snaptrade_item.id && connection["provider"] == "snaptrade"
+    end
+
+    assert_not_nil snaptrade_connection
+    assert_equal true, snaptrade_connection["credentials_configured"]
+  end
+
   test "returns an empty list when no provider connections exist" do
     ProviderConnectionStatus.stub(:for_family, []) do
       get api_v1_provider_connections_url, headers: api_headers(@api_key)
diff --git a/test/controllers/api/v1/trades_controller_test.rb b/test/controllers/api/v1/trades_controller_test.rb
new file mode 100644
index 000000000..89a27858f
--- /dev/null
+++ b/test/controllers/api/v1/trades_controller_test.rb
@@ -0,0 +1,847 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class Api::V1::TradesControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    @user.api_keys.active.destroy_all
+    @investment_account = accounts(:investment)
+    @read_write_api_key = nil
+    @read_only_api_key = nil
+  end
+
+  test "create dividend with security returns 201" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "dividend",
+        date: Date.current,
+        amount: 25.50,
+        currency: "USD",
+        ticker: "AAPL|XNAS"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert body["id"].present?
+    assert_equal "Dividend: AAPL", body["name"]
+    assert_equal "Dividend", body["investment_activity_label"]
+    assert_equal 0, body["qty"].to_i
+  end
+
+  test "create dividend without security returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "dividend",
+        date: Date.current,
+        amount: 25.50
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+  end
+
+  test "create dividend without amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "dividend",
+        date: Date.current,
+        ticker: "AAPL|XNAS"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+  end
+
+  test "create buy trade returns 201" do
+    security = Security.create!(ticker: "TEST", name: "Test Security", country_code: "US")
+
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 10,
+        price: 100.00,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert body["id"].present?
+    assert_equal "Buy", body["investment_activity_label"]
+  end
+
+  test "create sell trade returns 201" do
+    security = Security.create!(ticker: "TEST", name: "Test Security", country_code: "US")
+
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "sell",
+        date: Date.current,
+        qty: 10,
+        price: 100.00,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert body["id"].present?
+    assert_equal "Sell", body["investment_activity_label"]
+  end
+
+  test "invalid type returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "invalid",
+        date: Date.current
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+  end
+
+  test "create deposit returns 201" do
+     post "/api/v1/trades",
+       params: { trade: {
+         account_id: @investment_account.id,
+         type: "deposit",
+         date: Date.current,
+         amount: 175.25,
+         currency: "USD"
+       } },
+       headers: api_headers(read_write_api_key)
+
+     assert_response :created
+     body = JSON.parse(response.body)
+     assert body["id"].present?
+     assert_match(/Deposit to/, body["name"])
+   end
+
+  test "create withdrawal returns 201" do
+     post "/api/v1/trades",
+       params: { trade: {
+         account_id: @investment_account.id,
+         type: "withdrawal",
+         date: Date.current,
+         amount: 100.00,
+         currency: "USD"
+       } },
+       headers: api_headers(read_write_api_key)
+
+     assert_response :created
+     body = JSON.parse(response.body)
+     assert body["id"].present?
+     assert_match(/Withdrawal/, body["name"])
+   end
+
+  test "create withdrawal without amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "withdrawal",
+        date: Date.current
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+  end
+
+  test "create withdrawal with transfer_account_id creates linked transfer" do
+    depository = accounts(:depository)
+
+    assert_difference "Transfer.count", 1 do
+      post "/api/v1/trades",
+        params: { trade: {
+          account_id: @investment_account.id,
+          type: "withdrawal",
+          date: Date.current,
+          amount: 500.00,
+          currency: "USD",
+          transfer_account_id: depository.id
+        } },
+        headers: api_headers(read_write_api_key)
+    end
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert body["id"].present?
+    assert body["outflow_transaction"]["account"]["id"].present?
+    assert body["outflow_transaction"]["account"]["account_type"].present?
+
+    transfer = Transfer.joins(outflow_transaction: :entry)
+                       .where(entries: { account_id: @investment_account.id })
+                       .last
+
+    assert transfer, "Transfer should exist linking accounts"
+    assert_equal depository.id, transfer.inflow_transaction.entry.account_id, "Inflow should be to depository"
+    assert_equal @investment_account.id, transfer.outflow_transaction.entry.account_id, "Outflow should come from investment"
+  end
+
+  test "create deposit without amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "deposit",
+        date: Date.current
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+  end
+
+  test "create deposit with transfer_account_id creates linked transfer" do
+    depository = accounts(:depository)
+
+    assert_difference "Transfer.count", 1 do
+      post "/api/v1/trades",
+        params: { trade: {
+          account_id: @investment_account.id,
+          type: "deposit",
+          date: Date.current,
+          amount: 500.00,
+          currency: "USD",
+          transfer_account_id: depository.id
+        } },
+        headers: api_headers(read_write_api_key)
+    end
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert body["id"].present?
+    assert body["inflow_transaction"]["account"]["id"].present?
+    assert body["inflow_transaction"]["account"]["account_type"].present?
+
+    transfer = Transfer.joins(inflow_transaction: :entry)
+                       .where(entries: { account_id: @investment_account.id })
+                       .last
+
+    assert transfer, "Transfer should exist linking accounts"
+    assert_equal depository.id, transfer.outflow_transaction.entry.account_id, "Outflow should be from depository"
+    assert_equal @investment_account.id, transfer.inflow_transaction.entry.account_id, "Inflow should go to investment"
+  end
+
+  test "create interest returns 201" do
+       post "/api/v1/trades",
+         params: { trade: {
+           account_id: @investment_account.id,
+           type: "interest",
+           date: Date.current,
+           amount: 25.00,
+           currency: "USD"
+         } },
+         headers: api_headers(read_write_api_key)
+
+       assert_response :created
+       body = JSON.parse(response.body)
+       assert body["id"].present?
+       assert_equal "Interest", body["investment_activity_label"]
+     end
+
+  test "create interest with explicit ticker returns 201" do
+    security = Security.create!(ticker: "INTSEC", name: "Interest Security", country_code: "US")
+
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "interest",
+        date: Date.current,
+        amount: 25.00,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :created
+    body = JSON.parse(response.body)
+    assert body["id"].present?
+    assert_equal "Interest", body["investment_activity_label"]
+  end
+
+  test "create interest without amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "interest",
+        date: Date.current
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+  end
+
+  test "create requires read_write scope" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 10,
+        price: 100
+      } },
+      headers: api_headers(read_only_api_key)
+
+    assert_response :forbidden
+  end
+
+  test "should reject create without API key" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 10,
+        price: 100
+      } }
+
+    assert_response :unauthorized
+  end
+
+  test "should return 404 for unknown account_id" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: 999999,
+        type: "buy",
+        date: Date.current,
+        qty: 10,
+        price: 100,
+        security_id: Security.create!(ticker: "TEST", name: "Test", country_code: "US").id
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :not_found
+  end
+
+  test "should return 422 for invalid date format" do
+    security = Security.create!(ticker: "INVDATE", name: "Invalid Date Security", country_code: "US")
+
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: "invalid-date",
+        qty: 10,
+        price: 100,
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert body["errors"].any? { |e| e.downcase.include?("date") }, "Expected date-related error, got: #{body["errors"].inspect}"
+  end
+
+  # INDEX action tests
+  test "should get index with valid API key" do
+    get api_v1_trades_url, headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert response_data.key?("trades")
+    assert response_data.key?("pagination")
+    assert response_data["pagination"].key?("page")
+    assert response_data["pagination"].key?("per_page")
+    assert response_data["pagination"].key?("total_count")
+    assert response_data["pagination"].key?("total_pages")
+  end
+
+  test "should get index with read-only API key" do
+    get api_v1_trades_url, headers: api_headers(read_only_api_key)
+    assert_response :success
+  end
+
+  test "should filter trades by account_id" do
+    get api_v1_trades_url,
+      params: { account_id: @investment_account.id },
+      headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    response_data["trades"].each do |trade|
+      assert_equal @investment_account.id, trade["account"]["id"]
+    end
+  end
+
+  test "should filter trades by date range" do
+    start_date = 1.year.ago.to_date
+    end_date = Date.current
+
+    get api_v1_trades_url,
+      params: { start_date: start_date, end_date: end_date },
+      headers: api_headers(read_write_api_key)
+    assert_response :success
+  end
+
+  test "should reject index request without API key" do
+    get api_v1_trades_url
+    assert_response :unauthorized
+  end
+
+  test "should reject index request with invalid API key" do
+    get api_v1_trades_url, headers: { "X-Api-Key" => "invalid-key" }
+    assert_response :unauthorized
+  end
+
+  test "should reject index request with invalid date format" do
+    get api_v1_trades_url,
+      params: { start_date: "invalid" },
+      headers: api_headers(read_write_api_key)
+    assert_response :unprocessable_entity
+  end
+
+  # SHOW action tests
+  test "should show trade with valid API key" do
+    security = Security.create!(ticker: "SHOW", name: "Show Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    get api_v1_trade_url(trade_id), headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert_equal trade_id, response_data["id"]
+    assert response_data.key?("date")
+    assert response_data.key?("account")
+  end
+
+  test "should show trade with read-only API key" do
+    security = Security.create!(ticker: "SHOR", name: "Show RO Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    get api_v1_trade_url(trade_id), headers: api_headers(read_only_api_key)
+    assert_response :success
+  end
+
+  test "should return 404 for non-existent trade" do
+    get api_v1_trade_url(999999), headers: api_headers(read_write_api_key)
+    assert_response :not_found
+  end
+
+  test "should reject show request without API key" do
+    security = Security.create!(ticker: "SHON", name: "Show No Auth", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    get api_v1_trade_url(trade_id)
+    assert_response :unauthorized
+  end
+
+  # UPDATE action tests
+  test "should update trade with valid parameters" do
+    security = Security.create!(ticker: "UPD", name: "Update Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    update_params = {
+      trade: {
+        notes: "Updated notes"
+      }
+    }
+
+    put api_v1_trade_url(trade_id),
+      params: update_params,
+      headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert_equal "Updated notes", response_data["notes"]
+  end
+
+  test "should reject update with read-only API key" do
+    security = Security.create!(ticker: "UPDRO", name: "Update RO Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    put api_v1_trade_url(trade_id),
+      params: { trade: { notes: "Test" } },
+      headers: api_headers(read_only_api_key)
+    assert_response :forbidden
+  end
+
+  test "should reject update for non-existent trade" do
+    put api_v1_trade_url(999999),
+      params: { trade: { notes: "Test" } },
+      headers: api_headers(read_write_api_key)
+    assert_response :not_found
+  end
+
+  test "should reject update without API key" do
+    security = Security.create!(ticker: "UPDNO", name: "Update No Auth", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    put api_v1_trade_url(trade_id), params: { trade: { notes: "Test" } }
+    assert_response :unauthorized
+  end
+
+  test "should reject update with invalid date format" do
+     security = Security.create!(ticker: "UPDID", name: "Update Invalid Date", country_code: "US")
+     post "/api/v1/trades",
+       params: { trade: {
+         account_id: @investment_account.id,
+         type: "buy",
+         date: Date.current,
+         qty: 5,
+         price: 100,
+         currency: "USD",
+         security_id: security.id
+       } },
+       headers: api_headers(read_write_api_key)
+     assert_response :created
+     trade_id = JSON.parse(response.body)["id"]
+
+     put api_v1_trade_url(trade_id),
+            params: { trade: { date: "invalid" } },
+            headers: api_headers(read_write_api_key)
+     assert_response :unprocessable_entity
+   end
+
+  test "should update dividend trade with valid parameters" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "dividend",
+        date: Date.current,
+        amount: 25.50,
+        currency: "USD",
+        ticker: "AAPL|XNAS"
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    update_params = {
+      trade: {
+        notes: "Updated dividend notes"
+      }
+    }
+
+    put api_v1_trade_url(trade_id),
+      params: update_params,
+      headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert_equal "Updated dividend notes", response_data["notes"]
+  end
+
+  # DESTROY action tests
+  test "should destroy trade" do
+    security = Security.create!(ticker: "DEL", name: "Delete Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    delete api_v1_trade_url(trade_id), headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    assert response_data.key?("message")
+  end
+
+  test "should reject destroy with read-only API key" do
+    security = Security.create!(ticker: "DELRO", name: "Delete RO Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    delete api_v1_trade_url(trade_id), headers: api_headers(read_only_api_key)
+    assert_response :forbidden
+  end
+
+  test "should reject destroy for non-existent trade" do
+    delete api_v1_trade_url(999999), headers: api_headers(read_write_api_key)
+    assert_response :not_found
+  end
+
+  test "should reject destroy without API key" do
+    security = Security.create!(ticker: "DELNO", name: "Delete No Auth", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    delete api_v1_trade_url(trade_id)
+    assert_response :unauthorized
+  end
+
+  # Non-numeric amount returns 422
+  test "create deposit with non-numeric amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "deposit",
+        date: Date.current,
+        amount: "abc",
+        currency: "USD"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "create deposit with zero amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "deposit",
+        date: Date.current,
+        amount: 0,
+        currency: "USD"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "create deposit with negative amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "deposit",
+        date: Date.current,
+        amount: -50.00,
+        currency: "USD"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "create interest with non-numeric amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "interest",
+        date: Date.current,
+        amount: "abc",
+        currency: "USD"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "create interest with zero amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "interest",
+        date: Date.current,
+        amount: 0,
+        currency: "USD"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "create dividend with non-numeric amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "dividend",
+        date: Date.current,
+        amount: "abc",
+        currency: "USD",
+        ticker: "AAPL|XNAS"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "create dividend with zero amount returns 422" do
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "dividend",
+        date: Date.current,
+        amount: 0,
+        currency: "USD",
+        ticker: "AAPL|XNAS"
+      } },
+      headers: api_headers(read_write_api_key)
+
+    assert_response :unprocessable_entity
+    body = JSON.parse(response.body)
+    assert_equal "Amount must be a valid number", body["message"]
+  end
+
+  test "trade JSON should have expected structure" do
+    security = Security.create!(ticker: "JSP", name: "JSON Structure Security", country_code: "US")
+    post "/api/v1/trades",
+      params: { trade: {
+        account_id: @investment_account.id,
+        type: "buy",
+        date: Date.current,
+        qty: 5,
+        price: 100,
+        currency: "USD",
+        security_id: security.id
+      } },
+      headers: api_headers(read_write_api_key)
+    assert_response :created
+    trade_id = JSON.parse(response.body)["id"]
+
+    get api_v1_trade_url(trade_id), headers: api_headers(read_write_api_key)
+    assert_response :success
+
+    trade_data = JSON.parse(response.body)
+    assert trade_data.key?("id")
+    assert trade_data.key?("date")
+    assert trade_data.key?("account")
+    assert trade_data["account"].key?("id")
+    assert trade_data["account"].key?("name")
+    assert trade_data["account"].key?("account_type")
+    assert trade_data.key?("notes")
+  end
+
+  private
+
+    def read_write_api_key
+      @read_write_api_key ||= ApiKey.create!(
+        user: @user,
+        name: "Test RW Key",
+        key: ApiKey.generate_secure_key,
+        scopes: %w[read_write],
+        source: "web"
+      ).tap do |key|
+        Redis.new.del("api_rate_limit:#{key.id}")
+      end
+    end
+
+    def read_only_api_key
+      @read_only_api_key ||= ApiKey.create!(
+        user: @user,
+        name: "Test RO Key",
+        key: ApiKey.generate_secure_key,
+        scopes: %w[read],
+        source: "mobile"
+      ).tap do |key|
+        Redis.new.del("api_rate_limit:#{key.id}")
+      end
+    end
+
+    def api_headers(api_key)
+      { "X-Api-Key" => api_key.plain_key }
+    end
+end
diff --git a/test/controllers/api/v1/transactions_controller_test.rb b/test/controllers/api/v1/transactions_controller_test.rb
index 1f5123d9e..0e54c415d 100644
--- a/test/controllers/api/v1/transactions_controller_test.rb
+++ b/test/controllers/api/v1/transactions_controller_test.rb
@@ -3,6 +3,8 @@
 require "test_helper"
 
 class Api::V1::TransactionsControllerTest < ActionDispatch::IntegrationTest
+  include EntriesTestHelper
+
   setup do
     @user = users(:family_admin)
     @family = @user.family
@@ -51,6 +53,30 @@ class Api::V1::TransactionsControllerTest < ActionDispatch::IntegrationTest
     assert response_data["pagination"].key?("total_pages")
   end
 
+  test "index avoids per-transaction transfer queries" do
+    from_account = @family.accounts.first
+    to_account = @family.accounts.second || @family.accounts.create!(
+      name: "Second Account",
+      balance: 0,
+      currency: @family.currency,
+      accountable: Depository.new
+    )
+
+    create_transfer(from_account: from_account, to_account: to_account, amount: 10)
+    baseline_queries = count_db_queries do
+      get api_v1_transactions_url, params: { per_page: 200 }, headers: api_headers(@api_key)
+      assert_response :success
+    end
+
+    5.times { create_transfer(from_account: from_account, to_account: to_account, amount: 10) }
+    expanded_queries = count_db_queries do
+      get api_v1_transactions_url, params: { per_page: 200 }, headers: api_headers(@api_key)
+      assert_response :success
+    end
+
+    assert_equal baseline_queries, expanded_queries
+  end
+
   test "should get index with read-only API key" do
     get api_v1_transactions_url, headers: api_headers(@read_only_api_key)
     assert_response :success
@@ -121,6 +147,37 @@ class Api::V1::TransactionsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "should filter transactions by tag_ids without error" do
+    tag_one = tags(:one)
+    tag_two = tags(:two)
+    tagged_entry = @account.entries.create!(
+      name: "Tagged Transaction",
+      amount: 12.34,
+      currency: "USD",
+      date: Date.current,
+      entryable: Transaction.new(tags: [ tag_one, tag_two ])
+    )
+
+    untagged_entry = @account.entries.create!(
+      name: "Untagged Transaction",
+      amount: 12.34,
+      currency: "USD",
+      date: Date.current,
+      entryable: Transaction.new
+    )
+
+    get api_v1_transactions_url,
+        params: { tag_ids: [ tag_one.id, tag_two.id ], per_page: 200 },
+        headers: api_headers(@api_key)
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    transaction_ids = response_data["transactions"].map { |t| t["id"] }
+    assert_equal 1, transaction_ids.count(tagged_entry.transaction.id)
+    assert_includes transaction_ids, tagged_entry.transaction.id
+    assert_not_includes transaction_ids, untagged_entry.transaction.id
+  end
+
   test "should filter disabled account transactions by date range" do
     disabled_transaction = create_disabled_account_transaction(
       name: "Closed Account Date Range",
@@ -723,28 +780,7 @@ end
   end
 
   test "transactions with transfers should include transfer information" do
-    # Create a transfer between two accounts to test transfer rendering
-    from_account = @family.accounts.create!(
-      name: "Transfer From Account",
-      balance: 1000,
-      currency: "USD",
-      accountable: Depository.new
-    )
-
-    to_account = @family.accounts.create!(
-      name: "Transfer To Account",
-      balance: 0,
-      currency: "USD",
-      accountable: Depository.new
-    )
-
-    transfer = Transfer::Creator.new(
-      family: @family,
-      source_account_id: from_account.id,
-      destination_account_id: to_account.id,
-      date: Date.current,
-      amount: 100
-    ).create
+    transfer = create_transfer_between_accounts
 
     get api_v1_transaction_url(transfer.inflow_transaction), headers: api_headers(@api_key)
     assert_response :success
@@ -757,12 +793,87 @@ end
     assert transaction_data["transfer"].key?("other_account")
   end
 
+  test "index renders transfer rows without per-transfer transaction lookups" do
+    transfer = create_transfer_between_accounts
+
+    queries = capture_sql_queries do
+      get api_v1_transactions_url,
+          params: { per_page: 100 },
+          headers: api_headers(@api_key)
+    end
+
+    assert_response :success
+
+    response_data = JSON.parse(response.body)
+    transfer_transaction_ids = [ transfer.inflow_transaction_id, transfer.outflow_transaction_id ]
+    transfer_rows = response_data["transactions"].select { |transaction| transfer_transaction_ids.include?(transaction["id"]) }
+
+    assert_equal 2, transfer_rows.size
+    assert transfer_rows.all? { |transaction| transaction["transfer"].present? }
+    assert_empty queries.grep(/SELECT "transactions"\.\* FROM "transactions" WHERE "transactions"\."id" =/)
+    assert_empty queries.grep(/SELECT "entries"\.\* FROM "entries" WHERE "entries"\."id" =/)
+    assert_empty queries.grep(/SELECT "accounts"\.\* FROM "accounts" WHERE "accounts"\."id" =/)
+  end
+
   private
 
     def api_headers(api_key)
       { "X-Api-Key" => api_key.display_key }
     end
 
+    def count_db_queries(&block)
+      queries = 0
+      callback = lambda do |_name, _started, _finished, _unique_id, payload|
+        return if payload[:cached]
+        return if payload[:name].in?(%w[SCHEMA TRANSACTION])
+
+        queries += 1
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record", &block)
+      queries
+    end
+
+    def create_transfer_between_accounts
+      from_account = @family.accounts.create!(
+        name: "Transfer From Account",
+        balance: 1000,
+        currency: "USD",
+        accountable: Depository.new
+      )
+
+      to_account = @family.accounts.create!(
+        name: "Transfer To Account",
+        balance: 0,
+        currency: "USD",
+        accountable: Depository.new
+      )
+
+      Transfer::Creator.new(
+        family: @family,
+        source_account_id: from_account.id,
+        destination_account_id: to_account.id,
+        date: Date.current,
+        amount: 100
+      ).create
+    end
+
+    def capture_sql_queries
+      queries = []
+      callback = lambda do |_name, _started, _finished, _unique_id, payload|
+        next if payload[:cached]
+        next if %w[SCHEMA TRANSACTION].include?(payload[:name])
+
+        queries << payload[:sql].squish
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        yield
+      end
+
+      queries
+    end
+
     # Validates agent-friendly numeric fields: type, sign invariants
     def assert_amount_cents_fields(txn_json)
       assert txn_json.key?("amount_cents"), "Expected amount_cents field"
diff --git a/test/controllers/api/v1/transfers_controller_test.rb b/test/controllers/api/v1/transfers_controller_test.rb
index e74dcfbda..172435721 100644
--- a/test/controllers/api/v1/transfers_controller_test.rb
+++ b/test/controllers/api/v1/transfers_controller_test.rb
@@ -82,6 +82,10 @@ class Api::V1::TransfersControllerTest < ActionDispatch::IntegrationTest
     assert_equal "Transfer Savings", response_data.dig("inflow_transaction", "account", "name")
     assert_equal "Transfer Checking", response_data.dig("outflow_transaction", "account", "name")
     assert response_data.key?("amount_cents")
+    assert_equal "0.0", response_data["source_fee_amount"]
+    assert_equal "0.0", response_data["destination_fee_amount"]
+    assert response_data.key?("source_fee_currency")
+    assert response_data.key?("destination_fee_currency")
   end
 
   test "returns not found for another family's transfer" do
diff --git a/test/controllers/api/v1/users_controller_test.rb b/test/controllers/api/v1/users_controller_test.rb
index 570c0bd9d..32d69c5f9 100644
--- a/test/controllers/api/v1/users_controller_test.rb
+++ b/test/controllers/api/v1/users_controller_test.rb
@@ -116,6 +116,20 @@ class Api::V1::UsersControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "reset status returns family data counts" do
+    import_session = @user.family.import_sessions.create!(expected_chunks: 1)
+    import_session.imports.create!(
+      family: @user.family,
+      type: "SureImport",
+      sequence: 1,
+      checksum: "a" * 64
+    )
+    import_session.source_mappings.create!(
+      family: @user.family,
+      source_type: "Category",
+      source_id: "source-category-1",
+      target: @user.family.categories.first
+    )
+
     get "/api/v1/users/reset/status", headers: api_headers(@read_only_api_key)
 
     assert_response :ok
@@ -124,6 +138,8 @@ class Api::V1::UsersControllerTest < ActionDispatch::IntegrationTest
     assert_includes %w[complete data_remaining], body["status"]
     assert_equal body["counts"].values.sum.zero?, body["reset_complete"]
     assert_equal expected_reset_count_keys.sort, body["counts"].keys.sort
+    assert_equal 1, body["counts"]["import_sessions"]
+    assert_equal 1, body["counts"]["import_source_mappings"]
   end
 
   test "reset status ignores the follow-up family sync after reset" do
diff --git a/test/controllers/concerns/localize_test.rb b/test/controllers/concerns/localize_test.rb
index 3ba6f376e..2ee663edf 100644
--- a/test/controllers/concerns/localize_test.rb
+++ b/test/controllers/concerns/localize_test.rb
@@ -10,7 +10,7 @@ class LocalizeTest < ActionDispatch::IntegrationTest
   test "falls back to English when Accept-Language is unsupported" do
     get new_session_url, headers: { "Accept-Language" => "ru-RU,ru;q=0.9" }
     assert_response :success
-    assert_select "button", text: /Log in/i
+    assert_select "button", text: /Войти/i
   end
 
   test "uses Accept-Language for onboarding when user locale is not set" do
@@ -26,7 +26,7 @@ class LocalizeTest < ActionDispatch::IntegrationTest
 
     get preferences_onboarding_url, headers: { "Accept-Language" => "ru-RU,ru;q=0.9" }
     assert_response :success
-    assert_select "h1", text: /Configure your preferences/i
+    assert_select "h1", text: /Настройте ваши предпочтения/i
   end
 
   test "respects user locale override even when Accept-Language differs" do
diff --git a/test/controllers/credit_cards_controller_test.rb b/test/controllers/credit_cards_controller_test.rb
index 1b11ce558..7fd20f99a 100644
--- a/test/controllers/credit_cards_controller_test.rb
+++ b/test/controllers/credit_cards_controller_test.rb
@@ -92,4 +92,103 @@ class CreditCardsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "Credit card account updated", flash[:notice]
     assert_enqueued_with(job: SyncJob)
   end
+
+  test "updates enable banking balance interpretation flag when linked" do
+    enable_banking_account = create_linked_enable_banking_account
+
+    get edit_credit_card_path(@account)
+    assert_response :success
+    assert_match "treat_balance_as_available_credit", response.body
+    assert_match I18n.t("credit_cards.form.treat_balance_as_available_credit_label"), response.body
+
+    patch credit_card_path(@account), params: {
+      account: {
+        name: @account.name,
+        accountable_type: "CreditCard",
+        enable_banking: { treat_balance_as_available_credit: "1" }
+      }
+    }
+
+    assert_redirected_to @account
+    assert enable_banking_account.reload.treat_balance_as_available_credit?
+  end
+
+  test "clears enable banking balance interpretation flag when toggled off" do
+    enable_banking_account = create_linked_enable_banking_account
+    enable_banking_account.update!(treat_balance_as_available_credit: true)
+
+    patch credit_card_path(@account), params: {
+      account: {
+        name: @account.name,
+        accountable_type: "CreditCard",
+        enable_banking: { treat_balance_as_available_credit: "0" }
+      }
+    }
+
+    assert_redirected_to @account
+    assert_not enable_banking_account.reload.treat_balance_as_available_credit?
+  end
+
+  test "does not persist enable banking flag when the account update fails" do
+    enable_banking_account = create_linked_enable_banking_account
+
+    patch credit_card_path(@account), params: {
+      account: {
+        name: "",
+        accountable_type: "CreditCard",
+        enable_banking: { treat_balance_as_available_credit: "1" }
+      }
+    }
+
+    assert_response :unprocessable_entity
+    assert_not enable_banking_account.reload.treat_balance_as_available_credit?
+  end
+
+  test "handles malformed enable banking params without error" do
+    create_linked_enable_banking_account
+
+    patch credit_card_path(@account), params: {
+      account: {
+        name: @account.name,
+        accountable_type: "CreditCard",
+        enable_banking: "bogus"
+      }
+    }
+
+    assert_redirected_to @account
+  end
+
+  test "ignores enable banking params for accounts without an enable banking link" do
+    patch credit_card_path(@account), params: {
+      account: {
+        name: "Still works",
+        accountable_type: "CreditCard",
+        enable_banking: { treat_balance_as_available_credit: "1" }
+      }
+    }
+
+    assert_redirected_to @account
+    assert_equal "Still works", @account.reload.name
+  end
+
+  private
+    def create_linked_enable_banking_account
+      enable_banking_item = EnableBankingItem.create!(
+        family: @account.family,
+        name: "Test EB",
+        country_code: "FR",
+        application_id: "app_id",
+        client_certificate: "cert"
+      )
+      enable_banking_account = EnableBankingAccount.create!(
+        enable_banking_item: enable_banking_item,
+        name: "Linked card",
+        uid: "hash_cc",
+        currency: "EUR",
+        current_balance: 900.00,
+        credit_limit: 1000.00
+      )
+      AccountProvider.create!(account: @account, provider: enable_banking_account)
+      enable_banking_account
+    end
 end
diff --git a/test/controllers/depositories_controller_test.rb b/test/controllers/depositories_controller_test.rb
index 3c6e443a5..192823a48 100644
--- a/test/controllers/depositories_controller_test.rb
+++ b/test/controllers/depositories_controller_test.rb
@@ -7,4 +7,62 @@ class DepositoriesControllerTest < ActionDispatch::IntegrationTest
     sign_in @user = users(:family_admin)
     @account = accounts(:depository)
   end
+
+  test "create falls back to the stored return_to when no form param is present" do
+    get new_account_path(return_to: transactions_path) # StoreLocation captures it into the session
+
+    assert_difference -> { Account.count } => 1 do
+      post depositories_path, params: {
+        account: { name: "Return To Checking", currency: "USD", balance: 100, accountable_type: "Depository" }
+      }
+    end
+
+    assert_redirected_to transactions_path
+  end
+
+  test "create prefers the form return_to over the session value" do
+    get new_account_path(return_to: transactions_path) # session return_to
+
+    post depositories_path, params: {
+      account: { name: "Form RT Checking", currency: "USD", balance: 100, accountable_type: "Depository", return_to: budgets_path }
+    }
+
+    assert_redirected_to budgets_path
+  end
+
+  test "create ignores an external return_to (open-redirect guard)" do
+    post depositories_path, params: {
+      account: { name: "Evil RT Checking", currency: "USD", balance: 100, accountable_type: "Depository", return_to: "https://evil.example/phish" }
+    }
+
+    created = Account.order(:created_at).last
+    assert_redirected_to account_path(created) # not the external URL
+  end
+
+  test "update persists enable_category_matcher through the shared update action" do
+    linked_account = accounts(:connected)
+    assert linked_account.enable_category_matcher?
+
+    patch depository_path(linked_account), params: {
+      account: { enable_category_matcher: "0" }
+    }
+
+    refute linked_account.reload.enable_category_matcher?
+
+    patch depository_path(linked_account), params: {
+      account: { enable_category_matcher: "1" }
+    }
+
+    assert linked_account.reload.enable_category_matcher?
+  end
+
+  test "edit form renders category matcher toggle only for accounts that support it" do
+    get edit_account_url(accounts(:connected))
+    assert_response :success
+    assert_select "input[type=checkbox][name='account[enable_category_matcher]']", 1
+
+    get edit_account_url(accounts(:depository))
+    assert_response :success
+    assert_select "input[name='account[enable_category_matcher]']", 0
+  end
 end
diff --git a/test/controllers/enable_banking_items_controller_test.rb b/test/controllers/enable_banking_items_controller_test.rb
index 06005bc9a..424a5aa64 100644
--- a/test/controllers/enable_banking_items_controller_test.rb
+++ b/test/controllers/enable_banking_items_controller_test.rb
@@ -39,4 +39,28 @@ class EnableBankingItemsControllerTest < ActionDispatch::IntegrationTest
     assert_includes haystack, "ing-diba ag",
       "Expected the searchable data attribute to still include the bank name (existing name-search behavior)"
   end
+
+  test "authorize no longer blocks decoupled banks and proceeds to the hosted auth page" do
+    Provider::EnableBanking.any_instance.stubs(:get_aspsps).returns(
+      aspsps: [
+        {
+          name: "VR Bank in Holstein",
+          country: "DE",
+          psu_types: [ "personal" ],
+          auth_methods: [ { name: "decoupled_app", approach: "DECOUPLED" } ]
+        }
+      ]
+    )
+    Provider::EnableBanking.any_instance.stubs(:start_authorization).returns(
+      url: "https://api.enablebanking.com/auth/redirect/abc",
+      authorization_id: "auth_1"
+    )
+
+    post authorize_enable_banking_item_url(@item),
+         params: { aspsp_name: "VR Bank in Holstein", psu_type: "personal" }
+
+    assert_redirected_to "https://api.enablebanking.com/auth/redirect/abc"
+    assert_nil flash[:alert]
+    assert_equal "DECOUPLED", @item.reload.aspsp_auth_approach
+  end
 end
diff --git a/test/controllers/family_exports_controller_test.rb b/test/controllers/family_exports_controller_test.rb
index 217a6c170..29d961ac5 100644
--- a/test/controllers/family_exports_controller_test.rb
+++ b/test/controllers/family_exports_controller_test.rb
@@ -28,6 +28,37 @@ class FamilyExportsControllerTest < ActionDispatch::IntegrationTest
     assert_select "h2", text: "Export your data"
   end
 
+  test "admin can mark a lost export as failed" do
+    export = @family.family_exports.create!
+    export.update_columns(status: "processing", updated_at: 2.hours.ago)
+
+    post cancel_family_export_path(export)
+
+    assert_redirected_to family_exports_path
+    assert_equal "failed", export.reload.status
+  end
+
+  test "cancel refuses an export that is not presumed lost" do
+    export = @family.family_exports.create!
+    export.update_columns(status: "processing", updated_at: 5.minutes.ago)
+
+    post cancel_family_export_path(export)
+
+    assert_equal I18n.t("family_exports.cancel.not_cancellable"), flash[:alert]
+    assert_equal "processing", export.reload.status
+  end
+
+  test "non-admin cannot cancel an export" do
+    export = @family.family_exports.create!
+    export.update_columns(status: "processing", updated_at: 2.hours.ago)
+
+    sign_in @non_admin
+    post cancel_family_export_path(export)
+
+    assert_redirected_to root_path
+    assert_equal "processing", export.reload.status
+  end
+
   test "admin can create export" do
     assert_enqueued_with(job: FamilyDataExportJob) do
       post family_exports_path
diff --git a/test/controllers/family_merchants_controller_test.rb b/test/controllers/family_merchants_controller_test.rb
index b5dc950b3..16ee04f75 100644
--- a/test/controllers/family_merchants_controller_test.rb
+++ b/test/controllers/family_merchants_controller_test.rb
@@ -22,11 +22,14 @@ class FamilyMerchantsControllerTest < ActionDispatch::IntegrationTest
     end
 
     assert_redirected_to family_merchants_path
+    created_merchant = FamilyMerchant.find_by(name: "new merchant")
+    assert_equal "#000000", created_merchant.color
   end
 
   test "should update merchant" do
     patch family_merchant_url(@merchant), params: { family_merchant: { name: "new name", color: "#000000" } }
     assert_redirected_to family_merchants_path
+    assert_equal "#000000", @merchant.reload.color
   end
 
   test "should destroy merchant" do
diff --git a/test/controllers/goals_controller_test.rb b/test/controllers/goals_controller_test.rb
index c20ae7e73..2fb08236c 100644
--- a/test/controllers/goals_controller_test.rb
+++ b/test/controllers/goals_controller_test.rb
@@ -90,6 +90,47 @@ class GoalsControllerTest < ActionDispatch::IntegrationTest
     assert_response :unprocessable_entity
   end
 
+  test "new form excludes same-family accounts not shared with the current user" do
+    # Regression for #2168: funding-account picker leaked accounts owned by
+    # other family members that were never shared with the current user.
+    private_account = Account.create!(
+      family: @user.family,
+      owner: users(:family_member),
+      accountable: Depository.new,
+      name: "Member Private Checking",
+      currency: "USD",
+      balance: 100
+    )
+
+    get new_goal_url
+    assert_response :success
+    assert_no_match(/Member Private Checking/, response.body)
+    assert_no_match(/goal_account_ids_#{private_account.id}/, response.body)
+  end
+
+  test "create rejects a same-family account not shared with the current user" do
+    private_account = Account.create!(
+      family: @user.family,
+      owner: users(:family_member),
+      accountable: Depository.new,
+      name: "Member Private Checking",
+      currency: "USD",
+      balance: 100
+    )
+
+    assert_no_difference "Goal.count" do
+      post goals_url, params: {
+        goal: {
+          name: "Sneaky goal",
+          target_amount: "1000",
+          color: "#4da568",
+          account_ids: [ private_account.id ]
+        }
+      }
+    end
+    assert_response :unprocessable_entity
+  end
+
   test "update modifies identity fields" do
     patch goal_url(@goal), params: { goal: { name: "Renamed" } }
     assert_redirected_to goal_path(@goal)
@@ -109,6 +150,28 @@ class GoalsControllerTest < ActionDispatch::IntegrationTest
     assert_equal [ @connected.id ], @goal.reload.goal_accounts.pluck(:account_id)
   end
 
+  test "update preserves a linked account the current user cannot access" do
+    # Regression for #2172 review: a family goal can be linked to a private
+    # account owned by another member. That account is never rendered in the
+    # picker, so its absence from the submitted set must not unlink it.
+    private_account = Account.create!(
+      family: @user.family,
+      owner: users(:family_member),
+      accountable: Depository.new,
+      name: "Member Private Checking",
+      currency: @goal.currency,
+      balance: 100
+    )
+    @goal.goal_accounts.create!(account: private_account)
+
+    patch goal_url(@goal), params: { goal: { account_ids: [ @depository.id ] } }
+
+    assert_redirected_to goal_path(@goal)
+    linked = @goal.reload.goal_accounts.pluck(:account_id)
+    assert_includes linked, private_account.id, "inaccessible private link must be preserved"
+    assert_includes linked, @depository.id
+  end
+
   test "update with empty account_ids re-renders with error" do
     patch goal_url(@goal), params: { goal: { account_ids: [ "" ] } }
     assert_response :unprocessable_entity
diff --git a/test/controllers/import/configurations_controller_test.rb b/test/controllers/import/configurations_controller_test.rb
index 078c17fe9..d6541249e 100644
--- a/test/controllers/import/configurations_controller_test.rb
+++ b/test/controllers/import/configurations_controller_test.rb
@@ -11,6 +11,18 @@ class Import::ConfigurationsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "show renders the YNAB configuration partial" do
+    ynab = @user.family.imports.create!(
+      type: "YnabImport",
+      raw_file_str: file_fixture("imports/ynab.csv").read,
+      col_sep: ","
+    )
+
+    get import_configuration_url(ynab)
+
+    assert_response :success
+  end
+
   test "updating a valid configuration regenerates rows" do
     TransactionImport.any_instance.expects(:generate_rows_from_csv).once
 
diff --git a/test/controllers/import/uploads_controller_test.rb b/test/controllers/import/uploads_controller_test.rb
index 6aa3be8b6..1836ac95d 100644
--- a/test/controllers/import/uploads_controller_test.rb
+++ b/test/controllers/import/uploads_controller_test.rb
@@ -35,6 +35,18 @@ class Import::UploadsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "CSV uploaded successfully.", flash[:notice]
   end
 
+  test "account select does not leak unshared family accounts (#1803)" do
+    sign_in users(:family_member)
+
+    get import_upload_url(@import)
+
+    assert_response :success
+    assert_select 'select[name="import[account_id]"] option', text: "Checking Account"
+    assert_select 'select[name="import[account_id]"] option', text: "Collectable Account", count: 0
+    assert_select 'select[name="import[account_id]"] option', text: "IOU (personal debt to friend)", count: 0
+    assert_select 'select[name="import[account_id]"] option', text: "Plaid Depository Account", count: 0
+  end
+
   test "invalid csv cannot be uploaded" do
     patch import_upload_url(@import), params: {
       import: {
diff --git a/test/controllers/imports_controller_test.rb b/test/controllers/imports_controller_test.rb
index 1b48bd953..42ca620a8 100644
--- a/test/controllers/imports_controller_test.rb
+++ b/test/controllers/imports_controller_test.rb
@@ -26,6 +26,39 @@ class ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_select "turbo-frame#modal"
   end
 
+  test "cancel marks a lost import as failed" do
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 2.hours.ago)
+
+    post cancel_import_path(import)
+
+    assert_redirected_to imports_path
+    assert_equal "failed", import.reload.status
+    assert_equal Import.lost_error_message, import.error
+  end
+
+  test "cancel refuses an import that is not presumed lost" do
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 5.minutes.ago)
+
+    post cancel_import_path(import)
+
+    assert_equal I18n.t("imports.cancel.not_cancellable"), flash[:alert]
+    assert_equal "importing", import.reload.status
+  end
+
+  test "cannot cancel another family's import" do
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 2.hours.ago)
+
+    sign_in users(:empty)
+
+    post cancel_import_path(import)
+
+    assert_response :not_found
+    assert_equal "importing", import.reload.status
+  end
+
   test "shows disabled account-dependent imports when family has no accounts" do
     sign_in users(:empty)
 
@@ -38,8 +71,9 @@ class ImportsControllerTest < ActionDispatch::IntegrationTest
     assert_select "button", text: "Import from Mint", count: 1
     assert_select "button", text: "Import from Actual Budget", count: 1
     assert_select "button", text: "Import from Quicken (QIF)", count: 1
+    assert_select "button", text: "Import from YNAB", count: 1
     assert_select "span", text: "Import accounts first to unlock this option.", count: 2
-    assert_select "div[aria-disabled=true]", count: 3
+    assert_select "div[aria-disabled=true]", count: 2
   end
 
   test "creates import" do
@@ -363,4 +397,22 @@ class ImportsControllerTest < ActionDispatch::IntegrationTest
 
     assert_redirected_to imports_path
   end
+
+  test "PDF import account select does not leak unshared family accounts (#1803)" do
+    sign_in users(:family_member)
+    pdf_import = imports(:pdf_with_rows)
+    # The fixture has no attached pdf_file and no statement, so
+    # ImportsController#show would redirect to the upload page. The
+    # partial under test only renders for an uploaded PDF — stub the
+    # state so we exercise the actual account-select scoping path.
+    PdfImport.any_instance.stubs(:pdf_uploaded?).returns(true)
+
+    get import_url(pdf_import)
+
+    assert_response :success
+    assert_select 'select[name="import[account_id]"] option', text: "Checking Account"
+    assert_select 'select[name="import[account_id]"] option', text: "Collectable Account", count: 0
+    assert_select 'select[name="import[account_id]"] option', text: "IOU (personal debt to friend)", count: 0
+    assert_select 'select[name="import[account_id]"] option', text: "Plaid Depository Account", count: 0
+  end
 end
diff --git a/test/controllers/insights_controller_test.rb b/test/controllers/insights_controller_test.rb
new file mode 100644
index 000000000..41c2573ab
--- /dev/null
+++ b/test/controllers/insights_controller_test.rb
@@ -0,0 +1,152 @@
+require "test_helper"
+
+class InsightsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+    enable_preview_features
+    @insight = insights(:spending_anomaly_dining)
+    ensure_tailwind_build
+  end
+
+  test "index renders visible insights and marks them read" do
+    get insights_url
+
+    assert_response :success
+    assert_match CGI.escapeHTML(@insight.title), response.body
+    assert @insight.reload.read?
+  end
+
+  test "turbo prefetch requests do not mark insights read" do
+    get insights_url, headers: { "X-Sec-Purpose" => "prefetch" }
+
+    assert_response :success
+    assert @insight.reload.active?
+  end
+
+  test "dashboard renders the insights feed section with unread badges" do
+    get root_url
+
+    assert_response :success
+    assert_select "#insights-feed", count: 1
+    assert_select "#insights-feed span", text: I18n.t("insights.card.new")
+  end
+
+  test "insights feed leads the dashboard for users with a saved order that predates it" do
+    @user.update!(preferences: (@user.preferences || {}).merge(
+      "section_order" => %w[cashflow_sankey outflows_donut net_worth_chart balance_sheet]
+    ))
+
+    get root_url
+
+    assert_response :success
+    feed_position = response.body.index('data-section-key="insights_feed"')
+    sankey_position = response.body.index('data-section-key="cashflow_sankey"')
+    assert feed_position.present? && feed_position < sankey_position,
+      "insights_feed should be prepended, not appended, for saved orders that predate it"
+  end
+
+  test "dismiss removes the insight from the feed and offers undo via turbo stream" do
+    patch dismiss_insight_url(@insight), as: :turbo_stream
+
+    assert_response :success
+    assert_match "turbo-stream", response.body
+    assert_match undismiss_insight_path(@insight), response.body
+    assert @insight.reload.dismissed?
+  end
+
+  test "undismiss restores the insight as read and re-renders the list" do
+    @insight.dismiss!
+
+    patch undismiss_insight_url(@insight), as: :turbo_stream
+
+    assert_response :success
+    assert_match "insights-list", response.body
+    assert_match CGI.escapeHTML(@insight.title), response.body
+    assert @insight.reload.read?
+    assert_nil @insight.dismissed_at
+  end
+
+  test "refresh swaps the button into a pending state via turbo stream" do
+    assert_enqueued_with(job: GenerateInsightsJob, args: [ { family_id: @user.family_id } ]) do
+      post refresh_insights_url, as: :turbo_stream
+    end
+
+    assert_response :success
+    assert_match "insights-refresh", response.body
+    assert_match CGI.escapeHTML(I18n.t("insights.refresh.checking")), response.body
+  end
+
+  test "cannot dismiss another family's insight" do
+    other_insight = families(:empty).insights.create!(
+      insight_type: "idle_cash",
+      priority: "low",
+      title: "Someone else's insight",
+      body: "Body",
+      dedup_key: "idle_cash:other:2026-07"
+    )
+
+    patch dismiss_insight_url(other_insight), as: :turbo_stream
+
+    assert_response :not_found
+    assert other_insight.reload.active?
+  end
+
+  test "refresh enqueues insight generation for the family" do
+    assert_enqueued_with(job: GenerateInsightsJob, args: [ { family_id: @user.family_id } ]) do
+      post refresh_insights_url
+    end
+
+    assert_redirected_to insights_path
+  end
+
+  # Preview gate. Insights is opt-in via Settings → Preferences, so a user
+  # without the flag reaches none of it — not the page, not the dashboard
+  # section, not the top-bar entry, and not the job the refresh action would
+  # otherwise enqueue.
+  test "redirects users without preview access" do
+    disable_preview_features
+
+    get insights_url
+
+    assert_redirected_to root_path
+    assert_match(/preview/i, flash[:alert])
+  end
+
+  test "refresh does not enqueue generation for users without preview access" do
+    disable_preview_features
+
+    assert_no_enqueued_jobs only: GenerateInsightsJob do
+      post refresh_insights_url
+    end
+
+    assert_redirected_to root_path
+  end
+
+  test "dismiss is blocked for users without preview access" do
+    disable_preview_features
+
+    patch dismiss_insight_url(@insight), as: :turbo_stream
+
+    assert_redirected_to root_path
+    assert @insight.reload.active?
+  end
+
+  test "dashboard omits the insights feed and top-bar entry without preview access" do
+    disable_preview_features
+
+    get root_url
+
+    assert_response :success
+    assert_select "#insights-feed", count: 0
+    assert_select "a[href=?]", insights_path, count: 0
+  end
+
+  private
+    def enable_preview_features
+      @user.update!(preferences: (@user.preferences || {}).merge("preview_features_enabled" => true))
+    end
+
+    def disable_preview_features
+      @user.update!(preferences: (@user.preferences || {}).merge("preview_features_enabled" => false))
+    end
+end
diff --git a/test/controllers/invitations_controller_test.rb b/test/controllers/invitations_controller_test.rb
index 90a8e7102..a0f872d3f 100644
--- a/test/controllers/invitations_controller_test.rb
+++ b/test/controllers/invitations_controller_test.rb
@@ -134,6 +134,45 @@ class InvitationsControllerTest < ActionDispatch::IntegrationTest
     assert existing_user.ai_enabled?
   end
 
+  test "re-inviting an email whose prior invitation expired succeeds instead of 500ing" do
+    email = "expired-reinvite-ctrl@example.com"
+    expired = @admin.family.invitations.create!(email: email, role: "member", inviter: @admin)
+    expired.update_column(:expires_at, 1.day.ago)
+
+    post invitations_url, params: {
+      invitation: {
+        email: email,
+        role: "member"
+      }
+    }
+
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.create.success"), flash[:notice]
+    assert_not Invitation.exists?(expired.id), "stale expired invitation should be replaced"
+
+    new_invitation = @admin.family.invitations.find_by(email: email)
+    assert new_invitation.present?
+    assert new_invitation.pending?
+  end
+
+  test "raced unique-index violation on save is handled as a failure, not a 500" do
+    # Simulate a concurrent double-submit that slips past the pending-invite
+    # validation and hits the partial unique index at INSERT time.
+    Invitation.any_instance.stubs(:save).raises(ActiveRecord::RecordNotUnique)
+
+    assert_no_difference("Invitation.count") do
+      post invitations_url, params: {
+        invitation: {
+          email: "raced@example.com",
+          role: "member"
+        }
+      }
+    end
+
+    assert_redirected_to settings_profile_path
+    assert_equal I18n.t("invitations.create.failure"), flash[:alert]
+  end
+
   test "should handle invalid invitation creation" do
     assert_no_difference("Invitation.count") do
       post invitations_url, params: {
diff --git a/test/controllers/mcp_controller_test.rb b/test/controllers/mcp_controller_test.rb
index 2b23791be..b614407bc 100644
--- a/test/controllers/mcp_controller_test.rb
+++ b/test/controllers/mcp_controller_test.rb
@@ -9,53 +9,125 @@ class McpControllerTest < ActionDispatch::IntegrationTest
   # -- Authentication --
 
   test "returns 401 without authorization header" do
-    with_mcp_env do
-      post "/mcp", params: jsonrpc_request("initialize").to_json,
-           headers: { "Content-Type" => "application/json" }
+    post "/mcp", params: jsonrpc_request("initialize").to_json,
+         headers: { "Content-Type" => "application/json" }
 
-      assert_response :unauthorized
-      assert_equal "unauthorized", JSON.parse(response.body)["error"]
-    end
+    assert_response :unauthorized
+    assert_equal "unauthorized", JSON.parse(response.body)["error"]
+    assert response.headers["WWW-Authenticate"].present?, "Must include WWW-Authenticate header"
+    assert_includes response.headers["WWW-Authenticate"], "oauth-protected-resource"
   end
 
   test "returns 401 with wrong token" do
+    post "/mcp", params: jsonrpc_request("initialize").to_json,
+         headers: mcp_headers("wrong-token")
+
+    assert_response :unauthorized
+    assert response.headers["WWW-Authenticate"].present?
+  end
+
+  test "authenticates via Doorkeeper bearer token" do
+    app = Doorkeeper::Application.create!(
+      name: "Test MCP Client #{SecureRandom.hex(4)}",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: @user.id,
+      scopes: "read_write",
+      expires_in: 1.year
+    )
+
+    post "/mcp", params: jsonrpc_request("initialize").to_json,
+         headers: mcp_headers(token.token)
+
+    assert_response :ok
+    result = JSON.parse(response.body)["result"]
+    assert_equal "2025-03-26", result["protocolVersion"]
+  end
+
+  test "rejects token with read-only scope" do
+    app = Doorkeeper::Application.create!(
+      name: "Test MCP Client #{SecureRandom.hex(4)}",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: @user.id,
+      scopes: "read",
+      expires_in: 1.year
+    )
+
+    post "/mcp", params: jsonrpc_request("initialize").to_json,
+         headers: mcp_headers(token.token)
+
+    assert_response :unauthorized
+  end
+
+  test "rejects expired Doorkeeper token" do
+    app = Doorkeeper::Application.create!(
+      name: "Test MCP Client #{SecureRandom.hex(4)}",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: @user.id,
+      scopes: "read_write",
+      expires_in: -1.second # already expired at creation time
+    )
+
+    post "/mcp", params: jsonrpc_request("initialize").to_json,
+         headers: mcp_headers(token.token)
+
+    assert_response :unauthorized
+  end
+
+  test "rejects token for deactivated user" do
+    inactive_user = users(:family_member)
+    inactive_user.update!(active: false)
+    app = Doorkeeper::Application.create!(
+      name: "Test MCP Client #{SecureRandom.hex(4)}",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: inactive_user.id,
+      scopes: "read_write",
+      expires_in: 1.year
+    )
+
+    post "/mcp", params: jsonrpc_request("initialize").to_json,
+         headers: mcp_headers(token.token)
+
+    assert_response :unauthorized
+  ensure
+    inactive_user&.update!(active: true)
+  end
+
+  test "env-var token still works as fallback" do
     with_mcp_env do
       post "/mcp", params: jsonrpc_request("initialize").to_json,
-           headers: mcp_headers("wrong-token")
+           headers: mcp_headers(@token)
+
+      assert_response :ok
+    end
+  end
+
+  test "returns 401 and warns when env-var token matches but MCP_USER_EMAIL finds no user" do
+    with_env_overrides("MCP_API_TOKEN" => @token, "MCP_USER_EMAIL" => "nonexistent@example.com") do # pipelock:ignore
+      Rails.logger.expects(:warn).with(regexp_matches(/MCP_USER_EMAIL/)).once
+
+      post "/mcp", params: jsonrpc_request("initialize").to_json,
+           headers: mcp_headers(@token)
 
       assert_response :unauthorized
     end
   end
 
-  test "returns 503 when MCP_API_TOKEN is not set" do
-    with_env_overrides("MCP_USER_EMAIL" => @user.email) do
-      post "/mcp", params: jsonrpc_request("initialize").to_json,
-           headers: mcp_headers(@token)
-
-      assert_response :service_unavailable
-      assert_includes JSON.parse(response.body)["error"], "not configured"
-    end
-  end
-
-  test "returns 503 when MCP_USER_EMAIL is not set" do
-    with_env_overrides("MCP_API_TOKEN" => @token) do
-      post "/mcp", params: jsonrpc_request("initialize").to_json,
-           headers: mcp_headers(@token)
-
-      assert_response :service_unavailable
-      assert_includes JSON.parse(response.body)["error"], "user not configured"
-    end
-  end
-
-  test "returns 503 when MCP_USER_EMAIL does not match any user" do
-    with_env_overrides("MCP_API_TOKEN" => @token, "MCP_USER_EMAIL" => "nonexistent@example.com") do
-      post "/mcp", params: jsonrpc_request("initialize").to_json,
-           headers: mcp_headers(@token)
-
-      assert_response :service_unavailable
-    end
-  end
-
   # -- JSON-RPC protocol --
 
   test "returns parse error for invalid JSON" do
@@ -273,7 +345,7 @@ class McpControllerTest < ActionDispatch::IntegrationTest
   private
 
     def with_mcp_env(&block)
-      with_env_overrides("MCP_API_TOKEN" => @token, "MCP_USER_EMAIL" => @user.email, &block)
+      with_env_overrides("MCP_API_TOKEN" => @token, "MCP_USER_EMAIL" => @user.email, &block) # pipelock:ignore
     end
 
     def mcp_headers(token)
diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb
index 5f6d21e56..d97fd3f96 100644
--- a/test/controllers/messages_controller_test.rb
+++ b/test/controllers/messages_controller_test.rb
@@ -19,4 +19,27 @@ class MessagesControllerTest < ActionDispatch::IntegrationTest
 
     assert_response :forbidden
   end
+
+  test "report_timeout fails an undelivered assistant message" do
+    BackgroundJobHealth.stubs(:snapshot).returns({})
+    BackgroundJobHealth.stubs(:summary).returns("")
+
+    pending = @chat.messages.create!(type: "AssistantMessage", content: "", ai_model: "gpt-4.1", status: :pending, created_at: 5.minutes.ago)
+
+    post report_timeout_chat_message_url(@chat, pending)
+
+    assert_response :ok
+    assert_not Message.exists?(pending.id)
+    assert @chat.reload.error.present?
+  end
+
+  test "report_timeout cannot touch another user's chat" do
+    other_chat = users(:family_member).chats.first
+    pending = other_chat.messages.create!(type: "AssistantMessage", content: "", ai_model: "gpt-4.1", status: :pending)
+
+    post report_timeout_chat_message_url(other_chat, pending)
+
+    assert_response :not_found
+    assert Message.exists?(pending.id)
+  end
 end
diff --git a/test/controllers/oauth_metadata_controller_test.rb b/test/controllers/oauth_metadata_controller_test.rb
new file mode 100644
index 000000000..538456095
--- /dev/null
+++ b/test/controllers/oauth_metadata_controller_test.rb
@@ -0,0 +1,32 @@
+require "test_helper"
+
+class OauthMetadataControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @base = ENV["APP_URL"].presence&.chomp("/") || "http://www.example.com"
+  end
+
+  test "protected_resource returns RFC 9728 metadata" do
+    get "/.well-known/oauth-protected-resource"
+
+    assert_response :ok
+    assert_equal "application/json", response.content_type.split(";").first
+    json = JSON.parse(response.body)
+    assert_equal @base, json["resource"]
+    assert_equal [ @base ], json["authorization_servers"]
+  end
+
+  test "authorization_server returns RFC 8414 metadata" do
+    get "/.well-known/oauth-authorization-server"
+
+    assert_response :ok
+    json = JSON.parse(response.body)
+    assert_equal @base, json["issuer"]
+    assert_equal "#{@base}/oauth/authorize", json["authorization_endpoint"]
+    assert_equal "#{@base}/oauth/token", json["token_endpoint"]
+    assert_equal "#{@base}/register", json["registration_endpoint"]
+    assert_equal [ "code" ], json["response_types_supported"]
+    assert_equal [ "authorization_code" ], json["grant_types_supported"]
+    assert_equal [ "S256" ], json["code_challenge_methods_supported"]
+    assert_equal [ "read_write" ], json["scopes_supported"]
+  end
+end
diff --git a/test/controllers/oauth_registration_controller_test.rb b/test/controllers/oauth_registration_controller_test.rb
new file mode 100644
index 000000000..929e83e27
--- /dev/null
+++ b/test/controllers/oauth_registration_controller_test.rb
@@ -0,0 +1,123 @@
+require "test_helper"
+
+class OauthRegistrationControllerTest < ActionDispatch::IntegrationTest
+  test "registers a public client and returns client_id" do
+    post "/register",
+      params: {
+        client_name: "Claude",
+        redirect_uris: [ "https://claude.ai/callback" ],
+        grant_types: [ "authorization_code" ],
+        response_types: [ "code" ],
+        token_endpoint_auth_method: "none"
+      }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :created
+    json = JSON.parse(response.body)
+    assert json["client_id"].present?
+    assert_equal "Claude", json["client_name"]
+    assert_equal [ "https://claude.ai/callback" ], json["redirect_uris"]
+    assert_equal [ "authorization_code" ], json["grant_types"]
+    assert_equal "none", json["token_endpoint_auth_method"]
+    assert_nil json["client_secret"], "Public client must not return a secret"
+
+    app = Doorkeeper::Application.find_by(uid: json["client_id"])
+    assert app.present?, "Application should be persisted"
+    assert_not app.confidential?, "Application must be non-confidential (public client)"
+  end
+
+  test "returns error for invalid JSON body" do
+    post "/register",
+      params: "not json",
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :bad_request
+    json = JSON.parse(response.body)
+    assert_equal "invalid_client_metadata", json["error"]
+  end
+
+  test "returns error when redirect_uris is missing" do
+    post "/register",
+      params: { client_name: "Claude" }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :bad_request
+    json = JSON.parse(response.body)
+    assert_equal "invalid_client_metadata", json["error"]
+  end
+
+  test "returns error when redirect_uris contains only blank values" do
+    post "/register",
+      params: { client_name: "Claude", redirect_uris: [ "" ] }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :bad_request
+    json = JSON.parse(response.body)
+    assert_equal "invalid_client_metadata", json["error"]
+  end
+
+  test "uses fallback name when client_name is absent" do
+    post "/register",
+      params: {
+        redirect_uris: [ "https://claude.ai/callback" ],
+        token_endpoint_auth_method: "none"
+      }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :created
+    json = JSON.parse(response.body)
+    assert_equal "MCP Client", json["client_name"]
+  end
+
+  test "rejects non-loopback http redirect uri" do
+    post "/register",
+      params: {
+        client_name: "Claude",
+        redirect_uris: [ "http://evil.example/callback" ]
+      }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :bad_request
+    json = JSON.parse(response.body)
+    assert_equal "invalid_client_metadata", json["error"]
+  end
+
+  test "allows loopback http redirect uri" do
+    post "/register",
+      params: {
+        client_name: "Claude",
+        redirect_uris: [ "http://localhost:3456/callback" ]
+      }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :created
+    json = JSON.parse(response.body)
+    assert_equal [ "http://localhost:3456/callback" ], json["redirect_uris"]
+  end
+
+  test "allows ipv6 loopback http redirect uri" do
+    post "/register",
+      params: {
+        client_name: "Claude",
+        redirect_uris: [ "http://[::1]:3456/callback" ]
+      }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :created
+    json = JSON.parse(response.body)
+    assert_equal [ "http://[::1]:3456/callback" ], json["redirect_uris"]
+  end
+
+  test "rejects custom scheme redirect uri" do
+    post "/register",
+      params: {
+        client_name: "Claude",
+        redirect_uris: [ "myapp://callback" ]
+      }.to_json,
+      headers: { "Content-Type" => "application/json" }
+
+    assert_response :bad_request
+    json = JSON.parse(response.body)
+    assert_equal "invalid_client_metadata", json["error"]
+  end
+end
diff --git a/test/controllers/oidc_accounts_controller_test.rb b/test/controllers/oidc_accounts_controller_test.rb
index a24079931..9663bc62e 100644
--- a/test/controllers/oidc_accounts_controller_test.rb
+++ b/test/controllers/oidc_accounts_controller_test.rb
@@ -215,6 +215,22 @@ class OidcAccountsControllerTest < ActionController::TestCase
     assert_equal new_user_auth["last_name"], new_user.last_name
   end
 
+  test "create_user rolls back user when OIDC identity creation fails" do
+    auth = new_user_auth.merge(
+      "email" => "oidc-rollback@example.com",
+      "uid" => "oidc-rollback-uid"
+    )
+    session[:pending_oidc_auth] = auth
+    OidcIdentity.stubs(:create_from_omniauth).raises(ActiveRecord::RecordNotUnique, "duplicate identity")
+
+    assert_no_difference [ "User.count", "OidcIdentity.count", "Family.count" ] do
+      post :create_user
+    end
+
+    assert_response :unprocessable_entity
+    assert_nil User.find_by(email: auth["email"])
+  end
+
   test "should create session after OIDC registration" do
     session[:pending_oidc_auth] = new_user_auth
 
@@ -257,4 +273,42 @@ class OidcAccountsControllerTest < ActionController::TestCase
       password: "anypassword"
     ), "SSO-only user should not authenticate with password"
   end
+
+  test "create_user via invitation shares existing family accounts when family shares by default" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    family.invitations.create!(email: "invitee@example.com", role: "member", inviter: users(:family_admin))
+
+    session[:pending_oidc_auth] = {
+      "provider" => "openid_connect", "uid" => "invite-uid-1",
+      "email" => "invitee@example.com", "first_name" => "In", "last_name" => "Vitee"
+    }
+
+    post :create_user
+    assert_redirected_to root_path
+
+    invitee = User.find_by(email: "invitee@example.com")
+    assert_not_nil invitee
+    assert_equal family.id, invitee.family_id
+    assert_equal family.accounts.pluck(:id).sort,
+      AccountShare.where(user: invitee).pluck(:account_id).sort
+  end
+
+  test "create_user via invitation shares nothing when family sharing is private" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "private")
+    family.invitations.create!(email: "invitee2@example.com", role: "member", inviter: users(:family_admin))
+
+    session[:pending_oidc_auth] = {
+      "provider" => "openid_connect", "uid" => "invite-uid-2",
+      "email" => "invitee2@example.com", "first_name" => "In", "last_name" => "Vitee"
+    }
+
+    post :create_user
+    assert_redirected_to root_path
+
+    invitee = User.find_by(email: "invitee2@example.com")
+    assert_equal family.id, invitee.family_id
+    assert_equal 0, AccountShare.where(user: invitee).count
+  end
 end
diff --git a/test/controllers/onboardings_controller_test.rb b/test/controllers/onboardings_controller_test.rb
index bb4641371..2c83854db 100644
--- a/test/controllers/onboardings_controller_test.rb
+++ b/test/controllers/onboardings_controller_test.rb
@@ -24,7 +24,7 @@ class OnboardingsControllerTest < ActionDispatch::IntegrationTest
 
     assert_select "input[name='user[family_attributes][moniker]'][value='Family'][required]"
     assert_select "input[name='user[family_attributes][moniker]'][value='Group'][required]"
-    assert_select "p", text: /Will be using Sure with/i
+    assert_select "p.text-sm.font-medium.text-primary", text: /Will be using.*with/i
   end
 
   test "should get preferences" do
diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
index 8dcef79b9..0159730ed 100644
--- a/test/controllers/pages_controller_test.rb
+++ b/test/controllers/pages_controller_test.rb
@@ -14,6 +14,35 @@ class PagesControllerTest < ActionDispatch::IntegrationTest
     assert_response :ok
   end
 
+  test "update_preferences persists dashboard section layout height" do
+    patch "/dashboard/preferences", params: {
+      preferences: { dashboard_section_layout: { net_worth_chart: { height: "compact" } } }
+    }, as: :json
+
+    assert_response :ok
+    assert_equal "compact", @user.reload.dashboard_section_height("net_worth_chart")
+  end
+
+  test "update_preferences persists dashboard section width" do
+    patch "/dashboard/preferences", params: {
+      preferences: { dashboard_section_layout: { cashflow_sankey: { col_span: "single" } } }
+    }, as: :json
+
+    assert_response :ok
+    assert_equal "single", @user.reload.dashboard_section_width("cashflow_sankey")
+  end
+
+  test "update_preferences ignores malformed dashboard_section_layout without erroring" do
+    previous_height = @user.reload.dashboard_section_height("net_worth_chart")
+
+    patch "/dashboard/preferences", params: {
+      preferences: { dashboard_section_layout: "not-a-hash" }
+    }, as: :json
+
+    assert_response :ok
+    assert_equal previous_height, @user.reload.dashboard_section_height("net_worth_chart")
+  end
+
   test "dashboard memoizes income statement period totals while rendering" do
     income_statement = IncomeStatement.new(@family)
     IncomeStatement.stubs(:new).returns(income_statement)
@@ -95,6 +124,137 @@ class PagesControllerTest < ActionDispatch::IntegrationTest
     assert sankey_data.fetch("nodes").any? { |node| node.fetch("id").start_with?("expense_") }
   end
 
+  test "dashboard renders money flow widget" do
+    get root_path
+
+    assert_response :ok
+    assert_select "[data-controller='bar-chart']"
+  end
+
+  test "dashboard scopes money flow widget to selected month and accounts" do
+    # Dedicated account (rather than @family.accounts.first) so fixture
+    # transactions on other accounts can't skew the computed totals.
+    account = @family.accounts.create!(name: "Money Flow Test Checking", currency: @family.currency, balance: 0, accountable: Depository.new)
+    selected_month = 1.month.ago.beginning_of_month.to_date
+    create_transaction(account: account, name: "Groceries", amount: 50, date: selected_month + 1.day)
+    create_transaction(account: account, name: "Paycheck", amount: -200, date: selected_month + 2.days)
+
+    get root_path, params: {
+      money_flow_month: selected_month.iso8601,
+      money_flow_account_ids: [ account.id ]
+    }
+
+    assert_response :ok
+    bars = money_flow_bars
+
+    assert_equal 6, bars.size
+    highlighted = bars.find { |bar| bar["highlighted"] }
+    assert_equal selected_month.iso8601, highlighted["date"]
+    assert_equal 50.0, highlighted["expense"]
+    assert_equal 200.0, highlighted["income"]
+  end
+
+  test "dashboard money flow widget ignores account ids not accessible to the current user" do
+    other_family = Family.create!(name: "Other Family", currency: "USD")
+    other_account = other_family.accounts.create!(name: "Other Family Checking", currency: "USD", balance: 0, accountable: Depository.new)
+    create_transaction(account: other_account, name: "Not mine", amount: 999)
+
+    get root_path
+    default_bars = money_flow_bars
+
+    get root_path, params: { money_flow_account_ids: [ other_account.id ] }
+
+    assert_response :ok
+    filtered_bars = money_flow_bars
+
+    # An id outside the current user's accessible accounts is dropped entirely
+    # (money_flow_account_ids_param intersects against accessible ids), so the
+    # widget falls back to its unfiltered "all accessible accounts" state
+    # rather than scoping to a foreign account or erroring.
+    assert_equal default_bars, filtered_bars
+  end
+
+  test "dashboard money flow widget excludes accounts ineligible for cashflow totals from its account filter" do
+    excluded_account = @family.accounts.create!(
+      name: "Excluded From Reports",
+      currency: @family.currency,
+      balance: 0,
+      exclude_from_reports: true,
+      accountable: Depository.new
+    )
+
+    get root_path
+
+    assert_response :ok
+    assert_select "input[type='checkbox'][value=?]", excluded_account.id.to_s, count: 0
+  end
+
+  test "dashboard money flow widget ignores account ids excluded from cashflow totals" do
+    excluded_account = @family.accounts.create!(
+      name: "Excluded From Reports",
+      currency: @family.currency,
+      balance: 0,
+      exclude_from_reports: true,
+      accountable: Depository.new
+    )
+    create_transaction(account: excluded_account, name: "Not counted", amount: 999)
+
+    get root_path
+    default_bars = money_flow_bars
+
+    get root_path, params: { money_flow_account_ids: [ excluded_account.id ] }
+
+    assert_response :ok
+    filtered_bars = money_flow_bars
+
+    # An account excluded from reports is visible/accessible but not eligible
+    # for cashflow totals, so selecting only it must fall back to the
+    # unfiltered state instead of silently computing to zero.
+    assert_equal default_bars, filtered_bars
+  end
+
+  test "dashboard clamps a future money flow month instead of erroring" do
+    get root_path, params: { money_flow_month: 1.month.from_now.beginning_of_month.iso8601 }
+
+    assert_response :ok
+    bars = money_flow_bars
+
+    assert_equal Date.current.beginning_of_month.iso8601, bars.last["date"]
+  end
+
+  test "dashboard money flow income/expense links exclude pending transactions" do
+    get root_path
+
+    assert_response :ok
+    assert_select "a[href*='q%5Btypes%5D%5B%5D=income'][href*='q%5Bstatus%5D%5B%5D=confirmed']"
+    assert_select "a[href*='q%5Btypes%5D%5B%5D=expense'][href*='q%5Bstatus%5D%5B%5D=confirmed']"
+  end
+
+  test "dashboard money flow income/expense links stay scoped to eligible accounts by default" do
+    excluded_account = @family.accounts.create!(
+      name: "Excluded From Reports",
+      currency: @family.currency,
+      balance: 0,
+      exclude_from_reports: true,
+      accountable: Depository.new
+    )
+
+    get root_path
+
+    assert_response :ok
+    income_href = css_select("a[href*='q%5Btypes%5D%5B%5D=income']").first["href"]
+    expense_href = css_select("a[href*='q%5Btypes%5D%5B%5D=expense']").first["href"]
+
+    # The default (unfiltered) state must still pin the drill-down links to
+    # the eligible accounts backing the displayed totals, not the broader
+    # accessible-accounts set transactions_path defaults to when account_ids
+    # is absent.
+    assert_includes income_href, "q%5Baccount_ids%5D%5B%5D="
+    assert_not_includes income_href, excluded_account.id
+    assert_includes expense_href, "q%5Baccount_ids%5D%5B%5D="
+    assert_not_includes expense_href, excluded_account.id
+  end
+
   test "changelog" do
     VCR.use_cassette("git_repository_provider/fetch_latest_release_notes") do
       get changelog_path
@@ -132,4 +292,9 @@ class PagesControllerTest < ActionDispatch::IntegrationTest
     assert_select "h2", text: "Test Release"
     # Should not crash even with nil values
   end
+
+  private
+    def money_flow_bars
+      JSON.parse(css_select("[data-controller='bar-chart']").first["data-bar-chart-data-value"])
+    end
 end
diff --git a/test/controllers/properties_controller_test.rb b/test/controllers/properties_controller_test.rb
index ce5a97847..fa4d7f19d 100644
--- a/test/controllers/properties_controller_test.rb
+++ b/test/controllers/properties_controller_test.rb
@@ -188,4 +188,353 @@ class PropertiesControllerTest < ActionDispatch::IntegrationTest
     assert draft_account.active?
     assert_redirected_to account_path(draft_account)
   end
+
+  test "address update on draft account honors stored return_to over the account page" do
+    draft_account = Account.create!(
+      family: @user.family,
+      name: "Draft Property RT",
+      accountable: Property.new,
+      status: "draft",
+      balance: 500000,
+      currency: "USD"
+    )
+
+    # The property wizard (create → balances → address) doesn't thread return_to
+    # as a form param, so StoreLocation's session value is the only carrier.
+    get new_account_path(return_to: transactions_path)
+
+    patch update_address_property_path(draft_account), params: {
+      property: {
+        address_attributes: {
+          line1: "789 Activate St",
+          locality: "New York",
+          region: "NY",
+          country: "US",
+          postal_code: "10001"
+        }
+      }
+    }
+
+    draft_account.reload
+    assert draft_account.active?
+    assert_redirected_to transactions_path
+  end
+
+  test "address update ignores an external stored return_to (open-redirect guard)" do
+    draft_account = Account.create!(
+      family: @user.family,
+      name: "Draft Property Evil",
+      accountable: Property.new,
+      status: "draft",
+      balance: 500000,
+      currency: "USD"
+    )
+
+    # A hostile ?return_to is rejected at store time, so the wizard falls back
+    # to the account page rather than stream-redirecting off-site.
+    get new_account_path(return_to: "https://evil.example/phish")
+
+    patch update_address_property_path(draft_account), params: {
+      property: {
+        address_attributes: {
+          line1: "1 Safe St", locality: "NYC", region: "NY", country: "US", postal_code: "10001"
+        }
+      }
+    }
+
+    draft_account.reload
+    assert draft_account.active?
+    assert_redirected_to account_path(draft_account)
+  end
+
+  test "address update tolerates a non-String stored return_to without raising" do
+    draft_account = Account.create!(
+      family: @user.family,
+      name: "Draft Property Array",
+      accountable: Property.new,
+      status: "draft",
+      balance: 500000,
+      currency: "USD"
+    )
+
+    # `?return_to[]=foo` makes params[:return_to] an Array; safe_return_to must
+    # reject it via the is_a?(String) guard instead of raising NoMethodError.
+    get new_account_path("return_to" => [ "/transactions" ])
+
+    patch update_address_property_path(draft_account), params: {
+      property: {
+        address_attributes: {
+          line1: "1 Safe St", locality: "NYC", region: "NY", country: "US", postal_code: "10001"
+        }
+      }
+    }
+
+    draft_account.reload
+    assert draft_account.active?
+    assert_redirected_to account_path(draft_account)
+  end
+
+  # AVM provider lookup tests
+  def stub_avm_provider(response)
+    provider = mock
+    provider.stubs(:fetch_property_valuation).returns(response)
+    Provider::Registry.stubs(:rentcast).returns(provider)
+    provider
+  end
+
+  def successful_avm_response
+    Provider::Response.new(
+      success?: true,
+      data: Provider::PropertyValuationConcept::PropertyValuation.new(
+        valuation: 356_000,
+        currency: "USD",
+        property_type: "single_family_home",
+        year_built: 1973,
+        area_value: 1878,
+        area_unit: "sqft"
+      ),
+      error: nil
+    )
+  end
+
+  test "new shows method selector when an AVM provider is configured" do
+    stub_avm_provider(successful_avm_response)
+
+    get new_property_path(step: "method_select")
+
+    assert_response :success
+    assert_match "Add via RentCast", response.body
+  end
+
+  test "new skips method selector when no AVM provider is configured" do
+    Provider::Registry.stubs(:rentcast).returns(nil)
+    Provider::Registry.stubs(:realie).returns(nil)
+
+    get new_property_path(step: "method_select")
+
+    assert_response :success
+    assert_match "Enter property manually", response.body
+  end
+
+  test "new renders AVM lookup form for a configured provider" do
+    stub_avm_provider(successful_avm_response)
+
+    get new_property_path(method: "rentcast")
+
+    assert_response :success
+    assert_match "Add property via RentCast", response.body
+  end
+
+  test "AVM lookup renders a preview without creating an account" do
+    provider = mock
+    provider.expects(:fetch_property_valuation).with(
+      line1: "5500 Grand Lake Dr",
+      locality: "San Antonio",
+      region: "TX",
+      postal_code: "78244"
+    ).returns(successful_avm_response)
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    assert_no_difference "Account.count" do
+      post properties_path, params: {
+        avm_provider: "rentcast",
+        account: {
+          name: "AVM Home",
+          accountable_type: "Property",
+          address: {
+            line1: "5500 Grand Lake Dr",
+            locality: "San Antonio",
+            region: "TX",
+            postal_code: "78244"
+          }
+        }
+      }
+    end
+
+    assert_response :success
+    assert_match "Confirm property details", response.body
+    assert_match "1973", response.body
+    assert_match "1878", response.body
+  end
+
+  test "AVM preview warns when no property record was found" do
+    no_record = Provider::Response.new(
+      success?: true,
+      data: Provider::PropertyValuationConcept::PropertyValuation.new(
+        valuation: 450_000, currency: "USD", property_type: nil, year_built: nil, area_value: nil, area_unit: "sqft"
+      ),
+      error: nil
+    )
+    stub_avm_provider(no_record)
+
+    post properties_path, params: {
+      avm_provider: "rentcast",
+      account: {
+        name: "AVM Home",
+        accountable_type: "Property",
+        address: { line1: "1 Ghost St", locality: "San Antonio", region: "TX", postal_code: "78244" }
+      }
+    }
+
+    assert_response :success
+    assert_match "couldn&#39;t find a property record", response.body
+    assert_match "Unknown", response.body
+  end
+
+  def signed_preview_token(family: @user.family)
+    Rails.application.message_verifier(:avm_preview).generate(
+      {
+        "provider_key" => "rentcast",
+        "name" => "AVM Home",
+        "address" => {
+          "line1" => "5500 Grand Lake Dr",
+          "locality" => "San Antonio",
+          "region" => "TX",
+          "postal_code" => "78244"
+        },
+        "data" => {
+          "valuation" => "356000.0",
+          "currency" => "USD",
+          "property_type" => "single_family_home",
+          "year_built" => "1973",
+          "area_value" => "1878",
+          "area_unit" => "sqft"
+        }
+      },
+      expires_in: 1.hour,
+      purpose: "avm_preview/family/#{family.id}"
+    )
+  end
+
+  test "AVM confirm creates the account from the signed preview token without a provider call" do
+    provider = mock
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    assert_difference -> { Account.count } => 1 do
+      post properties_path, params: {
+        avm_provider: "rentcast",
+        avm_step: "confirm",
+        avm_preview_token: signed_preview_token,
+        account: { accountable_type: "Property" }
+      }
+    end
+
+    created_account = Account.order(:created_at).last
+    assert_redirected_to account_path(created_account)
+    assert created_account.active?
+    assert_equal "AVM Home", created_account.name
+    assert_equal 356_000, created_account.balance
+    assert_equal "USD", created_account.currency
+
+    property = created_account.accountable
+    assert_equal "rentcast", property.avm_provider
+    assert_equal Date.current, property.avm_last_synced_on
+    assert_equal "single_family_home", property.subtype
+    assert_equal 1973, property.year_built
+    assert_equal 1878, property.area_value
+    assert_equal "sqft", property.area_unit
+
+    address = property.address
+    assert_equal "5500 Grand Lake Dr", address.line1
+    assert_equal "San Antonio", address.locality
+    assert_equal "TX", address.region
+    assert_equal "78244", address.postal_code
+    assert_equal "US", address.country
+  end
+
+  test "re-renders lookup form when the AVM provider returns an error" do
+    stub_avm_provider(
+      Provider::Response.new(
+        success?: false,
+        data: nil,
+        error: Provider::Rentcast::Error.new("RentCast could not find a property matching this address")
+      )
+    )
+
+    assert_no_difference "Account.count" do
+      post properties_path, params: {
+        avm_provider: "rentcast",
+        account: {
+          name: "AVM Home",
+          accountable_type: "Property",
+          address: { line1: "1 Nowhere Ln", locality: "Nowhere", region: "TX", postal_code: "00000" }
+        }
+      }
+    end
+
+    assert_response :unprocessable_entity
+    assert_match "could not find a property", response.body
+  end
+
+  test "rejects AVM confirm without a valid signed preview token" do
+    provider = mock
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    assert_no_difference "Account.count" do
+      post properties_path, params: {
+        avm_provider: "rentcast",
+        avm_step: "confirm",
+        avm_preview_token: "forged-token",
+        account: { accountable_type: "Property" }
+      }
+    end
+
+    assert_response :unprocessable_entity
+    assert_match "preview has expired", response.body
+  end
+
+  test "rejects an AVM preview token minted for another family" do
+    provider = mock
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    assert_no_difference "Account.count" do
+      post properties_path, params: {
+        avm_provider: "rentcast",
+        avm_step: "confirm",
+        avm_preview_token: signed_preview_token(family: families(:empty)),
+        account: { accountable_type: "Property" }
+      }
+    end
+
+    assert_response :unprocessable_entity
+    assert_match "preview has expired", response.body
+  end
+
+  test "rejects incomplete AVM submissions before calling the provider" do
+    provider = mock
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    assert_no_difference "Account.count" do
+      post properties_path, params: {
+        avm_provider: "rentcast",
+        account: {
+          name: "",
+          accountable_type: "Property",
+          address: { line1: "5500 Grand Lake Dr", locality: "", region: "TX", postal_code: "78244" }
+        }
+      }
+    end
+
+    assert_response :unprocessable_entity
+    assert_match "complete US address", response.body
+  end
+
+  test "rejects AVM creation for unconfigured providers" do
+    assert_no_difference "Account.count" do
+      post properties_path, params: {
+        avm_provider: "realie",
+        account: {
+          name: "AVM Home",
+          accountable_type: "Property",
+          address: { line1: "123 Main Street", locality: "LA", region: "CA", postal_code: "90001" }
+        }
+      }
+    end
+
+    assert_redirected_to new_property_path
+  end
 end
diff --git a/test/controllers/questrade_items_controller_test.rb b/test/controllers/questrade_items_controller_test.rb
new file mode 100644
index 000000000..8d8a862a5
--- /dev/null
+++ b/test/controllers/questrade_items_controller_test.rb
@@ -0,0 +1,219 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class QuestradeItemsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in users(:family_admin)
+    SyncJob.stubs(:perform_later)
+
+    @family = families(:dylan_family)
+    @questrade_item = questrade_items(:one)
+  end
+
+  # ---------------------------------------------------------------------------
+  # create
+  # ---------------------------------------------------------------------------
+
+  test "create adds a new questrade connection" do
+    assert_difference "QuestradeItem.count", 1 do
+      post questrade_items_url, params: {
+        questrade_item: { name: "Business Questrade", refresh_token: "new_token_abc" }
+      }
+    end
+
+    assert_redirected_to settings_providers_path
+    assert_equal "new_token_abc", @family.questrade_items.find_by!(name: "Business Questrade").refresh_token
+  end
+
+  test "create uses localized default name when submitted name is blank" do
+    assert_difference "QuestradeItem.count", 1 do
+      post questrade_items_url, params: {
+        questrade_item: { name: "  ", refresh_token: "default_name_token" }
+      }
+    end
+
+    assert_redirected_to settings_providers_path
+    assert_equal I18n.t("questrade_items.default_name"), @family.questrade_items.order(:created_at).last.name
+  end
+
+  # ---------------------------------------------------------------------------
+  # update
+  # ---------------------------------------------------------------------------
+
+  test "update renames item and resets status to good when new token provided" do
+    @questrade_item.update!(status: :requires_update)
+
+    patch questrade_item_url(@questrade_item), params: {
+      questrade_item: { name: "Renamed Questrade", refresh_token: "refreshed_token" }
+    }
+
+    @questrade_item.reload
+    assert_redirected_to settings_providers_path
+    assert_equal "Renamed Questrade", @questrade_item.name
+    assert_equal "refreshed_token", @questrade_item.refresh_token
+    assert_equal "good", @questrade_item.status
+  end
+
+  test "update with blank token preserves existing token" do
+    original_token = @questrade_item.refresh_token
+
+    patch questrade_item_url(@questrade_item), params: {
+      questrade_item: { name: "Renamed Questrade", refresh_token: "" }
+    }
+
+    @questrade_item.reload
+    assert_redirected_to settings_providers_path
+    assert_equal "Renamed Questrade", @questrade_item.name
+    assert_equal original_token, @questrade_item.refresh_token
+  end
+
+  # ---------------------------------------------------------------------------
+  # destroy
+  # ---------------------------------------------------------------------------
+
+  test "destroy schedules the item for deletion" do
+    delete questrade_item_url(@questrade_item)
+
+    assert_redirected_to settings_providers_path
+    assert @questrade_item.reload.scheduled_for_deletion?
+  end
+
+  # ---------------------------------------------------------------------------
+  # sync
+  # ---------------------------------------------------------------------------
+
+  test "sync enqueues a sync job" do
+    assert_difference -> { Sync.where(syncable: @questrade_item).count }, 1 do
+      post sync_questrade_item_url(@questrade_item)
+    end
+
+    assert_response :redirect
+  end
+
+  test "sync is a no-op when item is already syncing" do
+    @questrade_item.syncs.create!(status: :syncing)
+
+    assert_no_difference -> { Sync.where(syncable: @questrade_item).count } do
+      post sync_questrade_item_url(@questrade_item)
+    end
+
+    assert_response :redirect
+  end
+
+  # ---------------------------------------------------------------------------
+  # select_accounts / link_accounts
+  # ---------------------------------------------------------------------------
+
+  test "select_accounts redirects to setup_accounts when credentials configured" do
+    get select_accounts_questrade_items_url
+
+    assert_redirected_to setup_accounts_questrade_item_url(@questrade_item)
+  end
+
+  test "select_accounts redirects to settings when credentials not configured" do
+    @questrade_item.update_column(:refresh_token, nil)
+
+    get select_accounts_questrade_items_url
+
+    assert_redirected_to settings_providers_path
+  end
+
+  test "link_accounts creates new accounts for selected questrade_accounts" do
+    questrade_account = @questrade_item.questrade_accounts.create!(
+      name: "RRSP (87654321)",
+      questrade_account_id: "87654321",
+      account_type: "RRSP",
+      currency: "CAD",
+      current_balance: 5000
+    )
+
+    assert_difference "Account.count", 1 do
+      assert_difference "AccountProvider.count", 1 do
+        post link_accounts_questrade_items_url, params: {
+          selected_account_ids: [ questrade_account.id ],
+          accountable_type: "Investment"
+        }
+      end
+    end
+
+    assert_redirected_to accounts_path
+  end
+
+  test "link_accounts redirects to settings when no credentials configured" do
+    @questrade_item.update_column(:refresh_token, nil)
+
+    post link_accounts_questrade_items_url, params: {
+      selected_account_ids: [ 999 ]
+    }
+
+    assert_redirected_to settings_providers_path
+  end
+
+  test "link_accounts redirects when no account ids selected" do
+    post link_accounts_questrade_items_url, params: { selected_account_ids: [] }
+
+    assert_redirected_to select_accounts_questrade_items_url
+  end
+
+  # ---------------------------------------------------------------------------
+  # setup_accounts / complete_account_setup
+  # ---------------------------------------------------------------------------
+
+  test "setup_accounts renders unlinked accounts" do
+    get setup_accounts_questrade_item_url(@questrade_item)
+
+    assert_response :success
+  end
+
+  test "complete_account_setup creates accounts from config and redirects" do
+    questrade_account = @questrade_item.questrade_accounts.create!(
+      name: "Margin (11111111)",
+      questrade_account_id: "11111111",
+      account_type: "Margin",
+      currency: "CAD",
+      current_balance: 3000
+    )
+
+    assert_difference "Account.count", 1 do
+      post complete_account_setup_questrade_item_url(@questrade_item), params: {
+        accounts: {
+          questrade_account.id.to_s => { account_type: "investment", balance: "3000" }
+        }
+      }
+    end
+
+    assert_redirected_to accounts_path
+  end
+
+  test "complete_account_setup redirects with alert when no accounts provided" do
+    post complete_account_setup_questrade_item_url(@questrade_item), params: { accounts: {} }
+
+    assert_redirected_to setup_accounts_questrade_item_url(@questrade_item)
+  end
+
+  # ---------------------------------------------------------------------------
+  # admin guard
+  # ---------------------------------------------------------------------------
+
+  test "non-admin cannot create a questrade item" do
+    sign_in users(:family_member)
+
+    assert_no_difference "QuestradeItem.count" do
+      post questrade_items_url, params: {
+        questrade_item: { name: "Sneaky Questrade", refresh_token: "sneak_token" }
+      }
+    end
+
+    assert_redirected_to accounts_path
+  end
+
+  test "non-admin cannot destroy a questrade item" do
+    sign_in users(:family_member)
+
+    delete questrade_item_url(@questrade_item)
+
+    assert_redirected_to accounts_path
+    assert_not @questrade_item.reload.scheduled_for_deletion?
+  end
+end
diff --git a/test/controllers/redbark_items_controller_test.rb b/test/controllers/redbark_items_controller_test.rb
new file mode 100644
index 000000000..9f94d40dd
--- /dev/null
+++ b/test/controllers/redbark_items_controller_test.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class RedbarkItemsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in users(:family_admin)
+    SyncJob.stubs(:perform_later)
+
+    @family = families(:dylan_family)
+    @redbark_item = redbark_items(:one)
+    @redbark_account = redbark_accounts(:savings_account)
+  end
+
+  test "create adds a new redbark connection" do
+    family = users(:empty).family
+    sign_in users(:empty)
+
+    assert_difference "RedbarkItem.count", 1 do
+      post redbark_items_url, params: {
+        redbark_item: { api_key: "rbk_live_new_key" }
+      }
+    end
+
+    item = family.redbark_items.order(:created_at).last
+    assert_equal "rbk_live_new_key", item.api_key
+  end
+
+  test "create with blank api key is rejected" do
+    assert_no_difference "RedbarkItem.count" do
+      post redbark_items_url, params: {
+        redbark_item: { api_key: "" }
+      }
+    end
+  end
+
+  test "update rotates the api key and clears requires_update" do
+    @redbark_item.update!(status: :requires_update)
+
+    patch redbark_item_url(@redbark_item), params: {
+      redbark_item: { api_key: "rbk_live_rotated" }
+    }
+
+    @redbark_item.reload
+    assert_equal "rbk_live_rotated", @redbark_item.api_key
+    assert @redbark_item.good?
+  end
+
+  test "blank api key update is rejected and preserves the stored key" do
+    original_key = @redbark_item.api_key
+
+    patch redbark_item_url(@redbark_item), params: {
+      redbark_item: { api_key: "" }
+    }
+
+    assert_equal original_key, @redbark_item.reload.api_key
+  end
+
+  test "sync enqueues a sync" do
+    RedbarkItem.any_instance.stubs(:syncing?).returns(false)
+    RedbarkItem.any_instance.expects(:sync_later).once
+
+    post sync_redbark_item_url(@redbark_item)
+    assert_response :redirect
+  end
+
+  test "destroy schedules the connection for deletion" do
+    delete redbark_item_url(@redbark_item)
+
+    assert_redirected_to settings_providers_path
+    assert @redbark_item.reload.scheduled_for_deletion?
+  end
+
+  test "complete_account_setup creates and links an account" do
+    assert_difference "Account.count", 1 do
+      post complete_account_setup_redbark_item_url(@redbark_item), params: {
+        accounts: { @redbark_account.id => { account_type: "depository" } }
+      }
+    end
+
+    @redbark_account.reload
+    assert @redbark_account.account_provider.present?
+    assert_equal "Depository", @redbark_account.account.accountable_type
+    assert_not @redbark_account.ignored?
+  end
+
+  test "complete_account_setup skip marks the account ignored" do
+    assert_no_difference "Account.count" do
+      post complete_account_setup_redbark_item_url(@redbark_item), params: {
+        accounts: { @redbark_account.id => { account_type: "skip" } }
+      }
+    end
+
+    assert @redbark_account.reload.ignored?
+    assert_not @redbark_item.reload.unlinked_redbark_accounts.exists?(id: @redbark_account.id)
+  end
+end
diff --git a/test/controllers/registrations_controller_test.rb b/test/controllers/registrations_controller_test.rb
index b9916dea1..fb14a7b48 100644
--- a/test/controllers/registrations_controller_test.rb
+++ b/test/controllers/registrations_controller_test.rb
@@ -118,4 +118,58 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTest
     assert_not created_user.show_ai_sidebar?
     assert created_user.ai_enabled?
   end
+
+  test "creating account from invitation shares existing family accounts when family shares by default" do
+    invitation = invitations(:one)
+    invitation.family.update!(default_account_sharing: "shared")
+
+    post registration_url, params: { user: {
+      email: invitation.email,
+      password: "Password1!",
+      invitation: invitation.token
+    } }
+
+    created_user = User.find_by(email: invitation.email)
+    assert_not_nil created_user
+    assert_equal invitation.family_id, created_user.family_id
+    assert_equal invitation.family.accounts.pluck(:id).sort,
+      AccountShare.where(user: created_user).pluck(:account_id).sort
+  end
+
+  test "creating account in invite-only default family shares existing family accounts" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    Setting.onboarding_state = "invite_only"
+    Setting.invite_only_default_family_id = family.id
+
+    assert_difference "User.count", +1 do
+      post registration_url, params: { user: {
+        email: "default-family-signup@example.com",
+        password: "Password1!"
+      } }
+    end
+
+    created_user = User.find_by(email: "default-family-signup@example.com")
+    assert_not_nil created_user
+    assert_equal family.id, created_user.family_id
+    assert_equal "member", created_user.role
+    assert_equal family.accounts.pluck(:id).sort,
+      AccountShare.where(user: created_user).pluck(:account_id).sort
+    assert AccountShare.where(user: created_user).all?(&:read_write?)
+  end
+
+  test "creating account from invitation shares nothing when family sharing is private" do
+    invitation = invitations(:one)
+    invitation.family.update!(default_account_sharing: "private")
+
+    post registration_url, params: { user: {
+      email: invitation.email,
+      password: "Password1!",
+      invitation: invitation.token
+    } }
+
+    created_user = User.find_by(email: invitation.email)
+    assert_not_nil created_user
+    assert_equal 0, AccountShare.where(user: created_user).count
+  end
 end
diff --git a/test/controllers/reports_controller_test.rb b/test/controllers/reports_controller_test.rb
index 87a6c2bca..59797f5e6 100644
--- a/test/controllers/reports_controller_test.rb
+++ b/test/controllers/reports_controller_test.rb
@@ -193,6 +193,40 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest
     assert_select ".text-center.py-8.text-subdued", { text: /No spending data/, count: 0 }, "Should not show 'No spending data' message when transactions exist"
   end
 
+  test "index avoids residual category lazy loads" do
+    account = accounts(:depository)
+
+    4.times do |idx|
+      parent = @family.categories.create!(
+        name: "Reports Parent #{idx}",
+        color: "#000000",
+        lucide_icon: "folder"
+      )
+      child = @family.categories.create!(
+        name: "Reports Child #{idx}",
+        color: "#111111",
+        lucide_icon: "folder",
+        parent: parent
+      )
+      entry = account.entries.create!(
+        name: "Reports transaction #{idx}",
+        date: Date.current,
+        amount: 10 + idx,
+        currency: "USD",
+        entryable: Transaction.new(
+          category: child,
+          kind: "standard"
+        )
+      )
+      assert entry.persisted?
+    end
+
+    queries = capture_sql_queries { get reports_path(period_type: :monthly) }
+
+    assert_response :ok
+    assert_empty queries.grep(/SELECT "categories"\.\* FROM "categories" WHERE "categories"\."id" = \$1 LIMIT \$2/)
+  end
+
   test "export transactions with API key authentication" do
     # Use an active API key with read permissions
     api_key = api_keys(:active_key)
@@ -213,6 +247,79 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest
     assert_match /Category/, @response.body
   end
 
+  test "export transactions with API key does not inherit web session impersonation" do
+    support_user = users(:sure_support_staff)
+    support_user.api_keys.active.destroy_all
+    token_value = ApiKey.generate_secure_key
+    export_credential = support_user.api_keys.build(
+      name: "Support Export Credential",
+      scopes: [ "read" ],
+      source: "web"
+    )
+    export_credential.key = token_value
+    export_credential.save!
+
+    impersonation_session = impersonation_sessions(:in_progress)
+    impersonated_user = impersonation_session.impersonated
+    leaked_category = impersonated_user.family.categories.create!(
+      name: "Impersonated Export Leak Probe"
+    )
+    impersonated_account = impersonated_user.finance_accounts.first
+    assert_not_nil impersonated_account, "Test setup failed: impersonated user has no finance account"
+
+    create_transaction(
+      account: impersonated_account,
+      name: "Impersonated export leak probe",
+      date: Date.current,
+      amount: 123.45,
+      category: leaked_category
+    )
+
+    support_user.sessions.destroy_all
+    support_user.sessions.create!(
+      user_agent: "Browser session",
+      ip_address: "127.0.0.1",
+      active_impersonator_session: impersonation_session
+    )
+
+    get export_transactions_reports_path(
+      format: :csv,
+      period_type: :ytd,
+      start_date: Date.current.beginning_of_year,
+      end_date: Date.current,
+      api_key: token_value
+    )
+
+    assert_response :ok
+    assert_equal "text/csv", @response.media_type
+    assert_no_match /Impersonated Export Leak Probe/, @response.body
+  end
+
+  test "export transactions with API key rejects deactivated user" do
+    user = users(:family_admin)
+    user.api_keys.active.destroy_all
+    token_value = ApiKey.generate_secure_key
+    export_access = user.api_keys.build(
+      name: "Inactive User Export Credential",
+      scopes: [ "read" ],
+      source: "web"
+    )
+    export_access.key = token_value
+    export_access.save!
+    user.update_column(:active, false)
+
+    get export_transactions_reports_path(
+      format: :csv,
+      period_type: :ytd,
+      api_key: token_value
+    )
+
+    assert_response :unauthorized
+    assert_match /Invalid or expired API key/, @response.body
+  ensure
+    user&.update_column(:active, true)
+  end
+
   test "export transactions with invalid API key" do
     get export_transactions_reports_path(
       format: :csv,
@@ -241,6 +348,40 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "text/csv", @response.media_type
   end
 
+  test "export transactions excludes tax-advantaged account transactions" do
+    taxable_category = @family.categories.create!(name: "Export Taxable Income", color: "#111111")
+    retirement_category = @family.categories.create!(name: "Export Retirement Income", color: "#222222")
+    taxable_account = @family.accounts.create!(
+      owner: @user,
+      name: "Export Taxable Brokerage",
+      balance: 0,
+      currency: "USD",
+      accountable: Investment.new(subtype: "brokerage")
+    )
+    retirement_account = @family.accounts.create!(
+      owner: @user,
+      name: "Export 401k",
+      balance: 0,
+      currency: "USD",
+      accountable: Investment.new(subtype: "401k")
+    )
+
+    create_transaction(account: taxable_account, name: "Taxable export dividend", amount: -100, category: taxable_category)
+    create_transaction(account: retirement_account, name: "401k export dividend", amount: -200, category: retirement_category)
+
+    get export_transactions_reports_path(
+      format: :csv,
+      period_type: :monthly,
+      start_date: Date.current.beginning_of_month,
+      end_date: Date.current.end_of_month
+    )
+
+    assert_response :ok
+    assert_equal "text/csv", @response.media_type
+    assert_match /Export Taxable Income/, @response.body
+    assert_no_match /Export Retirement Income/, @response.body
+  end
+
   test "export transactions swaps dates when end_date is before start_date" do
     start_date = Date.current
     end_date = 1.month.ago.to_date
@@ -279,6 +420,44 @@ class ReportsControllerTest < ActionDispatch::IntegrationTest
     assert_select "tr[data-category='category-#{subcategory_games.id}']", text: /^Games/
   end
 
+  test "index excludes tax-advantaged account transactions from activity breakdown" do
+    @family.accounts.each { |account| account.entries.destroy_all }
+
+    taxable_category = @family.categories.create!(name: "Reports Taxable Income", color: "#111111")
+    retirement_category = @family.categories.create!(name: "Reports Retirement Income", color: "#222222")
+    taxable_account = @family.accounts.create!(
+      owner: @user,
+      name: "Reports Taxable Brokerage",
+      balance: 0,
+      currency: "USD",
+      accountable: Investment.new(subtype: "brokerage")
+    )
+    retirement_account = @family.accounts.create!(
+      owner: @user,
+      name: "Reports 401k",
+      balance: 0,
+      currency: "USD",
+      accountable: Investment.new(subtype: "401k")
+    )
+
+    create_transaction(account: taxable_account, name: "Taxable dividend", amount: -100, category: taxable_category)
+    create_transaction(account: retirement_account, name: "401k dividend", amount: -200, category: retirement_category)
+    create_trade(securities(:aapl), account: taxable_account, qty: 1, date: Date.current, price: 100)
+    create_trade(securities(:aapl), account: retirement_account, qty: 1, date: Date.current, price: 200)
+
+    get reports_path(period_type: :monthly)
+    assert_response :ok
+
+    assert_select "tr[data-category='category-#{taxable_category.id}']", text: /Reports Taxable Income/
+    assert_select "tr[data-category='category-#{retirement_category.id}']", count: 0
+
+    other_investments_row = css_select("tr[data-category='category-other_investments']").first
+    assert_not_nil other_investments_row
+    assert_match(/#{Regexp.escape(Category.other_investments.name)}/, other_investments_row.text)
+    assert_match(/#{Regexp.escape(I18n.t("reports.transactions_breakdown.table.entries", count: 1))}/, other_investments_row.text)
+    assert_match(/\$100\.00/, other_investments_row.text)
+  end
+
   test "monthly period navigation shows previous month link" do
     get reports_path(period_type: :monthly)
     assert_response :ok
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index d3ec232ef..712343de1 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -112,9 +112,10 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     assert_match %r{/auth/openid_connect}, @response.body
     assert_match /Sign in with Keycloak/, @response.body
 
-    # Google-branded button
+    # Google-branded button — DS outline button carrying Google's official
+    # multi-color "G" mark (one of its brand hexes proves the inline SVG rendered).
     assert_match %r{/auth/google_oauth2}, @response.body
-    assert_match /gsi-material-button/, @response.body
+    assert_match /#4285F4/i, @response.body
     assert_match /Sign in with Google/, @response.body
   end
 
@@ -678,4 +679,75 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
     follow_redirect!
     assert_response :success
   end
+
+  # ── Desktop SSO: browser handoff + PKCE code exchange ──
+
+  test "desktop SSO exchanges a PKCE-bound code for a web session and is single-use" do
+    original_cache = Rails.cache
+    Rails.cache = ActiveSupport::Cache::MemoryStore.new
+
+    verifier = SecureRandom.hex(32)
+    challenge = Base64.urlsafe_encode64(Digest::SHA256.digest(verifier), padding: false)
+    oidc_identity = oidc_identities(:bob_google)
+
+    Rails.configuration.x.auth.stubs(:sso_providers).returns([
+      { name: "openid_connect", strategy: "openid_connect", label: "Google" }
+    ])
+    setup_omniauth_mock(provider: oidc_identity.provider, uid: oidc_identity.uid, email: @user.email, name: "Bob Dylan")
+
+    get "/auth/desktop/openid_connect", params: { code_challenge: challenge }
+    assert_response :success
+
+    get "/auth/openid_connect/callback"
+    assert_response :redirect
+    redirect_url = @response.redirect_url
+    assert redirect_url.start_with?("sure://sso/callback?code="), "Expected sure://sso/callback but got #{redirect_url}"
+    code = Rack::Utils.parse_query(URI.parse(redirect_url).query)["code"]
+    assert code.present?
+
+    assert_difference -> { oidc_identity.user.sessions.count }, 1 do
+      post desktop_sso_exchange_path, params: { code: code, code_verifier: verifier }
+    end
+    assert_redirected_to root_path
+
+    # Single-use: the same code cannot be redeemed again.
+    assert_no_difference -> { oidc_identity.user.sessions.count } do
+      post desktop_sso_exchange_path, params: { code: code, code_verifier: verifier }
+    end
+    assert_redirected_to new_session_path
+  ensure
+    Rails.cache = original_cache
+  end
+
+  test "desktop SSO exchange rejects a wrong PKCE verifier" do
+    original_cache = Rails.cache
+    Rails.cache = ActiveSupport::Cache::MemoryStore.new
+
+    challenge = Base64.urlsafe_encode64(Digest::SHA256.digest("the-real-verifier"), padding: false)
+    oidc_identity = oidc_identities(:bob_google)
+
+    Rails.configuration.x.auth.stubs(:sso_providers).returns([
+      { name: "openid_connect", strategy: "openid_connect", label: "Google" }
+    ])
+    setup_omniauth_mock(provider: oidc_identity.provider, uid: oidc_identity.uid, email: @user.email, name: "Bob Dylan")
+
+    get "/auth/desktop/openid_connect", params: { code_challenge: challenge }
+    get "/auth/openid_connect/callback"
+    code = Rack::Utils.parse_query(URI.parse(@response.redirect_url).query)["code"]
+
+    assert_no_difference -> { oidc_identity.user.sessions.count } do
+      post desktop_sso_exchange_path, params: { code: code, code_verifier: "an-attacker-guess" }
+    end
+    assert_redirected_to new_session_path
+  ensure
+    Rails.cache = original_cache
+  end
+
+  test "desktop_sso_start rejects a missing PKCE code_challenge" do
+    Rails.configuration.x.auth.stubs(:sso_providers).returns([
+      { name: "openid_connect", strategy: "openid_connect", label: "Google" }
+    ])
+    get "/auth/desktop/openid_connect"
+    assert_redirected_to new_session_path
+  end
 end
diff --git a/test/controllers/settings/ai_prompts_controller_test.rb b/test/controllers/settings/ai_prompts_controller_test.rb
new file mode 100644
index 000000000..efd6de61b
--- /dev/null
+++ b/test/controllers/settings/ai_prompts_controller_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class Settings::AiPromptsControllerTest < ActionDispatch::IntegrationTest
+  test "admin can view family AI prompts" do
+    sign_in users(:family_admin)
+    get settings_ai_prompts_path
+    assert_response :success
+  end
+
+  test "non-admin member cannot view family AI prompts" do
+    sign_in users(:family_member)
+    get settings_ai_prompts_path
+    assert_redirected_to accounts_path
+    assert_equal I18n.t("shared.require_admin"), flash[:alert]
+  end
+
+  test "guest cannot view family AI prompts" do
+    sign_in users(:intro_user)
+    get settings_ai_prompts_path
+    assert_redirected_to accounts_path
+    assert_equal I18n.t("shared.require_admin"), flash[:alert]
+  end
+end
diff --git a/test/controllers/settings/api_keys_controller_test.rb b/test/controllers/settings/api_keys_controller_test.rb
index 1905a4cab..74e85d4fb 100644
--- a/test/controllers/settings/api_keys_controller_test.rb
+++ b/test/controllers/settings/api_keys_controller_test.rb
@@ -7,29 +7,20 @@ class Settings::ApiKeysControllerTest < ActionDispatch::IntegrationTest
     sign_in @user
   end
 
-  test "should show no API key page when user has no active keys" do
-    get settings_api_key_path
-    assert_response :success
-  end
-
-  test "should show current API key when user has active key" do
-    @api_key = ApiKey.create!(
+  test "index shows api keys list" do
+    ApiKey.create!(
       user: @user,
-      name: "Test API Key",
-      display_key: "test_key_123",
+      name: "Listed Key",
+      display_key: "listed_key_123",
       scopes: [ "read" ]
     )
 
-    get settings_api_key_path
+    get settings_api_keys_path
     assert_response :success
+    assert_includes response.body, "Listed Key"
   end
 
-  test "should show new API key form" do
-    get new_settings_api_key_path
-    assert_response :success
-  end
-
-  test "should redirect to show when user already has active key and tries to visit new" do
+  test "new always renders form (no redirect when key exists)" do
     ApiKey.create!(
       user: @user,
       name: "Existing API Key",
@@ -38,57 +29,38 @@ class Settings::ApiKeysControllerTest < ActionDispatch::IntegrationTest
     )
 
     get new_settings_api_key_path
-    assert_redirected_to settings_api_key_path
+    assert_response :success
   end
 
-  test "should create new API key with valid parameters" do
+  test "create makes a new key without revoking existing keys" do
+    existing = ApiKey.create!(
+      user: @user,
+      name: "Existing API Key",
+      display_key: "existing_key_123",
+      scopes: [ "read" ]
+    )
+
     assert_difference "ApiKey.count", 1 do
-      post settings_api_key_path, params: {
+      post settings_api_keys_path, params: {
         api_key: {
-          name: "Test Integration Key",
+          name: "Brand New Key",
           scopes: "read_write"
         }
       }
     end
 
-    assert_redirected_to settings_api_key_path
-    follow_redirect!
-    assert_response :success
+    new_key = @user.api_keys.active.visible.find_by(name: "Brand New Key")
+    assert new_key.present?
+    assert_redirected_to settings_api_key_path(new_key, newly_created: true)
 
-    api_key = @user.api_keys.active.first
-    assert_equal "Test Integration Key", api_key.name
-    assert_includes api_key.scopes, "read_write"
+    existing.reload
+    refute existing.revoked?
+    assert_includes new_key.scopes, "read_write"
   end
 
-  test "should revoke existing key when creating new one" do
-    old_key = ApiKey.create!(
-      user: @user,
-      name: "Old API Key",
-      display_key: "old_key_123",
-      scopes: [ "read" ]
-    )
-
-    post settings_api_key_path, params: {
-      api_key: {
-        name: "New API Key",
-        scopes: "read_write"
-      }
-    }
-
-    assert_redirected_to settings_api_key_path
-    follow_redirect!
-    assert_response :success
-
-    old_key.reload
-    assert old_key.revoked?
-
-    new_key = @user.api_keys.active.first
-    assert_equal "New API Key", new_key.name
-  end
-
-  test "should not create API key without name" do
+  test "create rejects blank name" do
     assert_no_difference "ApiKey.count" do
-      post settings_api_key_path, params: {
+      post settings_api_keys_path, params: {
         api_key: {
           name: "",
           scopes: "read"
@@ -99,93 +71,158 @@ class Settings::ApiKeysControllerTest < ActionDispatch::IntegrationTest
     assert_response :unprocessable_entity
   end
 
-  test "should not create API key without scopes" do
-  # Ensure clean state for this specific test
-  @user.api_keys.destroy_all
-  initial_user_count = @user.api_keys.count
-
-  assert_no_difference "@user.api_keys.count" do
-    post settings_api_key_path, params: {
-      api_key: {
-        name: "Test Key",
-        scopes: []
+  test "create rejects blank scopes" do
+    assert_no_difference "ApiKey.count" do
+      post settings_api_keys_path, params: {
+        api_key: {
+          name: "No Scopes Key",
+          scopes: []
+        }
       }
-    }
+    end
+
+    assert_response :unprocessable_entity
   end
 
-  assert_response :unprocessable_entity
-  assert_equal initial_user_count, @user.api_keys.reload.count
-end
+  test "create rejects duplicate active name" do
+    ApiKey.create!(
+      user: @user,
+      name: "Dup",
+      display_key: "dup_key_123",
+      scopes: [ "read" ]
+    )
 
-  test "should revoke API key" do
-    @api_key = ApiKey.create!(
+    assert_no_difference "ApiKey.count" do
+      post settings_api_keys_path, params: {
+        api_key: {
+          name: "Dup",
+          scopes: "read_write"
+        }
+      }
+    end
+
+    assert_response :unprocessable_entity
+  end
+
+  test "show renders a key" do
+    created_key = ApiKey.create!(
       user: @user,
       name: "Test API Key",
       display_key: "test_key_123",
       scopes: [ "read" ]
     )
 
-    delete settings_api_key_path
-
-    assert_redirected_to settings_api_key_path
-    follow_redirect!
+    get settings_api_key_path(created_key)
     assert_response :success
-
-    @api_key.reload
-    assert @api_key.revoked?
+    assert_includes response.body, "Test API Key"
   end
 
-  test "should handle revoke when no API key exists" do
-    delete settings_api_key_path
+  test "show renders the newly created confirmation" do
+    created_key = ApiKey.create!(
+      user: @user,
+      name: "Fresh Key",
+      display_key: "fresh_key_123",
+      scopes: [ "read" ]
+    )
 
-    assert_redirected_to settings_api_key_path
-    # Should not error even when no API key exists
+    get settings_api_key_path(created_key, newly_created: true)
+    assert_response :success
+    assert_includes response.body, created_key.plain_key
+    assert_select "h3", text: I18n.t("settings.api_keys.show.newly_created.heading")
   end
 
-  test "should only allow one active API key per user" do
-    # Create first API key
-    post settings_api_key_path, params: {
-      api_key: {
-        name: "First Key",
-        scopes: "read"
-      }
-    }
+  test "show 404s on another user's key" do
+    other_user = users(:family_member)
+    other_user.api_keys.destroy_all
+    other_key = ApiKey.create!(
+      user: other_user,
+      name: "Other User Key",
+      display_key: "other_user_key_123",
+      scopes: [ "read" ]
+    )
 
-    first_key = @user.api_keys.active.first
-
-    # Create second API key
-    post settings_api_key_path, params: {
-      api_key: {
-        name: "Second Key",
-        scopes: "read_write"
-      }
-    }
-
-    # First key should be revoked
-    first_key.reload
-    assert first_key.revoked?
-
-    # Only one active key should exist
-    assert_equal 1, @user.api_keys.active.count
-    assert_equal "Second Key", @user.api_keys.active.first.name
+    get settings_api_key_path(other_key)
+    assert_response :not_found
   end
 
-  test "should generate secure random API key" do
-    post settings_api_key_path, params: {
+  test "destroy revokes the targeted key only" do
+    key1 = ApiKey.create!(
+      user: @user,
+      name: "Key One",
+      display_key: "key_one_123",
+      scopes: [ "read" ]
+    )
+    key2 = ApiKey.create!(
+      user: @user,
+      name: "Key Two",
+      display_key: "key_two_123",
+      scopes: [ "read_write" ]
+    )
+
+    delete settings_api_key_path(key1)
+    assert_redirected_to settings_api_keys_path
+
+    key1.reload
+    key2.reload
+    assert key1.revoked?
+    refute key2.revoked?
+  end
+
+  test "destroy cannot revoke demo monitoring key" do
+    # set_api_key scopes to .visible which EXCLUDES the demo key, so the
+    # demo key id is not found by the controller and the request 404s
+    # before reaching the cannot_revoke branch.
+    demo_key = ApiKey.create!(
+      user: @user,
+      name: "Demo Monitoring Key",
+      display_key: ApiKey::DEMO_MONITORING_KEY,
+      scopes: [ "read" ]
+    )
+
+    delete settings_api_key_path(demo_key)
+    assert_response :not_found
+
+    demo_key.reload
+    refute demo_key.revoked?
+  end
+
+  test "create generates a secure random API key" do
+    post settings_api_keys_path, params: {
       api_key: {
         name: "Random Key Test",
         scopes: "read"
       }
     }
 
-    assert_redirected_to settings_api_key_path
-    follow_redirect!
-    assert_response :success
+    created_key = @user.api_keys.active.visible.find_by(name: "Random Key Test")
+    assert created_key.present?
+    assert_redirected_to settings_api_key_path(created_key, newly_created: true)
+    assert_includes created_key.scopes, "read"
+    assert_equal 64, created_key.plain_key.length
+  end
 
-    # Verify the API key was created with expected properties
-    api_key = @user.api_keys.active.first
-    assert api_key.present?
-    assert_equal "Random Key Test", api_key.name
-    assert_includes api_key.scopes, "read"
+  # API keys are user-scoped self-management: a member manages their own keys
+  # (a key carries only the owning user's permissions, and members reach this
+  # page via the Reports CSV/export flow). Do NOT add an admin gate here.
+  test "non-admin member can view API keys list" do
+    sign_in users(:family_member)
+    get settings_api_keys_path
+    assert_response :success
+  end
+
+  test "non-admin member can create their own API key" do
+    member = users(:family_member)
+    member.api_keys.destroy_all
+    sign_in member
+
+    assert_difference "ApiKey.count", 1 do
+      post settings_api_keys_path, params: {
+        api_key: { name: "Member Key", scopes: "read" }
+      }
+    end
+
+    new_key = member.api_keys.active.visible.find_by(name: "Member Key")
+    assert new_key.present?
+    assert_redirected_to settings_api_key_path(new_key, newly_created: true)
   end
 end
diff --git a/test/controllers/settings/background_jobs_controller_test.rb b/test/controllers/settings/background_jobs_controller_test.rb
new file mode 100644
index 000000000..37f3a14a1
--- /dev/null
+++ b/test/controllers/settings/background_jobs_controller_test.rb
@@ -0,0 +1,205 @@
+require "test_helper"
+
+class Settings::BackgroundJobsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    stub_sidekiq
+  end
+
+  test "super admin can view the console" do
+    sign_in users(:sure_support_staff)
+
+    get settings_background_jobs_path
+
+    assert_response :success
+  end
+
+  test "console renders in-flight operations with actions" do
+    sign_in users(:sure_support_staff)
+
+    stuck = imports(:transaction)
+    stuck.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    fresh_sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+
+    get settings_background_jobs_path
+
+    assert_response :success
+    assert_match stuck.id, response.body
+    assert_match fresh_sync.id, response.body
+    assert_match I18n.t("settings.background_jobs.operation.actions.mark_failed"), response.body
+  end
+
+  test "family admin is redirected away" do
+    sign_in users(:family_admin)
+
+    get settings_background_jobs_path
+
+    assert_redirected_to root_path
+  end
+
+  test "member is redirected away" do
+    sign_in users(:family_member)
+
+    get settings_background_jobs_path
+
+    assert_redirected_to root_path
+  end
+
+  test "cancel marks a stuck import as failed and writes an audit entry" do
+    sign_in users(:sure_support_staff)
+
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    assert_difference "DebugLogEntry.count", 1 do
+      post cancel_settings_background_jobs_path(record_type: "Import", id: import.id)
+    end
+
+    assert_redirected_to settings_background_jobs_path
+    assert_equal "failed", import.reload.status
+
+    entry = DebugLogEntry.order(:created_at).last
+    assert_equal "background_jobs", entry.category
+    assert_equal users(:sure_support_staff).id, entry.metadata["actor_user_id"]
+  end
+
+  test "cancel releases a stuck PdfImport claim back to pending" do
+    sign_in users(:sure_support_staff)
+
+    pdf = imports(:pdf)
+    pdf.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    post cancel_settings_background_jobs_path(record_type: "Import", id: pdf.id)
+
+    assert_equal "pending", pdf.reload.status
+  end
+
+  test "cancel marks a stuck sync as stale" do
+    sign_in users(:sure_support_staff)
+
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+    sync.update_columns(updated_at: 1.hour.ago)
+
+    post cancel_settings_background_jobs_path(record_type: "Sync", id: sync.id)
+
+    assert_equal "stale", sync.reload.status
+  end
+
+  test "cancel refuses a record inside the stuck window" do
+    sign_in users(:sure_support_staff)
+
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 1.minute.ago)
+
+    post cancel_settings_background_jobs_path(record_type: "Import", id: import.id)
+
+    assert_equal "importing", import.reload.status
+    assert_equal I18n.t("settings.background_jobs.cancel.not_cancellable"), flash[:alert]
+  end
+
+  test "cancel refuses when the record's job is visibly running" do
+    sign_in users(:sure_support_staff)
+
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    stub_sidekiq(worker_payloads: [
+      { "wrapped" => "ImportJob", "args" => [ { "arguments" => [ { "_aj_globalid" => import.to_global_id.to_s } ] } ] }
+    ])
+
+    post cancel_settings_background_jobs_path(record_type: "Import", id: import.id)
+
+    assert_equal "importing", import.reload.status
+  end
+
+  test "cancel resolves STI subclass record types" do
+    sign_in users(:sure_support_staff)
+
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    post cancel_settings_background_jobs_path(record_type: "TransactionImport", id: import.id)
+
+    assert_redirected_to settings_background_jobs_path
+    assert_equal "failed", import.reload.status
+  end
+
+  test "cancel routes a stuck PdfImport revert to revert_failed, not pending" do
+    sign_in users(:sure_support_staff)
+
+    pdf = imports(:pdf)
+    pdf.update_columns(status: "reverting", updated_at: 1.hour.ago)
+
+    post cancel_settings_background_jobs_path(record_type: "Import", id: pdf.id)
+
+    assert_equal "revert_failed", pdf.reload.status
+  end
+
+  test "cancel refuses when the record's job is waiting in a queue" do
+    sign_in users(:sure_support_staff)
+
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    queue = mock("Queue")
+    queue.stubs(name: "default", size: 1, latency: 0.0)
+    queue.stubs(:each).multiple_yields([ stub(item: { "wrapped" => "ImportJob", "args" => [ { "arguments" => [ { "_aj_globalid" => import.to_global_id.to_s } ] } ] }) ])
+    Sidekiq::Queue.stubs(:all).returns([ queue ])
+
+    post cancel_settings_background_jobs_path(record_type: "Import", id: import.id)
+
+    assert_equal "importing", import.reload.status
+    assert_equal I18n.t("settings.background_jobs.cancel.not_cancellable"), flash[:alert]
+  end
+
+  test "cancel refuses unknown record types" do
+    sign_in users(:sure_support_staff)
+
+    post cancel_settings_background_jobs_path(record_type: "User", id: users(:family_admin).id)
+
+    assert_response :not_found
+  end
+
+  test "cancel requires super admin" do
+    sign_in users(:family_admin)
+
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    post cancel_settings_background_jobs_path(record_type: "Import", id: import.id)
+
+    assert_redirected_to root_path
+    assert_equal "importing", import.reload.status
+  end
+
+  private
+    def stub_sidekiq(worker_payloads: [])
+      process_set = mock("ProcessSet")
+      process_set.stubs(:size).returns(1)
+      process_set.stubs(:sum).returns(worker_payloads.size)
+      Sidekiq::ProcessSet.stubs(:new).returns(process_set)
+
+      stats = mock("Stats")
+      stats.stubs(:enqueued).returns(0)
+      stats.stubs(:retry_size).returns(0)
+      stats.stubs(:dead_size).returns(0)
+      stats.stubs(:scheduled_size).returns(0)
+      Sidekiq::Stats.stubs(:new).returns(stats)
+
+      Sidekiq::Queue.stubs(:all).returns([])
+
+      empty_set = mock("JobSet")
+      empty_set.stubs(:each)
+      Sidekiq::RetrySet.stubs(:new).returns(empty_set)
+      Sidekiq::ScheduledSet.stubs(:new).returns(empty_set)
+
+      workers = mock("Workers")
+      yields = worker_payloads.map { |payload| [ "process", "thread", { "payload" => payload.to_json } ] }
+      if yields.any?
+        workers.stubs(:each).multiple_yields(*yields)
+      else
+        workers.stubs(:each)
+      end
+      Sidekiq::Workers.stubs(:new).returns(workers)
+    end
+end
diff --git a/test/controllers/settings/hostings_controller_test.rb b/test/controllers/settings/hostings_controller_test.rb
index e4ecca9bb..cd328164e 100644
--- a/test/controllers/settings/hostings_controller_test.rb
+++ b/test/controllers/settings/hostings_controller_test.rb
@@ -10,8 +10,10 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
     @provider = mock
     Provider::Registry.stubs(:get_provider).with(:twelve_data).returns(@provider)
 
-    @provider.stubs(:healthy?).returns(true)
+    @provider.stubs(:health_status).returns(:healthy)
     Provider::Registry.stubs(:get_provider).with(:yahoo_finance).returns(@provider)
+    Provider::Registry.stubs(:get_provider).with(:rentcast).returns(nil)
+    Provider::Registry.stubs(:get_provider).with(:realie).returns(nil)
     @provider.stubs(:usage).returns(provider_success_response(
       OpenStruct.new(
         used: 10,
@@ -22,6 +24,14 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
     ))
   end
 
+  teardown do
+    # These tests persist global Setting.* values; reset them so state can't
+    # leak into later (order-dependent) tests.
+    %i[anthropic_access_token anthropic_base_url anthropic_model llm_provider twelve_data_api_key openai_access_token external_assistant_token rentcast_api_key realie_api_key].each do |key|
+      Setting.public_send("#{key}=", nil)
+    end
+  end
+
   test "cannot edit when self hosting is disabled" do
     @provider.stubs(:usage).returns(@usage_response)
 
@@ -42,6 +52,96 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "can update rentcast api key when self hosting is enabled" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { rentcast_api_key: "rentcast-token" } }
+
+      assert_equal "rentcast-token", Setting.rentcast_api_key
+    end
+  end
+
+  test "can update realie api key when self hosting is enabled" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { realie_api_key: "realie-token" } }
+
+      assert_equal "realie-token", Setting.realie_api_key
+    end
+  end
+
+  test "shows Yahoo Finance rate limiting as a warning" do
+    @provider.stubs(:health_status).returns(:rate_limited)
+
+    with_env_overrides("EXCHANGE_RATE_PROVIDER" => "yahoo_finance") do
+      with_self_hosting do
+        get settings_hosting_url
+
+        assert_response :success
+        assert_select "div[class~=?]", "bg-warning/10"
+        assert_includes response.body, "Yahoo Finance is temporarily rate limiting requests."
+        assert_includes response.body, "Yahoo Finance rate limit reached."
+        assert_includes response.body, "No action is required."
+        assert_not_includes response.body, "firewall"
+      end
+    end
+  end
+
+  test "renders healthy unavailable and unknown Yahoo Finance states" do
+    @provider.stubs(:health_status).returns(:healthy, :unavailable, :unknown)
+
+    with_env_overrides("EXCHANGE_RATE_PROVIDER" => "yahoo_finance") do
+      with_self_hosting do
+        get settings_hosting_url
+        assert_includes response.body, "Yahoo Finance is active and working."
+        assert_select "div[class~=?]", "bg-success"
+
+        get settings_hosting_url
+        assert_includes response.body, "Yahoo Finance is currently unavailable."
+        assert_includes response.body, "Could not verify Yahoo Finance."
+        assert_includes response.body, "Check your internet connection and try again later."
+        assert_not_includes response.body, "firewall"
+        assert_select "div[class~=?]", "bg-destructive"
+
+        get settings_hosting_url
+        assert_includes response.body, "Yahoo Finance status is being checked."
+        assert_not_includes response.body, "Could not verify Yahoo Finance."
+        assert_not_includes response.body, "Yahoo Finance rate limit reached."
+        assert_select "div[class~=?]", "bg-surface-inset"
+      end
+    end
+  end
+
+  test "renders Spanish Yahoo Finance health guidance" do
+    @provider.stubs(:health_status).returns(:rate_limited, :unavailable, :unknown)
+
+    with_env_overrides("EXCHANGE_RATE_PROVIDER" => "yahoo_finance") do
+      with_self_hosting do
+        get settings_hosting_url(locale: :es)
+        assert_includes response.body, "Yahoo Finance está limitando temporalmente las solicitudes."
+        assert_includes response.body, "No es necesario realizar ninguna acción."
+
+        get settings_hosting_url(locale: :es)
+        assert_includes response.body, "Yahoo Finance no está disponible en este momento."
+        assert_includes response.body, "Comprueba tu conexión a internet"
+
+        get settings_hosting_url(locale: :es)
+        assert_includes response.body, "Se está comprobando el estado de Yahoo Finance."
+      end
+    end
+  end
+
+  test "falls back to English for untranslated Yahoo Finance health guidance" do
+    @provider.stubs(:health_status).returns(:rate_limited)
+
+    with_env_overrides("EXCHANGE_RATE_PROVIDER" => "yahoo_finance") do
+      with_self_hosting do
+        get settings_hosting_url(locale: :fr)
+
+        assert_includes response.body, "Yahoo Finance is temporarily rate limiting requests."
+        assert_not_includes response.body, "translation missing"
+      end
+    end
+  end
+
   test "can update settings when self hosting is enabled" do
     with_self_hosting do
       patch settings_hosting_url, params: { setting: { twelve_data_api_key: "1234567890" } }
@@ -50,6 +150,25 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "can clear an encrypted api key by submitting a blank value" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { twelve_data_api_key: "1234567890" } }
+      assert_equal "1234567890", Setting.twelve_data_api_key
+
+      patch settings_hosting_url, params: { setting: { twelve_data_api_key: "" } }
+      assert_nil Setting.twelve_data_api_key
+    end
+  end
+
+  test "submitting the masked placeholder leaves an encrypted api key unchanged" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { twelve_data_api_key: "1234567890" } }
+
+      patch settings_hosting_url, params: { setting: { twelve_data_api_key: "********" } }
+      assert_equal "1234567890", Setting.twelve_data_api_key
+    end
+  end
+
   test "can update onboarding state when self hosting is enabled" do
     sign_in users(:sure_support_staff)
 
@@ -74,6 +193,135 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  # Regression: issue #2465 symptom for the OpenAI token. Blanking the field
+  # (the form auto-submits on blur) must clear the stored value, not silently
+  # keep the old one.
+  test "can clear openai access token by submitting a blank value" do
+    with_self_hosting do
+      Setting.openai_access_token = "previous-token"
+
+      patch settings_hosting_url, params: { setting: { openai_access_token: "" } }
+
+      assert_nil Setting.openai_access_token
+    end
+  end
+
+  test "ignores redacted openai token placeholder" do
+    with_self_hosting do
+      Setting.openai_access_token = "previous-token"
+
+      patch settings_hosting_url, params: { setting: { openai_access_token: "********" } }
+
+      assert_equal "previous-token", Setting.openai_access_token
+    end
+  end
+
+  test "can update anthropic access token when self hosting is enabled" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { anthropic_access_token: "fake-anthropic-key-for-tests" } }
+
+      assert_equal "fake-anthropic-key-for-tests", Setting.anthropic_access_token
+    end
+  end
+
+  # Regression: issue #2465 symptom for the Anthropic token.
+  test "can clear anthropic access token by submitting a blank value" do
+    with_self_hosting do
+      Setting.anthropic_access_token = "previous-token"
+
+      patch settings_hosting_url, params: { setting: { anthropic_access_token: "" } }
+
+      assert_nil Setting.anthropic_access_token
+    end
+  end
+
+  test "ignores redacted anthropic token placeholder" do
+    with_self_hosting do
+      Setting.anthropic_access_token = "previous-token"
+
+      patch settings_hosting_url, params: { setting: { anthropic_access_token: "********" } }
+
+      assert_equal "previous-token", Setting.anthropic_access_token
+    end
+  end
+
+  test "can update anthropic base_url and model" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { anthropic_base_url: "https://bedrock.example.com", anthropic_model: "claude-opus-4-7" } }
+
+      assert_equal "https://bedrock.example.com", Setting.anthropic_base_url
+      assert_equal "claude-opus-4-7", Setting.anthropic_model
+    end
+  end
+
+  test "rejects non-URL anthropic base_url" do
+    with_self_hosting do
+      Setting.anthropic_base_url = nil
+
+      patch settings_hosting_url, params: { setting: { anthropic_base_url: "not-a-url" } }
+
+      assert_response :unprocessable_entity
+      assert_match(/Anthropic Base URL must be an http/, flash[:alert])
+      assert_nil Setting.anthropic_base_url
+    end
+  end
+
+  test "clears anthropic base_url when blank value submitted" do
+    with_self_hosting do
+      Setting.anthropic_base_url = "https://bedrock.example.com"
+
+      patch settings_hosting_url, params: { setting: { anthropic_base_url: "" } }
+
+      assert_nil Setting.anthropic_base_url
+    end
+  end
+
+  test "requires anthropic model when a custom base_url is set" do
+    with_self_hosting do
+      Setting.anthropic_base_url = nil
+      Setting.anthropic_model = nil
+
+      patch settings_hosting_url, params: { setting: { anthropic_base_url: "https://bedrock.example.com" } }
+
+      assert_response :unprocessable_entity
+      assert_match(/Anthropic Model is required/, flash[:alert])
+      assert_nil Setting.anthropic_base_url
+    end
+  end
+
+  test "can update llm_provider to anthropic" do
+    with_self_hosting do
+      patch settings_hosting_url, params: { setting: { llm_provider: "anthropic" } }
+
+      assert_equal "anthropic", Setting.llm_provider
+    end
+  end
+
+  test "falls back to openai when stored llm_provider is invalid" do
+    with_self_hosting do
+      Setting.llm_provider = "bogus"
+      Provider::Openai.stubs(:configured?).returns(false)
+
+      get settings_hosting_url
+
+      assert_response :success
+      assert_select "select[name=?] option[selected][value=?]", "setting[llm_provider]", "openai"
+      assert_no_match(/translation missing/i, @response.body)
+    end
+  ensure
+    Setting.llm_provider = nil
+  end
+
+  test "rejects unknown llm_provider values" do
+    with_self_hosting do
+      Setting.llm_provider = "openai"
+
+      patch settings_hosting_url, params: { setting: { llm_provider: "bogus" } }
+
+      assert_equal "openai", Setting.llm_provider
+    end
+  end
+
   test "can update openai uri base and model together when self hosting is enabled" do
     with_self_hosting do
       patch settings_hosting_url, params: { setting: { openai_uri_base: "https://api.example.com/v1", openai_model: "gpt-4" } }
@@ -250,6 +498,19 @@ class Settings::HostingsControllerTest < ActionDispatch::IntegrationTest
     Setting.external_assistant_token = nil
   end
 
+  # Regression: issue #2465 symptom for the external assistant token.
+  test "can clear external assistant token by submitting a blank value" do
+    with_self_hosting do
+      Setting.external_assistant_token = "real-secret"
+
+      patch settings_hosting_url, params: { setting: { external_assistant_token: "" } }
+
+      assert_nil Setting.external_assistant_token
+    end
+  ensure
+    Setting.external_assistant_token = nil
+  end
+
   test "disconnect external assistant clears settings and resets type" do
     with_self_hosting do
       with_env_overrides("EXTERNAL_ASSISTANT_URL" => nil, "EXTERNAL_ASSISTANT_TOKEN" => nil) do
diff --git a/test/controllers/settings/llm_usages_controller_test.rb b/test/controllers/settings/llm_usages_controller_test.rb
new file mode 100644
index 000000000..aaab7afcb
--- /dev/null
+++ b/test/controllers/settings/llm_usages_controller_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class Settings::LlmUsagesControllerTest < ActionDispatch::IntegrationTest
+  test "admin can view family LLM usage" do
+    sign_in users(:family_admin)
+    get settings_llm_usage_path
+    assert_response :success
+  end
+
+  test "non-admin member cannot view family LLM usage" do
+    sign_in users(:family_member)
+    get settings_llm_usage_path
+    assert_redirected_to accounts_path
+    assert_equal I18n.t("shared.require_admin"), flash[:alert]
+  end
+
+  test "guest cannot view family LLM usage" do
+    sign_in users(:intro_user)
+    get settings_llm_usage_path
+    assert_redirected_to accounts_path
+    assert_equal I18n.t("shared.require_admin"), flash[:alert]
+  end
+end
diff --git a/test/controllers/settings/mcp_controller_test.rb b/test/controllers/settings/mcp_controller_test.rb
new file mode 100644
index 000000000..a9d6bf6b6
--- /dev/null
+++ b/test/controllers/settings/mcp_controller_test.rb
@@ -0,0 +1,126 @@
+require "test_helper"
+
+class Settings::McpControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    @user = users(:family_admin)
+    sign_in @user
+  end
+
+  test "shows MCP settings page" do
+    get settings_mcp_path
+    assert_response :success
+  end
+
+  test "shows connected tokens" do
+    app = Doorkeeper::Application.create!(
+      name: "Claude",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    Doorkeeper::AccessToken.create!(
+      application: app,
+      resource_owner_id: @user.id,
+      scopes: "read",
+      expires_in: 1.year
+    )
+
+    get settings_mcp_path
+    assert_response :success
+    assert_select "li", text: /Claude/
+  end
+
+  test "revokes a token" do
+    app = Doorkeeper::Application.create!(
+      name: "Claude",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: @user.id,
+      scopes: "read",
+      expires_in: 1.year
+    )
+
+    delete revoke_token_settings_mcp_path(token_id: token.id)
+
+    assert_redirected_to settings_mcp_path
+    assert token.reload.revoked_at.present?
+  end
+
+  test "does not show mobile device tokens" do
+    mobile_device = MobileDevice.create!(
+      user: @user,
+      device_id: "test-device-#{SecureRandom.hex(4)}",
+      device_name: "Test Phone",
+      device_type: "ios"
+    )
+    app = Doorkeeper::Application.create!(
+      name: "Sure Mobile",
+      redirect_uri: "sureapp://oauth/callback",
+      confidential: false
+    )
+    Doorkeeper::AccessToken.create!(
+      application: app,
+      resource_owner_id: @user.id,
+      mobile_device_id: mobile_device.id,
+      scopes: "read",
+      expires_in: 1.year
+    )
+
+    get settings_mcp_path
+    assert_response :success
+    assert_select "li", text: /Sure Mobile/, count: 0
+  end
+
+  test "cannot revoke another user's token" do
+    other_user = users(:family_member)
+    app = Doorkeeper::Application.create!(
+      name: "Claude",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: other_user.id,
+      scopes: "read",
+      expires_in: 1.year
+    )
+
+    delete revoke_token_settings_mcp_path(token_id: token.id)
+
+    assert_redirected_to settings_mcp_path
+    assert_nil token.reload.revoked_at
+  end
+
+  # MCP token management is user-scoped self-management: both actions are already
+  # scoped to Current.user, and any signed-in user (not just admins) can authorize
+  # an MCP client and own a live token. Gating this controller would leave members
+  # unable to disconnect their own clients. Do NOT add an admin gate here.
+  test "non-admin member can view MCP settings" do
+    sign_in users(:family_member)
+    get settings_mcp_path
+    assert_response :success
+  end
+
+  test "non-admin member can revoke their own MCP token" do
+    member = users(:family_member)
+    app = Doorkeeper::Application.create!(
+      name: "Claude",
+      redirect_uri: "https://claude.ai/callback",
+      confidential: false
+    )
+    token = Doorkeeper::AccessToken.create!( # pipelock:ignore
+      application: app,
+      resource_owner_id: member.id,
+      scopes: "read",
+      expires_in: 1.year
+    )
+
+    sign_in member
+    delete revoke_token_settings_mcp_path(token_id: token.id)
+
+    assert_redirected_to settings_mcp_path
+    assert token.reload.revoked_at.present?
+  end
+end
diff --git a/test/controllers/settings/providers_controller_test.rb b/test/controllers/settings/providers_controller_test.rb
index 5137b3b57..8d93c088b 100644
--- a/test/controllers/settings/providers_controller_test.rb
+++ b/test/controllers/settings/providers_controller_test.rb
@@ -422,6 +422,44 @@ class Settings::ProvidersControllerTest < ActionDispatch::IntegrationTest
     assert_match(/Query ID/i, response.body)
   end
 
+  test "GET connect_form for snaptrade shows OAuth setup instructions when instance is not configured" do
+    Provider::Snaptrade.stubs(:oauth_configured?).returns(false)
+
+    get connect_form_settings_providers_path(provider_key: "snaptrade")
+
+    assert_response :success
+    assert_includes response.body, I18n.t("providers.snaptrade.oauth_setup_step_3")
+    refute_includes response.body, I18n.t("providers.snaptrade.oauth_connect_button")
+    refute_includes response.body, I18n.t("providers.snaptrade.oauth_status_ready")
+  end
+
+  test "GET connect_form for snaptrade shows connect CTA when configured but item is not authorized" do
+    sign_in users(:empty)
+    Provider::Snaptrade.stubs(:oauth_configured?).returns(true)
+
+    get connect_form_settings_providers_path(provider_key: "snaptrade")
+
+    assert_response :success
+    assert_includes response.body, I18n.t("providers.snaptrade.oauth_connect_button")
+    assert_includes response.body, I18n.t("providers.snaptrade.oauth_status_ready")
+    refute_includes response.body, I18n.t("providers.snaptrade.oauth_status_authorized")
+    refute_includes response.body, I18n.t("providers.snaptrade.oauth_reauthorize_button")
+  end
+
+  test "GET connect_form for snaptrade shows authorized status and reauthorize CTA when item is connected" do
+    # Default signed-in user (family_admin) belongs to dylan_family, which owns
+    # the oauth-authorized `configured_item` fixture.
+    Provider::Snaptrade.stubs(:oauth_configured?).returns(true)
+
+    get connect_form_settings_providers_path(provider_key: "snaptrade")
+
+    assert_response :success
+    assert_includes response.body, I18n.t("providers.snaptrade.oauth_status_authorized")
+    assert_includes response.body, I18n.t("providers.snaptrade.oauth_reauthorize_button")
+    assert_includes response.body, I18n.t("providers.snaptrade.manage_connections")
+    refute_includes response.body, I18n.t("providers.snaptrade.oauth_connect_button")
+  end
+
   test "POST sync for ibkr without an active Ibkr sync enqueues SyncJob" do
     item = ibkr_items(:configured_item)
     Sync.where(syncable_type: "IbkrItem", syncable_id: item.id).delete_all
diff --git a/test/controllers/settings/securities_controller_test.rb b/test/controllers/settings/securities_controller_test.rb
new file mode 100644
index 000000000..26c12306d
--- /dev/null
+++ b/test/controllers/settings/securities_controller_test.rb
@@ -0,0 +1,34 @@
+require "test_helper"
+
+class Settings::SecuritiesControllerTest < ActionDispatch::IntegrationTest
+  setup { sign_in users(:family_admin) }
+
+  test "shows encryption warning when self-hosted and encryption is not configured" do
+    Rails.configuration.stubs(:app_mode).returns("self_hosted".inquiry)
+    ActiveRecordEncryptionConfig.stubs(:explicitly_configured?).returns(false)
+
+    get settings_security_url
+
+    assert_response :success
+    assert_includes response.body, I18n.t("settings.securities.show.encryption_warning.title")
+  end
+
+  test "hides encryption warning when encryption is configured" do
+    Rails.configuration.stubs(:app_mode).returns("self_hosted".inquiry)
+    ActiveRecordEncryptionConfig.stubs(:explicitly_configured?).returns(true)
+
+    get settings_security_url
+
+    assert_response :success
+    assert_not_includes response.body, I18n.t("settings.securities.show.encryption_warning.title")
+  end
+
+  test "does not show encryption warning in managed mode" do
+    Rails.configuration.stubs(:app_mode).returns("managed".inquiry)
+
+    get settings_security_url
+
+    assert_response :success
+    assert_not_includes response.body, I18n.t("settings.securities.show.encryption_warning.title")
+  end
+end
diff --git a/test/controllers/snaptrade_items_controller_test.rb b/test/controllers/snaptrade_items_controller_test.rb
index 06c4d54e9..8d64f4979 100644
--- a/test/controllers/snaptrade_items_controller_test.rb
+++ b/test/controllers/snaptrade_items_controller_test.rb
@@ -12,9 +12,19 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
+  test "connect redirects to portal when successful" do
+    portal_url = "https://app.snaptrade.com/portal/test123"
+
+    SnaptradeItem.any_instance.stubs(:connection_portal_url).returns(portal_url)
+
+    get connect_snaptrade_item_url(@snaptrade_item)
+
+    assert_redirected_to portal_url
+  end
+
   test "connect handles decryption error gracefully" do
     SnaptradeItem.any_instance
-      .stubs(:user_registered?)
+      .stubs(:connection_portal_url)
       .raises(ActiveRecord::Encryption::Errors::Decryption.new("cannot decrypt"))
 
     get connect_snaptrade_item_url(@snaptrade_item)
@@ -25,7 +35,7 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
 
   test "connect handles general error gracefully" do
     SnaptradeItem.any_instance
-      .stubs(:user_registered?)
+      .stubs(:connection_portal_url)
       .raises(StandardError.new("something broke"))
 
     get connect_snaptrade_item_url(@snaptrade_item)
@@ -34,40 +44,173 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
     assert_match(/Failed to connect/, flash[:alert])
   end
 
-  test "connect redirects to portal when successful" do
-    portal_url = "https://app.snaptrade.com/portal/test123"
+  test "oauth_authorize stores state and verifier in session and redirects to SnapTrade" do
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
 
-    SnaptradeItem.any_instance.stubs(:user_registered?).returns(true)
-    SnaptradeItem.any_instance.stubs(:connection_portal_url).returns(portal_url)
+    get oauth_authorize_snaptrade_items_url
 
-    get connect_snaptrade_item_url(@snaptrade_item)
+    assert_response :redirect
+    redirect = URI.parse(response.location)
+    assert_equal "dashboard.snaptrade.com", redirect.host
+    params = Rack::Utils.parse_query(redirect.query)
+    oauth_session = session[:snaptrade_oauth]
+    assert_equal oauth_session["state"], params["state"]
+    assert_equal "S256", params["code_challenge_method"]
+    assert oauth_session["code_verifier"].present?
+    assert oauth_session["item_id"].present?
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
 
-    assert_redirected_to portal_url
+  test "oauth_authorize redirects to settings when OAuth is not configured" do
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+
+    get oauth_authorize_snaptrade_items_url
+    assert_redirected_to settings_providers_path
+  end
+
+  test "oauth_callback rejects state mismatch without exchanging the code" do
+    Provider::Snaptrade.expects(:exchange_code).never
+
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    get oauth_authorize_snaptrade_items_url
+
+    get oauth_callback_snaptrade_items_url(code: "c0de", state: "wrong-state")
+
+    assert_redirected_to settings_providers_path
+    assert flash[:alert].present?
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
+
+  test "oauth_callback handles access_denied" do
+    get oauth_callback_snaptrade_items_url(error: "access_denied", state: "whatever")
+    assert_redirected_to settings_providers_path
+    assert flash[:alert].present?
+  end
+
+  test "oauth_callback fails when code param is missing" do
+    Provider::Snaptrade.expects(:exchange_code).never
+
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    get oauth_authorize_snaptrade_items_url
+    oauth_session = session[:snaptrade_oauth]
+
+    get oauth_callback_snaptrade_items_url(state: oauth_session["state"])
+
+    assert_redirected_to settings_providers_path
+    assert_equal "Unable to complete SnapTrade authorization. Please try again.", flash[:alert]
+    assert_nil session[:snaptrade_oauth]
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
+
+  test "oauth_callback handles exchange failures without applying tokens" do
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    get oauth_authorize_snaptrade_items_url
+    oauth_session = session[:snaptrade_oauth]
+    item = SnaptradeItem.find(oauth_session["item_id"])
+    original_token = item.oauth_access_token
+
+    Provider::Snaptrade.expects(:exchange_code)
+      .with(code: "c0de", redirect_uri: oauth_callback_snaptrade_items_url, code_verifier: oauth_session["code_verifier"])
+      .raises(Provider::Snaptrade::Error.new("upstream exchange failed"))
+
+    get oauth_callback_snaptrade_items_url(code: "c0de", state: oauth_session["state"])
+
+    assert_redirected_to settings_providers_path
+    assert_equal "Unable to complete SnapTrade authorization. Please try again.", flash[:alert]
+    assert_nil session[:snaptrade_oauth]
+    assert_equal original_token, item.reload.oauth_access_token
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
+
+  test "oauth_callback exchanges code, stores tokens, queues sync, and resumes setup" do
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    get oauth_authorize_snaptrade_items_url(return_to: "setup_accounts")
+    oauth_session = session[:snaptrade_oauth]
+    item = SnaptradeItem.find(oauth_session["item_id"])
+
+    Provider::Snaptrade.expects(:exchange_code)
+      .with(code: "c0de", redirect_uri: oauth_callback_snaptrade_items_url, code_verifier: oauth_session["code_verifier"])
+      .returns({ "access_token" => "at", "refresh_token" => "rt", "expires_in" => 900 })
+
+    get oauth_callback_snaptrade_items_url(code: "c0de", state: oauth_session["state"])
+
+    assert_redirected_to setup_accounts_snaptrade_item_path(item, accountable_type: nil)
+    assert_equal "at", item.reload.oauth_access_token
+    assert_nil session[:snaptrade_oauth]
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
+
+  test "oauth_callback clears a reconnect warning after successful authorization" do
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    @snaptrade_item.update!(status: :requires_update)
+
+    get oauth_authorize_snaptrade_items_url(item_id: @snaptrade_item.id)
+    oauth_session = session[:snaptrade_oauth]
+    Provider::Snaptrade.expects(:exchange_code).returns({ "access_token" => "at", "refresh_token" => "rt" })
+
+    get oauth_callback_snaptrade_items_url(code: "c0de", state: oauth_session["state"])
+
+    assert @snaptrade_item.reload.good?
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
+
+  test "oauth_callback queues a sync even while activities are fetching" do
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    get oauth_authorize_snaptrade_items_url(item_id: @snaptrade_item.id)
+    oauth_session = session[:snaptrade_oauth]
+    Provider::Snaptrade.expects(:exchange_code).returns({ "access_token" => "at", "refresh_token" => "rt" })
+    active_sync = @snaptrade_item.syncs.create!
+    active_sync.start!
+
+    assert_enqueued_with job: SnaptradeFollowUpSyncJob do
+      get oauth_callback_snaptrade_items_url(code: "c0de", state: oauth_session["state"])
+    end
+  ensure
+    Rails.configuration.x.snaptrade.oauth_client_id = nil
+    Rails.configuration.x.snaptrade.oauth_client_secret = nil
+  end
+
+  test "Reconnect starts OAuth authorization instead of adding a brokerage" do
+    @snaptrade_item.update!(status: :requires_update)
+
+    get accounts_url
+
+    assert_select "a[href='#{oauth_authorize_snaptrade_items_path(item_id: @snaptrade_item.id)}'][data-turbo-frame='_top']", text: /Reconnect/
+    assert_select "a[href='#{connect_snaptrade_item_path(@snaptrade_item)}']", text: /Reconnect/, count: 0
   end
 
   test "select_accounts redirects unregistered users into connect flow" do
     sign_out
     sign_in @user = users(:empty)
-    snaptrade_item = snaptrade_items(:pending_registration_item)
+    snaptrade_item = snaptrade_items(:unauthorized_item)
 
     get select_accounts_snaptrade_items_url, params: { accountable_type: "Investment", return_to: "setup_accounts" }
 
-    assert_redirected_to connect_snaptrade_item_path(snaptrade_item)
-  end
-
-  test "callback resumes setup flow after first-time connect detour" do
-    sign_out
-    sign_in @user = users(:empty)
-    snaptrade_item = snaptrade_items(:pending_registration_item)
-
-    assert_difference "Sync.count", 1 do
-      get select_accounts_snaptrade_items_url, params: { accountable_type: "Investment", return_to: "setup_accounts" }
-      assert_redirected_to connect_snaptrade_item_path(snaptrade_item)
-
-      get callback_snaptrade_items_url, params: { item_id: snaptrade_item.id }
-    end
-
-    assert_redirected_to setup_accounts_snaptrade_item_path(snaptrade_item, accountable_type: "Investment")
+    assert_redirected_to oauth_authorize_snaptrade_items_path(
+      item_id: snaptrade_item.id,
+      accountable_type: "Investment",
+      return_to: "setup_accounts"
+    )
   end
 
   test "select_accounts redirects registered users to setup flow" do
@@ -79,13 +222,11 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
   test "preload_accounts redirects unregistered users into connect flow" do
     sign_out
     sign_in @user = users(:empty)
-    snaptrade_item = snaptrade_items(:pending_registration_item)
-
     assert_no_difference "Sync.count" do
       get preload_accounts_snaptrade_items_url
     end
 
-    assert_redirected_to connect_snaptrade_item_path(snaptrade_item)
+    assert_redirected_to oauth_authorize_snaptrade_items_path(item_id: snaptrade_items(:unauthorized_item).id)
   end
 
   test "preload_accounts redirects registered users to setup flow and queues sync" do
@@ -99,8 +240,6 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
   test "entry routing prefers a registered active item over a pending one" do
     pending_item = @user.family.snaptrade_items.create!(
       name: "Pending Registration",
-      client_id: "pending_client_id",
-      consumer_key: "pending_consumer_key",
       status: :good,
       scheduled_for_deletion: false,
       pending_account_setup: true
@@ -114,7 +253,7 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
     end
     assert_redirected_to setup_accounts_snaptrade_item_path(@snaptrade_item)
 
-    assert_not pending_item.user_registered?
+    assert_not pending_item.oauth_configured?
   end
 
   test "setup_accounts shows linkable investment and crypto accounts in dropdown" do
@@ -148,11 +287,32 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
     assert_match accounts(:crypto).name, response.body
   end
 
+  test "setup_accounts preselects types from SnapTrade account categories" do
+    account = snaptrade_accounts(:fidelity_401k)
+    account.update!(raw_payload: { "account_category" => "DEPOSIT" })
+
+    get setup_accounts_snaptrade_item_url(@snaptrade_item)
+
+    assert_select "input[name='account_types[#{account.id}]'][value='Depository']"
+  end
+
+  test "complete_account_setup uses the selected account type" do
+    account = snaptrade_accounts(:fidelity_401k)
+    @snaptrade_item.stubs(:sync_later)
+
+    assert_difference "Account.where(accountable_type: 'Depository').count", 1 do
+      post complete_account_setup_snaptrade_item_url(@snaptrade_item), params: {
+        account_ids: [ account.id ],
+        account_types: { account.id => "Depository" }
+      }
+    end
+
+    assert_equal "Depository", account.reload.current_account.accountable_type
+  end
+
   test "select_existing_account prefers registered active item over pending one" do
     pending_item = @user.family.snaptrade_items.create!(
       name: "Pending Registration",
-      client_id: "pending_client_id",
-      consumer_key: "pending_consumer_key",
       status: :good,
       scheduled_for_deletion: false,
       pending_account_setup: true
@@ -248,6 +408,8 @@ class SnaptradeItemsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_select ".no-accounts-found", count: 1, message: "Expected the no-accounts UI to be shown after a completed sync with zero accounts"
     assert_select "#snaptrade-sync-spinner", count: 0, message: "Expected the spinner to be hidden when there is no active sync"
+    assert_select "a[href=?]", connect_snaptrade_item_path(@snaptrade_item, return_to: "setup_accounts", accountable_type: nil), text: /Connect Brokerage/
+    assert_no_match oauth_authorize_snaptrade_items_path(item_id: @snaptrade_item.id), response.body
   end
 
   test "setup_accounts does not re-queue a sync when a sync is already in progress" do
diff --git a/test/controllers/syncs_controller_test.rb b/test/controllers/syncs_controller_test.rb
new file mode 100644
index 000000000..1082b3967
--- /dev/null
+++ b/test/controllers/syncs_controller_test.rb
@@ -0,0 +1,54 @@
+require "test_helper"
+
+class SyncsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "member can cancel their family's sync" do
+    sync = Sync.create!(syncable: @user.family, status: :syncing)
+
+    post cancel_sync_path(sync)
+
+    assert_redirected_to accounts_path
+    assert_not_nil sync.reload.cancel_requested_at
+  end
+
+  test "cancelling a finished sync is a no-op with an alert" do
+    sync = Sync.create!(syncable: @user.family, status: :completed)
+
+    post cancel_sync_path(sync)
+
+    assert_redirected_to accounts_path
+    assert_equal I18n.t("syncs.cancel.not_cancellable"), flash[:alert]
+    assert_equal "completed", sync.reload.status
+  end
+
+  test "cannot cancel another family's sync" do
+    other_family_sync = Sync.create!(syncable: users(:empty).family, status: :syncing)
+
+    post cancel_sync_path(other_family_sync)
+
+    assert_response :not_found
+    assert_equal "syncing", other_family_sync.reload.status
+  end
+
+  test "non-admin member cannot cancel a provider item sync" do
+    sign_in users(:family_member)
+    provider_sync = Sync.create!(syncable: plaid_items(:one), status: :syncing)
+
+    post cancel_sync_path(provider_sync)
+
+    assert_response :not_found
+    assert_equal "syncing", provider_sync.reload.status
+  end
+
+  test "admin can cancel a provider item sync" do
+    provider_sync = Sync.create!(syncable: plaid_items(:one), status: :syncing)
+
+    post cancel_sync_path(provider_sync)
+
+    assert_redirected_to accounts_path
+    assert_not_nil provider_sync.reload.cancel_requested_at
+  end
+end
diff --git a/test/controllers/tag/deletions_controller_test.rb b/test/controllers/tag/deletions_controller_test.rb
index d51af30f9..2cf3da307 100644
--- a/test/controllers/tag/deletions_controller_test.rb
+++ b/test/controllers/tag/deletions_controller_test.rb
@@ -32,4 +32,22 @@ class Tag::DeletionsControllerTest < ActionDispatch::IntegrationTest
       post tag_deletions_url(@tag)
     end
   end
+
+  test "create with invalid or cross-family tag_id returns not found" do
+    other_family_tag = families(:empty).tags.create!(name: "Other family tag")
+
+    assert_no_difference -> { Tag.count } do
+      post tag_deletions_url(tag_id: other_family_tag.id)
+    end
+
+    assert_response :not_found
+  end
+
+  test "create with invalid replacement_tag_id returns not found" do
+    assert_no_difference -> { Tag.count } do
+      post tag_deletions_url(@tag), params: { replacement_tag_id: "missing" }
+    end
+
+    assert_response :not_found
+  end
 end
diff --git a/test/controllers/trading212_controller_test.rb b/test/controllers/trading212_controller_test.rb
new file mode 100644
index 000000000..2308f0d36
--- /dev/null
+++ b/test/controllers/trading212_controller_test.rb
@@ -0,0 +1,145 @@
+require "test_helper"
+
+class Trading212ItemsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in @user = users(:family_admin)
+    @item = trading212_items(:configured_item)
+  end
+
+  # === create ===
+
+  test "create redirects to accounts on success" do
+    assert_difference "Trading212Item.count", 1 do
+      post trading212_items_url, params: {
+        trading212_item: {
+          api_key: "new_api_key",
+          api_secret: "new_api_secret",
+          environment: "live",
+          currency: "USD"
+        }
+      }
+    end
+
+    assert_redirected_to accounts_path
+  end
+
+  test "create renders error on invalid params" do
+    assert_no_difference "Trading212Item.count" do
+      post trading212_items_url, params: {
+        trading212_item: {
+          api_key: "",
+          api_secret: "",
+          environment: "live"
+        }
+      }, headers: { "Turbo-Frame" => "modal" }
+    end
+
+    assert_response :unprocessable_entity
+  end
+
+  # === update ===
+
+  test "update redirects to accounts on success" do
+    patch trading212_item_url(@item), params: {
+      trading212_item: {
+        api_key: "",
+        api_secret: "",
+        environment: "demo"
+      }
+    }
+
+    assert_redirected_to accounts_path
+    assert_equal "demo", @item.reload.environment
+  end
+
+  # === destroy ===
+
+  test "destroy schedules item for deletion" do
+    delete trading212_item_url(@item)
+
+    assert_redirected_to settings_providers_path
+    assert @item.reload.scheduled_for_deletion?
+  end
+
+  # === sync ===
+
+  test "sync triggers sync job" do
+    @item.update!(status: :good)
+    assert_enqueued_with(job: SyncJob) do
+      post sync_trading212_item_url(@item)
+    end
+
+    assert_response :redirect
+  end
+
+  # === complete_account_setup ===
+
+  test "complete_account_setup creates investment account and provider link" do
+    t212_account = trading212_accounts(:main_account)
+
+    assert_difference "Account.count", 1 do
+      assert_difference "AccountProvider.count", 1 do
+        post complete_account_setup_trading212_item_url(@item), params: {
+          account_ids: [ t212_account.id ]
+        }
+      end
+    end
+
+    created_account = Account.order(created_at: :desc).first
+    assert_equal "Investment", created_account.accountable_type
+    assert_redirected_to accounts_path
+
+    t212_account.reload
+    assert_equal created_account, t212_account.current_account
+  end
+
+  test "complete_account_setup returns alert when no accounts selected" do
+    post complete_account_setup_trading212_item_url(@item), params: {
+      account_ids: []
+    }
+
+    assert_redirected_to setup_accounts_trading212_item_path(@item)
+    assert_not_nil flash[:alert]
+  end
+
+  # === link_existing_account ===
+
+  test "link_existing_account links manual investment account" do
+    account = accounts(:investment)
+
+    assert_difference "AccountProvider.count", 1 do
+      post link_existing_account_trading212_items_url, params: {
+        account_id: account.id,
+        trading212_account_id: trading212_accounts(:main_account).id
+      }
+    end
+
+    assert_redirected_to account_path(account)
+    trading212_accounts(:main_account).reload
+    assert_equal account, trading212_accounts(:main_account).current_account
+  end
+
+  test "link_existing_account rejects already linked trading212 account" do
+    original_account = accounts(:investment)
+    t212_account = trading212_accounts(:main_account)
+    AccountProvider.create!(account: original_account, provider: t212_account)
+
+    assert_no_difference "AccountProvider.count" do
+      post link_existing_account_trading212_items_url, params: {
+        account_id: original_account.id,
+        trading212_account_id: t212_account.id
+      }
+    end
+
+    assert_redirected_to account_path(original_account)
+  end
+
+  # === select_existing_account ===
+
+  test "select_existing_account renders available trading212 accounts" do
+    get select_existing_account_trading212_items_url, params: { account_id: accounts(:investment).id }
+
+    assert_response :success
+    assert_includes response.body, trading212_accounts(:main_account).name
+  end
+end
diff --git a/test/controllers/transactions/bulk_deletions_controller_test.rb b/test/controllers/transactions/bulk_deletions_controller_test.rb
index aa981d6c4..f6fbf96c8 100644
--- a/test/controllers/transactions/bulk_deletions_controller_test.rb
+++ b/test/controllers/transactions/bulk_deletions_controller_test.rb
@@ -21,4 +21,28 @@ class Transactions::BulkDeletionsControllerTest < ActionDispatch::IntegrationTes
     assert_redirected_to transactions_url
     assert_equal "#{delete_count} transactions deleted", flash[:notice]
   end
+
+  test "bulk delete with rejected transfers" do
+    entry = entries(:transaction)
+    other_entry = entries(:transfer_out)
+
+    # Create a rejected_transfer referencing the entry's transaction
+    RejectedTransfer.create!(
+      inflow_transaction: entry.entryable,
+      outflow_transaction: other_entry.entryable
+    )
+
+    assert_difference "RejectedTransfer.count", -1 do
+      assert_difference [ "Transaction.count", "Entry.count" ], -1 do
+        post transactions_bulk_deletion_url, params: {
+          bulk_delete: {
+            entry_ids: [ entry.id ]
+          }
+        }
+      end
+    end
+
+    assert_redirected_to transactions_url
+    assert_equal "1 transaction deleted", flash[:notice]
+  end
 end
diff --git a/test/controllers/transactions/categorizes_controller_test.rb b/test/controllers/transactions/categorizes_controller_test.rb
index a3628543e..1e74d8bbb 100644
--- a/test/controllers/transactions/categorizes_controller_test.rb
+++ b/test/controllers/transactions/categorizes_controller_test.rb
@@ -26,6 +26,19 @@ class Transactions::CategorizesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
+  test "show renders full dates so multi-year lists are unambiguous" do
+    create_transaction(account: @account, name: "Starbucks", date: Date.new(2024, 7, 8))
+
+    get transactions_categorize_url
+
+    assert_response :success
+    # format_date uses the family's date_format preference, every variant of
+    # which includes the year; the previous :short format ("%b %d") did not,
+    # making rows ambiguous when the uncategorized list spans years.
+    expected = Date.new(2024, 7, 8).strftime(@family.date_format)
+    assert_match expected, response.body
+  end
+
   test "show renders the first group at position 0" do
     2.times { create_transaction(account: @account, name: "Netflix") }
     3.times { create_transaction(account: @account, name: "Starbucks") }
diff --git a/test/controllers/transactions_controller_test.rb b/test/controllers/transactions_controller_test.rb
index 3fa6149fc..b533d89c7 100644
--- a/test/controllers/transactions_controller_test.rb
+++ b/test/controllers/transactions_controller_test.rb
@@ -239,6 +239,43 @@ class TransactionsControllerTest < ActionDispatch::IntegrationTest
   assert_operator overflow_count, :>, 0, "Overflow should show some transactions"
 end
 
+  test "pagination does not duplicate or skip transactions with same date and timestamp" do
+    family = families(:empty)
+    user = users(:empty)
+    sign_in user
+
+    family.accounts.each { |account| account.entries.delete_all }
+
+    account = family.accounts.create! name: "Same day", balance: 0, currency: "USD", accountable: Depository.new
+    timestamp = Time.zone.parse("2026-05-05 12:00:00")
+
+    entries = 13.times.map do |index|
+      create_transaction(
+        account: account,
+        name: "May 05 Transaction #{index + 1}",
+        amount: 100 + index,
+        date: Date.new(2026, 5, 5),
+        created_at: timestamp,
+        updated_at: timestamp
+      )
+    end
+
+    expected_entry_ids = Entry.where(id: entries.map(&:id)).reverse_chronological.pluck(:id).map(&:to_s)
+
+    get transactions_url(page: 1, per_page: 10)
+    assert_response :success
+    page_1_entry_ids = rendered_entry_ids
+
+    get transactions_url(page: 2, per_page: 10)
+    assert_response :success
+    page_2_entry_ids = rendered_entry_ids
+
+    assert_equal expected_entry_ids.first(10), page_1_entry_ids
+    assert_equal expected_entry_ids.drop(10), page_2_entry_ids
+    assert_empty page_1_entry_ids & page_2_entry_ids
+    assert_equal expected_entry_ids, page_1_entry_ids + page_2_entry_ids
+  end
+
   test "calls Transaction::Search totals method with correct search parameters" do
     family = families(:empty)
     sign_in users(:empty)
@@ -462,6 +499,56 @@ end
     end
   end
 
+  test "new preloads transaction form option data" do
+    family = families(:empty)
+    user = users(:empty)
+    sign_in user
+
+    manual_account_ids = []
+    4.times do |idx|
+      account = family.accounts.create!(
+        name: "Manual Account #{idx}",
+        balance: 0,
+        currency: "USD",
+        accountable: Depository.new
+      )
+      assert Account.manual.active.exists?(id: account.id), "Account should be included in the manual active scope"
+      manual_account_ids << account.id
+      family.categories.create!(
+        name: "Category #{idx}",
+        color: "#000000",
+        lucide_icon: "shapes"
+      )
+      family.merchants.create!(name: "Merchant #{idx}")
+      family.tags.create!(name: "Tag #{idx}")
+    end
+
+    inaccessible_account = families(:dylan_family).accounts.create!(
+      name: "Other Family Account",
+      balance: 0,
+      currency: "EUR",
+      accountable: Depository.new
+    )
+
+    queries = capture_sql_queries { get new_transaction_url }
+
+    assert_response :success
+    assert_select "input[name='entry[account_id]']"
+    assert_select "input[name='entry[entryable_attributes][category_id]']"
+    assert_select "input[name='entry[entryable_attributes][merchant_id]']"
+    assert_select "form[data-transaction-form-account-currencies-value]" do |forms|
+      account_currencies = JSON.parse(forms.first["data-transaction-form-account-currencies-value"])
+      manual_account_ids.each do |account_id|
+        assert_equal "USD", account_currencies[account_id.to_s]
+      end
+      assert_nil account_currencies[inaccessible_account.id.to_s]
+    end
+
+    assert_empty queries.grep(/FROM "account_providers" WHERE "account_providers"\."account_id" =/)
+    assert_operator queries.grep(/FROM "active_storage_attachments" WHERE "active_storage_attachments"\."record_id" =/).size, :<=, 1
+    assert_operator queries.grep(/SELECT "categories"\.\* FROM "categories" WHERE "categories"\."family_id" =/).size, :<=, 1
+  end
+
   test "unlock clears import_locked flag" do
     family = families(:empty)
     sign_in users(:empty)
@@ -634,4 +721,25 @@ end
     created_entry = Entry.order(:created_at).last
     assert_nil created_entry.transaction.extra["exchange_rate"]
   end
+
+  private
+    def rendered_entry_ids
+      css_select("turbo-frame[id^='entry_']").map { |node| node["id"].delete_prefix("entry_") }
+    end
+
+    def capture_sql_queries
+      queries = []
+      callback = lambda do |_name, _started, _finished, _unique_id, payload|
+        next if payload[:cached]
+        next if %w[SCHEMA TRANSACTION].include?(payload[:name])
+
+        queries << payload[:sql].squish
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        yield
+      end
+
+      queries
+    end
 end
diff --git a/test/controllers/transfers_controller_test.rb b/test/controllers/transfers_controller_test.rb
index 544b10057..c256baad0 100644
--- a/test/controllers/transfers_controller_test.rb
+++ b/test/controllers/transfers_controller_test.rb
@@ -150,6 +150,123 @@ class TransfersControllerTest < ActionDispatch::IntegrationTest
     assert_response :unprocessable_entity
   end
 
+  test "can create transfer with source fee" do
+    assert_difference "Transfer.count", 1 do
+      post transfers_url, params: {
+        transfer: {
+          from_account_id: accounts(:depository).id,
+          to_account_id: accounts(:credit_card).id,
+          date: Date.current,
+          amount: 100,
+          source_fee_amount: 3
+        }
+      }
+    end
+
+    transfer = Transfer.order(created_at: :desc).first
+    assert_equal 100, transfer.amount
+    assert_equal 3, transfer.derived_source_fee_amount
+    assert_equal 0, transfer.derived_destination_fee_amount
+    # Outflow should be principal only (no fee baked in)
+    assert_equal 100, transfer.outflow_transaction.entry.amount
+    # Inflow should be -(converted_principal)
+    assert_equal(-100, transfer.inflow_transaction.entry.amount)
+    # Fee transaction should be created
+    assert_equal 1, transfer.fee_transactions.count
+    fee_tx = transfer.fee_transactions.first
+    assert_equal "standard", fee_tx.kind
+    assert_equal 3, fee_tx.entry.amount
+    assert_equal accounts(:depository).id, fee_tx.entry.account_id
+    assert transfer.has_source_fee?
+    assert_not transfer.has_destination_fee?
+  end
+
+  test "can create transfer with destination fee" do
+    assert_difference "Transfer.count", 1 do
+      post transfers_url, params: {
+        transfer: {
+          from_account_id: accounts(:depository).id,
+          to_account_id: accounts(:credit_card).id,
+          date: Date.current,
+          amount: 100,
+          destination_fee_amount: 3
+        }
+      }
+    end
+
+    transfer = Transfer.order(created_at: :desc).first
+    assert_equal 100, transfer.amount
+    assert_equal 0, transfer.derived_source_fee_amount
+    assert_equal 3, transfer.derived_destination_fee_amount
+    # Outflow should be principal only
+    assert_equal 100, transfer.outflow_transaction.entry.amount
+    # Inflow should be -(converted_principal)
+    assert_equal(-100, transfer.inflow_transaction.entry.amount)
+    # Fee transaction should be created
+    assert_equal 1, transfer.fee_transactions.count
+    fee_tx = transfer.fee_transactions.first
+    assert_equal "standard", fee_tx.kind
+    assert_equal 3, fee_tx.entry.amount
+    assert_equal accounts(:credit_card).id, fee_tx.entry.account_id
+    assert_not transfer.has_source_fee?
+    assert transfer.has_destination_fee?
+  end
+
+  test "can create transfer with both source and destination fees" do
+    assert_difference "Transfer.count", 1 do
+      post transfers_url, params: {
+        transfer: {
+          from_account_id: accounts(:depository).id,
+          to_account_id: accounts(:credit_card).id,
+          date: Date.current,
+          amount: 100,
+          source_fee_amount: 2,
+          destination_fee_amount: 3
+        }
+      }
+    end
+
+    transfer = Transfer.order(created_at: :desc).first
+    assert_equal 100, transfer.amount
+    assert_equal 2, transfer.derived_source_fee_amount
+    assert_equal 3, transfer.derived_destination_fee_amount
+    # Outflow should be principal only
+    assert_equal 100, transfer.outflow_transaction.entry.amount
+    # Inflow should be -(converted_principal)
+    assert_equal(-100, transfer.inflow_transaction.entry.amount)
+    # Two fee transactions should be created
+    assert_equal 2, transfer.fee_transactions.count
+    source_fee_tx = transfer.fee_transactions.find { |t| t.entry.account_id == accounts(:depository).id }
+    dest_fee_tx = transfer.fee_transactions.find { |t| t.entry.account_id == accounts(:credit_card).id }
+    assert_equal 2, source_fee_tx.entry.amount
+    assert_equal 3, dest_fee_tx.entry.amount
+    assert transfer.has_fees?
+  end
+
+  test "derived fee methods reflect fee transaction entry edits" do
+    post transfers_url, params: {
+      transfer: {
+        from_account_id: accounts(:depository).id,
+        to_account_id: accounts(:credit_card).id,
+        date: Date.current,
+        amount: 100,
+        source_fee_amount: 3
+      }
+    }
+
+    transfer = Transfer.order(created_at: :desc).first
+    assert_equal 3, transfer.derived_source_fee_amount
+
+    # Simulate an independent edit of the fee transaction entry
+    fee_tx = transfer.fee_transactions.first
+    fee_tx.entry.update!(amount: 5)
+
+    # Derived fee should reflect the updated entry
+    transfer.reload
+    assert_equal 5, transfer.derived_source_fee_amount
+    assert transfer.has_source_fee?
+  end
+
   test "exchange_rate endpoint returns same_currency for matching currencies" do
     get exchange_rate_url, params: {
       from: "USD",
diff --git a/test/controllers/wise_items_controller_test.rb b/test/controllers/wise_items_controller_test.rb
new file mode 100644
index 000000000..b2073b607
--- /dev/null
+++ b/test/controllers/wise_items_controller_test.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class WiseItemsControllerTest < ActionDispatch::IntegrationTest
+  setup do
+    sign_in users(:family_admin)
+    SyncJob.stubs(:perform_later)
+    @family = families(:dylan_family)
+    @wise_item = wise_items(:one)
+
+    @valid_profiles = [
+      { "id" => "99999999", "type" => "personal", "details" => { "firstName" => "Jane", "lastName" => "Doe" } }
+    ]
+  end
+
+  # create redirects to select_profiles (Turbo requires a redirect from a standard
+  # form submission) — the encrypted token travels via the session, not the response body.
+
+  test "create redirects to select_profiles and keeps raw token out of the session" do
+    Provider::Wise.any_instance.stubs(:get_profiles).returns(@valid_profiles)
+
+    post wise_items_url, params: { wise_item: { token: "live_token_abc" } }
+
+    assert_redirected_to select_profiles_wise_items_path
+    assert_nil session[:wise_pending_token], "raw API token must not be stored in the session"
+    assert session[:wise_pending_encrypted_token].present?
+
+    follow_redirect!
+    assert_select "input[name='encrypted_pending_token']"
+  end
+
+  test "create stores an encrypted token that round-trips to the original value" do
+    Provider::Wise.any_instance.stubs(:get_profiles).returns(@valid_profiles)
+
+    post wise_items_url, params: { wise_item: { token: "live_token_abc" } }
+    follow_redirect!
+
+    encrypted = css_select("input[name='encrypted_pending_token']").first["value"]
+    assert encrypted.present?, "hidden encrypted_pending_token field must be present"
+
+    key = Rails.application.key_generator.generate_key("wise_pending_token", 32)
+    decrypted = ActiveSupport::MessageEncryptor.new(key).decrypt_and_verify(encrypted)
+    assert_equal "live_token_abc", decrypted
+  end
+
+  test "create redirects to providers on blank token" do
+    post wise_items_url, params: { wise_item: { token: "" } }
+    assert_redirected_to settings_providers_path
+    assert_nil session[:wise_pending_token]
+  end
+
+  test "create redirects to providers when Wise API rejects the token" do
+    Provider::Wise.any_instance.stubs(:get_profiles).raises(
+      Provider::Wise::WiseError.new("unauthorized", :unauthorized)
+    )
+
+    post wise_items_url, params: { wise_item: { token: "bad_token" } }
+    assert_redirected_to settings_providers_path
+    assert_nil session[:wise_pending_token]
+  end
+
+  # link_profiles reads the encrypted token from the session (set by create) —
+  # the client no longer needs to (and cannot) supply or tamper with it via params.
+
+  test "link_profiles creates WiseItems using the session-held encrypted token" do
+    Provider::Wise.any_instance.stubs(:get_profiles).returns(@valid_profiles)
+    post wise_items_url, params: { wise_item: { token: "live_token_abc" } }
+
+    assert_difference "WiseItem.count", 1 do
+      post link_profiles_wise_items_url, params: { profile_ids: [ "99999999" ] }
+    end
+
+    assert_redirected_to settings_providers_path
+    assert_equal "live_token_abc", @family.wise_items.find_by!(profile_id: "99999999").token
+    assert_nil session[:wise_pending_profiles]
+    assert_nil session[:wise_pending_encrypted_token]
+  end
+
+  test "link_profiles redirects to providers when there is no pending session" do
+    post link_profiles_wise_items_url, params: { profile_ids: [ "99999999" ] }
+
+    assert_redirected_to settings_providers_path
+  end
+
+  test "link_profiles redirects to providers when the session token cannot be decrypted" do
+    Provider::Wise.any_instance.stubs(:get_profiles).returns(@valid_profiles)
+    post wise_items_url, params: { wise_item: { token: "live_token_abc" } }
+
+    session[:wise_pending_encrypted_token] = "corrupted_garbage_value"
+
+    post link_profiles_wise_items_url, params: { profile_ids: [ "99999999" ] }
+
+    assert_redirected_to settings_providers_path
+  end
+end
diff --git a/test/encryption_verification_test.rb b/test/encryption_verification_test.rb
index 63885a1d0..c57427437 100644
--- a/test/encryption_verification_test.rb
+++ b/test/encryption_verification_test.rb
@@ -280,6 +280,46 @@ class EncryptionVerificationTest < ActiveSupport::TestCase
     account.update!(raw_payload: original_payload)
   end
 
+  test "redbark item credentials and payloads are encrypted" do
+    skip "No redbark items in fixtures" unless RedbarkItem.any?
+
+    item = RedbarkItem.first
+    original_payload = item.raw_payload
+
+    # Should be able to read
+    assert item.api_key.present? || item.raw_payload.present?
+
+    # Update payload
+    item.update!(raw_payload: { test: "data" })
+    item.reload
+
+    assert_equal({ "test" => "data" }, item.raw_payload)
+
+    # Restore
+    item.update!(raw_payload: original_payload)
+  end
+
+  test "redbark account payloads are encrypted" do
+    skip "No redbark accounts in fixtures" unless RedbarkAccount.any?
+
+    account = RedbarkAccount.first
+    original_payload = account.raw_payload
+
+    # Should be able to read encrypted fields without error
+    account.reload
+    assert_nothing_raised { account.raw_payload }
+    assert_nothing_raised { account.raw_transactions_payload }
+
+    # Update and verify
+    account.update!(raw_payload: { account_test: "value" })
+    account.reload
+
+    assert_equal({ "account_test" => "value" }, account.raw_payload)
+
+    # Restore
+    account.update!(raw_payload: original_payload)
+  end
+
   # ============================================================================
   # DATABASE VERIFICATION TESTS
   # ============================================================================
diff --git a/test/fixtures/files/imports/actual.csv b/test/fixtures/files/imports/actual.csv
index 03c504d5d..f3b5c317f 100644
--- a/test/fixtures/files/imports/actual.csv
+++ b/test/fixtures/files/imports/actual.csv
@@ -3,3 +3,4 @@ Checking Account,2024-01-01,Landlord,January rent,Housing,Rent,-1500.00,0,Reconc
 Credit Card,2024-01-02,Coffee Shop,Morning coffee,Food,Coffee,-4.25,0,Cleared
 Checking Account,2024-01-05,Employer,Monthly salary,Income,Paycheck,2500.00,0,Reconciled
 Checking Account,2024-01-06,Internal Transfer,Move to savings,,Transfer,-250.00,0,Not cleared
+Checking Account,2024-01-04,,Reconciliation balance adjustment,Income,Income,0.43,0,Reconciled
diff --git a/test/fixtures/files/imports/ynab.csv b/test/fixtures/files/imports/ynab.csv
new file mode 100644
index 000000000..dd991ab26
--- /dev/null
+++ b/test/fixtures/files/imports/ynab.csv
@@ -0,0 +1,6 @@
+"Account","Flag","Date","Payee","Category Group/Category","Category Group","Category","Memo","Outflow","Inflow","Cleared"
+"Checking","","01/01/2024","Landlord","Housing: Rent","Housing","Rent","January rent","$1,500.00","$0.00","Cleared"
+"Credit Card","Red","01/02/2024","Coffee Shop","Food: Coffee","Food","Coffee","Morning coffee","$4.25","$0.00","Uncleared"
+"Checking","","01/05/2024","Employer","Income: Paycheck","Income","Paycheck","Monthly salary","$0.00","$2,500.00","Cleared"
+"Checking","","01/06/2024","Transfer : Savings","","","","Move to savings","$250.00","$0.00","Uncleared"
+"Checking","","01/04/2024","","","","","Reconciliation balance adjustment","$0.00","$0.43","Reconciled"
diff --git a/test/fixtures/insights.yml b/test/fixtures/insights.yml
new file mode 100644
index 000000000..372f5bb3b
--- /dev/null
+++ b/test/fixtures/insights.yml
@@ -0,0 +1,32 @@
+spending_anomaly_dining:
+  family: dylan_family
+  insight_type: spending_anomaly
+  priority: medium
+  status: active
+  title: Food & Drink spending is up
+  body: You've spent about 40% more on Food & Drink this month than your recent three-month average.
+  metadata:
+    category_id: food-and-drink
+    direction: above
+    deviation_bucket: 25
+  currency: USD
+  period_start: <%= Date.current.beginning_of_month %>
+  period_end: <%= Date.current.end_of_month %>
+  generated_at: <%= 1.day.ago %>
+  dedup_key: <%= "spending_anomaly:food-and-drink:#{Date.current.strftime("%Y-%m")}" %>
+
+cash_flow_warning:
+  family: dylan_family
+  insight_type: cash_flow_warning
+  priority: high
+  status: active
+  title: Checking balance may run low
+  body: Based on your upcoming bills and typical spending, your checking balance could drop to about $320 in the next 30 days.
+  metadata:
+    negative: false
+    projected_low_bucket: 250
+  currency: USD
+  period_start: <%= Date.current %>
+  period_end: <%= 30.days.from_now.to_date %>
+  generated_at: <%= 1.day.ago %>
+  dedup_key: <%= "cash_flow_warning:#{Date.current.strftime("%Y-%m")}" %>
diff --git a/test/fixtures/questrade_accounts.yml b/test/fixtures/questrade_accounts.yml
new file mode 100644
index 000000000..d5a2758e4
--- /dev/null
+++ b/test/fixtures/questrade_accounts.yml
@@ -0,0 +1,8 @@
+one:
+  questrade_item: one
+  name: TFSA (12345678)
+  questrade_account_id: "12345678"
+  account_type: TFSA
+  currency: CAD
+  current_balance: 10000.00
+  account_status: Active
diff --git a/test/fixtures/questrade_items.yml b/test/fixtures/questrade_items.yml
new file mode 100644
index 000000000..a7c7bf0da
--- /dev/null
+++ b/test/fixtures/questrade_items.yml
@@ -0,0 +1,11 @@
+one:
+  family: dylan_family
+  name: My Questrade
+  refresh_token: test_refresh_token_abc123
+  status: good
+
+requires_update:
+  family: dylan_family
+  name: Stale Questrade
+  refresh_token: old_token
+  status: requires_update
diff --git a/test/fixtures/redbark_accounts.yml b/test/fixtures/redbark_accounts.yml
new file mode 100644
index 000000000..b3341c976
--- /dev/null
+++ b/test/fixtures/redbark_accounts.yml
@@ -0,0 +1,7 @@
+savings_account:
+  redbark_item: one
+  redbark_account_id: "rb_acc_savings_1"
+  connection_id: "rb_conn_1"
+  name: "Test Bank - Everyday Saver"
+  currency: AUD
+  current_balance: 2500.00
diff --git a/test/fixtures/redbark_items.yml b/test/fixtures/redbark_items.yml
new file mode 100644
index 000000000..1110133e7
--- /dev/null
+++ b/test/fixtures/redbark_items.yml
@@ -0,0 +1,6 @@
+one:
+  family: dylan_family
+
+  name: "Test Redbark Connection"
+  api_key: "rbk_live_test_api_key_123"
+  status: good
diff --git a/test/fixtures/snaptrade_items.yml b/test/fixtures/snaptrade_items.yml
index df3753dbe..497a7dd93 100644
--- a/test/fixtures/snaptrade_items.yml
+++ b/test/fixtures/snaptrade_items.yml
@@ -3,26 +3,20 @@
 
 configured_item:
   family: dylan_family
-
   name: "SnapTrade Connection"
-  client_id: "test_client_id"
-  consumer_key: "test_consumer_key"
-  snaptrade_user_id: "user_123"
-  snaptrade_user_secret: "secret_abc"
+  oauth_access_token: "test-access-token"
+  oauth_refresh_token: "test-refresh-token"
+  oauth_token_type: "Bearer"
+  oauth_scope: "read"
+  oauth_token_expires_at: <%= 1.hour.from_now %>
   status: good
   scheduled_for_deletion: false
   pending_account_setup: false
 
-# Item with credentials but not yet registered with SnapTrade
-# (user_id and user_secret are blank - represents state after saving credentials
-# but before connecting to SnapTrade portal)
-pending_registration_item:
+# Item that has never completed the OAuth flow (no tokens)
+unauthorized_item:
   family: empty
-
-  name: "Pending Registration"
-  client_id: "pending_client_id"
-  consumer_key: "pending_consumer_key"
-  # snaptrade_user_id and snaptrade_user_secret intentionally blank
-  status: good
+  name: "Unauthorized SnapTrade"
+  status: requires_update
   scheduled_for_deletion: false
   pending_account_setup: true
diff --git a/test/fixtures/trading212_accounts.yml b/test/fixtures/trading212_accounts.yml
new file mode 100644
index 000000000..781192aaa
--- /dev/null
+++ b/test/fixtures/trading212_accounts.yml
@@ -0,0 +1,26 @@
+# Minimal fixtures for Trading212 accounts
+# Per CLAUDE.md: Keep fixtures minimal (2-3 per model for base cases)
+
+main_account:
+  trading212_item: configured_item
+  name: "Trading 212 Invest"
+  trading212_account_id: "t212_acc_123"
+  currency: USD
+  current_balance: 50000.0000
+  cash_balance: 2500.0000
+  raw_positions_payload: []
+  raw_orders_payload: []
+  raw_dividends_payload: []
+  raw_transactions_payload: []
+
+pending_setup_account:
+  trading212_item: pending_setup_item
+  name: "Trading 212 ISA"
+  trading212_account_id: "t212_acc_456"
+  currency: GBP
+  current_balance: 20000.0000
+  cash_balance: 1000.0000
+  raw_positions_payload: []
+  raw_orders_payload: []
+  raw_dividends_payload: []
+  raw_transactions_payload: []
diff --git a/test/fixtures/trading212_items.yml b/test/fixtures/trading212_items.yml
new file mode 100644
index 000000000..765c040b8
--- /dev/null
+++ b/test/fixtures/trading212_items.yml
@@ -0,0 +1,49 @@
+# Minimal fixtures for Trading212 items
+# Per CLAUDE.md: Keep fixtures minimal (2-3 per model for base cases)
+
+configured_item:
+  family: dylan_family
+  name: "Trading 212 Connection"
+  status: good
+  environment: live
+  currency: USD
+  scheduled_for_deletion: false
+  pending_account_setup: false
+  api_key: "test_api_key"
+  api_secret: "test_api_secret"
+  raw_instruments_payload: []
+
+pending_setup_item:
+  family: dylan_family
+  name: "Trading 212 Setup Pending"
+  status: good
+  environment: live
+  currency: USD
+  scheduled_for_deletion: false
+  pending_account_setup: true
+  api_key: "test_api_key_pending"
+  api_secret: "test_api_secret_pending"
+  raw_instruments_payload: []
+
+requires_update_item:
+  family: dylan_family
+  name: "Trading 212 Needs Update"
+  status: requires_update
+  environment: live
+  currency: USD
+  scheduled_for_deletion: false
+  pending_account_setup: false
+  api_key: "bad_key"
+  api_secret: "bad_secret"
+  raw_instruments_payload: []
+
+no_credentials_item:
+  family: dylan_family
+  name: "Trading 212 No Credentials"
+  status: good
+  environment: demo
+  currency: USD
+  scheduled_for_deletion: false
+  pending_account_setup: true
+  # api_key and api_secret intentionally blank
+  raw_instruments_payload: []
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 109b78a13..bb62df285 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -1,9 +1,13 @@
+# password_digest is BCrypt::Password.create(user_password_test, cost: BCrypt::Engine::MIN_COST).
+# Keep MIN_COST here: verification cost is embedded in the digest, so a
+# production-cost digest adds ~230ms of CPU to every sign_in in tests.
+
 empty:
   family: empty
   first_name: User
   last_name: One
   email: user1@example.com
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   onboarded_at: <%= 3.days.ago %>
   role: admin
   ai_enabled: true
@@ -16,7 +20,7 @@ sure_support_staff:
   first_name: Support
   last_name: Admin
   email: support@sure.am
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   role: super_admin
   onboarded_at: <%= 3.days.ago %>
   ai_enabled: true
@@ -29,7 +33,7 @@ family_admin:
   first_name: Bob
   last_name: Dylan
   email: bob@bobdylan.com
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   role: admin
   onboarded_at: <%= 3.days.ago %>
   ai_enabled: true
@@ -42,7 +46,7 @@ family_member:
   first_name: Jakob
   last_name: Dylan
   email: jakobdylan@yahoo.com
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   onboarded_at: <%= 3.days.ago %>
   role: member
   ai_enabled: true
@@ -56,7 +60,7 @@ new_email:
   last_name: User
   email: user@example.com
   unconfirmed_email: new@example.com
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   onboarded_at: <%= Time.current %>
   role: member
   ai_enabled: true
@@ -69,7 +73,7 @@ intro_user:
   first_name: Intro
   last_name: User
   email: intro@example.com
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   onboarded_at: <%= 1.day.ago %>
   role: guest
   ai_enabled: true
@@ -82,7 +86,7 @@ inactive_trial_user:
   first_name: Inactive
   last_name: User
   email: inactive@example.com
-  password_digest: $2a$12$XoNBo/cMCyzpYtvhrPAhsubG21mELX48RAcjSVCRctW8dG8wrDIla
+  password_digest: $2a$04$deKu1NIqviMgrl.4NkXcieFkAmLa33RN9Tw/R/Llr22eMd4x/o/RO
   role: admin
   onboarded_at: <%= 90.days.ago %>
   ai_enabled: true
diff --git a/test/fixtures/wise_accounts.yml b/test/fixtures/wise_accounts.yml
new file mode 100644
index 000000000..9e2a5be60
--- /dev/null
+++ b/test/fixtures/wise_accounts.yml
@@ -0,0 +1,13 @@
+checking:
+  wise_item: one
+  balance_id: "10000001"
+  name: "Wise EUR"
+  currency: EUR
+  current_balance: 1000.00
+
+jar:
+  wise_item: one
+  balance_id: "10000002"
+  name: "Jar"
+  currency: EUR
+  current_balance: 5000.00
diff --git a/test/fixtures/wise_items.yml b/test/fixtures/wise_items.yml
new file mode 100644
index 000000000..4743c13d0
--- /dev/null
+++ b/test/fixtures/wise_items.yml
@@ -0,0 +1,7 @@
+one:
+  family: dylan_family
+  name: "Test Wise Connection"
+  token: "test_wise_token_123"
+  profile_id: "11111111"
+  profile_type: business
+  status: good
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 434735449..e4ea15064 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -44,6 +44,42 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_equal "Test Header Title", content_for(:header_title)
   end
 
+  test "#sidekiq_web_available? returns true when the route is mounted" do
+    named_routes = Struct.new(:defined) do
+      def route_defined?(name)
+        defined.fetch(name)
+      end
+    end
+
+    Rails.application.routes.stub(:named_routes, named_routes.new({ sidekiq_web_path: true })) do
+      assert sidekiq_web_available?
+    end
+  end
+
+  test "#sidekiq_web_available? returns false when the route is unavailable" do
+    named_routes = Struct.new(:defined) do
+      def route_defined?(name)
+        defined.fetch(name, false)
+      end
+    end
+
+    Rails.application.routes.stub(:named_routes, named_routes.new({})) do
+      assert_not sidekiq_web_available?
+    end
+  end
+
+  test "#sidekiq_web_available? returns true when only the url helper is defined" do
+    named_routes = Struct.new(:defined) do
+      def route_defined?(name)
+        defined.fetch(name, false)
+      end
+    end
+
+    Rails.application.routes.stub(:named_routes, named_routes.new({ sidekiq_web_url: true })) do
+      assert sidekiq_web_available?
+    end
+  end
+
   def setup
     @account1 = Account.new(currency: "USD", balance: 1)
     @account2 = Account.new(currency: "USD", balance: 2)
diff --git a/test/helpers/insights_helper_test.rb b/test/helpers/insights_helper_test.rb
new file mode 100644
index 000000000..84af79661
--- /dev/null
+++ b/test/helpers/insights_helper_test.rb
@@ -0,0 +1,121 @@
+require "test_helper"
+
+class InsightsHelperTest < ActionView::TestCase
+  test "positive types render success regardless of priority" do
+    insight = build_insight("net_worth_milestone", priority: "high", metadata: { "milestone" => 500_000 })
+
+    assert_equal :positive, insight_sentiment(insight)
+    assert_equal "success", insight_icon_color(insight)
+  end
+
+  test "savings rate improvement is positive even at high priority" do
+    insight = build_insight(
+      "savings_rate_change",
+      priority: "high",
+      metadata: { "current_rate" => 32.5, "previous_rate" => 20.1 }
+    )
+
+    assert_equal :positive, insight_sentiment(insight)
+    assert_equal "success", insight_icon_color(insight)
+  end
+
+  test "savings rate drop warns without going red" do
+    insight = build_insight(
+      "savings_rate_change",
+      priority: "high",
+      metadata: { "current_rate" => -5.4, "previous_rate" => 45.2 }
+    )
+
+    assert_equal :warning, insight_sentiment(insight)
+    assert_equal "warning", insight_icon_color(insight)
+  end
+
+  test "spending anomaly direction decides sentiment" do
+    above = build_insight("spending_anomaly", metadata: { "direction" => "above" })
+    below = build_insight("spending_anomaly", metadata: { "direction" => "below" })
+
+    assert_equal :warning, insight_sentiment(above)
+    assert_equal :positive, insight_sentiment(below)
+  end
+
+  test "only a projected-negative balance renders destructive" do
+    negative = build_insight("cash_flow_warning", priority: "high", metadata: { "negative" => true })
+    low = build_insight("cash_flow_warning", priority: "medium", metadata: { "negative" => false })
+
+    assert_equal "destructive", insight_icon_color(negative)
+    assert_equal "warning", insight_icon_color(low)
+  end
+
+  test "informational types stay neutral" do
+    %w[subscription_audit idle_cash].each do |type|
+      assert_equal :neutral, insight_sentiment(build_insight(type))
+      assert_equal "default", insight_icon_color(build_insight(type))
+    end
+  end
+
+  test "rows written before the metadata shape change degrade safely" do
+    stale = build_insight("cash_flow_warning", priority: "high", metadata: { "projected_low_amount" => 320.0 })
+
+    assert_equal :warning, insight_sentiment(stale)
+  end
+
+  test "meta line shows the type and a month-aligned period as the month name" do
+    insight = build_insight(
+      "savings_rate_change",
+      period_start: Date.new(Date.current.year, 6, 1),
+      period_end: Date.new(Date.current.year, 6, 30)
+    )
+
+    assert_equal "Savings rate · June", insight_meta_line(insight)
+  end
+
+  test "meta line labels a forward-looking window as next N days" do
+    insight = build_insight(
+      "cash_flow_warning",
+      period_start: Date.current,
+      period_end: Date.current + 30
+    )
+
+    assert_equal "Cash flow · Next 30 days", insight_meta_line(insight)
+  end
+
+  test "meta line falls back to the subject when there is no period" do
+    insight = build_insight("idle_cash", facts: { "account" => "Emergency fund" })
+
+    assert_equal "Idle cash · Emergency fund", insight_meta_line(insight)
+  end
+
+  test "key figure comes from facts and hides for rows without them" do
+    with_facts = build_insight("idle_cash", facts: { "balance" => "$28,400.00", "idle_days" => 60 })
+    without_facts = build_insight("idle_cash")
+
+    assert_equal "$28,400.00", insight_key_figure(with_facts).first
+    assert_nil insight_key_figure(without_facts)
+  end
+
+  test "action link resolves the stored subject and disappears when it cannot" do
+    account = families(:dylan_family).accounts.visible.first
+    resolvable = build_insight("idle_cash", metadata: { "account_id" => account.id })
+    dangling = build_insight("idle_cash", metadata: { "account_id" => SecureRandom.uuid })
+
+    assert_equal account_path(account), insight_action(resolvable)[:href]
+    assert_nil insight_action(dangling)
+  end
+
+  private
+    def build_insight(insight_type, priority: "medium", metadata: {}, facts: {}, period_start: nil, period_end: nil)
+      Insight.new(
+        family: families(:dylan_family),
+        insight_type: insight_type,
+        priority: priority,
+        status: "active",
+        title: "t",
+        body: "b",
+        metadata: metadata,
+        facts: facts,
+        period_start: period_start,
+        period_end: period_end,
+        dedup_key: "#{insight_type}:test"
+      )
+    end
+end
diff --git a/test/helpers/settings_helper_test.rb b/test/helpers/settings_helper_test.rb
new file mode 100644
index 000000000..3ee9c41d8
--- /dev/null
+++ b/test/helpers/settings_helper_test.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SettingsHelperTest < ActionView::TestCase
+  test "provider_summary for snaptrade is off when family has no snaptrade items" do
+    @snaptrade_items = []
+
+    assert_equal({ status: :off }, provider_summary("snaptrade"))
+  end
+
+  test "provider_summary for snaptrade is off when no item has completed OAuth" do
+    item = OpenStruct.new(oauth_configured?: false)
+    @snaptrade_items = [ item ]
+
+    assert_equal({ status: :off }, provider_summary("snaptrade"))
+  end
+
+  test "provider_summary for snaptrade reports sync-based status once an item is oauth configured" do
+    item = OpenStruct.new(oauth_configured?: true)
+    @snaptrade_items = [ item ]
+    @provider_sync_health = {}
+
+    assert_equal({ status: :ok, last_synced_at: nil }, provider_summary("snaptrade"))
+  end
+end
diff --git a/test/initializers/openid_connect_http_discovery_test.rb b/test/initializers/openid_connect_http_discovery_test.rb
new file mode 100644
index 000000000..3fc5da683
--- /dev/null
+++ b/test/initializers/openid_connect_http_discovery_test.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+# Regression coverage for https://github.com/we-promise/sure/issues/2844 - a
+# self-hosted IdP served over plain HTTP was upgraded to https:443 during discovery.
+class OpenIDConnectHttpDiscoveryTest < ActiveSupport::TestCase
+  Resource = OpenIDConnect::Discovery::Provider::Config::Resource
+
+  test "http issuer builds an http discovery endpoint" do
+    endpoint = Resource.new(URI.parse("http://auth.example")).endpoint
+
+    assert_equal "http://auth.example/.well-known/openid-configuration", endpoint.to_s
+  end
+
+  test "https issuer still builds an https discovery endpoint" do
+    endpoint = Resource.new(URI.parse("https://auth.example")).endpoint
+
+    assert_equal "https://auth.example/.well-known/openid-configuration", endpoint.to_s
+  end
+
+  test "custom http port is preserved" do
+    endpoint = Resource.new(URI.parse("http://auth.example:9000")).endpoint
+
+    assert_equal "http://auth.example:9000/.well-known/openid-configuration", endpoint.to_s
+  end
+
+  test "explicit non-default port is preserved per scheme" do
+    http_443 = Resource.new(URI.parse("http://auth.example:443")).endpoint
+    https_80 = Resource.new(URI.parse("https://auth.example:80")).endpoint
+
+    assert_equal "http://auth.example:443/.well-known/openid-configuration", http_443.to_s
+    assert_equal "https://auth.example:80/.well-known/openid-configuration", https_80.to_s
+  end
+
+  test "cache key varies by scheme, port, and path on the same host" do
+    baseline = cache_key_for("http://auth.example")
+    other_scheme = cache_key_for("https://auth.example")
+    other_port = cache_key_for("http://auth.example:9000")
+    other_path = cache_key_for("http://auth.example/application/o/sure")
+
+    keys = [ baseline, other_scheme, other_port, other_path ]
+    assert_equal keys.length, keys.uniq.length, "each of scheme/port/path must produce a distinct cache key"
+  end
+
+  test "issuer path prefix is preserved" do
+    endpoint = Resource.new(URI.parse("http://auth.example/application/o/sure")).endpoint
+
+    assert_equal "http://auth.example/application/o/sure/.well-known/openid-configuration", endpoint.to_s
+  end
+
+  private
+    def cache_key_for(issuer)
+      Resource.new(URI.parse(issuer)).send(:cache_key)
+    end
+end
diff --git a/test/integration/sidekiq_web_access_test.rb b/test/integration/sidekiq_web_access_test.rb
new file mode 100644
index 000000000..5f3ca9563
--- /dev/null
+++ b/test/integration/sidekiq_web_access_test.rb
@@ -0,0 +1,41 @@
+require "test_helper"
+
+class SidekiqWebAccessTest < ActionDispatch::IntegrationTest
+  test "logged-out visitor gets 404" do
+    get "/sidekiq"
+
+    assert_response :not_found
+  end
+
+  test "member gets 404" do
+    sign_in users(:family_member)
+
+    get "/sidekiq"
+
+    assert_response :not_found
+  end
+
+  test "family admin gets 404" do
+    sign_in users(:family_admin)
+
+    get "/sidekiq"
+
+    assert_response :not_found
+  end
+
+  test "super admin can access the dashboard" do
+    sign_in users(:sure_support_staff)
+
+    get "/sidekiq"
+
+    assert_response :success
+  end
+
+  test "garbage session cookie fails closed" do
+    cookies[:session_token] = "not-a-signed-cookie"
+
+    get "/sidekiq"
+
+    assert_response :not_found
+  end
+end
diff --git a/test/interfaces/import_interface_test.rb b/test/interfaces/import_interface_test.rb
index 2b4759277..e30819594 100644
--- a/test/interfaces/import_interface_test.rb
+++ b/test/interfaces/import_interface_test.rb
@@ -112,6 +112,94 @@ module ImportInterfaceTest
     assert_equal "1234.56", row.amount
   end
 
+  test "parses French/Scandinavian format with non-breaking-space thousands separator" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1 234,56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    # Real-world European CSV exports use a non-breaking space (U+00A0) as the
+    # thousands separator rather than a plain ASCII space.
+    csv_data = "date,amount,name\n01/01/2024,\"1 234,56\",Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "1234.56", row.amount
+  end
+
+  test "parses French/Scandinavian format with narrow no-break-space thousands separator" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1 234,56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    # Some locales/exporters use a narrow no-break space (U+202F) as the
+    # thousands separator, which Ruby's \s also does not match.
+    csv_data = "date,amount,name\n01/01/2024,\"1 234,56\",Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "1234.56", row.amount
+  end
+
+  test "rejects US-punctuation values under the French/Scandinavian format" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1 234,56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    # A misconfigured/mixed row using US separators ("1,234.56") must not be
+    # silently reinterpreted as 1.23456 under a space-delimited format; the
+    # unexpected period keeps it invalid so it surfaces as blank instead.
+    csv_data = "date,amount,name\n01/01/2024,\"1,234.56\",Test"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    row = import.rows.first
+    assert_equal "", row.amount
+  end
+
+  test "strips leading/trailing currency junk under the French/Scandinavian format" do
+    import = imports(:transaction)
+    import.update!(
+      number_format: "1 234,56",
+      amount_col_label: "amount",
+      date_col_label: "date",
+      name_col_label: "name",
+      date_format: "%m/%d/%Y"
+    )
+
+    # Currency symbols/codes at the edges (issue #2537's "1 234,56 kr" row) are
+    # stripped; the amount still parses. Interior junk is not stripped (covered
+    # by the mixed-punctuation rejection test above).
+    csv_data = "date,amount,name\n" \
+               "01/01/2024,\"1 234,56 kr\",Suffix\n" \
+               "01/02/2024,\"€1 234,56\",Prefix"
+    import.update!(raw_file_str: csv_data)
+    import.generate_rows_from_csv
+    import.reload
+
+    assert_equal "1234.56", import.rows.first.amount
+    assert_equal "1234.56", import.rows.second.amount
+  end
+
   test "parses zero-decimal currency format correctly" do
     import = imports(:transaction)
     import.update!(
diff --git a/test/interfaces/syncable_interface_test.rb b/test/interfaces/syncable_interface_test.rb
index df1420529..a972f375d 100644
--- a/test/interfaces/syncable_interface_test.rb
+++ b/test/interfaces/syncable_interface_test.rb
@@ -18,6 +18,18 @@ module SyncableInterfaceTest
     @syncable.perform_sync(mock_sync)
   end
 
+  test "sync_later does not enqueue SyncJob while a surrounding transaction is still open" do
+    job_enqueued_mid_transaction = false
+
+    ActiveRecord::Base.transaction do
+      @syncable.sync_later
+      job_enqueued_mid_transaction = queue_adapter.enqueued_jobs.any? { |j| j[:job] == SyncJob }
+    end
+
+    assert_not job_enqueued_mid_transaction, "SyncJob was enqueued inside an open transaction (GlobalID race)"
+    assert_enqueued_with(job: SyncJob)
+  end
+
   test "second sync request widens existing pending window" do
     later_start = 2.days.ago.to_date
     first_sync = @syncable.sync_later(window_start_date: later_start, window_end_date: later_start)
diff --git a/test/javascript/preview_deploy/render_preview_config_test.cjs b/test/javascript/preview_deploy/render_preview_config_test.cjs
new file mode 100644
index 000000000..70deab73f
--- /dev/null
+++ b/test/javascript/preview_deploy/render_preview_config_test.cjs
@@ -0,0 +1,100 @@
+const assert = require("node:assert/strict");
+const { describe, it } = require("node:test");
+
+const {
+  findRegistryImageRef,
+  renderPreviewConfig,
+  validateRegistryImageRef,
+} = require("../../../workers/preview/deploy/render_preview_config.cjs");
+
+const options = {
+  accountId: "account_123",
+  prNumber: "2160",
+  headSha: "3f013c4d9193ff111295c89a6f833d59bd69d91e",
+};
+const imageRef =
+  "registry.cloudflare.com/account_123/sure-preview-pr-2160:3f013c4d9193ff111295c89a6f833d59bd69d91e";
+
+describe("renderPreviewConfig", () => {
+  it("renders exactly one trusted TOML image entry to a registry reference", () => {
+    const source = [
+      'name = "sure-preview-2160"',
+      "",
+      "[[containers]]",
+      'image = "../../Dockerfile.preview"',
+      'class_name = "RailsContainer"',
+      "",
+    ].join("\n");
+
+    const rendered = renderPreviewConfig(source, imageRef, options);
+
+    assert.ok(rendered.includes(`image = "${imageRef}"`));
+    assert.doesNotMatch(rendered, /Dockerfile\.preview/);
+  });
+
+  it("rejects missing image entries", () => {
+    assert.throws(
+      () => renderPreviewConfig('name = "sure-preview-2160"\n', imageRef, options),
+      /contain an image entry/
+    );
+  });
+
+  it("rejects duplicate image entries", () => {
+    const source = [
+      "[[containers]]",
+      'image = "../../Dockerfile.preview"',
+      "",
+      "[[containers]]",
+      'image = "../../OtherDockerfile"',
+      "",
+    ].join("\n");
+
+    assert.throws(() => renderPreviewConfig(source, imageRef, options), /exactly one image entry/);
+  });
+
+  it("rejects local Docker tags as deploy image refs", () => {
+    assert.throws(
+      () => renderPreviewConfig('image = "../../Dockerfile.preview"\n', "my-local-image:latest", options),
+      /Cloudflare registry image reference/
+    );
+  });
+});
+
+describe("validateRegistryImageRef", () => {
+  it("accepts the expected registry ref", () => {
+    assert.equal(validateRegistryImageRef(imageRef, options), imageRef);
+  });
+
+  it("rejects registry refs for another PR", () => {
+    const wrongPr =
+      "registry.cloudflare.com/account_123/sure-preview-pr-2161:3f013c4d9193ff111295c89a6f833d59bd69d91e";
+
+    assert.throws(() => validateRegistryImageRef(wrongPr, options), /does not match this preview artifact/);
+  });
+
+  it("rejects registry refs for another account", () => {
+    const wrongAccount =
+      "registry.cloudflare.com/account_456/sure-preview-pr-2160:3f013c4d9193ff111295c89a6f833d59bd69d91e";
+
+    assert.throws(() => validateRegistryImageRef(wrongAccount, options), /account does not match/);
+  });
+});
+
+describe("findRegistryImageRef", () => {
+  it("extracts the expected registry image ref from wrangler output", () => {
+    const log = [
+      "Pushing image layers",
+      "Published registry.cloudflare.com/account_123/sure-preview-pr-2160:3f013c4d9193ff111295c89a6f833d59bd69d91e",
+      "Done",
+    ].join("\n");
+
+    assert.equal(findRegistryImageRef(log, options), imageRef);
+  });
+
+  it("ignores registry refs that do not match this preview artifact", () => {
+    const log =
+      "Published registry.cloudflare.com/account_123/sure-preview-pr-2161:3f013c4d9193ff111295c89a6f833d59bd69d91e";
+
+    assert.equal(findRegistryImageRef(log, options), "");
+  });
+});
diff --git a/test/javascript/preview_deploy/resolve_preview_request_test.cjs b/test/javascript/preview_deploy/resolve_preview_request_test.cjs
index 7dc799c7a..a3fb32a1f 100644
--- a/test/javascript/preview_deploy/resolve_preview_request_test.cjs
+++ b/test/javascript/preview_deploy/resolve_preview_request_test.cjs
@@ -123,7 +123,7 @@ describe("selectPullRequestNumber", () => {
   const headSha = "4f1159e99c7785bc370f53510284c251fabdb75b";
   const context = contextFor({ id: 123, head_sha: headSha });
 
-  it("falls back to commit association when workflow_run has no PR payload", () => {
+  it("prefers the preview artifact when commit association matches", () => {
     const selected = selectPullRequestNumber({
       runPullRequest: undefined,
       artifacts: [previewArtifact(2017, headSha)],
@@ -134,7 +134,37 @@ describe("selectPullRequestNumber", () => {
 
     assert.deepEqual(selected, {
       prNumber: 2017,
-      source: "commit_association",
+      source: "artifact_name+commit_association",
+    });
+  });
+
+  it("records workflow_run as a corroborating source when it matches the preview artifact", () => {
+    const selected = selectPullRequestNumber({
+      runPullRequest: { number: 2017 },
+      artifacts: [previewArtifact(2017, headSha)],
+      associatedPullRequests: [],
+      context,
+      headSha,
+    });
+
+    assert.deepEqual(selected, {
+      prNumber: 2017,
+      source: "artifact_name+workflow_run",
+    });
+  });
+
+  it("records workflow_run and commit association when both match the preview artifact", () => {
+    const selected = selectPullRequestNumber({
+      runPullRequest: { number: 2017 },
+      artifacts: [previewArtifact(2017, headSha)],
+      associatedPullRequests: [openPullRequest(2017, headSha, "Rene0422/sure")],
+      context,
+      headSha,
+    });
+
+    assert.deepEqual(selected, {
+      prNumber: 2017,
+      source: "artifact_name+workflow_run+commit_association",
     });
   });
 
@@ -152,10 +182,38 @@ describe("selectPullRequestNumber", () => {
 
     assert.deepEqual(selected, {
       prNumber: 2060,
-      source: "artifact_and_commit_association",
+      source: "artifact_name+commit_association",
     });
   });
 
+  it("fails closed when workflow metadata disagrees with the preview artifact", () => {
+    const selected = selectPullRequestNumber({
+      runPullRequest: { number: 1985 },
+      artifacts: [previewArtifact(1798, headSha)],
+      associatedPullRequests: [openPullRequest(1798, headSha)],
+      context,
+      headSha,
+    });
+
+    assert.equal(selected.prNumber, undefined);
+    assert.equal(typeof selected.error, "string");
+    assert.match(selected.error, /conflicts with workflow_run PR 1985/);
+  });
+
+  it("fails closed when commit association disagrees with the preview artifact", () => {
+    const selected = selectPullRequestNumber({
+      runPullRequest: undefined,
+      artifacts: [previewArtifact(1798, headSha)],
+      associatedPullRequests: [openPullRequest(1985, headSha)],
+      context,
+      headSha,
+    });
+
+    assert.equal(selected.prNumber, undefined);
+    assert.equal(typeof selected.error, "string");
+    assert.match(selected.error, /conflicts with commit-associated PRs 1985/);
+  });
+
   it("refuses ambiguous associated PRs without a single matching artifact", () => {
     const selected = selectPullRequestNumber({
       runPullRequest: undefined,
@@ -197,6 +255,7 @@ describe("resolvePreviewRequest", () => {
     assert.equal(state.outputs.head_sha, headSha);
     assert.equal(state.outputs.artifact_name, `preview-image-pr-2017-${headSha}`);
     assert.equal(state.outputs.is_fork, "true");
+    assert.equal(state.outputs.resolution_source, "artifact_name+commit_association");
   });
 
   it("resolves PRs from artifact names when workflow and commit association metadata are unavailable", async () => {
@@ -216,6 +275,7 @@ describe("resolvePreviewRequest", () => {
     assert.equal(state.outputs.head_sha, headSha);
     assert.equal(state.outputs.artifact_name, `preview-image-pr-2017-${headSha}`);
     assert.equal(state.outputs.is_fork, "true");
+    assert.equal(state.outputs.resolution_source, "artifact_name");
     assert.match(state.messages.join("\n"), /Resolved PR 2017 from artifact_name; fork=true/);
   });
 
diff --git a/test/javascript/utils/sidebar_resize_test.mjs b/test/javascript/utils/sidebar_resize_test.mjs
new file mode 100644
index 000000000..966aad515
--- /dev/null
+++ b/test/javascript/utils/sidebar_resize_test.mjs
@@ -0,0 +1,84 @@
+import { describe, it } from "node:test"
+import assert from "node:assert/strict"
+
+// Inline the function to avoid needing a bundler for ESM imports.
+// Must be kept in sync with app/javascript/utils/sidebar_resize.js
+const SIDEBAR_NAVBAR_WIDTH = 84
+const SIDEBAR_MIN_WIDTH = 240
+const SIDEBAR_MIN_MAIN_WIDTH = 400
+
+function clampSidebarWidth(rawWidth, {
+  viewportWidth,
+  otherWidth = 0,
+  navbarWidth = SIDEBAR_NAVBAR_WIDTH,
+  min = SIDEBAR_MIN_WIDTH,
+  minMain = SIDEBAR_MIN_MAIN_WIDTH,
+  absMax = Infinity,
+} = {}) {
+  const available = viewportWidth - navbarWidth - otherWidth - minMain
+  const max = Math.max(min, Math.min(absMax, available))
+  const clamped = Math.min(Math.max(rawWidth, min), max)
+  return Math.round(clamped)
+}
+
+describe("clampSidebarWidth", () => {
+  // A roomy 1440px viewport with the opposite sidebar at its default width.
+  const wide = { viewportWidth: 1440, otherWidth: 400 }
+
+  describe("within bounds", () => {
+    it("returns a width inside the allowed range unchanged", () => {
+      assert.equal(clampSidebarWidth(320, wide), 320)
+    })
+
+    it("rounds fractional pointer widths", () => {
+      assert.equal(clampSidebarWidth(321.6, wide), 322)
+    })
+  })
+
+  describe("minimum width", () => {
+    it("pins anything below the minimum up to the minimum", () => {
+      assert.equal(clampSidebarWidth(100, wide), SIDEBAR_MIN_WIDTH)
+    })
+
+    it("pins negative values to the minimum", () => {
+      assert.equal(clampSidebarWidth(-50, wide), SIDEBAR_MIN_WIDTH)
+    })
+  })
+
+  describe("per-side absolute max", () => {
+    it("caps at absMax even when more room is available", () => {
+      // 1440 - 84 - 400 - 400 = 556 available, but absMax wins.
+      assert.equal(clampSidebarWidth(900, { ...wide, absMax: 480 }), 480)
+    })
+  })
+
+  describe("protecting the center column", () => {
+    it("never lets the main area drop below the minimum", () => {
+      // At 1024px with the other sidebar at 240, the most this side can take is
+      // 1024 - 84 - 240 - 400 = 300px.
+      const width = clampSidebarWidth(900, { viewportWidth: 1024, otherWidth: 240 })
+      assert.equal(width, 300)
+      const mainLeft = 1024 - 84 - 240 - width
+      assert.equal(mainLeft, SIDEBAR_MIN_MAIN_WIDTH)
+    })
+
+    it("shrinks the allowance as the opposite sidebar grows", () => {
+      const narrow = clampSidebarWidth(900, { viewportWidth: 1024, otherWidth: 300 })
+      assert.equal(narrow, 240) // 1024 - 84 - 300 - 400 = 240
+    })
+  })
+
+  describe("degenerate viewports", () => {
+    it("falls back to the minimum when there is no room to give", () => {
+      // available goes negative; we accept the squeeze rather than return junk.
+      assert.equal(clampSidebarWidth(500, { viewportWidth: 600, otherWidth: 240 }), SIDEBAR_MIN_WIDTH)
+    })
+  })
+
+  describe("default options", () => {
+    it("treats a missing opposite sidebar as zero width", () => {
+      // 1440 - 84 - 0 - 400 = 956 available, request honored.
+      assert.equal(clampSidebarWidth(700, { viewportWidth: 1440 }), 700)
+    })
+  })
+})
diff --git a/test/javascript/utils/transactions_filter_url_test.mjs b/test/javascript/utils/transactions_filter_url_test.mjs
new file mode 100644
index 000000000..c7d2109fa
--- /dev/null
+++ b/test/javascript/utils/transactions_filter_url_test.mjs
@@ -0,0 +1,49 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import {
+  isNavigableCategoryNode,
+  buildCategoryTransactionsUrl,
+} from "../../../app/javascript/utils/transactions_filter_url.mjs";
+
+test("category nodes are navigable, structural nodes are not", () => {
+  assert.equal(isNavigableCategoryNode("expense_15"), true);
+  assert.equal(isNavigableCategoryNode("income_3"), true);
+  assert.equal(isNavigableCategoryNode("expense_sub_19"), true);
+  assert.equal(isNavigableCategoryNode("income_sub_7"), true);
+  assert.equal(isNavigableCategoryNode("cash_flow_node"), false);
+  assert.equal(isNavigableCategoryNode("surplus_node"), false);
+  // Bare aggregate ids are not category nodes.
+  assert.equal(isNavigableCategoryNode("income"), false);
+  assert.equal(isNavigableCategoryNode("expense"), false);
+});
+
+test("builds a transactions deep link with category and date range", () => {
+  const url = buildCategoryTransactionsUrl({
+    name: "Groceries",
+    startDate: "2026-05-01",
+    endDate: "2026-05-31",
+  });
+  assert.equal(
+    url,
+    "/transactions?q%5Bcategories%5D%5B%5D=Groceries&q%5Bstart_date%5D=2026-05-01&q%5Bend_date%5D=2026-05-31",
+  );
+});
+
+test("encodes category names with special characters", () => {
+  const url = buildCategoryTransactionsUrl({
+    name: "Food & Drink",
+    startDate: "2026-05-01",
+    endDate: "2026-05-31",
+  });
+  assert.match(url, /q%5Bcategories%5D%5B%5D=Food\+%26\+Drink/);
+});
+
+test("omits date params when dates are blank", () => {
+  const url = buildCategoryTransactionsUrl({
+    name: "Groceries",
+    startDate: "",
+    endDate: "",
+  });
+  assert.equal(url, "/transactions?q%5Bcategories%5D%5B%5D=Groceries");
+});
diff --git a/test/jobs/application_job_test.rb b/test/jobs/application_job_test.rb
new file mode 100644
index 000000000..75fffcb3d
--- /dev/null
+++ b/test/jobs/application_job_test.rb
@@ -0,0 +1,36 @@
+require "test_helper"
+
+class ApplicationJobTest < ActiveJob::TestCase
+  # Throwaway subclass used only to exercise ApplicationJob's enqueue policy
+  # without depending on any real job's side effects.
+  class CanaryJob < ApplicationJob
+    def perform; end
+  end
+
+  test "defers enqueue until the surrounding transaction commits" do
+    enqueued_mid_transaction = nil
+
+    ActiveRecord::Base.transaction do
+      CanaryJob.perform_later
+      enqueued_mid_transaction = enqueued_jobs.any? { |job| job[:job] == CanaryJob }
+    end
+
+    assert_not enqueued_mid_transaction, "job was enqueued before the transaction committed"
+    assert_enqueued_with job: CanaryJob
+  end
+
+  test "drops the enqueue when the surrounding transaction rolls back" do
+    assert_no_enqueued_jobs do
+      ActiveRecord::Base.transaction do
+        CanaryJob.perform_later
+        raise ActiveRecord::Rollback
+      end
+    end
+  end
+
+  test "enqueues immediately when there is no surrounding transaction" do
+    assert_enqueued_with job: CanaryJob do
+      CanaryJob.perform_later
+    end
+  end
+end
diff --git a/test/jobs/destroy_job_test.rb b/test/jobs/destroy_job_test.rb
new file mode 100644
index 000000000..54633495e
--- /dev/null
+++ b/test/jobs/destroy_job_test.rb
@@ -0,0 +1,32 @@
+require "test_helper"
+require "ostruct"
+
+class DestroyJobTest < ActiveJob::TestCase
+  test "destroys the model" do
+    model = mock
+    model.expects(:destroy).once
+
+    DestroyJob.perform_now(model)
+  end
+
+  test "resets scheduled_for_deletion when the destroy fails" do
+    model = OpenStruct.new(scheduled_for_deletion: true)
+    model.stubs(:destroy).raises(ActiveRecord::RecordNotDestroyed.new("nope"))
+    model.expects(:update!).with(scheduled_for_deletion: false).once
+
+    DestroyJob.perform_now(model)
+  end
+
+  test "inherits the deferred-enqueue policy from ApplicationJob" do
+    account = accounts(:depository)
+    enqueued_mid_transaction = nil
+
+    ActiveRecord::Base.transaction do
+      DestroyJob.perform_later(account)
+      enqueued_mid_transaction = enqueued_jobs.any? { |job| job[:job] == DestroyJob }
+    end
+
+    assert_not enqueued_mid_transaction, "DestroyJob enqueued before the transaction committed"
+    assert_enqueued_with job: DestroyJob
+  end
+end
diff --git a/test/jobs/family_data_export_job_test.rb b/test/jobs/family_data_export_job_test.rb
index 6aae26e81..79ed56f09 100644
--- a/test/jobs/family_data_export_job_test.rb
+++ b/test/jobs/family_data_export_job_test.rb
@@ -18,6 +18,18 @@ class FamilyDataExportJobTest < ActiveJob::TestCase
     assert @export.export_file.attached?
   end
 
+  test "does not restart an export in a terminal status" do
+    @export.update_columns(status: "failed")
+
+    Family::DataExporter.any_instance.expects(:generate_export).never
+
+    perform_enqueued_jobs do
+      FamilyDataExportJob.perform_later(@export)
+    end
+
+    assert_equal "failed", @export.reload.status
+  end
+
   test "marks export as failed on error" do
     # Mock the exporter to raise an error
     Family::DataExporter.any_instance.stubs(:generate_export).raises(StandardError, "Export failed")
diff --git a/test/jobs/family_reset_job_test.rb b/test/jobs/family_reset_job_test.rb
index d5979f3f7..739df4b60 100644
--- a/test/jobs/family_reset_job_test.rb
+++ b/test/jobs/family_reset_job_test.rb
@@ -10,10 +10,25 @@ class FamilyResetJobTest < ActiveJob::TestCase
   test "resets family data successfully" do
     initial_account_count = @family.accounts.count
     initial_category_count = @family.categories.count
+    import_session = @family.import_sessions.create!(expected_chunks: 1)
+    import_session.imports.create!(
+      family: @family,
+      type: "SureImport",
+      sequence: 1,
+      checksum: "a" * 64
+    )
+    import_session.source_mappings.create!(
+      family: @family,
+      source_type: "Category",
+      source_id: "source-category-1",
+      target: @family.categories.first
+    )
 
     # Family should have existing data
     assert initial_account_count > 0
     assert initial_category_count > 0
+    assert_equal 1, @family.import_sessions.count
+    assert_equal 1, @family.import_source_mappings.count
 
     # Don't expect Plaid removal calls since we're using fixtures without setup
     @plaid_provider.stubs(:remove_item)
@@ -23,6 +38,38 @@ class FamilyResetJobTest < ActiveJob::TestCase
     # All data should be removed
     assert_equal 0, @family.accounts.reload.count
     assert_equal 0, @family.categories.reload.count
+    assert_equal 0, @family.import_sessions.reload.count
+    assert_equal 0, @family.import_source_mappings.reload.count
+    assert_equal 0, @family.imports.reload.count
+  end
+
+  test "reset leaves another family's imports and mappings untouched" do
+    other_family = Family.create!(name: "Other Family", currency: "USD", locale: "en")
+    other_category = other_family.categories.create!(name: "Other Category")
+    other_session = other_family.import_sessions.create!(expected_chunks: 1)
+    other_import = other_session.imports.create!(
+      family: other_family,
+      type: "SureImport",
+      sequence: 1,
+      checksum: "b" * 64
+    )
+    other_mapping = other_session.source_mappings.create!(
+      family: other_family,
+      source_type: "Category",
+      source_id: "source-category-1",
+      target: other_category
+    )
+
+    @family.import_sessions.create!(expected_chunks: 1)
+    @plaid_provider.stubs(:remove_item)
+
+    FamilyResetJob.perform_now(@family)
+
+    assert ImportSession.exists?(other_session.id)
+    assert Import.exists?(other_import.id)
+    assert ImportSourceMapping.exists?(other_mapping.id)
+    assert Category.exists?(other_category.id)
+    assert_equal other_category, other_mapping.reload.target
   end
 
   test "resets family data even when Plaid credentials are invalid" do
diff --git a/test/jobs/generate_insights_job_test.rb b/test/jobs/generate_insights_job_test.rb
new file mode 100644
index 000000000..55ef3ce21
--- /dev/null
+++ b/test/jobs/generate_insights_job_test.rb
@@ -0,0 +1,241 @@
+require "test_helper"
+
+class GenerateInsightsJobTest < ActiveJob::TestCase
+  setup do
+    @family = families(:dylan_family)
+    enable_preview_features(@family)
+  end
+
+  test "without args enqueues one job per preview-enabled family" do
+    assert_operator Family.count, :>, Family.with_preview_features.count,
+      "fixture setup should leave some families without preview access"
+
+    assert_enqueued_jobs Family.with_preview_features.count, only: GenerateInsightsJob do
+      GenerateInsightsJob.perform_now
+    end
+
+    assert_enqueued_with(job: GenerateInsightsJob, args: [ { family_id: @family.id } ])
+  end
+
+  # Insights is a preview feature and the job manufactures data (and can spend
+  # LLM budget) per family, so families with nobody opted in are skipped
+  # entirely rather than generated for and hidden.
+  test "without args enqueues nothing when no family has preview access" do
+    disable_preview_features(@family)
+
+    assert_no_enqueued_jobs only: GenerateInsightsJob do
+      GenerateInsightsJob.perform_now
+    end
+  end
+
+  test "does nothing for a family without preview access" do
+    disable_preview_features(@family)
+
+    assert_no_difference "Insight.count" do
+      GenerateInsightsJob.perform_now(family_id: @family.id)
+    end
+  end
+
+  test "does not broadcast for a family without preview access" do
+    disable_preview_features(@family)
+
+    Turbo::StreamsChannel.expects(:broadcast_replace_to).never
+
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+  end
+
+  test "generates for a family where only one member opted in" do
+    @family.users.each { |user| set_preview_features(user, false) }
+    set_preview_features(@family.users.first, true)
+
+    stub_generated([ generated_insight ])
+
+    assert_difference "@family.insights.count", 1 do
+      GenerateInsightsJob.perform_now(family_id: @family.id)
+    end
+  end
+
+  test "does nothing for an unknown family" do
+    assert_nothing_raised do
+      GenerateInsightsJob.perform_now(family_id: SecureRandom.uuid)
+    end
+  end
+
+  test "does nothing for a family without accounts" do
+    family = families(:empty)
+
+    assert_no_difference "Insight.count" do
+      GenerateInsightsJob.perform_now(family_id: family.id)
+    end
+  end
+
+  test "runs all generators against real family data without raising" do
+    assert_nothing_raised do
+      GenerateInsightsJob.perform_now(family_id: @family.id)
+    end
+  end
+
+  test "creates an active insight with a body from a generated insight" do
+    stub_generated([ generated_insight ])
+
+    assert_difference "@family.insights.count", 1 do
+      GenerateInsightsJob.perform_now(family_id: @family.id)
+    end
+
+    insight = @family.insights.find_by(dedup_key: "idle_cash:test-account:2026-07")
+    assert_equal "active", insight.status
+    assert_equal "idle_cash", insight.insight_type
+    assert insight.body.present?
+    assert_equal 5000.0, insight.metadata["balance"]
+  end
+
+  test "re-running with unchanged numbers does not duplicate or rewrite" do
+    stub_generated([ generated_insight ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight = @family.insights.find_by(dedup_key: "idle_cash:test-account:2026-07")
+    original_body = insight.body
+
+    assert_no_difference "@family.insights.count" do
+      GenerateInsightsJob.perform_now(family_id: @family.id)
+    end
+
+    assert_equal original_body, insight.reload.body
+  end
+
+  test "persists display facts and refreshes them without a body rewrite when metadata is unchanged" do
+    stub_generated([ generated_insight ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight = @family.insights.find_by(dedup_key: "idle_cash:test-account:2026-07")
+    assert_equal "$5000", insight.facts["balance"]
+    original_body = insight.body
+    insight.mark_read!
+
+    stub_generated([ generated_insight(display_balance: 5040) ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight.reload
+    assert_equal "$5040", insight.facts["balance"]
+    assert_equal original_body, insight.body
+    assert insight.read?
+  end
+
+  test "dismissed insight stays dismissed when numbers are unchanged" do
+    stub_generated([ generated_insight ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight = @family.insights.find_by(dedup_key: "idle_cash:test-account:2026-07")
+    insight.dismiss!
+
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    assert insight.reload.dismissed?
+  end
+
+  test "dismissed insight reactivates when numbers change materially" do
+    stub_generated([ generated_insight ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight = @family.insights.find_by(dedup_key: "idle_cash:test-account:2026-07")
+    insight.dismiss!
+
+    stub_generated([ generated_insight(balance: 9000.0) ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight.reload
+    assert insight.active?
+    assert_equal 9000.0, insight.metadata["balance"]
+    assert_nil insight.dismissed_at
+    assert_nil insight.read_at
+  end
+
+  test "expires a visible insight whose condition cleared" do
+    insight = insights(:cash_flow_warning)
+    stub_generated([], succeeded_types: [ "cash_flow_warning" ])
+
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    assert insight.reload.expired?
+    assert_not_includes Insight.visible, insight
+  end
+
+  test "does not expire insights whose generator failed" do
+    insight = insights(:cash_flow_warning)
+    stub_generated([], succeeded_types: [])
+
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    assert insight.reload.active?
+  end
+
+  test "does not touch dismissed insights when their condition clears" do
+    insight = insights(:cash_flow_warning)
+    insight.dismiss!
+    stub_generated([], succeeded_types: [ "cash_flow_warning" ])
+
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    assert insight.reload.dismissed?
+  end
+
+  test "expired insight reactivates without a body rewrite when the condition returns unchanged" do
+    stub_generated([ generated_insight ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight = @family.insights.find_by(dedup_key: "idle_cash:test-account:2026-07")
+    original_body = insight.body
+    insight.mark_read!
+
+    stub_generated([], succeeded_types: [ "idle_cash" ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+    assert insight.reload.expired?
+
+    stub_generated([ generated_insight ])
+    GenerateInsightsJob.perform_now(family_id: @family.id)
+
+    insight.reload
+    assert insight.active?
+    assert_equal original_body, insight.body
+    assert_nil insight.read_at
+  end
+
+  private
+    def enable_preview_features(family)
+      family.users.each { |user| set_preview_features(user, true) }
+    end
+
+    def disable_preview_features(family)
+      family.users.each { |user| set_preview_features(user, false) }
+    end
+
+    def set_preview_features(user, enabled)
+      user.update!(preferences: (user.preferences || {}).merge("preview_features_enabled" => enabled))
+    end
+
+    def stub_generated(generated_insights, succeeded_types: nil)
+      result = Insight::GeneratorRegistry::Result.new(
+        insights: generated_insights,
+        succeeded_types: succeeded_types || generated_insights.map(&:insight_type).uniq
+      )
+      Insight::GeneratorRegistry.any_instance.stubs(:generate_all).returns(result)
+    end
+
+    # display_balance changes only the formatted facts, leaving metadata (the
+    # material-change signal) untouched — mirrors a balance drifting slightly
+    # between runs without crossing a bucket boundary.
+    def generated_insight(balance: 5000.0, display_balance: nil)
+      Insight::Generator::GeneratedInsight.new(
+        insight_type: "idle_cash",
+        priority: "low",
+        title: "Idle cash in Test Checking",
+        template_key: "idle_cash",
+        facts: { account: "Test Checking", balance: "$#{(display_balance || balance).to_i}", idle_days: 60 },
+        metadata: { account_id: "test-account", balance: balance },
+        currency: "USD",
+        period_start: nil,
+        period_end: nil,
+        dedup_key: "idle_cash:test-account:2026-07"
+      )
+    end
+end
diff --git a/test/jobs/snaptrade_follow_up_sync_job_test.rb b/test/jobs/snaptrade_follow_up_sync_job_test.rb
new file mode 100644
index 000000000..5716166da
--- /dev/null
+++ b/test/jobs/snaptrade_follow_up_sync_job_test.rb
@@ -0,0 +1,23 @@
+require "test_helper"
+
+class SnaptradeFollowUpSyncJobTest < ActiveJob::TestCase
+  test "queues a sync after the active sync has finished" do
+    item = snaptrade_items(:configured_item)
+
+    assert_difference "item.syncs.count", 1 do
+      SnaptradeFollowUpSyncJob.perform_now(item)
+    end
+  end
+
+  test "retries while an item sync is in progress" do
+    item = snaptrade_items(:configured_item)
+    active_sync = item.syncs.create!
+    active_sync.start!
+
+    assert_no_difference "item.syncs.count" do
+      assert_enqueued_with job: SnaptradeFollowUpSyncJob do
+        SnaptradeFollowUpSyncJob.perform_now(item)
+      end
+    end
+  end
+end
diff --git a/test/jobs/sync_cleaner_job_test.rb b/test/jobs/sync_cleaner_job_test.rb
new file mode 100644
index 000000000..898ed0b35
--- /dev/null
+++ b/test/jobs/sync_cleaner_job_test.rb
@@ -0,0 +1,96 @@
+require "test_helper"
+
+class SyncCleanerJobTest < ActiveSupport::TestCase
+  test "reaps records stuck by lost jobs and spares fresh ones" do
+    stuck_import = imports(:transaction)
+    stuck_import.update_columns(status: "importing", updated_at: 7.hours.ago)
+
+    stuck_revert = imports(:trade)
+    stuck_revert.update_columns(status: "reverting", updated_at: 7.hours.ago)
+
+    stuck_pdf = imports(:pdf)
+    stuck_pdf.update_columns(status: "importing", updated_at: 7.hours.ago)
+
+    stuck_export = FamilyExport.create!(family: families(:dylan_family))
+    stuck_export.update_columns(status: "processing", updated_at: 3.hours.ago)
+
+    stuck_session = families(:dylan_family).import_sessions.create!(status: :importing)
+    stuck_session.update_columns(updated_at: 7.hours.ago)
+
+    fresh_import = imports(:account)
+    fresh_import.update_columns(status: "importing", updated_at: 1.hour.ago)
+
+    fresh_export = FamilyExport.create!(family: families(:dylan_family))
+    fresh_export.update_columns(status: "processing", updated_at: 30.minutes.ago)
+
+    SyncCleanerJob.perform_now
+
+    assert_equal "failed", stuck_import.reload.status
+    assert_equal Import.interrupted_error_message, stuck_import.error
+
+    assert_equal "revert_failed", stuck_revert.reload.status
+
+    # PdfImport's importing status is a processing claim — reclaimed, not failed
+    assert_equal "pending", stuck_pdf.reload.status
+
+    assert_equal "failed", stuck_export.reload.status
+    assert_equal "failed", stuck_session.reload.status
+    assert_equal "import_interrupted", stuck_session.error_details["code"]
+
+    assert_equal "importing", fresh_import.reload.status
+    assert_equal "processing", fresh_export.reload.status
+  end
+
+  test "clears provider activity fetch flags stuck by lost job chains" do
+    stuck = snaptrade_accounts(:fidelity_401k)
+    stuck.update_columns(activities_fetch_pending: true, updated_at: 7.hours.ago)
+
+    SyncCleanerJob.perform_now
+
+    assert_not stuck.reload.activities_fetch_pending
+  end
+
+  test "a failing sweep does not block the others" do
+    Sync.expects(:clean).raises(StandardError.new("boom"))
+
+    stuck_export = FamilyExport.create!(family: families(:dylan_family))
+    stuck_export.update_columns(status: "processing", updated_at: 3.hours.ago)
+
+    assert_nothing_raised do
+      SyncCleanerJob.perform_now
+    end
+
+    assert_equal "failed", stuck_export.reload.status
+  end
+
+  test "reaped records are captured as debug log entries" do
+    stuck_import = imports(:transaction)
+    stuck_import.update_columns(status: "importing", updated_at: 7.hours.ago)
+
+    assert_difference "DebugLogEntry.count", 1 do
+      SyncCleanerJob.perform_now
+    end
+
+    entry = DebugLogEntry.order(:created_at).last
+    assert_equal "background_jobs", entry.category
+    assert_equal stuck_import.family, entry.family
+    assert_equal stuck_import.id, entry.metadata["record_id"]
+  end
+
+  test "activity-flag sweep isolates a failing model so later models still run" do
+    snaptrade = snaptrade_accounts(:fidelity_401k)
+    snaptrade.update_columns(activities_fetch_pending: true, updated_at: 7.hours.ago)
+
+    questrade = questrade_accounts(:one)
+    questrade.update_columns(activities_fetch_pending: true, updated_at: 7.hours.ago)
+
+    # SnaptradeAccount is swept before QuestradeAccount; a failing update! on a
+    # Snaptrade record must not skip the models that follow it.
+    SnaptradeAccount.any_instance.stubs(:update!).raises(ActiveRecord::RecordInvalid.new(SnaptradeAccount.new))
+
+    assert_nothing_raised { SyncCleanerJob.perform_now }
+
+    assert snaptrade.reload.activities_fetch_pending      # rolled back, still stuck
+    assert_not questrade.reload.activities_fetch_pending  # still cleared
+  end
+end
diff --git a/test/jobs/sync_property_valuations_job_test.rb b/test/jobs/sync_property_valuations_job_test.rb
new file mode 100644
index 000000000..5ae6ef95d
--- /dev/null
+++ b/test/jobs/sync_property_valuations_job_test.rb
@@ -0,0 +1,169 @@
+require "test_helper"
+
+class SyncPropertyValuationsJobTest < ActiveSupport::TestCase
+  setup do
+    @account = accounts(:property)
+    @property = @account.property
+    @property.update!(avm_provider: "rentcast")
+  end
+
+  def valuation_data(valuation: 600_000)
+    Provider::PropertyValuationConcept::PropertyValuation.new(
+      valuation: valuation,
+      currency: "USD",
+      property_type: "single_family_home",
+      year_built: 1973,
+      area_value: 1878,
+      area_unit: "sqft"
+    )
+  end
+
+  test "refreshes the valuation of linked properties via their provider" do
+    provider = mock
+    provider.stubs(:requests_remaining?).returns(true)
+    provider.stubs(:valuation_currency).returns("USD")
+    provider.expects(:fetch_property_valuation).with(
+      line1: "123 Main Street",
+      locality: "Los Angeles",
+      region: "CA",
+      postal_code: "90001"
+    ).returns(Provider::Response.new(success?: true, data: valuation_data, error: nil))
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    SyncPropertyValuationsJob.new.perform
+
+    assert_equal Date.current, @property.reload.avm_last_synced_on
+    assert_equal 600_000, @account.reload.balance
+  end
+
+  test "resolves each provider once per run across multiple properties" do
+    second_account = @account.family.accounts.create!(
+      name: "Second AVM Property",
+      balance: 0,
+      currency: "USD",
+      owner: @account.owner,
+      accountable: Property.new(
+        avm_provider: "rentcast",
+        address_attributes: { line1: "456 Oak Ave", locality: "Los Angeles", region: "CA", country: "US", postal_code: "90002" }
+      )
+    )
+
+    provider = mock
+    provider.stubs(:requests_remaining?).returns(true)
+    provider.stubs(:valuation_currency).returns("USD")
+    provider.stubs(:fetch_property_valuation).twice.returns(Provider::Response.new(success?: true, data: valuation_data, error: nil))
+    Provider::Registry.expects(:rentcast).once.returns(provider)
+
+    SyncPropertyValuationsJob.new.perform
+
+    assert_equal Date.current, @property.reload.avm_last_synced_on
+    assert_equal Date.current, second_account.property.reload.avm_last_synced_on
+  end
+
+  test "skips refresh when the account currency no longer matches the provider currency" do
+    @account.update!(currency: "EUR")
+
+    provider = mock
+    provider.stubs(:requests_remaining?).returns(true)
+    provider.stubs(:valuation_currency).returns("USD")
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    assert_difference "DebugLogEntry.count" => 1 do
+      SyncPropertyValuationsJob.new.perform
+    end
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "skips properties with incomplete addresses without spending a request" do
+    @property.address.update!(region: "")
+
+    Provider::Registry.expects(:rentcast).never
+
+    assert_difference "DebugLogEntry.count" => 1 do
+      SyncPropertyValuationsJob.new.perform
+    end
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "skips properties whose address city or ZIP was blanked" do
+    @property.address.update!(locality: "")
+
+    Provider::Registry.expects(:rentcast).never
+
+    assert_difference "DebugLogEntry.count" => 1 do
+      SyncPropertyValuationsJob.new.perform
+    end
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "skips properties whose address is no longer in the US" do
+    @property.address.update!(country: "CA")
+
+    Provider::Registry.expects(:rentcast).never
+
+    assert_difference "DebugLogEntry.count" => 1 do
+      SyncPropertyValuationsJob.new.perform
+    end
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "does not mark a property synced when the balance update fails" do
+    provider = mock
+    provider.stubs(:requests_remaining?).returns(true)
+    provider.stubs(:valuation_currency).returns("USD")
+    provider.stubs(:fetch_property_valuation).returns(Provider::Response.new(success?: true, data: valuation_data, error: nil))
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    Account.any_instance.stubs(:set_current_balance).returns(
+      Account::CurrentBalanceManager::Result.new(success?: false, changes_made?: false, error: "boom")
+    )
+
+    assert_difference "DebugLogEntry.count" => 1 do
+      SyncPropertyValuationsJob.new.perform
+    end
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "skips properties already refreshed today" do
+    @property.update!(avm_last_synced_on: Date.current)
+
+    provider = mock
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    SyncPropertyValuationsJob.new.perform
+  end
+
+  test "skips refresh when the provider's monthly budget is spent" do
+    provider = mock
+    provider.stubs(:requests_remaining?).returns(false)
+    provider.expects(:fetch_property_valuation).never
+    Provider::Registry.stubs(:rentcast).returns(provider)
+
+    SyncPropertyValuationsJob.new.perform
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "skips properties whose provider is no longer configured" do
+    Provider::Registry.stubs(:rentcast).returns(nil)
+
+    SyncPropertyValuationsJob.new.perform
+
+    assert_nil @property.reload.avm_last_synced_on
+  end
+
+  test "does not touch properties without an AVM provider" do
+    @property.update!(avm_provider: nil)
+
+    Provider::Registry.expects(:rentcast).never
+
+    SyncPropertyValuationsJob.new.perform
+  end
+end
diff --git a/test/jobs/yahoo_finance_health_check_job_test.rb b/test/jobs/yahoo_finance_health_check_job_test.rb
new file mode 100644
index 000000000..57c9e235e
--- /dev/null
+++ b/test/jobs/yahoo_finance_health_check_job_test.rb
@@ -0,0 +1,11 @@
+require "test_helper"
+
+class YahooFinanceHealthCheckJobTest < ActiveJob::TestCase
+  test "refreshes Yahoo Finance health status" do
+    provider = mock
+    provider.expects(:refresh_health_status).once
+    Provider::YahooFinance.expects(:new).returns(provider)
+
+    YahooFinanceHealthCheckJob.perform_now
+  end
+end
diff --git a/test/lib/tasks/security_backfill_test.rb b/test/lib/tasks/security_backfill_test.rb
new file mode 100644
index 000000000..57258b641
--- /dev/null
+++ b/test/lib/tasks/security_backfill_test.rb
@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SecurityBackfillTest < ActiveSupport::TestCase
+  # Follows the suite convention (see test/encryption_verification_test.rb):
+  # runs only when explicit encryption keys are configured, e.g.
+  #
+  #   ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=test \
+  #   ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=test \
+  #   ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=test \
+  #   bin/rails test test/lib/tasks/security_backfill_test.rb
+  setup do
+    skip "Encryption not configured" unless LunchflowAccount.encryption_ready?
+    Rails.application.load_tasks unless Rake::Task.task_defined?("security:backfill_encryption")
+    Rake::Task["security:backfill_encryption"].reenable
+  end
+
+  # Lunchflow is a representative provider model, chosen arbitrarily: the bug
+  # this guards against applies identically to every json/jsonb encrypts
+  # column the task touches (the Plaid/SimpleFin/Enable Banking/... raw
+  # payload columns), via the shared safe_read_field helper.
+  test "backfill preserves jsonb payload structure and string fields" do
+    item = LunchflowItem.new(family: families(:dylan_family), name: "Backfill Test", api_key: "seed")
+    item.save!(validate: false)
+    account = item.lunchflow_accounts.create!(
+      name: "Backfill Test Account", currency: "GBP", account_id: "backfill-test-1")
+
+    payload = [ { "id" => "tx-1", "amount" => -4.5, "currency" => "GBP", "date" => "2026-07-01" } ]
+
+    # Simulate rows written before encryption was enabled: bypass the encrypted
+    # setters and write plaintext values directly to the columns.
+    ActiveRecord::Base.connection.execute(ActiveRecord::Base.sanitize_sql([
+      "UPDATE lunchflow_accounts SET raw_transactions_payload = ?::jsonb WHERE id = ?",
+      payload.to_json, account.id ]))
+    ActiveRecord::Base.connection.execute(ActiveRecord::Base.sanitize_sql([
+      "UPDATE lunchflow_items SET api_key = ? WHERE id = ?", "plaintext-key", item.id ]))
+
+    capture_io { Rake::Task["security:backfill_encryption"].invoke("500", "false") }
+
+    account.reload
+    assert_kind_of Array, account.raw_transactions_payload,
+      "jsonb payload must decrypt to its original structure, not the JSON text"
+    assert_equal "tx-1", account.raw_transactions_payload.first["id"]
+    assert_equal "plaintext-key", item.reload.api_key
+
+    # The stored value is ciphertext, not plaintext jsonb
+    at_rest = account.read_attribute_before_type_cast(:raw_transactions_payload).to_s
+    refute_includes at_rest, "tx-1"
+  end
+
+  # Several payload columns default to {} — Rails presence checks treat empty
+  # Hash/Array as absent, so the backfill must gate on nil-ness or empty
+  # payloads stay plaintext and raise on every read once keys are live.
+  test "backfill encrypts empty json payloads" do
+    item = LunchflowItem.new(family: families(:dylan_family), name: "Backfill Empty Test", api_key: "seed")
+    item.save!(validate: false)
+    account = item.lunchflow_accounts.create!(
+      name: "Backfill Empty Test Account", currency: "GBP", account_id: "backfill-test-2")
+
+    # Plaintext empty payload, as left by a pre-encryption install
+    ActiveRecord::Base.connection.execute(ActiveRecord::Base.sanitize_sql([
+      "UPDATE lunchflow_accounts SET raw_payload = ?::jsonb WHERE id = ?", "{}", account.id ]))
+
+    capture_io { Rake::Task["security:backfill_encryption"].invoke("500", "false") }
+
+    account.reload
+    assert_equal({}, account.raw_payload,
+      "an empty payload must decrypt cleanly after the backfill, not remain plaintext")
+    assert_match(/"p":/, account.read_attribute_before_type_cast(:raw_payload).to_s,
+      "the stored value must be an encryption envelope, not plaintext {}")
+  end
+end
diff --git a/test/lib/tasks/simplefin_prune_pending_test.rb b/test/lib/tasks/simplefin_prune_pending_test.rb
new file mode 100644
index 000000000..4fedc7093
--- /dev/null
+++ b/test/lib/tasks/simplefin_prune_pending_test.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class SimplefinPrunePendingTest < ActiveSupport::TestCase
+  setup do
+    Rails.application.load_tasks unless Rake::Task.task_defined?("sure:simplefin:prune_pending")
+    Rake::Task["sure:simplefin:prune_pending"].reenable
+
+    @family = families(:dylan_family)
+    @account = accounts(:depository)
+    @simplefin_item = SimplefinItem.create!(
+      family: @family,
+      name: "Test SimpleFin Bank",
+      access_url: "https://example.com/access_token"
+    )
+    @simplefin_account = SimplefinAccount.create!(
+      simplefin_item: @simplefin_item,
+      name: "SF Checking",
+      account_id: "sf_acc_1",
+      account_type: "checking",
+      currency: "USD",
+      current_balance: 1000,
+      available_balance: 1000,
+      account: @account
+    )
+  end
+
+  test "dry_run defaults to true and leaves the payload untouched" do
+    payload = [
+      { "id" => "tx_pending", "pending" => true, "posted" => Date.current.to_s, "transacted_at" => (Date.current - 1).to_s },
+      { "id" => "tx_posted", "posted" => Date.current.to_s, "transacted_at" => (Date.current - 1).to_s }
+    ]
+    @simplefin_account.update!(raw_transactions_payload: payload)
+
+    capture_io { Rake::Task["sure:simplefin:prune_pending"].invoke }
+
+    assert_equal payload, @simplefin_account.reload.raw_transactions_payload,
+      "dry_run must default to true and never write to raw_transactions_payload"
+  end
+
+  test "removes pending rows and keeps non-pending rows when dry_run=false" do
+    # Uses the same three shapes covered in SimplefinEntry::ProcessorTest: an explicit
+    # pending flag, a settled row, and a malformed non-numeric posted value that must NOT
+    # be swept up as pending (regression: SimplefinEntry::Processor.pending? is the single
+    # shared definition this task delegates to, so this also guards against the task
+    # reintroducing its own posted_val.to_i.zero? bug).
+    payload = [
+      { "id" => "tx_pending", "pending" => true, "posted" => Date.current.to_s, "transacted_at" => (Date.current - 1).to_s },
+      { "id" => "tx_posted", "posted" => Date.current.to_s, "transacted_at" => (Date.current - 1).to_s },
+      { "id" => "tx_malformed_posted", "posted" => "unavailable", "transacted_at" => (Date.current - 1).to_s }
+    ]
+    @simplefin_account.update!(raw_transactions_payload: payload)
+
+    capture_io { Rake::Task["sure:simplefin:prune_pending"].invoke(nil, nil, "false") }
+
+    remaining_ids = @simplefin_account.reload.raw_transactions_payload.map { |tx| tx["id"] }
+    assert_equal %w[tx_posted tx_malformed_posted], remaining_ids
+  end
+
+  test "never touches Entry/Transaction rows, only the raw payload cache" do
+    entry = @account.entries.create!(
+      name: "Pre-existing entry",
+      date: Date.current,
+      amount: 10,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+
+    payload = [ { "id" => "tx_pending", "pending" => true, "posted" => Date.current.to_s, "transacted_at" => (Date.current - 1).to_s } ]
+    @simplefin_account.update!(raw_transactions_payload: payload)
+
+    assert_no_difference [ "Entry.count", "Transaction.count" ] do
+      capture_io { Rake::Task["sure:simplefin:prune_pending"].invoke(nil, nil, "false") }
+    end
+
+    assert entry.reload.persisted?
+  end
+end
diff --git a/test/mailers/rule_notification_mailer_test.rb b/test/mailers/rule_notification_mailer_test.rb
new file mode 100644
index 000000000..bc1580e8c
--- /dev/null
+++ b/test/mailers/rule_notification_mailer_test.rb
@@ -0,0 +1,78 @@
+require "test_helper"
+
+class RuleNotificationMailerTest < ActionMailer::TestCase
+  include EntriesTestHelper
+
+  test "digest" do
+    rule = rules(:one)
+    rule.update!(name: "Coffee rule")
+    family = rule.family
+    admin = family.users.find_by(role: %w[admin super_admin])
+    account = family.accounts.create!(name: "Mailer test", balance: 100, currency: "USD", accountable: Depository.new)
+    txn = create_transaction(date: Date.current, account: account, amount: 100, name: "Coffee").transaction
+
+    mail = RuleNotificationMailer.digest(rule: rule, transactions: [ txn ])
+
+    # The mailer derives the recipient from rule.family, so assert against that
+    # admin explicitly rather than an unrelated fixture.
+    assert_equal [ admin.email ], mail.to
+    assert_equal I18n.t(
+      "rule_notification_mailer.digest.subject",
+      count: 1,
+      product_name: Rails.configuration.x.product_name
+    ), mail.subject
+    assert_match "Coffee", mail.body.encoded
+
+    # The "View transactions" CTA must link to the transactions page in both parts.
+    html = mail.html_part.body.encoded
+    text = mail.text_part.body.encoded
+    assert_match I18n.t("rule_notification_mailer.digest.cta"), html
+    assert_match %r{/transactions}, html
+    assert_match %r{/transactions}, text
+  end
+
+  test "digest is delivered to the super_admin owner when there is no plain admin" do
+    # A self-hosted family is commonly a single super_admin (the owner) with no
+    # :admin user. The owner must still receive the digest.
+    family = Family.create!(name: "Solo owner family", currency: "USD")
+    owner = User.create!(family: family, email: "solo-owner@example.com", password: "password123", role: :super_admin)
+    account = family.accounts.create!(name: "Mailer test", balance: 100, currency: "USD", accountable: Depository.new)
+    txn = create_transaction(date: Date.current, account: account, amount: 100, name: "Coffee").transaction
+    rule = Rule.new(family: family, resource_type: "transaction", name: "Coffee rule")
+
+    mail = RuleNotificationMailer.digest(rule: rule, transactions: [ txn ])
+
+    assert_equal [ owner.email ], mail.to
+  end
+
+  test "digest recipient is an admin-level user when both admin and super_admin exist" do
+    # find_by(role: %w[admin super_admin]) has no ORDER BY, so which of the two
+    # is returned is not deterministic and precedence is intentionally undefined.
+    # The contract is only that the recipient is admin-level, never a member.
+    family = Family.create!(name: "Mixed roles family", currency: "USD")
+    User.create!(family: family, email: "the-admin@example.com", password: "password123", role: :admin)
+    User.create!(family: family, email: "the-super-admin@example.com", password: "password123", role: :super_admin)
+    User.create!(family: family, email: "the-member@example.com", password: "password123", role: :member)
+    account = family.accounts.create!(name: "Mailer test", balance: 100, currency: "USD", accountable: Depository.new)
+    txn = create_transaction(date: Date.current, account: account, amount: 100, name: "Coffee").transaction
+    rule = Rule.new(family: family, resource_type: "transaction", name: "Coffee rule")
+
+    mail = RuleNotificationMailer.digest(rule: rule, transactions: [ txn ])
+
+    recipient = family.users.find_by!(email: mail.to.first)
+    assert recipient.admin?, "expected an admin-level recipient, got role=#{recipient.role}"
+  end
+
+  test "digest is skipped when the family has no admin or super_admin" do
+    # Transaction details must never go to a regular member/guest.
+    family = Family.create!(name: "No-admin family", currency: "USD")
+    User.create!(family: family, email: "member-only@example.com", password: "password123", role: :member)
+    account = family.accounts.create!(name: "Mailer test", balance: 100, currency: "USD", accountable: Depository.new)
+    txn = create_transaction(date: Date.current, account: account, amount: 100, name: "Coffee").transaction
+    rule = Rule.new(family: family, resource_type: "transaction", name: "Coffee rule")
+
+    assert_no_emails do
+      RuleNotificationMailer.digest(rule: rule, transactions: [ txn ]).deliver_now
+    end
+  end
+end
diff --git a/test/models/account/chartable_test.rb b/test/models/account/chartable_test.rb
index 103b244b7..cb7b524d0 100644
--- a/test/models/account/chartable_test.rb
+++ b/test/models/account/chartable_test.rb
@@ -44,6 +44,26 @@ class Account::ChartableTest < ActiveSupport::TestCase
     memoized_series2_holdings_view = account.balance_series(period: Period.last_90_days, view: :holdings_balance)
   end
 
+  test "supports gains view and rejects unknown views" do
+    account = accounts(:investment)
+
+    test_series = Series.new(
+      start_date: Period.last_30_days.start_date,
+      end_date: Period.last_30_days.end_date,
+      interval: "1 day",
+      values: [],
+      favorable_direction: account.favorable_direction
+    )
+
+    builder = mock
+    Balance::ChartSeriesBuilder.expects(:new).returns(builder)
+    builder.expects(:gains_series).returns(test_series)
+
+    assert_equal test_series, account.balance_series(view: :gains)
+
+    assert_raises(ArgumentError) { account.balance_series(view: :bogus) }
+  end
+
   test "trims placeholder history for linked investment accounts without trades" do
     account = accounts(:investment)
     account.entries.destroy_all
diff --git a/test/models/account/linkable_test.rb b/test/models/account/linkable_test.rb
index 560cb5649..ec6ecfb82 100644
--- a/test/models/account/linkable_test.rb
+++ b/test/models/account/linkable_test.rb
@@ -42,6 +42,41 @@ class Account::LinkableTest < ActiveSupport::TestCase
     refute @account.linked_to?("SimplefinAccount")
   end
 
+  test "supports_category_matcher? returns true for Plaid-linked accounts" do
+    plaid_account = plaid_accounts(:one)
+    AccountProvider.create!(account: @account, provider: plaid_account)
+
+    assert @account.supports_category_matcher?
+  end
+
+  test "supports_category_matcher? returns true for legacy plaid_account_id links" do
+    plaid_account = plaid_accounts(:one)
+    @account.update!(plaid_account: plaid_account)
+
+    assert @account.supports_category_matcher?
+  end
+
+  test "supports_category_matcher? returns false for unlinked and non-Plaid accounts" do
+    refute @account.supports_category_matcher?
+
+    simplefin_item = SimplefinItem.create!(
+      family: @family,
+      name: "Test SimpleFin",
+      access_url: "https://example.com/access_token"
+    )
+    simplefin_account = SimplefinAccount.create!(
+      simplefin_item: simplefin_item,
+      name: "Test Account",
+      account_id: "test-acct",
+      currency: "USD",
+      account_type: "checking",
+      current_balance: 0
+    )
+    @account.update!(simplefin_account: simplefin_account)
+
+    refute @account.supports_category_matcher?
+  end
+
   test "can_delete_holdings? returns true for unlinked accounts" do
     assert @account.unlinked?
     assert @account.can_delete_holdings?
diff --git a/test/models/account/provider_import_adapter_test.rb b/test/models/account/provider_import_adapter_test.rb
index 29ab62fb8..6927ad30a 100644
--- a/test/models/account/provider_import_adapter_test.rb
+++ b/test/models/account/provider_import_adapter_test.rb
@@ -55,6 +55,37 @@ class Account::ProviderImportAdapterTest < ActiveSupport::TestCase
     end
   end
 
+  test "applies an explicit provider kind on a depository account" do
+    entry = @adapter.import_transaction(
+      external_id: "up_transfer_1",
+      amount: -50.00,
+      currency: "USD",
+      date: Date.today,
+      name: "Transfer to Savings",
+      source: "up",
+      kind: "funds_movement"
+    )
+
+    assert_equal "funds_movement", entry.transaction.kind
+  end
+
+  test "account-type kind takes precedence over an explicit provider kind" do
+    loan_adapter = Account::ProviderImportAdapter.new(accounts(:loan))
+
+    entry = loan_adapter.import_transaction(
+      external_id: "up_loan_repayment_1",
+      amount: -200.00,
+      currency: "USD",
+      date: Date.today,
+      name: "Home Loan Repayment",
+      source: "up",
+      kind: "funds_movement"
+    )
+
+    assert_equal "loan_payment", entry.transaction.kind,
+                 "a repayment on a Loan account must stay loan_payment, not the provider's funds_movement"
+  end
+
   test "updates existing transaction instead of creating duplicate" do
     # Create initial transaction
     entry = @adapter.import_transaction(
diff --git a/test/models/account/reconciliation_manager_test.rb b/test/models/account/reconciliation_manager_test.rb
index fe5257e9d..7f982d7e9 100644
--- a/test/models/account/reconciliation_manager_test.rb
+++ b/test/models/account/reconciliation_manager_test.rb
@@ -91,4 +91,80 @@ class Account::ReconciliationManagerTest < ActiveSupport::TestCase
       @manager.reconcile_balance(balance: 1200, date: Date.current)
     end
   end
+
+  test "reconciliation matches an open manual_save pledge by contribution delta" do
+    account = accounts(:depository)
+    manager = Account::ReconciliationManager.new(account)
+    create_balance(account: account, date: Date.current, balance: 2000, cash_balance: 2000)
+
+    pledge = goal_pledges(:open_transfer).goal.goal_pledges.create!(
+      account: account,
+      amount: 150,
+      currency: "USD",
+      kind: "manual_save"
+    )
+
+    result = manager.reconcile_balance(balance: 2150, date: Date.current)
+
+    assert result.success?
+    assert pledge.reload.status_matched?
+  end
+
+  test "reconciliation to the same balance leaves manual_save pledges open" do
+    account = accounts(:depository)
+    manager = Account::ReconciliationManager.new(account)
+    create_balance(account: account, date: Date.current, balance: 2000, cash_balance: 2000)
+
+    pledge = goal_pledges(:open_transfer).goal.goal_pledges.create!(
+      account: account,
+      amount: 150,
+      currency: "USD",
+      kind: "manual_save"
+    )
+
+    result = manager.reconcile_balance(balance: 2000, date: Date.current)
+
+    assert result.success?
+    assert_not pledge.reload.status_matched?
+  end
+
+  test "second same-day reconcile derives its delta from the valuation it updates, not the stale balance row" do
+    account = accounts(:depository)
+    manager = Account::ReconciliationManager.new(account)
+    create_balance(account: account, date: Date.current, balance: 2000, cash_balance: 2000)
+
+    goal = goal_pledges(:open_transfer).goal
+    first_pledge = goal.goal_pledges.create!(
+      account: account,
+      amount: 150,
+      currency: "USD",
+      kind: "manual_save"
+    )
+
+    assert manager.reconcile_balance(balance: 2150, date: Date.current).success?
+    assert first_pledge.reload.status_matched?
+
+    # The post-reconcile balance sync is async and hasn't run, so the
+    # balances row still says $2,000. The second save of $150 (2150 → 2300)
+    # must not be read as a $300 contribution off that stale row — that
+    # would wrongly close the larger pledge, and a wrong match never
+    # self-heals.
+    oversized_pledge = goal.goal_pledges.create!(
+      account: account,
+      amount: 300,
+      currency: "USD",
+      kind: "manual_save"
+    )
+    second_pledge = goal.goal_pledges.create!(
+      account: account,
+      amount: 150,
+      currency: "USD",
+      kind: "manual_save"
+    )
+
+    assert manager.reconcile_balance(balance: 2300, date: Date.current).success?
+
+    assert_not oversized_pledge.reload.status_matched?
+    assert second_pledge.reload.status_matched?
+  end
 end
diff --git a/test/models/account/syncer_test.rb b/test/models/account/syncer_test.rb
index 6eeaec117..f725b25b0 100644
--- a/test/models/account/syncer_test.rb
+++ b/test/models/account/syncer_test.rb
@@ -2,6 +2,14 @@ require "test_helper"
 require "ostruct"
 
 class Account::SyncerTest < ActiveSupport::TestCase
+  test "post-sync auto matches only transfers touching the synced account" do
+    account = accounts(:depository)
+
+    account.family.expects(:auto_match_transfers!).with(account: account).once
+
+    Account::Syncer.new(account).perform_post_sync
+  end
+
   test "applies IBKR historical balance overrides after materialization" do
     family = families(:empty)
     account = family.accounts.create!(
diff --git a/test/models/account_statement_test.rb b/test/models/account_statement_test.rb
index 38f956ecc..08438332e 100644
--- a/test/models/account_statement_test.rb
+++ b/test/models/account_statement_test.rb
@@ -756,6 +756,41 @@ class AccountStatementTest < ActiveSupport::TestCase
     assert_equal "mismatched", statuses[mismatched_month]
   end
 
+  test "coverage does not mark adjacent statements as duplicate when they only share a calendar month" do
+    account = Account.create!(
+      family: @family,
+      owner: users(:family_admin),
+      name: "Adjacent Statement Checking",
+      balance: 0,
+      currency: "USD",
+      accountable: Depository.new
+    )
+
+    march = Date.new(2026, 3, 1)
+
+    create_statement_with_period(
+      account: account,
+      period_start_on: Date.new(2026, 1, 8),
+      period_end_on: Date.new(2026, 3, 6),
+      content: "adjacent-a"
+    )
+
+    create_statement_with_period(
+      account: account,
+      period_start_on: Date.new(2026, 3, 7),
+      period_end_on: Date.new(2026, 4, 7),
+      content: "adjacent-b"
+    )
+
+    coverage = AccountStatement::Coverage.new(
+      account,
+      start_month: march,
+      end_month: march
+    )
+
+    assert_equal "covered", coverage.months.first.status
+  end
+
   private
 
     def create_statement(account:, month:, content:, suggested_account: nil, closing_balance: nil)
@@ -776,4 +811,24 @@ class AccountStatementTest < ActiveSupport::TestCase
       )
       statement
     end
+
+    def create_statement_with_period(account:, period_start_on:, period_end_on:, content:, suggested_account: nil)
+      statement = AccountStatement.create_from_upload!(
+        family: @family,
+        account: account,
+        file: uploaded_file(
+          filename: "statement_#{content}_#{period_start_on}_#{period_end_on}.csv",
+          content_type: "text/csv",
+          content: "date,amount\n#{period_start_on},1\n#{period_end_on},2\n#{content}\n"
+        )
+      )
+
+      statement.update!(
+        suggested_account: suggested_account,
+        period_start_on: period_start_on,
+        period_end_on: period_end_on
+      )
+
+      statement
+    end
 end
diff --git a/test/models/account_test.rb b/test/models/account_test.rb
index 0d7013354..a65715f54 100644
--- a/test/models/account_test.rb
+++ b/test/models/account_test.rb
@@ -99,6 +99,70 @@ class AccountTest < ActiveSupport::TestCase
     assert_equal opening_date, opening_anchor.entry.date
   end
 
+  test "subtype set as a top-level account attribute persists on create" do
+    Account.any_instance.stubs(:sync_later)
+
+    # Mirrors the create flow: the form submits `account[subtype]` as a
+    # top-level attribute (not nested under accountable_attributes). The
+    # accountable does not exist yet, so the delegating writer must build it.
+    account = Account.create_and_sync({
+      family: @family,
+      owner: @admin,
+      name: "Savings Account",
+      balance: 100,
+      currency: "USD",
+      accountable_type: "Depository",
+      subtype: "savings"
+    })
+
+    assert account.persisted?
+    assert_equal "savings", account.reload.subtype
+    assert_equal "savings", account.accountable.subtype
+  end
+
+  test "subtype assigned before accountable is built is not dropped" do
+    account = Account.new
+    account.accountable_type = "Depository"
+    account.subtype = "checking"
+
+    assert_not_nil account.accountable
+    assert_equal "checking", account.subtype
+  end
+
+  test "subtype assigned before accountable_type is not dropped" do
+    # The real controller path: strong-params `permit` preserves filter order,
+    # and `account_params` lists `:subtype` before `:accountable_type`, so the
+    # subtype writer runs while the type is still unknown.
+    account = Account.new
+    account.subtype = "savings"
+    account.accountable_type = "Depository"
+
+    assert_not_nil account.accountable
+    assert_equal "savings", account.subtype
+    assert_equal "savings", account.accountable.subtype
+  end
+
+  test "subtype persists on create when attributes arrive in permit order" do
+    Account.any_instance.stubs(:sync_later)
+
+    # Mirrors `account_params`: `permit` yields keys in filter order, so the
+    # create hash carries `subtype` before `accountable_type` — the ordering
+    # that previously dropped the subtype on create.
+    account = Account.create_and_sync({
+      family: @family,
+      owner: @admin,
+      name: "Savings Account",
+      balance: 100,
+      subtype: "savings",
+      currency: "USD",
+      accountable_type: "Depository"
+    })
+
+    assert account.persisted?
+    assert_equal "savings", account.reload.subtype
+    assert_equal "savings", account.accountable.subtype
+  end
+
   test "accountable display names expose singular and group contexts" do
     assert_equal "Investment", Investment.singular_display_name
     assert_equal "Investments", Investment.display_name
@@ -346,6 +410,15 @@ class AccountTest < ActiveSupport::TestCase
     assert_not_includes @family.accounts.included_in_finances_for(@member), @account
   end
 
+  test "included_in_reports scope excludes accounts marked as exclude_from_reports" do
+    included = @family.accounts.create! name: "Included", balance: 100, currency: "USD", accountable: Depository.new
+    excluded = @family.accounts.create! name: "Excluded", balance: 200, currency: "USD", accountable: Depository.new, exclude_from_reports: true
+
+    results = @family.accounts.included_in_reports
+    assert_includes results, included
+    assert_not_includes results, excluded
+  end
+
   test "auto_share_with_family creates shares for all non-owner members" do
     @family.update!(default_account_sharing: "private")
 
@@ -369,6 +442,27 @@ class AccountTest < ActiveSupport::TestCase
     assert share.include_in_finances?
   end
 
+  test "auto_share_with_family grants guests read_only and other members read_write" do
+    @family.update!(default_account_sharing: "private")
+    guest = users(:empty)
+    guest.update_columns(family_id: @family.id, role: "guest")
+
+    account = Account.create_and_sync({
+      family: @family,
+      owner: @admin,
+      name: "Guest Permission Account",
+      balance: 100,
+      currency: "USD",
+      accountable_type: "Depository",
+      accountable_attributes: {}
+    })
+
+    account.auto_share_with_family!
+
+    assert_equal "read_only", account.account_shares.find_by(user: guest).permission
+    assert_equal "read_write", account.account_shares.find_by(user: @member).permission
+  end
+
   test "current_holdings prefers latest provider snapshot holdings across currencies" do
     account = @family.accounts.create!(
       owner: @admin,
diff --git a/test/models/actual_import_test.rb b/test/models/actual_import_test.rb
index 7cc0b3470..d9758233b 100644
--- a/test/models/actual_import_test.rb
+++ b/test/models/actual_import_test.rb
@@ -22,7 +22,7 @@ class ActualImportTest < ActiveSupport::TestCase
 
     import.generate_rows_from_csv
 
-    assert_equal (1..4).to_a, import.rows.order(:source_row_number).pluck(:source_row_number)
+    assert_equal (1..5).to_a, import.rows.order(:source_row_number).pluck(:source_row_number)
   end
 
   test "generated rows combine category group and category" do
@@ -50,4 +50,52 @@ class ActualImportTest < ActiveSupport::TestCase
 
     assert_equal "Housing", import.rows.order(:source_row_number).first.category
   end
+
+  test "blank payee falls back to notes, then to the default row name" do
+    import = @family.imports.create!(
+      type: "ActualImport",
+      raw_file_str: file_fixture("imports/actual.csv").read,
+      col_sep: ","
+    )
+
+    import.generate_rows_from_csv
+
+    # Reconciliation row has a blank Payee but a meaningful Notes value
+    assert_equal "Reconciliation balance adjustment",
+      import.rows.order(:source_row_number).last.name
+
+    # When both Payee and Notes are blank, fall back to the generic default name
+    blank_both_csv = <<~CSV
+      Account,Date,Payee,Notes,Category_Group,Category,Amount,Split_Amount,Cleared
+      Checking Account,2024-01-04,,,Income,Income,0.43,0,Reconciled
+    CSV
+
+    blank_both = @family.imports.create!(type: "ActualImport", raw_file_str: blank_both_csv, col_sep: ",")
+    blank_both.generate_rows_from_csv
+
+    assert_equal "Imported item", blank_both.rows.order(:source_row_number).first.name
+  end
+
+  test "imports rows with a blank payee without failing the whole import" do
+    csv = <<~CSV
+      Account,Date,Payee,Notes,Category_Group,Category,Amount,Split_Amount,Cleared
+      Cash,2024-01-01,Employer,Salary,Income,Paycheck,2500.00,0,Reconciled
+      Cash,2024-01-04,,Reconciliation balance adjustment,Income,Income,0.43,0,Reconciled
+    CSV
+
+    import = @family.imports.create!(type: "ActualImport", raw_file_str: csv, col_sep: ",")
+    import.generate_rows_from_csv
+
+    import.mappings.create! key: "Income: Paycheck", create_when_empty: true, type: "Import::CategoryMapping"
+    import.mappings.create! key: "Income: Income", create_when_empty: true, type: "Import::CategoryMapping"
+    import.mappings.create! key: "Cash", mappable: accounts(:depository), type: "Import::AccountMapping"
+    import.reload
+
+    assert_difference -> { Entry.count } => 2, -> { Transaction.count } => 2 do
+      import.publish
+    end
+
+    assert_equal "complete", import.status
+    assert_includes import.entries.reload.map(&:name), "Reconciliation balance adjustment"
+  end
 end
diff --git a/test/models/akahu_entry/processor_test.rb b/test/models/akahu_entry/processor_test.rb
index 488c7d841..701b455d8 100644
--- a/test/models/akahu_entry/processor_test.rb
+++ b/test/models/akahu_entry/processor_test.rb
@@ -96,4 +96,24 @@ class AkahuEntry::ProcessorTest < ActiveSupport::TestCase
     assert_equal first_entry.id, second_entry.id
     assert_equal 1, @account.entries.where(source: "akahu").count
   end
+
+  test "converts ISO string timestamp date using family timezone not UTC" do
+    # 2025-07-14T23:30:00Z (23:30:00 UTC) == 2025-07-15 11:30:00 NZST
+    @family.update!(timezone: "Pacific/Auckland")
+
+    transaction_data = {
+      _id: "tz_nz_test",
+      _account: "acc_123",
+      date: "2025-07-14T23:30:00Z", # 2025-07-14 23:30:00 UTC
+      merchant: { name: "Late Night Shop" },
+      description: "After midnight",
+      amount: -10.00,
+      currency: "NZD"
+    }
+
+    entry = AkahuEntry::Processor.new(transaction_data, akahu_account: @akahu_account).process
+
+    assert_not_nil entry
+    assert_equal Date.new(2025, 7, 15), entry.date
+  end
 end
diff --git a/test/models/akahu_item/importer_test.rb b/test/models/akahu_item/importer_test.rb
index 4f751a384..0f48e6a0b 100644
--- a/test/models/akahu_item/importer_test.rb
+++ b/test/models/akahu_item/importer_test.rb
@@ -99,6 +99,16 @@ class AkahuItem::ImporterTest < ActiveSupport::TestCase
     assert_equal "acc_123", provider.transaction_calls.first[:account_id]
   end
 
+  test "initial sync fetches full history instead of clamping to a recent window" do
+    provider = FakeAkahuProvider.new
+
+    AkahuItem::Importer.new(@akahu_item, akahu_provider: provider).import
+
+    start_date = provider.transaction_calls.first[:start_date]
+    assert_nil start_date,
+      "initial sync should omit the start date so Akahu returns the full accessible history"
+  end
+
   test "removes pending transactions that disappear from latest pending response" do
     pending = [ pending_transaction(description: "Pending card auth", amount: -8.00) ]
     import_with(pending_transactions: pending, posted_transactions: [])
diff --git a/test/models/api_key_test.rb b/test/models/api_key_test.rb
index edd60389a..46087f790 100644
--- a/test/models/api_key_test.rb
+++ b/test/models/api_key_test.rb
@@ -135,7 +135,7 @@ class ApiKeyTest < ActiveSupport::TestCase
     assert @api_key.last_used_at > (original_time || Time.at(0))
   end
 
-  test "should prevent user from having multiple active api keys" do
+  test "allows multiple active api keys for the same user" do
     @api_key.save!
 
     second_key = ApiKey.new(
@@ -145,22 +145,69 @@ class ApiKeyTest < ActiveSupport::TestCase
       scopes: [ "read" ]
     )
 
-    assert_not second_key.valid?
-    assert_includes second_key.errors[:user], "can only have one active API key per source (web)"
-  end
-
-  test "should allow user to have new active key after revoking old one" do
-    @api_key.save!
-    @api_key.revoke!
-
-    second_key = ApiKey.new(
-      user: @user,
-      name: "Second API Key",
-      key: "another_key_123",
-      scopes: [ "read" ]
-    )
-
     assert second_key.valid?
+    assert second_key.save
+    assert second_key.active?
+    assert_equal 2, @user.api_keys.active.count
+  end
+
+  test "rejects duplicate name among active keys for the same user" do
+    ApiKey.create!(
+      user: @user,
+      name: "Dup",
+      key: "dup_key_123",
+      scopes: [ "read" ]
+    )
+
+    duplicate = ApiKey.new(
+      user: @user,
+      name: "Dup",
+      key: "dup_key_456",
+      scopes: [ "read" ]
+    )
+
+    assert_not duplicate.valid?
+    assert_includes duplicate.errors.attribute_names, :name
+  end
+
+  test "allows reusing the name of a revoked key" do
+    first = ApiKey.create!(
+      user: @user,
+      name: "Reuse",
+      key: "reuse_key_123",
+      scopes: [ "read" ]
+    )
+    first.revoke!
+
+    reused = ApiKey.new(
+      user: @user,
+      name: "Reuse",
+      key: "reuse_key_456",
+      scopes: [ "read" ]
+    )
+
+    assert reused.valid?
+  end
+
+  test "allows the same name across different users" do
+    ApiKey.create!(
+      user: @user,
+      name: "Shared",
+      key: "shared_key_123",
+      scopes: [ "read" ]
+    )
+
+    other_user = users(:family_member)
+    other_user.api_keys.destroy_all
+
+    other_key = ApiKey.new(
+      user: other_user,
+      name: "Shared",
+      key: "shared_key_456",
+      scopes: [ "read" ]
+    )
+
+    assert other_key.valid?
   end
 
   test "should allow active monitoring key alongside active web key" do
@@ -177,6 +224,21 @@ class ApiKeyTest < ActiveSupport::TestCase
     assert monitoring_key.valid?
   end
 
+  test "visible scope excludes the demo monitoring key" do
+    # The demo key's exclusion from `.visible` is the revocation guard used by
+    # Settings::ApiKeysController#destroy. Lock the invariant so broadening the
+    # scope can't silently make the demo key revocable.
+    demo_key = ApiKey.create!(
+      user: @user,
+      name: "Demo Monitoring Key",
+      display_key: ApiKey::DEMO_MONITORING_KEY,
+      scopes: [ "read" ]
+    )
+
+    refute_includes ApiKey.visible, demo_key
+    refute_includes @user.api_keys.active.visible, demo_key
+  end
+
   test "should include active api keys in active scope" do
     @api_key.save!
     active_keys = ApiKey.active
diff --git a/test/models/assistant/function/create_category_test.rb b/test/models/assistant/function/create_category_test.rb
new file mode 100644
index 000000000..059ca05be
--- /dev/null
+++ b/test/models/assistant/function/create_category_test.rb
@@ -0,0 +1,124 @@
+require "test_helper"
+
+class Assistant::Function::CreateCategoryTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @fn = Assistant::Function::CreateCategory.new(@user)
+  end
+
+  test "to_definition returns correct schema" do
+    definition = @fn.to_definition
+    assert_equal "create_category", definition[:name]
+    assert_not_empty definition[:description]
+    assert_includes definition[:params_schema][:required], "name"
+  end
+
+  test "creates a top-level category with all fields" do
+    assert_difference "@family.categories.count" do
+      result = @fn.call("name" => "Transport", "color" => "#4da568", "icon" => "bus")
+
+      assert result[:success]
+      assert_equal "Transport", result[:category][:name]
+      assert_equal "#4da568", result[:category][:color]
+      assert_equal "bus", result[:category][:icon]
+      assert_nil result[:category][:parent_id]
+    end
+  end
+
+  test "auto-suggests icon from name when omitted" do
+    result = @fn.call("name" => "Groceries", "color" => "#4da568")
+
+    assert result[:success]
+    assert_equal Category.suggested_icon("Groceries"), result[:category][:icon]
+  end
+
+  test "auto-assigns color from palette when omitted" do
+    result = @fn.call("name" => "Mystery")
+
+    assert result[:success]
+    assert_includes Category::COLORS, result[:category][:color]
+  end
+
+  test "creates a subcategory under an existing parent" do
+    parent = categories(:food_and_drink)
+    assert_difference "@family.categories.count" do
+      result = @fn.call("name" => "Fast Food", "parent_id" => parent.id)
+
+      assert result[:success]
+      assert_equal parent.id, result[:category][:parent_id]
+      assert_match "Food & Drink > Fast Food", result[:category][:name_with_parent]
+    end
+  end
+
+  test "subcategory inherits parent color" do
+    parent = categories(:food_and_drink)
+    result = @fn.call("name" => "Sushi", "parent_id" => parent.id)
+
+    assert result[:success]
+    assert_equal parent.reload.color, result[:category][:color]
+  end
+
+  test "soft error when name is whitespace only" do
+    result = @fn.call("name" => "   ")
+
+    assert_equal false, result[:success]
+    assert_equal "name_required", result[:error]
+  end
+
+  test "empty string parent_id is treated as absent, creates top-level category" do
+    assert_difference "@family.categories.count" do
+      result = @fn.call("name" => "No Parent", "parent_id" => "")
+
+      assert result[:success]
+      assert_nil result[:category][:parent_id]
+    end
+  end
+
+  test "soft error when color format is invalid" do
+    result = @fn.call("name" => "Bad Color Cat", "color" => "not-a-color")
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "soft error when nesting a subcategory under another subcategory" do
+    sub = categories(:subcategory)
+    result = @fn.call("name" => "Too Deep", "parent_id" => sub.id)
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "soft error when name is blank" do
+    result = @fn.call("name" => "")
+
+    assert_equal false, result[:success]
+    assert_equal "name_required", result[:error]
+  end
+
+  test "soft error when parent_id does not exist" do
+    result = @fn.call("name" => "Orphan", "parent_id" => "00000000-0000-0000-0000-000000000000")
+
+    assert_equal false, result[:success]
+    assert_equal "parent_not_found", result[:error]
+  end
+
+  test "soft error on duplicate name within family" do
+    existing = categories(:food_and_drink)
+    result = @fn.call("name" => existing.name)
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "cannot use a parent from another family" do
+    other_family = Family.create!(name: "Other", currency: "USD", locale: "en", country: "US", timezone: "UTC")
+    other_parent = other_family.categories.create!(name: "Foreign Parent", color: "#e99537", lucide_icon: "shapes")
+
+    result = @fn.call("name" => "Child", "parent_id" => other_parent.id)
+
+    assert_equal false, result[:success]
+    assert_equal "parent_not_found", result[:error]
+  end
+end
diff --git a/test/models/assistant/function/create_tag_test.rb b/test/models/assistant/function/create_tag_test.rb
new file mode 100644
index 000000000..81b4badc5
--- /dev/null
+++ b/test/models/assistant/function/create_tag_test.rb
@@ -0,0 +1,70 @@
+require "test_helper"
+
+class Assistant::Function::CreateTagTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @fn = Assistant::Function::CreateTag.new(@user)
+  end
+
+  test "to_definition returns correct schema" do
+    definition = @fn.to_definition
+    assert_equal "create_tag", definition[:name]
+    assert_not_empty definition[:description]
+    assert_includes definition[:params_schema][:required], "name"
+  end
+
+  test "creates a tag with name and color" do
+    assert_difference "@family.tags.count" do
+      result = @fn.call("name" => "Vacation", "color" => "#4da568")
+
+      assert result[:success]
+      assert_equal "Vacation", result[:tag][:name]
+      assert_equal "#4da568", result[:tag][:color]
+      assert result[:tag][:id].present?
+    end
+  end
+
+  test "auto-assigns a color from palette when omitted" do
+    result = @fn.call("name" => "Auto Color")
+
+    assert result[:success]
+    assert_includes Tag::COLORS, result[:tag][:color]
+  end
+
+  test "soft error when name is blank" do
+    result = @fn.call("name" => "")
+
+    assert_equal false, result[:success]
+    assert_equal "name_required", result[:error]
+  end
+
+  test "soft error on duplicate name within family" do
+    existing = tags(:one)
+    result = @fn.call("name" => existing.name)
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "soft error when name is whitespace only" do
+    result = @fn.call("name" => "   ")
+
+    assert_equal false, result[:success]
+    assert_equal "name_required", result[:error]
+  end
+
+  test "soft error when color format is invalid" do
+    result = @fn.call("name" => "Bad Color", "color" => "not-a-color")
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "scopes created tag to user's family" do
+    @fn.call("name" => "Scoped Tag")
+    tag = @family.tags.find_by(name: "Scoped Tag")
+    assert tag.present?
+    assert_equal @family.id, tag.family_id
+  end
+end
diff --git a/test/models/assistant/function/get_categories_test.rb b/test/models/assistant/function/get_categories_test.rb
new file mode 100644
index 000000000..7d48462a9
--- /dev/null
+++ b/test/models/assistant/function/get_categories_test.rb
@@ -0,0 +1,62 @@
+require "test_helper"
+
+class Assistant::Function::GetCategoriesTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @fn = Assistant::Function::GetCategories.new(@user)
+  end
+
+  test "to_definition returns correct name and description" do
+    definition = @fn.to_definition
+    assert_equal "get_categories", definition[:name]
+    assert_not_empty definition[:description]
+  end
+
+  test "returns all family categories" do
+    result = @fn.call
+
+    assert_kind_of Array, result[:categories]
+    assert_equal @family.categories.count, result[:total]
+  end
+
+  test "each category includes required fields" do
+    result = @fn.call
+    result[:categories].each do |c|
+      assert c[:id].present?
+      assert c[:name].present?
+      assert c[:name_with_parent].present?
+      assert c[:color].present?
+      assert c[:icon].present?
+      assert c.key?(:parent_id)
+      assert c.key?(:is_subcategory)
+    end
+  end
+
+  test "subcategory is_subcategory is true and has parent_id" do
+    result = @fn.call
+    sub = result[:categories].find { |c| c[:name] == categories(:subcategory).name }
+
+    assert sub.present?
+    assert sub[:is_subcategory]
+    assert_equal categories(:food_and_drink).id, sub[:parent_id]
+  end
+
+  test "top-level category has nil parent_id and is_subcategory false" do
+    result = @fn.call
+    top = result[:categories].find { |c| c[:name] == categories(:food_and_drink).name }
+
+    assert top.present?
+    assert_not top[:is_subcategory]
+    assert_nil top[:parent_id]
+  end
+
+  test "scopes to the user's family" do
+    other_family = Family.create!(name: "Other", currency: "USD", locale: "en", country: "US", timezone: "UTC")
+    other_family.categories.create!(name: "Foreign Category", color: "#e99537", lucide_icon: "shapes")
+
+    result = @fn.call
+    category_names = result[:categories].map { |c| c[:name] }
+    assert_not_includes category_names, "Foreign Category"
+  end
+end
diff --git a/test/models/assistant/function/get_tags_test.rb b/test/models/assistant/function/get_tags_test.rb
new file mode 100644
index 000000000..b5c9ba9c7
--- /dev/null
+++ b/test/models/assistant/function/get_tags_test.rb
@@ -0,0 +1,44 @@
+require "test_helper"
+
+class Assistant::Function::GetTagsTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @fn = Assistant::Function::GetTags.new(@user)
+  end
+
+  test "to_definition returns correct name and description" do
+    definition = @fn.to_definition
+    assert_equal "get_tags", definition[:name]
+    assert_not_empty definition[:description]
+    assert_equal "object", definition[:params_schema][:type]
+  end
+
+  test "returns all family tags sorted alphabetically" do
+    result = @fn.call
+
+    assert_kind_of Array, result[:tags]
+    assert_equal @family.tags.count, result[:total]
+
+    names = result[:tags].map { |t| t[:name] }
+    assert_equal names.sort, names
+  end
+
+  test "each tag includes id, name, and color" do
+    result = @fn.call
+    result[:tags].each do |t|
+      assert t[:id].present?
+      assert t[:name].present?
+      assert t[:color].present?
+    end
+  end
+
+  test "scopes to the user's family" do
+    other_family = Family.create!(name: "Other", currency: "USD", locale: "en", country: "US", timezone: "UTC")
+    other_family.tags.create!(name: "Foreign Tag")
+
+    result = @fn.call
+    tag_names = result[:tags].map { |t| t[:name] }
+    assert_not_includes tag_names, "Foreign Tag"
+  end
+end
diff --git a/test/models/assistant/function/update_category_test.rb b/test/models/assistant/function/update_category_test.rb
new file mode 100644
index 000000000..70e83a485
--- /dev/null
+++ b/test/models/assistant/function/update_category_test.rb
@@ -0,0 +1,104 @@
+require "test_helper"
+
+class Assistant::Function::UpdateCategoryTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @category = categories(:food_and_drink)
+    @fn = Assistant::Function::UpdateCategory.new(@user)
+  end
+
+  test "to_definition returns correct schema" do
+    definition = @fn.to_definition
+    assert_equal "update_category", definition[:name]
+    assert_not_empty definition[:description]
+    assert_includes definition[:params_schema][:required], "id"
+  end
+
+  test "updates category name" do
+    result = @fn.call("id" => @category.id, "name" => "Food & Beverages")
+
+    assert result[:success]
+    assert_equal "Food & Beverages", result[:category][:name]
+    assert_equal "Food & Beverages", @category.reload.name
+  end
+
+  test "updates category color" do
+    result = @fn.call("id" => @category.id, "color" => "#6471eb")
+
+    assert result[:success]
+    assert_equal "#6471eb", result[:category][:color]
+    assert_equal "#6471eb", @category.reload.color
+  end
+
+  test "updates category icon" do
+    result = @fn.call("id" => @category.id, "icon" => "pizza")
+
+    assert result[:success]
+    assert_equal "pizza", result[:category][:icon]
+    assert_equal "pizza", @category.reload.lucide_icon
+  end
+
+  test "updates multiple fields at once" do
+    result = @fn.call("id" => @category.id, "name" => "Dining", "color" => "#db5a54", "icon" => "utensils")
+
+    assert result[:success]
+    @category.reload
+    assert_equal "Dining", @category.name
+    assert_equal "#db5a54", @category.color
+    assert_equal "utensils", @category.lucide_icon
+  end
+
+  test "result includes name_with_parent for subcategory" do
+    sub = categories(:subcategory)
+    result = @fn.call("id" => sub.id, "icon" => "coffee")
+
+    assert result[:success]
+    assert_match(/#{sub.parent.name}/, result[:category][:name_with_parent])
+  end
+
+  test "soft error when id is nil" do
+    result = @fn.call("name" => "X")
+
+    assert_equal false, result[:success]
+    assert_equal "not_found", result[:error]
+  end
+
+  test "whitespace-only name is treated as absent, returns no_changes" do
+    result = @fn.call("id" => @category.id, "name" => "   ")
+
+    assert_equal false, result[:success]
+    assert_equal "no_changes", result[:error]
+  end
+
+  test "soft error when color format is invalid" do
+    result = @fn.call("id" => @category.id, "color" => "not-a-color")
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "soft error when category not found" do
+    result = @fn.call("id" => "00000000-0000-0000-0000-000000000000", "name" => "X")
+
+    assert_equal false, result[:success]
+    assert_equal "not_found", result[:error]
+  end
+
+  test "soft error when no changes provided" do
+    result = @fn.call("id" => @category.id)
+
+    assert_equal false, result[:success]
+    assert_equal "no_changes", result[:error]
+  end
+
+  test "cannot update a category from another family" do
+    other_family = Family.create!(name: "Other", currency: "USD", locale: "en", country: "US", timezone: "UTC")
+    other_cat = other_family.categories.create!(name: "Foreign", color: "#e99537", lucide_icon: "shapes")
+
+    result = @fn.call("id" => other_cat.id, "name" => "Hijacked")
+
+    assert_equal false, result[:success]
+    assert_equal "not_found", result[:error]
+  end
+end
diff --git a/test/models/assistant/function/update_tag_test.rb b/test/models/assistant/function/update_tag_test.rb
new file mode 100644
index 000000000..e86cd6445
--- /dev/null
+++ b/test/models/assistant/function/update_tag_test.rb
@@ -0,0 +1,91 @@
+require "test_helper"
+
+class Assistant::Function::UpdateTagTest < ActiveSupport::TestCase
+  setup do
+    @user = users(:family_admin)
+    @family = @user.family
+    @tag = tags(:one)
+    @fn = Assistant::Function::UpdateTag.new(@user)
+  end
+
+  test "to_definition returns correct schema" do
+    definition = @fn.to_definition
+    assert_equal "update_tag", definition[:name]
+    assert_not_empty definition[:description]
+    assert_includes definition[:params_schema][:required], "name"
+  end
+
+  test "params_schema enumerates family tag names" do
+    schema = @fn.params_schema
+    assert_includes schema[:properties][:name][:enum], @tag.name
+  end
+
+  test "updates tag name" do
+    result = @fn.call("name" => @tag.name, "new_name" => "Updated Name")
+
+    assert result[:success]
+    assert_equal "Updated Name", result[:tag][:name]
+    assert_equal "Updated Name", @tag.reload.name
+  end
+
+  test "updates tag color" do
+    result = @fn.call("name" => @tag.name, "color" => "#6471eb")
+
+    assert result[:success]
+    assert_equal "#6471eb", result[:tag][:color]
+    assert_equal "#6471eb", @tag.reload.color
+  end
+
+  test "updates both name and color at once" do
+    result = @fn.call("name" => @tag.name, "new_name" => "Both Updated", "color" => "#db5a54")
+
+    assert result[:success]
+    assert_equal "Both Updated", @tag.reload.name
+    assert_equal "#db5a54", @tag.reload.color
+  end
+
+  test "soft error when tag not found" do
+    result = @fn.call("name" => "Nonexistent Tag", "new_name" => "X")
+
+    assert_equal false, result[:success]
+    assert_equal "not_found", result[:error]
+  end
+
+  test "soft error when no changes provided" do
+    result = @fn.call("name" => @tag.name)
+
+    assert_equal false, result[:success]
+    assert_equal "no_changes", result[:error]
+  end
+
+  test "soft error when lookup name is empty string" do
+    result = @fn.call("name" => "", "new_name" => "X")
+
+    assert_equal false, result[:success]
+    assert_equal "not_found", result[:error]
+  end
+
+  test "empty string new_name is treated as absent, returns no_changes" do
+    result = @fn.call("name" => @tag.name, "new_name" => "")
+
+    assert_equal false, result[:success]
+    assert_equal "no_changes", result[:error]
+  end
+
+  test "soft error when color format is invalid" do
+    result = @fn.call("name" => @tag.name, "color" => "not-a-color")
+
+    assert_equal false, result[:success]
+    assert_equal "validation_failed", result[:error]
+  end
+
+  test "cannot update a tag from another family" do
+    other_family = Family.create!(name: "Other", currency: "USD", locale: "en", country: "US", timezone: "UTC")
+    other_tag = other_family.tags.create!(name: "Other Tag")
+
+    result = @fn.call("name" => other_tag.name, "new_name" => "Hijacked")
+
+    assert_equal false, result[:success]
+    assert_equal "not_found", result[:error]
+  end
+end
diff --git a/test/models/assistant/function_tool_caller_test.rb b/test/models/assistant/function_tool_caller_test.rb
new file mode 100644
index 000000000..8203e0d37
--- /dev/null
+++ b/test/models/assistant/function_tool_caller_test.rb
@@ -0,0 +1,54 @@
+require "test_helper"
+
+class Assistant::FunctionToolCallerTest < ActiveSupport::TestCase
+  # Minimal stub function that echoes back whatever args it receives.
+  class EchoFunction < Assistant::Function
+    def self.name = "echo"
+    def self.description = "Echoes the received arguments"
+    def call(params = {}) = params
+  end
+
+  FunctionRequest = Provider::LlmConcept::ChatFunctionRequest
+
+  setup do
+    @caller = Assistant::FunctionToolCaller.new([ EchoFunction.new(nil) ])
+  end
+
+  test "parses JSON arguments and forwards them to the function" do
+    request = FunctionRequest.new(
+      id: "call_1", call_id: "call_1", function_name: "echo",
+      function_args: { "foo" => "bar" }.to_json
+    )
+
+    result = @caller.fulfill_requests([ request ]).first
+
+    assert_equal({ "foo" => "bar" }, result.function_result)
+  end
+
+  test "treats empty-string arguments as an empty argument set" do
+    request = FunctionRequest.new(
+      id: "call_2", call_id: "call_2", function_name: "echo",
+      function_args: ""
+    )
+
+    # Regression for #2722: JSON.parse("") used to raise, killing the turn.
+    result = assert_nothing_raised do
+      @caller.fulfill_requests([ request ]).first
+    end
+
+    assert_equal({}, result.function_result)
+  end
+
+  test "treats nil arguments as an empty argument set" do
+    request = FunctionRequest.new(
+      id: "call_3", call_id: "call_3", function_name: "echo",
+      function_args: nil
+    )
+
+    result = assert_nothing_raised do
+      @caller.fulfill_requests([ request ]).first
+    end
+
+    assert_equal({}, result.function_result)
+  end
+end
diff --git a/test/models/assistant_message_test.rb b/test/models/assistant_message_test.rb
index 7c359c46b..167fed4ee 100644
--- a/test/models/assistant_message_test.rb
+++ b/test/models/assistant_message_test.rb
@@ -16,4 +16,13 @@ class AssistantMessageTest < ActiveSupport::TestCase
     assert_equal "update", streams.last["action"]
     assert_equal "assistant_message_#{message.id}", streams.last["target"]
   end
+
+  test "broadcasts remove after destroy so a failed turn's bubble is cleared" do
+    message = AssistantMessage.create!(chat: @chat, content: "Hello from assistant", ai_model: "gpt-4.1")
+    message.destroy!
+
+    streams = capture_turbo_stream_broadcasts(@chat)
+    assert_equal "remove", streams.last["action"]
+    assert_equal "assistant_message_#{message.id}", streams.last["target"]
+  end
 end
diff --git a/test/models/background_job_console_test.rb b/test/models/background_job_console_test.rb
new file mode 100644
index 000000000..0b5794198
--- /dev/null
+++ b/test/models/background_job_console_test.rb
@@ -0,0 +1,121 @@
+require "test_helper"
+
+class BackgroundJobConsoleTest < ActiveSupport::TestCase
+  test "fails closed when Sidekiq/Redis is unreachable" do
+    Sidekiq::ProcessSet.stubs(:new).raises(StandardError.new("no redis"))
+
+    console = BackgroundJobConsole.new
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+    sync.update_columns(updated_at: 1.hour.ago)
+
+    assert console.redis_error?
+    assert_nil console.stats
+    assert_not console.cancellable?(sync)
+  end
+
+  test "detects running records via GlobalIDs in worker payloads" do
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+    sync.update_columns(updated_at: 1.hour.ago)
+
+    stub_sidekiq(worker_payloads: [
+      { "wrapped" => "SyncJob", "args" => [ { "arguments" => [ { "_aj_globalid" => sync.to_global_id.to_s } ] } ] }
+    ])
+
+    console = BackgroundJobConsole.new
+
+    assert console.running?(sync)
+    assert_not console.cancellable?(sync)
+  end
+
+  test "cancellable only when idle past the stuck window with no live job" do
+    stub_sidekiq
+
+    console = BackgroundJobConsole.new
+
+    fresh = Sync.create!(syncable: accounts(:depository), status: :syncing)
+    stuck = Sync.create!(syncable: accounts(:connected), status: :syncing)
+    stuck.update_columns(updated_at: 1.hour.ago)
+
+    assert_not console.cancellable?(fresh)
+    assert console.cancellable?(stuck)
+  end
+
+  test "a record referenced by a queued job is not cancellable" do
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+    sync.update_columns(updated_at: 1.hour.ago)
+
+    stub_sidekiq(queued_items: [
+      { "wrapped" => "SyncJob", "args" => [ { "arguments" => [ { "_aj_globalid" => sync.to_global_id.to_s } ] } ] }
+    ])
+
+    console = BackgroundJobConsole.new
+
+    assert console.enqueued?(sync)
+    assert_not console.running?(sync)
+    assert_not console.cancellable?(sync)
+  end
+
+  test "a truncated backlog scan fails closed" do
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+    sync.update_columns(updated_at: 1.hour.ago)
+
+    filler = Array.new(BackgroundJobConsole::QUEUE_SCAN_LIMIT + 1) { { "args" => [] } }
+    stub_sidekiq(queued_items: filler)
+
+    console = BackgroundJobConsole.new
+
+    assert console.queue_scan_truncated?
+    assert_not console.cancellable?(sync)
+  end
+
+  test "a parent sync with incomplete children is not cancellable" do
+    stub_sidekiq
+
+    parent = Sync.create!(syncable: families(:dylan_family), status: :syncing)
+    Sync.create!(syncable: accounts(:depository), status: :syncing, parent: parent)
+    parent.update_columns(updated_at: 1.hour.ago)
+
+    console = BackgroundJobConsole.new
+
+    assert_not console.cancellable?(parent)
+  end
+
+  private
+    def stub_sidekiq(worker_payloads: [], queued_items: [])
+      process_set = mock("ProcessSet")
+      process_set.stubs(:size).returns(1)
+      process_set.stubs(:sum).returns(worker_payloads.size)
+      Sidekiq::ProcessSet.stubs(:new).returns(process_set)
+
+      stats = mock("Stats")
+      stats.stubs(:enqueued).returns(queued_items.size)
+      stats.stubs(:retry_size).returns(0)
+      stats.stubs(:dead_size).returns(0)
+      stats.stubs(:scheduled_size).returns(0)
+      Sidekiq::Stats.stubs(:new).returns(stats)
+
+      if queued_items.any?
+        queue = mock("Queue")
+        queue.stubs(name: "default", size: queued_items.size, latency: 0.0)
+        queue_yields = queued_items.map { |item| [ stub(item: item) ] }
+        queue.stubs(:each).multiple_yields(*queue_yields)
+        Sidekiq::Queue.stubs(:all).returns([ queue ])
+      else
+        Sidekiq::Queue.stubs(:all).returns([])
+      end
+
+      empty_set = mock("JobSet")
+      empty_set.stubs(:each)
+      Sidekiq::RetrySet.stubs(:new).returns(empty_set)
+      Sidekiq::ScheduledSet.stubs(:new).returns(empty_set)
+
+      workers = mock("Workers")
+      yields = worker_payloads.map { |payload| [ "process", "thread", { "payload" => payload.to_json } ] }
+      if yields.any?
+        workers.stubs(:each).multiple_yields(*yields)
+      else
+        workers.stubs(:each)
+      end
+      Sidekiq::Workers.stubs(:new).returns(workers)
+    end
+end
diff --git a/test/models/background_job_health_test.rb b/test/models/background_job_health_test.rb
new file mode 100644
index 000000000..85cc6a1ea
--- /dev/null
+++ b/test/models/background_job_health_test.rb
@@ -0,0 +1,50 @@
+require "test_helper"
+
+class BackgroundJobHealthTest < ActiveSupport::TestCase
+  setup { Rails.cache.delete(BackgroundJobHealth::CACHE_KEY) }
+  teardown { Rails.cache.delete(BackgroundJobHealth::CACHE_KEY) }
+
+  test "healthy when a worker polls the critical queue with low latency" do
+    stub_sidekiq(processes: [ { "queues" => [ "high_priority", "default" ] } ], latency: 1.0)
+
+    assert BackgroundJobHealth.healthy?
+    assert_equal 1, BackgroundJobHealth.snapshot[:workers]
+  end
+
+  test "unhealthy when no workers are online" do
+    stub_sidekiq(processes: [], latency: 0.0)
+
+    assert_not BackgroundJobHealth.healthy?
+  end
+
+  test "unhealthy when the critical queue is not polled by any worker" do
+    stub_sidekiq(processes: [ { "queues" => [ "default" ] } ], latency: 0.0)
+
+    assert_not BackgroundJobHealth.healthy?
+  end
+
+  test "unhealthy when the critical queue is badly backed up" do
+    stub_sidekiq(processes: [ { "queues" => [ "high_priority" ] } ], latency: 9_999)
+
+    assert_not BackgroundJobHealth.healthy?
+  end
+
+  test "fails open when Sidekiq/Redis is unreachable" do
+    Sidekiq::ProcessSet.stubs(:new).raises(StandardError.new("no redis"))
+
+    assert BackgroundJobHealth.healthy?
+    assert BackgroundJobHealth.snapshot[:error]
+  end
+
+  private
+    def stub_sidekiq(processes:, latency:)
+      process_set = mock("ProcessSet")
+      process_set.stubs(:size).returns(processes.size)
+      process_set.stubs(:flat_map).returns(processes.flat_map { |p| p["queues"] })
+      Sidekiq::ProcessSet.stubs(:new).returns(process_set)
+
+      queue = mock("Queue")
+      queue.stubs(:latency).returns(latency)
+      Sidekiq::Queue.stubs(:new).with("high_priority").returns(queue)
+    end
+end
diff --git a/test/models/balance/chart_series_builder_test.rb b/test/models/balance/chart_series_builder_test.rb
index 7e180ef36..5ae56071f 100644
--- a/test/models/balance/chart_series_builder_test.rb
+++ b/test/models/balance/chart_series_builder_test.rb
@@ -96,6 +96,24 @@ class Balance::ChartSeriesBuilderTest < ActiveSupport::TestCase
     assert_equal expected, builder.balance_series.map { |v| v.value.amount }
   end
 
+  test "account active until dates stop locf while preserving date rows" do
+    account = accounts(:depository)
+    account.balances.destroy_all
+
+    period = Period.custom(start_date: 2.days.ago.to_date, end_date: Date.current)
+    create_balance(account: account, date: period.start_date, balance: 1000)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      account_active_until_dates: { account.id => 1.day.ago.to_date },
+      currency: "USD",
+      period: period,
+      interval: "1 day"
+    )
+
+    assert_equal [ 1000, 1000, 0 ], builder.balance_series.map { |v| v.value.amount }
+  end
+
   test "when favorable direction is down balance signage inverts" do
     account = accounts(:credit_card)
     account.balances.destroy_all
@@ -320,4 +338,160 @@ class Balance::ChartSeriesBuilderTest < ActiveSupport::TestCase
     assert_equal 1, linked_account.balances.where(currency: "USD").count
     assert_equal 0, linked_account.balances.where(currency: "EUR").count
   end
+
+  test "gains series computes unrealized gains from holdings with locf" do
+    account = accounts(:investment)
+    account.holdings.destroy_all
+    security = securities(:aapl)
+
+    # 10 shares with avg cost of $90/share
+    create_holding(account: account, security: security, date: 3.days.ago.to_date, qty: 10, price: 100, cost_basis: 90)
+    create_holding(account: account, security: security, date: 1.day.ago.to_date, qty: 10, price: 110, cost_basis: 90)
+    create_holding(account: account, security: security, date: Date.current, qty: 10, price: 105, cost_basis: 90)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 4.days.ago.to_date, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    expected = [
+      0, # No holdings yet
+      100, # 1000 - 900
+      100, # Last observation carried forward
+      200, # 1100 - 900
+      150 # 1050 - 900
+    ]
+
+    assert_equal expected, builder.gains_series.map { |v| v.value.amount }
+  end
+
+  test "gains series treats unusable cost basis as zero gain" do
+    account = accounts(:investment)
+    account.holdings.destroy_all
+
+    # Unlocked zero cost basis (provider "unknown") -> no gain contribution
+    create_holding(account: account, security: securities(:aapl), date: Date.current, qty: 10, price: 100, cost_basis: 0)
+    # Nil cost basis -> no gain contribution
+    create_holding(account: account, security: securities(:msft), date: Date.current, qty: 5, price: 50, cost_basis: nil)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: Date.current, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    assert_equal [ 0 ], builder.gains_series.map { |v| v.value.amount }
+
+    # Locked zero cost basis (e.g. airdrop) is trusted -> full amount is gain
+    account.holdings.where(security: securities(:aapl)).update_all(cost_basis_locked: true)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: Date.current, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    assert_equal [ 1000 ], builder.gains_series.map { |v| v.value.amount }
+  end
+
+  test "gains series converts holding gains to target currency with locf rates" do
+    family = families(:dylan_family)
+    account = family.accounts.create!(
+      name: "EUR Investment",
+      balance: 1000,
+      currency: "EUR",
+      accountable: Investment.new
+    )
+    security = securities(:aapl)
+
+    # Gains in EUR: 100 yesterday (1000 - 900), 200 today (1100 - 900)
+    create_holding(account: account, security: security, date: 1.day.ago.to_date, qty: 10, price: 100, cost_basis: 90)
+    create_holding(account: account, security: security, date: Date.current, qty: 10, price: 110, cost_basis: 90)
+
+    # Single EUR -> USD rate; LOCF applies it to today as well
+    ExchangeRate.create!(date: 1.day.ago.to_date, from_currency: "EUR", to_currency: "USD", rate: 1.1)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 1.day.ago.to_date, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    expected = [
+      110, # 100 EUR * 1.1
+      220 # 200 EUR * 1.1 (rate carried forward)
+    ]
+
+    assert_equal expected, builder.gains_series.map { |v| v.value.amount }
+  end
+
+  test "gains series carries cost basis forward over gap-filled holdings" do
+    account = accounts(:investment)
+    account.holdings.destroy_all
+    security = securities(:aapl)
+
+    create_holding(account: account, security: security, date: 2.days.ago.to_date, qty: 10, price: 100, cost_basis: 90)
+    # Gap-filled rows (weekends, price gaps) are persisted without cost_basis
+    create_holding(account: account, security: security, date: 1.day.ago.to_date, qty: 10, price: 100, cost_basis: nil)
+    create_holding(account: account, security: security, date: Date.current, qty: 10, price: 110, cost_basis: nil)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 2.days.ago.to_date, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    expected = [
+      100, # 1000 - 900
+      100, # basis carried forward from 2 days ago, not zeroed
+      200 # 1100 - 900
+    ]
+
+    assert_equal expected, builder.gains_series.map { |v| v.value.amount }
+  end
+
+  test "gains series values carry trend vs previous point" do
+    account = accounts(:investment)
+    account.holdings.destroy_all
+    security = securities(:aapl)
+
+    create_holding(account: account, security: security, date: 1.day.ago.to_date, qty: 10, price: 100, cost_basis: 90)
+    create_holding(account: account, security: security, date: Date.current, qty: 10, price: 110, cost_basis: 90)
+
+    builder = Balance::ChartSeriesBuilder.new(
+      account_ids: [ account.id ],
+      currency: "USD",
+      period: Period.custom(start_date: 1.day.ago.to_date, end_date: Date.current),
+      interval: "1 day"
+    )
+
+    series = builder.gains_series
+
+    # First point has no prior point, so trend is flat
+    assert_equal 100, series.values.first.trend.previous.amount
+    assert_equal 100, series.values.first.trend.current.amount
+
+    assert_equal 100, series.values.last.trend.previous.amount
+    assert_equal 200, series.values.last.trend.current.amount
+  end
+
+  private
+    def create_holding(account:, security:, date:, qty:, price:, cost_basis:)
+      Holding.create!(
+        account: account,
+        security: security,
+        date: date,
+        qty: qty,
+        price: price,
+        amount: qty * price,
+        currency: account.currency,
+        cost_basis: cost_basis
+      )
+    end
 end
diff --git a/test/models/balance/forward_calculator_test.rb b/test/models/balance/forward_calculator_test.rb
index 22c8a5a61..bdd24dc81 100644
--- a/test/models/balance/forward_calculator_test.rb
+++ b/test/models/balance/forward_calculator_test.rb
@@ -534,6 +534,57 @@ class Balance::ForwardCalculatorTest < ActiveSupport::TestCase
     )
   end
 
+  test "investment account interest trade is classified as cash-only, not non-cash outflow" do
+    account = create_account_with_ledger(
+      account: { type: Investment, currency: "USD" },
+      entries: [
+        { type: "opening_anchor", date: 3.days.ago.to_date, balance: 5000 },
+        { type: "trade", date: 1.day.ago.to_date, ticker: "AAPL", qty: 10, price: 100 },
+        { type: "income_trade", date: Date.current, ticker: "AAPL", amount: 5, label: "Interest" }
+      ],
+      holdings: [
+        { date: 1.day.ago.to_date, ticker: "AAPL", qty: 10, price: 100, amount: 1000 },
+        { date: Date.current, ticker: "AAPL", qty: 10, price: 110, amount: 1100 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_data: [
+        {
+          date: 3.days.ago.to_date,
+          legacy_balances: { balance: 5000, cash_balance: 5000 },
+          balances: { start: 5000, start_cash: 5000, start_non_cash: 0, end_cash: 5000, end_non_cash: 0, end: 5000 },
+          flows: 0,
+          adjustments: 0
+        },
+        {
+          date: 2.days.ago.to_date,
+          legacy_balances: { balance: 5000, cash_balance: 5000 },
+          balances: { start: 5000, start_cash: 5000, start_non_cash: 0, end_cash: 5000, end_non_cash: 0, end: 5000 },
+          flows: 0,
+          adjustments: 0
+        },
+        {
+          date: 1.day.ago.to_date,
+          legacy_balances: { balance: 5000, cash_balance: 4000 },
+          balances: { start: 5000, start_cash: 5000, start_non_cash: 0, end_cash: 4000, end_non_cash: 1000, end: 5000 },
+          flows: { cash_inflows: 0, cash_outflows: 1000, non_cash_inflows: 1000, non_cash_outflows: 0, net_market_flows: 0 },
+          adjustments: 0
+        },
+        {
+          date: Date.current,
+          legacy_balances: { balance: 5105, cash_balance: 4005 },
+          balances: { start: 5000, start_cash: 4000, start_non_cash: 1000, end_cash: 4005, end_non_cash: 1100, end: 5105 },
+          flows: { cash_inflows: 5, cash_outflows: 0, non_cash_inflows: 0, non_cash_outflows: 0, net_market_flows: 100 },
+          adjustments: 0
+        }
+      ]
+    )
+  end
+
   test "investment account can have valuations that override balance" do
     account = create_account_with_ledger(
       account: { type: Investment, currency: "USD" },
@@ -757,6 +808,72 @@ class Balance::ForwardCalculatorTest < ActiveSupport::TestCase
     assert_not calculator.incremental?, "Should not be incremental for foreign currency accounts"
   end
 
+  # Regression: a reconciliation (or any entry) backfilled with a date EARLIER
+  # than the opening anchor must still be materialized into Balance rows. The
+  # window is bounded on min(opening_anchor_date, oldest_entry_date), and the
+  # pre-anchor start seeds from zero — each valuation resets the absolute
+  # balance on its own date.
+  test "materializes entries dated before the opening anchor" do
+    account = create_account_with_ledger(
+      account: { type: Depository, currency: "USD" },
+      entries: [
+        { type: "reconciliation", date: 5.days.ago.to_date, balance: 10000 }, # before anchor
+        { type: "opening_anchor",  date: 3.days.ago.to_date, balance: 17000 },
+        { type: "reconciliation", date: 1.day.ago.to_date,  balance: 20000 }
+      ]
+    )
+
+    calculated = Balance::ForwardCalculator.new(account).calculate
+
+    # Window extends back to the earliest entry, not the (later) opening anchor.
+    assert_equal 5.days.ago.to_date, calculated.map(&:date).min
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_data: [
+        {
+          # Pre-anchor reconciliation: seeded from 0, valuation sets the balance.
+          date: 5.days.ago.to_date,
+          legacy_balances: { balance: 10000, cash_balance: 10000 },
+          balances: { start: 0, start_cash: 0, start_non_cash: 0, end_cash: 10000, end_non_cash: 0, end: 10000 },
+          flows: 0,
+          adjustments: { cash_adjustments: 10000, non_cash_adjustments: 0 }
+        },
+        {
+          # Carries forward on a day with no entries.
+          date: 4.days.ago.to_date,
+          legacy_balances: { balance: 10000, cash_balance: 10000 },
+          balances: { start: 10000, start_cash: 10000, start_non_cash: 0, end_cash: 10000, end_non_cash: 0, end: 10000 },
+          flows: 0,
+          adjustments: 0
+        },
+        {
+          # Opening anchor resets the balance on its own date.
+          date: 3.days.ago.to_date,
+          legacy_balances: { balance: 17000, cash_balance: 17000 },
+          balances: { start: 10000, start_cash: 10000, start_non_cash: 0, end_cash: 17000, end_non_cash: 0, end: 17000 },
+          flows: 0,
+          adjustments: { cash_adjustments: 7000, non_cash_adjustments: 0 }
+        },
+        {
+          # Carries forward on a day with no entries.
+          date: 2.days.ago.to_date,
+          legacy_balances: { balance: 17000, cash_balance: 17000 },
+          balances: { start: 17000, start_cash: 17000, start_non_cash: 0, end_cash: 17000, end_non_cash: 0, end: 17000 },
+          flows: 0,
+          adjustments: 0
+        },
+        {
+          date: 1.day.ago.to_date,
+          legacy_balances: { balance: 20000, cash_balance: 20000 },
+          balances: { start: 17000, start_cash: 17000, start_non_cash: 0, end_cash: 20000, end_non_cash: 0, end: 20000 },
+          flows: 0,
+          adjustments: { cash_adjustments: 3000, non_cash_adjustments: 0 }
+        }
+      ]
+    )
+  end
+
   private
     def assert_balances(calculated_data:, expected_balances:)
       # Sort calculated data by date to ensure consistent ordering
diff --git a/test/models/balance/materializer_test.rb b/test/models/balance/materializer_test.rb
index 472f5fbd5..741260601 100644
--- a/test/models/balance/materializer_test.rb
+++ b/test/models/balance/materializer_test.rb
@@ -116,6 +116,46 @@ class Balance::MaterializerTest < ActiveSupport::TestCase
       "Recalculated balance for 2.days.ago should be persisted"
   end
 
+  # Regression: a prior full sync materializes balances for entries dated BEFORE
+  # the opening anchor; a later incremental sync (window after the anchor) must
+  # preserve them. The purge lower bound uses calculation_start_date — the same
+  # bound the calculator uses — not opening_anchor_date.
+  test "incremental sync preserves balances dated before the opening anchor" do
+    # Opening anchor at 5.days.ago, but a reconciliation backfilled earlier.
+    @account.entries.create!(
+      name: "Opening Balance", date: 5.days.ago.to_date, amount: 5000,
+      currency: "USD", entryable: Valuation.new(kind: "opening_anchor")
+    )
+    @account.entries.create!(
+      name: "Backfilled reconciliation", date: 8.days.ago.to_date, amount: 3000,
+      currency: "USD", entryable: Valuation.new(kind: "reconciliation")
+    )
+
+    # Pre-anchor balance materialized by a prior full sync.
+    pre_anchor    = create_balance(account: @account, date: 8.days.ago.to_date, balance: 3000)
+    preserved_mid = create_balance(account: @account, date: 6.days.ago.to_date, balance: 4000)
+
+    recalculated = [
+      Balance.new(
+        date: 2.days.ago.to_date, balance: 15000, cash_balance: 15000, currency: "USD",
+        start_cash_balance: 12000, start_non_cash_balance: 0,
+        cash_inflows: 3000, cash_outflows: 0, non_cash_inflows: 0, non_cash_outflows: 0,
+        net_market_flows: 0, cash_adjustments: 0, non_cash_adjustments: 0, flows_factor: 1
+      )
+    ]
+
+    Balance::ForwardCalculator.any_instance.expects(:calculate).returns(recalculated)
+    Balance::ForwardCalculator.any_instance.stubs(:incremental?).returns(true)
+    Holding::Materializer.any_instance.expects(:materialize_holdings).returns([]).once
+
+    Balance::Materializer.new(@account, strategy: :forward, window_start_date: 2.days.ago.to_date).materialize_balances
+
+    assert_not_nil @account.balances.find_by(id: pre_anchor.id),
+      "Balance before the opening anchor must be preserved during incremental purge"
+    assert_not_nil @account.balances.find_by(id: preserved_mid.id),
+      "Balance between anchor and window must be preserved"
+  end
+
   test "falls back to full recalculation when window_start_date is given but no prior balance exists" do
     @account.entries.create!(
       name: "Opening Balance",
@@ -228,6 +268,59 @@ class Balance::MaterializerTest < ActiveSupport::TestCase
     assert_balance_fields_persisted(expected_balances)
   end
 
+  test "reverse materialization persists opening boundary adjustment" do
+    account = families(:empty).accounts.create!(
+      name: "Linked Depository",
+      balance: 1000,
+      cash_balance: 1000,
+      currency: "USD",
+      accountable: Depository.new
+    )
+    opening_date = Date.new(2024, 1, 1)
+    boundary_date = opening_date + 1.day
+    transaction_date = opening_date + 2.days
+    current_anchor_date = opening_date + 3.days
+
+    account.entries.create!(
+      name: "Current Balance",
+      date: current_anchor_date,
+      amount: 1000,
+      currency: "USD",
+      entryable: Valuation.new(kind: "current_anchor")
+    )
+    account.entries.create!(
+      name: "Transaction",
+      date: transaction_date,
+      amount: 200,
+      currency: "USD",
+      entryable: Transaction.new
+    )
+    account.entries.create!(
+      name: "Opening Balance",
+      date: opening_date,
+      amount: 1000,
+      currency: "USD",
+      entryable: Valuation.new(kind: "opening_anchor")
+    )
+
+    Holding::Materializer.any_instance.expects(:materialize_holdings).returns([]).once
+
+    Balance::Materializer.new(account, strategy: :reverse).materialize_balances
+
+    opening_balance = account.balances.find_by!(date: opening_date)
+    boundary_balance = account.balances.find_by!(date: boundary_date)
+    transaction_balance = account.balances.find_by!(date: transaction_date)
+
+    assert_equal 1000, opening_balance.end_balance
+    assert_equal 1000, boundary_balance.start_balance
+    assert_equal 1200, boundary_balance.end_balance
+    assert_equal 200, boundary_balance.cash_adjustments
+    assert_equal 0, boundary_balance.cash_inflows
+    assert_equal 0, boundary_balance.cash_outflows
+    assert_equal 1200, transaction_balance.start_balance
+    assert_equal 1000, transaction_balance.end_balance
+  end
+
   private
 
     def assert_balance_fields_persisted(expected_balances)
diff --git a/test/models/balance/reverse_calculator_test.rb b/test/models/balance/reverse_calculator_test.rb
index 11f4463e3..f40a134b1 100644
--- a/test/models/balance/reverse_calculator_test.rb
+++ b/test/models/balance/reverse_calculator_test.rb
@@ -28,6 +28,102 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
     )
   end
 
+  test "opening boundary difference is surfaced as an adjustment instead of a silent jump" do
+    opening_date = Date.new(2024, 1, 1)
+    day_after_opening = opening_date + 1.day
+    transaction_date = opening_date + 2.days
+    current_anchor_date = transaction_date + 1.day
+
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 1000, cash_balance: 1000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: current_anchor_date, balance: 1000 },
+        { type: "transaction", date: transaction_date, amount: 200 },
+        { type: "opening_anchor", date: opening_date, balance: 1000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_data: [
+        {
+          date: opening_date,
+          legacy_balances: { balance: 1000, cash_balance: 1000 },
+          balances: { start: 1000, start_cash: 1000, start_non_cash: 0, end_cash: 1000, end_non_cash: 0, end: 1000 },
+          flows: 0,
+          adjustments: 0
+        },
+        {
+          date: day_after_opening,
+          legacy_balances: { balance: 1200, cash_balance: 1200 },
+          balances: { start: 1000, start_cash: 1000, start_non_cash: 0, end_cash: 1200, end_non_cash: 0, end: 1200 },
+          flows: 0,
+          adjustments: { cash_adjustments: 200, non_cash_adjustments: 0 }
+        },
+        {
+          date: transaction_date,
+          legacy_balances: { balance: 1000, cash_balance: 1000 },
+          balances: { start: 1200, start_cash: 1200, start_non_cash: 0, end_cash: 1000, end_non_cash: 0, end: 1000 },
+          flows: { cash_inflows: 0, cash_outflows: 200 },
+          adjustments: 0
+        },
+        {
+          date: current_anchor_date,
+          legacy_balances: { balance: 1000, cash_balance: 1000 },
+          balances: { start: 1000, start_cash: 1000, start_non_cash: 0, end_cash: 1000, end_non_cash: 0, end: 1000 },
+          flows: 0,
+          adjustments: 0
+        }
+      ]
+    )
+  end
+
+  test "opening boundary adjustment uses liability flow direction" do
+    opening_date = Date.new(2024, 1, 1)
+    boundary_date = opening_date + 1.day
+    current_anchor_date = boundary_date + 1.day
+
+    account = create_account_with_ledger(
+      account: { type: CreditCard, balance: 500, cash_balance: 500, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: current_anchor_date, balance: 500 },
+        { type: "transaction", date: boundary_date, amount: 100 },
+        { type: "opening_anchor", date: opening_date, balance: 1000 }
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_data: [
+        {
+          date: opening_date,
+          legacy_balances: { balance: 1000, cash_balance: 1000 },
+          balances: { start: 1000, start_cash: 1000, start_non_cash: 0, end_cash: 1000, end_non_cash: 0, end: 1000 },
+          flows: 0,
+          adjustments: 0
+        },
+        {
+          date: boundary_date,
+          legacy_balances: { balance: 500, cash_balance: 500 },
+          balances: { start: 1000, start_cash: 1000, start_non_cash: 0, end_cash: 500, end_non_cash: 0, end: 500 },
+          flows: { cash_inflows: 0, cash_outflows: 100 },
+          adjustments: { cash_adjustments: -600, non_cash_adjustments: 0 }
+        },
+        {
+          date: current_anchor_date,
+          legacy_balances: { balance: 500, cash_balance: 500 },
+          balances: { start: 500, start_cash: 500, start_non_cash: 0, end_cash: 500, end_non_cash: 0, end: 500 },
+          flows: 0,
+          adjustments: 0
+        }
+      ]
+    )
+  end
+
   # Reconciliation valuations act as waypoints during reverse syncs. This ensures that
   # historical balances accurately reflect the API-reported values, even if the transaction
   # history is incomplete or missing.
@@ -43,6 +139,8 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
 
     calculated = Balance::ReverseCalculator.new(account).calculate
 
+    # The day after the opening anchor now carries an explicit adjustment so
+    # the gap to the first reconciliation waypoint is auditable.
     assert_calculated_ledger_balances(
       calculated_data: calculated,
       expected_data: [
@@ -70,10 +168,10 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
         {
           date: 3.days.ago,
           legacy_balances: { balance: 17000, cash_balance: 17000 },
-          balances: { start: 17000, start_cash: 17000, start_non_cash: 0, end_cash: 17000, end_non_cash: 0, end: 17000 },
+          balances: { start: 15000, start_cash: 15000, start_non_cash: 0, end_cash: 17000, end_non_cash: 0, end: 17000 },
           flows: 0,
-          adjustments: { cash_adjustments: 0, non_cash_adjustments: 0 }
-        }, # Derived from Reconciliation waypoint
+          adjustments: { cash_adjustments: 2000, non_cash_adjustments: 0 }
+        }, # Opening boundary adjustment explains the gap from opening anchor to waypoint
         {
           date: 4.days.ago,
           legacy_balances: { balance: 15000, cash_balance: 15000 },
@@ -154,10 +252,10 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
         {
           date: 6.days.ago,
           legacy_balances: { balance: 22500, cash_balance: 22500 },
-          balances: { start: 22200, start_cash: 22200, start_non_cash: 0, end_cash: 22500, end_non_cash: 0, end: 22500 },
+          balances: { start: 18000, start_cash: 18000, start_non_cash: 0, end_cash: 22500, end_non_cash: 0, end: 22500 },
           flows: { cash_inflows: 300, cash_outflows: 0 },
-          adjustments: { cash_adjustments: 0, non_cash_adjustments: 0 }
-        }, # Income derived further back, right before opening_anchor
+          adjustments: { cash_adjustments: 4200, non_cash_adjustments: 0 }
+        }, # Opening boundary adjustment explains the gap from opening anchor to derived balance
         {
           date: 7.days.ago,
           legacy_balances: { balance: 18000, cash_balance: 18000 },
@@ -216,9 +314,9 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
         {
           date: 3.days.ago,
           legacy_balances: { balance: 18000, cash_balance: 18000 },
-          balances: { start: 18000, start_cash: 18000, start_non_cash: 0, end_cash: 18000, end_non_cash: 0, end: 18000 },
+          balances: { start: 15000, start_cash: 15000, start_non_cash: 0, end_cash: 18000, end_non_cash: 0, end: 18000 },
           flows: 0,
-          adjustments: { cash_adjustments: 0, non_cash_adjustments: 0 }
+          adjustments: { cash_adjustments: 3000, non_cash_adjustments: 0 }
         },
         {
           date: 4.days.ago,
@@ -314,10 +412,10 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
         {
           date: Date.current,
           legacy_balances: { balance: 20000, cash_balance: 10000 },
-          balances: { start: 20000, start_cash: 10000, start_non_cash: 10000, end_cash: 10000, end_non_cash: 10000, end: 20000 },
+          balances: { start: 15000, start_cash: 5000, start_non_cash: 10000, end_cash: 10000, end_non_cash: 10000, end: 20000 },
           flows: { market_flows: 0 },
-          adjustments: 0
-        }, # Since $10,000 of holdings, cash has to be $10,000 to reach $20,000 total value
+          adjustments: { cash_adjustments: 5000, non_cash_adjustments: 0 }
+        }, # Opening boundary adjustment explains the gap to the current provider anchor
         {
           date: 1.day.ago,
           legacy_balances: { balance: 15000, cash_balance: 5000 },
@@ -672,9 +770,9 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
         {
           date: 1.day.ago,
           legacy_balances: { balance: 20000, cash_balance: 19000 },
-          balances: { start: 20000, start_cash: 19000, start_non_cash: 1000, end_cash: 19000, end_non_cash: 1000, end: 20000 },
+          balances: { start: 15000, start_cash: 14000, start_non_cash: 1000, end_cash: 19000, end_non_cash: 1000, end: 20000 },
           flows: { market_flows: 0 },
-          adjustments: 0
+          adjustments: { cash_adjustments: 5000, non_cash_adjustments: 0 }
         },
         {
           date: 2.days.ago,
@@ -686,4 +784,65 @@ class Balance::ReverseCalculatorTest < ActiveSupport::TestCase
       ]
     )
   end
+
+  # Regression: a reconciliation waypoint dated EARLIER than the opening anchor
+  # must still be materialized. The reverse loop is bounded on
+  # min(opening_anchor_date, oldest_entry_date), so it continues past the anchor
+  # down to the earliest entry, which resets the balance on its own date.
+  test "materializes reconciliation waypoints dated before the opening anchor" do
+    account = create_account_with_ledger(
+      account: { type: Depository, balance: 20000, cash_balance: 20000, currency: "USD" },
+      entries: [
+        { type: "current_anchor", date: Date.current, balance: 20000 },
+        { type: "opening_anchor",  date: 2.days.ago,  balance: 15000 },
+        { type: "reconciliation", date: 4.days.ago,  balance: 9000 } # before the opening anchor
+      ]
+    )
+
+    calculated = Balance::ReverseCalculator.new(account).calculate
+
+    # Loop extends back to the earliest entry, not the (later) opening anchor.
+    assert_equal 4.days.ago.to_date, calculated.map(&:date).min
+
+    assert_calculated_ledger_balances(
+      calculated_data: calculated,
+      expected_data: [
+        {
+          date: Date.current,
+          legacy_balances: { balance: 20000, cash_balance: 20000 },
+          balances: { start: 20000, start_cash: 20000, start_non_cash: 0, end_cash: 20000, end_non_cash: 0, end: 20000 },
+          flows: 0,
+          adjustments: 0
+        }, # Current anchor
+        {
+          date: 1.day.ago,
+          legacy_balances: { balance: 20000, cash_balance: 20000 },
+          balances: { start: 15000, start_cash: 15000, start_non_cash: 0, end_cash: 20000, end_non_cash: 0, end: 20000 },
+          flows: 0,
+          adjustments: { cash_adjustments: 5000, non_cash_adjustments: 0 }
+        }, # Opening boundary adjustment explains the gap above the anchor
+        {
+          date: 2.days.ago,
+          legacy_balances: { balance: 15000, cash_balance: 15000 },
+          balances: { start: 15000, start_cash: 15000, start_non_cash: 0, end_cash: 15000, end_non_cash: 0, end: 15000 },
+          flows: 0,
+          adjustments: 0
+        }, # Opening anchor
+        {
+          date: 3.days.ago,
+          legacy_balances: { balance: 15000, cash_balance: 15000 },
+          balances: { start: 15000, start_cash: 15000, start_non_cash: 0, end_cash: 15000, end_non_cash: 0, end: 15000 },
+          flows: 0,
+          adjustments: 0
+        }, # Gap below the anchor carries down with no flows
+        {
+          date: 4.days.ago,
+          legacy_balances: { balance: 9000, cash_balance: 9000 },
+          balances: { start: 9000, start_cash: 9000, start_non_cash: 0, end_cash: 9000, end_non_cash: 0, end: 9000 },
+          flows: 0,
+          adjustments: 0
+        } # Pre-anchor reconciliation resets to its own value
+      ]
+    )
+  end
 end
diff --git a/test/models/balance_sheet/net_worth_breakdown_series_builder_test.rb b/test/models/balance_sheet/net_worth_breakdown_series_builder_test.rb
new file mode 100644
index 000000000..eace99634
--- /dev/null
+++ b/test/models/balance_sheet/net_worth_breakdown_series_builder_test.rb
@@ -0,0 +1,69 @@
+require "test_helper"
+
+class BalanceSheet::NetWorthBreakdownSeriesBuilderTest < ActiveSupport::TestCase
+  include BalanceTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @family.accounts.each { |account| account.balances.destroy_all }
+
+    @asset_account = accounts(:depository)
+    @liability_account = accounts(:credit_card)
+  end
+
+  test "builds monthly points with group breakdown that sums to net worth" do
+    period = Period.custom(start_date: Date.new(2026, 4, 15), end_date: Date.new(2026, 7, 15))
+
+    create_balance(account: @asset_account, date: period.start_date, balance: 5000)
+    create_balance(account: @asset_account, date: period.end_date, balance: 6000)
+    create_balance(account: @liability_account, date: period.start_date, balance: 1000)
+    create_balance(account: @liability_account, date: period.end_date, balance: 1500)
+
+    series = builder.breakdown_series(period: period)
+
+    # One point per month in the period, end date included
+    assert_equal 4, series[:values].size
+    assert_equal period.start_date, series[:values].first[:date]
+    assert_equal period.end_date, series[:values].last[:date]
+
+    last_point = series[:values].last
+
+    # Liabilities are reported as positive magnitudes
+    assert_equal 6000, last_point[:assets].amount
+    assert_equal 1500, last_point[:liabilities].amount
+    assert_equal 4500, last_point[:value].amount
+
+    # Every point's net worth equals assets minus liabilities
+    series[:values].each do |point|
+      assert_equal point[:value].amount, point[:assets].amount - point[:liabilities].amount
+    end
+
+    # Each point's trend is the month-over-month change from the previous
+    # point; the first point has no prior month so its trend is flat
+    assert_equal 0, series[:values].first[:trend].value.amount
+    series[:values].each_cons(2) do |previous, point|
+      assert_equal point[:value].amount - previous[:value].amount, point[:trend].value.amount
+    end
+  end
+
+  test "includes group metadata and excludes groups with no balances" do
+    period = Period.custom(start_date: Date.new(2026, 6, 15), end_date: Date.new(2026, 7, 15))
+
+    create_balance(account: @asset_account, date: period.end_date, balance: 5000)
+    create_balance(account: @liability_account, date: period.end_date, balance: 1000)
+
+    series = builder.breakdown_series(period: period)
+    groups = series[:values].last[:groups]
+
+    # Only account types with balances appear; assets sort before liabilities
+    assert_equal [ "asset", "liability" ], groups.map { |g| g[:classification] }
+    assert_equal Depository.display_name, groups.first[:name]
+    assert_equal CreditCard.display_name, groups.last[:name]
+    assert groups.all? { |g| g[:color].present? }
+  end
+
+  private
+    def builder
+      BalanceSheet::NetWorthBreakdownSeriesBuilder.new(@family)
+    end
+end
diff --git a/test/models/balance_sheet_test.rb b/test/models/balance_sheet_test.rb
index 558657279..1b5a8e8bb 100644
--- a/test/models/balance_sheet_test.rb
+++ b/test/models/balance_sheet_test.rb
@@ -1,6 +1,8 @@
 require "test_helper"
 
 class BalanceSheetTest < ActiveSupport::TestCase
+  include BalanceTestHelper
+
   setup do
     @family = families(:empty)
   end
@@ -46,6 +48,71 @@ class BalanceSheetTest < ActiveSupport::TestCase
     assert_equal 1000, BalanceSheet.new(@family).liabilities.total
   end
 
+  test "excluded accounts do not affect totals" do
+    create_account(balance: 1000, accountable: CreditCard.new)
+    create_account(balance: 10000, accountable: Depository.new)
+
+    excluded_asset = create_account(balance: 5000, accountable: Depository.new)
+    excluded_asset.update!(exclude_from_reports: true)
+
+    assert_equal 10000 - 1000, BalanceSheet.new(@family).net_worth
+    assert_equal 10000, BalanceSheet.new(@family).assets.total
+    assert_equal 1000, BalanceSheet.new(@family).liabilities.total
+  end
+
+  test "excluded accounts still have their own balance in account groups" do
+    create_account(balance: 1000, accountable: Depository.new)
+    excluded_asset = create_account(balance: 5000, accountable: Depository.new)
+    excluded_asset.update!(exclude_from_reports: true)
+
+    asset_groups = BalanceSheet.new(@family).assets.account_groups
+    depository_group = asset_groups.find { |ag| ag.name == Depository.display_name }
+
+    assert_equal 1000, depository_group.total
+    assert depository_group.accounts.any?(&:exclude_from_reports?)
+  end
+
+  test "net worth series preserves disabled history without carrying it into current totals" do
+    period = Period.custom(start_date: Date.current - 1.day, end_date: Date.current)
+    active_account = create_account(balance: 20_000, accountable: Depository.new)
+    disabled_account = create_account(balance: 0, accountable: Depository.new)
+    pending_deletion_account = create_account(balance: 0, accountable: Depository.new)
+    disabled_account.disable!
+    pending_deletion_account.mark_for_deletion!
+
+    assert_not_nil disabled_account.reload.disabled_at
+
+    create_balance(account: active_account, date: period.start_date, balance: 10_000)
+    create_balance(account: active_account, date: period.end_date, balance: 20_000)
+    create_balance(account: disabled_account, date: period.start_date, balance: 20_000)
+    create_balance(account: disabled_account, date: period.end_date, balance: 10_000)
+    create_balance(account: pending_deletion_account, date: period.start_date, balance: 40_000)
+    create_balance(account: pending_deletion_account, date: period.end_date, balance: 80_000)
+
+    series = BalanceSheet.new(@family).net_worth_series(period: period)
+    values_by_date = series.values.index_by(&:date)
+
+    assert_equal 30_000, values_by_date.fetch(period.start_date).value.amount
+    assert_equal 20_000, BalanceSheet.new(@family).net_worth
+    assert_equal BalanceSheet.new(@family).net_worth, values_by_date.fetch(period.end_date).value.amount
+  end
+
+  test "historical account scope respects shared-account finance settings" do
+    member = users(:new_email)
+    included_account = create_account(balance: 0, accountable: Depository.new)
+    excluded_account = create_account(balance: 0, accountable: Depository.new)
+
+    included_account.disable!
+    excluded_account.disable!
+    included_account.share_with!(member, include_in_finances: true)
+    excluded_account.share_with!(member, include_in_finances: false)
+
+    account_ids = BalanceSheet::HistoricalAccountScope.new(@family, user: member).account_ids
+
+    assert_includes account_ids, included_account.id
+    assert_not_includes account_ids, excluded_account.id
+  end
+
   test "calculates asset group totals" do
     create_account(balance: 1000, accountable: Depository.new)
     create_account(balance: 2000, accountable: Depository.new)
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
index 1797162e3..a12b9790a 100644
--- a/test/models/category_test.rb
+++ b/test/models/category_test.rb
@@ -43,6 +43,20 @@ class CategoryTest < ActiveSupport::TestCase
     assert_equal subcategory, transaction.reload.category
   end
 
+  test "invalid parent_id does not raise during validation" do
+    category = Category.new(
+      name: "Orphan Subcategory",
+      color: "#000000",
+      lucide_icon: "folder",
+      family: @family,
+      parent_id: SecureRandom.uuid
+    )
+
+    assert_nothing_raised { category.valid? }
+    assert_not category.subcategory?
+    assert_nil category.parent
+  end
+
   test "subcategory can only be one level deep" do
     category = categories(:subcategory)
 
@@ -63,6 +77,56 @@ class CategoryTest < ActiveSupport::TestCase
     assert_equal names, names.uniq  # No duplicates
   end
 
+  test "display_name localizes default category names" do
+    I18n.with_locale(:"zh-CN") do
+      assert_equal "餐饮", categories(:food_and_drink).display_name
+      assert_equal "未分类", Category.uncategorized.display_name
+    end
+  end
+
+  test "display_name returns default category names in english" do
+    I18n.with_locale(:en) do
+      assert_equal "Food & Drink", categories(:food_and_drink).display_name
+      assert_equal "Uncategorized", Category.uncategorized.display_name
+    end
+  end
+
+  test "display_name preserves custom category names" do
+    category = Category.new(name: "School Supplies", color: "#123456", lucide_icon: "book", family: @family)
+
+    I18n.with_locale(:"zh-CN") do
+      assert_equal "School Supplies", category.display_name
+    end
+  end
+
+  test "display_name_with_parent localizes default parent and child names" do
+    category = Category.new(
+      name: "Groceries",
+      color: "#123456",
+      lucide_icon: "shopping-bag",
+      family: @family,
+      parent: categories(:food_and_drink)
+    )
+
+    I18n.with_locale(:"zh-CN") do
+      assert_equal "餐饮 > 杂货", category.display_name_with_parent
+    end
+  end
+
+  test "display_name_with_parent preserves custom child names" do
+    category = Category.new(
+      name: "Coffee Beans",
+      color: "#123456",
+      lucide_icon: "coffee",
+      family: @family,
+      parent: categories(:food_and_drink)
+    )
+
+    I18n.with_locale(:"zh-CN") do
+      assert_equal "餐饮 > Coffee Beans", category.display_name_with_parent
+    end
+  end
+
   test "should accept valid 6-digit hex colors" do
     [ "#FFFFFF", "#000000", "#123456", "#ABCDEF", "#abcdef" ].each do |color|
       category = Category.new(name: "Category #{color}", color: color, lucide_icon: "shapes", family: @family)
@@ -77,4 +141,22 @@ class CategoryTest < ActiveSupport::TestCase
       assert_includes category.errors[:color], "is invalid"
     end
   end
+
+  test "ids_with_transactions returns a lookup hash for categorized transactions" do
+    category = categories(:food_and_drink)
+    transaction = Transaction.create!(category: category)
+    Entry.create!(
+      account: accounts(:depository),
+      entryable: transaction,
+      name: "Lookup transaction",
+      date: Date.current,
+      amount: 10,
+      currency: "USD"
+    )
+
+    lookup = Category.ids_with_transactions(family: @family, category_ids: [ category.id, 0 ])
+
+    assert lookup.key?(category.id)
+    assert_not lookup.key?(0)
+  end
 end
diff --git a/test/models/chat_test.rb b/test/models/chat_test.rb
index accf5e0cb..7466ba82b 100644
--- a/test/models/chat_test.rb
+++ b/test/models/chat_test.rb
@@ -150,4 +150,53 @@ class ChatTest < ActiveSupport::TestCase
     assert_equal I18n.t("chat.errors.rate_limited"), chat.presentable_error_message
     assert_equal "OpenAI API error 429: rate limit exceeded", chat.technical_error_message
   end
+
+  test "handle_undelivered_response! clears a blank pending bubble and records an error + debug log" do
+    BackgroundJobHealth.stubs(:snapshot).returns({ healthy: false, workers: 0 })
+    BackgroundJobHealth.stubs(:summary).returns("workers=0")
+
+    chat = chats(:two)
+    pending = chat.messages.create!(type: "AssistantMessage", content: "", ai_model: "gpt-4.1", status: :pending, created_at: 5.minutes.ago)
+
+    assert_difference -> { DebugLogEntry.count } => 1, -> { Message.count } => -1 do
+      assert chat.handle_undelivered_response!(pending)
+    end
+
+    assert_not Message.exists?(pending.id)
+    assert_equal I18n.t("chat.errors.no_response"), chat.reload.presentable_error_message
+  end
+
+  test "handle_undelivered_response! demotes a partially-streamed pending bubble to failed" do
+    BackgroundJobHealth.stubs(:snapshot).returns({})
+    BackgroundJobHealth.stubs(:summary).returns("")
+
+    chat = chats(:two)
+    pending = chat.messages.create!(type: "AssistantMessage", content: "partial answer", ai_model: "gpt-4.1", status: :pending, created_at: 5.minutes.ago)
+
+    assert_no_difference -> { Message.count } do
+      assert chat.handle_undelivered_response!(pending)
+    end
+
+    assert_equal "failed", pending.reload.status
+  end
+
+  test "handle_undelivered_response! ignores a pending bubble younger than the server timeout" do
+    chat = chats(:two)
+    fresh = chat.messages.create!(type: "AssistantMessage", content: "", ai_model: "gpt-4.1", status: :pending, created_at: 5.seconds.ago)
+
+    assert_no_difference [ "DebugLogEntry.count", "Message.count" ] do
+      assert_not chat.handle_undelivered_response!(fresh)
+    end
+
+    assert fresh.reload.pending?
+  end
+
+  test "handle_undelivered_response! is a no-op for non-pending messages" do
+    chat = chats(:one)
+    complete = chat.messages.create!(type: "AssistantMessage", content: "done", ai_model: "gpt-4.1", status: :complete)
+
+    assert_no_difference [ "DebugLogEntry.count", "Message.count" ] do
+      assert_not chat.handle_undelivered_response!(complete)
+    end
+  end
 end
diff --git a/test/models/coinbase_account/processor_test.rb b/test/models/coinbase_account/processor_test.rb
new file mode 100644
index 000000000..54b87f3b2
--- /dev/null
+++ b/test/models/coinbase_account/processor_test.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class CoinbaseAccount::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @family.update!(currency: "USD")
+    @item = CoinbaseItem.create!(
+      family: @family,
+      name: "Coinbase",
+      api_key: "k",
+      api_secret: "s"
+    )
+    @coinbase_account = @item.coinbase_accounts.create!(
+      name: "Bitcoin Wallet",
+      account_id: "cb_btc_123",
+      currency: "BTC",
+      current_balance: 0.5,
+      raw_payload: { "native_balance" => { "amount" => "25000", "currency" => "USD" } }
+    )
+    @account = Account.create!(
+      family: @family,
+      name: "Coinbase BTC",
+      balance: 0,
+      currency: "USD",
+      accountable: Crypto.create!(subtype: "exchange")
+    )
+    AccountProvider.create!(account: @account, provider: @coinbase_account)
+    @coinbase_account.reload
+  end
+
+  # Regression for issue #2412: the bare `HoldingsProcessor` reference resolved
+  # as CoinbaseAccount::Processor::HoldingsProcessor and raised an uninitialized
+  # constant error that was swallowed, so holdings never refreshed.
+  test "process invokes CoinbaseAccount::HoldingsProcessor" do
+    CoinbaseAccount::HoldingsProcessor.any_instance.expects(:process).once
+
+    CoinbaseAccount::Processor.new(@coinbase_account).process
+  end
+
+  test "updates linked crypto account balance from native_balance" do
+    CoinbaseAccount::HoldingsProcessor.any_instance.stubs(:process).returns(nil)
+
+    CoinbaseAccount::Processor.new(@coinbase_account).process
+
+    @account.reload
+    assert_equal 25_000.to_d, @account.balance
+    assert_equal 0.to_d, @account.cash_balance
+    assert_equal "USD", @account.currency
+  end
+end
diff --git a/test/models/coinstats_item/importer_test.rb b/test/models/coinstats_item/importer_test.rb
index af4436bb3..8f5e235f5 100644
--- a/test/models/coinstats_item/importer_test.rb
+++ b/test/models/coinstats_item/importer_test.rb
@@ -175,7 +175,7 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     assert_equal 2, coinstats_account.raw_transactions_payload.count
   end
 
-  test "handles rate limit error during transactions fetch gracefully" do
+  test "bails and preserves wallet snapshot when transactions fetch is rate limited" do
     crypto = Crypto.create!
     account = @family.accounts.create!(
       accountable: crypto,
@@ -186,6 +186,7 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     coinstats_account = @coinstats_item.coinstats_accounts.create!(
       name: "Ethereum Wallet",
       currency: "USD",
+      current_balance: 1000,
       raw_payload: { address: "0x123abc", blockchain: "ethereum" }
     )
     AccountProvider.create!(account: account, provider: coinstats_account)
@@ -202,24 +203,24 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
       .with("ethereum:0x123abc")
       .returns(success_response(bulk_response))
 
-    @mock_provider.expects(:extract_wallet_balance)
-      .with(bulk_response, "0x123abc", "ethereum")
-      .returns(balance_data)
+    @mock_provider.expects(:extract_wallet_balance).never
 
-    # Bulk transaction fetch fails with error - returns error response from fetch_transactions_for_accounts
     @mock_provider.expects(:get_wallet_transactions)
       .with("ethereum:0x123abc")
-      .raises(Provider::Coinstats::Error.new("Rate limited"))
+      .raises(Provider::Coinstats::RateLimitError.new("Rate limited"))
 
-    # When bulk fetch fails, extract_wallet_transactions is not called (bulk_transactions_data is nil)
+    @mock_provider.expects(:extract_wallet_transactions).never
 
     importer = CoinstatsItem::Importer.new(@coinstats_item, coinstats_provider: @mock_provider)
-    result = importer.import
 
-    # Should still succeed since balance was updated
-    assert result[:success]
-    assert_equal 1, result[:accounts_updated]
-    assert_equal 0, result[:transactions_imported]
+    assert_no_changes -> { coinstats_account.reload.current_balance.to_f } do
+      result = importer.import
+
+      refute result[:success]
+      assert_equal 0, result[:accounts_updated]
+      assert_equal 1, result[:accounts_failed]
+      assert_equal 0, result[:transactions_imported]
+    end
   end
 
   test "preserves exchange portfolio snapshot when portfolio coin fetch is missing" do
@@ -457,17 +458,13 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     ]
 
     @mock_provider.expects(:get_wallet_balances)
-      .with("ethereum:0xworking,ethereum:0xfailing")
+      .with("ethereum:0xfailing,ethereum:0xworking")
       .returns(success_response(bulk_response))
 
     @mock_provider.expects(:extract_wallet_balance)
       .with(bulk_response, "0xworking", "ethereum")
       .returns([ { coinId: "ethereum", name: "Ethereum", amount: 1.0, price: 2000 } ])
 
-    @mock_provider.expects(:extract_wallet_balance)
-      .with(bulk_response, "0xfailing", "ethereum")
-      .returns([]) # Empty array for missing wallet
-
     bulk_transactions_response = [
       {
         blockchain: "ethereum",
@@ -478,7 +475,7 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     ]
 
     @mock_provider.expects(:get_wallet_transactions)
-      .with("ethereum:0xworking,ethereum:0xfailing")
+      .with("ethereum:0xfailing,ethereum:0xworking")
       .returns(success_response(bulk_transactions_response))
 
     @mock_provider.expects(:extract_wallet_transactions)
@@ -497,6 +494,194 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     assert_equal 0, result[:accounts_failed]
   end
 
+  test "multi-wallet import preserves an existing wallet when bulk response omits it" do
+    crypto1 = Crypto.create!
+    account1 = @family.accounts.create!(
+      accountable: crypto1,
+      name: "Working Wallet",
+      balance: 2000,
+      currency: "USD"
+    )
+    coinstats_account1 = @coinstats_item.coinstats_accounts.create!(
+      name: "Working Wallet",
+      currency: "USD",
+      current_balance: 2000,
+      account_id: "ethereum",
+      raw_payload: {
+        address: "0xworking",
+        blockchain: "ethereum",
+        coinId: "ethereum",
+        amount: 1.0,
+        price: 2000,
+        balance: 2000
+      }
+    )
+    AccountProvider.create!(account: account1, provider: coinstats_account1)
+
+    crypto2 = Crypto.create!
+    account2 = @family.accounts.create!(
+      accountable: crypto2,
+      name: "DOGE Wallet",
+      balance: 100,
+      currency: "USD"
+    )
+    coinstats_account2 = @coinstats_item.coinstats_accounts.create!(
+      name: "DOGE Wallet",
+      currency: "USD",
+      current_balance: 100,
+      account_id: "dogecoin",
+      raw_payload: {
+        address: "Ddoge123",
+        blockchain: "dogecoin",
+        coinId: "dogecoin",
+        amount: 1000,
+        price: 0.1,
+        balance: 100
+      }
+    )
+    AccountProvider.create!(account: account2, provider: coinstats_account2)
+
+    bulk_response = [
+      {
+        blockchain: "dogecoin",
+        address: "Ddoge123",
+        connectionId: "dogecoin",
+        balances: [ { coinId: "dogecoin", name: "Dogecoin", amount: 1000, price: 0.1 } ]
+      }
+    ]
+
+    @mock_provider.expects(:get_wallet_balances)
+      .with("dogecoin:Ddoge123,ethereum:0xworking")
+      .returns(success_response(bulk_response))
+
+    @mock_provider.expects(:extract_wallet_balance)
+      .with(bulk_response, "Ddoge123", "dogecoin")
+      .returns([ { coinId: "dogecoin", name: "Dogecoin", amount: 1000, price: 0.1 } ])
+
+    bulk_transactions_response = [
+      {
+        blockchain: "dogecoin",
+        address: "Ddoge123",
+        connectionId: "dogecoin",
+        transactions: []
+      }
+    ]
+
+    @mock_provider.expects(:get_wallet_transactions)
+      .with("dogecoin:Ddoge123,ethereum:0xworking")
+      .returns(success_response(bulk_transactions_response))
+
+    @mock_provider.expects(:extract_wallet_transactions)
+      .with(bulk_transactions_response, "0xworking", "ethereum")
+      .returns([])
+
+    @mock_provider.expects(:extract_wallet_transactions)
+      .with(bulk_transactions_response, "Ddoge123", "dogecoin")
+      .returns([])
+
+    assert_difference "DebugLogEntry.count", 1 do
+      result = CoinstatsItem::Importer.new(@coinstats_item, coinstats_provider: @mock_provider).import
+
+      assert result[:success]
+    end
+
+    coinstats_account1.reload
+    coinstats_account2.reload
+
+    assert_equal 2000.0, coinstats_account1.current_balance.to_f, "missing wallet data should not zero an existing wallet"
+    assert_equal 100.0, coinstats_account2.current_balance.to_f
+
+    entry = DebugLogEntry.order(:created_at).last
+    assert_equal "provider_sync_error", entry.category
+    assert_equal "warn", entry.level
+    assert_equal "CoinStats wallet balance sync preserved existing snapshot because wallet was missing from bulk response", entry.message
+    assert_equal "coinstats", entry.provider_key
+    assert_equal @family.id, entry.family_id
+    assert_equal coinstats_account1.account_provider.id, entry.account_provider_id
+    assert_equal "wallet_missing_from_bulk_response", entry.metadata["reason"]
+    assert_equal "0xworking", entry.metadata["wallet_address"]
+  end
+
+  test "bulk balance fetch failure preserves all existing wallet balances during import" do
+    crypto1 = Crypto.create!
+    account1 = @family.accounts.create!(
+      accountable: crypto1,
+      name: "Ethereum Wallet",
+      balance: 2000,
+      currency: "USD"
+    )
+    coinstats_account1 = @coinstats_item.coinstats_accounts.create!(
+      name: "Ethereum Wallet",
+      currency: "USD",
+      current_balance: 2000,
+      account_id: "ethereum",
+      raw_payload: {
+        address: "0xeth123",
+        blockchain: "ethereum",
+        coinId: "ethereum",
+        amount: 1.0,
+        price: 2000,
+        balance: 2000
+      }
+    )
+    AccountProvider.create!(account: account1, provider: coinstats_account1)
+
+    crypto2 = Crypto.create!
+    account2 = @family.accounts.create!(
+      accountable: crypto2,
+      name: "DOGE Wallet",
+      balance: 100,
+      currency: "USD"
+    )
+    coinstats_account2 = @coinstats_item.coinstats_accounts.create!(
+      name: "DOGE Wallet",
+      currency: "USD",
+      current_balance: 100,
+      account_id: "dogecoin",
+      raw_payload: {
+        address: "Ddoge456",
+        blockchain: "dogecoin",
+        coinId: "dogecoin",
+        amount: 1000,
+        price: 0.1,
+        balance: 100
+      }
+    )
+    AccountProvider.create!(account: account2, provider: coinstats_account2)
+
+    @mock_provider.expects(:get_wallet_balances)
+      .with("dogecoin:Ddoge456,ethereum:0xeth123")
+      .raises(Provider::Coinstats::Error.new("CoinStats timeout"))
+
+    bulk_transactions_response = []
+    @mock_provider.expects(:get_wallet_transactions)
+      .with("dogecoin:Ddoge456,ethereum:0xeth123")
+      .returns(success_response(bulk_transactions_response))
+
+    assert_difference "DebugLogEntry.count", 3 do
+      result = CoinstatsItem::Importer.new(@coinstats_item, coinstats_provider: @mock_provider).import
+
+      assert result[:success]
+    end
+
+    coinstats_account1.reload
+    coinstats_account2.reload
+
+    assert_equal 2000.0, coinstats_account1.current_balance.to_f
+    assert_equal 100.0, coinstats_account2.current_balance.to_f
+
+    entries = DebugLogEntry.order(:created_at).last(3)
+    fetch_failure_entry = entries.find { |entry| entry.message == "CoinStats bulk balance fetch failed" }
+    assert_not_nil fetch_failure_entry
+    assert_equal "provider_sync_error", fetch_failure_entry.category
+    assert_equal "coinstats", fetch_failure_entry.provider_key
+    assert_equal "CoinStats timeout", fetch_failure_entry.metadata["error_message"]
+
+    preserved_entries = entries.select { |entry| entry.message == "CoinStats wallet balance sync preserved existing snapshot after bulk fetch failure" }
+    assert_equal 2, preserved_entries.size
+    assert_equal [ "0xeth123", "Ddoge456" ], preserved_entries.map { |entry| entry.metadata["wallet_address"] }.sort
+  end
+
   test "uses bulk endpoint for multiple unique wallets and falls back on error" do
     # Create accounts with two different wallet addresses
     crypto1 = Crypto.create!
@@ -544,7 +729,7 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     ]
 
     @mock_provider.expects(:get_wallet_balances)
-      .with("ethereum:0xeth123,bitcoin:bc1qbtc456")
+      .with("bitcoin:bc1qbtc456,ethereum:0xeth123")
       .returns(success_response(bulk_response))
 
     @mock_provider.expects(:extract_wallet_balance)
@@ -571,7 +756,7 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
     ]
 
     @mock_provider.expects(:get_wallet_transactions)
-      .with("ethereum:0xeth123,bitcoin:bc1qbtc456")
+      .with("bitcoin:bc1qbtc456,ethereum:0xeth123")
       .returns(success_response(bulk_transactions_response))
 
     @mock_provider.expects(:extract_wallet_transactions)
@@ -597,6 +782,53 @@ class CoinstatsItem::ImporterTest < ActiveSupport::TestCase
 
   # DeFi / staking tests
 
+  test "skips DeFi sync for unsupported blockchains" do
+    crypto = Crypto.create!
+    account = @family.accounts.create!(
+      accountable: crypto,
+      name: "Bitcoin Wallet",
+      balance: 4500,
+      currency: "USD"
+    )
+    coinstats_account = @coinstats_item.coinstats_accounts.create!(
+      name: "Bitcoin Wallet",
+      currency: "USD",
+      account_id: "bitcoin",
+      raw_payload: { address: "bc1qbtc456", blockchain: "bitcoin" }
+    )
+    AccountProvider.create!(account: account, provider: coinstats_account)
+
+    balance_data = [
+      { coinId: "bitcoin", name: "Bitcoin", symbol: "BTC", amount: 0.1, price: 45000 }
+    ]
+    bulk_response = [
+      { blockchain: "bitcoin", address: "bc1qbtc456", connectionId: "bitcoin", balances: balance_data }
+    ]
+    bulk_transactions_response = [
+      { blockchain: "bitcoin", address: "bc1qbtc456", connectionId: "bitcoin", transactions: [] }
+    ]
+
+    @mock_provider.expects(:get_wallet_defi).never
+    @mock_provider.expects(:get_wallet_balances)
+      .with("bitcoin:bc1qbtc456")
+      .returns(success_response(bulk_response))
+    @mock_provider.expects(:extract_wallet_balance)
+      .with(bulk_response, "bc1qbtc456", "bitcoin")
+      .returns(balance_data)
+    @mock_provider.expects(:get_wallet_transactions)
+      .with("bitcoin:bc1qbtc456")
+      .returns(success_response(bulk_transactions_response))
+    @mock_provider.expects(:extract_wallet_transactions)
+      .with(bulk_transactions_response, "bc1qbtc456", "bitcoin")
+      .returns([])
+
+    result = CoinstatsItem::Importer.new(@coinstats_item, coinstats_provider: @mock_provider).import
+
+    assert result[:success]
+    assert_equal 1, result[:accounts_updated]
+    assert_equal 4500.0, coinstats_account.reload.current_balance.to_f
+  end
+
   test "creates DeFi account with balance equal to total position value, not quantity * price" do
     crypto = Crypto.create!
     account = @family.accounts.create!(
diff --git a/test/models/enable_banking_account/processor_test.rb b/test/models/enable_banking_account/processor_test.rb
index 6bdbebda1..5a1ae5a0d 100644
--- a/test/models/enable_banking_account/processor_test.rb
+++ b/test/models/enable_banking_account/processor_test.rb
@@ -42,48 +42,153 @@ class EnableBankingAccount::ProcessorTest < ActiveSupport::TestCase
     assert_nil result
   end
 
-  test "sets CC balance to available_credit when credit_limit is present" do
-    cc_account = accounts(:credit_card)
-    @enable_banking_account.update!(
-      current_balance: 450.00,
-      credit_limit: 1000.00
-    )
-    AccountProvider.find_by(provider: @enable_banking_account)&.destroy
-    AccountProvider.create!(account: cc_account, provider: @enable_banking_account)
+  test "skips balance update when provider current_balance is nil" do
+    @account.update!(cash_balance: 987.65)
+    @enable_banking_account.update_columns(current_balance: nil)
 
-    EnableBankingAccount::Processor.new(@enable_banking_account).process
+    EnableBankingAccount::Transactions::Processor.any_instance.expects(:process).once
 
-    assert_equal 550.0, cc_account.reload.cash_balance
-    if cc_account.accountable.respond_to?(:available_credit)
-      assert_equal 550.0, cc_account.accountable.reload.available_credit
+    assert_no_changes -> { @account.reload.cash_balance } do
+      EnableBankingAccount::Processor.new(@enable_banking_account).process
     end
   end
 
-  test "falls back to stored available_credit when credit_limit is absent" do
+  test "sets CC balance as absolute debt and tracks available_credit when limit is present" do
     cc_account = accounts(:credit_card)
-    cc_account.accountable.update!(available_credit: 1000.0)
 
-    @enable_banking_account.update!(current_balance: 300.00, credit_limit: nil)
-
-    AccountProvider.find_by(provider: @enable_banking_account)&.destroy
-    AccountProvider.create!(account: cc_account, provider: @enable_banking_account)
+    @enable_banking_account.update!(
+      current_balance: 900.00,
+      credit_limit: 1000.00,
+      treat_balance_as_available_credit: true
+    )
+    relink_provider_to(cc_account)
 
     EnableBankingAccount::Processor.new(@enable_banking_account).process
 
-    assert_equal 700.0, cc_account.reload.cash_balance
+    assert_equal 100.0, cc_account.reload.cash_balance
+    if cc_account.accountable.respond_to?(:available_credit)
+      assert_equal 1000.0, cc_account.accountable.reload.available_credit
+    end
   end
 
-  test "sets CC balance to raw outstanding when credit_limit is absent" do
+  test "when treat_balance_as_available_credit is true and card is overpaid, floors debt at zero" do
+    cc_account = accounts(:credit_card)
+
+    @enable_banking_account.update!(
+      current_balance: 1050.00, # overpaid by 50
+      credit_limit: 1000.00,
+      treat_balance_as_available_credit: true
+    )
+    relink_provider_to(cc_account)
+
+    EnableBankingAccount::Processor.new(@enable_banking_account).process
+
+    assert_equal 0.0, cc_account.reload.cash_balance
+    if cc_account.accountable.respond_to?(:available_credit)
+      assert_equal 1000.0, cc_account.accountable.reload.available_credit
+    end
+  end
+
+  test "when treat_balance_as_available_credit is true and API limit absent, derives debt from manually set available_credit" do
+    cc_account = accounts(:credit_card)
+
+    cc_account.accountable.update!(available_credit: 1000.0)
+
+    @enable_banking_account.update!(
+      current_balance: 900.00,
+      credit_limit: nil,
+      treat_balance_as_available_credit: true
+    )
+
+    relink_provider_to(cc_account)
+
+    EnableBankingAccount::Processor.new(@enable_banking_account).process
+
+    # The manually configured available_credit acts as the credit limit and
+    # must survive the sync unchanged.
+    assert_equal 100.0, cc_account.reload.cash_balance
+    assert_equal 1000.0, cc_account.accountable.reload.available_credit
+  end
+
+  test "when treat_balance_as_available_credit is true but no limit is known, keeps existing balance" do
+    cc_account = accounts(:credit_card)
+
+    cc_account.accountable.update!(available_credit: nil)
+
+    @enable_banking_account.update!(
+      current_balance: 900.00,
+      credit_limit: nil,
+      treat_balance_as_available_credit: true
+    )
+
+    relink_provider_to(cc_account)
+
+    balance_before = cc_account.cash_balance
+
+    EnableBankingAccount::Processor.new(@enable_banking_account).process
+
+    # The reported balance is available credit and there's no limit to reverse
+    # from, so the debt is unknown. The existing balance must not be overwritten,
+    # and available_credit must stay blank so a later sync can't mistake a
+    # stale reported balance for a credit limit.
+    assert_equal balance_before, cc_account.reload.cash_balance
+    assert_nil cc_account.accountable.reload.available_credit
+  end
+
+  test "when treat_balance_as_available_credit is false, treats balance as absolute debt natively" do
+    cc_account = accounts(:credit_card)
+
+    # API sends current_balance as debt (e.g. 100) and credit limit (e.g. 1000)
+    # Debt should remain 100, available credit becomes 900
+    @enable_banking_account.update!(
+      current_balance: 100.00,
+      credit_limit: 1000.00,
+      treat_balance_as_available_credit: false
+    )
+    relink_provider_to(cc_account)
+
+    EnableBankingAccount::Processor.new(@enable_banking_account).process
+
+    assert_equal 100.0, cc_account.reload.cash_balance
+    if cc_account.accountable.respond_to?(:available_credit)
+      assert_equal 900.0, cc_account.accountable.reload.available_credit
+    end
+  end
+
+  test "sets CC balance to absolute debt when both limit and stored available_credit are absent" do
     cc_account = accounts(:credit_card)
     cc_account.accountable.update!(available_credit: nil)
 
     @enable_banking_account.update!(current_balance: 300.00, credit_limit: nil)
 
-    AccountProvider.find_by(provider: @enable_banking_account)&.destroy
-    AccountProvider.create!(account: cc_account, provider: @enable_banking_account)
+    relink_provider_to(cc_account)
 
     EnableBankingAccount::Processor.new(@enable_banking_account).process
 
     assert_equal 300.0, cc_account.reload.cash_balance
   end
+
+  test "treat_balance_as_available_credit flag is a no-op on Loan accounts" do
+    loan_account = accounts(:loan)
+
+    # Even with the flag set to true, loans should only ever process as absolute debt
+    @enable_banking_account.update!(
+      current_balance: 50000.00,
+      credit_limit: 100000.00,
+      treat_balance_as_available_credit: true
+    )
+
+    relink_provider_to(loan_account)
+
+    EnableBankingAccount::Processor.new(@enable_banking_account).process
+
+    # Balance should match the absolute incoming balance, no credit limit math applied
+    assert_equal 50000.0, loan_account.reload.cash_balance
+  end
+
+  private
+    def relink_provider_to(account)
+      AccountProvider.find_by(provider: @enable_banking_account)&.destroy
+      AccountProvider.create!(account: account, provider: @enable_banking_account)
+    end
 end
diff --git a/test/models/enable_banking_account_processor_test.rb b/test/models/enable_banking_account_processor_test.rb
new file mode 100644
index 000000000..320e7f7e1
--- /dev/null
+++ b/test/models/enable_banking_account_processor_test.rb
@@ -0,0 +1,61 @@
+require "test_helper"
+
+class EnableBankingAccountProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item = EnableBankingItem.new(family: @family, name: "Enable Banking",
+      country_code: "GB", application_id: "test-app")
+    @item.save!(validate: false)
+  end
+
+  test "skips the account update when current_balance is nil (failed balance fetch)" do
+    eb_acct = @item.enable_banking_accounts.create!(
+      name: "Checking",
+      uid: "eb_1",
+      currency: "GBP",
+      current_balance: nil
+    )
+
+    acct = accounts(:depository)
+    acct.update!(balance: 500, cash_balance: 500, currency: "GBP")
+    AccountProvider.create!(account: acct, provider: eb_acct)
+
+    EnableBankingAccount::Processor.new(eb_acct).send(:process_account!)
+
+    acct.reload
+    assert_equal BigDecimal("500"), acct.cash_balance,
+      "a sync whose balance fetch failed must not zero the account"
+    assert_equal BigDecimal("500"), acct.balance
+    # Parity/invariant check, not regression coverage: unlike Lunch Flow, the
+    # EB *processor* never had a currency-reset defect (its fallback chain
+    # already preferred the stored value), so this assertion also passes on
+    # main. The EB currency regression test lives at the model layer below.
+    assert_equal "GBP", acct.currency,
+      "a sync whose balance fetch failed must not change the account currency"
+  end
+
+  test "still updates the account when current_balance is present" do
+    eb_acct = @item.enable_banking_accounts.create!(
+      name: "Checking",
+      uid: "eb_2",
+      currency: "GBP",
+      current_balance: BigDecimal("250")
+    )
+
+    acct = accounts(:depository)
+    acct.update!(balance: 500, cash_balance: 500, currency: "GBP")
+    AccountProvider.create!(account: acct, provider: eb_acct)
+
+    EnableBankingAccount::Processor.new(eb_acct).send(:process_account!)
+
+    assert_equal BigDecimal("250"), acct.reload.cash_balance
+  end
+  test "snapshot upsert preserves an established currency when the payload omits it" do
+    eb_acct = @item.enable_banking_accounts.create!(name: "Checking", uid: "eb_3", currency: "GBP")
+
+    eb_acct.upsert_enable_banking_snapshot!({ uid: "eb_3", name: "Checking" })
+
+    assert_equal "GBP", eb_acct.reload.currency,
+      "an omitted payload currency must not reset an established account to EUR"
+  end
+end
diff --git a/test/models/enable_banking_entry/processor_test.rb b/test/models/enable_banking_entry/processor_test.rb
index 5b54b29be..d916e66c4 100644
--- a/test/models/enable_banking_entry/processor_test.rb
+++ b/test/models/enable_banking_entry/processor_test.rb
@@ -430,4 +430,25 @@ class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
 
     assert_nil processor.send(:merchant)
   end
+
+  test "converts unix timestamp date using family timezone not UTC" do
+    # 2025-07-14 23:30:00 UTC == 2025-07-15 01:30:00 CEST
+    @family.update!(timezone: "Europe/Berlin")
+
+    tx = {
+      entry_reference: "tz_ref",
+      transaction_id: nil,
+      booking_date: 1752535800, # 2025-07-14 23:30:00 UTC
+      transaction_amount: { amount: "10.00", currency: "EUR" },
+      creditor: { name: "Late Night Shop" },
+      credit_debit_indicator: "DBIT",
+      remittance_information: [ "After midnight" ],
+      status: "BOOK"
+    }
+
+    result = EnableBankingEntry::Processor.new(tx, enable_banking_account: @enable_banking_account).process
+
+    assert_not_nil result
+    assert_equal Date.new(2025, 7, 15), result.date
+  end
 end
diff --git a/test/models/enable_banking_item/importer_balance_test.rb b/test/models/enable_banking_item/importer_balance_test.rb
new file mode 100644
index 000000000..d6223e03a
--- /dev/null
+++ b/test/models/enable_banking_item/importer_balance_test.rb
@@ -0,0 +1,176 @@
+require "test_helper"
+require "ostruct"
+
+class EnableBankingItem::ImporterBalanceTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @enable_banking_item = EnableBankingItem.create!(
+      family: @family,
+      name: "CGD PT",
+      country_code: "PT",
+      application_id: "test_app_id",
+      client_certificate: "test_cert",
+      session_id: "test_session",
+      session_expires_at: 1.day.from_now,
+      status: :good
+    )
+
+    @enable_banking_account = @enable_banking_item.enable_banking_accounts.create!(
+      name: "CGD Current",
+      uid: "identification_hash_1",
+      account_id: "11111111-1111-1111-1111-111111111111",
+      currency: "EUR",
+      current_balance: 123.45,
+      account_status: "active",
+      provider: "enable_banking"
+    )
+
+    @mock_provider = OpenStruct.new
+    @importer = EnableBankingItem::Importer.new(@enable_banking_item, enable_banking_provider: @mock_provider)
+  end
+
+  test "fetch_and_update_balance prefers booked balance before available balance" do
+    @mock_provider.stubs(:get_account_balances).returns(
+      balances: [
+        {
+          balance_type: "ITAV",
+          balance_amount: { amount: "1250.00", currency: "EUR" },
+          credit_debit_indicator: "CRDT"
+        },
+        {
+          balance_type: "ITBD",
+          balance_amount: { amount: "50.00", currency: "EUR" },
+          credit_debit_indicator: "DBIT"
+        }
+      ]
+    )
+
+    assert @importer.send(:fetch_and_update_balance, @enable_banking_account)
+
+    assert_equal BigDecimal("-50.00"), @enable_banking_account.reload.current_balance
+  end
+
+  test "fetch_and_update_balance handles descriptive booked balance types" do
+    @mock_provider.stubs(:get_account_balances).returns(
+      balances: [
+        {
+          balance_type: "interimAvailable",
+          balance_amount: { amount: "2000.00", currency: "EUR" },
+          credit_debit_indicator: "CRDT"
+        },
+        {
+          balance_type: "closingBooked",
+          balance_amount: { amount: "321.09", currency: "EUR" },
+          credit_debit_indicator: "CRDT"
+        }
+      ]
+    )
+
+    assert @importer.send(:fetch_and_update_balance, @enable_banking_account)
+
+    assert_equal BigDecimal("321.09"), @enable_banking_account.reload.current_balance
+  end
+
+  test "balance endpoint failure marks provider balance unavailable and creates sanitized debug log" do
+    error = Provider::EnableBanking::EnableBankingError.new(
+      "Bad request to Enable Banking API: {\"error\":\"BALANCES_UNAVAILABLE\"}",
+      :bad_request,
+      response_data: {
+        error: "BALANCES_UNAVAILABLE",
+        detail: { account_id: "sensitive_account_id_should_not_be_persisted" }
+      }
+    )
+
+    @mock_provider.stubs(:get_account_balances).raises(error)
+
+    assert_difference "DebugLogEntry.count", 1 do
+      assert_not @importer.send(:fetch_and_update_balance, @enable_banking_account)
+    end
+
+    assert_nil @enable_banking_account.reload.current_balance
+
+    entry = DebugLogEntry.order(:created_at).last
+    assert_equal "provider_sync_error", entry.category
+    assert_equal "warn", entry.level
+    assert_equal "enable_banking", entry.provider_key
+    assert_equal "bad_request", entry.metadata["error_type"]
+    assert_equal "BALANCES_UNAVAILABLE", entry.metadata.dig("provider_error", "error")
+    assert_nil entry.metadata["response_data"]
+    assert_nil entry.metadata.dig("provider_error", "account_id")
+  end
+
+  test "empty balance response marks provider balance unavailable" do
+    @mock_provider.stubs(:get_account_balances).returns(balances: [])
+
+    assert_not @importer.send(:fetch_and_update_balance, @enable_banking_account)
+    assert_nil @enable_banking_account.reload.current_balance
+  end
+
+  test "unusable balance response marks provider balance unavailable" do
+    @mock_provider.stubs(:get_account_balances).returns(
+      balances: [
+        {
+          balance_type: "CLBD",
+          balance_amount: { currency: "EUR" },
+          credit_debit_indicator: "CRDT"
+        }
+      ]
+    )
+
+    assert_not @importer.send(:fetch_and_update_balance, @enable_banking_account)
+    assert_nil @enable_banking_account.reload.current_balance
+  end
+
+  test "import continues transaction sync when balance refresh fails" do
+    depository = Depository.create!
+    linked_account = Account.create!(
+      family: @family,
+      name: "CGD linked",
+      balance: 123.45,
+      cash_balance: 123.45,
+      currency: "EUR",
+      accountable: depository
+    )
+    AccountProvider.create!(account: linked_account, provider: @enable_banking_account)
+
+    @enable_banking_item.stubs(:upsert_enable_banking_snapshot!)
+    @importer.stubs(:fetch_session_data).returns(accounts: [])
+    @importer.expects(:fetch_and_update_balance).with(@enable_banking_account).returns(false)
+    @importer.expects(:fetch_and_store_transactions).with(@enable_banking_account).returns(
+      success: true,
+      transactions_count: 2
+    )
+
+    result = @importer.import
+
+    assert result[:success]
+    assert_equal 2, result[:transactions_imported]
+    assert_equal 0, result[:transactions_failed]
+    assert_equal 1, result[:balances_failed]
+  end
+
+  test "balance endpoint failure marks unsaved provider balance unavailable" do
+    unsaved_account = EnableBankingAccount.new(
+      enable_banking_item: @enable_banking_item,
+      uid: "unsaved-account",
+      current_balance: BigDecimal("123.45"),
+      currency: "EUR"
+    )
+
+    unsaved_account.stubs(:api_account_id).returns("unsaved-account")
+
+    error = Provider::EnableBanking::EnableBankingError.new(
+      "Bad request to Enable Banking API",
+      :bad_request,
+      response_data: { error: "BALANCES_UNAVAILABLE" }
+    )
+
+    @mock_provider.stubs(:get_account_balances).raises(error)
+
+    assert_nothing_raised do
+      assert_not @importer.send(:fetch_and_update_balance, unsaved_account)
+    end
+
+    assert_nil unsaved_account.current_balance
+  end
+end
diff --git a/test/models/enable_banking_item/importer_error_handling_test.rb b/test/models/enable_banking_item/importer_error_handling_test.rb
index e5b9192cb..5f2e0b73e 100644
--- a/test/models/enable_banking_item/importer_error_handling_test.rb
+++ b/test/models/enable_banking_item/importer_error_handling_test.rb
@@ -19,22 +19,43 @@ class EnableBankingItem::ImporterErrorHandlingTest < ActiveSupport::TestCase
     @importer = EnableBankingItem::Importer.new(@enable_banking_item, enable_banking_provider: @mock_provider)
   end
 
-  test "handle_sync_error handles unauthorized EnableBankingError" do
+  # Session-level auth failures (the top-level GET /sessions call) mean the consent
+  # is genuinely dead and the user must re-authorize.
+  test "handle_sync_error with session_level flips requires_update on unauthorized" do
     error = Provider::EnableBanking::EnableBankingError.new("Unauthorized", :unauthorized)
-    message = @importer.send(:handle_sync_error, error)
+    message = @importer.send(:handle_sync_error, error, session_level: true)
 
     assert_equal I18n.t("enable_banking_items.errors.session_invalid"), message
     assert @enable_banking_item.reload.requires_update?
   end
 
-  test "handle_sync_error handles not_found EnableBankingError" do
+  test "handle_sync_error with session_level flips requires_update on not_found" do
     error = Provider::EnableBanking::EnableBankingError.new("Not Found", :not_found)
-    message = @importer.send(:handle_sync_error, error)
+    message = @importer.send(:handle_sync_error, error, session_level: true)
 
     assert_equal I18n.t("enable_banking_items.errors.session_invalid"), message
     assert @enable_banking_item.reload.requires_update?
   end
 
+  # Per-account auth failures (a stale account UID, a transient hiccup on one
+  # account) must NOT kill the whole connection — that is what made every sync
+  # report "session expired". They surface as ordinary api errors and retry.
+  test "handle_sync_error per-account unauthorized does not flip requires_update" do
+    error = Provider::EnableBanking::EnableBankingError.new("Unauthorized", :unauthorized)
+    message = @importer.send(:handle_sync_error, error)
+
+    assert_equal I18n.t("enable_banking_items.errors.api_error"), message
+    assert_not @enable_banking_item.reload.requires_update?
+  end
+
+  test "handle_sync_error per-account not_found does not flip requires_update" do
+    error = Provider::EnableBanking::EnableBankingError.new("Not Found", :not_found)
+    message = @importer.send(:handle_sync_error, error)
+
+    assert_equal I18n.t("enable_banking_items.errors.api_error"), message
+    assert_not @enable_banking_item.reload.requires_update?
+  end
+
   test "handle_sync_error handles other EnableBankingError as api_error" do
     error = Provider::EnableBanking::EnableBankingError.new("Some API error", :internal_server_error)
     message = @importer.send(:handle_sync_error, error)
@@ -53,14 +74,24 @@ class EnableBankingItem::ImporterErrorHandlingTest < ActiveSupport::TestCase
     assert @enable_banking_item.reload.requires_update?
   end
 
-  test "fetch_and_store_transactions updates status to requires_update on unauthorized error" do
+  test "fetch_session_data reconciles session_expires_at from API access.valid_until" do
+    new_expiry = 45.days.from_now.change(usec: 0)
+    @mock_provider.stubs(:get_session).returns({ access: { valid_until: new_expiry.iso8601 } })
+
+    @importer.send(:fetch_session_data)
+
+    assert_equal new_expiry.to_i, @enable_banking_item.reload.session_expires_at.to_i
+  end
+
+  test "fetch_and_store_transactions does not flip whole connection on per-account unauthorized error" do
     enable_banking_account = EnableBankingAccount.new(uid: "test_uid")
     @importer.stubs(:determine_sync_start_date).returns(Date.today)
     @importer.expects(:fetch_paginated_transactions).raises(Provider::EnableBanking::EnableBankingError.new("Unauthorized", :unauthorized))
 
-    @importer.send(:fetch_and_store_transactions, enable_banking_account)
+    result = @importer.send(:fetch_and_store_transactions, enable_banking_account)
 
-    assert @enable_banking_item.reload.requires_update?
+    assert_not result[:success]
+    assert_not @enable_banking_item.reload.requires_update?
   end
 
   test "fetch_and_store_transactions succeeds and skips pending when ASPSP rejects PDNG transaction_status" do
@@ -81,32 +112,55 @@ class EnableBankingItem::ImporterErrorHandlingTest < ActiveSupport::TestCase
     assert result[:success]
   end
 
-  test "fetch_and_store_transactions fails when validation error is unrelated to transactionStatus" do
+  # Regression for #1805: ImaginV2 (and other Enable Banking connectors) reject PDNG with
+  # a generic WRONG_REQUEST_PARAMETERS body whose message does not mention "transactionStatus".
+  # The sync must still succeed and import booked transactions.
+  test "fetch_and_store_transactions succeeds when ASPSP rejects PDNG with WRONG_REQUEST_PARAMETERS" do
     enable_banking_account = EnableBankingAccount.new(uid: "test_uid")
     @importer.stubs(:determine_sync_start_date).returns(Date.today)
     @importer.stubs(:include_pending?).returns(true)
 
-    date_error = Provider::EnableBanking::EnableBankingError.new(
-      "Validation error from Enable Banking API: {\"message\":\"Invalid date_from format\"}",
-      :validation_error
+    imagin_error = Provider::EnableBanking::EnableBankingError.new(
+      "Validation error from Enable Banking API: {\"error\":\"WRONG_REQUEST_PARAMETERS\"}",
+      :validation_error,
+      response_data: { error: "WRONG_REQUEST_PARAMETERS" }
     )
 
     @importer.stubs(:fetch_paginated_transactions).with(enable_banking_account, has_entries(transaction_status: "BOOK")).returns([])
-    @importer.stubs(:fetch_paginated_transactions).with(enable_banking_account, has_entries(transaction_status: "PDNG")).raises(date_error)
+    @importer.stubs(:fetch_paginated_transactions).with(enable_banking_account, has_entries(transaction_status: "PDNG")).raises(imagin_error)
+
+    result = @importer.send(:fetch_and_store_transactions, enable_banking_account)
+
+    assert result[:success]
+  end
+
+  test "fetch_and_store_transactions propagates non-validation EnableBankingError from PDNG fetch" do
+    enable_banking_account = EnableBankingAccount.new(uid: "test_uid")
+    @importer.stubs(:determine_sync_start_date).returns(Date.today)
+    @importer.stubs(:include_pending?).returns(true)
+
+    rate_limit_error = Provider::EnableBanking::EnableBankingError.new(
+      "Rate limit exceeded. Please try again later.",
+      :rate_limited
+    )
+
+    @importer.stubs(:fetch_paginated_transactions).with(enable_banking_account, has_entries(transaction_status: "BOOK")).returns([])
+    @importer.stubs(:fetch_paginated_transactions).with(enable_banking_account, has_entries(transaction_status: "PDNG")).raises(rate_limit_error)
 
     result = @importer.send(:fetch_and_store_transactions, enable_banking_account)
 
     assert_not result[:success]
   end
 
-  test "fetch_and_update_balance updates status to requires_update on unauthorized error" do
+  test "fetch_and_update_balance does not flip whole connection on per-account unauthorized error" do
     enable_banking_account = EnableBankingAccount.new(uid: "test_uid")
     def @mock_provider.get_account_balances(**args)
       raise Provider::EnableBanking::EnableBankingError.new("Unauthorized", :unauthorized)
     end
 
-    @importer.send(:fetch_and_update_balance, enable_banking_account)
+    result = @importer.send(:fetch_and_update_balance, enable_banking_account)
 
-    assert @enable_banking_item.reload.requires_update?
+    assert_not result
+    assert_not @enable_banking_item.reload.requires_update?
   end
 end
diff --git a/test/models/enable_banking_item/importer_pdng_test.rb b/test/models/enable_banking_item/importer_pdng_test.rb
index 3d444ebf4..3fd1d18af 100644
--- a/test/models/enable_banking_item/importer_pdng_test.rb
+++ b/test/models/enable_banking_item/importer_pdng_test.rb
@@ -143,4 +143,49 @@ class EnableBankingItem::ImporterPdngTest < ActiveSupport::TestCase
 
     assert_equal @enable_banking_account.id, found.id
   end
+
+  # --- fetch_and_store_transactions behavior ---
+
+  test "fetch_and_store_transactions tags PDNG transaction as pending when include_pending is true" do
+    @importer.stubs(:include_pending?).returns(true)
+
+    # Some ASPSPs ignore transaction_status=BOOK and return PDNG transactions anyway.
+    tx = {
+      entry_reference: "tx_ref",
+      transaction_id: "tx_id",
+      booking_date: "2026-03-05",
+      transaction_amount: { amount: "10.00", currency: "EUR" },
+      status: "PDNG"
+    }
+
+    @importer.stubs(:fetch_paginated_transactions).with(@enable_banking_account, has_entries(transaction_status: "BOOK")).returns([ tx ])
+    @importer.stubs(:fetch_paginated_transactions).with(@enable_banking_account, has_entries(transaction_status: "PDNG")).returns([ tx ])
+
+    result = @importer.send(:fetch_and_store_transactions, @enable_banking_account)
+
+    assert result[:success]
+    stored = @enable_banking_account.raw_transactions_payload
+    assert_equal 1, stored.size
+    assert_equal true, stored.first.with_indifferent_access[:_pending]
+  end
+
+  test "fetch_and_store_transactions filters out PDNG transaction when include_pending is false" do
+    @importer.stubs(:include_pending?).returns(false)
+
+    # If include_pending is false, we must reject any PDNG transactions returned in the BOOK fetch.
+    tx = {
+      entry_reference: "tx_ref",
+      transaction_id: "tx_id",
+      booking_date: "2026-03-05",
+      transaction_amount: { amount: "10.00", currency: "EUR" },
+      status: "PDNG"
+    }
+
+    @importer.stubs(:fetch_paginated_transactions).with(@enable_banking_account, has_entries(transaction_status: "BOOK")).returns([ tx ])
+
+    result = @importer.send(:fetch_and_store_transactions, @enable_banking_account)
+
+    assert result[:success]
+    assert_nil @enable_banking_account.raw_transactions_payload
+  end
 end
diff --git a/test/models/enable_banking_item/syncer_test.rb b/test/models/enable_banking_item/syncer_test.rb
new file mode 100644
index 000000000..861db6e6c
--- /dev/null
+++ b/test/models/enable_banking_item/syncer_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+class EnableBankingItem::SyncerTest < ActiveSupport::TestCase
+  setup do
+    @item = EnableBankingItem.create!(
+      family: families(:dylan_family),
+      name: "Test",
+      country_code: "DE",
+      application_id: "app",
+      client_certificate: "cert",
+      session_id: "sess",
+      session_expires_at: 1.day.ago, # expired
+      status: :good
+    )
+    @syncer = EnableBankingItem::Syncer.new(@item)
+  end
+
+  test "expired session marks requires_update and finishes gracefully without raising" do
+    sync = Sync.create!(syncable: @item)
+
+    assert_nothing_raised do
+      @syncer.perform_sync(sync)
+    end
+
+    assert @item.reload.requires_update?
+
+    stats = sync.reload.sync_stats || {}
+    assert_equal 0, (stats["total_errors"] || 0),
+      "Expired session should be a graceful reconnect state, not a red sync error"
+  end
+end
diff --git a/test/models/enable_banking_item_test.rb b/test/models/enable_banking_item_test.rb
new file mode 100644
index 000000000..83e101119
--- /dev/null
+++ b/test/models/enable_banking_item_test.rb
@@ -0,0 +1,106 @@
+require "test_helper"
+
+class EnableBankingItemTest < ActiveSupport::TestCase
+  setup do
+    @item = EnableBankingItem.new(
+      family: families(:dylan_family),
+      name: "Test",
+      country_code: "DE",
+      application_id: "app",
+      client_certificate: "cert"
+    )
+  end
+
+  test "select_auth_method prefers REDIRECT over DECOUPLED and EMBEDDED" do
+    aspsp = {
+      auth_methods: [
+        { name: "decoupled_app", approach: "DECOUPLED" },
+        { name: "redirect_web", approach: "REDIRECT" },
+        { name: "embedded_form", approach: "EMBEDDED" }
+      ]
+    }.with_indifferent_access
+
+    selected = @item.send(:select_auth_method, aspsp, "personal")
+
+    assert_equal "redirect_web", selected[:name]
+    assert_equal "REDIRECT", selected[:approach]
+  end
+
+  test "select_auth_method falls back to DECOUPLED when no REDIRECT exists" do
+    aspsp = {
+      auth_methods: [
+        { name: "embedded_form", approach: "EMBEDDED" },
+        { name: "decoupled_app", approach: "DECOUPLED" }
+      ]
+    }.with_indifferent_access
+
+    selected = @item.send(:select_auth_method, aspsp, "personal")
+
+    assert_equal "decoupled_app", selected[:name]
+    assert_equal "DECOUPLED", selected[:approach]
+  end
+
+  test "select_auth_method filters by psu_type when methods declare one" do
+    aspsp = {
+      auth_methods: [
+        { name: "business_redirect", approach: "REDIRECT", psu_type: "business" },
+        { name: "personal_decoupled", approach: "DECOUPLED", psu_type: "personal" }
+      ]
+    }.with_indifferent_access
+
+    selected = @item.send(:select_auth_method, aspsp, "personal")
+
+    assert_equal "personal_decoupled", selected[:name]
+  end
+
+  test "select_auth_method ignores hidden methods" do
+    aspsp = {
+      auth_methods: [
+        { name: "hidden_redirect", approach: "REDIRECT", hidden_method: true },
+        { name: "decoupled_app", approach: "DECOUPLED" }
+      ]
+    }.with_indifferent_access
+
+    selected = @item.send(:select_auth_method, aspsp, "personal")
+
+    assert_equal "decoupled_app", selected[:name]
+  end
+
+  test "select_auth_method returns nil when no auth methods present" do
+    assert_nil @item.send(:select_auth_method, { auth_methods: [] }.with_indifferent_access, "personal")
+  end
+
+  test "select_auth_method returns nil when every method is hidden" do
+    aspsp = {
+      auth_methods: [
+        { name: "hidden_a", approach: "REDIRECT", hidden_method: true },
+        { name: "hidden_b", approach: "DECOUPLED", hidden_method: true }
+      ]
+    }.with_indifferent_access
+
+    # All methods hidden -> fall back to the ASPSP default rather than forcing one.
+    assert_nil @item.send(:select_auth_method, aspsp, "personal")
+  end
+
+  test "reconcile_session_expiry! updates session_expires_at from access.valid_until" do
+    @item.session_id = "sess"
+    @item.session_expires_at = 1.day.from_now
+    @item.save!
+    new_expiry = 60.days.from_now.change(usec: 0)
+
+    @item.reconcile_session_expiry!({ access: { valid_until: new_expiry.iso8601 } })
+
+    assert_equal new_expiry.to_i, @item.reload.session_expires_at.to_i
+  end
+
+  test "reconcile_session_expiry! is a no-op when valid_until is missing" do
+    @item.session_id = "sess"
+    original = 1.day.from_now.change(usec: 0)
+    @item.session_expires_at = original
+    @item.save!
+
+    @item.reconcile_session_expiry!({ access: {} })
+
+    assert_equal original.to_i, @item.reload.session_expires_at.to_i
+  end
+end
diff --git a/test/models/entry_test.rb b/test/models/entry_test.rb
new file mode 100644
index 000000000..bcf820d4d
--- /dev/null
+++ b/test/models/entry_test.rb
@@ -0,0 +1,25 @@
+require "test_helper"
+
+class EntryTest < ActiveSupport::TestCase
+  include EntriesTestHelper
+
+  test "chronological ordering uses id as final tie breaker" do
+    account = accounts(:depository)
+    timestamp = Time.zone.parse("2026-05-05 12:00:00")
+
+    entries = 3.times.map do |index|
+      create_transaction(
+        account: account,
+        name: "Same timestamp transaction #{index}",
+        date: Date.new(2026, 5, 5),
+        created_at: timestamp,
+        updated_at: timestamp
+      )
+    end
+
+    entry_ids = entries.map(&:id)
+
+    assert_equal entry_ids.sort, Entry.where(id: entry_ids).chronological.pluck(:id)
+    assert_equal entry_ids.sort.reverse, Entry.where(id: entry_ids).reverse_chronological.pluck(:id)
+  end
+end
diff --git a/test/models/exchange_rate_pair_test.rb b/test/models/exchange_rate_pair_test.rb
index 7a832fb83..ffec338b5 100644
--- a/test/models/exchange_rate_pair_test.rb
+++ b/test/models/exchange_rate_pair_test.rb
@@ -31,8 +31,7 @@ class ExchangeRatePairTest < ActiveSupport::TestCase
         provider_name: "twelve_data"
       )
 
-      Setting.exchange_rate_provider = "yahoo_finance"
-      refreshed = ExchangeRatePair.for_pair(from: "USD", to: "EUR")
+      refreshed = ExchangeRatePair.for_pair(from: "USD", to: "EUR", provider_name: "yahoo_finance")
 
       assert_nil refreshed.first_provider_rate_on
       assert_equal "yahoo_finance", refreshed.provider_name
diff --git a/test/models/family/auto_transfer_matchable_test.rb b/test/models/family/auto_transfer_matchable_test.rb
index 40ffa20da..5951d9487 100644
--- a/test/models/family/auto_transfer_matchable_test.rb
+++ b/test/models/family/auto_transfer_matchable_test.rb
@@ -98,6 +98,44 @@ class Family::AutoTransferMatchableTest < ActiveSupport::TestCase
     assert_no_difference -> { Transfer.count } do
       @family.auto_match_transfers!
     end
+
+    create_transaction(date: Date.current, account: @depository, amount: 700)
+    create_transaction(date: Date.current, account: @credit_card, amount: -700, excluded: true)
+
+    assert_no_difference -> { Transfer.count } do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "does not consider excluded entries when matching transfers" do
+    create_transaction(date: Date.current, account: @depository, amount: 500, excluded: true)
+    create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    assert_no_difference -> { Transfer.count } do
+      @family.auto_match_transfers!
+    end
+  end
+
+  test "account-scoped auto-matching only considers pairs touching that account" do
+    depository_outflow = create_transaction(date: Date.current, account: @depository, amount: 500)
+    credit_card_inflow = create_transaction(date: Date.current, account: @credit_card, amount: -500)
+
+    connected_outflow = create_transaction(date: Date.current, account: accounts(:connected), amount: 700)
+    loan_inflow = create_transaction(date: Date.current, account: @loan, amount: -700)
+
+    assert_difference -> { Transfer.count }, 1 do
+      @family.auto_match_transfers!(account: @depository)
+    end
+
+    Transfer.find_by!(
+      inflow_transaction_id: credit_card_inflow.entryable_id,
+      outflow_transaction_id: depository_outflow.entryable_id
+    )
+    assert_nil Transfer.find_by(inflow_transaction_id: loan_inflow.entryable_id, outflow_transaction_id: connected_outflow.entryable_id)
+
+    assert_difference -> { Transfer.count }, 1 do
+      @family.auto_match_transfers!(account: accounts(:connected))
+    end
   end
 
   test "does not match transactions outside the 4-day window" do
@@ -202,6 +240,9 @@ class Family::AutoTransferMatchableTest < ActiveSupport::TestCase
     sql = @family.send(:transfer_match_candidates_sql)
 
     assert_includes sql, "UNION ALL"
+    assert_includes sql, "inflow_candidates.excluded = FALSE"
+    assert_includes sql, "outflow_candidates.excluded = FALSE"
+    assert_includes sql, ":account_id IS NULL OR inflow_candidates.account_id = :account_id OR outflow_candidates.account_id = :account_id"
     assert_includes sql, "outflow_candidates.amount = -inflow_candidates.amount"
     assert_includes sql, "JOIN exchange_rates"
   end
diff --git a/test/models/family/data_exporter_test.rb b/test/models/family/data_exporter_test.rb
index 206c5e9d6..00d4759d7 100644
--- a/test/models/family/data_exporter_test.rb
+++ b/test/models/family/data_exporter_test.rb
@@ -381,9 +381,12 @@ class Family::DataExporterTest < ActiveSupport::TestCase
 
       assert rule_lines.any?
 
-      rule_data = JSON.parse(rule_lines.first)
+      rule_data = rule_lines.map { |line| JSON.parse(line) }.find { |rule| rule["data"]["name"] == "Test Rule" }
+
+      assert_not_nil rule_data
       assert_equal "Rule", rule_data["type"]
       assert_equal 1, rule_data["version"]
+      assert_equal @rule.id, rule_data["data"]["id"]
       assert rule_data["data"].key?("name")
       assert rule_data["data"].key?("resource_type")
       assert rule_data["data"].key?("active")
@@ -705,16 +708,24 @@ class Family::DataExporterTest < ActiveSupport::TestCase
       currency: "USD"
     )
 
-    split_parent_outflow = create_transaction_entry(@account, amount: 60, date: Date.parse("2024-01-25"), name: "Split transfer parent")
-    split_parent_outflow.split!([
-      { name: "Split transfer child", amount: 60, category_id: @category.id }
+    split_parent_outflow = create_transaction_entry(@account, amount: 104, date: Date.parse("2024-01-25"), name: "Split transfer parent")
+    split_children = split_parent_outflow.split!([
+      { name: "Split transfer child", amount: 100, category_id: @category.id },
+      { name: "Split fee child", amount: 4, category_id: @category.id }
     ])
-    transfer_inflow = create_transaction_entry(destination_account, amount: -60, date: Date.parse("2024-01-25"), name: "Split transfer inflow")
-    transfer = Transfer.create!(
+    parent_transfer_inflow = create_transaction_entry(destination_account, amount: -104, date: Date.parse("2024-01-25"), name: "Split parent transfer inflow")
+    parent_transfer = Transfer.create!(
       outflow_transaction: split_parent_outflow.entryable,
-      inflow_transaction: transfer_inflow.entryable,
+      inflow_transaction: parent_transfer_inflow.entryable,
       status: "confirmed"
     )
+    child_transfer_inflow = create_transaction_entry(destination_account, amount: -100, date: Date.parse("2024-01-25"), name: "Split child transfer inflow")
+    child_transfer = Transfer.create!(
+      outflow_transaction: split_children.first.entryable,
+      inflow_transaction: child_transfer_inflow.entryable,
+      status: "confirmed",
+      notes: "Transfer uses split child"
+    )
 
     zip_data = @exporter.generate_export
 
@@ -728,8 +739,20 @@ class Family::DataExporterTest < ActiveSupport::TestCase
         .select { |record| record["type"] == "Transfer" }
         .map { |record| record.dig("data", "id") }
 
-      assert_not_includes transaction_ids, split_parent_outflow.entryable.id
-      assert_not_includes transfer_ids, transfer.id
+      assert_includes transaction_ids, split_parent_outflow.entryable.id
+      split_parent_data = ndjson_records.find do |record|
+        record["type"] == "Transaction" && record.dig("data", "id") == split_parent_outflow.entryable.id
+      end
+      assert_equal 2, split_parent_data.dig("data", "split_lines").count
+      assert_equal [ "Split transfer child", "Split fee child" ], split_parent_data.dig("data", "split_lines").map { |line| line["name"] }
+      refute_includes transaction_ids, split_children.first.entryable.id
+      refute_includes transaction_ids, split_children.second.entryable.id
+      assert_not_includes transfer_ids, parent_transfer.id
+
+      child_transfer_data = ndjson_records.find { |record| record["type"] == "Transfer" && record.dig("data", "id") == child_transfer.id }
+      assert child_transfer_data
+      assert_equal split_children.first.entryable.id, child_transfer_data.dig("data", "outflow_transaction_id")
+      assert_equal child_transfer_inflow.entryable.id, child_transfer_data.dig("data", "inflow_transaction_id")
     end
   end
 
diff --git a/test/models/family/data_importer_test.rb b/test/models/family/data_importer_test.rb
index c6c75dda1..21ea0d4b7 100644
--- a/test/models/family/data_importer_test.rb
+++ b/test/models/family/data_importer_test.rb
@@ -125,6 +125,26 @@ class Family::DataImporterTest < ActiveSupport::TestCase
     assert_equal 1, balance.flows_factor
   end
 
+  test "counts skipped balance rows with blank account references once" do
+    ndjson = build_ndjson([
+      {
+        type: "Balance",
+        data: {
+          id: "balance-1",
+          account_id: "",
+          date: "2024-01-31",
+          balance: "1200.00",
+          currency: "USD"
+        }
+      }
+    ])
+
+    result = Family::DataImporter.new(@family, ndjson).import!
+
+    assert_equal 1, result.dig(:summary, "balances", "skipped")
+    assert_not Balance.exists?(date: Date.iso8601("2024-01-31"), currency: "USD", balance: BigDecimal("1200.00"))
+  end
+
   test "imports duplicate raw balance records idempotently by account date and currency" do
     balance_record = {
       type: "Balance",
@@ -352,6 +372,42 @@ class Family::DataImporterTest < ActiveSupport::TestCase
     assert_equal 5000.0, opening_anchors.first.entry.amount.to_f
   end
 
+  test "skips synthesized opening anchor for authoritative balance history imports" do
+    ndjson = build_ndjson([
+      {
+        type: "Account",
+        data: {
+          id: "acct-1",
+          name: "Imported With Full History",
+          balance: "5000",
+          currency: "USD",
+          accountable_type: "Depository",
+          authoritative_balance_history: true
+        }
+      },
+      {
+        type: "Valuation",
+        data: {
+          id: "val-1",
+          account_id: "acct-1",
+          date: "2020-04-01",
+          amount: "4900",
+          name: "Imported balance",
+          currency: "USD",
+          kind: "reconciliation"
+        }
+      }
+    ])
+
+    Family::DataImporter.new(@family, ndjson).import!
+
+    account = @family.accounts.find_by!(name: "Imported With Full History")
+
+    assert_equal 5000.0, account.balance.to_f
+    assert_empty account.valuations.opening_anchor
+    assert_equal 1, account.valuations.reconciliation.count
+  end
+
   test "imports categories with parent relationships" do
     ndjson = build_ndjson([
       {
@@ -406,6 +462,23 @@ class Family::DataImporterTest < ActiveSupport::TestCase
     assert_equal "#FF0000", tag.color
   end
 
+  test "imports tags with deterministic fallback color when source omits color" do
+    ndjson = build_ndjson([
+      {
+        type: "Tag",
+        data: {
+          id: "tag-1",
+          name: "Important"
+        }
+      }
+    ])
+
+    Family::DataImporter.new(@family, ndjson).import!
+
+    tag = @family.tags.find_by!(name: "Important")
+    assert_equal Tag::COLORS.first, tag.color
+  end
+
   test "imports merchants" do
     ndjson = build_ndjson([
       {
@@ -732,6 +805,275 @@ class Family::DataImporterTest < ActiveSupport::TestCase
     assert_equal "Weekly groceries", transaction.entry.notes
   end
 
+  test "imports native split lines and lets transfers reference split children" do
+    ndjson = build_ndjson([
+      {
+        type: "Account",
+        data: {
+          id: "checking",
+          name: "Checking",
+          balance: "1000",
+          currency: "USD",
+          accountable_type: "Depository"
+        }
+      },
+      {
+        type: "Account",
+        data: {
+          id: "wallet",
+          name: "Wallet",
+          balance: "500",
+          currency: "USD",
+          accountable_type: "Depository"
+        }
+      },
+      {
+        type: "Category",
+        data: {
+          id: "cat-fee",
+          name: "Bank Fees",
+          color: "#FF0000",
+          classification: "expense"
+        }
+      },
+      {
+        type: "Tag",
+        data: {
+          id: "tag-imported",
+          name: "Imported"
+        }
+      },
+      {
+        type: "Transaction",
+        data: {
+          id: "split-parent",
+          account_id: "checking",
+          date: "2024-01-15",
+          amount: "104.00",
+          name: "ATM withdrawal plus fee",
+          currency: "USD",
+          tag_ids: [ "tag-imported" ],
+          split_lines: [
+            {
+              id: "split-transfer-leg",
+              amount: "100.00",
+              name: "Cash movement",
+              notes: "Transfer portion"
+            },
+            {
+              id: "split-fee-line",
+              amount: "4.00",
+              name: "ATM fee",
+              category_id: "cat-fee",
+              notes: "Fee portion"
+            }
+          ]
+        }
+      },
+      {
+        type: "Transaction",
+        data: {
+          id: "wallet-inflow",
+          account_id: "wallet",
+          date: "2024-01-15",
+          amount: "-100.00",
+          name: "Cash received",
+          currency: "USD"
+        }
+      },
+      {
+        type: "Transfer",
+        data: {
+          id: "transfer-1",
+          inflow_transaction_id: "wallet-inflow",
+          outflow_transaction_id: "split-transfer-leg",
+          status: "confirmed",
+          notes: "Split-linked transfer"
+        }
+      }
+    ])
+
+    result = Family::DataImporter.new(@family, ndjson).import!
+
+    parent_entry = @family.entries.find_by!(name: "ATM withdrawal plus fee")
+    assert parent_entry.split_parent?
+    assert_equal true, parent_entry.excluded
+    assert_equal 4, result[:entries].count
+    assert_includes result[:entries].map(&:id), parent_entry.id
+
+    transfer_child = parent_entry.child_entries.find_by!(name: "Cash movement")
+    fee_child = parent_entry.child_entries.find_by!(name: "ATM fee")
+    assert_equal "Transfer portion", transfer_child.notes
+    assert_equal "Fee portion", fee_child.notes
+    assert_equal "Bank Fees", fee_child.transaction.category.name
+    assert_equal [ "Imported" ], transfer_child.transaction.tags.map(&:name)
+    assert_equal [ "Imported" ], fee_child.transaction.tags.map(&:name)
+
+    transfer = Transfer.find_by!(notes: "Split-linked transfer")
+    assert_equal "confirmed", transfer.status
+    assert_equal "Cash movement", transfer.outflow_transaction.entry.name
+    assert_equal "Cash received", transfer.inflow_transaction.entry.name
+  end
+
+  test "imports split lines without adding omitted parent taxonomy to explicit empty values" do
+    ndjson = build_ndjson([
+      {
+        type: "Account",
+        data: {
+          id: "checking",
+          name: "Checking",
+          balance: "1000",
+          currency: "USD",
+          accountable_type: "Depository"
+        }
+      },
+      {
+        type: "Tag",
+        data: {
+          id: "tag-parent",
+          name: "Parent tag"
+        }
+      },
+      {
+        type: "Merchant",
+        data: {
+          id: "merchant-parent",
+          name: "Parent merchant"
+        }
+      },
+      {
+        type: "Transaction",
+        data: {
+          id: "split-parent",
+          account_id: "checking",
+          date: "2024-01-15",
+          amount: "100.00",
+          name: "Tagged merchant split",
+          currency: "USD",
+          merchant_id: "merchant-parent",
+          tag_ids: [ "tag-parent" ],
+          split_lines: [
+            {
+              id: "split-inherits",
+              amount: "40.00",
+              name: "Inherits omitted taxonomy"
+            },
+            {
+              id: "split-empty",
+              amount: "60.00",
+              name: "Explicit empty taxonomy",
+              merchant_id: nil,
+              tag_ids: []
+            }
+          ]
+        }
+      }
+    ])
+
+    Family::DataImporter.new(@family, ndjson).import!
+
+    parent_entry = @family.entries.find_by!(name: "Tagged merchant split")
+    inherited_child = parent_entry.child_entries.find_by!(name: "Inherits omitted taxonomy")
+    explicit_empty_child = parent_entry.child_entries.find_by!(name: "Explicit empty taxonomy")
+
+    assert_equal "Parent merchant", inherited_child.transaction.merchant.name
+    assert_equal [ "Parent tag" ], inherited_child.transaction.tags.map(&:name)
+    assert_nil explicit_empty_child.transaction.merchant
+    assert_empty explicit_empty_child.transaction.tags
+  end
+
+  test "session transaction reimport only replaces current family taggings" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    account = @family.accounts.create!(
+      name: "Session Checking",
+      accountable: Depository.new,
+      balance: 100,
+      currency: "USD"
+    )
+    original_tag = @family.tags.create!(name: "Original")
+    replacement_tag = @family.tags.create!(name: "Replacement")
+    entry = account.entries.create!(
+      date: Date.parse("2024-01-01"),
+      amount: -10,
+      currency: "USD",
+      name: "Original transaction",
+      source: "sure_import_session:#{session.id}",
+      external_id: "Transaction:txn-1",
+      entryable: Transaction.new(kind: "standard")
+    )
+    transaction = entry.entryable
+    transaction.taggings.create!(tag: original_tag)
+
+    other_family = Family.create!(name: "Other Family", currency: "USD")
+    other_session = other_family.import_sessions.create!(expected_chunks: 1)
+    other_account = other_family.accounts.create!(
+      name: "Other Checking",
+      accountable: Depository.new,
+      balance: 100,
+      currency: "USD"
+    )
+    other_tag = other_family.tags.create!(name: "Other Original")
+    other_entry = other_account.entries.create!(
+      date: Date.parse("2024-01-01"),
+      amount: -10,
+      currency: "USD",
+      name: "Other transaction",
+      source: "sure_import_session:#{other_session.id}",
+      external_id: "Transaction:txn-1",
+      entryable: Transaction.new(kind: "standard")
+    )
+    other_transaction = other_entry.entryable
+    other_transaction.taggings.create!(tag: other_tag)
+
+    other_session.source_mappings.create!(
+      family: other_family,
+      source_type: "Transaction",
+      source_id: "txn-1",
+      target: other_transaction
+    )
+
+    session.source_mappings.create!(
+      family: @family,
+      source_type: "Account",
+      source_id: "acct-1",
+      target: account
+    )
+    session.source_mappings.create!(
+      family: @family,
+      source_type: "Tag",
+      source_id: "tag-1",
+      target: replacement_tag
+    )
+    session.source_mappings.create!(
+      family: @family,
+      source_type: "Transaction",
+      source_id: "txn-1",
+      target: transaction
+    )
+
+    ndjson = build_ndjson([
+      {
+        type: "Transaction",
+        data: {
+          id: "txn-1",
+          account_id: "acct-1",
+          tag_ids: [ "tag-1" ],
+          date: "2024-02-01",
+          amount: "-12.34",
+          currency: "USD",
+          name: "Updated transaction"
+        }
+      }
+    ])
+
+    Family::DataImporter.new(@family, ndjson, import_session: session).import!
+
+    assert_equal [ "Replacement" ], transaction.reload.tags.map(&:name)
+    assert_equal "Updated transaction", entry.reload.name
+    assert_equal [ "Other Original" ], other_transaction.reload.tags.map(&:name)
+    assert_equal "Other transaction", other_entry.reload.name
+  end
+
   test "imports trades with securities" do
     ndjson = build_ndjson([
       {
@@ -1216,7 +1558,7 @@ class Family::DataImporterTest < ActiveSupport::TestCase
           amount: "100.00",
           name: "Transfer to savings",
           currency: "USD",
-          kind: "funds_movement"
+          kind: "standard"
         }
       },
       {
@@ -1228,7 +1570,7 @@ class Family::DataImporterTest < ActiveSupport::TestCase
           amount: "-100.00",
           name: "Transfer from checking",
           currency: "USD",
-          kind: "funds_movement"
+          kind: "standard"
         }
       },
       {
@@ -1283,6 +1625,8 @@ class Family::DataImporterTest < ActiveSupport::TestCase
     assert_equal "Confirmed by user", transfer.notes
     assert_equal "Transfer from checking", transfer.inflow_transaction.entry.name
     assert_equal "Transfer to savings", transfer.outflow_transaction.entry.name
+    assert_equal "funds_movement", transfer.inflow_transaction.kind
+    assert_equal "funds_movement", transfer.outflow_transaction.kind
 
     rejected_transfer = RejectedTransfer
       .joins(inflow_transaction: :entry)
@@ -1498,6 +1842,61 @@ class Family::DataImporterTest < ActiveSupport::TestCase
     assert_equal category.id, action.value
   end
 
+  test "session rule reimport only replaces current family conditions and actions" do
+    rule = @family.rules.build(name: "Original Rule", resource_type: "transaction", active: true)
+    rule.conditions.build(condition_type: "transaction_name", operator: "like", value: "old")
+    rule.actions.build(action_type: "auto_categorize")
+    rule.save!
+
+    other_family = Family.create!(name: "Other Rules Family", currency: "USD")
+    other_rule = other_family.rules.build(name: "Other Rule", resource_type: "transaction", active: true)
+    other_rule.conditions.build(condition_type: "transaction_name", operator: "like", value: "other-old")
+    other_rule.actions.build(action_type: "auto_categorize")
+    other_rule.save!
+
+    other_session = other_family.import_sessions.create!(expected_chunks: 1)
+    other_session.source_mappings.create!(
+      family: other_family,
+      source_type: "Rule",
+      source_id: "rule-1",
+      target: other_rule
+    )
+
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.source_mappings.create!(
+      family: @family,
+      source_type: "Rule",
+      source_id: "rule-1",
+      target: rule
+    )
+
+    ndjson = build_ndjson([
+      {
+        type: "Rule",
+        version: 1,
+        data: {
+          id: "rule-1",
+          name: "Updated Rule",
+          resource_type: "transaction",
+          active: true,
+          conditions: [
+            { condition_type: "transaction_name", operator: "like", value: "new" }
+          ],
+          actions: [
+            { action_type: "set_transaction_name", value: "Renamed" }
+          ]
+        }
+      }
+    ])
+
+    Family::DataImporter.new(@family, ndjson, import_session: session).import!
+
+    assert_equal [ "new" ], rule.reload.conditions.map(&:value)
+    assert_equal [ "set_transaction_name" ], rule.actions.map(&:action_type)
+    assert_equal [ "other-old" ], other_rule.reload.conditions.map(&:value)
+    assert_equal [ "auto_categorize" ], other_rule.actions.map(&:action_type)
+  end
+
   test "imports rules from normalized operand value refs" do
     ndjson = build_ndjson([
       {
diff --git a/test/models/family/sync_complete_event_test.rb b/test/models/family/sync_complete_event_test.rb
new file mode 100644
index 000000000..223ef1715
--- /dev/null
+++ b/test/models/family/sync_complete_event_test.rb
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class Family::SyncCompleteEventTest < ActiveSupport::TestCase
+  fixtures :families
+
+  test "broadcast replaces both the sync toast and the accounts page's own sync controls" do
+    family = families(:dylan_family)
+
+    family.expects(:broadcast_replace_to).with(
+      family,
+      target: "sync-toast",
+      partial: "shared/notifications/sync_toast"
+    ).once
+
+    family.expects(:broadcast_replace_to).with(
+      family,
+      target: "accounts-sync-controls",
+      partial: "accounts/sync_controls",
+      locals: { family: family }
+    ).once
+
+    Family::SyncCompleteEvent.new(family).broadcast
+  end
+end
diff --git a/test/models/family/syncer_test.rb b/test/models/family/syncer_test.rb
index beb8c7645..14fac1c04 100644
--- a/test/models/family/syncer_test.rb
+++ b/test/models/family/syncer_test.rb
@@ -14,11 +14,6 @@ class Family::SyncerTest < ActiveSupport::TestCase
     )
 
     manual_accounts_count = @family.accounts.manual.count
-    plaid_items_count = @family.plaid_items.syncable.count
-    brex_items_count = @family.brex_items.syncable.count
-    akahu_items_count = @family.akahu_items.syncable.count
-    binance_items_count = @family.binance_items.syncable.count
-
     syncer = Family::Syncer.new(@family)
 
     Account.any_instance
@@ -26,31 +21,37 @@ class Family::SyncerTest < ActiveSupport::TestCase
            .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
            .times(manual_accounts_count)
 
-    PlaidItem.any_instance
-               .expects(:sync_later)
-               .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
-               .times(plaid_items_count)
-
-    BrexItem.any_instance
-            .expects(:sync_later)
-            .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
-            .times(brex_items_count)
-
-    AkahuItem.any_instance
-             .expects(:sync_later)
-             .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
-             .times(akahu_items_count)
-
-    BinanceItem.any_instance
-               .expects(:sync_later)
-               .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
-               .times(binance_items_count)
+    syncable_item_associations.each do |association|
+      association.klass.any_instance
+                 .expects(:sync_later)
+                 .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
+                 .times(@family.public_send(association.name).syncable.count)
+    end
 
     syncer.perform_sync(family_sync)
 
     assert_equal "completed", family_sync.reload.status
   end
 
+  test "syncs ibkr items through reflective provider discovery" do
+    family_sync = syncs(:family)
+    syncer = Family::Syncer.new(@family)
+
+    assert_includes syncable_item_associations.map(&:name), :ibkr_items
+
+    Account.any_instance.stubs(:sync_later)
+    syncable_item_associations.reject { |association| association.name == :ibkr_items }.each do |association|
+      association.klass.any_instance.stubs(:sync_later)
+    end
+
+    IbkrItem.any_instance
+            .expects(:sync_later)
+            .with(parent_sync: family_sync, window_start_date: nil, window_end_date: nil)
+            .times(@family.ibkr_items.syncable.count)
+
+    syncer.perform_sync(family_sync)
+  end
+
   test "only applies active rules during sync" do
     family_sync = syncs(:family)
 
@@ -79,16 +80,21 @@ class Family::SyncerTest < ActiveSupport::TestCase
 
     # Mock the account and plaid item syncs to avoid side effects
     Account.any_instance.stubs(:sync_later)
-    PlaidItem.any_instance.stubs(:sync_later)
-    SimplefinItem.any_instance.stubs(:sync_later)
-    LunchflowItem.any_instance.stubs(:sync_later)
-    EnableBankingItem.any_instance.stubs(:sync_later)
-    SophtronItem.any_instance.stubs(:sync_later)
-    BrexItem.any_instance.stubs(:sync_later)
-    AkahuItem.any_instance.stubs(:sync_later)
-    BinanceItem.any_instance.stubs(:sync_later)
+    syncable_item_associations.each do |association|
+      association.klass.any_instance.stubs(:sync_later)
+    end
 
     syncer.perform_sync(family_sync)
     syncer.perform_post_sync
   end
+
+  private
+    def syncable_item_associations
+      Family.reflect_on_all_associations(:has_many).select do |association|
+        association.name.to_s.end_with?("_items") &&
+          association.klass.included_modules.include?(Syncable)
+      rescue NameError
+        false
+      end
+    end
 end
diff --git a/test/models/family_export_test.rb b/test/models/family_export_test.rb
index c6f86c8bc..19faec3f2 100644
--- a/test/models/family_export_test.rb
+++ b/test/models/family_export_test.rb
@@ -14,6 +14,20 @@ class FamilyExportTest < ActiveSupport::TestCase
     assert_equal "pending", @export.status
   end
 
+  test "force_fail! fails a lost export but refuses fresh or terminal ones" do
+    @export.update_columns(status: "processing", updated_at: 2.hours.ago)
+    assert @export.force_fail!
+    assert_equal "failed", @export.reload.status
+
+    fresh = @family.family_exports.create!
+    fresh.update_columns(status: "processing", updated_at: 5.minutes.ago)
+    assert_not fresh.force_fail!
+    assert_equal "processing", fresh.reload.status
+
+    assert_not @export.force_fail!
+    assert_equal "failed", @export.reload.status
+  end
+
   test "can have export file attached" do
     @export.export_file.attach(
       io: StringIO.new("test content"),
@@ -128,4 +142,15 @@ class FamilyExportTest < ActiveSupport::TestCase
     assert_equal new_export.id, ordered_exports.first.id
     assert_equal old_export.id, ordered_exports.last.id
   end
+
+  test "clean isolates a record whose update! fails so the sweep does not abort" do
+    @export.update_columns(status: "processing", updated_at: 3.hours.ago)
+
+    # A validation/DB error on one stuck record must not abort the sweep for
+    # the rest (mirrors Import.clean's per-record rescue).
+    FamilyExport.any_instance.stubs(:update!).raises(ActiveRecord::RecordInvalid.new(FamilyExport.new))
+
+    assert_nothing_raised { FamilyExport.clean }
+    assert_equal "processing", @export.reload.status
+  end
 end
diff --git a/test/models/family_merchant_test.rb b/test/models/family_merchant_test.rb
new file mode 100644
index 000000000..c100af2a3
--- /dev/null
+++ b/test/models/family_merchant_test.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class FamilyMerchantTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+  end
+
+  test "preserves user-selected color on creation" do
+    merchant = FamilyMerchant.create!(
+      family: @family,
+      name: "Custom Color Merchant",
+      color: "#123456"
+    )
+
+    assert_equal "#123456", merchant.color
+  end
+
+  test "sets random default color when color is blank" do
+    merchant = FamilyMerchant.create!(
+      family: @family,
+      name: "Default Color Merchant"
+    )
+
+    assert_includes FamilyMerchant::COLORS, merchant.color
+  end
+
+  test "preserves existing color on update" do
+    merchant = FamilyMerchant.create!(
+      family: @family,
+      name: "Original Merchant",
+      color: "#123456"
+    )
+
+    merchant.update!(name: "Renamed Merchant")
+    assert_equal "#123456", merchant.reload.color
+  end
+
+  test "replaces invalid hex color with default sample" do
+    merchant = FamilyMerchant.create!(
+      family: @family,
+      name: "Invalid Color Merchant",
+      color: "invalid-color"
+    )
+
+    assert_includes FamilyMerchant::COLORS, merchant.color
+  end
+end
diff --git a/test/models/family_test.rb b/test/models/family_test.rb
index 0f9a9f736..b033c36e6 100644
--- a/test/models/family_test.rb
+++ b/test/models/family_test.rb
@@ -253,4 +253,125 @@ class FamilyTest < ActiveSupport::TestCase
     family = families(:dylan_family)
     assert family.module_enabled?(:nonexistent_module)
   end
+  
+  # auto_share_existing_accounts_with -----------------------------------------
+  test "auto_share_existing_accounts_with shares existing family accounts read_write when sharing is default" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    newcomer = users(:empty)
+    newcomer.update_columns(family_id: family.id, role: "member")
+
+    expected_ids = family.accounts.where.not(owner_id: newcomer.id).pluck(:id).sort
+    assert expected_ids.any?, "fixture family must have shareable accounts"
+
+    family.auto_share_existing_accounts_with(newcomer)
+
+    shares = AccountShare.where(user: newcomer)
+    assert_equal expected_ids, shares.pluck(:account_id).sort
+    assert shares.all?(&:read_write?), "shares must grant read_write"
+    assert shares.all?(&:include_in_finances?), "shares must be included in finances"
+  end
+
+  test "auto_share_existing_accounts_with shares existing family accounts read_only for guests" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    newcomer = users(:empty)
+    newcomer.update_columns(family_id: family.id, role: "guest")
+
+    expected_ids = family.accounts.where.not(owner_id: newcomer.id).pluck(:id).sort
+    assert expected_ids.any?, "fixture family must have shareable accounts"
+
+    family.auto_share_existing_accounts_with(newcomer)
+
+    shares = AccountShare.where(user: newcomer)
+    assert_equal expected_ids, shares.pluck(:account_id).sort
+    assert shares.all?(&:read_only?), "guest shares must grant read_only"
+    assert shares.all?(&:include_in_finances?), "shares must be included in finances"
+  end
+
+  test "auto_share_existing_accounts_with is a no-op when family sharing is private" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "private")
+    newcomer = users(:empty)
+    newcomer.update_columns(family_id: family.id, role: "member")
+
+    assert_no_difference "AccountShare.count" do
+      family.auto_share_existing_accounts_with(newcomer)
+    end
+  end
+
+  test "auto_share_existing_accounts_with does not share with a user outside the family" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    outsider = users(:empty)
+    outsider.update_columns(family_id: families(:empty).id, role: "member")
+
+    assert_no_difference "AccountShare.count" do
+      family.auto_share_existing_accounts_with(outsider)
+    end
+  end
+
+  test "auto_share_existing_accounts_with never shares a user's own account and is idempotent" do
+    family = families(:dylan_family)
+    family.update!(default_account_sharing: "shared")
+    newcomer = users(:empty)
+    newcomer.update_columns(family_id: family.id, role: "member")
+    owned = family.accounts.first
+    owned.update!(owner: newcomer)
+
+    family.auto_share_existing_accounts_with(newcomer)
+    count_after_first = AccountShare.where(user: newcomer).count
+
+    assert_not AccountShare.exists?(user: newcomer, account: owned),
+      "must not share a user's own account with themselves"
+
+    family.auto_share_existing_accounts_with(newcomer) # re-run
+
+    assert_equal count_after_first, AccountShare.where(user: newcomer).count,
+      "re-running must not create duplicate shares"
+  end
+
+  # Preview access is per-user, but jobs that act on family-scoped data have no
+  # Current.user. One opted-in member enables the family.
+  test "preview_features_enabled? is true when any member has opted in" do
+    family = families(:dylan_family)
+    family.users.each { |user| set_preview_features(user, false) }
+
+    assert_not family.reload.preview_features_enabled?
+
+    set_preview_features(family.users.first, true)
+
+    assert family.reload.preview_features_enabled?
+  end
+
+  test "with_preview_features scope agrees with the predicate" do
+    family = families(:dylan_family)
+    family.users.each { |user| set_preview_features(user, false) }
+
+    assert_not_includes Family.with_preview_features, family.reload
+
+    set_preview_features(family.users.first, true)
+
+    assert_includes Family.with_preview_features, family.reload
+  end
+
+  # The family rollup is a jsonb containment match; the UI gates on
+  # User#preview_features_enabled?'s strict `== true`. If containment were the
+  # looser of the two, the nightly job would generate for families whose UI
+  # still hides the feature — so assert the user-level predicate agrees.
+  test "with_preview_features ignores truthy non-boolean values" do
+    family = families(:dylan_family)
+    family.users.each { |user| set_preview_features(user, false) }
+    set_preview_features(family.users.first, "yes")
+
+    assert_not family.users.first.reload.preview_features_enabled?,
+      "the per-user predicate the UI reads must reject a non-boolean"
+    assert_not family.reload.preview_features_enabled?
+    assert_not_includes Family.with_preview_features, family
+  end
+
+  private
+    def set_preview_features(user, enabled)
+      user.update!(preferences: (user.preferences || {}).merge("preview_features_enabled" => enabled))
+    end
 end
diff --git a/test/models/goal_account_test.rb b/test/models/goal_account_test.rb
new file mode 100644
index 000000000..c0c8b9609
--- /dev/null
+++ b/test/models/goal_account_test.rb
@@ -0,0 +1,32 @@
+require "test_helper"
+
+class GoalAccountTest < ActiveSupport::TestCase
+  setup do
+    @goal = goals(:emergency_fund)
+    @account = Account.create!(
+      family: families(:dylan_family),
+      accountable: Depository.new,
+      name: "Allocation Test",
+      currency: "USD",
+      balance: 1_000
+    )
+  end
+
+  test "allocated_amount may be nil, meaning dedicate the whole balance" do
+    ga = GoalAccount.new(goal: @goal, account: @account, allocated_amount: nil)
+    assert ga.valid?, ga.errors.full_messages.to_sentence
+    assert ga.whole_account?
+  end
+
+  test "a set allocated_amount is not a whole-account link" do
+    ga = GoalAccount.new(goal: @goal, account: @account, allocated_amount: 250)
+    assert ga.valid?, ga.errors.full_messages.to_sentence
+    assert_not ga.whole_account?
+  end
+
+  test "allocated_amount must be non-negative" do
+    ga = GoalAccount.new(goal: @goal, account: @account, allocated_amount: -1)
+    assert_not ga.valid?
+    assert_includes ga.errors[:allocated_amount], "must be greater than or equal to 0"
+  end
+end
diff --git a/test/models/goal_pledge/reconciler_test.rb b/test/models/goal_pledge/reconciler_test.rb
index 52a25c72c..e84064b79 100644
--- a/test/models/goal_pledge/reconciler_test.rb
+++ b/test/models/goal_pledge/reconciler_test.rb
@@ -52,7 +52,7 @@ class GoalPledge::ReconcilerTest < ActiveSupport::TestCase
     assert_not @pledge.reload.status_matched?
   end
 
-  test "manual_save kind matches on Valuation entries" do
+  test "manual_save kind matches a Valuation by its contribution delta, not the full balance" do
     manual_pledge = @pledge.goal.goal_pledges.create!(
       account: @account,
       amount: 150,
@@ -60,13 +60,48 @@ class GoalPledge::ReconcilerTest < ActiveSupport::TestCase
       kind: "manual_save"
     )
 
-    entry = create_valuation_entry(amount: 150, date: manual_pledge.created_at.to_date)
+    # Realistic reconciliation: the account already held $2,000 and the user
+    # bumps it to $2,150. The valuation records the full $2,150 total; the
+    # $150 contribution is the delta the manager passes in.
+    entry = create_valuation_entry(amount: 2150, date: manual_pledge.created_at.to_date)
 
-    GoalPledge::Reconciler.new(entry).run
+    GoalPledge::Reconciler.new(entry, valuation_delta: 150).run
 
     assert manual_pledge.reload.status_matched?
   end
 
+  test "manual_save kind does not match when the full balance (not the delta) is unrelated to the pledge" do
+    manual_pledge = @pledge.goal.goal_pledges.create!(
+      account: @account,
+      amount: 150,
+      currency: "USD",
+      kind: "manual_save"
+    )
+
+    entry = create_valuation_entry(amount: 2150, date: manual_pledge.created_at.to_date)
+
+    # The full $2,150 balance must never be mistaken for the $150 contribution.
+    GoalPledge::Reconciler.new(entry, valuation_delta: 2150).run
+
+    assert_not manual_pledge.reload.status_matched?
+  end
+
+  test "manual_save kind does not match a balance decrease" do
+    manual_pledge = @pledge.goal.goal_pledges.create!(
+      account: @account,
+      amount: 150,
+      currency: "USD",
+      kind: "manual_save"
+    )
+
+    entry = create_valuation_entry(amount: 1850, date: manual_pledge.created_at.to_date)
+
+    # Balance dropped by $150 — a drawdown must not resolve a save pledge.
+    GoalPledge::Reconciler.new(entry, valuation_delta: -150).run
+
+    assert_not manual_pledge.reload.status_matched?
+  end
+
   private
     def create_transaction_entry(amount:, date:, account: @account, excluded: false)
       Entry.create!(
diff --git a/test/models/goal_test.rb b/test/models/goal_test.rb
index 70529f149..1b1bd30ee 100644
--- a/test/models/goal_test.rb
+++ b/test/models/goal_test.rb
@@ -49,12 +49,21 @@ class GoalTest < ActiveSupport::TestCase
     assert_match(/at least one/i, new_goal.errors[:base].join)
   end
 
-  test "linked accounts must be depository" do
+  test "investment accounts are fundable and default to the contributions basis" do
     investment = accounts(:investment)
-    new_goal = @family.goals.new(name: "Test", target_amount: 100, currency: "USD")
+    new_goal = @family.goals.new(name: "Inv", target_amount: 100, currency: "USD")
     new_goal.goal_accounts.build(account: investment)
+    assert new_goal.valid?, new_goal.errors.full_messages.to_sentence
+    new_goal.save! # basis is set on save (before_save), not on valid?
+    assert_equal "contributions", new_goal.progress_basis
+  end
+
+  test "non-fundable account types are rejected" do
+    credit = accounts(:credit_card)
+    new_goal = @family.goals.new(name: "Test", target_amount: 100, currency: "USD")
+    new_goal.goal_accounts.build(account: credit)
     assert_not new_goal.valid?
-    assert_includes new_goal.errors[:linked_accounts], "All linked accounts must be depository (checking, savings, HSA, CD, money-market)."
+    assert_includes new_goal.errors[:linked_accounts], "All linked accounts must be cash or investment accounts."
   end
 
   test "linked accounts must belong to family" do
@@ -103,6 +112,48 @@ class GoalTest < ActiveSupport::TestCase
     assert_equal 100, @goal.progress_percent
   end
 
+  test "progress_percent stays below 100 while remaining amount is positive" do
+    account = Account.create!(
+      family: @family,
+      accountable: Depository.new,
+      name: "Almost There Savings",
+      currency: "USD",
+      balance: BigDecimal("999.50")
+    )
+
+    goal = @family.goals.create!(
+      name: "Almost There",
+      target_amount: BigDecimal("1000"),
+      currency: "USD"
+    ) { |new_goal| new_goal.goal_accounts.build(account: account) }
+
+    assert_equal BigDecimal("0.5"), goal.remaining_amount
+    assert_equal 99, goal.progress_percent
+    assert_equal :no_target_date, goal.status
+  end
+
+  test "status stays reached for a goal completed while underfunded" do
+    account = Account.create!(
+      family: @family,
+      accountable: Depository.new,
+      name: "Completed Underfunded Savings",
+      currency: "USD",
+      balance: BigDecimal("999.50")
+    )
+
+    goal = @family.goals.create!(
+      name: "Completed Underfunded",
+      target_amount: BigDecimal("1000"),
+      currency: "USD"
+    ) { |new_goal| new_goal.goal_accounts.build(account: account) }
+
+    goal.complete!
+
+    assert_equal BigDecimal("0.5"), goal.remaining_amount
+    assert_equal 100, goal.progress_percent
+    assert_equal :reached, Goal.find(goal.id).status
+  end
+
   test "progress_percent is 0 for empty active goal" do
     fresh = goals(:car_paydown)
     fresh.update!(target_amount: 10_000)
@@ -248,4 +299,159 @@ class GoalTest < ActiveSupport::TestCase
     reloaded = Goal.find(@goal.id)
     assert_equal "goals.show.pledge_just_saved", reloaded.pledge_action_label_key
   end
+
+  test "explicit allocation backs only the earmarked slice" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Split Savings", currency: "USD", balance: 5_000)
+    goal = @family.goals.create!(name: "Earmarked", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 1_000)
+    end
+    assert_equal BigDecimal("1000"), goal.current_balance.to_d
+  end
+
+  test "explicit allocation is capped at the account balance via the haircut" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Over Earmark", currency: "USD", balance: 800)
+    goal = @family.goals.create!(name: "Over", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 5_000)
+    end
+    assert_equal BigDecimal("800"), goal.current_balance.to_d
+  end
+
+  test "unallocated link claims the balance left after another goal's earmark" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Shared Savings", currency: "USD", balance: 5_000)
+    earmarked = @family.goals.create!(name: "Earmarked", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 2_000)
+    end
+    whole = @family.goals.create!(name: "Whole", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account) # NULL = whole-balance remainder
+    end
+    assert_equal BigDecimal("2000"), earmarked.current_balance.to_d
+    assert_equal BigDecimal("3000"), whole.current_balance.to_d
+    # The two goals' shares of the shared account never exceed its balance.
+    assert_equal account.balance.to_d, earmarked.current_balance.to_d + whole.current_balance.to_d
+  end
+
+  test "over-earmarked account scales fixed slices pro-rata" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Contested Savings", currency: "USD", balance: 5_000)
+    a = @family.goals.create!(name: "Goal A", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 4_000)
+    end
+    b = @family.goals.create!(name: "Goal B", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 4_000)
+    end
+    # sum_fixed 8000 > balance 5000 -> each scaled by 5000/8000 -> 2500.
+    assert_equal BigDecimal("2500"), a.current_balance.to_d
+    assert_equal BigDecimal("2500"), b.current_balance.to_d
+    assert_equal account.balance.to_d, a.current_balance.to_d + b.current_balance.to_d
+  end
+
+  test "archived goals release their earmark from the shared pool" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Release Savings", currency: "USD", balance: 5_000)
+    whole = @family.goals.create!(name: "Whole", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account)
+    end
+    earmarked = @family.goals.create!(name: "Earmarked", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 2_000)
+    end
+    assert_equal BigDecimal("3000"), Goal.find(whole.id).current_balance.to_d
+    earmarked.archive!
+    # Archived goal no longer reserves its slice -> whole reclaims it.
+    assert_equal BigDecimal("5000"), Goal.find(whole.id).current_balance.to_d
+  end
+
+  test "account free_to_earmark subtracts non-archived fixed earmarks" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Headroom Savings", currency: "USD", balance: 5_000)
+    @family.goals.create!(name: "Earmarker", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 1_500)
+    end
+    assert_equal BigDecimal("1500"), account.goal_earmarked_total
+    assert_equal BigDecimal("3500"), account.free_to_earmark
+  end
+
+  test "an overdrawn account backs nothing for fixed or whole-balance links" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Overdrawn", currency: "USD", balance: BigDecimal("-100"))
+    fixed = @family.goals.create!(name: "Fixed OD", target_amount: 1_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 50)
+    end
+    whole = @family.goals.create!(name: "Whole OD", target_amount: 1_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account)
+    end
+    assert_equal 0.to_d, fixed.current_balance.to_d
+    assert_equal 0.to_d, whole.current_balance.to_d
+  end
+
+  test "an archived goal still shows its own earmark, not the whole balance" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Archived Earmark", currency: "USD", balance: 5_000)
+    earmarked = @family.goals.create!(name: "Archived Fixed", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 2_000)
+    end
+    earmarked.archive!
+    # Excluded from the shared pool, but its own earmark is read from its own
+    # goal_accounts — so it still reports 2,000, not the whole 5,000.
+    assert_equal BigDecimal("2000"), Goal.find(earmarked.id).current_balance.to_d
+  end
+
+  test "earmark edits to an existing linked account persist via goal.save!" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Autosave Savings", currency: "USD", balance: 5_000)
+    goal = @family.goals.create!(name: "Autosave goal", target_amount: 10_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account) # NULL = whole balance
+    end
+    ga = goal.goal_accounts.first
+    assert_nil ga.allocated_amount
+    ga.allocated_amount = 1_500
+    goal.save! # autosave: true must persist the dirty existing child
+    assert_equal BigDecimal("1500"), goal.goal_accounts.first.reload.allocated_amount
+  end
+
+  test "progress_percent memo resets after complete! on the same instance" do
+    account = Account.create!(family: @family, accountable: Depository.new, name: "Memo Savings", currency: "USD", balance: 100)
+    goal = @family.goals.create!(name: "Memo goal", target_amount: 1_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account)
+    end
+    assert_operator goal.progress_percent, :<, 100 # memoize the underfunded value
+    goal.complete!
+    assert_equal 100, goal.progress_percent, "stale memo would still report the pre-complete percent"
+  end
+
+  test "contributions basis excludes market gains" do
+    account = Account.create!(family: @family, accountable: Investment.new, name: "Brokerage", currency: "USD", balance: 10_000)
+    account.balances.create!(date: 10.days.ago.to_date, balance: 10_000, currency: "USD", net_market_flows: 3_000)
+    goal = @family.goals.create!(name: "Invest goal", target_amount: 20_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account)
+    end
+    assert_equal "contributions", goal.progress_basis
+    # 10,000 value − 3,000 market gain = 7,000 contributed.
+    assert_equal BigDecimal("7000"), goal.current_balance.to_d
+    assert_equal BigDecimal("10000"), goal.market_value_money.amount
+  end
+
+  test "reopen transitions a completed goal back to active" do
+    fresh = goals(:emergency_fund)
+    fresh.complete!
+    assert fresh.completed?
+    fresh.reopen!
+    assert fresh.active?
+  end
+
+  test "investment accounts default to transfer pledge kind, never manual_save" do
+    assert_equal "transfer", accounts(:investment).default_pledge_kind
+  end
+
+  test "adding an investment account via update flips a depository goal to contributions" do
+    goal = goals(:emergency_fund)
+    assert_equal "balance", goal.progress_basis
+    goal.goal_accounts.build(account: accounts(:investment))
+    goal.save!
+    assert_equal "contributions", goal.reload.progress_basis
+  end
+
+  test "earmark is respected on a contributions-basis goal" do
+    account = Account.create!(family: @family, accountable: Investment.new, name: "Brokerage2", currency: "USD", balance: 10_000)
+    account.balances.create!(date: 5.days.ago.to_date, balance: 10_000, currency: "USD", net_market_flows: 2_000)
+    goal = @family.goals.create!(name: "Earmarked invest", target_amount: 20_000, currency: "USD") do |g|
+      g.goal_accounts.build(account: account, allocated_amount: 1_000)
+    end
+    assert_equal "contributions", goal.progress_basis
+    # net contributed = 10,000 − 2,000 = 8,000; earmark 1,000 ≤ 8,000 → 1,000.
+    assert_equal BigDecimal("1000"), goal.current_balance.to_d
+  end
 end
diff --git a/test/models/holding/portfolio_cache_test.rb b/test/models/holding/portfolio_cache_test.rb
index fed652165..5ea355395 100644
--- a/test/models/holding/portfolio_cache_test.rb
+++ b/test/models/holding/portfolio_cache_test.rb
@@ -57,6 +57,33 @@ class Holding::PortfolioCacheTest < ActiveSupport::TestCase
     assert_equal holding.price, cache.get_price(@security.id, holding.date).price
   end
 
+  test "excludes income trades with zero price from trade price sources" do
+    Security::Price.destroy_all
+
+    @account.entries.create!(
+      name: "Interest: TEST",
+      date: Date.current,
+      amount: -50,
+      currency: "USD",
+      entryable: Trade.new(
+        qty: 0,
+        security: @security,
+        price: 0,
+        currency: "USD",
+        investment_activity_label: "Interest"
+      )
+    )
+
+    cache = Holding::PortfolioCache.new(@account)
+
+    # Income trade price=0 should be excluded; with no DB price for today,
+    # get_price returns nil instead of 0.
+    assert_nil cache.get_price(@security.id, Date.current)
+
+    # The buy trade's price is still available on its own date.
+    assert_equal @trade.price, cache.get_price(@security.id, @trade.entry.date).price
+  end
+
   test "converts historical prices using the requested date exchange rate" do
     account = families(:empty).accounts.create!(
       name: "CHF Brokerage",
diff --git a/test/models/import_encoding_test.rb b/test/models/import_encoding_test.rb
index 7770da992..14e084475 100644
--- a/test/models/import_encoding_test.rb
+++ b/test/models/import_encoding_test.rb
@@ -56,6 +56,27 @@ class ImportEncodingTest < ActiveSupport::TestCase
     assert import.rows.any? { |row| row.name&.include?("Café") }, "Extended Latin characters should be preserved"
   end
 
+  test "normalizes encoding on save even when validations are skipped" do
+    file_path = Rails.root.join("test/fixtures/files/imports/windows1250.csv")
+    csv_content = File.binread(file_path)
+    assert_equal Encoding::ASCII_8BIT, csv_content.encoding
+
+    import = @family.imports.create!(
+      type: "TransactionImport",
+      account: @account,
+      date_format: "%Y-%m-%d"
+    )
+
+    import.assign_attributes(raw_file_str: csv_content)
+
+    assert_nothing_raised do
+      import.save!(validate: false)
+    end
+
+    assert_equal Encoding::UTF_8, import.reload.raw_file_str.encoding
+    assert import.raw_file_str.valid_encoding?, "Converted string should be valid UTF-8"
+  end
+
   test "handles UTF-8 files without modification" do
     # Test that valid UTF-8 files are not modified
     file_path = Rails.root.join("test/fixtures/files/imports/transactions.csv")
diff --git a/test/models/import_session_test.rb b/test/models/import_session_test.rb
new file mode 100644
index 000000000..2707a1aaf
--- /dev/null
+++ b/test/models/import_session_test.rb
@@ -0,0 +1,849 @@
+require "test_helper"
+
+class ImportSessionTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+  end
+
+  test "job requires import session" do
+    error = assert_raises(ArgumentError) do
+      ImportSessionJob.perform_now(nil)
+    end
+
+    assert_equal "ImportSessionJob requires an import_session", error.message
+  end
+
+  test "job publishes import session" do
+    import_session = @family.import_sessions.create!
+    import_session.expects(:publish).once
+
+    ImportSessionJob.perform_now(import_session)
+  end
+
+  test "publishes ordered chunks with source mappings across files" do
+    session = @family.import_sessions.create!(expected_chunks: 2)
+    session.attach_chunk!(
+      sequence: 1,
+      client_chunk_id: "entities",
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.attach_chunk!(
+      sequence: 2,
+      client_chunk_id: "transactions",
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert session.reload.complete?
+    account = @family.accounts.find_by!(name: "Session Checking")
+    entry = account.entries.find_by!(name: "Grocery Run")
+    transaction = entry.entryable
+
+    assert_equal "Groceries", transaction.category.name
+    assert_equal "Market", transaction.merchant.name
+    assert_equal [ "Weekly" ], transaction.tags.map(&:name)
+    assert_equal "sure_import_session:#{session.id}", entry.source
+    assert_equal "Transaction:txn-1", entry.external_id
+    assert_equal 1, session.summary.dig("transactions", "created")
+
+    assert_source_mapping session, "Account", "acct-1", account
+    assert_source_mapping session, "Category", "cat-1", transaction.category
+    assert_source_mapping session, "Merchant", "merchant-1", transaction.merchant
+    assert_source_mapping session, "Tag", "tag-1", transaction.tags.first
+    assert_source_mapping session, "Transaction", "txn-1", transaction
+  end
+
+  test "publishing session chunks records readback verification for each chunk" do
+    session = @family.import_sessions.create!(expected_chunks: 2)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.attach_chunk!(
+      sequence: 2,
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    entity_chunk, transaction_chunk = session.imports.ordered_by_sequence.to_a
+    assert_equal 1, entity_chunk.expected_record_counts["accounts"]
+    assert_equal 1, transaction_chunk.expected_record_counts["transactions"]
+    assert_includes SureImport::VERIFICATION_STATUSES, entity_chunk.readback_verification["status"]
+    assert_equal 1, entity_chunk.readback_verification.dig("checked_counts", "accounts")
+    assert_equal 1, transaction_chunk.readback_verification.dig("checked_counts", "transactions")
+    assert_equal 1, transaction_chunk.readback_verification.dig("actual_delta_counts", "transactions")
+  end
+
+  test "publishing the same complete session does not duplicate imported transactions" do
+    session = @family.import_sessions.create!(expected_chunks: 2)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.attach_chunk!(
+      sequence: 2,
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert_no_difference("Entry.count") do
+      session.publish
+    end
+  end
+
+  test "republishing failed session skips complete chunks and retries failed chunks" do
+    session = @family.import_sessions.create!(expected_chunks: 2)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.attach_chunk!(
+      sequence: 2,
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    complete_chunk = session.imports.find_by!(sequence: 1)
+    failed_chunk = session.imports.find_by!(sequence: 2)
+    complete_chunk.update!(status: :complete, summary: { "accounts" => { "created" => 1 } }, error_details: {})
+    failed_chunk.update!(status: :failed, error: "transient failure", error_details: { "code" => "import_failed" })
+    session.update!(
+      status: :failed,
+      summary: complete_chunk.summary,
+      error_details: { "code" => "import_failed", "message" => "transient failure" }
+    )
+    processed_sequences = []
+
+    importer_factory = lambda do |_family, _content, import_session:, import:|
+      processed_sequences << import.sequence
+      flunk "completed chunk was reprocessed" if import.sequence == 1
+      assert_equal session, import_session
+
+      Object.new.tap do |importer|
+        importer.define_singleton_method(:import!) do
+          {
+            accounts: [],
+            entries: [],
+            summary: { "transactions" => { "created" => 1 } }
+          }
+        end
+      end
+    end
+
+    Family::DataImporter.stub(:new, importer_factory) do
+      session.publish
+    end
+
+    assert_equal [ 2 ], processed_sequences
+    assert complete_chunk.reload.complete?
+    assert failed_chunk.reload.complete?
+    assert session.reload.complete?
+    assert_equal 1, session.summary.dig("accounts", "created")
+    assert_equal 1, session.summary.dig("transactions", "created")
+  end
+
+  test "publish keeps session complete and records safe error when family sync enqueue fails" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    Family.any_instance.stubs(:sync_later).raises(StandardError, "redis://secret.local/0")
+    session.publish
+
+    assert session.reload.complete?
+    assert_equal "family_sync_enqueue_failed", session.error_details["code"]
+    assert_equal "Family sync could not be queued after import completion.", session.error_details["message"]
+    assert_no_match(/secret/, session.error_details.to_json)
+  end
+
+  test "publish stores generic error details for unexpected import failures" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    importer_factory = ->(*) { raise StandardError, "redis://secret.local/0" }
+
+    Family::DataImporter.stub(:new, importer_factory) do
+      session.publish
+    end
+
+    assert session.reload.failed?
+    assert_equal "Import session failed.", session.imports.first.error
+    assert_equal "import_failed", session.error_details["code"]
+    assert_equal "Import session failed.", session.error_details["message"]
+    assert_no_match(/secret/, session.error_details.to_json)
+  end
+
+  test "publish later requires the exact expected chunk sequences" do
+    session = @family.import_sessions.create!(expected_chunks: 2)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    error = assert_raises(ImportSession::ConflictError) do
+      session.publish_later
+    end
+
+    expected_message = "import session chunks do not match expected sequences " \
+                       "(missing sequences: 2)"
+    assert_equal expected_message, error.message
+    assert session.reload.pending?
+  end
+
+  test "chunk upload rejects sequences beyond the expected chunk count" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+
+    error = assert_raises(ImportSession::ConflictError) do
+      session.attach_chunk!(
+        sequence: 2,
+        content: build_ndjson(entity_records),
+        filename: "entities.ndjson",
+        content_type: "application/x-ndjson"
+      )
+    end
+
+    assert_equal "sequence exceeds expected_chunks", error.message
+    assert_empty session.imports
+  end
+
+  test "publish later restores status and records enqueue failures" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    ImportSessionJob.stub(:perform_later, ->(_import_session) { raise StandardError, "queue offline" }) do
+      error = assert_raises(ImportSession::EnqueueError) do
+        session.publish_later
+      end
+
+      assert_equal "Import session could not be queued.", error.message
+    end
+
+    assert session.reload.pending?
+    assert_equal "import_enqueue_failed", session.error_details["code"]
+    assert_equal "Import session could not be queued.", session.error_details["message"]
+  end
+
+  test "publish later syncs chunk row counts before enforcing row limit" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records + transaction_records),
+      filename: "session.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.imports.update_all(rows_count: 0)
+
+    SureImport.stub(:max_row_count, 1) do
+      assert_raises(Import::MaxRowCountExceededError) { session.publish_later }
+    end
+
+    assert session.reload.pending?
+    assert_equal 5, session.imports.reload.first.rows_count
+  end
+
+  test "fails loudly when a later chunk references a missing source id" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert session.reload.failed?
+    chunk = session.imports.first
+    assert chunk.failed?
+    assert_equal "missing_source_reference", chunk.error_details["code"]
+    assert_equal "acct-1", chunk.error_details["source_id"]
+    assert_equal 0, @family.entries.count
+  end
+
+  test "source mappings from another family cannot satisfy missing references" do
+    other_family = Family.create!(name: "Other Family", currency: "USD", locale: "en")
+    other_session = other_family.import_sessions.create!(expected_chunks: 1)
+    other_session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(entity_records),
+      filename: "other-entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    other_session.publish
+
+    assert other_session.reload.complete?
+    assert_equal 1, other_session.source_mappings.where(source_type: "Account", source_id: "acct-1").count
+
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert session.reload.failed?
+    assert_equal "missing_source_reference", session.imports.first.error_details["code"]
+    assert_equal "acct-1", session.imports.first.error_details["source_id"]
+    assert_equal 0, @family.entries.count
+  end
+
+  test "session mode rejects invalid account accountable types" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson([
+        {
+          type: "Account",
+          data: {
+            id: "acct-invalid",
+            name: "Invalid Account",
+            balance: "100.00",
+            currency: "USD",
+            accountable_type: "Kernel"
+          }
+        }
+      ]),
+      filename: "accounts.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert session.reload.failed?
+    assert_equal 0, @family.accounts.count
+    assert_equal "invalid_import_record", session.imports.first.error_details["code"]
+    assert_equal "Account", session.imports.first.error_details["record_type"]
+    assert_equal "accountable_type", session.imports.first.error_details["field"]
+    assert_equal "Kernel", session.imports.first.error_details["value"]
+  end
+
+  test "chunk upload is idempotent by sequence and checksum" do
+    session = @family.import_sessions.create!
+    content = build_ndjson(entity_records)
+
+    first = session.attach_chunk!(
+      sequence: 1,
+      content: content,
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    second = session.attach_chunk!(
+      sequence: 1,
+      content: content,
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    assert_equal first.id, second.id
+    assert_raises(ImportSession::ConflictError) do
+      session.attach_chunk!(
+        sequence: 1,
+        content: build_ndjson(transaction_records),
+        filename: "different.ndjson",
+        content_type: "application/x-ndjson"
+      )
+    end
+  end
+
+  test "chunk upload repairs incomplete existing chunk before accepting retry" do
+    session = @family.import_sessions.create!
+    content = build_ndjson(transaction_records)
+    chunk = session.imports.create!(
+      family: @family,
+      type: "SureImport",
+      sequence: 1,
+      client_chunk_id: "entities",
+      checksum: Digest::SHA256.hexdigest(content)
+    )
+
+    result = session.attach_chunk!(
+      sequence: 1,
+      client_chunk_id: "entities",
+      content: content,
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    assert_equal chunk.id, result.id
+    assert result.reload.ndjson_file.attached?
+    assert_equal 1, result.rows_count
+  end
+
+  test "chunk upload resyncs attached existing chunk before accepting retry" do
+    session = @family.import_sessions.create!
+    content = build_ndjson(transaction_records)
+    chunk = session.imports.create!(
+      family: @family,
+      type: "SureImport",
+      sequence: 1,
+      client_chunk_id: "entities",
+      checksum: Digest::SHA256.hexdigest(content)
+    )
+    chunk.ndjson_file.attach(
+      io: StringIO.new(content),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    result = session.attach_chunk!(
+      sequence: 1,
+      client_chunk_id: "entities",
+      content: content,
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    assert_equal chunk.id, result.id
+    assert_equal 1, result.rows_count
+  end
+
+  test "chunk upload rejects inconsistent sequence and client chunk keys" do
+    session = @family.import_sessions.create!
+    session.attach_chunk!(
+      sequence: 1,
+      client_chunk_id: "entities",
+      content: build_ndjson(entity_records),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    session.attach_chunk!(
+      sequence: 2,
+      client_chunk_id: "transactions",
+      content: build_ndjson(transaction_records),
+      filename: "transactions.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    error = assert_raises(ImportSession::ConflictError) do
+      session.attach_chunk!(
+        sequence: 1,
+        client_chunk_id: "transactions",
+        content: build_ndjson(transaction_records),
+        filename: "transactions.ndjson",
+        content_type: "application/x-ndjson"
+      )
+    end
+
+    assert_equal "sequence and client_chunk_id refer to different chunks", error.message
+  end
+
+  test "chunk upload treats duplicate insert races as idempotent retries" do
+    session = @family.import_sessions.create!
+    content = build_ndjson(entity_records)
+    existing = session.imports.create!(
+      family: @family,
+      type: "SureImport",
+      sequence: 1,
+      client_chunk_id: "entities",
+      checksum: Digest::SHA256.hexdigest(content)
+    )
+    existing.ndjson_file.attach(
+      io: StringIO.new(content),
+      filename: "entities.ndjson",
+      content_type: "application/x-ndjson"
+    )
+    existing.sync_ndjson_rows_count!
+    lookup_count = 0
+
+    session.stub(:existing_chunk_for!, ->(**) {
+      lookup_count += 1
+      lookup_count == 1 ? nil : existing
+    }) do
+      session.stub(:create_chunk!, ->(**) { raise ActiveRecord::RecordNotUnique, "duplicate chunk" }) do
+        assert_equal existing, session.attach_chunk!(
+          sequence: 1,
+          client_chunk_id: "entities",
+          content: content,
+          filename: "entities.ndjson",
+          content_type: "application/x-ndjson"
+        )
+      end
+    end
+
+    assert_equal 2, lookup_count
+  end
+
+  test "client session creation treats duplicate insert races as idempotent retries" do
+    existing = @family.import_sessions.create!(client_session_id: "race-session", expected_chunks: 2)
+    ImportSession.any_instance.stubs(:save!).raises(ActiveRecord::RecordNotUnique)
+
+    session = ImportSession.create_or_find_for!(
+      family: @family,
+      import_type: "SureImport",
+      client_session_id: "race-session",
+      expected_chunks: 2
+    )
+
+    assert_equal existing, session
+  end
+
+  test "client session creation race backfills missing expected chunks" do
+    existing = @family.import_sessions.create!(client_session_id: "race-session")
+    racing_session = @family.import_sessions.build(client_session_id: "race-session")
+    racing_session.stubs(:save!).raises(ActiveRecord::RecordNotUnique)
+
+    @family.import_sessions.stub(:find_or_initialize_by, racing_session) do
+      session = ImportSession.create_or_find_for!(
+        family: @family,
+        import_type: "SureImport",
+        client_session_id: "race-session",
+        expected_chunks: 2
+      )
+
+      assert_equal existing, session
+    end
+    assert_equal 2, existing.reload.expected_chunks
+  end
+
+  test "client session creation race preserves expected chunks conflict" do
+    @family.import_sessions.create!(client_session_id: "race-session", expected_chunks: 2)
+    ImportSession.any_instance.stubs(:save!).raises(ActiveRecord::RecordNotUnique)
+
+    error = assert_raises(ImportSession::ConflictError) do
+      ImportSession.create_or_find_for!(
+        family: @family,
+        import_type: "SureImport",
+        client_session_id: "race-session",
+        expected_chunks: 3
+      )
+    end
+
+    assert_equal "client_session_id already exists with a different expected_chunks value", error.message
+  end
+
+  test "session mode rejects rule records without source ids" do
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: build_ndjson([
+        {
+          type: "Rule",
+          data: {
+            name: "Missing Source Rule",
+            resource_type: "transaction",
+            active: true
+          }
+        }
+      ]),
+      filename: "rules.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert session.reload.failed?
+    assert_equal 0, @family.rules.count
+    assert_equal "missing_source_reference", session.imports.first.error_details["code"]
+    assert_equal "Rule", session.imports.first.error_details["record_type"]
+    assert_equal "(blank)", session.imports.first.error_details["source_id"]
+  end
+
+  test "session mode imports rule records exported by Sure packages" do
+    source_family = Family.create!(name: "Rule Export Source", currency: "USD", locale: "en")
+    category = source_family.categories.create!(
+      name: "Exported Category",
+      color: "#00AA00",
+      lucide_icon: "shapes"
+    )
+    source_rule = source_family.rules.build(
+      name: "Exported Rule",
+      resource_type: "transaction",
+      active: true
+    )
+    source_rule.conditions.build(
+      condition_type: "transaction_name",
+      operator: "like",
+      value: "Coffee"
+    )
+    source_rule.actions.build(
+      action_type: "set_transaction_category",
+      value: category.id
+    )
+    source_rule.save!
+
+    session = @family.import_sessions.create!(expected_chunks: 1)
+    session.attach_chunk!(
+      sequence: 1,
+      content: exported_ndjson_for(source_family),
+      filename: "all.ndjson",
+      content_type: "application/x-ndjson"
+    )
+
+    session.publish
+
+    assert session.reload.complete?
+    imported_rule = @family.rules.find_by!(name: "Exported Rule")
+    imported_category = @family.categories.find_by!(name: "Exported Category")
+
+    assert_equal 1, session.summary.dig("rules", "created")
+    assert_equal imported_category.id, imported_rule.actions.first.value
+    assert_source_mapping session, "Rule", source_rule.id, imported_rule
+  end
+
+  test "client idempotency keys are bounded before indexed writes" do
+    session = @family.import_sessions.build(client_session_id: "x" * 256)
+
+    assert_not session.valid?
+    assert_includes session.errors[:client_session_id], "is too long (maximum is 255 characters)"
+
+    import = @family.imports.build(type: "SureImport", client_chunk_id: "x" * 256)
+
+    assert_not import.valid?
+    assert_includes import.errors[:client_chunk_id], "is too long (maximum is 255 characters)"
+
+    import.sequence = 0
+    import.checksum = "short"
+
+    assert_not import.valid?
+    assert_includes import.errors[:sequence], "must be greater than 0"
+    assert_includes import.errors[:checksum], "is the wrong length (should be 64 characters)"
+
+    other_family = Family.create!(name: "Other Import Family", currency: "USD", locale: "en")
+    import.import_session = other_family.import_sessions.build
+    import.sequence = nil
+    import.checksum = nil
+
+    assert_not import.valid?
+    assert_includes import.errors[:import_session], "must belong to your family"
+    assert_includes import.errors[:sequence], "must be present for import session chunks"
+    assert_includes import.errors[:checksum], "must be present for import session chunks"
+
+    mapping = @family.import_source_mappings.build(
+      import_session: @family.import_sessions.build,
+      source_type: "x" * 65,
+      source_id: "x" * 256,
+      target_type: "Account",
+      target_id: SecureRandom.uuid
+    )
+
+    assert_not mapping.valid?
+    assert_includes mapping.errors[:source_type], "is too long (maximum is 64 characters)"
+    assert_includes mapping.errors[:source_id], "is too long (maximum is 255 characters)"
+
+    mapping.source_type = "Unsupported"
+    mapping.source_id = "acct-1"
+
+    assert_not mapping.valid?
+    assert_includes mapping.errors[:source_type], "is not included in the list"
+
+    mapping.source_type = "Account"
+    mapping.target_type = "Unsupported"
+
+    assert_not mapping.valid?
+    assert_includes mapping.errors[:target_type], "is not included in the list"
+  end
+
+  test "client idempotency keys are stripped before validation" do
+    session = @family.import_sessions.create!(client_session_id: "  session-1  ")
+    import = @family.imports.create!(type: "SureImport", client_chunk_id: "  chunk-1  ")
+    category = @family.categories.create!(name: "Mapping Category")
+    mapping = session.source_mappings.create!(
+      family: @family,
+      source_type: "Category",
+      source_id: "  cat-1  ",
+      target: category
+    )
+
+    assert_equal "session-1", session.client_session_id
+    assert_equal "chunk-1", import.client_chunk_id
+    assert_equal "cat-1", mapping.source_id
+  end
+
+  test "session status payloads must remain JSON objects" do
+    session = @family.import_sessions.build(summary: [], error_details: "failed")
+    import = @family.imports.build(type: "SureImport", summary: [], error_details: "failed")
+
+    assert_not session.valid?
+    assert_includes session.errors[:summary], "must be an object"
+    assert_includes session.errors[:error_details], "must be an object"
+
+    assert_not import.valid?
+    assert_includes import.errors[:summary], "must be an object"
+    assert_includes import.errors[:error_details], "must be an object"
+  end
+
+  test "source mappings must belong to the same family as their import session" do
+    other_family = Family.create!(name: "Other Mapping Family", currency: "USD", locale: "en")
+    mapping = other_family.import_source_mappings.build(
+      import_session: @family.import_sessions.build,
+      source_type: "Account",
+      source_id: "acct-1",
+      target: @family.accounts.build(name: "Session Checking")
+    )
+
+    assert_not mapping.valid?
+    assert_includes mapping.errors[:family], "must match import session"
+  end
+
+  test "source mapping targets must not cross family boundaries" do
+    other_family = Family.create!(name: "Other Mapping Target Family", currency: "USD", locale: "en")
+    mapping = @family.import_source_mappings.build(
+      import_session: @family.import_sessions.build,
+      source_type: " Account ",
+      source_id: "acct-1",
+      target: other_family.accounts.build(name: "Other Checking")
+    )
+
+    assert_not mapping.valid?
+    assert_equal "Account", mapping.source_type
+    assert_includes mapping.errors[:target], "must belong to your family"
+  end
+
+  test "clean reconciles committed chunks before failing a stuck session" do
+    session = @family.import_sessions.create!(status: "importing")
+    session.update_columns(updated_at: 7.hours.ago)
+
+    checksum = Digest::SHA256.hexdigest("chunk")
+    committed_chunk = TransactionImport.create!(family: @family, import_session: session, sequence: 1, checksum: checksum, status: "importing")
+    entries(:transaction).update_columns(import_id: committed_chunk.id)
+    rolled_back_chunk = TransactionImport.create!(family: @family, import_session: session, sequence: 2, checksum: checksum, status: "importing")
+
+    ImportSession.clean
+
+    session.reload
+    assert_equal "failed", session.status
+    assert_equal "import_interrupted", session.error_details["code"]
+    # The chunk whose import! committed must be skipped by a re-publish...
+    assert_equal "complete", committed_chunk.reload.status
+    # ...while the one that rolled back stays re-runnable.
+    assert_equal "importing", rolled_back_chunk.reload.status
+  end
+
+  test "clean leaves fresh importing sessions alone" do
+    session = @family.import_sessions.create!(status: "importing")
+
+    ImportSession.clean
+
+    assert_equal "importing", session.reload.status
+  end
+
+  test "clean isolates a session whose update! fails so the sweep does not abort" do
+    session = @family.import_sessions.create!(status: "importing")
+    session.update_columns(updated_at: 7.hours.ago)
+
+    # A validation/DB error on one stuck session must not abort the sweep for
+    # the rest (mirrors Import.clean's per-record rescue).
+    ImportSession.any_instance.stubs(:update!).raises(ActiveRecord::RecordInvalid.new(ImportSession.new))
+
+    assert_nothing_raised { ImportSession.clean }
+    assert_equal "importing", session.reload.status
+  end
+
+  private
+    def entity_records
+      [
+        {
+          type: "Account",
+          data: {
+            id: "acct-1",
+            name: "Session Checking",
+            balance: "100.00",
+            currency: "USD",
+            accountable_type: "Depository",
+            accountable: { subtype: "checking" }
+          }
+        },
+        {
+          type: "Category",
+          data: {
+            id: "cat-1",
+            name: "Groceries",
+            color: "#407706",
+            classification: "expense"
+          }
+        },
+        {
+          type: "Merchant",
+          data: {
+            id: "merchant-1",
+            name: "Market",
+            color: "#111111"
+          }
+        },
+        {
+          type: "Tag",
+          data: {
+            id: "tag-1",
+            name: "Weekly",
+            color: "#222222"
+          }
+        }
+      ]
+    end
+
+    def transaction_records
+      [
+        {
+          type: "Transaction",
+          data: {
+            id: "txn-1",
+            account_id: "acct-1",
+            category_id: "cat-1",
+            merchant_id: "merchant-1",
+            tag_ids: [ "tag-1" ],
+            date: "2024-01-15",
+            amount: "-12.34",
+            currency: "USD",
+            name: "Grocery Run"
+          }
+        }
+      ]
+    end
+
+    def build_ndjson(records)
+      records.map(&:to_json).join("\n")
+    end
+
+    def exported_ndjson_for(family)
+      ndjson = nil
+
+      Zip::File.open_buffer(Family::DataExporter.new(family).generate_export) do |zip|
+        ndjson = zip.read("all.ndjson")
+      end
+
+      ndjson
+    end
+
+    def assert_source_mapping(session, source_type, source_id, target)
+      mapping = session.source_mappings.find_by!(source_type: source_type, source_id: source_id)
+
+      assert_equal @family, mapping.family
+      assert_equal target, mapping.target
+    end
+end
diff --git a/test/models/import_test.rb b/test/models/import_test.rb
new file mode 100644
index 000000000..8c5820185
--- /dev/null
+++ b/test/models/import_test.rb
@@ -0,0 +1,202 @@
+require "test_helper"
+
+class ImportTest < ActiveSupport::TestCase
+  test "publish skips imports in terminal statuses" do
+    import = imports(:transaction)
+    import.update_columns(status: "complete")
+
+    import.expects(:import!).never
+
+    import.publish
+
+    assert_equal "complete", import.reload.status
+  end
+
+  test "publish skips imports that are reverting" do
+    import = imports(:transaction)
+    import.update_columns(status: "reverting")
+
+    import.expects(:import!).never
+
+    import.publish
+
+    assert_equal "reverting", import.reload.status
+  end
+
+  test "clean fails stuck imports but leaves PdfImports to their own reclaim" do
+    stuck_csv = imports(:transaction)
+    stuck_csv.update_columns(status: "importing", updated_at: 7.hours.ago)
+
+    stuck_pdf = imports(:pdf)
+    stuck_pdf.update_columns(status: "importing", updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "failed", stuck_csv.reload.status
+    assert_equal "importing", stuck_pdf.reload.status
+  end
+
+  test "clean leaves session-owned chunks to ImportSession.clean" do
+    family = families(:dylan_family)
+    session = family.import_sessions.create!(status: "importing")
+    chunk = TransactionImport.create!(
+      family: family,
+      import_session: session,
+      sequence: 1,
+      checksum: Digest::SHA256.hexdigest("chunk"),
+      status: "importing"
+    )
+    chunk.update_columns(updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "importing", chunk.reload.status
+  end
+
+  test "clean completes a stuck import whose data already committed" do
+    stuck = imports(:transaction)
+    stuck.update_columns(status: "importing", updated_at: 7.hours.ago)
+    entries(:transaction).update_columns(import_id: stuck.id)
+
+    Import.clean
+
+    stuck.reload
+    assert_equal "complete", stuck.status
+    assert_nil stuck.error
+  end
+
+  test "clean moves a stuck revert to revert_failed" do
+    stuck = imports(:transaction)
+    stuck.update_columns(status: "reverting", updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "revert_failed", stuck.reload.status
+  end
+
+  test "PdfImport clean reclaims the AI claim but completes a committed publish" do
+    ai_claim = imports(:pdf)
+    ai_claim.update_columns(status: "importing", updated_at: 7.hours.ago)
+
+    published = imports(:pdf_processed)
+    published.update_columns(status: "importing", updated_at: 7.hours.ago)
+    entries(:transaction).update_columns(import_id: published.id)
+
+    PdfImport.clean
+
+    assert_equal "pending", ai_claim.reload.status
+    assert_equal "complete", published.reload.status
+  end
+
+  test "PdfImport clean moves a stuck revert to revert_failed" do
+    stuck = imports(:pdf)
+    stuck.update_columns(status: "reverting", updated_at: 7.hours.ago)
+
+    PdfImport.clean
+
+    assert_equal "revert_failed", stuck.reload.status
+  end
+
+  test "force_fail! refuses records that have not been idle long enough" do
+    import = imports(:transaction)
+    import.update_columns(status: "importing", updated_at: 5.minutes.ago)
+
+    assert_not import.force_fail!
+    assert_equal "importing", import.reload.status
+  end
+
+  test "force_fail! fails a lost import and keeps reverts retryable" do
+    lost_import = imports(:transaction)
+    lost_import.update_columns(status: "importing", updated_at: 2.hours.ago)
+
+    assert lost_import.force_fail!
+    assert_equal "failed", lost_import.reload.status
+    assert_equal Import.lost_error_message, lost_import.error
+
+    lost_revert = imports(:trade)
+    lost_revert.update_columns(status: "reverting", updated_at: 2.hours.ago)
+
+    assert lost_revert.force_fail!
+    assert_equal "revert_failed", lost_revert.reload.status
+  end
+
+  test "force_fail! refuses terminal statuses" do
+    import = imports(:transaction)
+    import.update_columns(status: "complete", updated_at: 2.hours.ago)
+
+    assert_not import.force_fail!
+    assert_equal "complete", import.reload.status
+  end
+
+  test "force_fail! releases a lost PdfImport claim back to pending" do
+    pdf = imports(:pdf)
+    pdf.update_columns(status: "importing", updated_at: 2.hours.ago)
+
+    assert pdf.force_fail!
+    assert_equal "pending", pdf.reload.status
+  end
+
+  # Category/Merchant/Rule imports attach nothing to the import (their records
+  # hang off the family), so reap_stuck! leans on the type-specific
+  # data_committed? override to tell a committed run from a rolled-back one.
+  test "clean completes a stuck CategoryImport whose categories committed" do
+    family = families(:dylan_family)
+    stuck = CategoryImport.create!(family: family, status: "importing")
+    stuck.rows.create!(source_row_number: 1, name: categories(:income).name, currency: "USD")
+    stuck.update_columns(updated_at: 7.hours.ago)
+
+    Import.clean
+
+    stuck.reload
+    assert_equal "complete", stuck.status
+    assert_nil stuck.error
+  end
+
+  test "clean fails a stuck CategoryImport whose categories never committed" do
+    family = families(:dylan_family)
+    stuck = CategoryImport.create!(family: family, status: "importing")
+    stuck.rows.create!(source_row_number: 1, name: "Never Committed Category", currency: "USD")
+    stuck.update_columns(updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "failed", stuck.reload.status
+  end
+
+  test "clean completes a stuck MerchantImport whose merchants committed" do
+    family = families(:dylan_family)
+    stuck = MerchantImport.create!(family: family, status: "importing")
+    stuck.rows.create!(source_row_number: 1, name: merchants(:netflix).name, currency: "USD")
+    stuck.update_columns(updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "complete", stuck.reload.status
+  end
+
+  test "clean completes a stuck RuleImport whose named rules committed" do
+    family = families(:dylan_family)
+    # Skip Rule's own validations — the reaper only asks whether a rule with
+    # this name exists in the family, which is the state a committed import
+    # leaves behind.
+    family.rules.new(resource_type: "transaction", name: "Committed rule").save!(validate: false)
+    stuck = RuleImport.create!(family: family, status: "importing")
+    stuck.rows.create!(source_row_number: 1, name: "Committed rule", resource_type: "transaction", conditions: "[]", actions: "[]", currency: "USD")
+    stuck.update_columns(updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "complete", stuck.reload.status
+  end
+
+  test "clean fails a stuck RuleImport of only nameless rows (no commit signal)" do
+    family = families(:dylan_family)
+    stuck = RuleImport.create!(family: family, status: "importing")
+    stuck.rows.create!(source_row_number: 1, name: "", resource_type: "transaction", conditions: "[]", actions: "[]", currency: "USD")
+    stuck.update_columns(updated_at: 7.hours.ago)
+
+    Import.clean
+
+    assert_equal "failed", stuck.reload.status
+  end
+end
diff --git a/test/models/income_statement_test.rb b/test/models/income_statement_test.rb
index 9e2b350f6..00c9ca9c8 100644
--- a/test/models/income_statement_test.rb
+++ b/test/models/income_statement_test.rb
@@ -39,6 +39,17 @@ class IncomeStatementTest < ActiveSupport::TestCase
     assert_equal expected_total_expense, expense_totals.category_totals.find { |ct| ct.category.id == @food_category.id }.total
   end
 
+  test "orphaned categories still count as root category totals" do
+    orphan_category = @family.categories.create! name: "Orphaned Category"
+    orphan_category.update_column(:parent_id, SecureRandom.uuid)
+    create_transaction(account: @checking_account, amount: 123, category: orphan_category)
+
+    expense_totals = IncomeStatement.new(@family).expense_totals(period: Period.last_30_days)
+
+    assert_equal 200 + 300 + 400 + 123, expense_totals.total
+    assert_equal 123, expense_totals.category_totals.find { |ct| ct.category.id == orphan_category.id }.total
+  end
+
   test "memoizes expense and income period totals across repeated calculations" do
     income_statement = IncomeStatement.new(@family)
     period = Period.last_30_days
@@ -65,6 +76,30 @@ class IncomeStatementTest < ActiveSupport::TestCase
     assert_equal expected_total_income, income_totals.category_totals.find { |ct| ct.category.id == @income_category.id }.total
   end
 
+  test "totals_for scopes totals to a period and optional account ids" do
+    income_statement = IncomeStatement.new(@family)
+    period = Period.last_30_days
+
+    all_totals = income_statement.totals_for(period)
+    assert_equal Money.new(1000, @family.currency), all_totals.income_money
+    assert_equal Money.new(200 + 300 + 400, @family.currency), all_totals.expense_money
+
+    checking_only_totals = income_statement.totals_for(period, account_ids: [ @checking_account.id ])
+    assert_equal Money.new(1000, @family.currency), checking_only_totals.income_money
+    assert_equal Money.new(200, @family.currency), checking_only_totals.expense_money
+  end
+
+  test "eligible_accounts excludes accounts not reflected in totals" do
+    tax_advantaged_account = @family.accounts.create! name: "401k", currency: @family.currency, balance: 10000, accountable: Investment.new(subtype: "401k")
+    excluded_account = @family.accounts.create! name: "Excluded", currency: @family.currency, balance: 0, exclude_from_reports: true, accountable: Depository.new
+
+    eligible_ids = IncomeStatement.new(@family).eligible_accounts.pluck(:id)
+
+    assert_includes eligible_ids, @checking_account.id
+    assert_not_includes eligible_ids, tax_advantaged_account.id
+    assert_not_includes eligible_ids, excluded_account.id
+  end
+
   test "calculates median expense" do
     income_statement = IncomeStatement.new(@family)
     assert_equal 200 + 300 + 400, income_statement.expense_totals(period: Period.last_30_days).total
@@ -170,8 +205,8 @@ class IncomeStatementTest < ActiveSupport::TestCase
   # NOTE: These tests now pass because kind filtering is working after the refactoring!
   test "excludes regular transfers from income statement calculations" do
     # Create a regular transfer between accounts
-    _outflow_transaction = create_transaction(account: @checking_account, amount: 500, kind: "funds_movement")
-    _inflow_transaction = create_transaction(account: @credit_card_account, amount: -500, kind: "funds_movement")
+    create_transaction(account: @checking_account, amount: 500, kind: "funds_movement")
+    create_transaction(account: @credit_card_account, amount: -500, kind: "funds_movement")
 
     income_statement = IncomeStatement.new(@family)
     totals = income_statement.totals(date_range: Period.last_30_days.date_range)
@@ -184,7 +219,7 @@ class IncomeStatementTest < ActiveSupport::TestCase
 
   test "includes loan payments as expenses in income statement" do
     # Create a loan payment transaction
-    _loan_payment = create_transaction(account: @checking_account, amount: 1000, category: nil, kind: "loan_payment")
+    create_transaction(account: @checking_account, amount: 1000, category: nil, kind: "loan_payment")
 
     income_statement = IncomeStatement.new(@family)
     totals = income_statement.totals(date_range: Period.last_30_days.date_range)
@@ -197,7 +232,7 @@ class IncomeStatementTest < ActiveSupport::TestCase
 
   test "excludes one-time transactions from income statement calculations" do
     # Create a one-time transaction
-    _one_time_transaction = create_transaction(account: @checking_account, amount: 250, category: @groceries_category, kind: "one_time")
+    create_transaction(account: @checking_account, amount: 250, category: @groceries_category, kind: "one_time")
 
     income_statement = IncomeStatement.new(@family)
     totals = income_statement.totals(date_range: Period.last_30_days.date_range)
@@ -210,7 +245,7 @@ class IncomeStatementTest < ActiveSupport::TestCase
 
   test "excludes payment transactions from income statement calculations" do
     # Create a payment transaction (credit card payment)
-    _payment_transaction = create_transaction(account: @checking_account, amount: 300, category: nil, kind: "cc_payment")
+    create_transaction(account: @checking_account, amount: 300, category: nil, kind: "cc_payment")
 
     income_statement = IncomeStatement.new(@family)
     totals = income_statement.totals(date_range: Period.last_30_days.date_range)
@@ -304,7 +339,7 @@ class IncomeStatementTest < ActiveSupport::TestCase
 
   test "includes investment_contribution transactions as expenses in income statement" do
     # Create a transfer to investment account (marked as investment_contribution)
-    _investment_contribution = create_transaction(
+    create_transaction(
       account: @checking_account,
       amount: 1000,
       category: nil,
@@ -334,7 +369,7 @@ class IncomeStatementTest < ActiveSupport::TestCase
 
     # Provider-imported contribution shows as inflow (negative amount) to the investment account
     # kind is investment_contribution, which should be treated as expense regardless of sign
-    _provider_contribution = create_transaction(
+    create_transaction(
       account: investment_account,
       amount: -500, # Negative = inflow to account
       category: nil,
@@ -544,6 +579,46 @@ class IncomeStatementTest < ActiveSupport::TestCase
     refute_includes tax_advantaged_ids, @checking_account.id
   end
 
+  # Exclude-from-reports tests
+  test "excludes transactions from accounts with exclude_from_reports set" do
+    excluded_account = @family.accounts.create!(
+      name: "Excluded Checking",
+      currency: @family.currency,
+      balance: 3000,
+      accountable: Depository.new,
+      exclude_from_reports: true
+    )
+
+    create_transaction(account: excluded_account, amount: 500, category: @groceries_category)
+    create_transaction(account: excluded_account, amount: -300, category: @income_category)
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals(date_range: Period.last_30_days.date_range)
+
+    assert_equal 4, totals.transactions_count
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(900, @family.currency), totals.expense_money
+  end
+
+  test "includes transactions from accounts without exclude_from_reports" do
+    included_account = @family.accounts.create!(
+      name: "Included Checking",
+      currency: @family.currency,
+      balance: 3000,
+      accountable: Depository.new,
+      exclude_from_reports: false
+    )
+
+    create_transaction(account: included_account, amount: 100, category: @groceries_category)
+
+    income_statement = IncomeStatement.new(@family)
+    totals = income_statement.totals(date_range: Period.last_30_days.date_range)
+
+    assert_equal 5, totals.transactions_count
+    assert_equal Money.new(1000, @family.currency), totals.income_money
+    assert_equal Money.new(1000, @family.currency), totals.expense_money
+  end
+
   # net_category_totals tests
   test "net_category_totals nets expense and refund in the same category" do
     Entry.joins(:account).where(accounts: { family_id: @family.id }).destroy_all
@@ -653,4 +728,22 @@ class IncomeStatementTest < ActiveSupport::TestCase
     assert_equal Money.new(0, "USD"), totals.income_money
     assert_equal Money.new(0, "USD"), totals.expense_money
   end
+
+  test "reuses totals_query for income and expense in the same period" do
+    income_statement = IncomeStatement.new(@family)
+    period = Period.last_30_days
+
+    totals_query_calls = 0
+    income_statement.singleton_class.prepend(Module.new do
+      define_method(:totals_query) do |**kwargs|
+        totals_query_calls += 1
+        super(**kwargs)
+      end
+    end)
+
+    income_statement.income_totals(period: period)
+    income_statement.expense_totals(period: period)
+
+    assert_equal 1, totals_query_calls
+  end
 end
diff --git a/test/models/indexa_capital_account/activities_processor_test.rb b/test/models/indexa_capital_account/activities_processor_test.rb
new file mode 100644
index 000000000..8f28299ac
--- /dev/null
+++ b/test/models/indexa_capital_account/activities_processor_test.rb
@@ -0,0 +1,178 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class IndexaCapitalAccount::ActivitiesProcessorTest < ActiveSupport::TestCase
+  include SecuritiesTestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @item = indexa_capital_items(:configured_with_token)
+    @indexa_capital_account = indexa_capital_accounts(:mutual_fund)
+
+    @account = @family.accounts.create!(
+      name: "Test Investment",
+      balance: 10000,
+      currency: "EUR",
+      accountable: Investment.new
+    )
+
+    @indexa_capital_account.ensure_account_provider!(@account)
+    @indexa_capital_account.reload
+  end
+
+  test "processes contribution cash activity with negative inflow amount" do
+    @indexa_capital_account.update!(raw_activities_payload: [
+      build_cash_activity(
+        id: "contrib_001",
+        type: "CONTRIBUTION",
+        amount: 500.00,
+        date: Date.current.to_s
+      )
+    ])
+
+    processor = IndexaCapitalAccount::ActivitiesProcessor.new(@indexa_capital_account)
+    processor.process
+
+    entry = @account.entries.find_by(external_id: "contrib_001", source: "indexa_capital")
+    assert_not_nil entry
+    assert_equal(-500.00, entry.amount.to_f)
+    assert_equal "Contribution", entry.entryable.investment_activity_label
+  end
+
+  test "processes dividend cash activity as negative inflow" do
+    @indexa_capital_account.update!(raw_activities_payload: [
+      build_cash_activity(
+        id: "div_001",
+        type: "DIVIDEND",
+        amount: 25.50,
+        date: Date.current.to_s,
+        symbol: "IE00BFPM9V94"
+      )
+    ])
+
+    processor = IndexaCapitalAccount::ActivitiesProcessor.new(@indexa_capital_account)
+    processor.process
+
+    entry = @account.entries.find_by(external_id: "div_001", source: "indexa_capital")
+    assert_not_nil entry
+    assert_equal(-25.50, entry.amount.to_f)
+    assert_equal "Dividend", entry.entryable.investment_activity_label
+  end
+
+  test "processes withdrawal with positive outflow amount" do
+    @indexa_capital_account.update!(raw_activities_payload: [
+      build_cash_activity(
+        id: "withdraw_001",
+        type: "WITHDRAWAL",
+        amount: 200.00,
+        date: Date.current.to_s
+      )
+    ])
+
+    processor = IndexaCapitalAccount::ActivitiesProcessor.new(@indexa_capital_account)
+    processor.process
+
+    entry = @account.entries.find_by(external_id: "withdraw_001", source: "indexa_capital")
+    assert_not_nil entry
+    assert_equal 200.00, entry.amount.to_f
+    assert_equal "Withdrawal", entry.entryable.investment_activity_label
+  end
+
+  test "processes transfers with Sure sign convention" do
+    @indexa_capital_account.update!(raw_activities_payload: [
+      build_cash_activity(
+        id: "transfer_in_001",
+        type: "TRANSFER_IN",
+        amount: 300.00,
+        date: Date.current.to_s
+      ),
+      build_cash_activity(
+        id: "transfer_out_001",
+        type: "TRANSFER_OUT",
+        amount: 125.00,
+        date: Date.current.to_s
+      )
+    ])
+
+    processor = IndexaCapitalAccount::ActivitiesProcessor.new(@indexa_capital_account)
+    processor.process
+
+    transfer_in = @account.entries.find_by(external_id: "transfer_in_001", source: "indexa_capital")
+    transfer_out = @account.entries.find_by(external_id: "transfer_out_001", source: "indexa_capital")
+
+    assert_not_nil transfer_in
+    assert_not_nil transfer_out
+    assert_equal(-300.00, transfer_in.amount.to_f)
+    assert_equal 125.00, transfer_out.amount.to_f
+    assert_equal "Transfer", transfer_in.entryable.investment_activity_label
+    assert_equal "Transfer", transfer_out.entryable.investment_activity_label
+  end
+
+  test "processes fee with positive outflow amount" do
+    @indexa_capital_account.update!(raw_activities_payload: [
+      build_cash_activity(
+        id: "fee_001",
+        type: "FEE",
+        amount: 15.00,
+        date: Date.current.to_s
+      )
+    ])
+
+    processor = IndexaCapitalAccount::ActivitiesProcessor.new(@indexa_capital_account)
+    processor.process
+
+    entry = @account.entries.find_by(external_id: "fee_001", source: "indexa_capital")
+    assert_not_nil entry
+    assert_equal 15.00, entry.amount.to_f
+    assert_equal "Fee", entry.entryable.investment_activity_label
+  end
+
+  test "maps all known activity types correctly" do
+    type_mappings = {
+      "BUY" => "Buy",
+      "SELL" => "Sell",
+      "DIVIDEND" => "Dividend",
+      "DIV" => "Dividend",
+      "CONTRIBUTION" => "Contribution",
+      "WITHDRAWAL" => "Withdrawal",
+      "TRANSFER_IN" => "Transfer",
+      "TRANSFER_OUT" => "Transfer",
+      "TRANSFER" => "Transfer",
+      "INTEREST" => "Interest",
+      "FEE" => "Fee",
+      "TAX" => "Fee",
+      "REINVEST" => "Reinvestment",
+      "SPLIT" => "Other",
+      "MERGER" => "Other",
+      "OTHER" => "Other"
+    }
+
+    type_mappings.each do |indexa_type, expected_label|
+      actual = IndexaCapitalAccount::ActivitiesProcessor::ACTIVITY_TYPE_TO_LABEL[indexa_type]
+      assert_equal expected_label, actual, "Type #{indexa_type} should map to #{expected_label}"
+    end
+  end
+
+  test "handles empty payload gracefully" do
+    @indexa_capital_account.update!(raw_activities_payload: nil)
+
+    processor = IndexaCapitalAccount::ActivitiesProcessor.new(@indexa_capital_account)
+    result = processor.process
+
+    assert_equal({ trades: 0, transactions: 0 }, result)
+  end
+
+  private
+
+    def build_cash_activity(id:, type:, amount:, date:, symbol: nil)
+      activity = {
+        "id" => id,
+        "type" => type,
+        "amount" => amount,
+        "date" => date
+      }
+      activity["symbol"] = symbol if symbol
+      activity
+    end
+end
diff --git a/test/models/insight/body_writer_test.rb b/test/models/insight/body_writer_test.rb
new file mode 100644
index 000000000..20c6390ff
--- /dev/null
+++ b/test/models/insight/body_writer_test.rb
@@ -0,0 +1,98 @@
+require "test_helper"
+require "ostruct"
+
+class Insight::BodyWriterTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+  end
+
+  test "writes the template body when nobody in the family has AI enabled" do
+    @family.users.update_all(ai_enabled: false)
+    Provider::Registry.expects(:preferred_llm_provider).never
+
+    body = Insight::BodyWriter.new(@family).write(generated_insight)
+
+    assert_equal I18n.t("insights.templates.idle_cash", **generated_insight.facts.symbolize_keys), body
+  end
+
+  test "uses LLM prose when a user has opted in and a provider is configured" do
+    Provider::Registry.stubs(:preferred_llm_provider).returns(FakeLlmProvider.new("Narrated body."))
+
+    body = Insight::BodyWriter.new(@family).write(generated_insight)
+
+    assert_equal "Narrated body.", body
+  end
+
+  test "falls back to the template and captures a debug log when the LLM call fails" do
+    provider = FakeLlmProvider.new("unused")
+    provider.stubs(:chat_response).raises(StandardError.new("boom"))
+    Provider::Registry.stubs(:preferred_llm_provider).returns(provider)
+
+    body = nil
+    assert_difference "DebugLogEntry.count", 1 do
+      body = Insight::BodyWriter.new(@family).write(generated_insight)
+    end
+
+    assert_equal I18n.t("insights.templates.idle_cash", **generated_insight.facts.symbolize_keys), body
+  end
+
+  test "every template key interpolates with its generator's facts" do
+    TEMPLATE_FACTS.each do |template_key, facts|
+      body = I18n.t!("insights.templates.#{template_key}", **facts)
+
+      assert body.present?, "insights.templates.#{template_key} produced a blank body"
+    end
+  end
+
+  private
+    # One representative facts hash per template a generator can emit. Keeps
+    # the i18n templates honest: a renamed key or interpolation raises here
+    # instead of shipping "translation missing" as a stored body in production.
+    TEMPLATE_FACTS = {
+      "spending_anomaly.above" => { category: "Food & Drink", deviation_pct: 38, projected_spend: "$612.00", baseline_spend: "$443.00" },
+      "spending_anomaly.below" => { category: "Food & Drink", deviation_pct: 30, projected_spend: "$310.00", baseline_spend: "$443.00" },
+      "cash_flow_warning.low" => { projected_low: "$320.00", projected_low_date: "Jul 28, 2026", current_balance: "$1,200.00", horizon_days: 30 },
+      "cash_flow_warning.negative" => { projected_low: "-$412.00", projected_low_date: "Jul 28, 2026", current_balance: "$800.00", horizon_days: 30 },
+      "net_worth_milestone" => { milestone: "$500,000", net_worth: "$878,578.56" },
+      "subscription_audit" => { name: "Netflix", amount: "$15.49", days_overdue: 48, expected_on: "May 24, 2026" },
+      "savings_rate_change.up" => { month: "June", current_rate: 32.5, previous_rate: 20.1, change_pp: 12.4 },
+      "savings_rate_change.down" => { month: "June", current_rate: "12.1", previous_rate: "45.2", change_pp: 33.1 },
+      "savings_rate_change.down_negative" => { month: "June", current_rate: "−5.4", previous_rate: "45.2", change_pp: 50.6 },
+      "idle_cash" => { account: "Emergency fund", balance: "$28,400.00", idle_days: 60 },
+      "budget_at_risk.over" => { categories: "Food & Drink and Travel", count: 2, budget_spent_pct: 84 },
+      "budget_at_risk.near" => { categories: "Shopping", count: 1, budget_spent_pct: 72 },
+      "budget_on_track" => { spent: "$2,948.00", budgeted: "$5,200.00", budget_spent_pct: 57 }
+    }.freeze
+
+    class FakeLlmProvider
+      def self.effective_model
+        "fake-model"
+      end
+
+      def initialize(body)
+        @body = body
+      end
+
+      def chat_response(*, **)
+        OpenStruct.new(
+          success?: true,
+          data: OpenStruct.new(messages: [ OpenStruct.new(id: "1", output_text: @body) ])
+        )
+      end
+    end
+
+    def generated_insight
+      @generated_insight ||= Insight::Generator::GeneratedInsight.new(
+        insight_type: "idle_cash",
+        priority: "low",
+        title: "Idle cash in Emergency fund",
+        template_key: "idle_cash",
+        facts: { account: "Emergency fund", balance: "$28,400.00", idle_days: 60 },
+        metadata: { account_id: "acct", balance: 28_400.0 },
+        currency: "USD",
+        period_start: nil,
+        period_end: nil,
+        dedup_key: "idle_cash:acct:2026-07"
+      )
+    end
+end
diff --git a/test/models/insight_test.rb b/test/models/insight_test.rb
new file mode 100644
index 000000000..b7fc32d3d
--- /dev/null
+++ b/test/models/insight_test.rb
@@ -0,0 +1,90 @@
+require "test_helper"
+
+class InsightTest < ActiveSupport::TestCase
+  setup do
+    @insight = insights(:spending_anomaly_dining)
+  end
+
+  test "mark_read! transitions active insight and stamps read_at" do
+    assert @insight.active?
+
+    @insight.mark_read!
+
+    assert @insight.reload.read?
+    assert @insight.read_at.present?
+  end
+
+  test "mark_read! does not touch dismissed insights" do
+    @insight.dismiss!
+
+    @insight.mark_read!
+
+    assert @insight.reload.dismissed?
+    assert_nil @insight.read_at
+  end
+
+  test "dismiss! removes insight from visible scope" do
+    assert_includes Insight.visible, @insight
+
+    @insight.dismiss!
+
+    assert_not_includes Insight.visible, @insight
+    assert @insight.dismissed_at.present?
+  end
+
+  test "undismiss! restores a dismissed insight as read, not new" do
+    @insight.dismiss!
+
+    @insight.undismiss!
+
+    assert @insight.reload.read?
+    assert_nil @insight.dismissed_at
+    assert @insight.read_at.present?
+    assert_includes Insight.visible, @insight
+  end
+
+  test "duplicate dedup_key within a family is rejected" do
+    assert_raises ActiveRecord::RecordInvalid do
+      @insight.family.insights.create!(
+        insight_type: @insight.insight_type,
+        priority: "medium",
+        title: "Duplicate",
+        body: "Duplicate body",
+        dedup_key: @insight.dedup_key
+      )
+    end
+  end
+
+  test "same dedup_key is allowed across families" do
+    other_family = families(:empty)
+
+    assert_nothing_raised do
+      other_family.insights.create!(
+        insight_type: @insight.insight_type,
+        priority: "medium",
+        title: "Same key, other family",
+        body: "Body",
+        dedup_key: @insight.dedup_key
+      )
+    end
+  end
+
+  test "ordered puts high priority first, then most recent" do
+    high = insights(:cash_flow_warning)
+
+    assert_equal high, Insight.ordered.first
+  end
+
+  test "insight_type must be a known type" do
+    insight = Insight.new(
+      family: families(:empty),
+      insight_type: "bogus",
+      title: "t",
+      body: "b",
+      dedup_key: "bogus:key"
+    )
+
+    assert_not insight.valid?
+    assert insight.errors[:insight_type].any?
+  end
+end
diff --git a/test/models/investment_flow_statement_test.rb b/test/models/investment_flow_statement_test.rb
new file mode 100644
index 000000000..2e0b5fbe6
--- /dev/null
+++ b/test/models/investment_flow_statement_test.rb
@@ -0,0 +1,73 @@
+require "test_helper"
+
+class InvestmentFlowStatementTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @user = users(:empty)
+    @account = @family.accounts.create!(
+      owner: @user,
+      name: "Investment Cash",
+      balance: 0,
+      currency: "USD",
+      accountable: Depository.new
+    )
+  end
+
+  test "period totals aggregate contributions and withdrawals in one query" do
+    period = Period.custom(start_date: Date.current.beginning_of_month, end_date: Date.current.end_of_month)
+
+    @account.share_with!(users(:new_email), permission: "read_only", include_in_finances: true)
+    @account.share_with!(users(:intro_user), permission: "read_only", include_in_finances: true)
+
+    create_flow(label: "Contribution", amount: -125, date: period.start_date)
+    create_flow(label: "Contribution", amount: 25, date: period.start_date + 1.day)
+    create_flow(label: "Withdrawal", amount: 45, date: period.start_date + 1.day)
+    create_flow(label: "Withdrawal", amount: -5, date: period.start_date + 2.days)
+    create_flow(label: "Transfer", amount: 70, date: period.start_date + 2.days)
+    create_flow(label: "Contribution", amount: -999, date: period.start_date - 1.day)
+
+    statement = InvestmentFlowStatement.new(@family, user: @user)
+    totals = nil
+    queries = capture_sql_queries { totals = statement.period_totals(period: period) }
+
+    assert_equal Money.new(100, "USD"), totals.contributions
+    assert_equal Money.new(40, "USD"), totals.withdrawals
+    assert_equal Money.new(60, "USD"), totals.net_flow
+
+    aggregate_queries = queries.grep(/SUM\(CASE WHEN transactions\.investment_activity_label = 'Contribution'/)
+    assert_equal 1, aggregate_queries.size
+    assert_includes aggregate_queries.first, "transactions.investment_activity_label = 'Withdrawal'"
+    assert_empty queries.grep(/"transactions"\."investment_activity_label" = \$\d/)
+    assert_includes aggregate_queries.first, '"entries"."account_id" IN (SELECT DISTINCT "accounts"."id"'
+  end
+
+  private
+    def create_flow(label:, amount:, date:)
+      @account.entries.create!(
+        name: label,
+        amount: amount,
+        date: date,
+        currency: "USD",
+        entryable: Transaction.new(
+          kind: "standard",
+          investment_activity_label: label
+        )
+      )
+    end
+
+    def capture_sql_queries
+      queries = []
+      callback = lambda do |_name, _started, _finished, _unique_id, payload|
+        next if payload[:cached]
+        next if %w[SCHEMA TRANSACTION].include?(payload[:name])
+
+        queries << payload[:sql].squish
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        yield
+      end
+
+      queries
+    end
+end
diff --git a/test/models/investment_statement_test.rb b/test/models/investment_statement_test.rb
index 064553969..18d4ef51f 100644
--- a/test/models/investment_statement_test.rb
+++ b/test/models/investment_statement_test.rb
@@ -222,6 +222,52 @@ class InvestmentStatementTest < ActiveSupport::TestCase
     assert_in_delta 5.0, trend.percent, 0.1
   end
 
+  test "totals skips cache when there are no investment accounts" do
+    Rails.cache.expects(:fetch).never
+
+    totals = @statement.totals(period: Period.current_month)
+
+    assert_equal Money.new(0, "USD"), totals.contributions
+    assert_equal Money.new(0, "USD"), totals.withdrawals
+    assert_equal Money.new(0, "USD"), totals.dividends
+    assert_equal Money.new(0, "USD"), totals.interest
+    assert_equal 0, totals.trades_count
+  end
+
+  test "totals aggregate directly from trade entries" do
+    # Use the full current month: a month-to-date period collapses to a single
+    # day on the 1st, which would drop the start_date + 1.day trade below.
+    period = Period.custom(start_date: Date.current.beginning_of_month, end_date: Date.current.end_of_month)
+    shared_user = users(:new_email)
+    investment_account = create_investment_account(balance: 500)
+    hidden_account = create_investment_account(balance: 500)
+    investment_account.share_with!(shared_user, permission: "read_only", include_in_finances: true)
+
+    create_trade(account: investment_account, qty: 2, amount: 120, date: period.start_date)
+    create_trade(account: investment_account, qty: -1, amount: -40, date: period.start_date + 1.day)
+    create_trade(account: investment_account, qty: 1, amount: 999, date: period.start_date - 1.day)
+    create_trade(account: hidden_account, qty: 1, amount: 9999, date: period.start_date)
+
+    statement = InvestmentStatement.new(@family, user: shared_user)
+    totals = nil
+    queries = capture_sql_queries { totals = statement.totals(period: period) }
+
+    assert_equal Money.new(120, "USD"), totals.contributions
+    assert_equal Money.new(40, "USD"), totals.withdrawals
+    assert_equal 2, totals.trades_count
+
+    aggregate_queries = queries.grep(/SUM\(CASE WHEN trades\.qty > 0/)
+    assert_equal 1, aggregate_queries.size
+    assert_includes aggregate_queries.first, "FROM entries JOIN trades"
+    assert_includes aggregate_queries.first, "entries.entryable_type = 'Trade'"
+    assert_includes aggregate_queries.first, "entries.account_id IN"
+    assert_includes aggregate_queries.first, "entries.excluded = false"
+    assert_no_match(/FROM \(SELECT "trades"\.\*/, aggregate_queries.first)
+    # account_ids is pre-scoped to the family's visible accounts, so the
+    # aggregate trusts that input and no longer joins back to accounts.
+    assert_no_match(/JOIN accounts/, aggregate_queries.first)
+  end
+
   private
     def create_investment_account(balance:, cash_balance: 0, currency: "USD")
       @family.accounts.create!(
@@ -232,4 +278,19 @@ class InvestmentStatementTest < ActiveSupport::TestCase
         accountable: Investment.new
       )
     end
+
+    def create_trade(account:, qty:, amount:, date:)
+      account.entries.create!(
+        name: "Trade #{SecureRandom.hex(3)}",
+        amount: amount,
+        date: date,
+        currency: account.currency,
+        entryable: Trade.new(
+          security: Security.create!(ticker: "T#{SecureRandom.hex(8)}", name: "Test Security"),
+          qty: qty,
+          price: amount.to_d.abs / qty.to_d.abs,
+          currency: account.currency
+        )
+      )
+    end
 end
diff --git a/test/models/invitation_test.rb b/test/models/invitation_test.rb
index f54e63d4d..2217bf04f 100644
--- a/test/models/invitation_test.rb
+++ b/test/models/invitation_test.rb
@@ -110,6 +110,32 @@ class InvitationTest < ActiveSupport::TestCase
     assert invitation.valid?
   end
 
+  test "re-inviting an email with an expired unaccepted invitation replaces it without raising" do
+    email = "expired-reinvite@example.com"
+
+    expired = @family.invitations.create!(email: email, role: "member", inviter: @inviter)
+    expired.update_column(:expires_at, 1.day.ago)
+
+    invitation = nil
+    assert_nothing_raised do
+      invitation = @family.invitations.create!(email: email, role: "admin", inviter: @inviter)
+    end
+
+    assert invitation.pending?
+    assert_not Invitation.exists?(expired.id), "stale expired invitation should be removed"
+    assert_equal 1, @family.invitations.where(email: email).count
+  end
+
+  test "re-invite does not remove a still-pending duplicate (validation blocks first)" do
+    email = "still-pending@example.com"
+    pending = @family.invitations.create!(email: email, role: "member", inviter: @inviter)
+
+    duplicate = @family.invitations.build(email: email, role: "admin", inviter: @inviter)
+    assert_not duplicate.valid?
+
+    assert Invitation.exists?(pending.id), "an unexpired pending invitation must be preserved"
+  end
+
   test "can create invitation in same family (uniqueness scoped to family)" do
     email = "same-family-test@example.com"
 
@@ -203,4 +229,47 @@ class InvitationTest < ActiveSupport::TestCase
     assert_not user.show_ai_sidebar?
     assert user.ai_enabled?
   end
+
+  test "accept_for auto-shares existing family accounts when family shares by default" do
+    @family.update!(default_account_sharing: "shared")
+    user = users(:empty)
+    user.update_columns(family_id: families(:empty).id, role: "admin")
+    invitation = @family.invitations.create!(email: user.email, role: "member", inviter: @inviter)
+
+    expected_ids = @family.accounts.where.not(owner_id: user.id).pluck(:id).sort
+    assert expected_ids.any?
+
+    assert invitation.accept_for(user)
+
+    assert_equal expected_ids, AccountShare.where(user: user).pluck(:account_id).sort
+  end
+
+  test "accept_for auto-shares read_only for guest invitations" do
+    @family.update!(default_account_sharing: "shared")
+    user = users(:empty)
+    user.update_columns(family_id: families(:empty).id, role: "admin")
+    invitation = @family.invitations.create!(email: user.email, role: "guest", inviter: @inviter)
+
+    expected_ids = @family.accounts.where.not(owner_id: user.id).pluck(:id).sort
+    assert expected_ids.any?
+
+    assert invitation.accept_for(user)
+
+    user.reload
+    shares = AccountShare.where(user: user)
+    assert_equal "guest", user.role
+    assert_equal expected_ids, shares.pluck(:account_id).sort
+    assert shares.all?(&:read_only?), "guest invitation shares must grant read_only"
+  end
+
+  test "accept_for does not auto-share when family sharing is private" do
+    @family.update!(default_account_sharing: "private")
+    user = users(:empty)
+    user.update_columns(family_id: families(:empty).id, role: "admin")
+    invitation = @family.invitations.create!(email: user.email, role: "member", inviter: @inviter)
+
+    assert_no_difference "AccountShare.count" do
+      assert invitation.accept_for(user)
+    end
+  end
 end
diff --git a/test/models/kraken_account/ledger_processor_test.rb b/test/models/kraken_account/ledger_processor_test.rb
new file mode 100644
index 000000000..6268f0d4b
--- /dev/null
+++ b/test/models/kraken_account/ledger_processor_test.rb
@@ -0,0 +1,315 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class KrakenAccount::LedgerProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family  = families(:dylan_family)
+    @account = @family.accounts.create!(
+      name: "Kraken", balance: 0, currency: "USD",
+      accountable: Crypto.new
+    )
+    @item = KrakenItem.create!(
+      family: @family, name: "Kraken", api_key: "k", api_secret: "s"
+    )
+    @kraken_account = @item.kraken_accounts.create!(
+      name: "Kraken", account_id: "combined", account_type: "combined", currency: "USD",
+      current_balance: 0,
+      raw_payload: {
+        "asset_metadata" => { "XXBT" => { "altname" => "BTC" }, "ZUSD" => { "altname" => "USD" }, "ZEUR" => { "altname" => "EUR" } },
+        "assets" => [ { "symbol" => "BTC", "price_usd" => "50000.00" } ]
+      },
+      raw_transactions_payload: { "trades" => {}, "ledgers" => {} }
+    )
+    @kraken_account.ensure_account_provider!(@account)
+  end
+
+  # ---------------------------------------------------------------------------
+  # sign convention: Sure uses negative = inflow, positive = outflow
+  # ---------------------------------------------------------------------------
+
+  test "creates a deposit entry with negative amount (inflow)" do
+    set_ledgers(
+      "LABC01" => ledger_entry(type: "deposit", asset: "ZUSD", amount: "1000.00", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LABC01", source: "kraken")
+    assert entry, "deposit entry must exist"
+    assert entry.amount.negative?, "deposit is an inflow — must be negative in Sure's convention"
+    assert_in_delta(-1000.0, entry.amount.to_f, 0.01)
+    assert_equal "USD", entry.currency
+    assert_match(/Deposit.*USD/, entry.name)
+
+    txn = entry.entryable
+    assert_equal "funds_movement", txn.kind
+    assert_equal "Contribution",   txn.investment_activity_label
+    assert_equal "LABC01",         txn.extra.dig("kraken", "ledger_id")
+    assert_equal "deposit",        txn.extra.dig("kraken", "type")
+  end
+
+  test "creates a withdrawal entry with positive amount (outflow)" do
+    set_ledgers(
+      "LWIT01" => ledger_entry(type: "withdrawal", asset: "ZUSD", amount: "-500.00", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LWIT01", source: "kraken")
+    assert entry
+    assert entry.amount.positive?, "withdrawal is an outflow — must be positive in Sure's convention"
+    assert_in_delta 500.0, entry.amount.to_f, 0.01
+    assert_match(/Withdrawal.*USD/, entry.name)
+    assert_equal "Withdrawal",    entry.entryable.investment_activity_label
+    assert_equal "funds_movement", entry.entryable.kind
+  end
+
+  # ---------------------------------------------------------------------------
+  # fee inclusion in amount
+  # ---------------------------------------------------------------------------
+
+  test "includes the Kraken fee in the total withdrawal amount" do
+    # Kraken: balance_change = amount - fee = -500 - 1 = -501 total outflow
+    set_ledgers(
+      "LWIT02" => ledger_entry(type: "withdrawal", asset: "ZUSD", amount: "-500.00", fee: "1.00", time: 1_700_000_000)
+    )
+
+    process
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LWIT02", source: "kraken")
+    assert entry
+    assert_in_delta 501.0, entry.amount.to_f, 0.01
+  end
+
+  # ---------------------------------------------------------------------------
+  # BTC deposit (crypto → family currency conversion)
+  # ---------------------------------------------------------------------------
+
+  test "creates a deposit entry for BTC using stored price" do
+    set_ledgers(
+      "LBTC01" => ledger_entry(type: "deposit", asset: "XXBT", amount: "0.10000000", fee: "0.00000000", time: 1_700_000_000)
+    )
+
+    process
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LBTC01", source: "kraken")
+    assert entry
+    assert entry.amount.negative?, "BTC deposit is an inflow — must be negative"
+    # 0.1 BTC × $50,000/BTC = $5,000 (family currency = USD, no conversion needed)
+    assert_in_delta(-5000.0, entry.amount.to_f, 1.0)
+    assert_match(/Deposit.*BTC/, entry.name)
+  end
+
+  # ---------------------------------------------------------------------------
+  # staking
+  # ---------------------------------------------------------------------------
+
+  test "creates a staking reward entry (negative = inflow)" do
+    set_ledgers(
+      "LSTK01" => ledger_entry(type: "staking", asset: "XXBT", amount: "0.00050000", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LSTK01", source: "kraken")
+    assert entry
+    assert entry.amount.negative?, "staking reward is an inflow — must be negative"
+    assert_match(/Staking reward.*BTC/, entry.name)
+    assert_equal "Dividend", entry.entryable.investment_activity_label
+    assert_equal "standard",  entry.entryable.kind
+  end
+
+  # ---------------------------------------------------------------------------
+  # earn
+  # ---------------------------------------------------------------------------
+
+  test "creates an earn reward entry for rewards subtype" do
+    set_ledgers(
+      "LERN01" => ledger_entry(type: "earn", subtype: "rewardallocation", asset: "ZUSD", amount: "5.00", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LERN01", source: "kraken")
+    assert entry
+    assert entry.amount.negative?, "earn reward is an inflow — must be negative"
+    assert_equal "Interest", entry.entryable.investment_activity_label
+  end
+
+  test "skips earn allocation entries (internal fund movement, not income)" do
+    set_ledgers(
+      "LALLOC" => ledger_entry(type: "earn", subtype: "allocation", asset: "ZUSD", amount: "500.00", fee: "0.00", time: 1_700_000_000),
+      "LDEALLOC" => ledger_entry(type: "earn", subtype: "deallocation", asset: "ZUSD", amount: "-500.00", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_no_difference "@account.entries.count" do
+      process
+    end
+  end
+
+  # ---------------------------------------------------------------------------
+  # standalone fee
+  # ---------------------------------------------------------------------------
+
+  test "creates a fee entry with positive amount (outflow)" do
+    set_ledgers(
+      "LFEE01" => ledger_entry(type: "fee", asset: "ZUSD", amount: "-7.50", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LFEE01", source: "kraken")
+    assert entry
+    assert entry.amount.positive?, "fee is an outflow — must be positive"
+    assert_in_delta 7.5, entry.amount.to_f, 0.01
+    assert_equal "Fee", entry.entryable.investment_activity_label
+  end
+
+  # ---------------------------------------------------------------------------
+  # skipped types
+  # ---------------------------------------------------------------------------
+
+  test "skips trade-type ledger entries (handled by TradesHistory)" do
+    set_ledgers(
+      "LTRD01" => ledger_entry(type: "trade", asset: "XXBT", amount: "-0.1", fee: "0.0", time: 1_700_000_000)
+    )
+
+    assert_no_difference "@account.entries.count" do
+      process
+    end
+  end
+
+  test "skips transfer-type ledger entries" do
+    set_ledgers(
+      "LTRN01" => ledger_entry(type: "transfer", asset: "XXBT", amount: "0.1", fee: "0.0", time: 1_700_000_000)
+    )
+
+    assert_no_difference "@account.entries.count" do
+      process
+    end
+  end
+
+  # ---------------------------------------------------------------------------
+  # idempotency
+  # ---------------------------------------------------------------------------
+
+  test "does not duplicate entries on repeated processing" do
+    set_ledgers(
+      "LIDEM01" => ledger_entry(type: "deposit", asset: "ZUSD", amount: "100.00", fee: "0.00", time: 1_700_000_000)
+    )
+
+    # First pass must actually create the entry...
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    # ...and a second pass must be a no-op.
+    assert_no_difference "@account.entries.count" do
+      process
+    end
+  end
+
+  test "idempotency check does not scale entries queries with ledger count" do
+    set_ledgers(
+      "LQ1" => ledger_entry(type: "deposit", asset: "ZUSD", amount: "10.00", fee: "0.00", time: 1_700_000_000),
+      "LQ2" => ledger_entry(type: "deposit", asset: "ZUSD", amount: "20.00", fee: "0.00", time: 1_700_000_100),
+      "LQ3" => ledger_entry(type: "deposit", asset: "ZUSD", amount: "30.00", fee: "0.00", time: 1_700_000_200)
+    )
+
+    process # first pass creates the 3 entries
+    assert_equal 3, @account.entries.count
+
+    # On a second pass every entry is already present, so all are skipped. The
+    # existence check must be a single bulk pluck regardless of ledger count —
+    # the previous per-entry `exists?` would issue one query per entry instead.
+    queries = capture_sql_queries { process }
+    entries_selects = queries.count { |q| q.match?(/from "entries"/i) }
+    assert_equal 1, entries_selects,
+      "second pass should issue exactly one bulk external_id pluck, not one per entry"
+  end
+
+  # ---------------------------------------------------------------------------
+  # non-USD family currency
+  # ---------------------------------------------------------------------------
+
+  test "converts USD deposit to non-USD family currency" do
+    @family.update!(currency: "EUR")
+    ExchangeRate.create!(from_currency: "USD", to_currency: "EUR", date: Date.current, rate: 0.92)
+
+    set_ledgers(
+      "LEUR01" => ledger_entry(type: "deposit", asset: "ZUSD", amount: "1000.00", fee: "0.00", time: Time.current.to_i)
+    )
+
+    process
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LEUR01", source: "kraken")
+    assert entry
+    assert_equal "EUR", entry.currency
+    assert entry.amount.negative?, "deposit is inflow — negative"
+    assert_in_delta(-920.0, entry.amount.to_f, 1.0)
+  end
+
+  # ---------------------------------------------------------------------------
+  # missing crypto price
+  # ---------------------------------------------------------------------------
+
+  test "records zero amount and price_missing flag when no price data available" do
+    set_raw_payload_assets([])
+
+    set_ledgers(
+      "LNOPRICE" => ledger_entry(type: "deposit", asset: "XXBT", amount: "0.5", fee: "0.00", time: 1_700_000_000)
+    )
+
+    assert_difference "@account.entries.count", 1 do
+      process
+    end
+
+    entry = @account.entries.find_by(external_id: "kraken_ledger_LNOPRICE", source: "kraken")
+    assert entry
+    assert_equal 0, entry.amount.to_f
+    assert entry.entryable.extra.dig("kraken", "price_missing")
+  end
+
+  private
+
+    def process
+      KrakenAccount::LedgerProcessor.new(@kraken_account).process
+    end
+
+    def set_ledgers(ledgers)
+      @kraken_account.update!(
+        raw_transactions_payload: @kraken_account.raw_transactions_payload.merge("ledgers" => ledgers)
+      )
+    end
+
+    def set_raw_payload_assets(assets)
+      @kraken_account.update!(
+        raw_payload: @kraken_account.raw_payload.merge("assets" => assets)
+      )
+    end
+
+    def ledger_entry(type:, asset:, amount:, fee:, time:, subtype: "")
+      {
+        "refid"   => "S#{SecureRandom.hex(4).upcase}",
+        "time"    => time,
+        "type"    => type,
+        "subtype" => subtype,
+        "aclass"  => "currency",
+        "asset"   => asset,
+        "amount"  => amount,
+        "fee"     => fee,
+        "balance" => "1.00000000"
+      }
+    end
+end
diff --git a/test/models/kraken_item/importer_test.rb b/test/models/kraken_item/importer_test.rb
index 2da355bb9..880fbb13d 100644
--- a/test/models/kraken_item/importer_test.rb
+++ b/test/models/kraken_item/importer_test.rb
@@ -15,6 +15,7 @@ class KrakenItem::ImporterTest < ActiveSupport::TestCase
     @provider.stubs(:get_api_key_info).returns({ "name" => "Sure read-only" })
     @provider.stubs(:get_asset_pairs).returns(pair_metadata)
     @provider.stubs(:get_trades_history).returns({ "count" => 0, "trades" => {} })
+    @provider.stubs(:get_ledgers).returns({ "ledger" => {}, "count" => 0 })
     @provider.stubs(:get_ticker).returns(nil)
   end
 
diff --git a/test/models/llm_usage_test.rb b/test/models/llm_usage_test.rb
index 13a3af9ce..cb6a7d334 100644
--- a/test/models/llm_usage_test.rb
+++ b/test/models/llm_usage_test.rb
@@ -28,6 +28,47 @@ class LlmUsageTest < ActiveSupport::TestCase
     )
   end
 
+
+  test "calculate_cost uses current OpenAI pricing" do
+    gpt_54 = LlmUsage.calculate_cost(model: "gpt-5.4", prompt_tokens: 1_000_000, completion_tokens: 100_000)
+    assert_in_delta 4.0, gpt_54, 0.0001
+
+    nano = LlmUsage.calculate_cost(model: "gpt-4.1-nano", prompt_tokens: 1_000_000, completion_tokens: 1_000_000)
+    assert_in_delta 0.5, nano, 0.0001
+  end
+
+  test "calculate_cost prices snapshot model IDs with the most specific OpenAI prefix" do
+    mini = LlmUsage.calculate_cost(
+      model: "gpt-5.4-mini-2026-03-17",
+      prompt_tokens: 1_000_000,
+      completion_tokens: 100_000
+    )
+    assert_in_delta 1.2, mini, 0.0001
+
+    pro = LlmUsage.calculate_cost(
+      model: "gpt-5.4-pro-2026-03-17",
+      prompt_tokens: 100_000,
+      completion_tokens: 10_000
+    )
+    assert_in_delta 4.8, pro, 0.0001
+  end
+
+  test "calculate_cost uses reviewed OpenAI pricing for GPT-5.2 aliases and pro" do
+    chat_latest = LlmUsage.calculate_cost(
+      model: "gpt-5.2-chat-latest",
+      prompt_tokens: 1_000_000,
+      completion_tokens: 100_000
+    )
+    assert_in_delta 3.15, chat_latest, 0.0001
+
+    pro = LlmUsage.calculate_cost(
+      model: "gpt-5.2-pro",
+      prompt_tokens: 1_000_000,
+      completion_tokens: 100_000
+    )
+    assert_in_delta 37.8, pro, 0.0001
+  end
+
   test "calculate_cost returns Anthropic pricing for Claude models" do
     cost = LlmUsage.calculate_cost(model: "claude-sonnet-4-6", prompt_tokens: 1_000_000, completion_tokens: 100_000)
 
diff --git a/test/models/lunchflow_account_processor_test.rb b/test/models/lunchflow_account_processor_test.rb
new file mode 100644
index 000000000..b156c857b
--- /dev/null
+++ b/test/models/lunchflow_account_processor_test.rb
@@ -0,0 +1,78 @@
+require "test_helper"
+
+class LunchflowAccountProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item = LunchflowItem.new(family: @family, name: "Lunch Flow", api_key: "test_key")
+    @item.save!(validate: false)
+  end
+
+  test "skips the account update when current_balance is nil (failed balance fetch)" do
+    lf_acct = @item.lunchflow_accounts.create!(
+      name: "Checking",
+      account_id: "lf_1",
+      currency: "USD",
+      current_balance: nil
+    )
+
+    acct = accounts(:depository)
+    acct.update!(balance: 500, cash_balance: 500, currency: "GBP")
+    AccountProvider.create!(account: acct, provider: lf_acct)
+
+    LunchflowAccount::Processor.new(lf_acct).send(:process_account!)
+
+    acct.reload
+    assert_equal BigDecimal("500"), acct.balance,
+      "a sync whose balance fetch failed must not zero the account"
+    assert_equal "GBP", acct.currency,
+      "a sync whose balance fetch failed must not change the account currency"
+  end
+
+  test "still updates the account when current_balance is present" do
+    lf_acct = @item.lunchflow_accounts.create!(
+      name: "Checking",
+      account_id: "lf_2",
+      currency: "GBP",
+      current_balance: BigDecimal("250")
+    )
+
+    acct = accounts(:depository)
+    acct.update!(balance: 500, cash_balance: 500, currency: "GBP")
+    AccountProvider.create!(account: acct, provider: lf_acct)
+
+    LunchflowAccount::Processor.new(lf_acct).send(:process_account!)
+
+    assert_equal BigDecimal("250"), acct.reload.balance
+  end
+
+  test "snapshot upsert preserves the existing currency when the payload omits it" do
+    lf_acct = @item.lunchflow_accounts.create!(
+      name: "Checking",
+      account_id: "lf_3",
+      currency: "GBP"
+    )
+
+    # The real accounts endpoint carries neither balance nor currency.
+    lf_acct.upsert_lunchflow_snapshot!({ id: "lf_3", name: "Checking", status: "active" })
+
+    lf_acct.reload
+    assert_equal "GBP", lf_acct.currency,
+      "an established account's currency must survive a currency-less snapshot"
+    assert_nil lf_acct.current_balance
+  end
+
+  test "snapshot upsert falls back to USD when neither payload nor record has a valid currency" do
+    lf_acct = @item.lunchflow_accounts.create!(
+      name: "Checking",
+      account_id: "lf_4",
+      currency: "GBP"
+    )
+    # Simulate a record built from bad provider data (bypasses validation)
+    lf_acct.update_column(:currency, "")
+
+    lf_acct.upsert_lunchflow_snapshot!({ id: "lf_4", name: "Checking", status: "active" })
+
+    assert_equal "USD", lf_acct.reload.currency,
+      "a blank stored currency must fall through to USD, not fail validation"
+  end
+end
diff --git a/test/models/lunchflow_entry/processor_test.rb b/test/models/lunchflow_entry/processor_test.rb
index 18cd193af..0f51c2980 100644
--- a/test/models/lunchflow_entry/processor_test.rb
+++ b/test/models/lunchflow_entry/processor_test.rb
@@ -378,4 +378,29 @@ class LunchflowEntry::ProcessorTest < ActiveSupport::TestCase
     assert result.entryable.pending?, "Should create new pending entry when merchant doesn't match"
     assert result.external_id.start_with?("lunchflow_pending_"), "Should have temporary ID"
   end
+
+  test "converts unix timestamp date using negative family timezone offset" do
+    # 2025-07-15 01:20:00 UTC == 2025-07-14 21:20:00 EDT (UTC-4 in summer)
+    # Without timezone fix this would land on July 15; with fix it lands on July 14.
+    @family.update!(timezone: "America/New_York")
+
+    transaction_data = {
+      id: "lf_tz_neg_test",
+      accountId: 456,
+      amount: -10.00,
+      currency: "USD",
+      date: 1752542400, # 2025-07-15 01:20:00 UTC == 2025-07-14 21:20:00 EDT
+      merchant: "Late Night Shop",
+      description: "After midnight"
+    }
+
+    result = LunchflowEntry::Processor.new(
+      transaction_data,
+      lunchflow_account: @lunchflow_account
+    ).process
+
+    assert_not_nil result
+    assert_equal Date.new(2025, 7, 14), result.date,
+      "Transaction at 21:20 EDT should land on July 14, not July 15"
+  end
 end
diff --git a/test/models/lunchflow_item/importer_orphan_prune_test.rb b/test/models/lunchflow_item/importer_orphan_prune_test.rb
new file mode 100644
index 000000000..909624460
--- /dev/null
+++ b/test/models/lunchflow_item/importer_orphan_prune_test.rb
@@ -0,0 +1,121 @@
+require "test_helper"
+
+class LunchflowItem::ImporterOrphanPruneTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item = LunchflowItem.create!(
+      family: @family,
+      name: "Test Lunchflow",
+      api_key: "test_key_123",
+      status: :good
+    )
+    @importer = LunchflowItem::Importer.new(@item, lunchflow_provider: mock())
+  end
+
+  test "prunes orphaned unlinked LunchflowAccount no longer returned upstream" do
+    orphan = @item.lunchflow_accounts.create!(
+      account_id: "acct-old",
+      name: "Deleted Account",
+      currency: "USD"
+    )
+
+    pruned = @importer.send(:prune_orphaned_lunchflow_accounts, [ "acct-new" ])
+
+    assert_equal 1, pruned
+    assert_nil LunchflowAccount.find_by(id: orphan.id), "orphaned unlinked account should be deleted"
+  end
+
+  test "keeps unlinked LunchflowAccount that is still returned upstream" do
+    still_present = @item.lunchflow_accounts.create!(
+      account_id: "acct-keep",
+      name: "Active Account",
+      currency: "USD"
+    )
+
+    pruned = @importer.send(:prune_orphaned_lunchflow_accounts, [ "acct-keep" ])
+
+    assert_equal 0, pruned
+    assert_not_nil LunchflowAccount.find_by(id: still_present.id)
+  end
+
+  test "does not prune a LunchflowAccount linked via AccountProvider" do
+    linked = @item.lunchflow_accounts.create!(
+      account_id: "acct-linked",
+      name: "Linked Account",
+      currency: "USD"
+    )
+    account = @family.accounts.create!(
+      name: "Linked Checking",
+      balance: 100,
+      currency: "USD",
+      accountable: Depository.new(subtype: "checking")
+    )
+    AccountProvider.create!(account: account, provider: linked)
+
+    # Even though it's gone upstream, a linked account must be kept (deleting it
+    # would cascade-destroy the AccountProvider and orphan the user's Account).
+    pruned = @importer.send(:prune_orphaned_lunchflow_accounts, [ "acct-other" ])
+
+    assert_equal 0, pruned
+    assert_not_nil LunchflowAccount.find_by(id: linked.id), "linked account should not be deleted"
+  end
+
+  test "blank upstream list is a no-op so transient failures cannot wipe accounts" do
+    orphan = @item.lunchflow_accounts.create!(
+      account_id: "acct-old",
+      name: "Account",
+      currency: "USD"
+    )
+
+    assert_equal 0, @importer.send(:prune_orphaned_lunchflow_accounts, [])
+    assert_not_nil LunchflowAccount.find_by(id: orphan.id), "must not prune when upstream list is empty"
+  end
+
+  test "prunes multiple orphaned unlinked accounts" do
+    orphan1 = @item.lunchflow_accounts.create!(account_id: "old-1", name: "One", currency: "USD")
+    orphan2 = @item.lunchflow_accounts.create!(account_id: "old-2", name: "Two", currency: "USD")
+    kept = @item.lunchflow_accounts.create!(account_id: "new-1", name: "Three", currency: "USD")
+
+    pruned = @importer.send(:prune_orphaned_lunchflow_accounts, [ "new-1" ])
+
+    assert_equal 2, pruned
+    assert_nil LunchflowAccount.find_by(id: orphan1.id)
+    assert_nil LunchflowAccount.find_by(id: orphan2.id)
+    assert_not_nil LunchflowAccount.find_by(id: kept.id)
+  end
+
+  test "prunes an unlinked LunchflowAccount with a nil account_id" do
+    # account_id is nullable; a NULL id can never match upstream and would be
+    # silently skipped by a plain `where.not(account_id: ...)` (SQL three-valued
+    # logic). Such an unlinked record is a genuine orphan and must be pruned.
+    orphan = @item.lunchflow_accounts.create!(
+      account_id: nil,
+      name: "Never received an upstream id",
+      currency: "USD"
+    )
+
+    pruned = @importer.send(:prune_orphaned_lunchflow_accounts, [ "acct-new" ])
+
+    assert_equal 1, pruned
+    assert_nil LunchflowAccount.find_by(id: orphan.id), "nil account_id orphan should be pruned"
+  end
+
+  test "import returns accounts_pruned in its result and prunes orphans end-to-end" do
+    orphan = @item.lunchflow_accounts.create!(
+      account_id: "acct-old",
+      name: "Deleted Account",
+      currency: "USD"
+    )
+
+    provider = mock()
+    provider.stubs(:get_accounts).returns(
+      accounts: [ { id: "acct-new", name: "New Account", currency: "USD" } ]
+    )
+
+    importer = LunchflowItem::Importer.new(@item, lunchflow_provider: provider)
+    result = importer.import
+
+    assert_equal 1, result[:accounts_pruned]
+    assert_nil LunchflowAccount.find_by(id: orphan.id), "orphan should be pruned through import"
+  end
+end
diff --git a/test/models/mercury_account/processor_test.rb b/test/models/mercury_account/processor_test.rb
new file mode 100644
index 000000000..e01a53e00
--- /dev/null
+++ b/test/models/mercury_account/processor_test.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MercuryAccount::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family   = families(:dylan_family)
+    @item     = MercuryItem.create!(family: @family, name: "Mercury", token: "tok")
+  end
+
+  # ---------------------------------------------------------------------------
+  # balance update
+  # ---------------------------------------------------------------------------
+
+  test "updates account balance from mercury_account current_balance" do
+    account         = create_account("Checking")
+    mercury_account = create_mercury_account("acc_001", balance: 12_345.67, account: account)
+
+    MercuryAccount::Processor.new(mercury_account).process
+
+    assert_in_delta 12_345.67, account.reload.balance, 0.01
+  end
+
+  test "negates balance for CreditCard accounts" do
+    account         = @family.accounts.create!(
+      name: "Mercury Credit", balance: 0, currency: "USD",
+      accountable: CreditCard.new
+    )
+    mercury_account = create_mercury_account("acc_credit", balance: 500.0, account: account)
+
+    MercuryAccount::Processor.new(mercury_account).process
+
+    assert_in_delta(-500.0, account.reload.balance, 0.01)
+  end
+
+  test "sets cash_balance equal to balance for depository" do
+    account         = create_account("Savings")
+    mercury_account = create_mercury_account("acc_002", balance: 3_000.0, account: account)
+
+    MercuryAccount::Processor.new(mercury_account).process
+
+    assert_in_delta 3_000.0, account.reload.cash_balance, 0.01
+  end
+
+  # ---------------------------------------------------------------------------
+  # no linked account
+  # ---------------------------------------------------------------------------
+
+  test "returns nil without error when no linked account" do
+    mercury_account = @item.mercury_accounts.create!(
+      name: "Unlinked", account_id: "acc_unlinked", currency: "USD", current_balance: 100
+    )
+
+    result = nil
+    assert_nothing_raised do
+      result = MercuryAccount::Processor.new(mercury_account).process
+    end
+    assert_nil result
+  end
+
+  # ---------------------------------------------------------------------------
+  # transaction processing delegation
+  # ---------------------------------------------------------------------------
+
+  test "processes transactions stored in raw_transactions_payload" do
+    account = create_account("Checking")
+    mercury_account = create_mercury_account("acc_003", balance: 0, account: account,
+      raw_transactions: [
+        { "id" => "tx_a", "amount" => 100.0, "status" => "sent",
+          "bankDescription" => "Deposit", "createdAt" => "2024-06-01T00:00:00Z",
+          "postedAt" => "2024-06-01T00:00:00Z" }
+      ]
+    )
+
+    assert_difference "account.entries.count", 1 do
+      MercuryAccount::Processor.new(mercury_account).process
+    end
+  end
+
+  private
+
+    def create_account(name)
+      @family.accounts.create!(
+        name: name, balance: 0, currency: "USD",
+        accountable: Depository.new(subtype: "checking")
+      )
+    end
+
+    def create_mercury_account(account_id, balance:, account:, raw_transactions: [])
+      ma = @item.mercury_accounts.create!(
+        name: account_id, account_id: account_id, currency: "USD",
+        current_balance: balance,
+        raw_transactions_payload: raw_transactions
+      )
+      AccountProvider.create!(provider: ma, account: account)
+      ma
+    end
+end
diff --git a/test/models/mercury_entry/processor_test.rb b/test/models/mercury_entry/processor_test.rb
new file mode 100644
index 000000000..11e315238
--- /dev/null
+++ b/test/models/mercury_entry/processor_test.rb
@@ -0,0 +1,215 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MercuryEntry::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family  = families(:dylan_family)
+    @account = @family.accounts.create!(
+      name: "Mercury Checking", balance: 0, currency: "USD",
+      accountable: Depository.new(subtype: "checking")
+    )
+    @item = MercuryItem.create!(
+      family: @family, name: "Mercury", token: "test_token"
+    )
+    @mercury_account = @item.mercury_accounts.create!(
+      name: "Mercury Checking", account_id: "acc_001", currency: "USD", current_balance: 0
+    )
+    AccountProvider.create!(provider: @mercury_account, account: @account)
+  end
+
+  # ---------------------------------------------------------------------------
+  # happy-path posted transaction
+  # ---------------------------------------------------------------------------
+
+  test "imports a posted transaction with correct sign conversion" do
+    assert_difference "@account.entries.count", 1 do
+      process(tx(amount: 150.00, status: "sent"))
+    end
+
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert entry
+    # Mercury positive = inflow; Sure convention negates it → negative
+    assert entry.amount.negative?
+    assert_in_delta(-150.0, entry.amount.to_f, 0.01)
+  end
+
+  test "expense (negative Mercury amount) becomes positive outflow in Sure" do
+    assert_difference "@account.entries.count", 1 do
+      process(tx(amount: -75.50, status: "sent"))
+    end
+
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert entry
+    assert entry.amount.positive?
+    assert_in_delta 75.5, entry.amount.to_f, 0.01
+  end
+
+  # ---------------------------------------------------------------------------
+  # name resolution
+  # ---------------------------------------------------------------------------
+
+  test "prefers counterpartyNickname over counterpartyName over bankDescription" do
+    process(tx(counterparty_nickname: "Nick", counterparty_name: "Full Name", bank_description: "Bank Desc"))
+    assert_equal "Nick", @account.entries.last.name
+  end
+
+  test "falls back to counterpartyName when nickname absent" do
+    process(tx(counterparty_name: "Acme Corp"))
+    assert_equal "Acme Corp", @account.entries.last.name
+  end
+
+  test "falls back to bankDescription when no counterparty" do
+    process(tx(bank_description: "ACH Credit"))
+    assert_equal "ACH Credit", @account.entries.last.name
+  end
+
+  # ---------------------------------------------------------------------------
+  # date resolution
+  # ---------------------------------------------------------------------------
+
+  test "uses postedAt when present" do
+    process(tx(posted_at: "2024-03-15T00:00:00Z", created_at: "2024-03-10T00:00:00Z"))
+    assert_equal Date.new(2024, 3, 15), @account.entries.last.date
+  end
+
+  test "falls back to createdAt when postedAt absent" do
+    process(tx(posted_at: nil, created_at: "2024-03-10T00:00:00Z"))
+    assert_equal Date.new(2024, 3, 10), @account.entries.last.date
+  end
+
+  # ---------------------------------------------------------------------------
+  # notes
+  # ---------------------------------------------------------------------------
+
+  test "concatenates note and details with separator" do
+    process(tx(note: "Office supplies", details: "Q1 restock"))
+    assert_equal "Office supplies - Q1 restock", @account.entries.last.notes
+  end
+
+  test "note alone stored without separator" do
+    process(tx(note: "Reimbursement"))
+    assert_equal "Reimbursement", @account.entries.last.notes
+  end
+
+  # ---------------------------------------------------------------------------
+  # extra metadata: pending, kind, counterpartyId
+  # ---------------------------------------------------------------------------
+
+  test "marks pending transactions in extra" do
+    process(tx(status: "pending"))
+
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert entry
+    assert entry.entryable.extra.dig("mercury", "pending"), "pending flag must be true"
+  end
+
+  test "posted transactions have pending=false in extra" do
+    process(tx(status: "sent"))
+
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert_equal false, entry.entryable.extra.dig("mercury", "pending")
+  end
+
+  test "stores transaction kind in extra" do
+    process(tx(kind: "externalTransfer"))
+
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert_equal "externalTransfer", entry.entryable.extra.dig("mercury", "kind")
+  end
+
+  test "stores counterpartyId in extra" do
+    process(tx(counterparty_id: "cpty_abc123"))
+
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert_equal "cpty_abc123", entry.entryable.extra.dig("mercury", "counterparty_id")
+  end
+
+  test "does not store nil kind in extra" do
+    process(tx)
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert_nil entry.entryable.extra.dig("mercury", "kind")
+  end
+
+  # ---------------------------------------------------------------------------
+  # skipped statuses
+  # ---------------------------------------------------------------------------
+
+  test "skips failed transactions" do
+    assert_no_difference "@account.entries.count" do
+      result = process(tx(status: "failed"))
+      assert_nil result
+    end
+  end
+
+  # ---------------------------------------------------------------------------
+  # idempotency
+  # ---------------------------------------------------------------------------
+
+  test "does not create duplicate entries on re-process" do
+    process(tx)
+    assert_no_difference "@account.entries.count" do
+      process(tx)
+    end
+  end
+
+  # ---------------------------------------------------------------------------
+  # merchant creation
+  # ---------------------------------------------------------------------------
+
+  test "creates merchant from counterpartyName" do
+    process(tx(counterparty_name: "Stripe Inc"))
+    entry = @account.entries.find_by(external_id: "mercury_tx_001", source: "mercury")
+    assert entry.entryable.merchant.present?
+    assert_equal "Stripe Inc", entry.entryable.merchant.name
+  end
+
+  # ---------------------------------------------------------------------------
+  # missing linked account
+  # ---------------------------------------------------------------------------
+
+  test "returns nil when mercury_account has no linked account" do
+    AccountProvider.where(provider: @mercury_account).destroy_all
+
+    assert_no_difference "@account.entries.count" do
+      result = process(tx)
+      assert_nil result
+    end
+  end
+
+  private
+
+    def process(transaction_data)
+      MercuryEntry::Processor.new(transaction_data, mercury_account: @mercury_account).process
+    end
+
+    def tx(
+      id: "tx_001",
+      amount: 100.0,
+      status: "sent",
+      counterparty_name: nil,
+      counterparty_nickname: nil,
+      counterparty_id: nil,
+      bank_description: "Test Transaction",
+      kind: nil,
+      note: nil,
+      details: nil,
+      posted_at: "2024-06-01T12:00:00Z",
+      created_at: "2024-06-01T10:00:00Z"
+    )
+      {
+        "id"                  => id,
+        "amount"              => amount,
+        "status"              => status,
+        "counterpartyName"    => counterparty_name,
+        "counterpartyNickname" => counterparty_nickname,
+        "counterpartyId"      => counterparty_id,
+        "bankDescription"     => bank_description,
+        "kind"                => kind,
+        "note"                => note,
+        "details"             => details,
+        "postedAt"            => posted_at,
+        "createdAt"           => created_at
+      }
+    end
+end
diff --git a/test/models/mercury_item/importer_test.rb b/test/models/mercury_item/importer_test.rb
new file mode 100644
index 000000000..e42b9389e
--- /dev/null
+++ b/test/models/mercury_item/importer_test.rb
@@ -0,0 +1,156 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class MercuryItem::ImporterTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item   = MercuryItem.create!(family: @family, name: "Mercury", token: "tok")
+    @provider = mock
+    @provider.stubs(:get_accounts).returns({ accounts: [] })
+    @provider.stubs(:get_account_transactions).returns({ transactions: [] })
+  end
+
+  # ---------------------------------------------------------------------------
+  # account discovery
+  # ---------------------------------------------------------------------------
+
+  test "creates unlinked mercury_account records for newly discovered accounts" do
+    @provider.stubs(:get_accounts).returns({ accounts: [ account_payload("acc_001", "Business Checking") ] })
+
+    assert_difference "@item.mercury_accounts.count", 1 do
+      run_import
+    end
+
+    acct = @item.mercury_accounts.find_by(account_id: "acc_001")
+    assert acct
+    assert_equal "Business Checking", acct.name
+    assert_equal "USD", acct.currency
+  end
+
+  test "does not duplicate existing unlinked account records on re-import" do
+    @item.mercury_accounts.create!(name: "Existing", account_id: "acc_001", currency: "USD")
+    @provider.stubs(:get_accounts).returns({ accounts: [ account_payload("acc_001", "Business Checking") ] })
+
+    assert_no_difference "@item.mercury_accounts.count" do
+      run_import
+    end
+  end
+
+  test "updates current_balance on linked accounts" do
+    account, mercury_account = create_linked_account("acc_balance")
+    @provider.stubs(:get_accounts).returns({ accounts: [ account_payload("acc_balance", "Checking", balance: 5_000.0) ] })
+    @provider.stubs(:get_account_transactions).with("acc_balance", anything).returns({ transactions: [] })
+
+    run_import
+
+    assert_in_delta 5_000.0, mercury_account.reload.current_balance, 0.01
+  end
+
+  # ---------------------------------------------------------------------------
+  # transaction deduplication
+  # ---------------------------------------------------------------------------
+
+  test "appends new transactions and skips duplicate ids" do
+    _account, mercury_account = create_linked_account("acc_dedup",
+      raw_transactions: [ tx_payload("tx_old") ])
+
+    @provider.stubs(:get_accounts).returns({ accounts: [ account_payload("acc_dedup", "Checking") ] })
+    @provider.stubs(:get_account_transactions).with("acc_dedup", anything).returns({
+      transactions: [ tx_payload("tx_old"), tx_payload("tx_new") ]
+    })
+
+    run_import
+
+    ids = mercury_account.reload.raw_transactions_payload.map { |tx| tx["id"] }
+    assert_includes ids, "tx_old"
+    assert_includes ids, "tx_new"
+    assert_equal 2, ids.uniq.size
+  end
+
+  # ---------------------------------------------------------------------------
+  # sync window
+  # ---------------------------------------------------------------------------
+
+  test "uses 90-day window for account with no stored transactions" do
+    create_linked_account("acc_first")
+    @provider.stubs(:get_accounts).returns({ accounts: [ account_payload("acc_first", "Checking") ] })
+
+    captured_start = nil
+    @provider.stubs(:get_account_transactions).with do |_id, opts|
+      captured_start = opts[:start_date]
+      true
+    end.returns({ transactions: [] })
+
+    run_import
+
+    assert_not_nil captured_start
+    assert captured_start >= 91.days.ago.to_date,
+           "first-sync start date must be within 90 days"
+  end
+
+  test "uses last_synced_at minus 7 days when account has existing transactions" do
+    ten_days_ago = 10.days.ago
+    _account, mercury_account = create_linked_account("acc_resync",
+      raw_transactions: [ tx_payload("existing_tx") ])
+
+    @item.stubs(:last_synced_at).returns(ten_days_ago)
+    @provider.stubs(:get_accounts).returns({ accounts: [ account_payload("acc_resync", "Checking") ] })
+
+    captured_start = nil
+    @provider.stubs(:get_account_transactions).with do |_id, opts|
+      captured_start = opts[:start_date]
+      true
+    end.returns({ transactions: [] })
+
+    run_import
+
+    expected = (ten_days_ago - 7.days).to_date
+    assert_equal expected, captured_start.to_date
+  end
+
+  # ---------------------------------------------------------------------------
+  # auth error handling
+  # ---------------------------------------------------------------------------
+
+  test "marks item requires_update on 401 from Mercury API" do
+    @provider.stubs(:get_accounts).raises(
+      Provider::Mercury::MercuryError.new("Unauthorized", :unauthorized)
+    )
+
+    run_import
+
+    assert @item.reload.requires_update?
+  end
+
+  private
+
+    def run_import
+      MercuryItem::Importer.new(@item, mercury_provider: @provider).import
+    end
+
+    def create_linked_account(account_id, raw_transactions: [])
+      account = @family.accounts.create!(
+        name: account_id, balance: 0, currency: "USD",
+        accountable: Depository.new(subtype: "checking")
+      )
+      mercury_account = @item.mercury_accounts.create!(
+        name: account_id, account_id: account_id, currency: "USD",
+        current_balance: 0, raw_transactions_payload: raw_transactions
+      )
+      AccountProvider.create!(provider: mercury_account, account: account)
+      [ account, mercury_account ]
+    end
+
+    def account_payload(id, name, balance: 1_000.0)
+      { id: id, name: name, nickname: nil, legalBusinessName: nil,
+        currentBalance: balance, availableBalance: balance,
+        status: "active", type: "checking", kind: "checking" }
+    end
+
+    def tx_payload(id, amount: 50.0, status: "sent")
+      { "id" => id, "amount" => amount, "status" => status,
+        "bankDescription" => "Test", "createdAt" => "2024-06-01T00:00:00Z",
+        "postedAt" => "2024-06-01T00:00:00Z" }
+    end
+end
diff --git a/test/models/oidc/provider_options_builder_test.rb b/test/models/oidc/provider_options_builder_test.rb
new file mode 100644
index 000000000..1a12fb704
--- /dev/null
+++ b/test/models/oidc/provider_options_builder_test.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+module Oidc
+  class ProviderOptionsBuilderTest < ActiveSupport::TestCase
+    test "uses default scopes when custom scopes are blank" do
+      options = ProviderOptionsBuilder.call(base_config)
+
+      assert_equal %i[openid email profile], options[:scope]
+      assert_nil options[:extra_authorize_params]
+    end
+
+    test "requests groups claim when groups scope is configured" do
+      options = ProviderOptionsBuilder.call(base_config(settings: { scopes: "openid email profile groups" }))
+
+      claims = JSON.parse(options.dig(:extra_authorize_params, :claims))
+      assert_equal [ "groups" ], claims["id_token"].keys
+      assert_equal [ "groups" ], claims["userinfo"].keys
+      assert_nil claims.dig("id_token", "groups")
+      assert_nil claims.dig("userinfo", "groups")
+    end
+
+    test "requests groups claim when role mapping is configured" do
+      options = ProviderOptionsBuilder.call(base_config(settings: {
+        role_mapping: { super_admin: [ "sure-admins" ] }
+      }))
+
+      claims = JSON.parse(options.dig(:extra_authorize_params, :claims))
+      assert_equal [ "groups" ], claims["id_token"].keys
+      assert_equal [ "groups" ], claims["userinfo"].keys
+    end
+
+    test "does not request groups claim for regular OIDC login without group mapping" do
+      options = ProviderOptionsBuilder.call(base_config(settings: { scopes: "openid email profile" }))
+
+      assert_nil options[:extra_authorize_params]
+    end
+
+    test "discards blank scope tokens from surrounding whitespace" do
+      options = ProviderOptionsBuilder.call(base_config(settings: { scopes: "  openid   email profile groups  " }))
+
+      assert_equal %i[openid email profile groups], options[:scope]
+    end
+
+    test "returns nil when required configuration is missing" do
+      config = base_config.except(:client_secret)
+
+      assert_nil ProviderOptionsBuilder.call(
+        config,
+        env: {},
+        rails_env: ActiveSupport::StringInquirer.new("production")
+      )
+    end
+
+    test "includes configured prompt" do
+      options = ProviderOptionsBuilder.call(base_config(settings: { prompt: "login" }))
+
+      assert_equal "login", options[:prompt]
+    end
+
+    private
+      def base_config(overrides = {})
+        {
+          name: "openid_connect",
+          strategy: "openid_connect",
+          issuer: "https://idp.example.com",
+          client_id: "client-id",
+          client_secret: "client-secret",
+          redirect_uri: "https://sure.example.com/auth/openid_connect/callback",
+          settings: {}
+        }.deep_merge(overrides)
+      end
+  end
+end
diff --git a/test/models/oidc_identity_test.rb b/test/models/oidc_identity_test.rb
index 52a807a8f..95da294f7 100644
--- a/test/models/oidc_identity_test.rb
+++ b/test/models/oidc_identity_test.rb
@@ -92,6 +92,93 @@ class OidcIdentityTest < ActiveSupport::TestCase
     assert_equal "Jones", @user.last_name
   end
 
+  test "sync_user_attributes! applies guest role mapping from groups claim" do
+    @user.update!(role: :member)
+    AuthConfig.stubs(:sso_providers).returns([
+      {
+        name: @oidc_identity.provider,
+        settings: {
+          role_mapping: {
+            guest: [ "sure-guests" ]
+          }
+        }
+      }
+    ])
+    auth = OmniAuth::AuthHash.new(
+      provider: @oidc_identity.provider,
+      uid: @oidc_identity.uid,
+      info: { email: @user.email },
+      extra: {
+        raw_info: {
+          groups: [ "sure-guests" ]
+        }
+      }
+    )
+
+    @oidc_identity.sync_user_attributes!(auth)
+
+    assert_predicate @user.reload, :guest?
+  end
+
+  test "sync_user_attributes! prefers member over guest when both group mappings match" do
+    @user.update!(role: :guest)
+    AuthConfig.stubs(:sso_providers).returns([
+      {
+        name: @oidc_identity.provider,
+        settings: {
+          role_mapping: {
+            member: [ "sure-members" ],
+            guest: [ "sure-guests" ]
+          }
+        }
+      }
+    ])
+    auth = OmniAuth::AuthHash.new(
+      provider: @oidc_identity.provider,
+      uid: @oidc_identity.uid,
+      info: { email: @user.email },
+      extra: {
+        raw_info: {
+          groups: [ "sure-members", "sure-guests" ]
+        }
+      }
+    )
+
+    @oidc_identity.sync_user_attributes!(auth)
+
+    assert_predicate @user.reload, :member?
+  end
+
+  test "sync_user_attributes! leaves role unchanged when mapped groups claim is absent" do
+    @user.update!(role: :member)
+    AuthConfig.stubs(:sso_providers).returns([
+      {
+        name: @oidc_identity.provider,
+        settings: {
+          role_mapping: {
+            admin: [ "sure-admins" ],
+            guest: [ "sure-guests" ]
+          }
+        }
+      }
+    ])
+    auth = OmniAuth::AuthHash.new(
+      provider: @oidc_identity.provider,
+      uid: @oidc_identity.uid,
+      info: { email: @user.email },
+      extra: {
+        raw_info: {
+          name: "No Groups User"
+        }
+      }
+    )
+
+    @oidc_identity.sync_user_attributes!(auth)
+
+    assert_predicate @user.reload, :member?
+    assert_equal [], @oidc_identity.reload.info["groups"]
+  end
+
   test "creates from omniauth hash" do
     auth = OmniAuth::AuthHash.new({
       provider: "google_oauth2",
diff --git a/test/models/period_test.rb b/test/models/period_test.rb
index fa1221eb9..33e01bb02 100644
--- a/test/models/period_test.rb
+++ b/test/models/period_test.rb
@@ -63,6 +63,29 @@ class PeriodTest < ActiveSupport::TestCase
     assert_equal Date.current, period.end_date
   end
 
+  test "current_month_for preserves the current_month key for custom-month families" do
+    family = mock("family")
+    family.stubs(:uses_custom_month_start?).returns(true)
+    family.stubs(:current_custom_month_period).returns(
+      Period.custom(start_date: Date.new(2026, 6, 5), end_date: Date.new(2026, 7, 4))
+    )
+
+    period = Period.current_month_for(family)
+    assert_equal "current_month", period.key
+    assert_equal Date.new(2026, 6, 5), period.start_date
+    assert_equal Date.new(2026, 7, 4), period.end_date
+  end
+
+  test "last_month_for preserves the last_month key for custom-month families" do
+    family = mock("family")
+    family.stubs(:uses_custom_month_start?).returns(true)
+    family.stubs(:custom_month_start_for).returns(Date.new(2026, 5, 5))
+    family.stubs(:custom_month_end_for).returns(Date.new(2026, 6, 4))
+
+    period = Period.last_month_for(family)
+    assert_equal "last_month", period.key
+  end
+
   test "all_time period uses fallback when no family or entries exist" do
     Current.expects(:family).returns(nil)
 
diff --git a/test/models/plaid_account/type_mappable_test.rb b/test/models/plaid_account/type_mappable_test.rb
index b3bc67083..ffc530bc2 100644
--- a/test/models/plaid_account/type_mappable_test.rb
+++ b/test/models/plaid_account/type_mappable_test.rb
@@ -32,4 +32,18 @@ class PlaidAccount::TypeMappableTest < ActiveSupport::TestCase
     assert_equal "other", @mock_processor.map_subtype("depository", nil)
     assert_equal "other", @mock_processor.map_subtype("depository", "unknown")
   end
+
+  test "every mapped subtype is a valid subtype of its accountable" do
+    PlaidAccount::TypeMappable::TYPE_MAPPING.each do |plaid_type, config|
+      accountable_class = config[:accountable]
+      next unless accountable_class.const_defined?(:SUBTYPES)
+
+      config[:subtype_mapping].each do |plaid_subtype, subtype|
+        assert_includes accountable_class::SUBTYPES.keys, subtype,
+          "TYPE_MAPPING maps #{plaid_type}/#{plaid_subtype.inspect} to #{subtype.inspect}, " \
+          "which is not a valid #{accountable_class} subtype — syncing such an account fails " \
+          "with 'Validation failed: Accountable subtype is not included in the list'"
+      end
+    end
+  end
 end
diff --git a/test/models/plaid_entry/processor_test.rb b/test/models/plaid_entry/processor_test.rb
index 730be2e7f..2078e951c 100644
--- a/test/models/plaid_entry/processor_test.rb
+++ b/test/models/plaid_entry/processor_test.rb
@@ -89,4 +89,35 @@ class PlaidEntry::ProcessorTest < ActiveSupport::TestCase
     assert_equal "Amazon", entry.name
     assert_equal categories(:food_and_drink).id, entry.transaction.category_id
   end
+
+  test "skips category matcher when account.enable_category_matcher is false" do
+    @plaid_account.current_account.update!(enable_category_matcher: false)
+
+    plaid_transaction = {
+      "transaction_id" => "456",
+      "merchant_name" => "Amazon",
+      "amount" => 100,
+      "date" => Date.current,
+      "iso_currency_code" => "USD",
+      "personal_finance_category" => {
+        "detailed" => "Food"
+      },
+      "merchant_entity_id" => "456"
+    }
+
+    @category_matcher.expects(:match).never
+
+    processor = PlaidEntry::Processor.new(
+      plaid_transaction,
+      plaid_account: @plaid_account,
+      category_matcher: @category_matcher
+    )
+
+    assert_difference [ "Entry.count", "Transaction.count" ], 1 do
+      processor.process
+    end
+
+    entry = Entry.order(created_at: :desc).first
+    assert_nil entry.transaction.category_id
+  end
 end
diff --git a/test/models/provider/anthropic/bank_statement_extractor_test.rb b/test/models/provider/anthropic/bank_statement_extractor_test.rb
new file mode 100644
index 000000000..203246221
--- /dev/null
+++ b/test/models/provider/anthropic/bank_statement_extractor_test.rb
@@ -0,0 +1,141 @@
+require "test_helper"
+require "ostruct"
+
+class Provider::Anthropic::BankStatementExtractorTest < ActiveSupport::TestCase
+  setup do
+    @pdf_content = "%PDF-1.4 fake bytes".b
+  end
+
+  test "sends PDF as native document and returns normalized transactions + metadata" do
+    fake_response = build_response(content: [
+      tool_use_block(
+        id: "toolu_1",
+        name: "report_bank_statement",
+        input: {
+          "bank_name" => "Bank of Example",
+          "account_holder" => "Jane Doe",
+          "account_number" => "1234",
+          "statement_period" => { "start_date" => "2026-03-01", "end_date" => "2026-03-31" },
+          "opening_balance" => 1000.0,
+          "closing_balance" => 1500.0,
+          "transactions" => [
+            { "date" => "2026-03-05", "description" => "Coffee", "amount" => -4.5 },
+            { "date" => "2026-03-15", "description" => "Salary", "amount" => 3000.0, "reference" => "Payroll Mar" }
+          ]
+        }
+      )
+    ])
+    client = stub_client(fake_response)
+
+    result = Provider::Anthropic::BankStatementExtractor.new(
+      client: client,
+      model: "claude-sonnet-4-6",
+      pdf_content: @pdf_content
+    ).extract
+
+    assert_equal "Bank of Example", result[:bank_name]
+    assert_equal "Jane Doe", result[:account_holder]
+    assert_equal "1234", result[:account_number]
+    assert_equal "2026-03-01", result[:period][:start_date]
+    assert_equal "2026-03-31", result[:period][:end_date]
+    assert_equal 1000.0, result[:opening_balance]
+    assert_equal 1500.0, result[:closing_balance]
+
+    assert_equal 2, result[:transactions].size
+    txn1 = result[:transactions].first
+    assert_equal "2026-03-05", txn1[:date]
+    assert_equal "Coffee", txn1[:name]
+    assert_equal(-4.5, txn1[:amount])
+
+    txn2 = result[:transactions].last
+    assert_equal "Salary", txn2[:name]
+    assert_equal 3000.0, txn2[:amount]
+    assert_equal "Payroll Mar", txn2[:notes]
+  end
+
+  test "raises when pdf_content is blank" do
+    err = assert_raises(Provider::Anthropic::Error) do
+      Provider::Anthropic::BankStatementExtractor.new(
+        client: mock,
+        model: "claude-sonnet-4-6",
+        pdf_content: nil
+      ).extract
+    end
+    assert_match(/PDF content is required/i, err.message)
+  end
+
+  test "raises when model omits the tool call" do
+    fake_response = build_response(content: [ OpenStruct.new(type: :text, text: "no tool") ])
+    client = stub_client(fake_response)
+
+    err = assert_raises(Provider::Anthropic::Error) do
+      Provider::Anthropic::BankStatementExtractor.new(
+        client: client,
+        model: "claude-sonnet-4-6",
+        pdf_content: @pdf_content
+      ).extract
+    end
+    assert_match(/did not invoke report_bank_statement/i, err.message)
+  end
+
+  test "raises before API call when pdf_content exceeds the 32 MB limit" do
+    oversized = "a".b * (Provider::Anthropic::BankStatementExtractor::MAX_PDF_BYTES + 1)
+    client = mock
+    client.expects(:messages).never
+
+    err = assert_raises(Provider::Anthropic::Error) do
+      Provider::Anthropic::BankStatementExtractor.new(
+        client: client,
+        model: "claude-sonnet-4-6",
+        pdf_content: oversized
+      ).extract
+    end
+    assert_match(/exceeds Anthropic's 32 MB limit/i, err.message)
+  end
+
+  test "flags result as truncated when stop_reason is max_tokens" do
+    fake_response = build_response(
+      content: [
+        tool_use_block(
+          id: "toolu_1",
+          name: "report_bank_statement",
+          input: { "transactions" => [ { "date" => "2026-03-05", "description" => "Coffee", "amount" => -4.5 } ] }
+        )
+      ]
+    )
+    fake_response.stop_reason = :max_tokens
+    client = stub_client(fake_response)
+
+    Rails.logger.expects(:warn).with(regexp_matches(/truncated by max_tokens/i))
+
+    result = Provider::Anthropic::BankStatementExtractor.new(
+      client: client,
+      model: "claude-sonnet-4-6",
+      pdf_content: @pdf_content
+    ).extract
+
+    assert_equal true, result[:truncated]
+  end
+
+  private
+    def stub_client(response)
+      messages = mock
+      messages.stubs(:create).returns(response)
+      client = mock
+      client.stubs(:messages).returns(messages)
+      client
+    end
+
+    def build_response(content:, usage: { input_tokens: 1500, output_tokens: 400 })
+      OpenStruct.new(
+        id: "msg_test",
+        model: "claude-sonnet-4-6",
+        content: content,
+        usage: OpenStruct.new(input_tokens: usage[:input_tokens], output_tokens: usage[:output_tokens])
+      )
+    end
+
+    def tool_use_block(id:, name:, input:)
+      OpenStruct.new(type: :tool_use, id: id, name: name, input: input)
+    end
+end
diff --git a/test/models/provider/anthropic/chat_parser_test.rb b/test/models/provider/anthropic/chat_parser_test.rb
index 16085c656..3ce93b505 100644
--- a/test/models/provider/anthropic/chat_parser_test.rb
+++ b/test/models/provider/anthropic/chat_parser_test.rb
@@ -64,6 +64,37 @@ class Provider::Anthropic::ChatParserTest < ActiveSupport::TestCase
     assert_equal "toolu_42", parsed.function_requests.first.call_id
   end
 
+  test "normalizes empty-string tool input to an empty JSON object" do
+    raw = build_message(
+      id: "msg_5",
+      model: "claude-sonnet-4-6",
+      content: [
+        OpenStruct.new(type: :tool_use, id: "toolu_noargs", name: "get_categories", input: "")
+      ]
+    )
+
+    parsed = Provider::Anthropic::ChatParser.new(raw).parsed
+
+    req = parsed.function_requests.first
+    assert_equal "{}", req.function_args
+    # Must survive the downstream JSON.parse that fulfills the tool call.
+    assert_equal({}, JSON.parse(req.function_args))
+  end
+
+  test "normalizes nil tool input to an empty JSON object" do
+    raw = build_message(
+      id: "msg_6",
+      model: "claude-sonnet-4-6",
+      content: [
+        OpenStruct.new(type: :tool_use, id: "toolu_nil", name: "get_categories", input: nil)
+      ]
+    )
+
+    parsed = Provider::Anthropic::ChatParser.new(raw).parsed
+
+    assert_equal "{}", parsed.function_requests.first.function_args
+  end
+
   test "accepts hash-shaped content blocks" do
     raw = OpenStruct.new(
       id: "msg_4",
diff --git a/test/models/provider/anthropic/pdf_processor_test.rb b/test/models/provider/anthropic/pdf_processor_test.rb
new file mode 100644
index 000000000..d2cdbb3a7
--- /dev/null
+++ b/test/models/provider/anthropic/pdf_processor_test.rb
@@ -0,0 +1,126 @@
+require "test_helper"
+require "ostruct"
+
+class Provider::Anthropic::PdfProcessorTest < ActiveSupport::TestCase
+  setup do
+    @pdf_content = "%PDF-1.4 fake bytes".b
+  end
+
+  test "sends PDF as native document content block and parses tool response" do
+    fake_response = build_response(content: [
+      tool_use_block(
+        id: "toolu_1",
+        name: "report_document_analysis",
+        input: {
+          "document_type" => "bank_statement",
+          "summary" => "Bank of Example, Mar 2026 statement.",
+          "extracted_data" => {
+            "institution_name" => "Bank of Example",
+            "statement_period_start" => "2026-03-01",
+            "statement_period_end" => "2026-03-31",
+            "transaction_count" => 42,
+            "opening_balance" => 1000.0,
+            "closing_balance" => 1500.0,
+            "currency" => "USD",
+            "account_holder" => "Account Holder"
+          }
+        }
+      )
+    ])
+    captured = nil
+    client = stub_client(fake_response) { |params| captured = params }
+
+    result = Provider::Anthropic::PdfProcessor.new(
+      client,
+      model: "claude-sonnet-4-6",
+      pdf_content: @pdf_content
+    ).process
+
+    document_block = captured[:messages].first[:content].first
+    assert_equal "document", document_block[:type]
+    assert_equal "application/pdf", document_block[:source][:media_type]
+    assert_equal "base64", document_block[:source][:type]
+    assert_equal Base64.strict_encode64(@pdf_content), document_block[:source][:data]
+
+    assert_equal "report_document_analysis", captured[:tool_choice][:name]
+    assert captured[:tool_choice][:disable_parallel_tool_use]
+
+    assert_equal "bank_statement", result.document_type
+    assert_equal "Bank of Example, Mar 2026 statement.", result.summary
+    assert_equal 42, result.extracted_data["transaction_count"]
+  end
+
+  test "normalizes unknown document_type to other" do
+    fake_response = build_response(content: [
+      tool_use_block(
+        id: "toolu_2",
+        name: "report_document_analysis",
+        input: {
+          "document_type" => "alien_invasion_form",
+          "summary" => "Unknown.",
+          "extracted_data" => {}
+        }
+      )
+    ])
+    client = stub_client(fake_response)
+
+    result = Provider::Anthropic::PdfProcessor.new(
+      client,
+      model: "claude-sonnet-4-6",
+      pdf_content: @pdf_content
+    ).process
+
+    assert_equal "other", result.document_type
+  end
+
+  test "raises when pdf_content is blank" do
+    err = assert_raises(Provider::Anthropic::Error) do
+      Provider::Anthropic::PdfProcessor.new(
+        mock,
+        model: "claude-sonnet-4-6",
+        pdf_content: ""
+      ).process
+    end
+    assert_match(/PDF content is required/i, err.message)
+  end
+
+  test "raises before any API call when pdf_content exceeds the base64-adjusted cap" do
+    oversized = "a".b * (Provider::Anthropic::PdfProcessor::MAX_PDF_BYTES + 1)
+    client = mock
+    client.expects(:messages).never
+
+    err = assert_raises(Provider::Anthropic::Error) do
+      Provider::Anthropic::PdfProcessor.new(
+        client,
+        model: "claude-sonnet-4-6",
+        pdf_content: oversized
+      ).process
+    end
+    assert_match(/32 MB request limit/i, err.message)
+  end
+
+  private
+    def stub_client(response)
+      messages = mock
+      messages.expects(:create).with do |params|
+        yield(params) if block_given?
+        true
+      end.returns(response)
+      client = mock
+      client.stubs(:messages).returns(messages)
+      client
+    end
+
+    def build_response(content:, usage: { input_tokens: 800, output_tokens: 200 })
+      OpenStruct.new(
+        id: "msg_test",
+        model: "claude-sonnet-4-6",
+        content: content,
+        usage: OpenStruct.new(input_tokens: usage[:input_tokens], output_tokens: usage[:output_tokens])
+      )
+    end
+
+    def tool_use_block(id:, name:, input:)
+      OpenStruct.new(type: :tool_use, id: id, name: name, input: input)
+    end
+end
diff --git a/test/models/provider/binance_public_test.rb b/test/models/provider/binance_public_test.rb
index bf0476043..5fad8dc1e 100644
--- a/test/models/provider/binance_public_test.rb
+++ b/test/models/provider/binance_public_test.rb
@@ -100,6 +100,22 @@ class Provider::BinancePublicTest < ActiveSupport::TestCase
     assert_equal "USD", parsed[:display_currency]
   end
 
+  test "parse_ticker strips a separator before the quote (TRX-USD)" do
+    parsed = @provider.send(:parse_ticker, "TRX-USD")
+    refute parsed[:stablecoin]
+    # Without separator handling this would build the invalid pair "TRX-USDT".
+    assert_equal "TRXUSDT", parsed[:binance_pair]
+    assert_equal "TRX", parsed[:base]
+    assert_equal "USD", parsed[:display_currency]
+  end
+
+  test "parse_ticker treats a separated stablecoin (USDT-USD) as stablecoin" do
+    parsed = @provider.send(:parse_ticker, "USDT-USD")
+    assert parsed[:stablecoin]
+    assert_nil parsed[:binance_pair]
+    assert_equal "USDT", parsed[:base]
+  end
+
   test "search_securities returns empty array when query does not match" do
     @provider.stubs(:exchange_info_symbols).returns(sample_exchange_info)
 
@@ -146,6 +162,62 @@ class Provider::BinancePublicTest < ActiveSupport::TestCase
     assert_equal [ "BTCUSD" ], tickers
   end
 
+  test "search_securities resolves the canonical dashed BASE-USD form" do
+    @provider.stubs(:exchange_info_symbols).returns(sample_exchange_info)
+
+    # "BTC-USD" (Yahoo's crypto format, and what users paste) must resolve to
+    # the same single USD variant as "BTCUSD" — not fall through to offline.
+    response = @provider.search_securities("BTC-USD")
+
+    assert response.success?
+    assert_equal [ "BTCUSD" ], response.data.map(&:symbol)
+  end
+
+  test "search_securities resolves a dashed crypto the stock provider may miss (TRX-USD)" do
+    info = [ info_row("TRX", "USDT"), info_row("BTC", "USDT") ]
+    @provider.stubs(:exchange_info_symbols).returns(info)
+
+    response = @provider.search_securities("TRX-USD")
+
+    assert response.success?
+    assert_equal [ "TRXUSD" ], response.data.map(&:symbol)
+  end
+
+  test "search_securities accepts a slash separator (BTC/USD)" do
+    @provider.stubs(:exchange_info_symbols).returns(sample_exchange_info)
+
+    response = @provider.search_securities("BTC/USD")
+
+    assert response.success?
+    assert_equal [ "BTCUSD" ], response.data.map(&:symbol)
+  end
+
+  test "search_securities treats a dashed stablecoin (USDT-USD) as synthetic without hitting exchangeInfo" do
+    @provider.expects(:exchange_info_symbols).never
+
+    response = @provider.search_securities("USDT-USD")
+
+    assert response.success?
+    assert_equal 1, response.data.size
+    row = response.data.first
+    assert_equal "USDTUSD", row.symbol
+    assert_equal "USDT", row.name
+    assert_equal "USD", row.currency
+  end
+
+  test "search_securities keeps a native non-USD stablecoin pair (USDT-EUR) over the USD synthetic" do
+    info = [ info_row("USDT", "EUR"), info_row("BTC", "USDT") ]
+    @provider.stubs(:exchange_info_symbols).returns(info)
+
+    # Only USD-quoted stablecoins synthesize; a real EUR pair must survive.
+    response = @provider.search_securities("USDT-EUR")
+
+    assert response.success?
+    row = response.data.find { |s| s.symbol == "USDTEUR" }
+    assert_not_nil row, "expected native USDT/EUR pair, got #{response.data.map(&:symbol).inspect}"
+    assert_equal "EUR", row.currency
+  end
+
   test "search_securities ranks exact symbol match above base prefix match" do
     info = [
       info_row("BTC", "USDT"),   # base="BTC", symbol="BTCUSDT"
diff --git a/test/models/provider/coinbase_test.rb b/test/models/provider/coinbase_test.rb
new file mode 100644
index 000000000..cf19f5e5a
--- /dev/null
+++ b/test/models/provider/coinbase_test.rb
@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "base64"
+require "json"
+require "openssl"
+
+class Provider::CoinbaseTest < ActiveSupport::TestCase
+  TEST_API_KEY = "organizations/test-org/apiKeys/test-key-id".freeze
+
+  # JWT base64url parts omit padding — add the correct amount before decoding.
+  def jwt_decode_part(str)
+    pad = (4 - str.length % 4) % 4
+    Base64.urlsafe_decode64(str + ("=" * pad))
+  end
+
+  setup do
+    # Generate a fresh P-256 (prime256v1) key per run so no private key material
+    # is ever committed to the repo — avoids hardcoded-secret scanner findings.
+    ec = OpenSSL::PKey::EC.generate("prime256v1")
+    @test_key_multiline = ec.to_pem
+    # Simulate the common CDP "JSON paste" format where newlines are escaped as \n.
+    @test_key_single_line = @test_key_multiline.gsub("\n", '\n')
+
+    @provider = Provider::Coinbase.new(api_key: TEST_API_KEY, api_secret: @test_key_multiline)
+    @provider_escaped = Provider::Coinbase.new(api_key: TEST_API_KEY, api_secret: @test_key_single_line)
+  end
+
+  # --- parse_ec_private_key ---
+
+  test "parse_ec_private_key accepts real-newline PEM" do
+    key = @provider.send(:parse_ec_private_key, @test_key_multiline)
+    assert_instance_of OpenSSL::PKey::EC, key
+  end
+
+  test "parse_ec_private_key accepts escaped-newline PEM (JSON paste format)" do
+    key = @provider.send(:parse_ec_private_key, @test_key_single_line)
+    assert_instance_of OpenSSL::PKey::EC, key
+  end
+
+  # --- generate_jwt structure ---
+
+  test "generate_jwt produces a three-part JWT" do
+    jwt = @provider.send(:generate_jwt, "GET", "/v2/user")
+    parts = jwt.split(".")
+    assert_equal 3, parts.length, "JWT must have header.payload.signature"
+  end
+
+  test "generate_jwt header has alg ES256" do
+    jwt = @provider.send(:generate_jwt, "GET", "/v2/user")
+    header = JSON.parse(jwt_decode_part(jwt.split(".").first))
+    assert_equal "ES256", header["alg"]
+  end
+
+  test "generate_jwt header has kid matching api_key" do
+    jwt = @provider.send(:generate_jwt, "GET", "/v2/user")
+    header = JSON.parse(jwt_decode_part(jwt.split(".").first))
+    assert_equal TEST_API_KEY, header["kid"]
+  end
+
+  test "generate_jwt payload includes required CDP claims" do
+    jwt = @provider.send(:generate_jwt, "GET", "/v2/user")
+    payload = JSON.parse(jwt_decode_part(jwt.split(".")[1]))
+
+    assert_equal TEST_API_KEY, payload["sub"]
+    assert_equal "cdp", payload["iss"]
+    assert_equal "GET api.coinbase.com/v2/user", payload["uri"]
+    assert payload["nbf"].is_a?(Integer)
+    assert payload["exp"].is_a?(Integer)
+    assert_equal 120, payload["exp"] - payload["nbf"]
+  end
+
+  test "generate_jwt signature is 64 bytes (raw r||s for ES256)" do
+    jwt = @provider.send(:generate_jwt, "GET", "/v2/user")
+    sig_bytes = Base64.urlsafe_decode64(jwt.split(".").last + "==")
+    assert_equal 64, sig_bytes.bytesize, "ES256 JWT signature must be exactly 64 bytes (r||s)"
+  end
+
+  test "generate_jwt works with escaped-newline PEM key" do
+    jwt = @provider_escaped.send(:generate_jwt, "GET", "/v2/user")
+    header = JSON.parse(Base64.urlsafe_decode64(jwt.split(".").first + "=="))
+    assert_equal "ES256", header["alg"]
+  end
+
+  test "generate_jwt signature is verifiable with the corresponding public key" do
+    jwt = @provider.send(:generate_jwt, "GET", "/v2/user")
+    encoded_header, encoded_payload, encoded_sig = jwt.split(".")
+
+    public_key = OpenSSL::PKey::EC.new(@test_key_multiline)
+    message = "#{encoded_header}.#{encoded_payload}"
+
+    # Re-encode raw r||s signature back to DER for OpenSSL verification
+    sig_bytes = Base64.urlsafe_decode64(encoded_sig + "==")
+    r = OpenSSL::BN.new(sig_bytes[0, 32], 2)
+    s = OpenSSL::BN.new(sig_bytes[32, 32], 2)
+    der_sig = OpenSSL::ASN1::Sequence([ OpenSSL::ASN1::Integer(r), OpenSSL::ASN1::Integer(s) ]).to_der
+
+    assert public_key.verify(OpenSSL::Digest::SHA256.new, der_sig, message),
+      "JWT signature must verify against the EC public key"
+  end
+end
diff --git a/test/models/provider/coinstats_test.rb b/test/models/provider/coinstats_test.rb
index 2de89c47a..9a17fcb6f 100644
--- a/test/models/provider/coinstats_test.rb
+++ b/test/models/provider/coinstats_test.rb
@@ -5,6 +5,75 @@ class Provider::CoinstatsTest < ActiveSupport::TestCase
     @provider = Provider::Coinstats.new("test_api_key")
   end
 
+  test "retries wallet requests on rate limit with retry after" do
+    response = Struct.new(:code, :body, :headers)
+    rate_limited_response = response.new(
+      429,
+      { message: "Too Many Requests" }.to_json,
+      { "Retry-After" => "3" }
+    )
+    success_response = response.new(
+      200,
+      [ { blockchain: "ethereum", address: "0x123abc", balances: [] } ].to_json,
+      {}
+    )
+
+    @provider.stubs(:min_request_interval).returns(0)
+    @provider.expects(:sleep).with(3).once
+
+    Provider::Coinstats.expects(:get)
+      .with(
+        "#{Provider::Coinstats::BASE_URL}/wallet/balances",
+        headers: {
+          "X-API-KEY" => "test_api_key",
+          "Accept" => "application/json"
+        },
+        query: { wallets: "ethereum:0x123abc" }
+      )
+      .twice
+      .returns(rate_limited_response, success_response)
+
+    result = @provider.get_wallet_balances("ethereum:0x123abc")
+
+    assert result.success?
+    assert_equal "ethereum", result.data.first[:blockchain]
+  end
+
+  test "maps CoinStats credit limit responses without retrying" do
+    response = Struct.new(:code, :body, :headers)
+    credit_limited_response = response.new(
+      406,
+      {
+        statusCode: 406,
+        message: "Credits limit reached. Please upgrade your plan or wait for renewal.",
+        requestId: "test-request-id",
+        path: "/wallet/defi"
+      }.to_json,
+      {}
+    )
+
+    @provider.stubs(:min_request_interval).returns(0)
+    @provider.expects(:sleep).never
+
+    Provider::Coinstats.expects(:get)
+      .with(
+        "#{Provider::Coinstats::BASE_URL}/wallet/defi",
+        headers: {
+          "X-API-KEY" => "test_api_key",
+          "Accept" => "application/json"
+        },
+        query: { address: "0x123abc", connectionId: "ethereum" }
+      )
+      .once
+      .returns(credit_limited_response)
+
+    result = @provider.get_wallet_defi(address: "0x123abc", connection_id: "ethereum")
+
+    refute result.success?
+    assert_match "Credits limit reached", result.error.message
+    assert_equal 406, result.error.details[:status_code]
+  end
+
   test "extract_wallet_balance finds matching wallet by address and connectionId" do
     bulk_data = [
       {
diff --git a/test/models/provider/enable_banking_test.rb b/test/models/provider/enable_banking_test.rb
index e09c90c7e..f74f91b76 100644
--- a/test/models/provider/enable_banking_test.rb
+++ b/test/models/provider/enable_banking_test.rb
@@ -61,4 +61,64 @@ class Provider::EnableBankingTest < ActiveSupport::TestCase
     assert_equal Date.new(2026, 1, 17), error.corrected_date_from
     assert error.wrong_transactions_period?
   end
+
+  test "start_authorization includes auth_method in the request body when provided" do
+    captured_body = nil
+    response = OpenStruct.new(
+      code: 200,
+      body: { url: "https://api.enablebanking.com/auth/abc", authorization_id: "auth_1" }.to_json
+    )
+
+    Provider::EnableBanking.expects(:post).with do |_url, options|
+      captured_body = JSON.parse(options[:body])
+      true
+    end.returns(response)
+
+    @provider.start_authorization(
+      aspsp_name: "VR Bank in Holstein",
+      aspsp_country: "DE",
+      redirect_url: "https://app.example.com/callback",
+      auth_method: "decoupled_app"
+    )
+
+    assert_equal "decoupled_app", captured_body["auth_method"]
+  end
+
+  test "start_authorization omits auth_method when not provided" do
+    captured_body = nil
+    response = OpenStruct.new(
+      code: 200,
+      body: { url: "https://api.enablebanking.com/auth/abc", authorization_id: "auth_1" }.to_json
+    )
+
+    Provider::EnableBanking.expects(:post).with do |_url, options|
+      captured_body = JSON.parse(options[:body])
+      true
+    end.returns(response)
+
+    @provider.start_authorization(
+      aspsp_name: "ING-DiBa AG",
+      aspsp_country: "DE",
+      redirect_url: "https://app.example.com/callback"
+    )
+
+    assert_not captured_body.key?("auth_method")
+  end
+  test "bad request errors expose parsed response data" do
+    response = OpenStruct.new(
+      code: 400,
+      body: {
+        error: "BALANCES_UNAVAILABLE",
+        detail: { account_id: "redacted" }
+      }.to_json
+    )
+
+    error = assert_raises Provider::EnableBanking::EnableBankingError do
+      @provider.send(:handle_response, response)
+    end
+
+    assert_equal :bad_request, error.error_type
+    assert_equal "BALANCES_UNAVAILABLE", error.response_data[:error]
+    assert_equal "redacted", error.response_data.dig(:detail, :account_id)
+  end
 end
diff --git a/test/models/provider/eodhd_test.rb b/test/models/provider/eodhd_test.rb
new file mode 100644
index 000000000..bb53ec6fb
--- /dev/null
+++ b/test/models/provider/eodhd_test.rb
@@ -0,0 +1,82 @@
+require "test_helper"
+
+class Provider::EodhdTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::Eodhd.new("test_api_key")
+  end
+
+  test "preserves raw EODHD exchange code when no MIC mapping exists" do
+    unmapped_exchange_body = [
+      {
+        "Code" => "NL0014157679",
+        "Name" => "ING Select Fund - Actueel Zeer Offensief EUR B Cap",
+        "Exchange" => "EUFUND",
+        "Country" => "Netherlands",
+        "Currency" => "EUR"
+      }
+    ].to_json
+
+    mock_response = mock
+    mock_response.stubs(:body).returns(unmapped_exchange_body)
+
+    @provider.stubs(:enforce_daily_limit!)
+    @provider.stubs(:throttle_request)
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(mock_response)
+
+    result = @provider.search_securities("NL0014157679")
+
+    assert result.success?
+    assert_equal 1, result.data.length
+
+    security = result.data.first
+    assert_equal "NL0014157679", security.symbol
+    assert_equal "EUFUND", security.exchange_operating_mic
+    assert_equal "EUR", security.currency
+  end
+
+  test "uses mapped MIC when exchange code is in mapping" do
+    mapped_exchange_body = [
+      {
+        "Code" => "AAPL",
+        "Name" => "Apple Inc.",
+        "Exchange" => "US",
+        "Country" => "USA",
+        "Currency" => "USD"
+      }
+    ].to_json
+
+    mock_response = mock
+    mock_response.stubs(:body).returns(mapped_exchange_body)
+
+    @provider.stubs(:enforce_daily_limit!)
+    @provider.stubs(:throttle_request)
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(mock_response)
+
+    result = @provider.search_securities("AAPL")
+
+    assert result.success?
+    assert_equal 1, result.data.length
+
+    security = result.data.first
+    assert_equal "AAPL", security.symbol
+    assert_equal "XNYS", security.exchange_operating_mic
+    assert_equal "USD", security.currency
+  end
+
+  test "eodhd_symbol uses EUFUND exchange code correctly" do
+    ticker = @provider.send(:eodhd_symbol, "NL0014157679", "EUFUND")
+    assert_equal "NL0014157679.EUFUND", ticker
+  end
+
+  test "eodhd_symbol falls back to US when MIC is nil" do
+    ticker = @provider.send(:eodhd_symbol, "TEST", nil)
+    assert_equal "TEST.US", ticker
+  end
+
+  test "eodhd_symbol uses MIC mapping when available" do
+    ticker = @provider.send(:eodhd_symbol, "AAPL", "XNYS")
+    assert_equal "AAPL.US", ticker
+  end
+end
diff --git a/test/models/provider/frankfurter_test.rb b/test/models/provider/frankfurter_test.rb
new file mode 100644
index 000000000..79a522ea3
--- /dev/null
+++ b/test/models/provider/frankfurter_test.rb
@@ -0,0 +1,245 @@
+require "test_helper"
+
+class Provider::FrankfurterTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::Frankfurter.new
+    @provider.stubs(:throttle_request)
+  end
+
+  # ================================
+  #        Same-currency shortcut
+  # ================================
+
+  test "fetch_exchange_rate returns 1.0 for the same currency without calling the API" do
+    @provider.expects(:get_json).never
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "USD", date: Date.current)
+
+    assert response.success?
+    assert_equal 1.0, response.data.rate
+    assert_equal "USD", response.data.from
+    assert_equal "USD", response.data.to
+  end
+
+  test "fetch_exchange_rates returns 1.0 rates for every date in range for the same currency" do
+    @provider.expects(:get_json).never
+    start_date = Date.current - 3
+    end_date = Date.current
+
+    response = @provider.fetch_exchange_rates(from: "EUR", to: "EUR", start_date: start_date, end_date: end_date)
+
+    assert response.success?
+    assert_equal 4, response.data.size
+    assert response.data.all? { |r| r.rate == 1.0 }
+  end
+
+  test "fetch_exchange_rate treats mixed-case same currency as the same-currency shortcut" do
+    @provider.expects(:get_json).never
+
+    response = @provider.fetch_exchange_rate(from: "usd", to: "USD", date: Date.current)
+
+    assert response.success?
+    assert_equal 1.0, response.data.rate
+  end
+
+  test "fetch_exchange_rate strips non-letter characters from currency codes before building the URL path" do
+    date = Date.current - 5
+    body = { "date" => date.to_s, "base" => "USD", "quote" => "INR", "rate" => 83.1 }
+    @provider.expects(:get_json).with("/rate/USD/INR", has_entries("date" => date.to_s)).returns(body)
+
+    response = @provider.fetch_exchange_rate(from: "US/../D", to: "IN;R", date: date)
+
+    assert response.success?
+    assert_equal "USD", response.data.from
+    assert_equal "INR", response.data.to
+  end
+
+  # ================================
+  #        fetch_exchange_rate (GET /rate/{base}/{quote})
+  # ================================
+
+  test "fetch_exchange_rate returns the direct cross-rate for a real pair" do
+    date = Date.current - 5
+    stub_rate(from: "INR", to: "CAD", date: date, body: { "date" => date.to_s, "base" => "INR", "quote" => "CAD", "rate" => 0.01484 })
+
+    response = @provider.fetch_exchange_rate(from: "INR", to: "CAD", date: date)
+
+    assert response.success?
+    assert_equal date, response.data.date
+    assert_in_delta 0.01484, response.data.rate
+    assert_equal "INR", response.data.from
+    assert_equal "CAD", response.data.to
+  end
+
+  test "fetch_exchange_rate matches a lowercase target currency against Frankfurter's uppercase response" do
+    date = Date.current - 5
+    stub_rate(from: "USD", to: "INR", date: date, body: { "date" => date.to_s, "base" => "USD", "quote" => "INR", "rate" => 83.1 })
+
+    response = @provider.fetch_exchange_rate(from: "usd", to: "inr", date: date)
+
+    assert response.success?
+    assert_in_delta 83.1, response.data.rate
+    assert_equal "USD", response.data.from
+    assert_equal "INR", response.data.to
+  end
+
+  test "fetch_exchange_rate uses whatever date Frankfurter's own carry-forward returns" do
+    # v2 carries weekends/holidays forward server-side, so the response date
+    # can legitimately differ from the requested one - we trust it as-is.
+    requested_date = Date.current - 5
+    carried_forward_date = requested_date - 2
+    stub_rate(from: "USD", to: "INR", date: requested_date, body: { "date" => carried_forward_date.to_s, "base" => "USD", "quote" => "INR", "rate" => 91.0 })
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "INR", date: requested_date)
+
+    assert response.success?
+    assert_equal carried_forward_date, response.data.date
+    assert_in_delta 91.0, response.data.rate
+  end
+
+  test "fetch_exchange_rate fails without raising when the API call errors" do
+    @provider.stubs(:get_json).raises(StandardError.new("boom"))
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "INR", date: Date.current)
+
+    assert_not response.success?
+    assert_instance_of Provider::Frankfurter::Error, response.error
+  end
+
+  test "fetch_exchange_rate fails without raising when the response is missing a rate" do
+    date = Date.current - 5
+    stub_rate(from: "USD", to: "INR", date: date, body: { "date" => date.to_s, "base" => "USD", "quote" => "INR" })
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "INR", date: date)
+
+    assert_not response.success?
+    assert_instance_of Provider::Frankfurter::Error, response.error
+  end
+
+  # ================================
+  #        fetch_exchange_rates (GET /rates)
+  # ================================
+
+  test "fetch_exchange_rates returns a sorted range of rates" do
+    start_date = Date.current - 5
+    end_date = Date.current - 1
+    body = [
+      { "date" => start_date.to_s, "base" => "INR", "quote" => "CAD", "rate" => 0.0148 },
+      { "date" => (start_date + 1).to_s, "base" => "INR", "quote" => "CAD", "rate" => 0.0149 },
+      { "date" => end_date.to_s, "base" => "INR", "quote" => "CAD", "rate" => 0.0150 }
+    ]
+    stub_range(from: "INR", to: "CAD", start_date: start_date, end_date: end_date, body: body)
+
+    response = @provider.fetch_exchange_rates(from: "INR", to: "CAD", start_date: start_date, end_date: end_date)
+
+    assert response.success?
+    assert_equal 3, response.data.size
+    assert_equal response.data.map(&:date), response.data.map(&:date).sort
+    assert_equal start_date, response.data.first.date
+    assert_equal end_date, response.data.last.date
+  end
+
+  test "fetch_exchange_rates includes every calendar day (v2 carries weekends/holidays forward itself)" do
+    start_date = Date.new(2024, 3, 16) # Saturday
+    end_date = Date.new(2024, 3, 17)   # Sunday
+    body = [
+      { "date" => "2024-03-16", "base" => "INR", "quote" => "CAD", "rate" => 0.01631 },
+      { "date" => "2024-03-17", "base" => "INR", "quote" => "CAD", "rate" => 0.01631 }
+    ]
+    stub_range(from: "INR", to: "CAD", start_date: start_date, end_date: end_date, body: body)
+
+    response = @provider.fetch_exchange_rates(from: "INR", to: "CAD", start_date: start_date, end_date: end_date)
+
+    assert response.success?
+    assert_equal 2, response.data.size
+  end
+
+  test "fetch_exchange_rates ignores entries for a different quote currency" do
+    start_date = Date.current - 3
+    end_date = Date.current - 1
+    body = [
+      { "date" => start_date.to_s, "base" => "INR", "quote" => "CAD", "rate" => 0.0148 },
+      { "date" => start_date.to_s, "base" => "INR", "quote" => "USD", "rate" => 0.012 }
+    ]
+    stub_range(from: "INR", to: "CAD", start_date: start_date, end_date: end_date, body: body)
+
+    response = @provider.fetch_exchange_rates(from: "INR", to: "CAD", start_date: start_date, end_date: end_date)
+
+    assert response.success?
+    assert_equal 1, response.data.size
+    assert_equal "CAD", response.data.first.to
+  end
+
+  # ================================
+  #        Error handling
+  # ================================
+
+  test "fetch_exchange_rates fails without raising when the response is not an array" do
+    @provider.stubs(:get_json).returns({ "status" => 422, "message" => "invalid currency" })
+
+    response = @provider.fetch_exchange_rates(
+      from: "INR", to: "CAD", start_date: Date.current - 5, end_date: Date.current - 1
+    )
+
+    assert_not response.success?
+    assert_instance_of Provider::Frankfurter::Error, response.error
+  end
+
+  test "fetch_exchange_rates fails without raising on a network error" do
+    @provider.stubs(:get_json).raises(Faraday::ConnectionFailed.new("connection refused"))
+
+    response = @provider.fetch_exchange_rates(
+      from: "INR", to: "CAD", start_date: Date.current - 5, end_date: Date.current - 1
+    )
+
+    assert_not response.success?
+    assert_instance_of Provider::Frankfurter::Error, response.error
+  end
+
+  # ================================
+  #        healthy? / usage / max_history_days
+  # ================================
+
+  test "healthy? returns true when the currencies endpoint responds" do
+    @provider.stubs(:get_json).with("/currencies").returns([ { "iso_code" => "USD", "name" => "United States Dollar" } ])
+
+    response = @provider.healthy?
+
+    assert response.success?
+    assert response.data
+  end
+
+  test "healthy? fails when the currencies endpoint returns nothing" do
+    @provider.stubs(:get_json).with("/currencies").returns([])
+
+    response = @provider.healthy?
+
+    assert_not response.success?
+  end
+
+  test "usage reports a free, keyless plan" do
+    response = @provider.usage
+
+    assert response.success?
+    assert_equal "Free (no key required)", response.data.plan
+    assert_nil response.data.limit
+  end
+
+  test "max_history_days is nil (unbounded)" do
+    assert_nil @provider.max_history_days
+  end
+
+  private
+
+    def stub_rate(from:, to:, date:, body:)
+      @provider.stubs(:get_json)
+        .with("/rate/#{from}/#{to}", has_entries("date" => date.to_s))
+        .returns(body)
+    end
+
+    def stub_range(from:, to:, start_date:, end_date:, body:)
+      @provider.stubs(:get_json)
+        .with("/rates", has_entries("base" => from, "quotes" => to, "from" => start_date.to_s, "to" => end_date.to_s))
+        .returns(body)
+    end
+end
diff --git a/test/models/provider/kraken_test.rb b/test/models/provider/kraken_test.rb
index 0d233420c..29eff7c18 100644
--- a/test/models/provider/kraken_test.rb
+++ b/test/models/provider/kraken_test.rb
@@ -58,6 +58,40 @@ class Provider::KrakenTest < ActiveSupport::TestCase
     assert_equal({ "name" => "Sure read-only" }, @provider.get_api_key_info)
   end
 
+  test "get_ledgers sends request to Ledgers endpoint" do
+    ledger_payload = {
+      "ledger" => {
+        "LXXXXXX" => {
+          "refid" => "SXXXXXX", "time" => 1609459200, "type" => "deposit",
+          "subtype" => "", "aclass" => "currency", "asset" => "XXBT",
+          "amount" => "0.10000000", "fee" => "0.00000000", "balance" => "0.50000000"
+        }
+      },
+      "count" => 1
+    }
+    response = mock_httparty_response(200, { "error" => [], "result" => ledger_payload })
+
+    Provider::Kraken.expects(:post)
+      .with("/0/private/Ledgers", anything)
+      .returns(response)
+
+    result = @provider.get_ledgers
+    assert_equal ledger_payload, result
+  end
+
+  test "get_ledgers forwards start, type, and offset params" do
+    response = mock_httparty_response(200, { "error" => [], "result" => { "ledger" => {}, "count" => 0 } })
+
+    Provider::Kraken.expects(:post)
+      .with(
+        "/0/private/Ledgers",
+        has_entries(body: includes("start=1609459200", "type=deposit", "ofs=50"))
+      )
+      .returns(response)
+
+    @provider.get_ledgers(start: Time.zone.at(1609459200), type: "deposit", offset: 50)
+  end
+
   test "handle response returns result on success" do
     response = mock_httparty_response(200, { "error" => [], "result" => { "XXBT" => { "balance" => "1.0" } } })
 
diff --git a/test/models/provider/moex_public_test.rb b/test/models/provider/moex_public_test.rb
new file mode 100644
index 000000000..e74ccc657
--- /dev/null
+++ b/test/models/provider/moex_public_test.rb
@@ -0,0 +1,487 @@
+require "test_helper"
+
+class Provider::MoexPublicTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::MoexPublic.new
+    @provider.stubs(:throttle_request)
+  end
+
+  # ================================
+  #            Search
+  # ================================
+
+  test "search_securities returns a stock with MOEX MIC and nil country" do
+    stub_search("SBER", search_body(
+      row(secid: "SBER", shortname: "Sberbank", is_traded: "1", type: "common_share", group: "stock_shares", currencyid: "SUR")
+    ))
+
+    response = @provider.search_securities("SBER")
+
+    assert response.success?
+    sec = response.data.first
+    assert_equal "SBER", sec.symbol
+    assert_equal "Sberbank", sec.name
+    assert_equal "MISX", sec.exchange_operating_mic
+    assert_nil sec.country_code, "MOEX picks must carry a nil country so any family resolves them"
+    assert_equal "RUB", sec.currency, "legacy SUR currency code must normalize to RUB"
+  end
+
+  test "search_securities returns a fund (LQDT)" do
+    stub_search("LQDT", search_body(
+      row(secid: "LQDT", shortname: "Liquidity", is_traded: "1", type: "etf_ppif", group: "stock_etf", currencyid: "RUB")
+    ))
+
+    response = @provider.search_securities("LQDT")
+
+    assert_equal [ "LQDT" ], response.data.map(&:symbol)
+  end
+
+  test "search_securities returns an OFZ bond" do
+    stub_search("SU26238RMFS4", search_body(
+      row(secid: "SU26238RMFS4", shortname: "OFZ 26238", is_traded: "1", type: "ofz_bond", group: "stock_bonds", currencyid: "SUR")
+    ))
+
+    response = @provider.search_securities("SU26238RMFS4")
+
+    assert_equal [ "SU26238RMFS4" ], response.data.map(&:symbol)
+  end
+
+  test "search_securities strips the .ME alias suffix before querying ISS" do
+    stub_search("SBER", search_body(
+      row(secid: "SBER", shortname: "Sberbank", is_traded: "1", type: "common_share", group: "stock_shares")
+    ))
+
+    response = @provider.search_securities("SBER.ME")
+
+    assert response.success?
+    assert_equal [ "SBER" ], response.data.map(&:symbol)
+  end
+
+  test "search_securities strips the .MOEX alias suffix" do
+    stub_search("SBER", search_body(
+      row(secid: "SBER", shortname: "Sberbank", is_traded: "1", type: "common_share", group: "stock_shares")
+    ))
+
+    assert_equal [ "SBER" ], @provider.search_securities("sber.moex").data.map(&:symbol)
+  end
+
+  test "search_securities matches an ISIN query natively" do
+    isin = "RU0009029540"
+    stub_search(isin, search_body(
+      row(secid: "SBER", shortname: "Sberbank", isin: isin, is_traded: "1", type: "common_share", group: "stock_shares")
+    ))
+
+    assert_equal [ "SBER" ], @provider.search_securities(isin).data.map(&:symbol)
+  end
+
+  test "search_securities filters out non-traded instruments" do
+    stub_search("SBER", search_body(
+      row(secid: "SBERP_OLD", shortname: "delisted", is_traded: "0", type: "preferred_share", group: "stock_shares")
+    ))
+
+    assert_empty @provider.search_securities("SBER").data
+  end
+
+  test "search_securities excludes indices and futures" do
+    stub_search("RTSI", search_body(
+      row(secid: "IMOEX", shortname: "MOEX Index", is_traded: "1", type: "common_index", group: "stock_index"),
+      row(secid: "RIH6",  shortname: "RTS Future", is_traded: "1", type: "futures",      group: "futures_forts")
+    ))
+
+    assert_empty @provider.search_securities("RTSI").data
+  end
+
+  test "search_securities dedupes multiple board rows for the same SECID" do
+    stub_search("SBER", search_body(
+      row(secid: "SBER", shortname: "Sberbank", is_traded: "1", type: "common_share", group: "stock_shares", primary_boardid: "TQBR"),
+      row(secid: "SBER", shortname: "Sberbank", is_traded: "1", type: "common_share", group: "stock_shares", primary_boardid: "SMAL")
+    ))
+
+    assert_equal [ "SBER" ], @provider.search_securities("SBER").data.map(&:symbol)
+  end
+
+  test "search_securities returns empty for a blank query without calling ISS" do
+    @provider.expects(:get_json).never
+    assert_empty @provider.search_securities("   ").data
+  end
+
+  # ================================
+  #     Board / engine resolution
+  # ================================
+
+  test "resolve_instrument selects the ISS primary board" do
+    @provider.stubs(:get_json).with("/securities/SBER.json", anything).returns(instrument_body(
+      desc: { "SECID" => "SBER", "SHORTNAME" => "Sberbank", "TYPE" => "common_share", "GROUP" => "stock_shares", "FACEUNIT" => "SUR" },
+      boards: [
+        board_row(boardid: "SMAL", is_traded: "1", market: "shares", engine: "stock", is_primary: "0", currencyid: "SUR"),
+        board_row(boardid: "TQBR", is_traded: "1", market: "shares", engine: "stock", is_primary: "1", currencyid: "SUR")
+      ]
+    ))
+
+    instrument = @provider.send(:resolve_instrument, "SBER")
+
+    assert_equal "TQBR", instrument[:board]
+    assert_equal "shares", instrument[:market]
+    assert_equal "stock", instrument[:engine]
+    assert_equal "stock", instrument[:kind]
+    assert_equal "RUB", instrument[:currency]
+  end
+
+  test "resolve_instrument falls back to hardcoded board priority when no primary flag" do
+    @provider.stubs(:get_json).with("/securities/SU26238RMFS4.json", anything).returns(instrument_body(
+      desc: { "SECID" => "SU26238RMFS4", "SHORTNAME" => "OFZ 26238", "TYPE" => "ofz_bond", "GROUP" => "stock_bonds", "FACEUNIT" => "SUR" },
+      boards: [
+        board_row(boardid: "EQOB", is_traded: "1", market: "bonds", engine: "stock", is_primary: "0", currencyid: "SUR"),
+        board_row(boardid: "TQOB", is_traded: "1", market: "bonds", engine: "stock", is_primary: "0", currencyid: "SUR")
+      ]
+    ))
+
+    instrument = @provider.send(:resolve_instrument, "SU26238RMFS4")
+
+    assert_equal "TQOB", instrument[:board], "TQOB precedes EQOB in BOARD_PRIORITY"
+    assert_equal "bond", instrument[:kind]
+  end
+
+  # ================================
+  #          Security info
+  # ================================
+
+  test "fetch_security_info maps kind and omits an exchange website" do
+    @provider.stubs(:resolve_instrument).returns(bond_instrument)
+
+    response = @provider.fetch_security_info(symbol: "SU26238RMFS4", exchange_operating_mic: "MISX")
+
+    assert response.success?
+    assert_equal "bond", response.data.kind
+    assert_equal "MISX", response.data.exchange_operating_mic
+    # No issuer website: moex.com is the exchange, not the issuer, and would make
+    # Brandfetch render the exchange logo for every instrument.
+    assert_nil response.data.links
+  end
+
+  # ================================
+  #        Security prices
+  # ================================
+
+  test "fetch_security_prices uses LAST from the marketdata fallback chain" do
+    @provider.stubs(:resolve_instrument).returns(stock_instrument)
+    stub_history([])
+    stub_current_price(
+      securities: { "facevalue" => nil, "faceunit" => "SUR", "currencyid" => "SUR", "prevprice" => "300.0" },
+      marketdata: { "last" => "320.5", "marketprice" => "319.0", "lcloseprice" => "318.0", "waprice" => "319.2" }
+    )
+
+    response = @provider.fetch_security_price(symbol: "SBER", exchange_operating_mic: "MISX", date: Date.current)
+
+    assert response.success?
+    assert_in_delta 320.5, response.data.price
+    assert_equal "RUB", response.data.currency
+    assert_equal "MISX", response.data.exchange_operating_mic
+  end
+
+  test "fetch_security_prices falls back to PREVPRICE when marketdata is empty" do
+    @provider.stubs(:resolve_instrument).returns(stock_instrument)
+    stub_history([])
+    stub_current_price(
+      securities: { "facevalue" => nil, "currencyid" => "SUR", "prevprice" => "305.0" },
+      marketdata: { "last" => nil, "marketprice" => nil, "lcurrentprice" => nil, "lcloseprice" => nil, "waprice" => nil }
+    )
+
+    response = @provider.fetch_security_price(symbol: "SBER", exchange_operating_mic: "MISX", date: Date.current)
+
+    assert response.success?
+    assert_in_delta 305.0, response.data.price
+  end
+
+  test "fetch_security_prices reads past dates from the history endpoint" do
+    date = Date.current - 5
+    @provider.stubs(:resolve_instrument).returns(stock_instrument)
+    stub_history([ history_row(tradedate: date.to_s, close: "311.4") ])
+
+    response = @provider.fetch_security_price(symbol: "SBER", exchange_operating_mic: "MISX", date: date)
+
+    assert response.success?
+    assert_equal date, response.data.date
+    assert_in_delta 311.4, response.data.price
+    assert_equal "RUB", response.data.currency
+  end
+
+  test "fetch_security_prices paginates history via start=" do
+    start_date = Date.current - 200
+    end_date = Date.current - 10
+    page0 = Array.new(100) { |i| history_row(tradedate: (start_date + i).to_s, close: "100.0") }
+    page1 = Array.new(50)  { |i| history_row(tradedate: (start_date + 100 + i).to_s, close: "101.0") }
+
+    @provider.stubs(:resolve_instrument).returns(stock_instrument)
+    @provider.stubs(:get_json).with(regexp_matches(%r{^/history/}), has_entry("start" => 0)).returns(history_block(page0))
+    @provider.stubs(:get_json).with(regexp_matches(%r{^/history/}), has_entry("start" => 100)).returns(history_block(page1))
+
+    response = @provider.fetch_security_prices(
+      symbol: "SBER", exchange_operating_mic: "MISX", start_date: start_date, end_date: end_date
+    )
+
+    assert response.success?
+    assert_equal 150, response.data.size
+  end
+
+  test "fetch_security_prices skips a row with an unparseable date instead of failing" do
+    good_date = Date.current - 5
+    @provider.stubs(:resolve_instrument).returns(stock_instrument)
+    stub_history([
+      history_row(tradedate: "not-a-date", close: "300.0"),
+      history_row(tradedate: good_date.to_s, close: "311.4")
+    ])
+
+    response = @provider.fetch_security_prices(
+      symbol: "SBER", exchange_operating_mic: "MISX", start_date: Date.current - 7, end_date: good_date
+    )
+
+    assert response.success?
+    assert_equal [ good_date ], response.data.map(&:date)
+  end
+
+  test "fetch_security_prices converts bond percent-of-par to currency via FACEVALUE" do
+    date = Date.current - 5
+    @provider.stubs(:resolve_instrument).returns(bond_instrument)
+    stub_history([ history_row(tradedate: date.to_s, close: "98.5", facevalue: "1000.0", faceunit: "SUR") ])
+
+    response = @provider.fetch_security_price(symbol: "SU26238RMFS4", exchange_operating_mic: "MISX", date: date)
+
+    assert response.success?
+    assert_in_delta 985.0, response.data.price, 0.001, "98.5% of a 1000 par must be 985"
+    assert_equal "RUB", response.data.currency
+  end
+
+  test "fetch_security_prices stamps eurobond currency from ISS FACEUNIT" do
+    date = Date.current - 5
+    @provider.stubs(:resolve_instrument).returns(eurobond_instrument)
+    stub_history([ history_row(tradedate: date.to_s, close: "102.0", facevalue: "1000.0", faceunit: "USD") ])
+
+    response = @provider.fetch_security_price(symbol: "RU000A0JX0J2", exchange_operating_mic: "MISX", date: date)
+
+    assert_equal "USD", response.data.currency
+    assert_in_delta 1020.0, response.data.price, 0.001
+  end
+
+  test "fetch_security_prices reads per-row FACEVALUE for amortizing bonds" do
+    d1 = Date.current - 6
+    d2 = Date.current - 5
+    @provider.stubs(:resolve_instrument).returns(bond_instrument)
+    stub_history([
+      history_row(tradedate: d1.to_s, close: "100.0", facevalue: "1000.0", faceunit: "SUR"),
+      history_row(tradedate: d2.to_s, close: "100.0", facevalue: "700.0",  faceunit: "SUR")
+    ])
+
+    response = @provider.fetch_security_prices(
+      symbol: "RU000AMORT", exchange_operating_mic: "MISX", start_date: d1, end_date: d2
+    )
+
+    prices = response.data.sort_by(&:date)
+    assert_in_delta 1000.0, prices.first.price, 0.001
+    assert_in_delta 700.0,  prices.last.price, 0.001, "amortized face value must drive the second day's clean price"
+  end
+
+  test "fetch_security_price raises InvalidSecurityPriceError when nothing is found" do
+    date = Date.current - 5
+    @provider.stubs(:resolve_instrument).returns(stock_instrument)
+    stub_history([])
+
+    response = @provider.fetch_security_price(symbol: "SBER", exchange_operating_mic: "MISX", date: date)
+
+    assert_not response.success?
+    assert_instance_of Provider::MoexPublic::InvalidSecurityPriceError, response.error
+  end
+
+  # ================================
+  #          Exchange rates
+  # ================================
+
+  test "fetch_exchange_rate USD to RUB is the direct selt quote" do
+    date = Date.current - 5
+    stub_fx_history("USD000UTSTOM", [ fx_row(tradedate: date.to_s, close: "90.5") ])
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "RUB", date: date)
+
+    assert response.success?
+    assert_in_delta 90.5, response.data.rate.to_f
+    assert_equal "USD", response.data.from
+    assert_equal "RUB", response.data.to
+  end
+
+  test "fetch_exchange_rate looks back to the prior trading day on a non-trading date" do
+    non_trading_day = Date.current - 5
+    prior_trading_day = non_trading_day - 2
+    # ISS returns nothing for the weekend/holiday itself, only the earlier close.
+    stub_fx_history("USD000UTSTOM", [ fx_row(tradedate: prior_trading_day.to_s, close: "91.0") ])
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "RUB", date: non_trading_day)
+
+    assert response.success?
+    assert_equal prior_trading_day, response.data.date
+    assert_in_delta 91.0, response.data.rate.to_f
+  end
+
+  test "fetch_exchange_rate RUB to USD inverts the selt quote" do
+    date = Date.current - 5
+    stub_fx_history("USD000UTSTOM", [ fx_row(tradedate: date.to_s, close: "90.5") ])
+
+    response = @provider.fetch_exchange_rate(from: "RUB", to: "USD", date: date)
+
+    assert response.success?
+    assert_in_delta (1.0 / 90.5), response.data.rate.to_f, 0.0000001
+  end
+
+  test "fetch_exchange_rate supports EUR and CNY" do
+    date = Date.current - 5
+    stub_fx_history("EUR_RUB__TOM", [ fx_row(tradedate: date.to_s, close: "98.1") ])
+    stub_fx_history("CNYRUB_TOM",   [ fx_row(tradedate: date.to_s, close: "12.4") ])
+
+    eur = @provider.fetch_exchange_rate(from: "EUR", to: "RUB", date: date)
+    cny = @provider.fetch_exchange_rate(from: "CNY", to: "RUB", date: date)
+
+    assert_in_delta 98.1, eur.data.rate.to_f
+    assert_in_delta 12.4, cny.data.rate.to_f
+  end
+
+  test "fetch_exchange_rates returns empty for a non-RUB-crossed pair" do
+    @provider.expects(:get_json).never
+
+    response = @provider.fetch_exchange_rates(
+      from: "USD", to: "EUR", start_date: Date.current - 5, end_date: Date.current - 1
+    )
+
+    assert response.success?
+    assert_empty response.data
+  end
+
+  test "fetch_exchange_rate fails (no crash) for a non-RUB-crossed pair" do
+    @provider.expects(:get_json).never
+
+    response = @provider.fetch_exchange_rate(from: "USD", to: "EUR", date: Date.current - 1)
+
+    assert_not response.success?
+  end
+
+  test "fetch_exchange_rates returns a sorted range of rates" do
+    start_date = Date.current - 5
+    end_date = Date.current - 1
+    rows = (0..4).map { |i| fx_row(tradedate: (start_date + i).to_s, close: (90 + i).to_s) }
+    stub_fx_history("USD000UTSTOM", rows)
+
+    response = @provider.fetch_exchange_rates(
+      from: "USD", to: "RUB", start_date: start_date, end_date: end_date
+    )
+
+    assert response.success?
+    assert_equal 5, response.data.size
+    assert_equal start_date, response.data.first.date
+    assert_equal end_date, response.data.last.date
+  end
+
+  # ================================
+  #      Error / response wrapping
+  # ================================
+
+  test "search_securities wraps provider errors via with_provider_response" do
+    @provider.stubs(:get_json).raises(StandardError.new("ISS unreachable"))
+
+    response = @provider.search_securities("SBER")
+
+    assert_not response.success?
+    assert_instance_of Provider::MoexPublic::Error, response.error
+  end
+
+  test "max_history_days is nil (full history)" do
+    assert_nil @provider.max_history_days
+  end
+
+  # ================================
+  #            Helpers
+  # ================================
+
+  private
+
+    # ----- instrument stubs -----
+
+    def stock_instrument
+      { secid: "SBER", engine: "stock", market: "shares", board: "TQBR", currency: "RUB", name: "Sberbank", kind: "stock" }
+    end
+
+    def bond_instrument
+      { secid: "SU26238RMFS4", engine: "stock", market: "bonds", board: "TQOB", currency: "RUB", name: "OFZ 26238", kind: "bond" }
+    end
+
+    def eurobond_instrument
+      { secid: "RU000A0JX0J2", engine: "stock", market: "bonds", board: "TQOD", currency: "USD", name: "Eurobond", kind: "bond" }
+    end
+
+    # ----- column-array block builders -----
+
+    def block(columns, rows)
+      { "columns" => columns, "data" => rows.map { |r| columns.map { |c| r[c] } } }
+    end
+
+    SEARCH_COLUMNS = %w[secid shortname isin is_traded type group primary_boardid currencyid faceunit].freeze
+
+    def row(**attrs)
+      attrs.transform_keys(&:to_s)
+    end
+
+    def search_body(*rows)
+      { "securities" => block(SEARCH_COLUMNS, rows) }
+    end
+
+    def stub_search(query, body)
+      @provider.stubs(:get_json).with("/securities.json", has_entry("q" => query)).returns(body)
+    end
+
+    DESCRIPTION_COLUMNS = %w[name title value].freeze
+    BOARD_COLUMNS = %w[secid boardid title is_traded market engine is_primary currencyid].freeze
+
+    def board_row(**attrs)
+      { "secid" => "SBER", "title" => attrs[:boardid] }.merge(attrs.transform_keys(&:to_s))
+    end
+
+    def instrument_body(desc:, boards:)
+      {
+        "description" => block(DESCRIPTION_COLUMNS, desc.map { |name, value| { "name" => name, "title" => name, "value" => value } }),
+        "boards" => block(BOARD_COLUMNS, boards)
+      }
+    end
+
+    PRICE_SECURITIES_COLUMNS = %w[secid facevalue faceunit currencyid prevprice].freeze
+    PRICE_MARKETDATA_COLUMNS = %w[secid last marketprice lcurrentprice lcloseprice waprice].freeze
+
+    def stub_current_price(securities:, marketdata:)
+      body = {
+        "securities" => block(PRICE_SECURITIES_COLUMNS, [ securities ]),
+        "marketdata" => block(PRICE_MARKETDATA_COLUMNS, [ marketdata ])
+      }
+      @provider.stubs(:get_json).with(regexp_matches(%r{^/engines/}), anything).returns(body)
+    end
+
+    HISTORY_COLUMNS = %w[tradedate secid close legalcloseprice facevalue faceunit currencyid].freeze
+
+    def history_row(**attrs)
+      attrs.transform_keys(&:to_s)
+    end
+
+    def history_block(rows)
+      { "history" => block(HISTORY_COLUMNS, rows) }
+    end
+
+    def stub_history(rows)
+      @provider.stubs(:get_json).with(regexp_matches(%r{^/history/engines/(?!currency)}), anything).returns(history_block(rows))
+    end
+
+    FX_HISTORY_COLUMNS = %w[tradedate secid close waprice].freeze
+
+    def fx_row(**attrs)
+      attrs.transform_keys(&:to_s)
+    end
+
+    def stub_fx_history(instrument, rows)
+      body = { "history" => block(FX_HISTORY_COLUMNS, rows) }
+      @provider.stubs(:get_json).with(regexp_matches(%r{/history/engines/currency/.*#{Regexp.escape(instrument)}}), anything).returns(body)
+    end
+end
diff --git a/test/models/provider/questrade_test.rb b/test/models/provider/questrade_test.rb
new file mode 100644
index 000000000..53c81e75e
--- /dev/null
+++ b/test/models/provider/questrade_test.rb
@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "ostruct"
+
+class Provider::QuestradeTest < ActiveSupport::TestCase
+  # Security: the single-use refresh token must travel in the POST body so it
+  # can't leak into URLs / access logs / error-tracking breadcrumbs.
+  test "authenticate! sends the refresh token in the POST body, not the URL" do
+    token_payload = {
+      access_token: "access-123",
+      api_server: "https://api01.example.com/",
+      refresh_token: "rotated-456",
+      expires_in: 1800
+    }.to_json
+
+    Provider::Questrade.expects(:post)
+      .with(Provider::Questrade::LOGIN_URL, body: { grant_type: "refresh_token", refresh_token: "secret-rt" })
+      .returns(OpenStruct.new(code: 200, body: token_payload))
+    # Guard against regressing to a GET that carries the token in the query string.
+    Provider::Questrade.expects(:get).never
+
+    provider = Provider::Questrade.new(refresh_token: "secret-rt")
+    provider.send(:authenticate!)
+
+    assert_equal "rotated-456", provider.refresh_token, "rotated token should be surfaced for persistence"
+  end
+  # Security/correctness: the single-use token exchange must be serialized and
+  # must spend the freshest persisted token (see provided.rb#synchronize_exchange).
+  test "authenticate! spends the freshest token inside synchronize_exchange" do
+    token_payload = {
+      access_token: "at", api_server: "https://api01.example.com/",
+      refresh_token: "rotated", expires_in: 1800
+    }.to_json
+
+    lock_calls = 0
+    # The lock yields a token newer than the one the provider was built with.
+    sync = ->(&blk) { lock_calls += 1; blk.call("fresh-from-lock") }
+
+    # The exchange must use the locked/fresh token, not the stale initial one.
+    Provider::Questrade.expects(:post)
+      .with(Provider::Questrade::LOGIN_URL, body: { grant_type: "refresh_token", refresh_token: "fresh-from-lock" })
+      .returns(OpenStruct.new(code: 200, body: token_payload))
+
+    provider = Provider::Questrade.new(refresh_token: "stale-initial", synchronize_exchange: sync)
+    provider.send(:authenticate!)
+
+    assert_equal 1, lock_calls, "exchange must run inside the synchronize_exchange lock"
+    assert_equal "rotated", provider.refresh_token
+  end
+
+  test "retries network errors and raises Error after max retries exhausted" do
+    provider = Provider::Questrade.new(refresh_token: "test-rt")
+    # Authenticate first to set api_server and access_token
+    auth_payload = { access_token: "at", api_server: "https://api01.example.com/", refresh_token: "rt2", expires_in: 1800 }.to_json
+    Provider::Questrade.stubs(:post).returns(OpenStruct.new(code: 200, body: auth_payload))
+    provider.send(:authenticate!)
+
+    provider.stubs(:sleep)
+    DebugLogEntry.stubs(:capture)
+
+    attempt_count = 0
+    Provider::Questrade.stubs(:get).with { |*| attempt_count += 1; true }.raises(SocketError, "connection failed")
+
+    error = assert_raises(Provider::Questrade::Error) do
+      provider.list_accounts
+    end
+
+    assert_equal Provider::Questrade::MAX_RETRIES + 1, attempt_count
+    assert_match "Network error after #{Provider::Questrade::MAX_RETRIES} retries", error.message
+  end
+
+  test "retries on 429 rate limit and raises Error after max retries exhausted" do
+    provider = Provider::Questrade.new(refresh_token: "test-rt")
+    auth_payload = { access_token: "at", api_server: "https://api01.example.com/", refresh_token: "rt2", expires_in: 1800 }.to_json
+    Provider::Questrade.stubs(:post).returns(OpenStruct.new(code: 200, body: auth_payload))
+    provider.send(:authenticate!)
+
+    provider.stubs(:sleep)
+    DebugLogEntry.stubs(:capture)
+
+    stub_429 = OpenStruct.new(code: 429, body: "{}")
+    Provider::Questrade.stubs(:get).returns(stub_429)
+
+    error = assert_raises(Provider::Questrade::Error) do
+      provider.list_accounts
+    end
+
+    assert_match "Network error after #{Provider::Questrade::MAX_RETRIES} retries", error.message
+  end
+
+  test "retries on 5xx server error and raises Error after max retries exhausted" do
+    provider = Provider::Questrade.new(refresh_token: "test-rt")
+    auth_payload = { access_token: "at", api_server: "https://api01.example.com/", refresh_token: "rt2", expires_in: 1800 }.to_json
+    Provider::Questrade.stubs(:post).returns(OpenStruct.new(code: 200, body: auth_payload))
+    provider.send(:authenticate!)
+
+    provider.stubs(:sleep)
+    DebugLogEntry.stubs(:capture)
+
+    stub_503 = OpenStruct.new(code: 503, body: "{}")
+    Provider::Questrade.stubs(:get).returns(stub_503)
+
+    assert_raises(Provider::Questrade::Error) do
+      provider.list_accounts
+    end
+  end
+end
diff --git a/test/models/provider/realie_test.rb b/test/models/provider/realie_test.rb
new file mode 100644
index 000000000..7818e30f1
--- /dev/null
+++ b/test/models/provider/realie_test.rb
@@ -0,0 +1,185 @@
+require "test_helper"
+
+class Provider::RealieTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::Realie.new("test_api_key")
+    @provider.stubs(:throttle_request)
+  end
+
+  def address_lookup_body(overrides = {})
+    {
+      "property" => {
+        "useCode" => "Single Family Residential",
+        "yearBuilt" => 1985,
+        "buildingArea" => 1500.0,
+        "modelValue" => 420_000.0,
+        "modelValueMin" => 390_000.0,
+        "modelValueMax" => 450_000.0,
+        "totalMarketValue" => 400_000,
+        "city" => "LOS ANGELES",
+        "state" => "CA",
+        "zipCode" => "90001"
+      }.merge(overrides)
+    }.to_json
+  end
+
+  test "fetches valuation and property attributes in a single request" do
+    stub = stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(
+        query: { "address" => "123 Main Street", "state" => "CA" },
+        headers: { "Authorization" => "test_api_key" }
+      )
+      .to_return(status: 200, body: address_lookup_body)
+
+    response = @provider.fetch_property_valuation(
+      line1: "123 Main Street",
+      locality: "Los Angeles",
+      region: "CA",
+      postal_code: "90001"
+    )
+
+    assert response.success?
+    data = response.data
+    assert_equal 420_000, data.valuation
+    assert_equal "USD", data.currency
+    assert_equal "single_family_home", data.property_type
+    assert_equal 1985, data.year_built
+    assert_equal 1500, data.area_value
+    assert_equal "sqft", data.area_unit
+    assert_requested stub
+  end
+
+  test "falls back to the assessed market value when no model value is present" do
+    stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(query: hash_including("address" => "123 Main Street"))
+      .to_return(status: 200, body: address_lookup_body("modelValue" => nil))
+
+    response = @provider.fetch_property_valuation(line1: "123 Main Street", region: "CA")
+
+    assert response.success?
+    assert_equal 400_000, response.data.valuation
+  end
+
+  test "treats a zero model value as absent and falls back to the market value" do
+    stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(query: hash_including("address" => "123 Main Street"))
+      .to_return(status: 200, body: address_lookup_body("modelValue" => 0))
+
+    response = @provider.fetch_property_valuation(line1: "123 Main Street", region: "CA")
+
+    assert response.success?
+    assert_equal 400_000, response.data.valuation
+  end
+
+  test "returns an error when both model and market values are zero" do
+    stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(query: hash_including("address" => "123 Main Street"))
+      .to_return(status: 200, body: address_lookup_body("modelValue" => 0, "totalMarketValue" => 0))
+
+    response = @provider.fetch_property_valuation(line1: "123 Main Street", region: "CA")
+
+    assert_not response.success?
+    assert_match(/valuation/i, response.error.message)
+  end
+
+  test "picks the candidate matching the entered city and ZIP from multiple results" do
+    wrong_city = { "useCode" => "Commercial", "yearBuilt" => 1970, "buildingArea" => 9_000.0, "modelValue" => 2_000_000.0, "city" => "SACRAMENTO", "state" => "CA", "zipCode" => "95814" }
+    right_city = { "useCode" => "Single Family Residential", "yearBuilt" => 1985, "buildingArea" => 1500.0, "modelValue" => 420_000.0, "city" => "LOS ANGELES", "state" => "CA", "zipCode" => "90001" }
+
+    stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(query: hash_including("address" => "123 Main Street"))
+      .to_return(status: 200, body: { "property" => [ wrong_city, right_city ] }.to_json)
+
+    response = @provider.fetch_property_valuation(
+      line1: "123 Main Street",
+      locality: "Los Angeles",
+      region: "CA",
+      postal_code: "90001"
+    )
+
+    assert response.success?
+    assert_equal 420_000, response.data.valuation
+    assert_equal "single_family_home", response.data.property_type
+    assert_equal 1985, response.data.year_built
+  end
+
+  test "rejects a property matched in a different city or ZIP" do
+    stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(query: hash_including("address" => "123 Main Street"))
+      .to_return(status: 200, body: address_lookup_body("city" => "SACRAMENTO", "zipCode" => "95814"))
+
+    response = @provider.fetch_property_valuation(
+      line1: "123 Main Street",
+      locality: "Los Angeles",
+      region: "CA",
+      postal_code: "90001"
+    )
+
+    assert_not response.success?
+    assert_match(/different city or zip/i, response.error.message)
+  end
+
+  test "returns a friendly error when no property matches the address" do
+    stub_request(:get, "https://app.realie.ai/api/public/property/address/")
+      .with(query: hash_including("address" => "1 Nowhere Ln"))
+      .to_return(status: 404, body: { "detail" => "Not found" }.to_json)
+
+    response = @provider.fetch_property_valuation(line1: "1 Nowhere Ln", region: "CA")
+
+    assert_not response.success?
+    assert_match(/could not find a property/i, response.error.message)
+  end
+
+  test "maps documented numeric use codes to property subtypes" do
+    {
+      "1001" => "single_family_home",
+      "1002" => "townhouse",
+      "1004" => "condominium",
+      "1101" => "multi_family_home",
+      "1104" => "apartment",
+      "7001" => "agri_land",
+      "8001" => "plot",
+      "1006" => nil, # mobile/manufactured — no subtype equivalent
+      "9999" => nil  # unknown numeric code
+    }.each do |use_code, expected|
+      actual = @provider.send(:subtype_for_use_code, use_code)
+      if expected.nil?
+        assert_nil actual, "expected #{use_code.inspect} to map to nil"
+      else
+        assert_equal expected, actual, "expected #{use_code.inspect} to map to #{expected.inspect}"
+      end
+    end
+  end
+
+  test "maps use codes to property subtypes by keyword" do
+    {
+      "Single Family Residential" => "single_family_home",
+      "Duplex (2 units)" => "multi_family_home",
+      "Residential Condominium" => "condominium",
+      "Townhouse" => "townhouse",
+      "Vacant Land" => "plot",
+      "Commercial Office" => "commercial",
+      "Agricultural" => "agri_land",
+      "Something Unrecognized" => nil
+    }.each do |use_code, expected|
+      actual = @provider.send(:subtype_for_use_code, use_code)
+      if expected.nil?
+        assert_nil actual, "expected #{use_code.inspect} to map to nil"
+      else
+        assert_equal expected, actual, "expected #{use_code.inspect} to map to #{expected.inspect}"
+      end
+    end
+  end
+
+  test "stops issuing requests once the monthly limit is reached" do
+    ProviderRequestCount.create!(provider_key: "realie", period: ProviderRequestCount.current_period, count: Provider::Realie::MAX_REQUESTS_PER_MONTH)
+
+    assert_not @provider.requests_remaining?
+
+    response = @provider.fetch_property_valuation(line1: "123 Main Street", region: "CA")
+
+    assert_not response.success?
+    assert_instance_of Provider::Realie::RateLimitError, response.error
+    assert_not_requested :get, %r{app\.realie\.ai}
+  end
+end
diff --git a/test/models/provider/redbark_adapter_test.rb b/test/models/provider/redbark_adapter_test.rb
new file mode 100644
index 000000000..04a88c1f8
--- /dev/null
+++ b/test/models/provider/redbark_adapter_test.rb
@@ -0,0 +1,33 @@
+require "test_helper"
+
+class Provider::RedbarkAdapterTest < ActiveSupport::TestCase
+  test "supports Depository accounts" do
+    assert_includes Provider::RedbarkAdapter.supported_account_types, "Depository"
+  end
+
+  test "does not support Investment accounts" do
+    assert_not_includes Provider::RedbarkAdapter.supported_account_types, "Investment"
+  end
+
+  test "returns connection config for families" do
+    configs = Provider::RedbarkAdapter.connection_configs(family: families(:empty))
+
+    assert_equal 1, configs.length
+    assert_equal "redbark", configs.first[:key]
+    assert configs.first[:can_connect]
+  end
+
+  test "builds provider with valid credentials" do
+    provider = Provider::RedbarkAdapter.build_provider(family: families(:dylan_family))
+
+    assert_instance_of Provider::Redbark, provider
+  end
+
+  test "returns nil without credentials" do
+    assert_nil Provider::RedbarkAdapter.build_provider(family: families(:empty))
+  end
+
+  test "returns nil without family" do
+    assert_nil Provider::RedbarkAdapter.build_provider(family: nil)
+  end
+end
diff --git a/test/models/provider/redbark_test.rb b/test/models/provider/redbark_test.rb
new file mode 100644
index 000000000..1e34eba99
--- /dev/null
+++ b/test/models/provider/redbark_test.rb
@@ -0,0 +1,87 @@
+require "test_helper"
+
+class Provider::RedbarkTest < ActiveSupport::TestCase
+  test "initializes with api key" do
+    provider = Provider::Redbark.new(api_key: "rbk_live_test")
+    assert_equal "rbk_live_test", provider.api_key
+  end
+
+  test "raises configuration error when api key blank" do
+    assert_raises(Provider::Redbark::ConfigurationError) do
+      Provider::Redbark.new(api_key: "")
+    end
+  end
+
+  test "error includes error_type" do
+    error = Provider::Redbark::Error.new("Test error", :unauthorized)
+    assert_equal "Test error", error.message
+    assert_equal :unauthorized, error.error_type
+  end
+
+  test "error defaults error_type to unknown" do
+    error = Provider::Redbark::Error.new("Test error")
+    assert_equal :unknown, error.error_type
+  end
+
+  test "rate limit and server errors are typed for retry handling" do
+    assert Provider::Redbark::RateLimitError.new("limited", :rate_limited).is_a?(Provider::Redbark::Error)
+    assert Provider::Redbark::ServerError.new("boom", :server_error).is_a?(Provider::Redbark::Error)
+  end
+
+  test "get_transactions splits the window when the server truncates" do
+    provider = Provider::Redbark.new(api_key: "rbk_live_test")
+
+    stub_request(:get, "https://api.redbark.com/v1/transactions")
+      .with(query: hash_including("from" => "2026-01-01", "to" => "2026-01-31"))
+      .to_return(
+        status: 200,
+        headers: { "Content-Type" => "application/json", "X-Redbark-Truncated" => "true" },
+        body: { data: [ { id: "t1" } ], pagination: { hasMore: true } }.to_json
+      )
+    stub_request(:get, "https://api.redbark.com/v1/transactions")
+      .with(query: hash_including("from" => "2026-01-01", "to" => "2026-01-16"))
+      .to_return(
+        status: 200,
+        headers: { "Content-Type" => "application/json" },
+        body: { data: [ { id: "t1" }, { id: "t2" } ], pagination: { hasMore: false } }.to_json
+      )
+    stub_request(:get, "https://api.redbark.com/v1/transactions")
+      .with(query: hash_including("from" => "2026-01-17", "to" => "2026-01-31"))
+      .to_return(
+        status: 200,
+        headers: { "Content-Type" => "application/json" },
+        body: { data: [ { id: "t3" } ], pagination: { hasMore: false } }.to_json
+      )
+
+    results = provider.get_transactions(
+      connection_id: "conn_1",
+      account_id: "acc_1",
+      start_date: Date.new(2026, 1, 1),
+      end_date: Date.new(2026, 1, 31)
+    )
+
+    assert_equal %w[t1 t2 t3], results.map { |t| t[:id] }
+  end
+
+  test "get_transactions raises when a truncated window cannot be narrowed" do
+    provider = Provider::Redbark.new(api_key: "rbk_live_test")
+
+    stub_request(:get, "https://api.redbark.com/v1/transactions")
+      .with(query: hash_including("connectionId" => "conn_1"))
+      .to_return(
+        status: 200,
+        headers: { "Content-Type" => "application/json", "X-Redbark-Truncated" => "true" },
+        body: { data: [ { id: "t1" } ], pagination: { hasMore: true } }.to_json
+      )
+
+    error = assert_raises(Provider::Redbark::Error) do
+      provider.get_transactions(
+        connection_id: "conn_1",
+        account_id: "acc_1",
+        start_date: Date.new(2026, 1, 5),
+        end_date: Date.new(2026, 1, 5)
+      )
+    end
+    assert_equal :truncated, error.error_type
+  end
+end
diff --git a/test/models/provider/registry_test.rb b/test/models/provider/registry_test.rb
index 2aa274662..48c3d2fdf 100644
--- a/test/models/provider/registry_test.rb
+++ b/test/models/provider/registry_test.rb
@@ -107,4 +107,39 @@ class Provider::RegistryTest < ActiveSupport::TestCase
       assert_instance_of Provider::Openai, provider
     end
   end
+
+  test "preferred_llm_provider returns openai by default" do
+    openai = mock("openai")
+    Provider::Registry.stubs(:openai).returns(openai)
+    Provider::Registry.stubs(:anthropic).returns(mock("anthropic"))
+    Setting.stubs(:llm_provider).returns("openai")
+
+    assert_same openai, Provider::Registry.preferred_llm_provider
+  end
+
+  test "preferred_llm_provider returns anthropic when selected" do
+    anthropic = mock("anthropic")
+    Provider::Registry.stubs(:openai).returns(mock("openai"))
+    Provider::Registry.stubs(:anthropic).returns(anthropic)
+    Setting.stubs(:llm_provider).returns("anthropic")
+
+    assert_same anthropic, Provider::Registry.preferred_llm_provider
+  end
+
+  test "preferred_llm_provider falls back to the configured provider when the selected one is unconfigured" do
+    openai = mock("openai")
+    Provider::Registry.stubs(:openai).returns(openai)
+    Provider::Registry.stubs(:anthropic).returns(nil)
+    Setting.stubs(:llm_provider).returns("anthropic")
+
+    assert_same openai, Provider::Registry.preferred_llm_provider
+  end
+
+  test "preferred_llm_provider returns nil when no provider is configured" do
+    Provider::Registry.stubs(:openai).returns(nil)
+    Provider::Registry.stubs(:anthropic).returns(nil)
+    Setting.stubs(:llm_provider).returns("openai")
+
+    assert_nil Provider::Registry.preferred_llm_provider
+  end
 end
diff --git a/test/models/provider/rentcast_test.rb b/test/models/provider/rentcast_test.rb
new file mode 100644
index 000000000..e0e1fde05
--- /dev/null
+++ b/test/models/provider/rentcast_test.rb
@@ -0,0 +1,96 @@
+require "test_helper"
+
+class Provider::RentcastTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::Rentcast.new("test_api_key")
+    @provider.stubs(:throttle_request)
+  end
+
+  def avm_response_body
+    {
+      "price" => 356_000,
+      "priceRangeLow" => 330_000,
+      "priceRangeHigh" => 382_000,
+      "subjectProperty" => {
+        "formattedAddress" => "5500 Grand Lake Dr, San Antonio, TX 78244",
+        "propertyType" => "Single Family",
+        "yearBuilt" => 1973,
+        "squareFootage" => 1878
+      }
+    }.to_json
+  end
+
+  test "fetches valuation and property attributes in a single request" do
+    stub = stub_request(:get, "https://api.rentcast.io/v1/avm/value")
+      .with(
+        query: {
+          "address" => "5500 Grand Lake Dr, San Antonio, TX, 78244",
+          "lookupSubjectAttributes" => "true"
+        },
+        headers: { "X-Api-Key" => "test_api_key" }
+      )
+      .to_return(status: 200, body: avm_response_body)
+
+    response = @provider.fetch_property_valuation(
+      line1: "5500 Grand Lake Dr",
+      locality: "San Antonio",
+      region: "TX",
+      postal_code: "78244"
+    )
+
+    assert response.success?
+    data = response.data
+    assert_equal 356_000, data.valuation
+    assert_equal "USD", data.currency
+    assert_equal "single_family_home", data.property_type
+    assert_equal 1973, data.year_built
+    assert_equal 1878, data.area_value
+    assert_equal "sqft", data.area_unit
+    assert_requested stub
+  end
+
+  test "returns a friendly error when no property matches the address" do
+    stub_request(:get, "https://api.rentcast.io/v1/avm/value")
+      .with(query: hash_including("address" => "1 Nowhere Ln"))
+      .to_return(status: 404, body: { "error" => "Not found" }.to_json)
+
+    response = @provider.fetch_property_valuation(line1: "1 Nowhere Ln")
+
+    assert_not response.success?
+    assert_match(/could not find a property/i, response.error.message)
+  end
+
+  test "counts requests against the monthly budget" do
+    stub_request(:get, "https://api.rentcast.io/v1/avm/value")
+      .with(query: hash_including("lookupSubjectAttributes" => "true"))
+      .to_return(status: 200, body: avm_response_body)
+
+    assert @provider.requests_remaining?
+
+    @provider.fetch_property_valuation(line1: "5500 Grand Lake Dr")
+
+    assert_equal 1, ProviderRequestCount.count_for("rentcast")
+  end
+
+  test "monthly limit can be raised via ENV override" do
+    ProviderRequestCount.create!(provider_key: "rentcast", period: ProviderRequestCount.current_period, count: Provider::Rentcast::MAX_REQUESTS_PER_MONTH)
+
+    ENV["RENTCAST_MAX_REQUESTS_PER_MONTH"] = "100"
+    assert @provider.requests_remaining?
+  ensure
+    ENV.delete("RENTCAST_MAX_REQUESTS_PER_MONTH")
+  end
+
+  test "stops issuing requests once the monthly limit is reached" do
+    ProviderRequestCount.create!(provider_key: "rentcast", period: ProviderRequestCount.current_period, count: Provider::Rentcast::MAX_REQUESTS_PER_MONTH)
+
+    assert_not @provider.requests_remaining?
+
+    response = @provider.fetch_property_valuation(line1: "5500 Grand Lake Dr")
+
+    assert_not response.success?
+    assert_instance_of Provider::Rentcast::RateLimitError, response.error
+    assert_equal Provider::Rentcast::MAX_REQUESTS_PER_MONTH, ProviderRequestCount.count_for("rentcast")
+    assert_not_requested :get, %r{api\.rentcast\.io}
+  end
+end
diff --git a/test/models/provider/simplefin_test.rb b/test/models/provider/simplefin_test.rb
index a795b7342..194c33037 100644
--- a/test/models/provider/simplefin_test.rb
+++ b/test/models/provider/simplefin_test.rb
@@ -102,6 +102,39 @@ class Provider::SimplefinTest < ActiveSupport::TestCase
     assert_equal :server_error, error.error_type
   end
 
+  test "get_accounts sends pending=1 when pending is enabled" do
+    mock_response = OpenStruct.new(code: 200, body: '{"accounts": []}')
+
+    Provider::Simplefin.expects(:get)
+      .with { |url| url.include?("pending=1") }
+      .returns(mock_response)
+
+    @provider.get_accounts(@access_url, pending: true)
+  end
+
+  test "get_accounts omits the pending param when pending is disabled" do
+    # The SimpleFIN protocol has no pending=0 — bridges presence-check the
+    # param, so pending=0 behaves like pending=1. Disabling pending must omit
+    # the param entirely.
+    mock_response = OpenStruct.new(code: 200, body: '{"accounts": []}')
+
+    Provider::Simplefin.expects(:get)
+      .with { |url| !url.include?("pending") }
+      .returns(mock_response)
+
+    @provider.get_accounts(@access_url, pending: false)
+  end
+
+  test "get_accounts omits the pending param when pending is nil" do
+    mock_response = OpenStruct.new(code: 200, body: '{"accounts": []}')
+
+    Provider::Simplefin.expects(:get)
+      .with { |url| !url.include?("pending") }
+      .returns(mock_response)
+
+    @provider.get_accounts(@access_url, pending: nil)
+  end
+
   test "claim_access_url retries on network errors" do
     setup_token = Base64.encode64("https://example.com/claim")
     mock_response = OpenStruct.new(code: 200, body: "https://example.com/access")
diff --git a/test/models/provider/snaptrade_adapter_test.rb b/test/models/provider/snaptrade_adapter_test.rb
new file mode 100644
index 000000000..3fefcc336
--- /dev/null
+++ b/test/models/provider/snaptrade_adapter_test.rb
@@ -0,0 +1,35 @@
+require "test_helper"
+
+class Provider::SnaptradeAdapterTest < ActiveSupport::TestCase
+  test "supports Investment and Crypto accounts" do
+    assert_includes Provider::SnaptradeAdapter.supported_account_types, "Investment"
+    assert_includes Provider::SnaptradeAdapter.supported_account_types, "Crypto"
+  end
+
+  test "build_provider returns nil when family is nil" do
+    assert_nil Provider::SnaptradeAdapter.build_provider(family: nil)
+  end
+
+  test "build_provider returns nil when OAuth app is not configured" do
+    Provider::Snaptrade.stubs(:oauth_configured?).returns(false)
+
+    assert_nil Provider::SnaptradeAdapter.build_provider(family: families(:dylan_family))
+  end
+
+  test "build_provider returns nil when family has no authorized snaptrade item" do
+    Provider::Snaptrade.stubs(:oauth_configured?).returns(true)
+
+    assert_nil Provider::SnaptradeAdapter.build_provider(family: families(:empty))
+  end
+
+  test "build_provider returns a Provider::Snaptrade wrapping the authorized item" do
+    Provider::Snaptrade.stubs(:oauth_configured?).returns(true)
+    family = families(:dylan_family)
+    item = snaptrade_items(:configured_item)
+
+    provider = Provider::SnaptradeAdapter.build_provider(family: family)
+
+    assert_instance_of Provider::Snaptrade, provider
+    assert_equal item, provider.snaptrade_item
+  end
+end
diff --git a/test/models/provider/snaptrade_oauth_test.rb b/test/models/provider/snaptrade_oauth_test.rb
new file mode 100644
index 000000000..7c65889fa
--- /dev/null
+++ b/test/models/provider/snaptrade_oauth_test.rb
@@ -0,0 +1,228 @@
+require "test_helper"
+require "ostruct"
+
+class Provider::SnaptradeOauthTest < ActiveSupport::TestCase
+  setup do
+    @original = Rails.configuration.x.snaptrade
+    Rails.configuration.x.snaptrade = ActiveSupport::OrderedOptions.new
+  end
+
+  teardown do
+    Rails.configuration.x.snaptrade = @original
+  end
+
+  test "oauth_configured? requires both client id and secret" do
+    assert_not Provider::Snaptrade.oauth_configured?
+
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    assert_not Provider::Snaptrade.oauth_configured?
+
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+    assert Provider::Snaptrade.oauth_configured?
+  end
+
+  # --- helpers ---
+  def configure_oauth!
+    Rails.configuration.x.snaptrade.oauth_client_id = "client-id"
+    Rails.configuration.x.snaptrade.oauth_client_secret = "client-secret"
+  end
+
+  def faraday_response(status:, body:)
+    OpenStruct.new(status: status, body: body, success?: (200..299).cover?(status))
+  end
+
+  def fake_item(access_token: "at-1", refresh_token: "rt-1", expires_at: 1.hour.from_now)
+    item = OpenStruct.new(
+      oauth_access_token: access_token,
+      oauth_refresh_token: refresh_token,
+      oauth_token_expires_at: expires_at,
+      family: nil
+    )
+    def item.apply_oauth_tokens!(payload)
+      (@applied ||= []) << payload
+      self.oauth_access_token = payload["access_token"]
+    end
+    def item.applied = @applied || []
+    def item.update!(attrs) = (@updates ||= []) << attrs
+    def item.updates = @updates || []
+    # Stand in for ActiveRecord's row-locking API used by Provider::Snaptrade#refresh_access_token!.
+    # By default there's nothing concurrent to guard against in these tests, so locking is a no-op
+    # and reload leaves attributes untouched (they're already "current" in memory).
+    def item.with_lock
+      yield
+    end
+    def item.reload
+      self
+    end
+    item
+  end
+
+  test "generate_pkce returns S256 challenge of the verifier" do
+    pkce = Provider::Snaptrade.generate_pkce
+    expected = Base64.urlsafe_encode64(OpenSSL::Digest::SHA256.digest(pkce[:verifier]), padding: false)
+    assert_equal expected, pkce[:challenge]
+    assert pkce[:verifier].length.between?(43, 128)
+  end
+
+  test "authorize_url contains all required OAuth params" do
+    configure_oauth!
+    url = Provider::Snaptrade.authorize_url(
+      redirect_uri: "https://sure.test/callback", state: "st4te", code_challenge: "ch4llenge"
+    )
+    uri = URI.parse(url)
+    params = Rack::Utils.parse_query(uri.query)
+    assert_equal "dashboard.snaptrade.com", uri.host
+    assert_equal "code", params["response_type"]
+    assert_equal "client-id", params["client_id"]
+    assert_equal "https://sure.test/callback", params["redirect_uri"]
+    assert_equal "read", params["scope"]
+    assert_equal "st4te", params["state"]
+    assert_equal "ch4llenge", params["code_challenge"]
+    assert_equal "S256", params["code_challenge_method"]
+  end
+
+  test "exchange_code posts grant with PKCE verifier and basic auth" do
+    configure_oauth!
+    connection = mock("faraday")
+    request = OpenStruct.new(headers: {})
+    connection.expects(:post).with(Provider::Snaptrade::TOKEN_URL).yields(request)
+      .returns(faraday_response(status: 200, body: { access_token: "at", refresh_token: "rt", expires_in: 900, token_type: "Bearer", scope: "read" }.to_json))
+    Provider::Snaptrade.stubs(:oauth_connection).returns(connection)
+
+    payload = Provider::Snaptrade.exchange_code(code: "c0de", redirect_uri: "https://sure.test/cb", code_verifier: "v3rifier")
+
+    assert_equal "at", payload["access_token"]
+    assert_equal "Basic #{Base64.strict_encode64('client-id:client-secret')}", request.headers["Authorization"]
+    body = Rack::Utils.parse_query(request.body)
+    assert_equal "authorization_code", body["grant_type"]
+    assert_equal "c0de", body["code"]
+    assert_equal "v3rifier", body["code_verifier"]
+    assert_equal "https://sure.test/cb", body["redirect_uri"]
+  end
+
+  test "token request raises AuthenticationError on 4xx with error description" do
+    configure_oauth!
+    connection = mock("faraday")
+    connection.expects(:post).returns(faraday_response(status: 400, body: { error: "invalid_grant", error_description: "expired" }.to_json))
+    Provider::Snaptrade.stubs(:oauth_connection).returns(connection)
+
+    error = assert_raises(Provider::Snaptrade::AuthenticationError) do
+      Provider::Snaptrade.refresh_tokens(refresh_token: "dead-rt")
+    end
+    assert_match "expired", error.message
+  end
+
+  test "data calls send Bearer token on API base URL" do
+    configure_oauth!
+    item = fake_item
+    provider = Provider::Snaptrade.new(item)
+
+    request = OpenStruct.new(headers: {}, params: {})
+    connection = mock("faraday")
+    connection.expects(:get).with("#{Provider::Snaptrade::API_BASE_URL}/api/v1/accounts").yields(request)
+      .returns(faraday_response(status: 200, body: [ { id: "acct-1" } ].to_json))
+    provider.stubs(:api_connection).returns(connection)
+
+    accounts = provider.list_accounts
+    assert_equal "Bearer at-1", request.headers["Authorization"]
+    assert_equal [ { "id" => "acct-1" } ], accounts
+  end
+
+  test "expired token is refreshed before the data call and rotation persisted" do
+    configure_oauth!
+    item = fake_item(expires_at: 1.minute.ago)
+    provider = Provider::Snaptrade.new(item)
+
+    Provider::Snaptrade.expects(:refresh_tokens).with(refresh_token: "rt-1")
+      .returns({ "access_token" => "at-2", "refresh_token" => "rt-2", "expires_in" => 900 })
+
+    request = OpenStruct.new(headers: {}, params: {})
+    connection = mock("faraday")
+    connection.expects(:get).yields(request).returns(faraday_response(status: 200, body: "[]"))
+    provider.stubs(:api_connection).returns(connection)
+
+    provider.list_accounts
+    assert_equal "Bearer at-2", request.headers["Authorization"]
+    assert_equal "at-2", item.applied.last["access_token"]
+  end
+
+  test "401 triggers one refresh and retry" do
+    configure_oauth!
+    item = fake_item
+    provider = Provider::Snaptrade.new(item)
+
+    Provider::Snaptrade.expects(:refresh_tokens).with(refresh_token: "rt-1")
+      .returns({ "access_token" => "at-2", "expires_in" => 900 })
+
+    connection = mock("faraday")
+    responses = [ faraday_response(status: 401, body: "{}"), faraday_response(status: 200, body: "[]") ]
+    connection.expects(:get).twice.yields(OpenStruct.new(headers: {}, params: {})).returns(*responses)
+    provider.stubs(:api_connection).returns(connection)
+
+    assert_equal [], provider.list_accounts
+  end
+
+  test "failed refresh marks item requires_update and raises AuthenticationError" do
+    configure_oauth!
+    item = fake_item(expires_at: 1.minute.ago)
+    provider = Provider::Snaptrade.new(item)
+    DebugLogEntry.stubs(:capture)
+
+    Provider::Snaptrade.expects(:refresh_tokens).raises(Provider::Snaptrade::AuthenticationError, "invalid_grant")
+
+    assert_raises(Provider::Snaptrade::AuthenticationError) { provider.list_accounts }
+    assert_includes item.updates, { status: :requires_update }
+  end
+
+  test "blank refresh token raises AuthenticationError and marks requires_update exactly once" do
+    configure_oauth!
+    item = fake_item(refresh_token: nil, expires_at: 1.minute.ago)
+    provider = Provider::Snaptrade.new(item)
+    DebugLogEntry.stubs(:capture)
+
+    assert_raises(Provider::Snaptrade::AuthenticationError) { provider.list_accounts }
+    assert_equal [ { status: :requires_update } ], item.updates
+  end
+
+  test "concurrent refresh race: reload inside lock finds already-fresh token and skips HTTP refresh" do
+    configure_oauth!
+    item = fake_item(access_token: "at-stale", expires_at: 1.minute.ago)
+    # Simulate a concurrent caller having already rotated the tokens in the DB by the time
+    # this caller acquires the row lock and reloads -- the in-memory copy looked expired,
+    # but the reloaded row is fresh.
+    def item.reload
+      self.oauth_access_token = "at-fresh"
+      self.oauth_token_expires_at = 1.hour.from_now
+      self
+    end
+    provider = Provider::Snaptrade.new(item)
+
+    Provider::Snaptrade.expects(:refresh_tokens).never
+
+    request = OpenStruct.new(headers: {}, params: {})
+    connection = mock("faraday")
+    connection.expects(:get).yields(request).returns(faraday_response(status: 200, body: "[]"))
+    provider.stubs(:api_connection).returns(connection)
+
+    assert_equal [], provider.list_accounts
+    assert_equal "Bearer at-fresh", request.headers["Authorization"]
+  end
+
+  test "get_connection_url posts login and returns redirect URI" do
+    configure_oauth!
+    provider = Provider::Snaptrade.new(fake_item)
+
+    request = OpenStruct.new(headers: {}, params: {})
+    connection = mock("faraday")
+    connection.expects(:post).with("#{Provider::Snaptrade::API_BASE_URL}/api/v1/snapTrade/login").yields(request)
+      .returns(faraday_response(status: 200, body: { redirectURI: "https://app.snaptrade.com/connect/xyz" }.to_json))
+    provider.stubs(:api_connection).returns(connection)
+
+    url = provider.get_connection_url(redirect_url: "https://sure.test/return", broker: "QUESTRADE")
+    assert_equal "https://app.snaptrade.com/connect/xyz", url
+    body = JSON.parse(request.body)
+    assert_equal "https://sure.test/return", body["customRedirect"]
+    assert_equal "read", body["connectionType"]
+    assert_equal "QUESTRADE", body["broker"]
+  end
+end
diff --git a/test/models/provider/tiingo_test.rb b/test/models/provider/tiingo_test.rb
new file mode 100644
index 000000000..506a19e28
--- /dev/null
+++ b/test/models/provider/tiingo_test.rb
@@ -0,0 +1,265 @@
+require "test_helper"
+
+class Provider::TiingoTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::Tiingo.new("test_api_key")
+    @provider.stubs(:throttle_request)
+    @provider.stubs(:track_symbol)
+  end
+
+  # Real response captured from Tiingo's /tiingo/utilities/search for VFV -
+  # note there is no priceCurrency field, only countryCode.
+  def vfv_search_body
+    [
+      {
+        "name" => "Vanguard S&P 500 Index ETF",
+        "ticker" => "VFV",
+        "permaTicker" => "CA000000140493",
+        "openFIGIComposite" => nil,
+        "assetType" => "ETF",
+        "isActive" => true,
+        "countryCode" => "CA"
+      }
+    ].to_json
+  end
+
+  def aapl_search_body
+    [
+      {
+        "name" => "Apple Inc",
+        "ticker" => "AAPL",
+        "permaTicker" => "US0000000123",
+        "assetType" => "Stock",
+        "isActive" => true,
+        "countryCode" => "US"
+      }
+    ].to_json
+  end
+
+  # Real response captured from Tiingo's /tiingo/utilities/search for AAPL -
+  # Tiingo returns two entries sharing the exact same ticker, a CA
+  # cross-listing (no openFIGIComposite) and the real US primary listing.
+  # The CA entry appears first in the array.
+  def aapl_duplicate_ticker_search_body
+    [
+      {
+        "name" => "Apple Inc",
+        "ticker" => "AAPL",
+        "permaTicker" => "CA000000137372",
+        "openFIGIComposite" => nil,
+        "assetType" => "Stock",
+        "isActive" => true,
+        "countryCode" => "CA"
+      },
+      {
+        "name" => "Apple Inc",
+        "ticker" => "AAPL",
+        "permaTicker" => "US000000000038",
+        "openFIGIComposite" => "BBG000B9XRY4",
+        "assetType" => "Stock",
+        "isActive" => true,
+        "countryCode" => "US"
+      }
+    ].to_json
+  end
+
+  def stub_client_get(body)
+    mock_response = mock
+    mock_response.stubs(:body).returns(body)
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(mock_response)
+    mock_client
+  end
+
+  # ================================
+  #        search_securities
+  # ================================
+
+  test "search_securities resolves USD for a US security with no priceCurrency field" do
+    stub_client_get(aapl_search_body)
+
+    result = @provider.search_securities("AAPL")
+
+    assert result.success?
+    security = result.data.first
+    assert_equal "AAPL", security.symbol
+    assert_equal "USD", security.currency
+  end
+
+  test "search_securities resolves CAD for a Canadian security via countryCode (VFV)" do
+    stub_client_get(vfv_search_body)
+
+    result = @provider.search_securities("VFV")
+
+    assert result.success?
+    security = result.data.first
+    assert_equal "VFV", security.symbol
+    assert_equal "CAD", security.currency
+    assert_equal "CA", security.country_code
+  end
+
+  test "search_securities resolves currency for a country outside the old hardcoded allowlist (FR)" do
+    body = [
+      { "name" => "Some Fund", "ticker" => "XYZ", "assetType" => "ETF", "isActive" => true, "countryCode" => "FR" }
+    ].to_json
+    stub_client_get(body)
+
+    result = @provider.search_securities("XYZ")
+
+    assert result.success?
+    assert_equal "EUR", result.data.first.currency
+  end
+
+  test "search_securities does not populate currency for an unrecognized country code" do
+    body = [
+      { "name" => "Some Fund", "ticker" => "XYZ", "assetType" => "ETF", "isActive" => true, "countryCode" => "ZZ" }
+    ].to_json
+    stub_client_get(body)
+
+    result = @provider.search_securities("XYZ")
+
+    assert result.success?
+    assert_nil result.data.first.currency
+  end
+
+  test "search_securities resolves the same US-listed currency for every entry sharing a ticker across multiple countries (AAPL)" do
+    stub_client_get(aapl_duplicate_ticker_search_body)
+
+    result = @provider.search_securities("AAPL")
+
+    assert result.success?
+    # Both the CA and US entries share ticker AAPL, and Tiingo's daily-price
+    # endpoint is looked up by ticker alone, so both must show the same
+    # currency that actually backs the price data (USD, from the US entry) -
+    # not each entry's own countryCode - otherwise the currency shown here
+    # would disagree with what fetch_security_prices later returns.
+    assert_equal [ "USD", "USD" ], result.data.map(&:currency)
+  end
+
+  test "search_securities caches the US-listed currency for a ticker with multiple country matches, not just the first array entry" do
+    # Test env uses cache_store = :null_store; swap in a real store to inspect
+    # what actually gets cached.
+    Rails.stubs(:cache).returns(ActiveSupport::Cache::MemoryStore.new)
+    stub_client_get(aapl_duplicate_ticker_search_body)
+
+    @provider.search_securities("AAPL")
+
+    assert_equal "USD", Rails.cache.read("tiingo:currency:AAPL")
+  end
+
+  test "search_securities does not downgrade a cached US-derived currency when a later search for the same ticker omits the US entry" do
+    # Test env uses cache_store = :null_store; swap in a real store so the
+    # cache write from the first search actually persists for the second.
+    Rails.stubs(:cache).returns(ActiveSupport::Cache::MemoryStore.new)
+
+    stub_client_get(aapl_duplicate_ticker_search_body)
+    @provider.search_securities("AAPL") # caches USD from the US entry
+    assert_equal "USD", Rails.cache.read("tiingo:currency:AAPL")
+
+    # A later search for the same ticker returns a result set that only
+    # includes the CA cross-listing (e.g. a different query string surfaced
+    # by Tiingo's relevance ranking) - the cached USD (backing the real daily
+    # price data) must not be silently overwritten with CAD.
+    ca_only_body = [
+      {
+        "name" => "Apple Inc",
+        "ticker" => "AAPL",
+        "permaTicker" => "CA000000137372",
+        "openFIGIComposite" => nil,
+        "assetType" => "Stock",
+        "isActive" => true,
+        "countryCode" => "CA"
+      }
+    ].to_json
+    stub_client_get(ca_only_body)
+
+    result = @provider.search_securities("AAPL")
+
+    assert result.success?
+    assert_equal "USD", Rails.cache.read("tiingo:currency:AAPL")
+  end
+
+  # ================================
+  #        fetch_security_prices
+  # ================================
+
+  test "fetch_security_prices resolves currency from the search-populated cache without a second request" do
+    # Test env uses cache_store = :null_store, so writes are no-ops - swap in a
+    # real in-memory store for this test to genuinely exercise the
+    # write-then-read cache path (matching real dev/production behavior),
+    # rather than always falling through to the fallback search.
+    Rails.stubs(:cache).returns(ActiveSupport::Cache::MemoryStore.new)
+
+    mock_client = stub_client_get(vfv_search_body)
+    @provider.search_securities("VFV") # populates the tiingo:currency:VFV cache entry
+
+    prices_body = [ { "date" => "2026-06-01T00:00:00.000Z", "close" => 100.5 } ].to_json
+    mock_response = mock
+    mock_response.stubs(:body).returns(prices_body)
+    # .expects(...).once (not .stubs) so this test fails loudly if a second
+    # request (the fallback search) is made - the cache hit should avoid it.
+    # client is private, so reuse the already-stubbed mock_client rather than
+    # calling @provider.client externally.
+    mock_client.expects(:get).once.returns(mock_response)
+
+    result = @provider.fetch_security_prices(symbol: "VFV", start_date: Date.new(2026, 6, 1), end_date: Date.new(2026, 6, 1))
+
+    assert result.success?, "expected success but got: #{result.error&.message}"
+    assert_equal "CAD", result.data.first.currency
+  end
+
+  test "fetch_security_prices falls back to a fresh search when the currency isn't cached, and resolves CAD for VFV" do
+    prices_body = [ { "date" => "2026-06-01T00:00:00.000Z", "close" => 100.5 } ].to_json
+    prices_response = mock
+    prices_response.stubs(:body).returns(prices_body)
+
+    search_response = mock
+    search_response.stubs(:body).returns(vfv_search_body)
+
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(prices_response).then.returns(search_response)
+
+    result = @provider.fetch_security_prices(symbol: "VFV", start_date: Date.new(2026, 6, 1), end_date: Date.new(2026, 6, 1))
+
+    assert result.success?, "expected success but got: #{result.error&.message}"
+    assert_equal "CAD", result.data.first.currency
+  end
+
+  test "fetch_security_prices resolves USD for AAPL via the fallback search even though the CA entry appears first" do
+    prices_body = [ { "date" => "2026-06-01T00:00:00.000Z", "close" => 200.0 } ].to_json
+    prices_response = mock
+    prices_response.stubs(:body).returns(prices_body)
+
+    search_response = mock
+    search_response.stubs(:body).returns(aapl_duplicate_ticker_search_body)
+
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(prices_response).then.returns(search_response)
+
+    result = @provider.fetch_security_prices(symbol: "AAPL", start_date: Date.new(2026, 6, 1), end_date: Date.new(2026, 6, 1))
+
+    assert result.success?, "expected success but got: #{result.error&.message}"
+    assert_equal "USD", result.data.first.currency
+  end
+
+  test "fetch_security_prices fails (does not raise, does not default to USD) when the country code is unrecognized" do
+    prices_body = [ { "date" => "2026-06-01T00:00:00.000Z", "close" => 42.0 } ].to_json
+    prices_response = mock
+    prices_response.stubs(:body).returns(prices_body)
+
+    unmapped_search_body = [
+      { "name" => "Some Fund", "ticker" => "ZZZ", "assetType" => "ETF", "isActive" => true, "countryCode" => "ZZ" }
+    ].to_json
+    search_response = mock
+    search_response.stubs(:body).returns(unmapped_search_body)
+
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(prices_response).then.returns(search_response)
+
+    result = @provider.fetch_security_prices(symbol: "ZZZ", start_date: Date.new(2026, 6, 1), end_date: Date.new(2026, 6, 1))
+
+    assert_not result.success?
+    assert_instance_of Provider::Tiingo::Error, result.error
+    assert_match "Could not determine currency", result.error.message
+  end
+end
diff --git a/test/models/provider/tinkoff_invest_test.rb b/test/models/provider/tinkoff_invest_test.rb
new file mode 100644
index 000000000..64ad247a8
--- /dev/null
+++ b/test/models/provider/tinkoff_invest_test.rb
@@ -0,0 +1,196 @@
+require "test_helper"
+
+class Provider::TinkoffInvestTest < ActiveSupport::TestCase
+  setup do
+    @provider = Provider::TinkoffInvest.new("test-token")
+    @provider.stubs(:throttle_request)
+    Rails.cache.clear
+  end
+
+  # ----- search -----
+
+  test "search_securities maps a share to a stock with MOEX MIC" do
+    stub_find("SBER", [ instrument_short(ticker: "SBER", name: "Sberbank", type: "share", class_code: "TQBR", currency: "rub", country: "RU") ])
+
+    response = @provider.search_securities("SBER")
+
+    assert response.success?
+    sec = response.data.first
+    assert_equal "SBER", sec.symbol
+    assert_equal "Sberbank", sec.name
+    assert_equal "MISX", sec.exchange_operating_mic
+    assert_equal "RU", sec.country_code
+    assert_equal "RUB", sec.currency
+    assert_nil sec.logo_url, "search results carry no brand; logos come from fetch_security_info"
+  end
+
+  test "search_securities skips unsupported instrument kinds (futures, currency)" do
+    stub_find("X", [
+      instrument_short(ticker: "FUT", name: "Future", type: "futures", class_code: "SPBFUT"),
+      instrument_short(ticker: "USD000UTSTOM", name: "Dollar", type: "currency", class_code: "CETS")
+    ])
+
+    response = @provider.search_securities("X")
+
+    assert_empty response.data
+  end
+
+  # ----- info / logo -----
+
+  test "fetch_security_info builds the CDN logo url from brand.logoName" do
+    stub_find("SBER", [ instrument_short(ticker: "SBER", type: "share", class_code: "TQBR", uid: "uid-sber") ])
+    stub_instrument_by("uid-sber", instrument_full(name: "Sberbank", logo_name: "SBER.png", exchange: "moex_mrng_evng_e_wknd_dlr"))
+
+    response = @provider.fetch_security_info(symbol: "SBER", exchange_operating_mic: "MISX")
+
+    assert response.success?
+    assert_equal "Sberbank", response.data.name
+    assert_equal "https://invest-brands.cdn-tinkoff.ru/SBERx160.png", response.data.logo_url
+    assert_equal "MISX", response.data.exchange_operating_mic
+    assert_equal "stock", response.data.kind
+  end
+
+  test "fetch_security_info returns a nil logo when brand is absent" do
+    stub_find("XXX", [ instrument_short(ticker: "XXX", type: "share", class_code: "TQBR", uid: "uid-x") ])
+    stub_instrument_by("uid-x", instrument_full(name: "No Brand", logo_name: nil))
+
+    response = @provider.fetch_security_info(symbol: "XXX", exchange_operating_mic: nil)
+
+    assert_nil response.data.logo_url
+  end
+
+  # ----- prices -----
+
+  test "fetch_security_prices parses daily candle closes and appends the live last price" do
+    travel_to Date.new(2026, 6, 18) do
+      stub_find("SBER", [ instrument_short(ticker: "SBER", type: "share", class_code: "TQBR", uid: "uid-sber", currency: "rub") ])
+      @provider.stubs(:post).with("MarketDataService", "GetCandles", anything).returns(
+        "candles" => [
+          candle("2026-06-16", units: 300, nano: 500_000_000),
+          candle("2026-06-17", units: 305, nano: 0)
+        ]
+      )
+      @provider.stubs(:post).with("MarketDataService", "GetLastPrices", anything).returns(
+        "lastPrices" => [ { "price" => { "units" => "310", "nano" => 250_000_000 } } ]
+      )
+
+      response = @provider.fetch_security_prices(symbol: "SBER", exchange_operating_mic: "MISX", start_date: Date.new(2026, 6, 16), end_date: Date.new(2026, 6, 18))
+
+      assert response.success?
+      by_date = response.data.index_by(&:date)
+      assert_equal BigDecimal("300.5"), by_date[Date.new(2026, 6, 16)].price
+      assert_equal BigDecimal("305"), by_date[Date.new(2026, 6, 17)].price
+      assert_equal BigDecimal("310.25"), by_date[Date.new(2026, 6, 18)].price, "today should use the live last price"
+      assert_equal "RUB", by_date[Date.new(2026, 6, 16)].currency
+    end
+  end
+
+  test "fetch_security_prices converts bond percent-of-par to money via nominal" do
+    travel_to Date.new(2026, 6, 18) do
+      stub_find("RU000A10AAQ4", [ instrument_short(ticker: "RU000A10AAQ4", isin: "RU000A10AAQ4", type: "bond", class_code: "TQCB", uid: "uid-bond", currency: "rub") ])
+      stub_bond_by("uid-bond", { "nominal" => { "units" => "1000", "nano" => 0 } })
+      @provider.stubs(:post).with("MarketDataService", "GetCandles", anything).returns(
+        "candles" => [ candle("2026-06-17", units: 103, nano: 700_000_000) ] # 103.7% of par
+      )
+      @provider.stubs(:post).with("MarketDataService", "GetLastPrices", anything).returns("lastPrices" => [])
+
+      response = @provider.fetch_security_prices(symbol: "RU000A10AAQ4", exchange_operating_mic: "MISX", start_date: Date.new(2026, 6, 17), end_date: Date.new(2026, 6, 17))
+
+      price = response.data.first
+      assert_equal BigDecimal("1037"), price.price, "103.7% of 1000 nominal = 1037"
+    end
+  end
+
+  test "fetch_security_prices fails (no zero price) when a bond nominal is missing" do
+    travel_to Date.new(2026, 6, 18) do
+      stub_find("RU000A10AAQ4", [ instrument_short(ticker: "RU000A10AAQ4", type: "bond", class_code: "TQCB", uid: "uid-bond", currency: "rub") ])
+      stub_bond_by("uid-bond", {}) # no nominal
+      @provider.stubs(:post).with("MarketDataService", "GetCandles", anything).returns("candles" => [ candle("2026-06-17", units: 103, nano: 0) ])
+      @provider.stubs(:post).with("MarketDataService", "GetLastPrices", anything).returns("lastPrices" => [])
+
+      response = @provider.fetch_security_prices(symbol: "RU000A10AAQ4", exchange_operating_mic: "MISX", start_date: Date.new(2026, 6, 17), end_date: Date.new(2026, 6, 17))
+
+      assert_not response.success?
+      assert_kind_of Provider::TinkoffInvest::InvalidSecurityPriceError, response.error
+    end
+  end
+
+  test "fetch_security_prices returns only the live price for an amortizing bond" do
+    travel_to Date.new(2026, 6, 18) do
+      stub_find("RU000A10AAQ4", [ instrument_short(ticker: "RU000A10AAQ4", type: "bond", class_code: "TQCB", uid: "uid-bond", currency: "rub") ])
+      stub_bond_by("uid-bond", { "nominal" => { "units" => "417", "nano" => 710_000_000 }, "amortizationFlag" => true })
+      @provider.stubs(:post).with("MarketDataService", "GetCandles", anything).returns("candles" => [ candle("2026-06-10", units: 105, nano: 0) ])
+      @provider.stubs(:post).with("MarketDataService", "GetLastPrices", anything).returns("lastPrices" => [ { "price" => { "units" => "103", "nano" => 0 } } ])
+
+      response = @provider.fetch_security_prices(symbol: "RU000A10AAQ4", exchange_operating_mic: "MISX", start_date: Date.new(2026, 6, 10), end_date: Date.new(2026, 6, 18))
+
+      # The historical candle is skipped (today's nominal must not reprice old par);
+      # only the live price remains, converted with the current nominal.
+      assert_equal [ Date.new(2026, 6, 18) ], response.data.map(&:date)
+      assert_equal (BigDecimal("103") / 100 * BigDecimal("417.71")), response.data.first.price
+    end
+  end
+
+  test "resolve strips an exchange suffix before querying T-Invest" do
+    stub_find("T", [ instrument_short(ticker: "T", type: "share", class_code: "TQBR", uid: "uid-t") ])
+    stub_instrument_by("uid-t", instrument_full(name: "T-Tech", logo_name: "tcs2.png"))
+
+    response = @provider.fetch_security_info(symbol: "T.MOEX", exchange_operating_mic: "MISX")
+
+    assert response.success?
+    assert_equal "https://invest-brands.cdn-tinkoff.ru/tcs2x160.png", response.data.logo_url
+  end
+
+  test "fetch_security_prices skips incomplete candles" do
+    travel_to Date.new(2026, 6, 18) do
+      stub_find("SBER", [ instrument_short(ticker: "SBER", type: "share", class_code: "TQBR", uid: "uid-sber", currency: "rub") ])
+      @provider.stubs(:post).with("MarketDataService", "GetCandles", anything).returns(
+        "candles" => [ candle("2026-06-17", units: 305, nano: 0, complete: false) ]
+      )
+      @provider.stubs(:post).with("MarketDataService", "GetLastPrices", anything).returns("lastPrices" => [])
+
+      response = @provider.fetch_security_prices(symbol: "SBER", exchange_operating_mic: "MISX", start_date: Date.new(2026, 6, 17), end_date: Date.new(2026, 6, 17))
+
+      assert_empty response.data
+    end
+  end
+
+  private
+
+    def stub_find(query, instruments)
+      @provider.stubs(:post)
+               .with("InstrumentsService", "FindInstrument", has_entry(query: query))
+               .returns("instruments" => instruments)
+    end
+
+    def stub_instrument_by(uid, instrument)
+      @provider.stubs(:post)
+               .with("InstrumentsService", "GetInstrumentBy", has_entry(id: uid))
+               .returns("instrument" => instrument)
+    end
+
+    def stub_bond_by(uid, instrument)
+      @provider.stubs(:post)
+               .with("InstrumentsService", "BondBy", has_entry(id: uid))
+               .returns("instrument" => instrument)
+    end
+
+    def instrument_short(ticker:, type:, class_code:, name: nil, uid: "uid", isin: "", currency: "rub", country: "RU", exchange: "moex", tradeable: true)
+      {
+        "ticker" => ticker, "name" => name || ticker, "instrumentType" => type,
+        "classCode" => class_code, "uid" => uid, "isin" => isin, "apiTradeAvailableFlag" => tradeable,
+        "currency" => currency, "countryOfRisk" => country, "exchange" => exchange
+      }
+    end
+
+    def instrument_full(name:, logo_name: nil, exchange: "moex", nominal: nil)
+      h = { "name" => name, "exchange" => exchange }
+      h["brand"] = { "logoName" => logo_name } unless logo_name.nil?
+      h["nominal"] = nominal if nominal
+      h
+    end
+
+    def candle(date, units:, nano:, complete: true)
+      { "time" => "#{date}T00:00:00Z", "close" => { "units" => units.to_s, "nano" => nano }, "isComplete" => complete }
+    end
+end
diff --git a/test/models/provider/up_test.rb b/test/models/provider/up_test.rb
new file mode 100644
index 000000000..297c0866c
--- /dev/null
+++ b/test/models/provider/up_test.rb
@@ -0,0 +1,201 @@
+require "test_helper"
+
+class Provider::UpTest < ActiveSupport::TestCase
+  FakeResponse = Struct.new(:code, :body, :message, keyword_init: true)
+
+  test "fetches paginated account transactions following JSON:API links.next with bearer auth" do
+    next_url = "https://api.up.com.au/api/v1/accounts/acc_123/transactions?page%5Bafter%5D=cursor2"
+    responses = [
+      FakeResponse.new(
+        code: 200,
+        message: "OK",
+        body: {
+          data: [ { type: "transactions", id: "tx_1", attributes: { status: "SETTLED" }, relationships: { account: { data: { id: "acc_123" } } } } ],
+          links: { prev: nil, next: next_url }
+        }.to_json
+      ),
+      FakeResponse.new(
+        code: 200,
+        message: "OK",
+        body: {
+          data: [ { type: "transactions", id: "tx_2", attributes: { status: "HELD" }, relationships: { account: { data: { id: "acc_123" } } } } ],
+          links: { prev: nil, next: nil }
+        }.to_json
+      )
+    ]
+    requests = []
+
+    Provider::Up.stub(:get, ->(url, headers:, query: nil) {
+      requests << { url: url, headers: headers, query: query }
+      responses.shift
+    }) do
+      client = Provider::Up.new("up-access-token")
+
+      transactions = client.get_account_transactions(
+        account_id: "acc_123",
+        since: Date.new(2026, 1, 1)
+      )
+
+      assert_equal [ "tx_1", "tx_2" ], transactions.map { |tx| tx[:id] }
+      assert_equal [ "acc_123", "acc_123" ], transactions.map { |tx| tx[:account_id] }
+      assert_equal "SETTLED", transactions.first[:status]
+    end
+
+    assert_equal 2, requests.size
+    assert_match "/accounts/acc_123/transactions", requests.first[:url]
+    assert_equal "Bearer up-access-token", requests.first[:headers]["Authorization"]
+    assert_equal "2026-01-01T00:00:00Z", requests.first[:query]["filter[since]"]
+    assert_equal 100, requests.first[:query]["page[size]"]
+    # Pagination follows the absolute next URL with no extra query params.
+    assert_equal next_url, requests.second[:url]
+    assert_nil requests.second[:query]
+  end
+
+  test "stops paginating when the API repeats the same next cursor" do
+    repeating_url = "https://api.up.com.au/api/v1/accounts/acc_123/transactions?page%5Bafter%5D=loop"
+    page = FakeResponse.new(
+      code: 200,
+      message: "OK",
+      body: {
+        data: [ { type: "transactions", id: "tx_1", attributes: { status: "SETTLED" }, relationships: { account: { data: { id: "acc_123" } } } } ],
+        links: { prev: nil, next: repeating_url }
+      }.to_json
+    )
+    request_count = 0
+
+    Provider::Up.stub(:get, ->(url, headers:, query: nil) {
+      request_count += 1
+      raise "infinite pagination loop" if request_count > 5
+
+      page
+    }) do
+      client = Provider::Up.new("up-access-token")
+      transactions = client.get_account_transactions(account_id: "acc_123")
+
+      # First request + one follow of the repeated cursor, then the guard stops.
+      assert_equal 2, request_count
+      assert_equal [ "tx_1", "tx_1" ], transactions.map { |tx| tx[:id] }
+    end
+  end
+
+  test "refuses to follow a pagination link pointing at a non-Up host" do
+    evil_url = "https://evil.example.com/api/v1/accounts/acc_123/transactions?page%5Bafter%5D=x"
+    first_page = FakeResponse.new(
+      code: 200,
+      message: "OK",
+      body: {
+        data: [ { type: "transactions", id: "tx_1", attributes: { status: "SETTLED" }, relationships: { account: { data: { id: "acc_123" } } } } ],
+        links: { prev: nil, next: evil_url }
+      }.to_json
+    )
+    requested_urls = []
+
+    Provider::Up.stub(:get, ->(url, headers:, query: nil) {
+      requested_urls << url
+      first_page
+    }) do
+      client = Provider::Up.new("up-access-token")
+
+      error = assert_raises(Provider::Up::UpError) do
+        client.get_account_transactions(account_id: "acc_123")
+      end
+      assert_equal :invalid_url, error.error_type
+    end
+
+    # The bearer token must never be sent to the foreign host.
+    assert_not_includes requested_urls, evil_url
+  end
+
+  test "flattens JSON:API account resources" do
+    response = FakeResponse.new(
+      code: 200,
+      message: "OK",
+      body: {
+        data: [ {
+          type: "accounts",
+          id: "acc_123",
+          attributes: {
+            displayName: "Spending",
+            accountType: "TRANSACTIONAL",
+            ownershipType: "INDIVIDUAL",
+            balance: { currencyCode: "AUD", value: "123.45", valueInBaseUnits: 12345 }
+          }
+        } ],
+        links: { prev: nil, next: nil }
+      }.to_json
+    )
+
+    Provider::Up.stub(:get, ->(_url, headers:, query: nil) { response }) do
+      accounts = Provider::Up.new("up-access-token").get_accounts
+
+      assert_equal 1, accounts.size
+      account = accounts.first
+      assert_equal "acc_123", account[:id]
+      assert_equal "Spending", account[:displayName]
+      assert_equal "TRANSACTIONAL", account[:accountType]
+      assert_equal "AUD", account.dig(:balance, :currencyCode)
+      assert_equal "123.45", account.dig(:balance, :value)
+    end
+  end
+
+  test "flattens transaction relationships including transferAccount" do
+    response = FakeResponse.new(
+      code: 200,
+      message: "OK",
+      body: {
+        data: [
+          {
+            type: "transactions", id: "tx_xfer",
+            attributes: { status: "SETTLED", description: "Transfer to Savings" },
+            relationships: {
+              account: { data: { id: "acc_123" } },
+              category: { data: nil },
+              transferAccount: { data: { id: "acc_saver" } }
+            }
+          },
+          {
+            type: "transactions", id: "tx_plain",
+            attributes: { status: "SETTLED", description: "Coffee" },
+            relationships: {
+              account: { data: { id: "acc_123" } },
+              category: { data: { id: "restaurants-and-cafes" } },
+              transferAccount: { data: nil }
+            }
+          }
+        ],
+        links: { prev: nil, next: nil }
+      }.to_json
+    )
+
+    # The stub deliberately ignores the query: keyword: this test exercises only
+    # response flattening, not the request params (pagination/date filters), which
+    # are covered by the pagination tests above.
+    Provider::Up.stub(:get, ->(_url, headers:, query: nil) { response }) do
+      transactions = Provider::Up.new("up-access-token").get_account_transactions(account_id: "acc_123")
+
+      assert_equal "acc_saver", transactions.first[:transfer_account_id]
+      assert_equal "restaurants-and-cafes", transactions.second[:category_id]
+      assert_nil transactions.second[:transfer_account_id]
+    end
+  end
+
+  test "raises typed errors for unauthorized responses" do
+    response = FakeResponse.new(code: 401, message: "Unauthorized", body: "{}")
+
+    Provider::Up.stub(:get, ->(_url, headers:, query: nil) { response }) do
+      error = assert_raises Provider::Up::UpError do
+        Provider::Up.new("invalid-token").get_accounts
+      end
+
+      assert_equal :unauthorized, error.error_type
+    end
+  end
+
+  test "raises configuration error when token blank" do
+    error = assert_raises Provider::Up::UpError do
+      Provider::Up.new("")
+    end
+
+    assert_equal :configuration_error, error.error_type
+  end
+end
diff --git a/test/models/provider/yahoo_finance_test.rb b/test/models/provider/yahoo_finance_test.rb
index da7ae6eb0..5d361b916 100644
--- a/test/models/provider/yahoo_finance_test.rb
+++ b/test/models/provider/yahoo_finance_test.rb
@@ -1,49 +1,382 @@
 require "test_helper"
 
 class Provider::YahooFinanceTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup do
     @provider = Provider::YahooFinance.new
+    @cache = ActiveSupport::Cache::MemoryStore.new
+    Rails.stubs(:cache).returns(@cache)
+    DebugLogEntry.stubs(:capture)
   end
 
   # ================================
   #        Health Check Tests
   # ================================
 
-  test "healthy? returns true when API is working" do
-    mock_response = mock
-    mock_response.stubs(:body).returns('{"chart":{"result":[{"meta":{"symbol":"AAPL"}}]}}')
+  test "health_status returns cached status and schedules a stale refresh" do
+    @cache.write(
+      Provider::YahooFinance::HEALTH_STATUS_CACHE_KEY,
+      { status: :healthy, checked_at: 16.minutes.ago },
+      expires_in: Provider::YahooFinance::HEALTH_STATUS_RETENTION
+    )
+    @provider.expects(:perform_health_check).never
 
-    @provider.stubs(:fetch_cookie_and_crumb).returns([ "test_cookie", "test_crumb" ])
-    @provider.stubs(:authenticated_client).returns(mock_client = mock)
-    mock_client.stubs(:get).returns(mock_response)
-
-    assert @provider.healthy?
+    assert_enqueued_with(job: YahooFinanceHealthCheckJob) do
+      assert_equal :healthy, @provider.health_status
+    end
   end
 
-  test "healthy? returns false when API fails" do
-    @provider.stubs(:fetch_cookie_and_crumb).raises(Provider::YahooFinance::AuthenticationError.new("auth failed"))
+  test "health_status returns unknown and schedules a cold refresh" do
+    @provider.expects(:perform_health_check).never
 
-    assert_not @provider.healthy?
+    assert_enqueued_with(job: YahooFinanceHealthCheckJob) do
+      assert_equal :unknown, @provider.health_status
+    end
   end
 
-  test "healthy? retries with fresh crumb on Unauthorized body response" do
-    unauthorized_body = '{"chart":{"error":{"code":"Unauthorized","description":"No crumb"}}}'
-    success_body = '{"chart":{"result":[{"meta":{"symbol":"AAPL"}}]}}'
+  test "health_status does not schedule a refresh for fresh evidence" do
+    @cache.write(
+      Provider::YahooFinance::HEALTH_STATUS_CACHE_KEY,
+      { status: :healthy, checked_at: Time.current },
+      expires_in: Provider::YahooFinance::HEALTH_STATUS_RETENTION
+    )
 
-    unauthorized_response = mock
-    unauthorized_response.stubs(:body).returns(unauthorized_body)
+    assert_no_enqueued_jobs only: YahooFinanceHealthCheckJob do
+      assert_equal :healthy, @provider.health_status
+    end
+  end
 
-    success_response = mock
-    success_response.stubs(:body).returns(success_body)
+  test "health_status caches a healthy provider assessment" do
+    stub_successful_health_authentication
+    stub_health_chart_responses(healthy_chart_response)
 
-    mock_client = mock
-    mock_client.stubs(:get).returns(unauthorized_response, success_response)
+    assert_equal :healthy, @provider.refresh_health_status
+    assert_equal :healthy, @provider.refresh_health_status
+  end
 
-    @provider.stubs(:fetch_cookie_and_crumb).returns([ "cookie1", "crumb1" ], [ "cookie2", "crumb2" ])
-    @provider.stubs(:authenticated_client).returns(mock_client)
-    @provider.expects(:clear_crumb_cache).once
+  test "health_status classifies a crumb HTTP 429 without retrying" do
+    cookie_response = health_response(
+      status: 404,
+      headers: { "set-cookie" => "A3=test-cookie; Max-Age=3600" }
+    )
+    crumb_response = health_response(status: 429, body: "secret response body")
+    auth_client = mock
+    auth_client.expects(:get).twice.returns(cookie_response, crumb_response)
+    @provider.stubs(:health_auth_client).returns(auth_client)
+    @provider.expects(:health_authenticated_client).never
 
-    assert @provider.healthy?
+    assert_equal :rate_limited, @provider.refresh_health_status
+  end
+
+  test "health_status classifies a cookie HTTP 429 without continuing crumb acquisition" do
+    auth_client = mock
+    auth_client.expects(:get).once.returns(health_response(status: 429, body: "secret response body"))
+    @provider.stubs(:health_auth_client).returns(auth_client)
+    @provider.expects(:health_authenticated_client).never
+
+    assert_equal :rate_limited, @provider.refresh_health_status
+  end
+
+  test "health_status classifies a chart HTTP 429 without retrying" do
+    stub_successful_health_authentication
+    stub_health_chart_responses(health_response(status: 429, body: "secret response body"))
+
+    assert_equal :rate_limited, @provider.refresh_health_status
+  end
+
+  test "health_status classifies connection failures and timeouts as unavailable" do
+    [ Faraday::ConnectionFailed.new("connection failed"), Faraday::TimeoutError.new("timed out") ].each do |error|
+      provider = Provider::YahooFinance.new
+      @cache.clear
+      auth_client = mock
+      auth_client.expects(:get).once.raises(error)
+      provider.stubs(:health_auth_client).returns(auth_client)
+
+      assert_equal :unavailable, provider.refresh_health_status
+    end
+  end
+
+  test "health_status clears Unauthorized credentials without retrying immediately" do
+    auth_client = mock
+    auth_client.expects(:get).times(4).returns(
+      cookie_health_response("cookie-1"), health_response(status: 200, body: "crumb-1"),
+      cookie_health_response("cookie-2"), health_response(status: 200, body: "crumb-2")
+    )
+    @provider.stubs(:health_auth_client).returns(auth_client)
+    stub_health_chart_responses(
+      health_response(status: 200, body: '{"chart":{"error":{"code":"Unauthorized"}}}'),
+      healthy_chart_response
+    )
+
+    travel_to Time.zone.parse("2026-07-20 12:00:00") do
+      assert_equal :unavailable, @provider.refresh_health_status
+      travel 5.minutes + 1.second
+      assert_equal :healthy, @provider.refresh_health_status
+    end
+  end
+
+  test "health_status classifies malformed and empty chart responses as unavailable" do
+    stub_successful_health_authentication
+    stub_health_chart_responses(
+      health_response(status: 200, body: "not-json"),
+      health_response(status: 200, body: '{"chart":{"result":[]}}')
+    )
+
+    travel_to Time.zone.parse("2026-07-20 12:00:00") do
+      assert_equal :unavailable, @provider.refresh_health_status
+      travel 5.minutes + 1.second
+      assert_equal :unavailable, @provider.refresh_health_status
+    end
+  end
+
+  test "health_status applies status-specific freshness windows" do
+    [
+      [ healthy_chart_response, 15.minutes, :healthy ],
+      [ health_response(status: 429), 30.minutes, :rate_limited ],
+      [ health_response(status: 503), 5.minutes, :unavailable ]
+    ].each do |first_response, freshness, first_status|
+      provider = Provider::YahooFinance.new
+      @cache.clear
+      stub_successful_health_authentication(provider: provider)
+      stub_health_chart_responses(first_response, healthy_chart_response, provider: provider)
+
+      travel_to Time.zone.parse("2026-07-20 12:00:00") do
+        assert_equal first_status, provider.refresh_health_status
+        travel freshness - 1.second
+        assert_equal first_status, provider.refresh_health_status
+        travel 2.seconds
+        assert_equal :healthy, provider.refresh_health_status
+      end
+    end
+  end
+
+  test "health_status returns stale evidence while one refresh is in progress" do
+    stub_successful_health_authentication
+    started = Queue.new
+    finish = Queue.new
+    calls = 0
+    chart_client = Object.new
+    chart_client.define_singleton_method(:get) do |*_args|
+      calls += 1
+      next healthy_chart_response if calls == 1
+
+      started << true
+      finish.pop
+      health_response(status: 503)
+    end
+    chart_client.define_singleton_method(:healthy_chart_response) { health_response(status: 200, body: '{"chart":{"result":[{}]}}') }
+    chart_client.define_singleton_method(:health_response) do |status:, body: ""|
+      OpenStruct.new(status: status, body: body, headers: {}, success?: status.between?(200, 299))
+    end
+    @provider.stubs(:health_authenticated_client).returns(chart_client)
+
+    travel_to Time.zone.parse("2026-07-20 12:00:00") do
+      assert_equal :healthy, @provider.refresh_health_status
+      travel 15.minutes + 1.second
+
+      refreshing = Thread.new { @provider.refresh_health_status }
+      started.pop
+      assert_equal :healthy, Provider::YahooFinance.new.health_status
+      finish << true
+      assert_equal :unavailable, refreshing.value
+    end
+  end
+
+  test "health_status returns unknown during a cold concurrent refresh" do
+    stub_successful_health_authentication
+    started = Queue.new
+    finish = Queue.new
+    chart_client = Object.new
+    response = healthy_chart_response
+    chart_client.define_singleton_method(:get) do |*_args|
+      started << true
+      finish.pop
+      response
+    end
+    @provider.stubs(:health_authenticated_client).returns(chart_client)
+
+    refreshing = Thread.new { @provider.refresh_health_status }
+    started.pop
+    assert_equal :unknown, Provider::YahooFinance.new.health_status
+    finish << true
+    assert_equal :healthy, refreshing.value
+  end
+
+  test "health_status discards stale evidence after one hour" do
+    stub_successful_health_authentication(count: 2)
+    started = Queue.new
+    finish = Queue.new
+    calls = 0
+    first_response = healthy_chart_response
+    refresh_response = healthy_chart_response
+    chart_client = Object.new
+    chart_client.define_singleton_method(:get) do |*_args|
+      calls += 1
+      next first_response if calls == 1
+
+      started << true
+      finish.pop
+      refresh_response
+    end
+    @provider.stubs(:health_authenticated_client).returns(chart_client)
+
+    travel_to Time.zone.parse("2026-07-20 12:00:00") do
+      assert_equal :healthy, @provider.refresh_health_status
+      travel 1.hour + 1.second
+
+      refreshing = Thread.new { @provider.refresh_health_status }
+      started.pop
+      assert_equal :unknown, Provider::YahooFinance.new.health_status
+      finish << true
+      assert_equal :healthy, refreshing.value
+    end
+  end
+
+  test "health_status lock expires and an obsolete refresh cannot overwrite newer evidence" do
+    stub_successful_health_authentication
+    started = Queue.new
+    finish = Queue.new
+    obsolete_response = health_response(status: 503)
+    blocking_client = Object.new
+    blocking_client.define_singleton_method(:get) do |*_args|
+      started << true
+      finish.pop
+      obsolete_response
+    end
+    @provider.stubs(:health_authenticated_client).returns(blocking_client)
+
+    first_refresh = Thread.new { @provider.refresh_health_status }
+    started.pop
+    travel 15.seconds + 1.second do
+      replacement = Provider::YahooFinance.new
+      stub_health_chart_responses(healthy_chart_response, provider: replacement)
+      assert_equal :healthy, replacement.refresh_health_status
+    end
+    finish << true
+
+    assert_equal :healthy, first_refresh.value
+    assert_equal :healthy, Provider::YahooFinance.new.health_status
+  end
+
+  test "health_status returns unknown without contacting Yahoo when cache access fails" do
+    failing_cache = mock
+    failing_cache.expects(:read).once.raises(Redis::BaseError.new("cache details"))
+    Rails.stubs(:cache).returns(failing_cache)
+    @provider.expects(:perform_health_check).never
+    DebugLogEntry.expects(:capture).with do |attributes|
+      attributes[:category] == "provider_health_cache" &&
+        attributes[:metadata] == { exception_class: "Redis::BaseError" } &&
+        attributes.to_s.exclude?("cache details")
+    end
+
+    assert_equal :unknown, @provider.health_status
+  end
+
+  test "health_status reports a credential-cache failure as unknown" do
+    backing_cache = @cache
+    read_count = 0
+    failing_cache = Object.new
+    failing_cache.define_singleton_method(:read) do |key|
+      read_count += 1
+      raise Redis::BaseError, "cache details" if read_count == 3
+
+      backing_cache.read(key)
+    end
+    failing_cache.define_singleton_method(:write) { |key, value, **options| backing_cache.write(key, value, **options) }
+    failing_cache.define_singleton_method(:delete) { |key| backing_cache.delete(key) }
+    Rails.stubs(:cache).returns(failing_cache)
+    @provider.expects(:health_auth_client).never
+
+    diagnostics = []
+    DebugLogEntry.stubs(:capture).with { |attributes| diagnostics << attributes }
+
+    assert_equal :unknown, @provider.refresh_health_status
+    assert_equal [ "provider_health_cache" ], diagnostics.map { |entry| entry[:category] }
+    assert diagnostics.none? { |entry| entry.to_s.include?("cache details") }
+  end
+
+  test "health_status records only safe state transitions" do
+    stub_successful_health_authentication
+    stub_health_chart_responses(health_response(status: 429, body: "secret-body"))
+    DebugLogEntry.expects(:capture).with do |attributes|
+      attributes[:category] == "provider_health" &&
+        attributes[:level] == "warn" &&
+        attributes[:metadata] == {
+          previous_state: :unknown,
+          new_state: :rate_limited,
+          health_check_stage: :chart,
+          http_status: 429
+        } &&
+        attributes.to_s.exclude?("secret-body")
+    end
+
+    assert_equal :rate_limited, @provider.refresh_health_status
+  end
+
+  test "health_status omits repeated diagnostics and records healthy recovery" do
+    stub_successful_health_authentication(count: 2)
+    stub_health_chart_responses(
+      health_response(status: 429),
+      health_response(status: 429),
+      healthy_chart_response
+    )
+    events = []
+    DebugLogEntry.stubs(:capture).with { |attributes| events << attributes }
+
+    travel_to Time.zone.parse("2026-07-20 12:00:00") do
+      assert_equal :rate_limited, @provider.refresh_health_status
+      travel 30.minutes + 1.second
+      assert_equal :rate_limited, @provider.refresh_health_status
+      travel 30.minutes + 1.second
+      assert_equal :healthy, @provider.refresh_health_status
+    end
+
+    assert_equal %i[rate_limited healthy], events.map { |event| event.dig(:metadata, :new_state) }
+    assert_equal %w[warn info], events.map { |event| event[:level] }
+  end
+
+  test "healthy? is true only for healthy" do
+    %i[healthy rate_limited unavailable unknown].each do |status|
+      provider = Provider::YahooFinance.new
+      provider.stubs(:health_status).returns(status)
+
+      assert_equal status == :healthy, provider.healthy?
+    end
+  end
+
+  test "rate-limited health status does not gate or change normal price and exchange-rate operations" do
+    stub_successful_health_authentication
+    stub_health_chart_responses(health_response(status: 429))
+    assert_equal :rate_limited, @provider.refresh_health_status
+
+    @provider.stubs(:fetch_authenticated_chart).returns(
+      "chart" => {
+        "result" => [ {
+          "meta" => { "currency" => "USD", "exchangeName" => "NMS" },
+          "timestamp" => [ Time.utc(2026, 7, 17).to_i ],
+          "indicators" => { "quote" => [ { "close" => [ 210.25 ] } ] }
+        } ]
+      }
+    )
+    @provider.stubs(:throttle_request)
+
+    price_response = @provider.fetch_security_prices(
+      symbol: "AAPL",
+      exchange_operating_mic: "XNAS",
+      start_date: Date.new(2026, 7, 17),
+      end_date: Date.new(2026, 7, 17)
+    )
+    exchange_rate_response = @provider.fetch_exchange_rates(
+      from: "USD",
+      to: "EUR",
+      start_date: Date.new(2026, 7, 17),
+      end_date: Date.new(2026, 7, 17)
+    )
+
+    assert price_response.success?
+    assert exchange_rate_response.success?
+    assert_equal :rate_limited, @provider.refresh_health_status
   end
 
   # ================================
@@ -135,6 +468,51 @@ class Provider::YahooFinanceTest < ActiveSupport::TestCase
     assert_equal [], response.data
   end
 
+  test "search_securities returns canonical Colombian identity for Yahoo BVC listings" do
+    mock_response = mock
+    mock_response.stubs(:body).returns({
+      quotes: [ {
+        symbol: "CIBEST.CL",
+        longname: "Grupo Cibest S.A.",
+        exchange: "BVC",
+        exchDisp: "Colombia"
+      } ]
+    }.to_json)
+
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(mock_response)
+
+    response = @provider.search_securities("CIBEST.CL")
+
+    assert response.success?
+    security = response.data.sole
+    assert_equal "CIBEST.CL", security.symbol
+    assert_equal "XBOG", security.exchange_operating_mic
+    assert_equal "CO", security.country_code
+  end
+
+  test "search_securities preserves catalog countries and display-name fallback" do
+    mock_response = mock
+    mock_response.stubs(:body).returns({
+      quotes: [
+        { symbol: "AAPL", shortname: "Apple", exchange: "NMS", exchDisp: "NASDAQ" },
+        { symbol: "SAP.F", shortname: "SAP", exchange: "FRA", exchDisp: "Frankfurt" },
+        { symbol: "FALLBACK", shortname: "Fallback", exchange: "UNKNOWN", exchDisp: "Frankfurt" }
+      ]
+    }.to_json)
+
+    @provider.stubs(:client).returns(mock_client = mock)
+    mock_client.stubs(:get).returns(mock_response)
+
+    response = @provider.search_securities("company")
+
+    assert response.success?
+    results_by_symbol = response.data.index_by(&:symbol)
+    assert_equal "US", results_by_symbol.fetch("AAPL").country_code
+    assert_equal "DE", results_by_symbol.fetch("SAP.F").country_code
+    assert_equal "DE", results_by_symbol.fetch("FALLBACK").country_code
+  end
+
   # ================================
   #     Security Price Tests
   # ================================
@@ -148,6 +526,42 @@ class Provider::YahooFinanceTest < ActiveSupport::TestCase
     assert_instance_of Provider::YahooFinance::Error, response.error
   end
 
+  test "fetch_security_prices uses the Colombian Yahoo suffix once and COP fallback" do
+    date = Date.new(2024, 1, 15)
+    chart_response = mock
+    chart_response.stubs(:body).returns({
+      chart: {
+        result: [ {
+          meta: { exchangeName: "BVC" },
+          timestamp: [ Time.utc(2024, 1, 15).to_i ],
+          indicators: { quote: [ { close: [ 42_350.0 ] } ] }
+        } ]
+      }
+    }.to_json)
+    chart_client = mock
+    chart_client.expects(:get).with(regexp_matches(%r{/v8/finance/chart/CIBEST\.CL$})).twice.returns(chart_response)
+    @provider.stubs(:fetch_cookie_and_crumb).returns([ "cookie", "crumb" ])
+    @provider.stubs(:authenticated_client).with("cookie").returns(chart_client)
+    @provider.stubs(:throttle_request)
+
+    responses = [ "CIBEST", "CIBEST.CL" ].map do |symbol|
+      @provider.fetch_security_prices(
+        symbol: symbol,
+        exchange_operating_mic: "XBOG",
+        start_date: date,
+        end_date: date
+      )
+    end
+
+    responses.each do |response|
+      assert response.success?
+      price = response.data.sole
+      assert_equal "CIBEST.CL", price.symbol
+      assert_equal "COP", price.currency
+      assert_equal "XBOG", price.exchange_operating_mic
+    end
+  end
+
   # ================================
   #         Caching Tests
   # ================================
@@ -182,6 +596,26 @@ class Provider::YahooFinanceTest < ActiveSupport::TestCase
     end
   end
 
+  test "classifies a successful crumb response containing a rate limit body" do
+    cookie_response = mock
+    cookie_response.stubs(:headers).returns({ "set-cookie" => "A3=test-cookie; Max-Age=3600" })
+
+    crumb_response = mock
+    crumb_response.stubs(:status).returns(200)
+    crumb_response.stubs(:body).returns("Too Many Requests")
+    crumb_response.stubs(:success?).returns(true)
+
+    auth_client = mock
+    auth_client.stubs(:get).returns(cookie_response, crumb_response)
+    @provider.stubs(:auth_client).returns(auth_client)
+    @provider.stubs(:throttle_request)
+
+    result = @provider.fetch_security_info(symbol: "AAPL", exchange_operating_mic: "XNAS")
+
+    assert_not result.success?
+    assert_instance_of Provider::YahooFinance::RateLimitError, result.error
+  end
+
   test "handles 401 unauthorized as authentication error" do
     unauthorized_error = Faraday::UnauthorizedError.new("Unauthorized", { body: "Invalid Crumb" })
 
@@ -470,4 +904,47 @@ class Provider::YahooFinanceTest < ActiveSupport::TestCase
     result = @provider.send(:deduplicate_dual_listings, securities)
     assert_equal securities, result
   end
+
+  private
+
+    def stub_successful_health_authentication(provider: @provider, count: 1)
+      responses = count.times.flat_map do |index|
+        [
+          cookie_health_response("test-cookie-#{index}"),
+          health_response(status: 200, body: "test-crumb-#{index}")
+        ]
+      end
+      auth_client = mock
+      auth_client.expects(:get).times(responses.length).returns(*responses)
+      provider.stubs(:health_auth_client).returns(auth_client)
+    end
+
+    def stub_health_chart_responses(*responses, provider: @provider)
+      chart_client = mock
+      chart_client.expects(:get).times(responses.length).returns(*responses)
+      provider.stubs(:health_authenticated_client).returns(chart_client)
+    end
+
+    def cookie_health_response(cookie)
+      health_response(
+        status: 404,
+        headers: { "set-cookie" => "A3=#{cookie}; Max-Age=3600" }
+      )
+    end
+
+    def healthy_chart_response
+      health_response(
+        status: 200,
+        body: '{"chart":{"result":[{"meta":{"symbol":"AAPL"}}]}}'
+      )
+    end
+
+    def health_response(status:, body: "", headers: {})
+      OpenStruct.new(
+        status: status,
+        body: body,
+        headers: headers,
+        success?: status.between?(200, 299)
+      )
+    end
 end
diff --git a/test/models/provider_connection_status_test.rb b/test/models/provider_connection_status_test.rb
index fa243a715..b5449793a 100644
--- a/test/models/provider_connection_status_test.rb
+++ b/test/models/provider_connection_status_test.rb
@@ -89,4 +89,42 @@ class ProviderConnectionStatusTest < ActiveSupport::TestCase
     refute_includes kraken_status.keys, :api_secret
     assert_equal true, kraken_status[:credentials_configured]
   end
+
+  test "simplefin provider status does not require setup token after partial account sync" do
+    family = families(:dylan_family)
+    item = SimplefinItem.create!(
+      family: family,
+      name: "SimpleFIN",
+      access_url: "https://example.com/access",
+      status: :requires_update,
+      pending_account_setup: true
+    )
+    completed_sync = item.syncs.create!(
+      status: "completed",
+      created_at: Time.current,
+      completed_at: Time.current,
+      sync_stats: {
+        total_accounts: 18,
+        linked_accounts: 17,
+        unlinked_accounts: 1,
+        error_buckets: { auth: 1 }
+      }
+    )
+    provider = ProviderConnectionStatus::PROVIDERS.find { |entry| entry[:association] == :simplefin_items }
+
+    item.expects(:syncs).never
+
+    status = ProviderConnectionStatus.new(
+      provider,
+      item,
+      latest_sync: completed_sync,
+      latest_completed_sync: completed_sync,
+      syncing: false
+    ).to_h
+
+    assert_equal "good", status[:status]
+    assert_equal false, status[:requires_update]
+    assert_equal true, status[:pending_account_setup]
+    assert_equal "17 synced, 1 need setup", status.dig(:sync, :status_summary)
+  end
 end
diff --git a/test/models/provider_merchant/enhancer_test.rb b/test/models/provider_merchant/enhancer_test.rb
index e3d717a38..abd92d7e3 100644
--- a/test/models/provider_merchant/enhancer_test.rb
+++ b/test/models/provider_merchant/enhancer_test.rb
@@ -71,7 +71,9 @@ class ProviderMerchant::EnhancerTest < ActiveSupport::TestCase
   end
 
   test "returns zero counts when no LLM provider" do
+    # No provider configured: preferred_llm_provider checks both before nil.
     Provider::Registry.stubs(:get_provider).with(:openai).returns(nil)
+    Provider::Registry.stubs(:get_provider).with(:anthropic).returns(nil)
 
     result = ProviderMerchant::Enhancer.new(@family).enhance
 
diff --git a/test/models/provider_request_count_test.rb b/test/models/provider_request_count_test.rb
new file mode 100644
index 000000000..d3833099b
--- /dev/null
+++ b/test/models/provider_request_count_test.rb
@@ -0,0 +1,31 @@
+require "test_helper"
+
+class ProviderRequestCountTest < ActiveSupport::TestCase
+  test "increment! creates the counter and returns the new count" do
+    assert_equal 1, ProviderRequestCount.increment!("rentcast")
+    assert_equal 2, ProviderRequestCount.increment!("rentcast")
+    assert_equal 2, ProviderRequestCount.count_for("rentcast")
+  end
+
+  test "counts are scoped per provider and period" do
+    ProviderRequestCount.increment!("rentcast")
+    ProviderRequestCount.increment!("realie")
+    ProviderRequestCount.increment!("rentcast", period: "2020-01")
+
+    assert_equal 1, ProviderRequestCount.count_for("rentcast")
+    assert_equal 1, ProviderRequestCount.count_for("realie")
+    assert_equal 1, ProviderRequestCount.count_for("rentcast", period: "2020-01")
+  end
+
+  test "decrement! floors at zero" do
+    ProviderRequestCount.increment!("rentcast")
+    ProviderRequestCount.decrement!("rentcast")
+    ProviderRequestCount.decrement!("rentcast")
+
+    assert_equal 0, ProviderRequestCount.count_for("rentcast")
+  end
+
+  test "count_for returns zero when no counter exists" do
+    assert_equal 0, ProviderRequestCount.count_for("rentcast")
+  end
+end
diff --git a/test/models/qif_import_test.rb b/test/models/qif_import_test.rb
index e370b42be..d48007a7e 100644
--- a/test/models/qif_import_test.rb
+++ b/test/models/qif_import_test.rb
@@ -854,6 +854,22 @@ class QifImportTest < ActiveSupport::TestCase
 
   # ── QifParser: normalize_qif_date ──────────────────────────────────────────
 
+  test "normalize_qif_date preserves single spaces for month-name dates" do
+    assert_equal "26 Jan 2026", QifParser.send(:normalize_qif_date, "26 Jan 2026")
+  end
+
+  test "normalize_qif_date collapses multiple spaces in month-name dates" do
+    assert_equal "26 Jan 2026", QifParser.send(:normalize_qif_date, "26  Jan  2026")
+  end
+
+  test "normalize_qif_date still strips spaces from numeric dates" do
+    assert_equal "6/4/2020", QifParser.send(:normalize_qif_date, "6/ 4/2020")
+  end
+
+  test "normalize_qif_date expands 2-digit year for month-name dates" do
+    assert_equal "26 Jan 2026", QifParser.send(:normalize_qif_date, "26 Jan 26")
+  end
+
   test "normalize_qif_date converts apostrophe 2-digit year" do
     assert_equal "6/4/2020", QifParser.send(:normalize_qif_date, "6/ 4'20")
   end
@@ -898,6 +914,14 @@ class QifImportTest < ActiveSupport::TestCase
     assert_equal "2020-06-04", QifParser.send(:parse_qif_date, "2020-06-04", date_format: "%Y-%m-%d")
   end
 
+  test "parse_qif_date parses month-name format (DD MMM YYYY)" do
+    assert_equal "2026-01-26", QifParser.send(:parse_qif_date, "26 Jan 2026", date_format: "%d %b %Y")
+  end
+
+  test "parse_qif_date parses month-name format with 2-digit year" do
+    assert_equal "2026-01-26", QifParser.send(:parse_qif_date, "26 Jan 26", date_format: "%d %b %Y")
+  end
+
   test "parse_qif_date returns nil for invalid date" do
     assert_nil QifParser.send(:parse_qif_date, "13/32/2020", date_format: "%m/%d/%Y")
   end
@@ -962,6 +986,11 @@ class QifImportTest < ActiveSupport::TestCase
     assert_equal "%Y-%m-%d", Import.detect_date_format(samples)
   end
 
+  test "detect_date_format identifies month-name DD MMM YYYY format" do
+    samples = [ "26 Jan 2026", "23 Jan 2026", "02 Feb 2026" ]
+    assert_equal "%d %b %Y", Import.detect_date_format(samples)
+  end
+
   test "detect_date_format returns fallback for blank samples" do
     assert_equal "%Y-%m-%d", Import.detect_date_format([])
     assert_equal "%Y-%m-%d", Import.detect_date_format(nil)
@@ -1016,6 +1045,48 @@ class QifImportTest < ActiveSupport::TestCase
     assert_equal "%d/%m/%Y", @import.reload.qif_date_format
   end
 
+  # Reproduces #2498: Amex-style QIF with dd mmm yyyy dates previously failed
+  # with "Unable to detect date format" because normalize_qif_date stripped all
+  # spaces (turning "26 Jan 2026" into the unparseable "26Jan2026").
+  AMEX_DDD_MMM_YYYY_QIF = <<~QIF
+    !Type:CCard
+    D26 Jan 2026
+    N20260126
+    T-25.24
+    PAMAZON.COM.CA           WWW.AMAZON.CO
+    M
+    ^
+    D23 Jan 2026
+    N20260123
+    T-10.49
+    PSKIPTHEDISHES           WINNIPEG (BROAD
+    M
+    ^
+  QIF
+
+  test "generate_rows_from_csv auto-detects DD MMM YYYY format" do
+    @import.update!(raw_file_str: AMEX_DDD_MMM_YYYY_QIF)
+    @import.generate_rows_from_csv
+
+    assert_equal "%d %b %Y", @import.reload.qif_date_format
+    row = @import.rows.find_by(name: "AMAZON.COM.CA           WWW.AMAZON.CO")
+    assert_not_nil row
+    assert_equal "2026-01-26", row.date
+    assert_equal "-25.24",     row.amount
+  end
+
+  test "DD MMM YYYY format appears in valid_date_formats_with_preview for Amex QIF" do
+    @import.update!(raw_file_str: AMEX_DDD_MMM_YYYY_QIF)
+    @import.generate_rows_from_csv
+
+    formats = @import.valid_date_formats_with_preview
+    format_strs = formats.map { |f| f[:format] }
+
+    assert_includes format_strs, "%d %b %Y"
+    dd_mmm = formats.find { |f| f[:format] == "%d %b %Y" }
+    assert_equal "2026-01-26", dd_mmm[:preview]
+  end
+
   # ── QifParser: try_parse_date ───────────────────────────────────────────────
 
   test "try_parse_date returns ISO date for valid format" do
diff --git a/test/models/questrade_account/data_helpers_test.rb b/test/models/questrade_account/data_helpers_test.rb
new file mode 100644
index 000000000..b4f746495
--- /dev/null
+++ b/test/models/questrade_account/data_helpers_test.rb
@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class QuestradeAccount::DataHelpersTest < ActiveSupport::TestCase
+  # Create a test class that includes the concern
+  class TestHelper
+    include QuestradeAccount::DataHelpers
+
+    # Make private methods public for testing
+    public :parse_decimal, :parse_date, :resolve_security, :extract_currency, :extract_security_name
+  end
+
+  setup do
+    @helper = TestHelper.new
+  end
+
+  # ==========================================================================
+  # parse_decimal tests
+  # ==========================================================================
+
+  test "parse_decimal returns nil for nil input" do
+    assert_nil @helper.parse_decimal(nil)
+  end
+
+  test "parse_decimal parses string to BigDecimal" do
+    result = @helper.parse_decimal("123.45")
+    assert_instance_of BigDecimal, result
+    assert_equal BigDecimal("123.45"), result
+  end
+
+  test "parse_decimal handles integer input" do
+    result = @helper.parse_decimal(100)
+    assert_instance_of BigDecimal, result
+    assert_equal BigDecimal("100"), result
+  end
+
+  test "parse_decimal handles float input" do
+    result = @helper.parse_decimal(99.99)
+    assert_instance_of BigDecimal, result
+    assert_in_delta 99.99, result.to_f, 0.001
+  end
+
+  test "parse_decimal returns BigDecimal unchanged" do
+    input = BigDecimal("50.25")
+    result = @helper.parse_decimal(input)
+    assert_equal input, result
+  end
+
+  test "parse_decimal returns nil for invalid string" do
+    assert_nil @helper.parse_decimal("not a number")
+  end
+
+  # ==========================================================================
+  # parse_date tests
+  # ==========================================================================
+
+  test "parse_date returns nil for nil input" do
+    assert_nil @helper.parse_date(nil)
+  end
+
+  test "parse_date returns Date unchanged" do
+    input = Date.new(2024, 6, 15)
+    result = @helper.parse_date(input)
+    assert_equal input, result
+  end
+
+  test "parse_date parses ISO date string" do
+    result = @helper.parse_date("2024-06-15")
+    assert_instance_of Date, result
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date parses datetime string to date" do
+    result = @helper.parse_date("2024-06-15T10:30:00Z")
+    assert_instance_of Date, result
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date converts Time to Date" do
+    input = Time.zone.parse("2024-06-15 10:30:00")
+    result = @helper.parse_date(input)
+    assert_instance_of Date, result
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date returns nil for invalid string" do
+    assert_nil @helper.parse_date("not a date")
+  end
+
+  # ==========================================================================
+  # extract_currency tests
+  # ==========================================================================
+
+  test "extract_currency returns fallback for nil currency" do
+    result = @helper.extract_currency({}, fallback: "USD")
+    assert_equal "USD", result
+  end
+
+  test "extract_currency extracts string currency" do
+    result = @helper.extract_currency({ currency: "cad" })
+    assert_equal "CAD", result
+  end
+
+  test "extract_currency extracts currency from hash with code key" do
+    result = @helper.extract_currency({ currency: { code: "EUR" } })
+    assert_equal "EUR", result
+  end
+
+  test "extract_currency handles indifferent access" do
+    result = @helper.extract_currency({ "currency" => { "code" => "GBP" } })
+    assert_equal "GBP", result
+  end
+
+  # ==========================================================================
+  # resolve_security tests (investment providers only)
+  # ==========================================================================
+
+  test "resolve_security returns nil for blank ticker" do
+    assert_nil @helper.resolve_security("")
+    assert_nil @helper.resolve_security("   ")
+    assert_nil @helper.resolve_security(nil)
+  end
+
+  test "resolve_security finds existing security" do
+    existing = Security.create!(ticker: "XYZTEST", name: "Test Security Inc")
+
+    result = @helper.resolve_security("xyztest")
+    assert_equal existing, result
+  end
+
+  test "resolve_security creates new security when not found" do
+    symbol_data = { name: "Test Company Inc" }
+
+    result = @helper.resolve_security("TEST", symbol_data)
+
+    assert_not_nil result
+    assert_equal "TEST", result.ticker
+    assert_equal "Test Company Inc", result.name
+  end
+
+  test "resolve_security upcases ticker" do
+    symbol_data = { name: "Lowercase Test" }
+
+    result = @helper.resolve_security("lower", symbol_data)
+
+    assert_equal "LOWER", result.ticker
+  end
+
+  test "resolve_security uses ticker as fallback name" do
+    # Use short ticker (<=4 chars) to avoid titleize behavior
+    result = @helper.resolve_security("XYZ1", {})
+
+    assert_equal "XYZ1", result.name
+  end
+
+  # ==========================================================================
+  # extract_security_name tests (investment providers only)
+  # ==========================================================================
+
+  test "extract_security_name uses name field" do
+    result = @helper.extract_security_name({ name: "Apple Inc" }, "AAPL")
+    assert_equal "Apple Inc", result
+  end
+
+  test "extract_security_name falls back to description" do
+    result = @helper.extract_security_name({ description: "Microsoft Corp" }, "MSFT")
+    assert_equal "Microsoft Corp", result
+  end
+
+  test "extract_security_name uses ticker as fallback" do
+    result = @helper.extract_security_name({}, "GOOG")
+    assert_equal "GOOG", result
+  end
+
+  test "extract_security_name ignores generic type descriptions" do
+    result = @helper.extract_security_name({ name: "COMMON STOCK" }, "IBM")
+    assert_equal "IBM", result
+  end
+end
diff --git a/test/models/questrade_account/processor_test.rb b/test/models/questrade_account/processor_test.rb
new file mode 100644
index 000000000..9bf0c2f29
--- /dev/null
+++ b/test/models/questrade_account/processor_test.rb
@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class QuestradeAccount::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @questrade_item = @family.questrade_items.create!(name: "Test", refresh_token: "dummy-token")
+    @questrade_account = @questrade_item.questrade_accounts.create!(
+      questrade_account_id: "53999999",
+      name: "TFSA (53999999)",
+      currency: "CAD",
+      current_balance: 1500
+    )
+    @account = @family.accounts.create!(
+      name: "TFSA",
+      balance: 0,
+      currency: "CAD",
+      accountable: Investment.new
+    )
+    @questrade_account.ensure_account_provider!(@account)
+    @questrade_account.reload
+  end
+
+  # ---- Processor ----------------------------------------------------------
+
+  test "processor anchors the account balance from the questrade total" do
+    @questrade_account.update!(current_balance: 2500, cash_balance: 500)
+
+    QuestradeAccount::Processor.new(@questrade_account).process
+
+    assert_equal 2500, @account.reload.balance.to_d
+  end
+
+  test "processor is a no-op when the provider account is not linked" do
+    @questrade_account.account_provider.destroy
+    @questrade_account.reload
+
+    assert_nothing_raised { QuestradeAccount::Processor.new(@questrade_account).process }
+  end
+
+  # ---- HoldingsProcessor --------------------------------------------------
+
+  test "holdings processor imports positions as holdings" do
+    @questrade_account.update!(raw_holdings_payload: [
+      { "symbol" => "AAPL", "symbolId" => 8049, "openQuantity" => 10,
+        "currentPrice" => 150.0, "currentMarketValue" => 1500.0,
+        "averageEntryPrice" => 140.0, "currency" => "USD" }
+    ])
+
+    QuestradeAccount::HoldingsProcessor.new(@questrade_account).process
+
+    security = Security.find_by(ticker: "AAPL")
+    assert_not_nil security
+    assert @account.reload.holdings.where(security: security).exists?
+  end
+
+  test "holdings processor skips positions with a blank symbol" do
+    @questrade_account.update!(raw_holdings_payload: [
+      { "symbol" => "", "openQuantity" => 10, "currentPrice" => 100.0 }
+    ])
+
+    assert_nothing_raised { QuestradeAccount::HoldingsProcessor.new(@questrade_account).process }
+    assert_empty @account.reload.holdings
+  end
+
+  # ---- ActivitiesProcessor ------------------------------------------------
+
+  test "activities processor imports a Buy trade" do
+    @questrade_account.update!(raw_activities_payload: [
+      { "type" => "Trades", "action" => "Buy", "symbol" => "AAPL", "symbolId" => 8049,
+        "quantity" => 10, "price" => 150.0, "netAmount" => -1500.0,
+        "transactionDate" => "2026-06-01", "tradeDate" => "2026-06-01",
+        "currency" => "USD", "description" => "Apple Inc" }
+    ])
+
+    result = QuestradeAccount::ActivitiesProcessor.new(@questrade_account).process
+
+    assert_equal 1, result[:trades]
+    entry = @account.reload.entries.find_by(source: "questrade")
+    assert_not_nil entry
+    assert entry.entryable.is_a?(Trade)
+  end
+
+  test "activities processor skips entries with a blank type" do
+    @questrade_account.update!(raw_activities_payload: [
+      { "type" => "", "symbol" => "AAPL", "quantity" => 10, "price" => 100.0 }
+    ])
+
+    QuestradeAccount::ActivitiesProcessor.new(@questrade_account).process
+
+    assert_equal 0, @account.reload.entries.where(source: "questrade").count
+  end
+  # ---- home-currency inference (Questrade has no account currency field) ----
+
+  test "upsert_balances! infers USD home currency from per-currency balances" do
+    @questrade_account.update!(currency: "CAD")
+    @questrade_account.upsert_balances!([
+      { "currency" => "USD", "cash" => 5000, "totalEquity" => 5000 },
+      { "currency" => "CAD", "cash" => 0, "totalEquity" => 0 }
+    ])
+    assert_equal "USD", @questrade_account.reload.currency
+    assert_equal 5000, @questrade_account.cash_balance.to_d
+  end
+
+  test "upsert_balances! keeps CAD when the cash is CAD-denominated" do
+    @questrade_account.upsert_balances!([
+      { "currency" => "CAD", "cash" => 1000, "totalEquity" => 1000 },
+      { "currency" => "USD", "cash" => 0, "totalEquity" => 500 }
+    ])
+    assert_equal "CAD", @questrade_account.reload.currency
+  end
+end
diff --git a/test/models/recurring_transaction/identifier_test.rb b/test/models/recurring_transaction/identifier_test.rb
index 2b0149886..55268e05a 100644
--- a/test/models/recurring_transaction/identifier_test.rb
+++ b/test/models/recurring_transaction/identifier_test.rb
@@ -209,6 +209,225 @@ class RecurringTransaction::IdentifierTest < ActiveSupport::TestCase
     assert recurring.last_occurrence_date >= 2.months.ago.to_date
   end
 
+  test "identifies name patterns without per-pattern recurring transaction lookups" do
+    account = @family.accounts.first
+    names = Array.new(4) { |index| "Performance Subscription #{index}" }
+
+    names.each_with_index do |name, index|
+      create_name_pattern_entries(
+        account: account,
+        name: name,
+        amount: 40 + index,
+        day: 5
+      )
+    end
+
+    queries = capture_sql_queries do
+      assert_equal names.size, @identifier.identify_recurring_patterns
+    end
+
+    recurring_lookup_queries = queries.grep(
+      /SELECT "recurring_transactions"\.\* FROM "recurring_transactions" WHERE .*"recurring_transactions"\."name" = .*LIMIT/
+    )
+
+    assert_empty recurring_lookup_queries
+    assert_equal names.size, @family.recurring_transactions.where(name: names).count
+  end
+
+  test "keeps automatic recurring lookup amount-scoped" do
+    account = @family.accounts.first
+    name = "Tiered Performance Subscription"
+
+    recurring_transactions = [ 40, 55 ].map do |amount|
+      create_name_pattern_entries(
+        account: account,
+        name: name,
+        amount: amount,
+        day: 5
+      )
+
+      @family.recurring_transactions.create!(
+        account: account,
+        name: name,
+        amount: amount,
+        currency: "USD",
+        expected_day_of_month: 5,
+        last_occurrence_date: 4.months.ago.to_date,
+        next_expected_date: 1.month.from_now.to_date,
+        occurrence_count: 1,
+        status: "active"
+      )
+    end
+
+    queries = nil
+    assert_no_difference -> { @family.recurring_transactions.count } do
+      queries = capture_sql_queries do
+        @identifier.identify_recurring_patterns
+      end
+    end
+
+    recurring_lookup_queries = queries.grep(
+      /SELECT "recurring_transactions"\.\* FROM "recurring_transactions" WHERE .*"recurring_transactions"\."name" = .*LIMIT/
+    )
+
+    assert_empty recurring_lookup_queries
+    recurring_transactions.each do |recurring|
+      assert_equal 3, recurring.reload.occurrence_count
+    end
+  end
+
+  test "updates manual recurring variance without per-recurring entry lookups" do
+    account = @family.accounts.first
+    names = Array.new(4) { |index| "Manual Performance Subscription #{index}" }
+
+    recurring_transactions = names.each_with_index.map do |name, index|
+      create_name_pattern_entries(
+        account: account,
+        name: name,
+        amount: 50 + index,
+        day: 6
+      )
+
+      @family.recurring_transactions.create!(
+        account: account,
+        name: name,
+        amount: 50 + index,
+        currency: "USD",
+        expected_day_of_month: 6,
+        last_occurrence_date: 4.months.ago.to_date,
+        next_expected_date: 1.month.from_now.to_date,
+        occurrence_count: 1,
+        status: "active",
+        manual: true
+      )
+    end
+
+    queries = nil
+    assert_no_difference -> { @family.recurring_transactions.count } do
+      queries = capture_sql_queries do
+        @identifier.identify_recurring_patterns
+      end
+    end
+
+    entry_lookup_queries = queries.grep(
+      /FROM "entries".*AND "entries"\."name" = .*ORDER BY "entries"\."date" DESC/
+    )
+
+    assert_empty entry_lookup_queries
+    recurring_transactions.each do |recurring|
+      assert_equal 3, recurring.reload.occurrence_count
+    end
+  end
+
+  test "updates manual recurring variance across 1 to 31 month boundary" do
+    travel_to Date.new(2026, 6, 7) do
+      account = @family.accounts.first
+      name = "Boundary Performance Subscription"
+      recurring = @family.recurring_transactions.create!(
+        account: account,
+        name: name,
+        amount: 72,
+        currency: "USD",
+        expected_day_of_month: 1,
+        last_occurrence_date: 3.months.ago.to_date,
+        next_expected_date: 1.month.from_now.to_date,
+        occurrence_count: 0,
+        status: "active",
+        manual: true
+      )
+
+      transaction = Transaction.create!(
+        category: categories(:food_and_drink)
+      )
+      account.entries.create!(
+        date: Date.new(2026, 5, 31),
+        amount: 72,
+        currency: "USD",
+        name: name,
+        entryable: transaction
+      )
+
+      assert_no_difference -> { @family.recurring_transactions.count } do
+        @identifier.identify_recurring_patterns
+      end
+
+      recurring.reload
+      assert_equal 1, recurring.occurrence_count
+      assert_equal 72, recurring.expected_amount_min
+      assert_equal Date.new(2026, 5, 31), recurring.last_occurrence_date
+    end
+  end
+
+  test "updates manual recurring variance for expected end of month in February" do
+    account = @family.accounts.first
+
+    travel_to Date.new(2026, 3, 7) do
+      name = "Non Leap Boundary Subscription"
+      recurring = @family.recurring_transactions.create!(
+        account: account,
+        name: name,
+        amount: 82,
+        currency: "USD",
+        expected_day_of_month: 31,
+        last_occurrence_date: 3.months.ago.to_date,
+        next_expected_date: 1.month.from_now.to_date,
+        occurrence_count: 0,
+        status: "active",
+        manual: true
+      )
+
+      transaction = Transaction.create!(
+        category: categories(:food_and_drink)
+      )
+      account.entries.create!(
+        date: Date.new(2026, 2, 28),
+        amount: 82,
+        currency: "USD",
+        name: name,
+        entryable: transaction
+      )
+
+      @identifier.identify_recurring_patterns
+
+      recurring.reload
+      assert_equal 1, recurring.occurrence_count
+      assert_equal Date.new(2026, 2, 28), recurring.last_occurrence_date
+    end
+
+    travel_to Date.new(2024, 3, 7) do
+      name = "Leap Boundary Subscription"
+      recurring = @family.recurring_transactions.create!(
+        account: account,
+        name: name,
+        amount: 92,
+        currency: "USD",
+        expected_day_of_month: 31,
+        last_occurrence_date: 3.months.ago.to_date,
+        next_expected_date: 1.month.from_now.to_date,
+        occurrence_count: 0,
+        status: "active",
+        manual: true
+      )
+
+      transaction = Transaction.create!(
+        category: categories(:food_and_drink)
+      )
+      account.entries.create!(
+        date: Date.new(2024, 2, 29),
+        amount: 92,
+        currency: "USD",
+        name: name,
+        entryable: transaction
+      )
+
+      @identifier.identify_recurring_patterns
+
+      recurring.reload
+      assert_equal 1, recurring.occurrence_count
+      assert_equal Date.new(2024, 2, 29), recurring.last_occurrence_date
+    end
+  end
+
   test "circular_distance calculates correct distance for days near month boundary" do
     # Test wrapping: day 31 to day 1 should be distance 1 (31 -> 1 is one day forward)
     distance = @identifier.send(:circular_distance, 31, 1)
@@ -246,4 +465,35 @@ class RecurringTransaction::IdentifierTest < ActiveSupport::TestCase
     days = [ 1, 15, 30 ]
     assert_not @identifier.send(:days_cluster_together?, days)
   end
+
+  private
+    def create_name_pattern_entries(account:, name:, amount:, day:)
+      [ 0, 1, 2 ].each do |months_ago|
+        transaction = Transaction.create!(
+          category: categories(:food_and_drink)
+        )
+        account.entries.create!(
+          date: months_ago.months.ago.beginning_of_month + (day - 1).days,
+          amount: amount,
+          currency: "USD",
+          name: name,
+          entryable: transaction
+        )
+      end
+    end
+
+    def capture_sql_queries
+      queries = []
+      callback = lambda do |_name, _started, _finished, _unique_id, payload|
+        next if payload[:name].in?([ "SCHEMA", "TRANSACTION" ])
+
+        queries << payload[:sql].squish
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        yield
+      end
+
+      queries
+    end
 end
diff --git a/test/models/recurring_transaction_test.rb b/test/models/recurring_transaction_test.rb
index 20c8a28ae..75d8ce596 100644
--- a/test/models/recurring_transaction_test.rb
+++ b/test/models/recurring_transaction_test.rb
@@ -998,12 +998,9 @@ class RecurringTransactionTest < ActiveSupport::TestCase
     assert_not RecurringTransaction.exists?(rt.id)
   end
 
-  test "Cleaner skips recurring transfers so they aren't mistakenly marked inactive" do
-    # `matching_transactions` is single-account name/amount-based and never
-    # matches a Transfer pair, so without the skip the recurring transfer
-    # would flip to inactive at the 6-month threshold even when the user
-    # is still doing the transfer monthly. Issue #1590 tracks the proper
-    # pair-detection fix.
+  test "Cleaner keeps a recurring transfer active when its pair still occurs (issue #1590)" do
+    # The seed name rarely matches future occurrences, so pair detection (not
+    # name matching) is what keeps a live transfer active past the threshold.
     rt = @family.recurring_transactions.create!(
       account: @account, destination_account: accounts(:credit_card),
       name: "Transfer to CC", amount: 250, currency: "USD",
@@ -1012,12 +1009,61 @@ class RecurringTransactionTest < ActiveSupport::TestCase
       next_expected_date: 5.days.from_now.to_date,
       manual: true
     )
-    assert rt.should_be_inactive?, "guard sanity: row would be marked inactive without the skip"
+    assert rt.should_be_inactive?, "guard sanity: stale last_occurrence_date"
+
+    # A fresh transfer pair this cycle, carrying a *different* free-text name.
+    date = 1.month.ago.beginning_of_month + 4.days # day-of-month 5
+    outflow = @account.entries.create!(
+      date: date, amount: 250, currency: "USD", name: "rent transfer",
+      entryable: Transaction.new(kind: "funds_movement")
+    )
+    inflow = accounts(:credit_card).entries.create!(
+      date: date, amount: -250, currency: "USD", name: "rent transfer",
+      entryable: Transaction.new(kind: "funds_movement")
+    )
+    Transfer.create!(outflow_transaction: outflow.entryable, inflow_transaction: inflow.entryable)
 
     RecurringTransaction.cleanup_stale_for(@family)
     assert_equal "active", rt.reload.status
   end
 
+  test "Cleaner retires a recurring transfer whose pair has stopped" do
+    # No matching Transfer pair → genuinely stale → should be retired. This is
+    # the correctness the pair-detection (vs the old blanket skip) buys us.
+    rt = @family.recurring_transactions.create!(
+      account: @account, destination_account: accounts(:credit_card),
+      name: "Transfer to CC", amount: 250, currency: "USD",
+      expected_day_of_month: 5,
+      last_occurrence_date: 7.months.ago.to_date,
+      next_expected_date: 5.days.from_now.to_date,
+      manual: true
+    )
+
+    RecurringTransaction.cleanup_stale_for(@family)
+    assert_equal "inactive", rt.reload.status
+  end
+
+  test "matching_transactions finds the transfer pair regardless of occurrence name" do
+    rt = @family.recurring_transactions.create!(
+      account: @account, destination_account: accounts(:credit_card),
+      name: "Transfer to CC", amount: 250, currency: "USD",
+      expected_day_of_month: 5, last_occurrence_date: Date.current,
+      next_expected_date: 1.month.from_now.to_date, manual: true
+    )
+    date = Date.current.beginning_of_month + 4.days # day-of-month 5
+    outflow = @account.entries.create!(
+      date: date, amount: 250, currency: "USD", name: "an importer's wording",
+      entryable: Transaction.new(kind: "funds_movement")
+    )
+    inflow = accounts(:credit_card).entries.create!(
+      date: date, amount: -250, currency: "USD", name: "an importer's wording",
+      entryable: Transaction.new(kind: "funds_movement")
+    )
+    Transfer.create!(outflow_transaction: outflow.entryable, inflow_transaction: inflow.entryable)
+
+    assert_includes rt.matching_transactions.map(&:id), outflow.id
+  end
+
   test "Identifier#update_manual_recurring_transactions skips recurring transfers" do
     # Same reasoning as the Cleaner skip. Without the guard, the helper
     # would call find_matching_transaction_entries (single-account, by
diff --git a/test/models/redbark_account/data_helpers_test.rb b/test/models/redbark_account/data_helpers_test.rb
new file mode 100644
index 000000000..fe523a528
--- /dev/null
+++ b/test/models/redbark_account/data_helpers_test.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class RedbarkAccount::DataHelpersTest < ActiveSupport::TestCase
+  # Create a test class that includes the concern
+  class TestHelper
+    include RedbarkAccount::DataHelpers
+
+    # Make private methods public for testing
+    public :parse_decimal, :parse_date, :extract_currency
+  end
+
+  setup do
+    @helper = TestHelper.new
+  end
+
+  # ==========================================================================
+  # parse_decimal tests
+  # ==========================================================================
+
+  test "parse_decimal returns nil for nil input" do
+    assert_nil @helper.parse_decimal(nil)
+  end
+
+  test "parse_decimal parses string to BigDecimal" do
+    result = @helper.parse_decimal("123.45")
+    assert_instance_of BigDecimal, result
+    assert_equal BigDecimal("123.45"), result
+  end
+
+  test "parse_decimal handles integer input" do
+    result = @helper.parse_decimal(100)
+    assert_instance_of BigDecimal, result
+    assert_equal BigDecimal("100"), result
+  end
+
+  test "parse_decimal handles float input" do
+    result = @helper.parse_decimal(99.99)
+    assert_instance_of BigDecimal, result
+    assert_in_delta 99.99, result.to_f, 0.001
+  end
+
+  test "parse_decimal returns BigDecimal unchanged" do
+    input = BigDecimal("50.25")
+    result = @helper.parse_decimal(input)
+    assert_equal input, result
+  end
+
+  test "parse_decimal returns nil for invalid string" do
+    assert_nil @helper.parse_decimal("not a number")
+  end
+
+  # ==========================================================================
+  # parse_date tests
+  # ==========================================================================
+
+  test "parse_date returns nil for nil input" do
+    assert_nil @helper.parse_date(nil)
+  end
+
+  test "parse_date returns Date unchanged" do
+    input = Date.new(2024, 6, 15)
+    result = @helper.parse_date(input)
+    assert_equal input, result
+  end
+
+  test "parse_date parses ISO date string" do
+    result = @helper.parse_date("2024-06-15")
+    assert_instance_of Date, result
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date parses datetime string to date" do
+    result = @helper.parse_date("2024-06-15T10:30:00Z")
+    assert_instance_of Date, result
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date converts Time to Date" do
+    input = Time.zone.parse("2024-06-15 10:30:00")
+    result = @helper.parse_date(input)
+    assert_instance_of Date, result
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date returns nil for invalid string" do
+    assert_nil @helper.parse_date("not a date")
+  end
+
+  # ==========================================================================
+  # extract_currency tests
+  # ==========================================================================
+
+  test "extract_currency returns fallback for nil currency" do
+    result = @helper.extract_currency({}, fallback: "USD")
+    assert_equal "USD", result
+  end
+
+  test "extract_currency extracts string currency" do
+    result = @helper.extract_currency({ currency: "cad" })
+    assert_equal "CAD", result
+  end
+
+  test "extract_currency extracts currency from hash with code key" do
+    result = @helper.extract_currency({ currency: { code: "EUR" } })
+    assert_equal "EUR", result
+  end
+
+  test "extract_currency handles indifferent access" do
+    result = @helper.extract_currency({ "currency" => { "code" => "GBP" } })
+    assert_equal "GBP", result
+  end
+end
diff --git a/test/models/redbark_account/processor_test.rb b/test/models/redbark_account/processor_test.rb
new file mode 100644
index 000000000..4d0a6fd4a
--- /dev/null
+++ b/test/models/redbark_account/processor_test.rb
@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class RedbarkAccount::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @redbark_account = redbark_accounts(:savings_account)
+    @family = @redbark_account.redbark_item.family
+
+    @account = @family.accounts.create!(
+      name: "Test Account",
+      balance: 1000,
+      currency: "AUD",
+      accountable: Depository.new
+    )
+
+    @redbark_account.ensure_account_provider!(@account)
+    @redbark_account.reload
+  end
+
+  test "processor initializes with redbark_account" do
+    processor = RedbarkAccount::Processor.new(@redbark_account)
+    assert_not_nil processor
+  end
+
+  test "processor skips processing when no linked account" do
+    @redbark_account.account_provider&.destroy
+    @redbark_account.reload
+
+    processor = RedbarkAccount::Processor.new(@redbark_account)
+    assert_nothing_raised { processor.process }
+  end
+
+  test "processor updates account balance" do
+    @redbark_account.update!(current_balance: 15000)
+
+    RedbarkAccount::Processor.new(@redbark_account).process
+
+    @account.reload
+    assert_equal 15000, @account.balance.to_f
+  end
+
+  test "processor negates balance for credit card accounts" do
+    credit_account = @family.accounts.create!(
+      name: "Test Credit Card",
+      balance: 0,
+      currency: "AUD",
+      accountable: CreditCard.new
+    )
+    @redbark_account.account_provider&.destroy
+    @redbark_account.reload
+    @redbark_account.ensure_account_provider!(credit_account)
+    @redbark_account.update!(current_balance: -250)
+
+    RedbarkAccount::Processor.new(@redbark_account).process
+
+    credit_account.reload
+    assert_equal 250, credit_account.balance.to_f
+  end
+
+  test "transactions processor creates entries from raw payload" do
+    @redbark_account.update!(raw_transactions_payload: [
+      {
+        "id" => "tx_001",
+        "accountId" => @redbark_account.redbark_account_id,
+        "status" => "posted",
+        "date" => Date.current.to_s,
+        "description" => "COFFEE SHOP SYDNEY",
+        "amount" => "-4.50",
+        "direction" => "debit",
+        "merchantName" => "Coffee Shop"
+      }
+    ])
+
+    result = RedbarkAccount::Transactions::Processor.new(@redbark_account).process
+
+    assert result[:success]
+    assert_equal 1, result[:imported]
+
+    entry = @account.entries.find_by(external_id: "redbark_tx_001", source: "redbark")
+    assert_not_nil entry
+    # Redbark amounts are CDR pre-signed (negative = money out); Sure stores the opposite sign
+    assert_equal 4.50, entry.amount.to_f
+    assert_equal "Coffee Shop", entry.name
+    assert_equal "AUD", entry.currency
+  end
+
+  test "transactions processor stores pending flag in extra metadata" do
+    @redbark_account.update!(raw_transactions_payload: [
+      {
+        "id" => "tx_002",
+        "status" => "pending",
+        "date" => Date.current.to_s,
+        "description" => "PENDING PURCHASE",
+        "amount" => "-10.00",
+        "direction" => "debit"
+      }
+    ])
+
+    RedbarkAccount::Transactions::Processor.new(@redbark_account).process
+
+    entry = @account.entries.find_by(external_id: "redbark_tx_002", source: "redbark")
+    assert_not_nil entry
+    assert_equal true, entry.entryable.extra.dig("redbark", "pending")
+  end
+
+  test "transactions processor handles missing transaction id gracefully" do
+    @redbark_account.update!(raw_transactions_payload: [
+      { "id" => nil, "amount" => "-50.00", "date" => Date.current.to_s }
+    ])
+
+    result = RedbarkAccount::Transactions::Processor.new(@redbark_account).process
+
+    assert result[:success]
+    assert_equal 1, result[:skipped]
+    assert_equal 0, result[:failed]
+  end
+
+  test "transactions processor returns empty result when no transactions" do
+    @redbark_account.update!(raw_transactions_payload: [])
+
+    result = RedbarkAccount::Transactions::Processor.new(@redbark_account).process
+
+    assert result[:success]
+    assert_equal 0, result[:total]
+  end
+end
diff --git a/test/models/redbark_item/importer_test.rb b/test/models/redbark_item/importer_test.rb
new file mode 100644
index 000000000..e740ffa92
--- /dev/null
+++ b/test/models/redbark_item/importer_test.rb
@@ -0,0 +1,55 @@
+require "test_helper"
+
+class RedbarkItem::ImporterTest < ActiveSupport::TestCase
+  setup do
+    @redbark_item = redbark_items(:one)
+    @importer = RedbarkItem::Importer.new(@redbark_item, redbark_provider: nil)
+  end
+
+  test "merge_transactions keeps posted rows and refreshes by id" do
+    existing = [ { "id" => "t1", "status" => "posted", "date" => "2026-07-01", "amount" => "-10.00" } ]
+    fresh = [ { "id" => "t1", "status" => "posted", "date" => "2026-07-01", "amount" => "-12.00" } ]
+
+    merged = @importer.send(:merge_transactions, existing, fresh, window_start: Date.new(2026, 6, 1))
+
+    assert_equal 1, merged.size
+    assert_equal "-12.00", merged.first["amount"]
+  end
+
+  test "merge_transactions prunes pending rows missing from the refetched window" do
+    existing = [
+      { "id" => "pend_1", "status" => "pending", "date" => "2026-07-10" },
+      { "id" => "kept_posted", "status" => "posted", "date" => "2026-07-05" }
+    ]
+    fresh = [ { "id" => "post_1", "status" => "posted", "date" => "2026-07-10" } ]
+
+    merged = @importer.send(:merge_transactions, existing, fresh, window_start: Date.new(2026, 7, 1))
+    ids = merged.map { |t| t["id"] }
+
+    assert_includes ids, "post_1"
+    assert_includes ids, "kept_posted"
+    assert_not_includes ids, "pend_1"
+  end
+
+  test "merge_transactions drops rows dated before the fetch window" do
+    existing = [
+      { "id" => "old_posted", "status" => "posted", "date" => "2026-05-01" },
+      { "id" => "old_pending", "status" => "pending", "date" => "2026-06-15" },
+      { "id" => "undated", "status" => "posted" }
+    ]
+    fresh = [ { "id" => "post_1", "status" => "posted", "date" => "2026-07-10" } ]
+
+    merged = @importer.send(:merge_transactions, existing, fresh, window_start: Date.new(2026, 7, 1))
+
+    assert_equal %w[post_1 undated], merged.map { |t| t["id"] }.sort
+  end
+
+  test "merge_transactions keeps everything when no window is given" do
+    existing = [ { "id" => "old_posted", "status" => "posted", "date" => "2026-05-01" } ]
+    fresh = [ { "id" => "post_1", "status" => "posted", "date" => "2026-07-10" } ]
+
+    merged = @importer.send(:merge_transactions, existing, fresh, window_start: nil)
+
+    assert_equal %w[old_posted post_1], merged.map { |t| t["id"] }.sort
+  end
+end
diff --git a/test/models/redbark_item_test.rb b/test/models/redbark_item_test.rb
new file mode 100644
index 000000000..b57b57c02
--- /dev/null
+++ b/test/models/redbark_item_test.rb
@@ -0,0 +1,73 @@
+require "test_helper"
+
+class RedbarkItemTest < ActiveSupport::TestCase
+  def setup
+    @redbark_item = redbark_items(:one)
+  end
+
+  test "fixture is valid" do
+    assert @redbark_item.valid?
+  end
+
+  test "belongs to family" do
+    assert_equal families(:dylan_family), @redbark_item.family
+  end
+
+  test "credentials_configured returns true when api_key present" do
+    assert @redbark_item.credentials_configured?
+  end
+
+  test "credentials_configured returns false when api_key blank" do
+    @redbark_item.api_key = nil
+    assert_not @redbark_item.credentials_configured?
+  end
+
+  test "redbark_provider returns Provider::Redbark instance" do
+    provider = @redbark_item.redbark_provider
+    assert_instance_of Provider::Redbark, provider
+    assert_equal @redbark_item.api_key, provider.api_key
+  end
+
+  test "redbark_provider returns nil when credentials not configured" do
+    @redbark_item.api_key = nil
+    assert_nil @redbark_item.redbark_provider
+  end
+
+  test "syncer returns RedbarkItem::Syncer instance" do
+    assert_instance_of RedbarkItem::Syncer, @redbark_item.syncer
+  end
+
+  test "has_redbark_credentials reflects configured items" do
+    assert families(:dylan_family).has_redbark_credentials?
+    refute families(:empty).has_redbark_credentials?
+  end
+
+  test "ignored accounts are excluded from setup counts" do
+    account = redbark_accounts(:savings_account)
+    assert_equal 1, @redbark_item.unlinked_accounts_count
+
+    account.update!(ignored: true)
+
+    fresh_item = RedbarkItem.find(@redbark_item.id)
+    assert_equal 0, fresh_item.unlinked_accounts_count
+    assert_equal 1, fresh_item.total_accounts_count
+    assert_not RedbarkAccount.needs_setup.exists?(id: account.id)
+  end
+
+  test "encrypted jsonb payloads round-trip nested structures" do
+    payload = {
+      "accounts" => [
+        { "id" => "acc_1", "name" => "Everyday", "balances" => { "current" => "1024.55", "currency" => "AUD" } },
+        { "id" => "acc_2", "name" => "Savings", "meta" => { "tags" => [ "a", "b" ], "nested" => { "deep" => true } } }
+      ],
+      "fetched_at" => "2026-07-25T00:00:00Z"
+    }
+    institution = { "name" => "Test Bank", "logo" => "https://example.com/logo.png" }
+
+    @redbark_item.update!(raw_payload: payload, raw_institution_payload: institution)
+    reloaded = RedbarkItem.find(@redbark_item.id)
+
+    assert_equal payload, reloaded.raw_payload
+    assert_equal institution, reloaded.raw_institution_payload
+  end
+end
diff --git a/test/models/rule/action_executor/send_email_notification_test.rb b/test/models/rule/action_executor/send_email_notification_test.rb
new file mode 100644
index 000000000..f024ab821
--- /dev/null
+++ b/test/models/rule/action_executor/send_email_notification_test.rb
@@ -0,0 +1,84 @@
+require "test_helper"
+
+class Rule::ActionExecutor::SendEmailNotificationTest < ActiveSupport::TestCase
+  include EntriesTestHelper, ActiveJob::TestHelper
+
+  setup do
+    @family = families(:dylan_family)
+    @rule = rules(:one)
+    @account = @family.accounts.create!(name: "Notify test", balance: 1000, currency: "USD", accountable: Depository.new)
+    @txn1 = create_transaction(date: Date.current, account: @account, amount: 100, name: "Coffee").transaction
+    @scope = @account.transactions
+  end
+
+  def action
+    Rule::Action.new(rule: @rule, action_type: "send_email_notification")
+  end
+
+  test "enqueues one digest job for new matches, records deliveries, returns integer count" do
+    result = nil
+
+    assert_difference -> { NotificationDelivery.where(rule: @rule).count }, 1 do
+      assert_enqueued_with(job: RuleEmailNotificationJob) do
+        result = action.apply(@scope)
+      end
+    end
+
+    assert_equal 1, result
+    assert_includes NotificationDelivery.where(rule: @rule).pluck(:transaction_id), @txn1.id
+  end
+
+  test "dedup suppresses repeat sends across runs" do
+    action.apply(@scope)
+
+    result = nil
+    assert_no_enqueued_jobs only: RuleEmailNotificationJob do
+      result = action.apply(@scope)
+    end
+
+    assert_equal 0, result
+    assert_equal 1, NotificationDelivery.where(rule: @rule).count
+  end
+
+  test "only newly appearing transactions trigger a job" do
+    action.apply(@scope) # baseline: txn1 recorded + enqueued
+
+    txn2 = create_transaction(date: Date.current, account: @account, amount: 50, name: "Lunch").transaction
+
+    result = nil
+    # Only txn2 (the newly appearing match) may be enqueued — never the already
+    # notified txn1. Asserting the args, not just the job class, locks that down.
+    assert_enqueued_with(job: RuleEmailNotificationJob, args: [ @rule.id, [ txn2.id ] ]) do
+      result = action.apply(@scope)
+    end
+
+    assert_equal 1, result
+    recorded = NotificationDelivery.where(rule: @rule).pluck(:transaction_id)
+    assert_includes recorded, txn2.id
+    assert_equal 2, recorded.size
+  end
+
+  test "pre-seed watermark records existing matches without sending so history never emails" do
+    # after_create_commit does not fire under transactional tests (the wrapping
+    # transaction never commits), so invoke the seeding path directly to verify
+    # the watermark behavior the callback performs in production.
+    rule = @family.rules.create!(
+      resource_type: "transaction",
+      actions_attributes: [ { action_type: "send_email_notification" } ]
+    )
+    seed_action = rule.actions.first
+
+    assert_no_enqueued_jobs only: RuleEmailNotificationJob do
+      seed_action.send(:seed_notification_baseline)
+    end
+
+    # Pre-existing @txn1 is now watermarked, so a subsequent run sends nothing.
+    result = nil
+    assert_no_enqueued_jobs only: RuleEmailNotificationJob do
+      result = Rule::Action.new(rule: rule, action_type: "send_email_notification").apply(@scope)
+    end
+
+    assert_equal 0, result
+    assert_includes NotificationDelivery.where(rule: rule).pluck(:transaction_id), @txn1.id
+  end
+end
diff --git a/test/models/rule/action_test.rb b/test/models/rule/action_test.rb
index c6370653a..6e115be67 100644
--- a/test/models/rule/action_test.rb
+++ b/test/models/rule/action_test.rb
@@ -38,6 +38,21 @@ class Rule::ActionTest < ActiveSupport::TestCase
     end
   end
 
+  test "set_transaction_category overrides locked category when ignore_attribute_locks" do
+    # Explicit "Re-apply" from the rules UI passes ignore_attribute_locks: true (issue #2051)
+    @txn1.lock_attr!(:category_id)
+
+    action = Rule::Action.new(
+      rule: @transaction_rule,
+      action_type: "set_transaction_category",
+      value: @grocery_category.id
+    )
+
+    action.apply(@rule_scope, ignore_attribute_locks: true)
+
+    assert_equal @grocery_category.id, @txn1.reload.category_id
+  end
+
   test "set_transaction_tags" do
     tag = @family.tags.create!(name: "Rule test tag")
 
@@ -146,6 +161,22 @@ class Rule::ActionTest < ActiveSupport::TestCase
     end
   end
 
+  test "set_transaction_name overrides locked name when ignore_attribute_locks" do
+    # Explicit "Re-apply" from the rules UI passes ignore_attribute_locks: true (issue #2051)
+    new_name = "Renamed Transaction"
+    @txn1.entry.lock_attr!(:name)
+
+    action = Rule::Action.new(
+      rule: @transaction_rule,
+      action_type: "set_transaction_name",
+      value: new_name
+    )
+
+    action.apply(@rule_scope, ignore_attribute_locks: true)
+
+    assert_equal new_name, @txn1.reload.entry.name
+  end
+
   test "set_investment_activity_label" do
     # Does not modify transactions that are locked (user edited them)
     @txn1.lock_attr!(:investment_activity_label)
diff --git a/test/models/security_test.rb b/test/models/security_test.rb
index 0c83483ee..dfbcf6428 100644
--- a/test/models/security_test.rb
+++ b/test/models/security_test.rb
@@ -160,6 +160,19 @@ class SecurityTest < ActiveSupport::TestCase
     assert_equal "https://example.com/aapl.png", sec.display_logo_url
   end
 
+  test "display_logo_url for non-crypto with no website prefers stored logo over brandfetch lettermark" do
+    Setting.stubs(:brand_fetch_client_id).returns("test-client-id")
+    Setting.stubs(:brand_fetch_logo_size).returns(120)
+
+    sec = Security.new(
+      ticker: "SBER",
+      exchange_operating_mic: "MISX",
+      logo_url: "https://invest-brands.cdn-tinkoff.ru/SBERx160.png"
+    )
+
+    assert_equal "https://invest-brands.cdn-tinkoff.ru/SBERx160.png", sec.display_logo_url
+  end
+
   test "before_save writes the /crypto/{base} URL to logo_url for new crypto securities" do
     Setting.stubs(:brand_fetch_client_id).returns("test-client-id")
     Setting.stubs(:brand_fetch_logo_size).returns(120)
diff --git a/test/models/simplefin_account_test.rb b/test/models/simplefin_account_test.rb
index 53aa10405..1b4bceaea 100644
--- a/test/models/simplefin_account_test.rb
+++ b/test/models/simplefin_account_test.rb
@@ -71,6 +71,23 @@ class SimplefinAccountTest < ActiveSupport::TestCase
     assert_equal snapshot, @simplefin_account.raw_payload
   end
 
+  test "parses numeric-string epoch balance-date in snapshot" do
+    epoch_string = Time.utc(2026, 6, 17, 12, 34, 56).to_i.to_s
+    snapshot = {
+      "balance" => 2000.0,
+      "available-balance" => 1800.0,
+      "balance-date" => epoch_string,
+      "currency" => "USD",
+      "type" => "investment",
+      "name" => "Traditional IRA",
+      "id" => "trad_ira_1"
+    }
+
+    @simplefin_account.upsert_simplefin_snapshot!(snapshot)
+
+    assert_equal Time.at(epoch_string.to_i).utc, @simplefin_account.balance_date
+  end
+
   test "can upsert transactions" do
     transactions = [
       { "id" => "txn_1", "amount" => -50.00, "description" => "Coffee Shop", "posted" => "2024-01-01" },
diff --git a/test/models/simplefin_entry/processor_test.rb b/test/models/simplefin_entry/processor_test.rb
index 87061d04d..52e1a0ad1 100644
--- a/test/models/simplefin_entry/processor_test.rb
+++ b/test/models/simplefin_entry/processor_test.rb
@@ -142,6 +142,99 @@ class SimplefinEntry::ProcessorTest < ActiveSupport::TestCase
     assert_equal true, sf["pending"], "expected pending flag to be true when posted==0 and/or pending=true"
   end
 
+  test "skips pending transactions when pending inclusion is disabled" do
+    Setting.stubs(:syncs_include_pending).returns(false)
+
+    tx = {
+      id: "tx_pending_disabled_1",
+      amount: "-30.00",
+      currency: "USD",
+      payee: "Test Store",
+      description: "Auth hold",
+      posted: Date.current.to_s,
+      transacted_at: (Date.current - 1).to_s,
+      pending: true
+    }
+
+    # Clear the env var so this only exercises the Setting fallback branch of pending_enabled?
+    with_env_overrides SIMPLEFIN_INCLUDE_PENDING: nil do
+      assert_no_difference "@account.entries.count" do
+        SimplefinEntry::Processor.new(tx, simplefin_account: @simplefin_account).process
+      end
+    end
+  end
+
+  test "still imports posted transactions when pending inclusion is disabled" do
+    Setting.stubs(:syncs_include_pending).returns(false)
+
+    tx = {
+      id: "tx_posted_disabled_1",
+      amount: "-30.00",
+      currency: "USD",
+      payee: "Test Store",
+      description: "Settled",
+      posted: Date.current.to_s,
+      transacted_at: (Date.current - 1).to_s,
+      pending: false
+    }
+
+    with_env_overrides SIMPLEFIN_INCLUDE_PENDING: nil do
+      assert_difference "@account.entries.count", 1 do
+        SimplefinEntry::Processor.new(tx, simplefin_account: @simplefin_account).process
+      end
+    end
+  end
+
+  test "SIMPLEFIN_INCLUDE_PENDING env var takes precedence over Setting" do
+    # Setting says "skip pending", but the env var (mirrored via the boot-time config it
+    # populates) says "include pending" - env var must win, matching
+    # SimplefinItem::Importer#fetch_accounts_data's effective_pending resolution.
+    Setting.stubs(:syncs_include_pending).returns(false)
+    Rails.configuration.x.simplefin.stubs(:include_pending).returns(true)
+
+    tx = {
+      id: "tx_pending_env_override_1",
+      amount: "-30.00",
+      currency: "USD",
+      payee: "Test Store",
+      description: "Auth hold",
+      posted: Date.current.to_s,
+      transacted_at: (Date.current - 1).to_s,
+      pending: true
+    }
+
+    with_env_overrides SIMPLEFIN_INCLUDE_PENDING: "1" do
+      assert_difference "@account.entries.count", 1 do
+        SimplefinEntry::Processor.new(tx, simplefin_account: @simplefin_account).process
+      end
+    end
+  end
+
+  test "SIMPLEFIN_INCLUDE_PENDING env var disabling pending takes precedence over a permissive Setting" do
+    # Mirror of the test above: this is the actual real-world guard scenario the PR
+    # fixes - a self-hoster sets SIMPLEFIN_INCLUDE_PENDING=0 while the Setting (UI
+    # toggle) still says "include pending". The env var must win and skip the row.
+    Setting.stubs(:syncs_include_pending).returns(true)
+    Rails.configuration.x.simplefin.stubs(:include_pending).returns(false)
+
+    tx = {
+      id: "tx_pending_env_disable_1",
+      amount: "-30.00",
+      currency: "USD",
+      payee: "Test Store",
+      description: "Auth hold",
+      posted: Date.current.to_s,
+      transacted_at: (Date.current - 1).to_s,
+      pending: true
+    }
+
+    with_env_overrides SIMPLEFIN_INCLUDE_PENDING: "0" do
+      assert_no_difference "@account.entries.count" do
+        SimplefinEntry::Processor.new(tx, simplefin_account: @simplefin_account).process
+      end
+    end
+  end
+
   test "infers pending when posted is explicitly 0 and transacted_at present (no explicit pending flag)" do
     # Some SimpleFIN banks indicate pending by sending posted=0 + transacted_at, without pending flag
     t_epoch = (Date.current - 1).to_time.to_i
@@ -163,4 +256,27 @@ class SimplefinEntry::ProcessorTest < ActiveSupport::TestCase
     sf = entry.transaction.extra.fetch("simplefin")
     assert_equal true, sf["pending"], "expected pending to be inferred from posted=0 + transacted_at present"
   end
+
+  test "does not treat a non-numeric posted value as epoch-zero pending" do
+    # Regression: `posted_val.to_i.zero?` would also match malformed strings like
+    # "unavailable" (String#to_i coerces non-numeric input to 0), wrongly flagging a
+    # settled transaction as pending. Only literal 0 / "0" should count as epoch-zero.
+    tx = {
+      id: "tx_malformed_posted_1",
+      amount: "-11.00",
+      currency: "USD",
+      payee: "Test Store",
+      description: "Settled",
+      memo: "",
+      posted: "unavailable",
+      transacted_at: (Date.current - 1).to_s
+      # Note: NO pending flag set
+    }
+
+    SimplefinEntry::Processor.new(tx, simplefin_account: @simplefin_account).process
+
+    entry = @account.entries.find_by!(external_id: "simplefin_tx_malformed_posted_1", source: "simplefin")
+    sf = entry.transaction.extra.fetch("simplefin")
+    assert_equal false, sf["pending"], "expected a non-numeric posted value to not be inferred as pending"
+  end
 end
diff --git a/test/models/simplefin_item/importer_partial_errors_test.rb b/test/models/simplefin_item/importer_partial_errors_test.rb
index d258d9850..1f0190fb2 100644
--- a/test/models/simplefin_item/importer_partial_errors_test.rb
+++ b/test/models/simplefin_item/importer_partial_errors_test.rb
@@ -88,6 +88,18 @@ class SimplefinItem::ImporterPartialErrorsTest < ActiveSupport::TestCase
     assert_equal "requires_update", @item.status
   end
 
+  test "previously requires_update item is cleared after successful partial import with institution auth error" do
+    @item.update!(status: :requires_update)
+
+    @importer.send(:record_errors, [
+      "Connection to Cash App may need attention. Auth required"
+    ])
+    @importer.send(:maybe_clear_requires_update_status)
+
+    assert_equal "good", @item.reload.status,
+      "expected successful SimpleFIN import to clear item-level reconnect even when one institution needs auth"
+  end
+
   test "non-auth partial errors don't flip status" do
     @importer.send(:record_errors, [
       "Timed out fetching transactions from Chase",
diff --git a/test/models/simplefin_item/importer_test.rb b/test/models/simplefin_item/importer_test.rb
new file mode 100644
index 000000000..285849c2f
--- /dev/null
+++ b/test/models/simplefin_item/importer_test.rb
@@ -0,0 +1,21 @@
+require "test_helper"
+
+class SimplefinItem::ImporterTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item = SimplefinItem.create!(
+      family: @family,
+      name: "SimpleFIN Importer Test",
+      access_url: "https://example.com/access"
+    )
+    @importer = SimplefinItem::Importer.new(@item, simplefin_provider: nil)
+  end
+
+  test "normalizes numeric-string epoch balance-date for importer upserts" do
+    epoch_string = Time.utc(2026, 6, 17, 12, 34, 56).to_i.to_s
+
+    parsed = @importer.send(:normalize_balance_date, epoch_string)
+
+    assert_equal Time.at(epoch_string.to_i).utc, parsed
+  end
+end
diff --git a/test/models/simplefin_item_test.rb b/test/models/simplefin_item_test.rb
index e6f8514c8..0c689c1b5 100644
--- a/test/models/simplefin_item_test.rb
+++ b/test/models/simplefin_item_test.rb
@@ -30,6 +30,86 @@ class SimplefinItemTest < ActiveSupport::TestCase
     assert_equal "good", @simplefin_item.status
   end
 
+  test "setup token update is required when requires_update has no successful account sync" do
+    @simplefin_item.update!(status: :requires_update)
+    Sync.create!(
+      syncable: @simplefin_item,
+      status: "failed",
+      failed_at: Time.current,
+      error: "SimpleFIN access forbidden",
+      sync_stats: { "total_accounts" => 0 }
+    )
+
+    assert @simplefin_item.setup_token_update_required?
+    assert_equal "requires_update", @simplefin_item.effective_status
+    assert_includes @simplefin_item.attention_summary, "Connection needs update"
+  end
+
+  test "setup token update is not required when latest sync returned accounts" do
+    @simplefin_item.update!(status: :requires_update, pending_account_setup: true)
+    # Must be a terminal sync: a pending/in-progress sync short-circuits before
+    # the account-count check, so this would pass without exercising the branch.
+    Sync.create!(
+      syncable: @simplefin_item,
+      status: "completed",
+      completed_at: Time.current,
+      sync_stats: {
+        "total_accounts" => 18,
+        "error_buckets" => { "auth" => 1 },
+        "errors" => [ "Connection to Cash App may need attention. Auth required" ]
+      }
+    )
+
+    refute @simplefin_item.setup_token_update_required?
+    assert_equal "good", @simplefin_item.effective_status
+    refute_includes @simplefin_item.attention_summary, "Connection needs update"
+    assert_includes @simplefin_item.attention_summary, "Accounts need setup"
+  end
+
+  test "setup token update is not required when latest sync stats use symbol keys" do
+    @simplefin_item.update!(status: :requires_update)
+    latest_sync = Sync.new(
+      syncable: @simplefin_item,
+      status: "completed",
+      completed_at: Time.current,
+      sync_stats: {
+        total_accounts: 18,
+        error_buckets: { auth: 1 }
+      }
+    )
+
+    refute @simplefin_item.setup_token_update_required?(latest_sync:)
+    assert_equal "good", @simplefin_item.effective_status(latest_sync:)
+  end
+
+  test "setup token update is not required while latest sync is unresolved" do
+    @simplefin_item.update!(status: :requires_update)
+    Sync.create!(
+      syncable: @simplefin_item,
+      status: "pending",
+      sync_stats: {
+        "import_started" => true
+      }
+    )
+
+    refute @simplefin_item.setup_token_update_required?
+    assert_equal "good", @simplefin_item.effective_status
+  end
+
+  test "setup token update is required when latest sync is stale without accounts" do
+    @simplefin_item.update!(status: :requires_update)
+    Sync.create!(
+      syncable: @simplefin_item,
+      status: "stale",
+      sync_stats: {
+        "import_started" => true
+      }
+    )
+
+    assert @simplefin_item.setup_token_update_required?
+    assert_equal "requires_update", @simplefin_item.effective_status
+  end
+
   test "can be marked for deletion" do
     refute @simplefin_item.scheduled_for_deletion?
 
@@ -43,6 +123,15 @@ class SimplefinItemTest < ActiveSupport::TestCase
     assert_respond_to @simplefin_item, :syncing?
   end
 
+  test "memoizes accounts across repeated calls" do
+    queries = capture_sql_queries do
+      @simplefin_item.accounts
+      @simplefin_item.accounts
+    end
+
+    assert_equal 1, queries.grep(/FROM "simplefin_accounts"/).size
+  end
+
   test "scopes work correctly" do
     # Create one for deletion
     item_for_deletion = SimplefinItem.create!(
@@ -145,4 +234,25 @@ class SimplefinItemTest < ActiveSupport::TestCase
     )
     assert_equal "2 institutions", @simplefin_item.institution_summary
   end
+
+  private
+    def capture_sql_queries
+      queries = []
+
+      callback = lambda do |_name, _start, _finish, _message_id, payload|
+        sql = payload[:sql].to_s
+        name = payload[:name].to_s
+
+        next if name == "SCHEMA"
+        next if sql.match?(/\A(?:BEGIN|COMMIT|ROLLBACK)\b/i)
+
+        queries << sql
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        yield
+      end
+
+      queries
+    end
 end
diff --git a/test/models/snaptrade_account/activities_processor_test.rb b/test/models/snaptrade_account/activities_processor_test.rb
index 2c5639952..b4b8419c0 100644
--- a/test/models/snaptrade_account/activities_processor_test.rb
+++ b/test/models/snaptrade_account/activities_processor_test.rb
@@ -161,6 +161,37 @@ class SnaptradeAccount::ActivitiesProcessorTest < ActiveSupport::TestCase
     assert_equal "Transfer", transfer_out.entryable.investment_activity_label
   end
 
+  test "normalizes bare TRANSFER from the provider sign" do
+    # Regression test for issue #2756. Unlike TRANSFER_IN/TRANSFER_OUT, a bare "TRANSFER"
+    # carries no direction in the type, so SnapTrade's sign is the only directional signal
+    # available and must be inverted into Sure's convention rather than passed through.
+    @snaptrade_account.update!(raw_activities_payload: [
+      build_cash_activity(
+        id: "transfer_generic_in",
+        type: "TRANSFER",
+        amount: 1320.75,
+        settlement_date: Date.current.to_s
+      ),
+      build_cash_activity(
+        id: "transfer_generic_out",
+        type: "TRANSFER",
+        amount: -500.00,
+        settlement_date: Date.current.to_s
+      )
+    ])
+
+    processor = SnaptradeAccount::ActivitiesProcessor.new(@snaptrade_account)
+    processor.process
+
+    inbound = @account.entries.find_by(external_id: "transfer_generic_in", source: "snaptrade")
+    outbound = @account.entries.find_by(external_id: "transfer_generic_out", source: "snaptrade")
+
+    assert_not_nil inbound
+    assert_not_nil outbound
+    assert_equal(-1320.75, inbound.amount.to_f, "money in must be stored negative on an asset account")
+    assert_equal 500.00, outbound.amount.to_f, "money out must be stored positive on an asset account"
+  end
+
   test "maps all known activity types correctly" do
     type_mappings = {
       "BUY" => "Buy",
diff --git a/test/models/snaptrade_account_processor_test.rb b/test/models/snaptrade_account_processor_test.rb
index d6926d250..820d6d54e 100644
--- a/test/models/snaptrade_account_processor_test.rb
+++ b/test/models/snaptrade_account_processor_test.rb
@@ -380,6 +380,155 @@ class SnaptradeAccountProcessorTest < ActiveSupport::TestCase
     assert eur_cash, "processor must run the holdings processor so secondary-currency cash is surfaced even with no stock holdings"
   end
 
+  # === Cash-equivalent positions (money market / sweep funds) ===
+  #
+  # SnapTrade includes money market funds in the balances endpoint's `cash`
+  # figure AND returns them as positions with `cash_equivalent: true`.
+  # Counting both inflates the account total (e.g. Fidelity SPAXX).
+
+  test "processor does not double count cash-equivalent positions included in cash balance" do
+    security = securities(:aapl)
+    Account.any_instance.stubs(:set_current_balance)
+
+    @snaptrade_account.update!(
+      currency: "USD",
+      cash_balance: BigDecimal("5000.00"),
+      raw_holdings_payload: [
+        {
+          "symbol" => {
+            "symbol" => { "symbol" => "SPAXX", "description" => "Fidelity Government Money Market Fund" }
+          },
+          "units" => "4000",
+          "price" => "1.00",
+          "currency" => "USD",
+          "cash_equivalent" => true
+        },
+        {
+          "symbol" => {
+            "symbol" => { "symbol" => security.ticker, "description" => security.name }
+          },
+          "units" => "10",
+          "price" => "150.00",
+          "currency" => "USD"
+        }
+      ],
+      raw_activities_payload: []
+    )
+
+    SnaptradeAccount::Processor.new(@snaptrade_account).process
+
+    @account.reload
+    assert_equal BigDecimal("1000.00"), @account.cash_balance, "cash-equivalent position value must be subtracted from cash"
+    assert_equal BigDecimal("6500.00"), @account.balance, "total must count the money market fund only once (1500 stock + 4000 MMF + 1000 cash)"
+
+    spaxx = @account.holdings.joins(:security).where(securities: { ticker: "SPAXX" }).order(date: :desc).first
+    assert_not_nil spaxx, "the cash-equivalent position is still imported as a holding"
+    assert_equal BigDecimal("4000"), spaxx.amount
+
+    debug_entries = DebugLogEntry.where(category: "provider_sync", provider_key: "snaptrade")
+    assert_equal 1, debug_entries.count, "the exclusion is recorded once in /settings/debug"
+    assert_equal "4000.0", debug_entries.first.metadata["cash_equivalent_value"]
+  end
+
+  test "cash balance may go negative when cash-equivalent value exceeds reported cash and is recorded for support" do
+    Account.any_instance.stubs(:set_current_balance)
+
+    # A stale holdings snapshot (or real margin) can make the cash-equivalent
+    # value exceed reported cash. No floor is applied — negative cash is
+    # legitimate for margin — but before/after values are recorded so support
+    # can tell the two apart in /settings/debug.
+    @snaptrade_account.update!(
+      currency: "USD",
+      cash_balance: BigDecimal("100.00"),
+      raw_holdings_payload: [
+        {
+          "symbol" => {
+            "symbol" => { "symbol" => "SPAXX", "description" => "Fidelity Government Money Market Fund" }
+          },
+          "units" => "4000",
+          "price" => "1.00",
+          "currency" => "USD",
+          "cash_equivalent" => true
+        }
+      ],
+      raw_activities_payload: []
+    )
+
+    SnaptradeAccount::Processor.new(@snaptrade_account).process
+
+    @account.reload
+    assert_equal BigDecimal("-3900.00"), @account.cash_balance, "negative cash is preserved, not floored"
+
+    entry = DebugLogEntry.where(category: "provider_sync", provider_key: "snaptrade").order(created_at: :desc).first
+    assert_equal "100.0", entry.metadata["cash_balance_before"]
+    assert_equal "-3900.0", entry.metadata["cash_balance_after"]
+  end
+
+  test "cash-equivalent positions are subtracted in the stored cash currency when it falls back to USD" do
+    Account.any_instance.stubs(:set_current_balance)
+
+    # CAD account with no CAD cash entry: upsert_balances!' USD fallback means
+    # cash_balance is denominated in USD, so the USD money market fund must be
+    # subtracted from it even though it doesn't match the account currency.
+    @snaptrade_account.update!(
+      currency: "CAD",
+      current_balance: BigDecimal("10000.00"),
+      cash_balance: BigDecimal("5000.00"),
+      raw_balances_payload: [
+        { "currency" => { "code" => "USD" }, "cash" => "5000.00" }
+      ],
+      raw_holdings_payload: [
+        {
+          "symbol" => {
+            "symbol" => { "symbol" => "SPAXX", "description" => "Fidelity Government Money Market Fund" }
+          },
+          "units" => "4000",
+          "price" => "1.00",
+          "currency" => "USD",
+          "cash_equivalent" => true
+        }
+      ],
+      raw_activities_payload: []
+    )
+
+    SnaptradeAccount::Processor.new(@snaptrade_account).process
+
+    @account.reload
+    assert_equal BigDecimal("1000.00"), @account.cash_balance, "USD cash-equivalent position must be subtracted from the USD-denominated cash balance"
+    assert_equal BigDecimal("10000.00"), @account.balance, "multi-currency holdings still use the API total"
+  end
+
+  test "cash-equivalent positions in a non-primary currency reduce that currency's synthetic cash holding" do
+    @snaptrade_account.update!(
+      currency: "USD",
+      cash_balance: BigDecimal("1500.00"),
+      raw_balances_payload: [
+        { "currency" => { "code" => "USD" }, "cash" => "1500.00" },
+        { "currency" => { "code" => "EUR" }, "cash" => "800.00" }
+      ],
+      raw_holdings_payload: [
+        {
+          "symbol" => {
+            "symbol" => { "symbol" => "EURMM", "description" => "Euro Money Market Fund" }
+          },
+          "units" => "300",
+          "price" => "1.00",
+          "currency" => "EUR",
+          "cash_equivalent" => true
+        }
+      ]
+    )
+
+    SnaptradeAccount::HoldingsProcessor.new(@snaptrade_account).process
+
+    eur_cash = @account.holdings.joins(:security).where(securities: { kind: "cash" }, currency: "EUR").order(date: :desc).first
+    assert_not_nil eur_cash
+    assert_equal BigDecimal("500"), eur_cash.qty, "EUR synthetic cash must exclude the EUR cash-equivalent position (800 - 300)"
+
+    eur_mmf = @account.holdings.joins(:security).where(securities: { ticker: "EURMM" }).order(date: :desc).first
+    assert_not_nil eur_mmf, "the EUR cash-equivalent position is still imported as a holding"
+  end
+
   test "non-primary cash holding is not duplicated across repeated syncs" do
     @snaptrade_account.update!(
       currency: "USD",
diff --git a/test/models/snaptrade_account_test.rb b/test/models/snaptrade_account_test.rb
index 48efc0f30..a6293da6e 100644
--- a/test/models/snaptrade_account_test.rb
+++ b/test/models/snaptrade_account_test.rb
@@ -1,6 +1,8 @@
 require "test_helper"
 
 class SnaptradeAccountTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup do
     @family_a = families(:dylan_family)
     @family_b = families(:empty)
@@ -71,4 +73,54 @@ class SnaptradeAccountTest < ActiveSupport::TestCase
       )
     end
   end
+
+  test "suggested_account_type maps SnapTrade account categories" do
+    account = SnaptradeAccount.new(snaptrade_item: @item_a, name: "Account", currency: "USD")
+
+    account.raw_payload = { "account_category" => "DEPOSIT" }
+    assert_equal "Depository", account.suggested_account_type
+
+    account.raw_payload = { "account_category" => "LOC", "raw_type" => "line_of_credit" }
+    assert_equal "Loan", account.suggested_account_type
+
+    account.raw_payload = { "account_category" => "LOC", "raw_type" => "CREDIT_CARD" }
+    assert_equal "CreditCard", account.suggested_account_type
+
+    account.raw_payload = { "account_category" => "INVESTMENT" }
+    assert_equal "Investment", account.suggested_account_type
+
+    account.raw_payload = { "account_category" => "INVESTMENT", "raw_type" => "CRYPTOCURRENCY" }
+    assert_equal "Crypto", account.suggested_account_type
+
+    account.raw_payload = {}
+    assert_equal "Investment", account.suggested_account_type
+  end
+
+  # Regression: the after_destroy callback enqueues SnaptradeConnectionCleanupJob,
+  # which references the account/item by id. If it is enqueued before the destroy
+  # transaction commits (Rails 8.1's immediate-enqueue default), a worker can run
+  # before COMMIT: its "do other accounts still share this authorization?" guard
+  # then sees the not-yet-deleted row, skips the provider call, and leaks the
+  # SnapTrade connection. Enqueuing must be deferred until commit.
+  test "connection cleanup job is deferred until the destroy transaction commits" do
+    account = SnaptradeAccount.create!(
+      snaptrade_item: @item_a,
+      snaptrade_account_id: "cleanup_uuid",
+      snaptrade_authorization_id: "auth_cleanup",
+      name: "Brokerage",
+      currency: "USD",
+      current_balance: 1000
+    )
+
+    enqueued_mid_transaction = nil
+
+    ActiveRecord::Base.transaction do
+      account.destroy!
+      enqueued_mid_transaction = enqueued_jobs.any? { |job| job[:job] == SnaptradeConnectionCleanupJob }
+    end
+
+    assert_not enqueued_mid_transaction,
+      "SnaptradeConnectionCleanupJob was enqueued before the destroy committed (would race COMMIT and leak the provider connection)"
+    assert_enqueued_with job: SnaptradeConnectionCleanupJob
+  end
 end
diff --git a/test/models/snaptrade_item_oauth_test.rb b/test/models/snaptrade_item_oauth_test.rb
new file mode 100644
index 000000000..133acb1ec
--- /dev/null
+++ b/test/models/snaptrade_item_oauth_test.rb
@@ -0,0 +1,62 @@
+require "test_helper"
+require "ostruct"
+
+class SnaptradeItemOauthTest < ActiveSupport::TestCase
+  setup do
+    @item = snaptrade_items(:configured_item)
+  end
+
+  test "syncable scope includes only active items with an access token" do
+    assert_includes SnaptradeItem.syncable, snaptrade_items(:configured_item)
+    assert_not_includes SnaptradeItem.syncable, snaptrade_items(:unauthorized_item)
+  end
+
+  test "oauth_configured? and fully_configured? reflect token presence" do
+    assert @item.oauth_configured?
+    assert @item.fully_configured?
+    assert_not snaptrade_items(:unauthorized_item).oauth_configured?
+  end
+
+  test "apply_oauth_tokens! persists rotated tokens and keeps old refresh token when omitted" do
+    @item.apply_oauth_tokens!(
+      "access_token" => "new-at", "refresh_token" => "new-rt",
+      "token_type" => "Bearer", "scope" => "read", "expires_in" => 900
+    )
+    assert_equal "new-at", @item.oauth_access_token
+    assert_equal "new-rt", @item.oauth_refresh_token
+    assert_in_delta 900, @item.oauth_token_expires_at - Time.current, 10
+
+    @item.apply_oauth_tokens!("access_token" => "newer-at", "expires_in" => 900)
+    assert_equal "newer-at", @item.oauth_access_token
+    assert_equal "new-rt", @item.oauth_refresh_token, "refresh token must survive rotation that omits it"
+  end
+
+  test "complete_oauth_exchange! stores tokens and marks item good" do
+    @item.update!(status: :requires_update)
+    Provider::Snaptrade.expects(:exchange_code)
+      .with(code: "c0de", redirect_uri: "https://sure.test/cb", code_verifier: "v")
+      .returns({ "access_token" => "at", "refresh_token" => "rt", "expires_in" => 900 })
+
+    @item.complete_oauth_exchange!(code: "c0de", redirect_uri: "https://sure.test/cb", code_verifier: "v")
+
+    assert_equal "at", @item.oauth_access_token
+    assert @item.good?
+  end
+
+  test "snaptrade_provider returns provider only when token present" do
+    assert_instance_of Provider::Snaptrade, @item.snaptrade_provider
+    assert_nil snaptrade_items(:unauthorized_item).snaptrade_provider
+  end
+
+  test "destroy revokes tokens best-effort" do
+    Provider::Snaptrade.expects(:revoke_token).with(token: @item.oauth_refresh_token).returns(true)
+    @item.destroy!
+  end
+
+  test "destroy proceeds even when revocation raises" do
+    Provider::Snaptrade.expects(:revoke_token).raises(Provider::Snaptrade::ApiError.new("boom"))
+    assert_difference "SnaptradeItem.count", -1 do
+      @item.destroy!
+    end
+  end
+end
diff --git a/test/models/snaptrade_item_test.rb b/test/models/snaptrade_item_test.rb
index 6b31c9895..8bdaf3a4f 100644
--- a/test/models/snaptrade_item_test.rb
+++ b/test/models/snaptrade_item_test.rb
@@ -1,116 +1,64 @@
 require "test_helper"
 
 class SnaptradeItemTest < ActiveSupport::TestCase
+  include ActiveJob::TestHelper
+
   setup do
     @family = families(:dylan_family)
   end
 
   test "validates presence of name" do
-    item = SnaptradeItem.new(family: @family, client_id: "test", consumer_key: "test")
+    item = SnaptradeItem.new(family: @family)
     assert_not item.valid?
     assert_includes item.errors[:name], "can't be blank"
   end
 
-  test "validates presence of client_id on create" do
-    item = SnaptradeItem.new(family: @family, name: "Test", consumer_key: "test")
-    assert_not item.valid?
-    assert_includes item.errors[:client_id], "can't be blank"
-  end
-
-  test "validates presence of consumer_key on create" do
-    item = SnaptradeItem.new(family: @family, name: "Test", client_id: "test")
-    assert_not item.valid?
-    assert_includes item.errors[:consumer_key], "can't be blank"
-  end
-
-  test "credentials_configured? returns true when credentials are set" do
-    item = SnaptradeItem.new(
-      family: @family,
-      name: "Test",
-      client_id: "test_client_id",
-      consumer_key: "test_consumer_key"
-    )
-    assert item.credentials_configured?
-  end
-
-  test "credentials_configured? returns false when credentials are missing" do
+  test "allows oauth-only items without api credentials" do
     item = SnaptradeItem.new(family: @family, name: "Test")
-    assert_not item.credentials_configured?
+    assert item.valid?
   end
 
-  test "user_registered? returns false when user_id and secret are blank" do
-    item = SnaptradeItem.new(
-      family: @family,
-      name: "Test",
-      client_id: "test",
-      consumer_key: "test"
-    )
-    assert_not item.user_registered?
-  end
-
-  test "user_registered? returns true when user_id and secret are present" do
-    item = SnaptradeItem.new(
-      family: @family,
-      name: "Test",
-      client_id: "test",
-      consumer_key: "test",
-      snaptrade_user_id: "user_123",
-      snaptrade_user_secret: "secret_abc"
-    )
-    assert item.user_registered?
-  end
-
-  test "snaptrade_provider returns nil when credentials not configured" do
+  test "snaptrade_provider returns nil when oauth token not present" do
     item = SnaptradeItem.new(family: @family, name: "Test")
     assert_nil item.snaptrade_provider
   end
 
-  test "snaptrade_provider returns provider instance when configured" do
+  test "snaptrade_provider returns provider instance when oauth token present" do
     item = SnaptradeItem.new(
       family: @family,
       name: "Test",
-      client_id: "test_client_id",
-      consumer_key: "test_consumer_key"
+      oauth_access_token: "test-access-token"
     )
     provider = item.snaptrade_provider
     assert_instance_of Provider::Snaptrade, provider
   end
 
-  test "orphaned_users only includes users for the same family" do
-    item = SnaptradeItem.new(
-      family: @family,
-      name: "Test",
-      client_id: "test",
-      consumer_key: "test",
-      snaptrade_user_id: "family_#{@family.id}_111",
-      snaptrade_user_secret: "secret"
-    )
+  test "credentials_configured? mirrors oauth_configured?" do
+    item = SnaptradeItem.new(family: @family, name: "Test")
+    assert_equal item.oauth_configured?, item.credentials_configured?
+    assert_not item.credentials_configured?
 
-    item.stubs(:list_all_users).returns([
-      "family_#{@family.id}_111",
-      "family_#{@family.id}_222",
-      "family_999_333",
-      "legacy_user_444"
-    ])
-
-    assert_equal([ "family_#{@family.id}_222" ], item.orphaned_users)
+    item.oauth_access_token = "test-access-token"
+    assert_equal item.oauth_configured?, item.credentials_configured?
+    assert item.credentials_configured?
   end
 
-  test "delete_orphaned_user rejects users outside the current family namespace" do
-    item = SnaptradeItem.new(
-      family: @family,
-      name: "Test",
-      client_id: "test",
-      consumer_key: "test",
-      snaptrade_user_id: "family_#{@family.id}_111",
-      snaptrade_user_secret: "secret"
-    )
+  test "an unlinked account awaiting activities does not keep the item syncing" do
+    item = snaptrade_items(:configured_item)
+    account = snaptrade_accounts(:fidelity_401k)
+    account.update!(activities_fetch_pending: true)
 
-    provider = mock
-    provider.expects(:delete_user).never
-    item.stubs(:snaptrade_provider).returns(provider)
+    assert_nil account.current_account
+    assert_not item.syncing?
+  end
 
-    assert_not item.delete_orphaned_user("family_999_222")
-    assert_not item.delete_orphaned_user("legacy_user_333")
+  test "sync_later_with_follow_up queues a follow-up after an active sync" do
+    item = snaptrade_items(:configured_item)
+    active_sync = item.syncs.create!
+    active_sync.start!
+
+    assert_enqueued_with job: SnaptradeFollowUpSyncJob do
+      item.sync_later_with_follow_up
+    end
   end
 end
diff --git a/test/models/sure_import_test.rb b/test/models/sure_import_test.rb
index ff99bb6fd..d0a076bf8 100644
--- a/test/models/sure_import_test.rb
+++ b/test/models/sure_import_test.rb
@@ -37,8 +37,23 @@ class SureImportTest < ActiveSupport::TestCase
   end
 
   test "max_row_count is higher than standard imports" do
-    assert_equal 100_000, SureImport.max_row_count
-    assert_equal 100_000, @import.max_row_count
+    with_env_overrides(
+      "SURE_IMPORT_MAX_ROWS" => nil,
+      "SURE_IMPORT_MAX_NDJSON_SIZE_MB" => nil
+    ) do
+      assert_equal 100_000, SureImport.max_row_count
+      assert_equal 100_000, @import.max_row_count
+    end
+  end
+
+  test "max row count and ndjson size can be configured by environment" do
+    with_env_overrides(
+      "SURE_IMPORT_MAX_ROWS" => "150000",
+      "SURE_IMPORT_MAX_NDJSON_SIZE_MB" => "64"
+    ) do
+      assert_equal 150_000, SureImport.max_row_count
+      assert_equal 64.megabytes, SureImport.max_ndjson_size
+    end
   end
 
   test "dry_run totals can be derived from existing line type counts" do
@@ -296,7 +311,7 @@ class SureImportTest < ActiveSupport::TestCase
     assert_equal({ "expected" => 0, "actual" => 1 }, verification.dig("mismatches", "valuations"))
   end
 
-  test "publish records mismatch when expected rows are skipped by readback" do
+  test "import records mismatch when expected rows are skipped by readback" do
     attach_ndjson(build_ndjson([
       { type: "Transaction", data: {
         id: "transaction-1",
@@ -308,10 +323,12 @@ class SureImportTest < ActiveSupport::TestCase
       } }
     ]))
 
-    @import.publish
+    initial_transaction_count = @family.entries.where(entryable_type: "Transaction").count
+
+    @import.import!
     @import.reload
 
-    assert_equal "complete", @import.status
+    assert_equal initial_transaction_count, @family.entries.where(entryable_type: "Transaction").count
     assert_equal "mismatch", @import.readback_verification["status"]
     assert_equal({ "expected" => 1, "actual" => 0 }, @import.readback_verification.dig("mismatches", "transactions"))
   end
@@ -410,6 +427,43 @@ class SureImportTest < ActiveSupport::TestCase
     assert_equal "Revertable Account", @import.accounts.first.name
   end
 
+  test "import tracks split parent entries for revert" do
+    attach_ndjson(build_ndjson([
+      { type: "Account", data: {
+        id: "split-account",
+        name: "Split Revert Account",
+        balance: "500.00",
+        currency: "USD",
+        accountable_type: "Depository"
+      } },
+      { type: "Transaction", data: {
+        id: "split-parent",
+        account_id: "split-account",
+        date: "2024-01-15",
+        amount: "100.00",
+        name: "Revertable split parent",
+        currency: "USD",
+        split_lines: [
+          { id: "split-child-1", amount: "40.00", name: "Split child one" },
+          { id: "split-child-2", amount: "60.00", name: "Split child two" }
+        ]
+      } }
+    ]))
+
+    @import.publish
+
+    parent_entry = @family.entries.find_by!(name: "Revertable split parent")
+    split_entry_ids = [ parent_entry.id, *parent_entry.child_entries.pluck(:id) ]
+
+    assert parent_entry.split_parent?
+    assert_equal 3, @import.entries.where(id: split_entry_ids).count
+
+    assert_difference -> { Entry.where(id: split_entry_ids).count }, -3 do
+      @import.revert
+    end
+    assert_equal "pending", @import.reload.status
+  end
+
   test "publishes later enqueues job" do
     attach_ndjson(build_ndjson([
       { type: "Account", data: {
@@ -428,6 +482,242 @@ class SureImportTest < ActiveSupport::TestCase
     assert_equal "importing", @import.status
   end
 
+  test "publish_later raises custom error when preflight passes but import is not publishable" do
+    @import.stubs(:validate_sure_preflight!).returns(true)
+    @import.stubs(:publishable?).returns(false)
+
+    assert_no_enqueued_jobs do
+      error = assert_raises SureImport::NotPublishableError do
+        @import.publish_later
+      end
+      assert_equal "Import was uploaded but has no publishable records.", error.message
+    end
+    assert_equal "pending", @import.reload.status
+  end
+
+  test "publish_later restores previous status when enqueue fails" do
+    attach_ndjson(build_ndjson([
+      { type: "Account", data: {
+        id: "account-1",
+        name: "Queued Account",
+        balance: "100",
+        currency: "USD",
+        accountable_type: "Depository"
+      } }
+    ]))
+    ImportJob.stubs(:perform_later).raises(StandardError, "queue down")
+
+    assert_no_enqueued_jobs do
+      error = assert_raises StandardError do
+        @import.publish_later
+      end
+      assert_equal "queue down", error.message
+    end
+
+    assert_equal "pending", @import.reload.status
+  end
+
+  test "preflight reports blocking errors before publish_later enqueues" do
+    @family.categories.create!(
+      name: "Groceries",
+      color: "#407706",
+      lucide_icon: "shopping-basket"
+    )
+    attach_ndjson(build_ndjson([
+      { type: "Account", data: {
+        id: "account-1",
+        name: "Blocked Account",
+        balance: "100",
+        currency: "USD",
+        accountable_type: "Depository"
+      } },
+      { type: "Category", data: { id: "category-1", name: "Groceries" } }
+    ]))
+
+    assert_no_enqueued_jobs do
+      assert_raises SureImport::PreflightError do
+        @import.publish_later
+      end
+    end
+
+    assert_equal "failed", @import.reload.status
+    assert_includes @import.error, "Category name \"Groceries\" already exists"
+  end
+
+  test "publish_later reports unsupported records through preflight before publishable check" do
+    attach_ndjson(build_ndjson([
+      { type: "MysteryType", data: { id: "mystery-1" } }
+    ]))
+
+    assert_no_enqueued_jobs do
+      assert_raises SureImport::PreflightError do
+        @import.publish_later
+      end
+    end
+
+    assert_equal "failed", @import.reload.status
+    assert_includes @import.error, "unsupported record type MysteryType"
+  end
+
+  test "publish preflight failure does not partially import records" do
+    attach_ndjson(build_ndjson([
+      { type: "Account", data: {
+        id: "account-1",
+        name: "Should Not Import",
+        balance: "100",
+        currency: "USD",
+        accountable_type: "NotReal"
+      } }
+    ]))
+
+    assert_no_difference -> { @family.accounts.where(name: "Should Not Import").count } do
+      @import.publish
+    end
+
+    assert_equal "failed", @import.reload.status
+    assert_includes @import.error, "invalid accountable_type"
+  end
+
+  test "preflight catches missing fields unsupported types duplicate valuations and references" do
+    attach_ndjson(build_ndjson([
+      { type: "RecurringTransaction", data: { id: "recurring-1" } },
+      { type: "MysteryType", data: { id: "mystery-1" } },
+      { type: "Account", data: {
+        id: "account-1",
+        name: "Bad Subtype",
+        balance: "100",
+        accountable_type: "Depository",
+        accountable: { subtype: "not-a-subtype" }
+      } },
+      { type: "Valuation", data: { account_id: "account-1", date: "2024-01-01", amount: "100" } },
+      { type: "Valuation", data: { account_id: "account-1", date: "2024-01-01", amount: "101" } },
+      { type: "Transaction", data: {
+        id: "transaction-1",
+        account_id: "missing-account",
+        date: "2024-01-02",
+        amount: "-5",
+        tag_ids: [ "missing-tag" ]
+      } }
+    ]))
+
+    result = @import.sure_preflight
+    codes = result.errors.map { |error| error[:code] }
+
+    assert_not result.valid?
+    assert_includes codes, "missing_required_fields"
+    assert_includes codes, "unsupported_record_type"
+    assert_includes codes, "invalid_accountable_subtype"
+    assert_includes codes, "duplicate_valuation"
+    assert_includes codes, "missing_reference"
+  end
+
+  test "preflight rejects invalid accountable types through explicit allowlist" do
+    attach_ndjson(build_ndjson([
+      { type: "Account", data: {
+        id: "account-1",
+        name: "Bad Accountable",
+        balance: "100",
+        accountable_type: "Kernel",
+        accountable: { subtype: "system" }
+      } }
+    ]))
+
+    result = @import.sure_preflight
+
+    assert_not result.valid?
+    assert_nil Accountable.from_type("Kernel")
+    assert_equal Depository, Accountable.from_type("Depository")
+    assert_equal [ "invalid_accountable_type" ], result.errors.map { |error| error[:code] }
+    assert_includes result.error_message, 'invalid accountable_type "Kernel"'
+  end
+
+  test "preflight catches duplicate taxonomy names inside ndjson" do
+    attach_ndjson(build_ndjson([
+      { type: "Category", data: { id: "category-1", name: "Groceries" } },
+      { type: "Category", data: { id: "category-2", name: "Groceries" } }
+    ]))
+
+    result = @import.sure_preflight
+
+    assert_not result.valid?
+    assert_includes result.errors.map { |error| error[:code] }, "duplicate_taxonomy_name"
+    assert_includes result.error_message, "appears more than once"
+  end
+
+  test "preflight rejects split line totals that cannot import atomically" do
+    attach_ndjson(build_ndjson([
+      { type: "Account", data: {
+        id: "split-account",
+        name: "Split Checking",
+        balance: "500.00",
+        currency: "USD",
+        accountable_type: "Depository"
+      } },
+      { type: "Transaction", data: {
+        id: "split-parent",
+        account_id: "split-account",
+        date: "2024-01-15",
+        amount: "100.00",
+        name: "Invalid split parent",
+        currency: "USD",
+        split_lines: [
+          { id: "split-child-1", amount: "40.00", name: "Split child one" },
+          { id: "split-child-2", amount: "50.00", name: "Split child two" }
+        ]
+      } }
+    ]))
+
+    result = @import.sure_preflight
+
+    assert_not result.valid?
+    assert_includes result.errors.map { |error| error[:code] }, "split_amount_mismatch"
+
+    assert_no_enqueued_jobs do
+      assert_raises SureImport::PreflightError do
+        @import.publish_later
+      end
+    end
+    assert_equal "failed", @import.reload.status
+  end
+
+  test "strict preflight requires references to be present in the same ndjson" do
+    existing_account = @family.accounts.first
+    existing_parent = @family.categories.create!(
+      name: "Existing Parent",
+      color: "#407706",
+      lucide_icon: "shapes"
+    )
+
+    attach_ndjson(build_ndjson([
+      {
+        type: "Valuation",
+        data: {
+          account_id: existing_account.id,
+          date: "2024-01-01",
+          amount: "100"
+        }
+      },
+      {
+        type: "Category",
+        data: {
+          id: "category-child",
+          name: "Imported Child",
+          parent_id: existing_parent.id
+        }
+      }
+    ]))
+
+    result = @import.sure_preflight
+
+    assert_not result.valid?
+    assert_equal(
+      [ "missing_reference", "missing_reference" ],
+      result.errors.map { |error| error[:code] }
+    )
+    assert_includes result.error_message, "references missing account_id"
+    assert_includes result.error_message, "references missing parent_id"
+  end
+
   private
 
     def attach_ndjson(ndjson)
@@ -492,3 +782,75 @@ class SureImportTest < ActiveSupport::TestCase
       ])
     end
 end
+
+class Import::PreflightTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+  end
+
+  test "SureImport preflight reports strict taxonomy collisions" do
+    @family.tags.create!(name: "Reviewed", color: "#12B76A")
+    ndjson = build_ndjson([
+      { type: "Tag", data: { id: "tag-1", name: "Reviewed" } }
+    ])
+
+    assert_no_difference("Import.count") do
+      response = Import::Preflight.new(
+        family: @family,
+        params: { type: "SureImport", raw_file_content: ndjson }
+      ).call
+      payload = response.payload[:data]
+
+      assert_equal :ok, response.status
+      assert_equal false, payload[:valid]
+      assert_equal "existing_taxonomy_collision", payload[:errors].first[:code]
+    end
+  end
+
+  test "SureImport preflight counts invalid rows instead of validation errors" do
+    ndjson = build_ndjson([
+      [],
+      { type: "Transaction", data: { id: "transaction-1" } }
+    ])
+
+    response = Import::Preflight.new(
+      family: @family,
+      params: { type: "SureImport", raw_file_content: ndjson }
+    ).call
+    payload = response.payload[:data]
+
+    assert_equal :ok, response.status
+    assert_equal 2, payload[:stats][:rows_count]
+    assert_equal 1, payload[:stats][:valid_rows_count]
+    assert_equal 1, payload[:stats][:invalid_rows_count]
+    assert_operator payload[:errors].size, :>, payload[:stats][:invalid_rows_count]
+  end
+
+  test "SureImport preflight handles missing entity counts" do
+    result = Struct.new(:stats, :errors, :warnings, keyword_init: true) do
+      def valid?
+        true
+      end
+    end.new(
+      stats: { rows_count: 1, valid_rows_count: 1, invalid_rows_count: 0 },
+      errors: [],
+      warnings: []
+    )
+    SureImport::Preflight.stubs(:new).returns(stub(call: result))
+
+    response = Import::Preflight.new(
+      family: @family,
+      params: { type: "SureImport", raw_file_content: "{}" }
+    ).call
+    payload = response.payload[:data]
+
+    assert_equal :ok, response.status
+    assert_includes payload[:warnings], "No importable records were found."
+  end
+
+  private
+
+    def build_ndjson(records)
+      records.map(&:to_json).join("\n")
+    end
+end
diff --git a/test/models/sync_test.rb b/test/models/sync_test.rb
index 92dcba289..747f46ff2 100644
--- a/test/models/sync_test.rb
+++ b/test/models/sync_test.rb
@@ -179,6 +179,146 @@ class SyncTest < ActiveSupport::TestCase
     assert_equal "completed", account_sync.reload.status
   end
 
+  test "sync staled mid-run does not run post-sync when its job finishes" do
+    syncable = accounts(:depository)
+    sync = Sync.create!(syncable: syncable)
+
+    # Simulate SyncCleanerJob marking the sync stale while the job is still running
+    syncable.expects(:perform_sync).with { |s| Sync.find(s.id).mark_stale!; true }
+
+    Account.any_instance.expects(:perform_post_sync).never
+    Account.any_instance.expects(:broadcast_sync_complete).never
+
+    sync.perform
+
+    assert_equal "stale", sync.reload.status
+  end
+
+  test "sync staled mid-run does not raise when its job fails" do
+    syncable = accounts(:depository)
+    sync = Sync.create!(syncable: syncable)
+
+    syncable.expects(:perform_sync).with { |s| Sync.find(s.id).mark_stale!; true }
+      .raises(StandardError.new("provider blew up"))
+
+    Account.any_instance.expects(:perform_post_sync).never
+    Account.any_instance.expects(:broadcast_sync_complete).never
+
+    assert_nothing_raised do
+      sync.perform
+    end
+
+    assert_equal "stale", sync.reload.status
+    assert_equal "provider blew up", sync.error
+  end
+
+  test "request_cancel! resolves a pending sync immediately" do
+    sync = Sync.create!(syncable: accounts(:depository))
+
+    assert sync.request_cancel!
+    assert_equal "stale", sync.reload.status
+
+    # The queued job later no-ops via the may_start? guard
+    accounts(:depository).expects(:perform_sync).never
+    sync.perform
+    assert_equal "stale", sync.reload.status
+  end
+
+  test "cancelling a pending child finalizes its waiting parent" do
+    family = families(:dylan_family)
+    parent = Sync.create!(syncable: family, status: :syncing)
+    child = Sync.create!(syncable: accounts(:depository), parent: parent, status: :pending)
+
+    Family.any_instance.expects(:perform_post_sync).once
+    Family.any_instance.expects(:broadcast_sync_complete).once
+
+    assert child.request_cancel!
+
+    # The child's queued job will no-op via may_start?, so nothing else ever
+    # finalizes the parent — request_cancel! itself must cascade or the
+    # parent hangs in syncing until the 24h sweep.
+    assert_equal "stale", child.reload.status
+    assert_equal "completed", parent.reload.status
+  end
+
+  test "a late provider complete! cannot resurrect a cancelled sync" do
+    item = SimplefinItem.create!(family: families(:dylan_family), name: "SF Conn", access_url: "https://example.com/access")
+    sync = Sync.create!(syncable: item, status: :syncing)
+
+    # Simulates the Sidekiq job's in-memory copy, loaded before cancellation
+    in_job_copy = Sync.find(sync.id)
+
+    assert sync.request_cancel!
+    assert_equal "stale", sync.reload.status
+
+    SimplefinItem::Syncer.new(item).send(:mark_completed, in_job_copy)
+
+    assert_equal "stale", sync.reload.status
+  end
+
+  test "request_cancel! returns false for terminal syncs" do
+    sync = Sync.create!(syncable: accounts(:depository), status: :completed)
+
+    assert_not sync.request_cancel!
+    assert_equal "completed", sync.reload.status
+  end
+
+  test "cancelling a running tree stales pending children and resolves the root to stale without post-sync" do
+    family = families(:dylan_family)
+    plaid_item = plaid_items(:one)
+    account = accounts(:connected)
+
+    family_sync = Sync.create!(syncable: family, status: :syncing)
+    running_child = Sync.create!(syncable: plaid_item, parent: family_sync)
+    pending_child = Sync.create!(syncable: account, parent: running_child, status: :pending)
+
+    running_child.start!
+
+    assert family_sync.request_cancel!
+
+    # Pending descendants are resolved immediately; running ones are left alone
+    assert_equal "stale", pending_child.reload.status
+    assert_equal "syncing", running_child.reload.status
+    assert_equal "syncing", family_sync.reload.status
+
+    # The running child finishes honestly; the cancelled root resolves to
+    # stale and must not re-run family transfer matching / rules / broadcasts
+    PlaidItem.any_instance.expects(:perform_post_sync).once
+    PlaidItem.any_instance.expects(:broadcast_sync_complete).once
+    Family.any_instance.expects(:perform_post_sync).never
+    Family.any_instance.expects(:broadcast_sync_complete).never
+
+    # Simulate the in-flight job finishing after the cancel was requested
+    running_child.finalize_if_all_children_finalized
+
+    assert_equal "completed", running_child.reload.status
+    assert_equal "stale", family_sync.reload.status
+  end
+
+  test "cancel-requested syncs are not visible and do not swallow new sync requests" do
+    account = accounts(:depository)
+    Sync.where(syncable: account).destroy_all
+
+    sync = Sync.create!(syncable: account, status: :syncing, cancel_requested_at: Time.current)
+
+    assert_not account.syncing?
+
+    new_sync = nil
+    assert_difference "Sync.count", 1 do
+      new_sync = account.sync_later
+    end
+    assert_not_equal sync.id, new_sync.id
+  end
+
+  test "family syncer stops scheduling children once cancel is requested" do
+    family = families(:dylan_family)
+    sync = Sync.create!(syncable: family, status: :syncing, cancel_requested_at: Time.current)
+
+    assert_no_difference "Sync.count" do
+      Family::Syncer.new(family).perform_sync(sync)
+    end
+  end
+
   test "clean marks stale incomplete rows" do
     stale_pending = Sync.create!(
       syncable: accounts(:depository),
@@ -257,6 +397,20 @@ class SyncTest < ActiveSupport::TestCase
     assert Sync.any_incomplete_for?(family)
   end
 
+  test "visible? matches visible scope for in-progress syncs" do
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing)
+
+    assert sync.visible?
+    assert_includes Sync.visible, sync
+  end
+
+  test "visible? excludes stale in-progress syncs outside VISIBLE_FOR window" do
+    sync = Sync.create!(syncable: accounts(:depository), status: :syncing, created_at: Sync::VISIBLE_FOR.ago - 1.minute)
+
+    refute sync.visible?
+    refute_includes Sync.visible, sync
+  end
+
   test "api error payload is present for failed syncs without raw error text" do
     sync = Sync.create!(syncable: accounts(:depository), status: :failed)
 
diff --git a/test/models/syncable_test.rb b/test/models/syncable_test.rb
new file mode 100644
index 000000000..79136bfd6
--- /dev/null
+++ b/test/models/syncable_test.rb
@@ -0,0 +1,103 @@
+require "test_helper"
+
+class SyncableTest < ActiveSupport::TestCase
+  def test_current_sync_maps_avoid_additional_queries
+    account = Account.find(accounts(:depository).id)
+
+    sync = Sync.create!(syncable: account)
+    sync.start!
+
+    key = [ account.class.base_class.name, account.id ]
+    Current.latest_sync_by_syncable = { key => sync }
+    Current.latest_completed_sync_by_syncable = { key => nil }
+    Current.syncing_by_syncable = { key => true }
+
+    queries = capture_sql_queries do
+      account.syncing?
+      account.last_sync_created_at
+      account.last_synced_at
+    end
+
+    assert_equal [], queries
+  ensure
+    Current.reset
+  end
+
+  def test_syncing_without_current_maps_queries_database
+    account = Account.find(accounts(:depository).id)
+    Current.reset
+
+    sync = Sync.create!(syncable: account)
+    sync.start!
+
+    queries = capture_sql_queries do
+      assert account.syncing?
+    end
+
+    assert queries.grep(/FROM "syncs"/).any?,
+      "Expected syncing? to query syncs when Current maps are absent"
+  ensure
+    Current.reset
+  end
+
+  def test_latest_completed_sync_without_current_maps_queries_database
+    account = Account.find(accounts(:depository).id)
+    Current.reset
+
+    sync = Sync.create!(syncable: account, status: :completed)
+    sync.update_column(:completed_at, Time.current)
+
+    queries = capture_sql_queries do
+      account.last_synced_at
+    end
+
+    assert queries.grep(/FROM "syncs"/).any?,
+      "Expected latest_completed_sync_record to query syncs when Current maps are absent"
+  ensure
+    Current.reset
+  end
+
+  def test_partial_current_sync_maps_fall_back_to_database
+    account = Account.find(accounts(:depository).id)
+    Current.reset
+
+    sync = Sync.create!(syncable: account)
+    sync.start!
+
+    key = [ account.class.base_class.name, account.id ]
+    Current.latest_sync_by_syncable = {}
+    Current.latest_completed_sync_by_syncable = {}
+    Current.syncing_by_syncable = {}
+
+    queries = capture_sql_queries do
+      assert account.syncing?
+      assert_equal sync.created_at, account.last_sync_created_at
+    end
+
+    assert queries.grep(/FROM "syncs"/).any?,
+      "Expected partial Current maps to fall back to database queries"
+  ensure
+    Current.reset
+  end
+
+  private
+    def capture_sql_queries
+      queries = []
+
+      callback = lambda do |_name, _start, _finish, _message_id, payload|
+        sql = payload[:sql].to_s
+        name = payload[:name].to_s
+
+        next if name == "SCHEMA"
+        next if sql.match?(/\A(?:BEGIN|COMMIT|ROLLBACK)\b/i)
+
+        queries << sql
+      end
+
+      ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+        yield
+      end
+
+      queries
+    end
+end
diff --git a/test/models/trading212_account_test.rb b/test/models/trading212_account_test.rb
new file mode 100644
index 000000000..28e3d819c
--- /dev/null
+++ b/test/models/trading212_account_test.rb
@@ -0,0 +1,132 @@
+require "test_helper"
+
+class Trading212AccountTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @trading212_item = trading212_items(:configured_item)
+    @trading212_account = trading212_accounts(:main_account)
+  end
+
+  # === Validations ===
+
+  test "validates presence of currency" do
+    account = Trading212Account.new(
+      trading212_item: @trading212_item,
+      name: "Test Account",
+      trading212_account_id: "t212_test_1"
+      # currency intentionally blank
+    )
+    assert_not account.valid?
+    assert_includes account.errors[:currency], "can't be blank"
+  end
+
+  test "validates uniqueness of trading212_account_id within item scope" do
+    existing = @trading212_item.trading212_accounts.create!(
+      name: "Duplicate",
+      trading212_account_id: "t212_duplicate",
+      currency: "USD"
+    )
+
+    duplicate = @trading212_item.trading212_accounts.build(
+      name: "Another Duplicate",
+      trading212_account_id: "t212_duplicate",
+      currency: "USD"
+    )
+
+    assert_not duplicate.valid?
+    assert_includes duplicate.errors[:trading212_account_id], "has already been taken"
+  end
+
+  test "allows nil trading212_account_id across items" do
+    second_item = trading212_items(:pending_setup_item)
+
+    account1 = @trading212_item.trading212_accounts.create!(
+      name: "Account 1",
+      currency: "USD"
+    )
+
+    account2 = second_item.trading212_accounts.create!(
+      name: "Account 2",
+      currency: "USD"
+    )
+
+    # Both nil IDs are allowed across different items (unique index has WHERE clause)
+    assert account1.valid?
+    assert account2.valid?
+  end
+
+  # === current_account ===
+
+  test "current_account returns account through account_provider" do
+    investment = accounts(:investment)
+    @trading212_account.ensure_account_provider!(investment)
+
+    assert_equal investment, @trading212_account.current_account
+  end
+
+  test "current_account returns nil when no provider link" do
+    assert_nil @trading212_account.current_account
+  end
+
+  # === ensure_account_provider! ===
+
+  test "ensure_account_provider! creates AccountProvider for the given account" do
+    investment = accounts(:investment)
+
+    assert_difference "AccountProvider.count", 1 do
+      @trading212_account.ensure_account_provider!(investment)
+    end
+
+    assert_equal investment, @trading212_account.reload.current_account
+  end
+
+  test "ensure_account_provider! is idempotent" do
+    investment = accounts(:investment)
+
+    assert_difference "AccountProvider.count", 1 do
+      @trading212_account.ensure_account_provider!(investment)
+    end
+
+    assert_no_difference "AccountProvider.count" do
+      @trading212_account.ensure_account_provider!(investment)
+    end
+
+    assert_equal investment, @trading212_account.reload.current_account
+  end
+
+  test "ensure_account_provider! updates account if different" do
+    investment = accounts(:investment)
+    @trading212_account.ensure_account_provider!(investment)
+
+    crypto = accounts(:crypto)
+    @trading212_account.ensure_account_provider!(crypto)
+
+    assert_equal crypto, @trading212_account.reload.current_account
+  end
+
+  # === instruments_map ===
+
+  test "instruments_map delegates to trading212_item" do
+    instruments = [
+      { "ticker" => "AAPL_US_EQ", "shortName" => "Apple Inc.", "currencyCode" => "USD" }
+    ]
+    @trading212_item.update!(raw_instruments_payload: instruments)
+
+    result = @trading212_account.instruments_map
+    assert_equal "Apple Inc.", result["AAPL_US_EQ"]["shortName"]
+  end
+
+  # === belongs_to relationships ===
+
+  test "belongs to trading212_item" do
+    assert_equal @trading212_item, @trading212_account.trading212_item
+  end
+
+  test "destroyed when trading212_item is destroyed" do
+    t212_account_id = @trading212_account.id
+
+    @trading212_item.destroy
+
+    assert_nil Trading212Account.find_by(id: t212_account_id)
+  end
+end
diff --git a/test/models/trading212_activities_processor_test.rb b/test/models/trading212_activities_processor_test.rb
new file mode 100644
index 000000000..c56834171
--- /dev/null
+++ b/test/models/trading212_activities_processor_test.rb
@@ -0,0 +1,419 @@
+require "test_helper"
+
+class Trading212ActivitiesProcessorTest < ActiveSupport::TestCase
+  fixtures :families, :trading212_items, :trading212_accounts, :accounts, :securities
+  setup do
+    @family = families(:dylan_family)
+    @trading212_item = trading212_items(:configured_item)
+    @trading212_account = trading212_accounts(:main_account)
+
+    # Link to an investment account
+    @account = @family.accounts.create!(
+      name: "Test T212 Investment",
+      balance: 0,
+      cash_balance: 0,
+      currency: "USD",
+      accountable: Investment.new
+    )
+    @trading212_account.ensure_account_provider!(@account)
+    @trading212_account.reload
+  end
+
+  # === process orders (BUY) ===
+
+  test "processes a filled buy order as a Buy trade" do
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => {
+            "id" => "order_001",
+            "status" => "FILLED",
+            "side" => "BUY",
+            "instrument" => {
+              "ticker" => "AAPL_US_EQ",
+              "isin" => "US0378331005",
+              "name" => "Apple Inc."
+            },
+            "filledValue" => "1750.00",
+            "createdAt" => "2024-06-15T10:30:00Z"
+          },
+          "fill" => {
+            "id" => "fill_001",
+            "quantity" => "10",
+            "price" => "175.00",
+            "filledAt" => "2024-06-15T10:30:00Z"
+          }
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:trades]
+    entry = @account.entries.find_by(external_id: "trading212_order_fill_001")
+    assert_not_nil entry
+    assert_equal "Trade", entry.entryable_type
+    assert_equal "Buy", entry.entryable.investment_activity_label
+    assert entry.entryable.qty.positive?
+  end
+
+  test "processes a filled sell order as a Sell trade" do
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => {
+            "id" => "order_002",
+            "status" => "FILLED",
+            "side" => "SELL",
+            "instrument" => {
+              "ticker" => "TSLA_US_EQ",
+              "name" => "Tesla Inc."
+            },
+            "filledValue" => "2500.00",
+            "createdAt" => "2024-06-15T10:30:00Z"
+          },
+          "fill" => {
+            "id" => "fill_002",
+            "quantity" => "10",
+            "price" => "250.00",
+            "filledAt" => "2024-06-15T10:30:00Z"
+          }
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:trades]
+    entry = @account.entries.find_by(external_id: "trading212_order_fill_002")
+    assert_equal "Sell", entry.entryable.investment_activity_label
+    assert entry.entryable.qty.negative?
+  end
+
+  test "skips non-filled orders" do
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => {
+            "id" => "order_003",
+            "status" => "PENDING",
+            "side" => "BUY",
+            "instrument" => { "ticker" => "MSFT_US_EQ", "name" => "Microsoft" },
+            "filledValue" => "400.00",
+            "createdAt" => "2024-06-15T10:30:00Z"
+          },
+          "fill" => {
+            "id" => "fill_003",
+            "quantity" => "1",
+            "price" => "400.00"
+          }
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 0, result[:trades]
+  end
+
+  test "uses order id as external_id when fill id is absent" do
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => {
+            "id" => "order_005",
+            "status" => "FILLED",
+            "side" => "BUY",
+            "instrument" => { "ticker" => "MSFT_US_EQ", "name" => "Microsoft" },
+            "filledValue" => "400.00",
+            "createdAt" => "2024-06-15T10:30:00Z"
+          },
+          "fill" => {
+            "quantity" => "1",
+            "price" => "400.00",
+            "filledAt" => "2024-06-15T10:30:00Z"
+          }
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:trades]
+    entry = @account.entries.find_by(external_id: "trading212_order_order_005")
+    assert_not_nil entry
+  end
+
+  # === process dividends ===
+
+  test "processes dividend as a cash transaction" do
+    @trading212_account.update!(
+      raw_dividends_payload: [
+        {
+          "reference" => "div_001",
+          "ticker" => "AAPL_US_EQ",
+          "amount" => "25.00",
+          "paidOn" => "2024-06-15",
+          "quantity" => "50",
+          "grossAmountPerShare" => "0.50",
+          "type" => "ORDINARY"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:dividends]
+    entry = @account.entries.find_by(external_id: "trading212_dividend_div_001")
+    assert_not_nil entry
+    assert_equal "Transaction", entry.entryable_type
+    assert_equal "Dividend", entry.entryable.investment_activity_label
+    # Dividends are negative in Sure (inflow)
+    assert entry.amount.negative?
+  end
+
+  test "skips dividend with blank reference" do
+    @trading212_account.update!(
+      raw_dividends_payload: [
+        {
+          "ticker" => "AAPL_US_EQ",
+          "amount" => "25.00",
+          "paidOn" => "2024-06-15"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 0, result[:dividends]
+  end
+
+  test "skips dividend with zero or nil amount" do
+    @trading212_account.update!(
+      raw_dividends_payload: [
+        { "reference" => "div_zero", "amount" => "0", "paidOn" => "2024-06-15" },
+        { "reference" => "div_nil", "amount" => nil, "paidOn" => "2024-06-15" }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 0, result[:dividends]
+  end
+
+  # === process cash transactions ===
+
+  test "processes DEPOSIT as Contribution" do
+    @trading212_account.update!(
+      raw_transactions_payload: [
+        {
+          "reference" => "txn_001",
+          "type" => "DEPOSIT",
+          "amount" => "1000.00",
+          "dateTime" => "2024-06-15T10:00:00Z"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:transactions]
+    entry = @account.entries.find_by(external_id: "trading212_transaction_txn_001")
+    assert_not_nil entry
+    assert_equal "Contribution", entry.entryable.investment_activity_label
+    # Deposits are negative in Sure (inflow)
+    assert entry.amount.negative?
+  end
+
+  test "processes WITHDRAW as Withdrawal" do
+    @trading212_account.update!(
+      raw_transactions_payload: [
+        {
+          "reference" => "txn_002",
+          "type" => "WITHDRAW",
+          "amount" => "500.00",
+          "dateTime" => "2024-06-15T10:00:00Z"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:transactions]
+    entry = @account.entries.find_by(external_id: "trading212_transaction_txn_002")
+    assert_equal "Withdrawal", entry.entryable.investment_activity_label
+    assert entry.amount.positive?
+  end
+
+  test "processes INTEREST as Interest" do
+    @trading212_account.update!(
+      raw_transactions_payload: [
+        {
+          "reference" => "txn_003",
+          "type" => "INTEREST",
+          "amount" => "5.00",
+          "dateTime" => "2024-06-15T10:00:00Z"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:transactions]
+    entry = @account.entries.find_by(external_id: "trading212_transaction_txn_003")
+    assert_equal "Interest", entry.entryable.investment_activity_label
+  end
+
+  test "processes FEE as Fee" do
+    @trading212_account.update!(
+      raw_transactions_payload: [
+        {
+          "reference" => "txn_004",
+          "type" => "FEE",
+          "amount" => "2.50",
+          "dateTime" => "2024-06-15T10:00:00Z"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 1, result[:transactions]
+    entry = @account.entries.find_by(external_id: "trading212_transaction_txn_004")
+    assert_equal "Fee", entry.entryable.investment_activity_label
+  end
+
+  test "skips transaction with blank reference" do
+    @trading212_account.update!(
+      raw_transactions_payload: [
+        {
+          "type" => "DEPOSIT",
+          "amount" => "100.00",
+          "dateTime" => "2024-06-15T10:00:00Z"
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 0, result[:transactions]
+  end
+
+  test "skips transaction with zero amount" do
+    @trading212_account.update!(
+      raw_transactions_payload: [
+        { "reference" => "txn_zero", "type" => "DEPOSIT", "amount" => "0", "dateTime" => "2024-06-15T10:00:00Z" }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 0, result[:transactions]
+  end
+
+  # === idempotency ===
+
+  test "processor is idempotent - does not duplicate entries" do
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => {
+            "id" => "order_idempotent",
+            "status" => "FILLED",
+            "side" => "BUY",
+            "instrument" => { "ticker" => "AAPL_US_EQ", "name" => "Apple" },
+            "filledValue" => "1750.00",
+            "createdAt" => "2024-06-15T10:30:00Z"
+          },
+          "fill" => {
+            "id" => "fill_idempotent",
+            "quantity" => "10",
+            "price" => "175.00"
+          }
+        }
+      ],
+      raw_dividends_payload: [
+        { "reference" => "div_idempotent", "amount" => "10.00", "paidOn" => "2024-06-15" }
+      ],
+      raw_transactions_payload: [
+        { "reference" => "txn_idempotent", "type" => "DEPOSIT", "amount" => "100.00", "dateTime" => "2024-06-15T10:00:00Z" }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    first_result = processor.process
+    second_result = processor.process
+
+    assert_equal first_result, second_result
+    assert_equal 1, @account.entries.where(external_id: "trading212_order_fill_idempotent").count
+    assert_equal 1, @account.entries.where(external_id: "trading212_dividend_div_idempotent").count
+    assert_equal 1, @account.entries.where(external_id: "trading212_transaction_txn_idempotent").count
+  end
+
+  # === process returns early without account ===
+
+  test "returns zero counts when no account linked" do
+    @trading212_account.account_provider.destroy!
+
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => { "id" => "o1", "status" => "FILLED", "side" => "BUY",
+                       "instrument" => { "ticker" => "AAPL_US_EQ", "name" => "Apple" } },
+          "fill" => { "quantity" => "10", "price" => "175.00" }
+        }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal({ trades: 0, dividends: 0, transactions: 0 }, result)
+  end
+
+  # === combined results ===
+
+  test "returns combined stats for all activity types" do
+    @trading212_account.update!(
+      raw_orders_payload: [
+        {
+          "order" => { "id" => "o1", "status" => "FILLED", "side" => "BUY",
+                       "instrument" => { "ticker" => "AAPL_US_EQ", "name" => "Apple" } },
+          "fill" => { "id" => "f1", "quantity" => "10", "price" => "175.00", "filledAt" => "2024-06-15T10:30:00Z" }
+        },
+        {
+          "order" => { "id" => "o2", "status" => "FILLED", "side" => "SELL",
+                       "instrument" => { "ticker" => "TSLA_US_EQ", "name" => "Tesla" } },
+          "fill" => { "id" => "f2", "quantity" => "5", "price" => "250.00", "filledAt" => "2024-06-15T11:00:00Z" }
+        }
+      ],
+      raw_dividends_payload: [
+        { "reference" => "d1", "amount" => "10.00", "paidOn" => "2024-06-15" }
+      ],
+      raw_transactions_payload: [
+        { "reference" => "t1", "type" => "DEPOSIT", "amount" => "1000.00", "dateTime" => "2024-06-15T10:00:00Z" },
+        { "reference" => "t2", "type" => "FEE", "amount" => "2.00", "dateTime" => "2024-06-15T10:00:00Z" }
+      ]
+    )
+
+    processor = Trading212Account::ActivitiesProcessor.new(@trading212_account)
+    result = processor.process
+
+    assert_equal 2, result[:trades]
+    assert_equal 1, result[:dividends]
+    assert_equal 2, result[:transactions]
+  end
+end
diff --git a/test/models/trading212_data_helpers_test.rb b/test/models/trading212_data_helpers_test.rb
new file mode 100644
index 000000000..5e29d9b88
--- /dev/null
+++ b/test/models/trading212_data_helpers_test.rb
@@ -0,0 +1,209 @@
+require "test_helper"
+
+class Trading212DataHelpersTest < ActiveSupport::TestCase
+  # Test class that includes the DataHelpers concern and exposes private methods
+  class TestHelper
+    include Trading212Account::DataHelpers
+
+    attr_accessor :currency, :instruments_map
+
+    def initialize(currency: "USD", instruments_map: {})
+      @currency = currency
+      @instruments_map = instruments_map
+    end
+
+    def test_parse_decimal(value)     = parse_decimal(value)
+    def test_parse_date(value)        = parse_date(value)
+    def test_standard_ticker(v)       = standard_ticker(v)
+    def test_resolve_security_for_ticker(v) = resolve_security_for_ticker(v)
+    def test_resolve_security_direct(isin, ticker, name) = resolve_security_direct(isin, ticker, name)
+    def test_instrument_currency(v)    = instrument_currency(v)
+  end
+
+  setup do
+    @helper = TestHelper.new
+  end
+
+  # === parse_decimal ===
+
+  test "parse_decimal handles BigDecimal" do
+    result = @helper.test_parse_decimal(BigDecimal("123.45"))
+    assert_equal BigDecimal("123.45"), result
+  end
+
+  test "parse_decimal handles String" do
+    result = @helper.test_parse_decimal("456.78")
+    assert_equal BigDecimal("456.78"), result
+  end
+
+  test "parse_decimal handles Integer" do
+    result = @helper.test_parse_decimal(100)
+    assert_equal BigDecimal("100"), result
+  end
+
+  test "parse_decimal handles Float" do
+    result = @helper.test_parse_decimal(99.99)
+    assert_equal BigDecimal("99.99"), result
+  end
+
+  test "parse_decimal handles negative values" do
+    result = @helper.test_parse_decimal("-50.25")
+    assert_equal BigDecimal("-50.25"), result
+  end
+
+  test "parse_decimal strips whitespace" do
+    result = @helper.test_parse_decimal("  42.0  ")
+    assert_equal BigDecimal("42.0"), result
+  end
+
+  test "parse_decimal returns nil for nil input" do
+    assert_nil @helper.test_parse_decimal(nil)
+  end
+
+  test "parse_decimal returns nil for blank string" do
+    assert_nil @helper.test_parse_decimal("")
+  end
+
+  test "parse_decimal returns nil for invalid string" do
+    assert_nil @helper.test_parse_decimal("not_a_number")
+  end
+
+  # === parse_date ===
+
+  test "parse_date handles Date object" do
+    date = Date.new(2024, 6, 15)
+    result = @helper.test_parse_date(date)
+    assert_equal date, result
+  end
+
+  test "parse_date handles ISO string" do
+    result = @helper.test_parse_date("2024-06-15")
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date handles Time object" do
+    time = Time.zone.parse("2024-06-15 10:30:00")
+    result = @helper.test_parse_date(time)
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date handles DateTime" do
+    dt = DateTime.new(2024, 6, 15, 10, 30)
+    result = @helper.test_parse_date(dt)
+    assert_equal Date.new(2024, 6, 15), result
+  end
+
+  test "parse_date returns nil for nil input" do
+    assert_nil @helper.test_parse_date(nil)
+  end
+
+  test "parse_date returns nil for blank input" do
+    assert_nil @helper.test_parse_date("")
+  end
+
+  test "parse_date returns nil for invalid string" do
+    assert_nil @helper.test_parse_date("invalid_date")
+  end
+
+  # === standard_ticker ===
+
+  test "standard_ticker extracts first segment of T212 ticker" do
+    assert_equal "AAPL", @helper.test_standard_ticker("AAPL_US_EQ")
+  end
+
+  test "standard_ticker handles single segment" do
+    assert_equal "TSLA", @helper.test_standard_ticker("TSLA")
+  end
+
+  test "standard_ticker uppercases the ticker" do
+    assert_equal "AAPL", @helper.test_standard_ticker("aapl_us_eq")
+  end
+
+  test "standard_ticker handles empty string" do
+    assert_equal "", @helper.test_standard_ticker("")
+  end
+
+  # === resolve_security_for_ticker ===
+
+  test "resolve_security_for_ticker finds via instruments_map" do
+    Security.create!(ticker: "TSLA", name: "Tesla Inc.")
+    helper = TestHelper.new(
+      instruments_map: {
+        "TSLA_US_EQ" => { "shortName" => "Tesla Inc.", "currencyCode" => "USD" }
+      }
+    )
+
+    security = helper.test_resolve_security_for_ticker("TSLA_US_EQ")
+    assert_equal "TSLA", security.ticker
+    assert_equal "Tesla Inc.", security.name
+  end
+
+  test "resolve_security_for_ticker creates security if not found" do
+    helper = TestHelper.new(instruments_map: {})
+
+    security = helper.test_resolve_security_for_ticker("MSFT_US_EQ")
+    assert_equal "MSFT", security.ticker
+  end
+
+  test "resolve_security_for_ticker returns nil for nil input" do
+    security = @helper.test_resolve_security_for_ticker(nil)
+    assert_nil security
+  end
+
+  test "resolve_security_for_ticker returns nil for empty ticker" do
+    security = @helper.test_resolve_security_for_ticker("")
+    assert_nil security
+  end
+
+  # === resolve_security_direct ===
+
+  test "resolve_security_direct finds existing by ticker" do
+    existing = Security.create!(ticker: "GOOGL", name: "Alphabet Inc.")
+
+    result = @helper.test_resolve_security_direct("ISIN123", "GOOGL", "Alphabet Inc.")
+    assert_equal existing, result
+  end
+
+  test "resolve_security_direct creates new when not found" do
+    result = @helper.test_resolve_security_direct("ISIN456", "NVDA", "Nvidia Corp")
+    assert_equal "NVDA", result.ticker
+    assert_equal "Nvidia Corp", result.name
+  end
+
+  test "resolve_security_direct handles race condition on create" do
+    Security.create!(ticker: "RACE", name: "Already Exists")
+
+    result = @helper.test_resolve_security_direct(nil, "RACE", "New Name")
+    assert_equal "RACE", result.ticker
+    assert_equal "Already Exists", result.name
+  end
+
+  # === instrument_currency ===
+
+  test "instrument_currency returns currency from instruments_map" do
+    helper = TestHelper.new(
+      currency: "USD",
+      instruments_map: { "AAPL_US_EQ" => { "currencyCode" => "EUR" } }
+    )
+
+    assert_equal "EUR", helper.test_instrument_currency("AAPL_US_EQ")
+  end
+
+  test "instrument_currency falls back to account currency" do
+    helper = TestHelper.new(
+      currency: "USD",
+      instruments_map: {}
+    )
+
+    assert_equal "USD", helper.test_instrument_currency("UNKNOWN_TICKER")
+  end
+
+  test "instrument_currency falls back when instrument has no currencyCode" do
+    helper = TestHelper.new(
+      currency: "GBP",
+      instruments_map: { "TSLA_US_EQ" => { "shortName" => "Tesla" } }
+    )
+
+    assert_equal "GBP", helper.test_instrument_currency("TSLA_US_EQ")
+  end
+end
diff --git a/test/models/trading212_holdings_processor_test.rb b/test/models/trading212_holdings_processor_test.rb
new file mode 100644
index 000000000..8ab047b2c
--- /dev/null
+++ b/test/models/trading212_holdings_processor_test.rb
@@ -0,0 +1,208 @@
+require "test_helper"
+
+class Trading212HoldingsProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @trading212_item = trading212_items(:configured_item)
+    @trading212_account = trading212_accounts(:main_account)
+
+    # Link to an investment account
+    @account = @family.accounts.create!(
+      name: "Test T212 Investment",
+      balance: 0,
+      cash_balance: 0,
+      currency: "USD",
+      accountable: Investment.new
+    )
+    @trading212_account.ensure_account_provider!(@account)
+    @trading212_account.reload
+  end
+
+  # === process ===
+
+  test "processor creates holdings from raw positions payload" do
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => {
+            "ticker" => "AAPL_US_EQ",
+            "isin" => "US0378331005",
+            "name" => "Apple Inc.",
+            "currency" => "USD"
+          },
+          "quantity" => "50",
+          "currentPrice" => "175.00",
+          "averagePricePaid" => "150.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    processor.process
+
+    security = Security.find_by(ticker: "AAPL")
+    assert_not_nil security
+
+    holding = @account.holdings.find_by(security: security)
+    assert_not_nil holding
+    assert_equal BigDecimal("50"), holding.qty
+    assert_equal BigDecimal("175.00"), holding.price
+  end
+
+  test "processor stores cost basis when available" do
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => {
+            "ticker" => "TSLA_US_EQ",
+            "name" => "Tesla Inc."
+          },
+          "quantity" => "25",
+          "currentPrice" => "250.00",
+          "averagePricePaid" => "200.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    processor.process
+
+    security = Security.find_by(ticker: "TSLA")
+    holding = @account.holdings.find_by(security: security)
+    assert_not_nil holding
+    assert_equal BigDecimal("200.00"), holding.cost_basis
+    assert_equal "provider", holding.cost_basis_source
+  end
+
+  test "processor skips position with blank ticker" do
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => {
+            "ticker" => "",
+            "name" => "No Ticker"
+          },
+          "quantity" => "100",
+          "currentPrice" => "50.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+
+    assert_nothing_raised do
+      processor.process
+    end
+
+    assert_equal 0, @account.holdings.count
+  end
+
+  test "processor skips position with zero quantity" do
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => {
+            "ticker" => "MSFT_US_EQ",
+            "name" => "Microsoft"
+          },
+          "quantity" => "0",
+          "currentPrice" => "400.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    processor.process
+
+    assert_equal 0, @account.holdings.count
+  end
+
+  test "processor skips position with nil price" do
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => {
+            "ticker" => "GOOGL_US_EQ",
+            "name" => "Alphabet"
+          },
+          "quantity" => "10",
+          "currentPrice" => nil
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    processor.process
+
+    assert_equal 0, @account.holdings.count
+  end
+
+  test "processor is idempotent - does not duplicate holdings" do
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => {
+            "ticker" => "NVDA_US_EQ",
+            "name" => "Nvidia"
+          },
+          "quantity" => "30",
+          "currentPrice" => "800.00",
+          "averagePricePaid" => "600.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    2.times { processor.process }
+
+    security = Security.find_by(ticker: "NVDA")
+    assert_equal 1, @account.holdings.where(security: security).count
+  end
+
+  test "processor handles empty positions payload" do
+    @trading212_account.update!(raw_positions_payload: [])
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    processor.process
+
+    assert_equal 0, @account.holdings.count
+  end
+
+  test "processor returns early when no account linked" do
+    @trading212_account.account_provider.destroy!
+
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          "instrument" => { "ticker" => "AAPL_US_EQ", "name" => "Apple" },
+          "quantity" => "10",
+          "currentPrice" => "150.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+    processor.process
+
+    assert_equal 0, @account.holdings.count
+  end
+
+  test "processor gracefully handles individual position errors" do
+    # Position without instrument at all
+    @trading212_account.update!(
+      raw_positions_payload: [
+        {
+          # Missing instrument key entirely
+          "quantity" => "10",
+          "currentPrice" => "150.00"
+        }
+      ]
+    )
+
+    processor = Trading212Account::HoldingsProcessor.new(@trading212_account)
+
+    assert_nothing_raised do
+      processor.process
+    end
+  end
+end
diff --git a/test/models/trading212_item_importer_test.rb b/test/models/trading212_item_importer_test.rb
new file mode 100644
index 000000000..3de757903
--- /dev/null
+++ b/test/models/trading212_item_importer_test.rb
@@ -0,0 +1,121 @@
+require "test_helper"
+
+class Trading212ItemImporterTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item = trading212_items(:configured_item)
+  end
+
+  test "import creates trading212_account with fetched data" do
+    provider = mock("trading212_provider")
+    provider.expects(:fetch_instruments).returns([
+      { "ticker" => "AAPL_US_EQ", "shortName" => "Apple Inc.", "currencyCode" => "USD" }
+    ])
+    provider.expects(:fetch_account_summary).returns({
+      "id" => "t212_acc_new",
+      "totalValue" => "15000.00",
+      "cash" => { "availableToTrade" => "2000.00" }
+    })
+    provider.expects(:fetch_positions).returns([
+      { "instrument" => { "ticker" => "AAPL_US_EQ" }, "quantity" => "10", "currentPrice" => "175.00" }
+    ])
+    provider.expects(:fetch_all_orders).returns([
+      { "order" => { "id" => "o1", "status" => "FILLED", "side" => "BUY" } }
+    ])
+    provider.expects(:fetch_all_dividends).returns([
+      { "reference" => "d1", "amount" => "10.00" }
+    ])
+    provider.expects(:fetch_all_transactions).returns([
+      { "reference" => "t1", "type" => "DEPOSIT", "amount" => "1000.00" }
+    ])
+
+    importer = Trading212Item::Importer.new(@item, provider: provider)
+    result = importer.import
+
+    assert_equal({ success: true }, result)
+
+    account = @item.trading212_accounts.find_by(trading212_account_id: "t212_acc_new")
+    assert_not_nil account
+    assert_equal BigDecimal("15000.00"), account.current_balance
+    assert_equal BigDecimal("2000.00"), account.cash_balance
+    assert account.raw_positions_payload.present?
+    assert account.raw_orders_payload.present?
+    assert account.raw_dividends_payload.present?
+    assert account.raw_transactions_payload.present?
+  end
+
+  test "import updates existing account on subsequent sync" do
+    existing = @item.trading212_accounts.create!(
+      name: "Existing Account",
+      trading212_account_id: "t212_acc_existing",
+      currency: "USD",
+      current_balance: BigDecimal("1000.00"),
+      cash_balance: BigDecimal("100.00")
+    )
+
+    provider = mock("trading212_provider")
+    provider.expects(:fetch_instruments).returns([])
+    provider.expects(:fetch_account_summary).returns({
+      "id" => "t212_acc_existing",
+      "totalValue" => "12000.00",
+      "cash" => { "availableToTrade" => "1500.00" }
+    })
+    provider.expects(:fetch_positions).returns([])
+    provider.expects(:fetch_all_orders).returns([])
+    provider.expects(:fetch_all_dividends).returns([])
+    provider.expects(:fetch_all_transactions).returns([])
+
+    assert_no_difference "Trading212Account.count" do
+      Trading212Item::Importer.new(@item, provider: provider).import
+    end
+
+    existing.reload
+    assert_equal BigDecimal("12000.00"), existing.current_balance
+    assert_equal BigDecimal("1500.00"), existing.cash_balance
+  end
+
+  test "import stores instruments payload on item" do
+    instruments = [
+      { "ticker" => "AAPL_US_EQ", "shortName" => "Apple Inc." },
+      { "ticker" => "TSLA_US_EQ", "shortName" => "Tesla Inc." }
+    ]
+
+    provider = mock("trading212_provider")
+    provider.expects(:fetch_instruments).returns(instruments)
+    provider.expects(:fetch_account_summary).returns({
+      "id" => "t212_acc_inst",
+      "totalValue" => "5000.00",
+      "cash" => { "availableToTrade" => "500.00" }
+    })
+    provider.expects(:fetch_positions).returns([])
+    provider.expects(:fetch_all_orders).returns([])
+    provider.expects(:fetch_all_dividends).returns([])
+    provider.expects(:fetch_all_transactions).returns([])
+
+    Trading212Item::Importer.new(@item, provider: provider).import
+
+    assert_equal 2, @item.reload.raw_instruments_payload.size
+  end
+
+  test "import falls back to cached instruments on fetch failure" do
+    @item.update!(raw_instruments_payload: [
+      { "ticker" => "CACHED_US_EQ", "shortName" => "Cached Inc." }
+    ])
+
+    provider = mock("trading212_provider")
+    provider.expects(:fetch_instruments).raises(StandardError.new("Network error"))
+    provider.expects(:fetch_account_summary).returns({
+      "id" => "t212_acc_cache",
+      "totalValue" => "5000.00",
+      "cash" => { "availableToTrade" => "500.00" }
+    })
+    provider.expects(:fetch_positions).returns([])
+    provider.expects(:fetch_all_orders).returns([])
+    provider.expects(:fetch_all_dividends).returns([])
+    provider.expects(:fetch_all_transactions).returns([])
+
+    # Should not raise
+    result = Trading212Item::Importer.new(@item, provider: provider).import
+    assert_equal({ success: true }, result)
+  end
+end
diff --git a/test/models/trading212_item_syncer_test.rb b/test/models/trading212_item_syncer_test.rb
new file mode 100644
index 000000000..1a592d4d5
--- /dev/null
+++ b/test/models/trading212_item_syncer_test.rb
@@ -0,0 +1,87 @@
+require "test_helper"
+
+class Trading212ItemSyncerTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @item = trading212_items(:configured_item)
+    @syncer = Trading212Item::Syncer.new(@item)
+  end
+
+  # === perform_sync (missing credentials) ===
+
+  test "perform_sync raises ConfigurationError when credentials are missing" do
+    @item.update!(api_key: nil, api_secret: nil)
+    sync = @item.syncs.create!
+
+    error = assert_raises(Provider::Trading212::ConfigurationError) do
+      @syncer.perform_sync(sync)
+    end
+
+    assert_equal "Trading 212 API key is missing.", error.message
+    assert_equal "requires_update", @item.reload.status
+  end
+
+  test "perform_sync sets requires_update status on auth error" do
+    sync = @item.syncs.create!
+    Provider::Trading212.any_instance.expects(:fetch_account_summary)
+      .raises(Provider::Trading212::AuthenticationError.new("Trading 212 authentication failed (401)."))
+
+    assert_raises(Provider::Trading212::AuthenticationError) do
+      @syncer.perform_sync(sync)
+    end
+
+    assert_equal "requires_update", @item.reload.status
+  end
+
+  # === perform_sync (happy path) ===
+
+  test "perform_sync imports data and processes accounts when linked" do
+    # Link an account
+    t212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+    t212_account.ensure_account_provider!(investment)
+
+    sync = @item.syncs.create!
+    @item.update!(status: :good)
+
+    # Stub the importer to avoid HTTP calls
+    Trading212Item::Importer.any_instance.stubs(:import).returns({ success: true })
+
+    # Run sync without raising
+    @syncer.perform_sync(sync)
+
+    # Sync ran without raising; verify stats were collected
+    stats = sync.reload.sync_stats
+    assert stats.present?
+  end
+
+  test "perform_sync sets pending_account_setup when accounts are unlinked" do
+    sync = @item.syncs.create!
+
+    Trading212Item::Importer.any_instance.expects(:import).returns({ success: true })
+
+    @syncer.perform_sync(sync)
+
+    assert @item.reload.pending_account_setup?
+  end
+
+  # === perform_sync (error handling) ===
+
+  test "perform_sync records error stats on generic failure" do
+    sync = @item.syncs.create!
+    Trading212Item::Importer.any_instance.expects(:import).raises(StandardError.new("Boom"))
+
+    assert_raises(StandardError) do
+      @syncer.perform_sync(sync)
+    end
+
+    stats = sync.reload.sync_stats
+    assert stats["total_errors"] >= 1
+  end
+
+  # === perform_post_sync ===
+
+  test "perform_post_sync is a no-op" do
+    assert_nil @syncer.perform_post_sync
+  end
+end
diff --git a/test/models/trading212_item_test.rb b/test/models/trading212_item_test.rb
new file mode 100644
index 000000000..a47887e7f
--- /dev/null
+++ b/test/models/trading212_item_test.rb
@@ -0,0 +1,204 @@
+require "test_helper"
+
+class Trading212ItemTest < ActiveSupport::TestCase
+  include SyncableInterfaceTest
+
+  setup do
+    @family = families(:dylan_family)
+    @trading212_item = @syncable = trading212_items(:configured_item)
+  end
+
+  # === Validations ===
+
+  test "validates presence of api_key on create" do
+    item = Trading212Item.new(family: @family, api_secret: "secret", environment: "live")
+    assert_not item.valid?
+    assert_includes item.errors[:api_key], "can't be blank"
+  end
+
+  test "validates presence of api_secret on create" do
+    item = Trading212Item.new(family: @family, api_key: "key", environment: "live")
+    assert_not item.valid?
+    assert_includes item.errors[:api_secret], "can't be blank"
+  end
+
+  test "validates api_key and api_secret on create" do
+    item = Trading212Item.new(family: @family, api_key: "key", api_secret: "secret")
+    assert item.valid?
+  end
+
+  # === Status enum ===
+
+  test "default status is good" do
+    item = Trading212Item.new(family: @family, api_key: "key", api_secret: "secret")
+    assert_equal "good", item.status
+  end
+
+  test "can query good items" do
+    items = Trading212Item.good
+    assert_includes items, @trading212_item
+    assert_not_includes items, trading212_items(:requires_update_item)
+  end
+
+  test "can query requires_update items" do
+    items = Trading212Item.needs_update
+    assert_includes items, trading212_items(:requires_update_item)
+    assert_not_includes items, @trading212_item
+  end
+
+  # === Environment enum ===
+
+  test "default environment is live" do
+    item = Trading212Item.new(family: @family, api_key: "key", api_secret: "secret")
+    assert_equal "live", item.environment
+  end
+
+  test "accepts demo environment" do
+    item = Trading212Item.new(family: @family, api_key: "key", api_secret: "secret", environment: "demo")
+    assert item.valid?
+    assert_equal "demo", item.environment
+  end
+
+  # === credentials_configured? ===
+
+  test "credentials_configured? returns true when api_key and api_secret are present" do
+    assert @trading212_item.credentials_configured?
+  end
+
+  test "credentials_configured? returns false when api_key is blank" do
+    item = trading212_items(:no_credentials_item)
+    assert_not item.credentials_configured?
+  end
+
+  # === trading212_provider ===
+
+  test "trading212_provider returns a Provider::Trading212 instance when configured" do
+    provider = @trading212_item.trading212_provider
+    assert_instance_of Provider::Trading212, provider
+  end
+
+  test "trading212_provider returns nil when credentials not configured" do
+    item = trading212_items(:no_credentials_item)
+    assert_nil item.trading212_provider
+  end
+
+  test "Provider::Trading212 raises ConfigurationError with blank credentials" do
+    assert_raises(Provider::Trading212::ConfigurationError) do
+      Provider::Trading212.new(api_key: "", api_secret: "secret")
+    end
+  end
+
+  # === Scopes ===
+
+  test "active scope excludes items scheduled for deletion" do
+    item = trading212_items(:configured_item)
+    item.update!(scheduled_for_deletion: true)
+
+    assert_not_includes Trading212Item.active, item
+  end
+
+  test "syncable scope excludes items without api_key" do
+    assert_not_includes Trading212Item.syncable, trading212_items(:no_credentials_item)
+  end
+
+  test "syncable scope includes items with credentials" do
+    assert_includes Trading212Item.syncable, @trading212_item
+  end
+
+  # === destroy_later ===
+
+  test "destroy_later marks item for deletion and enqueues DestroyJob" do
+    assert_enqueued_with(job: DestroyJob) do
+      @trading212_item.destroy_later
+    end
+
+    assert_predicate @trading212_item.reload, :scheduled_for_deletion?
+  end
+
+  # === accounts ===
+
+  test "accounts returns linked investment accounts" do
+    trading212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+
+    trading212_account.ensure_account_provider!(investment)
+
+    account_list = @trading212_item.accounts
+    assert_includes account_list, investment
+  end
+
+  test "accounts returns empty when no accounts are linked" do
+    assert_empty @trading212_item.accounts
+  end
+
+  # === has_completed_initial_setup? ===
+
+  test "has_completed_initial_setup? returns false when no accounts exist" do
+    assert_not @trading212_item.has_completed_initial_setup?
+  end
+
+  test "has_completed_initial_setup? returns true when accounts exist" do
+    trading212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+    trading212_account.ensure_account_provider!(investment)
+
+    assert @trading212_item.has_completed_initial_setup?
+  end
+
+  # === sync_status_summary ===
+
+  test "sync_status_summary reports no_accounts when no trading212 accounts" do
+    # Delete fixture account to test empty state
+    @trading212_item.trading212_accounts.delete_all
+    summary = @trading212_item.reload.sync_status_summary
+    assert_match(/No Trading 212 account discovered yet/, summary)
+  end
+
+  test "sync_status_summary reports all_linked when all accounts have providers" do
+    trading212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+    trading212_account.ensure_account_provider!(investment)
+
+    summary = @trading212_item.reload.sync_status_summary
+    assert_match(/account linked/, summary)
+  end
+
+  test "sync_status_summary reports partial when some accounts are unlinked" do
+    # main_account is linked
+    trading212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+    trading212_account.ensure_account_provider!(investment)
+
+    # Create a second, unlinked account
+    @trading212_item.trading212_accounts.create!(
+      name: "Unlinked Account",
+      trading212_account_id: "t212_acc_789",
+      currency: "USD"
+    )
+
+    summary = @trading212_item.reload.sync_status_summary
+    assert_match(/need setup/, summary)
+  end
+
+  # === unlink_all! ===
+
+  test "unlink_all! removes account providers from all trading212 accounts" do
+    trading212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+    trading212_account.ensure_account_provider!(investment)
+
+    assert_difference -> { AccountProvider.where(provider_type: "Trading212Account").count }, -1 do
+      @trading212_item.unlink_all!(dry_run: false)
+    end
+  end
+
+  test "unlink_all! dry_run does not remove providers" do
+    trading212_account = trading212_accounts(:main_account)
+    investment = accounts(:investment)
+    trading212_account.ensure_account_provider!(investment)
+
+    assert_no_difference -> { AccountProvider.where(provider_type: "Trading212Account").count } do
+      @trading212_item.unlink_all!(dry_run: true)
+    end
+  end
+end
diff --git a/test/models/transfer_test.rb b/test/models/transfer_test.rb
index e47d200d2..2368671ab 100644
--- a/test/models/transfer_test.rb
+++ b/test/models/transfer_test.rb
@@ -124,4 +124,33 @@ class TransferTest < ActiveSupport::TestCase
   test "kind_for_account returns funds_movement for depository accounts" do
     assert_equal "funds_movement", Transfer.kind_for_account(accounts(:depository))
   end
+
+  test "has_source_fee? returns true when source fee present" do
+    transfer = transfers(:one)
+    entry = accounts(:depository).entries.create!(name: "Fee", date: Date.current, amount: 5, currency: "USD", entryable: Transaction.new(kind: "standard"))
+    transfer.fee_transactions << entry.entryable
+    assert transfer.has_source_fee?
+    assert transfer.has_fees?
+  end
+
+  test "has_destination_fee? returns true when destination fee present" do
+    transfer = transfers(:one)
+    entry = accounts(:credit_card).entries.create!(name: "Fee", date: Date.current, amount: 5, currency: "USD", entryable: Transaction.new(kind: "standard"))
+    transfer.fee_transactions << entry.entryable
+    assert transfer.has_destination_fee?
+    assert transfer.has_fees?
+  end
+
+  test "has_fees? returns false when no fees" do
+    transfer = transfers(:one)
+    refute transfer.has_fees?
+  end
+
+  test "total_fee sums source and destination fees" do
+    transfer = transfers(:one)
+    entry1 = accounts(:depository).entries.create!(name: "Fee", date: Date.current, amount: 3, currency: "USD", entryable: Transaction.new(kind: "standard"))
+    entry2 = accounts(:credit_card).entries.create!(name: "Fee", date: Date.current, amount: 2, currency: "USD", entryable: Transaction.new(kind: "standard"))
+    transfer.fee_transactions << entry1.entryable << entry2.entryable
+    assert_equal 5, transfer.total_fee
+  end
 end
diff --git a/test/models/trend_test.rb b/test/models/trend_test.rb
index 64601af19..5dccb42e3 100644
--- a/test/models/trend_test.rb
+++ b/test/models/trend_test.rb
@@ -31,10 +31,28 @@ class TrendTest < ActiveSupport::TestCase
   test "infinitely up" do
     trend = Trend.new(current: 100, previous: 0)
     assert_equal "up", trend.direction
+    assert_equal Float::INFINITY, trend.percent
   end
 
   test "infinitely down" do
     trend = Trend.new(current: 0, previous: 100)
     assert_equal "down", trend.direction
   end
+
+  test "percent sign tracks direction when the base is negative" do
+    # Net worth improving from -100 to -50 is a +50% change, not -50%.
+    improving = Trend.new(current: -50, previous: -100)
+    assert_equal "up", improving.direction
+    assert_equal 50.0, improving.percent
+
+    # Net worth worsening from -100 to -150 is a -50% change.
+    worsening = Trend.new(current: -150, previous: -100)
+    assert_equal "down", worsening.direction
+    assert_equal(-50.0, worsening.percent)
+  end
+
+  test "percent carries the sign of current when the base is zero" do
+    assert_equal(-Float::INFINITY, Trend.new(current: -100, previous: 0).percent)
+    assert_equal Float::INFINITY, Trend.new(current: 100, previous: 0).percent
+  end
 end
diff --git a/test/models/up_account_test.rb b/test/models/up_account_test.rb
new file mode 100644
index 000000000..d751b1563
--- /dev/null
+++ b/test/models/up_account_test.rb
@@ -0,0 +1,24 @@
+require "test_helper"
+
+class UpAccountTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @up_item = UpItem.create!(family: @family, name: "Test Up", access_token: "up-access-token")
+  end
+
+  test "needs_setup excludes linked and ignored accounts" do
+    unlinked = UpAccount.create!(up_item: @up_item, name: "Unlinked", account_id: "acc_unlinked", currency: "AUD")
+    ignored  = UpAccount.create!(up_item: @up_item, name: "Skipped", account_id: "acc_ignored", currency: "AUD", ignored: true)
+
+    linked = UpAccount.create!(up_item: @up_item, name: "Linked", account_id: "acc_linked", currency: "AUD")
+    account = Account.create!(family: @family, name: "Linked", accountable: Depository.new(subtype: "checking"), balance: 0, currency: "AUD")
+    AccountProvider.create!(account: account, provider: linked)
+
+    needs_setup = @up_item.up_accounts.needs_setup
+
+    assert_includes needs_setup, unlinked
+    assert_not_includes needs_setup, ignored
+    assert_not_includes needs_setup, linked
+    assert_equal 1, @up_item.unlinked_accounts_count
+  end
+end
diff --git a/test/models/up_entry/processor_test.rb b/test/models/up_entry/processor_test.rb
new file mode 100644
index 000000000..d7d07c404
--- /dev/null
+++ b/test/models/up_entry/processor_test.rb
@@ -0,0 +1,154 @@
+require "test_helper"
+
+class UpEntry::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @up_item = UpItem.create!(
+      family: @family,
+      name: "Test Up",
+      access_token: "up-access-token"
+    )
+    @up_account = UpAccount.create!(
+      up_item: @up_item,
+      name: "Up Spending",
+      account_id: "acc_123",
+      currency: "AUD"
+    )
+    @account = Account.create!(
+      family: @family,
+      name: "Spending",
+      accountable: Depository.new(subtype: "checking"),
+      balance: 1000,
+      currency: "AUD"
+    )
+
+    AccountProvider.create!(account: @account, provider: @up_account)
+  end
+
+  test "imports settled Up transaction with sign conversion and provider metadata" do
+    transaction_data = {
+      id: "tx_123",
+      account_id: "acc_123",
+      status: "SETTLED",
+      description: "Coffee Shop",
+      message: "Morning coffee",
+      rawText: "COFFEE SHOP SYDNEY",
+      amount: { currencyCode: "AUD", value: "-12.50", valueInBaseUnits: -1250 },
+      foreignAmount: nil,
+      settledAt: "2026-01-15T08:30:00+11:00",
+      createdAt: "2026-01-15T08:00:00+11:00",
+      category_id: "restaurants-and-cafes"
+    }
+
+    entry = UpEntry::Processor.new(transaction_data, up_account: @up_account).process
+
+    assert_equal "up_tx_123", entry.external_id
+    assert_equal "up", entry.source
+    assert_equal BigDecimal("12.5"), entry.amount
+    assert_equal "AUD", entry.currency
+    assert_equal Date.new(2026, 1, 15), entry.date
+    assert_equal "Coffee Shop", entry.name
+    assert_equal "Morning coffee", entry.notes
+
+    transaction = entry.entryable
+    assert_equal false, transaction.pending?
+    assert_equal false, transaction.extra.dig("up", "pending")
+    assert_equal "SETTLED", transaction.extra.dig("up", "status")
+    assert_equal "restaurants-and-cafes", transaction.extra.dig("up", "category_id")
+    assert_equal "Coffee Shop", transaction.merchant.name
+  end
+
+  test "marks HELD transactions as pending and falls back to createdAt for the date" do
+    entry = UpEntry::Processor.new(
+      {
+        id: "tx_held_1",
+        account_id: "acc_123",
+        status: "HELD",
+        description: "Pending card auth",
+        amount: { currencyCode: "AUD", value: "-8.00", valueInBaseUnits: -800 },
+        settledAt: nil,
+        createdAt: "2026-01-20T12:00:00+11:00"
+      },
+      up_account: @up_account
+    ).process
+
+    assert entry.entryable.pending?
+    assert_equal true, entry.entryable.extra.dig("up", "pending")
+    assert_equal Date.new(2026, 1, 20), entry.date
+  end
+
+  test "stores foreign amount FX metadata" do
+    entry = UpEntry::Processor.new(
+      {
+        id: "tx_fx_1",
+        account_id: "acc_123",
+        status: "SETTLED",
+        description: "US Merchant",
+        amount: { currencyCode: "AUD", value: "-15.00", valueInBaseUnits: -1500 },
+        foreignAmount: { currencyCode: "USD", value: "-10.00", valueInBaseUnits: -1000 },
+        settledAt: "2026-01-18T00:00:00+11:00",
+        createdAt: "2026-01-18T00:00:00+11:00"
+      },
+      up_account: @up_account
+    ).process
+
+    transaction = entry.entryable
+    assert_equal "USD", transaction.extra.dig("up", "fx_from")
+    assert_equal "-10.00", transaction.extra.dig("up", "fx_amount")
+  end
+
+  test "income (positive Up amount) is stored as negative in Sure" do
+    entry = UpEntry::Processor.new(
+      {
+        id: "tx_income_1",
+        account_id: "acc_123",
+        status: "SETTLED",
+        description: "Salary",
+        amount: { currencyCode: "AUD", value: "2500.00", valueInBaseUnits: 250000 },
+        settledAt: "2026-01-15T00:00:00+11:00",
+        createdAt: "2026-01-15T00:00:00+11:00"
+      },
+      up_account: @up_account
+    ).process
+
+    assert_equal BigDecimal("-2500.0"), entry.amount
+  end
+
+  test "marks internal transfers (transferAccount present) as funds_movement" do
+    entry = UpEntry::Processor.new(
+      {
+        id: "tx_transfer_1",
+        account_id: "acc_123",
+        status: "SETTLED",
+        description: "Transfer to 2Up Spending",
+        amount: { currencyCode: "AUD", value: "-500.00", valueInBaseUnits: -50000 },
+        settledAt: "2026-01-22T00:00:00+11:00",
+        createdAt: "2026-01-22T00:00:00+11:00",
+        transfer_account_id: "acc_other"
+      },
+      up_account: @up_account
+    ).process
+
+    transaction = entry.entryable
+    assert_equal "funds_movement", transaction.kind
+    assert_equal "acc_other", transaction.extra.dig("up", "transfer_account_id")
+  end
+
+  test "ordinary transactions (no transferAccount) keep the standard kind" do
+    entry = UpEntry::Processor.new(
+      {
+        id: "tx_standard_1",
+        account_id: "acc_123",
+        status: "SETTLED",
+        description: "Coffee Shop",
+        amount: { currencyCode: "AUD", value: "-4.50", valueInBaseUnits: -450 },
+        settledAt: "2026-01-22T00:00:00+11:00",
+        createdAt: "2026-01-22T00:00:00+11:00"
+      },
+      up_account: @up_account
+    ).process
+
+    assert_equal "standard", entry.entryable.kind
+    assert_nil entry.entryable.extra.dig("up", "transfer_account_id")
+  end
+end
diff --git a/test/models/up_item/importer_test.rb b/test/models/up_item/importer_test.rb
new file mode 100644
index 000000000..73ff16925
--- /dev/null
+++ b/test/models/up_item/importer_test.rb
@@ -0,0 +1,156 @@
+require "test_helper"
+
+class UpItem::ImporterTest < ActiveSupport::TestCase
+  class FakeUpProvider
+    attr_reader :transaction_calls
+
+    def initialize(accounts: nil, transactions: nil)
+      @transaction_calls = []
+      @accounts = accounts
+      @transactions = transactions
+    end
+
+    def get_accounts
+      @accounts || [
+        {
+          id: "acc_123",
+          displayName: "Up Spending",
+          accountType: "TRANSACTIONAL",
+          ownershipType: "INDIVIDUAL",
+          balance: { currencyCode: "AUD", value: "123.45", valueInBaseUnits: 12345 }
+        }
+      ]
+    end
+
+    def get_account_transactions(account_id:, since: nil)
+      @transaction_calls << { account_id: account_id, since: since }
+      @transactions || [ settled_transaction ]
+    end
+
+    private
+
+      def settled_transaction
+        {
+          id: "tx_1",
+          account_id: "acc_123",
+          status: "SETTLED",
+          description: "Posted transaction",
+          amount: { currencyCode: "AUD", value: "-20.00", valueInBaseUnits: -2000 },
+          settledAt: "2026-01-19T00:00:00+11:00",
+          createdAt: "2026-01-19T00:00:00+11:00"
+        }
+      end
+  end
+
+  setup do
+    @family = families(:empty)
+    @up_item = UpItem.create!(
+      family: @family,
+      name: "Test Up",
+      access_token: "up-access-token"
+    )
+    @up_account = UpAccount.create!(
+      up_item: @up_item,
+      name: "Old name",
+      account_id: "acc_123",
+      currency: "AUD"
+    )
+    @account = Account.create!(
+      family: @family,
+      name: "Spending",
+      accountable: Depository.new(subtype: "checking"),
+      balance: 0,
+      currency: "AUD"
+    )
+    AccountProvider.create!(account: @account, provider: @up_account)
+  end
+
+  test "imports account snapshot and stores transactions" do
+    provider = FakeUpProvider.new
+
+    result = UpItem::Importer.new(@up_item, up_provider: provider).import
+
+    assert result[:success]
+    assert_equal 1, result[:accounts_updated]
+    assert_equal 1, result[:transactions_imported]
+
+    @up_account.reload
+    assert_equal "Up Spending", @up_account.name
+    assert_equal BigDecimal("123.45"), @up_account.current_balance
+    assert_equal "TRANSACTIONAL", @up_account.account_type
+    assert_equal "acc_123", provider.transaction_calls.first[:account_id]
+
+    assert_equal [ "tx_1" ], @up_account.raw_transactions_payload.map { |tx| tx["id"] }
+  end
+
+  test "held transaction settling under the same id clears pending without duplicates" do
+    import_with(transactions: [ held_transaction(id: "tx_h1", amount: "-8.00") ])
+    process_transactions
+
+    assert_equal 1, pending_entries.count
+
+    import_with(transactions: [ settled(id: "tx_h1", amount: "-8.00") ])
+    process_transactions
+
+    assert_empty pending_entries
+    assert_equal 1, @account.entries.where(source: "up").count
+    entry = @account.entries.find_by(external_id: "up_tx_h1", source: "up")
+    assert_equal false, entry.entryable.pending?
+  end
+
+  test "removes held transactions that disappear from the latest fetch" do
+    import_with(transactions: [ held_transaction(id: "tx_h2", amount: "-8.00") ])
+    process_transactions
+
+    assert_equal 1, pending_entries.count
+
+    import_with(transactions: [])
+    process_transactions
+
+    @up_account.reload
+    assert_empty pending_entries
+    assert_empty @up_account.raw_transactions_payload.select { |tx| UpEntry::Processor.pending?(tx) }
+  end
+
+  private
+
+    def import_with(transactions:)
+      provider = FakeUpProvider.new(transactions: transactions)
+      UpItem::Importer.new(@up_item, up_provider: provider).import
+    end
+
+    def process_transactions
+      UpAccount::Transactions::Processor.new(@up_account.reload).process
+    end
+
+    def pending_entries
+      @account.entries
+        .joins("INNER JOIN transactions ON transactions.id = entries.entryable_id AND entries.entryable_type = 'Transaction'")
+        .where(source: "up")
+        .where("(transactions.extra -> 'up' ->> 'pending')::boolean = true")
+    end
+
+    def held_transaction(id:, amount:, date: "2026-01-15T00:00:00+11:00")
+      {
+        id: id,
+        account_id: "acc_123",
+        status: "HELD",
+        description: "Pending card auth",
+        amount: { currencyCode: "AUD", value: amount, valueInBaseUnits: (amount.to_f * 100).to_i },
+        settledAt: nil,
+        createdAt: date
+      }
+    end
+
+    def settled(id:, amount:, date: "2026-01-16T00:00:00+11:00")
+      {
+        id: id,
+        account_id: "acc_123",
+        status: "SETTLED",
+        description: "Posted card auth",
+        amount: { currencyCode: "AUD", value: amount, valueInBaseUnits: (amount.to_f * 100).to_i },
+        settledAt: date,
+        createdAt: date
+      }
+    end
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 5139fff09..2ab21ffec 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -510,6 +510,45 @@ class UserTest < ActiveSupport::TestCase
     assert_equal new_order, @user.dashboard_section_order
   end
 
+  test "dashboard_section_height returns stored preset or nil" do
+    @user.update!(preferences: {})
+    assert_nil @user.dashboard_section_height("net_worth_chart")
+
+    @user.update_dashboard_preferences({
+      "dashboard_section_layout" => { "net_worth_chart" => { "height" => "tall" } }
+    })
+    @user.reload
+
+    assert_equal "tall", @user.dashboard_section_height("net_worth_chart")
+    assert_nil @user.dashboard_section_height("balance_sheet")
+  end
+
+  test "dashboard_section_width returns stored col_span or nil" do
+    @user.update!(preferences: {})
+    assert_nil @user.dashboard_section_width("cashflow_sankey")
+
+    @user.update_dashboard_preferences({
+      "dashboard_section_layout" => { "cashflow_sankey" => { "col_span" => "single" } }
+    })
+
+    assert_equal "single", @user.reload.dashboard_section_width("cashflow_sankey")
+  end
+
+  test "dashboard_section_layout merges width and height without clobbering" do
+    @user.update!(preferences: {})
+
+    @user.update_dashboard_preferences({
+      "dashboard_section_layout" => { "net_worth_chart" => { "height" => "tall" } }
+    })
+    @user.update_dashboard_preferences({
+      "dashboard_section_layout" => { "net_worth_chart" => { "col_span" => "full" } }
+    })
+    @user.reload
+
+    assert_equal "tall", @user.dashboard_section_height("net_worth_chart")
+    assert_equal "full", @user.dashboard_section_width("net_worth_chart")
+  end
+
   test "handles empty preferences gracefully for dashboard methods" do
     @user.update!(preferences: {})
 
@@ -518,7 +557,7 @@ class UserTest < ActiveSupport::TestCase
       "Should return false when collapsed_sections key is missing"
 
     # dashboard_section_order should return default order when key is missing
-    assert_equal %w[cashflow_sankey outflows_donut net_worth_chart balance_sheet],
+    assert_equal %w[insights_feed cashflow_sankey outflows_donut net_worth_chart balance_sheet],
       @user.dashboard_section_order,
       "Should return default order when section_order key is missing"
 
diff --git a/test/models/vector_store/pgvector_test.rb b/test/models/vector_store/pgvector_test.rb
index e0393f139..64212861e 100644
--- a/test/models/vector_store/pgvector_test.rb
+++ b/test/models/vector_store/pgvector_test.rb
@@ -3,6 +3,9 @@ require "test_helper"
 class VectorStore::PgvectorTest < ActiveSupport::TestCase
   setup do
     @adapter = VectorStore::Pgvector.new
+    # Schema provisioning is exercised by its own tests below; the operation
+    # tests stub it out so their mock connections only see the op's SQL.
+    @adapter.stubs(:ensure_schema!)
   end
 
   test "create_store returns a UUID" do
@@ -138,4 +141,69 @@ class VectorStore::PgvectorTest < ActiveSupport::TestCase
     assert_not_includes @adapter.supported_extensions, ".zip"
     assert_not_includes @adapter.supported_extensions, ".docx"
   end
+
+  test "ensure_schema! is a no-op when the table already exists" do
+    adapter = VectorStore::Pgvector.new
+
+    mock_conn = mock("connection")
+    mock_conn.expects(:table_exists?).with(VectorStore::Pgvector::TABLE_NAME).returns(true)
+    mock_conn.expects(:create_table).never
+    adapter.stubs(:connection).returns(mock_conn)
+
+    adapter.send(:ensure_schema!)
+    # Memoized: a second call must not hit the connection again.
+    adapter.send(:ensure_schema!)
+  end
+
+  test "ensure_schema! provisions extension, table, and indexes when missing" do
+    adapter = VectorStore::Pgvector.new
+
+    mock_conn = mock("connection")
+    mock_conn.expects(:table_exists?).with(VectorStore::Pgvector::TABLE_NAME).returns(false)
+    mock_conn.expects(:extension_enabled?).with("vector").returns(false)
+    mock_conn.expects(:enable_extension).with("vector")
+    mock_conn.expects(:create_table).with(VectorStore::Pgvector::TABLE_NAME, id: :uuid, if_not_exists: true)
+    mock_conn.expects(:add_index).times(3)
+    adapter.stubs(:connection).returns(mock_conn)
+
+    adapter.send(:ensure_schema!)
+  end
+
+  test "ensure_schema! wraps provisioning failures in VectorStore::Error" do
+    adapter = VectorStore::Pgvector.new
+
+    mock_conn = mock("connection")
+    mock_conn.expects(:table_exists?).returns(false)
+    mock_conn.expects(:extension_enabled?).raises(ActiveRecord::StatementInvalid.new("permission denied"))
+    adapter.stubs(:connection).returns(mock_conn)
+
+    error = assert_raises(VectorStore::Error) { adapter.send(:ensure_schema!) }
+    assert_match(/pgvector store unavailable/, error.message)
+  end
+
+  test "available? is true when the chunks table exists" do
+    conn = mock("connection")
+    conn.expects(:table_exists?).with(VectorStore::Pgvector::TABLE_NAME).returns(true)
+    ActiveRecord::Base.stubs(:connection).returns(conn)
+
+    assert VectorStore::Pgvector.available?
+  end
+
+  test "available? is true when the extension is available but the table is missing" do
+    conn = mock("connection")
+    conn.expects(:table_exists?).returns(false)
+    conn.expects(:select_value).returns(1)
+    ActiveRecord::Base.stubs(:connection).returns(conn)
+
+    assert VectorStore::Pgvector.available?
+  end
+
+  test "available? is false when neither table nor extension is available" do
+    conn = mock("connection")
+    conn.expects(:table_exists?).returns(false)
+    conn.expects(:select_value).returns(nil)
+    ActiveRecord::Base.stubs(:connection).returns(conn)
+
+    assert_not VectorStore::Pgvector.available?
+  end
 end
diff --git a/test/models/vector_store/registry_test.rb b/test/models/vector_store/registry_test.rb
index 514b30b24..0bd544ed0 100644
--- a/test/models/vector_store/registry_test.rb
+++ b/test/models/vector_store/registry_test.rb
@@ -43,13 +43,62 @@ class VectorStore::RegistryTest < ActiveSupport::TestCase
     end
   end
 
-  test "adapter returns VectorStore::Pgvector instance when pgvector configured" do
+  test "adapter returns VectorStore::Pgvector instance when pgvector configured and available" do
+    VectorStore::Pgvector.stubs(:available?).returns(true)
     ClimateControl.modify(VECTOR_STORE_PROVIDER: "pgvector") do
       adapter = VectorStore::Registry.adapter
       assert_instance_of VectorStore::Pgvector, adapter
     end
   end
 
+  test "adapter is nil when pgvector is selected but unavailable" do
+    VectorStore::Pgvector.stubs(:available?).returns(false)
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: "pgvector") do
+      assert_nil VectorStore::Registry.adapter
+      assert_not VectorStore.configured?
+    end
+  end
+
+  test "adapter is nil for the anthropic default when pgvector is unavailable" do
+    Setting.stubs(:llm_provider).returns("anthropic")
+    VectorStore::Pgvector.stubs(:available?).returns(false)
+    VectorStore::Registry.stubs(:openai_access_token).returns(nil)
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: nil) do
+      assert_nil VectorStore::Registry.adapter
+    end
+  end
+
+  test "adapter builds pgvector for the anthropic default when available" do
+    Setting.stubs(:llm_provider).returns("anthropic")
+    VectorStore::Pgvector.stubs(:available?).returns(true)
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: nil) do
+      assert_instance_of VectorStore::Pgvector, VectorStore::Registry.adapter
+    end
+  end
+
+  test "adapter_name defaults to pgvector when LLM_PROVIDER is anthropic" do
+    Setting.stubs(:llm_provider).returns("anthropic")
+    VectorStore::Registry.stubs(:openai_access_token).returns(nil)
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: nil) do
+      assert_equal :pgvector, VectorStore::Registry.adapter_name
+    end
+  end
+
+  test "adapter_name routes anthropic installs to pgvector even when OpenAI key is present" do
+    Setting.stubs(:llm_provider).returns("anthropic")
+    VectorStore::Registry.stubs(:openai_access_token).returns("sk-test")
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: nil) do
+      assert_equal :pgvector, VectorStore::Registry.adapter_name
+    end
+  end
+
+  test "explicit VECTOR_STORE_PROVIDER overrides anthropic default" do
+    Setting.stubs(:llm_provider).returns("anthropic")
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: "qdrant") do
+      assert_equal :qdrant, VectorStore::Registry.adapter_name
+    end
+  end
+
   test "configured? delegates to adapter presence" do
     VectorStore::Registry.stubs(:adapter).returns(nil)
     assert_not VectorStore.configured?
@@ -57,4 +106,26 @@ class VectorStore::RegistryTest < ActiveSupport::TestCase
     VectorStore::Registry.stubs(:adapter).returns(VectorStore::Openai.new(access_token: "sk-test"))
     assert VectorStore.configured?
   end
+
+  test "pgvector_effective? is true when pgvector is explicit" do
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: "pgvector") do
+      assert VectorStore::Registry.pgvector_effective?
+    end
+  end
+
+  test "pgvector_effective? is true for the anthropic default (no explicit provider)" do
+    Setting.stubs(:llm_provider).returns("anthropic")
+    VectorStore::Registry.stubs(:openai_access_token).returns(nil)
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: nil) do
+      assert VectorStore::Registry.pgvector_effective?
+    end
+  end
+
+  test "pgvector_effective? is false for the openai default" do
+    Setting.stubs(:llm_provider).returns("openai")
+    VectorStore::Registry.stubs(:openai_access_token).returns("sk-test")
+    ClimateControl.modify(VECTOR_STORE_PROVIDER: nil) do
+      assert_not VectorStore::Registry.pgvector_effective?
+    end
+  end
 end
diff --git a/test/models/wise_account_test.rb b/test/models/wise_account_test.rb
new file mode 100644
index 000000000..5d69a6769
--- /dev/null
+++ b/test/models/wise_account_test.rb
@@ -0,0 +1,115 @@
+require "test_helper"
+
+class WiseAccountTest < ActiveSupport::TestCase
+  setup do
+    @wise_item = wise_items(:one)
+    @checking = wise_accounts(:checking)
+    @jar = wise_accounts(:jar)
+  end
+
+  # jar?
+
+  test "jar? returns false for STANDARD balance" do
+    @checking.update!(raw_payload: { "type" => "STANDARD" })
+    assert_not @checking.jar?
+  end
+
+  test "jar? returns true for SAVINGS balance" do
+    @jar.update!(raw_payload: { "type" => "SAVINGS" })
+    assert @jar.jar?
+  end
+
+  test "jar? returns false when raw_payload is nil" do
+    @checking.update!(raw_payload: nil)
+    assert_not @checking.jar?
+  end
+
+  # account_subtype
+
+  test "account_subtype returns checking for STANDARD account" do
+    @checking.update!(raw_payload: { "type" => "STANDARD" })
+    assert_equal "checking", @checking.account_subtype
+  end
+
+  test "account_subtype returns savings for JAR account" do
+    @jar.update!(raw_payload: { "type" => "SAVINGS" })
+    assert_equal "savings", @jar.account_subtype
+  end
+
+  # upsert_wise_snapshot!
+
+  test "upsert_wise_snapshot! updates balance from STANDARD response" do
+    balance_data = {
+      "id" => "10000001",
+      "amount" => { "value" => 2500.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 100.0, "currency" => "EUR" },
+      "type" => "STANDARD"
+    }
+
+    @checking.upsert_wise_snapshot!(balance_data)
+
+    assert_equal BigDecimal("2500.0"), @checking.current_balance
+    assert_equal BigDecimal("100.0"), @checking.reserved_balance
+    assert_equal "EUR", @checking.currency
+    assert_equal "STANDARD", @checking.raw_payload["type"]
+  end
+
+  test "upsert_wise_snapshot! uses totalWorth for SAVINGS balance" do
+    balance_data = {
+      "id" => "10000002",
+      "amount" => { "value" => 4000.0, "currency" => "EUR" },
+      "totalWorth" => { "value" => 5000.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+      "type" => "SAVINGS",
+      "name" => "Jar"
+    }
+
+    @jar.update!(name: nil)
+    @jar.upsert_wise_snapshot!(balance_data)
+
+    assert_equal BigDecimal("5000.0"), @jar.current_balance
+    assert_equal "Jar", @jar.name
+  end
+
+  test "upsert_wise_snapshot! stores borderless_account_id in raw_payload" do
+    balance_data = {
+      "id" => "10000001",
+      "amount" => { "value" => 1000.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" }
+    }
+
+    @checking.upsert_wise_snapshot!(balance_data, borderless_account_id: 88888001, recipient_id: 99999001)
+
+    assert_equal 88888001, @checking.raw_payload["borderless_account_id"]
+    assert_equal 99999001, @checking.raw_payload["recipient_id"]
+  end
+
+  test "upsert_wise_snapshot! preserves existing name" do
+    @checking.update!(name: "My Wise EUR")
+    balance_data = {
+      "id" => "10000001",
+      "amount" => { "value" => 1000.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+      "name" => "Jar"
+    }
+
+    @checking.upsert_wise_snapshot!(balance_data)
+
+    assert_equal "My Wise EUR", @checking.name
+  end
+
+  test "upsert_wise_snapshot! defaults name to Wise JAR currency for new SAVINGS account" do
+    @jar.update!(name: nil)
+    balance_data = {
+      "id" => "10000002",
+      "amount" => { "value" => 1000.0, "currency" => "EUR" },
+      "totalWorth" => { "value" => 1000.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+      "type" => "SAVINGS"
+    }
+
+    @jar.upsert_wise_snapshot!(balance_data)
+
+    assert_equal "Wise JAR EUR", @jar.name
+  end
+end
diff --git a/test/models/wise_activity/processor_test.rb b/test/models/wise_activity/processor_test.rb
new file mode 100644
index 000000000..2514146e2
--- /dev/null
+++ b/test/models/wise_activity/processor_test.rb
@@ -0,0 +1,212 @@
+require "test_helper"
+
+class WiseActivity::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @wise_item = WiseItem.create!(
+      family: @family,
+      name: "Test Wise",
+      token: "test_token",
+      profile_id: "123",
+      profile_type: :business
+    )
+
+    @jar_account = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000002",
+      name: "Jar",
+      currency: "EUR",
+      raw_payload: { "type" => "SAVINGS", "name" => "Jar" }
+    )
+    @jar_sure_account = Account.create!(
+      family: @family,
+      name: "Jar",
+      accountable: Depository.new(subtype: "savings"),
+      balance: 0,
+      currency: "EUR"
+    )
+    AccountProvider.create!(account: @jar_sure_account, provider: @jar_account)
+
+    @standard_account = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000001",
+      name: "Wise EUR",
+      currency: "EUR",
+      raw_payload: { "type" => "STANDARD", "recipient_id" => 99999001 }
+    )
+    @standard_sure_account = Account.create!(
+      family: @family,
+      name: "Wise EUR",
+      accountable: Depository.new(subtype: "checking"),
+      balance: 0,
+      currency: "EUR"
+    )
+    AccountProvider.create!(account: @standard_sure_account, provider: @standard_account)
+  end
+
+  # INTERBALANCE — JAR side
+
+  test "INTERBALANCE 'To Jar' on JAR account is income (negative)" do
+    activity = build_interbalance("To <strong>Jar</strong>", amount: "1,000 EUR", resource_id: "5001")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("-1000.0"), entry.amount
+    assert_equal "wise_interbalance_5001_inflow", entry.external_id
+    assert_equal I18n.t("wise_items.activities.jar_deposit"), entry.name
+  end
+
+  test "INTERBALANCE 'From Jar' on JAR account is expense (positive)" do
+    activity = build_interbalance("From <strong>EUR</strong>", amount: "500 EUR", resource_id: "5002")
+    # Simulates a withdrawal: title doesn't start with "To"
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("500.0"), entry.amount
+    assert_equal "wise_interbalance_5002_inflow", entry.external_id
+    assert_equal I18n.t("wise_items.activities.jar_withdrawal"), entry.name
+  end
+
+  # INTERBALANCE — STANDARD side
+
+  test "INTERBALANCE 'To Jar' on STANDARD account is expense (positive outflow)" do
+    activity = build_interbalance("To <strong>Jar</strong>", amount: "1,000 EUR", resource_id: "5003")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @standard_account).process
+
+    assert_equal BigDecimal("1000.0"), entry.amount
+    assert_equal "wise_interbalance_5003_outflow", entry.external_id
+  end
+
+  # Amount parsing
+
+  test "parses comma-formatted amount" do
+    activity = build_interbalance("To <strong>Jar</strong>", amount: "2,500 EUR", resource_id: "6001")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("-2500.0"), entry.amount
+  end
+
+  test "parses HTML-wrapped positive amount" do
+    activity = build_cashback(amount: "<positive>+ 3.53 EUR</positive>", resource_id: "57001")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("-3.53"), entry.amount
+  end
+
+  test "parses plain decimal amount" do
+    activity = build_asset_fee(amount: "0.83 EUR", resource_id: "18001")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("0.83"), entry.amount
+  end
+
+  # BALANCE_CASHBACK (interest)
+
+  test "BALANCE_CASHBACK is imported as income (negative)" do
+    activity = build_cashback(amount: "<positive>+ 1.12 EUR</positive>", resource_id: "57002")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("-1.12"), entry.amount
+    assert_equal I18n.t("wise_items.activities.interest"), entry.name
+    assert_equal "wise_activity_#{activity["id"]}", entry.external_id
+  end
+
+  # BALANCE_ASSET_FEE
+
+  test "BALANCE_ASSET_FEE is imported as expense (positive)" do
+    activity = build_asset_fee(amount: "0.06 EUR", resource_id: "18002")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal BigDecimal("0.06"), entry.amount
+    assert_equal I18n.t("wise_items.activities.asset_fee"), entry.name
+    assert_equal "wise_activity_#{activity["id"]}", entry.external_id
+  end
+
+  # Deduplication
+
+  test "re-processing same activity returns existing entry" do
+    activity = build_cashback(amount: "<positive>+ 0.09 EUR</positive>", resource_id: "57003")
+
+    entry1 = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+    entry2 = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    assert_equal entry1.id, entry2.id
+    assert_equal 1, @jar_sure_account.entries.where(source: "wise").count
+  end
+
+  # Skips without linked account
+
+  test "returns skipped when JAR has no linked Sure account" do
+    unlinked = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000099",
+      name: "Unlinked Jar",
+      currency: "EUR",
+      raw_payload: { "type" => "SAVINGS", "name" => "Jar" }
+    )
+
+    result = WiseActivity::Processor.new(
+      build_cashback(amount: "0.10 EUR", resource_id: "1"),
+      wise_account: unlinked
+    ).process
+
+    assert_equal :skipped, result
+  end
+
+  # Extra metadata
+
+  test "stores wise activity metadata in entry extra" do
+    activity = build_cashback(amount: "1.00 EUR", resource_id: "57004")
+
+    entry = WiseActivity::Processor.new(activity, wise_account: @jar_account).process
+
+    extra = entry.entryable.extra
+    assert_equal "BALANCE_CASHBACK", extra.dig("wise", "activity_type")
+    assert_equal "BALANCE_CASHBACK", extra.dig("wise", "resource_type")
+    assert_equal "57004", extra.dig("wise", "resource_id")
+  end
+
+  private
+
+    def build_interbalance(title, amount:, resource_id:)
+      {
+        "id" => "interbalance_activity_#{resource_id}",
+        "type" => "INTERBALANCE",
+        "resource" => { "type" => "BALANCE_TRANSACTION", "id" => resource_id },
+        "title" => title,
+        "primaryAmount" => amount,
+        "status" => "COMPLETED",
+        "createdOn" => "2026-05-01T06:12:11.597Z"
+      }
+    end
+
+    def build_cashback(amount:, resource_id:)
+      {
+        "id" => "cashback_activity_#{resource_id}",
+        "type" => "BALANCE_CASHBACK",
+        "resource" => { "type" => "BALANCE_CASHBACK", "id" => resource_id },
+        "title" => "<strong>Cashback</strong>",
+        "primaryAmount" => amount,
+        "status" => "COMPLETED",
+        "createdOn" => "2026-06-03T07:26:34.500Z"
+      }
+    end
+
+    def build_asset_fee(amount:, resource_id:)
+      {
+        "id" => "fee_activity_#{resource_id}",
+        "type" => "BALANCE_ASSET_FEE",
+        "resource" => { "type" => "ACCRUAL_CHARGE", "id" => resource_id },
+        "title" => "<strong>Wise Assets Europe fee</strong>",
+        "primaryAmount" => amount,
+        "status" => "COMPLETED",
+        "createdOn" => "2026-06-02T18:11:07.593Z"
+      }
+    end
+end
diff --git a/test/models/wise_entry/processor_test.rb b/test/models/wise_entry/processor_test.rb
new file mode 100644
index 000000000..2fc3cb6e6
--- /dev/null
+++ b/test/models/wise_entry/processor_test.rb
@@ -0,0 +1,177 @@
+require "test_helper"
+
+class WiseEntry::ProcessorTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @wise_item = WiseItem.create!(
+      family: @family,
+      name: "Test Wise",
+      token: "test_token",
+      profile_id: "123",
+      profile_type: :business
+    )
+    @wise_account = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000001",
+      name: "Wise EUR",
+      currency: "EUR",
+      raw_payload: { "type" => "STANDARD", "recipient_id" => 99999001 }
+    )
+    @account = Account.create!(
+      family: @family,
+      name: "Wise EUR",
+      accountable: Depository.new(subtype: "checking"),
+      balance: 0,
+      currency: "EUR"
+    )
+    AccountProvider.create!(account: @account, provider: @wise_account)
+  end
+
+  # Income vs expense detection
+
+  test "imports outgoing transfer (targetAccount != recipientId) as positive expense" do
+    transfer = build_transfer(id: 1001, target_account: 9999999, source_value: 500.0, target_value: 500.0)
+
+    entry = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal BigDecimal("500.0"), entry.amount
+    assert_equal "outgoing", entry.entryable.extra.dig("wise", "direction")
+  end
+
+  test "imports incoming transfer (targetAccount == recipientId) as negative income" do
+    transfer = build_transfer(id: 1002, target_account: 99999001, source_value: 1200.0, target_value: 1200.0)
+
+    entry = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal BigDecimal("-1200.0"), entry.amount
+    assert_equal "incoming", entry.entryable.extra.dig("wise", "direction")
+  end
+
+  test "uses status-based fallback when no recipient_id stored" do
+    @wise_account.update!(raw_payload: { "type" => "STANDARD" })
+
+    outgoing = build_transfer(id: 1003, target_account: 9999, source_value: 100.0,
+                               status: "outgoing_payment_sent")
+    entry = WiseEntry::Processor.new(outgoing, wise_account: @wise_account).process
+    assert entry.amount.positive?
+
+    incoming = build_transfer(id: 1004, target_account: 9999, source_value: 100.0,
+                               status: "funds_credited")
+    entry = WiseEntry::Processor.new(incoming, wise_account: @wise_account).process
+    assert entry.amount.negative?
+  end
+
+  # External ID and deduplication
+
+  test "uses stable external_id based on transfer id" do
+    transfer = build_transfer(id: 2001, target_account: 9999)
+
+    entry1 = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+    entry2 = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal "wise_transfer_2001", entry1.external_id
+    assert_equal entry1.id, entry2.id
+    assert_equal 1, @account.entries.where(source: "wise").count
+  end
+
+  # Reference as name
+
+  test "uses details.reference as transaction name when present" do
+    transfer = build_transfer(id: 3001, target_account: 9999, reference: "Invoice #42")
+
+    entry = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal "Invoice #42", entry.name
+  end
+
+  test "falls back to default name when no reference" do
+    transfer = build_transfer(id: 3002, target_account: 9999, reference: nil)
+
+    entry = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal I18n.t("wise_items.entries.default_name"), entry.name
+  end
+
+  # Fee handling
+
+  test "creates separate fee entry when sourceValue exceeds targetValue in same currency" do
+    transfer = build_transfer(id: 4001, target_account: 9999, source_value: 100.5, target_value: 100.0)
+
+    WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    entries = @account.entries.where(source: "wise").order(:created_at)
+    assert_equal 2, entries.count
+
+    fee_entry = entries.find { |e| e.external_id == "wise_fee_4001" }
+    assert_not_nil fee_entry
+    assert_equal BigDecimal("0.5"), fee_entry.amount
+    assert_equal I18n.t("wise_items.entries.fee_name"), fee_entry.name
+  end
+
+  test "does not create fee entry when sourceValue equals targetValue" do
+    transfer = build_transfer(id: 4002, target_account: 9999, source_value: 200.0, target_value: 200.0)
+
+    WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal 1, @account.entries.where(source: "wise").count
+  end
+
+  test "does not create fee entry for cross-currency transfers" do
+    transfer = build_transfer(id: 4003, target_account: 9999, source_value: 100.0, target_value: 90.0,
+                               source_currency: "EUR", target_currency: "GBP")
+
+    WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    assert_equal 1, @account.entries.where(source: "wise").count
+  end
+
+  # Skips without linked account
+
+  test "returns skipped when no account linked" do
+    unlinked_account = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000099",
+      name: "Unlinked",
+      currency: "GBP"
+    )
+
+    result = WiseEntry::Processor.new(build_transfer(id: 5001, target_account: 9999),
+                                       wise_account: unlinked_account).process
+
+    assert_equal :skipped, result
+  end
+
+  # Extra metadata
+
+  test "stores wise metadata in entry extra" do
+    transfer = build_transfer(id: 6001, target_account: 9999, source_value: 50.0, reference: "test ref")
+
+    entry = WiseEntry::Processor.new(transfer, wise_account: @wise_account).process
+
+    extra = entry.entryable.extra
+    assert_equal 6001, extra.dig("wise", "transfer_id")
+    assert_equal "outgoing_payment_sent", extra.dig("wise", "status")
+    assert_equal "EUR", extra.dig("wise", "source_currency")
+    assert_equal "test ref", extra.dig("wise", "reference")
+  end
+
+  private
+
+    def build_transfer(id:, target_account:, source_value: 100.0, target_value: nil,
+                        source_currency: "EUR", target_currency: nil, status: "outgoing_payment_sent",
+                        reference: nil)
+      {
+        "id" => id,
+        "targetAccount" => target_account,
+        "sourceAccount" => nil,
+        "sourceCurrency" => source_currency,
+        "sourceValue" => source_value,
+        "targetCurrency" => target_currency || source_currency,
+        "targetValue" => target_value || source_value,
+        "status" => status,
+        "rate" => 1.0,
+        "created" => "2026-01-15 10:00:00",
+        "details" => reference ? { "reference" => reference } : {}
+      }
+    end
+end
diff --git a/test/models/wise_item/importer_test.rb b/test/models/wise_item/importer_test.rb
new file mode 100644
index 000000000..f9afd5a4d
--- /dev/null
+++ b/test/models/wise_item/importer_test.rb
@@ -0,0 +1,263 @@
+require "test_helper"
+
+class WiseItem::ImporterTest < ActiveSupport::TestCase
+  class FakeWiseProvider
+    attr_reader :calls
+
+    def initialize(balances: nil, savings_balances: nil, borderless_accounts: nil,
+                   transfers: nil, activities: nil, raise_on: {})
+      @balances = balances || [ standard_balance ]
+      @savings_balances = savings_balances || []
+      @borderless_accounts = borderless_accounts || [ borderless_account ]
+      @transfers = transfers || []
+      @activities = activities || []
+      @raise_on = raise_on
+      @calls = []
+    end
+
+    def get_balances(profile_id)
+      @calls << :get_balances
+      raise_if(:get_balances)
+      @balances
+    end
+
+    def get_savings_balances(profile_id)
+      @calls << :get_savings_balances
+      raise_if(:get_savings_balances)
+      @savings_balances
+    end
+
+    def get_borderless_accounts(profile_id)
+      @calls << :get_borderless_accounts
+      raise_if(:get_borderless_accounts)
+      @borderless_accounts
+    end
+
+    def get_transfers(profile_id, limit: 100, offset: 0)
+      @calls << :get_transfers
+      @transfers
+    end
+
+    def get_activities(profile_id, cursor: nil, size: 100)
+      @calls << :get_activities
+      raise_if(:get_activities)
+      { "activities" => @activities, "cursor" => nil }
+    end
+
+    private
+
+      def raise_if(method)
+        error = @raise_on[method]
+        raise Provider::Wise::WiseError.new(error, :fetch_failed) if error
+      end
+
+      def standard_balance
+        {
+          "id" => "10000001",
+          "amount" => { "value" => 1964.88, "currency" => "EUR" },
+          "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+          "type" => "STANDARD"
+        }
+      end
+
+      def borderless_account
+        {
+          "id" => 88888001,
+          "recipientId" => 99999001,
+          "balances" => [ { "id" => 10000001 } ]
+        }
+      end
+  end
+
+  setup do
+    @family = families(:empty)
+    @wise_item = WiseItem.create!(
+      family: @family,
+      name: "Test Wise",
+      token: "test_token",
+      profile_id: "11111111",
+      profile_type: :business
+    )
+  end
+
+  # STANDARD balance import
+
+  test "imports STANDARD balances and creates WiseAccount records" do
+    provider = FakeWiseProvider.new
+
+    result = WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    assert result[:success]
+    assert_equal 1, result[:accounts_created]
+    assert_equal 0, result[:accounts_updated]
+
+    account = @wise_item.wise_accounts.first
+    assert_equal "10000001", account.balance_id
+    assert_equal "EUR", account.currency
+    assert_not account.jar?
+  end
+
+  test "stores borderless_account_id and recipient_id in STANDARD account raw_payload" do
+    provider = FakeWiseProvider.new
+
+    WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    account = @wise_item.wise_accounts.find_by(balance_id: "10000001")
+    assert_equal 88888001, account.raw_payload["borderless_account_id"]
+    assert_equal 99999001, account.raw_payload["recipient_id"]
+  end
+
+  # SAVINGS (JAR) balance import
+
+  test "imports SAVINGS balances and marks them as JAR" do
+    savings = {
+      "id" => "10000002",
+      "amount" => { "value" => 11022.16, "currency" => "EUR" },
+      "totalWorth" => { "value" => 11022.16, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+      "type" => "SAVINGS",
+      "name" => "Jar"
+    }
+    provider = FakeWiseProvider.new(savings_balances: [ savings ])
+
+    WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    jar = @wise_item.wise_accounts.find_by(balance_id: "10000002")
+    assert_not_nil jar
+    assert jar.jar?
+    assert_equal BigDecimal("11022.16"), jar.current_balance
+    assert_equal "Jar", jar.name
+  end
+
+  test "continues if savings balances fetch fails" do
+    provider = FakeWiseProvider.new(raise_on: { get_savings_balances: "forbidden" })
+
+    result = WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    assert result[:success]
+    assert_equal 1, @wise_item.wise_accounts.count
+  end
+
+  # Transfer routing
+
+  test "routes transfers to matching STANDARD account by source currency" do
+    transfers = [
+      build_transfer(id: 1, source_currency: "EUR", target_currency: "EUR", target_account: 9999),
+      build_transfer(id: 2, source_currency: "USD", target_currency: "USD", target_account: 9999)
+    ]
+    provider = FakeWiseProvider.new(transfers: transfers)
+
+    WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    eur_account = @wise_item.wise_accounts.find_by(currency: "EUR")
+    assert_equal 1, eur_account.raw_transactions_payload.size
+    assert_equal 1, eur_account.raw_transactions_payload.first["id"]
+  end
+
+  test "routes incoming transfers to account by target currency" do
+    transfers = [
+      build_transfer(id: 3, source_currency: "USD", target_currency: "EUR", target_account: 99999001)
+    ]
+    provider = FakeWiseProvider.new(transfers: transfers)
+
+    WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    eur_account = @wise_item.wise_accounts.find_by(currency: "EUR")
+    assert_equal 1, eur_account.raw_transactions_payload.size
+  end
+
+  # Activity routing
+
+  test "routes INTERBALANCE activities to both JAR and STANDARD accounts" do
+    savings = {
+      "id" => "10000002",
+      "amount" => { "value" => 1000.0, "currency" => "EUR" },
+      "totalWorth" => { "value" => 1000.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+      "type" => "SAVINGS",
+      "name" => "Jar"
+    }
+    interbalance = build_interbalance("To <strong>Jar</strong>", resource_id: "5001")
+    provider = FakeWiseProvider.new(savings_balances: [ savings ], activities: [ interbalance ])
+
+    WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    jar = @wise_item.wise_accounts.find_by(balance_id: "10000002")
+    standard = @wise_item.wise_accounts.find_by(balance_id: "10000001")
+
+    assert_equal 1, jar.raw_transactions_payload.size
+    assert jar.raw_transactions_payload.any? { |a| a["type"] == "INTERBALANCE" }
+    assert standard.raw_transactions_payload.any? { |a| a["type"] == "INTERBALANCE" }
+  end
+
+  test "routes BALANCE_CASHBACK only to JAR account" do
+    savings = {
+      "id" => "10000002",
+      "amount" => { "value" => 1000.0, "currency" => "EUR" },
+      "totalWorth" => { "value" => 1000.0, "currency" => "EUR" },
+      "reservedAmount" => { "value" => 0.0, "currency" => "EUR" },
+      "type" => "SAVINGS",
+      "name" => "Jar"
+    }
+    cashback = build_cashback("57001")
+    provider = FakeWiseProvider.new(savings_balances: [ savings ], activities: [ cashback ])
+
+    WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    jar = @wise_item.wise_accounts.find_by(balance_id: "10000002")
+    standard = @wise_item.wise_accounts.find_by(balance_id: "10000001")
+
+    assert_equal 1, jar.raw_transactions_payload.size
+    assert_empty standard.raw_transactions_payload.select { |a| a["type"] == "BALANCE_CASHBACK" }
+  end
+
+  # Returns failed result when balances fetch fails
+
+  test "returns failed result when STANDARD balances fetch fails" do
+    provider = FakeWiseProvider.new(raise_on: { get_balances: "unauthorized" })
+
+    result = WiseItem::Importer.new(@wise_item, wise_provider: provider).import
+
+    assert_not result[:success]
+    assert_equal "Failed to fetch balances", result[:error]
+  end
+
+  private
+
+    def build_transfer(id:, source_currency: "EUR", target_currency: "EUR", target_account: 9999)
+      {
+        "id" => id,
+        "targetAccount" => target_account,
+        "sourceCurrency" => source_currency,
+        "targetCurrency" => target_currency,
+        "sourceValue" => 100.0,
+        "targetValue" => 100.0,
+        "status" => "outgoing_payment_sent",
+        "created" => 7.days.ago.strftime("%Y-%m-%d %H:%M:%S")
+      }
+    end
+
+    def build_interbalance(title, resource_id:)
+      {
+        "id" => "interbalance_#{resource_id}",
+        "type" => "INTERBALANCE",
+        "resource" => { "type" => "BALANCE_TRANSACTION", "id" => resource_id },
+        "title" => title,
+        "primaryAmount" => "1,000 EUR",
+        "status" => "COMPLETED",
+        "createdOn" => 7.days.ago.iso8601
+      }
+    end
+
+    def build_cashback(resource_id)
+      {
+        "id" => "cashback_#{resource_id}",
+        "type" => "BALANCE_CASHBACK",
+        "resource" => { "type" => "BALANCE_CASHBACK", "id" => resource_id },
+        "title" => "<strong>Cashback</strong>",
+        "primaryAmount" => "<positive>+ 1.12 EUR</positive>",
+        "status" => "COMPLETED",
+        "createdOn" => 3.days.ago.iso8601
+      }
+    end
+end
diff --git a/test/models/wise_item_test.rb b/test/models/wise_item_test.rb
new file mode 100644
index 000000000..b913e5e70
--- /dev/null
+++ b/test/models/wise_item_test.rb
@@ -0,0 +1,115 @@
+require "test_helper"
+
+class WiseItemTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:empty)
+    @wise_item = WiseItem.create!(
+      family: @family,
+      name: "Test Wise",
+      token: "test_token",
+      profile_id: "123",
+      profile_type: :business
+    )
+
+    @standard_account = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000001",
+      name: "Wise EUR",
+      currency: "EUR",
+      raw_payload: { "type" => "STANDARD", "recipient_id" => 99999001 }
+    )
+    @standard_sure_account = Account.create!(
+      family: @family,
+      name: "Wise EUR",
+      accountable: Depository.new(subtype: "checking"),
+      balance: 0,
+      currency: "EUR"
+    )
+    AccountProvider.create!(account: @standard_sure_account, provider: @standard_account)
+
+    @jar_account = WiseAccount.create!(
+      wise_item: @wise_item,
+      balance_id: "10000002",
+      name: "Jar",
+      currency: "EUR",
+      raw_payload: { "type" => "SAVINGS", "name" => "Jar" }
+    )
+    @jar_sure_account = Account.create!(
+      family: @family,
+      name: "Jar",
+      accountable: Depository.new(subtype: "savings"),
+      balance: 0,
+      currency: "EUR"
+    )
+    AccountProvider.create!(account: @jar_sure_account, provider: @jar_account)
+  end
+
+  # link_jar_transfers!
+
+  test "links matching interbalance inflow and outflow entries as a Transfer" do
+    inflow_entry  = create_interbalance_entry(@jar_sure_account, "5001", side: :inflow, amount: -1000.0)
+    outflow_entry = create_interbalance_entry(@standard_sure_account, "5001", side: :outflow, amount: 1000.0)
+
+    assert_difference "Transfer.count", 1 do
+      @wise_item.link_jar_transfers!
+    end
+
+    transfer = Transfer.find_by(inflow_transaction_id: inflow_entry.entryable_id)
+    assert_not_nil transfer
+    assert_equal outflow_entry.entryable_id, transfer.outflow_transaction_id
+    assert_equal "confirmed", transfer.status
+  end
+
+  test "does not create duplicate Transfer for already-linked pair" do
+    inflow_entry  = create_interbalance_entry(@jar_sure_account, "5002", side: :inflow, amount: -2000.0)
+    outflow_entry = create_interbalance_entry(@standard_sure_account, "5002", side: :outflow, amount: 2000.0)
+
+    @wise_item.link_jar_transfers!
+
+    assert_no_difference "Transfer.count" do
+      @wise_item.link_jar_transfers!
+    end
+  end
+
+  test "skips unmatched inflow entries with no corresponding outflow" do
+    create_interbalance_entry(@jar_sure_account, "5003", side: :inflow, amount: -500.0)
+
+    assert_no_difference "Transfer.count" do
+      @wise_item.link_jar_transfers!
+    end
+  end
+
+  test "links multiple interbalance pairs in one call" do
+    create_interbalance_entry(@jar_sure_account, "6001", side: :inflow, amount: -1000.0)
+    create_interbalance_entry(@standard_sure_account, "6001", side: :outflow, amount: 1000.0)
+    create_interbalance_entry(@jar_sure_account, "6002", side: :inflow, amount: -3000.0)
+    create_interbalance_entry(@standard_sure_account, "6002", side: :outflow, amount: 3000.0)
+
+    assert_difference "Transfer.count", 2 do
+      @wise_item.link_jar_transfers!
+    end
+  end
+
+  test "does nothing when no interbalance entries exist" do
+    assert_no_difference "Transfer.count" do
+      @wise_item.link_jar_transfers!
+    end
+  end
+
+  private
+
+    def create_interbalance_entry(account, resource_id, side:, amount:)
+      external_id = "wise_interbalance_#{resource_id}_#{side}"
+      transaction = Transaction.create!(kind: "funds_movement")
+      entry = account.entries.create!(
+        external_id: external_id,
+        source: "wise",
+        amount: amount,
+        currency: "EUR",
+        date: Date.today,
+        name: "Transfer to Jar",
+        entryable: transaction
+      )
+      entry
+    end
+end
diff --git a/test/models/ynab_import_test.rb b/test/models/ynab_import_test.rb
new file mode 100644
index 000000000..ba1d91a49
--- /dev/null
+++ b/test/models/ynab_import_test.rb
@@ -0,0 +1,205 @@
+require "test_helper"
+
+class YnabImportTest < ActiveSupport::TestCase
+  setup do
+    @family = families(:dylan_family)
+  end
+
+  test "default column mappings are applied after create" do
+    import = @family.imports.create!(type: "YnabImport")
+
+    YnabImport.default_column_mappings.each do |attribute, value|
+      assert_equal value, import.public_send(attribute)
+    end
+  end
+
+  test "generated rows preserve stable source row numbers" do
+    import = ynab_import(file_fixture("imports/ynab.csv").read)
+    import.generate_rows_from_csv
+
+    assert_equal (1..5).to_a, import.rows.order(:source_row_number).pluck(:source_row_number)
+  end
+
+  test "outflow becomes a positive (expense) amount and inflow a negative (income) amount" do
+    import = ynab_import(file_fixture("imports/ynab.csv").read)
+    import.generate_rows_from_csv
+
+    rows = import.rows.order(:source_row_number)
+    # Row 1 is a pure outflow (rent): an expense, stored positive in Sure's convention
+    assert_equal BigDecimal("1500"), rows.first.signed_amount
+    # Row 3 is a pure inflow (paycheck): income, stored negative in Sure's convention
+    assert_equal BigDecimal("-2500"), rows.third.signed_amount
+  end
+
+  test "strips currency symbols and thousands separators from outflow/inflow" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      Checking,02/01/2024,Big Bill,Bills: Utilities,Quarterly,"$1,234.56",
+      Checking,02/02/2024,Refund,Income: Refund,,,"$1,000.00"
+    CSV
+    import.generate_rows_from_csv
+
+    rows = import.rows.order(:source_row_number)
+    assert_equal BigDecimal("1234.56"), rows.first.signed_amount
+    assert_equal BigDecimal("-1000"), rows.second.signed_amount
+  end
+
+  test "combines the category group and category from the single YNAB column" do
+    import = ynab_import(file_fixture("imports/ynab.csv").read)
+    import.generate_rows_from_csv
+
+    assert_equal "Housing: Rent", import.rows.order(:source_row_number).first.category
+  end
+
+  test "composes separate Category Group and Category columns" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group,Category,Memo,Outflow,Inflow
+      Checking,03/01/2024,Store,Food,Groceries,Weekly,42.00,0.00
+      Checking,03/02/2024,Misc,Food,,No category,5.00,0.00
+    CSV
+    import.generate_rows_from_csv
+
+    rows = import.rows.order(:source_row_number)
+    assert_equal "Food: Groceries", rows.first.category
+    assert_equal "Food", rows.second.category
+  end
+
+  test "composes legacy YNAB 4 Master Category and Sub Category columns" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category,Master Category,Sub Category,Memo,Outflow,Inflow
+      Checking,03/10/2024,Store,Everyday Expenses: Groceries,Everyday Expenses,Groceries,Weekly,42.00,0.00
+      Checking,03/11/2024,Misc,Everyday Expenses,Everyday Expenses,,No sub,5.00,0.00
+    CSV
+    import.generate_rows_from_csv
+
+    rows = import.rows.order(:source_row_number)
+    assert_equal "Everyday Expenses: Groceries", rows.first.category
+    assert_equal "Everyday Expenses", rows.second.category
+  end
+
+  test "a single signed Amount column takes precedence over outflow/inflow" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Amount
+      Checking,04/01/2024,Employer,Income: Salary,Paycheck,2000.00
+      Checking,04/02/2024,Store,Food: Groceries,Weekly,-50.00
+    CSV
+    import.generate_rows_from_csv
+
+    rows = import.rows.order(:source_row_number)
+    assert_equal BigDecimal("-2000"), rows.first.signed_amount  # inflow positive -> income negative
+    assert_equal BigDecimal("50"), rows.second.signed_amount    # outflow negative -> expense positive
+  end
+
+  test "blank payee falls back to memo, then to the default row name" do
+    import = ynab_import(file_fixture("imports/ynab.csv").read)
+    import.generate_rows_from_csv
+
+    # Last row has a blank Payee but a meaningful Memo
+    assert_equal "Reconciliation balance adjustment",
+      import.rows.order(:source_row_number).last.name
+
+    blank_both = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      Checking,01/04/2024,,,,0.00,0.43
+    CSV
+    blank_both.generate_rows_from_csv
+
+    assert_equal "Imported item", blank_both.rows.order(:source_row_number).first.name
+  end
+
+  test "publishes entries with combined money movement and mapped category/account" do
+    import = ynab_import(file_fixture("imports/ynab.csv").read)
+    import.generate_rows_from_csv
+
+    import.mappings.create! key: "Housing: Rent", create_when_empty: true, type: "Import::CategoryMapping"
+    import.mappings.create! key: "Food: Coffee", create_when_empty: true, type: "Import::CategoryMapping"
+    import.mappings.create! key: "Income: Paycheck", create_when_empty: true, type: "Import::CategoryMapping"
+    import.mappings.create! key: "Checking", mappable: accounts(:depository), type: "Import::AccountMapping"
+    import.mappings.create! key: "Credit Card", mappable: accounts(:credit_card), type: "Import::AccountMapping"
+    import.reload
+
+    assert_difference -> { Entry.count } => 5, -> { Transaction.count } => 5 do
+      import.publish
+    end
+
+    assert_equal "complete", import.status
+
+    entries = import.entries.reload
+    assert_equal BigDecimal("1500"), entries.find { |e| e.name == "Landlord" }.amount   # expense, positive
+    assert_equal BigDecimal("-2500"), entries.find { |e| e.name == "Employer" }.amount   # income, negative
+  end
+
+  test "nets the amount when both outflow and inflow are present on a row" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      Checking,05/01/2024,Adjustment,Income: Adjust,Net,30.00,100.00
+    CSV
+    import.generate_rows_from_csv
+
+    # inflow 100 - outflow 30 = +70 (income), reversed to -70 in Sure's convention
+    assert_equal BigDecimal("-70"), import.rows.first.signed_amount
+  end
+
+  test "treats an already-signed (negative) outflow as a magnitude" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      Checking,05/02/2024,Store,Food: Groceries,Signed,-25.00,
+    CSV
+    import.generate_rows_from_csv
+
+    # A negative outflow is still an expense (+25 in Sure's convention), never income
+    assert_equal BigDecimal("25"), import.rows.first.signed_amount
+  end
+
+  test "non-numeric outflow/inflow yields a zero amount instead of erroring" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      Checking,05/03/2024,Weird,Food: Groceries,Garbage,n/a,
+    CSV
+    import.generate_rows_from_csv
+
+    assert_equal BigDecimal("0"), import.rows.first.signed_amount
+  end
+
+  test "leaves the account blank when the export omits an Account column" do
+    import = ynab_import(<<~CSV)
+      Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      05/04/2024,Store,Food: Groceries,No account column,5.00,
+    CSV
+    import.generate_rows_from_csv
+
+    assert_equal "", import.rows.first.account
+  end
+
+  test "blocks the import when no Outflow/Inflow/Amount column is present" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo
+      Checking,01/01/2024,Store,Food: Groceries,No amount columns here
+    CSV
+    import.generate_rows_from_csv
+
+    row = import.rows.first
+    # No amount source -> blank amount -> fails the required-column validation
+    assert_predicate row.amount.to_s, :blank?
+    assert_not row.valid?
+    assert_includes row.errors[:amount], "is required"
+    assert_not import.cleaned?
+  end
+
+  test "still allows a genuine zero-dollar row when amount columns exist" do
+    import = ynab_import(<<~CSV)
+      Account,Date,Payee,Category Group/Category,Memo,Outflow,Inflow
+      Checking,01/01/2024,Placeholder,Food: Groceries,Zero,$0.00,$0.00
+    CSV
+    import.generate_rows_from_csv
+
+    row = import.rows.first
+    assert_equal BigDecimal("0"), row.signed_amount
+    assert row.valid?
+  end
+
+  private
+    def ynab_import(csv)
+      @family.imports.create!(type: "YnabImport", raw_file_str: csv, col_sep: ",")
+    end
+end
diff --git a/test/services/api_rate_limiter_test.rb b/test/services/api_rate_limiter_test.rb
index 8afc6bb9a..46d142c0d 100644
--- a/test/services/api_rate_limiter_test.rb
+++ b/test/services/api_rate_limiter_test.rb
@@ -15,12 +15,12 @@ class ApiRateLimiterTest < ActiveSupport::TestCase
     @rate_limiter = ApiRateLimiter.new(@api_key)
 
     # Clear any existing rate limit data
-    Redis.new.del("api_rate_limit:#{@api_key.id}")
+    clear_rate_limit_data(@api_key)
   end
 
   teardown do
     # Clean up Redis data after each test
-    Redis.new.del("api_rate_limit:#{@api_key.id}")
+    clear_rate_limit_data(@api_key)
   end
 
   test "should have default rate limit" do
@@ -117,7 +117,7 @@ class ApiRateLimiterTest < ActiveSupport::TestCase
     assert_equal 1, @rate_limiter.current_count
     assert_equal 2, other_rate_limiter.current_count
   ensure
-    Redis.new.del("api_rate_limit:#{other_api_key.id}")
+    clear_rate_limit_data(other_api_key)
     other_api_key.destroy
   end
 
@@ -135,4 +135,17 @@ class ApiRateLimiterTest < ActiveSupport::TestCase
 
     assert_in_delta expected_reset, reset_time, 1
   end
+
+  test "uses REDIS_URL for redis connection" do
+    with_env_overrides("REDIS_URL" => "redis://custom-host:6380/3") do
+      limiter = ApiRateLimiter.new(@api_key)
+      assert_equal "redis://custom-host:6380/3", limiter.redis_url
+    end
+  end
+
+  private
+
+    def clear_rate_limit_data(api_key)
+      Redis.new(url: ApiRateLimiter.redis_url).del("api_rate_limit:#{api_key.id}")
+    end
 end
diff --git a/test/support/entries_test_helper.rb b/test/support/entries_test_helper.rb
index 90ecd9220..4da7ac5db 100644
--- a/test/support/entries_test_helper.rb
+++ b/test/support/entries_test_helper.rb
@@ -52,20 +52,20 @@ module EntriesTestHelper
       entryable: trade
   end
 
-  def create_transfer(from_account:, to_account:, amount:, date: Date.current, currency: "USD")
+  def create_transfer(from_account:, to_account:, amount:, date: Date.current, currency: "USD", source_fee_amount: 0, destination_fee_amount: 0)
     outflow_transaction = Transaction.create!(kind: "funds_movement")
     inflow_transaction = Transaction.create!(kind: "funds_movement")
 
     transfer = Transfer.create!(
       outflow_transaction: outflow_transaction,
-      inflow_transaction: inflow_transaction
+      inflow_transaction: inflow_transaction,
+      amount: amount.abs
     )
 
-    # Create entries for both accounts
     from_account.entries.create!(
       name: "Transfer to #{to_account.name}",
       date: date,
-      amount: -amount.abs,
+      amount: amount.abs,
       currency: currency,
       entryable: outflow_transaction
     )
@@ -73,11 +73,37 @@ module EntriesTestHelper
     to_account.entries.create!(
       name: "Transfer from #{from_account.name}",
       date: date,
-      amount: amount.abs,
+      amount: -(amount.abs),
       currency: currency,
       entryable: inflow_transaction
     )
 
+    if source_fee_amount > 0
+      fee_tx = Transaction.create!(
+        kind: "standard",
+        entry: from_account.entries.create!(
+          name: "Transfer fee to #{to_account.name}",
+          date: date,
+          amount: source_fee_amount,
+          currency: currency,
+        )
+      )
+      transfer.fee_transactions << fee_tx
+    end
+
+    if destination_fee_amount > 0
+      fee_tx = Transaction.create!(
+        kind: "standard",
+        entry: to_account.entries.create!(
+          name: "Transfer fee from #{from_account.name}",
+          date: date,
+          amount: destination_fee_amount,
+          currency: currency,
+        )
+      )
+      transfer.fee_transactions << fee_tx
+    end
+
     transfer
   end
 end
diff --git a/test/support/ledger_testing_helper.rb b/test/support/ledger_testing_helper.rb
index a2266b679..8194979a0 100644
--- a/test/support/ledger_testing_helper.rb
+++ b/test/support/ledger_testing_helper.rb
@@ -88,6 +88,29 @@ module LedgerTestingHelper
           currency: currency,
           entryable: trade
         )
+      when "income_trade"
+        security = Security.find_or_create_by!(ticker: entry_data[:ticker]) do |s|
+          s.name = entry_data[:ticker]
+        end
+
+        currency = entry_data[:currency] || created_account.currency
+
+        trade = Trade.new(
+          qty: 0,
+          security: security,
+          price: 0,
+          fee: 0,
+          currency: currency,
+          investment_activity_label: entry_data[:label] || "Interest"
+        )
+
+        created_account.entries.create!(
+          name: "#{entry_data[:label] || 'Interest'}: #{entry_data[:ticker]}",
+          date: entry_data[:date],
+          amount: -(entry_data[:amount].to_d),
+          currency: currency,
+          entryable: trade
+        )
       end
     end
 
diff --git a/test/support/sql_query_capture.rb b/test/support/sql_query_capture.rb
new file mode 100644
index 000000000..ed1b1f1c0
--- /dev/null
+++ b/test/support/sql_query_capture.rb
@@ -0,0 +1,17 @@
+module SqlQueryCapture
+  def capture_sql_queries
+    queries = []
+    callback = lambda do |_name, _started, _finished, _unique_id, payload|
+      next if payload[:cached]
+      next if %w[SCHEMA TRANSACTION].include?(payload[:name])
+
+      queries << payload[:sql].squish
+    end
+
+    ActiveSupport::Notifications.subscribed(callback, "sql.active_record") do
+      yield
+    end
+
+    queries
+  end
+end
diff --git a/test/system/accounts_sync_ui_test.rb b/test/system/accounts_sync_ui_test.rb
new file mode 100644
index 000000000..668549391
--- /dev/null
+++ b/test/system/accounts_sync_ui_test.rb
@@ -0,0 +1,56 @@
+require "application_system_test_case"
+
+class AccountsSyncUiTest < ApplicationSystemTestCase
+  setup do
+    @user = users(:family_admin)
+    sign_in @user
+  end
+
+  test "idle state shows a plain refresh trigger with no cancel control" do
+    visit accounts_path
+
+    within "#accounts-sync-controls" do
+      assert_selector "button[aria-label='#{I18n.t("accounts.index.sync")}']"
+      assert_no_text I18n.t("accounts.index.cancel_sync")
+    end
+  end
+
+  test "an in-progress family sync shows a spinner and a matching Cancel sync button" do
+    Sync.create!(syncable: @user.family, status: :syncing)
+
+    visit accounts_path
+
+    within "#accounts-sync-controls" do
+      # `icon(..., as_button: true, class: "animate-spin")` renders a
+      # DS::Button whose icon classes are fully internal to the component —
+      # the caller's `class:` lands on the button element itself, not the
+      # inner svg. Same visual result for a centered square icon button.
+      assert_selector "button.animate-spin[disabled]"
+      assert_selector "button", text: I18n.t("accounts.index.cancel_sync")
+    end
+  end
+
+  test "cancelling a sync shows a flash notice, and the tray centers on the content pane" do
+    Sync.create!(syncable: @user.family, status: :syncing)
+
+    visit accounts_path
+    within "#accounts-sync-controls" do
+      click_on I18n.t("accounts.index.cancel_sync")
+    end
+
+    assert_text I18n.t("syncs.cancel.cancelled")
+
+    # The tray is a fixed overlay, positioned by notification_tray_controller.js
+    # to center on <main> (the actual content pane next to the sidebar) rather
+    # than the full viewport — assert the two centers actually match, not just
+    # that the tray exists somewhere on screen.
+    tray_rect = page.evaluate_script("document.querySelector('[data-notification-tray-target=\"tray\"]').getBoundingClientRect()")
+    main_rect = page.evaluate_script("document.querySelector('#main').getBoundingClientRect()")
+
+    tray_center = tray_rect["left"] + tray_rect["width"] / 2.0
+    main_center = main_rect["left"] + main_rect["width"] / 2.0
+
+    assert_in_delta main_center, tray_center, 1.0,
+      "expected the tray (center: #{tray_center}) to align with the content pane (center: #{main_center}), not drift to viewport-center"
+  end
+end
diff --git a/test/system/accounts_test.rb b/test/system/accounts_test.rb
index b7595f238..5bb7740eb 100644
--- a/test/system/accounts_test.rb
+++ b/test/system/accounts_test.rb
@@ -104,6 +104,40 @@ class AccountsTest < ApplicationSystemTestCase
       end
     end
 
+    # The account page issues a Turbo morph refresh shortly after it loads
+    # (`turbo_refreshes_with method: :morph` reacting to a family-stream
+    # broadcast). Opening the menu while that refresh is in flight can detach the
+    # node mid-click ("Node with given id does not belong to the document") or
+    # wipe the just-opened edit form — neither of which Capybara auto-retries.
+    # Retry until the edit form is present so the test is deterministic instead
+    # of racing the broadcast (mirrors PropertyTest#open_account_edit_dialog).
+    def open_account_edit_dialog
+      3.times do
+        # A prior (slow) attempt may have already opened the edit form.
+        return if has_field?("Account name", wait: 0)
+
+        begin
+          within_testid("account-menu") do
+            # Open the menu only when it's closed. DS::Menu's trigger toggles
+            # (menu_controller#toggle), so blindly re-clicking an already-open
+            # menu would close it and hide "Edit", turning a slow-but-successful
+            # modal load into a fresh flake.
+            unless has_selector?("[role='menu']", visible: true, wait: 0)
+              find("button").click
+            end
+            click_on "Edit"
+          end
+        rescue Selenium::WebDriver::Error::WebDriverError => e
+          raise unless e.message.match?(
+            /does not belong to the document|stale element reference/i,
+          )
+          next
+        end
+        return if has_field?("Account name", wait: 2)
+      end
+      assert_field "Account name"
+    end
+
     def assert_account_created(accountable_type, &block)
       click_link Accountable.from_type(accountable_type).singular_display_name
       click_link "Enter account balance" if accountable_type.in?(%w[Depository Investment Crypto Loan CreditCard])
@@ -139,23 +173,20 @@ class AccountsTest < ApplicationSystemTestCase
       assert_equal notes, created_account[:notes]
 
       visit account_url(created_account)
-
-      within_testid("account-menu") do
-        find("button").click
-        click_on "Edit"
-      end
+      # Let the initial page (and any immediate Turbo morph) settle before
+      # opening the edit dialog — same race as open_account_edit_dialog.
+      assert_selector "h2", text: account_name
 
       updated_institution_name = "[system test] Updated Institution"
       updated_institution_domain = "updated.example.com"
       updated_notes = "Updated notes for #{accountable_type}"
 
-      fill_in "Account name", with: "Updated account name"
-      find("summary", text: "Additional details").click
-      fill_in "Institution name", with: updated_institution_name
-      fill_in "Institution domain", with: updated_institution_domain
-      fill_in "Notes", with: updated_notes
-      click_button "Update Account"
-      assert_selector "h2", text: "Updated account name"
+      update_account_details(
+        name: "Updated account name",
+        institution_name: updated_institution_name,
+        institution_domain: updated_institution_domain,
+        notes: updated_notes
+      )
 
       created_account.reload
       assert_equal updated_institution_name, created_account[:institution_name]
@@ -163,6 +194,34 @@ class AccountsTest < ApplicationSystemTestCase
       assert_equal updated_notes, created_account[:notes]
     end
 
+    # Fill + submit the account edit dialog, retrying when a Turbo morph
+    # detaches nodes mid-interaction (Chrome: "Node with given id does not
+    # belong to the document"). Mirrors open_account_edit_dialog.
+    def update_account_details(name:, institution_name:, institution_domain:, notes:)
+      3.times do
+        begin
+          open_account_edit_dialog unless has_field?("Account name", wait: 0)
+
+          fill_in "Account name", with: name
+          unless has_field?("Institution name", wait: 0)
+            find("summary", text: "Additional details").click
+          end
+          fill_in "Institution name", with: institution_name
+          fill_in "Institution domain", with: institution_domain
+          fill_in "Notes", with: notes
+          click_button "Update Account"
+
+          return if has_selector?("h2", text: name, wait: 2)
+        rescue Selenium::WebDriver::Error::WebDriverError => e
+          raise unless e.message.match?(
+            /does not belong to the document|stale element reference/i,
+          )
+        end
+      end
+
+      assert_selector "h2", text: name
+    end
+
     def humanized_accountable(accountable_type)
       Accountable.from_type(accountable_type).singular_display_name
     end
diff --git a/test/system/ds_overlay_morph_test.rb b/test/system/ds_overlay_morph_test.rb
new file mode 100644
index 000000000..4dcfbd04a
--- /dev/null
+++ b/test/system/ds_overlay_morph_test.rb
@@ -0,0 +1,65 @@
+require "application_system_test_case"
+
+# Regression coverage for the bug fixed alongside DS::Menu / DS::Popover's
+# `fixed`-in-static-class change: a Turbo morph re-renders an open panel's
+# content element back to its server-rendered (closed) state without going
+# through the controller's own open/close methods. `show` used to be a plain
+# instance property that a morph couldn't touch, so the next click toggled
+# off an already-closed panel — swallowing the click. Deriving `show` from
+# the content element's own `hidden` class (rather than tracked state) means
+# it can't desync from what the DOM actually shows.
+class DsOverlayMorphTest < ApplicationSystemTestCase
+  setup do
+    sign_in @user = users(:family_admin)
+  end
+
+  test "DS::Menu reopens correctly after a morph resets it to hidden" do
+    visit tags_url
+
+    trigger = find("[aria-haspopup='menu']", match: :first)
+    content_id = trigger["aria-controls"]
+
+    trigger.click
+    assert_selector "##{content_id}", visible: true
+    assert_equal "true", trigger["aria-expanded"]
+
+    simulate_morph_reset(content_id)
+
+    trigger.click
+    assert_selector "##{content_id}", visible: true
+    assert_equal "true", trigger["aria-expanded"]
+  end
+
+  test "DS::Popover reopens correctly after a morph resets it to hidden" do
+    visit root_url
+
+    within_testid "user-menu" do
+      trigger = find("[aria-haspopup='dialog']")
+      content_id = trigger["aria-controls"]
+
+      trigger.click
+      assert_selector "##{content_id}", visible: true
+      assert_equal "true", trigger["aria-expanded"]
+
+      simulate_morph_reset(content_id)
+
+      trigger.click
+      assert_selector "##{content_id}", visible: true
+      assert_equal "true", trigger["aria-expanded"]
+    end
+  end
+
+  private
+    # Mimics what idiomorph does to an open panel on a same-page Turbo morph:
+    # the content element's class list is reconciled back to the always-hidden
+    # server-rendered markup, and any inline style the controller applied
+    # (position coordinates) is stripped — all without calling the Stimulus
+    # controller's toggle()/close().
+    def simulate_morph_reset(content_id)
+      page.execute_script(<<~JS, content_id)
+        const el = document.getElementById(arguments[0]);
+        el.classList.add("hidden");
+        el.removeAttribute("style");
+      JS
+    end
+end
diff --git a/test/system/imports_test.rb b/test/system/imports_test.rb
index e5667817e..dd398490d 100644
--- a/test/system/imports_test.rb
+++ b/test/system/imports_test.rb
@@ -225,4 +225,42 @@ class ImportsTest < ApplicationSystemTestCase
 
     click_on "Back to dashboard"
   end
+
+  test "ynab import" do
+    visit new_import_path
+
+    # Pending CSV-style imports default the dialog to the Raw Data tab; YNAB lives under Financial Tools.
+    click_on "Financial Tools"
+    click_on "Import from YNAB"
+
+    within_testid("import-tabs") do
+      click_on "Copy & Paste"
+    end
+
+    fill_in "import[raw_file_str]", with: file_fixture("imports/ynab.csv").read
+
+    find_field("import[raw_file_str]").find(:xpath, "./ancestor::form").click_button("Upload CSV")
+
+    click_on "Apply configuration"
+
+    click_on "Next step"
+
+    assert_selector "h1", text: "Assign your categories"
+    click_on "Next"
+
+    assert_selector "h1", text: "Assign your accounts"
+    click_on "Next"
+
+    click_on "Publish import"
+
+    assert_text "Import in progress"
+
+    perform_enqueued_jobs
+
+    click_on "Check status"
+
+    assert_text "Import successful"
+
+    click_on "Back to dashboard"
+  end
 end
diff --git a/test/system/property_test.rb b/test/system/property_test.rb
index b0a15f35d..19941144f 100644
--- a/test/system/property_test.rb
+++ b/test/system/property_test.rb
@@ -13,13 +13,48 @@ class PropertiesEditTest < ApplicationSystemTestCase
 
   test "can persist property subtype" do
     click_link "[system test] Property Account"
-    find("[data-testid='account-menu']").click
-    click_on "Edit"
+    open_account_edit_dialog
     assert_equal "single_family_home", find("#account_accountable_attributes_subtype").value
   end
 
   private
 
+    # The account page issues a Turbo morph refresh shortly after it loads
+    # (`turbo_refreshes_with method: :morph` reacting to a family-stream
+    # broadcast). If the edit modal is opened while that refresh is in flight,
+    # the morph re-renders the page and wipes the just-loaded `#modal`
+    # turbo-frame before the dialog is interactive — and can detach the menu
+    # node mid-click ("Node with given id does not belong to the document"),
+    # which Capybara does not auto-retry. Open via the account menu and retry
+    # until the edit form is present so the test is deterministic instead of
+    # racing the broadcast.
+    def open_account_edit_dialog
+      3.times do
+        # A prior (slow) attempt may have already opened the edit form.
+        return if has_selector?("#account_accountable_attributes_subtype", wait: 0)
+
+        begin
+          within_testid("account-menu") do
+            # Open the menu only when it's closed. DS::Menu's trigger toggles
+            # (menu_controller#toggle), so blindly re-clicking an already-open
+            # menu would close it and hide "Edit", turning a slow-but-successful
+            # modal load into a fresh flake.
+            unless has_selector?("[role='menu']", visible: true, wait: 0)
+              find("button").click
+            end
+            click_on "Edit"
+          end
+        rescue Selenium::WebDriver::Error::WebDriverError => e
+          raise unless e.message.match?(
+            /does not belong to the document|stale element reference/i,
+          )
+          next
+        end
+        return if has_selector?("#account_accountable_attributes_subtype", wait: 2)
+      end
+      assert_selector "#account_accountable_attributes_subtype"
+    end
+
     def open_new_account_modal
       within "[data-controller='DS--tabs']" do
         click_button "All"
diff --git a/test/system/settings/api_keys_test.rb b/test/system/settings/api_keys_test.rb
index e558cb945..bf296309f 100644
--- a/test/system/settings/api_keys_test.rb
+++ b/test/system/settings/api_keys_test.rb
@@ -7,200 +7,75 @@ class Settings::ApiKeysTest < ApplicationSystemTestCase
     login_as @user
   end
 
-  test "should show no API key state when user has no active keys" do
-    visit settings_api_key_path
+  test "should show empty state when user has no API keys" do
+    visit settings_api_keys_path
 
-    assert_text "API Key"
-    assert_link "Create API Key", href: new_settings_api_key_path
-    assert_text "Access your account data programmatically"
+    assert_text "API Keys"
+    assert_text "No API keys yet"
+    assert_link "New API Key", href: new_settings_api_key_path
   end
 
-  test "should navigate to create new API key form" do
-    visit settings_api_key_path
-    click_link "Create API Key"
+  test "should create multiple keys, list them, and revoke one" do
+    # Create the first key
+    visit settings_api_keys_path
+    click_link "New API Key"
 
     assert_current_path new_settings_api_key_path
     assert_text "Create New API Key"
-    assert_field "API Key Name"
-    assert_text "Read Only"
-    assert_text "Read/Write"
-  end
 
-  test "should create a new API key with selected scopes" do
-    visit new_settings_api_key_path
-
-    fill_in "API Key Name", with: "Test Integration Key"
+    fill_in "API Key Name", with: "First Key"
     choose "Read/Write"
-
     click_button "Save API Key"
 
-    # Should redirect to show page with the API key details
-    assert_current_path settings_api_key_path
-    assert_text "Test Integration Key"
-    assert_text "Your API Key"
-
-    # Should show the actual API key value
-    api_key_display = find("#api-key-display")
+    # Newly-created confirmation page shows the plain key
+    assert_text "API Key Created Successfully"
+    assert_text "First Key"
+    api_key_display = find("[data-clipboard-target='source']")
     assert api_key_display.text.length > 30 # Should be a long hex string
 
-    # Should show copy buttons
-    assert_button "Copy API Key"
-    assert_link "Create New Key"
-  end
+    # Back to the list, the first key is shown
+    click_link "Continue to API Key Settings"
+    assert_current_path settings_api_keys_path
+    assert_text "First Key"
 
-  test "should show current API key details after creation" do
-    # Create an API key first
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Production API Key",
-      display_key: "test_plain_key_123",
-      scopes: [ "read_write" ]
-    )
-
-    visit settings_api_key_path
-
-    assert_text "Your API Key"
-    assert_text "Production API Key"
-    assert_text "Active"
-    assert_text "Read/Write"
-    assert_text "Never used"
-    assert_link "Create New Key"
-    assert_button "Revoke Key"
-  end
-
-  test "should show usage instructions and example curl command" do
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Test API Key",
-      display_key: "test_key_123",
-      scopes: [ "read" ]
-    )
-
-    visit settings_api_key_path
-
-    assert_text "How to use your API key"
-    assert_text "curl -H \"X-Api-Key: test_key_123\""
-    assert_text "/api/v1/accounts"
-  end
-
-  test "should allow regenerating API key" do
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Old API Key",
-      display_key: "old_key_123",
-      scopes: [ "read" ]
-    )
-
-    visit settings_api_key_path
-    click_link "Create New Key"
-
-    # Should be on the new API key form
-    assert_text "Create New API Key"
-
-    fill_in "API Key Name", with: "New API Key"
+    # Create a SECOND key with a different name
+    click_link "New API Key"
+    fill_in "API Key Name", with: "Second Key"
     choose "Read Only"
     click_button "Save API Key"
 
-    # Should redirect to show page with new key
-    assert_text "New API Key"
-    assert_text "Your API Key"
+    assert_text "API Key Created Successfully"
+    click_link "Continue to API Key Settings"
 
-    # Old key should be revoked
-    api_key.reload
-    assert api_key.revoked?
-  end
+    # Both keys appear in the list
+    assert_current_path settings_api_keys_path
+    assert_text "First Key"
+    assert_text "Second Key"
 
-  test "should allow revoking API key with confirmation" do
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Test API Key",
-      display_key: "test_key_123",
-      scopes: [ "read" ]
-    )
+    # Revoke the first key via the custom confirmation dialog
+    within all(".bg-container", text: "First Key").first do
+      click_button "Revoke"
+    end
 
-    visit settings_api_key_path
-
-    # Click the revoke button to open the modal
-    click_button "Revoke Key"
-
-    # Wait for the dialog and then confirm
     assert_selector "#confirm-dialog", visible: true
     within "#confirm-dialog" do
       click_button "Confirm"
     end
-
-    # Wait for redirect after revoke
     assert_no_selector "#confirm-dialog"
 
-    assert_text "API Key"
-    assert_text "Access your account data programmatically"
+    # First key gone, second remains
+    assert_no_text "First Key"
+    assert_text "Second Key"
 
-    # Key should be revoked in the database
-    api_key.reload
-    assert api_key.revoked?
+    assert @user.api_keys.where(name: "First Key").first.revoked?
+    refute @user.api_keys.active.where(name: "Second Key").empty?
   end
 
-  test "should redirect to show when user already has active key and tries to visit new" do
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Existing API Key",
-      display_key: "existing_key_123",
-      scopes: [ "read" ]
-    )
-
-    visit new_settings_api_key_path
-
-    assert_current_path settings_api_key_path
-  end
-
-  test "should show API key in navigation" do
-    visit settings_api_key_path
+  test "should show API keys in navigation" do
+    visit settings_api_keys_path
 
     within("nav") do
-      assert_text "API Key"
+      assert_text "API Keys"
     end
   end
-
-  test "should validate API key name is required" do
-    visit new_settings_api_key_path
-
-    # Try to submit without name
-    choose "Read Only"
-    click_button "Save API Key"
-
-    # Should stay on form with validation error
-    assert_current_path new_settings_api_key_path
-    assert_field "API Key Name" # Form should still be visible
-    # The form might not show the validation error inline, but should remain on the form
-  end
-
-  test "should show last used timestamp when API key has been used" do
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Used API Key",
-      display_key: "used_key_123",
-      scopes: [ "read" ],
-      last_used_at: 2.hours.ago
-    )
-
-    visit settings_api_key_path
-
-    assert_text "2 hours ago"
-    assert_no_text "Never used"
-  end
-
-  test "should show expiration date when API key has expiration" do
-    api_key = ApiKey.create!(
-      user: @user,
-      name: "Expiring API Key",
-      display_key: "expiring_key_123",
-      scopes: [ "read" ],
-      expires_at: 30.days.from_now
-    )
-
-    visit settings_api_key_path
-
-    # Should show some indication of expiration (exact format may vary)
-    assert_no_text "Never expires"
-  end
 end
diff --git a/test/system/settings_test.rb b/test/system/settings_test.rb
index 96ec24dcc..c02c14d00 100644
--- a/test/system/settings_test.rb
+++ b/test/system/settings_test.rb
@@ -30,7 +30,7 @@ class SettingsTest < ApplicationSystemTestCase
       @settings_links.insert(merchants_index + 1, [ "Statement Vault", account_statements_path ])
       @settings_links += [
         [ "AI Prompts", settings_ai_prompts_path ],
-        [ "API Key", settings_api_key_path ]
+        [ "API Keys", settings_api_keys_path ]
       ]
     end
   end
@@ -54,6 +54,8 @@ class SettingsTest < ApplicationSystemTestCase
     Rails.application.config.app_mode.stubs(:self_hosted?).returns(true)
     Provider::Registry.stubs(:get_provider).with(:twelve_data).returns(nil)
     Provider::Registry.stubs(:get_provider).with(:yahoo_finance).returns(nil)
+    Provider::Registry.stubs(:get_provider).with(:rentcast).returns(nil)
+    Provider::Registry.stubs(:get_provider).with(:realie).returns(nil)
     Provider::Registry.stubs(:get_provider).with(:github).returns(stub(fetch_latest_release_notes: nil))
     open_settings_from_sidebar
     assert_selector "li", text: "Self-Hosting"
@@ -93,7 +95,7 @@ class SettingsTest < ApplicationSystemTestCase
 
       # Assert that admin-only settings are not present in the navigation
       assert_no_selector "li", text: "AI Prompts"
-      assert_no_selector "li", text: "API Key"
+      assert_no_selector "li", text: "API Keys"
       assert_no_selector "li", text: "Bank sync"
       assert_no_selector "li", text: "Statement Vault"
     end
diff --git a/test/system/trades_test.rb b/test/system/trades_test.rb
index f8e94fdc5..46d1c2146 100644
--- a/test/system/trades_test.rb
+++ b/test/system/trades_test.rb
@@ -10,10 +10,11 @@ class TradesTest < ApplicationSystemTestCase
 
     @account = accounts(:investment)
 
-    visit_account_portfolio
-
     # Disable provider to focus on form testing
     Security.stubs(:provider).returns(nil)
+    Security.stubs(:providers).returns([])
+
+    visit_account_portfolio
   end
 
   test "can create buy transaction" do
@@ -44,6 +45,8 @@ class TradesTest < ApplicationSystemTestCase
     open_new_trade_modal
 
     select "Sell", from: "Type"
+    assert_selector "turbo-frame#modal form[data-trade-type='sell']"
+
     fill_in "Ticker symbol", with: "AAPL"
     fill_in "Date", with: Date.current
     fill_in "Quantity", with: qty
diff --git a/test/system/transactions_form_exchange_rate_test.rb b/test/system/transactions_form_exchange_rate_test.rb
index 4e611e881..d521c5a72 100644
--- a/test/system/transactions_form_exchange_rate_test.rb
+++ b/test/system/transactions_form_exchange_rate_test.rb
@@ -68,10 +68,8 @@ class TransactionsFormExchangeRateTest < ApplicationSystemTestCase
     # Wait for exchange rate container to become visible
     assert_selector "[data-transaction-form-target='exchangeRateContainer']", visible: true
 
-    # Exchange rate field should be populated
-    exchange_rate_field = find("[data-transaction-form-target='exchangeRateField']")
-    assert_not_empty exchange_rate_field.value
-    assert_equal "1.27", exchange_rate_field.value
+    # Exchange rate is fetched asynchronously — wait for the field value.
+    assert_equal "1.27", wait_for_exchange_rate_value("1.27")
   end
 
   test "exchange rate field is empty when rate not found" do
@@ -100,18 +98,17 @@ class TransactionsFormExchangeRateTest < ApplicationSystemTestCase
     # Change to EUR
     find("select[data-money-field-target='currency']").find("option[value='EUR']").select_option
 
-    # Wait for EUR rate to load
+    # Wait for EUR rate to load (async fetch)
     assert_selector "[data-transaction-form-target='exchangeRateContainer']", visible: true
-    first_rate = find("[data-transaction-form-target='exchangeRateField']").value
-    assert_equal "1.10", first_rate
+    first_rate = wait_for_exchange_rate_value("1.10")
 
     # Change to GBP
     find("select[data-money-field-target='currency']").find("option[value='GBP']").select_option
 
-    # Wait for GBP rate to be updated
+    # Wait for the field to flip from EUR→GBP; reading immediately is flaky
+    # because the previous value stays until the fetch completes.
     assert_selector "[data-transaction-form-target='exchangeRateContainer']", visible: true
-    second_rate = find("[data-transaction-form-target='exchangeRateField']").value
-    assert_equal "1.27", second_rate
+    second_rate = wait_for_exchange_rate_value("1.27")
 
     # Rates should be different
     assert_not_equal first_rate, second_rate
@@ -135,6 +132,7 @@ class TransactionsFormExchangeRateTest < ApplicationSystemTestCase
 
     # Exchange rate shown (both USD and EUR exist, they differ)
     assert_selector "[data-transaction-form-target='exchangeRateContainer']", visible: true
+    wait_for_exchange_rate_value("1.10")
 
     # Switch to EUR account
     select_ds("Account", eur_account)
@@ -143,4 +141,11 @@ class TransactionsFormExchangeRateTest < ApplicationSystemTestCase
     # Exchange rate UI should hide
     assert_selector "[data-transaction-form-target='exchangeRateContainer']", visible: false
   end
+
+  private
+    # JS sets the input's value property after an async fetch. Waiting on the
+    # HTML value= attribute is unreliable, so filter the node by .value.
+    def wait_for_exchange_rate_value(expected)
+      find("[data-transaction-form-target='exchangeRateField']") { |node| node.value == expected }.value
+    end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 461ebe3a6..d73d3706d 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -26,6 +26,7 @@ require "webmock/minitest"
 require "rack/test"
 require "tempfile"
 require "uri"
+require Rails.root.join("test/support/sql_query_capture").to_s
 
 VCR.configure do |config|
   config.cassette_library_dir = "test/vcr_cassettes"
@@ -78,6 +79,15 @@ module ActiveSupport
     # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
     fixtures :all
 
+    # rails-settings-cached keeps an in-memory cache that survives the per-test
+    # transaction rollback, so a Setting.* value written in one test leaks into
+    # later tests and causes order-dependent failures (e.g. Settings::Hostings
+    # reading a stale "" where nil is expected). Reset the cache before every
+    # test so each starts from the rolled-back DB state.
+    setup { Setting.clear_cache }
+
+    include SqlQueryCapture
+
     # Add more helper methods to be used by all tests here...
     def sign_in(user)
       post sessions_path, params: { email: user.email, password: user_password_test }
diff --git a/test/views/categories/category_list_group_view_test.rb b/test/views/categories/category_list_group_view_test.rb
index 62d5a9001..7305ece0e 100644
--- a/test/views/categories/category_list_group_view_test.rb
+++ b/test/views/categories/category_list_group_view_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class CategoryListGroupViewTest < ActionView::TestCase
-  test "falls back to transaction existence checks when no lookup is provided" do
+  test "loads transaction lookup in one query when no lookup is provided" do
     category = categories(:food_and_drink)
     transaction = Transaction.create!(category: category)
     Entry.create!(
@@ -15,10 +15,20 @@ class CategoryListGroupViewTest < ActionView::TestCase
 
     html = render(partial: "categories/category_list_group", locals: {
       title: "Categories",
-      categories: [ category ]
+      categories: [ category ],
+      family: category.family
     })
 
     assert_includes html, new_category_deletion_path(category)
     assert_not_includes html, "data-turbo-method=\"delete\""
   end
+
+  test "renders with empty categories when no transaction lookup is provided" do
+    assert_nothing_raised do
+      render(partial: "categories/category_list_group", locals: {
+        title: "Categories",
+        categories: []
+      })
+    end
+  end
 end
diff --git a/test/views/transactions/transfer_counterpart_view_test.rb b/test/views/transactions/transfer_counterpart_view_test.rb
new file mode 100644
index 000000000..1c1de6016
--- /dev/null
+++ b/test/views/transactions/transfer_counterpart_view_test.rb
@@ -0,0 +1,85 @@
+require "test_helper"
+
+class Transactions::TransferCounterpartViewTest < ActionView::TestCase
+  setup do
+    @family = families(:dylan_family)
+    @user = users(:family_admin)
+    Current.session = Session.create!(user: @user)
+
+    @checking = accounts(:depository) # "from" account
+    @savings = accounts(:credit_card) # "to" account
+
+    @accessible_account_ids = @user.accessible_accounts.pluck(:id).to_set
+    @split_parent_entry_ids = Set.new
+  end
+
+  test "renders outflow transfer with arrow to destination account" do
+    outflow_tx = Transaction.create!(kind: "funds_movement")
+    outflow_entry = Entry.create!(
+      account: @checking, entryable: outflow_tx,
+      name: "Transfer to Savings", amount: 100, currency: "USD", date: Date.today
+    )
+
+    inflow_tx = Transaction.create!(kind: "funds_movement")
+    inflow_entry = Entry.create!(
+      account: @savings, entryable: inflow_tx,
+      name: "Transfer from Checking", amount: -100, currency: "USD", date: Date.today
+    )
+
+    Transfer.create!(
+      inflow_transaction: inflow_tx,
+      outflow_transaction: outflow_tx,
+      status: "confirmed"
+    )
+
+    html = render(partial: "transactions/transaction", locals: {
+      entry: outflow_entry, balance_trend: nil, view_ctx: "global"
+    })
+
+    assert_includes html, "→"
+    assert_includes html, @savings.name
+  end
+
+  test "renders inflow transfer with arrow from source account" do
+    outflow_tx = Transaction.create!(kind: "funds_movement")
+    outflow_entry = Entry.create!(
+      account: @checking, entryable: outflow_tx,
+      name: "Transfer to Savings", amount: 100, currency: "USD", date: Date.today
+    )
+
+    inflow_tx = Transaction.create!(kind: "funds_movement")
+    inflow_entry = Entry.create!(
+      account: @savings, entryable: inflow_tx,
+      name: "Transfer from Checking", amount: -100, currency: "USD", date: Date.today
+    )
+
+    Transfer.create!(
+      inflow_transaction: inflow_tx,
+      outflow_transaction: outflow_tx,
+      status: "confirmed"
+    )
+
+    html = render(partial: "transactions/transaction", locals: {
+      entry: inflow_entry, balance_trend: nil, view_ctx: "global"
+    })
+
+    assert_includes html, "←"
+    assert_includes html, @checking.name
+  end
+
+  test "falls back to account name when transfer has no counterpart" do
+    tx = Transaction.create!(kind: "funds_movement")
+    entry = Entry.create!(
+      account: @checking, entryable: tx,
+      name: "Unmatched Transfer", amount: 100, currency: "USD", date: Date.today
+    )
+
+    html = render(partial: "transactions/transaction", locals: {
+      entry: entry, balance_trend: nil, view_ctx: "global"
+    })
+
+    assert_includes html, @checking.name
+    assert_not_includes html, "→"
+    assert_not_includes html, "←"
+  end
+end
diff --git a/workers/preview/deploy/redact_preview_log.sh b/workers/preview/deploy/redact_preview_log.sh
new file mode 100755
index 000000000..40633ff4e
--- /dev/null
+++ b/workers/preview/deploy/redact_preview_log.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+perl -pe '
+  s#registry\.cloudflare\.com/[^/]+/#registry.cloudflare.com/<redacted-account>/#g;
+  s#((?:Authorization|Proxy-Authorization):\s*Bearer\s+)[^[:space:]]+#$1<redacted-token>#gi;
+  s#((?:X-Auth-Key|X-Auth-Email|X-Api-Key|Api-Key):\s*)[^[:space:]]+#$1<redacted-token>#gi;
+  s#([?&](?:token|api_key|access_token|refresh_token|auth_token|key|private_key)=)[^&[:space:]]+#$1<redacted-token>#gi;
+  s#("(?:token|api_key|access_token|refresh_token|auth_token|secret|client_secret|private_key)"\s*:\s*")[^"]*#$1<redacted-token>#gi;
+  s#(CLOUDFLARE_ACCOUNT_ID=)[^[:space:]]+#$1<redacted-account>#g;
+  s#((?:CLOUDFLARE_API_TOKEN|API_KEY|ACCESS_TOKEN|REFRESH_TOKEN|AUTH_TOKEN|PRIVATE_KEY)=)[^[:space:]]+#$1<redacted-token>#g;
+'
diff --git a/workers/preview/deploy/render_preview_config.cjs b/workers/preview/deploy/render_preview_config.cjs
new file mode 100644
index 000000000..4afeed72e
--- /dev/null
+++ b/workers/preview/deploy/render_preview_config.cjs
@@ -0,0 +1,114 @@
+const fs = require("node:fs");
+
+const IMAGE_FIELD_PATTERN = /^(\s*image\s*=\s*)"([^"]*)"(\s*(?:#.*)?)$/gm;
+const REGISTRY_IMAGE_REF_PATTERN =
+  /^registry\.cloudflare\.com\/([A-Za-z0-9_-]+)\/(sure-preview-pr-([1-9][0-9]*):([a-f0-9]{40}))$/;
+const REGISTRY_IMAGE_REF_SCAN_PATTERN =
+  /registry\.cloudflare\.com\/[A-Za-z0-9_-]+\/sure-preview-pr-[1-9][0-9]*:[a-f0-9]{40}/g;
+
+function expectedImageTag({ prNumber, headSha }) {
+  if (!/^[1-9][0-9]*$/.test(String(prNumber || ""))) {
+    throw new Error("Expected a numeric preview PR number");
+  }
+
+  if (!/^[a-f0-9]{40}$/.test(String(headSha || ""))) {
+    throw new Error("Expected a 40-character preview head SHA");
+  }
+
+  return `sure-preview-pr-${prNumber}:${headSha}`;
+}
+
+function validateRegistryImageRef(imageRef, { accountId, prNumber, headSha }) {
+  const match = REGISTRY_IMAGE_REF_PATTERN.exec(imageRef || "");
+  if (!match) {
+    throw new Error("Expected a Cloudflare registry image reference");
+  }
+
+  const expectedTag = expectedImageTag({ prNumber, headSha });
+  if (match[2] !== expectedTag) {
+    throw new Error("Cloudflare registry image reference does not match this preview artifact");
+  }
+
+  if (accountId && match[1] !== accountId) {
+    throw new Error("Cloudflare registry image reference account does not match this workflow");
+  }
+
+  return imageRef;
+}
+
+function renderPreviewConfig(source, imageRef, options) {
+  validateRegistryImageRef(imageRef, options);
+
+  const matches = [...source.matchAll(IMAGE_FIELD_PATTERN)];
+  if (matches.length === 0) {
+    throw new Error("Expected wrangler.toml source to contain an image entry");
+  }
+
+  if (matches.length > 1) {
+    throw new Error("Expected wrangler.toml source to contain exactly one image entry");
+  }
+
+  return source.replace(IMAGE_FIELD_PATTERN, `$1${JSON.stringify(imageRef)}$3`);
+}
+
+function findRegistryImageRef(log, options) {
+  const matches = [...new Set(log.match(REGISTRY_IMAGE_REF_SCAN_PATTERN) || [])];
+  const matchedRef = matches.find((candidate) => {
+    try {
+      validateRegistryImageRef(candidate, options);
+      return true;
+    } catch {
+      return false;
+    }
+  });
+
+  return matchedRef || "";
+}
+
+function envOptions() {
+  return {
+    accountId: process.env.CLOUDFLARE_ACCOUNT_ID,
+    prNumber: process.env.PR_NUMBER,
+    headSha: process.env.HEAD_SHA,
+  };
+}
+
+function runCli() {
+  const command = process.argv[2];
+
+  if (command === "render") {
+    const sourcePath = process.argv[3];
+    const destinationPath = process.argv[4];
+    const imageRef = process.env.PREVIEW_IMAGE_REF;
+
+    if (!sourcePath || !destinationPath) {
+      throw new Error("Usage: render_preview_config.cjs render <source> <destination>");
+    }
+
+    const rendered = renderPreviewConfig(fs.readFileSync(sourcePath, "utf8"), imageRef, envOptions());
+    fs.writeFileSync(destinationPath, rendered);
+    return;
+  }
+
+  if (command === "find") {
+    const logPath = process.argv[3];
+    if (!logPath) {
+      throw new Error("Usage: render_preview_config.cjs find <wrangler-log>");
+    }
+
+    process.stdout.write(findRegistryImageRef(fs.readFileSync(logPath, "utf8"), envOptions()));
+    return;
+  }
+
+  throw new Error(`Unknown command ${command || ""}`);
+}
+
+if (require.main === module) {
+  runCli();
+}
+
+module.exports = {
+  findRegistryImageRef,
+  renderPreviewConfig,
+  validateRegistryImageRef,
+};
diff --git a/workers/preview/deploy/resolve_preview_request.cjs b/workers/preview/deploy/resolve_preview_request.cjs
index 7aec276c1..596a1e3c0 100644
--- a/workers/preview/deploy/resolve_preview_request.cjs
+++ b/workers/preview/deploy/resolve_preview_request.cjs
@@ -32,6 +32,10 @@ function uniqueNumbers(candidates) {
   return [...new Set(candidates.map((candidate) => candidate.parsed.prNumber))];
 }
 
+function uniquePullRequestNumbers(pullRequests) {
+  return [...new Set(pullRequests.map((pullRequest) => pullRequest.number))];
+}
+
 function associatedPullRequestsForHead(associatedPullRequests, context, headSha) {
   const baseRepo = repoFullName(context);
 
@@ -43,15 +47,65 @@ function associatedPullRequestsForHead(associatedPullRequests, context, headSha)
 }
 
 function selectPullRequestNumber({ runPullRequest, artifacts, associatedPullRequests, context, headSha }) {
-  if (runPullRequest?.number) {
+  const associatedHeadPullRequests = associatedPullRequestsForHead(associatedPullRequests, context, headSha);
+  const associatedPullRequestNumbers = uniquePullRequestNumbers(associatedHeadPullRequests);
+  const artifactPullRequestNumbers = uniqueNumbers(artifactCandidates(artifacts, headSha));
+  const workflowRunPullRequestNumber = runPullRequest?.number ?? null;
+
+  if (artifactPullRequestNumbers.length > 1) {
     return {
-      prNumber: runPullRequest.number,
-      source: "workflow_run",
+      error: `Workflow run ${headSha} published preview artifacts for multiple pull requests`,
     };
   }
 
-  const associatedHeadPullRequests = associatedPullRequestsForHead(associatedPullRequests, context, headSha);
-  const artifactPullRequestNumbers = uniqueNumbers(artifactCandidates(artifacts, headSha));
+  if (artifactPullRequestNumbers.length === 1) {
+    const artifactPullRequestNumber = artifactPullRequestNumbers[0];
+
+    if (workflowRunPullRequestNumber && workflowRunPullRequestNumber !== artifactPullRequestNumber) {
+      return {
+        error: `Preview artifact PR ${artifactPullRequestNumber} conflicts with workflow_run PR ${workflowRunPullRequestNumber}`,
+      };
+    }
+
+    if (
+      associatedPullRequestNumbers.length > 0 &&
+      !associatedPullRequestNumbers.includes(artifactPullRequestNumber)
+    ) {
+      return {
+        error: `Preview artifact PR ${artifactPullRequestNumber} conflicts with commit-associated PRs ${associatedPullRequestNumbers.join(", ")}`,
+      };
+    }
+
+    const corroboratingSources = [];
+    if (workflowRunPullRequestNumber === artifactPullRequestNumber) corroboratingSources.push("workflow_run");
+    if (associatedPullRequestNumbers.includes(artifactPullRequestNumber)) {
+      corroboratingSources.push("commit_association");
+    }
+
+    return {
+      prNumber: artifactPullRequestNumber,
+      source:
+        corroboratingSources.length > 0
+          ? `artifact_name+${corroboratingSources.join("+")}`
+          : "artifact_name",
+    };
+  }
+
+  if (workflowRunPullRequestNumber) {
+    if (
+      associatedPullRequestNumbers.length > 0 &&
+      !associatedPullRequestNumbers.includes(workflowRunPullRequestNumber)
+    ) {
+      return {
+        error: `workflow_run PR ${workflowRunPullRequestNumber} conflicts with commit-associated PRs ${associatedPullRequestNumbers.join(", ")}`,
+      };
+    }
+
+    return {
+      prNumber: workflowRunPullRequestNumber,
+      source: "workflow_run",
+    };
+  }
 
   if (associatedHeadPullRequests.length === 1) {
     return {
@@ -61,34 +115,11 @@ function selectPullRequestNumber({ runPullRequest, artifacts, associatedPullRequ
   }
 
   if (associatedHeadPullRequests.length > 1) {
-    const associatedNumbers = new Set(associatedHeadPullRequests.map((pullRequest) => pullRequest.number));
-    const artifactMatches = artifactPullRequestNumbers.filter((number) => associatedNumbers.has(number));
-
-    if (artifactMatches.length === 1) {
-      return {
-        prNumber: artifactMatches[0],
-        source: "artifact_and_commit_association",
-      };
-    }
-
     return {
       error: `Workflow run head SHA ${headSha} is associated with multiple open pull requests and no single preview artifact matched`,
     };
   }
 
-  if (artifactPullRequestNumbers.length === 1) {
-    return {
-      prNumber: artifactPullRequestNumbers[0],
-      source: "artifact_name",
-    };
-  }
-
-  if (artifactPullRequestNumbers.length > 1) {
-    return {
-      error: `Workflow run ${headSha} published preview artifacts for multiple pull requests`,
-    };
-  }
-
   return {
     prNumber: null,
     source: "none",
@@ -186,6 +217,7 @@ async function resolvePreviewRequest({ github, context, core }) {
   core.setOutput("head_sha", headSha);
   core.setOutput("is_fork", String(isFork));
   core.setOutput("pr_number", String(prNumber));
+  core.setOutput("resolution_source", selected.source);
   core.setOutput("should_deploy", "true");
 }
 
diff --git a/workers/preview/package-lock.json b/workers/preview/package-lock.json
index 2cfb46528..ffa57e247 100644
--- a/workers/preview/package-lock.json
+++ b/workers/preview/package-lock.json
@@ -11,7 +11,7 @@
         "@cloudflare/containers": "^0.3.3",
         "@cloudflare/workers-types": "^4.20250124.0",
         "typescript": "^5.0.0",
-        "wrangler": "^4.0.0"
+        "wrangler": "^4.103.0"
       }
     },
     "node_modules/@cloudflare/containers": {
@@ -48,9 +48,9 @@
       }
     },
     "node_modules/@cloudflare/workerd-darwin-64": {
-      "version": "1.20260507.1",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20260507.1.tgz",
-      "integrity": "sha512-S85aMwcaPJUjKWDiG6iMMnioKWtPLACa6m0j/EhHR1GYfVpnxb974cBc6d25L+sf7jHWHJI2u5hGp0UTJ7MtXQ==",
+      "version": "1.20260617.1",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20260617.1.tgz",
+      "integrity": "sha512-jWwmgEVVWbsHNrLSNXzwjJaH90VzRxq1cWkQFUidxyeUPnMxemeNE8I9qFAfrpzGgE11e9sKDcE3ettJW08swQ==",
       "cpu": [
         "x64"
       ],
@@ -65,9 +65,9 @@
       }
     },
     "node_modules/@cloudflare/workerd-darwin-arm64": {
-      "version": "1.20260507.1",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20260507.1.tgz",
-      "integrity": "sha512-GMEBu8Zp9Q97HLnf7bWJN4KjWpN5MxpeqdvHjBGWNl8UYprJI0k+Jkp89+Wh5S8vIon+HoVbDfOzPa7VwgL6Eg==",
+      "version": "1.20260617.1",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20260617.1.tgz",
+      "integrity": "sha512-LHH7b565g9znfCUOkwbec6FG2rmRbsgCy6aJiU9KN662mNheWl5sw/iKleiFSiljPKQQP3HkjnC/NSkdgi/aSA==",
       "cpu": [
         "arm64"
       ],
@@ -82,9 +82,9 @@
       }
     },
     "node_modules/@cloudflare/workerd-linux-64": {
-      "version": "1.20260507.1",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20260507.1.tgz",
-      "integrity": "sha512-QlrKEBdgA3uVc0Ok0Q3+0/CW0CTjgj5ySir1i1YY5FXVv0X6GpwtnB5umjunjF2MFprss+L+iFGZzxcSvMC1nA==",
+      "version": "1.20260617.1",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20260617.1.tgz",
+      "integrity": "sha512-FMnaAKXe4Cfd8TQurCVd9fs2XQVBFRCsP+Id/SRdUv89MlwYu9zXfoyx6BxM+brPTIUK38SHbo8iaxiwzLi9JQ==",
       "cpu": [
         "x64"
       ],
@@ -99,9 +99,9 @@
       }
     },
     "node_modules/@cloudflare/workerd-linux-arm64": {
-      "version": "1.20260507.1",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20260507.1.tgz",
-      "integrity": "sha512-eGbbupEtK2nh9V9Dhcx3vv3GTKeXqSVNgAEYVCCN0NGS9tl9HbMoHRX/4JL181FKXROMigWBCQVL//qPhsAzBQ==",
+      "version": "1.20260617.1",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20260617.1.tgz",
+      "integrity": "sha512-MRoifFYcqbxxIIQy7PqO5tFY/qPFSnjXzakWl0sO93l+HLyG35jRAgOi6jfqa4kBxc7gKKtH861DcewjxUfkjA==",
       "cpu": [
         "arm64"
       ],
@@ -116,9 +116,9 @@
       }
     },
     "node_modules/@cloudflare/workerd-windows-64": {
-      "version": "1.20260507.1",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20260507.1.tgz",
-      "integrity": "sha512-dmClJ/E0BAcuDetQIZFqbeAXejWrG5pysGRMQ6T83Y0IW/7IAamY2zFEkAJ10I5xwZsdHuYsZtzlOxpEXpJs7A==",
+      "version": "1.20260617.1",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20260617.1.tgz",
+      "integrity": "sha512-rgBV9wQrv0OSKgCTTbhFUFY3sLGNANZ88aqaLvtmEn2gmbFVb1J4PDGochVUdB7NSEp4D/ghHva6/8SZmbONpw==",
       "cpu": [
         "x64"
       ],
@@ -133,9 +133,9 @@
       }
     },
     "node_modules/@cloudflare/workers-types": {
-      "version": "4.20260511.1",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20260511.1.tgz",
-      "integrity": "sha512-FA+si7cOq9i/gtCHhIc0XJL0l1F/ApF+m00752Aj7WZFJrj3ZulT2T8/+rT3BabMT0QEnqFEGIqCgrmqhgEfMg==",
+      "version": "4.20260619.1",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20260619.1.tgz",
+      "integrity": "sha512-bprsNzG0DapQPFwU2AvQlQ6FUO7Y4bKWaPBzLNI7nBSqlHsK0P62xx2NaNT6i/htzAgQspKZm1D32y0RxofrRQ==",
       "dev": true,
       "license": "MIT OR Apache-2.0"
     },
@@ -153,9 +153,9 @@
       }
     },
     "node_modules/@emnapi/runtime": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz",
-      "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz",
+      "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -164,9 +164,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz",
-      "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
+      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
       "cpu": [
         "ppc64"
       ],
@@ -181,9 +181,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz",
-      "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
+      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
       "cpu": [
         "arm"
       ],
@@ -198,9 +198,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz",
-      "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
+      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
       "cpu": [
         "arm64"
       ],
@@ -215,9 +215,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz",
-      "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
+      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
       "cpu": [
         "x64"
       ],
@@ -232,9 +232,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz",
-      "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
+      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
       "cpu": [
         "arm64"
       ],
@@ -249,9 +249,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz",
-      "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
+      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
       ],
@@ -266,9 +266,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz",
-      "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
       "cpu": [
         "arm64"
       ],
@@ -283,9 +283,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz",
-      "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
       "cpu": [
         "x64"
       ],
@@ -300,9 +300,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz",
-      "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
+      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
       "cpu": [
         "arm"
       ],
@@ -317,9 +317,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz",
-      "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
+      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
       "cpu": [
         "arm64"
       ],
@@ -334,9 +334,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz",
-      "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
+      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
       "cpu": [
         "ia32"
       ],
@@ -351,9 +351,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz",
-      "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
+      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
       "cpu": [
         "loong64"
       ],
@@ -368,9 +368,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz",
-      "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
+      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
       "cpu": [
         "mips64el"
       ],
@@ -385,9 +385,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz",
-      "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
+      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
       "cpu": [
         "ppc64"
       ],
@@ -402,9 +402,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz",
-      "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
+      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
       "cpu": [
         "riscv64"
       ],
@@ -419,9 +419,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz",
-      "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
+      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
       "cpu": [
         "s390x"
       ],
@@ -436,9 +436,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz",
-      "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
+      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
       "cpu": [
         "x64"
       ],
@@ -453,9 +453,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz",
-      "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
       "cpu": [
         "arm64"
       ],
@@ -470,9 +470,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz",
-      "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
       "cpu": [
         "x64"
       ],
@@ -487,9 +487,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz",
-      "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
       "cpu": [
         "arm64"
       ],
@@ -504,9 +504,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz",
-      "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
       "cpu": [
         "x64"
       ],
@@ -521,9 +521,9 @@
       }
     },
     "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz",
-      "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
+      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
       "cpu": [
         "arm64"
       ],
@@ -538,9 +538,9 @@
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz",
-      "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
+      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
       "cpu": [
         "x64"
       ],
@@ -555,9 +555,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz",
-      "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
+      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
       "cpu": [
         "arm64"
       ],
@@ -572,9 +572,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz",
-      "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
+      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
       "cpu": [
         "ia32"
       ],
@@ -589,9 +589,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz",
-      "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
+      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
       "cpu": [
         "x64"
       ],
@@ -1214,9 +1214,9 @@
       }
     },
     "node_modules/@speed-highlight/core": {
-      "version": "1.2.15",
-      "resolved": "https://registry.npmjs.org/@speed-highlight/core/-/core-1.2.15.tgz",
-      "integrity": "sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw==",
+      "version": "1.2.17",
+      "resolved": "https://registry.npmjs.org/@speed-highlight/core/-/core-1.2.17.tgz",
+      "integrity": "sha512-Z92FwKpCtfaW1V0jTU/fh3QzYEZN8wDwrzRIBoADCJfn4mJCNcJN/XegifX7BDrQ8/h9Xh/JnbyMchL0FqXrkg==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -1262,9 +1262,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.27.3",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz",
-      "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==",
+      "version": "0.28.1",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
+      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1275,32 +1275,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.27.3",
-        "@esbuild/android-arm": "0.27.3",
-        "@esbuild/android-arm64": "0.27.3",
-        "@esbuild/android-x64": "0.27.3",
-        "@esbuild/darwin-arm64": "0.27.3",
-        "@esbuild/darwin-x64": "0.27.3",
-        "@esbuild/freebsd-arm64": "0.27.3",
-        "@esbuild/freebsd-x64": "0.27.3",
-        "@esbuild/linux-arm": "0.27.3",
-        "@esbuild/linux-arm64": "0.27.3",
-        "@esbuild/linux-ia32": "0.27.3",
-        "@esbuild/linux-loong64": "0.27.3",
-        "@esbuild/linux-mips64el": "0.27.3",
-        "@esbuild/linux-ppc64": "0.27.3",
-        "@esbuild/linux-riscv64": "0.27.3",
-        "@esbuild/linux-s390x": "0.27.3",
-        "@esbuild/linux-x64": "0.27.3",
-        "@esbuild/netbsd-arm64": "0.27.3",
-        "@esbuild/netbsd-x64": "0.27.3",
-        "@esbuild/openbsd-arm64": "0.27.3",
-        "@esbuild/openbsd-x64": "0.27.3",
-        "@esbuild/openharmony-arm64": "0.27.3",
-        "@esbuild/sunos-x64": "0.27.3",
-        "@esbuild/win32-arm64": "0.27.3",
-        "@esbuild/win32-ia32": "0.27.3",
-        "@esbuild/win32-x64": "0.27.3"
+        "@esbuild/aix-ppc64": "0.28.1",
+        "@esbuild/android-arm": "0.28.1",
+        "@esbuild/android-arm64": "0.28.1",
+        "@esbuild/android-x64": "0.28.1",
+        "@esbuild/darwin-arm64": "0.28.1",
+        "@esbuild/darwin-x64": "0.28.1",
+        "@esbuild/freebsd-arm64": "0.28.1",
+        "@esbuild/freebsd-x64": "0.28.1",
+        "@esbuild/linux-arm": "0.28.1",
+        "@esbuild/linux-arm64": "0.28.1",
+        "@esbuild/linux-ia32": "0.28.1",
+        "@esbuild/linux-loong64": "0.28.1",
+        "@esbuild/linux-mips64el": "0.28.1",
+        "@esbuild/linux-ppc64": "0.28.1",
+        "@esbuild/linux-riscv64": "0.28.1",
+        "@esbuild/linux-s390x": "0.28.1",
+        "@esbuild/linux-x64": "0.28.1",
+        "@esbuild/netbsd-arm64": "0.28.1",
+        "@esbuild/netbsd-x64": "0.28.1",
+        "@esbuild/openbsd-arm64": "0.28.1",
+        "@esbuild/openbsd-x64": "0.28.1",
+        "@esbuild/openharmony-arm64": "0.28.1",
+        "@esbuild/sunos-x64": "0.28.1",
+        "@esbuild/win32-arm64": "0.28.1",
+        "@esbuild/win32-ia32": "0.28.1",
+        "@esbuild/win32-x64": "0.28.1"
       }
     },
     "node_modules/fsevents": {
@@ -1329,17 +1329,17 @@
       }
     },
     "node_modules/miniflare": {
-      "version": "4.20260507.1",
-      "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20260507.1.tgz",
-      "integrity": "sha512-PSXBiLExTdZ4UGO/raKCHQauUpYL7F880ZRB7j0+78Rv8h7TsdN2E/iEDK9sK2Y+SPQ5wJSeAa+rDeVKoZZoEw==",
+      "version": "4.20260617.1",
+      "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20260617.1.tgz",
+      "integrity": "sha512-Go3/gzStm99QHptsSgU+q1S+xDfLoRgwjJNY80kaTVi0ENhTyqKq+sc4xZiWBSbM7uUcJwmzm8+QFKtcYLJ9nw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "0.8.1",
-        "sharp": "^0.34.5",
-        "undici": "7.24.8",
-        "workerd": "1.20260507.1",
-        "ws": "8.18.0",
+        "sharp": "0.34.5",
+        "undici": "7.28.0",
+        "workerd": "1.20260617.1",
+        "ws": "8.21.0",
         "youch": "4.1.0-beta.10"
       },
       "bin": {
@@ -1364,9 +1364,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.0.tgz",
-      "integrity": "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz",
+      "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -1457,9 +1457,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.8.tgz",
-      "integrity": "sha512-6KQ/+QxK49Z/p3HO6E5ZCZWNnCasyZLa5ExaVYyvPxUwKtbCPMKELJOqh7EqOle0t9cH/7d2TaaTRRa6Nhs4YQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz",
+      "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1477,9 +1477,9 @@
       }
     },
     "node_modules/workerd": {
-      "version": "1.20260507.1",
-      "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20260507.1.tgz",
-      "integrity": "sha512-z7JhsFSe6+X1b5fUHaVpo15VM1IRMJiLofEkq8iKdCo+Veqc+FUg5lIsuz8NwePxuSKrXtO4ZQpGkQLbPVXFhg==",
+      "version": "1.20260617.1",
+      "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20260617.1.tgz",
+      "integrity": "sha512-Re5pl6pdowt3ZmWUzGlOuB7jbRIIPetgKalmo4cYmucQnVhpo7/3e4MfpekbhLi2EhZZz5EY9NWRu8zFzuEZew==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
@@ -1490,30 +1490,31 @@
         "node": ">=16"
       },
       "optionalDependencies": {
-        "@cloudflare/workerd-darwin-64": "1.20260507.1",
-        "@cloudflare/workerd-darwin-arm64": "1.20260507.1",
-        "@cloudflare/workerd-linux-64": "1.20260507.1",
-        "@cloudflare/workerd-linux-arm64": "1.20260507.1",
-        "@cloudflare/workerd-windows-64": "1.20260507.1"
+        "@cloudflare/workerd-darwin-64": "1.20260617.1",
+        "@cloudflare/workerd-darwin-arm64": "1.20260617.1",
+        "@cloudflare/workerd-linux-64": "1.20260617.1",
+        "@cloudflare/workerd-linux-arm64": "1.20260617.1",
+        "@cloudflare/workerd-windows-64": "1.20260617.1"
       }
     },
     "node_modules/wrangler": {
-      "version": "4.90.0",
-      "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.90.0.tgz",
-      "integrity": "sha512-bmNIykl59TfCUn5xQgU7IWylSsPx3LQaPLMSAq2VQHt89CBrcj9qXQ0eYfjBCWA5XTBVgten391evt7xxtXwcA==",
+      "version": "4.103.0",
+      "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.103.0.tgz",
+      "integrity": "sha512-3Lv1P5t2xcSEkSTKtG+Lz+3JFryuU7YPLkaCUj7gNe+CJsjZJLtUwqsh1x595QBxkIbCE0GAvDx2DCJUU4+oqw==",
       "dev": true,
       "license": "MIT OR Apache-2.0",
       "dependencies": {
         "@cloudflare/kv-asset-handler": "0.5.0",
         "@cloudflare/unenv-preset": "2.16.1",
         "blake3-wasm": "2.1.5",
-        "esbuild": "0.27.3",
-        "miniflare": "4.20260507.1",
+        "esbuild": "0.28.1",
+        "miniflare": "4.20260617.1",
         "path-to-regexp": "6.3.0",
         "unenv": "2.0.0-rc.24",
-        "workerd": "1.20260507.1"
+        "workerd": "1.20260617.1"
       },
       "bin": {
+        "cf-wrangler": "bin/cf-wrangler.js",
         "wrangler": "bin/wrangler.js",
         "wrangler2": "bin/wrangler.js"
       },
@@ -1521,10 +1522,10 @@
         "node": ">=22.0.0"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "2.3.3"
       },
       "peerDependencies": {
-        "@cloudflare/workers-types": "^4.20260507.1"
+        "@cloudflare/workers-types": "^4.20260617.1"
       },
       "peerDependenciesMeta": {
         "@cloudflare/workers-types": {
@@ -1533,9 +1534,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz",
+      "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/workers/preview/package.json b/workers/preview/package.json
index 5823dd4ba..8ade8d8c9 100644
--- a/workers/preview/package.json
+++ b/workers/preview/package.json
@@ -10,6 +10,6 @@
     "@cloudflare/containers": "^0.3.3",
     "@cloudflare/workers-types": "^4.20250124.0",
     "typescript": "^5.0.0",
-    "wrangler": "^4.0.0"
+    "wrangler": "^4.103.0"
   }
 }
diff --git a/workers/preview/src/index.ts b/workers/preview/src/index.ts
index addd30bc4..e3c901479 100644
--- a/workers/preview/src/index.ts
+++ b/workers/preview/src/index.ts
@@ -155,6 +155,23 @@ export class RailsContainer extends Container {
     return history.filter((record) => kept.has(record));
   }
 
+  private isAttemptStart(record: DiagnosticRecord): boolean {
+    return (
+      record.event === "start" ||
+      (record.event === "entrypoint" && typeof record.payload?.stage === "string" && record.payload.stage === "boot")
+    );
+  }
+
+  private diagnosticsForLatestAttempt(allDiagnostics: DiagnosticRecord[]): DiagnosticRecord[] {
+    for (let index = allDiagnostics.length - 1; index >= 0; index -= 1) {
+      if (this.isAttemptStart(allDiagnostics[index])) {
+        return allDiagnostics.slice(index);
+      }
+    }
+
+    return allDiagnostics;
+  }
+
   private async getDiagnostics(): Promise<{
     state: unknown;
     containerRunning: boolean;
@@ -196,11 +213,12 @@ export class RailsContainer extends Container {
     return Math.round(((end - start) / 1000) * 100) / 100;
   }
 
-  private buildPreviewTimings(allDiagnostics: DiagnosticRecord[], previewReady: boolean): PreviewTimings {
-    const entrypointDiagnostics = allDiagnostics.filter(
+  private buildPreviewTimings(attemptDiagnostics: DiagnosticRecord[], previewReady: boolean): PreviewTimings {
+    const entrypointDiagnostics = attemptDiagnostics.filter(
       (item) => item.event === "entrypoint" && typeof item.payload?.stage === "string"
     );
-    const firstEventAt = (event: string) => this.validTimestamp(allDiagnostics.find((item) => item.event === event)?.at);
+    const firstEventAt = (event: string) =>
+      this.validTimestamp(attemptDiagnostics.find((item) => item.event === event)?.at);
     const firstStageAt = (...stages: string[]) =>
       this.validTimestamp(entrypointDiagnostics.find((item) => stages.includes(item.payload?.stage ?? ""))?.at);
 
@@ -240,7 +258,8 @@ export class RailsContainer extends Container {
     diagnosticsHistory: DiagnosticRecord[];
   }, options?: { probe?: boolean }): Promise<PreviewStatusPayload> {
     const allDiagnostics = [...base.diagnosticsHistory, ...(base.diagnostics ? [base.diagnostics] : [])];
-    const entrypointDiagnostics = allDiagnostics.filter(
+    const attemptDiagnostics = this.diagnosticsForLatestAttempt(allDiagnostics);
+    const entrypointDiagnostics = attemptDiagnostics.filter(
       (item) => item.event === "entrypoint" && typeof item.payload?.stage === "string"
     );
     const latestEntrypoint = entrypointDiagnostics.at(-1) ?? null;
@@ -258,7 +277,7 @@ export class RailsContainer extends Container {
     const previewFailed =
       entrypointDiagnostics.some((item) => FAILED_STAGES.has(item.payload?.stage ?? "")) ||
       base.diagnostics?.event === "error";
-    const timings = this.buildPreviewTimings(allDiagnostics, previewReady);
+    const timings = this.buildPreviewTimings(attemptDiagnostics, previewReady);
 
     let phase: PreviewProgress["phase"] = "cold";
     if (previewFailed) {
diff --git a/workers/preview/wrangler.toml b/workers/preview/wrangler.toml
index 17e95b899..9845919d2 100644
--- a/workers/preview/wrangler.toml
+++ b/workers/preview/wrangler.toml
@@ -17,7 +17,14 @@ enabled = true
 [[containers]]
 class_name = "RailsContainer"
 image = "../../Dockerfile.preview"
-instance_type = "basic"
+# standard-1 (1/2 vCPU, 4 GiB RAM, 8 GB disk), not basic (1/4 vCPU, 1 GiB,
+# 4 GB): this single container runs postgres + redis + puma AND generates the
+# full demo dataset (Demo::Generator: ~12 years of transactions). That
+# generation peaks just over 1 GiB, so basic OOM-kills it (exit 137) mid-boot
+# and the preview never reaches demo-data-ready. Verified on a real Cloudflare
+# standard-1 deploy: rails ready ~46s, demo data ~149s, previewReady ~195s,
+# peak well under 4 GiB, no OOM.
+instance_type = "standard-1"
 max_instances = 1
 
 # Durable Object binding for the container