From 03bd4394f1076f431a5cb9358d43b3950b1244c7 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 15 Jun 2026 22:53:20 -0700
Subject: [PATCH 1/2] chore: update branches for CI

---
 .github/workflows/dashwallet.yml          | 2 +-
 .github/workflows/ktlint.yml              | 2 +-
 .github/workflows/manual_distribution.yml | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dashwallet.yml b/.github/workflows/dashwallet.yml
index 5ed01d6c8a..8ec6514094 100644
--- a/.github/workflows/dashwallet.yml
+++ b/.github/workflows/dashwallet.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master, feature-*, bugfix-* ]
+    branches: [ master, feature-*, bugfix-*, feat/*, fix/* ]
 
 jobs:
   build:
diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml
index 0bf8157979..5f1d4ce27c 100644
--- a/.github/workflows/ktlint.yml
+++ b/.github/workflows/ktlint.yml
@@ -2,7 +2,7 @@ name: Code format check
 
 on:
   pull_request:
-    branches: [ master, feature-*, bugfix-*, dashpay-* ]
+    branches: [ master, feature-*, bugfix-*, feat/*, fix/* ]
 
 jobs:
   check:
diff --git a/.github/workflows/manual_distribution.yml b/.github/workflows/manual_distribution.yml
index c2de4bc37b..9b0dcaf73b 100644
--- a/.github/workflows/manual_distribution.yml
+++ b/.github/workflows/manual_distribution.yml
@@ -6,11 +6,11 @@ on:
       taskID:
         description: 'Task ID'
         required: true
-        default: 'NMA-'
+        default: 'MO-'
       flavor:
         description: 'Flavor'
         required: true
-        default: 'staging'
+        default: '_testNet3'
       type:
         description: 'Type'
         required: true

From 134c1442d58231acaba0a2ad3b01e251d537fb80 Mon Sep 17 00:00:00 2001
From: HashEngineering <hashengineeringsolutions@gmail.com>
Date: Mon, 15 Jun 2026 22:54:20 -0700
Subject: [PATCH 2/2] chore: include mappings.txt in fastlane deployment to
 Google Play

---
 fastlane/Fastfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 48fa31ca29..ec5ff857a3 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -43,7 +43,12 @@ platform :android do
 		UI.user_error!("Missing apk. Run 'publish' lane to build and upload")
 	end
 
-	supply(apk: filename, track: 'internal')
+	mapping = "#{ENV['PWD']}/wallet/build/outputs/mapping/prodRelease/mapping.txt"
+	if !File.exist? "#{mapping}"
+		UI.user_error!("Missing mapping.txt. Run 'publish' lane to build and upload")
+	end
+
+	supply(apk: filename, mapping: mapping, track: 'internal')
   end
 
   desc "Promote to production track with 0.2 rollout by default"