m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Adding "Enable smart contract data" step to Ledger Instructions (Confirmation Screen) (#12115)

Browse Source
This commit is contained in:
ryanml 2021-09-16 09:52:42 -07:00 committed by GitHub
parent 2b104603d5
commit 792f9efa56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/_locales/en/messages.json
View File

@ -1213,6 +1213,9 @@
"ledgerLiveDialogHeader": { "ledgerLiveDialogHeader": {
"message": "Prior to clicking confirm:" "message": "Prior to clicking confirm:"
}, },
"ledgerLiveDialogStepFour": {
"message": "Enable smart contract data on your Ledger device"
},
"ledgerLiveDialogStepOne": { "ledgerLiveDialogStepOne": {
"message": "Enable Use Ledger Live under Settings > Advanced" "message": "Enable Use Ledger Live under Settings > Advanced"
}, },

58
ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
View File

@ -402,45 +402,37 @@ export default class ConfirmTransactionBase extends Component {
</div> </div>
) : null; ) : null;
const renderLedgerLiveStep = (text, show = true) => {
return (
show && (
<Typography
boxProps={{ margin: 0 }}
color={COLORS.PRIMARY3}
fontWeight={FONT_WEIGHT.BOLD}
variant={TYPOGRAPHY.H7}
>
{text}
</Typography>
)
);
};
const ledgerInstructionField = isLedgerAccount ? ( const ledgerInstructionField = isLedgerAccount ? (
<div> <div>
<div className="confirm-detail-row"> <div className="confirm-detail-row">
<Dialog type="message"> <Dialog type="message">
<div className="ledger-live-dialog"> <div className="ledger-live-dialog">
<Typography {renderLedgerLiveStep(t('ledgerLiveDialogHeader'))}
boxProps={{ margin: 0 }} {renderLedgerLiveStep(
color={COLORS.PRIMARY3} `- ${t('ledgerLiveDialogStepOne')}`,
fontWeight={FONT_WEIGHT.BOLD} !isFirefox,
variant={TYPOGRAPHY.H7} )}
> {renderLedgerLiveStep(`- ${t('ledgerLiveDialogStepTwo')}`)}
{t('ledgerLiveDialogHeader')} {renderLedgerLiveStep(`- ${t('ledgerLiveDialogStepThree')}`)}
</Typography> {renderLedgerLiveStep(
{!isFirefox && ( `- ${t('ledgerLiveDialogStepFour')}`,
<Typography Boolean(txData.txParams?.data),
boxProps={{ margin: 0 }}
color={COLORS.PRIMARY3}
fontWeight={FONT_WEIGHT.BOLD}
variant={TYPOGRAPHY.H7}
>
{`- ${t('ledgerLiveDialogStepOne')}`}
</Typography>
)} )}
<Typography
boxProps={{ margin: 0 }}
color={COLORS.PRIMARY3}
fontWeight={FONT_WEIGHT.BOLD}
variant={TYPOGRAPHY.H7}
>
{`- ${t('ledgerLiveDialogStepTwo')}`}
</Typography>
<Typography
boxProps={{ margin: 0 }}
color={COLORS.PRIMARY3}
fontWeight={FONT_WEIGHT.BOLD}
variant={TYPOGRAPHY.H7}
>
{`- ${t('ledgerLiveDialogStepThree')}`}
</Typography>
</div> </div>
</Dialog> </Dialog>
</div> </div>