diff --git a/package.json b/package.json index a3c60fbe2c..358c706fff 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "prettier": "prettier './src/**/*.{js,jsx,ts,tsx}'", "release": "electron-builder --mac --linux --windows -p always", "start-mainnet": "REACT_APP_NETWORK=mainnet yarn start", - "start": "react-app-rewired start", + "start": "HTTPS=true react-app-rewired start", "test": "NODE_ENV=test && react-app-rewired test --env=jsdom", "test:coverage": "yarn test --coverage --watchAll=false", "coveralls": "cat ./coverage/lcov.info | coveralls", diff --git a/src/logic/wallets/transactionDataCheck/images/contractData.png b/src/logic/wallets/transactionDataCheck/images/contractData.png new file mode 100644 index 0000000000..441a3de167 Binary files /dev/null and b/src/logic/wallets/transactionDataCheck/images/contractData.png differ diff --git a/src/logic/wallets/transactionDataCheck.ts b/src/logic/wallets/transactionDataCheck/index.ts similarity index 80% rename from src/logic/wallets/transactionDataCheck.ts rename to src/logic/wallets/transactionDataCheck/index.ts index 4ca7235ea2..b4a03bbfbb 100644 --- a/src/logic/wallets/transactionDataCheck.ts +++ b/src/logic/wallets/transactionDataCheck/index.ts @@ -1,15 +1,16 @@ import { loadFromStorage, saveToStorage } from 'src/utils/storage' import { WALLET_PROVIDER } from 'src/logic/wallets/getWeb3' +import contractDataImage from './images/contractData.png' const USER_ENABLED_LEDGER_TX_DATA = 'USER_ENABLED_LEDGER_TX_DATA' function transactionDataCheck(): any { return async (stateAndHelpers) => { const { wallet } = stateAndHelpers const isTransactionDataEnabled = await loadFromStorage(USER_ENABLED_LEDGER_TX_DATA) - if (wallet && wallet.name === WALLET_PROVIDER.LEDGER && !isTransactionDataEnabled) { + if (wallet && wallet.name.toUpperCase() === WALLET_PROVIDER.LEDGER && !isTransactionDataEnabled) { return { heading: 'Allow Transaction Data', // edit modal heading here - description: 'Please allow transaction data on your Ledger device.', // edit modal description that is displayed here. You can include html strings here and they will be rendered as html elements. + description: `

Important: In order to sign transactions with your Ledger device, you will have to activate the "Contract Data" setting in the Ethereum app on your Ledger.

`, // edit modal description that is displayed here. You can include html strings here and they will be rendered as html elements. eventCode: 'allowTransactionData', button: { text: 'Done',