diff --git a/flows/Mandatory_Backup.yaml b/flows/Mandatory_Backup.yaml
new file mode 100644
index 0000000000..e72dc1a4fa
--- /dev/null
+++ b/flows/Mandatory_Backup.yaml
@@ -0,0 +1,206 @@
+appId: io.hexawallet.keeper.development
+---
+
+- launchApp
+
+
+##################################
+# Enter Passcode (11111111)
+##################################
+
+- assertVisible:
+    id: "key_1"
+
+- repeat:
+    times: 8
+    commands:
+      - tapOn:
+          id: "key_1"
+
+- assertVisible: "Create"
+- tapOn: "Create"
+
+##################################
+# Remember Passcode Screen
+##################################
+
+- assertVisible: "Remember your passcode"
+- tapOn: "Back"
+
+##################################
+# Back to Create Screen
+##################################
+
+- assertVisible: "Create"
+- tapOn: "Create"
+
+##################################
+# Continue Screen
+##################################
+
+- assertVisible: "Continue"
+- tapOn: "Continue"
+
+##################################
+# Enable Biometric Authentication
+##################################
+
+- assertVisible: "Enable Biometric Authentication"
+- tapOn: "Cancel"
+
+##################################
+# Onboarding Screens
+##################################
+
+- assertVisible: "Create wallets"
+
+- swipe:
+    start: 80%,50%
+    end: 10%,50%
+
+- assertVisible: "Manage keys"
+
+- swipe:
+    start: 80%,50%
+    end: 10%,50%
+
+- assertVisible: "Plan for Inheritance"
+
+##################################
+# FAQs
+##################################
+
+- tapOn: "See FAQs"
+- back
+
+##################################
+# Get Started
+##################################
+
+- assertVisible: "Get Started"
+- tapOn: "Get Started"
+
+##################################
+# Welcome Screen
+##################################
+
+- assertVisible: "Welcome to Bitcoin Keeper"
+- tapOn: "Start New"
+
+##################################
+# Final Modal
+##################################
+
+- assertVisible: "Next"
+- tapOn: "Next"
+
+##################################
+# Home Screen
+##################################
+- assertVisible: "Set Up Wallet Recovery"
+
+
+- assertVisible: "Backup Recovery Key"
+
+
+####################################################
+# MANDATORY BACKUP FLOW
+####################################################
+
+- assertVisible: "Backup Recovery Key"
+- tapOn: "Backup Recovery Key"
+
+##################################
+# Confirm Passcode (1111)
+##################################
+
+- assertVisible: "Confirm Passcode"
+
+- repeat:
+    times: 4
+    commands:
+      - tapOn:
+          id: "key_1"
+
+- tapOn:
+    id: "btn_primaryText"
+
+##################################
+# Cancel First Time
+##################################
+
+- assertVisible: "Cancel"
+- tapOn: "Cancel"
+
+##################################
+# Try Switching Tab
+##################################
+
+- tapOn: "Keys"
+
+##################################
+# Mandatory Modal Again
+##################################
+
+- assertVisible: "Set Up Wallet Recovery"
+- tapOn: "Backup Recovery Key"
+
+##################################
+# Confirm Passcode Again
+##################################
+
+- repeat:
+    times: 4
+    commands:
+      - tapOn:
+          id: "key_1"
+
+- tapOn:
+    id: "btn_primaryText"
+
+##################################
+# Backup Now
+##################################
+
+- assertVisible: "Backup Now"
+- tapOn: "Backup Now"
+
+##################################
+# Recovery Key Screen
+##################################
+
+- assertVisible: "Recovery Key"
+
+- tapOn: { id: "text_seed_word_0" }
+- tapOn: { id: "text_seed_word_1" }
+- tapOn: { id: "text_seed_word_2" }
+- tapOn: { id: "text_seed_word_3" }
+- tapOn: { id: "text_seed_word_4" }
+- tapOn: { id: "text_seed_word_5" }
+- tapOn: { id: "text_seed_word_6" }
+- tapOn: { id: "text_seed_word_7" }
+- tapOn: { id: "text_seed_word_8" }
+- tapOn: { id: "text_seed_word_9" }
+- tapOn: { id: "text_seed_word_10" }
+- tapOn: { id: "text_seed_word_11" }
+
+- tapOn: "Next"
+
+##################################
+# Confirm Backup
+##################################
+
+- assertVisible: "Confirm Backup"
+
+- tapOn: "Enter seed word"
+
+# ⚠ Replace with actual expected seed word
+- inputText: "example"
+
+- tapOn: "Confirm"
+
+##################################
+# Final Verification
+##################################
+
+- assertVisible: "Keys"
diff --git a/flows/addNewKey.yaml b/flows/addNewKey.yaml
deleted file mode 100644
index 1e9cec9615..0000000000
--- a/flows/addNewKey.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'btn_Manage\nKeys'
-- assertVisible:
-    id: 'btn_Add Key'
-- tapOn:
-    id: 'btn_Add Key'
-- waitForAnimationToEnd:
-    timeout: 5000
-- scroll
-- tapOn:
-    id: 'btn_KEEPER'
-- assertVisible:
-    id: 'btn_Add a New Mobile Key'
-- tapOn:
-    id: 'btn_Add a New Mobile Key'
-- assertVisible: Next
-- tapOn:
-    id: 'modal_primary_btn'
-- waitForAnimationToEnd:
-    timeout: 20000
-- extendedWaitUntil:
-    visible: "Manage Keys"
-    timeout: 20000
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
-- runFlow: hidendeletekey.yaml
diff --git a/flows/add_singlesig_wallet.yaml b/flows/add_singlesig_wallet.yaml
new file mode 100644
index 0000000000..1e1e098984
--- /dev/null
+++ b/flows/add_singlesig_wallet.yaml
@@ -0,0 +1,284 @@
+appId: io.hexawallet.keeper.development
+---
+# Add Single Sig Wallet - Stable Old Maestro Version
+
+########################################
+# Wallets Screen
+########################################
+
+- assertVisible: "Wallets"
+- tapOn:
+    text: "Wallets"
+    index: 1
+
+- waitForAnimationToEnd
+
+- assertVisible: "Add Wallet"
+- tapOn: "Add Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Pick Wallet Type
+########################################
+
+- assertVisible: "Bitcoin Wallet"
+- tapOn: "Bitcoin Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Add New Wallet
+########################################
+
+- assertVisible: "Add a New Wallet"
+- tapOn: "Add a New Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Create Wallet
+########################################
+
+- assertVisible: "Create Wallet"
+- tapOn: "Create Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Select Wallet Type
+########################################
+
+- assertVisible: "Single-key"
+- tapOn: "Single-key"
+
+- waitForAnimationToEnd
+
+- assertVisible: "Proceed"
+- tapOn: "Proceed"
+
+- waitForAnimationToEnd
+
+########################################
+# Select Wallet Keys
+########################################
+
+- assertVisible: "Select your wallet keys"
+- tapOn: "Add a Key"
+
+- waitForAnimationToEnd
+
+########################################
+# Add Signer
+########################################
+
+# Removed "Add a Signer" assertion (causing failure)
+
+- assertVisible: "Add a software key"
+- tapOn: "Add a software key"
+
+- waitForAnimationToEnd
+
+########################################
+# Software Keys
+########################################
+
+- assertVisible: "Seed Key"
+- tapOn: "Seed Key"
+
+- waitForAnimationToEnd
+
+########################################
+# Add Seed Key
+########################################
+
+- assertVisible: "Create"
+- tapOn: "Create"
+
+- waitForAnimationToEnd
+
+########################################
+# Create Seed Key
+########################################
+
+- assertVisible: "Proceed"
+- tapOn: "Proceed"
+
+- waitForAnimationToEnd
+
+########################################
+# Reveal 12 Seed Words (NO POINT TAPPING)
+########################################
+
+########################################
+# Reveal 12 Seed Words (Correct Index Based)
+########################################
+
+- assertVisible: "Seed Key"
+
+- tapOn:
+    index: 0
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 1
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 2
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 3
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 4
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 5
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 6
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 7
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 8
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 9
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 10
+- waitForAnimationToEnd
+
+- tapOn:
+    index: 11
+- waitForAnimationToEnd
+
+- assertVisible: "Next"
+- tapOn: "Next"
+
+- waitForAnimationToEnd
+
+- assertVisible: "Next"
+- tapOn: "Next"
+
+- waitForAnimationToEnd
+
+########################################
+# Confirm Backup (Manual Entry)
+########################################
+
+- assertVisible: "Confirm Backup"
+- tapOn: "Enter seed word"
+
+# 👉 MANUALLY enter requested seed word here
+
+# Give yourself time before next step
+- waitForAnimationToEnd
+- waitForAnimationToEnd
+- waitForAnimationToEnd
+
+- hideKeyboard
+
+- assertVisible: "Confirm"
+- tapOn: "Confirm"
+
+- waitForAnimationToEnd
+
+########################################
+# Remember Seed Words Modal
+########################################
+
+- assertVisible: "Save"
+- tapOn: "Save"
+
+- waitForAnimationToEnd
+
+########################################
+# Seed Key Added Successfully
+########################################
+
+- assertVisible: "Seed key Added Successfully!"
+- tapOn: "Cancel"
+
+- waitForAnimationToEnd
+
+########################################
+# Select Added Seed Key
+########################################
+
+- assertVisible: "Select your wallet keys"
+
+- assertVisible:
+    text: "Seed Key"
+    index: 0
+
+- tapOn:
+    text: "Seed Key"
+    index: 0
+
+- waitForAnimationToEnd
+
+- assertVisible: "Proceed"
+- tapOn: "Proceed"
+
+- waitForAnimationToEnd
+
+########################################
+# Confirm Wallet Details
+########################################
+
+- assertVisible: "Enter wallet name"
+- tapOn: "Enter wallet name"
+- inputText: "My Single Sig Wallet"
+- hideKeyboard
+
+- waitForAnimationToEnd
+
+########################################
+# Add Description
+########################################
+
+- assertVisible: "Add Description"
+- tapOn: "Add Description"
+
+- waitForAnimationToEnd
+
+- assertVisible: "Add a description (Optional)"
+- tapOn: "Add a description (Optional)"
+- inputText: "Primary Bitcoin Wallet"
+- hideKeyboard
+
+- waitForAnimationToEnd
+
+- assertVisible: "Save Changes"
+- tapOn: "Save Changes"
+
+- waitForAnimationToEnd
+
+########################################
+# Create Wallet
+########################################
+
+- assertVisible: "Create Your Wallet"
+- tapOn: "Create Your Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Wallet Created
+########################################
+
+- assertVisible: "Wallet Created Successfully"
+- assertVisible: "View Wallet"
+- tapOn: "View Wallet"
diff --git a/flows/addwallet.yaml b/flows/addwallet.yaml
deleted file mode 100644
index 38c897339b..0000000000
--- a/flows/addwallet.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-appId: ${APPID}
----
-- assertTrue: ${output.text_HotWallet = "1 Wallet"}
-- assertVisible:
-    id: 'wallet_list'
-- swipe:
-   from: 
-    id: 'wallet_list'
-   direction: LEFT
-- assertVisible:
-    id: 'btn_add_wallet'
-- tapOn:
-    id: 'btn_add_wallet'
-- waitForAnimationToEnd:
-    timeout: 1000
-- assertTrue: ${output.text_modal_title = "Add or Import Wallet"}
-- assertTrue: ${output.text_modal_subtitle = "Create purpose specific wallets having dedicated UTXOs. Manage other app wallets by importing them"}
-- assertVisible:
-    id: 'btn_Hot Wallet'
-- assertVisible:
-    id: 'btn_2-of-3 Vault'
-- assertVisible:
-    id: 'btn_3-of-5 Vault'
-- assertVisible:
-    id: 'btn_Collaborative'
-- tapOn:
-    id: 'btn_Hot Wallet'
-- waitForAnimationToEnd:
-    timeout: 2000
-- tapOn:
-    id: 'input_transfer_policy'
-- 'eraseText'
-- inputText: '21000'
-- hideKeyboard
-- assertVisible:
-    id: 'btn_primaryText'
-- assertTrue: ${output.btn_primaryText = "Create"}
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible:
-    id: modal_loading
-- waitForAnimationToEnd:
-    timeout: 20000
-- assertVisible:
-    id: 'modal_primary_btn'
-- tapOn:
-    id: 'modal_primary_btn'
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
diff --git a/flows/appsettings.yaml b/flows/appsettings.yaml
deleted file mode 100644
index d4aec33bf3..0000000000
--- a/flows/appsettings.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-appId: ${APPID}
----
-# - runFlow: login.yaml
-- tapOn:
-    id: btn_AppSettingsIcon
-- assertVisible:
-    id: 'btn_back'
-- assertVisible: 'App Settings'
-- assertVisible: 'Configure your app here'
-- assertVisible:
-    id: 'btn_App_Backup}'
-- assertVisible:
-    id: 'view_Biometrics'
-- assertVisible:
-    id: 'view_Dark_Mode'
-- assertVisible:
-    id: 'view_Node_Settings'
-- assertVisible:
-    id: 'view_Version_History'
-- assertVisible:
-    id: 'view_Tor_Settings'
-- assertVisible:
-    id: 'view_Language_&_Currency'
-- assertVisible:
-    id: 'view_ KeeperTelegram'
-- assertVisible:
-    id: 'view_keeperTwitter'
-- assertVisible:
-    id: 'btn_FAQ'
-- assertVisible:
-    id: 'text_termsCondition'
-- assertVisible:
-    id: 'text_privacyPolicy'
-- tapOn:
-    id: 'view_Dark_Mode'
-    delay: 1000
-- tapOn:
-    id: 'view_Dark_Mode'
-    delay: 1000
-- runFlow: exportseed.yaml
-- runFlow: versionhistory.yaml
-- tapOn:
-    id: 'btn_back'
diff --git a/flows/buyBTC.yaml b/flows/buyBTC.yaml
deleted file mode 100644
index a946893831..0000000000
--- a/flows/buyBTC.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- swipe:
-    from:
-      id: list_transactions
-    direction: DOWN
-    duration: 2000
-- waitForAnimationToEnd:
-    timeout: 5000
-- repeat:
-    while:
-      visible:
-        id: 'icon_unconfirmed_0'
-    commands:
-      - runFlow: refreshwallet.yaml
-- assertVisible:
-    id: 'btn_Buy Bitcoin'
-- tapOn:
-    id: 'btn_Buy Bitcoin'
-- tapOn:
-    id: 'btn_primaryText'
-
diff --git a/flows/collaborative_wallet.yaml b/flows/collaborative_wallet.yaml
new file mode 100644
index 0000000000..23625fca29
--- /dev/null
+++ b/flows/collaborative_wallet.yaml
@@ -0,0 +1,147 @@
+appId: io.hexawallet.keeper.development
+---
+# Add Collaborative Wallet - Fully Corrected Stable Flow
+
+########################################
+# Wallets Screen
+########################################
+
+- assertVisible: "Wallets"
+
+- tapOn:
+    text: "Wallets"
+    index: 1
+
+- waitForAnimationToEnd
+
+- assertVisible: "Add Wallet"
+- tapOn: "Add Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Pick Wallet Type
+########################################
+
+- assertVisible: "Bitcoin Wallet"
+- tapOn: "Bitcoin Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Add New Wallet
+########################################
+
+- assertVisible: "Add a New Wallet"
+- tapOn: "Add a New Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Select Collaborative Wallet
+########################################
+
+- assertVisible: "Collaborative Wallet"
+- tapOn: "Collaborative Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Handle Existing Session (If Appears)
+########################################
+
+- runFlow:
+    when:
+      visible: "Collaborative wallet setup session already exists"
+    commands:
+      - tapOn: "Start New"
+      - waitForAnimationToEnd
+
+########################################
+# Collaborative Vault Screen
+########################################
+
+- assertVisible: "Collaborative Vault"
+- assertVisible: "Add Second Contact"
+
+########################################
+# Add Second Contact
+########################################
+
+- tapOn: "Add Second Contact"
+
+- assertVisible: "Add a Contact"
+- assertVisible: "Scan QR"
+
+- tapOn: "Scan QR"
+
+########################################
+# Camera Permission (FIRST TIME ONLY)
+########################################
+
+- runFlow:
+    when:
+      visible: "Allow Keeper to take pictures and record video?"
+    commands:
+      - tapOn: "While using the app"
+      - waitForAnimationToEnd
+
+########################################
+# MANUAL QR SCAN - Second Contact
+########################################
+
+# 👉 Manually scan QR now
+
+- extendedWaitUntil:
+    visible: "Add Third Contact"
+    timeout: 120000
+
+- waitForAnimationToEnd
+
+########################################
+# Add Third Contact
+########################################
+
+- assertVisible: "Add Third Contact"
+- tapOn: "Add Third Contact"
+
+- assertVisible: "Add a Contact"
+- assertVisible: "Scan QR"
+
+- tapOn: "Scan QR"
+
+########################################
+# MANUAL QR SCAN - Third Contact
+########################################
+
+# 👉 Manually scan QR now
+
+- extendedWaitUntil:
+    visible: "Collaborative Wallet Created Successfully!"
+    timeout: 120000
+
+########################################
+# Success Modal
+########################################
+
+- assertVisible: "Collaborative Wallet Created Successfully!"
+- assertVisible: "View vault"
+
+- tapOn: "View vault"
+
+- waitForAnimationToEnd
+
+########################################
+# Final Confirmation
+########################################
+
+- assertVisible: "Collaborative Wallet"
+- tapOn: "Okay"
+
+- waitForAnimationToEnd
+
+########################################
+# Final Vault Landing
+########################################
+
+- assertVisible: "Collaborative Wallet 1"
\ No newline at end of file
diff --git a/flows/concierge.yaml b/flows/concierge.yaml
new file mode 100644
index 0000000000..7f3e36807b
--- /dev/null
+++ b/flows/concierge.yaml
@@ -0,0 +1,86 @@
+appId: io.hexawallet.keeper.development
+---
+
+- extendedWaitUntil:
+    visible: "Concierge"
+    timeout: 60000
+# Open Concierge tab
+- tapOn: "Concierge"
+
+- assertVisible:
+    text: "Concierge"
+    index: 0
+
+# View Advisors
+- assertVisible: "View Advisors"
+- tapOn: "View Advisors"
+
+- assertVisible: "Meet Our Advisors"
+
+# Scroll advisors list
+- scroll
+- scroll
+
+# Open advisor profile
+- scrollUntilVisible:
+    element: "View Profile"
+
+- tapOn:
+    text: "View Profile"
+    index: 0
+
+- assertVisible: "Expert Profile"
+
+# Scroll profile page
+- scroll
+- scroll
+
+# Back to advisors
+- tapOn:
+    point: "10%,10%"
+
+- assertVisible: "Meet Our Advisors"
+
+# Back to Concierge
+- tapOn:
+    id: "btn_back"
+
+# Ask a question flow
+- assertVisible: "Ask a question."
+- assertVisible: "Take me there"
+
+- tapOn: "Take me there"
+
+- assertVisible: "Ask a question."
+- assertVisible: "Ask the team"
+
+- tapOn: "Ask the team"
+
+# Attach Screenshot (optional)
+- assertVisible: "Attach Screenshot"
+- tapOn: "Attach Screenshot"
+
+# Wait in case file picker opens
+- waitForAnimationToEnd
+- waitForAnimationToEnd
+
+# Share attributes
+- assertVisible: "Share App Attributes"
+- tapOn: "Share App Attributes"
+
+# Additional details modal
+- assertVisible: "Additional details"
+- assertVisible: "Select All"
+
+- tapOn: "Select All"
+
+# Share action
+- tapOn:
+    text: "Share"
+
+# Confirmation
+- assertVisible: "Keeper Concierge"
+
+# Back arrow
+- tapOn:
+    point: "9%,9%"
\ No newline at end of file
diff --git a/flows/copywalletaddress.yaml b/flows/copywalletaddress.yaml
deleted file mode 100644
index e646f386c0..0000000000
--- a/flows/copywalletaddress.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-appId: ${APPID}
----
-# - runFlow: login.yaml
-- tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- tapOn:
-    id: 'btn_Receive'
-- tapOn:
-    id: 'btn_copy_address'
-- repeat:
-    while:
-      visible: 'Address Copied Successfully'
-    commands:
-      - tapOn:
-          id: 'btn_copy_address'
-- tapOn:
-    id: 'btn_back'
-- waitForAnimationToEnd:
-    timeout: 1000
-- tapOn:
-    id: 'btn_back'
-- waitForAnimationToEnd:
-    timeout: 1000
diff --git a/flows/create_passcode.yaml b/flows/create_passcode.yaml
new file mode 100644
index 0000000000..729a6d8762
--- /dev/null
+++ b/flows/create_passcode.yaml
@@ -0,0 +1,54 @@
+appId: io.hexawallet.keeper.development
+---
+
+- launchApp
+
+# ---- Create Passcode ----
+- assertVisible:
+    id: key_1
+
+- repeat:
+    times: 8
+    commands:
+      - tapOn:
+          id: key_1
+
+- assertVisible: "Create"
+- tapOn: "Create"
+
+# ---- Remember Passcode ----
+- assertVisible: "Remember your passcode"
+- tapOn: "Continue"
+
+# ---- Biometric ----
+- assertVisible: "Enable Biometric Authentication"
+- tapOn: "Cancel"
+
+# ---- Onboarding Carousel ----
+- assertVisible: "Create wallets"
+
+- swipe:
+    direction: LEFT
+
+- assertVisible: "Manage keys"
+
+- swipe:
+    direction: LEFT
+
+- assertVisible: "Plan for Inheritance"
+
+- tapOn: "See FAQs"
+- pressKey: back
+
+# ---- Get Started ----
+- assertVisible: "Get Started"
+- tapOn: "Get Started"
+
+# ---- Welcome ----
+- assertVisible: "Welcome to Bitcoin Keeper"
+- tapOn: "Start New"
+
+- assertVisible: "Next"
+- tapOn: "Next"
+
+- assertVisible: "Home"
\ No newline at end of file
diff --git a/flows/create_wallet_onboarding.yaml b/flows/create_wallet_onboarding.yaml
new file mode 100644
index 0000000000..e139fc1fa6
--- /dev/null
+++ b/flows/create_wallet_onboarding.yaml
@@ -0,0 +1,124 @@
+appId: io.hexawallet.keeper.development
+---
+
+##################################
+# Launch App
+##################################
+
+- launchApp
+
+##################################
+# Enter Passcode (11111111)
+##################################
+
+- assertVisible:
+    id: "key_1"
+
+- repeat:
+    times: 8
+    commands:
+      - tapOn:
+          id: "key_1"
+
+# Tap Create (Primary Button)
+- assertVisible:
+    id: "btn_primaryText"
+
+- tapOn:
+    id: "btn_primaryText"
+
+##################################
+# Remember Passcode Screen
+##################################
+
+- assertVisible: "Remember your passcode"
+
+# Tap Back
+- tapOn: "Back"
+
+##################################
+# Back To Passcode Screen
+##################################
+
+# Primary button (Create) should be visible again
+- assertVisible:
+    id: "btn_primaryText"
+
+# Tap Create again
+- tapOn:
+    id: "btn_primaryText"
+
+##################################
+# Continue Screen
+##################################
+
+# Now Continue button appears
+- assertVisible: "Continue"
+
+- tapOn: "Continue"
+
+##################################
+# Enable Biometric Authentication
+##################################
+
+- assertVisible: "Enable Biometric Authentication"
+
+# Skip biometric
+- tapOn: "Cancel"
+
+##################################
+# Onboarding Screens
+##################################
+
+- assertVisible: "Create wallets"
+
+# Swipe to Manage Keys
+- swipe:
+    start: 80%,50%
+    end: 10%,50%
+
+- assertVisible: "Manage keys"
+
+# Swipe to Plan for Inheritance
+- swipe:
+    start: 80%,50%
+    end: 10%,50%
+
+- assertVisible: "Plan for Inheritance"
+
+##################################
+# FAQs
+##################################
+
+- assertVisible: "See FAQs"
+- tapOn: "See FAQs"
+
+- back
+
+##################################
+# Get Started
+##################################
+
+- assertVisible: "Get Started"
+- tapOn: "Get Started"
+
+##################################
+# Welcome Screen
+##################################
+
+- assertVisible: "Welcome to Bitcoin Keeper"
+
+- tapOn: "Start New"
+
+##################################
+# Final Modal
+##################################
+
+- assertVisible: "Next"
+- tapOn: "Next"
+
+##################################
+# Home Screen
+##################################
+
+- assertVisible: "Home"
diff --git a/flows/editwallet.yaml b/flows/editwallet.yaml
deleted file mode 100644
index d3ae9c2884..0000000000
--- a/flows/editwallet.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-appId: ${APPID}
----
-- runFlow: login.yaml
-- tapOn:
-    id: 'btn_LinkedWallet'
-- tapOn:
-    id: 'btn_walletSettings'
-- tapOn:
-    id: 'btn_Wallet_Details'
-- assertVisible: 'Edit wallet name and description'
diff --git a/flows/editwalletdetails.yaml b/flows/editwalletdetails.yaml
deleted file mode 100644
index 919e1e9fcb..0000000000
--- a/flows/editwalletdetails.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-appId: ${APPID}
----
-# - runFlow: login.yaml
-- tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- tapOn:
-    id: 'btn_Settings'
-- waitForAnimationToEnd:
-    timeout: 1000
-- assertVisible:
-    id: 'btn_back'
-- assertTrue: ${output.text_header_title = "Wallet Settings"}
-- assertTrue: ${output.text_header_subtitle = "Setting for the wallet only"}
-- assertVisible:
-    id: 'view_Wallet_Details'
-- tapOn:
-    id: 'view_Wallet_Details'
-    delay: 500
-- waitForAnimationToEnd:
-    timeout: 1000
-- assertVisible:
-    id: 'btn_back'
-- assertTrue: ${output.text_header_title = "Wallet Details"}
-- assertTrue: ${output.text_header_subtitle = "Name, details and transfer policy"}
-- assertVisible:
-    id: 'view_Edit_wallet_name_and_description'
-- assertVisible:
-    id: 'view_Show_xPub'
-- assertVisible:
-    id: 'view_Derivation_Path'
-- assertVisible:
-    id: view_Transfer_Policy
-- assertVisible:
-    id: 'text_note_title'
-- assertTrue: ${output.text_note_title = "Note"}
-- assertTrue: ${output.text_note_subtitle = "These settings are for your selected wallet only and does not affect other wallets"}
-- tapOn:
-    id: 'view_Edit_wallet_name_and_description'
-- assertTrue: ${output.text_header_subtitle = "Edit wallet name and description"}
-- tapOn:
-    id: 'input_walletName'
-- 'eraseText'
-- inputRandomPersonName
-- inputText: "'s wallet"
-- tapOn:
-    id: 'input_walletDescription'
-- 'eraseText'
-- inputRandomText
-- inputRandomEmail
-- inputRandomNumber
-- hideKeyboard
-- assertVisible: 'Cancel'
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible:
-    id: modal_loading
-- runFlow:
-    when:
-      notVisible:
-        id: 'modal_loading'
-    commands:
-      - assertVisible: 'Wallet details updated'
-      - tapOn:
-          id: 'btn_back'
-          repeat: 3
-          delay: 500
diff --git a/flows/exportseed.yaml b/flows/exportseed.yaml
deleted file mode 100644
index 6c2b3501c3..0000000000
--- a/flows/exportseed.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'btn_App_Backup}'
-- waitForAnimationToEnd:
-    timeout: 1000
-- assertVisible:
-    id: 'btn_back'
-- assertVisible: 'Backup Wallet'
-- assertVisible: 'Setup backup for Keeper'
-- assertVisible:
-    id: 'view_Export_app_individual_phrase'
-- tapOn:
-    id: 'view_Export_app_individual_phrase'
-    waitToSettleTimeoutMs: 500
-- waitForAnimationToEnd:
-    timeout: 5000
-- assertVisible: 'Confirm Passcode'
-- assertVisible: 'To backup app recovery phrase'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_2'
-- tapOn:
-    id: 'key_3'
-- tapOn:
-    id: 'key_4'
-- assertVisible:
-    id: 'btn_primaryText'
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible: 'Recovery Phrase'
-- tapOn: 'Make sure you keep them safe'
-- tapOn:
-    id: 'btn_seed_word_0'
-- assertTrue: '${output.text_seed_word_0 != "*****"}'
-- tapOn:
-    id: 'btn_seed_word_3'
-- assertTrue: '${output.text_seed_word_0 ="*****"}'
-- assertTrue: '${output.text_seed_word_3 != "*****"}'
-- tapOn:
-    id: 'btn_back'
-- waitForAnimationToEnd:
-    timeout: 1000
-- tapOn:
-    id: 'btn_back'
-- waitForAnimationToEnd:
-    timeout: 1000
diff --git a/flows/forgot_passcode.yaml b/flows/forgot_passcode.yaml
new file mode 100644
index 0000000000..a16127e3f6
--- /dev/null
+++ b/flows/forgot_passcode.yaml
@@ -0,0 +1,131 @@
+appId: io.hexawallet.keeper.development
+---
+
+- launchApp
+
+# -----------------------------
+# Welcome Screen
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Welcome Back"
+    timeout: 20000
+
+# -----------------------------
+# Wrong Passcode Attempt 1
+# -----------------------------
+# USER manually enters wrong passcode
+- extendedWaitUntil:
+    visible: "Proceed"
+    timeout: 60000
+- tapOn: "Proceed"
+
+- extendedWaitUntil:
+    visible: "Incorrect Passcode, Try Again!"
+    timeout: 20000
+
+
+# -----------------------------
+# Wrong Passcode Attempt 2
+# -----------------------------
+# USER manually enters wrong passcode
+- extendedWaitUntil:
+    visible: "Proceed"
+    timeout: 60000
+- tapOn: "Proceed"
+
+- extendedWaitUntil:
+    visible: "Incorrect Passcode, Try Again!"
+    timeout: 20000
+
+
+# -----------------------------
+# Wrong Passcode Attempt 3
+# -----------------------------
+# USER manually enters wrong passcode
+- extendedWaitUntil:
+    visible: "Proceed"
+    timeout: 60000
+- tapOn: "Proceed"
+
+
+# -----------------------------
+# Retry Modal
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Retry"
+    timeout: 20000
+- tapOn: "Retry"
+
+
+# -----------------------------
+# Forgot Passcode Flow
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Forgot passcode?"
+    timeout: 20000
+- tapOn: "Forgot passcode?"
+
+
+# -----------------------------
+# Reset Passcode
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Reset Passcode"
+    timeout: 20000
+- tapOn: "Continue"
+
+
+# -----------------------------
+# Create New Passcode
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Create a passcode"
+    timeout: 20000
+
+# USER manually enters new passcode
+
+
+- extendedWaitUntil:
+    visible: "Confirm your passcode"
+    timeout: 120000
+
+# USER confirms passcode
+- tapOn: "Create"
+
+
+# -----------------------------
+# Remember Passcode Screen
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Remember your passcode"
+    timeout: 20000
+- tapOn: "Continue"
+
+
+# -----------------------------
+# Recover Wallet Screen
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Recover an existing Keeper App"
+    timeout: 20000
+
+
+# -----------------------------
+# USER enters seed / recovery words
+# (5 minutes wait)
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Next"
+    timeout: 300000
+
+- tapOn: "Next"
+
+
+# -----------------------------
+# Wallet Recovery Processing
+# -----------------------------
+- extendedWaitUntil:
+    visible: "Continue"
+    timeout: 120000
+
+- tapOn: "Continue"
\ No newline at end of file
diff --git a/flows/healthCheckKey.yaml b/flows/healthCheckKey.yaml
deleted file mode 100644
index c5bba973b6..0000000000
--- a/flows/healthCheckKey.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'btn_Manage\nKeys'
-- tapOn:
-    id: 'btn_Mobile Key'
-    index: 0
-- tapOn:
-    id: 'btn_Health Check'
-- assertVisible:
-    id: 'modal_secondary_btn'
-- tapOn:
-    id: 'modal_secondary_btn'
-- assertVisible:
-    id: 'modal_secondary_btn'
-- tapOn:
-    id: 'modal_secondary_btn'
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
-- extendedWaitUntil:
-    visible: "Manage Keys"
-    timeout: 20000
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
-
diff --git a/flows/hidendeletekey.yaml b/flows/hidendeletekey.yaml
deleted file mode 100644
index cd27efbd4f..0000000000
--- a/flows/hidendeletekey.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'btn_Manage\nKeys'
-- tapOn:
-    id: 'btn_Mobile Key'
-    index: 0
-- tapOn:
-    id: 'btn_Settings'
-- tapOn:
-    id: 'btn_Hide signer'
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible:
-    id: 'btn_manage_singner_setting'
-- tapOn:
-    id: 'btn_manage_singner_setting'
-- assertVisible:
-    id: 'btn_Show and delete keys'
-- tapOn:
-   id: 'btn_Show and delete keys'
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible:
-    id: 'btn_Delete'
-    index: 0
-- tapOn:
-    id: 'btn_Delete'
-    index: 0
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
-- extendedWaitUntil:
-    visible: "Manage Keys"
-    timeout: 20000
-- assertVisible:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
-- runFlow: healthCheckKey.yaml
-
diff --git a/flows/import_wallet.yaml b/flows/import_wallet.yaml
new file mode 100644
index 0000000000..7b814f601a
--- /dev/null
+++ b/flows/import_wallet.yaml
@@ -0,0 +1,116 @@
+appId: io.hexawallet.keeper.development
+---
+########################################
+# Wallets Screen
+########################################
+
+- assertVisible: "Wallets"
+- tapOn:
+    text: "Wallets"
+    index: 1
+
+- waitForAnimationToEnd
+
+- assertVisible: "Add Wallet"
+- tapOn: "Add Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Pick Wallet Type
+########################################
+
+- assertVisible: "Bitcoin Wallet"
+- tapOn: "Bitcoin Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Add a New Wallet Screen
+########################################
+
+- assertVisible: "Add a New Wallet"
+- tapOn: "Import Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Camera Permission (If Appears)
+########################################
+
+- runFlow:
+    when:
+      visible:
+        id: "com.android.permissioncontroller:id/permission_message"
+    commands:
+      - tapOn: "While using the app"
+
+- waitForAnimationToEnd
+
+########################################
+# Import Wallet Screen
+########################################
+
+- assertVisible: "Import a Wallet"
+- assertVisible: "or enter configuration manually"
+
+# Tap manual configuration field
+- tapOn: "or enter configuration manually"
+
+###################################################
+# MANUAL STEP - You enter config manually here
+# Script will wait until Proceed button is enabled
+###################################################
+
+- extendedWaitUntil:
+    visible: "Proceed"
+    timeout: 60000   # 60 seconds to manually paste config
+
+- tapOn: "Proceed"
+
+- waitForAnimationToEnd
+
+########################################
+# Confirm Wallet Details
+########################################
+
+- assertVisible: "Confirm your wallet details"
+
+# Wallet Name
+- tapOn:
+    text: "Imported wallet"
+    index: 0
+- eraseText
+- inputText: "Test Imported Wallet"
+
+# Description
+- runFlow:
+    when:
+      visible: "Secure your sats"
+    commands:
+      - tapOn: "Secure your sats"
+      - eraseText
+      - inputText: "Manual config test wallet"
+
+- hideKeyboard
+
+########################################
+# Done Button
+########################################
+
+- assertVisible: "Done"
+- tapOn: "Done"
+
+- waitForAnimationToEnd
+
+########################################
+# Handle Free Feature Modal
+########################################
+
+- runFlow:
+    when:
+      visible: "This feature is now free"
+    commands:
+      - tapOn: "No thanks"
+
+- waitForAnimationToEnd
diff --git a/flows/keySetting.yaml b/flows/keySetting.yaml
deleted file mode 100644
index df63ceeeb0..0000000000
--- a/flows/keySetting.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'btn_Manage\nKeys'
-- tapOn:
-    id: 'btn_Mobile Key'
-    index: 0
-- tapOn:
-    id: 'btn_Settings'
diff --git a/flows/launch_success.png b/flows/launch_success.png
new file mode 100644
index 0000000000..fc800e474f
Binary files /dev/null and b/flows/launch_success.png differ
diff --git a/flows/login.yaml b/flows/login.yaml
deleted file mode 100644
index fa63365825..0000000000
--- a/flows/login.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-appId: ${APPID}
----
-- extendedWaitUntil:
-    visible: 'Enter your passcode'
-    timeout: 20000
-- assertNotVisible: 'Proceed'
-- tapOn: '1'
-- tapOn: '2'
-- tapOn: '3'
-- tapOn: '7'
-- assertVisible: 'Proceed'
-- tapOn: 'Proceed'
-- waitForAnimationToEnd:
-    timeout: 5000
-- assertVisible: 'Incorrect password'
-- assertNotVisible: 'Proceed'
-- assertVisible: 'Retry'
-- tapOn: 'Retry'
-- tapOn: '1'
-- tapOn: '1'
-- tapOn: '1'
-- tapOn: '1'
-- assertVisible: 'Proceed'
-- tapOn: 'Proceed'
-- waitForAnimationToEnd:
-    timeout: 5000
-- extendedWaitUntil:
-    visible: 'Next'
-    timeout: 30000
-- tapOn: 'Next'
-- waitForAnimationToEnd:
-    timeout: 2000
diff --git a/flows/newapp.yaml b/flows/newapp.yaml
deleted file mode 100644
index a2c18a6dad..0000000000
--- a/flows/newapp.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-appId: ${APPID}
----
-- runFlow: setpin.yaml
-- extendedWaitUntil:
-    visible: 'Welcome'
-    timeout: 5000
-- assertVisible:
-    id: 'view_startNewTile'
-- tapOn:
-    id: 'view_startNewTile'
-- extendedWaitUntil:
-    visible: 'Next'
-    timeout: 30000
-- tapOn: 'Next'
-- waitForAnimationToEnd:
-    timeout: 2000
-- extendedWaitUntil:
-    notVisible:
-        id: 'toast_message'
-    timeout: 20000
diff --git a/flows/receive.yaml b/flows/receive.yaml
index e05bb99d0d..20a25f0ed3 100644
--- a/flows/receive.yaml
+++ b/flows/receive.yaml
@@ -1,26 +1,77 @@
-appId: ${APPID}
+appId: io.hexawallet.keeper.development
 ---
