Lint, test and translation fixes for metametrics.

MetaMask · Feb 14, 2019 · 3d5aeae · 3d5aeae
1 parent f100aba
commit 3d5aeae
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -928,6 +928,12 @@
   "originalTotal": {
     "message": "Original Total"
   },
+  "participateInMetaMetrics": {
+    "message": "Participate in MetaMetrics"
+  },
+  "participateInMetaMetricsDesciption": {
+    "message": "Participate in MetaMetrics to help us make MetaMask better"
+  },
   "password": {
     "message": "Password"
   },

diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js
@@ -26,7 +26,6 @@ import ConfirmResetAccount from './confirm-reset-account'
 import TransactionConfirmed from './transaction-confirmed'
 import CancelTransaction from './cancel-transaction'
 
-import WelcomeBeta from './welcome-beta'
 import MetaMetricsOptIn from './metametrics-opt-in'
 import RejectTransactions from './reject-transactions'
 import ClearApprovedOrigins from './clear-approved-origins'

diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js
@@ -571,9 +571,9 @@ export default class SettingsTab extends PureComponent {
     return (
       <div className="settings-page__content-row">
         <div className="settings-page__content-item">
-          <span>{ 'Participate in MetaMetrics' }</span>
+          <span>{ t('participateInMetaMetrics') }</span>
           <div className="settings-page__content-description">
-            { 'Participate in MetaMetrics to help us make MetaMask better' }
+            { t('participateInMetaMetricsDescription') }
           </div>
         </div>
         <div className="settings-page__content-item">
@@ -608,7 +608,7 @@ export default class SettingsTab extends PureComponent {
         { this.renderHexDataOptIn() }
         { this.renderAdvancedGasInputInline() }
         { this.renderBlockieOptIn() }
-        { this.renderMetaMetricsOptIn () }
+        { this.renderMetaMetricsOptIn() }
       </div>
     )
   }

diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.container.js b/ui/app/components/pages/settings/settings-tab/settings-tab.container.js
@@ -12,6 +12,7 @@ import {
   setFeatureFlag,
   showModal,
   setUseNativeCurrencyAsPrimaryCurrencyPreference,
+  setParticipateInMetaMetrics,
 } from '../../../../actions'
 import { preferencesSelector } from '../../../../selectors'
 

diff --git a/ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js b/ui/app/components/send/send-content/send-gas-row/send-gas-row.component.js
@@ -31,6 +31,7 @@ export default class SendGasRow extends Component {
   };
 
   renderAdvancedOptionsButton () {
+    const { metricsEvent } = this.context
     const { showCustomizeGasModal } = this.props
     return <div className="advanced-gas-options-btn" onClick={() => {
       metricsEvent({
@@ -67,7 +68,6 @@ export default class SendGasRow extends Component {
       gasLimit,
       insufficientBalance,
     } = this.props
-    const { metricsEvent } = this.context
 
     const gasPriceButtonGroup = <div>
         <GasPriceButtonGroup

diff --git a/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-component.test.js b/ui/app/components/send/send-content/send-gas-row/tests/send-gas-row-component.test.js
@@ -30,7 +30,7 @@ describe('SendGasRow Component', function () {
         someGasPriceButtonGroupProp: 'foo',
         anotherGasPriceButtonGroupProp: 'bar',
       }}
-    />, { context: { t: str => str + '_t' } })
+    />, { context: { t: str => str + '_t', metricsEvent: () => ({}) } })
   })
 
   afterEach(() => {