afterme_web.md

# Folder Structure

- afterme_web/
  - lib/
    - constants.dart
    - dashboard.dart
    - firebase_options.dart
    - home_page.dart
    - main.dart
    - no_will_configured_page.dart
    - profile_page.dart
    - wallet_provider.dart
    - config/
      - supported_chains.dart
    - creator/
      - will_configurator.dart
      - will_creator_provider.dart
      - will_creator_wizard.dart
      - steps/
        - step_1_heirs.dart
        - step_2_assets.dart
        - step_3_distribution.dart
        - step_4_timeout.dart
        - step_5_review.dart
    - diary/
      - diary_page.dart
      - diary_provider.dart
      - mock_diary_data.dart
      - models/
    - executions/
      - contract_item.dart
      - executions_page.dart
    - mock/
      - mock_executions.dart
    - models/
      - asset_models.dart
      - chain_model.dart
      - diary_entry.dart
      - execution_contract_model.dart
      - will_details_model.dart
    - utils/
      - avatar_generator.dart
      - conversions.dart
      - validators.dart
    - widgets/
      - address_avatar.dart
      - animated_step_container.dart
      - avatar_generator.dart
      - step_progress_indicator.dart
      - wrong_network_display.dart

# File Contents

### `lib/constants.dart`
```dart
// lib/constants.dart
const String amLogo = "https://i.ibb.co/nqCtGpwH/amlogo.png";
const String metamaskLogoUrl = "https://i.ibb.co/kV4yWnpn/metamic.png";
String stickFigure =
    "https://media4.giphy.com/media/v1.Y2lkPTc5MGI3NjExaTNzNTVwb3VrMW14djlvOGk2M2ZwMjdmZW82cThvYzFqN2I5ZndpbiZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9cw/ATjHQ5tttY2kfGUmwm/giphy.gif";

// ABI for the Will.sol contract
const willContractAbi = r'''
[{"inputs":[{"internalType":"address","name":"initialOwner","type":"address"},{"internalType":"address","name":"_sourceContract","type":"address"},{"internalType":"bool","name":"_hasDiary","type":"bool"},{"internalType":"address","name":"_executorAddress","type":"address"}],"stateMutability":"payable","type":"constructor"},{"inputs":[],"name":"ReentrancyGuardReentrantCall","type":"error"},{"anonymous":false,"inputs":[],"name":"Cancelled","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"executor","type":"address"},{"indexed":false,"internalType":"uint256","name":"ethFee","type":"uint256"},{"indexed":true,"internalType":"address","name":"feeRecipient","type":"address"}],"name":"Executed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"newLastUpdate","type":"uint256"}],"name":"Ping","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"}],"name":"WillConfigured","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"}],"name":"WillEmptied","type":"event"},{"inputs":[],"name":"EXECUTION_FEE_BPS","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"cancelAndWithdraw","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"currentState","outputs":[{"internalType":"enum Will.WillState","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"emptyWillForEdit","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"execute","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"executorAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_interval","type":"uint256"},{"internalType":"address[]","name":"_heirs","type":"address[]"},{"internalType":"uint256[]","name":"_distro","type":"uint256[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"internalType":"struct Will.Erc20Distribution[]","name":"_erc20s","type":"tuple[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"address","name":"heir","type":"address"}],"internalType":"struct Will.NftDistribution[]","name":"_nfts","type":"tuple[]"}],"name":"fundAndConfigure","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"getWillDetails","outputs":[{"components":[{"internalType":"address","name":"owner","type":"address"},{"internalType":"uint256","name":"interval","type":"uint256"},{"internalType":"uint256","name":"lastUpdate","type":"uint256"},{"internalType":"bool","name":"executed","type":"bool"},{"internalType":"bool","name":"hasDiary","type":"bool"},{"internalType":"uint256","name":"ethBalance","type":"uint256"},{"internalType":"address[]","name":"heirs","type":"address[]"},{"internalType":"uint256[]","name":"distributionPercentages","type":"uint256[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"balance","type":"uint256"}],"internalType":"struct Erc20Detail[]","name":"erc20Details","type":"tuple[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"address","name":"heir","type":"address"}],"internalType":"struct Erc721Detail[]","name":"erc721Details","type":"tuple[]"}],"internalType":"struct WillDetails","name":"","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"hasDiary","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_interval","type":"uint256"},{"internalType":"address[]","name":"_heirs","type":"address[]"},{"internalType":"uint256[]","name":"_distro","type":"uint256[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"internalType":"struct Will.Erc20Distribution[]","name":"_erc20s","type":"tuple[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"address","name":"heir","type":"address"}],"internalType":"struct Will.NftDistribution[]","name":"_nfts","type":"tuple[]"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"interval","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"lastUpdate","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"ping","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"renounceOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"sourceContract","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"}]
''';

// The ABI for the Source.sol contract
const sourceContractAbi = r'''
[{"inputs":[{"internalType":"address","name":"_coFounderOnePrimary","type":"address"},{"internalType":"address","name":"_coFounderOneSecondary","type":"address"},{"internalType":"address","name":"_coFounderTwoPrimary","type":"address"},{"internalType":"address","name":"_coFounderTwoSecondary","type":"address"},{"internalType":"address","name":"_initialExecutor","type":"address"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"uint8","name":"coFounderId","type":"uint8"},{"indexed":false,"internalType":"address","name":"newPrimary","type":"address"},{"indexed":false,"internalType":"address","name":"newSecondary","type":"address"}],"name":"CoFounderAddressesUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"newExecutor","type":"address"}],"name":"ExecutorAddressUpdated","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"caller","type":"address"},{"indexed":false,"internalType":"uint256","name":"amountForCoFounderOne","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amountForCoFounderTwo","type":"uint256"}],"name":"FeesWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":true,"internalType":"address","name":"willAddress","type":"address"}],"name":"WillCleared","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":true,"internalType":"address","name":"willAddress","type":"address"},{"indexed":false,"internalType":"bool","name":"hasDiary","type":"bool"}],"name":"WillCreated","type":"event"},{"inputs":[],"name":"basePlatformFee","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"clearWillRecord","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"coFounderOne","outputs":[{"internalType":"address","name":"primary","type":"address"},{"internalType":"address","name":"secondary","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"coFounderTwo","outputs":[{"internalType":"address","name":"primary","type":"address"},{"internalType":"address","name":"secondary","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"interval","type":"uint256"},{"internalType":"address[]","name":"heirs","type":"address[]"},{"internalType":"uint256[]","name":"distribution","type":"uint256[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"internalType":"struct Will.Erc20Distribution[]","name":"erc20s","type":"tuple[]"},{"components":[{"internalType":"address","name":"tokenContract","type":"address"},{"internalType":"uint256","name":"tokenId","type":"uint256"},{"internalType":"address","name":"heir","type":"address"}],"internalType":"struct Will.NftDistribution[]","name":"nfts","type":"tuple[]"}],"name":"createWill","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"createWillDiary","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[],"name":"diaryPlatformFee","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"executorAddress","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_newExecutor","type":"address"}],"name":"setExecutorAddress","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_newFee","type":"uint256"}],"name":"setDiaryPlatformFee","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_newPrimary","type":"address"},{"internalType":"address","name":"_newSecondary","type":"address"}],"name":"updateCoFounderOneAddresses","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_newPrimary","type":"address"},{"internalType":"address","name":"_newSecondary","type":"address"}],"name":"updateCoFounderTwoAddresses","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"userWills","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"withdrawFees","outputs":[],"stateMutability":"nonpayable","type":"function"},{"stateMutability":"payable","type":"receive"}]
''';

// Generic ABI for the 'approve' function in an ERC20 token contract
const erc20ApproveAbi = r'''
[{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]
''';

// Generic ABI for the 'approve' function in an ERC721 (NFT) contract
const erc721ApproveAbi = r'''
[{"constant":false,"inputs":[{"name":"to","type":"address"},{"name":"tokenId","type":"uint256"}],"name":"approve","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}]
''';
// lib/constants.dart
```

### `lib/dashboard.dart`
```dart
import 'package:afterme_web/constants.dart';
import 'package:afterme_web/executions/executions_page.dart';
import 'package:afterme_web/landing_page.dart';
import 'package:afterme_web/profile_page.dart';
import 'package:afterme_web/wallet_provider.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';

class DashboardPage extends StatefulWidget {
  const DashboardPage({super.key});

  @override
  State<DashboardPage> createState() => _DashboardPageState();
}

class _DashboardPageState extends State<DashboardPage> {
  final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
  final FocusNode _keyboardFocusNode = FocusNode();
  bool _isSectionOneVisible = true;

  // State for Executions page is now fully managed here.
  late final TextEditingController _searchController;
  bool _showArmedInExecutions = true;
  bool _showMockData = true;

  @override
  void initState() {
    super.initState();
    _searchController = TextEditingController();

    WidgetsBinding.instance.addPostFrameCallback((_) {
      context.read<WalletProvider>().addListener(_onWalletChange);
    });
  }

  @override
  void dispose() {
    _searchController.dispose();
    _keyboardFocusNode.dispose();
    context.read<WalletProvider>().removeListener(_onWalletChange);
    super.dispose();
  }

  void _onWalletChange() {
    if (!mounted) return;

    final walletProvider = context.read<WalletProvider>();
    if (!walletProvider.isConnected) {
      Navigator.of(context).pushReplacement(
        MaterialPageRoute(builder: (context) => const LandingPage()),
      );
    }
  }

  void _toggleExecutionsFilter(bool value) {
    setState(() {
      _showArmedInExecutions = !value;
    });
  }

  KeyEventResult _handleKeyPress(FocusNode node, RawKeyEvent event) {
    if (event is RawKeyDownEvent) {
      if (event.isShiftPressed && event.logicalKey == LogicalKeyboardKey.keyM) {
        setState(() {
          _showMockData = !_showMockData;
          ScaffoldMessenger.of(context).hideCurrentSnackBar();
          ScaffoldMessenger.of(context).showSnackBar(
            SnackBar(
              content:
                  Text('Mock data ${_showMockData ? "enabled" : "disabled"}.'),
              duration: const Duration(seconds: 1),
            ),
          );
        });
        // We handled the event, so stop it from propagating further.
        return KeyEventResult.handled;
      }
    }
    // We didn't handle the event, so let other widgets process it.
    return KeyEventResult.ignored;
  }

  @override
  Widget build(BuildContext context) {
    final walletState = context.watch<WalletProvider>();
    final theme = Theme.of(context);

    final address = walletState.currentAddress;
    String formattedAddress = '';
    if (address != null && address.length > 10) {
      formattedAddress =
          '${address.substring(0, 6)}...${address.substring(address.length - 4)}';
    } else {
      formattedAddress = address ?? '';
    }

    // Wrap the entire Scaffold in a Focus widget to handle global key events.
    return Focus(
      focusNode: _keyboardFocusNode,
      onKey: _handleKeyPress,
      autofocus: true,
      child: Scaffold(
        key: _scaffoldKey,
        extendBodyBehindAppBar: true,
        appBar: AppBar(
          automaticallyImplyLeading: false,
          backgroundColor: Colors.transparent,
          elevation: 0,
          leading: Align(
            alignment: Alignment.centerLeft,
            child: Padding(
              padding: const EdgeInsets.only(left: 24.0),
              child: Text(
                formattedAddress,
                style: const TextStyle(fontFamily: 'monospace', fontSize: 16),
              ),
            ),
          ),
          leadingWidth: 200,
          centerTitle: true,
          title: Visibility(
            visible: !_isSectionOneVisible,
            child: ConstrainedBox(
              constraints:
                  const BoxConstraints(maxWidth: 1000), // Match page content width
              child: Row(
                crossAxisAlignment: CrossAxisAlignment.center,
                mainAxisAlignment: MainAxisAlignment.center,
                children: [
                  const Icon(Icons.layers_outlined,
                      size: 28, color: Colors.white70),
                  const SizedBox(width: 12),
                  const Text('Will Executions',
                      style:
                          TextStyle(fontFamily: 'NanumMyeongjo', fontSize: 19)),
                  const SizedBox(width: 40),
                  Expanded(
                    child: TextField(
                      controller: _searchController,
                      style: const TextStyle(fontSize: 14),
                      decoration: InputDecoration(
                        hintText: 'Find contract by address...',
                        prefixIcon: const Icon(Icons.search, size: 18),
                        isDense: true,
                        contentPadding: const EdgeInsets.symmetric(
                            vertical: 8.0, horizontal: 8.0),
                        filled: true,
                        fillColor: Colors.black.withOpacity(0.2),
                        enabledBorder: OutlineInputBorder(
                          borderRadius: BorderRadius.circular(8),
                          borderSide:
                              BorderSide(color: Colors.grey.shade800, width: 0.5),
                        ),
                        focusedBorder: OutlineInputBorder(
                          borderRadius: BorderRadius.circular(8),
                          borderSide: BorderSide(
                              color: theme.primaryColor, width: 0.5),
                        ),
                      ),
                    ),
                  ),
                  const SizedBox(width: 40),
                  Text(
                    "Armed",
                    style: TextStyle(
                        fontSize: 12,
                        color: _showArmedInExecutions
                            ? Colors.white
                            : Colors.white54,
                        fontWeight: FontWeight.bold),
                  ),
                  const SizedBox(width: 4),
                  Switch(
                    value: !_showArmedInExecutions,
                    onChanged: _toggleExecutionsFilter,
                    materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
                    activeTrackColor: Colors.grey.shade600,
                    inactiveTrackColor: Colors.grey.shade800,
                    inactiveThumbColor: Colors.white,
                    activeColor: Colors.white,
                  ),
                  const SizedBox(width: 4),
                  Text(
                    "Executed",
                    style: TextStyle(
                        fontSize: 12,
                        color: !_showArmedInExecutions
                            ? Colors.white
                            : Colors.white54,
                        fontWeight: FontWeight.bold),
                  ),
                ],
              ),
            ),
          ),
          actions: [
            Padding(
              padding: const EdgeInsets.only(right: 24.0),
              child: Container(
                  height: 39,
                  decoration: BoxDecoration(
                      border: Border.all(
                          width: 0.1,
                          color: theme.textTheme.bodyLarge!.color!),
                      color: theme.indicatorColor.withOpacity(0.1)),
                  child: Row(
                    children: [
                      const SizedBox(width: 12),
                      Icon(
                        Icons.connect_without_contact_sharp,
                        size: 29,
                        color: theme.indicatorColor,
                      ),
                      const SizedBox(width: 12),
                      Text(
                        walletState.currentChain?.chainName ??
                            'Unsupported Network',
                        style:
                            TextStyle(color: theme.indicatorColor, fontSize: 15),
                      ),
                      const SizedBox(width: 12),
                    ],
                  )),
            ),
          ],
        ),
        body: Container(
          decoration: BoxDecoration(
            gradient: LinearGradient(
              begin: Alignment.centerLeft,
              end: Alignment.centerRight,
              stops: const [0.0, 0.23],
              colors: [
                const Color.fromARGB(255, 38, 38, 38),
                Colors.transparent
              ],
            ),
          ),
          child: IndexedStack(
            index: _isSectionOneVisible ? 0 : 1,
            children: [
              const ProfilePage(key: ValueKey('profile_page')),
              // Use a ValueListenableBuilder to listen for text changes efficiently
              ValueListenableBuilder<TextEditingValue>(
                valueListenable: _searchController,
                builder: (context, value, child) {
                  return ExecutionsPage(
                    key: const ValueKey('executions_page'),
                    searchQuery: value.text,
                    showArmed: _showArmedInExecutions,
                    showMockData: _showMockData,
                  );
                },
              ),
            ],
          ),
        ),
        endDrawer: Drawer(
          backgroundColor: const Color.fromARGB(255, 28, 28, 28),
          child: Padding(
            padding: const EdgeInsets.symmetric(horizontal: 24.0)
                .copyWith(top: 48.0, bottom: 32.0),
            child: Column(
              mainAxisAlignment: MainAxisAlignment.spaceBetween,
              crossAxisAlignment: CrossAxisAlignment.center,
              children: <Widget>[
                // --- Group 1: Logo & Divider ---
                Column(
                  mainAxisSize: MainAxisSize.min,
                  children: [
                    SizedBox(
                      height: 90,
                      child: Image.network(
                        amLogo,
                        fit: BoxFit.contain,
                      ),
                    ),
                    const SizedBox(height: 16),
                    const Divider(color: Colors.white24),
                  ],
                ),

                // --- Group 2: Section Switcher ---
                Padding(
                  padding:
                      const EdgeInsets.symmetric(horizontal: 4.0, vertical: 25),
                  child: Row(
                    mainAxisAlignment: MainAxisAlignment.center,
                    crossAxisAlignment: CrossAxisAlignment.center,
                    children: [
                      Text(
                        "My Will",
                        textAlign: TextAlign.center,
                        style: TextStyle(
                          fontSize: 16,
                          color: _isSectionOneVisible
                              ? Colors.white
                              : Colors.white54,
                          fontWeight: FontWeight.bold,
                        ),
                      ),
                      SizedBox(
                        width: 12,
                        ),
                      Switch(
                        value: !_isSectionOneVisible,
                        onChanged: (value) {
                          setState(() => _isSectionOneVisible = !value);
                        },
                        activeTrackColor: Colors.grey.shade600,
                        inactiveTrackColor: Colors.grey.shade800,
                        inactiveThumbColor: Colors.white,
                        activeColor: Colors.white,
                      ),
                      SizedBox(
                        width: 12,
                        ),
                      Text(
                        "Executions",
                        style: TextStyle(
                          fontSize: 16,
                          color: !_isSectionOneVisible
                              ? Colors.white
                              : Colors.white54,
                          fontWeight: FontWeight.bold,
                        ),
                      ),
                    ],
                  ),
                ),
                const Spacer(),
                // --- Group 3: Info Cards ---
                Column(
                  mainAxisSize: MainAxisSize.min,
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
                    InfoCard(
                      iconBuilder: (color) => Image.network(
                        "https://i.ibb.co/qWf3xck/github.png",
                        height: 28,
                        color: color,
                      ),
                      text:
                          "Browse the open-source smart contract code and the supporting docs.",
                      onTap: () => launchUrl(Uri.parse(
                          "https://github.com/dOrg-tech/afterme-contracts")),
                      defaultColor: const Color.fromARGB(255, 185, 185, 185),
                      hoverColor: const Color.fromARGB(255, 236, 255, 149),
                    ),
                    const SizedBox(height: 20),
                    InfoCard(
                      iconBuilder: (color) =>
                          Icon(Icons.code_sharp, size: 30, color: color),
                      text: "Bytecode integrity check of the deployed contract.",
                      onTap: () => launchUrl(Uri.parse(
                          "https://github.com/dOrg-tech/afterme-contracts")),
                      defaultColor: Colors.white70,
                      hoverColor: const Color.fromARGB(255, 138, 228, 255),
                    ),
                    const SizedBox(height: 20),
                    InfoCard(
                      iconBuilder: (color) => SizedBox(
                        height: 30,
                        width: 30,
                        child: Image.network(
                          "https://i.ibb.co/Nr7Psjm/discord.png",
                          color: color,
                        ),
                      ),
                      text:
                          "Got questions? Join our Discord and ask the community or team.",
                      onTap: () =>
                          launchUrl(Uri.parse("https://discord.gg/XufcBNu277")),
                      defaultColor: Colors.white70,
                      hoverColor: const Color.fromARGB(255, 170, 136, 255),
                    ),
                  ],
                ),
                const Spacer(),
                // --- Group 4: Credits ---
                Column(
                  children: [
                    RichText(
                      textAlign: TextAlign.center,
                      text: TextSpan(
                        style: const TextStyle(
                            fontSize: 14,
                            color: Colors.white70,
                            fontFamily: 'NanumMyeongjo'),
                        children: [
                          const TextSpan(text: 'Powered by '),
                          TextSpan(
                            text: 'Tezos Commons',
                            style: const TextStyle(
                              color: Colors.white,
                              decoration: TextDecoration.underline,
                            ),
                            recognizer: TapGestureRecognizer()
                              ..onTap = () {
                                launchUrl(
                                    Uri.parse("https://tezoscommons.org/"));
                              },
                          ),
                        ],
                      ),
                    ),
                    const SizedBox(height: 16),
                    RichText(
                      textAlign: TextAlign.center,
                      text: TextSpan(
                        style: const TextStyle(
                            fontSize: 14,
                            color: Colors.white70,
                            fontFamily: 'NanumMyeongjo'),
                        children: [
                          const TextSpan(text: 'Developed by '),
                          TextSpan(
                            text: 'Eight Rice',
                            style: const TextStyle(
                              color: Colors.white,
                              decoration: TextDecoration.underline,
                            ),
                            recognizer: TapGestureRecognizer()..onTap = () {},
                          ),
                          const TextSpan(text: ' of '),
                          TextSpan(
                            text: 'dOrg',
                            style: const TextStyle(
                              color: Colors.white,
                              decoration: TextDecoration.underline,
                            ),
                            recognizer: TapGestureRecognizer()
                              ..onTap = () {
                                launchUrl(Uri.parse('https://dorg.tech/'));
                              },
                          ),
                        ],
                      ),
                    ),
                  ],
                ),
                const SizedBox(height: 40),
                // --- Group 5: Footer Links with Divider ---
                Column(
                  mainAxisSize: MainAxisSize.min,
                  children: [
                    const Divider(color: Colors.white24),
                    const SizedBox(height: 24),
                    Row(
                      mainAxisAlignment: MainAxisAlignment.center,
                      children: [
                        InkWell(
                          onTap: () {},
                          child: const Text('Terms',
                              style: TextStyle(
                                  color: Colors.white70,
                                  decoration: TextDecoration.underline)),
                        ),
                        const SizedBox(width: 24),
                        InkWell(
                          onTap: () {},
                          child: const Text('Privacy',
                              style: TextStyle(
                                  color: Colors.white70,
                                  decoration: TextDecoration.underline)),
                        ),
                        const SizedBox(width: 24),
                        InkWell(
                          onTap: () {},
                          child: const Text('Contact',
                              style: TextStyle(
                                  color: Colors.white70,
                                  decoration: TextDecoration.underline)),
                        ),
                      ],
                    ),
                  ],
                ),
              ],
            ),
          ),
        ),
        floatingActionButton: FloatingActionButton(
          onPressed: () => _scaffoldKey.currentState?.openEndDrawer(),
          backgroundColor: Colors.transparent,
          elevation: 0,
          child: Transform(
            alignment: Alignment.center,
            transform: Matrix4.identity()..scale(-1.0, 1.0),
            child: SizedBox(
              width: 80,
              height: 120,
              child: Transform.scale(
                scaleX: -1.0,
                child: Image.asset(
                  'assets/img/AM_FLA_icon.png',
                  fit: BoxFit.contain,
                ),
              ),
            ),
          ),
        ),
      ),
    );
  }
}

class InfoCard extends StatefulWidget {
  const InfoCard({
    super.key,
    required this.iconBuilder,
    required this.text,
    required this.onTap,
    required this.hoverColor,
    required this.defaultColor,
  });

  final Widget Function(Color color) iconBuilder;
  final String text;
  final VoidCallback onTap;
  final Color hoverColor;
  final Color defaultColor;

  @override
  State<InfoCard> createState() => _InfoCardState();
}

class _InfoCardState extends State<InfoCard> {
  bool _isHovered = false;

  @override
  Widget build(BuildContext context) {
    final color = _isHovered ? widget.hoverColor : widget.defaultColor;

    return MouseRegion(
      onEnter: (_) => setState(() => _isHovered = true),
      onExit: (_) => setState(() => _isHovered = false),
      cursor: SystemMouseCursors.click,
      child: InkWell(
        onTap: widget.onTap,
        borderRadius: BorderRadius.circular(8.0),
        child: Container(
          decoration: BoxDecoration(
            borderRadius: BorderRadius.circular(8.0),
            border: Border.all(color: Colors.white24, width: 0.5),
          ),
          padding: const EdgeInsets.all(8.0),
          child: Row(
            children: [
              SizedBox(
                width: 40,
                child: widget.iconBuilder(color),
              ),
              const SizedBox(width: 16),
              Expanded(
                child: Padding(
                  padding: const EdgeInsets.only(right: 8.0),
                  child: Text(
                    widget.text,
                    style: TextStyle(
                      color: color,
                      fontSize: 14,
                      height: 1.4,
                    ),
                  ),
                ),
              ),
            ],
          ),
        ),
      ),
    );
  }
}
```

