{label}
- {showError && }
+ {showError && }
{!showError && showWarning && }
{customLabelContent}
diff --git a/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js b/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
index 30280e1d007f..8df48bb8b8b3 100644
--- a/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
+++ b/ui/app/components/send/send-content/send-row-wrapper/tests/send-row-wrapper-component.test.js
@@ -11,6 +11,7 @@ describe('SendContent Component', function () {
beforeEach(() => {
wrapper = shallow(
@@ -48,13 +49,16 @@ describe('SendContent Component', function () {
assert(expectedSendRowErrorMessage.is(SendRowErrorMessage))
assert.deepEqual(
expectedSendRowErrorMessage.props(),
- { errorType: 'mockErrorType' }
+ { errorType: 'mockErrorType',
+ customErrors: {mockErrorType: 'mockError'},
+ }
)
})
it('should render its second child as a child of the send-v2__form-field, if it has two children', () => {
wrapper = shallow(
@@ -67,6 +71,7 @@ describe('SendContent Component', function () {
it('should render its first child as the last child of the send-v2__form-label, if it has two children', () => {
wrapper = shallow(
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index 6732010a31a9..ae599d38fdaf 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -142,15 +142,23 @@ WalletView.prototype.render = function () {
let type
if (keyring) {
type = keyring.type
- if (type !== 'HD Key Tree') {
- if (type.toLowerCase().search('hardware') !== -1) {
+ switch (type) {
+ case 'Trezor Hardware':
+ case 'Ledger Hardware':
label = this.context.t('hardware')
- } else {
+ break
+ case 'Simple Key Pair':
label = this.context.t('imported')
- }
+ break
+ case 'External Account':
+ label = this.context.t('external')
+ break
+ default:
+ label = ''
}
}
+
return h('div.wallet-view.flex-column', {
style: {},
className: responsiveDisplayClassname,
diff --git a/ui/app/ducks/confirm-transaction.duck.js b/ui/app/ducks/confirm-transaction.duck.js
index e228d2d3959d..ceec4f5d14d0 100644
--- a/ui/app/ducks/confirm-transaction.duck.js
+++ b/ui/app/ducks/confirm-transaction.duck.js
@@ -43,6 +43,7 @@ const UPDATE_NONCE = createActionType('UPDATE_NONCE')
const UPDATE_TO_SMART_CONTRACT = createActionType('UPDATE_TO_SMART_CONTRACT')
const FETCH_DATA_START = createActionType('FETCH_DATA_START')
const FETCH_DATA_END = createActionType('FETCH_DATA_END')
+const UPDATE_SIGNATURE = createActionType('UPDATE_SIGNATURE')
// Initial state
const initState = {
@@ -65,6 +66,7 @@ const initState = {
nonce: '',
toSmartContract: false,
fetchingData: false,
+ signature: '',
}
// Reducer
@@ -162,6 +164,11 @@ export default function reducer ({ confirmTransaction: confirmState = initState
}
case CLEAR_CONFIRM_TRANSACTION:
return initState
+ case UPDATE_SIGNATURE:
+ return {
+ ...confirmState,
+ signature: action.payload,
+ }
default:
return confirmState
}
@@ -414,3 +421,11 @@ export function clearConfirmTransaction () {
type: CLEAR_CONFIRM_TRANSACTION,
}
}
+
+export function updateSignature (newSignature) {
+ return {
+ type: UPDATE_SIGNATURE,
+ payload: newSignature,
+ }
+}
+
diff --git a/ui/app/ducks/tests/confirm-transaction.duck.test.js b/ui/app/ducks/tests/confirm-transaction.duck.test.js
index eceacd0bd95e..33f0aed459cc 100644
--- a/ui/app/ducks/tests/confirm-transaction.duck.test.js
+++ b/ui/app/ducks/tests/confirm-transaction.duck.test.js
@@ -25,6 +25,7 @@ const initialState = {
nonce: '',
toSmartContract: false,
fetchingData: false,
+ signature: '',
}
const UPDATE_TX_DATA = 'metamask/confirm-transaction/UPDATE_TX_DATA'
diff --git a/ui/app/routes.js b/ui/app/routes.js
index fcf3d3e68a50..4237c76e9e52 100644
--- a/ui/app/routes.js
+++ b/ui/app/routes.js
@@ -12,6 +12,7 @@ const CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE = '/confirm-add-suggested-token'
const NEW_ACCOUNT_ROUTE = '/new-account'
const IMPORT_ACCOUNT_ROUTE = '/new-account/import'
const CONNECT_HARDWARE_ROUTE = '/new-account/connect'
+const EXTERNAL_ACCOUNT_ROUTE = '/new-account/external'
const SEND_ROUTE = '/send'
const NOTICE_ROUTE = '/notice'
const WELCOME_ROUTE = '/welcome'
@@ -51,6 +52,7 @@ module.exports = {
NEW_ACCOUNT_ROUTE,
IMPORT_ACCOUNT_ROUTE,
CONNECT_HARDWARE_ROUTE,
+ EXTERNAL_ACCOUNT_ROUTE,
SEND_ROUTE,
NOTICE_ROUTE,
WELCOME_ROUTE,