cozy-harvest-lib 8.1.0 → 8.2.1

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.2.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.2.0...cozy-harvest-lib@8.2.1) (2022-04-13)
+
+
+### Bug Fixes
+
+* Get correct bi mapping for bnp_es and cic_es ([f304f89](https://github.com/cozy/cozy-libs/commit/f304f8978f1857f3f1d1e74c0c19385ab96dde24))
+
+
+
+
+
+# [8.2.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.1...cozy-harvest-lib@8.2.0) (2022-04-13)
+
+
+### Features
+
+* Fix back navigation ([89283ab](https://github.com/cozy/cozy-libs/commit/89283ab1beb06fa15625a7f108abbddf37216397))
+
+
+
+
+
+## [8.1.1](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.1.0...cozy-harvest-lib@8.1.1) (2022-04-11)
+
+
+### Bug Fixes
+
+* **cozy-harvest-lib:** Correctly handle onClick on AppLinkCard ([c9068c5](https://github.com/cozy/cozy-libs/commit/c9068c53a1ec2e1f6b9b7636f6b25aadec69900f))
+* **cozy-harvest-lib:** Disable AppLink button until fallback is resolved ([bedc90d](https://github.com/cozy/cozy-libs/commit/bedc90d80c899bb93a2be70d6963d62742fb600b))
+
+
+
+
+
 # [8.1.0](https://github.com/cozy/cozy-libs/compare/cozy-harvest-lib@8.0.0...cozy-harvest-lib@8.1.0) (2022-04-08)
 
 

package/dist/components/AccountModal.js

@@ -26,7 +26,7 @@ import * as triggersModel from '../helpers/triggers';
 import KonnectorAccountTabs from './KonnectorConfiguration/KonnectorAccountTabs';
 import AccountSelectBox from './AccountSelectBox/AccountSelectBox';
 import KonnectorModalHeader from './KonnectorModalHeader';
-import { withMountPointPushHistory } from './MountPointContext';
+import { withMountPointHistory } from './MountPointContext';
 import withLocales from './hoc/withLocales';
 import DialogContent from '@material-ui/core/DialogContent';
 /**
@@ -247,6 +247,7 @@ export var AccountModal = /*#__PURE__*/function (_Component) {
           accountsAndTriggers = _this$props2.accountsAndTriggers,
           t = _this$props2.t,
           pushHistory = _this$props2.pushHistory,
+          replaceHistory = _this$props2.replaceHistory,
           initialActiveTab = _this$props2.initialActiveTab,
           isMobile = _this$props2.breakpoints.isMobile,
           showAccountSelection = _this$props2.showAccountSelection,
@@ -293,7 +294,7 @@ export var AccountModal = /*#__PURE__*/function (_Component) {
         account: account,
         onAccountDeleted: onDismiss,
         addAccount: function addAccount() {
-          return pushHistory('/new');
+          return replaceHistory('/new');
         },
         showNewAccountButton: showNewAccountButton
       })));
@@ -324,7 +325,7 @@ AccountModal.propTypes = {
     trigger: PropTypes.object.isRequired
   })).isRequired,
   t: PropTypes.func.isRequired,
-  pushHistory: PropTypes.func.isRequired,
+  replaceHistory: PropTypes.func.isRequired,
   accountId: PropTypes.string.isRequired,
 
   /** @type {string} Can be set to force the initial active tab */
@@ -336,4 +337,4 @@ AccountModal.propTypes = {
   /** @type {Boolean} Whether to show the button to add a new account */
   showNewAccountButton: PropTypes.bool
 };
-export default flow(withClient, withLocales, withMountPointPushHistory, withBreakpoints())(AccountModal);
+export default flow(withClient, withLocales, withMountPointHistory, withBreakpoints())(AccountModal);

package/dist/components/AccountModal.spec.js

@@ -38,6 +38,7 @@ var accountIdMock = '123';
 describe('AccountModal', function () {
   var setup = function setup() {
     var mockHistoryPush = jest.fn();
+    var mockHistoryReplace = jest.fn();
     var component = shallow( /*#__PURE__*/React.createElement(AccountModal, {
       konnector: {},
       t: function t(x) {
@@ -46,6 +47,7 @@ describe('AccountModal', function () {
       accountId: accountIdMock,
       accountsAndTriggers: accountsAndTriggersMock,
       pushHistory: mockHistoryPush,
+      replaceHistory: mockHistoryReplace,
       breakpoints: {
         isMobile: true
       },
@@ -53,7 +55,8 @@ describe('AccountModal', function () {
     }));
     return {
       component: component,
-      mockHistoryPush: mockHistoryPush
+      mockHistoryPush: mockHistoryPush,
+      mockHistoryReplace: mockHistoryReplace
     };
   };
 

package/dist/components/AccountsListModal.js

@@ -13,7 +13,8 @@ var AccountsListModal = function AccountsListModal(_ref) {
       t = _ref.t;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      pushHistory = _useContext.pushHistory,
+      replaceHistory = _useContext.replaceHistory;
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DialogContent, null, /*#__PURE__*/React.createElement(Stack, {
     className: "u-mb-3"
@@ -29,7 +30,7 @@ var AccountsListModal = function AccountsListModal(_ref) {
     accounts: accounts,
     konnector: konnector,
     onPick: function onPick(option) {
-      return pushHistory("/accounts/".concat(option.account._id));
+      return replaceHistory("/accounts/".concat(option.account._id));
     },
     addAccount: function addAccount() {
       return pushHistory('/new');

package/dist/components/EditAccountModal.js

@@ -27,7 +27,7 @@ import { DialogCloseButton, useCozyDialog } from 'cozy-ui/transpiled/react/CozyD
 import { fetchAccount as _fetchAccount } from '../connections/accounts';
 import * as triggersModel from '../helpers/triggers';
 import TriggerManager from './TriggerManager';
-import { withMountPointPushHistory } from './MountPointContext';
+import { withMountPointHistory } from './MountPointContext';
 import logger from '../logger';
 import { withTracker } from './hoc/tracking';
 import useTimeout from './hooks/useTimeout';
@@ -213,7 +213,7 @@ export var EditAccountModal = /*#__PURE__*/function (_Component) {
       var account = this.state.account;
 
       if (account) {
-        this.props.pushHistory("/accounts/".concat(account._id));
+        this.props.replaceHistory("/accounts/".concat(account._id));
       } else {
         this.props.pushHistory("/accounts");
       }
@@ -255,4 +255,4 @@ EditAccountModal.propTypes = {
   accounts: PropTypes.array.isRequired,
   reconnect: PropTypes.bool
 };
-export default flow(withClient, withMountPointPushHistory, withTracker)(EditAccountModal);
+export default flow(withClient, withMountPointHistory, withTracker)(EditAccountModal);

package/dist/components/HarvestModalRoot.js

@@ -8,13 +8,13 @@ var HarvestModalRoot = function HarvestModalRoot(_ref) {
       konnector = _ref.konnector;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   if (accounts.length === 0) {
-    pushHistory('/new');
+    replaceHistory('/new');
     return null;
   } else if (accounts.length === 1) {
-    pushHistory("/accounts/".concat(accounts[0].account._id));
+    replaceHistory("/accounts/".concat(accounts[0].account._id));
     return null;
   } else {
     return /*#__PURE__*/React.createElement(AccountsListModal, {

package/dist/components/KonnectorConfiguration/ConfigurationTab/index.js

@@ -76,7 +76,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
       isMobile = _useBreakpoints.isMobile;
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var client = useClient();
   var vaultClient = useVaultClient();
@@ -238,7 +238,7 @@ var ConfigurationTab = function ConfigurationTab(_ref2) {
     button: true,
     divider: true,
     onClick: function onClick() {
-      return pushHistory("/accounts/".concat(account._id, "/edit"));
+      return replaceHistory("/accounts/".concat(account._id, "/edit"));
     }
   }, /*#__PURE__*/React.createElement(ListItemIcon, null, /*#__PURE__*/React.createElement(Icon, {
     icon: KeyIcon,

package/dist/components/MountPointContext.js

@@ -26,20 +26,32 @@ export var RawMountPointProvider = /*#__PURE__*/function (_React$Component) {
 
     _this = _super.call(this, props);
     _this.pushHistory = _this.pushHistory.bind(_assertThisInitialized(_this));
+    _this.replaceHistory = _this.replaceHistory.bind(_assertThisInitialized(_this));
     _this.state = {
       baseRoute: props.baseRoute || '/',
-      pushHistory: _this.pushHistory
+      pushHistory: _this.pushHistory,
+      replaceHistory: _this.replaceHistory
     };
     return _this;
   }
 
   _createClass(RawMountPointProvider, [{
-    key: "pushHistory",
-    value: function pushHistory(route) {
+    key: "historyAction",
+    value: function historyAction(route, method) {
       var history = this.props.history;
       var baseRoute = this.state.baseRoute;
-      var segments = baseRoute.split('/').concat(route.split('/')).filter(Boolean);
-      history.push("/".concat(segments.join('/')));
+      var segments = '/'.concat(baseRoute.split('/').concat(route.split('/')).filter(Boolean).join('/'));
+      history[method](segments);
+    }
+  }, {
+    key: "pushHistory",
+    value: function pushHistory(route) {
+      this.historyAction(route, 'push');
+    }
+  }, {
+    key: "replaceHistory",
+    value: function replaceHistory(route) {
+      this.historyAction(route, 'replace');
     }
   }, {
     key: "render",
@@ -57,19 +69,21 @@ RawMountPointProvider.propTypes = {
   history: PropTypes.object
 };
 
-var withMountPointPushHistory = function withMountPointPushHistory(BaseComponent) {
+var withMountPointHistory = function withMountPointHistory(BaseComponent) {
   var Component = function Component(props) {
     var _useContext = useContext(MountPointContext),
-        pushHistory = _useContext.pushHistory;
+        pushHistory = _useContext.pushHistory,
+        replaceHistory = _useContext.replaceHistory;
 
     return /*#__PURE__*/React.createElement(BaseComponent, _extends({
-      pushHistory: pushHistory
+      pushHistory: pushHistory,
+      replaceHistory: replaceHistory
     }, props));
   };
 
-  Component.displayName = "withMountPointPushHistory(".concat(BaseComponent.displayName || BaseComponent.name, ")");
+  Component.displayName = "withMountPointHistory(".concat(BaseComponent.displayName || BaseComponent.name, ")");
   return Component;
 };
 
 var MountPointProvider = withRouter(RawMountPointProvider);
-export { MountPointContext, MountPointProvider, withMountPointPushHistory };
+export { MountPointContext, MountPointProvider, withMountPointHistory };

package/dist/components/MountPointContext.spec.js

@@ -3,7 +3,7 @@ import { shallow } from 'enzyme';
 import { RawMountPointProvider } from 'components/MountPointContext';
 describe('MountPointProvider', function () {
   var historyMock = {
-    push: jest.fn()
+    replace: jest.fn()
   };
   beforeEach(function () {
     jest.resetAllMocks();
@@ -13,33 +13,33 @@ describe('MountPointProvider', function () {
       baseRoute: "/root",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one');
-    component.instance().pushHistory('/one/two');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one/two');
-    component.instance().pushHistory('no/slash');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash');
-    component.instance().pushHistory('too/many///slashes');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/too/many/slashes');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one');
+    component.instance().replaceHistory('/one/two');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one/two');
+    component.instance().replaceHistory('no/slash');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash');
+    component.instance().replaceHistory('too/many///slashes');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/too/many/slashes');
   });
   it('should handle a trailing slash in the base route', function () {
     var component = shallow( /*#__PURE__*/React.createElement(RawMountPointProvider, {
       baseRoute: "/root/",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one');
-    component.instance().pushHistory('no/slash');
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one');
+    component.instance().replaceHistory('no/slash');
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash');
   });
   it('should handle a base route with multiple segments', function () {
     var component = shallow( /*#__PURE__*/React.createElement(RawMountPointProvider, {
       baseRoute: "/base/route/",
       history: historyMock
     }));
-    component.instance().pushHistory('/one');
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one');
-    component.instance().pushHistory('/one/two');
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one/two');
+    component.instance().replaceHistory('/one');
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one');
+    component.instance().replaceHistory('/one/two');
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one/two');
   });
 });

package/dist/components/NewAccountModal.js

@@ -32,7 +32,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
   var client = useClient();
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var _useMaintenanceStatus = useMaintenanceStatus(client, konnector),
       fetchStatus = _useMaintenanceStatus.fetchStatus,
@@ -78,7 +78,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
         path += '/success';
       }
 
-      pushHistory(path);
+      replaceHistory(path);
     },
     onSuccess: function onSuccess(trigger) {
       var accountId = triggersModel.getAccountId(trigger);
@@ -88,7 +88,7 @@ var NewAccountModal = function NewAccountModal(_ref) {
         path += '/success';
       }
 
-      pushHistory(path);
+      replaceHistory(path);
     },
     onVaultDismiss: onDismiss,
     fieldOptions: fieldOptions

package/dist/components/NewAccountModal.spec.js

@@ -27,9 +27,9 @@ jest.mock('./DialogContext', function () {
   };
 });
 describe('NewAccountModal', function () {
-  var pushHistory = jest.fn();
+  var replaceHistory = jest.fn();
   var mountPointContextValue = {
-    pushHistory: pushHistory
+    replaceHistory: replaceHistory
   };
   var konnectorTrigger = {
     worker: 'konnector',
@@ -58,7 +58,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onLoginSuccessFn(konnectorTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
   });
   it('should redirect to route without success on login success for client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -72,7 +72,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onLoginSuccessFn(clientTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
   });
   it('should redirect to success route on success for non client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -86,7 +86,7 @@ describe('NewAccountModal', function () {
       }
     }))));
     onSuccessFn(konnectorTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success');
   });
   it('should redirect to route without success on success for client triggers', function () {
     render( /*#__PURE__*/React.createElement(AppLike, {
@@ -100,6 +100,6 @@ describe('NewAccountModal', function () {
       }
     }))));
     onSuccessFn(clientTrigger);
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient');
   });
 });

package/dist/components/RedirectToAccountFormButton.js

@@ -13,11 +13,11 @@ var RedirectToAccountFormButton = function RedirectToAccountFormButton(_ref) {
   var accountId = getAccountId(trigger);
 
   var _useContext = useContext(MountPointContext),
-      pushHistory = _useContext.pushHistory;
+      replaceHistory = _useContext.replaceHistory;
 
   var handleClick = useCallback(function () {
-    pushHistory("/accounts/".concat(accountId, "/edit?reconnect"));
-  }, [accountId, pushHistory]);
+    replaceHistory("/accounts/".concat(accountId, "/edit?reconnect"));
+  }, [accountId, replaceHistory]);
   return /*#__PURE__*/React.createElement(Button, {
     className: "u-ml-0",
     theme: "secondary",

package/dist/components/RedirectToAccountFormButton.spec.js

@@ -4,10 +4,10 @@ import { MountPointContext } from './MountPointContext';
 import RedirectToAccountFormButton from './RedirectToAccountFormButton';
 import AppLike from '../../test/AppLike';
 describe('redirect to account form button', function () {
-  it('should use pushHistory to navigate', function () {
-    var pushHistory = jest.fn();
+  it('should use replaceHistory to navigate', function () {
+    var replaceHistory = jest.fn();
     var mountPointContextValue = {
-      pushHistory: pushHistory
+      replaceHistory: replaceHistory
     };
     var trigger = {
       message: {
@@ -20,6 +20,6 @@ describe('redirect to account form button', function () {
       trigger: trigger
     }))));
     fireEvent.click(root.getByText('Reconnect'));
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/account-id-1337/edit?reconnect');
   });
 });

package/dist/components/cards/AppLinkCard.js

@@ -41,7 +41,8 @@ export var AppLinkButton = function AppLinkButton(_ref) {
     var onClick = _ref2.onClick,
         href = _ref2.href;
     return /*#__PURE__*/React.createElement(ButtonLink, {
-      onClick: fetchStatus !== 'loaded' ? onClick : null,
+      disabled: fetchStatus !== 'loaded',
+      onClick: fetchStatus === 'loaded' ? onClick : null,
       href: href,
       icon: isInstalled ? /*#__PURE__*/React.createElement(AppIcon, {
         app: slug,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-harvest-lib",
-  "version": "8.1.0",
+  "version": "8.2.1",
   "description": "Provides logic, modules and components for Cozy's harvest applications.",
   "main": "dist/index.js",
   "author": "Cozy",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@cozy/minilog": "^1.0.0",
     "@sentry/browser": "^6.0.1",
-    "cozy-bi-auth": "0.0.24",
+    "cozy-bi-auth": "0.0.25",
     "cozy-doctypes": "^1.83.7",
     "cozy-logger": "^1.9.0",
     "date-fns": "^1.30.1",
@@ -85,5 +85,5 @@
     "react-router-dom": "^5.0.1"
   },
   "sideEffects": false,
-  "gitHead": "7d830a3634199b430803344cad471783baac1bd5"
+  "gitHead": "34e61fe01b642f5a6640a52d70383ead998fdb70"
 }

package/src/components/AccountModal.jsx

@@ -14,7 +14,7 @@ import * as triggersModel from '../helpers/triggers'
 import KonnectorAccountTabs from './KonnectorConfiguration/KonnectorAccountTabs'
 import AccountSelectBox from './AccountSelectBox/AccountSelectBox'
 import KonnectorModalHeader from './KonnectorModalHeader'
-import { withMountPointPushHistory } from './MountPointContext'
+import { withMountPointHistory } from './MountPointContext'
 import withLocales from './hoc/withLocales'
 import DialogContent from '@material-ui/core/DialogContent'
 
@@ -109,6 +109,7 @@ export class AccountModal extends Component {
       accountsAndTriggers,
       t,
       pushHistory,
+      replaceHistory,
       initialActiveTab,
       breakpoints: { isMobile },
       showAccountSelection,
@@ -164,7 +165,7 @@ export class AccountModal extends Component {
               initialTrigger={trigger}
               account={account}
               onAccountDeleted={onDismiss}
-              addAccount={() => pushHistory('/new')}
+              addAccount={() => replaceHistory('/new')}
               showNewAccountButton={showNewAccountButton}
             />
           </DialogContent>
@@ -197,7 +198,7 @@ AccountModal.propTypes = {
     })
   ).isRequired,
   t: PropTypes.func.isRequired,
-  pushHistory: PropTypes.func.isRequired,
+  replaceHistory: PropTypes.func.isRequired,
   accountId: PropTypes.string.isRequired,
 
   /** @type {string} Can be set to force the initial active tab */
@@ -213,6 +214,6 @@ AccountModal.propTypes = {
 export default flow(
   withClient,
   withLocales,
-  withMountPointPushHistory,
+  withMountPointHistory,
   withBreakpoints()
 )(AccountModal)

package/src/components/AccountModal.spec.jsx

@@ -37,6 +37,8 @@ const accountIdMock = '123'
 describe('AccountModal', () => {
   const setup = () => {
     const mockHistoryPush = jest.fn()
+    const mockHistoryReplace = jest.fn()
+
     const component = shallow(
       <AccountModal
         konnector={{}}
@@ -44,11 +46,12 @@ describe('AccountModal', () => {
         accountId={accountIdMock}
         accountsAndTriggers={accountsAndTriggersMock}
         pushHistory={mockHistoryPush}
+        replaceHistory={mockHistoryReplace}
         breakpoints={{ isMobile: true }}
         onDismiss={jest.fn()}
       />
     )
-    return { component, mockHistoryPush }
+    return { component, mockHistoryPush, mockHistoryReplace }
   }
 
   it('should display the fetching state by default', () => {
@@ -62,7 +65,9 @@ describe('AccountModal', () => {
       name: 'account 1'
     })
 
-    const { component, mockHistoryPush } = setup({ fetchAccount })
+    const { component, mockHistoryPush } = setup({
+      fetchAccount
+    })
 
     it('should display the AccountSelect & Content if an account is there and we can change the selectedAccount', async () => {
       await component.instance().componentDidMount()

package/src/components/AccountsListModal.jsx

@@ -8,7 +8,7 @@ import { MountPointContext } from './MountPointContext'
 import DialogContent from '@material-ui/core/DialogContent'
 
 const AccountsListModal = ({ konnector, accounts, t }) => {
-  const { pushHistory } = useContext(MountPointContext)
+  const { pushHistory, replaceHistory } = useContext(MountPointContext)
   return (
     <>
       <DialogContent>
@@ -23,7 +23,7 @@ const AccountsListModal = ({ konnector, accounts, t }) => {
         <AccountsList
           accounts={accounts}
           konnector={konnector}
-          onPick={option => pushHistory(`/accounts/${option.account._id}`)}
+          onPick={option => replaceHistory(`/accounts/${option.account._id}`)}
           addAccount={() => pushHistory('/new')}
         />
       </DialogContent>

package/src/components/EditAccountModal.jsx

@@ -19,7 +19,7 @@ import {
 import { fetchAccount } from '../connections/accounts'
 import * as triggersModel from '../helpers/triggers'
 import TriggerManager from './TriggerManager'
-import { withMountPointPushHistory } from './MountPointContext'
+import { withMountPointHistory } from './MountPointContext'
 import logger from '../logger'
 import { withTracker } from './hoc/tracking'
 import useTimeout from './hooks/useTimeout'
@@ -164,7 +164,7 @@ export class EditAccountModal extends Component {
   redirectToAccount() {
     const { account } = this.state
     if (account) {
-      this.props.pushHistory(`/accounts/${account._id}`)
+      this.props.replaceHistory(`/accounts/${account._id}`)
     } else {
       this.props.pushHistory(`/accounts`)
     }
@@ -203,6 +203,6 @@ EditAccountModal.propTypes = {
 
 export default flow(
   withClient,
-  withMountPointPushHistory,
+  withMountPointHistory,
   withTracker
 )(EditAccountModal)

package/src/components/HarvestModalRoot.jsx

@@ -4,12 +4,12 @@ import AccountsListModal from './AccountsListModal'
 import { MountPointContext } from './MountPointContext'
 
 const HarvestModalRoot = ({ accounts, konnector }) => {
-  const { pushHistory } = useContext(MountPointContext)
+  const { replaceHistory } = useContext(MountPointContext)
   if (accounts.length === 0) {
-    pushHistory('/new')
+    replaceHistory('/new')
     return null
   } else if (accounts.length === 1) {
-    pushHistory(`/accounts/${accounts[0].account._id}`)
+    replaceHistory(`/accounts/${accounts[0].account._id}`)
     return null
   } else {
     return <AccountsListModal konnector={konnector} accounts={accounts} />

package/src/components/KonnectorConfiguration/ConfigurationTab/index.jsx

@@ -78,7 +78,7 @@ const ConfigurationTab = ({
 }) => {
   const { t } = useI18n()
   const { isMobile } = useBreakpoints()
-  const { pushHistory } = useContext(MountPointContext)
+  const { replaceHistory } = useContext(MountPointContext)
   const client = useClient()
   const vaultClient = useVaultClient()
   const [deleting, setDeleting] = useSafeState(false)
@@ -169,7 +169,7 @@ const ConfigurationTab = ({
             <ListItem
               button
               divider
-              onClick={() => pushHistory(`/accounts/${account._id}/edit`)}
+              onClick={() => replaceHistory(`/accounts/${account._id}/edit`)}
             >
               <ListItemIcon>
                 <Icon icon={KeyIcon} color={palette['slateGrey']} />

package/src/components/MountPointContext.jsx

@@ -9,21 +9,31 @@ export class RawMountPointProvider extends React.Component {
     super(props)
 
     this.pushHistory = this.pushHistory.bind(this)
+    this.replaceHistory = this.replaceHistory.bind(this)
 
     this.state = {
       baseRoute: props.baseRoute || '/',
-      pushHistory: this.pushHistory
+      pushHistory: this.pushHistory,
+      replaceHistory: this.replaceHistory
     }
   }
 
-  pushHistory(route) {
+  historyAction(route, method) {
     const { history } = this.props
     const { baseRoute } = this.state
-    const segments = baseRoute
-      .split('/')
-      .concat(route.split('/'))
-      .filter(Boolean)
-    history.push(`/${segments.join('/')}`)
+    const segments = '/'.concat(
+      baseRoute.split('/').concat(route.split('/')).filter(Boolean).join('/')
+    )
+
+    history[method](segments)
+  }
+
+  pushHistory(route) {
+    this.historyAction(route, 'push')
+  }
+
+  replaceHistory(route) {
+    this.historyAction(route, 'replace')
   }
 
   render() {
@@ -40,13 +50,20 @@ RawMountPointProvider.propTypes = {
   history: PropTypes.object
 }
 
-const withMountPointPushHistory = BaseComponent => {
+const withMountPointHistory = BaseComponent => {
   const Component = props => {
-    const { pushHistory } = useContext(MountPointContext)
-    return <BaseComponent pushHistory={pushHistory} {...props} />
+    const { pushHistory, replaceHistory } = useContext(MountPointContext)
+
+    return (
+      <BaseComponent
+        pushHistory={pushHistory}
+        replaceHistory={replaceHistory}
+        {...props}
+      />
+    )
   }
 
-  Component.displayName = `withMountPointPushHistory(${
+  Component.displayName = `withMountPointHistory(${
     BaseComponent.displayName || BaseComponent.name
   })`
 
@@ -54,4 +71,4 @@ const withMountPointPushHistory = BaseComponent => {
 }
 
 const MountPointProvider = withRouter(RawMountPointProvider)
-export { MountPointContext, MountPointProvider, withMountPointPushHistory }
+export { MountPointContext, MountPointProvider, withMountPointHistory }

package/src/components/MountPointContext.spec.jsx

@@ -3,7 +3,7 @@ import { shallow } from 'enzyme'
 import { RawMountPointProvider } from 'components/MountPointContext'
 
 describe('MountPointProvider', () => {
-  const historyMock = { push: jest.fn() }
+  const historyMock = { replace: jest.fn() }
 
   beforeEach(() => {
     jest.resetAllMocks()
@@ -14,17 +14,17 @@ describe('MountPointProvider', () => {
       <RawMountPointProvider baseRoute="/root" history={historyMock} />
     )
 
-    component.instance().pushHistory('/one')
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one')
+    component.instance().replaceHistory('/one')
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one')
 
-    component.instance().pushHistory('/one/two')
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one/two')
+    component.instance().replaceHistory('/one/two')
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one/two')
 
-    component.instance().pushHistory('no/slash')
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash')
+    component.instance().replaceHistory('no/slash')
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash')
 
-    component.instance().pushHistory('too/many///slashes')
-    expect(historyMock.push).toHaveBeenCalledWith('/root/too/many/slashes')
+    component.instance().replaceHistory('too/many///slashes')
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/too/many/slashes')
   })
 
   it('should handle a trailing slash in the base route', () => {
@@ -32,11 +32,11 @@ describe('MountPointProvider', () => {
       <RawMountPointProvider baseRoute="/root/" history={historyMock} />
     )
 
-    component.instance().pushHistory('/one')
-    expect(historyMock.push).toHaveBeenCalledWith('/root/one')
+    component.instance().replaceHistory('/one')
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/one')
 
-    component.instance().pushHistory('no/slash')
-    expect(historyMock.push).toHaveBeenCalledWith('/root/no/slash')
+    component.instance().replaceHistory('no/slash')
+    expect(historyMock.replace).toHaveBeenCalledWith('/root/no/slash')
   })
 
   it('should handle a base route with multiple segments', () => {
@@ -44,10 +44,10 @@ describe('MountPointProvider', () => {
       <RawMountPointProvider baseRoute="/base/route/" history={historyMock} />
     )
 
-    component.instance().pushHistory('/one')
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one')
+    component.instance().replaceHistory('/one')
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one')
 
-    component.instance().pushHistory('/one/two')
-    expect(historyMock.push).toHaveBeenCalledWith('/base/route/one/two')
+    component.instance().replaceHistory('/one/two')
+    expect(historyMock.replace).toHaveBeenCalledWith('/base/route/one/two')
   })
 })

package/src/components/NewAccountModal.jsx

@@ -26,7 +26,7 @@ import { useDialogContext } from './DialogContext'
 const NewAccountModal = ({ konnector, onDismiss }) => {
   const { t } = useI18n()
   const client = useClient()
-  const { pushHistory } = useContext(MountPointContext)
+  const { replaceHistory } = useContext(MountPointContext)
   const {
     fetchStatus,
     data: { isInMaintenance, messages: maintenanceMessages }
@@ -74,7 +74,7 @@ const NewAccountModal = ({ konnector, onDismiss }) => {
               if (trigger.worker !== 'client') {
                 path += '/success'
               }
-              pushHistory(path)
+              replaceHistory(path)
             }}
             onSuccess={trigger => {
               const accountId = triggersModel.getAccountId(trigger)
@@ -82,7 +82,7 @@ const NewAccountModal = ({ konnector, onDismiss }) => {
               if (trigger.worker !== 'client') {
                 path += '/success'
               }
-              pushHistory(path)
+              replaceHistory(path)
             }}
             onVaultDismiss={onDismiss}
             fieldOptions={fieldOptions}

package/src/components/NewAccountModal.spec.jsx

@@ -26,9 +26,9 @@ jest.mock('./DialogContext', () => {
 })
 
 describe('NewAccountModal', () => {
-  const pushHistory = jest.fn()
+  const replaceHistory = jest.fn()
   const mountPointContextValue = {
-    pushHistory
+    replaceHistory
   }
   const konnectorTrigger = {
     worker: 'konnector',
@@ -58,7 +58,7 @@ describe('NewAccountModal', () => {
       </AppLike>
     )
     onLoginSuccessFn(konnectorTrigger)
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success')
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success')
   })
   it('should redirect to route without success on login success for client triggers', () => {
     render(
@@ -71,7 +71,7 @@ describe('NewAccountModal', () => {
       </AppLike>
     )
     onLoginSuccessFn(clientTrigger)
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient')
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient')
   })
 
   it('should redirect to success route on success for non client triggers', () => {
@@ -85,7 +85,7 @@ describe('NewAccountModal', () => {
       </AppLike>
     )
     onSuccessFn(konnectorTrigger)
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumber/success')
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumber/success')
   })
   it('should redirect to route without success on success for client triggers', () => {
     render(
@@ -98,6 +98,6 @@ describe('NewAccountModal', () => {
       </AppLike>
     )
     onSuccessFn(clientTrigger)
-    expect(pushHistory).toHaveBeenCalledWith('/accounts/accountNumberClient')
+    expect(replaceHistory).toHaveBeenCalledWith('/accounts/accountNumberClient')
   })
 })

package/src/components/RedirectToAccountFormButton.jsx

@@ -7,10 +7,10 @@ import { MountPointContext } from './MountPointContext'
 const RedirectToAccountFormButton = ({ trigger }) => {
   const { t } = useI18n()
   const accountId = getAccountId(trigger)
-  const { pushHistory } = useContext(MountPointContext)
+  const { replaceHistory } = useContext(MountPointContext)
   const handleClick = useCallback(() => {
-    pushHistory(`/accounts/${accountId}/edit?reconnect`)
-  }, [accountId, pushHistory])
+    replaceHistory(`/accounts/${accountId}/edit?reconnect`)
+  }, [accountId, replaceHistory])
   return (
     <Button
       className="u-ml-0"

package/src/components/RedirectToAccountFormButton.spec.jsx

@@ -5,10 +5,10 @@ import RedirectToAccountFormButton from './RedirectToAccountFormButton'
 import AppLike from '../../test/AppLike'
 
 describe('redirect to account form button', () => {
-  it('should use pushHistory to navigate', () => {
-    const pushHistory = jest.fn()
+  it('should use replaceHistory to navigate', () => {
+    const replaceHistory = jest.fn()
     const mountPointContextValue = {
-      pushHistory
+      replaceHistory
     }
     const trigger = {
       message: {
@@ -23,7 +23,7 @@ describe('redirect to account form button', () => {
       </AppLike>
     )
     fireEvent.click(root.getByText('Reconnect'))
-    expect(pushHistory).toHaveBeenCalledWith(
+    expect(replaceHistory).toHaveBeenCalledWith(
       '/accounts/account-id-1337/edit?reconnect'
     )
   })

package/src/components/cards/AppLinkCard.jsx

@@ -28,7 +28,8 @@ export const AppLinkButton = ({ slug, path }) => {
     <AppLinker app={{ slug }} nativePath={path} href={url || '#'}>
       {({ onClick, href }) => (
         <ButtonLink
-          onClick={fetchStatus !== 'loaded' ? onClick : null}
+          disabled={fetchStatus !== 'loaded'}
+          onClick={fetchStatus === 'loaded' ? onClick : null}
           href={href}
           icon={
             isInstalled ? (