Stages 5.1, 5.3, 5.4 of the returning-user flow rework. All three §4 entry paths now require payment BEFORE pairing, matching the updated mermaid spec. * Spec (requirement/flow_customer.mermaid.md §4): payment block converges three call-sites (bestie-yang-udah-kenal-online, bestie-baru, offline-popup → cari bestie lain). PairRoute dispatches lama → targeted pair, baru/cari-lain → §3 blast. §3 retains its post-payment-shared contract. * Stage 5.1 (client_app): PaymentDraft carries targetedMitraId + topicSensitivity. bestie_history_list seeds the draft + pushes /payment/entry (was legacy /payment). searching_screen branches on draft.targetedMitraId for blast-vs-targeted dispatch. payment_entry uses resetExceptTarget(); bestie_choice_sheet + home _onCurhatBestieBaruPressed call explicit reset() before push so the keepAlive draft can't leak stale targeting into a blast. * Stage 5.3 (client_app): new BestieOfflineVariant.prePayReturning. Bestie-history-list _BestieRow splits tappable from dim so offline rows render dimmed but route taps into the popup. CTA "cari bestie lain" resets the draft + pushes /payment/entry. * Stage 5.4 (client_app): deleted legacy /payment route, payment_screen.dart, payment_notifier.dart(+.g.dart). router cleaned. * Tests (requirement/phase4-customer-flow.md + client_app/.maestro/): six Maestro flows TS-01..TS-06 covering every §4 branching point, all passing end-to-end. Shared onboarding prelude under .maestro/subflows/. New helper scripts: accept_latest_pending, force_mitra_offline, force_other_mitra_online, reset_all_mitras_online, mitra_accept_latest_internal. New backend _test endpoints to match. /reset-phone now cascade-deletes customer_transactions (FK was blocking). /force-pairing-timeout branches targeted (RETURNING_CHAT_TIMEOUT via expireTargetedPairingRequest, now exported) vs blast (PAIRING_FAILED). seed_history_session also outputs MITRA_NAME_RE (regex-escaped) for reliable selectors against display names containing regex specials. * mitra_app: dispose-during-deactivate guardrail for back-press on the mitra chat screen after the customer's goodbye message. Pending real emulator repro verification (carried over from 2026-05-15). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
72 lines
2.4 KiB
Dart
72 lines
2.4 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
import 'package:go_router/go_router.dart';
|
|
import '../../../core/chat/chat_opening_provider.dart';
|
|
import '../../../core/theme/halo_tokens.dart';
|
|
import '../state/payment_draft_provider.dart';
|
|
|
|
/// Single point of truth for the discount-vs-method-pick branch.
|
|
///
|
|
/// Reads `chat-pricing.first_session_discount.eligible`. When the customer
|
|
/// is eligible (and the discount is enabled), routes to the S6 paywall;
|
|
/// otherwise routes to the regular method-pick screen. The draft is reset
|
|
/// here so a fresh entry into the flow always starts clean.
|
|
class PaymentEntryScreen extends ConsumerStatefulWidget {
|
|
const PaymentEntryScreen({super.key});
|
|
|
|
@override
|
|
ConsumerState<PaymentEntryScreen> createState() => _PaymentEntryScreenState();
|
|
}
|
|
|
|
class _PaymentEntryScreenState extends ConsumerState<PaymentEntryScreen> {
|
|
bool _routed = false;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
Future.microtask(() {
|
|
if (!mounted) return;
|
|
// Targeting is set BEFORE this screen (by bestie-history-list) and must
|
|
// survive the entry-screen reset, so use resetExceptTarget() — full
|
|
// reset() would wipe targetedMitraId and silently downgrade the
|
|
// returning-targeted flow to a blast.
|
|
ref.read(paymentDraftNotifierProvider.notifier).resetExceptTarget();
|
|
});
|
|
}
|
|
|
|
void _routeOnce(String location) {
|
|
if (_routed || !mounted) return;
|
|
_routed = true;
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (!mounted) return;
|
|
context.go(location);
|
|
});
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final pricingAsync = ref.watch(chatPricingProvider);
|
|
|
|
return Scaffold(
|
|
backgroundColor: HaloTokens.bg,
|
|
body: pricingAsync.when(
|
|
loading: () => const Center(child: CircularProgressIndicator()),
|
|
error: (_, __) {
|
|
// Pricing fetch failed — fall through to method-pick (which fetches
|
|
// pricing again and surfaces the error there).
|
|
_routeOnce('/payment/method-pick');
|
|
return const SizedBox.shrink();
|
|
},
|
|
data: (pricing) {
|
|
if (pricing.firstSessionDiscount?.eligible ?? false) {
|
|
_routeOnce('/payment/discount-paywall');
|
|
} else {
|
|
_routeOnce('/payment/method-pick');
|
|
}
|
|
return const SizedBox.shrink();
|
|
},
|
|
),
|
|
);
|
|
}
|
|
}
|