From 613db488b1c15e722718d8619252da43d8b2356c Mon Sep 17 00:00:00 2001
From: Armand <4831c0@proton.me>
Date: Mon, 2 Mar 2026 15:07:51 +0100
Subject: [PATCH] firka_wear: pass model number to phone when pairing

---
 firka/lib/app/initialization_screen.dart               |  4 +++-
 firka/lib/ui/phone/pages/extras/main_wear_pair.dart    |  7 +++++--
 firka_wear/lib/ui/wear/screens/login/login_screen.dart | 10 ++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/firka/lib/app/initialization_screen.dart b/firka/lib/app/initialization_screen.dart
index 51f090e3..024b822e 100644
--- a/firka/lib/app/initialization_screen.dart
+++ b/firka/lib/app/initialization_screen.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -103,10 +104,11 @@ class _InitializationScreenState extends State<InitializationScreen> {
                     WidgetsBinding.instance.addPostFrameCallback((_) {
                       final ctx = navigatorKey.currentContext;
                       if (ctx != null && ctx.mounted) {
+                        logger.info('Watch init_data: ${jsonEncode(msg)}');
                         showWearBottomSheet(
                           ctx,
                           initData,
-                          Platform.isAndroid ? 'Wear OS' : 'Apple Watch',
+                          Platform.isAndroid ? msg['model'] : 'Apple Watch',
                         );
                       }
                     });
diff --git a/firka/lib/ui/phone/pages/extras/main_wear_pair.dart b/firka/lib/ui/phone/pages/extras/main_wear_pair.dart
index 093d534a..783e7299 100644
--- a/firka/lib/ui/phone/pages/extras/main_wear_pair.dart
+++ b/firka/lib/ui/phone/pages/extras/main_wear_pair.dart
@@ -146,10 +146,13 @@ class _WearPairSheetContentState extends State<_WearPairSheetContent> {
                       padding: const EdgeInsets.symmetric(vertical: 16),
                       child: Column(
                         children: [
-                          const SizedBox(
+                          SizedBox(
                             width: 32,
                             height: 32,
-                            child: CircularProgressIndicator(strokeWidth: 2),
+                            child: CircularProgressIndicator(
+                              color: appStyle.colors.accent,
+                              strokeWidth: 2,
+                            ),
                           ),
                           const SizedBox(height: 12),
                           Text(
diff --git a/firka_wear/lib/ui/wear/screens/login/login_screen.dart b/firka_wear/lib/ui/wear/screens/login/login_screen.dart
index 20362050..bab2ca7a 100644
--- a/firka_wear/lib/ui/wear/screens/login/login_screen.dart
+++ b/firka_wear/lib/ui/wear/screens/login/login_screen.dart
@@ -114,7 +114,10 @@ class _WearLoginScreen extends State<WearLoginScreen> {
 
         debugPrint("[Watch -> Phone]: ping");
         watch.sendMessage(<String, dynamic>{
-          'data': jsonEncode(<String, dynamic>{'id': 'ping'}),
+          'data': jsonEncode(<String, dynamic>{
+            'id': 'ping',
+            'model': initData.devInfo.model,
+          }),
         });
       }
 
@@ -241,7 +244,10 @@ class _WearLoginScreen extends State<WearLoginScreen> {
             onPressed: () async {
               debugPrint("[Watch -> Phone]: ping");
               watch.sendMessage(<String, dynamic>{
-                'data': jsonEncode(<String, dynamic>{'id': 'ping'}),
+                'data': jsonEncode(<String, dynamic>{
+                  'id': 'ping',
+                  'model': initData.devInfo.model,
+                }),
               });
             },
             // TODO: This is a placeholder, style this properly