diff --git a/apps/giga-wear/client/proguard-rules.pro b/apps/giga-wear/client/proguard-rules.pro
index 8d030c9..6016a15 100644
--- a/apps/giga-wear/client/proguard-rules.pro
+++ b/apps/giga-wear/client/proguard-rules.pro
@@ -34,26 +34,3 @@
 -dontwarn androidx.window.sidecar.SidecarInterface
 -dontwarn androidx.window.sidecar.SidecarProvider
 -dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
-
--keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent { *; }
--keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent$OnSaved { *; }
--keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent$OnRecent { *; }
--keep class ru.shadowsparky.vbox.shared.domain.RemoteEvent$OnSearch { *; }
-
--keep class ru.shadowsparky.videobox.multiplatform.**$Config { *; }
--keep class ru.shadowsparky.videobox.multiplatform.**$Configuration { *; }
-
--keepclassmembers class * implements android.os.Parcelable {
-    static ** CREATOR;
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
-
--keep class com.arkivanov.decompose.** { *; }
--keep interface com.arkivanov.decompose.** { *; }
--dontwarn com.arkivanov.decompose.**
diff --git a/apps/giga-wear/client/src/main/AndroidManifest.xml b/apps/giga-wear/client/src/main/AndroidManifest.xml
index e865fb4..6e6921e 100644
--- a/apps/giga-wear/client/src/main/AndroidManifest.xml
+++ b/apps/giga-wear/client/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.type.watch" />
-
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
diff --git a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/data/GigaChatRepository.kt b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/data/GigaChatRepository.kt
index 399f4e0..52f46ca 100644
--- a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/data/GigaChatRepository.kt
+++ b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/data/GigaChatRepository.kt
@@ -8,7 +8,7 @@ import org.koin.core.annotation.Factory
 import ru.shadowsparky.chat.domain.ChatRepository
 import ru.shadowsparky.chat.domain.Message
 
-const val ENDPOINT = "http://192.168.0.76:8181"
+const val ENDPOINT = "https://wear.shadowsparky.ru/api"
 
 @Factory
 class GigaChatRepository(
diff --git a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthComponent.kt b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthComponent.kt
index 918d378..34e1bbd 100644
--- a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthComponent.kt
+++ b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthComponent.kt
@@ -70,7 +70,7 @@ class AuthComponentFactory(
             child,
             tokenStorage,
             authRepository
-        ) { root.nav(Route.ChatScreen()) }
+        ) { root.navReplace(Route.ChatScreen()) }
         return Child.AuthChild(component)
     }
 }
diff --git a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthScreen.kt b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthScreen.kt
index 3984d23..9d22871 100644
--- a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthScreen.kt
+++ b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/auth/AuthScreen.kt
@@ -1,6 +1,7 @@
 package ru.shadowsparky.gigawear.presentation.auth
 
 import android.app.RemoteInput
+import android.view.inputmethod.EditorInfo
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.background
@@ -30,6 +31,7 @@ import androidx.wear.compose.material3.AppScaffold
 import androidx.wear.compose.material3.Button
 import androidx.wear.compose.material3.CircularProgressIndicator
 import androidx.wear.input.RemoteInputIntentHelper
+import androidx.wear.input.wearableExtender
 import ru.shadowsparky.gigawear.R
 import androidx.wear.compose.material3.Text as WearText
 
@@ -95,6 +97,10 @@ private fun CodeStep(
         val remoteInputs = listOf(
             RemoteInput.Builder(CODE_INPUT_KEY)
                 .setLabel(title)
+                .wearableExtender {
+                    setEmojisAllowed(false)
+                    setInputActionType(EditorInfo.IME_ACTION_DONE)
+                }
                 .build()
         )
         RemoteInputIntentHelper.putRemoteInputsExtra(intent, remoteInputs)
diff --git a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatComponent.kt b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatComponent.kt
index e7f4602..b409f42 100644
--- a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatComponent.kt
+++ b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatComponent.kt
@@ -37,7 +37,6 @@ class ChatComponent(
     private val scope = coroutineScope(exceptionHandler + SupervisorJob() + Dispatchers.Main.immediate)
     val updateComponent = updateComponentFactory.create(childContext("updater"))
 
-
     private val _events = Channel<ComponentEvent>(Channel.BUFFERED)
     val events = _events.receiveAsFlow()
 
diff --git a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatScreen.kt b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatScreen.kt
index 63daa62..4a720c2 100644
--- a/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatScreen.kt
+++ b/apps/giga-wear/client/src/main/kotlin/ru/shadowsparky/gigawear/presentation/chat/ChatScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -36,7 +37,6 @@ import androidx.wear.compose.material3.MaterialTheme
 import androidx.wear.compose.material3.ScreenScaffold
 import androidx.wear.compose.material3.ScrollIndicator
 import androidx.wear.compose.material3.Text
-import com.arkivanov.decompose.extensions.compose.subscribeAsState
 import kotlinx.coroutines.flow.collectLatest
 import ru.shadowsparky.gigawear.R
 import ru.shadowsparky.gigawear.presentation.WearErrorContent
@@ -46,7 +46,7 @@ import java.util.Locale
 @Composable
 fun ChatScreen(component: ChatComponent) {
     val context = LocalContext.current
-    val state by component.state.subscribeAsState()
+    val state by component.state.collectAsState()
 
     var tts by remember {
         mutableStateOf<TextToSpeech?>(null)
diff --git a/apps/giga-wear/client/src/main/res/raw/keep.xml b/apps/giga-wear/client/src/main/res/raw/keep.xml
new file mode 100644
index 0000000..ea529a1
--- /dev/null
+++ b/apps/giga-wear/client/src/main/res/raw/keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@raw/watchface,@raw/watchface_*,@xml/watch_face_info,@xml/watch_face_shapes,@xml/*watchface*,@drawable/preview*" />
diff --git a/apps/giga-wear/client/src/main/res/values/strings.xml b/apps/giga-wear/client/src/main/res/values/strings.xml
index fddc304..9e5cc44 100644
--- a/apps/giga-wear/client/src/main/res/values/strings.xml
+++ b/apps/giga-wear/client/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="auth_next">Далее</string>
 
     <!-- Экран входа: шаг кода -->
-    <string name="auth_code_title">Код</string>
+    <string name="auth_code_title">Введите код привязки</string>
     <string name="auth_code_label">%1$d цифр</string>
     <string name="auth_code_counter">%1$d / %2$d</string>
     <string name="auth_submit">Войти</string>