Merge pull request #1053 from alexstotsky/redirection-fixes

(fix) Redirection and message duplication issues

Author: eugeneglova

src/components/Status/Status.js

@@ -14,15 +14,24 @@ export const AppToaster = Toaster.create({
   position: Position.BOTTOM_RIGHT,
 })
 
+let lastShownMsg = null
+
 export const Status = ({
   clearStatus,
   intent,
   msg = {},
 }) => {
   if (!msg.id) {
+    lastShownMsg = null
     return ''
   }
 
+  if (msg === lastShownMsg) {
+    return ''
+  }
+
+  lastShownMsg = msg
+
   const params = {
     ...msg,
     topic: msg.topic ? i18n.t(msg.topic) || msg.topic : undefined,

src/state/routing/saga.js

@@ -1,4 +1,6 @@
-import { put, select, takeLatest } from 'redux-saga/effects'
+import {
+  call, put, select, takeLatest,
+} from 'redux-saga/effects'
 import { LOCATION_CHANGE, replace } from 'redux-first-history'
 import { isEmpty } from '@bitfinex/lib-js-util-base'
 
@@ -14,22 +16,19 @@ import { getLastRoute, getRouteParams } from './selectors'
 
 const { MENU_ORDER_TRADES } = queryConstants
 
-let isFirstRendering = true
+// handles legacy route redirects on app startup
+// runs once before LOCATION_CHANGE listeners are set up, avoiding takeLatest race conditions
+function* handleLegacyRedirects() {
+  const { pathname, search } = window.location
+  if (pathname.includes('/deposits') || pathname.includes('/withdrawals')) {
+    const [, , symbols] = pathname.split('/')
+    yield put(replace(`/movements${symbols ? `/${symbols}` : ''}${search || ''}`, { isSkipped: true }))
+  }
+}
 
 function* locationChange({ payload }) {
   const { location } = payload
-  const { pathname, search, state } = location
-
-  const isFirstRender = isFirstRendering
-  if (isFirstRender) {
-    isFirstRendering = false
-    // redirects from legacy sections `deposits' and 'withdrawals' to 'movements' on first render
-    if (pathname.includes('/deposits') || pathname.includes('/withdrawals')) {
-      const [, , symbols] = pathname.split('/')
-      yield put(replace(`/movements${symbols ? `/${symbols}` : ''}${search || ''}`, { isSkipped: true }))
-      return
-    }
-  }
+  const { pathname, state } = location
 
   if (!isEmpty(state) && state.isSkipped) {
     return
@@ -46,8 +45,8 @@ function* locationChange({ payload }) {
     return
   }
 
-  // return previously saved params on route change
-  if (route !== lastRoute && !isFirstRender) {
+  // return previously saved params on route change (skip on first load when lastRoute is not yet set)
+  if (route !== lastRoute && lastRoute) {
     const routeParams = yield select(getRouteParams, route)
     if (isEmpty(routeParams)) {
       const query = getQueryWithoutParams(Object.keys(FILTER_KEYS)) // remove filters of current section
@@ -104,6 +103,7 @@ function* filtersSet({ payload }) {
 }
 
 export default function* routingSaga() {
+  yield call(handleLegacyRedirects)
   yield takeLatest(LOCATION_CHANGE, locationChange)
   yield takeLatest(LOCATION_CHANGE, lastRouteSet)
   yield takeLatest(filterTypes.SET_FILTERS, filtersSet)