From f528c7e72b9223c4fd3b23f2f903658bab8245d4 Mon Sep 17 00:00:00 2001
From: v-almonacid <ealmonacid@gmail.com>
Date: Wed, 16 Sep 2020 23:16:12 +0200
Subject: [PATCH] fix delegation confirm. ui bug

---
 .../Delegation/DelegationConfirmation.js      | 26 +++++++++++--------
 src/components/Receive/AddressView.js         |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/Delegation/DelegationConfirmation.js b/src/components/Delegation/DelegationConfirmation.js
index 939a71c6c8..44925be2e6 100644
--- a/src/components/Delegation/DelegationConfirmation.js
+++ b/src/components/Delegation/DelegationConfirmation.js
@@ -245,7 +245,7 @@ const DelegationConfirmation = ({
   const reward = approximateReward(amountToDelegate)
 
   const isConfirmationDisabled =
-    (!isEasyConfirmationEnabled && !password) || processingTx
+    (!isEasyConfirmationEnabled && !password && !isHW) || processingTx
 
   return (
     <View style={styles.container}>
@@ -276,16 +276,20 @@ const DelegationConfirmation = ({
             label={intl.formatMessage(txLabels.amount)}
           />
         </View>
-        {!isEasyConfirmationEnabled && (
-          <View style={styles.input}>
-            <ValidatedTextInput
-              secureTextEntry
-              value={password}
-              label={intl.formatMessage(txLabels.password)}
-              onChangeText={setPassword}
-            />
-          </View>
-        )}
+        {/* eslint-disable indent */
+        !isEasyConfirmationEnabled &&
+          !isHW && (
+            <View style={styles.input}>
+              <ValidatedTextInput
+                secureTextEntry
+                value={password}
+                label={intl.formatMessage(txLabels.password)}
+                onChangeText={setPassword}
+              />
+            </View>
+          )
+        /* eslint-enable indent */
+        }
         <View style={styles.itemBlock}>
           <Text style={styles.itemTitle}>
             {intl.formatMessage(messages.rewardsExplanation)}
diff --git a/src/components/Receive/AddressView.js b/src/components/Receive/AddressView.js
index d53e3c3702..2abdeb3831 100644
--- a/src/components/Receive/AddressView.js
+++ b/src/components/Receive/AddressView.js
@@ -67,7 +67,7 @@ const _handleOnVerifyAddress = async (
       )
     } catch (e) {
       if (e instanceof LocalizableError) {
-        await showErrorDialog(errorMessages.hwConnectionError, intl, {
+        await showErrorDialog(errorMessages.generalLocalizableError, intl, {
           message: intl.formatMessage({
             id: e.id,
             defaultMessage: e.defaultMessage,