### `lib/firebase_options.dart`
```dart
// File generated by FlutterFire CLI.
// ignore_for_file: type=lint
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
    show defaultTargetPlatform, kIsWeb, TargetPlatform;

/// Default [FirebaseOptions] for use with your Firebase apps.
///
/// Example:
/// ```dart
/// import 'firebase_options.dart';
/// // ...
/// await Firebase.initializeApp(
///   options: DefaultFirebaseOptions.currentPlatform,
/// );
/// ```
class DefaultFirebaseOptions {
  static FirebaseOptions get currentPlatform {
    if (kIsWeb) {
      return web;
    }
    switch (defaultTargetPlatform) {
      case TargetPlatform.android:
        throw UnsupportedError(
          'DefaultFirebaseOptions have not been configured for android - '
          'you can reconfigure this by running the FlutterFire CLI again.',
        );
      case TargetPlatform.iOS:
        throw UnsupportedError(
          'DefaultFirebaseOptions have not been configured for ios - '
          'you can reconfigure this by running the FlutterFire CLI again.',
        );
      case TargetPlatform.macOS:
        throw UnsupportedError(
          'DefaultFirebaseOptions have not been configured for macos - '
          'you can reconfigure this by running the FlutterFire CLI again.',
        );
      case TargetPlatform.windows:
        throw UnsupportedError(
          'DefaultFirebaseOptions have not been configured for windows - '
          'you can reconfigure this by running the FlutterFire CLI again.',
        );
      case TargetPlatform.linux:
        throw UnsupportedError(
          'DefaultFirebaseOptions have not been configured for linux - '
          'you can reconfigure this by running the FlutterFire CLI again.',
        );
      default:
        throw UnsupportedError(
          'DefaultFirebaseOptions are not supported for this platform.',
        );
    }
  }

  static const FirebaseOptions web = FirebaseOptions(
    apiKey: 'AIzaSyCyrGJpjoAsx5ZA7ftGLmp5JKDbu2syxYU',
    appId: '1:83997538410:web:5c1be55b838884bce7f213',
    messagingSenderId: '83997538410',
    projectId: 'afterme-850af',
    authDomain: 'afterme-850af.firebaseapp.com',
    databaseURL: 'https://afterme-850af.firebaseio.com',
    storageBucket: 'afterme-850af.firebasestorage.app',
    measurementId: 'G-BJ99QKTJZ5',
  );
}

```

### `lib/home_page.dart`
```dart
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'wallet_provider.dart';

class HomePage extends StatelessWidget {
  const HomePage({super.key});

  @override
  Widget build(BuildContext context) {
    final walletProvider = context.watch<WalletProvider>();
    final theme = Theme.of(context);

    return Scaffold(
      body: Center(
        child: ConstrainedBox(
          constraints: const BoxConstraints(maxWidth: 500),
          child: Padding(
            padding: const EdgeInsets.all(24.0),
            child: Column(
              mainAxisAlignment: MainAxisAlignment.center,
              crossAxisAlignment: CrossAxisAlignment.center,
              children: [
                Icon(
                  Icons.security,
                  size: 80,
                  color: theme.primaryColor,
                ),
                const SizedBox(height: 24),
                const Text(
                  'Secure Your Digital Legacy',
                  textAlign: TextAlign.center,
                  style: TextStyle(
                    fontSize: 32,
                    fontFamily: "NanumMyeongjo", 
                    fontWeight: FontWeight.bold,
                    color: Colors.white,
                  ),
                ),
                const SizedBox(height: 16),
                const Text(
                  'AfterMe allows you to create a decentralized will, ensuring your crypto assets are passed on to your loved ones according to your wishes—securely and without intermediaries.',
                  textAlign: TextAlign.center,
                  style: TextStyle(
                    fontSize: 16,
                    height: 1.5,
                  ),
                ),
                const SizedBox(height: 48),
                walletProvider.isLoading
                    ? const CircularProgressIndicator()
                    : RichText(
                        textAlign: TextAlign.center,
                        text: TextSpan(
                          style: TextStyle(
                            fontSize: 18,
                            color: Colors.white.withOpacity(0.8),
                          ),
                          children: [
                          
                            TextSpan(
                              text: 'Connect your wallet',
                              style: TextStyle(
                                color: theme.primaryColor,
                                fontWeight: FontWeight.bold,
                                decoration: TextDecoration.underline,
                              ),
                              recognizer: TapGestureRecognizer()
                                ..onTap = () {
                                  walletProvider.connectWallet();
                                },
                            ),
                            const TextSpan(text: ' to get started.'),
                          ],
                        ),
                      ),
              ],
            ),
          ),
        ),
      ),
    );
  }
}
// lib/home_page.dart
```

### `lib/main.dart`
```dart
import 'package:afterme_web/dashboard.dart';
import 'package:afterme_web/diary/diary_page.dart';
import 'package:afterme_web/firebase_options.dart';
import 'package:afterme_web/landing_page.dart';
import 'package:afterme_web/profile_page.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:webview_flutter_web/webview_flutter_web.dart';
import 'diary/diary_provider.dart';
import 'wallet_provider.dart';
import 'package:youtube_player_iframe_web/youtube_player_iframe_web.dart';
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
void main() async {

  WidgetsFlutterBinding.ensureInitialized(); // Good practice
  await Firebase.initializeApp(options: DefaultFirebaseOptions.web);
  runApp(const MyApp());
}

class MyApp extends StatelessWidget {
  const MyApp({super.key});

  @override
  Widget build(BuildContext context) {
    return MultiProvider(
      providers: [
        ChangeNotifierProvider(create: (context) => WalletProvider()),
        // DiaryProvider needs access to WalletProvider.
        ChangeNotifierProvider(
          create: (context) => DiaryProvider(context.read<WalletProvider>()),
        ),
      ],
      child: MaterialApp(
        debugShowCheckedModeBanner: false,
        title: 'AfterMe Digital Will',
        theme: ThemeData(
          fontFamily: 'NanumMyeongjo',
          primarySwatch: Colors.blue,
        ),
        darkTheme: ThemeData(
          brightness: Brightness.dark,
          fontFamily: 'NanumMyeongjo',
          primaryColor: Colors.teal,
          scaffoldBackgroundColor: const Color.fromARGB(255, 12, 12, 12),
          textTheme: ThemeData.dark().textTheme.apply(
            bodyColor: Colors.white70,
            displayColor: Colors.white,
          ),
          elevatedButtonTheme: ElevatedButtonThemeData(
            style: ElevatedButton.styleFrom(
              foregroundColor: Colors.white,
              backgroundColor: Colors.teal,
            ),
          ),
        ),
        themeMode: ThemeMode.dark,
        // By setting a dedicated router as the home, we can cleanly handle
        // the initial state without complex logic in the UI pages themselves.
        home: const InitialRouter(),
      ),
    );
  }
}

/// A simple widget that decides which page to show on app startup.
class InitialRouter extends StatelessWidget {
  const InitialRouter({super.key});

  @override
  Widget build(BuildContext context) {
    // Watch the provider to react to state changes.
    final provider = context.watch<WalletProvider>();

    // MODIFIED: Use the new 'isAutoConnecting' flag for the initial load screen.
    if (provider.isAutoConnecting) {
      return const Scaffold(
        backgroundColor: Color.fromARGB(255, 12, 12, 12),
        body: Center(child: CircularProgressIndicator()),
      );
    }

    // After loading, if the wallet is connected, go directly to the dashboard.
    if (provider.isConnected) {
      return const DashboardPage();
    }

    // Otherwise, show the landing page for the user to connect.
    return const LandingPage();
  }
}
// lib/main.dart
```

### `lib/no_will_configured_page.dart`
```dart
import 'package:afterme_web/diary/diary_provider.dart';
import 'package:afterme_web/wallet_provider.dart';
import 'package:flutter/material.dart';
import 'creator/will_creator_wizard.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';

class NoWillConfiguredPage extends StatefulWidget {
  const NoWillConfiguredPage({super.key});

  @override
  State<NoWillConfiguredPage> createState() => _NoWillConfiguredPageState();
}

class _NoWillConfiguredPageState extends State<NoWillConfiguredPage> {
  bool _showContent = false;

  @override
  void initState() {
    super.initState();
    // Trigger the animation after a short delay
    Future.delayed(const Duration(milliseconds: 200), () {
      if (mounted) {
        setState(() {
          _showContent = true;
        });
      }
    });
  }

  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    final walletProvider = context.watch<WalletProvider>();
    return Center(
      child: ConstrainedBox(
        constraints: const BoxConstraints(maxWidth: 800),
        child: AnimatedOpacity(
          duration: const Duration(milliseconds: 500),
          opacity: _showContent ? 1.0 : 0.0,
          child: ListView(
            padding: const EdgeInsets.all(24.0),
            children: [
              const SizedBox(height: 70),
              Text(
                'Create Your Digital Legacy',
                textAlign: TextAlign.center,
                style: theme.textTheme.headlineLarge?.copyWith(
                  fontWeight: FontWeight.bold,
                ),
              ),
              const SizedBox(height: 16),
              Text(
                'You can chose to only pass along your digital assets,\n or you can also leave behind a lasting personal diary.',
                textAlign: TextAlign.center,
                style: theme.textTheme.titleMedium?.copyWith(
                  color: Colors.white70,
                ),
              ),
              const SizedBox(height: 48),
              IntrinsicHeight(
                child: Row(
                  crossAxisAlignment: CrossAxisAlignment.stretch,
                  children: [
                    Expanded(
                      child: _ServiceCard(
                        icon: FontAwesomeIcons.fileContract,
                        title: 'Decentralized Will',
                        price: 'Free',
                        description:
                            'A smart contract-based will to manage and distribute your cryptocurrency assets to your designated heirs automatically.',
                        buttonText: 'Create Will',
                        onPressed: walletProvider.isDeploying
                            ? null
                            : () {
                                Navigator.push(
                                  context,
                                  MaterialPageRoute(
                                      builder: (context) =>
                                          const WillCreatorWizard()),
                                );
                              },
                      ),
                    ),
                    const SizedBox(width: 24),
                    Expanded(
                      child: _ServiceCard(
                        icon: FontAwesomeIcons.bookOpen,
                        title: 'Decentralized Will + Diary',
                        price: '\$25 one-time fee',
                        description:
                            'Includes the Decentralized Will, plus an extra feature: Create a digital diary with text and videos that will be published to a public profile when the will is executed.',
                        buttonText: 'Create Will + Diary',
                        // CORRECTED: This now only calls the wallet provider. The diary logic will
                        // be handled automatically by the DiaryPage and DiaryProvider later.
                        onPressed: walletProvider.isDeploying
                            ? null
                            : () => context.read<WalletProvider>().createWillDiary(),
                        isFeatured: true,
                      ),
                    ),
                  ],
                ),
              ),
              const SizedBox(height: 48),
              _buildSecurityInfo(context),
            ],
          ),
        ),
      ),
    );
  }

  Widget _buildSecurityInfo(BuildContext context) {
    final theme = Theme.of(context);
    return Container(
      padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
      decoration: BoxDecoration(
        color: Colors.black.withOpacity(0.2),
        borderRadius: BorderRadius.circular(12),
        border: Border.all(color: Colors.grey.shade800),
      ),
      child: Row(
        mainAxisAlignment: MainAxisAlignment.spaceAround,
        children: [
          FaIcon(FontAwesomeIcons.shieldHalved, color: Colors.grey.shade400),
          const SizedBox(width: 16),
          Flexible(
            child: Text(
              'For critical security information, such as the smart contract and cryptographic verification of the logic being deploying at the address you will be interacting with, please check the stick figure.',
              textAlign: TextAlign.center,
              style: theme.textTheme.bodyMedium?.copyWith(
                color: Colors.grey.shade400,
                height: 1.5,
              ),
            ),
          ),
        ],
      ),
    );
  }
}

class _ServiceCard extends StatelessWidget {
  final IconData icon;
  final String title;
  final String price;
  final String description;
  final String buttonText;
  final VoidCallback? onPressed;
  final bool isFeatured;

  const _ServiceCard({
    required this.icon,
    required this.title,
    required this.price,
    required this.description,
    required this.buttonText,
    required this.onPressed,
    this.isFeatured = false,
  });

  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    final Color primaryColor = isFeatured ? theme.primaryColor : Colors.white;
    final Color buttonColor =
        isFeatured ? theme.primaryColor : Colors.grey.shade800;

    return Container(
      padding: const EdgeInsets.all(24.0),
      decoration: BoxDecoration(
        color: Colors.white.withOpacity(0.05),
        borderRadius: BorderRadius.circular(16.0),
        border: Border.all(
          color: isFeatured
              ? theme.primaryColor.withOpacity(0.5)
              : Colors.grey.shade800,
          width: isFeatured ? 2 : 1,
        ),
        boxShadow: isFeatured
            ? [
                BoxShadow(
                  color: theme.primaryColor.withOpacity(0.15),
                  blurRadius: 20,
                  spreadRadius: 5,
                )
              ]
            : [],
      ),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          FaIcon(icon, size: 32, color: primaryColor),
          const SizedBox(height: 16),
          Text(
            title,
            style: theme.textTheme.headlineSmall?.copyWith(
              fontWeight: FontWeight.bold,
              color: primaryColor,
            ),
          ),
          const SizedBox(height: 8),
          Text(
            price,
            style: theme.textTheme.titleMedium?.copyWith(
              fontWeight: FontWeight.w600,
              color: Colors.white,
            ),
          ),
          const SizedBox(height: 24),
          Text(
            description,
            style: theme.textTheme.bodyMedium?.copyWith(
              color: Colors.white70,
              height: 1.6,
            ),
          ),
          const Spacer(),
          const SizedBox(height: 32),
          SizedBox(
            width: double.infinity,
            child: ElevatedButton(
              onPressed: onPressed,
              style: ElevatedButton.styleFrom(
                backgroundColor: buttonColor,
                foregroundColor: Colors.white,
                padding:
                    const EdgeInsets.symmetric(horizontal: 24, vertical: 20),
                shape: RoundedRectangleBorder(
                  borderRadius: BorderRadius.circular(12),
                ),
                textStyle: const TextStyle(
                  fontSize: 16,
                  fontWeight: FontWeight.bold,
                ),
              ),
              child: Text(buttonText),
            ),
          ),
        ],
      ),
    );
  }
}
// lib/no_will_configured_page.dart
```

### `lib/profile_page.dart`
```dart
import 'dart:async';
import 'package:afterme_web/creator/will_configurator.dart';
import 'package:afterme_web/diary/diary_page.dart';
import 'package:afterme_web/widgets/address_avatar.dart';
import 'package:afterme_web/widgets/wrong_network_display.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';
import 'no_will_configured_page.dart';
import 'wallet_provider.dart';
import 'models/will_details_model.dart';

class ProfilePage extends StatefulWidget {
  const ProfilePage({super.key});

  @override
  State<ProfilePage> createState() => _ProfilePageState();
}

class _ProfilePageState extends State<ProfilePage>
    with SingleTickerProviderStateMixin {
  Timer? _countdownTimer;
  Duration? _timeRemaining;
  BigInt? _timerBasedOnLastUpdate;
  TabController? _tabController;

  @override
  void dispose() {
    _countdownTimer?.cancel();
    _tabController?.dispose();
    super.dispose();
  }

  void _setupTabController(WillDetails details) {
    if (details.hasDiary) {
      if (_tabController == null || _tabController!.length != 2) {
        _tabController?.dispose(); // Dispose old one if it exists
        _tabController = TabController(length: 2, vsync: this);
      }
    } else {
      if (_tabController != null) {
        _tabController?.dispose();
        _tabController = null;
      }
    }
  }

  void _startTimer(WillDetails details) {
    _countdownTimer?.cancel();

    if (details.executed) {
      setState(() => _timeRemaining = Duration.zero);
      return;
    }

    final deadline = DateTime.fromMillisecondsSinceEpoch(
      (details.lastUpdate + details.interval).toInt() * 1000,
    );

    _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
      final now = DateTime.now();
      if (!mounted) {
        timer.cancel();
        return;
      }

      final remaining = deadline.difference(now);
      if (remaining.isNegative) {
        setState(() => _timeRemaining = Duration.zero);
        timer.cancel();
      } else {
        setState(() => _timeRemaining = remaining);
      }
    });
  }

  String _formatDuration(Duration duration) {
    String twoDigits(int n) => n.toString().padLeft(2, '0');
    final days = duration.inDays;
    final hours = twoDigits(duration.inHours.remainder(24));
    final minutes = twoDigits(duration.inMinutes.remainder(60));
    final seconds = twoDigits(duration.inSeconds.remainder(60));
    return "${days}d ${hours}h ${minutes}m ${seconds}s";
  }

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<WalletProvider>();
    Widget body;

    final details = provider.willDetails;

    if (details != null &&
        details.currentState == WillState.Active &&
        details.lastUpdate != _timerBasedOnLastUpdate) {
      _timerBasedOnLastUpdate = details.lastUpdate;
      WidgetsBinding.instance.addPostFrameCallback((_) {
        if (mounted) {
          _startTimer(details);
        }
      });
    }

    if (provider.isCheckingWill && details == null) {
      body = _buildLoading('Checking for your Will...');
    } else if (provider.isWrongNetwork) {
      body = const WrongNetworkDisplay();
    } else if (details != null) {
      body = _buildDashboard(details);
    } else {
      body = const NoWillConfiguredPage();
    }

    return Stack(
      children: [
        Padding(
            padding: EdgeInsets.only(top: 36, left: 24.0, right: 24.0),
            child: body),
        if (provider.isWillActionInProgress || provider.isDeploying)
          Container(
            color: Colors.black.withOpacity(0.7),
            child: Center(
              child: Column(
                mainAxisSize: MainAxisSize.min,
                children: [
                  const CircularProgressIndicator(),
                  const SizedBox(height: 20),
                  Text(
                    provider.isDeploying
                        ? provider.deploymentStatusMessage
                        : provider.willActionMessage,
                    style: Theme.of(context).textTheme.titleLarge,
                    textAlign: TextAlign.center,
                  ),
                ],
              ),
            ),
          ),
      ],
    );
  }

  Widget _buildDashboard(WillDetails details) {
    _setupTabController(details);

    Widget willContent;
    switch (details.currentState) {
      case WillState.Empty:
        willContent = const WillConfigurator();
        break;
      case WillState.Active:
        willContent = _buildActiveWillView(details);
        break;
      case WillState.Executed:
        willContent = _buildStatusDisplay(
            'Will Executed', 'This will has been executed and is no longer active.');
        break;
    }

    // This is the centralized layout control point.
    // Everything is placed inside the Align -> ConstrainedBox.
    return Align(
      alignment: Alignment.topCenter,
      child: ConstrainedBox(
        constraints: const BoxConstraints(maxWidth: 800),
        child: _tabController == null
            // Case 1: No diary, just show the will content (which is already constrained).
            ? willContent
            // Case 2: Diary exists, build the tabbed view inside the constraint.
            : Column(
                children: [
                  // FIXED: Align TabBar to the left
                  Align(
                    alignment: Alignment.centerLeft,
                    child: TabBar(
                      controller: _tabController,
                      isScrollable: true, // Allows tabs to take their natural width
                      tabs: const [
                        Tab(text: 'Will'),
                        Tab(text: 'Diary'),
                      ],
                    ),
                  ),
                  const SizedBox(height: 24.0),
                  Expanded(
                    child: TabBarView(
                      controller: _tabController,
                      children: [
                        willContent, // This is now correctly placed within the constrained column.
                        const DiaryPage(),
                      ],
                    ),
                  ),
                ],
              ),
      ),
    );
  }

  Widget _buildActiveWillView(WillDetails details) {
    final walletProvider = context.read<WalletProvider>();
    final theme = Theme.of(context);
    final amountStyle =
        theme.textTheme.titleLarge?.copyWith(fontFamily: 'monospace');

    return SingleChildScrollView(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.start,
        crossAxisAlignment: CrossAxisAlignment.center,
        children: [
          if (walletProvider.willContractAddress != null)
            Padding(
              padding: const EdgeInsets.only(bottom: 16.0),
              child: Row(
                mainAxisAlignment: MainAxisAlignment.center,
                children: [
                  const Text('contract deployed at:  '),
                  SelectableText(
                    walletProvider.willContractAddress!,
                    style: const TextStyle(fontFamily: 'monospace'),
                  ),
                  IconButton(
                    icon:
                        const Icon(Icons.copy, size: 16, color: Colors.white54),
                    onPressed: () {
                      Clipboard.setData(
                          ClipboardData(text: walletProvider.willContractAddress!));
                      ScaffoldMessenger.of(context).showSnackBar(
                        const SnackBar(
                            content: Text('Will Address copied to clipboard')),
                      );
                    },
                  ),
                ],
              ),
            ),
          Align(
            alignment: Alignment.topCenter,
            child: Card(
              color: Colors.grey[850],
              child: Padding(
                padding: const EdgeInsets.all(16.0),
                child: Column(
                  crossAxisAlignment: CrossAxisAlignment.center,
                  children: [
                    Text('Time until Executable',
                        style: theme.textTheme.titleMedium
                            ?.copyWith(fontFamily: 'NanumMyeongjo')),
                    const SizedBox(height: 8),
                    if (_timeRemaining != null)
                      Text(
                        _formatDuration(_timeRemaining!),
                        style: theme.textTheme.headlineMedium?.copyWith(
                          color: theme.primaryColor,
                          fontFamily: 'monospace',
                        ),
                      )
                    else
                      const Text("Calculating...",
                          style:
                              TextStyle(fontFamily: 'monospace', fontSize: 24)),
                    const SizedBox(height: 16),
                    ElevatedButton.icon(
                      onPressed: () => walletProvider.pingWill(),
                      icon: const Icon(Icons.touch_app),
                      label: const Text('Ping (Reset Timer)'),
                    )
                  ],
                ),
              ),
            ),
          ),
          const SizedBox(height: 24),
          _buildSection(theme, 'Assets in Will', [
            ListTile(
                leading: const Icon(Icons.account_balance_wallet),
                title: Text(
                    'Native Currency (${walletProvider.currentChain?.nativeCurrency.symbol})',
                    style: const TextStyle(fontFamily: 'NanumMyeongjo')),
                trailing:
                    Text(details.formattedEthBalance, style: amountStyle)),
            ...details.erc20Details.map((a) => ListTile(
                leading: const Icon(Icons.token),
                title: SelectableText(a.tokenContract,
                    style: const TextStyle(fontFamily: 'monospace')),
                trailing: Text(a.formattedBalance, style: amountStyle))),
            ...details.erc721Details.map((a) => ListTile(
                leading: const Icon(Icons.image),
                title: SelectableText(a.tokenContract,
                    style: const TextStyle(fontFamily: 'monospace')),
                subtitle: Text('Token ID: ${a.tokenId}',
                    style: const TextStyle(fontFamily: 'monospace')))),
          ]),
          _buildSection(theme, 'Heirs & Distribution', [
            for (int i = 0; i < details.heirs.length; i++)
              ListTile(
                leading: AddressAvatar(address: details.heirs[i]),
                title: SelectableText(details.heirs[i],
                    style: const TextStyle(fontFamily: 'monospace')),
                trailing: Text('${details.distributionPercentages[i]}%',
                    style: amountStyle),
              ),
            ...details.erc721Details.map((a) => ListTile(
                leading: const Icon(Icons.person_pin_circle_outlined),
                title: const Text('NFT Assigned to Heir',
                    style: TextStyle(fontFamily: 'NanumMyeongjo')),
                subtitle: SelectableText(a.heir,
                    style: const TextStyle(fontFamily: 'monospace')))),
          ]),
          const Divider(),
          const SizedBox(height: 16),
          Row(
            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
            children: [
              TextButton.icon(
                onPressed: () => walletProvider.emptyWillForEdit(),
                icon: const Icon(Icons.edit_outlined, color: Colors.blue),
                label: const Text('Edit Will',
                    style: TextStyle(
                      color: Colors.blue,
                    )),
              ),
              TextButton.icon(
                onPressed: () => walletProvider.cancelWill(),
                icon: const Icon(Icons.cancel_outlined, color: Colors.orange),
                label: const Text('Cancel & Withdraw All Assets',
                    style: TextStyle(
                      color: Colors.orange,
                    )),
              ),
            ],
          ),
          const SizedBox(height: 24),
        ],
      ),
    );
  }

  Widget _buildSection(ThemeData theme, String title, List<Widget> children) {
    return Padding(
      padding: const EdgeInsets.only(bottom: 16.0),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          Text(title,
              style: theme.textTheme.headlineSmall
                  ?.copyWith(fontFamily: 'NanumMyeongjo')),
          const Divider(),
          ...children,
        ],
      ),
    );
  }

  Widget _buildLoading(String message) {
    return Center(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
          const CircularProgressIndicator(),
          const SizedBox(height: 16),
          Text(message),
        ],
      ),
    );
  }

  Widget _buildStatusDisplay(String title, String message) {
    return Center(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
          Text(title, style: Theme.of(context).textTheme.headlineSmall),
          const SizedBox(height: 16),
          Text(message),
        ],
      ),
    );
  }
}
// lib/profile_page.dart```
```

### `lib/wallet_provider.dart`
```dart
import 'package:flutter/material.dart';
import 'package:flutter_web3/flutter_web3.dart';
import 'config/supported_chains.dart';
import 'constants.dart';
import 'creator/will_creator_provider.dart';
import 'models/chain_model.dart';
import 'models/will_details_model.dart';
import 'utils/conversions.dart';

