diff --git a/packages/kit/src/components/NameServiceResolver/index.tsx b/packages/kit/src/components/NameServiceResolver/index.tsx index fc731bbc945..47f151d5ee3 100644 --- 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 index 2d81ef52baa..6d916044153 100644 --- 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', });