Fix AddWalletScreen for small displays

Fix success message on feedback submission

Author: angelix

common/src/commonMain/kotlin/com/blockstream/common/models/support/SupportViewModel.kt

@@ -2,11 +2,12 @@ package com.blockstream.common.models.support
 
 import blockstream_green.common.generated.resources.Res
 import blockstream_green.common.generated.resources.id_contact_support
+import blockstream_green.common.generated.resources.id_thank_you_for_your_feedback
 import blockstream_green.common.generated.resources.id_thanks_your_message_has_been_sent
 import com.blockstream.common.SupportType
-import com.blockstream.common.data.SupportData
 import com.blockstream.common.data.GreenWallet
 import com.blockstream.common.data.NavData
+import com.blockstream.common.data.SupportData
 import com.blockstream.common.events.Event
 import com.blockstream.common.events.Events
 import com.blockstream.common.extensions.isNotBlank
@@ -98,7 +99,7 @@ class SupportViewModel(type: SupportType, supportData: SupportData, greenWalletO
                 autoRetry = false
             )
         }, onSuccess = {
-            postSideEffect(SideEffects.Snackbar(text = StringHolder.create(Res.string.id_thanks_your_message_has_been_sent)))
+            postSideEffect(SideEffects.Snackbar(text = StringHolder.create(if (type == SupportType.FEEDBACK) Res.string.id_thank_you_for_your_feedback else Res.string.id_thanks_your_message_has_been_sent)))
             postSideEffect(SideEffects.NavigateBack())
         })
     }

compose/src/commonMain/kotlin/com/blockstream/compose/screens/onboarding/phone/AddWalletScreen.kt

@@ -4,7 +4,8 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Text
@@ -60,7 +61,7 @@ fun AddWalletScreen(
 ) {
 
     EnvironmentBottomSheet.getResult {
-        if(it >= 0) {
+        if (it >= 0) {
             viewModel.postEvent(
                 AddWalletViewModel.LocalEvents.SelectEnviroment(
                     isTestnet = it == 1,
@@ -74,15 +75,14 @@ fun AddWalletScreen(
 
     Column(
         modifier = Modifier
-            .fillMaxWidth()
-            .fillMaxHeight(),
+            .fillMaxSize(),
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.SpaceEvenly
     ) {
 
         Box(
             modifier = Modifier
-                .weight(6f)
+                .weight(2f)
                 .padding(horizontal = 24.dp),
         ) {
             Image(
@@ -102,7 +102,6 @@ fun AddWalletScreen(
 
         GreenColumn(
             space = 8,
-            modifier = Modifier.padding(horizontal = 0.dp).weight(4f),
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Text(
@@ -118,32 +117,32 @@ fun AddWalletScreen(
             )
         }
 
-        Column {
-            GreenColumn(
-                padding = 24,
-                modifier = Modifier,
-                horizontalAlignment = Alignment.CenterHorizontally,
-            ) {
+        Spacer(modifier = Modifier.weight(1f))
+
+        GreenColumn(
+            padding = 0,
+            modifier = Modifier.padding(horizontal = 24.dp).padding(bottom = 24.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
 
-                GreenButton(
-                    stringResource(Res.string.id_new_wallet),
-                    modifier = Modifier.fillMaxWidth(),
-                    size = GreenButtonSize.BIG,
-                ) {
-                    viewModel.postEvent(AddWalletViewModel.LocalEvents.NewWallet)
-                }
-
-                GreenButton(
-                    stringResource(Res.string.id_restore_wallet),
-                    modifier = Modifier.fillMaxWidth(),
-                    type = GreenButtonType.OUTLINE,
-                    color = GreenButtonColor.WHITE,
-                    size = GreenButtonSize.BIG,
-                ) {
-                    viewModel.postEvent(AddWalletViewModel.LocalEvents.RestoreWallet)
-                }
+            GreenButton(
+                stringResource(Res.string.id_new_wallet),
+                modifier = Modifier.fillMaxWidth(),
+                size = GreenButtonSize.BIG,
+            ) {
+                viewModel.postEvent(AddWalletViewModel.LocalEvents.NewWallet)
+            }
 
+            GreenButton(
+                stringResource(Res.string.id_restore_wallet),
+                modifier = Modifier.fillMaxWidth(),
+                type = GreenButtonType.OUTLINE,
+                color = GreenButtonColor.WHITE,
+                size = GreenButtonSize.BIG,
+            ) {
+                viewModel.postEvent(AddWalletViewModel.LocalEvents.RestoreWallet)
             }
+
         }
     }