From 605e881526d50cea65a13eb4ddaeb416504adffa Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 11:35:43 +0200
Subject: [PATCH 01/20] Remove orientation lock from Android manifest

---
 android/java/AndroidManifest.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/java/AndroidManifest.xml b/android/java/AndroidManifest.xml
index 1fc2a01ecc4d7..a703d92ce4792 100644
--- a/android/java/AndroidManifest.xml
+++ b/android/java/AndroidManifest.xml
@@ -51,9 +51,7 @@
     android:theme="@style/Theme.Chromium.Activity" />
 
 <activity android:name="org.chromium.chrome.browser.crypto_wallet.activities.BraveWalletDAppsActivity"
-    android:theme="@style/Theme.Chromium.Activity.FakeTranslucent"
-    android:screenOrientation="sensorPortrait"
-    tools:ignore="LockedOrientationActivity,DiscouragedApi"/>
+    android:theme="@style/Theme.Chromium.Activity.FakeTranslucent" />
 
 <activity
     android:name="org.chromium.chrome.browser.vpn.split_tunnel.SplitTunnelActivity"

From 788fbc4988b863c88cd681b83c6021d8e80289fc Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 11:35:59 +0200
Subject: [PATCH 02/20] Add missing copyright to XML layout

---
 android/java/brave-res/layout/approve_tx_bottom_sheet.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/java/brave-res/layout/approve_tx_bottom_sheet.xml b/android/java/brave-res/layout/approve_tx_bottom_sheet.xml
index c4de9ecf622a9..c0f46149797d4 100644
--- a/android/java/brave-res/layout/approve_tx_bottom_sheet.xml
+++ b/android/java/brave-res/layout/approve_tx_bottom_sheet.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2021 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"

From 56936e7662310f743985a6e0c21f5de65dacfd4f Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 11:36:48 +0200
Subject: [PATCH 03/20] Make bottom sheet dialog full width in landscape for
 smartphones only

---
 .../WalletBottomSheetDialogFragment.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java
index 65241a60769cb..4a70aa8808611 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java
@@ -5,9 +5,11 @@
 
 package org.chromium.chrome.browser.crypto_wallet.fragments;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 
+import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
 import org.chromium.brave_wallet.mojom.BraveWalletService;
@@ -19,6 +21,7 @@
 import org.chromium.chrome.browser.app.domain.KeyringModel;
 import org.chromium.chrome.browser.app.domain.WalletModel;
 import org.chromium.chrome.browser.crypto_wallet.observers.KeyringServiceObserverImpl;