class WalletProvider extends ChangeNotifier {
  String? _currentAddress;
  int? _currentChainId;
  Chain? _currentChain;
  String? _willContractAddress;
  WillDetails? _willDetails; // Holds the details of the deployed will

  bool _isConnected = false;
  bool _isLoading = false; // For manual connection actions
  bool _isAutoConnecting = true; // NEW: For initial app load auto-connect
  bool _isCheckingWill = false;
  bool _isDeploying = false;
  String _deploymentStatusMessage = '';

  bool _isWillActionInProgress = false;
  String _willActionMessage = '';

  String? get currentAddress => _currentAddress;
  bool get isConnected => _isConnected;
  bool get isLoading => _isLoading;
  bool get isAutoConnecting => _isAutoConnecting; // NEW: Getter for the new flag
  bool get isCheckingWill => _isCheckingWill;
  String? get willContractAddress => _willContractAddress;
  WillDetails? get willDetails => _willDetails;

  bool get isWrongNetwork => isConnected && _currentChain == null;

  bool get isDeploying => _isDeploying;
  String get deploymentStatusMessage => _deploymentStatusMessage;

  bool get isWillActionInProgress => _isWillActionInProgress;
  String get willActionMessage => _willActionMessage;

  Chain? get currentChain => _currentChain;
  List<Chain> get chains => supportedChains;

  void _updateCurrentChain(int chainId) {
    _currentChainId = chainId;
    _currentChain = supportedChainsMap[chainId];
  }

  void _setDeploymentStatus(bool deploying, [String message = '']) {
    _isDeploying = deploying;
    _deploymentStatusMessage = message;
    notifyListeners();
  }

  void _setWillActionStatus(bool inProgress, [String message = '']) {
    _isWillActionInProgress = inProgress;
    _willActionMessage = message;
    notifyListeners();
  }

  Future<void> fetchWillDetails() async {
    if (_willContractAddress == null ||
        _willContractAddress == '0x0000000000000000000000000000000000000000')
      return;

    _isCheckingWill = true;
    notifyListeners();

    try {
      final provider = Web3Provider(ethereum!);
      final contract =
          Contract(_willContractAddress!, willContractAbi, provider);

      // Fetch both details and state in parallel
      final results = await Future.wait([
        contract.call<List<dynamic>>('getWillDetails'),
        contract.call<dynamic>('currentState'), // EXPECT DYNAMIC
      ]);

      final detailsResponse = results[0] as List<dynamic>;
      // SAFELY PARSE the result, which could be int or BigInt
      final currentStateValue = BigInt.parse(results[1].toString()).toInt();

      _willDetails =
          WillDetails.fromRPCResponse(detailsResponse, currentStateValue);
    } catch (e) {
      print('Error fetching will details: $e');
      _willDetails = null;
    } finally {
      _isCheckingWill = false;
      notifyListeners();
    }
  }

  Future<void> pingWill() async {
    if (_willContractAddress == null) return;
    _setWillActionStatus(true, 'Sending Ping transaction...');
    try {
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      final contract = Contract(_willContractAddress!, willContractAbi, signer);

      final tx = await contract.send('ping');
      _setWillActionStatus(true, 'Waiting for confirmation...');
      await tx.wait();
      await fetchWillDetails();
    } catch (e) {
      print('Error pinging will: $e');
    } finally {
      _setWillActionStatus(false);
    }
  }

  Future<void> cancelWill() async {
    if (_willContractAddress == null) return;
    _setWillActionStatus(true, 'Cancelling Will contract...');
    try {
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      final contract = Contract(_willContractAddress!, willContractAbi, signer);

      final tx = await contract.send('cancelAndWithdraw');
      _setWillActionStatus(true, 'Waiting for confirmation...');
      await tx.wait();
      await checkWillStatus(); // Re-check to confirm it's gone
    } catch (e) {
      print('Error cancelling will: $e');
    } finally {
      _setWillActionStatus(false);
    }
  }

  Future<void> executeWill(String willAddress) async {
    if (!isConnected || isWrongNetwork) return;
    _setWillActionStatus(true, 'Executing Will...');
    try {
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      // Use the specific willAddress passed to the function
      final contract = Contract(willAddress, willContractAbi, signer);

      final tx = await contract.send('execute');
      _setWillActionStatus(true, 'Waiting for confirmation...');
      await tx.wait();
      // No need to fetch details here. The Firestore listener will update the UI.
    } catch (e) {
      print('Error executing will: $e');
      // Optionally show an error message to the user
    } finally {
      _setWillActionStatus(false);
    }
  }

  // Legacy will creation
  Future<bool> createWill(WillCreatorProvider creatorProvider) async {
    if (!isConnected || isWrongNetwork) {
      _setDeploymentStatus(false, 'Not connected or on wrong network.');
      return false;
    }
    _setDeploymentStatus(true, 'Preparing transaction...');
    try {
      final currentSourceContractAddress =
          _currentChain!.sourceContractAddress;
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      final sourceContract =
          Contract(currentSourceContractAddress, sourceContractAbi, signer);

      BigInt totalValue = BigInt.zero;
      if (creatorProvider.ethAmountController != null &&
          creatorProvider.ethAmountController!.text.isNotEmpty) {
        totalValue += etherToWei(creatorProvider.ethAmountController!.text);
      }
      for (int i = 0; i < creatorProvider.erc20Assets.length; i++) {
        final asset = creatorProvider.erc20Assets[i];
        final tokenAddress = asset.contractAddressController.text;
        final tokenAmountInWei = etherToWei(asset.amountController.text);
        _setDeploymentStatus(
            true,
            'Approving ERC20 Token ${i + 1}/${creatorProvider.erc20Assets.length}...');
        final tokenContract = Contract(tokenAddress, erc20ApproveAbi, signer);
        final tx = await tokenContract
            .send('approve', [currentSourceContractAddress, tokenAmountInWei]);
        await tx.wait();
      }
      for (int i = 0; i < creatorProvider.nftAssets.length; i++) {
        final asset = creatorProvider.nftAssets[i];
        final nftAddress = asset.contractAddressController.text;
        final tokenId = int.parse(asset.tokenIdController.text);
        _setDeploymentStatus(true,
            'Approving NFT ${i + 1}/${creatorProvider.nftAssets.length}...');
        final nftContract = Contract(nftAddress, erc721ApproveAbi, signer);
        final tx = await nftContract
            .send('approve', [currentSourceContractAddress, tokenId]);
        await tx.wait();
      }
      _setDeploymentStatus(true, 'Deploying Will contract...');
      final heirs =
          creatorProvider.heirControllers.map((c) => c.text).toList();
      final distribution = creatorProvider.distributionPercentages
          .map((p) => p.round())
          .toList();
      final interval = creatorProvider.executionMinutes.round() * 60;
      final erc20s = creatorProvider.erc20Assets
          .map((a) => {
                "tokenContract": a.contractAddressController.text,
                "amount": etherToWei(a.amountController.text)
              })
          .toList();
      final nfts = creatorProvider.nftAssets
          .map((a) => {
                "tokenContract": a.contractAddressController.text,
                "tokenId": int.parse(a.tokenIdController.text),
                "heir": a.assignedHeir
              })
          .toList();
      final deployTx = await sourceContract.send(
          'createWill',
          [interval, heirs, distribution, erc20s, nfts],
          TransactionOverride(value: totalValue));
      _setDeploymentStatus(true, 'Finalizing deployment...');
      await deployTx.wait();

      // FIXED: Added delay to prevent race condition with RPC node
      await Future.delayed(const Duration(seconds: 2));

      _setDeploymentStatus(true, 'Success! Refreshing status...');
      await checkWillStatus();
      _setDeploymentStatus(false);
      return true;
    } catch (e) {
      print('Deployment error: $e');
      _setDeploymentStatus(false, 'An error occurred: ${e.toString()}');
      return false;
    }
  }

  // New method for creating an empty will with a diary
  Future<bool> createWillDiary() async {
    if (!isConnected || isWrongNetwork) {
      _setDeploymentStatus(false, 'Not connected or on wrong network.');
      return false;
    }
    _setDeploymentStatus(true, 'Preparing to deploy Diary contract...');
    try {
      final sourceContractAddress = _currentChain!.sourceContractAddress;
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      final sourceContract =
          Contract(sourceContractAddress, sourceContractAbi, signer);

      _setDeploymentStatus(true, 'Fetching Diary fee...');
      final fee = await sourceContract.call<BigInt>('diaryPlatformFee');

      _setDeploymentStatus(true, 'Please confirm transaction...');
      final tx = await sourceContract
          .send('createWillDiary', [], TransactionOverride(value: fee));

      _setDeploymentStatus(true, 'Deploying...');
      await tx.wait();

      // FIXED: Added delay to prevent race condition with RPC node
      await Future.delayed(const Duration(seconds: 2));

      _setDeploymentStatus(true, 'Success! Refreshing status...');
      await checkWillStatus();
      return true;
    } catch (e) {
      print('Diary Will creation error: $e');
      _setDeploymentStatus(false, 'An error occurred: ${e.toString()}');
      return false;
    } finally {
      _setDeploymentStatus(false);
    }
  }

  // New method to configure an existing, empty will
  Future<bool> fundAndConfigureWill(
      WillCreatorProvider creatorProvider) async {
    if (!isConnected || isWrongNetwork || _willContractAddress == null) {
      _setWillActionStatus(false, 'Not ready to configure.');
      return false;
    }
    _setWillActionStatus(true, 'Preparing to configure your Will...');
    try {
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      final willContract =
          Contract(_willContractAddress!, willContractAbi, signer);

      BigInt totalValue = BigInt.zero;
      if (creatorProvider.ethAmountController != null &&
          creatorProvider.ethAmountController!.text.isNotEmpty) {
        totalValue += etherToWei(creatorProvider.ethAmountController!.text);
      }

      // Approvals now need to be for the willContractAddress itself
      for (int i = 0; i < creatorProvider.erc20Assets.length; i++) {
        final asset = creatorProvider.erc20Assets[i];
        final tokenAddress = asset.contractAddressController.text;
        final tokenAmountInWei = etherToWei(asset.amountController.text);
        _setWillActionStatus(
            true,
            'Approving ERC20 Token ${i + 1}/${creatorProvider.erc20Assets.length}...');
        final tokenContract = Contract(tokenAddress, erc20ApproveAbi, signer);
        final tx = await tokenContract
            .send('approve', [_willContractAddress, tokenAmountInWei]);
        await tx.wait();
      }
      for (int i = 0; i < creatorProvider.nftAssets.length; i++) {
        final asset = creatorProvider.nftAssets[i];
        final nftAddress = asset.contractAddressController.text;
        final tokenId = int.parse(asset.tokenIdController.text);
        _setWillActionStatus(true,
            'Approving NFT ${i + 1}/${creatorProvider.nftAssets.length}...');
        final nftContract = Contract(nftAddress, erc721ApproveAbi, signer);
        final tx =
            await nftContract.send('approve', [_willContractAddress, tokenId]);
        await tx.wait();
      }

      _setWillActionStatus(true, 'Configuring Will...');
      final heirs =
          creatorProvider.heirControllers.map((c) => c.text).toList();
      final distribution = creatorProvider.distributionPercentages
          .map((p) => p.round())
          .toList();
      final interval = creatorProvider.executionMinutes.round() * 60;
      final erc20s = creatorProvider.erc20Assets
          .map((a) => {
                "tokenContract": a.contractAddressController.text,
                "amount": etherToWei(a.amountController.text)
              })
          .toList();
      final nfts = creatorProvider.nftAssets
          .map((a) => {
                "tokenContract": a.contractAddressController.text,
                "tokenId": int.parse(a.tokenIdController.text),
                "heir": a.assignedHeir
              })
          .toList();

      final tx = await willContract.send(
          'fundAndConfigure',
          [interval, heirs, distribution, erc20s, nfts],
          TransactionOverride(value: totalValue));

      _setWillActionStatus(true, 'Finalizing configuration...');
      await tx.wait();
      _setWillActionStatus(true, 'Success! Refreshing...');
      await fetchWillDetails();
      return true;
    } catch (e) {
      print('Will configuration error: $e');
      _setWillActionStatus(false, 'An error occurred: ${e.toString()}');
      return false;
    } finally {
      _setWillActionStatus(false);
    }
  }

  // New method to empty a will for editing
  Future<void> emptyWillForEdit() async {
    if (_willContractAddress == null) return;
    _setWillActionStatus(true, 'Preparing Will for editing...');
    try {
      final provider = Web3Provider(ethereum!);
      final signer = provider.getSigner();
      final contract = Contract(_willContractAddress!, willContractAbi, signer);

      final tx = await contract.send('emptyWillForEdit');
      _setWillActionStatus(
          true, 'Returning assets and waiting for confirmation...');
      await tx.wait();
      await fetchWillDetails();
    } catch (e) {
      print('Error emptying will: $e');
    } finally {
      _setWillActionStatus(false);
    }
  }

  Future<bool> connectWallet() async {
    if (!Ethereum.isSupported) return false;

    _isLoading = true; // This now ONLY affects manual connection UIs
    notifyListeners();

    try {
      final accs = await ethereum!.requestAccount();
      if (accs.isNotEmpty) {
        _currentAddress = accs.first;
        _isConnected = true;
        _updateCurrentChain(await ethereum!.getChainId());
        await checkWillStatus();
        _isLoading = false;
        notifyListeners();
        return true;
      } else {
        _isLoading = false;
        notifyListeners();
        return false;
      }
    } catch (e) {
      print('Error connecting to wallet: $e');
      _isLoading = false;
      notifyListeners();
      return false;
    }
  }

  Future<void> disconnect() async {
    _currentAddress = null;
    _isConnected = false;
    _willContractAddress = null;
    _willDetails = null;
    _currentChainId = null;
    _currentChain = null;
    notifyListeners();
  }

  Future<void> autoConnect() async {
    if (Ethereum.isSupported) {
      try {
        final accs = await ethereum!.getAccounts();
        if (accs.isNotEmpty) {
          _currentAddress = accs.first;
          _isConnected = true;
          _updateCurrentChain(await ethereum!.getChainId());
          await checkWillStatus();
        }
      } catch (e) {
        print('Error auto connecting to wallet: $e');
      }
    }
  }

  Future<void> checkWillStatus() async {
    if (!isConnected || isWrongNetwork) {
      _willContractAddress = null;
      _willDetails = null;
      if (isConnected)
        notifyListeners(); // Notify if wrong network to update UI
      return;
    }
    _isCheckingWill = true;
    notifyListeners();
    try {
      final provider = Web3Provider(ethereum!);
      final sourceContract =
          Contract(_currentChain!.sourceContractAddress, sourceContractAbi, provider);
      final result =
          await sourceContract.call<String>('userWills', [currentAddress]);
      const zeroAddress = '0x0000000000000000000000000000000000000000';
      if (result.toLowerCase() != zeroAddress) {
        _willContractAddress = result;
        await fetchWillDetails();
      } else {
        _willContractAddress = null;
        _willDetails = null;
      }
    } catch (e) {
      print('Error checking will status: $e');
      _willContractAddress = null;
      _willDetails = null;
    } finally {
      _isCheckingWill = false;
      notifyListeners();
    }
  }

  Future<void> switchNetwork(int chainId) async {
    if (Ethereum.isSupported) {
      try {
        await ethereum!.walletSwitchChain(chainId);
      } catch (e) {
        if (e.toString().contains('4902')) {
          await addNetwork(chainId);
        } else {
          print('Error switching network: $e');
        }
      }
    }
  }

  Future<void> addNetwork(int chainId) async {
    final chainToAdd = supportedChainsMap[chainId];
    if (chainToAdd == null) return;
    if (Ethereum.isSupported) {
      try {
        await ethereum!.walletAddChain(
          chainId: chainToAdd.chainId,
          chainName: chainToAdd.chainName,
          nativeCurrency: chainToAdd.nativeCurrency,
          rpcUrls: [chainToAdd.rpcUrl],
          blockExplorerUrls: [chainToAdd.explorerUrl],
        );
      } catch (e) {
        print('Error adding network: $e');
      }
    }
  }

  void onAccountsChanged(List<String> accounts) {
    if (accounts.isEmpty) {
      disconnect();
    } else {
      _currentAddress = accounts.first;
      _isConnected = true;
      checkWillStatus();
    }
  }

  void onChainChanged(int chainId) {
    _updateCurrentChain(chainId);
    notifyListeners();
    if (isConnected) {
      checkWillStatus();
    }
  }

  Future<void> _performAutoConnect() async {
    await autoConnect();
    _isAutoConnecting = false;
    notifyListeners();
  }

  WalletProvider() {
    if (Ethereum.isSupported) {
      ethereum!.onAccountsChanged(onAccountsChanged);
      ethereum!.onChainChanged(onChainChanged);
      _performAutoConnect();
    } else {
      _isAutoConnecting = false;
    }
  }
}
// lib/wallet_provider.dart
```

### `lib/config/supported_chains.dart`
```dart
// lib/config/supported_chains.dart
import 'package:afterme_web/models/chain_model.dart';
import 'package:flutter_web3/flutter_web3.dart';

/// A list of all chains supported by the dApp.
/// To add a new chain, simply add a new `Chain` object to this list.
final List<Chain> supportedChains = [
  Chain(
    chainId: 128123,
    chainName: "Etherlink-Testnet",
    rpcUrl: "https://node.ghostnet.etherlink.com",
    explorerUrl: "https://testnet.explorer.etherlink.com",
    nativeCurrency: CurrencyParams(name: 'Tezos', symbol: 'XTZ', decimals: 18),
    sourceContractAddress: "0x9648f6f415bE0B8c31843873d246B5A68a63c352",
  ),
  // Example of how to add another chain in the future:
  // Chain(
  //   chainId: 421613,
  //   chainName: "Arbitrum Goerli",
  //   rpcUrl: "https://goerli-rollup.arbitrum.io/rpc",
  //   explorerUrl: "https://goerli.arbiscan.io/",
  //   nativeCurrency: CurrencyParams(name: 'AGOR', symbol: 'AGOR', decimals: 18),
  //   sourceContractAddress: "0xYourContractAddressOnArbitrumGoerli",
  // ),
];