+
+########################################
+# Wallets Screen
+########################################
+
+- assertVisible: "Wallets"
+
 - tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- swipe:
-    from:
-      id: list_transactions
-    direction: DOWN
-    duration: 2000
-- waitForAnimationToEnd:
-    timeout: 5000
-- repeat:
-    while:
-      visible:
-        id: 'icon_unconfirmed_0'
-    commands:
-      - runFlow: refreshwallet.yaml
-- assertVisible:
-    id: 'btn_Receive'
+    text: "Wallets"
+    index: 1
+
+########################################
+# Open Mobile Wallet
+########################################
+
+- assertVisible: "Mobile Wallet"
+- tapOn: "Mobile Wallet"
+
+########################################
+# Wallet Home Screen
+########################################
+
+- assertVisible: "Recent Transactions"
+
+########################################
+# Open Receive Screen (Same pattern as Send)
+########################################
+
+# Receive button middle madhe aste (Send cha right side)
 - tapOn:
-    id: 'btn_Receive'
-- tapOn:
-    id: 'btn_back'
-- tapOn:
-    id: 'btn_back'
+    point: "50%,35%"
+
+- waitForAnimationToEnd
+
+- assertVisible: "Receive"
+- assertVisible: "Get New Address"
+
+########################################
+# Generate New Address
+########################################
+
+- tapOn: "Get New Address"
+
+- waitForAnimationToEnd
+
+########################################
+# Request Specific Amount
+########################################
+
+- assertVisible: "Request specific amount"
+- tapOn: "Request specific amount"
+
+- assertVisible: "Request Specific Amount"
+
+########################################
+# Manual Amount Entry (Pause)
+########################################
+
+- waitForAnimationToEnd
+- assertVisible: "Confirm"
+
+########################################
+# Confirm
+########################################
+
+- tapOn: "Confirm"
+
+- waitForAnimationToEnd
+
+########################################
+# Back to Receive Screen
+########################################
+
+- assertVisible: "Receive"
+- assertVisible: "Request specific amount"
\ No newline at end of file
diff --git a/flows/receivesats.yaml b/flows/receivesats.yaml
deleted file mode 100644
index d2c5cbd286..0000000000
--- a/flows/receivesats.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-appId: ${APPID}
----
-# - runFlow: login.yaml
-- tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- tapOn:
-    id: btn_Settings
-- assertVisible:
-    id: 'view_Receive_Test_Sats'
-- tapOn:
-    id: 'view_Receive_Test_Sats'
-- extendedWaitUntil:
-    visible: '5000 Sats Received'
-    timeout: 30000
-- repeat:
-    while:
-      notVisible:
-        id: 'btn_transaction_0'
-    commands:
-      - swipe:
-          from:
-            id: list_transactions
-          direction: DOWN
diff --git a/flows/refreshwallet.yaml b/flows/refreshwallet.yaml
index 61fc93321c..282c334828 100644
--- a/flows/refreshwallet.yaml
+++ b/flows/refreshwallet.yaml
@@ -1,4 +1,4 @@
-appId: ${APPID}
+appId: io.hexawallet.keeper.development
 ---
 - swipe:
     from:
diff --git a/flows/sanity.yaml b/flows/sanity.yaml
deleted file mode 100644
index 8bac3e6114..0000000000
--- a/flows/sanity.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-appId: ${APPID}
----
-- runFlow: newapp.yaml
-- runFlow: addwallet.yaml
-- runFlow: addNewKey.yaml
-
diff --git a/flows/send.yaml b/flows/send.yaml
index 2e553e5a80..4cc052ed8b 100644
--- a/flows/send.yaml
+++ b/flows/send.yaml
@@ -1,96 +1,150 @@
-appId: ${APPID}
+appId: io.hexawallet.keeper.development
 ---
+
+########################################
+# Wallets Screen
+########################################
+
+- assertVisible: "Wallets"
+
 - tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- swipe:
-    from:
-      id: list_transactions
-    direction: DOWN
-    duration: 2000
-- waitForAnimationToEnd:
-    timeout: 5000
-- repeat:
-    while:
-      visible:
-        id: 'icon_unconfirmed_0'
+    text: "Wallets"
+    index: 1
+
+########################################
+# Open Mobile Wallet
+########################################
+
+- assertVisible: "Mobile Wallet"
+- tapOn: "Mobile Wallet"
+
+########################################
+# OPTIONAL: First-Time Refresh Modal
+########################################
+
+- runFlow:
+    when:
+      visible: "Pull Down to Refresh"
     commands:
