Merge branch 'development' into feature/more-responsive

blockchain · Jul 1, 2018 · 729e60c · 729e60c
2 parents e9e3ad1 + 981a3c4
commit 729e60c
Show file tree

Hide file tree

Showing 59 changed files with 211 additions and 57 deletions.
diff --git a/config/wallet-options-v4.json b/config/wallet-options-v4.json
@@ -131,12 +131,12 @@
         "countries": ["US"],
         "states": ["AR", "AZ", "CA", "CO", "ID", "IL", "IN", "KS", "KY", "LA", "MA", "MD", "MI", "MN", "MO", "MT", "NE", "NV", "OK", "PA", "SC", "SD", "TN", "TX", "VA", "WI", "WV"],
         "config": {
-          "production": false,
+          "production": true,
           "availability": true,
-          "apiKey": "6CD61A0E965D48A7B1883A860490DC9E",
+          "apiKey": "f31614a7-5074-49f2-8c2a-bfb8e55de2bd",
           "plaid": "0b041cd9e9fbf1e7d93a0d5a39f5b9",
-          "plaidEnv": "tartan",
-          "siftScience": "3884e5fae5",
+          "plaidEnv": "production",
+          "siftScience": "a19cc360a1",
           "surveyLinks": [
             "https://blockchain.co1.qualtrics.com/SE/?SID=SV_bPCcv7eZgqlQSrP",
             "https://blockchain.co1.qualtrics.com/SE/?SID=SV_4HIEh5KIodM8UTP",
@@ -202,5 +202,3 @@
     "walletHelper": "https://wallet-helper.blockchain.info"
   }
 }
-
-
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.0.0-alpha17",
+  "version": "4.0.0-alpha17.2",
   "license": "ISC",
   "author": {
     "name": "Blockchain.info",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/bg.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/bg.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/da.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/da.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/de.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/de.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "2FA aktivieren",
   "modals.twostepyubico.explain": "Mit Yubikey kombnieren",
   "modals.twostepyubico.title": "2-Faktor-Verifizierung aktivieren",
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Weiter",
   "modals.upgradewallet.title": "Willkommen bei Ihrer Blockchain-Wallet",
   "modals.upgradewallet.title1": "Völlig aktualisiertes Design und modernste Nutzererfahrung",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/defaultMessages.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/defaultMessages.json
@@ -4470,6 +4470,15 @@
     ],
     "path": "src/modals/TwoStepYubico/template.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Upgrading your wallet. This should take around {duration} seconds.",
