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

Change "Outgoing" to "Sent Ether" or "Sent Token"

Browse Source
This commit is contained in:
Alexander Tseung 2018-08-16 12:46:40 -07:00
parent c06a0be486
commit eb17151ff4
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -903,6 +903,12 @@
"sendTokens": { "sendTokens": {
"message": "Send Tokens" "message": "Send Tokens"
}, },
"sentEther": {
"message": "sent ether"
},
"sentTokens": {
"message": "sent tokens"
},
"separateEachWord": { "separateEachWord": {
"message": "Separate each word with a single space" "message": "Separate each word with a single space"
}, },

8
test/e2e/beta/metamask-beta-ui.spec.js
View File

@ -560,7 +560,7 @@ describe('MetaMask', function () {
driver.wait(async () => { driver.wait(async () => {
const confirmedTxes = await findElements(driver, By.css('.transaction-list__completed-transactions .transaction-list-item')) const confirmedTxes = await findElements(driver, By.css('.transaction-list__completed-transactions .transaction-list-item'))
return confirmedTxes.length === 4 return confirmedTxes.length === 4
}, 10000) }, 15000)
const txValues = await findElements(driver, By.css('.transaction-list-item__amount--secondary')) const txValues = await findElements(driver, By.css('.transaction-list-item__amount--secondary'))
await driver.wait(until.elementTextMatches(txValues[0], /-4\sETH/), 10000) await driver.wait(until.elementTextMatches(txValues[0], /-4\sETH/), 10000)
@ -761,8 +761,8 @@ describe('MetaMask', function () {
return confirmedTxes.length === 1 return confirmedTxes.length === 1
}, 10000) }, 10000)
const txStatuses = await findElements(driver, By.css('.transaction-list-item__action')) const txStatuses = await findElements(driver, By.css('.transaction-list-item__action'))
const tx = await driver.wait(until.elementTextMatches(txStatuses[0], /Outgoing|Failed/), 10000) const tx = await driver.wait(until.elementTextMatches(txStatuses[0], /Sent\sToken|Failed/), 10000)
assert.equal(await tx.getText(), 'Outgoing') assert.equal(await tx.getText(), 'Sent Tokens')
}) })
}) })
@ -842,7 +842,7 @@ describe('MetaMask', function () {
const txValues = await findElements(driver, By.css('.transaction-list-item__amount--primary')) const txValues = await findElements(driver, By.css('.transaction-list-item__amount--primary'))
await driver.wait(until.elementTextMatches(txValues[0], /-7\sTST/)) await driver.wait(until.elementTextMatches(txValues[0], /-7\sTST/))
const txStatuses = await findElements(driver, By.css('.transaction-list-item__action')) const txStatuses = await findElements(driver, By.css('.transaction-list-item__action'))
await driver.wait(until.elementTextMatches(txStatuses[0], /Outgoing/)) await driver.wait(until.elementTextMatches(txStatuses[0], /Sent\sToken/))
const walletBalance = await findElement(driver, By.css('.wallet-balance')) const walletBalance = await findElement(driver, By.css('.wallet-balance'))
await walletBalance.click() await walletBalance.click()

4
ui/app/components/transaction-action/tests/transaction-action.component.test.js
View File

@ -34,7 +34,7 @@ describe('TransactionAction Component', () => {
assert.equal(wrapper.text(), '--') assert.equal(wrapper.text(), '--')
}) })
it('should render Outgoing', () => { it('should render Sent Ether', () => {
const methodData = { data: {}, done: true, error: null } const methodData = { data: {}, done: true, error: null }
const transaction = { const transaction = {
id: 1, id: 1,
@ -58,7 +58,7 @@ describe('TransactionAction Component', () => {
/>, { context: { tOrDefault }}) />, { context: { tOrDefault }})
assert.equal(wrapper.find('.transaction-action').length, 1) assert.equal(wrapper.find('.transaction-action').length, 1)
assert.equal(wrapper.text(), 'outgoing') assert.equal(wrapper.text(), 'sentEther')
}) })
it('should render Approved', () => { it('should render Approved', () => {

4
ui/app/constants/transactions.js
View File

@ -11,10 +11,10 @@ export const TOKEN_METHOD_TRANSFER = 'transfer'
export const TOKEN_METHOD_APPROVE = 'approve' export const TOKEN_METHOD_APPROVE = 'approve'
export const TOKEN_METHOD_TRANSFER_FROM = 'transferfrom' export const TOKEN_METHOD_TRANSFER_FROM = 'transferfrom'
export const SEND_ETHER_ACTION_KEY = 'outgoing' export const SEND_ETHER_ACTION_KEY = 'sentEther'
export const DEPLOY_CONTRACT_ACTION_KEY = 'contractDeployment' export const DEPLOY_CONTRACT_ACTION_KEY = 'contractDeployment'
export const APPROVE_ACTION_KEY = 'approve' export const APPROVE_ACTION_KEY = 'approve'
export const SEND_TOKEN_ACTION_KEY = 'outgoing' export const SEND_TOKEN_ACTION_KEY = 'sentTokens'
export const TRANSFER_FROM_ACTION_KEY = 'transferFrom' export const TRANSFER_FROM_ACTION_KEY = 'transferFrom'
export const SIGNATURE_REQUEST_KEY = 'signatureRequest' export const SIGNATURE_REQUEST_KEY = 'signatureRequest'
export const UNKNOWN_FUNCTION_KEY = 'unknownFunction' export const UNKNOWN_FUNCTION_KEY = 'unknownFunction'