From 261fe4121293db436dd08d93810160e60bc7426f Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 31 Jan 2025 10:24:59 +0100
Subject: [PATCH 1/3] Removed unused property

---
 .../android/ui/orders/creation/OrderCreateEditFormFragment.kt  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
index 5abb3d69d22..9b2223eec84 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
+++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/creation/OrderCreateEditFormFragment.kt
@@ -27,7 +27,6 @@ import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -135,8 +134,6 @@ class OrderCreateEditFormFragment :
     private var progressDialog: CustomProgressDialog? = null
     private var orderUpdateFailureSnackBar: Snackbar? = null
 
-    private val args: OrderCreateEditFormFragmentArgs by navArgs()
-
     override val activityAppBarStatus: AppBarStatus
         get() = AppBarStatus.Hidden
 

From ffee7d9eaeba8fefe59b9e17bc28f1bd8f890d06 Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 31 Jan 2025 10:31:53 +0100
Subject: [PATCH 2/3] Use MaterialToolbar with theme which we use everywhere

---
 .../src/main/res/layout/fragment_order_create_edit_form.xml    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WooCommerce/src/main/res/layout/fragment_order_create_edit_form.xml b/WooCommerce/src/main/res/layout/fragment_order_create_edit_form.xml
index 587b08debea..b7c589e682a 100644
--- a/WooCommerce/src/main/res/layout/fragment_order_create_edit_form.xml
+++ b/WooCommerce/src/main/res/layout/fragment_order_create_edit_form.xml
@@ -33,8 +33,9 @@
         android:orientation="vertical"
         tools:layout_constraintGuide_percent="0.5"/>
 
-    <androidx.appcompat.widget.Toolbar
+    <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/main_toolbar"
+        style="@style/Widget.Woo.Toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:elevation="@dimen/appbar_elevation"

From ecf25cad66a7effabb23f6dae6e7c59847dec5ab Mon Sep 17 00:00:00 2001
From: Andrey <akidinov@gmail.com>
Date: Fri, 31 Jan 2025 11:16:49 +0100
Subject: [PATCH 3/3] Updated release notes

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 60b67110147..e21cb3c6362 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
+21.7
+-----
+- [*] Fixed color scheme for the create botton on the order creation screen [https://github.com/woocommerce/woocommerce-android/pull/13428]
+
 21.6
 -----
 - [*] Updated tablet detection logic to consider both width and height dimensions, enhancing compatibility with larger phones and tablets, particularly in landscape mode [https://github.com/woocommerce/woocommerce-android/pull/13228]