+        "id": "modals.upgradeaddresslabels.explain"
+      }
+    ],
+    "path": "src/modals/UpgradeAddressLabels/template.json"
+  },
   {
     "descriptors": [
       {

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/el.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/el.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Ενεργοποίηση Επαλήθευσης Δύο Παραγόντων",
   "modals.twostepyubico.explain": "Αντιστοίχηση με το yubikey σας:",
   "modals.twostepyubico.title": "Ενεργοποίηση Επαλήθευσης Δύο Βημάτων",
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Συνέχεια",
   "modals.upgradewallet.title": "Καλωσορίσατε στο Blockchain Πορτοφόλι σας!",
   "modals.upgradewallet.title1": "Εντελώς ενημερωμένος σχεδιασμός και εμπειρία χρήστη",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Enable 2FA",
   "modals.twostepyubico.explain": "Pair with your yubikey:",
   "modals.twostepyubico.title": "Enable Two-Step Verification",
+  "modals.upgradeaddresslabels.explain": "Upgrading your wallet. This should take around {duration} seconds.",
   "modals.upgradewallet.continue": "Continue",
   "modals.upgradewallet.title": "Welcome to your Blockchain Wallet!",
   "modals.upgradewallet.title1": "Completely updated design and user experience",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/es.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/es.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Activar autenticación 2FA",
   "modals.twostepyubico.explain": "Emparejar con su YubiKey:",
   "modals.twostepyubico.title": "Activar doble verificación",
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Continuar",
   "modals.upgradewallet.title": "¡Bienvenido a su monedero de Blockchain!",
   "modals.upgradewallet.title1": "Diseño y experiencia de usuario totalmente actualizados",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/fr.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/fr.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Activer l'authentification à deux facteurs",
   "modals.twostepyubico.explain": "Associer avec votre yubikey :",
   "modals.twostepyubico.title": "Activer la vérification à deux facteurs",
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Continuer",
   "modals.upgradewallet.title": "Bienvenue sur votre portefeuille Blockchain",
   "modals.upgradewallet.title1": "Conception et expérience utilisateur entièrement mises à jour",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/hi.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/hi.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/hu.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/hu.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/id.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/id.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Aktifkan 2FA",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Lanjutkan",
   "modals.upgradewallet.title": "Selamat datang di Dompet Blockchain",
   "modals.upgradewallet.title1": "Desain dan pengalaman pengguna yang sepenuhnya diperbarui.",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/it.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/it.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Abiliti la 2FA",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Continui",
   "modals.upgradewallet.title": "Benvenut nel suo portafogli Blockchain ",
   "modals.upgradewallet.title1": "Design ed esperienza utente completamente aggiornati",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/ja.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/ja.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "2段階認証を有効にする",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "続行",
   "modals.upgradewallet.title": "ブロックチェーンウォレットにようこそ",
   "modals.upgradewallet.title1": "完全に更新されたデザインとユーザーエクスペリエンス",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/ko.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/ko.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "2FA 사용 설정",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "계속",
   "modals.upgradewallet.title": "블록체인 지갑에 오신 것을 환영합니다.",
   "modals.upgradewallet.title1": "완전히 업데이트 된 디자인과 사용자 체험",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/nl.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/nl.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "2FA inschakelen",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Doorgaan",
   "modals.upgradewallet.title": "Welkom bij uw Blockchain-portemonnee!",
   "modals.upgradewallet.title1": "Volledig opgewaardeerd design en opgewaardeerde gebruikerservaring",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/no.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/no.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/pl.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/pl.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Włącz Uwierzytelnianie Dwustopniowe",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Kontynuuj",
   "modals.upgradewallet.title": "Witaj w swoim portfelu Blockchain",
   "modals.upgradewallet.title1": "Zupełnie nowy design i doświadczenia",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/pt.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/pt.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Ativar autenticação de dois fatores",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Continuar",
   "modals.upgradewallet.title": "Bem-vindo a sua Carteira Blockchain",
   "modals.upgradewallet.title1": "Design e experiência do usuário inteiramente renovados.",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/ro.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/ro.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/ru.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/ru.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Активировать 2ФА",
   "modals.twostepyubico.explain": "Выполните сопряжение с yubikey:",
   "modals.twostepyubico.title": "Активировать 2-этапную верификацию",
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Продолжить",
   "modals.upgradewallet.title": "Добро пожаловать в кошелек Blockchain",
   "modals.upgradewallet.title1": "Полностью обновленный дизайн и интерфейс",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/sl.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/sl.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/sv.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/sv.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": null,
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": null,
   "modals.upgradewallet.title": null,
   "modals.upgradewallet.title1": null,

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/th.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/th.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "เปิดใช้งาน 2FA",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "ดำเนินการต่อ",
   "modals.upgradewallet.title": "ยินดีต้อนรับสู่กระเป๋าเงิน Blockchain ของคุณ",
   "modals.upgradewallet.title1": "การออกแบบและประสบการณ์ผู้ใช้ได้รับการปรับปรุงให้ทันสมัยทั้งหมด",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/tr.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/tr.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "2FA Etkinleştir",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Devam",
   "modals.upgradewallet.title": "Blockchain Cüzdanınıza hoş geldiniz",
   "modals.upgradewallet.title1": "Tamamen güncellenmiş tasarım ve kullanıcı deneyimi",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/vi.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/vi.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "Kích hoạt bảo mật 2 lớp",
   "modals.twostepyubico.explain": null,
   "modals.twostepyubico.title": null,
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "Tiếp tục",
   "modals.upgradewallet.title": "Chào mừng đến với Ví Blockchain của bạn",
   "modals.upgradewallet.title1": "Hoàn tất nâng cấp thiết kế và trải nghiệm người dùng",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/zh.json b/packages/blockchain-wallet-v4-frontend/src/assets/locales/zh.json
@@ -670,6 +670,7 @@
   "modals.twostepyubico.enable": "启用2FA",
   "modals.twostepyubico.explain": "与您的Yubikey配对：",
   "modals.twostepyubico.title": "启用两步验证",
+  "modals.upgradeaddresslabels.explain": null,
   "modals.upgradewallet.continue": "继续",
   "modals.upgradewallet.title": "欢迎使用您的Blockchain钱包!",
   "modals.upgradewallet.title1": "全新的设计和使用体验。",

diff --git a/packages/blockchain-wallet-v4-frontend/src/assets/locales/{ } b/packages/blockchain-wallet-v4-frontend/src/assets/locales/{ }
diff --git a/...es/blockchain-wallet-v4-frontend/src/components/TransactionListItem/PartnerLabel/index.js b/...es/blockchain-wallet-v4-frontend/src/components/TransactionListItem/PartnerLabel/index.js
@@ -0,0 +1,55 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { FormattedMessage } from 'react-intl'
+import styled from 'styled-components'
+import { Banner } from 'blockchain-info-components'
+
+const LabelContainer = styled.div`
+  margin-top: 5px;
+`
+const PartnerBanner = styled(Banner)`
+  padding: 3px 5px;
+`
+const capitalize = (text) => text[0].toUpperCase() + text.substring(1)
+
+const PartnerLabel = props => {
+  const { txType, partnerLabel, buysellPartner } = props
+
+  if (partnerLabel === 'shift') {
+    return (
+      <LabelContainer mobileSize='14px' size='16px' weight={500} color={props.type} uppercase>
+        <PartnerBanner>
+          {
+            txType === 'sent'
+              ? <FormattedMessage id='components.txlistitem.partnerlabel.depositedshapeshift' defaultMessage='ShapeShift Deposit' />
+              : <FormattedMessage id='components.txlistitem.partnerlabel.receivedshapeshift' defaultMessage='Received from ShapeShift' />
+          }
+        </PartnerBanner>
+      </LabelContainer>
+    )
+  }
+
+  if (partnerLabel === 'buy-sell' && buysellPartner) {
+    return (
+      <LabelContainer mobileSize='14px' size='16px' weight={500} color={props.type} uppercase>
+        <PartnerBanner partnerLabel>
+          {
+            txType === 'sent'
+              ? <FormattedMessage id='components.txlistitem.partnerlabel.soldvia' defaultMessage='Sold via {partner}' values={{ partner: capitalize(buysellPartner) }} />
+              : <FormattedMessage id='components.txlistitem.partnerlabel.boughtvia' defaultMessage='Bought via {partner}' values={{ partner: capitalize(buysellPartner) }} />
+          }
+        </PartnerBanner>
+      </LabelContainer>
+    )
+  }
+
+  return null
+}
+
+PartnerLabel.propTypes = {
+  txHash: PropTypes.string.isRequired,
+  txType: PropTypes.string.isRequired,
+  buysellPartner: PropTypes.string
+}
+
+export default PartnerLabel
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/index.js b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/index.js
@@ -40,6 +40,7 @@ class ListItemContainer extends React.PureComponent {
       transaction={this.props.transaction}
       handleCoinToggle={this.handleCoinToggle}
       handleEditDescription={this.handleEditDescription}
+      buysellPartner={this.props.buysellPartner}
     />
   }
 }

diff --git a/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js b/packages/blockchain-wallet-v4-frontend/src/components/TransactionListItem/template.js
@@ -11,6 +11,7 @@ import Description from './Description'
 import Confirmations from './Confirmations'
 import FiatAtTime from './FiatAtTime'
 import Status from './Status'
+import PartnerLabel from './PartnerLabel'
 import media from 'services/ResponsiveService'
 import { prop } from 'ramda'
 
@@ -112,7 +113,7 @@ const dateHelper = (time) => {
 }
 
 const TransactionListItem = (props) => {
-  const { handleCoinToggle, transaction, handleEditDescription, coin, minConfirmations } = props
+  const { handleCoinToggle, transaction, handleEditDescription, coin, minConfirmations, buysellPartner } = props
 
   return (
     <TransactionRowContainer>
@@ -127,6 +128,11 @@ const TransactionListItem = (props) => {
               </Banner>
             </BannerWrapper>
           )}
+          {
+            prop('partnerLabel', transaction)
+              ? <PartnerLabel txType={prop('type', transaction)} partnerLabel={prop('partnerLabel', transaction)} buysellPartner={buysellPartner} />
+              : null
+          }
         </StatusColumn>
         <DetailsColumn>
           <Addresses to={transaction.to} from={transaction.from} inputs={transaction.inputs} outputs={transaction.outputs} coin={coin} />

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js b/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js
@@ -376,6 +376,7 @@ export default ({ api, coreSagas }) => {
     transferEthSaga,
     upgradeWallet,
     upgradeWalletSaga,
+    upgradeAddressLabelsSaga,
     welcomeSaga
   }
 }
diff --git a/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.spec.js b/packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.spec.js
@@ -277,7 +277,8 @@ describe('authSagas', () => {
       setLogoutEventListener,
       transferEthSaga,
       upgradeWalletSaga,
-      welcomeSaga
+      welcomeSaga,
+      upgradeAddressLabelsSaga
     } = authSagas({
       api,
       coreSagas
@@ -327,6 +328,10 @@ describe('authSagas', () => {
       saga.next().put(actions.router.push('/home'))
     })
 
+    it('should call upgrade address labels saga', () => {
+      saga.next().call(upgradeAddressLabelsSaga)
+    })
+
     it('should trigger login success action', () => {
       saga.next().put(actions.auth.loginSuccess())
     })
@@ -412,7 +417,7 @@ describe('authSagas', () => {
           [call.fn(setLogoutEventListener), jest.fn],
           [fork.fn(logoutRoutine), jest.fn]
         ])
-        .put(actions.alerts.displaySuccess(C.LOGIN_SUCCESS))
+        .not.put(actions.alerts.displaySuccess(C.LOGIN_SUCCESS))
         .run()
     })
 

diff --git a/packages/blockchain-wallet-v4-frontend/src/data/components/layoutWallet/reducers.js b/packages/blockchain-wallet-v4-frontend/src/data/components/layoutWallet/reducers.js
@@ -28,7 +28,8 @@ export default (state = INITIAL_STATE, action) => {
     case '@@router/LOCATION_CHANGE': {
       const pathname = path(['location', 'pathname'], payload)
       const settingsOpened = pathname && pathname.indexOf('/settings') > -1
-      return merge(state, { trayOpened: false, trayContent: '', menuOpened: false, settingsOpened })
+      const shouldOpenSettings = !state.settingsOpened && settingsOpened
+      return merge(state, { trayOpened: false, trayContent: '', menuOpened: shouldOpenSettings, settingsOpened })
     }
     case AT.LAYOUT_WALLET_MENU_TOGGLE_CLICKED: {
       return merge(state, { menuOpened: !state.menuOpened })

diff --git a/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js b/packages/blockchain-wallet-v4-frontend/src/layouts/Wallet/MenuLeft/Navigation/template.js
@@ -10,6 +10,7 @@ import { Icon, Separator, Text } from 'blockchain-info-components'
 const Wrapper = styled.div`
   height: 100%;
   position: relative;
+  overflow: auto;
   display: flex;
   flex-direction: column;
   justify-content: space-between;