/// A map of chain IDs to Chain objects for quick lookups.
final Map<int, Chain> supportedChainsMap = {
  for (var chain in supportedChains) chain.chainId: chain
};
// lib/config/supported_chains.dart
```

### `lib/creator/will_configurator.dart`
```dart
import 'package:afterme_web/creator/steps/step_4_timeout.dart';
import 'package:afterme_web/creator/steps/step_5_review.dart';
import 'package:afterme_web/creator/will_creator_provider.dart';
import 'package:afterme_web/utils/validators.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../wallet_provider.dart';
import 'package:afterme_web/widgets/animated_step_container.dart';
import 'package:afterme_web/widgets/step_progress_indicator.dart';
import 'steps/step_1_heirs.dart';
import 'steps/step_2_assets.dart';
import 'steps/step_3_distribution.dart';

class WillConfigurator extends StatefulWidget {
  const WillConfigurator({super.key});

  @override
  State<WillConfigurator> createState() => _WillConfiguratorState();
}

class _WillConfiguratorState extends State<WillConfigurator> {
  int _currentStep = 0;
  late final WillCreatorProvider _willCreatorProvider;
  bool _showFooter = false;

  @override
  void initState() {
    super.initState();
    _willCreatorProvider = WillCreatorProvider(
      walletProvider: context.read<WalletProvider>(),
    );
    // Since this is embedded, we can show the footer immediately.
    WidgetsBinding.instance.addPostFrameCallback((_) {
      if (mounted) setState(() => _showFooter = true);
    });
  }

  final List<Map<String, dynamic>> _steps = [
    {
      "title": "Step 1 - Add Heirs",
      "description":
          "Specify the wallet addresses of the people who will inherit your crypto assets.",
      "content": const Step1Heirs(),
    },
    {
      "title": "Step 2 - Add Assets",
      "description": "Select the tokens to include in your will.",
      "content": const Step2Assets(),
    },
    {
      "title": "Step 3 - Distribute Assets",
      "description":
          "Allocate percentages of your fungible assets and assign specific NFTs to your heirs.",
      "content": const Step3Distribution(),
    },
    {
      "title": "Step 4 - Set Timeout",
      "description":
          "Define the inactivity period. If you don't 'ping' your Will contract for this duration, it becomes executable.",
      "content": const Step4Timeout(),
    },
    {
      "title": "Step 5 - Review & Configure",
      "description":
          "Review the details. This will fund your deployed Will contract and make it active.",
      "content": const Step5Review(),
    },
  ];

  void _goToStep(int step) {
    setState(() {
      _currentStep = step;
      _showFooter = false; // Trigger re-animation of footer
      Future.delayed(
          const Duration(milliseconds: 100), () => setState(() => _showFooter = true));
    });
  }

  bool _isStepValid(WillCreatorProvider provider) {
    switch (_currentStep) {
      case 0:
        if (provider.heirControllers.isEmpty) return false;
        return provider.heirControllers.every((controller) {
          return isValidEthereumAddress(controller.text.trim());
        });
      case 1:
        final bool isEthAdded = provider.ethAmountController != null;
        final bool areErc20sAdded = provider.erc20Assets.isNotEmpty;
        final bool areNftsAdded = provider.nftAssets.isNotEmpty;
        if (!isEthAdded && !areErc20sAdded && !areNftsAdded) return false;
        if (isEthAdded) {
          final ethText = provider.ethAmountController!.text.trim();
          if (ethText.isEmpty ||
              double.tryParse(ethText) == null ||
              double.parse(ethText) <= 0) return false;
        }
        if (areErc20sAdded) {
          final allValid = provider.erc20Assets.every((asset) {
            final address = asset.contractAddressController.text.trim();
            final amount = asset.amountController.text.trim();
            return isValidEthereumAddress(address) &&
                amount.isNotEmpty &&
                double.tryParse(amount) != null &&
                double.parse(amount) > 0;
          });
          if (!allValid) return false;
        }
        if (areNftsAdded) {
          final allValid = provider.nftAssets.every((asset) {
            final address = asset.contractAddressController.text.trim();
            final tokenId = asset.tokenIdController.text.trim();
            return isValidEthereumAddress(address) &&
                tokenId.isNotEmpty &&
                int.tryParse(tokenId) != null;
          });
          if (!allValid) return false;
        }
        return true;
      case 2:
        return provider.nftAssets
            .every((nft) => nft.assignedHeir != null && nft.assignedHeir!.isNotEmpty);
      default:
        return true;
    }
  }

  Future<void> _handleConfigure() async {
    final walletProvider = context.read<WalletProvider>();
    final success =
        await walletProvider.fundAndConfigureWill(_willCreatorProvider);

    if (mounted && !success) {
      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
        content:
            Text('Configuration failed: ${walletProvider.willActionMessage}'),
        backgroundColor: Colors.red,
      ));
    }
    // On success, the provider will refresh and the ProfilePage will rebuild automatically.
  }

  @override
  void dispose() {
    _willCreatorProvider.dispose();
    super.dispose();
  }

  @override
  Widget build(BuildContext context) {
    return ChangeNotifierProvider.value(
      value: _willCreatorProvider,
      child: Builder(
        builder: (context) {
          final creatorProvider = context.watch<WillCreatorProvider>();
          final isLastStep = _currentStep == _steps.length - 1;
          final isFirstStep = _currentStep == 0;
          final isStepValid = _isStepValid(creatorProvider);

          return Column(
            children: [
              Expanded(
                child: SingleChildScrollView(
                  padding: const EdgeInsets.symmetric(horizontal: 24.0),
                  child: Column(
                    children: [
                      const SizedBox(height: 48),
                      AnimatedStepContainer(
                        key: ValueKey(_currentStep),
                        title: _steps[_currentStep]['title'],
                        description: _steps[_currentStep]['description'],
                        content: _steps[_currentStep]['content'],
                        onAnimationCompleted: () {},
                      ),
                      const SizedBox(height: 64),
                    ],
                  ),
                ),
              ),
              _buildNavigationFooter(isFirstStep, isLastStep, isStepValid),
            ],
          );
        },
      ),
    );
  }

  Widget _buildNavigationFooter(
      bool isFirstStep, bool isLastStep, bool isStepValid) {
    return AnimatedSwitcher(
      duration: const Duration(milliseconds: 300),
      transitionBuilder: (child, animation) =>
          FadeTransition(opacity: animation, child: child),
      child: !_showFooter
          ? const SizedBox(key: ValueKey('empty_footer'), height: 80)
          : Padding(
              key: const ValueKey('nav_footer'),
              padding:
                  const EdgeInsets.symmetric(horizontal: 24.0, vertical: 20.0),
              child: Row(
                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                children: [
                  isFirstStep
                      ? const SizedBox(width: 110)
                      : ElevatedButton(
                          onPressed: () => _goToStep(_currentStep - 1),
                          style: ElevatedButton.styleFrom(
                              minimumSize: const Size(110, 40),
                              backgroundColor: Colors.grey.shade800,
                              foregroundColor: Colors.white),
                          child: const Text('Back'),
                        ),
                  StepProgressIndicator(
                    totalSteps: _steps.length,
                    currentStep: _currentStep,
                  ),
                  ElevatedButton(
                    onPressed: !isStepValid
                        ? null
                        : () {
                            if (isLastStep) {
                              _handleConfigure();
                            } else {
                              _goToStep(_currentStep + 1);
                            }
                          },
                    style:
                        ElevatedButton.styleFrom(minimumSize: const Size(110, 40)),
                    child: Text(isLastStep ? ' FUND & CONFIGURE ' : 'Next'),
                  ),
                ],
              ),
            ),
    );
  }
}
// lib/creator/will_configurator.dart
```

### `lib/creator/will_creator_provider.dart`
```dart
import 'package:afterme_web/wallet_provider.dart';
import 'package:flutter/material.dart';
// Import for min/max functions
import '../models/asset_models.dart';

class WillCreatorProvider extends ChangeNotifier {
  final WalletProvider _walletProvider;

  static const double totalDistributable = 100.0;
  static const double minPercentage = 1.0;

  // Step 1: Heirs
  final List<TextEditingController> heirControllers = [];

  // Step 2: Assets
  TextEditingController? ethAmountController;
  final List<Erc20Asset> erc20Assets = [];
  final List<NftAsset> nftAssets = [];

  // Step 3: Distribution
  List<double> distributionPercentages = [];
  final List<bool> distributionLocks = [];
  final Map<int, String> nftHeirAssignments = {};

  // Step 4: Timeout
  double executionMinutes = 30.0;

  String get chainName =>
      _walletProvider.currentChain?.nativeCurrency.symbol ?? 'Native Token';

  WillCreatorProvider({required WalletProvider walletProvider})
      : _walletProvider = walletProvider {
    addHeir();
  }

  // --- Step 1 Methods ---
  void addHeir() {
    final controller = TextEditingController();
    controller.addListener(notifyListeners);
    heirControllers.add(controller);
    distributionLocks.add(false);
    distributionPercentages.add(0.0);

    // RULE 1 IMPLEMENTATION: When transitioning from 1 to 2 heirs,
    // unlock the first heir which was automatically locked.
    if (heirControllers.length == 2 && distributionLocks[0] == true) {
      distributionLocks[0] = false;
    }

    _rebalanceAllUnlocked();
    notifyListeners();
  }

  void removeHeir(int index) {
    if (heirControllers.length > 1) {
      final controller = heirControllers[index];
      controller.removeListener(notifyListeners);
      controller.dispose();
      heirControllers.removeAt(index);
      distributionLocks.removeAt(index);
      distributionPercentages.removeAt(index);
      _rebalanceAllUnlocked();
      notifyListeners();
    }
  }

  // --- Step 2 Methods (Unchanged) ---
  void addEth() {
    if (ethAmountController == null) {
      ethAmountController = TextEditingController();
      ethAmountController!.addListener(notifyListeners);
      notifyListeners();
    }
  }

  void removeEth() {
    ethAmountController?.removeListener(notifyListeners);
    ethAmountController?.dispose();
    ethAmountController = null;
    notifyListeners();
  }

  void addErc20() {
    final asset = Erc20Asset();
    asset.contractAddressController.addListener(notifyListeners);
    asset.amountController.addListener(notifyListeners);
    erc20Assets.add(asset);
    notifyListeners();
  }

  void removeErc20(int index) {
    erc20Assets[index].dispose(notifyListeners);
    erc20Assets.removeAt(index);
    notifyListeners();
  }

  void addNft() {
    final asset = NftAsset();
    asset.contractAddressController.addListener(notifyListeners);
    asset.tokenIdController.addListener(notifyListeners);
    nftAssets.add(asset);
    notifyListeners();
  }

  void removeNft(int index) {
    nftAssets[index].dispose(notifyListeners);
    nftAssets.removeAt(index);
    nftHeirAssignments.remove(index);
    notifyListeners();
  }

  // --- Step 3 Methods ---

  void _distribute(double total, List<int> indices,
      {double minVal = minPercentage}) {
    if (indices.isEmpty) return;

    int totalInt = total.round();
    int minValInt = minVal.round();

    // Fallback for cases where total can't support minVal for everyone
    if (totalInt < indices.length * minValInt) {
      int equalShare = totalInt ~/ indices.length;
      int remainder = totalInt % indices.length;
      for (int i = 0; i < indices.length; i++) {
        distributionPercentages[indices[i]] =
            (equalShare + (i < remainder ? 1 : 0)).toDouble();
      }
      return;
    }

    int distributableTotal = totalInt - (indices.length * minValInt);
    int baseAmount = distributableTotal ~/ indices.length;
    int remainder = distributableTotal % indices.length;

    for (int i = 0; i < indices.length; i++) {
      int index = indices[i];
      int extra = (i < remainder) ? 1 : 0;
      distributionPercentages[index] =
          (minValInt + baseAmount + extra).toDouble();
    }
  }

  double _getLockedTotal() {
    double total = 0.0;
    for (int i = 0; i < distributionLocks.length; i++) {
      if (distributionLocks[i]) {
        total += distributionPercentages[i];
      }
    }
    return total;
  }

  void _rebalanceAllUnlocked() {
    if (heirControllers.length == 1) {
      distributionPercentages[0] = totalDistributable;
      distributionLocks[0] = true;
      return;
    }

    final lockedTotal = _getLockedTotal();
    final unlockedIndices = [
      for (int i = 0; i < distributionLocks.length; i++)
        if (!distributionLocks[i]) i
    ];

    // RULE 2 IMPLEMENTATION: If only one slider remains unlocked,
    // automatically lock it by assigning it the remainder.
    if (unlockedIndices.length == 1) {
      final lastIndex = unlockedIndices.first;
      distributionPercentages[lastIndex] =
          (totalDistributable - lockedTotal).round().toDouble();
      distributionLocks[lastIndex] = true;
    } else {
      _distribute(totalDistributable - lockedTotal, unlockedIndices);
    }
  }

  // RULE 3 IMPLEMENTATION: The "Reset" button is the only way to unlock.
  void resetDistribution() {
    for (int i = 0; i < distributionLocks.length; i++) {
      distributionLocks[i] = false;
    }
    _rebalanceAllUnlocked();
    nftHeirAssignments.clear();
    notifyListeners();
  }

  // RULE 3 IMPLEMENTATION: This is now a one-way lock action.
  void lockDistribution(int index) {
    if (distributionLocks[index]) return; // Do nothing if already locked

    // Snap the value to an integer before locking.
    distributionPercentages[index] =
        distributionPercentages[index].round().toDouble();
    distributionLocks[index] = true;

    // Rebalance the other unlocked sliders. This will also trigger the "lock last one" rule if needed.
    _rebalanceAllUnlocked();
    notifyListeners();
  }

  void updateDistribution(int updatedIndex, double rawNewValue) {
    if (heirControllers.length == 1 || distributionLocks[updatedIndex]) return;

    final lockedTotal = _getLockedTotal();
    final unlockedIndices = [
      for (int i = 0; i < distributionLocks.length; i++)
        if (!distributionLocks[i]) i
    ];
    final otherUnlockedIndices =
        unlockedIndices.where((i) => i != updatedIndex).toList();

    double maxVal = totalDistributable -
        lockedTotal -
        (otherUnlockedIndices.length * minPercentage);

    double roundedValue = rawNewValue.round().toDouble();
    double clampedValue = roundedValue.clamp(minPercentage, maxVal);

    distributionPercentages[updatedIndex] = clampedValue;

    double remainingForOthers = totalDistributable - lockedTotal - clampedValue;
    _distribute(remainingForOthers, otherUnlockedIndices);

    notifyListeners();
  }

  // --- Unchanged Methods ---
  void assignNftToHeir(int nftIndex, String heirAddress) {
    nftAssets[nftIndex].assignedHeir = heirAddress;
    notifyListeners();
  }

  void setExecutionMinutes(double minutes) {
    executionMinutes = minutes;
    notifyListeners();
  }

  @override
  void dispose() {
    for (var controller in heirControllers) {
      controller.removeListener(notifyListeners);
      controller.dispose();
    }
    ethAmountController?.removeListener(notifyListeners);
    ethAmountController?.dispose();
    for (var asset in erc20Assets) {
      asset.dispose(notifyListeners);
    }
    for (var asset in nftAssets) {
      asset.dispose(notifyListeners);
    }
    super.dispose();
  }
}
// lib/creator/will_creator_provider.dart
```

### `lib/creator/will_creator_wizard.dart`
```dart
import 'package:afterme_web/utils/validators.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../wallet_provider.dart';
import 'will_creator_provider.dart';
import 'package:afterme_web/widgets/animated_step_container.dart';
import 'package:afterme_web/widgets/step_progress_indicator.dart';
import 'steps/step_1_heirs.dart';
import 'steps/step_2_assets.dart';
import 'steps/step_3_distribution.dart';
import 'steps/step_4_timeout.dart';
import 'steps/step_5_review.dart';

class WillCreatorWizard extends StatefulWidget {
  const WillCreatorWizard({super.key});

  @override
  State<WillCreatorWizard> createState() => _WillCreatorWizardState();
}

class _WillCreatorWizardState extends State<WillCreatorWizard> {
  int _currentStep = 0;
  late final WillCreatorProvider _willCreatorProvider;
  bool _showFooter = false;

  @override
  void initState() {
    super.initState();
    _willCreatorProvider = WillCreatorProvider(
      walletProvider: context.read<WalletProvider>(),
    );
  }

  // MODIFIED: Updated the description for Step 5 to be more accurate.
  final List<Map<String, dynamic>> _steps = [
    {
      "title": "Step 1 - Add Heirs",
      "description": "Specify the wallet addresses of the people who will inherit your crypto assets.\nYou can add as many as needed. The distribution will be configured separtely.",
      "content": const Step1Heirs(),
    },
    {
      "title": "Step 2 - Add Assets",
      "description": "The tokens to include in your will. ",
      "content": const Step2Assets(),
    },
    {
      "title": "Step 3 - Distribute Assets",
      "description": "Allocate percentages of your fungible assets and assign specific NFTs to your heirs.",
      "content": const Step3Distribution(),
    },
    {
      "title": "Step 4 - Set Timeout",
      "description": "Define the inactivity period. If you don't 'ping' your Will contract for this duration, it becomes executable.",
      "content": const Step4Timeout(),
    },
    {
      "title": "Step 5 - Review & Deploy",
      "description": "Carefully review all details before deploying your Will contract. This action will commit the contract to the blockchain.",
      "content": const Step5Review(),
    },
  ];

  void _goToStep(int step) {
    setState(() {
      _currentStep = step;
      _showFooter = false;
    });
  }

  bool _isStepValid(WillCreatorProvider provider) {
    switch (_currentStep) {
      case 0:
        if (provider.heirControllers.isEmpty) return false;
        return provider.heirControllers.every((controller) {
          return isValidEthereumAddress(controller.text.trim());
        });
      case 1:
        final bool isEthAdded = provider.ethAmountController != null;
        final bool areErc20sAdded = provider.erc20Assets.isNotEmpty;
        final bool areNftsAdded = provider.nftAssets.isNotEmpty;
        if (!isEthAdded && !areErc20sAdded && !areNftsAdded) return false;
        if (isEthAdded) {
          final ethText = provider.ethAmountController!.text.trim();
          if (ethText.isEmpty || double.tryParse(ethText) == null || double.parse(ethText) <= 0) return false;
        }
        if (areErc20sAdded) {
          final allValid = provider.erc20Assets.every((asset) {
            final address = asset.contractAddressController.text.trim();
            final amount = asset.amountController.text.trim();
            return isValidEthereumAddress(address) && amount.isNotEmpty && double.tryParse(amount) != null && double.parse(amount) > 0;
          });
          if (!allValid) return false;
        }
        if (areNftsAdded) {
          final allValid = provider.nftAssets.every((asset) {
            final address = asset.contractAddressController.text.trim();
            final tokenId = asset.tokenIdController.text.trim();
            return isValidEthereumAddress(address) && tokenId.isNotEmpty && int.tryParse(tokenId) != null;
          });
          if (!allValid) return false;
        }
        return true;
      case 2:
        return provider.nftAssets.every((nft) => nft.assignedHeir != null && nft.assignedHeir!.isNotEmpty);
      default:
        return true;
    }
  }

  // MODIFIED: Removed the confirmation dialog for a direct deployment call.
  Future<void> _handleDeploy() async {
    final walletProvider = context.read<WalletProvider>();
    
    // Proceed directly to the deployment call.
    final success = await walletProvider.createWill(_willCreatorProvider);

    if (mounted) {
      if (success) {
        // On success, pop the wizard page to return to the dashboard.
        Navigator.of(context).pop();
      } else {
        // On failure, show an error message.
        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
          content: Text('Deployment failed: ${walletProvider.deploymentStatusMessage}'),
          backgroundColor: Colors.red,
        ));
      }
    }
  }

  @override
  void dispose() {
    _willCreatorProvider.dispose();
    super.dispose();
  }

  @override
  Widget build(BuildContext context) {
    final walletState = context.watch<WalletProvider>();
    return ChangeNotifierProvider.value(
      value: _willCreatorProvider,
      child: Builder(
        builder: (context) {
          final creatorProvider = context.watch<WillCreatorProvider>();
          final isLastStep = _currentStep == _steps.length - 1;
          final isFirstStep = _currentStep == 0;
          final isStepValid = _isStepValid(creatorProvider);
          final address = walletState.currentAddress;
          String formattedAddress = '';
          if (address != null && address.length > 10) {
            formattedAddress = '${address.substring(0, 6)}...${address.substring(address.length - 4)}';
          } else {
            formattedAddress = address ?? '';
          }
          return Scaffold(
            extendBodyBehindAppBar: true,
            appBar: AppBar(
              title: Text(formattedAddress, style: const TextStyle(fontFamily: 'monospace', fontSize: 16)),
              backgroundColor: Colors.transparent,
              elevation: 0,
              scrolledUnderElevation: 0,
              automaticallyImplyLeading: false,
              actions: [
              Container(
              height: 39,
              padding: const EdgeInsets.symmetric(horizontal: 12),
              decoration: BoxDecoration(
                  border: Border.all(
                      width: 0.1,
                      color: Theme.of(context).textTheme.bodyLarge!.color!),
                  color: Theme.of(context).indicatorColor.withOpacity(0.1)),
              child: Row(
                children: [
                  Icon(
                    Icons.connect_without_contact_sharp,
                    size: 29,
                    color: Theme.of(context).indicatorColor,
                  ),
                  const SizedBox(width: 12),
                  Text(
                    walletState.currentChain?.chainName ?? 'Unsupported Network',
                    style: TextStyle(
                        color: Theme.of(context).indicatorColor, fontSize: 15),
                  ), 
                ],
              )),
              ],
            ),
            body: Container(
              decoration: BoxDecoration(
                gradient: LinearGradient(
                  begin: Alignment.centerLeft,
                  end: Alignment.centerRight,
                  stops: const [0.0, 0.23],
                  colors: [const Color.fromARGB(255, 38, 38, 38), Colors.transparent],
                ),
              ),
              child: Stack(
                children: [
                  Center(
                    child: ConstrainedBox(
                      constraints: const BoxConstraints(maxWidth: 800),
                      child: Column(
                        children: [
                          Expanded(
                            child: SingleChildScrollView(
                              padding: const EdgeInsets.symmetric(horizontal: 24.0),
                              child: Column(
                                children: [
                                  SizedBox(height: MediaQuery.of(context).size.height * 0.1),
                                  AnimatedStepContainer(
                                    key: ValueKey(_currentStep),
                                    title: _steps[_currentStep]['title'],
                                    description: _steps[_currentStep]['description'],
                                    content: _steps[_currentStep]['content'],
                                    onAnimationCompleted: () {
                                      if (!_showFooter && mounted) setState(() => _showFooter = true);
                                    },
                                  ),
                                  const SizedBox(height: 64),
                                ],
                              ),
                            ),
                          ),
                          _buildNavigationFooter(walletState, isFirstStep, isLastStep, isStepValid),
                        ],
                      ),
                    ),
                  ),
                  if (walletState.isDeploying)
                    Container(
                      color: Colors.black.withOpacity(0.7),
                      child: Center(
                        child: Column(
                          mainAxisSize: MainAxisSize.min,
                          children: [
                            const CircularProgressIndicator(),
                            const SizedBox(height: 20),
                            Text(walletState.deploymentStatusMessage, style: Theme.of(context).textTheme.titleLarge, textAlign: TextAlign.center),
                          ],
                        ),
                      ),
                    ),
                ],
              ),
            ),
            
          );
        },
      ),
    );
  }

  Widget _buildNavigationFooter(WalletProvider walletProvider, bool isFirstStep, bool isLastStep, bool isStepValid) {
    return AnimatedSwitcher(
      duration: const Duration(milliseconds: 300),
      transitionBuilder: (child, animation) => FadeTransition(opacity: animation, child: child),
      child: !_showFooter
          ? const SizedBox(key: ValueKey('empty_footer'), height: 80)
          : Padding(
              key: const ValueKey('nav_footer'),
              padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 20.0),
              child: Row(
                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                children: [
                  isFirstStep
                      ? const SizedBox(width: 110)
                      : ElevatedButton(
                          onPressed: walletProvider.isDeploying ? null : () => _goToStep(_currentStep - 1),
                          style: ElevatedButton.styleFrom(minimumSize: const Size(110, 40), backgroundColor: Colors.grey.shade800, foregroundColor: Colors.white),
                          child: const Text('Back'),
                        ),
                  StepProgressIndicator(
                    totalSteps: _steps.length,
                    currentStep: _currentStep,
                  ),
                  ElevatedButton(
                    onPressed: walletProvider.isDeploying || !isStepValid
                        ? null
                        : () {
                            if (isLastStep) {
                              _handleDeploy();
                            } else {
                              _goToStep(_currentStep + 1);
                            }
                          },
                    style: ElevatedButton.styleFrom(minimumSize: const Size(110, 40)),
                    child: Text(isLastStep ? ' DEPLOY WILL ' : 'Next'),
                  ),
                ],
              ),
            ),
    );
  }
}
```

### `lib/creator/steps/step_1_heirs.dart`
```dart
import 'package:afterme_web/utils/validators.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../will_creator_provider.dart';

