fix: disable loading state and validating state (#1487)

OneKeyHQ · Sep 6, 2022 · 1edc8fd · 1edc8fd
1 parent abebc96
commit 1edc8fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/kit/src/components/NameServiceResolver/index.tsx b/packages/kit/src/components/NameServiceResolver/index.tsx
@@ -74,8 +74,9 @@ export const useNameServiceStatus = () => {
       address: state?.activeAddress,
       disableSubmitBtn: buildDisableStatus,
       name: state?.name,
+      isValid: state?.isValidName,
     }),
-    [state?.activeAddress, buildDisableStatus, state?.name],
+    [state?.activeAddress, buildDisableStatus, state?.name, state?.isValidName],
   );
 };
 

diff --git a/packages/kit/src/views/Send/PreSendAddress.tsx b/packages/kit/src/views/Send/PreSendAddress.tsx
@@ -49,6 +49,7 @@ function PreSendAddress() {
   const {
     onChange: onNameServiceChange,
     disableSubmitBtn,
+    isValid: isValidNameServiceName,
     address: resolvedAddress,
   } = useNameServiceStatus();
 
@@ -162,7 +163,8 @@ function PreSendAddress() {
                         toAddress,
                       );
                     } catch (error0) {
-                      if (disableSubmitBtn) return;
+                      if (isValidNameServiceName && !resolvedAddress)
+                        return undefined;
                       return intl.formatMessage({
                         id: 'form__address_invalid',
                       });