Merge pull request #3812 from anup2307/fix-modalbrowserhistory

fixed the browserhistory for the modal in ballot page
wevote · Jan 3, 2024 · 3f5931d · 3f5931d
2 parents 247a12b + 9268cf5
commit 3f5931d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/js/common/utils/historyPush.js b/src/js/common/utils/historyPush.js
@@ -4,8 +4,9 @@ import webAppConfig from '../../config';
 // See v5: https://reactrouter.com/native/api/Hooks/usehistory
 // IMPORTANT:  The HTML5 window.history, is very different from the react-router V5 history, don't use window.history!
 // removePriorPathname determines whether the route  should be pushed or replace the previous entry in the history stack.
-export default function historyPush (route, removePriorPathname = false) {
-  if (route !== global.weVoteGlobalHistory.location.pathname) {
+// doNotPushHistory tells whether the history needs to be updated or not.
+export default function historyPush (route, removePriorPathname = false, doNotPushToHistory = false) {
+  if (route !== global.weVoteGlobalHistory.location.pathname && !doNotPushToHistory) {
     if (removePriorPathname) {
       global.weVoteGlobalHistory.replace(route);
     } else {

diff --git a/src/js/components/Share/ShareButtonDesktopTablet.jsx b/src/js/components/Share/ShareButtonDesktopTablet.jsx
@@ -113,7 +113,7 @@ class ShareButtonDesktopTablet extends Component {
     if (!stringContains('/modal/share', pathname) && isWebApp()) {
       const pathnameWithModalShare = `${pathname}${pathname.endsWith('/') ? '' : '/'}modal/share`;
       // console.log('Navigation ShareButtonDesktopTablet openShareModal ', pathnameWithModalShare)
-      historyPush(pathnameWithModalShare);
+      historyPush(pathnameWithModalShare, false, true);
     }
   }