Skip to content

Commit

Permalink
chore(Tech Debt): update redux-saga
Browse files Browse the repository at this point in the history
  • Loading branch information
plondon committed May 6, 2019
1 parent 5338254 commit 6c7ffbe
Show file tree
Hide file tree
Showing 22 changed files with 121 additions and 59 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
"react-intl-translations-manager": "5.0.3",
"react-test-renderer": "16.6.3",
"redux-mock-store": "1.5.3",
"redux-saga-test-plan": "3.7.0",
"redux-saga-test-plan": "4.0.0-beta.2",
"release-it": "8.2.0",
"rimraf": "2.6.3",
"staged-git-files": "1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/blockchain-wallet-v4-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"redux-form": "7.4.2",
"redux-logger": "3.0.6",
"redux-persist": "5.7.0",
"redux-saga": "0.16.0",
"redux-saga": "1.0.0",
"reselect": "4.0.0",
"rxjs": "6.3.3",
"sanitize-html": "1.19.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { delay } from 'redux-saga'
import { call, put } from 'redux-saga/effects'
import { delay, put } from 'redux-saga/effects'
import * as actions from './actions'

const DISMISS_AFTER = 7000

export const handleTimer = function * (action) {
const { id, persist } = action.payload
if (persist) return
yield call(delay, DISMISS_AFTER)
yield delay(DISMISS_AFTER)
yield put(actions.dismissAlert(id))
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { delay } from 'redux-saga'
import { call, put } from 'redux-saga/effects'
import { delay, put } from 'redux-saga/effects'

import * as actions from './actions.js'
import * as sagas from './sagas'
Expand All @@ -10,7 +9,7 @@ describe('Alert Sagas', () => {
let id = 1
let gen = sagas.handleTimer({ payload: { id: id } })

expect(gen.next().value).toEqual(call(delay, 7000))
expect(gen.next().value).toEqual(delay(7000))
expect(gen.next().value).toEqual(put(actions.dismissAlert(id)))
expect(gen.next().done).toEqual(true)
})
Expand Down
5 changes: 2 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/data/auth/sagas.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { call, put, select, take, fork } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { call, delay, fork, put, select, take } from 'redux-saga/effects'
import { assoc, path, prop, is } from 'ramda'

import * as C from 'services/AlertService'
Expand Down Expand Up @@ -200,7 +199,7 @@ export default ({ api, coreSagas }) => {
return false
}
try {
yield call(delay, 2000)
yield delay(2000)
const response = yield call(api.pollForSessionGUID, session)
if (prop('guid', response)) {
return true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
call,
delay,
cancel,
fork,
put,
Expand All @@ -8,7 +9,6 @@ import {
spawn,
take
} from 'redux-saga/effects'
import { delay } from 'redux-saga'
import {
compose,
includes,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import { cancel, call, fork, put, all, select, spawn } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import {
cancel,
call,
delay,
fork,
put,
all,
select,
spawn
} from 'redux-saga/effects'
import {
any,
concat,
Expand Down Expand Up @@ -213,7 +221,7 @@ export default ({ api, coreSagas }) => {
try {
while (true) {
yield call(updateTrade, depositAddress)
yield call(delay, pollTimeout)
yield delay(pollTimeout)
}
} catch (e) {
yield put(actions.alerts.displayError(C.EXCHANGE_REFRESH_TRADE_ERROR))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { delay } from 'redux-saga'
import { call, put, select, take } from 'redux-saga/effects'
import { call, delay, put, select, take } from 'redux-saga/effects'
import { head, isEmpty, prop, toUpper } from 'ramda'

import { actions, actionTypes, selectors, model } from 'data'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {
call,
cancelled,
delay,
put,
take,
select,
Expand All @@ -16,7 +17,7 @@ import {
propEq,
values
} from 'ramda'
import { delay, eventChannel, END } from 'redux-saga'
import { eventChannel, END } from 'redux-saga'
import { actionTypes, actions, model, selectors } from 'data'
import * as A from './actions'
import * as AT from './actionTypes'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { put, take } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { put, delay, take } from 'redux-saga/effects'
import { actions, actionTypes } from 'data'

export const logLocation = 'components/onboarding/sagas'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { call, select, put } from 'redux-saga/effects'
import { call, delay, put, select } from 'redux-saga/effects'
import { equals, path, pathOr, prop, nth, is, identity, includes } from 'ramda'
import { delay } from 'redux-saga'
import * as A from './actions'
import * as S from './selectors'
import { FORM } from './model'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { equals, path, pathOr, prop, nth, is, identity, includes } from 'ramda'
import { call, select, put } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { call, delay, put, select } from 'redux-saga/effects'
import * as A from './actions'
import * as S from './selectors'
import { FORM } from './model'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { call, select, put, take } from 'redux-saga/effects'
import { call, delay, put, select, take } from 'redux-saga/effects'
import {
equals,
identity,
Expand All @@ -10,7 +10,6 @@ import {
head,
toLower
} from 'ramda'
import { delay } from 'redux-saga'
import * as A from './actions'
import * as S from './selectors'
import { FORM } from './model'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { call, select, put } from 'redux-saga/effects'
import { call, delay, put, select } from 'redux-saga/effects'
import { equals, includes, path, pathOr, prop, head } from 'ramda'
import { delay } from 'redux-saga'
import * as A from './actions'
import * as S from './selectors'
import { FORM } from './model'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import {
values,
whereEq
} from 'ramda'
import { put, all, call, select } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { all, call, put, delay, select } from 'redux-saga/effects'
import moment from 'moment'

import { selectors, model, actions } from 'data'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { delay } from 'redux-saga'
import { put, select, call, fork, cancel, spawn } from 'redux-saga/effects'
import {
cancel,
call,
delay,
fork,
put,
select,
spawn
} from 'redux-saga/effects'
import moment from 'moment'
import { compose, equals, lift, prop, sortBy, tail } from 'ramda'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { apply, put, call, select } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { apply, call, delay, put, select } from 'redux-saga/effects'
import * as A from './actions'
import * as actions from '../../actions'
import * as selectors from '../../selectors.js'
Expand Down Expand Up @@ -113,7 +112,7 @@ export default ({ api, coreSagas, networks }) => {
)
if (result.status === 'active') {
yield put(A.sfoxSuccess())
yield call(delay, 1500)
yield delay(1500)
yield put(modalActions.closeAllModals())
} else {
yield put(A.sfoxNotAsked())
Expand Down
5 changes: 2 additions & 3 deletions packages/blockchain-wallet-v4-frontend/src/data/rootSaga.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { all, call, fork, put } from 'redux-saga/effects'
import { delay } from 'redux-saga'
import { all, call, delay, fork, put } from 'redux-saga/effects'
import { coreSagasFactory, coreRootSagaFactory } from 'blockchain-wallet-v4/src'
import * as actions from './actions'
import alerts from './alerts/sagaRegister'
Expand Down Expand Up @@ -40,7 +39,7 @@ const welcomeSaga = function * () {

const languageInitSaga = function * () {
try {
yield call(delay, 250)
yield delay(250)
const lang = tryParseLanguageFromUrl()
if (lang.language) {
yield put(actions.preferences.setLanguage(lang.language, false))
Expand Down
2 changes: 1 addition & 1 deletion packages/blockchain-wallet-v4/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"read-blob": "1.1.0",
"redux": "4.0.1",
"redux-immutable": "4.0.0",
"redux-saga": "0.16.2",
"redux-saga": "1.0.0",
"reselect": "4.0.0",
"scryptsy": "2.0.0",
"seedrandom": "2.4.3",
Expand Down
5 changes: 2 additions & 3 deletions packages/blockchain-wallet-v4/src/redux/data/coinify/sagas.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import ExchangeDelegate from '../../../exchange/delegate'
import { delay } from 'redux-saga'
import { apply, call, put, select } from 'redux-saga/effects'
import { apply, call, delay, put, select } from 'redux-saga/effects'
import * as A from './actions'
import * as S from './selectors'
import * as walletActions from '../../wallet/actions'
Expand Down Expand Up @@ -351,7 +350,7 @@ export default ({ api, options }) => {
const kyc = yield select(S.getKyc)
let status = kyc.map(prop('state')).getOrElse(undefined)
while (equals(status, 'pending')) {
yield call(delay, 1000)
yield delay(1000)
const kycR = yield select(S.getKyc)
const kyc = kycR.getOrElse(undefined)
if (!kyc) {
Expand Down
5 changes: 2 additions & 3 deletions packages/blockchain-wallet-v4/src/redux/kvStore/btc/sagas.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { call, put, select } from 'redux-saga/effects'
import { call, delay, put, select } from 'redux-saga/effects'
import { isNil, isEmpty } from 'ramda'
import { delay } from 'redux-saga'
import { set } from 'ramda-lens'
import * as A from './actions'
import { KVStoreEntry, HDAccount, Wallet } from '../../../types'
Expand All @@ -11,7 +10,7 @@ import { callTask } from '../../../utils/functional'

export default ({ api, networks }) => {
const createMetadataBtc = function * () {
yield call(delay, 1000)
yield delay(1000)
const addressLabels = {}

const wallet = yield select(getWallet)
Expand Down
88 changes: 74 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1557,6 +1557,50 @@
universal-user-agent "^2.0.0"
url-template "^2.0.8"

"@redux-saga/core@^1.0.0":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.0.2.tgz#4336a5bb4253e5ca69681c25a863fbbc03ea6d88"
integrity sha512-AsJYcpuYfM1cmxJvfhXs9HAFSZVEG17TMsLPlXH7+Hq5a5ZP4GqcbtijEmS2AC7NR5lLJHy8csxpqz22PeW5dw==
dependencies:
"@babel/runtime" "^7.0.0"
"@redux-saga/deferred" "^1.0.1"
"@redux-saga/delay-p" "^1.0.1"
"@redux-saga/is" "^1.0.2"
"@redux-saga/symbols" "^1.0.1"
"@redux-saga/types" "^1.0.2"
redux ">=0.10 <5"
typescript-tuple "^2.1.0"

"@redux-saga/deferred@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.0.1.tgz#c895445e486bded90acf0b873b4e978fbfe458c2"
integrity sha512-+gW5xQ93QXOOmRLAmX8x2Hx1HpbTG6CM6+HcdTSbJovh4uMWaGyeDECnqXSt8QqA/ja3s2nqYXLqXFKepIQ1hw==

"@redux-saga/delay-p@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.0.1.tgz#d69fc6103c7509ae80faa144ea17bbc69e51e029"
integrity sha512-0SnNDyDLUyB4NThtptAwiprNOnbCNhoed/Rp5JwS7SB+a/AdWynVgg/E6BmjsggLFNr07KW0bzn05tsPRBuU7Q==
dependencies:
"@redux-saga/symbols" "^1.0.1"

"@redux-saga/is@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.0.2.tgz#7f4be014c97061898d7efb11d6c9de31e943ed38"
integrity sha512-WnaUOwYvPK2waWjzebT4uhL8zY76XNkzzpJ2EQJe8bN1tByvAjvT7MuJZTSshOhdHL5PsRO0MsH224XIXBJidQ==
dependencies:
"@redux-saga/symbols" "^1.0.1"
"@redux-saga/types" "^1.0.2"

"@redux-saga/symbols@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.0.1.tgz#46512ae1275f88df061c42168d0f600ddb170c1e"
integrity sha512-akKkzcVnb1RzJaZV2LQFbi51abvdICMuAKwwLoCjjxLbLAGIw9EJxk5ucNnWSSCEsoEQMeol5tkAcK+Xzuv1Bg==

"@redux-saga/types@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.0.2.tgz#1d94f02800b094753f9271c206a26c2a06ca14ee"
integrity sha512-8/qcMh15507AnXJ3lBeuhsdFwnWQqnp68EpUuHlYPixJ5vjVmls7/Jq48cnUlrZI8Jd9U1jkhfCl0gaT5KMgVw==

"@samverschueren/stream-to-observable@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
Expand Down Expand Up @@ -13646,10 +13690,10 @@ redux-persist@5.7.0:
resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-5.7.0.tgz#b2d9a7c885b1ba29dd802106899970943072390d"
integrity sha512-syOx6uBbDf6nmU9YdwviGRTP5xTnDMvQokUtPt8mU0ohiOgr/FqiEZN1hsQ8DdkX9vbB8kETAh5o/jduwKTTig==

redux-saga-test-plan@3.7.0:
version "3.7.0"
resolved "https://registry.yarnpkg.com/redux-saga-test-plan/-/redux-saga-test-plan-3.7.0.tgz#c8f513b1c6e13eef526a6b8a2e9076b6f26f5698"
integrity sha512-et9kCnME01kjoKXFfSk4FkozgOPPvllt9TlpL6A7ZYIS/WgoEFMLXk/UYww8KWXbmk5Qo2IF6xCc/IS1KmvP6A==
redux-saga-test-plan@4.0.0-beta.2:
version "4.0.0-beta.2"
resolved "https://registry.yarnpkg.com/redux-saga-test-plan/-/redux-saga-test-plan-4.0.0-beta.2.tgz#51717b4819df798c252fbe38171edddb4ef6e76e"
integrity sha512-krCpdou4GMH2nL8RFB20Xp0ucvRcwU/4d8jUObYPzaN9tY0nnohOJio583V2vaT7LlNpXBavInPrUbwOK3NLfg==
dependencies:
core-js "^2.4.1"
fsm-iterator "^1.1.0"
Expand All @@ -13658,17 +13702,14 @@ redux-saga-test-plan@3.7.0:
object-assign "^4.1.0"
util-inspect "^0.1.8"

redux-saga@0.16.0:
version "0.16.0"
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.0.tgz#0a231db0a1489301dd980f6f2f88d8ced418f724"
integrity sha1-CiMdsKFIkwHdmA9vL4jYztQY9yQ=

redux-saga@0.16.2:
version "0.16.2"
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-0.16.2.tgz#993662e86bc945d8509ac2b8daba3a8c615cc971"
integrity sha512-iIjKnRThI5sKPEASpUvySemjzwqwI13e3qP7oLub+FycCRDysLSAOwt958niZW6LhxfmS6Qm1BzbU70w/Koc4w==
redux-saga@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.0.0.tgz#acb8b3ed9180fecbe75f342011d75af3ac11045b"
integrity sha512-GvJWs/SzMvEQgeaw6sRMXnS2FghlvEGsHiEtTLpJqc/FHF3I5EE/B+Hq5lyHZ8LSoT2r/X/46uWvkdCnK9WgHA==
dependencies:
"@redux-saga/core" "^1.0.0"

redux@4.0.1, redux@^4.0.1:
redux@4.0.1, "redux@>=0.10 <5", redux@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
Expand Down Expand Up @@ -15766,6 +15807,25 @@ typeforce@^1.11.3, typeforce@^1.11.5, typeforce@^1.8.7:
resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.16.0.tgz#060f871420f4ed90d411e0606bebc62a0889ad55"
integrity sha512-V60F7OHPH7vPlgIU73vYyeebKxWjQqCTlge+MvKlVn09PIhCOi/ZotowYdgREHB5S1dyHOr906ui6NheYXjlVQ==

typescript-compare@^0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
dependencies:
typescript-logic "^0.0.0"

typescript-logic@^0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==

typescript-tuple@^2.1.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
dependencies:
typescript-compare "^0.0.2"

u2f-api@0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/u2f-api/-/u2f-api-0.2.7.tgz#17bf196b242f6bf72353d9858e6a7566cc192720"
Expand Down

0 comments on commit 6c7ffbe

Please sign in to comment.