blockchain · TheLeoB · Jul 15, 2022 · Aug 8, 2022 · Aug 8, 2022 · Aug 15, 2022
@@ -24,6 +24,7 @@
     "@typescript-eslint/ban-ts-comment": "off",
     "@typescript-eslint/no-empty-function": "off",
     "consistent-return": "off",
+    "class-methods-use-this": "off",
     "func-names": "off",
     "no-console": ["error", { "allow": ["warn", "error"] }],
     "no-param-reassign": "off",

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-v4",
-  "version": "4.82.3",
+  "version": "4.82.5",
   "license": "AGPL-3.0-or-later",
   "private": true,
   "author": {

@@ -1016,7 +1016,6 @@
   "modals.active-rewards.withdrawal.total-balance-message": "Requesting a withdrawal from your Active Rewards Account will send your total balance to your Bitcoin Trading Account.",
   "modals.active-rewards.withdrawalrequested.activerewardsbutton": "Go to {coin} Active Rewards",
   "modals.active-rewards.withdrawalrequested.description": "Your withdrawal will be executed once this week's strategy is complete.",
-  "modals.active-rewards.withdrawalrequested.historybutton": "See Transfer Details",
   "modals.active-rewards.withdrawalrequested.title": "Withdrawal Requested",
   "modals.activeRewards.balancedropdown.button": "Show in {currency}",
   "modals.addbitcoinwallet.button": "Create New Bitcoin Wallet",
@@ -2466,8 +2465,8 @@
   "scenes.recovery.import.body": "There’s no account associated with the seed phrase you entered. You can import and manage your wallet instead.",
   "scenes.recovery.import.title": "Import Your Wallet",
   "scenes.recovery.invalid_twofa": "Incorrect code",
-  "scenes.recovery.reset_warning_bodytext": "To restore your Private Key Wallets, please use your cloud backup or recovery phrase.",
-  "scenes.recovery.reset_warning_titletext": "This method only restores your Trading and Rewards Accounts",
+  "scenes.recovery.reset_warning_bodytext": "To restore your Private Key Wallet (DeFi Wallet), please use your cloud backup or recovery phrase.",
+  "scenes.recovery.reset_warning_titletext": "This method only restores your Trading and Earn Accounts",
   "scenes.recovery.reverify_warning": "For your security, you may be to re-verify your identity before accessing your Wallet or Exchange funds.",
   "scenes.recovery.setup2FA.getCode": "Get Verification Code",
   "scenes.recovery.setup2FA.submitCode": "Submit Code",

@@ -6,6 +6,7 @@ import styled from 'styled-components'
 import Currencies from '@core/exchange/currencies'
 import { Icon, Text } from 'blockchain-info-components'
 import { AmountTextBox } from 'components/Exchange'
+import { useCoinConfig } from 'hooks'
 import { formatTextAmount } from 'services/forms'
 
 const AmountContainer = styled.div`
@@ -63,6 +64,8 @@ const AmountFieldInput: React.FC<Props> = ({
     return formatTextAmount(value, allValues && allValues.fix === 'FIAT')
   }
 
+  const { coinfig } = window.coins[coin || 'BTC']
+
   const resizeSymbol = (isFiat, inputNode, fontSizeRatio, fontSizeNumber) => {
     if (Number(fontSizeRatio) > 0) {
       setRatio(fontSizeRatio > 1 ? 1 : fontSizeRatio)
@@ -118,7 +121,7 @@ const AmountFieldInput: React.FC<Props> = ({
 
           {fix === 'CRYPTO' && (
             <Text size='56px' color={amountError ? 'red400' : 'textBlack'} weight={500}>
-              {coin}
+              {coinfig.displaySymbol}
             </Text>
           )}
           {showToggle ? (
@@ -144,7 +147,7 @@ const AmountFieldInput: React.FC<Props> = ({
               weight={500}
               data-e2e='sendQuoteAmount'
             >
-              {fix === 'FIAT' && coin} {quote} {fix === 'CRYPTO' && fiatCurrency}
+              {fix === 'FIAT' && coinfig.displaySymbol} {quote} {fix === 'CRYPTO' && fiatCurrency}
             </Text>
           </>
         ) : null}

@@ -2,10 +2,10 @@
 import { concat, curry, reduce, sequence } from 'ramda'
 
 import { Exchange, Remote } from '@core'
-import { getBalance } from '@core/redux/data/coins/selectors'
 import { ADDRESS_TYPES } from '@core/redux/payment/btc/utils'
 import { EarnAccountBalanceResponseType } from '@core/types'
 import { selectors } from 'data'
+import { getCoinNonCustodialBalance } from 'data/balances/selectors'
 
 export const getData = (
   state,
@@ -72,7 +72,7 @@ export const getData = (
   const toSelfCustodyDropdown = (balance) => [
     {
       label: buildSelfCustodyDisplay(balance),
-      value: { balance, label: 'Private Key', type: ADDRESS_TYPES.ACCOUNT }
+      value: { balance, coin, label: 'Private Key', type: ADDRESS_TYPES.ACCOUNT }
     }
   ]
   const toInterestDropdown = (account) =>
@@ -104,7 +104,9 @@ export const getData = (
           .map(toGroup('Custodial Wallet'))
       : Remote.of([]),
     includeSelfCustody
-      ? getBalance(coin, state).map(toSelfCustodyDropdown).map(toGroup('Private Key'))
+      ? getCoinNonCustodialBalance(coin)(state)
+          .map(toSelfCustodyDropdown)
+          .map(toGroup('Private Key'))
       : Remote.of([]),
     includeInterest
       ? selectors.components.interest

@@ -28,7 +28,7 @@ export const getData = (
     if (has('balance', wallet)) {
       const xlmDisplay = Exchange.displayCoinToCoin({
         coin: 'XLM',
-        value: wallet.balnace
+        value: wallet.balance
       })
       return `${wallet.label} (${xlmDisplay})`
     }

@@ -13,6 +13,7 @@ import * as form from './form/actions'
 import { actions as goals } from './goals/slice'
 import { actions as logs } from './logs/slice'
 import * as middleware from './middleware/actions'
+import * as activities from './middleware/webSocket/activities/actions'
 import * as ws from './middleware/webSocket/coins/actions'
 import { actions as misc } from './misc/slice'
 import { actions as modals } from './modals/slice'
@@ -24,6 +25,7 @@ import { actions as signup } from './signup/slice'
 import * as wallet from './wallet/actions'
 
 export {
+  activities,
   alerts,
   analytics,
   auth,

@@ -1,6 +1,9 @@
 // Account Recovery Events
 export enum Events {
   ACCOUNT_RECOVERY_2FA_ACTIVATION = 'Account Recovery 2FA Activation',
+  ACCOUNT_RECOVERY_2FA_CONFIRMED = 'Account Recovery 2FA Confirmed',
+  ACCOUNT_RECOVERY_2FA_DISMISSED = 'Account Recovery 2FA Dismissed',
+  ACCOUNT_RECOVERY_2FA_PROMPTED = 'Account Recovery 2FA Prompted',
   ACCOUNT_RECOVERY_EMAIL_CLICKED = 'Account Recovery Email Clicked',
   ACCOUNT_RECOVERY_EMAIL_SENT = 'Account Recovery Email Sent',
   ACCOUNT_RECOVERY_FORGOT_PASSWORD_VIEWED = 'Account Recovery Forgot Password Viewed',
@@ -21,6 +24,9 @@ export enum Events {
 type AccountRecoveryActions = {
   key:
     | Events.ACCOUNT_RECOVERY_2FA_ACTIVATION
+    | Events.ACCOUNT_RECOVERY_2FA_PROMPTED
+    | Events.ACCOUNT_RECOVERY_2FA_DISMISSED
+    | Events.ACCOUNT_RECOVERY_2FA_CONFIRMED
     | Events.ACCOUNT_RECOVERY_EMAIL_CLICKED
     | Events.ACCOUNT_RECOVERY_EMAIL_SENT
     | Events.ACCOUNT_RECOVERY_FORGOT_PASSWORD_VIEWED

@@ -3,6 +3,7 @@ export enum Events {
   LOGIN_2FA_PAGE_VIEWED = '2fa Page Viewed',
   LOGIN_CLICKED = 'Login Clicked',
   LOGIN_DEVICE_VERIFIED = 'Device Verified',
+  LOGIN_FORGOT_PASSWORD_CLICKED = 'Forgot Your Password Clicked',
   LOGIN_HELP_CLICKED = 'Login Help Clicked',
   LOGIN_IDENTIFIER_ENTERED = 'Login Identifier Entered',
   LOGIN_IDENTIFIER_FAILED = 'Login Identifier Failed',
@@ -32,6 +33,7 @@ type LoginActions = {
     | Events.LOGIN_RECOVERY_OPTION_SELECTED
     | Events.LOGIN_PASSWORD_DENIED
     | Events.LOGIN_HELP_CLICKED
+    | Events.LOGIN_FORGOT_PASSWORD_CLICKED
     | Events.LOGIN_DEVICE_VERIFIED
     | Events.LOGIN_IDENTIFIER_ENTERED
     | Events.LOGIN_IDENTIFIER_FAILED

@@ -4,7 +4,9 @@ import { startSubmit, stopSubmit } from 'redux-form'
 import { all, call, fork, put, select, take } from 'redux-saga/effects'
 
 import { coreSelectors } from '@core'
+import { APIType } from '@core/network/api'
 import { CountryScope, WalletOptionsType } from '@core/types'
+import { sha256 } from '@core/walletCrypto'
 import { actions, actionTypes, selectors } from 'data'
 import { ClientErrorProperties } from 'data/analytics/types/errors'
 import { fetchBalances } from 'data/balances/sagas'
@@ -42,7 +44,7 @@ import {
   ProductAuthOptions
 } from './types'
 
-export default ({ api, coreSagas, networks }) => {
+export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; networks: any }) => {
   const logLocation = 'auth/sagas'
   const { createExchangeUser, createUser } = profileSagas({
     api,
@@ -242,6 +244,48 @@ export default ({ api, coreSagas, networks }) => {
     }
   }
 
+  const authWalletPubkeyService = function* ({
+    guid,
+    sharedKey
+  }: {
+    guid: string
+    sharedKey: string
+  }) {
+    try {
+      const sharedKeyHash = sha256(sharedKey).toString('hex')
+      const response = yield call(api.authWalletPubkeyService, { guid, sharedKeyHash })
+      return response.success
+    } catch (e) {
+      return false
+    }
+  }
+
+  const subscribeToUnifiedBalances = function* () {
+    const guid = yield select(selectors.core.wallet.getGuid)
+    const sharedKey = yield select(selectors.core.wallet.getSharedKey)
+
+    const guidHash = sha256(guid).toString('hex')
+    const sharedKeyHash = sha256(sharedKey).toString('hex')
+
+    const auth = yield call(authWalletPubkeyService, { guid, sharedKey })
+    if (!auth) return
+    try {
+      yield put(actions.core.data.coins.getSubscriptionsLoading())
+      const subscriptions: ReturnType<typeof api.getSubscriptions> = yield call(
+        api.getSubscriptions,
+        { guidHash, sharedKeyHash }
+      )
+      yield put(actions.core.data.coins.getSubscriptionsSuccess(subscriptions))
+      if (subscriptions.currencies.length === 0) {
+        yield put(actions.core.data.coins.initializeSubscriptions())
+      } else {
+        yield put(actions.core.data.coins.fetchUnifiedBalances())
+      }
+    } catch (e) {
+      yield put(actions.core.data.coins.getSubscriptionsFailure())
+    }
+  }
+
   const checkWalletDerivationsLegitimacy = function* () {
     const accounts = yield call(coreSagas.wallet.getAccountsWithIncompleteDerivations)
 
@@ -325,7 +369,6 @@ export default ({ api, coreSagas, networks }) => {
       yield call(coreSagas.kvStore.xlm.fetchMetadataXlm, askSecondPasswordEnhancer)
       yield call(coreSagas.kvStore.bch.fetchMetadataBch)
       yield call(coreSagas.data.xlm.fetchLedgerDetails)
-      yield call(coreSagas.data.xlm.fetchData)
 
       yield call(authNabu, firstLogin)
       if (product === ProductAuthOptions.EXCHANGE && (recovery || !firstLogin)) {
@@ -334,7 +377,7 @@ export default ({ api, coreSagas, networks }) => {
         )
       }
       const guid = yield select(selectors.core.wallet.getGuid)
-      if (firstLogin && !isAccountReset && !recovery) {
+      if (firstLogin && !isAccountReset && !recovery && country) {
         // create nabu user
         yield call(createUser)
         yield call(api.setUserInitialAddress, country, state)
@@ -390,6 +433,7 @@ export default ({ api, coreSagas, networks }) => {
       } else {
         yield put(actions.router.push('/home'))
       }
+      yield call(subscribeToUnifiedBalances)
       yield call(fetchBalances)
       yield call(saveGoals, firstLogin)
       // We run goals in accountResetSaga in this case
@@ -400,7 +444,8 @@ export default ({ api, coreSagas, networks }) => {
       yield call(upgradeAddressLabelsSaga)
       yield put(actions.auth.startLogoutTimer())
       yield call(startCoinWebsockets)
-
+      // TODO: temp, do we want this here?
+      yield put(actions.activities.startSocket())
       // store guid and email in cache for future login
       yield put(actions.cache.guidEntered(guid))
       if (email) {
@@ -521,6 +566,7 @@ export default ({ api, coreSagas, networks }) => {
         session,
         sharedKey
       })
+
       // Check which unification flow we're running
       // to determine what we want to do after authing user
       const magicLinkData: AuthMagicLink = yield select(S.getMagicLinkData)
@@ -548,6 +594,7 @@ export default ({ api, coreSagas, networks }) => {
           yield call(loginRoutineSaga, {})
           break
       }
+
       yield put(
         actions.analytics.trackEvent({
           key: Analytics.LOGIN_SIGNED_IN,

@@ -1,5 +1,5 @@
 import { pathOr } from 'ramda'
-import { fork, join, put, select, take } from 'redux-saga/effects'
+import { put, select, take } from 'redux-saga/effects'
 
 import { Remote } from '@core'
 import { actions, actionTypes, selectors } from 'data'
@@ -10,49 +10,10 @@ export const balancePath = ['payload', 'info', 'final_balance']
 export const fetchBalances = function* () {
   yield put(actions.core.data.bch.fetchData())
   yield put(actions.core.data.btc.fetchData())
-  yield put(actions.core.data.xlm.fetchData())
   yield put(actions.core.data.eth.fetchData())
-  yield put(actions.core.data.eth.fetchErc20Data())
+  yield put(actions.core.data.coins.fetchUnifiedBalances())
   yield put(actions.components.refresh.refreshRates())
   yield put(actions.custodial.fetchRecentSwapTxs())
-  yield put(actions.core.data.coins.fetchData())
-}
-
-export const getEthBalance = function* () {
-  try {
-    const ethBalanceR = yield select(selectors.core.data.eth.getBalance)
-    if (!Remote.Success.is(ethBalanceR)) {
-      const ethData = yield take([
-        actionTypes.core.data.eth.FETCH_ETH_DATA_SUCCESS,
-        actionTypes.core.data.eth.FETCH_ETH_DATA_FAILURE
-      ])
-      return pathOr(0, balancePath, ethData)
-    }
-    return ethBalanceR.getOrElse(0)
-  } catch (e) {
-    yield put(actions.logs.logErrorMessage(logLocation, 'getEthBalance', e))
-  }
-}
-
-export const getErc20Balance = function* (token) {
-  try {
-    const erc20BalanceR = yield select(selectors.core.data.eth.getErc20Balance, token)
-    if (!Remote.Success.is(erc20BalanceR)) {
-      yield put(actions.core.data.eth.fetchErc20Data(token))
-      const erc20Data = yield take([
-        (action) =>
-          action.type === actionTypes.core.data.eth.FETCH_ERC20_TOKEN_DATA_SUCCESS &&
-          action.payload.token === token,
-        (action) =>
-          action.type === actionTypes.core.data.eth.FETCH_ERC20_TOKEN_DATA_FAILURE &&
-          action.payload.token === token
-      ])
-      return pathOr(0, balancePath, erc20Data)
-    }
-    return erc20BalanceR.getOrElse(0)
-  } catch (e) {
-    yield put(actions.logs.logErrorMessage(logLocation, 'getErc20Balance', e))
-  }
 }
 
 export const getBtcBalance = function* () {
@@ -86,29 +47,3 @@ export const getBchBalance = function* () {
     yield put(actions.logs.logErrorMessage(logLocation, 'getBchBalance', e))
   }
 }
-
-export const getXlmBalance = function* () {
-  try {
-    const xlmBalanceR = yield select(selectors.core.data.xlm.getTotalBalance)
-    if (!Remote.Success.is(xlmBalanceR)) {
-      const xlmData = yield take(actionTypes.core.data.xlm.FETCH_DATA_SUCCESS)
-      return pathOr(0, balancePath, xlmData)
-    }
-    return xlmBalanceR.getOrElse(0)
-  } catch (e) {
-    yield put(actions.logs.logErrorMessage(logLocation, 'getXlmBalance', e))
-  }
-}
-
-export const waitForAllBalances = function* () {
-  const btcT = yield fork(getBtcBalance)
-  const bchT = yield fork(getBchBalance)
-  const ethT = yield fork(getEthBalance)
-  const xlmT = yield fork(getXlmBalance)
-  const btc = yield join(btcT)
-  const bch = yield join(bchT)
-  const eth = yield join(ethT)
-  const xlm = yield join(xlmT)
-
-  return { bch, btc, eth, xlm }
-}