Fix rebase errors

17 files changed, 22 insertions, 102 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index c7034464..f438a390 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -29,12 +29,7 @@ If applicable, add screenshots to help explain your problem.
 **Browser details (please complete the following information):**
  - OS: [e.g. OS X, Windows]
  - Browser [e.g. chrome, safari]
-<<<<<<< HEAD
- - MetaMask Version [e.g. 5.0.2]
-=======
  - DekuSan Version [e.g. 4.9.0]
- - Old UI or New / Beta UI?
->>>>>>> Complete onboarding flow
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a88271d3..0e0f3597 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - [#5860](https://github.com/MetaMask/metamask-extension/pull/5860): Fixed an infinite spinner bug.
 - [#5875](https://github.com/MetaMask/metamask-extension/pull/5875): Update phishing warning copy
 - [#5863](https://github.com/MetaMask/metamask-extension/pull/5863): bugfix: normalize contract addresss when fetching exchange rates
-- [#5843](https://github.com/MetaMask/metamask-extension/pull/5843): Use selector for state.metamask.accounts in all cases.
+- [#5843](https://github.com/MetaMask/metamask-extension/pull/5843): Use selector for state.dekusan.accounts in all cases.
 
 ## 5.0.4 Thu Nov 29 2018
 
@@ -16,7 +16,7 @@
 - [#5835](https://github.com/MetaMask/metamask-extension/pull/5835): Open full-screen UI on install
 - Locked versions for some dependencies to avoid possible issues from event-stream hack.
 - [#5831](https://github.com/MetaMask/metamask-extension/pull/5831): Hide app-header when provider request pending
-- [#5786](https://github.com/MetaMask/metamask-extension/pull/5786): * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump

+- [#5786](https://github.com/MetaMask/metamask-extension/pull/5786): * transactions - autofill gasPrice for retry attempts with either the recomened gasprice or a %10 bump
 - [#5801](https://github.com/MetaMask/metamask-extension/pull/5801): transactions - ensure err is defined when setting tx failed
 - [#5792](https://github.com/MetaMask/metamask-extension/pull/5792): Consider HW Wallets for signTypedMessage
 - [#5829](https://github.com/MetaMask/metamask-extension/pull/5829): Show disabled cursor in .network-disabled state
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index e13aa9c2..78b005a6 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -98,18 +98,6 @@
   "clickCopy": {
     "message": "Kliknij żeby skopiować"
   },
-<<<<<<< HEAD
-  "clickToAdd": {
-    "message": "Przycisnij $1, aby dodać go do swojego konta"
-  },
-  "close": {
-    "message": "Zamknij"
-  },
-  "chromeRequiredForHardwareWallets": {
-    "message": "Żeby połączyć się z portfelem sprzętowym, należy uruchomić MetaMask z przeglądarką Google Chrome."
-  },
-=======
->>>>>>> Update translations
   "confirm": {
     "message": "Potwierdź"
   },
@@ -915,16 +903,8 @@
   "warning": {
     "message": "Uwaga"
   },
-<<<<<<< HEAD
-  "welcomeBack": {
-    "message": "Witaj z powrotem!"
-  },
-  "welcome": {
-    "message": "Witaj w MetaMask"
-=======
   "welcomeBeta": {
     "message": "Witaj w MetaMask Beta"
->>>>>>> Update translations
   },
   "whatsThis": {
     "message": "Co to jest?"
diff --git a/app/phishing.html b/app/phishing.html
index 8c7c45c7..a1790b73 100644
--- a/app/phishing.html
+++ b/app/phishing.html
@@ -55,17 +55,10 @@
 
       <img src="/images/dekusan.svg" style="height:60px">
       <h3>ATTENTION</h3>
-<<<<<<< HEAD
-      <p>This domain is currently on the MetaMask domain warning list. This means that based on information available to us, MetaMask believes this domain could currently compromise your security and, as an added safety feature, MetaMask has restricted access to the site. To override this, please read the rest of this warning for instructions on how to continue at your own risk.  </p>
-      <p>There are many reasons sites can appear on our warning list, and our warning list compiles from other widely used industry lists. Such reasons can include known fraud or security risks, such as domains that test positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>. Domains on these warning lists may include outright malicious websites and legitimate websites that have been compromised by a malicious actor.
-      <p id="esdbLink"></p>
-      <p>Note that this warning list is compiled on a voluntary basis. This list may be inaccurate or incomplete. Just because a domain does not appear on this list is not an implicit guarantee of that domain's safety. As always, your transactions are your own responsibility. If you wish to interact with any domain on our warning list, you can do so by <a id="unsafe-continue">continuing at your own risk</a>.</p>
-=======
       <p>DekuSan believes this domain could currently compromise your security and has prevented you from interacting with it.</p>
       <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>. This includes outright malicious websites and legitimate websites that have been compromised by a malicious actor.</p>
       <p id="esdbLink"></p>
       <p>You can turn DekuSan off to interact with this site, but it is advised not to.</p>
->>>>>>> Complete onboarding flow
       <p>
         If you think this domain is incorrectly flagged or if a blocked legitimate website has resolved its security issues,
         <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>.
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 01ec0d8b..067b00fc 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -196,22 +196,14 @@ async function loadStateFromPersistence () {
       // we were able to recover (though it might be old)
       versionedData = diskStoreState
       const vaultStructure = getObjStructure(versionedData)
-<<<<<<< HEAD
-      sentry.captureMessage('MetaMask - Empty vault found - recovered from diskStore', {
-=======
-      raven.captureMessage('DekuSan - Empty vault found - recovered from diskStore', {
->>>>>>> Complete onboarding flow
+      sentry.captureMessage('DekuSan - Empty vault found - recovered from diskStore', {
         // "extra" key is required by Sentry
         extra: { vaultStructure },
       })
     } else {
       // unable to recover, clear state
       versionedData = migrator.generateInitialState(firstTimeState)
-<<<<<<< HEAD
-      sentry.captureMessage('MetaMask - Empty vault found - unable to recover')
-=======
-      raven.captureMessage('DekuSan - Empty vault found - unable to recover')
->>>>>>> Complete onboarding flow
+      sentry.captureMessage('DekuSan - Empty vault found - unable to recover')
     }
   }
 
@@ -364,15 +356,11 @@ function setupController (initState, initLangCode) {
     const processName = remotePort.name
     const isDekuSanInternalProcess = metamaskInternalProcessHash[processName]
 
-<<<<<<< HEAD
     if (metamaskBlacklistedPorts.includes(remotePort.name)) {
       return false
     }
 
-    if (isMetaMaskInternalProcess) {
-=======
     if (isDekuSanInternalProcess) {
->>>>>>> Complete onboarding flow
       const portStream = new PortStream(remotePort)
       // communication with popup
       controller.isClientOpen = true
diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js
index 9d38278e..5017b687 100644
--- a/app/scripts/controllers/token-rates.js
+++ b/app/scripts/controllers/token-rates.js
@@ -47,8 +47,6 @@ class TokenRatesController {
   }
 
   /**
-<<<<<<< HEAD
-=======
    * Fetches a token exchange rate by address
    *
    * @param {String} address - Token contract address
@@ -59,13 +57,12 @@ class TokenRatesController {
       const json = await response.json()
       return json && json.length ? json[0].averagePrice : 0
     } catch (error) {
-      warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error)
+      log.warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error)
       return 0
     }
   }
 
   /**
->>>>>>> Complete onboarding flow
    * @type {Number}
    */
   set interval (interval) {
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index 3d8c0b9a..d749321e 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -28,7 +28,7 @@ async function start () {
     const state = window.getCleanAppState()
     // remove unnecessary data
     delete state.localeMessages
-    delete state.metamask.recentBlocks
+    delete state.dekusan.recentBlocks
     // return state to be added to request
     return state
   }
@@ -46,29 +46,7 @@ async function start () {
   const container = document.getElementById('app-content')
   startPopup({ container, connectionStream }, (err, store) => {
     if (err) return displayCriticalError(err)
-<<<<<<< HEAD
-
-    const state = store.getState()
-    let betaUIState = Boolean(state.featureFlags && state.featureFlags.betaUI)
-    const useBetaCss = getShouldUseNewUi(state)
-
-    let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
-    let deleteInjectedCss = injectCss(css)
-    let newBetaUIState
-
-    store.subscribe(() => {
-      const state = store.getState()
-      newBetaUIState = state.metamask.featureFlags.betaUI
-      if (newBetaUIState !== betaUIState) {
-        deleteInjectedCss()
-        betaUIState = newBetaUIState
-        css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss()
-        deleteInjectedCss = injectCss(css)
-      }
-    })
-=======
     injectCss(NewMetaMaskUiCss())
->>>>>>> Complete onboarding flow
   })
 
 
diff --git a/test/unit/ui/app/reducers/app.spec.js b/test/unit/ui/app/reducers/app.spec.js
index bee4963e..d8e964a6 100644
--- a/test/unit/ui/app/reducers/app.spec.js
+++ b/test/unit/ui/app/reducers/app.spec.js
@@ -473,7 +473,7 @@ describe('App State', () => {
       },
     }
     const oldState = {
-      metamask: {...metamaskState.metamask, ...txs},
+      dekusan: { ...metamaskState.dekusan, ...txs},
     }
     const state = reduceApp(oldState, {
       type: actions.SHOW_CONF_TX_PAGE,
diff --git a/ui/app/components/currency-input/tests/currency-input.container.test.js b/ui/app/components/currency-input/tests/currency-input.container.test.js
index ce66f386..feb5a8eb 100644
--- a/ui/app/components/currency-input/tests/currency-input.container.test.js
+++ b/ui/app/components/currency-input/tests/currency-input.container.test.js
@@ -52,12 +52,8 @@ describe('CurrencyInput container', () => {
       assert.deepEqual(mergeProps(mockStateProps, mockDispatchProps, {}), {
         conversionRate: 280.45,
         currentCurrency: 'usd',
-<<<<<<< HEAD
-        nativeCurrency: 'ETH',
-        suffix: 'ETH',
-=======
+        nativeCurrency: 'DEX',
         suffix: 'DEX',
->>>>>>> Update Dexon wording
       })
     })
   })
diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js
index d8298963..7f52db98 100644
--- a/ui/app/components/dropdowns/network-dropdown.js
+++ b/ui/app/components/dropdowns/network-dropdown.js
@@ -26,7 +26,7 @@ function mapStateToProps (state) {
     provider: state.dekusan.provider,
     frequentRpcListDetail: state.dekusan.frequentRpcListDetail || [],
     networkDropdownOpen: state.appState.networkDropdownOpen,
-    network: state.metamask.network,
+    network: state.dekusan.network,
   }
 }
 
diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js
index 2f6395a2..218dc3b9 100644
--- a/ui/app/components/eth-balance.js
+++ b/ui/app/components/eth-balance.js
@@ -12,7 +12,7 @@ const FiatValue = require('./fiat-value.js')
 module.exports = connect(mapStateToProps)(EthBalanceComponent)
 function mapStateToProps (state) {
   return {
-    ticker: state.metamask.ticker,
+    ticker: state.dekusan.ticker,
   }
 }
 
diff --git a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
index 51283286..72a03eca 100644
--- a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
+++ b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js
@@ -45,7 +45,7 @@ proxyquire('../gas-modal-page-container.container.js', {
   '../../../ducks/confirm-transaction.duck': confirmTransactionActionSpies,
   '../../../ducks/send.duck': sendActionSpies,
   '../../../selectors.js': {
-    getCurrentEthBalance: (state) => state.metamask.balance || '0x0',
+    getCurrentEthBalance: (state) => state.dekusan.balance || '0x0',
   },
 })
 
@@ -138,7 +138,7 @@ describe('gas-modal-page-container container', () => {
         { mockState: baseMockState, expectedResult: baseExpectedResult, mockOwnProps: baseMockOwnProps },
         {
           mockState: Object.assign({}, baseMockState, {
-            metamask: { ...baseMockState.metamask, balance: '0xfffffffffffffffffffff' },
+            dekusan: { ...baseMockState.dekusan, balance: '0xfffffffffffffffffffff' },
           }),
           expectedResult: Object.assign({}, baseExpectedResult, { insufficientBalance: false }),
           mockOwnProps: baseMockOwnProps,
diff --git a/ui/app/components/send/send.selectors.js b/ui/app/components/send/send.selectors.js
index 175ada9b..f6638c45 100644
--- a/ui/app/components/send/send.selectors.js
+++ b/ui/app/components/send/send.selectors.js
@@ -76,9 +76,9 @@ function accountsWithSendEtherInfoSelector (state) {
 //   const autoAddAccountsThreshold = 2
 //   const autoAddTokensThreshold = 1
 
-//   const numberOfTransactions = state.metamask.selectedAddressTxList.length
+//   const numberOfTransactions = state.dekusan.selectedAddressTxList.length
 //   const numberOfAccounts = Object.keys(getMetaMaskAccounts(state)).length
-//   const numberOfTokensAdded = state.metamask.tokens.length
+//   const numberOfTokensAdded = state.dekusan.tokens.length
 
 //   const userPassesThreshold = (numberOfTransactions > autoAddTransactionThreshold) &&
 //     (numberOfAccounts > autoAddAccountsThreshold) &&
@@ -118,7 +118,7 @@ function getCurrentCurrency (state) {
 }
 
 function getNativeCurrency (state) {
-  return state.metamask.nativeCurrency
+  return state.dekusan.nativeCurrency
 }
 
 function getCurrentNetwork (state) {
diff --git a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
index af60aa1d..f5aae92c 100644
--- a/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
+++ b/ui/app/components/user-preferenced-currency-display/user-preferenced-currency-display.container.js
@@ -8,7 +8,7 @@ const mapStateToProps = (state, ownProps) => {
 
   return {
     useNativeCurrencyAsPrimaryCurrency,
-    nativeCurrency: state.metamask.nativeCurrency,
+    nativeCurrency: state.dekusan.nativeCurrency,
   }
 }
 
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index 404d733e..4e329060 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -37,17 +37,10 @@ function mapStateToProps (state) {
   return {
     network: state.dekusan.network,
     sidebarOpen: state.appState.sidebar.isOpen,
-<<<<<<< HEAD
-    identities: state.metamask.identities,
-    accounts: selectors.getMetaMaskAccounts(state),
-    tokens: state.metamask.tokens,
-    keyrings: state.metamask.keyrings,
-=======
     identities: state.dekusan.identities,
-    accounts: state.dekusan.accounts,
+    accounts: selectors.getMetaMaskAccounts(state),
     tokens: state.dekusan.tokens,
     keyrings: state.dekusan.keyrings,
->>>>>>> Fix UI bugs
     selectedAddress: selectors.getSelectedAddress(state),
     selectedAccount: selectors.getSelectedAccount(state),
     selectedTokenAddress: state.dekusan.selectedTokenAddress,
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index 57865c33..0b596493 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -62,7 +62,7 @@ window.getCleanAppState = function () {
   state.version = global.platform.getVersion()
   state.browser = window.navigator.userAgent
   // ensure seedWords are not included
-  if (state.metamask) delete state.metamask.seedWords
+  if (state.dekusan) delete state.dekusan.seedWords
   if (state.appState.currentView) delete state.appState.currentView.seedWords
   return state
 }
diff --git a/ui/app/selectors/custom-gas.js b/ui/app/selectors/custom-gas.js
index 59f240f9..e98df53f 100644
--- a/ui/app/selectors/custom-gas.js
+++ b/ui/app/selectors/custom-gas.js
@@ -189,8 +189,8 @@ function getRenderableBasicEstimateData (state) {
   if (getBasicGasEstimateLoadingStatus(state)) {
     return []
   }
-  const gasLimit = state.metamask.send.gasLimit || getCustomGasLimit(state)
-  const conversionRate = state.metamask.conversionRate
+  const gasLimit = state.dekusan.send.gasLimit || getCustomGasLimit(state)
+  const conversionRate = state.dekusan.conversionRate
   const currentCurrency = getCurrentCurrency(state)
   const {
     gas: {
@@ -234,8 +234,8 @@ function getRenderableEstimateDataForSmallButtonsFromGWEI (state) {
   if (getBasicGasEstimateLoadingStatus(state)) {
     return []
   }
-  const gasLimit = state.metamask.send.gasLimit || getCustomGasLimit(state)
-  const conversionRate = state.metamask.conversionRate
+  const gasLimit = state.dekusan.send.gasLimit || getCustomGasLimit(state)
+  const conversionRate = state.dekusan.conversionRate
   const currentCurrency = getCurrentCurrency(state)
   const {
     gas: {