class Step1Heirs extends StatefulWidget {
  const Step1Heirs({super.key});

  @override
  State<Step1Heirs> createState() => _Step1HeirsState();
}

class _Step1HeirsState extends State<Step1Heirs> {
  // Use a map to store error messages for each controller
  final Map<TextEditingController, String?> _errors = {};

  void _validateAddress(TextEditingController controller) {
    final text = controller.text.trim();
    if (text.isEmpty) {
      _errors[controller] = 'Address cannot be empty.';
    } else if (!isValidEthereumAddress(text)) {
      _errors[controller] = 'Invalid Ethereum address format.';
    } else {
      _errors[controller] = null;
    }
    // We can call setState here to rebuild and show the error text
    setState(() {});
  }

  @override
  Widget build(BuildContext context) {
    // Watch is important here to rebuild when heirs are added/removed
    final provider = context.watch<WillCreatorProvider>();

    return Column(
      children: [
        ListView.builder(
          shrinkWrap: true,
          physics: const NeverScrollableScrollPhysics(),
          itemCount: provider.heirControllers.length,
          itemBuilder: (context, index) {
            final controller = provider.heirControllers[index];
            return Padding(
              padding: const EdgeInsets.only(bottom: 16.0),
              child: Center(
                child: Row(
                  mainAxisAlignment: MainAxisAlignment.center,
                  children: [
                    ConstrainedBox(
                      constraints: BoxConstraints(maxWidth: 540),
                      child: TextField(
                        controller: controller,
                        onChanged: (_) => _validateAddress(controller),
                        decoration: InputDecoration(
                          labelText: 'Heir ${index + 1} Address',
                          border: const OutlineInputBorder(),
                          errorText: _errors[controller],
                        ),
                      ),
                    ),
                    if (provider.heirControllers.length > 1)
                      IconButton(
                        icon: const Icon(Icons.delete_outline),
                        onPressed: () {
                          // Remove controller and its error message
                          _errors.remove(controller);
                          provider.removeHeir(index);
                        },
                        tooltip: 'Remove Heir',
                      ),
                  ],
                ),
              ),
            );
          },
        ),
        const SizedBox(height: 16),
        ElevatedButton.icon(
          style: ElevatedButton.styleFrom(
            backgroundColor: Colors.transparent,
          ),
          onPressed: () => provider.addHeir(),
          icon: const Icon(Icons.add),
          label: const Text('Add Another Heir'),
        ),
      ],
    );
  }
}
```

### `lib/creator/steps/step_2_assets.dart`
```dart
import 'package:afterme_web/creator/will_creator_provider.dart';
import 'package:afterme_web/utils/validators.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';

class Step2Assets extends StatefulWidget {
  // MODIFIED: No longer needs any constructor parameters
  const Step2Assets({super.key});

  @override
  State<Step2Assets> createState() => _Step2AssetsState();
}

class _Step2AssetsState extends State<Step2Assets> {
  // --- Validation Logic ---
  String? _validateEth(String? value) {
    final text = value?.trim() ?? '';
    if (text.isEmpty) return 'Amount cannot be empty.';
    final number = double.tryParse(text);
    if (number == null) return 'Invalid number format.';
    if (number <= 0) return 'Amount must be positive.';
    return null;
  }

  String? _validateErc20Address(String? value) {
    final text = value?.trim() ?? '';
    if (text.isEmpty) return 'Address cannot be empty.';
    if (!isValidEthereumAddress(text)) return 'Invalid address format.';
    return null;
  }

  String? _validateErc20Amount(String? value) {
    return _validateEth(value); // Same logic
  }

  String? _validateNftAddress(String? value) {
    return _validateErc20Address(value); // Same logic
  }

  String? _validateNftTokenId(String? value) {
    final text = value?.trim() ?? '';
    if (text.isEmpty) return 'Token ID cannot be empty.';
    if (int.tryParse(text) == null) return 'Must be a whole number.';
    return null;
  }

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<WillCreatorProvider>();
    final theme = Theme.of(context);

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        if (provider.ethAmountController != null)
          _buildEthInput(provider)
        else
          // MODIFIED: Gets chainName from provider now
          _buildAddAssetButton(context,
              'Add (${provider.chainName})', () => provider.addEth()),
        const Divider(height: 40),
        Text('ERC20 Tokens', style: theme.textTheme.titleLarge),
        const SizedBox(height: 16),
        if (provider.erc20Assets.isNotEmpty)
          ListView.builder(
            shrinkWrap: true,
            physics: const NeverScrollableScrollPhysics(),
            itemCount: provider.erc20Assets.length,
            itemBuilder: (context, index) =>
                _buildErc20Input(provider, index),
          ),
        _buildAddAssetButton(
            context, 'Add ERC20', () => provider.addErc20()),
        const Divider(height: 40),
        Text('NFTs (ERC721)', style: theme.textTheme.titleLarge),
        const SizedBox(height: 16),
        if (provider.nftAssets.isNotEmpty)
          ListView.builder(
            shrinkWrap: true,
            physics: const NeverScrollableScrollPhysics(),
            itemCount: provider.nftAssets.length,
            itemBuilder: (context, index) => _buildNftInput(provider, index),
          ),
        _buildAddAssetButton(context, 'Add NFT', () => provider.addNft()),
      ],
    );
  }

  Widget _buildAddAssetButton(
      BuildContext context, String label, VoidCallback onPressed) {
    return Center(
      child: OutlinedButton.icon(
        icon: const Icon(Icons.add),
        label: Text(label),
        onPressed: onPressed,
        style: OutlinedButton.styleFrom(
          side: BorderSide(color: Theme.of(context).primaryColor),
          padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
        ),
      ),
    );
  }

  Widget _buildEthInput(WillCreatorProvider provider) {
    return Card(
      child: Padding(
        padding: const EdgeInsets.all(12.0),
        child: Row(
          children: [
            const Icon(Icons.account_balance_wallet_outlined, size: 40),
            const SizedBox(width: 12),
            Expanded(
              child: TextFormField(
                controller: provider.ethAmountController,
                autovalidateMode: AutovalidateMode.onUserInteraction,
                validator: _validateEth,
                keyboardType: const TextInputType.numberWithOptions(decimal: true),
                inputFormatters: [
                  FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d*')),
                ],
                decoration: InputDecoration(
                  // MODIFIED: Gets chainName from provider now
                  labelText: 'Amount of ${provider.chainName}',
                  border: const OutlineInputBorder(),
                ),
              ),
            ),
            IconButton(
              icon: const Icon(Icons.delete_outline, color: Colors.redAccent),
              onPressed: () => provider.removeEth(),
              tooltip: 'Remove Native Currency',
            )
          ],
        ),
      ),
    );
  }

  Widget _buildErc20Input(WillCreatorProvider provider, int index) {
    final asset = provider.erc20Assets[index];
    return Card(
      margin: const EdgeInsets.only(bottom: 16),
      child: Padding(
        padding: const EdgeInsets.all(12.0),
        child: Column(
          children: [
            TextFormField(
              controller: asset.contractAddressController,
              autovalidateMode: AutovalidateMode.onUserInteraction,
              validator: _validateErc20Address,
              decoration: const InputDecoration(
                labelText: 'ERC20 Contract Address',
                border: OutlineInputBorder(),
              ),
            ),
            const SizedBox(height: 12),
            Row(
              children: [
                Expanded(
                  child: TextFormField(
                    controller: asset.amountController,
                    autovalidateMode: AutovalidateMode.onUserInteraction,
                    validator: _validateErc20Amount,
                    keyboardType: const TextInputType.numberWithOptions(decimal: true),
                    inputFormatters: [
                      FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d*')),
                    ],
                    decoration: const InputDecoration(
                      labelText: 'Token Amount',
                      border: OutlineInputBorder(),
                    ),
                  ),
                ),
                IconButton(
                  icon: const Icon(Icons.delete_outline, color: Colors.redAccent),
                  onPressed: () => provider.removeErc20(index),
                  tooltip: 'Remove ERC20',
                )
              ],
            ),
          ],
        ),
      ),
    );
  }

  Widget _buildNftInput(WillCreatorProvider provider, int index) {
    final asset = provider.nftAssets[index];
    return Card(
      margin: const EdgeInsets.only(bottom: 16),
      child: Padding(
        padding: const EdgeInsets.all(12.0),
        child: Column(
          children: [
            TextFormField(
              controller: asset.contractAddressController,
              autovalidateMode: AutovalidateMode.onUserInteraction,
              validator: _validateNftAddress,
              decoration: const InputDecoration(
                labelText: 'NFT Contract Address',
                border: OutlineInputBorder(),
              ),
            ),
            const SizedBox(height: 12),
            Row(
              children: [
                Expanded(
                  child: TextFormField(
                    controller: asset.tokenIdController,
                    autovalidateMode: AutovalidateMode.onUserInteraction,
                    validator: _validateNftTokenId,
                    keyboardType: TextInputType.number,
                    inputFormatters: [FilteringTextInputFormatter.digitsOnly],
                    decoration: const InputDecoration(
                      labelText: 'Token ID',
                      border: OutlineInputBorder(),
                    ),
                  ),
                ),
                IconButton(
                  icon: const Icon(Icons.delete_outline, color: Colors.redAccent),
                  onPressed: () => provider.removeNft(index),
                  tooltip: 'Remove NFT',
                )
              ],
            ),
          ],
        ),
      ),
    );
  }
}
```

### `lib/creator/steps/step_3_distribution.dart`
```dart
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../will_creator_provider.dart';

class Step3Distribution extends StatelessWidget {
  const Step3Distribution({super.key});

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<WillCreatorProvider>();
    final theme = Theme.of(context);

    final validHeirs = provider.heirControllers
        .where((c) => c.text.trim().isNotEmpty)
        .map((c) => c.text.trim())
        .toList();

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
            Text('Fungible Asset Distribution',
                style: theme.textTheme.titleLarge),
            TextButton(
              onPressed: () => provider.resetDistribution(),
              child: const Text('Reset All'),
            )
          ],
        ),
        const SizedBox(height: 8),
        Container(
          padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 12.0),
          decoration: BoxDecoration(
            border: Border.all(color: Colors.grey.shade800),
            borderRadius: BorderRadius.circular(8),
            color: Colors.black.withOpacity(0.1),
          ),
          child: Column(
            children: [
              const Row(
                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                children: [
                  Row(
                    children: [
                      Icon(Icons.receipt_long,
                          color: Colors.white70, size: 16),
                      SizedBox(width: 8),
                      Text('Execution Reward:',
                          style: TextStyle(color: Colors.white70)),
                    ],
                  ),
                  Text('0.5%',
                      style: TextStyle(
                          color: Colors.white70, fontFamily: 'monospace')),
                ],
              ),
              const SizedBox(height: 4),
              Row(
                mainAxisAlignment: MainAxisAlignment.spaceBetween,
                children: [
                  Row(
                    children: [
                      Icon(Icons.groups, color: theme.primaryColor, size: 16),
                      const SizedBox(width: 8),
                      Text('Total for Heirs:',
                          style: TextStyle(
                              color: theme.primaryColor,
                              fontWeight: FontWeight.bold)),
                    ],
                  ),
                  Text('99.5%',
                      style: TextStyle(
                          color: theme.primaryColor,
                          fontWeight: FontWeight.bold,
                          fontFamily: 'monospace')),
                ],
              )
            ],
          ),
        ),
        const SizedBox(height: 16),
        ListView.builder(
          shrinkWrap: true,
          physics: const NeverScrollableScrollPhysics(),
          itemCount: provider.heirControllers.length,
          itemBuilder: (context, index) {
            final heirAddress = provider.heirControllers[index].text.trim();
            if (heirAddress.isEmpty) return const SizedBox.shrink();

            final isLocked = provider.distributionLocks[index];

            return Card(
              color: isLocked ? Colors.grey.shade900 : null,
              margin: const EdgeInsets.only(bottom: 12),
              child: Padding(
                padding: const EdgeInsets.all(12.0),
                child: Column(
                  crossAxisAlignment: CrossAxisAlignment.start,
                  children: [
                    Text(
                      'Heir ${index + 1}: ${heirAddress.substring(0, 6)}...${heirAddress.substring(heirAddress.length - 4)}',
                      overflow: TextOverflow.ellipsis,
                    ),
                    Row(
                      children: [
                        Expanded(
                          child: Slider(
                            value: provider.distributionPercentages[index],
                            min: WillCreatorProvider.minPercentage,
                            max: WillCreatorProvider.totalDistributable,
                            onChanged: isLocked
                                ? null
                                : (value) {
                                    provider.updateDistribution(index, value);
                                  },
                            activeColor: isLocked
                                ? Colors.grey.shade600
                                : theme.primaryColor,
                            inactiveColor:
                                isLocked ? Colors.grey.shade800 : null,
                          ),
                        ),
                        SizedBox(
                          width: 60,
                          child: Text(
                              '${provider.distributionPercentages[index].round()}%'),
                        ),
                        // RULE 3 IMPLEMENTATION: The button is now a one-way action.
                        IconButton(
                          // The icon is a lock if locked, or an "open lock" if available to be locked.
                          icon: Icon(isLocked ? Icons.lock : Icons.lock_open),
                          color: isLocked ? theme.primaryColor : Colors.grey,
                          tooltip: isLocked
                              ? 'Locked (use Reset All to unlock)'
                              : 'Lock Percentage',
                          // The button is disabled if locked.
                          onPressed: isLocked
                              ? null
                              : () => provider.lockDistribution(index),
                        )
                      ],
                    ),
                  ],
                ),
              ),
            );
          },
        ),
        const Divider(height: 40),
        Text('NFT Assignment', style: theme.textTheme.titleLarge),
        const SizedBox(height: 16),
        if (provider.nftAssets.isEmpty)
          const Text('No NFTs added in the previous step.'),
        if (validHeirs.isEmpty && provider.nftAssets.isNotEmpty)
          const Text(
              'Please add valid heir addresses in Step 1 to assign NFTs.'),
        if (provider.nftAssets.isNotEmpty && validHeirs.isNotEmpty)
          ListView.builder(
            shrinkWrap: true,
            physics: const NeverScrollableScrollPhysics(),
            itemCount: provider.nftAssets.length,
            itemBuilder: (context, index) {
              final nft = provider.nftAssets[index];
              return Card(
                margin: const EdgeInsets.only(bottom: 12),
                child: Padding(
                  padding: const EdgeInsets.all(12.0),
                  child: Row(
                    children: [
                      Expanded(
                        child: Text(
                          'NFT #${nft.tokenIdController.text} (${nft.contractAddressController.text.substring(0, 6)}...)',
                          overflow: TextOverflow.ellipsis,
                        ),
                      ),
                      const SizedBox(width: 16),
                      DropdownButton<String>(
                        value: nft.assignedHeir,
                        hint: const Text('Select Heir'),
                        items: validHeirs
                            .map<DropdownMenuItem<String>>((String address) {
                          return DropdownMenuItem<String>(
                            value: address,
                            child: Text('${address.substring(0, 6)}...'),
                          );
                        }).toList(),
                        onChanged: (String? newValue) {
                          if (newValue != null) {
                            provider.assignNftToHeir(index, newValue);
                          }
                        },
                      ),
                    ],
                  ),
                ),
              );
            },
          ),
      ],
    );
  }
}
// lib/creator/steps/step_3_distribution.dart
```

### `lib/creator/steps/step_4_timeout.dart`
```dart
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../will_creator_provider.dart';

class Step4Timeout extends StatelessWidget {
  const Step4Timeout({super.key});

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<WillCreatorProvider>();
    final theme = Theme.of(context);

    return Column(
      mainAxisAlignment: MainAxisAlignment.center,
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        Text(
          '${provider.executionMinutes.round()} Minutes',
          style: theme.textTheme.headlineMedium?.copyWith(
            color: theme.primaryColor,
            fontWeight: FontWeight.bold,
          ),
        ),
        Slider(
          value: provider.executionMinutes,
          min: 5,
          max: 120,
          divisions: (120 - 5),
          label: provider.executionMinutes.round().toString(),
          onChanged: (double value) {
            provider.setExecutionMinutes(value);
          },
        ),
        const SizedBox(height: 8),
        const Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          children: [
            Text('5 Minutes (Min)'),
            Text('120 Minutes (Max)'),
          ],
        ),
      ],
    );
  }
}
```

### `lib/creator/steps/step_5_review.dart`
```dart
import 'package:afterme_web/widgets/address_avatar.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../will_creator_provider.dart';

class Step5Review extends StatelessWidget {
  const Step5Review({super.key});

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<WillCreatorProvider>();
    final theme = Theme.of(context);
    
    // A reusable style for the prominent values on the right.
    final valueStyle = theme.textTheme.titleLarge?.copyWith(
      color: theme.primaryColor,
      fontFamily: 'monospace',
      fontWeight: FontWeight.bold,
    );

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        // --- 1. FUNGIBLE ASSETS SECTION (MOVED UP) ---
        _buildSection(theme, 'Fungible Assets', [
          if (provider.ethAmountController != null &&
              provider.ethAmountController!.text.isNotEmpty)
            _buildReviewRow(
              title: Text('Native Currency (${provider.chainName})'),
              trailing: Text(provider.ethAmountController!.text, style: valueStyle),
            ),
          for (var asset in provider.erc20Assets)
            _buildReviewRow(
              title: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  const Text('ERC20 Token'),
                  SelectableText(
                    asset.contractAddressController.text,
                    style: const TextStyle(fontFamily: 'monospace', color: Colors.white70, fontSize: 12),
                  ),
                ],
              ),
              trailing: Text(asset.amountController.text, style: valueStyle),
            ),
        ]),
        
        // --- 2. HEIRS & DISTRIBUTION SECTION ---
        _buildSection(theme, 'Heirs & Distribution', [
          for (int i = 0; i < provider.heirControllers.length; i++)
            _buildReviewRow(
              leading: AddressAvatar(address: provider.heirControllers[i].text),
              title: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text('Heir ${i + 1}'),
                   SelectableText(
                     provider.heirControllers[i].text,
                     style: const TextStyle(fontFamily: 'monospace', color: Colors.white70, fontSize: 12),
                   ),
                 ],
              ),
              trailing: Text(
                '${provider.distributionPercentages[i].toStringAsFixed(1)}%',
                style: valueStyle,
              ),
            )
        ]),

        // --- 3. NFTs SECTION (STYLED FOR CONSISTENCY) ---
        _buildSection(theme, 'NFTs (Non-Fungible Assets)', [
          for (var asset in provider.nftAssets)
            _buildReviewRow(
              leading: const Icon(Icons.image_outlined, size: 40, color: Colors.white70),
              title: Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                   Text('Token ID: ${asset.tokenIdController.text}'),
                   SelectableText(
                     asset.contractAddressController.text,
                     style: const TextStyle(fontFamily: 'monospace', color: Colors.white70, fontSize: 12),
                   ),
                ],
              ),
              trailing: Column(
                crossAxisAlignment: CrossAxisAlignment.end,
                children: [
                  Text('Assigned to:', style: theme.textTheme.bodySmall),
                  Text(
                    '${asset.assignedHeir?.substring(0, 6) ?? 'N/A'}...',
                    style: const TextStyle(fontFamily: 'monospace'),
                  ),
                ],
              ),
            )
        ]),

        // --- 4. EXECUTION CONFIGURATION SECTION ---
        _buildSection(theme, 'Execution Configuration', [
          _buildReviewRow(
              title: const Column(
                crossAxisAlignment: CrossAxisAlignment.start,
                children: [
                  Text('Inactivity Timeout'),
                  Text(
                    'The contract becomes executable after this period of inactivity.',
                     style: TextStyle(color: Colors.white70, fontSize: 12),
                  ),
                ],
              ),
              trailing: Text(
                '${provider.executionMinutes.round()} min',
                style: valueStyle,
              ),
          ),
        ]),
      ],
    );
  }

  Widget _buildSection(ThemeData theme, String title, List<Widget> children) {
    if (children.isEmpty) return const SizedBox.shrink();
    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        Text(title, style: theme.textTheme.titleLarge),
        const Divider(),
        ...children,
        const SizedBox(height: 24),
      ],
    );
  }

  /// A new, more flexible helper widget for creating review rows.
  Widget _buildReviewRow({
    Widget? leading,
    required Widget title,
    Widget? trailing,
  }) {
    return Padding(
      padding: const EdgeInsets.symmetric(vertical: 10.0),
      child: Row(
        crossAxisAlignment: CrossAxisAlignment.center,
        children: [
          if (leading != null) ...[
            SizedBox(width: 40, height: 40, child: Center(child: leading)),
            const SizedBox(width: 16),
          ],
          Expanded(child: title),
          if (trailing != null) ...[
            const SizedBox(width: 16),
            trailing,
          ],
        ],
      ),
    );
  }
}
// lib/creator/steps/step_5_review.dart
```

### `lib/diary/diary_page.dart`
```dart
import 'package:afterme_web/diary/diary_provider.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:youtube_player_iframe/youtube_player_iframe.dart';
import 'package:uuid/uuid.dart';
import '../models/diary_entry.dart';