-      - runFlow: refreshwallet.yaml
-- assertVisible:
-    id: 'btn_Send'
-- tapOn:
-    id: 'btn_Send'
-- waitForAnimationToEnd:
-    timeout: 2000
+      - tapOn: "Okay"
+
+########################################
+# Ensure Wallet Loaded
+########################################
+
+- waitForAnimationToEnd
+- assertVisible: "Mobile Wallet"
+
+########################################
+# Auto Fund If Balance Is 0
+########################################
+
 - runFlow:
     when:
-      visible:
-        id: 'com.android.permissioncontroller:id/grant_dialog'
+      visible: "0 sats"
     commands:
+      - waitForAnimationToEnd
+
       - tapOn:
-          id: 'com.android.permissioncontroller:id/permission_allow_foreground_only_button'
-- assertTrue: ${output.text_header_title = "Send"}
-- assertTrue: ${output.text_header_subtitle = "Scan a bitcoin address"}
-- assertVisible:
-    id: 'qrscanner'
-- assertVisible:
-    id: 'btn_upload_image'
-- assertVisible:
-    id: 'input_receive_address'
-- tapOn:
-    id: 'input_receive_address'
-- inputText: 'tb1qq4yupzkhnzlz8kva9udnud6rw5vezk5qr7kp7s'
-- waitForAnimationToEnd:
-    timeout: 2000
-- assertTrue: ${output.text_header_title = "Enter the Amount"}
-- assertVisible:
-    id: 'view_wallet_info'
-- assertVisible:
-    id: 'input_amount'
-- assertVisible:
-    id: 'text_sendmax'
-- assertVisible:
-    id: 'input_note'
-- assertVisible:
-    id: 'input_amount'
-- tapOn:
-    id: 'input_amount'
-- inputText: '0.00001100'
-- tapOn:
-    id: 'input_note'
-- inputText: 'Testing with maestro'
-- tapOn:
-    id: 'input_amount'
-- inputText: 'Test'
-- hideKeyboard
-- tapOn:
-    id: 'btn_primaryText'
-- waitForAnimationToEnd:
-    timeout: 2000
-- assertTrue: ${output.text_header_title = "Sending to address"}
-- assertTrue: ${output.text_header_subtitle = "Choose priority and fee"}
-- assertVisible: 'tb1qq4yupzkhnzlz8kva9udnud6rw5vezk5qr7kp7s'
-- assertVisible: 'Transaction Priority'
-- tapOn:
-    id: 'btn_primaryText'
-- assertVisible:
-    id: 'modal_passcode_verify'
-- tapOn:
-    id: 'key_1'
+          point: "89%,10%"
+
+      - assertVisible: "Wallet Settings"
+      - assertVisible: "Receive Test Sats"
+      - tapOn: "Receive Test Sats"
+
+      - waitForAnimationToEnd
+      - assertVisible: "Mobile Wallet"
+
+- waitForAnimationToEnd
+
+########################################
+# Start Send Flow
+########################################
+
 - tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- assertVisible:
