Merge branch 'development' into release/v4.98.00

.github/workflows/deploy-storybook.yml

@@ -5,30 +5,38 @@ on:
     branches:
       - development
 
+env:
+  HUSKY: 0
+
 jobs:
   pull-request:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [14.16]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Install node.js v${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+      - name: Install node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          node-version: 16
 
-      - name: Install dependencies
-        run: yarn
+      - name: Get node version
+        id: node
+        run: |
+          echo "::set-output name=version::$(node -v)"
 
-#     Non-working command
-#      - name: Deploy storybook - base components
-#        run: yarn storybook:base
+      - name: Get node_modules cache
+        uses: actions/cache@v4
+        id: node_modules
+        with:
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}-${{ steps.node.outputs.version }}
+
+      - name: Install dependencies
+        run: yarn --frozen-lockfile
 
       - name: Deploy storybook - wallet
         run: yarn storybook:deploy-wallet --ci
         env:
-          GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-request.yml

@@ -4,24 +4,36 @@ on:
   pull_request:
     types: [opened, synchronize, reopened]
 
+env:
+  HUSKY: 0
+
 jobs:
   pull-request:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [14.16]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+
+      - name: Install node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 16
+
+      - name: Get node version
+        id: node
+        run: |
+          echo "::set-output name=version::$(node -v)"
 
-      - name: Install node.js v${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+      - name: Get node_modules cache
+        uses: actions/cache@v4
+        id: node_modules
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}-${{ steps.node.outputs.version }}
 
       - name: Install dependencies
-        run: yarn
+        run: yarn --frozen-lockfile
 
       # TODO: enable once all lint issues are fixed
       #- name: Lint code
@@ -34,4 +46,4 @@ jobs:
         run: yarn ci:test:core:components
 
       - name: Test package - frontend
-        run: yarn ci:test:frontend
+        run: yarn ci:test:frontend

.nvmrc

@@ -1 +1 @@
-v14.16
+v16

package.json