class DiaryPage extends StatefulWidget {
  const DiaryPage({super.key});

  @override
  State<DiaryPage> createState() => _DiaryPageState();
}

class _DiaryPageState extends State<DiaryPage> {
  List<DiaryEntry> _filteredEntries = [];
  DiaryEntry? _selectedEntry;

  bool _isEditing = false;
  bool _isDirty = false;
  DiaryEntry? _tempNewEntry;

  final _searchController = TextEditingController();
  final _titleController = TextEditingController();
  final _contentController = TextEditingController();
  final _uuid = const Uuid();

  @override
  void initState() {
    super.initState();
    _searchController.addListener(_filterEntries);
    _titleController.addListener(() => setState(() => _isDirty = true));
    _contentController.addListener(() => setState(() => _isDirty = true));
    WidgetsBinding.instance.addPostFrameCallback((_) => _filterEntries());
  }

  @override
  void didChangeDependencies() {
    super.didChangeDependencies();
    _filterEntries();
    final entries = context.watch<DiaryProvider>().entries;
    if (_selectedEntry != null && !entries.any((e) => e.id == _selectedEntry!.id)) {
      _selectedEntry = null;
      _isEditing = false;
    }
  }

  @override
  void dispose() {
    _searchController.dispose();
    _titleController.dispose();
    _contentController.dispose();
    super.dispose();
  }

  void _filterEntries() {
    final provider = context.read<DiaryProvider>();
    final query = _searchController.text;
    setState(() {
      _filteredEntries = query.isEmpty
          ? provider.entries
          : provider.entries
              .where((entry) => entry.title.toLowerCase().contains(query.toLowerCase()))
              .toList();
    });
  }

  Future<void> _addDiaryEntry() async {
    if (!(await _promptToSaveIfDirty())) return;
    setState(() {
      _tempNewEntry = DiaryEntry(
        id: _uuid.v4(),
        title: '',
        date: DateTime.now(),
        content: '',
      );
      _selectedEntry = _tempNewEntry;
      _isEditing = true;
      _isDirty = false;
      _titleController.text = '';
      _contentController.text = '';
    });
  }

  Future<void> _removeDiaryEntry(DiaryEntry entry) async {
    final diaryProvider = context.read<DiaryProvider>();
    if (!mounted) return;
    final confirmed = await showDialog<bool>(
      context: context,
      builder: (context) => AlertDialog(
        title: const Text('Delete Entry'),
        content: Text('Are you sure you want to delete "${entry.title}"?'),
        actions: [
          TextButton(onPressed: () => Navigator.of(context).pop(false), child: const Text('Cancel')),
          TextButton(onPressed: () => Navigator.of(context).pop(true), child: const Text('Delete')),
        ],
      ),
    );
    if (!mounted || confirmed != true) return;
    await diaryProvider.deleteEntry(entry.id);
    if (!mounted) return;
    setState(() {
      if (_selectedEntry == entry) {
        _selectedEntry = null;
        _isEditing = false;
      }
    });
  }

  Future<void> _selectEntry(DiaryEntry entry) async {
    if (entry == _selectedEntry) return;
    if (!(await _promptToSaveIfDirty())) return;
    setState(() {
      _selectedEntry = entry;
      _isEditing = false;
      _isDirty = false;
      _tempNewEntry = null;
      _updateControllersForSelectedEntry();
    });
  }

  void _updateControllersForSelectedEntry() {
    if (_selectedEntry != null) {
      _titleController.text = _selectedEntry!.title;
      _contentController.text = _selectedEntry!.content;
    }
  }

  Future<bool> _promptToSaveIfDirty() async {
    if (!_isEditing || !_isDirty) {
      _discardChanges();
      return true;
    }
    final action = await showDialog<UnsavedAction>(
      context: context,
      builder: (ctx) => AlertDialog(
        title: const Text('Unsaved Changes'),
        content: const Text('You have unsaved changes. Save them now?'),
        actions: [
          TextButton(onPressed: () => Navigator.of(ctx).pop(UnsavedAction.discard), child: const Text('Discard')),
          TextButton(onPressed: () => Navigator.of(ctx).pop(UnsavedAction.save), child: const Text('Save')),
        ],
      ),
    );
    if (!mounted) return false;
    if (action == UnsavedAction.save) return await _saveChanges();
    if (action == UnsavedAction.discard) {
      _discardChanges();
      return true;
    }
    return false;
  }

  Future<bool> _saveChanges() async {
    if (_selectedEntry == null) return false;
    final provider = context.read<DiaryProvider>();
    final isNewEntry = _tempNewEntry != null;
    final success = await provider.addOrUpdateEntry(
      id: isNewEntry ? null : _selectedEntry!.id,
      title: _titleController.text.isEmpty ? 'Untitled' : _titleController.text,
      content: _contentController.text,
    );
    if (!mounted) return false;
    if (success) {
      setState(() {
        _isEditing = false;
        _isDirty = false;
        _tempNewEntry = null;
        _selectedEntry = null;
      });
    }
    return success;
  }

  void _discardChanges() {
    setState(() {
      _tempNewEntry = null;
      _isEditing = false;
      _isDirty = false;
      if (_selectedEntry != null && _tempNewEntry == _selectedEntry) {
        _selectedEntry = null;
      }
    });
  }

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<DiaryProvider>();

    switch (provider.state) {
      case DiaryState.initializing:
      case DiaryState.loadingAction:
        return Center(
          child: Column(
            mainAxisSize: MainAxisSize.min,
            children: [
              const CircularProgressIndicator(),
              const SizedBox(height: 16),
              Text(provider.loadingMessage),
            ],
          ),
        );

      case DiaryState.needsCreation:
        return _buildActionScreen(
          title: 'Create Your Secure Diary',
          description: 'To get started, you need to create your secure diary.\nThis one-time action requires a signature to set up your encrypted storage.',
          buttonLabel: 'Create Diary',
          onPressed: () => provider.createDiary(),
        );

      case DiaryState.locked:
        return _buildActionScreen(
          title: 'Unlock Your Diary',
          description: 'To access your encrypted diary, you need to sign a message with your wallet.\nThis is a free, off-chain action that generates your unique encryption key.',
          buttonLabel: 'Unlock with Signature',
          onPressed: () => provider.unlockDiary(),
        );

      case DiaryState.unlocked:
        return Scaffold(
          body: Row(
            crossAxisAlignment: CrossAxisAlignment.start,
            children: [
              Expanded(flex: 1, child: _buildEntryListPane()),
              const VerticalDivider(width: 1),
              Expanded(flex: 2, child: _buildEntryDetails()),
            ],
          ),
        );
    }
  }

  Widget _buildActionScreen({
    required String title,
    required String description,
    required String buttonLabel,
    required VoidCallback onPressed,
  }) {
    return Center(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
          const Icon(Icons.lock_outline, size: 48, color: Colors.amber),
          const SizedBox(height: 24),
          Text(title, style: const TextStyle(fontSize: 24, fontWeight: FontWeight.bold)),
          const SizedBox(height: 16),
          Text(description, textAlign: TextAlign.center),
          const SizedBox(height: 24),
          ElevatedButton.icon(
            icon: const Icon(Icons.key),
            label: Text(buttonLabel),
            onPressed: onPressed,
          ),
        ],
      ),
    );
  }

  Widget _buildEntryListPane() {
    return Padding(
      padding: const EdgeInsets.all(8.0),
      child: Column(
        children: [
          Padding(
            padding: const EdgeInsets.all(8.0),
            child: Row(
              children: [
                const Expanded(
                    child: Text("Entries",
                        style: TextStyle(
                            fontSize: 20, fontWeight: FontWeight.bold))),
                ElevatedButton.icon(
                  icon: const Icon(Icons.add),
                  label: const Text('New Entry'),
                  onPressed: _addDiaryEntry,
                ),
              ],
            ),
          ),
          Padding(
            padding: const EdgeInsets.all(8.0),
            child: TextField(
              controller: _searchController,
              decoration: const InputDecoration(
                labelText: 'Search by title...',
                prefixIcon: Icon(Icons.search),
                border: OutlineInputBorder(),
              ),
            ),
          ),
          Expanded(child: _buildEntryList()),
        ],
      ),
    );
  }

  Widget _buildEntryList() {
    final displayList = [..._filteredEntries];
    if (_tempNewEntry != null && !displayList.contains(_tempNewEntry)) {
      displayList.insert(0, _tempNewEntry!);
    }
    if (displayList.isEmpty) {
      return Center(
        child: Text(_searchController.text.isNotEmpty
            ? 'No entries match your search.'
            : 'Add an entry to get started!'),
      );
    }
    return ListView.builder(
      itemCount: displayList.length,
      itemBuilder: (context, index) {
        final entry = displayList[index];
        final isTempEntry = entry == _tempNewEntry;
        return ListTile(
          title: Text(
            isTempEntry ? (_titleController.text.isEmpty ? 'Untitled' : _titleController.text) : entry.title,
            maxLines: 1,
            overflow: TextOverflow.ellipsis,
            style: isTempEntry ? const TextStyle(fontStyle: FontStyle.italic) : null,
          ),
          subtitle: Text(DateFormat.yMMMd().format(entry.date)),
          selected: entry == _selectedEntry,
          selectedTileColor: Theme.of(context).highlightColor,
          onTap: () => _selectEntry(entry),
          trailing: isTempEntry
              ? null
              : IconButton(
                  icon: const Icon(Icons.delete_outline),
                  tooltip: 'Delete Entry',
                  onPressed: () => _removeDiaryEntry(entry),
                ),
        );
      },
    );
  }

  Widget _buildEntryDetails() {
    if (_selectedEntry == null) {
      return const Center(
        child: Column(
          mainAxisAlignment: MainAxisAlignment.center,
          children: [
            Icon(Icons.book_outlined, size: 48, color: Colors.white54),
            SizedBox(height: 16),
            Text('Select an entry or create a new one',
                style: TextStyle(fontSize: 20)),
          ],
        ),
      );
    }
    return _isEditing ? _buildEditView() : _buildDetailView();
  }

  Widget _buildDetailView() {
    return SingleChildScrollView(
      padding: const EdgeInsets.all(24.0),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          Row(
            mainAxisAlignment: MainAxisAlignment.spaceBetween,
            children: [
              Expanded(
                child: Text(_selectedEntry!.title,
                    style: Theme.of(context).textTheme.headlineMedium),
              ),
              IconButton(icon: const Icon(Icons.edit), onPressed: () => setState(() => _isEditing = true)),
            ],
          ),
          const SizedBox(height: 8),
          Text(DateFormat.yMMMMEEEEd().format(_selectedEntry!.date),
              style: Theme.of(context).textTheme.titleSmall),
          const SizedBox(height: 16),
          const Divider(),
          const SizedBox(height: 16),
          RichText(
            text: TextSpan(
              style: Theme.of(context).textTheme.bodyLarge?.copyWith(height: 1.5),
              children: _buildContentSpans(_selectedEntry!.content, context),
            ),
          ),
        ],
      ),
    );
  }

  Widget _buildEditView() {
    return Padding(
      padding: const EdgeInsets.all(24.0),
      child: Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
          TextField(
            controller: _titleController,
            style: Theme.of(context).textTheme.headlineMedium,
            decoration: const InputDecoration(
              hintText: 'Title',
              border: InputBorder.none,
            ),
          ),
          const SizedBox(height: 8),
          Text(DateFormat.yMMMMEEEEd().format(_selectedEntry!.date),
              style: Theme.of(context).textTheme.titleSmall),
          const SizedBox(height: 16),
          const Divider(),
          const SizedBox(height: 16),
          Expanded(
            child: TextField(
              controller: _contentController,
              maxLines: null,
              expands: true,
              style: Theme.of(context).textTheme.bodyLarge?.copyWith(height: 1.5),
              decoration: const InputDecoration(
                hintText: 'Start writing your story...',
                border: InputBorder.none,
              ),
            ),
          ),
          const SizedBox(height: 16),
          Row(
            mainAxisAlignment: MainAxisAlignment.end,
            children: [
              TextButton(onPressed: () async {
                  if (await _promptToSaveIfDirty()) {
                      setState(() {
                         _isEditing = false;
                         if (_tempNewEntry != null) _selectedEntry = null;
                         _tempNewEntry = null;
                      });
                  }
              }, child: const Text('Cancel')),
              const SizedBox(width: 8),
              ElevatedButton(
                onPressed: _isDirty ? () => _saveChanges() : null,
                child: const Text('Save Entry'),
              ),
            ],
          )
        ],
      ),
    );
  }
  
  void _showVideoPlayerDialog(String videoId) {
    showDialog(
      context: context,
      builder: (context) {
        return Dialog(
          child: ConstrainedBox(
            constraints: BoxConstraints(
              maxWidth: MediaQuery.of(context).size.width * 0.8,
              maxHeight: MediaQuery.of(context).size.height * 0.8,
            ),
            child: _YoutubePlayerDialog(videoId: videoId),
          ),
        );
      },
    );
  }
  
  List<InlineSpan> _buildContentSpans(String text, BuildContext context) {
    final List<InlineSpan> spans = [];
    final RegExp urlRegex = RegExp(
        r"((https?:\/\/)|(www\.))[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)");
    
    int lastMatchEnd = 0;
    for (final Match match in urlRegex.allMatches(text)) {
      if (match.start > lastMatchEnd) {
        spans.add(TextSpan(text: text.substring(lastMatchEnd, match.start)));
      }
      final String url = match.group(0)!;
      final videoId = YoutubePlayerController.convertUrlToId(url);
      if (videoId != null) {
        spans.add(WidgetSpan(alignment: PlaceholderAlignment.middle, child: _buildYoutubeThumbnail(videoId)));
      } else {
        spans.add(
          TextSpan(
            text: url,
            style: TextStyle(color: Theme.of(context).colorScheme.primary, decoration: TextDecoration.underline),
            recognizer: TapGestureRecognizer()
              ..onTap = () async {
                String launchableUrl = url;
                if (!launchableUrl.startsWith('http')) {
                  launchableUrl = 'https://$launchableUrl';
                }
                final uri = Uri.parse(launchableUrl);
                await launchUrl(uri, webOnlyWindowName: '_blank');
              },
          ),
        );
      }
      lastMatchEnd = match.end;
    }
    if (lastMatchEnd < text.length) {
      spans.add(TextSpan(text: text.substring(lastMatchEnd)));
    }
    return spans;
  }

  Widget _buildYoutubeThumbnail(String videoId) {
    final thumbnailUrl = 'https://img.youtube.com/vi/$videoId/mqdefault.jpg';
    return InkWell(
      onTap: () => _showVideoPlayerDialog(videoId),
      child: Padding(
        padding: const EdgeInsets.symmetric(vertical: 8.0),
        child: SizedBox(
          width: 240,
          child: Stack(
            alignment: Alignment.center,
            children: [
              Image.network(thumbnailUrl),
              const Icon(Icons.play_circle_fill, color: Colors.white, size: 50),
            ],
          ),
        ),
      ),
    );
  }
}

enum UnsavedAction { save, discard }

class _YoutubePlayerDialog extends StatefulWidget {
  final String videoId;
  const _YoutubePlayerDialog({required this.videoId});
  @override
  State<_YoutubePlayerDialog> createState() => _YoutubePlayerDialogState();
}

class _YoutubePlayerDialogState extends State<_YoutubePlayerDialog> {
  late final YoutubePlayerController _controller;
  @override
  void initState() {
    super.initState();
    _controller = YoutubePlayerController(
      params: const YoutubePlayerParams(
        showFullscreenButton: true,
        mute: false,
        showControls: true,
      ),
    );
    _controller.loadVideoById(videoId: widget.videoId);
  }
  @override
  void dispose() {
    _controller.close();
    super.dispose();
  }
  @override
  Widget build(BuildContext context) {
    return YoutubePlayer(
      controller: _controller,
      aspectRatio: 16 / 9,
    );
  }
}
// lib/diary/diary_page.dart
```

### `lib/diary/diary_provider.dart`
```dart
import 'dart:convert';
import 'dart:async';
import 'package:afterme_web/wallet_provider.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_web3/flutter_web3.dart';
import 'package:http/http.dart' as http;
import 'package:uuid/uuid.dart';
import 'package:crypto/crypto.dart';
import 'package:encrypt/encrypt.dart' as enc;
import 'package:hex/hex.dart';

import '../models/diary_entry.dart';

enum DiaryState {
  initializing,
  needsCreation,
  locked,
  unlocked,
  loadingAction,
}

class DiaryProvider with ChangeNotifier {
  final WalletProvider _walletProvider;
  final FirebaseFirestore _firestore = FirebaseFirestore.instance;
  final _uuid = const Uuid();

  static const String _keyDerivationMessage =
      "I am signing this message to derive my unique AfterMe diary key. This is not a transaction.";
  static const String _functionsBaseUrl =
      "https://us-central1-afterme-850af.cloudfunctions.net";

  enc.Key? _encryptionKey;
  List<DiaryEntry> _entries = [];
  StreamSubscription<DocumentSnapshot>? _diaryStreamSubscription;
  String? _lastCheckedContractAddress;
  String _loadingMessage = 'Initializing...';
  DiaryState _state = DiaryState.initializing;

  // The "busy" flag to prevent race conditions during diary creation.
  bool _isCreating = false;

  DiaryState get state => _state;
  String get loadingMessage => _loadingMessage;
  List<DiaryEntry> get entries => _entries;

  DiaryProvider(this._walletProvider) {
    _walletProvider.addListener(_onWalletProviderChanged);
    _onWalletProviderChanged();
  }

  void _onWalletProviderChanged() {
    if (_isCreating) return;

    final newAddress = _walletProvider.willContractAddress;
    final hasDiary = _walletProvider.willDetails?.hasDiary ?? false;

    bool isNewDiaryContract =
        (newAddress != null && hasDiary && newAddress != _lastCheckedContractAddress);
    bool hasLostDiaryContract =
        (newAddress == null && _lastCheckedContractAddress != null);

    if (isNewDiaryContract || hasLostDiaryContract) {
      _reset();
      _lastCheckedContractAddress = newAddress;
      if (isNewDiaryContract) {
        initialize();
      }
    }
  }

  void _setState(DiaryState newState, [String? message]) {
    _state = newState;
    if (message != null) {
      _loadingMessage = message;
    }
    notifyListeners();
  }

  // Performs a one-time check to decide the initial state.
  Future<void> initialize() async {
    _setState(DiaryState.initializing, 'Connecting to diary...');
    final contractAddress = _walletProvider.willContractAddress;
    if (contractAddress == null) {
      _setState(DiaryState.locked, "Error: No contract address found.");
      return;
    }

    try {
      final doc =
          await _firestore.collection('diaries').doc(contractAddress).get();
      if (doc.exists) {
        _setState(DiaryState.locked);
      } else {
        _setState(DiaryState.needsCreation);
      }
    } catch (e) {
      _setState(DiaryState.locked, "Error connecting to diary.");
    }
  }

  Future<void> unlockDiary() async {
    _setState(
        DiaryState.loadingAction, 'Requesting signature to unlock diary...');
    try {
      final signer = Web3Provider(ethereum!).getSigner();
      final signature = await signer.signMessage(_keyDerivationMessage);
      final cleanSignature =
          signature.startsWith('0x') ? signature.substring(2) : signature;
      final signatureBytes = HEX.decode(cleanSignature);
      final keyBytes = sha256.convert(signatureBytes).bytes;
      _encryptionKey = enc.Key(Uint8List.fromList(keyBytes));

      _setState(DiaryState.unlocked);
      _startRealtimeEntryListener();
    } catch (e) {
      debugPrint("Error unlocking diary: $e");
      _setState(DiaryState.locked, 'Failed to unlock diary.');
    }
  }

  Future<void> createDiary() async {
    if (_isCreating) return;
    _isCreating = true;
    _setState(
        DiaryState.loadingAction, 'Requesting signature to create diary...');

    try {
      final signer = Web3Provider(ethereum!).getSigner();
      final signature = await signer.signMessage(_keyDerivationMessage);
      final cleanSignature =
          signature.startsWith('0x') ? signature.substring(2) : signature;
      final signatureBytes = HEX.decode(cleanSignature);
      final keyBytes = Uint8List.fromList(sha256.convert(signatureBytes).bytes);

      _setState(DiaryState.loadingAction, 'Initializing your secure diary...');
      final bool success = await _createDiaryDocumentInBackend(keyBytes);

      if (success) {
        _encryptionKey = enc.Key(keyBytes);
        _entries = [];
        _setState(DiaryState.unlocked);
        _startRealtimeEntryListener();
      } else {
        _setState(DiaryState.needsCreation, 'Failed to create diary.');
      }
    } catch (e) {
      debugPrint("Error creating diary: $e");
      _setState(DiaryState.needsCreation, 'Operation failed.');
    } finally {
      _isCreating = false;
    }
  }

  Future<bool> _createDiaryDocumentInBackend(Uint8List keyBytes) async {
    try {
      final plaintextKeyHex = '0x${HEX.encode(keyBytes)}';
      final payload = await _createSignedPayload('create diary', {
        "ownerAddress": _walletProvider.currentAddress,
        "willContractAddress": _walletProvider.willContractAddress,
        "plaintextKey": plaintextKeyHex,
      });
      final response = await http.post(
        Uri.parse("$_functionsBaseUrl/createDiary"),
        headers: {'Content-Type': 'application/json'},
        body: json.encode(payload),
      );
      // THE FIX: Accept 201 Created as a valid success code.
      return response.statusCode == 200 || response.statusCode == 201;
    } catch (e) {
      debugPrint("Error creating diary document: $e");
      return false;
    }
  }

