Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts

1 files changed, 8 insertions, 2 deletions

diff --git a/ui/app/components/copyable.js b/ui/app/components/copyable.js
index 28def9adb..ad504deb8 100644
--- a/ui/app/components/copyable.js
+++ b/ui/app/components/copyable.js
@@ -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: {