merge: resolve conflicts with leojay-net/main for PR #1316

Resolution strategy:
- UD (modify/delete): accepted upstream deletions for files moved to Dechat/ by leojay-net/main
- AA (add/add): kept theirs for useIdempotentAction.ts/.test.ts (complete implementation)
- AU: staged BankDetailsModal.memory-leak.test.tsx in its Dechat/ path
- UU Dechat/ files: took leojay-net/main (theirs) — docs-and-core did not modify
  these implementation files; conflicts were residual from prior merges
- Covered: AuditTable, CCIPBridgeModal, ChatMessages, Message, StellarFiatModal,
  ToastProvider, UserPreferencesContext, useFeatureFlag, useSplitView,
  useTransactionFilters, cryptoPriceService, rateLimit.test, stellar-contracts

Author: Dev-journals

.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+{
+  "name": "Stellar Dex Chat",
+  "image": "mcr.microsoft.com/devcontainers/rust:1-bullseye",
+  "features": {
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "20"
+    }
+  },
+  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rust-lang.rust-analyzer",
+        "tamasfe.even-better-toml",
+        "esbenp.prettier-vscode",
+        "dbaeumer.vscode-eslint",
+        "ms-playwright.playwright"
+      ],
+      "settings": {
+        "rust-analyzer.cargo.target": "wasm32-unknown-unknown",
+        "editor.formatOnSave": true,
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "[rust]": {
+          "editor.defaultFormatter": "rust-lang.rust-analyzer"
+        }
+      }
+    }
+  },
+  "remoteEnv": {
+    "SOROBAN_NETWORK": "testnet",
+    "SOROBAN_RPC_URL": "https://soroban-testnet.stellar.org"
+  }
+}

.devcontainer/post-create.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "==> Adding wasm32 target for Soroban contract builds"
+rustup target add wasm32-unknown-unknown
+
+echo "==> Installing stellar-cli"
+cargo install --locked stellar-cli --features opt
+
+echo "==> Installing pnpm"
+npm install -g pnpm
+
+echo "==> Installing frontend dependencies"
+cd Dechat/dex_with_fiat_frontend
+pnpm install
+pnpm test:e2e:install
+cd ../..
+
+echo "==> Dev environment ready. Run 'stellar --version' to verify."

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/Dechat/stellar-contracts"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "npm"
+    directory: "/Dechat/dex_with_fiat_frontend"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/auto-merge.yml

@@ -1,5 +1,6 @@
 name: Auto-Merge PRs
 
+<<<<<<< HEAD
 # Fires when a PR is opened/updated (to enable native auto-merge) and when a
 # check suite completes (to directly merge if every check went green and the
 # branch has no conflicts).