  void _startRealtimeEntryListener() {
    final contractAddress = _walletProvider.willContractAddress;
    if (contractAddress == null) return;
    _diaryStreamSubscription?.cancel();
    _diaryStreamSubscription = _firestore
        .collection('diaries')
        .doc(contractAddress)
        .snapshots()
        .listen((snapshot) {
      if (snapshot.exists) {
        _processEntries(List<Map<String, dynamic>>.from(
            snapshot.data()?['entries'] ?? []));
      } else {
        _entries = [];
      }
      notifyListeners();
    });
  }

  void _processEntries(List<Map<String, dynamic>> encryptedEntries) {
    if (_encryptionKey == null) {
      _entries = [];
      return;
    }

    final decrypted = encryptedEntries.map((entryData) {
      try {
        return DiaryEntry(
          id: entryData['id'],
          title: _decrypt(entryData['encryptedTitle']),
          content: _decrypt(entryData['encryptedBody']),
          // FIX #1: Read from "createdAt" field instead of "date".
          date: (entryData['createdAt'] as Timestamp).toDate(),
        );
      } catch (e) {
        return DiaryEntry(
          id: entryData['id'],
          title: "Decryption Failed",
          content: "Could not decrypt this entry.",
          // Also apply the fix here for safety.
          date: (entryData['createdAt'] as Timestamp).toDate(),
        );
      }
    }).toList();

    decrypted.sort((a, b) => b.date.compareTo(a.date));
    _entries = decrypted;
  }

  String _encrypt(String plaintext) {
    if (_encryptionKey == null) throw Exception("Diary is not unlocked.");
    final iv = enc.IV.fromSecureRandom(16);
    final encrypter = enc.Encrypter(enc.AES(_encryptionKey!));
    final encrypted = encrypter.encrypt(plaintext, iv: iv);
    return base64.encode(iv.bytes + encrypted.bytes);
  }

  String _decrypt(String base64Ciphertext) {
    if (_encryptionKey == null) throw Exception("Diary is not unlocked.");
    final allBytes = base64.decode(base64Ciphertext);
    final iv = enc.IV(allBytes.sublist(0, 16));
    final ciphertext = allBytes.sublist(16);
    final encrypter = enc.Encrypter(enc.AES(_encryptionKey!));
    return encrypter.decrypt(enc.Encrypted(ciphertext), iv: iv);
  }

  Future<Map<String, dynamic>> _createSignedPayload(
      String action, Map<String, dynamic> data) async {
    final nonce = _uuid.v4();
    final message =
        "I am signing this message to authorize the '$action' action for my AfterMe diary. Nonce: $nonce";
    final signer = Web3Provider(ethereum!).getSigner();
    final signature = await signer.signMessage(message);
    return {...data, "signedMessage": message, "signature": signature};
  }

  /// FIX #2: Rewritten to correctly handle adding and "updating" entries
  /// by aligning with the backend's actual capabilities.
  Future<bool> addOrUpdateEntry(
      {String? id, required String title, required String content}) async {
    if (_encryptionKey == null) return false;
    _setState(DiaryState.loadingAction, 'Saving entry...');

    try {
      // If an ID exists, it's an update. We must delete the old entry first.
      if (id != null) {
        final deleteSuccess = await _deleteEntryInternal(id);
        if (!deleteSuccess) {
          throw Exception("Failed to delete original entry during update.");
        }
      }

      // Now, add the new or updated entry. The backend will assign a new ID.
      final addSuccess = await _addEntryInternal(title, content);
      if (!addSuccess) {
        throw Exception("Failed to add the new entry.");
      }

      _setState(DiaryState.unlocked);
      return true;
    } catch (e) {
      _setState(DiaryState.unlocked, "Error: ${e.toString()}");
      return false;
    }
  }

  // Internal helper for adding an entry
  Future<bool> _addEntryInternal(String title, String content) async {
    final payload = await _createSignedPayload('add/update entry', {
      "willContractAddress": _walletProvider.willContractAddress,
      "entry": {"title": _encrypt(title), "body": _encrypt(content)},
    });
    final response = await http.post(
        Uri.parse("$_functionsBaseUrl/addDiaryEntry"),
        headers: {'Content-Type': 'application/json'},
        body: json.encode(payload));
    return response.statusCode == 200;
  }

  // Internal helper for deleting an entry
  Future<bool> _deleteEntryInternal(String entryId) async {
    final payload = await _createSignedPayload('delete entry', {
      "willContractAddress": _walletProvider.willContractAddress,
      "entryId": entryId,
    });
    final response = await http.post(
        Uri.parse("$_functionsBaseUrl/deleteDiaryEntry"),
        headers: {'Content-Type': 'application/json'},
        body: json.encode(payload));
    // It's okay if it's not found (404), maybe it was a new unsaved entry.
    return response.statusCode == 200 || response.statusCode == 404;
  }

  // This is the public method called by the UI for deletion.
  Future<bool> deleteEntry(String entryId) async {
    if (_encryptionKey == null) return false;
    _setState(DiaryState.loadingAction, 'Deleting entry...');
    try {
      final success = await _deleteEntryInternal(entryId);
      _setState(DiaryState.unlocked);
      return success;
    } catch (e) {
      _setState(DiaryState.unlocked, "Error: ${e.toString()}");
      return false;
    }
  }

  void _reset() {
    _diaryStreamSubscription?.cancel();
    _diaryStreamSubscription = null;
    _encryptionKey = null;
    _entries = [];
    _lastCheckedContractAddress = null;
    _isCreating = false;
    _setState(DiaryState.initializing);
  }

  @override
  void dispose() {
    _diaryStreamSubscription?.cancel();
    _walletProvider.removeListener(_onWalletProviderChanged);
    super.dispose();
  }
}
// lib/diary/diary_provider.dart
```

### `lib/diary/mock_diary_data.dart`
```dart
// // lib/diary/mock_diary_data.dart

// import 'diary_entry.dart';

// List<DiaryEntry> mockDiaryEntries = [
//   DiaryEntry(
//     title: 'A Beautiful Day',
//     date: DateTime.now().subtract(const Duration(days: 2)),
//     content: 'Today was a wonderful day. The sun was shining and I went for a long walk in the park. I felt so at peace with the world.',
//   ),
//   DiaryEntry(
//     title: 'Flutter Progress',
//     date: DateTime.now().subtract(const Duration(days: 1)),
//     content: 'Made some great progress on my Flutter web app. The diary feature is starting to take shape. I am excited to see how it turns out. I found a great video that explains some advanced concepts: https://www.youtube.com/watch?v=iLnmTe5Q2Qw. I should also check out the official docs at www.flutter.dev.',
//   ),
//   DiaryEntry(
//     title: 'A New Idea',
//     date: DateTime.now(),
//     content: 'Had a brilliant idea for a new feature. I should write it down before I forget. It involves integrating a mood tracker with the diary entries.',
//   ),
// ];
// // lib/diary/mock_diary_data.dart
```

### `lib/executions/contract_item.dart`
```dart
import 'dart:async';
import 'package:afterme_web/models/execution_contract_model.dart';
import 'package:afterme_web/widgets/address_avatar.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:url_launcher/url_launcher.dart';
import '../wallet_provider.dart';
import 'package:provider/provider.dart';

class ContractItem extends StatefulWidget {
  final ExecutionContract contract;
  final bool shouldAnimate;
  final Duration animationDelay;
  final VoidCallback onAnimationComplete;

  const ContractItem({
    super.key,
    required this.contract,
    required this.shouldAnimate,
    required this.animationDelay,
    required this.onAnimationComplete,
  });

  @override
  State<ContractItem> createState() => _ContractItemState();
}

class _ContractItemState extends State<ContractItem> with TickerProviderStateMixin {
  Timer? _secondTimer;
  Timer? _blinkTimer;
  Duration _timeRemaining = Duration.zero;
  bool _blinkColorIsRed = false;
  bool _isAnimationStarted = false;

  @override
  void initState() {
    super.initState();
    _updateTimeRemaining();
    _secondTimer = Timer.periodic(const Duration(seconds: 1), (_) => _updateTimeRemaining());

    if (widget.shouldAnimate) {
      Future.delayed(widget.animationDelay, () {
        if (mounted) {
          setState(() {
            _isAnimationStarted = true;
          });
          widget.onAnimationComplete();
        }
      });
    } else {
      _isAnimationStarted = true;
    }
  }

  void _updateTimeRemaining() {
    if (!mounted) return;

    // Use UTC now for comparison, ensuring accuracy across timezones.
    final remaining = widget.contract.deadline.difference(DateTime.now().toUtc());
    setState(() {
      _timeRemaining = remaining;
    });

    final shouldBlink = !widget.contract.isExecuted && remaining.inSeconds < 10 && !remaining.isNegative;

    if (shouldBlink) {
      _startBlinking();
    } else {
      _stopBlinking();
    }
  }

  void _startBlinking() {
    if (_blinkTimer?.isActive ?? false) return; // Already blinking
    _blinkTimer = Timer.periodic(const Duration(milliseconds: 500), (_) {
      if (!mounted) return;
      setState(() => _blinkColorIsRed = !_blinkColorIsRed);
    });
  }

  void _stopBlinking() {
    if (_blinkTimer?.isActive ?? false) {
      _blinkTimer!.cancel();
      _blinkTimer = null;
      if (_blinkColorIsRed) {
        setState(() => _blinkColorIsRed = false);
      }
    }
  }

  @override
  void dispose() {
    _secondTimer?.cancel();
    _blinkTimer?.cancel();
    super.dispose();
  }

  String _formatDuration(Duration duration) {
    String twoDigits(int n) => n.toString().padLeft(2, '0');
    if (duration.isNegative) {
      final d = duration.abs();
      final days = d.inDays;
      final hours = twoDigits(d.inHours.remainder(24));
      final minutes = twoDigits(d.inMinutes.remainder(60));
      final seconds = twoDigits(d.inSeconds.remainder(60));
      return "-${days}d ${hours}h ${minutes}m ${seconds}s";
    }
    final days = duration.inDays;
    final hours = twoDigits(duration.inHours.remainder(24));
    final minutes = twoDigits(duration.inMinutes.remainder(60));
    final seconds = twoDigits(duration.inSeconds.remainder(60));
    return "${days}d ${hours}h ${minutes}m ${seconds}s";
  }

  String _formatExecutionTime(DateTime dt) {
    // Since DateTime is UTC, format it as such to avoid ambiguity.
    final utcDt = dt.toUtc();
    String p(int n) => n.toString().padLeft(2, '0');
    return '${utcDt.year}/${p(utcDt.month)}/${p(utcDt.day)} - ${p(utcDt.hour)}:${p(utcDt.minute)} UTC';
  }

  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);
    final walletProvider = context.watch<WalletProvider>();

    final isReadyToExecute = !widget.contract.isExecuted && _timeRemaining.isNegative;
    final isBlinking = _blinkTimer?.isActive ?? false;

    Color countdownColor = Colors.white;
    if (isReadyToExecute) {
      countdownColor = Colors.red.shade400;
    } else if (isBlinking && _blinkColorIsRed) {
      countdownColor = Colors.red.shade400;
    }

    Widget content = Container(
      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 20.0),
      decoration: BoxDecoration(
        color: widget.contract.isMock ? theme.primaryColor.withOpacity(0.05) : Colors.transparent,
        border: Border(bottom: BorderSide(color: Colors.grey.shade800, width: 0.5)),
      ),
      child: Row(
        children: [
          // Contract Address
          Expanded(
            flex: 3,
            child: Row(
              children: [
                AddressAvatar(address: widget.contract.address, size: 36),
                const SizedBox(width: 16),
                Flexible(
                  child: SelectableText(
                    '${widget.contract.address.substring(0, 6)}...${widget.contract.address.substring(widget.contract.address.length - 4)}',
                    style: const TextStyle(fontFamily: 'monospace', fontSize: 15),
                  ),
                ),
                IconButton(
                  icon: const Icon(Icons.copy, size: 16, color: Colors.white54),
                  onPressed: () {
                    Clipboard.setData(ClipboardData(text: widget.contract.address));
                    ScaffoldMessenger.of(context).showSnackBar(
                      const SnackBar(content: Text('Address copied to clipboard')),
                    );
                  },
                ),
              ],
            ),
          ),
          // Status
          Expanded(
            flex: 2,
            child: Center(
              child: Container(
                padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 4),
                decoration: BoxDecoration(
                  color: widget.contract.isExecuted ? Colors.blue.withOpacity(0.1) : Colors.green.withOpacity(0.1),
                  borderRadius: BorderRadius.circular(12),
                  border: Border.all(
                      color: widget.contract.isExecuted ? Colors.blue.shade300 : Colors.green.shade300, width: 0.5),
                ),
                child: Text(
                  widget.contract.isExecuted ? 'Executed' : 'Armed',
                  style: TextStyle(
                    fontWeight: FontWeight.bold,
                    color: widget.contract.isExecuted ? Colors.blue.shade200 : Colors.green.shade200,
                  ),
                ),
              ),
            ),
          ),
          // Countdown / Execution Time
          Expanded(
            flex: 3,
            child: Center(
              child: widget.contract.isExecuted && widget.contract.executionTime != null
                  ? Text(
                      _formatExecutionTime(widget.contract.executionTime!),
                      style: const TextStyle(fontFamily: 'monospace', color: Colors.white70),
                    )
                  : Text(
                          _formatDuration(_timeRemaining),
                          style: TextStyle(
                              fontFamily: 'monospace',
                              fontSize: 16,
                              color: countdownColor,
                              fontWeight: FontWeight.bold),
                        ),
            ),
          ),
          // Action Button / TX Link
          Expanded(
            flex: 2,
            child: Center(
              child: widget.contract.isExecuted
                  ? Row(
                      mainAxisAlignment: MainAxisAlignment.center,
                      children: [
                        Text('TX: ${widget.contract.txHash?.substring(0, 6) ?? 'N/A'}...',
                            style: const TextStyle(fontFamily: 'monospace', color: Colors.white54)),
                        IconButton(
                          icon: const Icon(Icons.open_in_new, size: 18, color: Colors.white70),
                          onPressed: () {
                            if (walletProvider.currentChain != null && widget.contract.txHash != null) {
                              launchUrl(Uri.parse(
                                  '${walletProvider.currentChain!.explorerUrl}/tx/0x${widget.contract.txHash}'));
                            }
                          },
                        ),
                      ],
                    )
                  : ElevatedButton(
                      // CORRECTED: The onPressed callback now calls the executeWill function.
                      // It is disabled if not ready OR if another will action is already in progress.
                      onPressed: isReadyToExecute && !walletProvider.isWillActionInProgress
                          ? () => context.read<WalletProvider>().executeWill(widget.contract.address)
                          : null,
                      style: ElevatedButton.styleFrom(
                        backgroundColor: theme.primaryColor,
                        disabledBackgroundColor: Colors.grey.shade800,
                        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
                      ),
                      child: const Text('Execute'),
                    ),
            ),
          ),
        ],
      ),
    );

    return AnimatedOpacity(
      opacity: _isAnimationStarted ? 1.0 : 0.0,
      duration: const Duration(milliseconds: 400),
      curve: Curves.easeOut,
      child: AnimatedContainer(
        duration: const Duration(milliseconds: 400),
        curve: Curves.easeOut,
        transform: Matrix4.translationValues(0, _isAnimationStarted ? 0 : 20, 0),
        child: content,
      ),
    );
  }
}
// lib/executions/contract_item.dart
```

### `lib/executions/executions_page.dart`
```dart
import 'package:afterme_web/models/execution_contract_model.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:afterme_web/executions/contract_item.dart';
import 'package:afterme_web/mock/mock_executions.dart';
import 'package:afterme_web/wallet_provider.dart';
import 'package:afterme_web/widgets/wrong_network_display.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

class ExecutionsPage extends StatefulWidget {
  final String searchQuery;
  final bool showArmed;
  final bool showMockData;

  const ExecutionsPage({
    super.key,
    required this.searchQuery,
    required this.showArmed,
    required this.showMockData,
  });

  @override
  State<ExecutionsPage> createState() => _ExecutionsPageState();
}

class _ExecutionsPageState extends State<ExecutionsPage> {
  Stream<QuerySnapshot>? _willsStream;
  String? _currentStreamChainName;
  final Set<String> _animatedContracts = {};

  @override
  void initState() {
    super.initState();
    // didChangeDependencies will be called immediately after, so we can init there.
  }

  @override
  void didChangeDependencies() {
    super.didChangeDependencies();
    // This is the correct place to react to provider changes for side-effects
    // like creating a network-dependent stream.
    _updateStream();
  }

  void _updateStream() {
    final walletProvider = Provider.of<WalletProvider>(context);
    final newChainName = walletProvider.currentChain?.chainName;

    // Only update the stream if the network has actually changed.
    if (newChainName != _currentStreamChainName) {
      // Update the tracking variable immediately.
      _currentStreamChainName = newChainName;

      if (walletProvider.isWrongNetwork || newChainName == null) {
        // If the network is unsupported or disconnected, clear the stream.
        if (_willsStream != null) {
          setState(() {
            _willsStream = null;
          });
        }
      } else {
        // If it's a new, valid network, create a new stream.
        setState(() {
          final collectionName = "wills$newChainName";
          _willsStream = FirebaseFirestore.instance.collection(collectionName).snapshots();
          _animatedContracts.clear(); // Reset animations for the new list.
        });
      }
    }
  }

  List<ExecutionContract> _filterAndSortContracts(List<ExecutionContract> contracts) {
    final query = widget.searchQuery.toLowerCase();
    
    List<ExecutionContract> filtered = contracts.where((contract) {
      final matchesType = contract.isExecuted == !widget.showArmed;
      if (!matchesType) return false;
      final matchesQuery = query.isEmpty || contract.address.toLowerCase().contains(query);
      return matchesQuery;
    }).toList();

    if (widget.showArmed) {
      filtered.sort((a, b) => a.deadline.compareTo(b.deadline));
    } else {
      if (filtered.isNotEmpty && filtered.first.executionTime != null) {
         filtered.sort((a, b) => b.executionTime!.compareTo(a.executionTime!));
      }
    }
    return filtered;
  }

  @override
  Widget build(BuildContext context) {
    final walletProvider = context.watch<WalletProvider>();
    final theme = Theme.of(context);
    final headerStyle = theme.textTheme.labelLarge?.copyWith(color: Colors.white70);

    Widget pageContent;

    if (walletProvider.isWrongNetwork) {
      pageContent = const WrongNetworkDisplay();
    } else if (_willsStream == null) {
      // If we are on a correct network but the stream is null, it's either
      // initializing or the network just changed. Show a loader.
      pageContent = const Center(child: CircularProgressIndicator());
    } else {
      pageContent = StreamBuilder<QuerySnapshot>(
        stream: _willsStream,
        builder: (context, snapshot) {
          if (snapshot.hasError) {
            return Center(child: Text('Error: ${snapshot.error}'));
          }
          if (snapshot.connectionState == ConnectionState.waiting) {
            return const Center(child: CircularProgressIndicator());
          }

          List<ExecutionContract> firestoreContracts = snapshot.data!.docs
              .map((doc) => ExecutionContract.fromFirestore(doc))
              .toList();

          List<ExecutionContract> combinedList = [...firestoreContracts];
          if (widget.showMockData) {
            combinedList.addAll(mockContracts);
          }

          final displayedContracts = _filterAndSortContracts(combinedList);
          int animationIndexCounter = 0;

          final displayedAddresses = displayedContracts.map((c) => c.address).toSet();
          _animatedContracts.removeWhere((addr) => !displayedAddresses.contains(addr));

          return Center(
            child: ConstrainedBox(
              constraints: const BoxConstraints(maxWidth: 1000),
              child: Column(
                children: [
                  _buildTableHeaders(headerStyle),
                  Expanded(
                    child: displayedContracts.isEmpty
                        ? Center(
                            child: Text(
                            'No contracts found.',
                            style: theme.textTheme.titleMedium,
                          ))
                        : ListView.builder(
                            padding: EdgeInsets.zero,
                            itemCount: displayedContracts.length,
                            itemBuilder: (context, index) {
                              final contract = displayedContracts[index];
                              final bool hasAnimated = _animatedContracts.contains(contract.address);
                              
                              int delayMs = 0;
                              bool shouldAnimate = !hasAnimated;

                              if (shouldAnimate) {
                                if (animationIndexCounter < 10) {
                                  delayMs = animationIndexCounter * 50;
                                } else {
                                  delayMs = 500;
                                }
                                animationIndexCounter++;
                              }

                              return ContractItem(
                                key: ValueKey(contract.address),
                                contract: contract,
                                shouldAnimate: shouldAnimate,
                                animationDelay: Duration(milliseconds: delayMs),
                                onAnimationComplete: () {
                                  if (mounted) {
                                    _animatedContracts.add(contract.address);
                                  }
                                },
                              );
                            },
                          ),
                  ),
                ],
              ),
            ),
          );
        },
      );
    }

    return Padding(
      padding: const EdgeInsets.only(
        top: 70.0,
        left: 24.0,
        right: 24.0,
      ),
      child: Stack(
        children: [
          pageContent,
          if (walletProvider.isWillActionInProgress)
            Container(
              color: Colors.black.withOpacity(0.7),
              child: Center(
                child: Column(
                  mainAxisSize: MainAxisSize.min,
                  children: [
                    const CircularProgressIndicator(),
                    const SizedBox(height: 20),
                    Text(
                      walletProvider.willActionMessage,
                      style: Theme.of(context).textTheme.titleLarge,
                      textAlign: TextAlign.center,
                    ),
                  ],
                ),
              ),
            ),
        ],
      ),
    );
  }

  Widget _buildTableHeaders(TextStyle? headerStyle) {
    return Container(
      padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8.0),
      decoration: BoxDecoration(
        color: Colors.white.withOpacity(0.05),
        border: Border.symmetric(
          horizontal: BorderSide(color: Colors.grey.shade800, width: 0.5),
        ),
      ),
      child: Row(
        children: [
          Expanded(flex: 3, child: Text('CONTRACT ADDRESS', style: headerStyle)),
          Expanded(flex: 2, child: Center(child: Text('STATUS', style: headerStyle))),
          Expanded(
              flex: 3,
              child:
                  Center(child: Text(widget.showArmed ? 'NEXT PING DEADLINE' : 'EXECUTION TIME', style: headerStyle))),
          Expanded(flex: 2, child: Center(child: Text(widget.showArmed ? 'ACTION' : 'TRANSACTION', style: headerStyle))),
        ],
      ),
    );
  }
}
// lib/executions/executions_page.dart
```

### `lib/mock/mock_executions.dart`
```dart
import 'dart:math';
import '../models/execution_contract_model.dart';

// Helper to generate random Ethereum-like addresses.
String _generateRandomAddress() {
  final random = Random();
  const chars = 'abcdef0123456789';
  final address =
      String.fromCharCodes(Iterable.generate(40, (_) => chars.codeUnitAt(random.nextInt(chars.length))));
  return '0x$address';
}

