diff --git a/packages/extension-ui/src/Popup/Signing/Request/SignArea.tsx b/packages/extension-ui/src/Popup/Signing/Request/SignArea.tsx index 3c317914..3cad3330 100644 --- a/packages/extension-ui/src/Popup/Signing/Request/SignArea.tsx +++ b/packages/extension-ui/src/Popup/Signing/Request/SignArea.tsx @@ -17,12 +17,11 @@ interface Props { error: string | null; isExternal?: boolean; isFirst: boolean; - isSignable: boolean; setError: (value: string | null) => void; signId: string; } -function SignArea ({ buttonText, className, error, isExternal, isFirst, isSignable, setError, signId }: Props): JSX.Element { +function SignArea ({ buttonText, className, error, isExternal, isFirst, setError, signId }: Props): JSX.Element { const [savePass, setSavePass] = useState(false); const [isLocked, setIsLocked] = useState(null); const [password, setPassword] = useState(''); @@ -97,7 +96,7 @@ function SignArea ({ buttonText, className, error, isExternal, isFirst, isSignab return ( - {isSignable && isFirst && !isExternal && ( + {isFirst && !isExternal && ( <> {isLocked && ( | null { +export default function Request ({ account: { accountIndex, addressOffset, genesisHash, isExternal, isHardware }, buttonText, isFirst, request, signId, url }: Props): React.ReactElement | null { const onAction = useContext(ActionContext); const [{ hexBytes, payload }, setData] = useState({ hexBytes: null, payload: null }); const [error, setError] = useState(null); @@ -126,7 +126,6 @@ export default function Request ({ account: { accountIndex, addressOffset, isExt error={error} isExternal={isExternal} isFirst={isFirst} - isSignable setError={setError} signId={signId} /> @@ -143,27 +142,39 @@ export default function Request ({ account: { accountIndex, addressOffset, isExt isExternal={isExternal} /> - + {isExternal && !isHardware && genesisHash + ? ( + + ) + : ( + + ) + } - {(isHardware || isExternal) && ( + {isExternal && !isHardware && !genesisHash && ( <> - { - isHardware - ? t('Raw data signing is not supported for hardware wallets.') - : t('Raw data signing is not supported for QR wallets.') - } + {t('"Allow use on any network" is not supported to show a QR code. You must associate this account with a network.')} )} + {isHardware && <> + {t('Message signing is not supported for hardware wallets.')} + + } diff --git a/packages/extension/public/locales/en/translation.json b/packages/extension/public/locales/en/translation.json index 5e8aa67d..645bc8c7 100644 --- a/packages/extension/public/locales/en/translation.json +++ b/packages/extension/public/locales/en/translation.json @@ -161,10 +161,6 @@ "I want to export all my accounts": "", "Notifications": "", "Search by name or network...": "", - "Message signing is not supported for hardware wallets.": "", - "Message signing is not supported for QR wallets.": "", - "Raw data signing is not supported for hardware wallets.": "", - "Raw data signing is not supported for QR wallets.": "", "Select all": "", "Accounts connected to {{url}}": "", "Connect {{total}} account(s)": "", @@ -173,5 +169,6 @@ "Understood": "", "Ask again later": "", "no accounts": "", - "all accounts": "" + "all accounts": "", + "Message signing is not supported for hardware wallets.": "" }