Merge pull request #590 from bitfinexcom/beta

Release version to master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-ui",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "Report page to overview the user actions in Bitfinex and download related csv files",
   "repository": {
     "type": "git",

src/components/Auth/RegisterSubAccounts/RegisterSubAccounts.js

@@ -118,7 +118,7 @@ class RegisterSubAccounts extends PureComponent {
               users={users}
               authData={authData}
               masterAccount={masterAccEmail}
-              addMultipleAccsEnabled={isMultipleAccsSelected}
+              isMultipleAccsSelected={isMultipleAccsSelected}
             />
           </>
         </div>

src/components/SubAccounts/SubAccount/SubAccount.js

@@ -19,8 +19,8 @@ class SubAccount extends PureComponent {
       isSubAccount: PropTypes.bool,
     }).isRequired,
     addSubAccount: PropTypes.func.isRequired,
-    addMultipleAccsEnabled: PropTypes.bool,
     isSubAccountsLoading: PropTypes.bool,
+    isMultipleAccsSelected: PropTypes.bool,
     masterAccount: PropTypes.string,
     updateSubAccount: PropTypes.func.isRequired,
     users: PropTypes.arrayOf(PropTypes.shape({
@@ -34,7 +34,7 @@ class SubAccount extends PureComponent {
   static defaultProps = {
     masterAccount: undefined,
     isSubAccountsLoading: false,
-    addMultipleAccsEnabled: true,
+    isMultipleAccsSelected: false,
   }
 
   state = {
@@ -105,7 +105,7 @@ class SubAccount extends PureComponent {
       authData,
       masterAccount,
       isSubAccountsLoading,
-      addMultipleAccsEnabled,
+      isMultipleAccsSelected,
     } = this.props
     const { accounts, subUsersToRemove } = this.state
     const { email: currentUserEmail, isSubAccount } = authData
@@ -140,9 +140,10 @@ class SubAccount extends PureComponent {
                 accounts={accounts}
                 authData={authData}
                 users={preparedUsers}
-                onChange={this.onSubUsersChange}
+                addMultipleAccsEnabled
                 masterAccount={masterAccount}
-                addMultipleAccsEnabled={addMultipleAccsEnabled}
+                onChange={this.onSubUsersChange}
+                shouldFilterCurrentUser={!isMultipleAccsSelected}
               />
               <Button
                 intent={Intent.PRIMARY}

src/components/SubAccounts/SubAccount/SubUsersAdd/SubUsersAdd.js

@@ -18,6 +18,7 @@ class SubUsersAdd extends PureComponent {
       apiSecret: PropTypes.string,
     })).isRequired,
     addMultipleAccsEnabled: PropTypes.bool.isRequired,
+    shouldFilterCurrentUser: PropTypes.bool.isRequired,
     masterAccount: PropTypes.string,
     authData: PropTypes.shape({
       email: PropTypes.string,
@@ -98,13 +99,15 @@ class SubUsersAdd extends PureComponent {
       authData,
       masterAccount,
       addMultipleAccsEnabled,
+      shouldFilterCurrentUser,
     } = this.props
     const { email: currentUserEmail } = authData
 
     const subAccountOptions = users.filter((account) => (
       !account.isSubAccount
-      && account.email !== currentUserEmail
-      && account.email !== masterAccount))
+      && account.email !== masterAccount
+      && (shouldFilterCurrentUser ? account.email !== currentUserEmail : true)
+    ))
     const takenAccountOptions = this.getTakenAccountOptions(accounts)
     const selectClassName = addMultipleAccsEnabled
       ? 'sub-account-create-select' : 'bitfinex-auth-email'

src/state/auth/reducer.js

@@ -135,6 +135,7 @@ export function authReducer(state = initialState, action) {
         ...initialState,
         ...getStoredAuth(),
         users: state.users,
+        token: state.token,
       }
     default:
       return state

src/state/sync/constants.js

@@ -24,4 +24,5 @@ export default {
   WS_PROGRESS_UPDATE: 'ws_emitProgress',
   WS_REQUESTS_REDIRECT: 'ws_emitRedirectingRequestsStatusToApi',
   SYNC_INTERRUPTED: 'SYNCHRONIZATION_HAS_BEEN_INTERRUPTED',
+  SYNC_NOT_STARTED: 'SYNCHRONIZATION_HAS_NOT_STARTED_YET',
 }

src/state/sync/saga.js

@@ -154,26 +154,29 @@ function* initQueryMode() {
   }
 }
 
-function* initSync() {
+export function* initSync() {
   yield call(initQueryMode)
   const { result: syncProgress } = yield call(fetchSyncProgress)
-
-  const isSyncing = Number.isInteger(syncProgress) && syncProgress !== 100
-  if (isSyncing) {
-    yield put(actions.setSyncPref({
-      progress: syncProgress,
-      isSyncing: true,
-    }))
-  } else {
+  if (syncProgress === types.SYNC_NOT_STARTED) {
+    yield put(actions.setIsSyncing(false))
     yield call(startSyncing)
+  } else {
+    yield put(actions.setIsSyncing(true))
+    const isSyncing = Number.isInteger(syncProgress) && syncProgress !== 100
+    if (isSyncing) {
+      yield put(actions.setSyncPref({
+        progress: syncProgress,
+        isSyncing: true,
+      }))
+    } else {
+      yield call(startSyncing)
+    }
+    yield call(getSyncConf)
   }
-
-  yield call(getSyncConf)
 }
 
 function* progressUpdate({ payload }) {
   const { result } = payload
-
   if (result === types.SYNC_INTERRUPTED) {
     yield put(actions.setIsSyncing(false))
   } else {

src/state/ws/saga.js

@@ -1,5 +1,6 @@
 import { call, put, takeLatest } from 'redux-saga/effects'
 
+import { initSync } from 'state/sync/saga'
 import { updateSyncStatus } from 'state/sync/actions'
 import { updateStatus, updateWarningStatus } from 'state/status/actions'
 
@@ -8,8 +9,8 @@ import login from './signIn'
 
 function* reconnect() {
   const wsAuth = yield call(login)
-
   if (wsAuth) {
+    yield call(initSync)
     yield put(updateSyncStatus())
   }
 }