+import org.chromium.chrome.browser.util.ConfigurationUtils;
 
 /**
  * Base class for {@code BottomSheetDialogFragment} with wallet specific implementation
@@ -77,6 +80,26 @@ public void onAttach(Context context) {
         }
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        // Tablets keep Material's default width.
+        if (ConfigurationUtils.isTablet(requireContext())) {
+            return;
+        }
+
+        final Dialog dialog = getDialog();
+        if (!(dialog instanceof BottomSheetDialog bottomSheetDialog)) {
+            return;
+        }
+
+        // Material's BottomSheetDialog caps the sheet width (640dp by default) and
+        // centers it on wide layouts, which leaves side gaps in landscape. On phones
+        // we want the sheet to span the full width.
+        bottomSheetDialog.getBehavior().setMaxWidth(-1);
+    }
+
     @Override
     public void onDismiss(DialogInterface dialog) {
         mKeyringObserver.close();

From 4757c500702cfe6096c865e1288eb328635eba07 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 11:37:28 +0200
Subject: [PATCH 04/20] Introduce landscape layout

---
 android/BUILD.gn                              |   1 +
 .../layout-land/approve_tx_bottom_sheet.xml   | 291 ++++++++++++++++++
 2 files changed, 292 insertions(+)
 create mode 100644 android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml

diff --git a/android/BUILD.gn b/android/BUILD.gn
index e3710d1971f65..92786b6d82ddd 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -477,6 +477,7 @@ android_resources("java_resources") {
     "java/brave-res/layout-land/activity_brave_origin_plans.xml",
     "java/brave-res/layout-land/activity_brave_vpn_profile.xml",
     "java/brave-res/layout-land/activity_vpn_paywall.xml",
+    "java/brave-res/layout-land/approve_tx_bottom_sheet.xml",
     "java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml",
     "java/brave-res/layout/activity_account_selector.xml",
     "java/brave-res/layout/activity_add_account.xml",
diff --git a/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml b/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml
new file mode 100644
index 0000000000000..0d7184f43dd76
--- /dev/null
+++ b/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".browser.crypto_wallet.fragments.ApproveTxBottomSheetDialogFragment">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/column_divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5"
+        tools:ignore="InconsistentLayout" />
+
+    <!-- Left column: transaction summary header. -->
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/column_divider"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <TextView
+            android:id="@+id/network_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="4dp"
+            android:text="@string/mainnet"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_transaction_counter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginEnd="12dp"
+            tools:text="1 of 2"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="16sp"
+            android:visibility="gone"
+            app:layout_constraintEnd_toStartOf="@id/btn_next_tx"
+            app:layout_constraintTop_toTopOf="@id/btn_next_tx"
+            app:layout_constraintBottom_toBottomOf="@id/btn_next_tx"/>
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_next_tx"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:padding="0dp"
+            android:textAllCaps="false"
+            android:textColor="@color/brave_action_color"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/network_name"
+            tools:text="Next" />
+
+        <ImageView
+            android:id="@+id/account_picture"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center_horizontal"
+            android:contentDescription="@null"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/network_name"
+            app:srcCompat="@drawable/ic_eth_24" />
+
+        <TextView
+            android:id="@+id/domain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="16dp"
+            android:gravity="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/account_picture"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="15sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/from_to"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="4dp"
+            android:gravity="center"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/domain" />
+
+        <TextView
+            android:id="@+id/tx_type"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/from_to" />
+
+        <TextView
+            android:id="@+id/amount_asset"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="2dp"
+            android:gravity="center"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tx_type" />
+
+        <TextView
+            android:id="@+id/amount_fiat"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="8dp"
+            android:gravity="center"
+            android:textColor="@color/wallet_text_color"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/amount_asset" />
+
+        <TextView
+            android:id="@+id/tv_approve_dialog_additional_details"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:gravity="center"
+            android:textColor="@color/wallet_text_color"
+            android:background="@color/brave_wallet_dn_error_text_bg_color"
+            android:textSize="16sp"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/amount_fiat" />
+
+        <Space
+            android:id="@+id/tab_top_space"
+            android:layout_width="0dp"
+            android:layout_height="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_approve_dialog_additional_details"
+            app:layout_constraintBottom_toTopOf="@+id/warning_container" />
+
+        <LinearLayout
+            android:id="@+id/warning_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:background="#32E32444"
+            android:orientation="vertical"
+            android:padding="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tab_top_space"
+            android:visibility="gone">
+
+            <TextView
+                style="@style/BraveWalletTextView"
+                android:text="@string/wallet_change_ownership_warning"
+                android:textColor="@color/brave_theme_error_txt"
+                android:textStyle="bold"
+                android:drawablePadding="6dp"
+                app:drawableStartCompat="@drawable/ic_warning" />
+
+            <TextView
+                android:layout_marginTop="8dp"
+                style="@style/BraveWalletTextView"
+                android:layout_width="match_parent"
+                android:text="@string/wallet_change_ownership_description"
+                android:textColor="@color/brave_theme_error_txt" />
+        </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <!-- Right column: tabs, ViewPager (pages scroll internally), pinned actions. -->
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@color/wallet_toolbar_bg_color"
+        app:layout_constraintStart_toEndOf="@id/column_divider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tabGravity="fill"
+        app:tabIndicator="@drawable/tab_gradient_separator"
+        app:tabIndicatorHeight="@dimen/brave_wallet_tab_indicator_height"
+        app:tabIndicatorColor="@null"
+        app:tabSelectedTextColor="@color/tab_color"
+        app:tabTextAppearance="@style/BraveWalletTabsTextAppearance"
+        app:tabTextColor="@color/wallet_text_color"
+        app:layout_constraintBottom_toTopOf="@id/navigation_view_pager"/>
+
+    <org.chromium.chrome.browser.crypto_wallet.model.TxNonSwipeableViewPager
+        android:id="@+id/navigation_view_pager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toEndOf="@id/column_divider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tabs"
+        app:layout_constraintBottom_toTopOf="@id/actions_container" />
+
+    <LinearLayout
+        android:id="@+id/actions_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintStart_toEndOf="@id/column_divider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/navigation_view_pager"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/btn_reject_transactions"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textAllCaps="false"
+            android:textColor="@color/brave_action_color"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:id="@+id/approve_tx_bottom_sheet_action"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="6dp"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/reject"
+                style="@style/BraveWalletButtonHollow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="1"
+                android:text="@string/reject"
+                android:textSize="16sp" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/approve"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="1"
+                android:background="@drawable/crypto_wallet_blue_button"
+                android:gravity="center"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/approve"
+                android:textAllCaps="false"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

From b2789108854f9761c9e05fce9f4cd7361d736518 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 12:13:43 +0200
Subject: [PATCH 05/20] Optimize layout reusability

---
 android/BUILD.gn                              |   2 +
 .../layout-land/approve_tx_bottom_sheet.xml   | 271 +-----------------
 .../brave-res/layout/approve_tx_actions.xml   |  99 +++++++
 .../layout/approve_tx_bottom_sheet.xml        | 261 +----------------
 .../brave-res/layout/approve_tx_header.xml    | 183 ++++++++++++
 5 files changed, 304 insertions(+), 512 deletions(-)
 create mode 100644 android/java/brave-res/layout/approve_tx_actions.xml
 create mode 100644 android/java/brave-res/layout/approve_tx_header.xml

diff --git a/android/BUILD.gn b/android/BUILD.gn
index 92786b6d82ddd..c2fd2f0e68105 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -497,7 +497,9 @@ android_resources("java_resources") {
     "java/brave-res/layout/activity_vpn_server_selection.xml",
     "java/brave-res/layout/activity_welcome_onboarding.xml",
     "java/brave-res/layout/application_item_layout.xml",
+    "java/brave-res/layout/approve_tx_actions.xml",
     "java/brave-res/layout/approve_tx_bottom_sheet.xml",
+    "java/brave-res/layout/approve_tx_header.xml",
     "java/brave-res/layout/auto_reconnect_vpn_tutorial_item_layout.xml",
     "java/brave-res/layout/bottom_toolbar.xml",
     "java/brave-res/layout/bottom_toolbar_browsing.xml",
diff --git a/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml b/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml
index 0d7184f43dd76..3437efd013a3d 100644
--- a/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml
+++ b/android/java/brave-res/layout-land/approve_tx_bottom_sheet.xml
@@ -19,273 +19,22 @@
         app:layout_constraintGuide_percent="0.5"
         tools:ignore="InconsistentLayout" />
 
-    <!-- Left column: transaction summary header. -->
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/approve_tx_header"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/column_divider"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <TextView
-            android:id="@+id/network_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="4dp"
-            android:text="@string/mainnet"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tv_transaction_counter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="4dp"
-            android:layout_marginEnd="12dp"
-            tools:text="1 of 2"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="16sp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toStartOf="@id/btn_next_tx"
-            app:layout_constraintTop_toTopOf="@id/btn_next_tx"
-            app:layout_constraintBottom_toBottomOf="@id/btn_next_tx"/>
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_next_tx"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:padding="0dp"
-            android:textAllCaps="false"
-            android:textColor="@color/brave_action_color"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/network_name"
-            tools:text="Next" />
-
-        <ImageView
-            android:id="@+id/account_picture"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center_horizontal"
-            android:contentDescription="@null"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/network_name"
-            app:srcCompat="@drawable/ic_eth_24" />
-
-        <TextView
-            android:id="@+id/domain"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="16dp"
-            android:gravity="center"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/account_picture"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="15sp"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/from_to"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="4dp"
-            android:gravity="center"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/domain" />
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/tx_type"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
-            android:gravity="center"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/from_to" />
-
-        <TextView
-            android:id="@+id/amount_asset"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="2dp"
-            android:gravity="center"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="20sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tx_type" />
-
-        <TextView
-            android:id="@+id/amount_fiat"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="8dp"
-            android:gravity="center"
-            android:textColor="@color/wallet_text_color"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/amount_asset" />
-
-        <TextView
-            android:id="@+id/tv_approve_dialog_additional_details"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:gravity="center"
-            android:textColor="@color/wallet_text_color"
-            android:background="@color/brave_wallet_dn_error_text_bg_color"
-            android:textSize="16sp"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/amount_fiat" />
-
-        <Space
-            android:id="@+id/tab_top_space"
-            android:layout_width="0dp"
-            android:layout_height="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_approve_dialog_additional_details"
-            app:layout_constraintBottom_toTopOf="@+id/warning_container" />
-
-        <LinearLayout
-            android:id="@+id/warning_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:background="#32E32444"
-            android:orientation="vertical"
-            android:padding="16dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tab_top_space"
-            android:visibility="gone">
-
-            <TextView
-                style="@style/BraveWalletTextView"
-                android:text="@string/wallet_change_ownership_warning"
-                android:textColor="@color/brave_theme_error_txt"
-                android:textStyle="bold"
-                android:drawablePadding="6dp"
-                app:drawableStartCompat="@drawable/ic_warning" />
-
-            <TextView
-                android:layout_marginTop="8dp"
-                style="@style/BraveWalletTextView"
-                android:layout_width="match_parent"
-                android:text="@string/wallet_change_ownership_description"
-                android:textColor="@color/brave_theme_error_txt" />
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <!-- Right column: tabs, ViewPager (pages scroll internally), pinned actions. -->
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tabs"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:background="@color/wallet_toolbar_bg_color"
-        app:layout_constraintStart_toEndOf="@id/column_divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tabGravity="fill"
-        app:tabIndicator="@drawable/tab_gradient_separator"
-        app:tabIndicatorHeight="@dimen/brave_wallet_tab_indicator_height"
-        app:tabIndicatorColor="@null"
-        app:tabSelectedTextColor="@color/tab_color"
-        app:tabTextAppearance="@style/BraveWalletTabsTextAppearance"
-        app:tabTextColor="@color/wallet_text_color"
-        app:layout_constraintBottom_toTopOf="@id/navigation_view_pager"/>
-
-    <org.chromium.chrome.browser.crypto_wallet.model.TxNonSwipeableViewPager
-        android:id="@+id/navigation_view_pager"
+    <include
+        android:id="@+id/actions_group"
+        layout="@layout/approve_tx_actions"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintStart_toEndOf="@id/column_divider"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tabs"
-        app:layout_constraintBottom_toTopOf="@id/actions_container" />
-
-    <LinearLayout
-        android:id="@+id/actions_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintStart_toEndOf="@id/column_divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/navigation_view_pager"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <Button
-            android:id="@+id/btn_reject_transactions"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:textAllCaps="false"
-            android:textColor="@color/brave_action_color"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/approve_tx_bottom_sheet_action"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="6dp"
-            android:orientation="horizontal">
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/reject"
-                style="@style/BraveWalletButtonHollow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="1"
-                android:text="@string/reject"
-                android:textSize="16sp" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/approve"
-                style="?android:attr/borderlessButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="1"
-                android:background="@drawable/crypto_wallet_blue_button"
-                android:gravity="center"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="8dp"
-                android:text="@string/approve"
-                android:textAllCaps="false"
-                android:textColor="@android:color/white"
-                android:textSize="16sp" />
-
-        </LinearLayout>
-    </LinearLayout>
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/approve_tx_actions.xml b/android/java/brave-res/layout/approve_tx_actions.xml
new file mode 100644
index 0000000000000..96a87ce43c72d
--- /dev/null
+++ b/android/java/brave-res/layout/approve_tx_actions.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@color/wallet_toolbar_bg_color"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tabGravity="fill"
+        app:tabIndicator="@drawable/tab_gradient_separator"
+        app:tabIndicatorHeight="@dimen/brave_wallet_tab_indicator_height"
+        app:tabIndicatorColor="@null"
+        app:tabSelectedTextColor="@color/tab_color"
+        app:tabTextAppearance="@style/BraveWalletTabsTextAppearance"
+        app:tabTextColor="@color/wallet_text_color"
+        app:layout_constraintBottom_toTopOf="@id/navigation_view_pager"/>
+
+    <org.chromium.chrome.browser.crypto_wallet.model.TxNonSwipeableViewPager
+        android:id="@+id/navigation_view_pager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tabs"
+        app:layout_constraintBottom_toTopOf="@id/actions_container" />
+
+    <LinearLayout
+        android:id="@+id/actions_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/navigation_view_pager"
+        app:layout_constraintBottom_toBottomOf="parent">
+
+        <Button
+            android:id="@+id/btn_reject_transactions"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textAllCaps="false"
+            android:textColor="@color/brave_action_color"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:id="@+id/approve_tx_bottom_sheet_action"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginVertical="6dp"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/reject"
+                style="@style/BraveWalletButtonHollow"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="1"
+                android:text="@string/reject"
+                android:textSize="16sp" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/approve"
+                style="?android:attr/borderlessButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_weight="1"
+                android:background="@drawable/crypto_wallet_blue_button"
+                android:gravity="center"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/approve"
+                android:textAllCaps="false"
+                android:textColor="@android:color/white"
+                android:textSize="16sp" />
+
+        </LinearLayout>
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/approve_tx_bottom_sheet.xml b/android/java/brave-res/layout/approve_tx_bottom_sheet.xml
index c0f46149797d4..1885c099cc109 100644
--- a/android/java/brave-res/layout/approve_tx_bottom_sheet.xml
+++ b/android/java/brave-res/layout/approve_tx_bottom_sheet.xml
@@ -9,265 +9,24 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     tools:context=".browser.crypto_wallet.fragments.ApproveTxBottomSheetDialogFragment">
 
-    <TextView
-        android:id="@+id/network_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="4dp"
-        android:text="@string/mainnet"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/tv_transaction_counter"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginEnd="12dp"
-        tools:text="1 of 2"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="16sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toStartOf="@id/btn_next_tx"
-        app:layout_constraintTop_toTopOf="@id/btn_next_tx"
-        app:layout_constraintBottom_toBottomOf="@id/btn_next_tx"/>
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/btn_next_tx"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:minWidth="0dp"
-        android:minHeight="0dp"
-        android:padding="0dp"
-        android:textAllCaps="false"
-        android:textColor="@color/brave_action_color"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/network_name"
-        tools:text="Next" />
-
-    <ImageView
-        android:id="@+id/account_picture"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_gravity="center_horizontal"
-        android:contentDescription="@null"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/network_name"
-        app:srcCompat="@drawable/ic_eth_24" />
-
-    <TextView
-        android:id="@+id/domain"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/account_picture"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="15sp"
-        android:visibility="gone" />
-
-    <TextView
-        android:id="@+id/from_to"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="4dp"
-        android:gravity="center"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/domain" />
-
-    <TextView
-        android:id="@+id/tx_type"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/from_to" />
-
-    <TextView
-        android:id="@+id/amount_asset"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="2dp"
-        android:gravity="center"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="20sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tx_type" />
-
-    <TextView
-        android:id="@+id/amount_fiat"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:layout_marginBottom="8dp"
-        android:gravity="center"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="16sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/amount_asset" />
-
-    <TextView
-        android:id="@+id/tv_approve_dialog_additional_details"
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/approve_tx_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:gravity="center"
-        android:textColor="@color/wallet_text_color"
-        android:background="@color/brave_wallet_dn_error_text_bg_color"
-        android:textSize="16sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/amount_fiat" />
-
-    <Space
-        android:id="@+id/tab_top_space"
-        android:layout_width="0dp"
-        android:layout_height="8dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_approve_dialog_additional_details"
-        app:layout_constraintBottom_toTopOf="@+id/warning_container" />
-
-    <LinearLayout
-        android:id="@+id/warning_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:background="#32E32444"
-        android:orientation="vertical"
-        android:padding="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/tabs"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tv_approve_dialog_additional_details"
-        app:layout_constraintVertical_bias="0"
-        android:visibility="gone">
-
-        <TextView
-            style="@style/BraveWalletTextView"
-            android:text="@string/wallet_change_ownership_warning"
-            android:textColor="@color/brave_theme_error_txt"
-            android:textStyle="bold"
-            android:drawablePadding="6dp"
-            app:drawableStartCompat="@drawable/ic_warning" />
-
-        <TextView
-            android:layout_marginTop="8dp"
-            style="@style/BraveWalletTextView"
-            android:layout_width="match_parent"
-            android:text="@string/wallet_change_ownership_description"
-            android:textColor="@color/brave_theme_error_txt" />
-    </LinearLayout>
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tabs"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/wallet_toolbar_bg_color"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/warning_container"
-        app:tabGravity="fill"
-        app:tabIndicator="@drawable/tab_gradient_separator"
-        app:tabIndicatorHeight="@dimen/brave_wallet_tab_indicator_height"
-        app:tabIndicatorColor="@null"
-        app:tabSelectedTextColor="@color/tab_color"
-        app:tabTextAppearance="@style/BraveWalletTabsTextAppearance"
-        app:tabTextColor="@color/wallet_text_color"
-        app:layout_constraintBottom_toTopOf="@id/navigation_view_pager"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <org.chromium.chrome.browser.crypto_wallet.model.TxNonSwipeableViewPager
-        android:id="@+id/navigation_view_pager"
+    <include
+        android:id="@+id/actions_group"
+        layout="@layout/approve_tx_actions"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tabs"
-        app:layout_constraintBottom_toTopOf="@id/actions_container" />
-
-    <LinearLayout
-        android:id="@+id/actions_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/navigation_view_pager"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <Button
-            android:id="@+id/btn_reject_transactions"
-            style="@style/Widget.MaterialComponents.Button.TextButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:textAllCaps="false"
-            android:textColor="@color/brave_action_color"
-            android:visibility="gone" />
-
-        <LinearLayout
-            android:id="@+id/approve_tx_bottom_sheet_action"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="6dp"
-            android:orientation="horizontal">
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/reject"
-                style="@style/BraveWalletButtonHollow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="start"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="1"
-                android:text="@string/reject"
-                android:textSize="16sp" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/approve"
-                style="?android:attr/borderlessButtonStyle"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="end"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="1"
-                android:background="@drawable/crypto_wallet_blue_button"
-                android:gravity="center"
-                android:paddingStart="16dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="16dp"
-                android:paddingBottom="8dp"
-                android:text="@string/approve"
-                android:textAllCaps="false"
-                android:textColor="@android:color/white"
-                android:textSize="16sp" />
-
-        </LinearLayout>
-    </LinearLayout>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header_container"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/approve_tx_header.xml b/android/java/brave-res/layout/approve_tx_header.xml
new file mode 100644
index 0000000000000..7d130f9c14ffc
--- /dev/null
+++ b/android/java/brave-res/layout/approve_tx_header.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/network_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:text="@string/mainnet"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_transaction_counter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:layout_marginEnd="12dp"
+        tools:text="1 of 2"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="16sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@id/btn_next_tx"
+        app:layout_constraintTop_toTopOf="@id/btn_next_tx"
+        app:layout_constraintBottom_toBottomOf="@id/btn_next_tx"/>
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/btn_next_tx"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:minWidth="0dp"
+        android:minHeight="0dp"
+        android:padding="0dp"
+        android:textAllCaps="false"
+        android:textColor="@color/brave_action_color"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/network_name"
+        tools:text="Next" />
+
+    <ImageView
+        android:id="@+id/account_picture"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center_horizontal"
+        android:contentDescription="@null"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/network_name"
+        app:srcCompat="@drawable/ic_eth_24" />
+
+    <TextView
+        android:id="@+id/domain"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/account_picture"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="15sp"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/from_to"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="center"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/domain" />
+
+    <TextView
+        android:id="@+id/tx_type"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/from_to" />
+
+    <TextView
+        android:id="@+id/amount_asset"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="2dp"
+        android:gravity="center"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tx_type" />
+
+    <TextView
+        android:id="@+id/amount_fiat"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginBottom="8dp"
+        android:gravity="center"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="16sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/amount_asset" />
+
+    <TextView
+        android:id="@+id/tv_approve_dialog_additional_details"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:gravity="center"
+        android:textColor="@color/wallet_text_color"
+        android:background="@color/brave_wallet_dn_error_text_bg_color"
+        android:textSize="16sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/amount_fiat" />
+
+    <Space
+        android:id="@+id/tab_top_space"
+        android:layout_width="0dp"
+        android:layout_height="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tv_approve_dialog_additional_details"
+        app:layout_constraintBottom_toTopOf="@+id/warning_container" />
+
+    <LinearLayout
+        android:id="@+id/warning_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:background="#32E32444"
+        android:orientation="vertical"
+        android:padding="16dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tab_top_space"
+        android:visibility="gone">
+
+        <TextView
+            style="@style/BraveWalletTextView"
+            android:text="@string/wallet_change_ownership_warning"
+            android:textColor="@color/brave_theme_error_txt"
+            android:textStyle="bold"
+            android:drawablePadding="6dp"
+            app:drawableStartCompat="@drawable/ic_warning" />
+
+        <TextView
+            android:layout_marginTop="8dp"
+            style="@style/BraveWalletTextView"
+            android:layout_width="match_parent"
+            android:text="@string/wallet_change_ownership_description"
+            android:textColor="@color/brave_theme_error_txt" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

From 28d752caca01ab9841607cba0e3576de946f9127 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 12:56:09 +0200
Subject: [PATCH 06/20] Show single column layout for tablets

---
 android/BUILD.gn                              |  1 +
 .../approve_tx_bottom_sheet.xml               | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 android/java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml

diff --git a/android/BUILD.gn b/android/BUILD.gn
index c2fd2f0e68105..a664c75bc8851 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -478,6 +478,7 @@ android_resources("java_resources") {
     "java/brave-res/layout-land/activity_brave_vpn_profile.xml",
     "java/brave-res/layout-land/activity_vpn_paywall.xml",
     "java/brave-res/layout-land/approve_tx_bottom_sheet.xml",
+    "java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml",
     "java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml",
     "java/brave-res/layout/activity_account_selector.xml",
     "java/brave-res/layout/activity_add_account.xml",
diff --git a/android/java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml b/android/java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml
new file mode 100644
index 0000000000000..157395ce27323
--- /dev/null
+++ b/android/java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".browser.crypto_wallet.fragments.ApproveTxBottomSheetDialogFragment">
+
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/approve_tx_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/actions_group"
+        layout="@layout/approve_tx_actions"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header_container"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

From d97b53683ce946cf6f1e55ecc57a12cabdc226bc Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 16:15:15 +0200
Subject: [PATCH 07/20] Fix null model crashes upon orientation changes

---
 .../activities/BraveWalletDAppsActivity.java      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletDAppsActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletDAppsActivity.java
index e5f1bd4000a06..3c00b97d0b61e 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletDAppsActivity.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletDAppsActivity.java
@@ -10,6 +10,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import android.os.Bundle;
 import android.view.Window;
 
 import androidx.fragment.app.Fragment;
@@ -75,6 +76,20 @@ public enum ActivityType {
         FINISH;
     }
 
+    @Override
+    protected @Nullable Bundle transformSavedInstanceStateForOnCreate(
+            @Nullable Bundle savedInstanceState) {
+        // The DApps fragments depend on the WalletModel, which only becomes available
+        // after native initialization (finishNativeInitialization). On a configuration
+        // change such as rotation, the FragmentManager would otherwise restore these
+        // fragments before the model is ready and crash in
+        // WalletBottomSheetDialogFragment.onAttach. Drop the saved fragment/view state so
+        // the activity rebuilds its fragment from the pending request once the model is
+        // initialized. The activity itself is fully reconstructed from its intent and the
+        // wallet's pending requests, so nothing else needs to be restored.
+        return null;
+    }
+
     @Override
     protected void onPreCreate() {
         super.onPreCreate();

From 9ed4e6505538c447a4ca45bf6af639adf8205018 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 17:55:49 +0200
Subject: [PATCH 08/20] Adjust layouts for SignMessageFragment

---
 android/BUILD.gn                              |   4 +
 .../layout-land/fragment_sign_message.xml     |  43 ++++
 .../fragment_sign_message.xml                 |  35 +++
 .../layout/fragment_sign_message.xml          | 215 ++----------------
 .../brave-res/layout/sign_message_details.xml | 135 +++++++++++
 .../brave-res/layout/sign_message_header.xml  |  99 ++++++++
 6 files changed, 331 insertions(+), 200 deletions(-)
 create mode 100644 android/java/brave-res/layout-land/fragment_sign_message.xml
 create mode 100644 android/java/brave-res/layout-sw600dp-land/fragment_sign_message.xml
 create mode 100644 android/java/brave-res/layout/sign_message_details.xml
 create mode 100644 android/java/brave-res/layout/sign_message_header.xml

diff --git a/android/BUILD.gn b/android/BUILD.gn
index a664c75bc8851..3a38a4521e6ec 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -478,7 +478,9 @@ android_resources("java_resources") {
     "java/brave-res/layout-land/activity_brave_vpn_profile.xml",
     "java/brave-res/layout-land/activity_vpn_paywall.xml",
     "java/brave-res/layout-land/approve_tx_bottom_sheet.xml",
+    "java/brave-res/layout-land/fragment_sign_message.xml",
     "java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml",
+    "java/brave-res/layout-sw600dp-land/fragment_sign_message.xml",
     "java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml",
     "java/brave-res/layout/activity_account_selector.xml",
     "java/brave-res/layout/activity_add_account.xml",
@@ -649,6 +651,8 @@ android_resources("java_resources") {
     "java/brave-res/layout/recovery_phrase_item_layout.xml",
     "java/brave-res/layout/search_preference.xml",
     "java/brave-res/layout/selected_network_item.xml",
+    "java/brave-res/layout/sign_message_details.xml",
+    "java/brave-res/layout/sign_message_header.xml",
     "java/brave-res/layout/sign_warning_container.xml",
     "java/brave-res/layout/toolbar_space.xml",
     "java/brave-res/layout/tracker_item_layout.xml",
diff --git a/android/java/brave-res/layout-land/fragment_sign_message.xml b/android/java/brave-res/layout-land/fragment_sign_message.xml
new file mode 100644
index 0000000000000..b6fbbe45e0202
--- /dev/null
+++ b/android/java/brave-res/layout-land/fragment_sign_message.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:background="@color/wallet_bg"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/column_divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5"
+        tools:ignore="InconsistentLayout" />
+
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/sign_message_header"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/column_divider"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/details_container"
+        layout="@layout/sign_message_details"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toEndOf="@id/column_divider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout-sw600dp-land/fragment_sign_message.xml b/android/java/brave-res/layout-sw600dp-land/fragment_sign_message.xml
new file mode 100644
index 0000000000000..61879c478d95e
--- /dev/null
+++ b/android/java/brave-res/layout-sw600dp-land/fragment_sign_message.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:background="@color/wallet_bg"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">
+
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/sign_message_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/details_container"
+        layout="@layout/sign_message_details"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header_container"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/fragment_sign_message.xml b/android/java/brave-res/layout/fragment_sign_message.xml
index cc38fe8f275ba..054fde7aba889 100644
--- a/android/java/brave-res/layout/fragment_sign_message.xml
+++ b/android/java/brave-res/layout/fragment_sign_message.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2022 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
 <androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -9,212 +14,22 @@
     android:background="@color/wallet_bg"
     tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">
 
-    <TextView
-        android:id="@+id/fragment_sign_msg_tv_network_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="20dp"
-        android:paddingHorizontal="24dp"
-        android:text="@string/mainnet"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/fragment_sign_msg_cv_account_image_container"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_marginTop="20dp"
-        android:layout_centerHorizontal="true"
-        android:elevation="12dp"
-        android:innerRadius="0dp"
-        android:shape="ring"
-        android:thicknessRatio="1.9"
-        app:cardBackgroundColor="@color/brave_theme_color"
-        app:cardCornerRadius="40dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/fragment_sign_msg_tv_network_name"
-        app:strokeColor="@color/brave_white"
-        app:strokeWidth="2dp">
-
-        <ImageView
-            android:id="@+id/fragment_sign_msg_cv_iv_account"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignStart="@+id/cv_dapps_image_container"
-            android:layout_alignBottom="@+id/cv_dapps_image_container"
-            android:layout_centerHorizontal="true"
-            android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
-            app:cardBackgroundColor="@android:color/transparent"
-            tools:srcCompat="@drawable/ic_brave_logo" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <TextView
-        android:id="@+id/domain"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_cv_account_image_container"
-        android:textColor="@color/wallet_text_color"
-        android:textSize="15sp" />
-
-    <TextView
-        android:id="@+id/fragment_sign_msg_tv_account_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="4dp"
-        android:gravity="center"
-        android:textColor="@color/brave_wallet_dapp_text_color"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/domain"
-        tools:text="Ledger Nano" />
-
-    <TextView
-        android:id="@+id/fragment_sign_msg_tv_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
-        android:gravity="center"
-        android:textColor="@color/brave_wallet_dapp_text_color"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:text="@string/fragment_sign_message_description"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_tv_account_name"
-        tools:text="Your signature is being requested" />
-
-    <TextView
-        android:id="@+id/fragment_sign_msg_tv_message_details"
-        android:padding="16dp"
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/sign_message_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        android:textColor="@color/tab_color"
-        android:gravity="center"
-        android:text="@string/details"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_tv_message" />
-
-    <View
-        android:id="@+id/view_tab_line"
-        android:layout_width="match_parent"
-        android:background="@drawable/tab_gradient_separator"
-        android:layout_marginBottom="10dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_tv_message_details"
-        android:layout_height="2dp" />
-
-    <LinearLayout
-        android:id="@+id/non_ascii_warning_layout"
-        android:background="@drawable/wallet_top_banner_bg"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_tab_line">
-
-        <TextView
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:textSize="16sp"
-            android:textColor="@color/wallet_error_text_color"
-            android:drawablePadding="2dp"
-            app:drawableStartCompat="@drawable/ic_warning"
-            android:text="@string/wallet_non_ascii_characters"/>
-
-        <TextView
-            android:id="@+id/non_ascii_warning_text_link"
-            android:layout_weight="1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:textSize="16sp"
-            android:textColor="@color/brave_link"
-            android:text="@string/wallet_non_ascii_characters_original"/>
-
-    </LinearLayout>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <include
-        android:id="@+id/sign_msg_warning_container"
-        layout="@layout/sign_warning_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout" />
-
-    <EditText
-        android:id="@+id/sign_message_text"
-        style="@style/BraveWalletEditTextBordered"
+        android:id="@+id/details_container"
+        layout="@layout/sign_message_details"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="32dp"
-        android:minHeight="100dp"
-        android:inputType="none"
-        android:paddingVertical="10dp"
-        android:textIsSelectable="true"
-        android:focusable="false"
-        android:longClickable="false"
-        android:importantForAutofill="no"
-        app:layout_constraintBottom_toTopOf="@+id/approve_tx_bottom_sheet_action"
+        android:layout_height="0dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout"
-        app:layout_constraintVertical_bias="0"
-        android:lines="14"
-        android:scrollbars="vertical"
-        android:fadeScrollbars="false"
-        tools:ignore="LabelFor" />
-
-    <LinearLayout
-        android:id="@+id/approve_tx_bottom_sheet_action"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="12dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:orientation="horizontal">
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/fragment_sign_msg_btn_cancel"
-            style="@style/BraveWalletButtonHollow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_weight="1"
-            android:text="@string/brave_cancel"
-            android:textSize="16sp"
-            tools:ignore="DuplicateSpeakableTextCheck" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/fragment_sign_msg_btn_sign"
-            style="@style/BraveWalletButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_weight="1"
-            android:drawableStart="@drawable/ic_key"
-            app:drawableTint="@color/brave_white"
-            android:text="@string/brave_wallet_sign_message_positive_button_action" />
-    </LinearLayout>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header_container"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/sign_message_details.xml b/android/java/brave-res/layout/sign_message_details.xml
new file mode 100644
index 0000000000000..1e298232f5c9d
--- /dev/null
+++ b/android/java/brave-res/layout/sign_message_details.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/fragment_sign_msg_tv_message_details"
+        android:padding="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:textColor="@color/tab_color"
+        android:gravity="center"
+        android:text="@string/details"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_tab_line"
+        android:layout_width="match_parent"
+        android:background="@drawable/tab_gradient_separator"
+        android:layout_marginBottom="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_tv_message_details"
+        android:layout_height="2dp" />
+
+    <LinearLayout
+        android:id="@+id/non_ascii_warning_layout"
+        android:background="@drawable/wallet_top_banner_bg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:orientation="vertical"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_tab_line">
+
+        <TextView
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:textSize="16sp"
+            android:textColor="@color/wallet_error_text_color"
+            android:drawablePadding="2dp"
+            app:drawableStartCompat="@drawable/ic_warning"
+            android:text="@string/wallet_non_ascii_characters"/>
+
+        <TextView
+            android:id="@+id/non_ascii_warning_text_link"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            android:textSize="16sp"
+            android:textColor="@color/brave_link"
+            android:text="@string/wallet_non_ascii_characters_original"/>
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/sign_msg_warning_container"
+        layout="@layout/sign_warning_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout" />
+
+    <EditText
+        android:id="@+id/sign_message_text"
+        style="@style/BraveWalletEditTextBordered"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="32dp"
+        android:inputType="none"
+        android:paddingVertical="10dp"
+        android:textIsSelectable="true"
+        android:focusable="false"
+        android:longClickable="false"
+        android:importantForAutofill="no"
+        app:layout_constraintBottom_toTopOf="@+id/approve_tx_bottom_sheet_action"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout"
+        app:layout_constraintVertical_bias="0"
+        android:maxLines="14"
+        android:scrollbars="vertical"
+        android:fadeScrollbars="false"
+        tools:ignore="LabelFor" />
+
+    <LinearLayout
+        android:id="@+id/approve_tx_bottom_sheet_action"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/fragment_sign_msg_btn_cancel"
+            style="@style/BraveWalletButtonHollow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:text="@string/brave_cancel"
+            android:textSize="16sp"
+            tools:ignore="DuplicateSpeakableTextCheck" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/fragment_sign_msg_btn_sign"
+            style="@style/BraveWalletButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:drawableStart="@drawable/ic_key"
+            app:drawableTint="@color/brave_white"
+            android:text="@string/brave_wallet_sign_message_positive_button_action" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/sign_message_header.xml b/android/java/brave-res/layout/sign_message_header.xml
new file mode 100644
index 0000000000000..14632975f19af
--- /dev/null
+++ b/android/java/brave-res/layout/sign_message_header.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/fragment_sign_msg_tv_network_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="20dp"
+        android:paddingHorizontal="24dp"
+        android:text="@string/mainnet"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/fragment_sign_msg_cv_account_image_container"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="20dp"
+        android:layout_centerHorizontal="true"
+        android:elevation="12dp"
+        android:innerRadius="0dp"
+        android:shape="ring"
+        android:thicknessRatio="1.9"
+        app:cardBackgroundColor="@color/brave_theme_color"
+        app:cardCornerRadius="40dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/fragment_sign_msg_tv_network_name"
+        app:strokeColor="@color/brave_white"
+        app:strokeWidth="2dp">
+
+        <ImageView
+            android:id="@+id/fragment_sign_msg_cv_iv_account"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignStart="@+id/cv_dapps_image_container"
+            android:layout_alignBottom="@+id/cv_dapps_image_container"
+            android:layout_centerHorizontal="true"
+            android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
+            app:cardBackgroundColor="@android:color/transparent"
+            tools:srcCompat="@drawable/ic_brave_logo" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <TextView
+        android:id="@+id/domain"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_cv_account_image_container"
+        android:textColor="@color/wallet_text_color"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/fragment_sign_msg_tv_account_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="center"
+        android:textColor="@color/brave_wallet_dapp_text_color"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/domain"
+        tools:text="Ledger Nano" />
+
+    <TextView
+        android:id="@+id/fragment_sign_msg_tv_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="8dp"
+        android:gravity="center"
+        android:textColor="@color/brave_wallet_dapp_text_color"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:text="@string/fragment_sign_message_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_msg_tv_account_name"
+        tools:text="Your signature is being requested" />
+</androidx.constraintlayout.widget.ConstraintLayout>

From 3f3c9403ad85835fbcdfd05e960899579eb851df Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 18:09:53 +0200
Subject: [PATCH 09/20] Remove unused call to set lines

---
 .../crypto_wallet/fragments/dapps/SignMessageFragment.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignMessageFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignMessageFragment.java
index 5dbd3842958ed..b9a85e2ed4a36 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignMessageFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignMessageFragment.java
@@ -183,7 +183,6 @@ private void maybeHandlePendingRequests(final SignMessageRequest @Nullable [] re
 
         mHasUnicodeWarning = Validations.hasUnicode(message);
         if (mHasUnicodeWarning) {
-            mSignMessageText.setLines(12);
             View view = getView();
             if (view != null) {
                 TextView warningLinkText = view.findViewById(R.id.non_ascii_warning_text_link);

From 39bfef5046ad9333f2ac0c97eb97a8d2fe7948cf Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 18:35:20 +0200
Subject: [PATCH 10/20] Remove maxLines from message details layout

---
 android/java/brave-res/layout/sign_message_details.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/java/brave-res/layout/sign_message_details.xml b/android/java/brave-res/layout/sign_message_details.xml
index 1e298232f5c9d..cca4bbbce3e9a 100644
--- a/android/java/brave-res/layout/sign_message_details.xml
+++ b/android/java/brave-res/layout/sign_message_details.xml
@@ -93,7 +93,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout"
         app:layout_constraintVertical_bias="0"
-        android:maxLines="14"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
         tools:ignore="LabelFor" />

From bcd1f5a4c2dd9a3e73c3db3e2d953b90b6627c8e Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 18:42:15 +0200
Subject: [PATCH 11/20] Remove unused constraint vertical bias

---
 android/java/brave-res/layout/sign_message_details.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/android/java/brave-res/layout/sign_message_details.xml b/android/java/brave-res/layout/sign_message_details.xml
index cca4bbbce3e9a..e576489756766 100644
--- a/android/java/brave-res/layout/sign_message_details.xml
+++ b/android/java/brave-res/layout/sign_message_details.xml
@@ -92,7 +92,6 @@
         app:layout_constraintBottom_toTopOf="@+id/approve_tx_bottom_sheet_action"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout"
-        app:layout_constraintVertical_bias="0"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"
         tools:ignore="LabelFor" />

From 4429eb1d5a6fb68a7bf9d9dd9824c145654ea9d9 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 18:46:26 +0200
Subject: [PATCH 12/20] Improve sign_message_text layout width

---
 android/java/brave-res/layout/sign_message_details.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/android/java/brave-res/layout/sign_message_details.xml b/android/java/brave-res/layout/sign_message_details.xml
index e576489756766..b264d29cfa8c5 100644
--- a/android/java/brave-res/layout/sign_message_details.xml
+++ b/android/java/brave-res/layout/sign_message_details.xml
@@ -79,7 +79,7 @@
     <EditText
         android:id="@+id/sign_message_text"
         style="@style/BraveWalletEditTextBordered"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="32dp"
@@ -91,6 +91,7 @@
         android:importantForAutofill="no"
         app:layout_constraintBottom_toTopOf="@+id/approve_tx_bottom_sheet_action"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/non_ascii_warning_layout"
         android:scrollbars="vertical"
         android:fadeScrollbars="false"

From 245205d1daeab3719b5163e9aafc9358a1e1cbef Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Wed, 29 Jul 2026 18:51:30 +0200
Subject: [PATCH 13/20] Remove unused attributes from XML layouts

---
 android/java/brave-res/layout/approve_tx_header.xml   | 2 --
 android/java/brave-res/layout/sign_message_header.xml | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/android/java/brave-res/layout/approve_tx_header.xml b/android/java/brave-res/layout/approve_tx_header.xml
index 7d130f9c14ffc..1acc67704c766 100644
--- a/android/java/brave-res/layout/approve_tx_header.xml
+++ b/android/java/brave-res/layout/approve_tx_header.xml
@@ -42,7 +42,6 @@
         style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:minWidth="0dp"
         android:minHeight="0dp"
         android:padding="0dp"
@@ -57,7 +56,6 @@
         android:id="@+id/account_picture"
         android:layout_width="60dp"
         android:layout_height="60dp"
-        android:layout_gravity="center_horizontal"
         android:contentDescription="@null"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/android/java/brave-res/layout/sign_message_header.xml b/android/java/brave-res/layout/sign_message_header.xml
index 14632975f19af..b16cec38b9755 100644
--- a/android/java/brave-res/layout/sign_message_header.xml
+++ b/android/java/brave-res/layout/sign_message_header.xml
@@ -29,11 +29,7 @@
         android:layout_width="60dp"
         android:layout_height="60dp"
         android:layout_marginTop="20dp"
-        android:layout_centerHorizontal="true"
         android:elevation="12dp"
-        android:innerRadius="0dp"
-        android:shape="ring"
-        android:thicknessRatio="1.9"
         app:cardBackgroundColor="@color/brave_theme_color"
         app:cardCornerRadius="40dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,11 +42,7 @@
             android:id="@+id/fragment_sign_msg_cv_iv_account"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignStart="@+id/cv_dapps_image_container"
-            android:layout_alignBottom="@+id/cv_dapps_image_container"
-            android:layout_centerHorizontal="true"
             android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
-            app:cardBackgroundColor="@android:color/transparent"
             tools:srcCompat="@drawable/ic_brave_logo" />
     </com.google.android.material.card.MaterialCardView>
 

From 679389d3e26bff4177988cbfd7a06aeaeb649a7a Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Thu, 30 Jul 2026 14:24:40 +0200
Subject: [PATCH 14/20] Adjust layouts for SiweMessageFragment

---
 android/BUILD.gn                              |   4 +
 .../brave-res/layout-land/fragment_siwe.xml   |  64 ++++++++
 .../layout-sw600dp-land/fragment_siwe.xml     |  67 ++++++++
 .../java/brave-res/layout/fragment_siwe.xml   | 152 +++---------------
 .../java/brave-res/layout/siwe_details.xml    |  69 ++++++++
 android/java/brave-res/layout/siwe_header.xml |  85 ++++++++++
 6 files changed, 308 insertions(+), 133 deletions(-)
 create mode 100644 android/java/brave-res/layout-land/fragment_siwe.xml
 create mode 100644 android/java/brave-res/layout-sw600dp-land/fragment_siwe.xml
 create mode 100644 android/java/brave-res/layout/siwe_details.xml
 create mode 100644 android/java/brave-res/layout/siwe_header.xml

diff --git a/android/BUILD.gn b/android/BUILD.gn
index 3a38a4521e6ec..80901efb25d3d 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -479,8 +479,10 @@ android_resources("java_resources") {
     "java/brave-res/layout-land/activity_vpn_paywall.xml",
     "java/brave-res/layout-land/approve_tx_bottom_sheet.xml",
     "java/brave-res/layout-land/fragment_sign_message.xml",
+    "java/brave-res/layout-land/fragment_siwe.xml",
     "java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml",
     "java/brave-res/layout-sw600dp-land/fragment_sign_message.xml",
+    "java/brave-res/layout-sw600dp-land/fragment_siwe.xml",
     "java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml",
     "java/brave-res/layout/activity_account_selector.xml",
     "java/brave-res/layout/activity_add_account.xml",
@@ -654,6 +656,8 @@ android_resources("java_resources") {
     "java/brave-res/layout/sign_message_details.xml",
     "java/brave-res/layout/sign_message_header.xml",
     "java/brave-res/layout/sign_warning_container.xml",
+    "java/brave-res/layout/siwe_details.xml",
+    "java/brave-res/layout/siwe_header.xml",
     "java/brave-res/layout/toolbar_space.xml",
     "java/brave-res/layout/tracker_item_layout.xml",
     "java/brave-res/layout/view_holder_account_selector.xml",
diff --git a/android/java/brave-res/layout-land/fragment_siwe.xml b/android/java/brave-res/layout-land/fragment_siwe.xml
new file mode 100644
index 0000000000000..a459a4970b78b
--- /dev/null
+++ b/android/java/brave-res/layout-land/fragment_siwe.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wallet_bg"
+    android:orientation="vertical"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SiweMessageFragment">
+
+    <TextView
+        android:id="@+id/frag_siwe_tv_title"
+        style="@style/BraveWalletTextViewTitle"
+        android:layout_width="match_parent"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:text="@string/brave_wallet_sign_in_with_brave_wallet"
+        android:textSize="20sp" />
+
+    <View
+        android:id="@+id/frag_siwe_div1"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/wallet_edittext_outline_color" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="20dp">
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/column_divider"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_percent="0.5"
+            tools:ignore="InconsistentLayout" />
+
+        <include
+            android:id="@+id/header_container"
+            layout="@layout/siwe_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/column_divider"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <include
+            android:id="@+id/details_container"
+            layout="@layout/siwe_details"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintStart_toEndOf="@id/column_divider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/android/java/brave-res/layout-sw600dp-land/fragment_siwe.xml b/android/java/brave-res/layout-sw600dp-land/fragment_siwe.xml
new file mode 100644
index 0000000000000..731e89a07ec79
--- /dev/null
+++ b/android/java/brave-res/layout-sw600dp-land/fragment_siwe.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wallet_bg"
+    android:orientation="vertical"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SiweMessageFragment">
+
+    <TextView
+        android:id="@+id/frag_siwe_tv_title"
+        style="@style/BraveWalletTextViewTitle"
+        android:layout_width="match_parent"
+        android:layout_marginTop="12dp"
+        android:gravity="center"
+        android:text="@string/brave_wallet_sign_in_with_brave_wallet"
+        android:textSize="20sp" />
+
+    <View
+        android:id="@+id/frag_siwe_div1"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="12dp"
+        android:background="@color/wallet_edittext_outline_color" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="20dp">
+
+        <include
+            android:id="@+id/header_container"
+            layout="@layout/siwe_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/view_tab_line"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="6dp"
+            android:background="@color/wallet_edittext_outline_color"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/header_container"
+            tools:ignore="InconsistentLayout" />
+
+        <include
+            android:id="@+id/details_container"
+            layout="@layout/siwe_details"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/view_tab_line"
+            app:layout_constraintBottom_toBottomOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/android/java/brave-res/layout/fragment_siwe.xml b/android/java/brave-res/layout/fragment_siwe.xml
index fbd9817d82371..6b0a18c4ad488 100644
--- a/android/java/brave-res/layout/fragment_siwe.xml
+++ b/android/java/brave-res/layout/fragment_siwe.xml
@@ -11,7 +11,7 @@
     android:layout_height="match_parent"
     android:background="@color/wallet_bg"
     android:orientation="vertical"
-    tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">
+    tools:context=".browser.crypto_wallet.fragments.dapps.SiweMessageFragment">
 
     <TextView
         android:id="@+id/frag_siwe_tv_title"
@@ -27,155 +27,41 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_marginTop="12dp"
-        android:background="@color/wallet_edittext_outline_color"
-        app:layout_constraintTop_toBottomOf="@id/frag_siwe_tv_title" />
+        android:background="@color/wallet_edittext_outline_color" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="20dp">
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/frag_siwe_fav_container"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_centerHorizontal="true"
-            android:elevation="12dp"
-            app:cardCornerRadius="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:strokeColor="@color/brave_white"
-            app:strokeWidth="1dp">
-
-            <ImageView
-                android:id="@+id/frag_siwe_iv_fav"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_alignStart="@+id/cv_dapps_image_container"
-                android:layout_alignBottom="@+id/cv_dapps_image_container"
-                android:layout_centerHorizontal="true"
-                android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
-                app:cardBackgroundColor="@android:color/transparent"
-                tools:srcCompat="@drawable/ic_brave_logo" />
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/frag_siwe_cv_fav_nw_container"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_centerHorizontal="true"
-            android:elevation="12dp"
-            android:translationZ="1dp"
-            android:visibility="gone"
-            app:cardCornerRadius="8dp"
-            app:layout_constraintBottom_toBottomOf="@id/frag_siwe_fav_container"
-            app:layout_constraintEnd_toEndOf="@id/frag_siwe_fav_container"
-            app:strokeColor="@color/brave_white"
-            app:strokeWidth="1dp">
-
-            <ImageView
-                android:id="@+id/frag_siwe_iv_fav_nw_icon"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:layout_gravity="center_vertical"
-                android:background="@drawable/eth"
-                android:contentDescription="@null" />
-        </com.google.android.material.card.MaterialCardView>
-
-        <TextView
-            android:id="@+id/frag_siwe_tv_origin"
-            style="@style/BraveWalletTextView"
-            android:layout_width="match_parent"
-            android:layout_marginVertical="4dp"
-            android:gravity="center"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/frag_siwe_fav_container" />
-
-        <TextView
-            android:id="@+id/frag_siwe_tv_url"
-            style="@style/BraveWalletTextView"
-            android:layout_width="match_parent"
-            android:layout_marginVertical="4dp"
-            android:gravity="center"
-            app:layout_constraintEnd_toEndOf="parent"
+        <include
+            android:id="@+id/header_container"
+            layout="@layout/siwe_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/frag_siwe_tv_origin" />
-
-        <TextView
-            android:id="@+id/frag_siwe_msg_tv_network_name"
-            style="@style/BraveWalletTextView"
-            android:layout_width="match_parent"
-            android:layout_marginVertical="4dp"
-            android:gravity="center"
-            app:layout_constraintBottom_toTopOf="@id/view_tab_line"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/frag_siwe_tv_url" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <View
             android:id="@+id/view_tab_line"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="1dp"
             android:layout_marginTop="6dp"
             android:background="@color/wallet_edittext_outline_color"
-            app:layout_constraintBottom_toTopOf="@id/frag_siwe_rv_container"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/frag_siwe_msg_tv_network_name" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/header_container"
+            tools:ignore="InconsistentLayout" />
 
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/frag_siwe_rv_container"
-            android:layout_width="match_parent"
+        <include
+            android:id="@+id/details_container"
+            layout="@layout/siwe_details"
+            android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginVertical="12dp"
-            android:elevation="12dp"
-            app:cardCornerRadius="12dp"
-            app:layout_constraintBottom_toTopOf="@id/approve_tx_bottom_sheet_action"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/view_tab_line">
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/frag_siwe_rv"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/brave_wallet_dn_highlight_bg_color"
-                android:elevation="12dp"
-                android:padding="16dp"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
-        </com.google.android.material.card.MaterialCardView>
-
-        <LinearLayout
-            android:id="@+id/approve_tx_bottom_sheet_action"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginVertical="12dp"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/frag_siwe_msg_btn_cancel"
-                style="@style/BraveWalletButtonHollow"
-                android:layout_gravity="start"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="1"
-                android:padding="0dp"
-                android:text="@string/brave_cancel"
-                android:textSize="16sp"
-                tools:ignore="DuplicateSpeakableTextCheck" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/frag_siwe_msg_btn_sign"
-                style="@style/BraveWalletButton"
-                android:layout_gravity="end"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
-                android:layout_weight="1"
-                android:text="@string/brave_wallet_sign_message_positive_button_action"
-                app:drawableTint="@color/brave_white" />
-        </LinearLayout>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/view_tab_line"
+            app:layout_constraintBottom_toBottomOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/android/java/brave-res/layout/siwe_details.xml b/android/java/brave-res/layout/siwe_details.xml
new file mode 100644
index 0000000000000..cffcbe1cd65e5
--- /dev/null
+++ b/android/java/brave-res/layout/siwe_details.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/frag_siwe_rv_container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginVertical="12dp"
+        android:elevation="12dp"
+        app:cardCornerRadius="12dp"
+        app:layout_constraintBottom_toTopOf="@id/approve_tx_bottom_sheet_action"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/frag_siwe_rv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/brave_wallet_dn_highlight_bg_color"
+            android:elevation="12dp"
+            android:padding="16dp"
+            android:scrollbars="vertical"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <LinearLayout
+        android:id="@+id/approve_tx_bottom_sheet_action"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="12dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/frag_siwe_msg_btn_cancel"
+            style="@style/BraveWalletButtonHollow"
+            android:layout_gravity="start"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:padding="0dp"
+            android:text="@string/brave_cancel"
+            android:textSize="16sp"
+            tools:ignore="DuplicateSpeakableTextCheck" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/frag_siwe_msg_btn_sign"
+            style="@style/BraveWalletButton"
+            android:layout_gravity="end"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:text="@string/brave_wallet_sign_message_positive_button_action"
+            app:drawableTint="@color/brave_white" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/siwe_header.xml b/android/java/brave-res/layout/siwe_header.xml
new file mode 100644
index 0000000000000..ac57a55e0ea2e
--- /dev/null
+++ b/android/java/brave-res/layout/siwe_header.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/frag_siwe_fav_container"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:elevation="12dp"
+        app:cardCornerRadius="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/brave_white"
+        app:strokeWidth="1dp">
+
+        <ImageView
+            android:id="@+id/frag_siwe_iv_fav"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
+            tools:srcCompat="@drawable/ic_brave_logo" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/frag_siwe_cv_fav_nw_container"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:elevation="12dp"
+        android:translationZ="1dp"
+        android:visibility="gone"
+        app:cardCornerRadius="8dp"
+        app:layout_constraintBottom_toBottomOf="@id/frag_siwe_fav_container"
+        app:layout_constraintEnd_toEndOf="@id/frag_siwe_fav_container"
+        app:strokeColor="@color/brave_white"
+        app:strokeWidth="1dp">
+
+        <ImageView
+            android:id="@+id/frag_siwe_iv_fav_nw_icon"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/eth"
+            android:contentDescription="@null" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <TextView
+        android:id="@+id/frag_siwe_tv_origin"
+        style="@style/BraveWalletTextView"
+        android:layout_width="0dp"
+        android:layout_marginVertical="4dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/frag_siwe_fav_container" />
+
+    <TextView
+        android:id="@+id/frag_siwe_tv_url"
+        style="@style/BraveWalletTextView"
+        android:layout_width="0dp"
+        android:layout_marginVertical="4dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/frag_siwe_tv_origin" />
+
+    <TextView
+        android:id="@+id/frag_siwe_msg_tv_network_name"
+        style="@style/BraveWalletTextView"
+        android:layout_width="0dp"
+        android:layout_marginVertical="4dp"
+        android:gravity="center"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/frag_siwe_tv_url" />
+</androidx.constraintlayout.widget.ConstraintLayout>

From f2756e83097a2b6ed2618b87b58cee05b27e0e7f Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Thu, 30 Jul 2026 14:37:37 +0200
Subject: [PATCH 15/20] Show scrollbar when content is scrollable

---
 android/java/brave-res/layout/siwe_details.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android/java/brave-res/layout/siwe_details.xml b/android/java/brave-res/layout/siwe_details.xml
index cffcbe1cd65e5..6e2ee5a04f760 100644
--- a/android/java/brave-res/layout/siwe_details.xml
+++ b/android/java/brave-res/layout/siwe_details.xml
@@ -31,6 +31,8 @@
             android:elevation="12dp"
             android:padding="16dp"
             android:scrollbars="vertical"
+            android:fadeScrollbars="false"
+            android:scrollbarStyle="outsideOverlay"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
     </com.google.android.material.card.MaterialCardView>
 

From fe4653a0b9e231b2e9512c21d0fe8d9716ccfd85 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Thu, 30 Jul 2026 16:50:26 +0200
Subject: [PATCH 16/20] Adjust TwoLineItemBottomSheetFragment cut outs

---
 .../TwoLineItemBottomSheetFragment.java       | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java
index b71c5068bb7f4..e231cfbc69859 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java
@@ -6,21 +6,30 @@
 package org.chromium.chrome.browser.crypto_wallet.fragments;
 
 import android.annotation.SuppressLint;
+import android.app.Dialog;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 import android.widget.ImageButton;
 
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+
 import org.chromium.build.annotations.MonotonicNonNull;
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.build.annotations.Nullable;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.crypto_wallet.adapters.TwoLineItemRecyclerViewAdapter;
 import org.chromium.chrome.browser.crypto_wallet.adapters.TwoLineItemRecyclerViewAdapter.TwoLineItem;
+import org.chromium.chrome.browser.util.ConfigurationUtils;
 
 import java.util.List;
 
@@ -33,6 +42,33 @@ public class TwoLineItemBottomSheetFragment extends WalletBottomSheetDialogFragm
     @MonotonicNonNull private List<TwoLineItem> mItems;
     @MonotonicNonNull private TwoLineItemRecyclerViewAdapter mAdapter;
 
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        Dialog dialog = super.onCreateDialog(savedInstanceState);
+        // In landscape the sheet would otherwise open at its collapsed peek height, showing
+        // only the title. Expand it on show so the details list is visible and scrollable.
+        dialog.setOnShowListener(shownDialog -> expandInLandscape((BottomSheetDialog) shownDialog));
+        return dialog;
+    }
+
+    private void expandInLandscape(BottomSheetDialog bottomSheetDialog) {
+        if (!ConfigurationUtils.isLandscape(requireContext())) {
+            return;
+        }
+        final BottomSheetBehavior<FrameLayout> behavior = bottomSheetDialog.getBehavior();
+        behavior.setSkipCollapsed(true);
+        // Defer expanding by one frame. Expanding synchronously from the show listener can run
+        // before the landscape system-bar insets are dispatched, so BottomSheetBehavior lays the
+        // sheet out edge-to-edge (insetLeft == 0) and its content is clipped under the navigation
+        // bar. By the next frame the insets are applied and the expanded sheet is offset correctly.
+        final View content = getView();
+        if (content != null) {
+            content.post(() -> behavior.setState(BottomSheetBehavior.STATE_EXPANDED));
+        } else {
+            behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+        }
+    }
+
     @SuppressLint("ClickableViewAccessibility")
     @Override
     public View onCreateView(
@@ -40,6 +76,30 @@ public View onCreateView(
             @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_two_line_item_sheet, container, false);
+
+        // Phones drop the Material width cap (WalletBottomSheetDialogFragment.onStart), so the
+        // sheet is full-width and can run under a display cutout; keep its contents clear of it.
+        // The cutout's left/right insets are already orientation-aware (zero unless the cutout is
+        // on a vertical edge), so no orientation check is needed. Tablets keep the centered,
+        // width-limited sheet, which never reaches a screen-edge cutout, so they are excluded.
+        // BottomSheetBehavior already applies the system-bar insets, so only the cutout is here.
+        final int basePaddingLeft = view.getPaddingLeft();
+        final int basePaddingRight = view.getPaddingRight();
+        ViewCompat.setOnApplyWindowInsetsListener(
+                view,
+                (v, insets) -> {
+                    int left = basePaddingLeft;
+                    int right = basePaddingRight;
+                    if (!ConfigurationUtils.isTablet(v.getContext())) {
+                        final Insets cutout =
+                                insets.getInsets(WindowInsetsCompat.Type.displayCutout());
+                        left += cutout.left;
+                        right += cutout.right;
+                    }
+                    v.setPadding(left, v.getPaddingTop(), right, v.getPaddingBottom());
+                    return insets;
+                });
+
         RecyclerView recyclerView = view.findViewById(R.id.frag_two_line_sheet_list);
         if (mAdapter != null) {
             recyclerView.setAdapter(mAdapter);

From 724ecaedf765b8eef9c05e8d55bd76d5b8ea20a6 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Fri, 31 Jul 2026 13:56:12 +0200
Subject: [PATCH 17/20] Adjust layouts for SignSolTransactionsFragment

---
 android/BUILD.gn                              |   4 +
 .../layout-land/fragment_sign_tx_message.xml  |  43 ++++
 .../fragment_sign_tx_message.xml              |  35 ++++
 .../layout/fragment_sign_tx_message.xml       | 198 ++----------------
 .../layout/sign_tx_message_details.xml        |  98 +++++++++
 .../layout/sign_tx_message_header.xml         | 108 ++++++++++
 6 files changed, 307 insertions(+), 179 deletions(-)
 create mode 100644 android/java/brave-res/layout-land/fragment_sign_tx_message.xml
 create mode 100644 android/java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml
 create mode 100644 android/java/brave-res/layout/sign_tx_message_details.xml
 create mode 100644 android/java/brave-res/layout/sign_tx_message_header.xml

diff --git a/android/BUILD.gn b/android/BUILD.gn
index 80901efb25d3d..85718dd15b8a7 100644
--- a/android/BUILD.gn
+++ b/android/BUILD.gn
@@ -479,9 +479,11 @@ android_resources("java_resources") {
     "java/brave-res/layout-land/activity_vpn_paywall.xml",
     "java/brave-res/layout-land/approve_tx_bottom_sheet.xml",
     "java/brave-res/layout-land/fragment_sign_message.xml",
+    "java/brave-res/layout-land/fragment_sign_tx_message.xml",
     "java/brave-res/layout-land/fragment_siwe.xml",
     "java/brave-res/layout-sw600dp-land/approve_tx_bottom_sheet.xml",
     "java/brave-res/layout-sw600dp-land/fragment_sign_message.xml",
+    "java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml",
     "java/brave-res/layout-sw600dp-land/fragment_siwe.xml",
     "java/brave-res/layout-sw600dp/activity_welcome_onboarding.xml",
     "java/brave-res/layout/activity_account_selector.xml",
@@ -655,6 +657,8 @@ android_resources("java_resources") {
     "java/brave-res/layout/selected_network_item.xml",
     "java/brave-res/layout/sign_message_details.xml",
     "java/brave-res/layout/sign_message_header.xml",
+    "java/brave-res/layout/sign_tx_message_details.xml",
+    "java/brave-res/layout/sign_tx_message_header.xml",
     "java/brave-res/layout/sign_warning_container.xml",
     "java/brave-res/layout/siwe_details.xml",
     "java/brave-res/layout/siwe_header.xml",
diff --git a/android/java/brave-res/layout-land/fragment_sign_tx_message.xml b/android/java/brave-res/layout-land/fragment_sign_tx_message.xml
new file mode 100644
index 0000000000000..e322caaa3da17
--- /dev/null
+++ b/android/java/brave-res/layout-land/fragment_sign_tx_message.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:background="@color/wallet_bg"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SignSolTransactionsFragment">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/column_divider"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.5"
+        tools:ignore="InconsistentLayout" />
+
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/sign_tx_message_header"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/column_divider"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/details_container"
+        layout="@layout/sign_tx_message_details"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toEndOf="@id/column_divider"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml b/android/java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml
new file mode 100644
index 0000000000000..ce4b2f92c6b46
--- /dev/null
+++ b/android/java/brave-res/layout-sw600dp-land/fragment_sign_tx_message.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    android:background="@color/wallet_bg"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SignSolTransactionsFragment">
+
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/sign_tx_message_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        android:id="@+id/details_container"
+        layout="@layout/sign_tx_message_details"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header_container"
+        app:layout_constraintBottom_toBottomOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/fragment_sign_tx_message.xml b/android/java/brave-res/layout/fragment_sign_tx_message.xml
index 64a3e3731cba3..147d66e80c50f 100644
--- a/android/java/brave-res/layout/fragment_sign_tx_message.xml
+++ b/android/java/brave-res/layout/fragment_sign_tx_message.xml
@@ -1,195 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- Copyright (c) 2022 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/wallet_bg"
     android:padding="20dp"
-    tools:context=".browser.crypto_wallet.fragments.dapps.SignMessageFragment">
-
-    <TextView
-        android:id="@+id/fragment_sign_tx_msg_tv_network_name"
-        style="@style/BraveWalletTextView"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="20dp"
-        android:text="@string/mainnet"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/fragment_sign_tx_msg_tv_counter"
-        style="@style/BraveWalletTextView"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="20dp"
-        tools:text="1 of 2"
-        android:textSize="16sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/fragment_encryption_msg_btn_next"/>
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/fragment_encryption_msg_btn_next"
-        style="@style/BraveWalletTextButton"
-        android:text="@string/brave_wallet_next"
-        app:layout_constraintBottom_toBottomOf="@id/fragment_sign_tx_msg_tv_counter"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:minWidth="0dp"
-        android:padding="8dp"
-        android:textStyle="bold"
-        app:layout_constraintLeft_toRightOf="@id/fragment_sign_tx_msg_tv_counter"
-        app:layout_constraintTop_toTopOf="@id/fragment_sign_tx_msg_tv_counter"
-        tools:ignore="TouchTargetSizeCheck" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/fragment_sign_tx_msg_cv_account_image_container"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20dp"
-        android:elevation="12dp"
-        android:innerRadius="0dp"
-        android:shape="ring"
-        android:thicknessRatio="1.9"
-        app:cardBackgroundColor="@color/brave_theme_color"
-        app:cardCornerRadius="40dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/fragment_sign_tx_msg_tv_network_name"
-        app:strokeColor="@color/brave_white"
-        app:strokeWidth="2dp">
-
-        <ImageView
-            android:id="@+id/fragment_sign_tx_msg_cv_iv_account"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_alignStart="@+id/cv_dapps_image_container"
-            android:layout_alignBottom="@+id/cv_dapps_image_container"
-            android:layout_centerHorizontal="true"
-            android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
-            app:cardBackgroundColor="@android:color/transparent"
-            tools:srcCompat="@drawable/ic_brave_logo" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <TextView
-        android:id="@+id/domain"
-        style="@style/BraveWalletTextView"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:textSize="16sp"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_cv_account_image_container" />
-
-    <TextView
-        android:id="@+id/fragment_sign_tx_msg_tv_account_name"
-        style="@style/BraveWalletTextView"
-        android:layout_width="match_parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="4dp"
-        android:gravity="center"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/domain"
-        tools:text="Ledger Nano" />
-
-    <TextView
-        android:id="@+id/fragment_sign_tx_msg_tv_message"
-        style="@style/BraveWalletTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
-        android:gravity="center"
-        android:text="@string/fragment_sign_message_description"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_tv_account_name"
-        tools:text="Your signature is being requested" />
+    android:background="@color/wallet_bg"
+    tools:context=".browser.crypto_wallet.fragments.dapps.SignSolTransactionsFragment">
 
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/fragment_sign_tx_msg_tv_message_tabs"
+    <include
+        android:id="@+id/header_container"
+        layout="@layout/sign_tx_message_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_tv_message"
-        app:tabGravity="fill"
-        app:tabIndicatorColor="@android:color/transparent"
-        app:tabIndicatorHeight="0dp"
-        app:tabMaxWidth="0dp"
-        app:tabMode="fixed"
-        app:tabSelectedTextColor="@color/tab_color"
-        app:tabTextAppearance="@style/BraveWalletTabsTextAppearance"
-        app:tabTextColor="@color/wallet_text_color"
-        tools:ignore="SpeakableTextPresentCheck" />
-
-    <View
-        android:id="@+id/view_tab_line"
-        android:layout_width="match_parent"
-        android:layout_height="2dp"
-        android:layout_marginBottom="10dp"
-        android:background="@drawable/tab_gradient_separator"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_tv_message_tabs" />
+        app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.viewpager2.widget.ViewPager2
-        android:id="@+id/fragment_sign_tx_msg_tv_message_view_pager"
+    <include
+        android:id="@+id/details_container"
+        layout="@layout/sign_tx_message_details"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="32dp"
-        app:layout_constraintBottom_toTopOf="@+id/approve_tx_bottom_sheet_action"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/view_tab_line"
-        app:layout_constraintVertical_bias="0"
-        />
-
-    <include
-        android:id="@+id/fragment_sign_tx_warning_container"
-        layout="@layout/sign_warning_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/view_tab_line" />
-
-    <LinearLayout
-        android:id="@+id/approve_tx_bottom_sheet_action"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="12dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent">
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/fragment_sign_tx_msg_btn_cancel"
-            style="@style/BraveWalletButtonHollow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="start"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_weight="1"
-            android:text="@string/brave_cancel"
-            android:textSize="16sp"
-            tools:ignore="DuplicateSpeakableTextCheck" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/fragment_sign_tx_msg_btn_sign"
-            style="@style/BraveWalletButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_weight="1"
-            android:drawableStart="@drawable/ic_key"
-            android:text="@string/brave_wallet_sign_message_positive_button_action"
-            app:drawableTint="@color/brave_white" />
-    </LinearLayout>
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/header_container"
+        app:layout_constraintBottom_toBottomOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/sign_tx_message_details.xml b/android/java/brave-res/layout/sign_tx_message_details.xml
new file mode 100644
index 0000000000000..68e003d713b39
--- /dev/null
+++ b/android/java/brave-res/layout/sign_tx_message_details.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/fragment_sign_tx_msg_tv_message_tabs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tabGravity="fill"
+        app:tabIndicatorColor="@android:color/transparent"
+        app:tabIndicatorHeight="0dp"
+        app:tabMaxWidth="0dp"
+        app:tabMode="fixed"
+        app:tabSelectedTextColor="@color/tab_color"
+        app:tabTextAppearance="@style/BraveWalletTabsTextAppearance"
+        app:tabTextColor="@color/wallet_text_color"
+        tools:ignore="SpeakableTextPresentCheck" />
+
+    <View
+        android:id="@+id/view_tab_line"
+        android:layout_width="0dp"
+        android:layout_height="2dp"
+        android:layout_marginBottom="10dp"
+        android:background="@drawable/tab_gradient_separator"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_tv_message_tabs" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/fragment_sign_tx_msg_tv_message_view_pager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="32dp"
+        app:layout_constraintBottom_toTopOf="@+id/approve_tx_bottom_sheet_action"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/view_tab_line" />
+
+    <include
+        android:id="@+id/fragment_sign_tx_warning_container"
+        layout="@layout/sign_warning_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/view_tab_line" />
+
+    <LinearLayout
+        android:id="@+id/approve_tx_bottom_sheet_action"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="12dp"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/fragment_sign_tx_msg_btn_cancel"
+            style="@style/BraveWalletButtonHollow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:text="@string/brave_cancel"
+            android:textSize="16sp"
+            tools:ignore="DuplicateSpeakableTextCheck" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/fragment_sign_tx_msg_btn_sign"
+            style="@style/BraveWalletButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:drawableStart="@drawable/ic_key"
+            android:text="@string/brave_wallet_sign_message_positive_button_action"
+            app:drawableTint="@color/brave_white" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/java/brave-res/layout/sign_tx_message_header.xml b/android/java/brave-res/layout/sign_tx_message_header.xml
new file mode 100644
index 0000000000000..a35d0a8e02af4
--- /dev/null
+++ b/android/java/brave-res/layout/sign_tx_message_header.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2026 The Brave Authors. All rights reserved.
+     This Source Code Form is subject to the terms of the Mozilla Public
+     License, v. 2.0. If a copy of the MPL was not distributed with this file,
+     You can obtain one at https://mozilla.org/MPL/2.0/.
+-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/fragment_sign_tx_msg_tv_network_name"
+        style="@style/BraveWalletTextView"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="20dp"
+        android:text="@string/mainnet"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/fragment_sign_tx_msg_tv_counter"
+        style="@style/BraveWalletTextView"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="20dp"
+        tools:text="1 of 2"
+        android:textSize="16sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/fragment_encryption_msg_btn_next"/>
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/fragment_encryption_msg_btn_next"
+        style="@style/BraveWalletTextButton"
+        android:text="@string/brave_wallet_next"
+        app:layout_constraintBottom_toBottomOf="@id/fragment_sign_tx_msg_tv_counter"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:minWidth="0dp"
+        android:padding="8dp"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toRightOf="@id/fragment_sign_tx_msg_tv_counter"
+        app:layout_constraintTop_toTopOf="@id/fragment_sign_tx_msg_tv_counter"
+        tools:ignore="TouchTargetSizeCheck" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/fragment_sign_tx_msg_cv_account_image_container"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="20dp"
+        android:elevation="12dp"
+        app:cardBackgroundColor="@color/brave_theme_color"
+        app:cardCornerRadius="40dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/fragment_sign_tx_msg_tv_network_name"
+        app:strokeColor="@color/brave_white"
+        app:strokeWidth="2dp">
+
+        <ImageView
+            android:id="@+id/fragment_sign_tx_msg_cv_iv_account"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:contentDescription="@string/accessibility_wallet_dapp_panel_account"
+            tools:srcCompat="@drawable/ic_brave_logo" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <TextView
+        android:id="@+id/domain"
+        style="@style/BraveWalletTextView"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_cv_account_image_container" />
+
+    <TextView
+        android:id="@+id/fragment_sign_tx_msg_tv_account_name"
+        style="@style/BraveWalletTextView"
+        android:layout_width="match_parent"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="center"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/domain"
+        tools:text="Ledger Nano" />
+
+    <TextView
+        android:id="@+id/fragment_sign_tx_msg_tv_message"
+        style="@style/BraveWalletTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginVertical="8dp"
+        android:gravity="center"
+        android:text="@string/fragment_sign_message_description"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/fragment_sign_tx_msg_tv_account_name"
+        tools:text="Your signature is being requested" />
+</androidx.constraintlayout.widget.ConstraintLayout>

From 9851a69ea7b5c06f10fbba75a0bb3f242e8233b5 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Fri, 31 Jul 2026 14:00:21 +0200
Subject: [PATCH 18/20] Add Javadoc to SignSolTransactionFragment class

---
 .../dapps/SignSolTransactionsFragment.java          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java
index fb1545eaa1e13..320b49a53cde7 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java
@@ -57,6 +57,19 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+/**
+ * Bottom sheet for reviewing and approving or rejecting a dApp request to sign one or more Solana
+ * transactions ({@code signTransaction} / {@code signAllTransactions}). The transactions are only
+ * signed here, never broadcast.
+ *
+ * <p>Pending {@link SignSolTransactionsRequest}s are observed from the {@code DappsModel} and shown
+ * as a queue: the counter and "Next" control page through them ("N of M"), and each request is
+ * approved or rejected individually.
+ *
+ * <p>Each request uses a two-step flow: a risk-acknowledgment panel first (the primary button reads
+ * "Continue"), then the transaction step, which lists the decoded Solana instructions in the
+ * "Details" pager and signs on confirmation.
+ */
 @NullMarked
 public class SignSolTransactionsFragment extends WalletBottomSheetDialogFragment {
     private List<NavigationItem> mTabTitles;

From 9fc49b61d029abb0ffddd98b507ff59a06b905c7 Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Fri, 31 Jul 2026 14:32:03 +0200
Subject: [PATCH 19/20] Fix Learn more click listener

---
 .../dapps/SignSolTransactionsFragment.java     | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java
index 320b49a53cde7..7d6cdaef2849b 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/dapps/SignSolTransactionsFragment.java
@@ -9,8 +9,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -141,17 +139,11 @@ public View onCreateView(
     private void initComponents() {
         updateTxPanelPerStep();
         fetchSignRequestData();
-        Spanned associatedSPLTokenAccountInfo =
-                Utils.createSpanForSurroundedPhrase(
-                        requireContext(),
-                        R.string.learn_more,
-                        (v) -> {
-                            TabUtils.openUrlInNewTab(
-                                    false, WalletConstants.URL_SIGN_TRANSACTION_REQUEST);
-                            TabUtils.bringChromeTabbedActivityToTheTop(getActivity());
-                        });
-        mTxLearnMore.setMovementMethod(LinkMovementMethod.getInstance());
-        mTxLearnMore.setText(associatedSPLTokenAccountInfo);
+        mTxLearnMore.setOnClickListener(
+                v -> {
+                    TabUtils.openUrlInNewTab(false, WalletConstants.URL_SIGN_TRANSACTION_REQUEST);
+                    TabUtils.bringChromeTabbedActivityToTheTop(getActivity());
+                });
 
         mBtSign.setOnClickListener(v -> processRequest(true));
         mBtCancel.setOnClickListener(v -> processRequest(false));

From fd7cdca73082fdf9b52165ecd4d8ed525eec65ea Mon Sep 17 00:00:00 2001
From: Simone Arpe <simon.arpe@gmail.com>
Date: Fri, 31 Jul 2026 16:37:23 +0200
Subject: [PATCH 20/20] Fix cut outs in WalletBottomSheetDialogFragment

---
 .../ApproveTxBottomSheetDialogFragment.java   |  1 +
 .../TwoLineItemBottomSheetFragment.java       | 27 --------------
 .../WalletBottomSheetDialogFragment.java      | 36 +++++++++++++++++++
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/ApproveTxBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/ApproveTxBottomSheetDialogFragment.java
index ab6f8ed40cd8c..7344476d9f98a 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/ApproveTxBottomSheetDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/ApproveTxBottomSheetDialogFragment.java
@@ -139,6 +139,7 @@ public View onCreateView(
 
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
         mRejectAllTx = view.findViewById(R.id.btn_reject_transactions);
 
         if (mTxInfo == null) {
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java
index e231cfbc69859..b10c2b71d5daf 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/TwoLineItemBottomSheetFragment.java
@@ -15,9 +15,6 @@
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 
-import androidx.core.graphics.Insets;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
@@ -76,30 +73,6 @@ public View onCreateView(
             @Nullable ViewGroup container,
             @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_two_line_item_sheet, container, false);
-
-        // Phones drop the Material width cap (WalletBottomSheetDialogFragment.onStart), so the
-        // sheet is full-width and can run under a display cutout; keep its contents clear of it.
-        // The cutout's left/right insets are already orientation-aware (zero unless the cutout is
-        // on a vertical edge), so no orientation check is needed. Tablets keep the centered,
-        // width-limited sheet, which never reaches a screen-edge cutout, so they are excluded.
-        // BottomSheetBehavior already applies the system-bar insets, so only the cutout is here.
-        final int basePaddingLeft = view.getPaddingLeft();
-        final int basePaddingRight = view.getPaddingRight();
-        ViewCompat.setOnApplyWindowInsetsListener(
-                view,
-                (v, insets) -> {
-                    int left = basePaddingLeft;
-                    int right = basePaddingRight;
-                    if (!ConfigurationUtils.isTablet(v.getContext())) {
-                        final Insets cutout =
-                                insets.getInsets(WindowInsetsCompat.Type.displayCutout());
-                        left += cutout.left;
-                        right += cutout.right;
-                    }
-                    v.setPadding(left, v.getPaddingTop(), right, v.getPaddingBottom());
-                    return insets;
-                });
-
         RecyclerView recyclerView = view.findViewById(R.id.frag_two_line_sheet_list);
         if (mAdapter != null) {
             recyclerView.setAdapter(mAdapter);
diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java
index 4a70aa8808611..db04e6d521909 100644
--- a/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/crypto_wallet/fragments/WalletBottomSheetDialogFragment.java
@@ -8,6 +8,12 @@
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
@@ -18,6 +24,7 @@
 import org.chromium.build.annotations.EnsuresNonNull;
 import org.chromium.build.annotations.MonotonicNonNull;
 import org.chromium.build.annotations.NullMarked;
+import org.chromium.build.annotations.Nullable;
 import org.chromium.chrome.browser.app.domain.KeyringModel;
 import org.chromium.chrome.browser.app.domain.WalletModel;
 import org.chromium.chrome.browser.crypto_wallet.observers.KeyringServiceObserverImpl;
@@ -80,6 +87,35 @@ public void onAttach(Context context) {
         }
     }
 
+    /**
+     * Pads the sheet contents by the display-cutout insets so that, when the sheet is full-width in
+     * landscape, its contents stay clear of a cutout (e.g. a camera hole). The cutout's left/right
+     * insets are already orientation-aware (zero unless the cutout is on a vertical edge), and
+     * tablets keep the centered, width-limited sheet, so the padding is applied for phones only.
+     * {@code BottomSheetBehavior} already handles the system-bar insets.
+     */
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        final int basePaddingLeft = view.getPaddingLeft();
+        final int basePaddingRight = view.getPaddingRight();
+        ViewCompat.setOnApplyWindowInsetsListener(
+                view,
+                (v, insets) -> {
+                    int left = basePaddingLeft;
+                    int right = basePaddingRight;
+                    if (!ConfigurationUtils.isTablet(v.getContext())) {
+                        final Insets cutout =
+                                insets.getInsets(WindowInsetsCompat.Type.displayCutout());
+                        left += cutout.left;
+                        right += cutout.right;
+                    }
+                    v.setPadding(left, v.getPaddingTop(), right, v.getPaddingBottom());
+                    return insets;
+                });
+    }
+
     @Override
     public void onStart() {
         super.onStart();