-    id: 'btn_primaryText'
-- tapOn:
-    id: 'btn_primaryText'
-- extendedWaitUntil:
-    visible: 'Send Successful'
-    timeout: 30000
-- assertVisible: 'The transaction has been successfully broadcasted'
-- tapOn:
-    text: 'View Details'
-    index: 1
+    point: "20%,35%"
+
+- waitForAnimationToEnd
+- assertVisible: "Enter Address"
+
+########################################
+# Address & Note
+########################################
+
+# ---- MANUAL: Scan address ----
+
+- assertVisible: "Add a Note (Optional)"
+- tapOn: "Add a Note (Optional)"
+
+# ---- MANUAL: Enter note ----
+
+- assertVisible: "Proceed"
+- tapOn: "Proceed"
+
+########################################
+# Enter Amount Screen
+########################################
+
+- waitForAnimationToEnd
+- assertVisible: "Enter Amount to Send"
+
+# ---- MANUAL: Enter amount ----
+
+########################################
+# Fee Selection (Correct Text)
+########################################
+
+- assertVisible: "Fee Priority: Low"
+- tapOn: "Fee Priority: Low"
+
+# ---- MANUAL: Select different fee if needed ----
+
+- assertVisible: "Confirm"
+- tapOn: "Confirm"
+
+########################################
+# Send Transaction
+########################################
+
+- assertVisible: "Send"
+- tapOn: "Send"
+
+########################################
+# OPTIONAL: High Fee Alert
+########################################
+
+- runFlow:
+    when:
+      visible: "High Fee Alert"
+    commands:
+      - tapOn: "Proceed"
+
+########################################
+# Confirmation Screen
+########################################
+
+- waitForAnimationToEnd
+- assertVisible: "Send Confirmation"
+
+- assertVisible: "Confirm & Send"
+- tapOn: "Confirm & Send"
+
+########################################
+# OPTIONAL: Passcode Screen
+########################################
+
+- runFlow:
+    when:
+      visible: "Confirm Passcode"
+    commands:
+      - tapOn: "Proceed"
+
+########################################
+# Success Screen
+########################################
+
+- waitForAnimationToEnd
+- assertVisible: "Send Successful"
+
+- assertVisible: "View Wallet"
+- tapOn: "View Wallet"
\ No newline at end of file
diff --git a/flows/setpin.yaml b/flows/setpin.yaml
deleted file mode 100644
index a91611fb2d..0000000000
--- a/flows/setpin.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-appId: ${APPID}
----
-- extendedWaitUntil:
-    visible: 'Create a passcode'
-    timeout: 20000
-- assertVisible: 'Create'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- waitForAnimationToEnd:
-    timeout: 2000
-- assertVisible: 'Create'
-- assertVisible: 'Confirm your passcode'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_1'
-- tapOn:
-    id: 'key_4'
-- assertVisible: 'Passcodes do NOT match'
-- tapOn:
-    id: 'btn_clear'
-- assertNotVisible: 'Passcodes do NOT match'
-- tapOn:
-    id: 'key_1'
-- tapOn: 'Create'
-- waitForAnimationToEnd:
-    timeout: 5000
-- assertVisible: 'Continue'
-- tapOn: 'Continue'
-- swipe:
-    direction: LEFT
-- swipe:
-    direction: LEFT
-- swipe:
-    direction: LEFT
-- waitForAnimationToEnd:
-    timeout: 5000
-- assertVisible: 'Start App'
-- tapOn: 'Start App'
diff --git a/flows/subscription.yaml b/flows/subscription.yaml
deleted file mode 100644
index 4ef8508cb3..0000000000
--- a/flows/subscription.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-appId: ${APPID}
----
-- assertVisible:
-    id: 'btn_choosePlan'
-- tapOn:
-    id: 'btn_choosePlan'
-- tapOn:
-    id: 'btn_Mobile Key'
-    index: 0
-- tapOn:
-    id: 'btn_Settings'
diff --git a/flows/versionhistory.yaml b/flows/versionhistory.yaml
deleted file mode 100644
index 6642c91e4a..0000000000
--- a/flows/versionhistory.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'view_Version_History'
-- waitForAnimationToEnd:
-    timeout: 1000
-- assertVisible:
-    id: 'btn_back'
-- assertTrue: ${output.text_header_title = "Version History"}
-- assertTrue: ${output.text_header_subtitle = "You can verify the history of your app upgrades here"}
-- assertVisible:
-    id: 'view_VersionHistoryList'
-- assertVisible: 'Initially installed'
-- assertVisible:
-    id: 'text_appid'
-- tapOn:
-    id: 'btn_back'
-- waitForAnimationToEnd:
-    timeout: 1000
diff --git a/flows/viewwallet.yaml b/flows/viewwallet.yaml
deleted file mode 100644
index c82f285532..0000000000
--- a/flows/viewwallet.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-appId: ${APPID}
----
-# - runFlow: login.yaml
-- tapOn:
-    id: 'view_wallet_0'
-- assertVisible: 'Bip-85 Wallets'
-- assertVisible: 'Create as many (hot) wallets as you want, and backup with a single Recovery Phrase'
-- assertVisible: 'You can use the individual wallet’s Recovery Phrases to connect other bitcoin apps to Keeper'
-- assertVisible: 'When the funds in a wallet cross a threshold, a transfer to the Vault is triggered. This ensures you don’t have more sats in hot wallets than you need.'
-- assertVisible:
-    id: 'btn_close_modal'
-- assertVisible: 'See FAQs'
-- assertVisible: Continue
-- tapOn:
-    id: 'btn_close_modal'
-- assertVisible:
-    id: 'btn_back'
-- assertVisible:
-    id: 'btn_learnMore'
-- assertVisible: 'Wallet 1'
-- assertVisible: 'Single-sig bitcoin wallet'
-- assertVisible: 'Unconfirmed'
-- assertVisible: 'Available Balance'
-- assertVisible: 'Transfer Policy is set at  '
-- assertVisible: 'Transactions'
-- assertVisible: 'No transactions yet.'
-- assertVisible:
-    id: 'btn_Send'
-- assertVisible:
-    id: 'btn_Receive'
-- assertVisible:
-    id: 'btn_Buy'
-- assertVisible:
-    id: 'btn_Settings'
-- tapOn:
-    id: 'btn_learnMore'
-- assertVisible: 'Bip-85 Wallets'
-- assertVisible: 'Create as many (hot) wallets as you want, and backup with a single Recovery Phrase'
-- assertVisible: 'You can use the individual wallet’s Recovery Phrases to connect other bitcoin apps to Keeper'
-- assertVisible: 'When the funds in a wallet cross a threshold, a transfer to the Vault is triggered. This ensures you don’t have more sats in hot wallets than you need.'
-- tapOn:
-    id: 'btn_close_modal'
-- waitForAnimationToEnd:
-    timeout: 3000
-- tapOn:
-    id: 'btn_back'
diff --git a/flows/walletSetting.yaml b/flows/walletSetting.yaml
deleted file mode 100644
index fbd85fc9ae..0000000000
--- a/flows/walletSetting.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-appId: ${APPID}
----
-- tapOn:
-    id: 'view_wallet_0'
-    index: 0
-- swipe:
-    from:
-      id: list_transactions
-    direction: DOWN
-    duration: 2000
-- waitForAnimationToEnd:
-    timeout: 5000
-- repeat:
-    while:
-      visible:
-        id: 'icon_unconfirmed_0'
-    commands:
-      - runFlow: refreshwallet.yaml
-- assertVisible:
-    id: 'btn_Settings'
-- tapOn:
-    id: 'btn_Settings'