// Helper to generate a random transaction hash.
String _generateRandomTxHash() {
  final random = Random();
  const chars = 'abcdef0123456789';
  final hash =
      String.fromCharCodes(Iterable.generate(64, (_) => chars.codeUnitAt(random.nextInt(chars.length))));
  return '0x$hash';
}

// Updated function to create a mock contract with the new model
ExecutionContract _createMockContract({
  required bool isExecuted,
  required Duration timeOffset,
  int interval = 2592000, // 30 days
}) {
  final now = DateTime.now();
  final address = _generateRandomAddress();
  DateTime lastUpdate;
  DateTime? executionTime;
  String? txHash;

  if (isExecuted) {
    executionTime = now.add(timeOffset);
    lastUpdate = executionTime.subtract(Duration(seconds: interval));
    txHash = _generateRandomTxHash();
  } else {
    // For armed contracts, the deadline is in the future/past.
    // lastUpdate = deadline - interval
    final deadline = now.add(timeOffset);
    lastUpdate = deadline.subtract(Duration(seconds: interval));
  }

  return ExecutionContract(
    address: address,
    owner: _generateRandomAddress(),
    isExecuted: isExecuted,
    lastUpdate: lastUpdate,
    interval: interval,
    isMock: true, // Mark this as mock data
    executionTime: executionTime,
    txHash: txHash,
  );
}

// A list of mock contracts to populate the UI.
final List<ExecutionContract> mockContracts = [
  // --- Armed Contracts ---
  // A few with negative time (ready to execute)
  _createMockContract(isExecuted: false, timeOffset: const Duration(minutes: -5, seconds: -30)),
  _createMockContract(isExecuted: false, timeOffset: const Duration(hours: -2)),
  _createMockContract(isExecuted: false, timeOffset: const Duration(days: -1)),

  // A few with < 10 seconds (blinking)
  _createMockContract(isExecuted: false, timeOffset: const Duration(seconds: 8)),
  _createMockContract(isExecuted: false, timeOffset: const Duration(seconds: 4)),

  // A few with < 1 hour
  _createMockContract(isExecuted: false, timeOffset: const Duration(seconds: 14)),
  _createMockContract(isExecuted: false, timeOffset: const Duration(seconds: 30)),
  _createMockContract(isExecuted: false, timeOffset: const Duration(minutes: 15)),
  _createMockContract(isExecuted: false, timeOffset: const Duration(minutes: 45)),

  // Several with long remaining times
  ...List.generate(
      15,
      (index) => _createMockContract(isExecuted: false, timeOffset: Duration(days: 2 + index, hours: 5, minutes: 20))),

  // --- Executed Contracts ---
  ...List.generate(
      15,
      (index) => _createMockContract(isExecuted: true, timeOffset: Duration(days: -(index * 2), hours: -(index * 3)))),
];
// lib/mock/mock_executions.dart
```

### `lib/models/asset_models.dart`
```dart
import 'package:flutter/material.dart';

// A model to hold the controllers for an ERC20 asset entry
class Erc20Asset {
  final TextEditingController contractAddressController = TextEditingController();
  final TextEditingController amountController = TextEditingController();

  void dispose(VoidCallback listener) {
    contractAddressController.removeListener(listener);
    amountController.removeListener(listener);
    contractAddressController.dispose();
    amountController.dispose();
  }
}

// A model to hold the controllers for an NFT asset entry
class NftAsset {
  final TextEditingController contractAddressController = TextEditingController();
  final TextEditingController tokenIdController = TextEditingController();
  String? assignedHeir; // This will hold the selected heir's address

  void dispose(VoidCallback listener) {
    contractAddressController.removeListener(listener);
    tokenIdController.removeListener(listener);
    contractAddressController.dispose();
    tokenIdController.dispose();
  }
}
```

### `lib/models/chain_model.dart`
```dart
// lib/models/chain_model.dart
import 'package:flutter_web3/flutter_web3.dart';

/// Represents all the necessary details for a supported blockchain network.
class Chain {
  final int chainId;
  final String chainName;
  final String rpcUrl;
  final String explorerUrl;
  final CurrencyParams nativeCurrency;
  final String sourceContractAddress;

  const Chain({
    required this.chainId,
    required this.chainName,
    required this.rpcUrl,
    required this.explorerUrl,
    required this.nativeCurrency,
    required this.sourceContractAddress,
  });
}
```

### `lib/models/diary_entry.dart`
```dart
// lib/models/diary_entry.dart

class DiaryEntry {
  final String id;
  final String title;
  final DateTime date;
  final String content;

  DiaryEntry({
    required this.id,
    required this.title,
    required this.date,
    required this.content,
  });
}
// lib/models/diary_entry.dart
```

### `lib/models/execution_contract_model.dart`
```dart
import 'package:cloud_firestore/cloud_firestore.dart';

class ExecutionContract {
  final String address;
  final String owner;
  final bool isExecuted;
  final DateTime lastUpdate;
  final int interval; // in seconds
  final bool isMock;
  final DateTime? executionTime;
  final String? txHash;

  ExecutionContract({
    required this.address,
    required this.owner,
    required this.isExecuted,
    required this.lastUpdate,
    required this.interval,
    this.isMock = false,
    this.executionTime,
    this.txHash,
  });

  /// Calculated property for the deadline.
  DateTime get deadline => lastUpdate.add(Duration(seconds: interval));

  /// Factory constructor to create an instance from a Firestore document.
  factory ExecutionContract.fromFirestore(DocumentSnapshot doc) {
    Map<String, dynamic> data = doc.data() as Map<String, dynamic>;

    // Firestore timestamps need to be converted to DateTime
    DateTime? execTime;
    if (data['executionTime'] != null) {
      execTime = DateTime.fromMillisecondsSinceEpoch(
          (data['executionTime'] as Timestamp).millisecondsSinceEpoch,
          isUtc: true);
    }
    
    return ExecutionContract(
      address: data['address'] ?? doc.id,
      owner: data['owner'] ?? '',
      isExecuted: data['executed'] ?? false,
      lastUpdate: DateTime.fromMillisecondsSinceEpoch(
          (data['lastUpdate'] as Timestamp).millisecondsSinceEpoch,
          isUtc: true),
      interval: data['interval']?.toInt() ?? 0,
      executionTime: execTime,
      // CORRECTED: Look for 'transactionHash' in the Firestore document
      // and assign it to the 'txHash' property of the model.
      txHash: data['transactionHash'],

    );
  }
}
// lib/models/execution_contract_model.dart
```

### `lib/models/will_details_model.dart`
```dart
// lib/models/will_details_model.dart

import 'package:afterme_web/utils/conversions.dart';

enum WillState { Empty, Active, Executed }

class Erc20Detail {
  final String tokenContract;
  final BigInt balance;

  Erc20Detail({required this.tokenContract, required this.balance});

  factory Erc20Detail.fromList(List<dynamic> data) {
    return Erc20Detail(
      tokenContract: data[0] as String,
      balance: BigInt.parse(data[1].toString()),
    );
  }

  String get formattedBalance {
    try {
      return formatEther(balance);
    } catch (e) {
      return balance.toString();
    }
  }
}

class Erc721Detail {
  final String tokenContract;
  final BigInt tokenId;
  final String heir;

  Erc721Detail({
    required this.tokenContract,
    required this.tokenId,
    required this.heir,
  });

  factory Erc721Detail.fromList(List<dynamic> data) {
    return Erc721Detail(
      tokenContract: data[0] as String,
      tokenId: BigInt.parse(data[1].toString()),
      heir: data[2] as String,
    );
  }
}

class WillDetails {
  final String owner;
  final BigInt interval; // in seconds
  final BigInt lastUpdate; // unix timestamp in seconds
  final bool executed;
  final bool hasDiary;
  final BigInt ethBalance;
  final List<String> heirs;
  final List<BigInt> distributionPercentages;
  final List<Erc20Detail> erc20Details;
  final List<Erc721Detail> erc721Details;
  final WillState currentState;

  WillDetails({
    required this.owner,
    required this.interval,
    required this.lastUpdate,
    required this.executed,
    required this.hasDiary,
    required this.ethBalance,
    required this.heirs,
    required this.distributionPercentages,
    required this.erc20Details,
    required this.erc721Details,
    required this.currentState,
  });

  factory WillDetails.fromRPCResponse(
      List<dynamic> response, int currentStateValue) {
    final rawPercentages = response[7] as List<dynamic>;
    final rawErc20s = response[8] as List<dynamic>;
    final rawErc721s = response[9] as List<dynamic>;

    return WillDetails(
      owner: response[0] as String,
      interval: BigInt.parse(response[1].toString()),
      lastUpdate: BigInt.parse(response[2].toString()),
      executed: response[3] as bool,
      hasDiary: response[4] as bool,
      ethBalance: BigInt.parse(response[5].toString()),
      heirs: List<String>.from(response[6]),
      distributionPercentages:
          rawPercentages.map((p) => BigInt.parse(p.toString())).toList(),
      erc20Details: rawErc20s
          .map((data) => Erc20Detail.fromList(data as List<dynamic>))
          .toList(),
      erc721Details: rawErc721s
          .map((data) => Erc721Detail.fromList(data as List<dynamic>))
          .toList(),
      currentState: WillState.values[currentStateValue],
    );
  }

  String get formattedEthBalance => formatEther(ethBalance);
}
// lib/models/will_details_model.dart
```

### `lib/utils/avatar_generator.dart`
```dart
import 'dart:math';
import 'dart:typed_data';
import 'package:image/image.dart' as img;

/// Generates a symmetrical, pixelated avatar from a given string hash.
///
/// Returns the avatar as a PNG-encoded [Uint8List].
Future<Uint8List> generateAvatarAsync(String hash, {int size = 40, int pixelSize = 5}) async {
  // Use the hash's own hashCode for seeding to ensure consistent output for the same string.
  final random = Random(hash.hashCode);
  final image = img.Image(width: size, height: size);

  // Generate a small color palette based on the hash.
  final colorPalette = List.generate(
    5,
    (_) => img.ColorRgb8(
      random.nextInt(256),
      random.nextInt(256),
      random.nextInt(256),
    ),
  );

  // Fill the image symmetrically.
  for (var x = 0; x < size / 2; x += pixelSize) {
    for (var y = 0; y < size; y += pixelSize) {
      final color = colorPalette[random.nextInt(colorPalette.length)];
      // Draw a pixel on the left side.
      // MODIFIED: Used named parameters as required by the 'image' package API.
      img.fillRect(image, x1: x, y1: y, x2: x + pixelSize, y2: y + pixelSize, color: color);
      // Mirror the pixel to the right side for symmetry.
      img.fillRect(image, x1: size - x - pixelSize, y1: y, x2: size - x, y2: y + pixelSize, color: color);
    }
  }

  // Encode the image to PNG format.
  final pngBytes = img.encodePng(image);
  return Uint8List.fromList(pngBytes);
}
// lib/utils/avatar_generator.dart
```

### `lib/utils/conversions.dart`
```dart
// lib/utils/conversions.dart


BigInt etherToWei(String amount) {
  const int decimals = 18;
  String wholePart = '0';
  String fractionalPart = '';

  if (amount.contains('.')) {
    final parts = amount.split('.');
    wholePart = parts[0];
    fractionalPart = parts[1];
  } else {
    wholePart = amount;
  }

  if (fractionalPart.length > decimals) {
    fractionalPart = fractionalPart.substring(0, decimals);
  }

  final paddedFractionalPart = fractionalPart.padRight(decimals, '0');
  final weiString = '$wholePart$paddedFractionalPart';
  
  return BigInt.parse(weiString);
}

/// Converts a BigInt representation of a value in Wei to a formatted string in Ether.
String formatEther(BigInt wei) {
  const int decimals = 18;
  String weiString = wei.toString();
  
  if (weiString.length <= decimals) {
    // Pad with leading zeros if it's less than 1 Ether
    String padded = weiString.padLeft(decimals + 1, '0');
    return "0.${padded.substring(1)}".replaceAll(RegExp(r'0+$'), ''); // Remove trailing zeros
  } else {
    int decimalPointIndex = weiString.length - decimals;
    String whole = weiString.substring(0, decimalPointIndex);
    String fractional = weiString.substring(decimalPointIndex).replaceAll(RegExp(r'0+$'), '');
    
    if (fractional.isEmpty) {
      return whole;
    }
    return "$whole.$fractional";
  }
}
// lib/utils/conversions.dart
```

### `lib/utils/validators.dart`
```dart
// lib/utils/validators.dart

/// A simple regex validator for Ethereum-style addresses.
/// Checks for '0x' followed by 40 hexadecimal characters.
bool isValidEthereumAddress(String address) {
  return RegExp(r'^0x[a-fA-F0-9]{40}$').hasMatch(address);
}
```

### `lib/widgets/address_avatar.dart`
```dart
import 'dart:typed_data';
import 'package:flutter/material.dart';
import '../utils/avatar_generator.dart';

class AddressAvatar extends StatefulWidget {
  final String address;
  final double size;

  const AddressAvatar({
    super.key,
    required this.address,
    this.size = 40.0,
  });

  @override
  State<AddressAvatar> createState() => _AddressAvatarState();
}

class _AddressAvatarState extends State<AddressAvatar> {
  Future<Uint8List>? _avatarFuture;

  @override
  void initState() {
    super.initState();
    _generateAvatar();
  }

  @override
  void didUpdateWidget(covariant AddressAvatar oldWidget) {
    super.didUpdateWidget(oldWidget);
    // Regenerate avatar only if the address has changed.
    if (widget.address != oldWidget.address || widget.size != oldWidget.size) {
      _generateAvatar();
    }
  }

  void _generateAvatar() {
    _avatarFuture = generateAvatarAsync(widget.address, size: widget.size.toInt());
  }

  @override
  Widget build(BuildContext context) {
    // Use a FutureBuilder to handle the async image generation.
    return FutureBuilder<Uint8List>(
      future: _avatarFuture,
      builder: (context, snapshot) {
        // While waiting for the image, show a placeholder.
        if (snapshot.connectionState == ConnectionState.waiting) {
          return CircleAvatar(
            radius: widget.size / 2,
            backgroundColor: Colors.grey.shade800,
            child: Padding(
              padding: const EdgeInsets.all(8.0),
              child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white70),
            ),
          );
        }
        // If there's an error, show an error icon.
        if (snapshot.hasError) {
          return CircleAvatar(
            radius: widget.size / 2,
            backgroundColor: Colors.red.shade900,
            child: Icon(Icons.error_outline, color: Colors.white70, size: widget.size * 0.6),
          );
        }
        // If we have the image data, display it.
        if (snapshot.hasData) {
          return CircleAvatar(
            radius: widget.size / 2,
            backgroundImage: MemoryImage(snapshot.data!),
          );
        }
        // Default fallback (though rarely reached).
        return CircleAvatar(
          radius: widget.size / 2,
          backgroundColor: Colors.grey.shade800,
        );
      },
    );
  }
}
// lib/widgets/address_avatar.dart
```

### `lib/widgets/animated_step_container.dart`
```dart
import 'package:flutter/material.dart';
import 'package:animated_text_kit/animated_text_kit.dart';

class AnimatedStepContainer extends StatefulWidget {
  final String title;
  final String description;
  final Widget content;
  final VoidCallback onAnimationCompleted;

  const AnimatedStepContainer({
    super.key,
    required this.title,
    required this.description,
    required this.content,
    required this.onAnimationCompleted,
  });

  @override
  _AnimatedStepContainerState createState() => _AnimatedStepContainerState();
}

class _AnimatedStepContainerState extends State<AnimatedStepContainer> {
  bool _showTitle = false;
  bool _showDescription = false;
  bool _showContent = false;

  @override
  void initState() {
    super.initState();
    _startAnimationSequence();
  }

  void _startAnimationSequence() {
    WidgetsBinding.instance.addPostFrameCallback((_) {
      if (!mounted) return;
      
      // 1. Show title
      setState(() => _showTitle = true);
      
      // 2. Show description after title
      Future.delayed(const Duration(milliseconds: 250), () {
        if (mounted) setState(() => _showDescription = true);
      });
    });
  }
  
  Widget _fadeScaleTransition(Widget widget, Animation<double> animation) {
    return ScaleTransition(
      scale: Tween<double>(begin: 0.95, end: 1.0).animate(
          CurvedAnimation(parent: animation, curve: Curves.easeOut)),
      child: FadeTransition(
        opacity: Tween<double>(begin: 0.0, end: 1.0).animate(animation),
        child: widget,
      ),
    );
  }

  @override
  Widget build(BuildContext context) {
    final theme = Theme.of(context);

    return Column(
      crossAxisAlignment: CrossAxisAlignment.start,
      children: [
        // Title
        AnimatedSwitcher(
          duration: const Duration(milliseconds: 200),
          transitionBuilder: _fadeScaleTransition,
          child: _showTitle
              ? Text(
                  widget.title,
                  key: const ValueKey('title'),
                  style: theme.textTheme.headlineMedium?.copyWith(
                    fontFamily: 'NanumMyeongjo',
                    fontWeight: FontWeight.bold,
                    color: Colors.white,
                  ),
                )
              : const SizedBox(key: ValueKey('empty_title'), height: 44),
        ),
        const SizedBox(height: 24),
        
        // Description
        AnimatedSwitcher(
          duration: const Duration(milliseconds: 200),
          child: _showDescription
              ? DefaultTextStyle(
                  style: theme.textTheme.bodyLarge!.copyWith(
                    fontFamily: 'NanumMyeongjo',
                    height: 1.6,
                  ),
                  child: AnimatedTextKit(
                    isRepeatingAnimation: false,
                    totalRepeatCount: 1,
                    pause: Duration.zero,
                    animatedTexts: [
                      TypewriterAnimatedText(
                        widget.description,
                        speed: const Duration(milliseconds: 2),
                      ),
                    ],
                    onFinished: () {
                      if (mounted) {
                        setState(() => _showContent = true);
                        // After content starts fading in, call the completion callback
                        Future.delayed(const Duration(milliseconds: 350), () {
                            if(mounted) {
                                widget.onAnimationCompleted();
                            }
                        });
                      }
                    },
                  ),
                )
              : const SizedBox(key: ValueKey('empty_desc'), height: 50),
        ),
        const SizedBox(height: 32),
        
        // Content
        AnimatedSwitcher(
          duration: const Duration(milliseconds: 300),
          transitionBuilder: (child, animation) => FadeTransition(opacity: animation, child: child),
          child: _showContent
              ? widget.content
              : const SizedBox(key: ValueKey('empty_content')),
        ),
      ],
    );
  }
}
```

### `lib/widgets/avatar_generator.dart`
```dart
import 'dart:math';
import 'dart:typed_data';
import 'package:image/image.dart' as img;

/// Generates a symmetrical, pixelated avatar from a given string hash.
///
/// Returns the avatar as a PNG-encoded [Uint8List].
Future<Uint8List> generateAvatarAsync(String hash, {int size = 40, int pixelSize = 5}) async {
  // Use the hash's own hashCode for seeding to ensure consistent output for the same string.
  final random = Random(hash.hashCode);
  final image = img.Image(width: size, height: size);

  // Generate a small color palette based on the hash.
  final colorPalette = List.generate(
    5,
    (_) => img.ColorRgb8(
      random.nextInt(256),
      random.nextInt(256),
      random.nextInt(256),
    ),
  );

  // Fill the image symmetrically.
  for (var x = 0; x < size / 2; x += pixelSize) {
    for (var y = 0; y < size; y += pixelSize) {
      final color = colorPalette[random.nextInt(colorPalette.length)];
      // Draw a pixel on the left side.
      // MODIFIED: Used named parameters as required by the 'image' package API.
      img.fillRect(image, x1: x, y1: y, x2: x + pixelSize, y2: y + pixelSize, color: color);
      // Mirror the pixel to the right side for symmetry.
      img.fillRect(image, x1: size - x - pixelSize, y1: y, x2: size - x, y2: y + pixelSize, color: color);
    }
  }

  // Encode the image to PNG format.
  final pngBytes = img.encodePng(image);
  return Uint8List.fromList(pngBytes);
}
// lib/utils/avatar_generator.dart
```

### `lib/widgets/step_progress_indicator.dart`
```dart
import 'package:flutter/material.dart';

class StepProgressIndicator extends StatelessWidget {
  final int totalSteps;
  final int currentStep; // 0-indexed for programmatic use

  const StepProgressIndicator({
    super.key,
    required this.totalSteps,
    required this.currentStep,
  });

  @override
  Widget build(BuildContext context) {
    return SizedBox(
      width: 200, // Fixed width for the indicator container
      child: Row(
        children: List.generate(totalSteps, (index) {
          return _buildStep(context, index);
        }),
      ),
    );
  }

  Widget _buildStep(BuildContext context, int index) {
    bool isActive = index <= currentStep;
    return Expanded(
      child: Container(
        height: 4,
        margin: const EdgeInsets.symmetric(horizontal: 4),
        decoration: BoxDecoration(
          color: isActive ? Theme.of(context).primaryColor : Colors.grey.shade700,
          borderRadius: BorderRadius.circular(2),
          boxShadow: isActive
              ? [
                  BoxShadow(
                    color: Theme.of(context).primaryColor.withOpacity(0.3),
                    spreadRadius: 1,
                    blurRadius: 4,
                    offset: const Offset(0, 0),
                  ),
                ]
              : [],
        ),
      ),
    );
  }
}
```

### `lib/widgets/wrong_network_display.dart`
```dart
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../wallet_provider.dart';

class WrongNetworkDisplay extends StatelessWidget {
  const WrongNetworkDisplay({super.key});

  @override
  Widget build(BuildContext context) {
    final provider = context.watch<WalletProvider>();
    final supported = provider.chains;

    return Center(
      child: Column(
        mainAxisAlignment: MainAxisAlignment.center,
        children: [
          const Icon(Icons.error_outline, color: Colors.amber, size: 48),
          const SizedBox(height: 16),
          const Text(
            'Wrong Network Detected',
            style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
          ),
          const SizedBox(height: 8),
          const Text(
            'Please switch to one of the supported networks:',
            style: TextStyle(fontSize: 19),
            textAlign: TextAlign.center,
          ),
          const SizedBox(height: 24),
          ...supported.map((chain) => Padding(
                padding: const EdgeInsets.only(bottom: 8.0),
                child: ElevatedButton(
                  onPressed: () => provider.switchNetwork(chain.chainId),
                  child: Text('Switch to ${chain.chainName}'),
                ),
              )),
        ],
      ),
    );
  }
}
// lib/widgets/wrong_network_display.dart
```