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

Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist

Browse Source
This commit is contained in:
Dan 2018-03-30 00:00:31 -02:30
commit 717623e2e3
87 changed files with 1036 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.circleci/config.yml
View File

@ -141,6 +141,9 @@ jobs:
- run:
name: Test
command: npm run test:e2e
- store_artifacts:
path: test-artifacts
destination: test-artifacts
test-unit:
docker:

2
.gitignore vendored
View File

@ -28,6 +28,8 @@ test/background.js
test/bundle.js
test/test-bundle.js
test-artifacts
#ignore css output and sourcemaps
ui/app/css/output/

2
CHANGELOG.md
View File

@ -3,6 +3,8 @@
## Current Master
- Fix bug where the "Reset account" feature would not clear the network cache.
- Increase maximum gas limit, to allow very gas heavy transactions, since block gas limits have been stable.
- Allow user to select language on settings page
## 4.4.0 Mon Mar 26 2018

63
app/_locales/de/messages.json
View File

@ -14,9 +14,15 @@
"address": {
"message": "Adresse"
},
"addCustomToken": {
"message": "Eigenen Token hinzufügen"
},
"addToken": {
"message": "Token hinzufügen"
},
"addTokens": {
"message": "Token hinzufügen"
},
"amount": {
"message": "Betrag"
},
@ -31,9 +37,15 @@
"message": "MetaMask",
"description": "Der Name der Erweiterung"
},
"approved": {
"message": "Genehmigt"
},
"attemptingConnect": {
"message": "Versuch mit der Blockchain zu verbinden."
},
"attributions": {
"message": "Was wir verwenden"
},
"available": {
"message": "Verfügbar"
},
@ -43,6 +55,9 @@
"balance": {
"message": "Guthaben:"
},
"balances": {
"message": "Deine Guthaben"
},
"balanceIsInsufficientGas": {
"message": "Guthaben unzureichend für den aktuellen gesamten Gasbetrag"
},
@ -69,7 +84,7 @@
"message": "Auf Coinbase kaufen"
},
"buyCoinbaseExplainer": {
"message": "Coinbase ist die weltweit bekannteste Möglichkeit bitcoin, ethereum und litecoin zu kaufen und verkaufen."
"message": "Coinbase ist die weltweit bekannteste Art und Weise um bitcoin, ethereum und litecoin zu kaufen und verkaufen."
},
"ok": {
"message": "Ok"
@ -105,7 +120,7 @@
"message": "Zu Coinbase fortfahren"
},
"contractDeployment": {
"message": "Smart Contract ausführen"
"message": "Smart Contract Ausführung"
},
"conversionProgress": {
"message": "Umtausch in Arbeit"
@ -148,7 +163,7 @@
"description": "Börsentyp (Kryptowährungen)"
},
"currentConversion": {
"message": "Aktueller Umtausch"
"message": "Aktuelle Tauschwährung"
},
"currentNetwork": {
"message": "Aktuelles Netzwerk"
@ -185,7 +200,7 @@
"description": "Teilt dem Benutzer mit welchen Token er beim Einzahlen mit Shapeshift ausgewählt hat"
},
"depositEth": {
"message": "Eth einzahlen"
"message": "Eth kaufen"
},
"depositEther": {
"message": "Ether einzahlen"
@ -274,7 +289,7 @@
"message": "Folge uns auf Twitter"
},
"from": {
"message": "von"
"message": "Von"
},
"fromToSame": {
"message": "Ziel- und Ursprungsadresse dürfen nicht identisch sein"
@ -347,14 +362,14 @@
"message": "Es erlaubt dir ether & Token zu halten und dient dir als Verbindung zu dezentralisierten Applikationen."
},
"import": {
"message": "Import",
"message": "Importieren",
"description": "Button um den Account aus einer ausgewählten Datei zu importieren"
},
"importAccount": {
"message": "Account importieren"
},
"importAccountMsg": {
"message":" Importierte Accounts werden nicht mit der Seed Wörterfolge deines ursprünglichen MetaMask Accounts verknüpft. Erfahre mehr über importierte Accounts."
"message":" Importierte Accounts werden nicht mit der Seed-Wörterfolge deines ursprünglichen MetaMask Accounts verknüpft. Erfahre mehr über importierte Accounts."
},
"importAnAccount": {
"message": "Einen Account importieren"
@ -369,7 +384,7 @@
"infoHelp": {
"message": "Info & Hilfe"
},
"insufficientFunds": {
"insufficientFunds": {
"message": "Nicht genügend Guthaben."
},
"insufficientTokens": {
@ -441,10 +456,10 @@
"message": "Frei"
},
"loweCaseWords": {
"message": "Die Wörter der Seed Wörterfolgen sind alle kleingeschrieben"
"message": "Die Wörter der Seed-Wörterfolgen sind alle kleingeschrieben"
},
"mainnet": {
"message": "Ethereum Hauptnetzwerk (Main Net)"
"message": "Ethereum Main Net"
},
"message": {
"message": "Nachricht"
@ -541,7 +556,7 @@
"description": "Für den Import eine Accounts mit Hilfe eines Private Keys"
},
"pasteSeed": {
"message": "Füge deine Seed Wörterfolge hier ein!"
"message": "Füge deine Seed-Wörterfolge hier ein!"
},
"personalAddressDetected": {
"message": "Personalisierte Adresse identifiziert. Bitte füge die Token Contract Adresse ein."
@ -557,7 +572,7 @@
"description": "Wähle diesen Dateityp um damit einen Account zu importieren"
},
"privateKeyWarning": {
"message": "Warnung: Niemals jemanden deinen Private Key mitteilen. Jeder der im Besitz deines Private Keys ist, kann jegliches Guthaben deines Accounts stehlen."
"message": "Warnung: Niemals jemanden deinen Private Key mitteilen. Jeder der im Besitz deines Private Keys ist, kann jegliches Guthaben deines Accounts stehlen."
},
"privateNetwork": {
"message": "Privates Netzwerk"
@ -566,7 +581,7 @@
"message": "QR Code anzeigen"
},
"readdToken": {
"message": "Du kannst diesen Token zukünftig wieder hinzufügen indem du in den Menüpunkt \"Token hinzufügen\" in den Einstellungen deines Accounts gehst."
"message": "Du kannst diesen Token immer erneut hinzufügen, indem du in den Menüpunkt \"Token hinzufügen\" in den Einstellungen deines Accounts gehst."
},
"readMore": {
"message": "Hier mehr erfahren."
@ -590,7 +605,7 @@
"message": "Account zurücksetzten"
},
"restoreFromSeed": {
"message": "Mit Hilfe der Seed Wörterfolge wiederherstellen."
"message": "Mit Hilfe der Seed-Wörterfolge wiederherstellen."
},
"restoreVault": {
"message": "Vault wiederherstellen"
@ -605,13 +620,13 @@
"message": "Wallet Seed"
},
"revealSeedWords": {
"message": "Seed Wörterfolge anzeigen"
"message": "Seed-Wörterfolge anzeigen"
},
"revealSeedWordsWarning": {
"message": "Bitte niemals deine Seed Wörterfolge an einem öffentlichen Ort kenntlich machen. Mit diesen Wörtern können alle deine Accounts gestohlen werden."
"message": "Bitte niemals deine Seed-Wörterfolge an einem öffentlichen Ort kenntlich machen. Mit diesen Wörtern können alle deine Accounts gestohlen werden."
},
"revert": {
"message": "Zurück gehen"
"message": "Rückgängig machen"
},
"rinkeby": {
"message": "Rinkeby Testnetzwerk"
@ -623,7 +638,7 @@
"message": "Aktueller RPC"
},
"connectingToMainnet": {
"message": "Verbinde zum Ethereum Hauptnetzwerk (Main Net)"
"message": "Verbinde zum Ethereum Main Net"
},
"connectingToRopsten": {
"message": " Verbinde zum Ropsten Testnetzwerk"
@ -649,7 +664,7 @@
"description": "Prozess des Exportieren eines Accounts"
},
"saveSeedAsFile": {
"message": "Seed Wörterfolge als Datei speichern"
"message": "Seed-Wörterfolge als Datei speichern"
},
"search": {
"message": "Suche"
@ -661,7 +676,7 @@
"message": "Neues Passwort (min. 8 Zeichen)"
},
"seedPhraseReq": {
"message": "Seed Wörterfolgen bestehen aus 12 Wörtern"
"message": "Seed-Wörterfolgen bestehen aus 12 Wörtern"
},
"select": {
"message": "Auswählen"
@ -685,7 +700,7 @@
"message": "Token senden"
},
"onlySendToEtherAddress": {
"message": "ETH nur zu einer Ethereum Adresse senden."
"message": "ETH unbedingt nur zu einer Ethereum Adresse senden."
},
"sendTokensAnywhere": {
"message": "Token zu einer beliebigen Person mit einem Ethereumaccount senden"
@ -742,7 +757,7 @@
"message": "Einreichen"
},
"submitted": {
"message": "Eingereicht"
"message": "Abgeschickt"
},
"supportCenter": {
"message": "Gehe zu unserem Support Center"
@ -782,7 +797,7 @@
"message": "Tokensymbol"
},
"tokenWarning1": {
"message": "Behalte die Token die du mit deinem MetaMask Account gekauft hast im Auge. Wenn du Token mit einem anderen Account gekauft hast, werden diese hier nicht angezeigt."
"message": "Behalte die Token die du mit deinem MetaMask Account gekauft hast im Blick. Wenn du Token mit einem anderen Account gekauft hast, werden diese hier nicht angezeigt."
},
"total": {
"message": "Gesamt"
@ -853,7 +868,7 @@
"message": " Account einsehen"
},
"visitWebSite": {
"message": "Gehe zu unsere Webseite"
"message": "Gehe zu unserer Webseite"
},
"warning": {
"message": "Warnung"

16
app/_locales/nl/messages.json
View File

@ -299,7 +299,7 @@
"message": "De gaslimiet moet minstens 21000 zijn"
},
"generatingSeed": {
"message": "Zaad produceren ..."
"message": "Back-up woorden produceren ..."
},
"gasPrice": {
"message": "Gasprijs (GWEI)"
@ -432,7 +432,7 @@
"message": "Los"
},
"loweCaseWords": {
"message": "zaadwoorden hebben alleen kleine letters"
"message": "back-up woorden hebben alleen kleine letters"
},
"mainnet": {
"message": "belangrijkste ethereum-netwerk"
@ -532,7 +532,7 @@
"description": "Voor het importeren van een account vanaf een privésleutel"
},
"pasteSeed": {
"message": "Plak je zaadzin hier!"
"message": "Plak je back-up woorden hier!"
},
"personalAddressDetected": {
"message": "Persoonlijk adres gedetecteerd. Voer het tokencontractadres in."
@ -581,7 +581,7 @@
"message": "Account opnieuw instellen"
},
"restoreFromSeed": {
"message": "Herstel van zaaduitdrukking"
"message": "Herstel vanuit back-up woorden"
},
"required": {
"message": "Verplicht"
@ -590,10 +590,10 @@
"message": "Probeer hier opnieuw met een hogere gasprijs"
},
"revealSeedWords": {
"message": "Onthul zaadwoorden"
"message": "Onthul back-up woorden"
},
"revealSeedWordsWarning": {
"message": "Herstel je zaadwoorden niet op een openbare plaats! Deze woorden kunnen worden gebruikt om al uw accounts te stelen."
"message": "Zorg dat je back-up woorden niet op een openbare plaats bekijkt! Deze woorden kunnen worden gebruikt om al uw accounts opnieuw te genereren (en dus uw account te stelen)."
},
"revert": {
"message": "terugkeren"
@ -616,7 +616,7 @@
"description": "Account export proces"
},
"saveSeedAsFile": {
"message": "Bewaar zaadwoorden als bestand"
"message": "Bewaar back-up woorden als bestand"
},
"search": {
"message": "Zoeken"
@ -625,7 +625,7 @@
"message": "Voer hier je geheime twaalfwoordfrase in om je kluis te herstellen."
},
"seedPhraseReq": {
"message": "zaadzinnen zijn 12 woorden lang"
"message": "Back-up woorden zijn 12 woorden lang"
},
"select": {
"message": "kiezen"

2
app/scripts/controllers/currency.js
View File

@ -52,7 +52,7 @@ class CurrencyController {
this.setConversionDate(Number(parsedResponse.timestamp))
}).catch((err) => {
if (err) {
console.warn('MetaMask - Failed to query currency conversion.')
console.warn(`MetaMask - Failed to query currency conversion:`, currentCurrency, err)
this.setConversionRate(0)
this.setConversionDate('N/A')
}

10
app/scripts/controllers/transactions.js
View File

@ -250,7 +250,7 @@ module.exports = class TransactionController extends EventEmitter {
// wait for a nonce
nonceLock = await this.nonceTracker.getNonceLock(fromAddress)
// add nonce to txParams
// if txMeta has lastGasPrice then it is a retry at same nonce with higher
// if txMeta has lastGasPrice then it is a retry at same nonce with higher
// gas price transaction and their for the nonce should not be calculated
const nonce = txMeta.lastGasPrice ? txMeta.txParams.nonce : nonceLock.nextNonce
txMeta.txParams.nonce = ethUtil.addHexPrefix(nonce.toString(16))
@ -273,12 +273,14 @@ module.exports = class TransactionController extends EventEmitter {
async signTransaction (txId) {
const txMeta = this.txStateManager.getTx(txId)
const txParams = txMeta.txParams
const fromAddress = txParams.from
// add network/chain id
txParams.chainId = ethUtil.addHexPrefix(this.getChainId().toString(16))
const chainId = this.getChainId()
const txParams = Object.assign({}, txMeta.txParams, { chainId })
// sign tx
const fromAddress = txParams.from
const ethTx = new Transaction(txParams)
await this.signEthTx(ethTx, fromAddress)
// set state to signed
this.txStateManager.setTxStatusSigned(txMeta.id)
const rawTx = ethUtil.bufferToHex(ethTx.serialize())
return rawTx

5
app/scripts/lib/nonce-tracker.js
View File

@ -31,14 +31,13 @@ class NonceTracker {
const networkNonceResult = await this._getNetworkNextNonce(address)
const highestLocallyConfirmed = this._getHighestLocallyConfirmed(address)
const nextNetworkNonce = networkNonceResult.nonce
const highestLocalNonce = highestLocallyConfirmed
const highestSuggested = Math.max(nextNetworkNonce, highestLocalNonce)
const highestSuggested = Math.max(nextNetworkNonce, highestLocallyConfirmed)
const pendingTxs = this.getPendingTransactions(address)
const localNonceResult = this._getHighestContinuousFrom(pendingTxs, highestSuggested) || 0
nonceDetails.params = {
highestLocalNonce,
highestLocallyConfirmed,
highestSuggested,
nextNetworkNonce,
}

14
app/scripts/lib/setupRaven.js
View File

@ -23,10 +23,20 @@ function setupRaven(opts) {
release,
transport: function(opts) {
const report = opts.data
// simplify ethjs error messages
// simplify certain complex error messages
report.exception.values.forEach(item => {
item.value = extractEthjsErrorMessage(item.value)
let errorMessage = item.value
// simplify ethjs error messages
errorMessage = extractEthjsErrorMessage(errorMessage)
// simplify 'Transaction Failed: known transaction'
if (errorMessage.indexOf('Transaction Failed: known transaction') === 0) {
// cut the hash from the error message
errorMessage = 'Transaction Failed: known transaction'
}
// finalize
item.value = errorMessage
})
// modify report urls
rewriteReportUrls(report)
// make request normally

16
app/scripts/lib/tx-state-manager.js
View File

@ -106,12 +106,9 @@ module.exports = class TransactionStateManager extends EventEmitter {
}
updateTx (txMeta, note) {
// validate txParams
if (txMeta.txParams) {
Object.keys(txMeta.txParams).forEach((key) => {
const value = txMeta.txParams[key]
if (typeof value !== 'string') console.error(`${key}: ${value} in txParams is not a string`)
if (!ethUtil.isHexPrefixed(value)) console.error('is not hex prefixed, anything on txParams must be hex prefixed')
})
this.validateTxParams(txMeta.txParams)
}
// create txMeta snapshot for history
@ -139,6 +136,15 @@ module.exports = class TransactionStateManager extends EventEmitter {
this.updateTx(txMeta, `txStateManager#updateTxParams`)
}
// validates txParams members by type
validateTxParams(txParams) {
Object.keys(txParams).forEach((key) => {
const value = txParams[key]
if (typeof value !== 'string') throw new Error(`${key}: ${value} in txParams is not a string`)
if (!ethUtil.isHexPrefixed(value)) throw new Error('is not hex prefixed, everything on txParams must be hex prefixed')
})
}
/*
Takes an object of fields to search for eg:
let thingsToLookFor = {

6
old-ui/app/components/pending-tx.js
View File

@ -62,8 +62,8 @@ PendingTx.prototype.render = function () {
const gasBn = hexToBn(gas)
// default to 8MM gas limit
const gasLimit = new BN(parseInt(blockGasLimit) || '8000000')
const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20)
const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20)
const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 99, 100)
const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 98, 100)
const safeGasLimit = safeGasLimitBN.toString(10)
// Gas Price
@ -311,7 +311,7 @@ PendingTx.prototype.render = function () {
style: {
fontSize: '0.9em',
},
}, 'Gas limit set dangerously high. Approving this transaction is likely to fail.')
}, 'Gas limit set dangerously high. Approving this transaction is liable to fail.')
: null,
]),

86
package-lock.json generated
View File

@ -224,6 +224,15 @@
}
}
},
"@sinonjs/formatio": {
"version": "2.0.0",
"resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
"integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
"dev": true,
"requires": {
"samsam": "1.3.0"
}
},
"@types/node": {
"version": "8.5.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.5.tgz",
@ -5202,12 +5211,20 @@
"dev": true
},
"eslint-plugin-mocha": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-4.11.0.tgz",
"integrity": "sha1-kRk6L1XiCl41l0BUoAidMBmO5Xg=",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-mocha/-/eslint-plugin-mocha-5.0.0.tgz",
"integrity": "sha512-mpRWWsjxRco2bY4qE5DL8SmGoVF0Onb6DZrbgOjFoNo1YNN299K2voIozd8Kce3qC/neWNr2XF27E1ZDMl1yZg==",
"dev": true,
"requires": {
"ramda": "0.24.1"
"ramda": "0.25.0"
},
"dependencies": {
"ramda": {
"version": "0.25.0",
"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.25.0.tgz",
"integrity": "sha512-GXpfrYVPwx3K7RQ6aYT8KPS8XViSXUVJT1ONhoKPE9VAleW42YE+U+8VEyGWt41EnEQW7gwecYJriTI0pKoecQ==",
"dev": true
}
}
},
"eslint-plugin-react": {
@ -6090,12 +6107,12 @@
}
},
"ethjs-query": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.2.tgz",
"integrity": "sha1-9IikjOGZTNTHfsy3tSkCxvKc/YU=",
"version": "0.3.4",
"resolved": "https://registry.npmjs.org/ethjs-query/-/ethjs-query-0.3.4.tgz",
"integrity": "sha512-RkeLtBwuXJkBIf/U+Az0GOT203UiBLmN7WA6WZIwSTbmhH2yNicggwaWKvN3TOtpErOsXnzYTZp82mElHdORUQ==",
"requires": {
"ethjs-format": "0.2.4",
"ethjs-rpc": "0.1.8"
"ethjs-format": "0.2.5",
"ethjs-rpc": "0.1.9"
},
"dependencies": {
"bn.js": {
@ -6104,12 +6121,12 @@
"integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU="
},
"ethjs-format": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/ethjs-format/-/ethjs-format-0.2.4.tgz",
"integrity": "sha1-W7vESlrSTmirOTMS/5A5pztlv4E=",
"version": "0.2.5",
"resolved": "https://registry.npmjs.org/ethjs-format/-/ethjs-format-0.2.5.tgz",
"integrity": "sha1-RPMKvuF7B01xYtLIhqv/0GWCiSU=",
"requires": {
"bn.js": "4.11.6",
"ethjs-schema": "0.1.9",
"ethjs-schema": "0.2.0",
"ethjs-util": "0.1.3",
"is-hex-prefixed": "1.0.0",
"number-to-bn": "1.7.0",
@ -6117,9 +6134,14 @@
}
},
"ethjs-rpc": {
"version": "0.1.8",
"resolved": "https://registry.npmjs.org/ethjs-rpc/-/ethjs-rpc-0.1.8.tgz",
"integrity": "sha1-FnZ0DkHHIoGWpxGJ0z8VychbWZ0="
"version": "0.1.9",
"resolved": "https://registry.npmjs.org/ethjs-rpc/-/ethjs-rpc-0.1.9.tgz",
"integrity": "sha512-KJqT7cgTeCJQ2RY1AlVmTZVnKIUXMPg+niPN5VJKwRSzpjgfr3LTVHlGbkRCqZtOMDi0ogB2vHZaRQiZBXZTUg=="
},
"ethjs-schema": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/ethjs-schema/-/ethjs-schema-0.2.0.tgz",
"integrity": "sha1-B7RtT1W3kqhGyQp58zDTHREsyjg="
},
"ethjs-util": {
"version": "0.1.3",
@ -12459,9 +12481,9 @@
"integrity": "sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ="
},
"lolex": {
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.1.tgz",
"integrity": "sha512-mQuW55GhduF3ppo+ZRUTz1PRjEh1hS5BbqU7d8D0ez2OKxHDod7StPPeAVKisZR5aLkHZjdGWSL42LSONUJsZw==",
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-2.3.2.tgz",
"integrity": "sha512-A5pN2tkFj7H0dGIAM6MFvHKMJcPnjZsOMvR7ujCjfgW5TbV6H9vb1PgxLtHvjqNZTHsUolz+6/WEO0N1xNx2ng==",
"dev": true
},
"longest": {
@ -13646,14 +13668,14 @@
"dev": true
},
"nise": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/nise/-/nise-1.2.0.tgz",
"integrity": "sha512-q9jXh3UNsMV28KeqI43ILz5+c3l+RiNW8mhurEwCKckuHQbL+hTJIKKTiUlCPKlgQ/OukFvSnKB/Jk3+sFbkGA==",
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/nise/-/nise-1.3.2.tgz",
"integrity": "sha512-KPKb+wvETBiwb4eTwtR/OsA2+iijXP+VnlSFYJo3EHjm2yjek1NWxHOUQat3i7xNLm1Bm18UA5j5Wor0yO2GtA==",
"dev": true,
"requires": {
"formatio": "1.2.0",
"@sinonjs/formatio": "2.0.0",
"just-extend": "1.1.27",
"lolex": "1.6.0",
"lolex": "2.3.2",
"path-to-regexp": "1.7.0",
"text-encoding": "0.6.4"
},
@ -13664,12 +13686,6 @@
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
"dev": true
},
"lolex": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz",
"integrity": "sha1-OpoCg0UqR9dDnnJzG54H1zhuSfY=",
"dev": true
},
"path-to-regexp": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
@ -18695,16 +18711,16 @@
"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
},
"sinon": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-4.1.3.tgz",
"integrity": "sha512-c7u0ZuvBRX1eXuB4jN3BRCAOGiUTlM8SE3TxbJHrNiHUKL7wonujMOB6Fi1gQc00U91IscFORQHDga/eccqpbw==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/sinon/-/sinon-5.0.0.tgz",
"integrity": "sha512-dMX7ZB2E1iQ5DOEOePoNJQp03uyhdMfb+kLXlNPbquv2FwfezD+0GbbHSgCw4MFhpSSS9NMoYJfOPMjCMJtXWA==",
"dev": true,
"requires": {
"diff": "3.3.1",
"formatio": "1.2.0",
"lodash.get": "4.4.2",
"lolex": "2.3.1",
"nise": "1.2.0",
"lolex": "2.3.2",
"nise": "1.3.2",
"supports-color": "4.5.0",
"type-detect": "4.0.5"
},

4
package.json
View File

@ -109,7 +109,7 @@
"ethjs": "^0.2.8",
"ethjs-contract": "^0.1.9",
"ethjs-ens": "^2.0.0",
"ethjs-query": "^0.3.1",
"ethjs-query": "^0.3.4",
"express": "^4.15.5",
"extension-link-enabler": "^1.0.0",
"extensionizer": "^1.0.0",
@ -144,6 +144,7 @@
"obs-store": "^3.0.0",
"once": "^1.3.3",
"percentile": "^1.2.0",
"pify": "^3.0.0",
"ping-pong-stream": "^1.0.0",
"pojo-migrator": "^2.1.0",
"polyfill-crypto.getrandomvalues": "^1.0.0",
@ -151,7 +152,6 @@
"promise-filter": "^1.1.0",
"promise-to-callback": "^1.0.0",
"pump": "^3.0.0",
"pify": "^3.0.0",
"pumpify": "^1.3.4",
"qrcode-npm": "0.0.3",
"ramda": "^0.24.1",

63
test/e2e/metamask.spec.js
View File

@ -1,5 +1,8 @@
const fs = require('fs')
const mkdirp = require('mkdirp')
const path = require('path')
const assert = require('assert')
const pify = require('pify')
const webdriver = require('selenium-webdriver')
const By = webdriver.By
const { delay, buildWebDriver } = require('./func')
@ -14,12 +17,18 @@ describe('Metamask popup page', function () {
const extPath = path.resolve('dist/chrome')
driver = buildWebDriver(extPath)
await driver.get('chrome://extensions-frame')
const elems = await driver.findElements(By.className('extension-list-item-wrapper'))
const elems = await driver.findElements(By.css('.extension-list-item-wrapper'))
const extensionId = await elems[1].getAttribute('id')
await driver.get(`chrome-extension://${extensionId}/popup.html`)
await delay(500)
})
afterEach(async function () {
if (this.currentTest.state === 'failed') {
await verboseReportOnFailure(this.currentTest)
}
})
after(async function () {
await driver.quit()
})
@ -37,32 +46,27 @@ describe('Metamask popup page', function () {
})
it('should show privacy notice', async () => {
const privacy = await driver.findElement(By.className(
'terms-header'
)).getText()
const privacy = await driver.findElement(By.css('.terms-header')).getText()
assert.equal(privacy, 'PRIVACY NOTICE', 'shows privacy notice')
driver.findElement(By.css(
'button'
)).click()
driver.findElement(By.css('button')).click()
await delay(300)
})
it('should show terms of use', async () => {
await delay(300)
const terms = await driver.findElement(By.className(
'terms-header'
)).getText()
const terms = await driver.findElement(By.css('.terms-header')).getText()
assert.equal(terms, 'TERMS OF USE', 'shows terms of use')
await delay(300)
})
it('should be unable to continue without scolling throught the terms of use', async () => {
const button = await driver.findElement(By.css(
'button'
)).isEnabled()
const button = await driver.findElement(By.css('button')).isEnabled()
assert.equal(button, false, 'disabled continue button')
const element = driver.findElement(By.linkText(
'Attributions'
))
await driver.executeScript('arguments[0].scrollIntoView(true)', element)
await delay(300)
})
it('should be able to continue when scrolled to the bottom of terms of use', async () => {
@ -71,10 +75,10 @@ describe('Metamask popup page', function () {
await delay(500)
assert.equal(buttonEnabled, true, 'enabled continue button')
await button.click()
await delay(300)
})
it('should accept password with length of eight', async () => {
await delay(300)
const passwordBox = await driver.findElement(By.id('password-box'))
const passwordBoxConfirm = await driver.findElement(By.id('password-box-confirm'))
const button = driver.findElement(By.css('button'))
@ -87,16 +91,16 @@ describe('Metamask popup page', function () {
it('should show value was created and seed phrase', async () => {
await delay(700)
this.seedPhase = await driver.findElement(By.className('twelve-word-phrase')).getText()
this.seedPhase = await driver.findElement(By.css('.twelve-word-phrase')).getText()
const continueAfterSeedPhrase = await driver.findElement(By.css('button'))
await continueAfterSeedPhrase.click()
await delay(300)
})
it('should show lock account', async () => {
await delay(300)
await driver.findElement(By.className('sandwich-expando')).click()
await driver.findElement(By.css('.sandwich-expando')).click()
await delay(500)
await driver.findElement(By.xpath('//*[@id="app-content"]/div/div[3]/span/div/li[2]')).click()
await driver.findElement(By.css('#app-content > div > div:nth-child(3) > span > div > li:nth-child(3)')).click()
})
it('should accept account password after lock', async () => {
@ -106,17 +110,30 @@ describe('Metamask popup page', function () {
await delay(500)
})
it('should show QR code', async () => {
it('should show QR code option', async () => {
await delay(300)
await driver.findElement(By.className('fa-ellipsis-h')).click()
await driver.findElement(By.xpath('//*[@id="app-content"]/div/div[4]/div/div/div[1]/flex-column/div[1]/div/span/i/div/div/li[2]')).click()
await driver.findElement(By.css('.fa-ellipsis-h')).click()
await driver.findElement(By.css('#app-content > div > div.app-primary.from-right > div > div > div:nth-child(1) > flex-column > div.name-label > div > span > i > div > div > li:nth-child(3)')).click()
await delay(300)
})
it('should show the account address', async () => {
this.accountAddress = await driver.findElement(By.className('ellip-address')).getText()
await driver.findElement(By.className('fa-arrow-left')).click()
this.accountAddress = await driver.findElement(By.css('.ellip-address')).getText()
await driver.findElement(By.css('.fa-arrow-left')).click()
await delay(500)
})
})
async function verboseReportOnFailure(test) {
const artifactDir = `./test-artifacts/${test.title}`
const filepathBase = `${artifactDir}/test-failure`
await pify(mkdirp)(artifactDir)
// capture screenshot
const screenshot = await driver.takeScreenshot()
await pify(fs.writeFile)(`${filepathBase}-screenshot.png`, screenshot, { encoding: 'base64' })
// capture dom source
const htmlSource = await driver.getPageSource()
await pify(fs.writeFile)(`${filepathBase}-dom.html`, htmlSource)
}
})

36
test/unit/nonce-tracker-test.js
View File

@ -33,6 +33,42 @@ describe('Nonce Tracker', function () {
})
})
describe('sentry issue 476304902', function () {
beforeEach(function () {
const txGen = new MockTxGen()
pendingTxs = txGen.generate({ status: 'submitted' }, {
fromNonce: 3,
count: 29,
})
nonceTracker = generateNonceTrackerWith(pendingTxs, [], '0x3')
})
it('should return 9', async function () {
this.timeout(15000)
const nonceLock = await nonceTracker.getNonceLock('0x7d3517b0d011698406d6e0aed8453f0be2697926')
assert.equal(nonceLock.nextNonce, '32', `nonce should be 32 got ${nonceLock.nextNonce}`)
await nonceLock.releaseLock()
})
})
describe('issue 3670', function () {
beforeEach(function () {
const txGen = new MockTxGen()
pendingTxs = txGen.generate({ status: 'submitted' }, {
fromNonce: 6,
count: 3,
})
nonceTracker = generateNonceTrackerWith(pendingTxs, [], '0x6')
})
it('should return 9', async function () {
this.timeout(15000)
const nonceLock = await nonceTracker.getNonceLock('0x7d3517b0d011698406d6e0aed8453f0be2697926')
assert.equal(nonceLock.nextNonce, '9', `nonce should be 9 got ${nonceLock.nextNonce}`)
await nonceLock.releaseLock()
})
})
describe('with no previous txs', function () {
beforeEach(function () {
nonceTracker = generateNonceTrackerWith([], [])

22
ui/app/accounts/import/index.js
View File

@ -1,7 +1,8 @@
const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
import Select from 'react-select'
// Subviews
@ -9,8 +10,13 @@ const JsonImportView = require('./json.js')
const PrivateKeyImportView = require('./private-key.js')
AccountImportSubview.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(AccountImportSubview)
inherits(AccountImportSubview, Component)
function AccountImportSubview () {
Component.call(this)
@ -18,8 +24,8 @@ function AccountImportSubview () {
AccountImportSubview.prototype.getMenuItemTexts = function () {
return [
this.props.t('privateKey'),
this.props.t('jsonFile'),
this.context.t('privateKey'),
this.context.t('jsonFile'),
]
}
@ -32,7 +38,7 @@ AccountImportSubview.prototype.render = function () {
h('div.new-account-import-form', [
h('.new-account-import-disclaimer', [
h('span', this.props.t('importAccountMsg')),
h('span', this.context.t('importAccountMsg')),
h('span', {
style: {
cursor: 'pointer',
@ -43,12 +49,12 @@ AccountImportSubview.prototype.render = function () {
url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts',
})
},
}, this.props.t('here')),
}, this.context.t('here')),
]),
h('div.new-account-import-form__select-section', [
h('div.new-account-import-form__select-label', this.props.t('selectType')),
h('div.new-account-import-form__select-label', this.context.t('selectType')),
h(Select, {
className: 'new-account-import-form__select',
@ -80,9 +86,9 @@ AccountImportSubview.prototype.renderImportView = function () {
const current = type || menuItems[0]
switch (current) {
case this.props.t('privateKey'):
case this.context.t('privateKey'):
return h(PrivateKeyImportView)
case this.props.t('jsonFile'):
case this.context.t('jsonFile'):
return h(JsonImportView)
default:
return h(JsonImportView)

25
ui/app/accounts/import/json.js
View File

@ -1,7 +1,7 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const FileInput = require('react-simple-file-input').default
@ -24,11 +24,11 @@ class JsonImportSubview extends Component {
return (
h('div.new-account-import-form__json', [
h('p', this.props.t('usedByClients')),
h('p', this.context.t('usedByClients')),
h('a.warning', {
href: HELP_LINK,
target: '_blank',
}, this.props.t('fileImportFail')),
}, this.context.t('fileImportFail')),
h(FileInput, {
readAs: 'text',
@ -43,7 +43,7 @@ class JsonImportSubview extends Component {
h('input.new-account-import-form__input-password', {
type: 'password',
placeholder: this.props.t('enterPassword'),
placeholder: this.context.t('enterPassword'),
id: 'json-password-box',
onKeyPress: this.createKeyringOnEnter.bind(this),
}),
@ -53,13 +53,13 @@ class JsonImportSubview extends Component {
h('button.btn-secondary.new-account-create-form__button', {
onClick: () => this.props.goHome(),
}, [
this.props.t('cancel'),
this.context.t('cancel'),
]),
h('button.btn-primary.new-account-create-form__button', {
onClick: () => this.createNewKeychain(),
}, [
this.props.t('import'),
this.context.t('import'),
]),
]),
@ -84,14 +84,14 @@ class JsonImportSubview extends Component {
const state = this.state
if (!state) {
const message = this.props.t('validFileImport')
const message = this.context.t('validFileImport')
return this.props.displayWarning(message)
}
const { fileContents } = state
if (!fileContents) {
const message = this.props.t('needImportFile')
const message = this.context.t('needImportFile')
return this.props.displayWarning(message)
}
@ -99,7 +99,7 @@ class JsonImportSubview extends Component {
const password = passwordInput.value
if (!password) {
const message = this.props.t('needImportPassword')
const message = this.context.t('needImportPassword')
return this.props.displayWarning(message)
}
@ -112,7 +112,7 @@ JsonImportSubview.propTypes = {
goHome: PropTypes.func,
displayWarning: PropTypes.func,
importNewJsonAccount: PropTypes.func,
t: PropTypes.func,
t: PropTypes.func,
}
const mapStateToProps = state => {
@ -129,4 +129,9 @@ const mapDispatchToProps = dispatch => {
}
}
JsonImportSubview.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(JsonImportSubview)

14
ui/app/accounts/import/private-key.js
View File

@ -1,11 +1,17 @@
const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const actions = require('../../actions')
PrivateKeyImportView.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(PrivateKeyImportView)
function mapStateToProps (state) {
return {
error: state.appState.warning,
@ -33,7 +39,7 @@ PrivateKeyImportView.prototype.render = function () {
return (
h('div.new-account-import-form__private-key', [
h('span.new-account-create-form__instruction', this.props.t('pastePrivateKey')),
h('span.new-account-create-form__instruction', this.context.t('pastePrivateKey')),
h('div.new-account-import-form__private-key-password-container', [
@ -50,13 +56,13 @@ PrivateKeyImportView.prototype.render = function () {
h('button.btn-secondary--lg.new-account-create-form__button', {
onClick: () => goHome(),
}, [
this.props.t('cancel'),
this.context.t('cancel'),
]),
h('button.btn-primary--lg.new-account-create-form__button', {
onClick: () => this.createNewKeychain(),
}, [
this.props.t('import'),
this.context.t('import'),
]),
]),

12
ui/app/accounts/import/seed.js
View File

@ -1,10 +1,16 @@
const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
SeedImportSubview.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(SeedImportSubview)
function mapStateToProps (state) {
return {}
}
@ -20,10 +26,10 @@ SeedImportSubview.prototype.render = function () {
style: {
},
}, [
this.props.t('pasteSeed'),
this.context.t('pasteSeed'),
h('textarea'),
h('br'),
h('button', this.props.t('submit')),
h('button', this.context.t('submit')),
])
)
}

17
ui/app/accounts/new-account/create-form.js
View File

@ -1,11 +1,11 @@
const { Component } = require('react')
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
class NewAccountCreateForm extends Component {
constructor (props) {
constructor (props, context) {
super(props)
const { numberOfExistingAccounts = 0 } = props
@ -13,7 +13,7 @@ class NewAccountCreateForm extends Component {
this.state = {
newAccountName: '',
defaultAccountName: this.props.t('newAccountNumberName', [newAccountNumber]),
defaultAccountName: context.t('newAccountNumberName', [newAccountNumber]),
}
}
@ -24,7 +24,7 @@ class NewAccountCreateForm extends Component {
return h('div.new-account-create-form', [
h('div.new-account-create-form__input-label', {}, [
this.props.t('accountName'),
this.context.t('accountName'),
]),
h('div.new-account-create-form__input-wrapper', {}, [
@ -40,13 +40,13 @@ class NewAccountCreateForm extends Component {
h('button.btn-secondary--lg.new-account-create-form__button', {
onClick: () => this.props.goHome(),
}, [
this.props.t('cancel'),
this.context.t('cancel'),
]),
h('button.btn-primary--lg.new-account-create-form__button', {
onClick: () => this.props.createAccount(newAccountName || defaultAccountName),
}, [
this.props.t('create'),
this.context.t('create'),
]),
]),
@ -97,4 +97,9 @@ const mapDispatchToProps = dispatch => {
}
}
NewAccountCreateForm.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(NewAccountCreateForm)

14
ui/app/accounts/new-account/index.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const PropTypes = require('prop-types')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const { getCurrentViewContext } = require('../../selectors')
const classnames = require('classnames')
@ -36,8 +37,13 @@ function AccountDetailsModal (props) {
}
}
AccountDetailsModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsModal)
AccountDetailsModal.prototype.render = function () {
const { displayedForm, displayForm } = this.props
@ -45,7 +51,7 @@ AccountDetailsModal.prototype.render = function () {
h('div.new-account__header', [
h('div.new-account__title', this.props.t('newAccount')),
h('div.new-account__title', this.context.t('newAccount')),
h('div.new-account__tabs', [
@ -55,7 +61,7 @@ AccountDetailsModal.prototype.render = function () {
'new-account__tabs__unselected cursor-pointer': displayedForm !== 'CREATE',
}),
onClick: () => displayForm('CREATE'),
}, this.props.t('createDen')),
}, this.context.t('createDen')),
h('div.new-account__tabs__tab', {
className: classnames('new-account__tabs__tab', {
@ -63,7 +69,7 @@ AccountDetailsModal.prototype.render = function () {
'new-account__tabs__unselected cursor-pointer': displayedForm !== 'IMPORT',
}),
onClick: () => displayForm('IMPORT'),
}, this.props.t('import')),
}, this.context.t('import')),
]),

56
ui/app/add-token.js
View File

@ -2,7 +2,8 @@ const inherits = require('util').inherits
const Component = require('react').Component
const classnames = require('classnames')
const h = require('react-hyperscript')
const connect = require('./metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const R = require('ramda')
const Fuse = require('fuse.js')
const contractMap = require('eth-contract-metadata')
@ -29,8 +30,13 @@ const { tokenInfoGetter } = require('./token-util')
const emptyAddr = '0x0000000000000000000000000000000000000000'
AddTokenScreen.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AddTokenScreen)
function mapStateToProps (state) {
const { identities, tokens } = state.metamask
return {
@ -139,7 +145,7 @@ AddTokenScreen.prototype.validate = function () {
if (customAddress) {
const validAddress = ethUtil.isValidAddress(customAddress)
if (!validAddress) {
errors.customAddress = this.props.t('invalidAddress')
errors.customAddress = this.context.t('invalidAddress')
}
const validDecimals = customDecimals !== null
@ -147,23 +153,23 @@ AddTokenScreen.prototype.validate = function () {
&& customDecimals >= 0
&& customDecimals < 36
if (!validDecimals) {
errors.customDecimals = this.props.t('decimalsMustZerotoTen')
errors.customDecimals = this.context.t('decimalsMustZerotoTen')
}
const symbolLen = customSymbol.trim().length
const validSymbol = symbolLen > 0 && symbolLen < 10
if (!validSymbol) {
errors.customSymbol = this.props.t('symbolBetweenZeroTen')
errors.customSymbol = this.context.t('symbolBetweenZeroTen')
}
const ownAddress = identitiesList.includes(standardAddress)
if (ownAddress) {
errors.customAddress = this.props.t('personalAddressDetected')
errors.customAddress = this.context.t('personalAddressDetected')
}
const tokenAlreadyAdded = this.checkExistingAddresses(customAddress)
if (tokenAlreadyAdded) {
errors.customAddress = this.props.t('tokenAlreadyAdded')
errors.customAddress = this.context.t('tokenAlreadyAdded')
}
} else if (
Object.entries(selectedTokens)
@ -171,7 +177,7 @@ AddTokenScreen.prototype.validate = function () {
isEmpty && !isSelected
), true)
) {
errors.tokenSelector = this.props.t('mustSelectOne')
errors.tokenSelector = this.context.t('mustSelectOne')
}
return {
@ -201,7 +207,7 @@ AddTokenScreen.prototype.renderCustomForm = function () {
'add-token__add-custom-field--error': errors.customAddress,
}),
}, [
h('div.add-token__add-custom-label', this.props.t('tokenAddress')),
h('div.add-token__add-custom-label', this.context.t('tokenAddress')),
h('input.add-token__add-custom-input', {
type: 'text',
onChange: this.tokenAddressDidChange,
@ -214,7 +220,7 @@ AddTokenScreen.prototype.renderCustomForm = function () {
'add-token__add-custom-field--error': errors.customSymbol,
}),
}, [
h('div.add-token__add-custom-label', this.props.t('tokenSymbol')),
h('div.add-token__add-custom-label', this.context.t('tokenSymbol')),
h('input.add-token__add-custom-input', {
type: 'text',
onChange: this.tokenSymbolDidChange,
@ -228,7 +234,7 @@ AddTokenScreen.prototype.renderCustomForm = function () {
'add-token__add-custom-field--error': errors.customDecimals,
}),
}, [
h('div.add-token__add-custom-label', this.props.t('decimal')),
h('div.add-token__add-custom-label', this.context.t('decimal')),
h('input.add-token__add-custom-input', {
type: 'number',
onChange: this.tokenDecimalsDidChange,
@ -250,7 +256,7 @@ AddTokenScreen.prototype.renderTokenList = function () {
const results = [...addressSearchResult, ...fuseSearchResult]
return h('div', [
results.length > 0 && h('div.add-token__token-icons-title', this.props.t('popularTokens')),
results.length > 0 && h('div.add-token__token-icons-title', this.context.t('popularTokens')),
h('div.add-token__token-icons-container', Array(6).fill(undefined)
.map((_, i) => {
const { logo, symbol, name, address } = results[i] || {}
@ -305,10 +311,10 @@ AddTokenScreen.prototype.renderConfirmation = function () {
h('div.add-token', [
h('div.add-token__wrapper', [
h('div.add-token__title-container.add-token__confirmation-title', [
h('div.add-token__description', this.props.t('likeToAddTokens')),
h('div.add-token__description', this.context.t('likeToAddTokens')),
]),
h('div.add-token__content-container.add-token__confirmation-content', [
h('div.add-token__description.add-token__confirmation-description', this.props.t('balances')),
h('div.add-token__description.add-token__confirmation-description', this.context.t('balances')),
h('div.add-token__confirmation-token-list',
Object.entries(tokens)
.map(([ address, token ]) => (
@ -327,10 +333,10 @@ AddTokenScreen.prototype.renderConfirmation = function () {
h('div.add-token__buttons', [
h('button.btn-secondary--lg.add-token__cancel-button', {
onClick: () => this.setState({ isShowingConfirmation: false }),
}, this.props.t('back')),
}, this.context.t('back')),
h('button.btn-primary--lg', {
onClick: () => addTokens(tokens).then(goHome),
}, this.props.t('addTokens')),
}, this.context.t('addTokens')),
]),
])
)
@ -350,14 +356,14 @@ AddTokenScreen.prototype.renderTabs = function () {
h('div.add-token__content-container', [
h('div.add-token__info-box', [
h('div.add-token__info-box__close'),
h('div.add-token__info-box__title', this.props.t('whatsThis')),
h('div.add-token__info-box__copy', this.props.t('keepTrackTokens')),
h('div.add-token__info-box__copy--blue', this.props.t('learnMore')),
h('div.add-token__info-box__title', this.context.t('whatsThis')),
h('div.add-token__info-box__copy', this.context.t('keepTrackTokens')),
h('div.add-token__info-box__copy--blue', this.context.t('learnMore')),
]),
h('div.add-token__input-container', [
h('input.add-token__input', {
type: 'text',
placeholder: this.props.t('searchTokens'),
placeholder: this.context.t('searchTokens'),
onChange: e => this.setState({ searchQuery: e.target.value }),
}),
h('div.add-token__search-input-error-message', errors.tokenSelector),
@ -381,9 +387,9 @@ AddTokenScreen.prototype.render = function () {
onClick: () => goHome(),
}, [
h('i.fa.fa-angle-left.fa-lg'),
h('span', this.props.t('cancel')),
h('span', this.context.t('cancel')),
]),
h('div.add-token__header__title', this.props.t('addTokens')),
h('div.add-token__header__title', this.context.t('addTokens')),
!isShowingConfirmation && h('div.add-token__header__tabs', [
h('div.add-token__header__tabs__tab', {
@ -392,7 +398,7 @@ AddTokenScreen.prototype.render = function () {
'add-token__header__tabs__unselected cursor-pointer': displayedTab !== 'SEARCH',
}),
onClick: () => this.displayTab('SEARCH'),
}, this.props.t('search')),
}, this.context.t('search')),
h('div.add-token__header__tabs__tab', {
className: classnames('add-token__header__tabs__tab', {
@ -400,7 +406,7 @@ AddTokenScreen.prototype.render = function () {
'add-token__header__tabs__unselected cursor-pointer': displayedTab !== 'CUSTOM_TOKEN',
}),
onClick: () => this.displayTab('CUSTOM_TOKEN'),
}, this.props.t('customToken')),
}, this.context.t('customToken')),
]),
]),
@ -412,10 +418,10 @@ AddTokenScreen.prototype.render = function () {
!isShowingConfirmation && h('div.add-token__buttons', [
h('button.btn-secondary--lg.add-token__cancel-button', {
onClick: goHome,
}, this.props.t('cancel')),
}, this.context.t('cancel')),
h('button.btn-primary--lg.add-token__confirm-button', {
onClick: this.onNext,
}, this.props.t('next')),
}, this.context.t('next')),
]),
])
}

32
ui/app/app.js
View File

@ -1,7 +1,8 @@
const inherits = require('util').inherits
const Component = require('react').Component
const connect = require('./metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const PropTypes = require('prop-types')
const actions = require('./actions')
const classnames = require('classnames')
@ -45,8 +46,13 @@ const QrView = require('./components/qr-code')
// Global Modals
const Modal = require('./components/modals/index').Modal
App.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(App)
inherits(App, Component)
function App () { Component.call(this) }
@ -293,8 +299,8 @@ App.prototype.renderAppBar = function () {
// metamask name
h('.flex-row', [
h('h1', this.props.t('appName')),
h('div.beta-label', this.props.t('beta')),
h('h1', this.context.t('appName')),
h('div.beta-label', this.context.t('beta')),
]),
]),
@ -556,15 +562,15 @@ App.prototype.getConnectingLabel = function () {
let name
if (providerName === 'mainnet') {
name = this.props.t('connectingToMainnet')
name = this.context.t('connectingToMainnet')
} else if (providerName === 'ropsten') {
name = this.props.t('connectingToRopsten')
name = this.context.t('connectingToRopsten')
} else if (providerName === 'kovan') {
name = this.props.t('connectingToRopsten')
name = this.context.t('connectingToRopsten')
} else if (providerName === 'rinkeby') {
name = this.props.t('connectingToRinkeby')
name = this.context.t('connectingToRinkeby')
} else {
name = this.props.t('connectingToUnknown')
name = this.context.t('connectingToUnknown')
}
return name
@ -577,15 +583,15 @@ App.prototype.getNetworkName = function () {
let name
if (providerName === 'mainnet') {
name = this.props.t('mainnet')
name = this.context.t('mainnet')
} else if (providerName === 'ropsten') {
name = this.props.t('ropsten')
name = this.context.t('ropsten')
} else if (providerName === 'kovan') {
name = this.props.t('kovan')
name = this.context.t('kovan')
} else if (providerName === 'rinkeby') {
name = this.props.t('rinkeby')
name = this.context.t('rinkeby')
} else {
name = this.props.t('unknownNetwork')
name = this.context.t('unknownNetwork')
}
return name

20
ui/app/components/account-dropdowns.js
View File

@ -3,7 +3,7 @@ const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const actions = require('../actions')
const genAccountLink = require('etherscan-link').createAccountLink
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const Dropdown = require('./dropdown').Dropdown
const DropdownMenuItem = require('./dropdown').DropdownMenuItem
const Identicon = require('./identicon')
@ -79,7 +79,7 @@ class AccountDropdowns extends Component {
try { // Sometimes keyrings aren't loaded yet:
const type = keyring.type
const isLoose = type !== 'HD Key Tree'
return isLoose ? h('.keyring-label.allcaps', this.props.t('loose')) : null
return isLoose ? h('.keyring-label.allcaps', this.context.t('loose')) : null
} catch (e) { return }
}
@ -129,7 +129,7 @@ class AccountDropdowns extends Component {
diameter: 32,
},
),
h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, this.props.t('createAccount')),
h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, this.context.t('createAccount')),
],
),
h(
@ -154,7 +154,7 @@ class AccountDropdowns extends Component {
fontSize: '24px',
marginBottom: '5px',
},
}, this.props.t('importAccount')),
}, this.context.t('importAccount')),
]
),
]
@ -192,7 +192,7 @@ class AccountDropdowns extends Component {
global.platform.openWindow({ url })
},
},
this.props.t('etherscanView'),
this.context.t('etherscanView'),
),
h(
DropdownMenuItem,
@ -204,7 +204,7 @@ class AccountDropdowns extends Component {
actions.showQrView(selected, identity ? identity.name : '')
},
},
this.props.t('showQRCode'),
this.context.t('showQRCode'),
),
h(
DropdownMenuItem,
@ -216,7 +216,7 @@ class AccountDropdowns extends Component {
copyToClipboard(checkSumAddress)
},
},
this.props.t('copyAddress'),
this.context.t('copyAddress'),
),
h(
DropdownMenuItem,
@ -226,7 +226,7 @@ class AccountDropdowns extends Component {
actions.requestAccountExport()
},
},
this.props.t('exportPrivateKey'),
this.context.t('exportPrivateKey'),
),
]
)
@ -316,6 +316,10 @@ const mapDispatchToProps = (dispatch) => {
}
}
AccountDropdowns.contextTypes = {
t: PropTypes.func,
}
module.exports = {
AccountDropdowns: connect(null, mapDispatchToProps)(AccountDropdowns),
}

22
ui/app/components/account-export.js
View File

@ -1,14 +1,20 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const PropTypes = require('prop-types')
const inherits = require('util').inherits
const exportAsFile = require('../util').exportAsFile
const copyToClipboard = require('copy-to-clipboard')
const actions = require('../actions')
const ethUtil = require('ethereumjs-util')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
ExportAccountView.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(ExportAccountView)
inherits(ExportAccountView, Component)
function ExportAccountView () {
Component.call(this)
@ -35,7 +41,7 @@ ExportAccountView.prototype.render = function () {
if (notExporting) return h('div')
if (exportRequested) {
const warning = this.props.t('exportPrivateKeyWarning')
const warning = this.context.t('exportPrivateKeyWarning')
return (
h('div', {
style: {
@ -53,7 +59,7 @@ ExportAccountView.prototype.render = function () {
h('p.error', warning),
h('input#exportAccount.sizing-input', {
type: 'password',
placeholder: this.props.t('confirmPassword').toLowerCase(),
placeholder: this.context.t('confirmPassword').toLowerCase(),
onKeyPress: this.onExportKeyPress.bind(this),
style: {
position: 'relative',
@ -74,10 +80,10 @@ ExportAccountView.prototype.render = function () {
style: {
marginRight: '10px',
},
}, this.props.t('submit')),
}, this.context.t('submit')),
h('button', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, this.props.t('cancel')),
}, this.context.t('cancel')),
]),
(this.props.warning) && (
h('span.error', {
@ -98,7 +104,7 @@ ExportAccountView.prototype.render = function () {
margin: '0 20px',
},
}, [
h('label', this.props.t('copyPrivateKey') + ':'),
h('label', this.context.t('copyPrivateKey') + ':'),
h('p.error.cursor-pointer', {
style: {
textOverflow: 'ellipsis',
@ -112,13 +118,13 @@ ExportAccountView.prototype.render = function () {
}, plainKey),
h('button', {
onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)),
}, this.props.t('done')),
}, this.context.t('done')),
h('button', {
style: {
marginLeft: '10px',
},
onClick: () => exportAsFile(`MetaMask ${nickname} Private Key`, plainKey),
}, this.props.t('saveAsFile')),
}, this.context.t('saveAsFile')),
])
}
}

22
ui/app/components/account-menu/index.js
View File

@ -1,14 +1,20 @@
const inherits = require('util').inherits
const Component = require('react').Component
const connect = require('../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const actions = require('../../actions')
const { Menu, Item, Divider, CloseArea } = require('../dropdowns/components/menu')
const Identicon = require('../identicon')
const { formatBalance } = require('../../util')
AccountMenu.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountMenu)
inherits(AccountMenu, Component)
function AccountMenu () { Component.call(this) }
@ -70,10 +76,10 @@ AccountMenu.prototype.render = function () {
h(Item, {
className: 'account-menu__header',
}, [
this.props.t('myAccounts'),
this.context.t('myAccounts'),
h('button.account-menu__logout-button', {
onClick: lockMetamask,
}, this.props.t('logout')),
}, this.context.t('logout')),
]),
h(Divider),
h('div.account-menu__accounts', this.renderAccounts()),
@ -81,23 +87,23 @@ AccountMenu.prototype.render = function () {
h(Item, {
onClick: () => showNewAccountPage('CREATE'),
icon: h('img.account-menu__item-icon', { src: 'images/plus-btn-white.svg' }),
text: this.props.t('createAccount'),
text: this.context.t('createAccount'),
}),
h(Item, {
onClick: () => showNewAccountPage('IMPORT'),
icon: h('img.account-menu__item-icon', { src: 'images/import-account.svg' }),
text: this.props.t('importAccount'),
text: this.context.t('importAccount'),
}),
h(Divider),
h(Item, {
onClick: showInfoPage,
icon: h('img', { src: 'images/mm-info-icon.svg' }),
text: this.props.t('infoHelp'),
text: this.context.t('infoHelp'),
}),
h(Item, {
onClick: showConfigPage,
icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),
text: this.props.t('settings'),
text: this.context.t('settings'),
}),
])
}
@ -155,6 +161,6 @@ AccountMenu.prototype.indicateIfLoose = function (keyring) {
try { // Sometimes keyrings aren't loaded yet:
const type = keyring.type
const isLoose = type !== 'HD Key Tree'
return isLoose ? h('.keyring-label.allcaps', this.props.t('imported')) : null
return isLoose ? h('.keyring-label.allcaps', this.context.t('imported')) : null
} catch (e) { return }
}

2
ui/app/components/balance-component.js
View File

@ -1,5 +1,5 @@
const Component = require('react').Component
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const inherits = require('util').inherits
const TokenBalance = require('./token-balance')

16
ui/app/components/bn-as-decimal-input.js
View File

@ -1,13 +1,19 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN
const extend = require('xtend')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
BnAsDecimalInput.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(BnAsDecimalInput)
inherits(BnAsDecimalInput, Component)
function BnAsDecimalInput () {
this.state = { invalid: null }
@ -137,13 +143,13 @@ BnAsDecimalInput.prototype.constructWarning = function () {
let message = name ? name + ' ' : ''
if (min && max) {
message += this.props.t('betweenMinAndMax', [`${newMin} ${suffix}`, `${newMax} ${suffix}`])
message += this.context.t('betweenMinAndMax', [`${newMin} ${suffix}`, `${newMax} ${suffix}`])
} else if (min) {
message += this.props.t('greaterThanMin', [`${newMin} ${suffix}`])
message += this.context.t('greaterThanMin', [`${newMin} ${suffix}`])
} else if (max) {
message += this.props.t('lessThanMax', [`${newMax} ${suffix}`])
message += this.context.t('lessThanMax', [`${newMax} ${suffix}`])
} else {
message += this.props.t('invalidInput')
message += this.context.t('invalidInput')
}
return message

22
ui/app/components/buy-button-subview.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../actions')
const CoinbaseForm = require('./coinbase-form')
const ShapeshiftForm = require('./shapeshift-form')
@ -10,8 +11,13 @@ const AccountPanel = require('./account-panel')
const RadioList = require('./custom-radio-list')
const networkNames = require('../../../app/scripts/config.js').networkNames
BuyButtonSubview.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(BuyButtonSubview)
function mapStateToProps (state) {
return {
identity: state.appState.identity,
@ -76,7 +82,7 @@ BuyButtonSubview.prototype.headerSubview = function () {
paddingTop: '4px',
paddingBottom: '4px',
},
}, this.props.t('depositEth')),
}, this.context.t('depositEth')),
]),
// loading indication
@ -118,7 +124,7 @@ BuyButtonSubview.prototype.headerSubview = function () {
paddingTop: '4px',
paddingBottom: '4px',
},
}, this.props.t('selectService')),
}, this.context.t('selectService')),
]),
])
@ -143,7 +149,7 @@ BuyButtonSubview.prototype.primarySubview = function () {
case '4':
case '42':
const networkName = networkNames[network]
const label = `${networkName} ${this.props.t('testFaucet')}`
const label = `${networkName} ${this.context.t('testFaucet')}`
return (
h('div.flex-column', {
style: {
@ -164,14 +170,14 @@ BuyButtonSubview.prototype.primarySubview = function () {
style: {
marginTop: '15px',
},
}, this.props.t('borrowDharma'))
}, this.context.t('borrowDharma'))
) : null,
])
)
default:
return (
h('h2.error', this.props.t('unknownNetworkId'))
h('h2.error', this.context.t('unknownNetworkId'))
)
}
@ -203,8 +209,8 @@ BuyButtonSubview.prototype.mainnetSubview = function () {
'ShapeShift',
],
subtext: {
'Coinbase': `${this.props.t('crypto')}/${this.props.t('fiat')} (${this.props.t('usaOnly')})`,
'ShapeShift': this.props.t('crypto'),
'Coinbase': `${this.context.t('crypto')}/${this.context.t('fiat')} (${this.context.t('usaOnly')})`,
'ShapeShift': this.context.t('crypto'),
},
onClick: this.radioHandler.bind(this),
}),

12
ui/app/components/coinbase-form.js
View File

@ -1,11 +1,17 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../actions')
CoinbaseForm.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(CoinbaseForm)
function mapStateToProps (state) {
return {
warning: state.appState.warning,
@ -37,11 +43,11 @@ CoinbaseForm.prototype.render = function () {
}, [
h('button.btn-green', {
onClick: this.toCoinbase.bind(this),
}, this.props.t('continueToCoinbase')),
}, this.context.t('continueToCoinbase')),
h('button.btn-red', {
onClick: () => props.dispatch(actions.goHome()),
}, this.props.t('cancel')),
}, this.context.t('cancel')),
]),
])
}

10
ui/app/components/copyButton.js
View File

@ -1,13 +1,19 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const copyToClipboard = require('copy-to-clipboard')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const Tooltip = require('./tooltip')
CopyButton.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(CopyButton)
inherits(CopyButton, Component)
function CopyButton () {
Component.call(this)
@ -23,7 +29,7 @@ CopyButton.prototype.render = function () {
const value = props.value
const copied = state.copied
const message = copied ? this.props.t('copiedButton') : props.title || this.props.t('copyButton')
const message = copied ? this.context.t('copiedButton') : props.title || this.context.t('copyButton')
return h('.copy-button', {
style: {

10
ui/app/components/copyable.js
View File

@ -1,13 +1,19 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const Tooltip = require('./tooltip')
const copyToClipboard = require('copy-to-clipboard')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
Copyable.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(Copyable)
inherits(Copyable, Component)
function Copyable () {
Component.call(this)
@ -23,7 +29,7 @@ Copyable.prototype.render = function () {
const { copied } = state
return h(Tooltip, {
title: copied ? this.props.t('copiedExclamation') : this.props.t('copy'),
title: copied ? this.context.t('copiedExclamation') : this.context.t('copy'),
position: 'bottom',
}, h('span', {
style: {

28
ui/app/components/customize-gas-modal/index.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const GasModalCard = require('./gas-modal-card')
@ -94,8 +95,13 @@ function CustomizeGasModal (props) {
this.state = getOriginalState(props)
}
CustomizeGasModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(CustomizeGasModal)
CustomizeGasModal.prototype.save = function (gasPrice, gasLimit, gasTotal) {
const {
updateGasPrice,
@ -149,7 +155,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
})
if (!balanceIsSufficient) {
error = this.props.t('balanceIsInsufficientGas')
error = this.context.t('balanceIsInsufficientGas')
}
const gasLimitTooLow = gasLimit && conversionGreaterThan(
@ -165,7 +171,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) {
)
if (gasLimitTooLow) {
error = this.props.t('gasLimitTooLow')
error = this.context.t('gasLimitTooLow')
}
this.setState({ error })
@ -258,7 +264,7 @@ CustomizeGasModal.prototype.render = function () {
}, [
h('div.send-v2__customize-gas__header', {}, [
h('div.send-v2__customize-gas__title', this.props.t('customGas')),
h('div.send-v2__customize-gas__title', this.context.t('customGas')),
h('div.send-v2__customize-gas__close', {
onClick: hideModal,
@ -274,8 +280,8 @@ CustomizeGasModal.prototype.render = function () {
// max: 1000,
step: multiplyCurrencies(MIN_GAS_PRICE_GWEI, 10),
onChange: value => this.convertAndSetGasPrice(value),
title: this.props.t('gasPrice'),
copy: this.props.t('gasPriceCalculation'),
title: this.context.t('gasPrice'),
copy: this.context.t('gasPriceCalculation'),
}),
h(GasModalCard, {
@ -284,8 +290,8 @@ CustomizeGasModal.prototype.render = function () {
// max: 100000,
step: 1,
onChange: value => this.convertAndSetGasLimit(value),
title: this.props.t('gasLimit'),
copy: this.props.t('gasLimitCalculation'),
title: this.context.t('gasLimit'),
copy: this.context.t('gasLimitCalculation'),
}),
]),
@ -298,7 +304,7 @@ CustomizeGasModal.prototype.render = function () {
h('div.send-v2__customize-gas__revert', {
onClick: () => this.revert(),
}, [this.props.t('revert')]),
}, [this.context.t('revert')]),
h('div.send-v2__customize-gas__buttons', [
h('button.btn-secondary.send-v2__customize-gas__cancel', {
@ -306,12 +312,12 @@ CustomizeGasModal.prototype.render = function () {
style: {
marginRight: '10px',
},
}, [this.props.t('cancel')]),
}, [this.context.t('cancel')]),
h('button.btn-primary.send-v2__customize-gas__save', {
onClick: () => !error && this.save(newGasPrice, gasLimit, gasTotal),
className: error && 'btn-primary--disabled',
}, [this.props.t('save')]),
}, [this.context.t('save')]),
]),
]),

25
ui/app/components/dropdowns/components/account-dropdowns.js
View File

@ -3,7 +3,7 @@ const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const actions = require('../../../actions')
const genAccountLink = require('../../../../lib/account-link.js')
const connect = require('../../../metamask-connect')
const connect = require('react-redux').connect
const Dropdown = require('./dropdown').Dropdown
const DropdownMenuItem = require('./dropdown').DropdownMenuItem
const Identicon = require('../../identicon')
@ -130,7 +130,7 @@ class AccountDropdowns extends Component {
actions.showEditAccountModal(identity)
},
}, [
this.props.t('edit'),
this.context.t('edit'),
]),
]),
@ -144,7 +144,7 @@ class AccountDropdowns extends Component {
try { // Sometimes keyrings aren't loaded yet:
const type = keyring.type
const isLoose = type !== 'HD Key Tree'
return isLoose ? h('.keyring-label.allcaps', this.props.t('loose')) : null
return isLoose ? h('.keyring-label.allcaps', this.context.t('loose')) : null
} catch (e) { return }
}
@ -202,7 +202,7 @@ class AccountDropdowns extends Component {
fontSize: '16px',
lineHeight: '23px',
},
}, this.props.t('createAccount')),
}, this.context.t('createAccount')),
],
),
h(
@ -236,7 +236,7 @@ class AccountDropdowns extends Component {
fontSize: '16px',
lineHeight: '23px',
},
}, this.props.t('importAccount')),
}, this.context.t('importAccount')),
]
),
]
@ -287,7 +287,7 @@ class AccountDropdowns extends Component {
menuItemStyles,
),
},
this.props.t('accountDetails'),
this.context.t('accountDetails'),
),
h(
DropdownMenuItem,
@ -303,7 +303,7 @@ class AccountDropdowns extends Component {
menuItemStyles,
),
},
this.props.t('etherscanView'),
this.context.t('etherscanView'),
),
h(
DropdownMenuItem,
@ -319,7 +319,7 @@ class AccountDropdowns extends Component {
menuItemStyles,
),
},
this.props.t('copyAddress'),
this.context.t('copyAddress'),
),
h(
DropdownMenuItem,
@ -331,7 +331,7 @@ class AccountDropdowns extends Component {
menuItemStyles,
),
},
this.props.t('exportPrivateKey'),
this.context.t('exportPrivateKey'),
),
h(
DropdownMenuItem,
@ -346,7 +346,7 @@ class AccountDropdowns extends Component {
menuItemStyles,
),
},
this.props.t('addToken'),
this.context.t('addToken'),
),
]
@ -464,4 +464,9 @@ function mapStateToProps (state) {
}
}
AccountDropdowns.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDropdowns)

34
ui/app/components/dropdowns/network-dropdown.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const Dropdown = require('./components/dropdown').Dropdown
const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem
@ -54,8 +55,13 @@ function NetworkDropdown () {
Component.call(this)
}
NetworkDropdown.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(NetworkDropdown)
// TODO: specify default props and proptypes
NetworkDropdown.prototype.render = function () {
const props = this.props
@ -94,13 +100,13 @@ NetworkDropdown.prototype.render = function () {
}, [
h('div.network-dropdown-header', {}, [
h('div.network-dropdown-title', {}, this.props.t('networks')),
h('div.network-dropdown-title', {}, this.context.t('networks')),
h('div.network-dropdown-divider'),
h('div.network-dropdown-content',
{},
this.props.t('defaultNetwork')
this.context.t('defaultNetwork')
),
]),
@ -122,7 +128,7 @@ NetworkDropdown.prototype.render = function () {
style: {
color: providerType === 'mainnet' ? '#ffffff' : '#9b9b9b',
},
}, this.props.t('mainnet')),
}, this.context.t('mainnet')),
]
),
@ -144,7 +150,7 @@ NetworkDropdown.prototype.render = function () {
style: {
color: providerType === 'ropsten' ? '#ffffff' : '#9b9b9b',
},
}, this.props.t('ropsten')),
}, this.context.t('ropsten')),
]
),
@ -166,7 +172,7 @@ NetworkDropdown.prototype.render = function () {
style: {
color: providerType === 'kovan' ? '#ffffff' : '#9b9b9b',
},
}, this.props.t('kovan')),
}, this.context.t('kovan')),
]
),
@ -188,7 +194,7 @@ NetworkDropdown.prototype.render = function () {
style: {
color: providerType === 'rinkeby' ? '#ffffff' : '#9b9b9b',
},
}, this.props.t('rinkeby')),
}, this.context.t('rinkeby')),
]
),
@ -210,7 +216,7 @@ NetworkDropdown.prototype.render = function () {
style: {
color: activeNetwork === 'http://localhost:8545' ? '#ffffff' : '#9b9b9b',
},
}, this.props.t('localhost')),
}, this.context.t('localhost')),
]
),
@ -234,7 +240,7 @@ NetworkDropdown.prototype.render = function () {
style: {
color: activeNetwork === 'custom' ? '#ffffff' : '#9b9b9b',
},
}, this.props.t('customRPC')),
}, this.context.t('customRPC')),
]
),
@ -249,15 +255,15 @@ NetworkDropdown.prototype.getNetworkName = function () {
let name
if (providerName === 'mainnet') {
name = this.props.t('mainnet')
name = this.context.t('mainnet')
} else if (providerName === 'ropsten') {
name = this.props.t('ropsten')
name = this.context.t('ropsten')
} else if (providerName === 'kovan') {
name = this.props.t('kovan')
name = this.context.t('kovan')
} else if (providerName === 'rinkeby') {
name = this.props.t('rinkeby')
name = this.context.t('rinkeby')
} else {
name = this.props.t('unknownNetwork')
name = this.context.t('unknownNetwork')
}
return name

10
ui/app/components/dropdowns/token-menu-dropdown.js
View File

@ -1,12 +1,18 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
TokenMenuDropdown.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown)
function mapDispatchToProps (dispatch) {
return {
showHideTokenConfirmationModal: (token) => {
@ -44,7 +50,7 @@ TokenMenuDropdown.prototype.render = function () {
showHideTokenConfirmationModal(this.props.token)
this.props.onClose()
},
}, this.props.t('hideToken')),
}, this.context.t('hideToken')),
]),
]),

12
ui/app/components/ens-input.js
View File

@ -1,4 +1,5 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const extend = require('xtend')
@ -8,11 +9,16 @@ const ENS = require('ethjs-ens')
const networkMap = require('ethjs-ens/lib/network-map.json')
const ensRE = /.+\..+$/
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const ToAutoComplete = require('./send/to-autocomplete')
EnsInput.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(EnsInput)
inherits(EnsInput, Component)
function EnsInput () {
Component.call(this)
@ -70,13 +76,13 @@ EnsInput.prototype.lookupEnsName = function (recipient) {
log.info(`ENS attempting to resolve name: ${recipient}`)
this.ens.lookup(recipient.trim())
.then((address) => {
if (address === ZERO_ADDRESS) throw new Error(this.props.t('noAddressForName'))
if (address === ZERO_ADDRESS) throw new Error(this.context.t('noAddressForName'))
if (address !== ensResolution) {
this.setState({
loadingEns: false,
ensResolution: address,
nickname: recipient.trim(),
hoverText: address + '\n' + this.props.t('clickCopy'),
hoverText: address + '\n' + this.context.t('clickCopy'),
ensFailure: false,
})
}

16
ui/app/components/hex-as-decimal-input.js
View File

@ -1,13 +1,19 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const ethUtil = require('ethereumjs-util')
const BN = ethUtil.BN
const extend = require('xtend')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
HexAsDecimalInput.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(HexAsDecimalInput)
inherits(HexAsDecimalInput, Component)
function HexAsDecimalInput () {
this.state = { invalid: null }
@ -127,13 +133,13 @@ HexAsDecimalInput.prototype.constructWarning = function () {
let message = name ? name + ' ' : ''
if (min && max) {
message += this.props.t('betweenMinAndMax', [min, max])
message += this.context.t('betweenMinAndMax', [min, max])
} else if (min) {
message += this.props.t('greaterThanMin', [min])
message += this.context.t('greaterThanMin', [min])
} else if (max) {
message += this.props.t('lessThanMax', [max])
message += this.context.t('lessThanMax', [max])
} else {
message += this.props.t('invalidInput')
message += this.context.t('invalidInput')
}
return message

2
ui/app/components/identicon.js
View File

@ -1,7 +1,7 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const isNode = require('detect-node')
const findDOMNode = require('react-dom').findDOMNode
const jazzicon = require('jazzicon')

12
ui/app/components/modals/account-details-modal.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const AccountModalContainer = require('./account-modal-container')
const { getSelectedIdentity } = require('../../selectors')
@ -33,8 +34,13 @@ function AccountDetailsModal () {
Component.call(this)
}
AccountDetailsModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDetailsModal)
// Not yet pixel perfect todos:
// fonts of qr-header
@ -64,12 +70,12 @@ AccountDetailsModal.prototype.render = function () {
h('button.btn-primary.account-modal__button', {
onClick: () => global.platform.openWindow({ url: genAccountLink(address, network) }),
}, this.props.t('etherscanView')),
}, this.context.t('etherscanView')),
// Holding on redesign for Export Private Key functionality
h('button.btn-primary.account-modal__button', {
onClick: () => showExportPrivateKeyModal(),
}, this.props.t('exportPrivateKey')),
}, this.context.t('exportPrivateKey')),
])
}

10
ui/app/components/modals/account-modal-container.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const { getSelectedIdentity } = require('../../selectors')
const Identicon = require('../identicon')
@ -25,8 +26,13 @@ function AccountModalContainer () {
Component.call(this)
}
AccountModalContainer.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountModalContainer)
AccountModalContainer.prototype.render = function () {
const {
selectedIdentity,
@ -59,7 +65,7 @@ AccountModalContainer.prototype.render = function () {
h('i.fa.fa-angle-left.fa-lg'),
h('span.account-modal-back__text', ' ' + this.props.t('back')),
h('span.account-modal-back__text', ' ' + this.context.t('back')),
]),

22
ui/app/components/modals/buy-options-modal.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const networkNames = require('../../../../app/scripts/config.js').networkNames
@ -32,8 +33,13 @@ function BuyOptions () {
Component.call(this)
}
BuyOptions.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(BuyOptions)
BuyOptions.prototype.renderModalContentOption = function (title, header, onClick) {
return h('div.buy-modal-content-option', {
onClick,
@ -56,15 +62,15 @@ BuyOptions.prototype.render = function () {
}, [
h('div.buy-modal-content-title', {
style: {},
}, this.props.t('transfers')),
h('div', {}, this.props.t('howToDeposit')),
}, this.context.t('transfers')),
h('div', {}, this.context.t('howToDeposit')),
]),
h('div.buy-modal-content-options.flex-column.flex-center', {}, [
isTestNetwork
? this.renderModalContentOption(networkName, this.props.t('testFaucet'), () => toFaucet(network))
: this.renderModalContentOption('Coinbase', this.props.t('depositFiat'), () => toCoinbase(address)),
? this.renderModalContentOption(networkName, this.context.t('testFaucet'), () => toFaucet(network))
: this.renderModalContentOption('Coinbase', this.context.t('depositFiat'), () => toCoinbase(address)),
// h('div.buy-modal-content-option', {}, [
// h('div.buy-modal-content-option-title', {}, 'Shapeshift'),
@ -72,8 +78,8 @@ BuyOptions.prototype.render = function () {
// ]),,
this.renderModalContentOption(
this.props.t('directDeposit'),
this.props.t('depositFromAccount'),
this.context.t('directDeposit'),
this.context.t('depositFromAccount'),
() => this.goToAccountDetailsModal()
),
@ -84,7 +90,7 @@ BuyOptions.prototype.render = function () {
background: 'white',
},
onClick: () => { this.props.hideModal() },
}, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, this.props.t('cancel'))),
}, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, this.context.t('cancel'))),
]),
])
}

38
ui/app/components/modals/deposit-ether-modal.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const networkNames = require('../../../../app/scripts/config.js').networkNames
const ShapeshiftForm = require('../shapeshift-form')
@ -40,27 +41,32 @@ function mapDispatchToProps (dispatch) {
}
inherits(DepositEtherModal, Component)
function DepositEtherModal (props) {
function DepositEtherModal (props, context) {
Component.call(this)
// need to set after i18n locale has loaded
DIRECT_DEPOSIT_ROW_TITLE = props.t('directDepositEther')
DIRECT_DEPOSIT_ROW_TEXT = props.t('directDepositEtherExplainer')
COINBASE_ROW_TITLE = props.t('buyCoinbase')
COINBASE_ROW_TEXT = props.t('buyCoinbaseExplainer')
SHAPESHIFT_ROW_TITLE = props.t('depositShapeShift')
SHAPESHIFT_ROW_TEXT = props.t('depositShapeShiftExplainer')
FAUCET_ROW_TITLE = props.t('testFaucet')
DIRECT_DEPOSIT_ROW_TITLE = context.t('directDepositEther')
DIRECT_DEPOSIT_ROW_TEXT = context.t('directDepositEtherExplainer')
COINBASE_ROW_TITLE = context.t('buyCoinbase')
COINBASE_ROW_TEXT = context.t('buyCoinbaseExplainer')
SHAPESHIFT_ROW_TITLE = context.t('depositShapeShift')
SHAPESHIFT_ROW_TEXT = context.t('depositShapeShiftExplainer')
FAUCET_ROW_TITLE = context.t('testFaucet')
this.state = {
buyingWithShapeshift: false,
}
}
DepositEtherModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(DepositEtherModal)
DepositEtherModal.prototype.facuetRowText = function (networkName) {
return this.props.t('getEtherFromFaucet', [networkName])
return this.context.t('getEtherFromFaucet', [networkName])
}
DepositEtherModal.prototype.renderRow = function ({
@ -122,10 +128,10 @@ DepositEtherModal.prototype.render = function () {
h('div.page-container__header', [
h('div.page-container__title', [this.props.t('depositEther')]),
h('div.page-container__title', [this.context.t('depositEther')]),
h('div.page-container__subtitle', [
this.props.t('needEtherInWallet'),
this.context.t('needEtherInWallet'),
]),
h('div.page-container__header-close', {
@ -148,7 +154,7 @@ DepositEtherModal.prototype.render = function () {
}),
title: DIRECT_DEPOSIT_ROW_TITLE,
text: DIRECT_DEPOSIT_ROW_TEXT,
buttonLabel: this.props.t('viewAccount'),
buttonLabel: this.context.t('viewAccount'),
onButtonClick: () => this.goToAccountDetailsModal(),
hide: buyingWithShapeshift,
}),
@ -157,7 +163,7 @@ DepositEtherModal.prototype.render = function () {
logo: h('i.fa.fa-tint.fa-2x'),
title: FAUCET_ROW_TITLE,
text: this.facuetRowText(networkName),
buttonLabel: this.props.t('getEther'),
buttonLabel: this.context.t('getEther'),
onButtonClick: () => toFaucet(network),
hide: !isTestNetwork || buyingWithShapeshift,
}),
@ -171,7 +177,7 @@ DepositEtherModal.prototype.render = function () {
}),
title: COINBASE_ROW_TITLE,
text: COINBASE_ROW_TEXT,
buttonLabel: this.props.t('continueToCoinbase'),
buttonLabel: this.context.t('continueToCoinbase'),
onButtonClick: () => toCoinbase(address),
hide: isTestNetwork || buyingWithShapeshift,
}),
@ -184,7 +190,7 @@ DepositEtherModal.prototype.render = function () {
}),
title: SHAPESHIFT_ROW_TITLE,
text: SHAPESHIFT_ROW_TEXT,
buttonLabel: this.props.t('shapeshiftBuy'),
buttonLabel: this.context.t('shapeshiftBuy'),
onButtonClick: () => this.setState({ buyingWithShapeshift: true }),
hide: isTestNetwork,
hideButton: buyingWithShapeshift,

12
ui/app/components/modals/edit-account-name-modal.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const { getSelectedAccount } = require('../../selectors')
@ -32,8 +33,13 @@ function EditAccountNameModal (props) {
}
}
EditAccountNameModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(EditAccountNameModal)
EditAccountNameModal.prototype.render = function () {
const { hideModal, saveAccountLabel, identity } = this.props
@ -50,7 +56,7 @@ EditAccountNameModal.prototype.render = function () {
]),
h('div.edit-account-name-modal-title', {
}, [this.props.t('editAccountName')]),
}, [this.context.t('editAccountName')]),
h('input.edit-account-name-modal-input', {
placeholder: identity.name,
@ -69,7 +75,7 @@ EditAccountNameModal.prototype.render = function () {
},
disabled: this.state.inputText.length === 0,
}, [
this.props.t('save'),
this.context.t('save'),
]),
]),

20
ui/app/components/modals/export-private-key-modal.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const ethUtil = require('ethereumjs-util')
const actions = require('../../actions')
const AccountModalContainer = require('./account-modal-container')
@ -37,8 +38,13 @@ function ExportPrivateKeyModal () {
}
}
ExportPrivateKeyModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ExportPrivateKeyModal)
ExportPrivateKeyModal.prototype.exportAccountAndGetPrivateKey = function (password, address) {
const { exportAccount } = this.props
@ -48,8 +54,8 @@ ExportPrivateKeyModal.prototype.exportAccountAndGetPrivateKey = function (passwo
ExportPrivateKeyModal.prototype.renderPasswordLabel = function (privateKey) {
return h('span.private-key-password-label', privateKey
? this.props.t('copyPrivateKey')
: this.props.t('typePassword')
? this.context.t('copyPrivateKey')
: this.context.t('typePassword')
)
}
@ -86,8 +92,8 @@ ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, password,
),
(privateKey
? this.renderButton('btn-primary--lg export-private-key__button', () => hideModal(), this.props.t('done'))
: this.renderButton('btn-primary--lg export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), this.props.t('confirm'))
? this.renderButton('btn-primary--lg export-private-key__button', () => hideModal(), this.context.t('done'))
: this.renderButton('btn-primary--lg export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), this.context.t('confirm'))
),
])
@ -120,7 +126,7 @@ ExportPrivateKeyModal.prototype.render = function () {
h('div.account-modal-divider'),
h('span.modal-body-title', this.props.t('showPrivateKeys')),
h('span.modal-body-title', this.context.t('showPrivateKeys')),
h('div.private-key-password', {}, [
this.renderPasswordLabel(privateKey),
@ -130,7 +136,7 @@ ExportPrivateKeyModal.prototype.render = function () {
!warning ? null : h('span.private-key-password-error', warning),
]),
h('div.private-key-password-warning', this.props.t('privateKeyWarning')),
h('div.private-key-password-warning', this.context.t('privateKeyWarning')),
this.renderButtons(privateKey, this.state.password, address, hideModal),

16
ui/app/components/modals/hide-token-confirmation-modal.js
View File

@ -1,7 +1,8 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const Identicon = require('../identicon')
@ -31,8 +32,13 @@ function HideTokenConfirmationModal () {
this.state = {}
}
HideTokenConfirmationModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(HideTokenConfirmationModal)
HideTokenConfirmationModal.prototype.render = function () {
const { token, network, hideToken, hideModal } = this.props
const { symbol, address } = token
@ -41,7 +47,7 @@ HideTokenConfirmationModal.prototype.render = function () {
h('div.hide-token-confirmation__container', {
}, [
h('div.hide-token-confirmation__title', {}, [
this.props.t('hideTokenPrompt'),
this.context.t('hideTokenPrompt'),
]),
h(Identicon, {
@ -54,19 +60,19 @@ HideTokenConfirmationModal.prototype.render = function () {
h('div.hide-token-confirmation__symbol', {}, symbol),
h('div.hide-token-confirmation__copy', {}, [
this.props.t('readdToken'),
this.context.t('readdToken'),
]),
h('div.hide-token-confirmation__buttons', {}, [
h('button.btn-cancel.hide-token-confirmation__button.allcaps', {
onClick: () => hideModal(),
}, [
this.props.t('cancel'),
this.context.t('cancel'),
]),
h('button.btn-clear.hide-token-confirmation__button.allcaps', {
onClick: () => hideToken(address),
}, [
this.props.t('hide'),
this.context.t('hide'),
]),
]),
]),

21
ui/app/components/modals/new-account-modal.js
View File

@ -1,7 +1,7 @@
const { Component } = require('react')
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
class NewAccountModal extends Component {
@ -11,7 +11,7 @@ class NewAccountModal extends Component {
const newAccountNumber = numberOfExistingAccounts + 1
this.state = {
newAccountName: `${props.t('account')} ${newAccountNumber}`,
newAccountName: `${this.context.t('account')} ${newAccountNumber}`,
}
}
@ -22,7 +22,7 @@ class NewAccountModal extends Component {
h('div.new-account-modal-wrapper', {
}, [
h('div.new-account-modal-header', {}, [
this.props.t('newAccount'),
this.context.t('newAccount'),
]),
h('div.modal-close-x', {
@ -30,19 +30,19 @@ class NewAccountModal extends Component {
}),
h('div.new-account-modal-content', {}, [
this.props.t('accountName'),
this.context.t('accountName'),
]),
h('div.new-account-input-wrapper', {}, [
h('input.new-account-input', {
value: this.state.newAccountName,
placeholder: this.props.t('sampleAccountName'),
placeholder: this.context.t('sampleAccountName'),
onChange: event => this.setState({ newAccountName: event.target.value }),
}, []),
]),
h('div.new-account-modal-content.after-input', {}, [
this.props.t('or'),
this.context.t('or'),
]),
h('div.new-account-modal-content.after-input.pointer', {
@ -50,13 +50,13 @@ class NewAccountModal extends Component {
this.props.hideModal()
this.props.showImportPage()
},
}, this.props.t('importAnAccount')),
}, this.context.t('importAnAccount')),
h('div.new-account-modal-content.button.allcaps', {}, [
h('button.btn-clear', {
onClick: () => this.props.createAccount(newAccountName),
}, [
this.props.t('save'),
this.context.t('save'),
]),
]),
]),
@ -104,4 +104,9 @@ const mapDispatchToProps = dispatch => {
}
}
NewAccountModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(NewAccountModal)

11
ui/app/components/modals/notification-modal.js
View File

@ -1,7 +1,7 @@
const { Component } = require('react')
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
class NotificationModal extends Component {
@ -22,12 +22,12 @@ class NotificationModal extends Component {
}, [
h('div.notification-modal__header', {}, [
this.props.t(header),
this.context.t(header),
]),
h('div.notification-modal__message-wrapper', {}, [
h('div.notification-modal__message', {}, [
this.props.t(message),
this.context.t(message),
]),
]),
@ -73,4 +73,9 @@ const mapDispatchToProps = dispatch => {
}
}
NotificationModal.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(null, mapDispatchToProps)(NotificationModal)

2
ui/app/components/modals/notification-modals/confirm-reset-account.js
View File

@ -1,7 +1,7 @@
const { Component } = require('react')
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../../actions')
const NotifcationModal = require('../notification-modal')

2
ui/app/components/modals/shapeshift-deposit-tx-modal.js
View File

@ -1,7 +1,7 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const QrView = require('../qr-code')
const AccountModalContainer = require('./account-modal-container')

9
ui/app/components/network-display.js
View File

@ -1,7 +1,7 @@
const { Component } = require('react')
const h = require('react-hyperscript')
const PropTypes = require('prop-types')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
const networkToColorHash = {
@ -30,7 +30,7 @@ class NetworkDisplay extends Component {
const { provider: { type } } = this.props
return h('.network-display__container', [
this.renderNetworkIcon(),
h('.network-name', this.props.t(type)),
h('.network-name', this.context.t(type)),
])
}
}
@ -48,4 +48,9 @@ const mapStateToProps = ({ metamask: { network, provider } }) => {
}
}
NetworkDisplay.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(NetworkDisplay)

33
ui/app/components/network.js
View File

@ -1,12 +1,18 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const classnames = require('classnames')
const inherits = require('util').inherits
const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon')
Network.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(Network)
inherits(Network, Component)
function Network () {
@ -15,6 +21,7 @@ function Network () {
Network.prototype.render = function () {
const props = this.props
const context = this.context
const networkNumber = props.network
let providerName
try {
@ -34,7 +41,7 @@ Network.prototype.render = function () {
onClick: (event) => this.props.onClick(event),
}, [
h('img', {
title: props.t('attemptingConnect'),
title: context.t('attemptingConnect'),
style: {
width: '27px',
},
@ -42,22 +49,22 @@ Network.prototype.render = function () {
}),
])
} else if (providerName === 'mainnet') {
hoverText = props.t('mainnet')
hoverText = context.t('mainnet')
iconName = 'ethereum-network'
} else if (providerName === 'ropsten') {
hoverText = props.t('ropsten')
hoverText = context.t('ropsten')
iconName = 'ropsten-test-network'
} else if (parseInt(networkNumber) === 3) {
hoverText = props.t('ropsten')
hoverText = context.t('ropsten')
iconName = 'ropsten-test-network'
} else if (providerName === 'kovan') {
hoverText = props.t('kovan')
hoverText = context.t('kovan')
iconName = 'kovan-test-network'
} else if (providerName === 'rinkeby') {
hoverText = props.t('rinkeby')
hoverText = context.t('rinkeby')
iconName = 'rinkeby-test-network'
} else {
hoverText = props.t('unknownNetwork')
hoverText = context.t('unknownNetwork')
iconName = 'unknown-private-network'
}
@ -85,7 +92,7 @@ Network.prototype.render = function () {
backgroundColor: '#038789', // $blue-lagoon
nonSelectBackgroundColor: '#15afb2',
}),
h('.network-name', props.t('mainnet')),
h('.network-name', context.t('mainnet')),
h('i.fa.fa-chevron-down.fa-lg.network-caret'),
])
case 'ropsten-test-network':
@ -94,7 +101,7 @@ Network.prototype.render = function () {
backgroundColor: '#e91550', // $crimson
nonSelectBackgroundColor: '#ec2c50',
}),
h('.network-name', props.t('ropsten')),
h('.network-name', context.t('ropsten')),
h('i.fa.fa-chevron-down.fa-lg.network-caret'),
])
case 'kovan-test-network':
@ -103,7 +110,7 @@ Network.prototype.render = function () {
backgroundColor: '#690496', // $purple
nonSelectBackgroundColor: '#b039f3',
}),
h('.network-name', props.t('kovan')),
h('.network-name', context.t('kovan')),
h('i.fa.fa-chevron-down.fa-lg.network-caret'),
])
case 'rinkeby-test-network':
@ -112,7 +119,7 @@ Network.prototype.render = function () {
backgroundColor: '#ebb33f', // $tulip-tree
nonSelectBackgroundColor: '#ecb23e',
}),
h('.network-name', props.t('rinkeby')),
h('.network-name', context.t('rinkeby')),
h('i.fa.fa-chevron-down.fa-lg.network-caret'),
])
default:
@ -124,7 +131,7 @@ Network.prototype.render = function () {
},
}),
h('.network-name', props.t('privateNetwork')),
h('.network-name', context.t('privateNetwork')),
h('i.fa.fa-chevron-down.fa-lg.network-caret'),
])
}

10
ui/app/components/notice.js
View File

@ -1,13 +1,19 @@
const inherits = require('util').inherits
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const ReactMarkdown = require('react-markdown')
const linker = require('extension-link-enabler')
const findDOMNode = require('react-dom').findDOMNode
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
Notice.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(Notice)
inherits(Notice, Component)
function Notice () {
Component.call(this)
@ -111,7 +117,7 @@ Notice.prototype.render = function () {
style: {
marginTop: '18px',
},
}, this.props.t('accept')),
}, this.context.t('accept')),
])
)
}

10
ui/app/components/pending-msg-details.js
View File

@ -1,12 +1,18 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const AccountPanel = require('./account-panel')
PendingMsgDetails.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(PendingMsgDetails)
inherits(PendingMsgDetails, Component)
function PendingMsgDetails () {
Component.call(this)
@ -40,7 +46,7 @@ PendingMsgDetails.prototype.render = function () {
// message data
h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [
h('.flex-column.flex-space-between', [
h('label.font-small.allcaps', this.props.t('message')),
h('label.font-small.allcaps', this.context.t('message')),
h('span.font-small', msgParams.data),
]),
]),

18
ui/app/components/pending-msg.js
View File

@ -1,11 +1,17 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const PendingTxDetails = require('./pending-msg-details')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
PendingMsg.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(PendingMsg)
inherits(PendingMsg, Component)
function PendingMsg () {
Component.call(this)
@ -30,14 +36,14 @@ PendingMsg.prototype.render = function () {
fontWeight: 'bold',
textAlign: 'center',
},
}, this.props.t('signMessage')),
}, this.context.t('signMessage')),
h('.error', {
style: {
margin: '10px',
},
}, [
this.props.t('signNotice'),
this.context.t('signNotice'),
h('a', {
href: 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527',
style: { color: 'rgb(247, 134, 28)' },
@ -46,7 +52,7 @@ PendingMsg.prototype.render = function () {
const url = 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527'
global.platform.openWindow({ url })
},
}, this.props.t('readMore')),
}, this.context.t('readMore')),
]),
// message details
@ -56,10 +62,10 @@ PendingMsg.prototype.render = function () {
h('.flex-row.flex-space-around', [
h('button', {
onClick: state.cancelMessage,
}, this.props.t('cancel')),
}, this.context.t('cancel')),
h('button', {
onClick: state.signMessage,
}, this.props.t('sign')),
}, this.context.t('sign')),
]),
])

32
ui/app/components/pending-tx/confirm-deploy-contract.js
View File

@ -1,5 +1,5 @@
const { Component } = require('react')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const PropTypes = require('prop-types')
const actions = require('../../actions')
@ -32,7 +32,7 @@ class ConfirmDeployContract extends Component {
if (valid && this.verifyGasParams()) {
this.props.sendTransaction(txMeta, event)
} else {
this.props.displayWarning(this.props.t('invalidGasParams'))
this.props.displayWarning(this.context.t('invalidGasParams'))
this.setState({ submitting: false })
}
}
@ -177,7 +177,7 @@ class ConfirmDeployContract extends Component {
return (
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('gasFee') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('gasFee') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency.toUpperCase()}`),
@ -216,8 +216,8 @@ class ConfirmDeployContract extends Component {
return (
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
h('div.confirm-screen-section-column', [
h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
h('span.confirm-screen-label', [ this.context.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.context.t('amountPlusGas') ]),
]),
h('div.confirm-screen-section-column', [
@ -247,11 +247,11 @@ class ConfirmDeployContract extends Component {
h('.page-container__header-row', [
h('span.page-container__back-button', {
onClick: () => backToAccountDetail(selectedAddress),
}, this.props.t('back')),
}, this.context.t('back')),
window.METAMASK_UI_TYPE === 'notification' && h(NetworkDisplay),
]),
h('.page-container__title', this.props.t('confirmContract')),
h('.page-container__subtitle', this.props.t('pleaseReviewTransaction')),
h('.page-container__title', this.context.t('confirmContract')),
h('.page-container__subtitle', this.context.t('pleaseReviewTransaction')),
]),
// Main Send token Card
h('.page-container__content', [
@ -274,7 +274,7 @@ class ConfirmDeployContract extends Component {
h('div.confirm-screen-rows', [
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('from') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('from') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', fromName),
h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`),
@ -282,9 +282,9 @@ class ConfirmDeployContract extends Component {
]),
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('to') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('to') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', this.props.t('newContract')),
h('div.confirm-screen-row-info', this.context.t('newContract')),
]),
]),
@ -302,12 +302,12 @@ class ConfirmDeployContract extends Component {
// Cancel Button
h('button.btn-cancel.page-container__footer-button.allcaps', {
onClick: event => this.cancel(event, txMeta),
}, this.props.t('cancel')),
}, this.context.t('cancel')),
// Accept Button
h('button.btn-confirm.page-container__footer-button.allcaps', {
onClick: event => this.onSubmit(event),
}, this.props.t('confirm')),
}, this.context.t('confirm')),
]),
]),
])
@ -351,4 +351,8 @@ const mapDispatchToProps = dispatch => {
}
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmDeployContract)
ConfirmDeployContract.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmDeployContract)

26
ui/app/components/pending-tx/confirm-send-ether.js
View File

@ -1,5 +1,6 @@
const Component = require('react').Component
const connect = require('../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const inherits = require('util').inherits
const actions = require('../../actions')
@ -18,8 +19,13 @@ const NetworkDisplay = require('../network-display')
const { MIN_GAS_PRICE_HEX } = require('../send/send-constants')
ConfirmSendEther.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmSendEther)
function mapStateToProps (state) {
const {
conversionRate,
@ -196,7 +202,7 @@ ConfirmSendEther.prototype.getData = function () {
},
to: {
address: txParams.to,
name: identities[txParams.to] ? identities[txParams.to].name : this.props.t('newRecipient'),
name: identities[txParams.to] ? identities[txParams.to].name : this.context.t('newRecipient'),
},
memo: txParams.memo || '',
gasFeeInFIAT,
@ -297,7 +303,7 @@ ConfirmSendEther.prototype.render = function () {
h('div.confirm-screen-rows', [
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('from') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('from') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', fromName),
h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`),
@ -305,7 +311,7 @@ ConfirmSendEther.prototype.render = function () {
]),
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('to') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('to') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', toName),
h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`),
@ -313,7 +319,7 @@ ConfirmSendEther.prototype.render = function () {
]),
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('gasFee') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('gasFee') ]),
h('div.confirm-screen-section-column', [
h(GasFeeDisplay, {
gasTotal: gasTotal || gasFeeInHex,
@ -326,8 +332,8 @@ ConfirmSendEther.prototype.render = function () {
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
h('div.confirm-screen-section-column', [
h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
h('span.confirm-screen-label', [ this.context.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.context.t('amountPlusGas') ]),
]),
h('div.confirm-screen-section-column', [
@ -428,10 +434,10 @@ ConfirmSendEther.prototype.render = function () {
clearSend()
this.cancel(event, txMeta)
},
}, this.props.t('cancel')),
}, this.context.t('cancel')),
// Accept Button
h('button.btn-confirm.page-container__footer-button.allcaps', [this.props.t('confirm')]),
h('button.btn-confirm.page-container__footer-button.allcaps', [this.context.t('confirm')]),
]),
]),
])
@ -447,7 +453,7 @@ ConfirmSendEther.prototype.onSubmit = function (event) {
if (valid && this.verifyGasParams()) {
this.props.sendTransaction(txMeta, event)
} else {
this.props.dispatch(actions.displayWarning(this.props.t('invalidGasParams')))
this.props.dispatch(actions.displayWarning(this.context.t('invalidGasParams')))
this.setState({ submitting: false })
}
}

42
ui/app/components/pending-tx/confirm-send-token.js
View File

@ -1,5 +1,6 @@
const Component = require('react').Component
const connect = require('../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const inherits = require('util').inherits
const tokenAbi = require('human-standard-token-abi')
@ -28,8 +29,13 @@ const {
getSelectedTokenContract,
} = require('../../selectors')
ConfirmSendToken.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ConfirmSendToken)
function mapStateToProps (state, ownProps) {
const { token: { symbol }, txData } = ownProps
const { txParams } = txData || {}
@ -168,7 +174,7 @@ ConfirmSendToken.prototype.getAmount = function () {
? +(sendTokenAmount * tokenExchangeRate * conversionRate).toFixed(2)
: null,
token: typeof value === 'undefined'
? this.props.t('unknown')
? this.context.t('unknown')
: +sendTokenAmount.toFixed(decimals),
}
@ -240,7 +246,7 @@ ConfirmSendToken.prototype.getData = function () {
},
to: {
address: value,
name: identities[value] ? identities[value].name : this.props.t('newRecipient'),
name: identities[value] ? identities[value].name : this.context.t('newRecipient'),
},
memo: txParams.memo || '',
}
@ -286,7 +292,7 @@ ConfirmSendToken.prototype.renderGasFee = function () {
return (
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('gasFee') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('gasFee') ]),
h('div.confirm-screen-section-column', [
h(GasFeeDisplay, {
gasTotal: gasTotal || gasFeeInHex,
@ -308,8 +314,8 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
? (
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
h('div.confirm-screen-section-column', [
h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
h('span.confirm-screen-label', [ this.context.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.context.t('amountPlusGas') ]),
]),
h('div.confirm-screen-section-column', [
@ -321,13 +327,13 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
: (
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
h('div.confirm-screen-section-column', [
h('span.confirm-screen-label', [ this.props.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.props.t('amountPlusGas') ]),
h('span.confirm-screen-label', [ this.context.t('total') + ' ' ]),
h('div.confirm-screen-total-box__subtitle', [ this.context.t('amountPlusGas') ]),
]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', `${tokenAmount} ${symbol}`),
h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} ${this.props.t('gas')}`),
h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} ${this.context.t('gas')}`),
]),
])
)
@ -350,10 +356,10 @@ ConfirmSendToken.prototype.render = function () {
this.inputs = []
const isTxReprice = Boolean(txMeta.lastGasPrice)
const title = isTxReprice ? this.props.t('reprice_title') : this.props.t('confirm')
const title = isTxReprice ? this.context.t('reprice_title') : this.context.t('confirm')
const subtitle = isTxReprice
? this.props.t('reprice_subtitle')
: this.props.t('pleaseReviewTransaction')
? this.context.t('reprice_subtitle')
: this.context.t('pleaseReviewTransaction')
return (
h('div.confirm-screen-container.confirm-send-token', [
@ -362,7 +368,7 @@ ConfirmSendToken.prototype.render = function () {
h('div.page-container__header', [
!txMeta.lastGasPrice && h('button.confirm-screen-back-button', {
onClick: () => editTransaction(txMeta),
}, this.props.t('edit')),
}, this.context.t('edit')),
h('div.page-container__title', title),
h('div.page-container__subtitle', subtitle),
]),
@ -406,7 +412,7 @@ ConfirmSendToken.prototype.render = function () {
h('div.confirm-screen-rows', [
h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('from') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('from') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', fromName),
h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`),
@ -414,7 +420,7 @@ ConfirmSendToken.prototype.render = function () {
]),
toAddress && h('section.flex-row.flex-center.confirm-screen-row', [
h('span.confirm-screen-label.confirm-screen-section-column', [ this.props.t('to') ]),
h('span.confirm-screen-label.confirm-screen-section-column', [ this.context.t('to') ]),
h('div.confirm-screen-section-column', [
h('div.confirm-screen-row-info', toName),
h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`),
@ -436,10 +442,10 @@ ConfirmSendToken.prototype.render = function () {
// Cancel Button
h('button.btn-cancel.page-container__footer-button.allcaps', {
onClick: (event) => this.cancel(event, txMeta),
}, this.props.t('cancel')),
}, this.context.t('cancel')),
// Accept Button
h('button.btn-confirm.page-container__footer-button.allcaps', [this.props.t('confirm')]),
h('button.btn-confirm.page-container__footer-button.allcaps', [this.context.t('confirm')]),
]),
]),
]),
@ -456,7 +462,7 @@ ConfirmSendToken.prototype.onSubmit = function (event) {
if (valid && this.verifyGasParams()) {
this.props.sendTransaction(txMeta, event)
} else {
this.props.dispatch(actions.displayWarning(this.props.t('invalidGasParams')))
this.props.dispatch(actions.displayWarning(this.context.t('invalidGasParams')))
this.setState({ submitting: false })
}
}

2
ui/app/components/pending-tx/index.js
View File

@ -1,5 +1,5 @@
const Component = require('react').Component
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const clone = require('clone')
const abi = require('human-standard-token-abi')

2
ui/app/components/qr-code.js
View File

@ -2,7 +2,7 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const qrCode = require('qrcode-npm').qrcode
const inherits = require('util').inherits
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const isHexPrefixed = require('ethereumjs-util').isHexPrefixed
const ReadOnlyInput = require('./readonly-input')

2
ui/app/components/send/account-list-item.js
View File

@ -1,7 +1,7 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const Identicon = require('../identicon')
const CurrencyDisplay = require('./currency-display')
const { conversionRateSelector, getCurrentCurrency } = require('../../selectors')

12
ui/app/components/send/gas-fee-display-v2.js
View File

@ -1,11 +1,17 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const CurrencyDisplay = require('./currency-display')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
GasFeeDisplay.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(GasFeeDisplay)
inherits(GasFeeDisplay, Component)
function GasFeeDisplay () {
Component.call(this)
@ -33,8 +39,8 @@ GasFeeDisplay.prototype.render = function () {
readOnly: true,
})
: gasLoadingError
? h('div.currency-display.currency-display--message', this.props.t('setGasPrice'))
: h('div.currency-display', this.props.t('loading')),
? h('div.currency-display.currency-display--message', this.context.t('setGasPrice'))
: h('div.currency-display', this.context.t('loading')),
h('button.sliders-icon-container', {
onClick,

10
ui/app/components/send/gas-tooltip.js
View File

@ -1,11 +1,17 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const InputNumber = require('../input-number.js')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
GasTooltip.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(GasTooltip)
inherits(GasTooltip, Component)
function GasTooltip () {
Component.call(this)
@ -82,7 +88,7 @@ GasTooltip.prototype.render = function () {
'marginTop': '81px',
},
}, [
h('span.gas-tooltip-label', {}, [this.props.t('gasLimit')]),
h('span.gas-tooltip-label', {}, [this.context.t('gasLimit')]),
h('i.fa.fa-info-circle'),
]),
h(InputNumber, {

2
ui/app/components/send/send-v2-container.js
View File

@ -1,4 +1,4 @@
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const actions = require('../../actions')
const abi = require('ethereumjs-abi')
const SendEther = require('../../send-v2')

10
ui/app/components/send/to-autocomplete.js
View File

@ -1,11 +1,17 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const AccountListItem = require('./account-list-item')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
ToAutoComplete.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(ToAutoComplete)
inherits(ToAutoComplete, Component)
function ToAutoComplete () {
Component.call(this)
@ -93,7 +99,7 @@ ToAutoComplete.prototype.render = function () {
return h('div.send-v2__to-autocomplete', {}, [
h('input.send-v2__to-autocomplete__input', {
placeholder: this.props.t('recipientAddress'),
placeholder: this.context.t('recipientAddress'),
className: inError ? `send-v2__error-border` : '',
value: to,
onChange: event => onChange(event.target.value),

9
ui/app/components/sender-to-recipient.js
View File

@ -1,6 +1,6 @@
const { Component } = require('react')
const h = require('react-hyperscript')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const PropTypes = require('prop-types')
const Identicon = require('./identicon')
@ -21,7 +21,7 @@ class SenderToRecipient extends Component {
this.renderRecipientIcon(),
h(
'.sender-to-recipient__name.sender-to-recipient__recipient-name',
recipientName || this.props.t('newContract')
recipientName || this.context.t('newContract')
),
])
)
@ -64,4 +64,9 @@ SenderToRecipient.propTypes = {
t: PropTypes.func,
}
SenderToRecipient.contextTypes = {
t: PropTypes.func,
}
module.exports = connect()(SenderToRecipient)

28
ui/app/components/shapeshift-form.js
View File

@ -1,7 +1,8 @@
const h = require('react-hyperscript')
const inherits = require('util').inherits
const PropTypes = require('prop-types')
const Component = require('react').Component
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const classnames = require('classnames')
const { qrcode } = require('qrcode-npm')
const { shapeShiftSubview, pairUpdate, buyWithShapeShift } = require('../actions')
@ -32,8 +33,13 @@ function mapDispatchToProps (dispatch) {
}
}
ShapeshiftForm.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(ShapeshiftForm)
inherits(ShapeshiftForm, Component)
function ShapeshiftForm () {
Component.call(this)
@ -93,7 +99,7 @@ ShapeshiftForm.prototype.onBuyWithShapeShift = function () {
}))
.catch(() => this.setState({
showQrCode: false,
errorMessage: this.props.t('invalidRequest'),
errorMessage: this.context.t('invalidRequest'),
isLoading: false,
}))
}
@ -125,10 +131,10 @@ ShapeshiftForm.prototype.renderMarketInfo = function () {
return h('div.shapeshift-form__metadata', {}, [
this.renderMetadata(this.props.t('status'), limit ? this.props.t('available') : this.props.t('unavailable')),
this.renderMetadata(this.props.t('limit'), limit),
this.renderMetadata(this.props.t('exchangeRate'), rate),
this.renderMetadata(this.props.t('min'), minimum),
this.renderMetadata(this.context.t('status'), limit ? this.context.t('available') : this.context.t('unavailable')),
this.renderMetadata(this.context.t('limit'), limit),
this.renderMetadata(this.context.t('exchangeRate'), rate),
this.renderMetadata(this.context.t('min'), minimum),
])
}
@ -142,7 +148,7 @@ ShapeshiftForm.prototype.renderQrCode = function () {
return h('div.shapeshift-form', {}, [
h('div.shapeshift-form__deposit-instruction', [
this.props.t('depositCoin', [depositCoin.toUpperCase()]),
this.context.t('depositCoin', [depositCoin.toUpperCase()]),
]),
h('div', depositAddress),
@ -179,7 +185,7 @@ ShapeshiftForm.prototype.render = function () {
h('div.shapeshift-form__selector', [
h('div.shapeshift-form__selector-label', this.props.t('deposit')),
h('div.shapeshift-form__selector-label', this.context.t('deposit')),
h(SimpleDropdown, {
selectedOption: this.state.depositCoin,
@ -199,7 +205,7 @@ ShapeshiftForm.prototype.render = function () {
h('div.shapeshift-form__selector', [
h('div.shapeshift-form__selector-label', [
this.props.t('receive'),
this.context.t('receive'),
]),
h('div.shapeshift-form__selector-input', ['ETH']),
@ -217,7 +223,7 @@ ShapeshiftForm.prototype.render = function () {
}, [
h('div.shapeshift-form__address-input-label', [
this.props.t('refundAddress'),
this.context.t('refundAddress'),
]),
h('input.shapeshift-form__address-input', {
@ -239,7 +245,7 @@ ShapeshiftForm.prototype.render = function () {
className: btnClass,
disabled: !token,
onClick: () => this.onBuyWithShapeShift(),
}, [this.props.t('buy')]),
}, [this.context.t('buy')]),
])
}

22
ui/app/components/shift-list-item.js
View File

@ -1,7 +1,8 @@
const inherits = require('util').inherits
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const vreme = new (require('vreme'))()
const explorerLink = require('etherscan-link').createExplorerLink
const actions = require('../actions')
@ -12,8 +13,13 @@ const EthBalance = require('./eth-balance')
const Tooltip = require('./tooltip')
ShiftListItem.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(ShiftListItem)
function mapStateToProps (state) {
return {
selectedAddress: state.metamask.selectedAddress,
@ -75,7 +81,7 @@ ShiftListItem.prototype.renderUtilComponents = function () {
value: this.props.depositAddress,
}),
h(Tooltip, {
title: this.props.t('qrCode'),
title: this.context.t('qrCode'),
}, [
h('i.fa.fa-qrcode.pointer.pop-hover', {
onClick: () => props.dispatch(actions.reshowQrCode(props.depositAddress, props.depositType)),
@ -135,8 +141,8 @@ ShiftListItem.prototype.renderInfo = function () {
color: '#ABA9AA',
width: '100%',
},
}, this.props.t('toETHviaShapeShift', [props.depositType])),
h('div', this.props.t('noDeposits')),
}, this.context.t('toETHviaShapeShift', [props.depositType])),
h('div', this.context.t('noDeposits')),
h('div', {
style: {
fontSize: 'x-small',
@ -158,8 +164,8 @@ ShiftListItem.prototype.renderInfo = function () {
color: '#ABA9AA',
width: '100%',
},
}, this.props.t('toETHviaShapeShift', [props.depositType])),
h('div', this.props.t('conversionProgress')),
}, this.context.t('toETHviaShapeShift', [props.depositType])),
h('div', this.context.t('conversionProgress')),
h('div', {
style: {
fontSize: 'x-small',
@ -184,7 +190,7 @@ ShiftListItem.prototype.renderInfo = function () {
color: '#ABA9AA',
width: '100%',
},
}, this.props.t('fromShapeShift')),
}, this.context.t('fromShapeShift')),
h('div', formatDate(props.time)),
h('div', {
style: {
@ -196,7 +202,7 @@ ShiftListItem.prototype.renderInfo = function () {
])
case 'failed':
return h('span.error', '(' + this.props.t('failed') + ')')
return h('span.error', '(' + this.context.t('failed') + ')')
default:
return ''
}

28
ui/app/components/signature-request.js
View File

@ -1,8 +1,9 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const Identicon = require('./identicon')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const ethUtil = require('ethereumjs-util')
const classnames = require('classnames')
@ -37,8 +38,13 @@ function mapDispatchToProps (dispatch) {
}
}
SignatureRequest.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(SignatureRequest)
inherits(SignatureRequest, Component)
function SignatureRequest (props) {
Component.call(this)
@ -54,7 +60,7 @@ SignatureRequest.prototype.renderHeader = function () {
h('div.request-signature__header-background'),
h('div.request-signature__header__text', this.props.t('sigRequest')),
h('div.request-signature__header__text', this.context.t('sigRequest')),
h('div.request-signature__header__tip-container', [
h('div.request-signature__header__tip'),
@ -75,7 +81,7 @@ SignatureRequest.prototype.renderAccountDropdown = function () {
return h('div.request-signature__account', [
h('div.request-signature__account-text', [this.props.t('account') + ':']),
h('div.request-signature__account-text', [this.context.t('account') + ':']),
h(AccountDropdownMini, {
selectedAccount,
@ -102,7 +108,7 @@ SignatureRequest.prototype.renderBalance = function () {
return h('div.request-signature__balance', [
h('div.request-signature__balance-text', [this.props.t('balance')]),
h('div.request-signature__balance-text', [this.context.t('balance')]),
h('div.request-signature__balance-value', `${balanceInEther} ETH`),
@ -136,7 +142,7 @@ SignatureRequest.prototype.renderRequestInfo = function () {
return h('div.request-signature__request-info', [
h('div.request-signature__headline', [
this.props.t('yourSigRequested'),
this.context.t('yourSigRequested'),
]),
])
@ -154,18 +160,18 @@ SignatureRequest.prototype.msgHexToText = function (hex) {
SignatureRequest.prototype.renderBody = function () {
let rows
let notice = this.props.t('youSign') + ':'
let notice = this.context.t('youSign') + ':'
const { txData } = this.props
const { type, msgParams: { data } } = txData
if (type === 'personal_sign') {
rows = [{ name: this.props.t('message'), value: this.msgHexToText(data) }]
rows = [{ name: this.context.t('message'), value: this.msgHexToText(data) }]
} else if (type === 'eth_signTypedData') {
rows = data
} else if (type === 'eth_sign') {
rows = [{ name: this.props.t('message'), value: data }]
notice = this.props.t('signNotice')
rows = [{ name: this.context.t('message'), value: data }]
notice = this.context.t('signNotice')
}
return h('div.request-signature__body', {}, [
@ -224,10 +230,10 @@ SignatureRequest.prototype.renderFooter = function () {
return h('div.request-signature__footer', [
h('button.btn-secondary--lg.request-signature__footer__cancel-button', {
onClick: cancel,
}, this.props.t('cancel')),
}, this.context.t('cancel')),
h('button.btn-primary--lg', {
onClick: sign,
}, this.props.t('sign')),
}, this.context.t('sign')),
])
}

2
ui/app/components/token-balance.js
View File

@ -2,7 +2,7 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const TokenTracker = require('eth-token-tracker')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const selectors = require('../selectors')
function mapStateToProps (state) {

2
ui/app/components/token-cell.js
View File

@ -1,7 +1,7 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const Identicon = require('./identicon')
const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
const selectors = require('../selectors')

14
ui/app/components/token-list.js
View File

@ -1,9 +1,10 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const inherits = require('util').inherits
const TokenTracker = require('eth-token-tracker')
const TokenCell = require('./token-cell.js')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const selectors = require('../selectors')
function mapStateToProps (state) {
@ -24,8 +25,13 @@ for (const address in contracts) {
}
}
TokenList.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(TokenList)
inherits(TokenList, Component)
function TokenList () {
this.state = {
@ -42,7 +48,7 @@ TokenList.prototype.render = function () {
const { tokens, isLoading, error } = state
if (isLoading) {
return this.message(this.props.t('loadingTokens'))
return this.message(this.context.t('loadingTokens'))
}
if (error) {
@ -52,7 +58,7 @@ TokenList.prototype.render = function () {
padding: '80px',
},
}, [
this.props.t('troubleTokenBalances'),
this.context.t('troubleTokenBalances'),
h('span.hotFix', {
style: {
color: 'rgba(247, 134, 28, 1)',
@ -63,7 +69,7 @@ TokenList.prototype.render = function () {
url: `https://ethplorer.io/address/${userAddress}`,
})
},
}, this.props.t('here')),
}, this.context.t('here')),
])
}

28
ui/app/components/tx-list-item.js
View File

@ -1,6 +1,7 @@
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('../metamask-connect')
const connect = require('react-redux').connect
const inherits = require('util').inherits
const classnames = require('classnames')
const abi = require('human-standard-token-abi')
@ -15,8 +16,13 @@ const { calcTokenAmount } = require('../token-util')
const { getCurrentCurrency } = require('../selectors')
TxListItem.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(TxListItem)
function mapStateToProps (state) {
return {
tokens: state.metamask.tokens,
@ -74,9 +80,9 @@ TxListItem.prototype.getAddressText = function () {
const addressToRender = txDataName === 'transfer' ? value : address
addressText = `${addressToRender.slice(0, 10)}...${addressToRender.slice(-4)}`
} else if (isMsg) {
addressText = this.props.t('sigRequest')
addressText = this.context.t('sigRequest')
} else {
addressText = this.props.t('contractDeployment')
addressText = this.context.t('contractDeployment')
}
return addressText
@ -313,21 +319,21 @@ TxListItem.prototype.txStatusIndicator = function () {
let name
if (transactionStatus === 'unapproved') {
name = this.props.t('unapproved')
name = this.context.t('unapproved')
} else if (transactionStatus === 'rejected') {
name = this.props.t('rejected')
name = this.context.t('rejected')
} else if (transactionStatus === 'approved') {
name = this.props.t('approved')
name = this.context.t('approved')
} else if (transactionStatus === 'signed') {
name = this.props.t('signed')
name = this.context.t('signed')
} else if (transactionStatus === 'submitted') {
name = this.props.t('submitted')
name = this.context.t('submitted')
} else if (transactionStatus === 'confirmed') {
name = this.props.t('confirmed')
name = this.context.t('confirmed')
} else if (transactionStatus === 'failed') {
name = this.props.t('failed')
name = this.context.t('failed')
} else if (transactionStatus === 'dropped') {
name = this.props.t('dropped')
name = this.context.t('dropped')
}
return name
}

14
ui/app/components/tx-list.js
View File

@ -1,5 +1,6 @@
const Component = require('react').Component
const connect = require('../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const inherits = require('util').inherits
const prefixForNetwork = require('../../lib/etherscan-prefix-for-network')
@ -11,8 +12,13 @@ const { showConfTxPage } = require('../actions')
const classnames = require('classnames')
const { tokenInfoGetter } = require('../token-util')
TxList.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(TxList)
function mapStateToProps (state) {
return {
txsToRender: selectors.transactionsSelector(state),
@ -39,7 +45,7 @@ TxList.prototype.render = function () {
return h('div.flex-column', [
h('div.flex-row.tx-list-header-wrapper', [
h('div.flex-row.tx-list-header', [
h('div', this.props.t('transactions')),
h('div', this.context.t('transactions')),
]),
]),
h('div.flex-column.tx-list-container', {}, [
@ -56,7 +62,7 @@ TxList.prototype.renderTransaction = function () {
: [h(
'div.tx-list-item.tx-list-item--empty',
{ key: 'tx-list-none' },
[ this.props.t('noTransactions') ],
[ this.context.t('noTransactions') ],
)]
}
@ -111,7 +117,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
if (isUnapproved) {
opts.onClick = () => showConfTxPage({ id: transactionId })
opts.transactionStatus = this.props.t('notStarted')
opts.transactionStatus = this.context.t('notStarted')
} else if (transactionHash) {
opts.onClick = () => this.view(transactionHash, transactionNetworkId)
}

14
ui/app/components/tx-view.js
View File

@ -1,5 +1,6 @@
const Component = require('react').Component
const connect = require('../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const ethUtil = require('ethereumjs-util')
const inherits = require('util').inherits
@ -10,8 +11,13 @@ const BalanceComponent = require('./balance-component')
const TxList = require('./tx-list')
const Identicon = require('./identicon')
TxView.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(TxView)
function mapStateToProps (state) {
const sidebarOpen = state.appState.sidebarOpen
const isMascara = state.appState.isMascara
@ -72,21 +78,21 @@ TxView.prototype.renderButtons = function () {
onClick: () => showModal({
name: 'DEPOSIT_ETHER',
}),
}, this.props.t('deposit')),
}, this.context.t('deposit')),
h('button.btn-primary.hero-balance-button', {
style: {
marginLeft: '0.8em',
},
onClick: showSendPage,
}, this.props.t('send')),
}, this.context.t('send')),
])
)
: (
h('div.flex-row.flex-center.hero-balance-buttons', [
h('button.btn-primary.hero-balance-button', {
onClick: showSendTokenPage,
}, this.props.t('send')),
}, this.context.t('send')),
])
)
}

16
ui/app/components/wallet-view.js
View File

@ -1,5 +1,6 @@
const Component = require('react').Component
const connect = require('../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const inherits = require('util').inherits
const classnames = require('classnames')
@ -12,8 +13,13 @@ const BalanceComponent = require('./balance-component')
const TokenList = require('./token-list')
const selectors = require('../selectors')
WalletView.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(WalletView)
function mapStateToProps (state) {
return {
@ -116,7 +122,7 @@ WalletView.prototype.render = function () {
onClick: hideSidebar,
}),
h('div.wallet-view__keyring-label.allcaps', isLoose ? this.props.t('imported') : ''),
h('div.wallet-view__keyring-label.allcaps', isLoose ? this.context.t('imported') : ''),
h('div.flex-column.flex-center.wallet-view__name-container', {
style: { margin: '0 auto' },
@ -133,13 +139,13 @@ WalletView.prototype.render = function () {
selectedIdentity.name,
]),
h('button.btn-clear.wallet-view__details-button.allcaps', this.props.t('details')),
h('button.btn-clear.wallet-view__details-button.allcaps', this.context.t('details')),
]),
]),
h(Tooltip, {
position: 'bottom',
title: this.state.hasCopied ? this.props.t('copiedExclamation') : this.props.t('copyToClipboard'),
title: this.state.hasCopied ? this.context.t('copiedExclamation') : this.context.t('copyToClipboard'),
wrapperClassName: 'wallet-view__tooltip',
}, [
h('button.wallet-view__address', {
@ -172,7 +178,7 @@ WalletView.prototype.render = function () {
showAddTokenPage()
hideSidebar()
},
}, this.props.t('addToken')),
}, this.context.t('addToken')),
])
}

2
ui/app/conf-tx.js
View File

@ -1,7 +1,7 @@
const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('./metamask-connect')
const connect = require('react-redux').connect
const actions = require('./actions')
const txHelper = require('../lib/tx-helper')

26
ui/app/first-time/init-menu.js
View File

@ -1,7 +1,8 @@
const inherits = require('util').inherits
const EventEmitter = require('events').EventEmitter
const Component = require('react').Component
const connect = require('../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const Mascot = require('../components/mascot')
const actions = require('../actions')
@ -12,8 +13,13 @@ const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums
let isSubmitting = false
InitializeMenuScreen.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(InitializeMenuScreen)
inherits(InitializeMenuScreen, Component)
function InitializeMenuScreen () {
Component.call(this)
@ -59,7 +65,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
color: '#7F8082',
marginBottom: 10,
},
}, this.props.t('appName')),
}, this.context.t('appName')),
h('div', [
@ -69,10 +75,10 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
color: '#7F8082',
display: 'inline',
},
}, this.props.t('encryptNewDen')),
}, this.context.t('encryptNewDen')),
h(Tooltip, {
title: this.props.t('denExplainer'),
title: this.context.t('denExplainer'),
}, [
h('i.fa.fa-question-circle.pointer', {
style: {
@ -92,7 +98,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
h('input.large-input.letter-spacey', {
type: 'password',
id: 'password-box',
placeholder: this.props.t('newPassword'),
placeholder: this.context.t('newPassword'),
onInput: this.inputChanged.bind(this),
style: {
width: 260,
@ -104,7 +110,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
h('input.large-input.letter-spacey', {
type: 'password',
id: 'password-box-confirm',
placeholder: this.props.t('confirmPassword'),
placeholder: this.context.t('confirmPassword'),
onKeyPress: this.createVaultOnEnter.bind(this),
onInput: this.inputChanged.bind(this),
style: {
@ -119,7 +125,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
style: {
margin: 12,
},
}, this.props.t('createDen')),
}, this.context.t('createDen')),
h('.flex-row.flex-center.flex-grow', [
h('p.pointer', {
@ -129,7 +135,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
color: 'rgb(247, 134, 28)',
textDecoration: 'underline',
},
}, this.props.t('importDen')),
}, this.context.t('importDen')),
]),
h('.flex-row.flex-center.flex-grow', [
@ -178,12 +184,12 @@ InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {
var passwordConfirm = passwordConfirmBox.value
if (password.length < 8) {
this.warning = this.props.t('passwordShort')
this.warning = this.context.t('passwordShort')
this.props.dispatch(actions.displayWarning(this.warning))
return
}
if (password !== passwordConfirm) {
this.warning = this.props.t('passwordMismatch')
this.warning = this.context.t('passwordMismatch')
this.props.dispatch(actions.displayWarning(this.warning))
return
}

36
ui/app/i18n-provider.js Normal file
View File

@ -0,0 +1,36 @@
const { Component } = require('react')
const connect = require('react-redux').connect
const PropTypes = require('prop-types')
const t = require('../i18n-helper').getMessage
class I18nProvider extends Component {
getChildContext() {
const { localeMessages } = this.props
return {
t: t.bind(null, localeMessages),
}
}
render() {
return this.props.children
}
}
I18nProvider.propTypes = {
localeMessages: PropTypes.object,
children: PropTypes.object,
}
I18nProvider.childContextTypes = {
t: PropTypes.func,
}
const mapStateToProps = state => {
const { localeMessages } = state
return {
localeMessages,
}
}
module.exports = connect(mapStateToProps)(I18nProvider)

2
ui/app/keychains/hd/create-vault-complete.js
View File

@ -1,6 +1,6 @@
const inherits = require('util').inherits
const Component = require('react').Component
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const actions = require('../../actions')
const exportAsFile = require('../../util').exportAsFile

15
ui/app/keychains/hd/recover-seed/confirmation.js
View File

@ -1,12 +1,17 @@
const inherits = require('util').inherits
const Component = require('react').Component
const connect = require('../../../metamask-connect')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const actions = require('../../../actions')
RevealSeedConfirmation.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(RevealSeedConfirmation)
inherits(RevealSeedConfirmation, Component)
function RevealSeedConfirmation () {
Component.call(this)
@ -49,13 +54,13 @@ RevealSeedConfirmation.prototype.render = function () {
},
}, [
h('h4', this.props.t('revealSeedWordsWarning')),
h('h4', this.context.t('revealSeedWordsWarning')),
// confirmation
h('input.large-input.letter-spacey', {
type: 'password',
id: 'password-box',
placeholder: this.props.t('enterPasswordConfirm'),
placeholder: this.context.t('enterPasswordConfirm'),
onKeyPress: this.checkConfirmation.bind(this),
style: {
width: 260,
@ -91,7 +96,7 @@ RevealSeedConfirmation.prototype.render = function () {
),
props.inProgress && (
h('span.in-progress-notification', this.props.t('generatingSeed'))
h('span.in-progress-notification', this.context.t('generatingSeed'))
),
]),
])

32
ui/app/keychains/hd/restore-vault.js
View File

@ -1,11 +1,17 @@
const inherits = require('util').inherits
const PropTypes = require('prop-types')
const PersistentForm = require('../../../lib/persistent-form')
const connect = require('../../metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const actions = require('../../actions')
RestoreVaultScreen.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(RestoreVaultScreen)
inherits(RestoreVaultScreen, PersistentForm)
function RestoreVaultScreen () {
PersistentForm.call(this)
@ -36,23 +42,23 @@ RestoreVaultScreen.prototype.render = function () {
padding: 6,
},
}, [
this.props.t('restoreVault'),
this.context.t('restoreVault'),
]),
// wallet seed entry
h('h3', this.props.t('walletSeed')),
h('h3', this.context.t('walletSeed')),
h('textarea.twelve-word-phrase.letter-spacey', {
dataset: {
persistentFormId: 'wallet-seed',
},
placeholder: this.props.t('secretPhrase'),
placeholder: this.context.t('secretPhrase'),
}),
// password
h('input.large-input.letter-spacey', {
type: 'password',
id: 'password-box',
placeholder: this.props.t('newPassword8Chars'),
placeholder: this.context.t('newPassword8Chars'),
dataset: {
persistentFormId: 'password',
},
@ -66,7 +72,7 @@ RestoreVaultScreen.prototype.render = function () {
h('input.large-input.letter-spacey', {
type: 'password',
id: 'password-box-confirm',
placeholder: this.props.t('confirmPassword'),
placeholder: this.context.t('confirmPassword'),
onKeyPress: this.createOnEnter.bind(this),
dataset: {
persistentFormId: 'password-confirmation',
@ -96,7 +102,7 @@ RestoreVaultScreen.prototype.render = function () {
style: {
textTransform: 'uppercase',
},
}, this.props.t('cancel')),
}, this.context.t('cancel')),
// submit
h('button.primary', {
@ -104,7 +110,7 @@ RestoreVaultScreen.prototype.render = function () {
style: {
textTransform: 'uppercase',
},
}, this.props.t('ok')),
}, this.context.t('ok')),
]),
])
)
@ -135,13 +141,13 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
var passwordConfirmBox = document.getElementById('password-box-confirm')
var passwordConfirm = passwordConfirmBox.value
if (password.length < 8) {
this.warning = this.props.t('passwordNotLongEnough')
this.warning = this.context.t('passwordNotLongEnough')
this.props.dispatch(actions.displayWarning(this.warning))
return
}
if (password !== passwordConfirm) {
this.warning = this.props.t('passwordsDontMatch')
this.warning = this.context.t('passwordsDontMatch')
this.props.dispatch(actions.displayWarning(this.warning))
return
}
@ -151,18 +157,18 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
// true if the string has more than a space between words.
if (seed.split(' ').length > 1) {
this.warning = this.props.t('spaceBetween')
this.warning = this.context.t('spaceBetween')
this.props.dispatch(actions.displayWarning(this.warning))
return
}
// true if seed contains a character that is not between a-z or a space
if (!seed.match(/^[a-z ]+$/)) {
this.warning = this.props.t('loweCaseWords')
this.warning = this.context.t('loweCaseWords')
this.props.dispatch(actions.displayWarning(this.warning))
return
}
if (seed.split(' ').length !== 12) {
this.warning = this.props.t('seedPhraseReq')
this.warning = this.context.t('seedPhraseReq')
this.props.dispatch(actions.displayWarning(this.warning))
return
}

2
ui/app/new-keychain.js
View File

@ -1,7 +1,7 @@
const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('./metamask-connect')
const connect = require('react-redux').connect
module.exports = connect(mapStateToProps)(NewKeychain)

7
ui/app/select-app.js
View File

@ -1,12 +1,13 @@
const inherits = require('util').inherits
const Component = require('react').Component
const connect = require('./metamask-connect')
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const App = require('./app')
const OldApp = require('../../old-ui/app/app')
const { autoAddToBetaUI } = require('./selectors')
const { setFeatureFlag, setNetworkEndpoints } = require('./actions')
const { BETA_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
const I18nProvider = require('./i18n-provider')
function mapStateToProps (state) {
return {
@ -62,7 +63,7 @@ SelectedApp.prototype.render = function () {
// const Selected = betaUI || isMascara || firstTime ? App : OldApp
const { betaUI, isMascara } = this.props
const Selected = betaUI || isMascara ? App : OldApp
const Selected = betaUI || isMascara ? h(I18nProvider, [ h(App) ]) : h(OldApp)
return h(Selected)
return Selected
}

33
ui/app/send-v2.js
View File

@ -1,4 +1,5 @@
const { inherits } = require('util')
const PropTypes = require('prop-types')
const PersistentForm = require('../lib/persistent-form')
const h = require('react-hyperscript')
@ -29,6 +30,10 @@ const {
} = require('./components/send/send-utils')
const { isValidAddress } = require('./util')
SendTransactionScreen.contextTypes = {
t: PropTypes.func,
}
module.exports = SendTransactionScreen
inherits(SendTransactionScreen, PersistentForm)
@ -188,9 +193,9 @@ SendTransactionScreen.prototype.renderHeader = function () {
return h('div.page-container__header', [
h('div.page-container__title', selectedToken ? this.props.t('sendTokens') : this.props.t('sendETH')),
h('div.page-container__title', selectedToken ? this.context.t('sendTokens') : this.context.t('sendETH')),
h('div.page-container__subtitle', this.props.t('onlySendToEtherAddress')),
h('div.page-container__subtitle', this.context.t('onlySendToEtherAddress')),
h('div.page-container__header-close', {
onClick: () => {
@ -261,11 +266,11 @@ SendTransactionScreen.prototype.handleToChange = function (to, nickname = '') {
let toError = null
if (!to) {
toError = this.props.t('required')
toError = this.context.t('required')
} else if (!isValidAddress(to)) {
toError = this.props.t('invalidAddressRecipient')
toError = this.context.t('invalidAddressRecipient')
} else if (to === from) {
toError = this.props.t('fromToSame')
toError = this.context.t('fromToSame')
}
updateSendTo(to, nickname)
@ -281,9 +286,9 @@ SendTransactionScreen.prototype.renderToRow = function () {
h('div.send-v2__form-label', [
this.props.t('to'),
this.context.t('to'),
this.renderErrorMessage(this.props.t('to')),
this.renderErrorMessage(this.context.t('to')),
]),
@ -384,11 +389,11 @@ SendTransactionScreen.prototype.validateAmount = function (value) {
)
if (conversionRate && !sufficientBalance) {
amountError = this.props.t('insufficientFunds')
amountError = this.context.t('insufficientFunds')
} else if (verifyTokenBalance && !sufficientTokens) {
amountError = this.props.t('insufficientTokens')
amountError = this.context.t('insufficientTokens')
} else if (amountLessThanZero) {
amountError = this.props.t('negativeETH')
amountError = this.context.t('negativeETH')
}
updateSendErrors({ amount: amountError })
@ -418,7 +423,7 @@ SendTransactionScreen.prototype.renderAmountRow = function () {
setMaxModeTo(true)
this.setAmountToMax()
},
}, [ !maxModeOn ? this.props.t('max') : '' ]),
}, [ !maxModeOn ? this.context.t('max') : '' ]),
]),
h('div.send-v2__form-field', [
@ -447,7 +452,7 @@ SendTransactionScreen.prototype.renderGasRow = function () {
return h('div.send-v2__form-row', [
h('div.send-v2__form-label', h('gasFee')),
h('div.send-v2__form-label', this.context.t('gasFee')),
h('div.send-v2__form-field', [
@ -517,11 +522,11 @@ SendTransactionScreen.prototype.renderFooter = function () {
clearSend()
goHome()
},
}, this.props.t('cancel')),
}, this.context.t('cancel')),
h('button.btn-primary--lg.page-container__footer-button', {
disabled: !noErrors || !gasTotal || missingTokenBalance,
onClick: event => this.onSubmit(event),
}, this.props.t('next')),
}, this.context.t('next')),
])
}

81
ui/app/settings.js
View File

@ -1,7 +1,7 @@
const { Component } = require('react')
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('./metamask-connect')
const connect = require('react-redux').connect
const actions = require('./actions')
const infuraCurrencies = require('./infura-conversion.json')
const validUrl = require('valid-url')
@ -55,8 +55,8 @@ class Settings extends Component {
return h('div.settings__tabs', [
h(TabBar, {
tabs: [
{ content: this.props.t('settings'), key: 'settings' },
{ content: this.props.t('info'), key: 'info' },
{ content: this.context.t('settings'), key: 'settings' },
{ content: this.context.t('info'), key: 'info' },
],
defaultTab: activeTab,
tabSelected: key => this.setState({ activeTab: key }),
@ -69,7 +69,7 @@ class Settings extends Component {
return h('div.settings__content-row', [
h('div.settings__content-item', [
h('span', this.props.t('blockiesIdenticon')),
h('span', this.context.t('blockiesIdenticon')),
]),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
@ -89,13 +89,13 @@ class Settings extends Component {
return h('div.settings__content-row', [
h('div.settings__content-item', [
h('span', this.props.t('currentConversion')),
h('span', this.context.t('currentConversion')),
h('span.settings__content-description', `Updated ${Date(conversionDate)}`),
]),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
h(SimpleDropdown, {
placeholder: this.props.t('selectCurrency'),
placeholder: this.context.t('selectCurrency'),
options: getInfuraCurrencyOptions(),
selectedOption: currentCurrency,
onSelect: newCurrency => setCurrentCurrency(newCurrency),
@ -136,31 +136,31 @@ class Settings extends Component {
switch (provider.type) {
case 'mainnet':
title = this.props.t('currentNetwork')
value = this.props.t('mainnet')
title = this.context.t('currentNetwork')
value = this.context.t('mainnet')
color = '#038789'
break
case 'ropsten':
title = this.props.t('currentNetwork')
value = this.props.t('ropsten')
title = this.context.t('currentNetwork')
value = this.context.t('ropsten')
color = '#e91550'
break
case 'kovan':
title = this.props.t('currentNetwork')
value = this.props.t('kovan')
title = this.context.t('currentNetwork')
value = this.context.t('kovan')
color = '#690496'
break
case 'rinkeby':
title = this.props.t('currentNetwork')
value = this.props.t('rinkeby')
title = this.context.t('currentNetwork')
value = this.context.t('rinkeby')
color = '#ebb33f'
break
default:
title = this.props.t('currentRpc')
title = this.context.t('currentRpc')
value = provider.rpcTarget
}
@ -181,12 +181,12 @@ class Settings extends Component {
return (
h('div.settings__content-row', [
h('div.settings__content-item', [
h('span', this.props.t('newRPC')),
h('span', this.context.t('newRPC')),
]),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
h('input.settings__input', {
placeholder: this.props.t('newRPC'),
placeholder: this.context.t('newRPC'),
onChange: event => this.setState({ newRpc: event.target.value }),
onKeyPress: event => {
if (event.key === 'Enter') {
@ -199,7 +199,7 @@ class Settings extends Component {
event.preventDefault()
this.validateRpc(this.state.newRpc)
},
}, this.props.t('save')),
}, this.context.t('save')),
]),
]),
])
@ -215,9 +215,9 @@ class Settings extends Component {
const appendedRpc = `http://${newRpc}`
if (validUrl.isWebUri(appendedRpc)) {
displayWarning(this.props.t('uriErrorMsg'))
displayWarning(this.context.t('uriErrorMsg'))
} else {
displayWarning(this.props.t('invalidRPC'))
displayWarning(this.context.t('invalidRPC'))
}
}
}
@ -226,10 +226,10 @@ class Settings extends Component {
return (
h('div.settings__content-row', [
h('div.settings__content-item', [
h('div', this.props.t('stateLogs')),
h('div', this.context.t('stateLogs')),
h(
'div.settings__content-description',
this.props.t('stateLogsDescription')
this.context.t('stateLogsDescription')
),
]),
h('div.settings__content-item', [
@ -238,13 +238,13 @@ class Settings extends Component {
onClick (event) {
window.logStateString((err, result) => {
if (err) {
this.state.dispatch(actions.displayWarning(this.props.t('stateLogError')))
this.state.dispatch(actions.displayWarning(this.context.t('stateLogError')))
} else {
exportAsFile('MetaMask State Logs.json', result)
}
})
},
}, this.props.t('downloadStateLogs')),
}, this.context.t('downloadStateLogs')),
]),
]),
])
@ -256,7 +256,7 @@ class Settings extends Component {
return (
h('div.settings__content-row', [
h('div.settings__content-item', this.props.t('revealSeedWords')),
h('div.settings__content-item', this.context.t('revealSeedWords')),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
h('button.btn-primary--lg.settings__button--red', {
@ -264,7 +264,7 @@ class Settings extends Component {
event.preventDefault()
revealSeedConfirmation()
},
}, this.props.t('revealSeedWords')),
}, this.context.t('revealSeedWords')),
]),
]),
])
@ -276,7 +276,7 @@ class Settings extends Component {
return (
h('div.settings__content-row', [
h('div.settings__content-item', this.props.t('useOldUI')),
h('div.settings__content-item', this.context.t('useOldUI')),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
h('button.btn-primary--lg.settings__button--orange', {
@ -284,7 +284,7 @@ class Settings extends Component {
event.preventDefault()
setFeatureFlagToBeta()
},
}, this.props.t('useOldUI')),
}, this.context.t('useOldUI')),
]),
]),
])
@ -295,7 +295,7 @@ class Settings extends Component {
const { showResetAccountConfirmationModal } = this.props
return h('div.settings__content-row', [
h('div.settings__content-item', this.props.t('resetAccount')),
h('div.settings__content-item', this.context.t('resetAccount')),
h('div.settings__content-item', [
h('div.settings__content-item-col', [
h('button.btn-primary--lg.settings__button--orange', {
@ -303,7 +303,7 @@ class Settings extends Component {
event.preventDefault()
showResetAccountConfirmationModal()
},
}, this.props.t('resetAccount')),
}, this.context.t('resetAccount')),
]),
]),
])
@ -339,13 +339,13 @@ class Settings extends Component {
renderInfoLinks () {
return (
h('div.settings__content-item.settings__content-item--without-height', [
h('div.settings__info-link-header', this.props.t('links')),
h('div.settings__info-link-header', this.context.t('links')),
h('div.settings__info-link-item', [
h('a', {
href: 'https://metamask.io/privacy.html',
target: '_blank',
}, [
h('span.settings__info-link', this.props.t('privacyMsg')),
h('span.settings__info-link', this.context.t('privacyMsg')),
]),
]),
h('div.settings__info-link-item', [
@ -353,7 +353,7 @@ class Settings extends Component {
href: 'https://metamask.io/terms.html',
target: '_blank',
}, [
h('span.settings__info-link', this.props.t('terms')),
h('span.settings__info-link', this.context.t('terms')),
]),
]),
h('div.settings__info-link-item', [
@ -361,7 +361,7 @@ class Settings extends Component {
href: 'https://metamask.io/attributions.html',
target: '_blank',
}, [
h('span.settings__info-link', this.props.t('attributions')),
h('span.settings__info-link', this.context.t('attributions')),
]),
]),
h('hr.settings__info-separator'),
@ -370,7 +370,7 @@ class Settings extends Component {
href: 'https://support.metamask.io',
target: '_blank',
}, [
h('span.settings__info-link', this.props.t('supportCenter')),
h('span.settings__info-link', this.context.t('supportCenter')),
]),
]),
h('div.settings__info-link-item', [
@ -378,7 +378,7 @@ class Settings extends Component {
href: 'https://metamask.io/',
target: '_blank',
}, [
h('span.settings__info-link', this.props.t('visitWebSite')),
h('span.settings__info-link', this.context.t('visitWebSite')),
]),
]),
h('div.settings__info-link-item', [
@ -386,7 +386,7 @@ class Settings extends Component {
target: '_blank',
href: 'mailto:help@metamask.io?subject=Feedback',
}, [
h('span.settings__info-link', this.props.t('emailUs')),
h('span.settings__info-link', this.context.t('emailUs')),
]),
]),
])
@ -408,7 +408,7 @@ class Settings extends Component {
h('div.settings__info-item', [
h(
'div.settings__info-about',
this.props.t('builtInCalifornia')
this.context.t('builtInCalifornia')
),
]),
]),
@ -485,4 +485,9 @@ const mapDispatchToProps = dispatch => {
}
}
Settings.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps, mapDispatchToProps)(Settings)

16
ui/app/unlock.js
View File

@ -1,7 +1,8 @@
const inherits = require('util').inherits
const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('./metamask-connect')
const connect = require('react-redux').connect
const actions = require('./actions')
const getCaretCoordinates = require('textarea-caret')
const EventEmitter = require('events').EventEmitter
@ -10,8 +11,13 @@ const environmentType = require('../../app/scripts/lib/environment-type')
const Mascot = require('./components/mascot')
UnlockScreen.contextTypes = {
t: PropTypes.func,
}
module.exports = connect(mapStateToProps)(UnlockScreen)
inherits(UnlockScreen, Component)
function UnlockScreen () {
Component.call(this)
@ -40,7 +46,7 @@ UnlockScreen.prototype.render = function () {
textTransform: 'uppercase',
color: '#7F8082',
},
}, this.props.t('appName')),
}, this.context.t('appName')),
h('input.large-input', {
type: 'password',
@ -66,7 +72,7 @@ UnlockScreen.prototype.render = function () {
style: {
margin: 10,
},
}, this.props.t('login')),
}, this.context.t('login')),
h('p.pointer', {
onClick: () => {
@ -80,7 +86,7 @@ UnlockScreen.prototype.render = function () {
color: 'rgb(247, 134, 28)',
textDecoration: 'underline',
},
}, this.props.t('restoreFromSeed')),
}, this.context.t('restoreFromSeed')),
h('p.pointer', {
onClick: () => {
@ -93,7 +99,7 @@ UnlockScreen.prototype.render = function () {
textDecoration: 'underline',
marginTop: '32px',
},
}, this.props.t('classicInterface')),
}, this.context.t('classicInterface')),
])
)
}