@@ -37,7 +37,7 @@
   "lint-staged": {
     "packages/*/src/**/*.{js,ts,tsx}": [
       "eslint --fix",
-      "yarn test --bail --findRelatedTests"
+      "yarn jest --bail --findRelatedTests --passWithNoTests"
     ],
     "packages/*/src/**/*.{js,tsx}": [
       "stylelint './packages/*/src/**/*.{js,tsx}'"

packages/blockchain-wallet-v4-frontend/src/assets/locales/en.json

@@ -2761,11 +2761,11 @@
   "scenes.tax.center.card.report.select": "Choose year",
   "scenes.tax.center.card.report.title": "Export your transaction history",
   "scenes.tax.center.card.service.button": "Visit CoinTracker",
-  "scenes.tax.center.card.service.cointracker.description": "If your crypto activity is high and you have multiple wallets beyond Blockchain.com, Cointracker is fully supported in the US, Australia, UK, Canada and also provides capital gains reports for users around the World. Blockchain.com users get free tax reports for up to 500 transactions with CoinTracker.",
+  "scenes.tax.center.card.service.cointracker.description": "We have partnered with CoinTracker to simplify your tax reporting. CoinTracker is fully supported in the US, Australia, UK, Canada and also provides capital gains reports for users around the World. New users from Blockchain.com get 10% off all tax plans",
   "scenes.tax.center.card.service.title": "Upload to a tax service",
   "scenes.tax.center.card.service.turboTax.button": "Visit TurboTax",
   "scenes.tax.center.card.service.turboTax.description1": "We have partnered with TurboTax and Cointracker to simplify your tax reporting.",
-  "scenes.tax.center.card.service.turboTax.description2": "If you’re new to crypto and don’t have much crypto activity, TurboTax helps navigate the complexity of crypto taxes. Save time by auto-importing crypto activity, plus specialized experts are available year round and can even do your taxes for you, start to finish.",
+  "scenes.tax.center.card.service.turboTax.description2": "TurboTax has crypto taxes covered. Save time and hassle by importing up to 20k crypto transactions, plus an expert in investment taxes can help or even prepare your return from start to finish.",
   "scenes.tax.center.carousel.file": "How do I file?",
   "scenes.tax.center.carousel.file.description": "Export your transaction history then manually calculate your gains/losses using your cost basis. If you want to simplify the process, use our crypto tax partner CoinTracker to get free tax reports for up to 500 transactions.",
   "scenes.tax.center.carousel.services": "What if I use other crypto services?",

packages/blockchain-wallet-v4-frontend/src/data/actionTypes.ts

@@ -4,8 +4,7 @@ import * as components from './components/actionTypes'
 import { actionTypes as form } from './form/actionTypes'
 import * as middleware from './middleware/actionTypes'
 import * as modules from './modules/actionTypes'
-import * as preferences from './preferences/actionTypes'
 import * as router from './router/actionTypes'
 import * as wallet from './wallet/actionTypes'
 
-export { components, core, form, middleware, modules, preferences, router, wallet }
+export { components, core, form, middleware, modules, router, wallet }

packages/blockchain-wallet-v4-frontend/src/data/actions.ts

@@ -17,7 +17,7 @@ import * as ws from './middleware/webSocket/coins/actions'
 import { actions as misc } from './misc/slice'
 import { actions as modals } from './modals/slice'
 import * as modules from './modules/actions'
-import * as preferences from './preferences/actions'
+import { actions as preferences } from './preferences/slice'
 import { actions as prices } from './prices/slice'
 import { actions as session } from './session/slice'
 import { actions as signup } from './signup/slice'

packages/blockchain-wallet-v4-frontend/src/data/components/buySell/sagas.ts

@@ -2169,7 +2169,9 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
 
   const switchFix = function* ({ payload }: ReturnType<typeof A.switchFix>) {
     yield put(actions.form.change(FORM_BS_CHECKOUT, 'fix', payload.fix))
-    yield put(actions.preferences.setBSCheckoutFix(payload.orderType, payload.fix))
+    yield put(
+      actions.preferences.setBSCheckoutFix({ fix: payload.fix, orderType: payload.orderType })
+    )
     const newAmount = new BigNumber(payload.amount).isGreaterThan(0) ? payload.amount : undefined
     yield put(actions.form.change(FORM_BS_CHECKOUT, 'amount', newAmount))
     yield put(actions.form.focus(FORM_BS_CHECKOUT, 'amount'))

packages/blockchain-wallet-v4-frontend/src/data/components/priceChart/slice.ts

@@ -2,24 +2,13 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 
 import { CoinType, TimeRange } from '@core/types'
 
-const initialState = {
+import { CoinPayload, PriceChartType, TimePayload } from './types'
+
+const initialState: PriceChartType = {
   coin: 'BTC',
   time: TimeRange.ALL
 }
 
-type CoinPayload = {
-  coin: CoinType
-}
-
-type InitializedPayload = {
-  coin: CoinType
-  time: TimeRange
-}
-
-type TimePayload = {
-  time: TimeRange
-}
-
 const priceChartSlice = createSlice({
   initialState,
   name: 'priceChart',
@@ -32,7 +21,7 @@ const priceChartSlice = createSlice({
     },
     initialized: {
       prepare: (coin: CoinType, time: TimeRange) => ({ payload: { coin, time } }),
-      reducer: (state, action: PayloadAction<InitializedPayload>) => {
+      reducer: (state, action: PayloadAction<PriceChartType>) => {
         state.coin = action.payload.coin
         state.time = action.payload.time
       }

packages/blockchain-wallet-v4-frontend/src/data/components/priceChart/types.ts

@@ -0,0 +1,11 @@
+import { CoinType, TimeRange } from '@core/types'
+
+export type CoinPayload = {
+  coin: CoinType
+}
+
+export type TimePayload = {
+  time: TimeRange
+}
+
+export type PriceChartType = CoinPayload & TimePayload

packages/blockchain-wallet-v4-frontend/src/data/misc/sagas.ts

@@ -75,7 +75,7 @@ export default () => {
       const cookieLang = cookies.get('clang')
       const lang = urlLang?.language || cookieLang
       if (lang) {
-        yield put(actions.preferences.setLanguage(lang, false))
+        yield put(actions.preferences.setLanguage({ language: lang, showAlert: false }))
       }
     } catch (e) {
       // do nothing, app will fallback to english