@@ -125,5 +126,177 @@ jobs:
                 core.info(`✅  Auto-merged PR #${pr.number}: ${pull.title}`);
               } catch (err) {
                 core.error(`Failed to merge PR #${pr.number}: ${err.message}`);
+=======
+# Merges open PRs once every check that ran for their head commit has gone green.
+#
+# Why `workflow_run` and not `check_suite`:
+#   GitHub does not start a new workflow run from events generated by the
+#   built-in GITHUB_TOKEN, so the `check_suite: completed` suites produced by
+#   Actions never triggered this workflow (0 runs in ~40 attempts). `workflow_run`
+#   is the supported way to react to another workflow finishing.
+#
+# Why not GitHub's native auto-merge (`gh pr merge --auto`):
+#   `main` has no branch protection and therefore no *required* status checks.
+#   Native auto-merge only waits for required checks, so with none configured it
+#   merges as soon as the PR is mergeable — i.e. before CI has finished. This
+#   workflow evaluates the checks itself instead.
+#
+# Security: jobs here run in the base-repo context with a writable token and
+# deliberately never check out or execute PR-authored code — they only call the
+# REST API.
+
+on:
+  workflow_run:
+    workflows:
+      - "Frontend CI"
+      - "Frontend Build Check"
+      - "Smart Contract CI"
+      - "Contract Tests"
+    types: [completed]
+  # Safety net: re-sweep periodically so a PR whose triggering event was missed
+  # (or that went green while another PR was merging) still lands.
+  schedule:
+    - cron: "*/30 * * * *"
+  workflow_dispatch:
+
+permissions:
+  contents: write # needed to merge
+  pull-requests: write # needed to comment / update PRs
+  checks: read
+  statuses: read
+
+concurrency:
+  group: auto-merge
+  cancel-in-progress: false
+
+jobs:
+  merge-green-prs:
+    name: Merge PRs with all checks passing
+    runs-on: ubuntu-latest
+    steps:
+      - name: Evaluate and merge
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const { owner, repo } = context.repo;
+            const TERMINAL_OK = ['success', 'skipped', 'neutral'];
+
+            // ── Work out which PRs to consider ────────────────────────────
+            // `workflow_run.pull_requests` is always empty for PRs from forks,
+            // so resolve candidates by matching head SHA against open PRs.
+            const openPrs = await github.paginate(github.rest.pulls.list, {
+              owner, repo, state: 'open', per_page: 100,
+            });
+
+            let candidates = openPrs;
+            if (context.eventName === 'workflow_run') {
+              const run = context.payload.workflow_run;
+              if (run.conclusion !== 'success') {
+                core.info(`Upstream run "${run.name}" concluded "${run.conclusion}" — nothing to do.`);
+                return;
+              }
+              candidates = openPrs.filter(pr => pr.head.sha === run.head_sha);
+              if (candidates.length === 0) {
+                core.info(`No open PR matches head SHA ${run.head_sha}.`);
+                return;
+              }
+            }
+
+            core.info(`Evaluating ${candidates.length} PR(s).`);
+
+            for (const summary of candidates) {
+              const number = summary.number;
+
+              // Re-fetch: the list payload omits `mergeable`/`mergeable_state`.
+              let { data: pr } = await github.rest.pulls.get({
+                owner, repo, pull_number: number,
+              });
+
+              if (pr.draft)            { core.info(`#${number}: draft — skipping.`); continue; }
+              if (pr.state !== 'open') { core.info(`#${number}: not open — skipping.`); continue; }
+
+              // ── Checks must all be finished and green ───────────────────
+              const sha = pr.head.sha;
+              const { data: { check_runs } } = await github.rest.checks.listForRef({
+                owner, repo, ref: sha, per_page: 100,
+              });
+
+              // Ignore this workflow's own check so it never waits on itself.
+              const relevant = check_runs.filter(r => r.name !== 'Merge PRs with all checks passing');
+
+              if (relevant.length === 0) {
+                core.info(`#${number}: no checks reported for ${sha} — refusing to merge unchecked.`);
+                continue;
+              }
+
+              const pending = relevant.filter(r => r.status !== 'completed');
+              if (pending.length > 0) {
+                core.info(`#${number}: still running (${pending.map(r => r.name).join(', ')}) — waiting.`);
+                continue;
+              }
+
+              const failing = relevant.filter(r => !TERMINAL_OK.includes(r.conclusion));
+              if (failing.length > 0) {
+                core.info(`#${number}: failing checks (${failing.map(r => r.name).join(', ')}) — skipping.`);
+                continue;
+              }
+
+              // Legacy commit statuses (non-Actions integrations) count too.
+              const { data: combined } = await github.rest.repos.getCombinedStatusForRef({
+                owner, repo, ref: sha,
+              });
+              if (combined.total_count > 0 && combined.state !== 'success') {
+                core.info(`#${number}: commit status is "${combined.state}" — skipping.`);
+                continue;
+              }
+
+              // ── Mergeability (computed asynchronously by GitHub) ────────
+              for (let attempt = 0; pr.mergeable === null && attempt < 3; attempt++) {
+                core.info(`#${number}: mergeability not computed yet, retrying in 5s…`);
+                await new Promise(r => setTimeout(r, 5000));
+                ({ data: pr } = await github.rest.pulls.get({
+                  owner, repo, pull_number: number,
+                }));
+              }
+
+              if (pr.mergeable === false) {
+                core.info(`#${number}: merge conflicts (${pr.mergeable_state}) — skipping.`);
+                continue;
+              }
+              if (pr.mergeable === null) {
+                core.info(`#${number}: mergeability still unknown — will retry next sweep.`);
+                continue;
+              }
+              if (['blocked', 'behind', 'draft'].includes(pr.mergeable_state)) {
+                core.info(`#${number}: mergeable_state="${pr.mergeable_state}" — skipping.`);
+                continue;
+              }
+
+              // ── Merge ──────────────────────────────────────────────────
+              // Drop AI-assistant co-author trailers from the squash message.
+              // Human co-authors are deliberately left intact — stripping those
+              // would erase real contributor attribution.
+              const body = (pr.body ?? '')
+                .split('\n')
+                .filter(line => !/^\s*co-authored-by:.*(claude|anthropic\.com)/i.test(line))
+                .join('\n')
+                .trim();
+
+              try {
+                await github.rest.pulls.merge({
+                  owner, repo,
+                  pull_number:  number,
+                  merge_method: 'squash',
+                  commit_title: `${pr.title} (#${number})`,
+                  commit_message: body,
+                  sha,
+                });
+                core.notice(`Auto-merged #${number}: ${pr.title}`);
+              } catch (err) {
+                // 405 = not mergeable right now, 409 = head moved. Both are
+                // transient; the next sweep retries.
+                core.warning(`#${number}: merge failed (${err.status}): ${err.message}`);
+>>>>>>> emwulrd/main
               }
             }

.github/workflows/changelog.yml

@@ -16,6 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repository
+<<<<<<< HEAD
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -28,6 +29,39 @@ jobs:
 
       - name: Commit and push CHANGELOG.md
         uses: stefanzweifel/git-auto-commit-action@v5
+=======
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+        with:
+          fetch-depth: 0
+
+      # Run the binary directly rather than orhun/git-cliff-action. The action
+      # marshals the whole changelog back through $GITHUB_OUTPUT with a heredoc
+      # and fails on this repo's output ("Invalid value. Matching delimiter not
+      # found 'EOF'"). Nothing here consumes that output — we only need
+      # CHANGELOG.md on disk.
+      - name: Install git-cliff
+        env:
+          GIT_CLIFF_VERSION: "2.13.1"
+        run: |
+          set -euo pipefail
+          TARBALL="git-cliff-${GIT_CLIFF_VERSION}-x86_64-unknown-linux-gnu.tar.gz"
+          curl -sSfL --retry 3 \
+            "https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/${TARBALL}" \
+            -o "$TARBALL"
+          curl -sSfL --retry 3 \
+            "https://github.com/orhun/git-cliff/releases/download/v${GIT_CLIFF_VERSION}/${TARBALL}.sha512" \
+            -o "${TARBALL}.sha512"
+          sha512sum -c "${TARBALL}.sha512"
+          tar -xzf "$TARBALL"
+          sudo install -m755 "git-cliff-${GIT_CLIFF_VERSION}/git-cliff" /usr/local/bin/git-cliff
+          git-cliff --version
+
+      - name: Generate CHANGELOG.md
+        run: git-cliff --config cliff.toml --output CHANGELOG.md
+
+      - name: Commit and push CHANGELOG.md
+        uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5
+>>>>>>> emwulrd/main
         with:
           file_pattern: CHANGELOG.md
           commit_message: "chore(changelog): update changelog [skip ci]"

.github/workflows/contract-tests.yml

@@ -4,29 +4,49 @@ on:
   pull_request:
     branches:
       - main
+    paths:
+      - "Dechat/stellar-contracts/**"
+      - ".github/workflows/contract-tests.yml"
 
 jobs:
   test:
     name: Run cargo test
     runs-on: ubuntu-latest
 
+    defaults:
+      run:
+        working-directory: Dechat/stellar-contracts
+
     steps:
       - name: Checkout repository
+<<<<<<< HEAD
         uses: actions/checkout@v4
 
       - name: Install Rust stable toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
+=======
+        uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4
+
+      - name: Install Rust stable toolchain
+        uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # stable
+        with:
+          toolchain: stable
+>>>>>>> emwulrd/main
           components: clippy
           targets: wasm32-unknown-unknown
 
       - name: Cache Cargo dependencies
+<<<<<<< HEAD
         uses: Swatinem/rust-cache@v2
+=======
+        uses: Swatinem/rust-cache@42dc69e1aa15d09112580998cf2ef0119e2e91ae # v2
+>>>>>>> emwulrd/main
         with:
-          workspaces: stellar-contracts -> target
+          workspaces: Dechat/stellar-contracts -> target
 
       - name: Run clippy (deny warnings)
-        run: cd stellar-contracts && cargo clippy --all-targets --all-features -- -D warnings
+        run: cargo clippy --all-targets --all-features -- -D warnings
 
       - name: Run contract tests
-        run: cd stellar-contracts && cargo test
+        run: cargo test