Merge pull request #758 from soramitsu/fixes/pankra

fixes/pankra
soramitsu · Nov 25, 2022 · 9f224bf · 9f224bf
2 parents 3a7e3b5 + 56222d1
commit 9f224bf
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/common/src/main/java/jp/co/soramitsu/common/compose/component/FeeInfo.kt b/common/src/main/java/jp/co/soramitsu/common/compose/component/FeeInfo.kt
@@ -49,9 +49,6 @@ fun FeeInfo(state: FeeInfoViewState, modifier: Modifier = Modifier) {
                 .align(CenterVertically)
         )
         Column(modifier = Modifier.weight(1f)) {
-            state.feeAmountFiat?.let {
-                B2(text = it, color = black2, textAlign = TextAlign.End, modifier = Modifier.align(Alignment.End))
-            }
             state.feeAmount?.let {
                 CapsTitle(text = it, textAlign = TextAlign.End, modifier = Modifier.align(Alignment.End))
             } ?: Shimmer(
@@ -60,6 +57,9 @@ fun FeeInfo(state: FeeInfoViewState, modifier: Modifier = Modifier) {
                     .width(100.dp)
                     .align(Alignment.End)
             )
+            state.feeAmountFiat?.let {
+                B2(text = it, color = black2, textAlign = TextAlign.End, modifier = Modifier.align(Alignment.End))
+            }
         }
     }
 }

diff --git a/...mpl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/send/setup/SendSetupContent.kt b/...mpl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/send/setup/SendSetupContent.kt
@@ -130,6 +130,15 @@ fun SendSetupContent(
                 FeeInfo(state = state.feeInfoState)
 
                 Spacer(modifier = Modifier.weight(1f))
+            }
+
+            val isSoftKeyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0
+            val showQuickInput = state.amountInputState.isFocused && isSoftKeyboardOpen
+            Column(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .imePadding()
+            ) {
                 LazyRow(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterHorizontally)
@@ -149,22 +158,15 @@ fun SendSetupContent(
                         .fillMaxWidth()
                         .height(48.dp)
                 )
-
                 MarginVertical(margin = 12.dp)
-            }
-
-            val isSoftKeyboardOpen = WindowInsets.ime.getBottom(LocalDensity.current) > 0
-            val showQuickInput = state.amountInputState.isFocused && isSoftKeyboardOpen
-            if (showQuickInput) {
-                QuickAmountInput(
-                    modifier = Modifier
-                        .align(Alignment.BottomCenter)
-                        .imePadding(),
-                    onQuickAmountInput = {
-                        keyboardController?.hide()
-                        callback.onQuickAmountInput(it)
-                    }
-                )
+                if (showQuickInput) {
+                    QuickAmountInput(
+                        onQuickAmountInput = {
+                            keyboardController?.hide()
+                            callback.onQuickAmountInput(it)
+                        }
+                    )
+                }
             }
         }
     }

diff --git a/...l/src/main/java/jp/co/soramitsu/wallet/impl/presentation/send/setup/SendSetupViewModel.kt b/...l/src/main/java/jp/co/soramitsu/wallet/impl/presentation/send/setup/SendSetupViewModel.kt
@@ -300,7 +300,7 @@ class SendSetupViewModel @Inject constructor(
         val amountInPlanks = asset?.token?.planksFromAmount(amount).orZero()
         ButtonViewState(
             text = resourceManager.getString(R.string.common_continue),
-            enabled = true
+            enabled = amountInPlanks.compareTo(BigInteger.ZERO) != 0
         )
     }.stateIn(viewModelScope, SharingStarted.Eagerly, defaultButtonState)
 
@@ -386,7 +386,12 @@ class SendSetupViewModel @Inject constructor(
     }
 
     override fun onNextClick() {
-        onNextStep()
+        val amount = enteredAmountFlow.value.toBigDecimalOrNull().orZero()
+        isValid(amount).fold({
+            onNextStep()
+        }, {
+            showError(it)
+        })
     }
 
     private val validations = listOf(

diff --git a/...c/main/java/jp/co/soramitsu/wallet/impl/presentation/send/success/SendSuccessViewModel.kt b/...c/main/java/jp/co/soramitsu/wallet/impl/presentation/send/success/SendSuccessViewModel.kt
@@ -73,7 +73,7 @@ class SendSuccessViewModel @Inject constructor(
         TitleValueViewState(
             title = resourceManager.getString(R.string.hash),
             value = operationHash?.shorten(),
-            clickState = TitleValueViewState.ClickState(R.drawable.ic_arrow_top_right_white_16, SendSuccessViewState.CODE_HASH_CLICK)
+            clickState = TitleValueViewState.ClickState(R.drawable.ic_copy_filled_24, SendSuccessViewState.CODE_HASH_CLICK)
         )
     )