InstaCash devel update wave — 2026-05-27 status

Summary

Routine periodic devel → customization/instacash sync started 2026-05-27 by andras.lederer across the three InstaCash repos: esign_css, vuer_oss, and vuer_css. All three update branches use the date-only convention: update/customization/instacash-2026-05-27. This note captures per-repo branch state, conflict topology, and outstanding decisions at attempt time — read this before resuming the wave.

Trigger

• Type: routine periodic devel → customization/instacash sync (no specific ticket driver).
• Initiated by: andras.lederer, 2026-05-27.
• Branch naming convention used: update/customization/instacash-2026-05-27 (date-only, no ticket prefix) — applied identically across all three repos.

Per-repo state at attempt time

esign_css

Orphan history — see esign-css-instacash-orphan-history

Standard git merge origin/devel halts on refusing to merge unrelated histories. customization/instacash is a single squashed orphan commit with no common ancestor with devel. Strategic decision required before any update can land. Do not just --allow-unrelated-histories blind.

Item	Value
customization/instacash HEAD	b7cee2f (“1.3.0.10”, 2025-11-20)
devel HEAD	5d5b407
Merge attempt result	Halted: refusing to merge unrelated histories
Common ancestor	None — git merge-base returns empty
Path delta	95 paths (26 M, 14 A devel-only, 55 D devel-deleted but instacash retains)
Branch shape	Single orphan commit (squashed release)

The 55 instacash-retained-but-devel-deleted files include MBH/MKB branding assets InstaCash wants to keep — these are intentional retentions, not stale baggage.

vuer_oss

Item	Value
customization/instacash HEAD	521c44a5d7
devel HEAD	c59ef3ac95
Commits merged in	50
Conflicting paths (UU)	10
Side-state	stash@{0} = “instacash-update-temp-stash-2026-05-27” (single .gitignore line). Pop on the right branch before continuing.

High-risk conflicts (require careful, ticket-aware resolution):

Path	Why it matters
customization/listeners/self-service-v2.js	BREAKING incoming: FKITDEV-7518 changes id-card subtypes interaction; collides with InstaCash newIdFormatAcceptance. Also overlaps with in-flight tickets FKITDEV-8787 (selfservice-v2 abort clear-state) and FKITDEV-8747 (locale-through-RPC, already merged on the working tree’s parent feature branch).
customization/portal/PortalData.js	Portal layer InstaCash extends heavily
customization/portal/PortalData.trans.js	Translation companion to PortalData.js — must move together

Moderate-risk conflicts:

• config/dev.json
• config/docker.json
• server/web/routes/room.endpoint.js
• customization/customization.js

Trivial conflicts:

• package.json, yarn.lock — chokidar version bump
• client/features/videochat/common/Flow/Flow.styl

Notable BREAKING devel changes flowing into this update:

Ticket	Subject	InstaCash impact
FKITDEV-7518	id-card subtypes refactor	self-service-v2 listener interaction with newIdFormatAcceptance
FKITDEV-8607	config.js defaultValue semantics	config layer audit
FKITDEV-8727	MJML v5	email template re-render check
FKITDEV-7665	Attachment storage	storage layer review

vuer_css

Item	Value
customization/instacash HEAD	e3f7a1d6
devel HEAD	546c58ed
Commits merged in	57
Conflicting paths	44
Worktree used	~/coding/facekom/vuer_css-instacash-update (parallel bugfix/FKITDEV-8787 WIP kept untouched in the main checkout)
Server-side merge result	CLEAN — server/web/routes.js, server/web/WebServer.js, package.json, yarn.lock. No Express 5 risk in this repo (contrary to a prior assumption rooted in ASSICASH-71 which is the vuer_css customization/instacash Express-4-on-devel-Express-5 case).

High-risk conflicts:

Path	Why it matters
customization/customizations.js	5 InstaCash routes vs devel placeholder revert. Manual reconciliation of route registration vs upstream simplification.
client/ui/elements/modal/modal.js	a11y modal-stack / inert / scroll-lock — requires true 3-way merge, not pick-a-side
client/ui/elements/modal/modal.twig	Same a11y rework (markup side)
client/ui/elements/modal/modal.styl	Same a11y rework (style side)

Moderate-risk conflicts:

• 10 system-check twigs (WCAG-driven rework)
• 11 page twigs
• Accordion + dropdown + alert pairs (twig + styl)
• RequestCallback
• Kiosk layout
• Appointment

Trivial conflicts:

• 8 stylus files

Required reviewer expertise (don’t merge these blind):

Ticket	Subject
FKITDEV-7674	Bootstrap removal
FKITDEV-7969	High-contrast theme
FKITDEV-8270	WCAG compliance

Side-state to clean up

vuer_oss has an uncommitted stash

stash@{0} titled instacash-update-temp-stash-2026-05-27 contains a single .gitignore line. Pop it on the branch it belongs to (the working/feature branch the stash came from, not the update branch) before resuming, or you’ll lose it under future stash churn.

Outstanding decisions

1. esign_css workflow — orphan-history merge strategy required. See esign-css-instacash-orphan-history for the three workflow options (brutal --allow-unrelated-histories, rebase-replay, cherry-pick-delta-forward).

2. FKITDEV-8817 sequencing — the jQuery vuln fix is on bugfix/FKITDEV-8817-jquery-update in esign_css, pushed but PR not yet opened (see FKITDEV-8817 Status 2026-05-27 section). Parallel strategy chosen: do the devel update first; once 8817 lands on devel, a second devel → update/customization/instacash-2026-05-27 merge will pull it in. No need to wait — 8817 will flow in via the normal sync mechanism.

3. Self-service-v2 conflict resolution (vuer_oss) — must be done with awareness of three landing tickets:

   • FKITDEV-7518 (id-card subtypes) on incoming devel
   • FKITDEV-8747 (locale through RPC) already in devel as of recent commits
   • FKITDEV-8787 (selfservice-v2 abort clear-state) in-flight, on bugfix/FKITDEV-8787 in vuer_css

Cross-repo branch table

Repo	Update branch	Base of update	Tip merged into update	Status
esign_css	update/customization/instacash-2026-05-27	customization/instacash @ b7cee2f	devel @ 5d5b407	Blocked — orphan history
vuer_oss	update/customization/instacash-2026-05-27	customization/instacash @ 521c44a5d7	devel @ c59ef3ac95	In conflict — 10 UU, 50 commits in
vuer_css	update/customization/instacash-2026-05-27 (worktree)	customization/instacash @ e3f7a1d6	devel @ 546c58ed	In conflict — 44 paths, 57 commits in, server-side clean

Related

• esign-css-instacash-orphan-history — Critical operational note on esign_css orphan branch shape; read before any esign_css instacash update.
• FKITDEV-8817 — esign_css jQuery vuln remediation; parallel work, sequenced for second-merge inclusion.
• esign-css-customization-branches — esign_css customization fleet and dev/test method.
• customization-branches — vuer_oss / vuer_css branch index.
• release-process — FaceKom release/update flow.
• breakage-risks — Core file merge conflict hotspots.
• ASSICASH-71 — vuer_css InstaCash Express 4 → Express 5 risk (separate from this wave).
• FKITDEV-8787 — In-flight selfservice-v2 ticket overlapping the vuer_oss conflict surface.