diff --git a/node/buildSrcCordova.js b/node/buildSrcCordova.js
index 48a31c353..d0166ed8a 100644
--- a/node/buildSrcCordova.js
+++ b/node/buildSrcCordova.js
@@ -56,26 +56,26 @@ function getVersionsFromConfigXML () {
   let regex = /version="(.*?)"/;
   let found = data.match(regex);
   if (found.length > 0) {
-    console.log('version from config.xml: ', found[1]);
+    console.log('> Cordova: version from config.xml: ', found[1]);
     versions.version = found[1];
   } else {
-    console.log('version from config.xml: error');
+    console.log('> Cordova: version from config.xml: error');
   }
   regex = /ios-CFBundleVersion="(.*?)"/;
   found = data.match(regex);
-  if (found.length > 0) {
-    console.log('ios-CFBundleVersion from config.xml: ', found[1]);
+  if (found && found.length > 0) {
+    console.log('> Cordova: ios-CFBundleVersion from config.xml: ', found[1]);
     versions.iosBundleVersion = found[1];
   } else {
-    console.log('ios-CFBundleVersion from config.xml: error');
+    console.log('> Cordova: ios-CFBundleVersion from config.xml: error');
   }
   regex = /android-versionCode="(.*?)"/;
   found = data.match(regex);
-  if (found.length > 0) {
-    console.log('android-versionCode from config.xml: ', found[1]);
+  if (found && found.length > 0) {
+    console.log('> Cordova: android-versionCode from config.xml: ', found[1]);
     versions.androidBundleVersion = found[1];
   } else {
-    console.log('android-versionCode from config.xml: error');
+    console.log('> Cordova: android-versionCode from config.xml: error');
   }
   return versions;
 }
@@ -178,7 +178,7 @@ function fileRewriterForCordova (path, versions) {
 
     if (deleteFiles.includes(path)) {
       fs.remove(path);
-      console.log(`rm file ${path}`);
+      console.log(`> Removed: rm file ${path}`);
     // } else if (dummySubstituteFiles.includes(path)) {
     // Removes files that have includes that cause problems in cordova -- these were Stripe related,
     // but the stripe problem no longer manifested in Oct 2025, and Dale wanted the non-functional
@@ -234,13 +234,13 @@ fs.remove('./build').then(() => {
               if (!(out.length === 1 && out[1] === undefined)) {
                 console.log('> Cordova: Files that (incorrectly) still contain React.lazy: ');
                 console.log(out);
-                console.log('> Cordova: The files listed above, need to be fixed before proceeding!');  // Or the regex needs adjustment
+                console.error('> Cordova: The files listed above, need to be fixed before proceeding!');  // Or the regex needs adjustment
               }
             });
         });
       });
     } catch (err) {
-      console.log(err);
+      console.error(`> Cordova caught error: ${err}`);
     }
   });
 });
diff --git a/node/initialSteps.js b/node/initialSteps.js
index 4588edc5a..ea3308112 100644
--- a/node/initialSteps.js
+++ b/node/initialSteps.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 const { promises: fsPromises } = require('fs');
 
 const isWebApp = !process.env.npm_lifecycle_script.includes('CORDOVA=1');
-console.log(isWebApp ? 'initialSteps -- WebApp compilation' : '> Cordova: Cordova compilation');
+console.log(isWebApp ? 'Info.plist initialSteps -- WebApp compilation' : '> Cordova: Cordova compilation');
 
 // Creates the compileDate.js file that contains the compile date as a string, so it can be displayed where wanted in the app.
 const d = new Date();
diff --git a/node/unSymLinkIOS.sh b/node/unSymLinkIOS.sh
index 84dae28ff..26a659532 100644
--- a/node/unSymLinkIOS.sh
+++ b/node/unSymLinkIOS.sh
@@ -1,5 +1,5 @@
 # This suddenly become necessary with XCode 15 and iOS 17, on October 25, 2023
-echo 'copying files and removing symlinks in WeVoteCordova/platforms/ios/www'
+echo '> Cordova: copying files and removing symlinks in WeVoteCordova/platforms/ios/www'
 cd ../WeVoteCordova/platforms/ios/www || exit
 rm bundle.js
 cp ../../../../WebApp/build/bundle.js .
diff --git a/src/App.jsx b/src/App.jsx
index 85f75bc19..9fca9dc2e 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -12,7 +12,7 @@ import VoterSessionActions from './js/actions/VoterSessionActions';
 import muiTheme from './js/common/components/Style/muiTheme';
 import LoadingWheelComp from './js/common/components/Widgets/LoadingWheelComp';
 import AppObservableStore, { messageService } from './js/common/stores/AppObservableStore';
-import { hasDynamicIsland, hasIPhoneNotch, heightOfIOSSpacer } from './js/common/utils/cordovaUtils';
+import { hasDynamicIsland, hasCordovaNotch, heightOfCordovaSpacer } from './js/common/utils/cordovaUtils';
 import historyPush from './js/common/utils/historyPush';
 import { isWeVoteMarketingSite, normalizedHref } from './js/common/utils/hrefUtils';
 import initializejQuery from './js/common/utils/initializejQuery';
@@ -221,7 +221,7 @@ class App extends Component {
 
     if (isCordova()) {
       console.log(`Cordova:   window.device ${JSON.stringify(window.device)}`);
-      console.log(`Cordova:   Header, isIOS ${hasDynamicIsland()} (${heightOfIOSSpacer()}), hasIPhoneNotch (or AndroidNotch) ${hasIPhoneNotch()}`);
+      console.log(`Cordova:   Header, isIOS ${hasDynamicIsland()}, heightOfCordovaSpacer ${heightOfCordovaSpacer()}), hasCordovaNotch ${hasCordovaNotch()}`);
     }
 
     this.acceptURLVariables();
@@ -536,8 +536,8 @@ class App extends Component {
                   <Route path="/candidate/:candidate_we_vote_id/:organization_we_vote_id" exact component={OrganizationVoterGuideCandidate} />
                   <Route path="/candidate/:candidate_we_vote_id" exact component={Candidate} />
                   <Route path="/challenges/" exact component={ChallengesHomeLoader} />
-                  <Route path="/donate" component={(isNotWeVoteMarketingSite || this.localIsAndroid()) ? ReadyRedirect : Donate} />
-                  <Route path="/donatefaq" component={(isNotWeVoteMarketingSite || this.localIsAndroid()) ? ReadyRedirect : DonateFaq} />
+                  <Route path="/donate" component={(isNotWeVoteMarketingSite) ? ReadyRedirect : Donate} />
+                  <Route path="/donatefaq" component={(isNotWeVoteMarketingSite) ? ReadyRedirect : DonateFaq} />
                   <Route path="/facebook_invitable_friends" component={FacebookInvitableFriends} />
                   <Route path="/findfriends/:set_up_page" exact component={FindFriendsRoot} />
                   <Route path="/findfriends" exact><FindFriendsRoot /></Route>
diff --git a/src/js/common/components/Navigation/ChallengeHeaderSimple.jsx b/src/js/common/components/Navigation/ChallengeHeaderSimple.jsx
index 7e1d9bc3a..ebb3d26b2 100644
--- a/src/js/common/components/Navigation/ChallengeHeaderSimple.jsx
+++ b/src/js/common/components/Navigation/ChallengeHeaderSimple.jsx
@@ -45,7 +45,7 @@ function ChallengeHeaderSimple (props) {
               </ChallengeTitleAndDaysLeftWrapper>
             </ChallengePhotoAndTitle>
             {!hideCloseIcon && (
-              <CloseDrawerIconWrapper>
+              <CloseDrawerIconWrapperChallenger>
                 <div>
                   <IconButton
                     aria-label="Close"
@@ -59,7 +59,7 @@ function ChallengeHeaderSimple (props) {
                     </span>
                   </IconButton>
                 </div>
-              </CloseDrawerIconWrapper>
+              </CloseDrawerIconWrapperChallenger>
             )}
           </ChallengeTitleRow>
         </ChallengeHeaderSimpleContentContainer>
@@ -157,7 +157,7 @@ const ChallengeTitleRow = styled('div')`
   margin-bottom: 16px;
 `;
 
-const CloseDrawerIconWrapper = styled('div')`
+const CloseDrawerIconWrapperChallenger = styled('div')`
   display: flex;
   justify-content: flex-end;
 `;
diff --git a/src/js/common/components/Settings/SettingsVerifySecretCode.jsx b/src/js/common/components/Settings/SettingsVerifySecretCode.jsx
index 39803b2e3..df44d28be 100644
--- a/src/js/common/components/Settings/SettingsVerifySecretCode.jsx
+++ b/src/js/common/components/Settings/SettingsVerifySecretCode.jsx
@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import styled from 'styled-components';
 import VoterActions from '../../../actions/VoterActions';
-import { hasIPhoneNotch, isIOS, isIPhone4in } from '../../utils/cordovaUtils';
+import { hasCordovaNotch, isIOS, isIPhone4in } from '../../utils/cordovaUtils';
 import { isCordova, isWebApp } from '../../utils/isCordovaOrWebApp';
 import { renderLog } from '../../utils/logging';
 import VoterStore from '../../../stores/VoterStore';
@@ -758,7 +758,7 @@ SettingsVerifySecretCode.propTypes = {
 
 const styles = (theme) => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     [theme.breakpoints.up('sm')]: {
       maxWidth: '720px',
       width: '85%',
diff --git a/src/js/common/utils/cordovaUtils.js b/src/js/common/utils/cordovaUtils.js
index 1d328575e..45bea22ea 100644
--- a/src/js/common/utils/cordovaUtils.js
+++ b/src/js/common/utils/cordovaUtils.js
@@ -356,14 +356,18 @@ export function isIPadMini () {
   return false;
 }
 
-export function heightOfIOSSpacer (asString = false) {
-  if (isIOS()) {
+export function heightOfCordovaSpacer (asString = false) {
+  let height = 0;
+  if (isCordova()) {
     if (isIOS() && !isIOSAppOnMac()) {
-      const params = getThisAppleDeviceParameters();
-      return asString ? `${params.iOSSpacer}px` : params.iOSSpacer;
+      const { iOSSpacer } = getThisAppleDeviceParameters();
+      height = iOSSpacer;
+    } else if (isAndroid()) {
+      height = window.androidNotchCutout ? window.androidNotchInset : 0;
     }
   }
-  return 0;
+  // console.log(`heightOfCordovaSpacer '${asString ? `${height}px` : height}'`);
+  return asString ? `${height}px` : height;
 }
 
 export function isCordovaPhone () {
@@ -395,32 +399,8 @@ export function isIPadGiantSize () {
   return false;
 }
 
-export function isAndroidNotch () {
-  if (window.device === undefined) {
-    return false;
-  }
-  const { device: { model, uuid } } = window;
-  // There is an edge-to-edge setting for android, but it will go away in Android 16 in 2025, we have to do this
-  // https://stackoverflow.com/questions/79382767/prevent-edge-to-edge-behaviour-after-android-sdk-35
-  const notchedModels = [
-    'Pixel 7',          // From Browserstack Cordova app device dialog
-    'Pixel 9',          // From Browserstack logcat
-    'Pixel 9',          // From Browserstack logcat
-    'Pixel 9 Pro',      // From Browserstack logcat
-    'Pixel 9 Pro XL',   // From Browserstack logcat
-    'Pixel 10',         // From Browserstack logcat
-    'Pixel 10 Pro',     // From Browserstack logcat
-    'Pixel 10 Pro XL',  // From Browserstack logcat
-  ];
-  const simulatorUUIDs = [    // These change when you update Android Studio
-    'ba09ecb05c77f653',
-    '6d9df9c89e647862',
-  ];
-  if (notchedModels.includes(model) || simulatorUUIDs.includes(uuid)) {
-    logMatch('isAndroidNotch === true for ', model, uuid);
-    return true;
-  }
-  return false;
+export function hasAndroidNotch () {
+  return window.androidNotchCutout;
 }
 
 export function hasDynamicIsland () {
@@ -436,19 +416,23 @@ export function hasDynamicIsland () {
   return false;
 }
 
-export function hasIPhoneNotch () {
-  if (!isIOS()) return false;
-  // Notched models === from the iPhone X up to the iPhone 14 and iPhone SE (2022).
-  // Specifically, this includes the iPhone X, XR, XS, 11, 12, 13 series, iPhone 14 and 14 Plus, and the iPhone SE (2022).
-  const params = getThisAppleDeviceParameters();
-  const marketingInt = parseInt(params.marketingNumber) || 0;
-  const isPro = params.name.includes('Pro');
-  const lettered = ['X', 'XR', 'XS', 'SE'];       // Too simple of a test to handle old SE versions, but those are mostly gone
-  return !hasDynamicIsland() && (
-    lettered.includes(params.marketingNumber) ||
-    (marketingInt === 14 && !isPro) ||
-    (marketingInt >= 11 && marketingInt <= 13)
-  );
+export function hasCordovaNotch () {
+  if (isAndroid()) {
+    return hasAndroidNotch();
+  } else if (isIOS()) {
+    // Notched models === from the iPhone X up to the iPhone 14 and iPhone SE (2022).
+    // Specifically, this includes the iPhone X, XR, XS, 11, 12, 13 series, iPhone 14 and 14 Plus, and the iPhone SE (2022).
+    const params = getThisAppleDeviceParameters();
+    const marketingInt = parseInt(params.marketingNumber) || 0;
+    const isPro = params.name.includes('Pro');
+    const lettered = ['X', 'XR', 'XS', 'SE'];       // Too simple of a test to handle old SE versions, but those are mostly gone
+    return !hasDynamicIsland() && (
+      lettered.includes(params.marketingNumber) ||
+      (marketingInt === 14 && !isPro) ||
+      (marketingInt >= 11 && marketingInt <= 13)
+    );
+  }
+  return false;
 }
 
 export function isIOsSmallerThanPlus () {
@@ -519,39 +503,6 @@ export function getAndroidSize () {
   return androidSizeString;
 }
 
-export function hasAndroidNotch () {
-  // https://deviceatlas.com/blog/list-of-user-agent-strings  (last letter U, like SM-G988U, is a country code ... USA)
-  const ua = navigator.userAgent.toLowerCase();
-  if (ua.includes('SM-S908') ||       // Samsung Galaxy S22 Ultra
-      ua.includes('SM-S906') ||       // Samsung Galaxy S22+
-      ua.includes('SM-S901') ||       // Samsung Galaxy S22
-      ua.includes('SM-G996') ||       // Samsung Galaxy S21
-      ua.includes('SM-G980') ||       // Samsung Galaxy S20
-      ua.includes('SM-G973')) {       // Samsung Galaxy S10
-    return true;
-  }
-
-  // window.device.model: "sdk_gphone64_arm64"
-
-  if (androidPixels === 4446720) {
-    logMatch('Android Samsung Galaxy S22 Ultra (or S22+) detected by pixel size');
-    return true;
-  } else if (androidPixels === 2527200) {
-    logMatch('Android Samsung Galaxy S22 detected by pixel size');  // 1440 x 3040
-    return true;
-  } else if (androidPixels === 2562000) {
-    logMatch('Android Samsung Galaxy S21 detected by pixel size');  // 1080 x 2400
-    return true;
-  } else if (androidPixels === 4608000) {
-    logMatch('Android Samsung Galaxy S20 Ultra detected by pixel size');
-    return true;
-  } else if (androidPixels === 4377600) {
-    logMatch('Android Samsung Galaxy S10 detected by pixel size');  // 1080x2340
-    return true;
-  }
-  return false;
-}
-
 export function isAndroidSizeSM () {
   if (isAndroid()) {
     if (getAndroidSize() === '--sm') {
@@ -680,7 +631,7 @@ if (isSimulator()) {
 
 export function getToastClass () {
   let toastClass = '';
-  if (hasIPhoneNotch()) {
+  if (hasCordovaNotch()) {
     toastClass = 'app-toast-cordova__iphone-notch';
   } else if (isIOS()) {
     toastClass = 'app-toast-cordova__iphone';
diff --git a/src/js/components/Activity/ActivityTidbitDrawer.jsx b/src/js/components/Activity/ActivityTidbitDrawer.jsx
index e56d61b72..ddaccd04e 100644
--- a/src/js/components/Activity/ActivityTidbitDrawer.jsx
+++ b/src/js/components/Activity/ActivityTidbitDrawer.jsx
@@ -77,7 +77,7 @@ class ActivityTidbitDrawer extends Component {
         anchor="right"
         classes={{ paper: classes.drawerClasses }}
         direction="left"
-        id="share-menu"
+        id="activityTidbit"
         onClose={this.closeActivityTidbitDrawer}
         open={modalOpen}
       >
diff --git a/src/js/components/Ballot/PositionDrawer.jsx b/src/js/components/Ballot/PositionDrawer.jsx
index d661470db..fe032ad49 100644
--- a/src/js/components/Ballot/PositionDrawer.jsx
+++ b/src/js/components/Ballot/PositionDrawer.jsx
@@ -11,7 +11,8 @@ import MeasureActions from '../../actions/MeasureActions';
 import OrganizationActions from '../../actions/OrganizationActions';
 import VoterGuideActions from '../../actions/VoterGuideActions';
 import apiCalming from '../../common/utils/apiCalming';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import convertToInteger from '../../common/utils/convertToInteger';
+import { hasCordovaNotch, heightOfCordovaSpacer } from '../../common/utils/cordovaUtils';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
@@ -20,11 +21,8 @@ import BallotStore from '../../stores/BallotStore';
 import CandidateStore from '../../stores/CandidateStore';
 import IssueStore from '../../stores/IssueStore';
 import MeasureStore from '../../stores/MeasureStore';
-// import OrganizationStore from '../../stores/OrganizationStore';
 import VoterGuideStore from '../../stores/VoterGuideStore';
 import VoterStore from '../../stores/VoterStore';
-import { cordovaDrawerTopMargin } from '../../utils/cordovaOffsets';
-import convertToInteger from '../../common/utils/convertToInteger';
 
 const DelayedLoad = React.lazy(() => import(/* webpackChunkName: 'DelayedLoad' */ '../../common/components/Widgets/DelayedLoad'));
 const PositionItem = React.lazy(() => import(/* webpackChunkName: 'PositionItem' */ './PositionItem'));
@@ -291,7 +289,7 @@ PositionDrawer.propTypes = {
 
 const styles = () => ({
   drawer: {
-    marginTop: cordovaDrawerTopMargin(),
+    marginTop: `${heightOfCordovaSpacer(true)} !important`,
     maxWidth: '550px !important',
     '& *': {
       maxWidth: '550px !important',
@@ -305,7 +303,7 @@ const styles = () => ({
   },
   dialogPaper: {
     display: 'block',
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     minWidth: '100%',
     maxWidth: '100%',
     width: '100%',
diff --git a/src/js/components/Ballot/SelectBallotModal.jsx b/src/js/components/Ballot/SelectBallotModal.jsx
index 372013b44..8a62471cf 100644
--- a/src/js/components/Ballot/SelectBallotModal.jsx
+++ b/src/js/components/Ballot/SelectBallotModal.jsx
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import styled from 'styled-components';
 import AnalyticsActions from '../../actions/AnalyticsActions';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { displayNoneIfSmallerThanDesktop } from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
 import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
@@ -204,7 +204,7 @@ const styles = (theme) => ({
     },
   },
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     minHeight: '80%',
     maxHeight: '90%',
     height: '80%',
diff --git a/src/js/components/CompleteYourProfile/AdviserIntroModal.jsx b/src/js/components/CompleteYourProfile/AdviserIntroModal.jsx
index ddb9ff9dc..edd7a9c6e 100644
--- a/src/js/components/CompleteYourProfile/AdviserIntroModal.jsx
+++ b/src/js/components/CompleteYourProfile/AdviserIntroModal.jsx
@@ -5,7 +5,7 @@ import withStyles from '@mui/styles/withStyles';
 import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { renderLog } from '../../common/utils/logging';
 import { ModalTitleType1, ModalTitleAreaType1 } from '../Style/ModalType1Styles';
 
@@ -67,7 +67,7 @@ AdviserIntroModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/CompleteYourProfile/FirstPositionIntroModal.jsx b/src/js/components/CompleteYourProfile/FirstPositionIntroModal.jsx
index d1d6f332c..16593a81f 100644
--- a/src/js/components/CompleteYourProfile/FirstPositionIntroModal.jsx
+++ b/src/js/components/CompleteYourProfile/FirstPositionIntroModal.jsx
@@ -6,7 +6,7 @@ import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import VoterActions from '../../actions/VoterActions';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { renderLog } from '../../common/utils/logging';
 import { ContinueButtonType1Wrapper, ModalTitleType1, ModalTitleAreaType1 } from '../Style/ModalType1Styles';
@@ -155,7 +155,7 @@ FirstPositionIntroModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/CompleteYourProfile/HowItWorksModal.jsx b/src/js/components/CompleteYourProfile/HowItWorksModal.jsx
index 9a18a9bc9..702b5b4f2 100644
--- a/src/js/components/CompleteYourProfile/HowItWorksModal.jsx
+++ b/src/js/components/CompleteYourProfile/HowItWorksModal.jsx
@@ -7,7 +7,7 @@ import React, { Component, Suspense } from 'react';
 import TagManager from 'react-gtm-module';
 import styled from 'styled-components';
 import VoterActions from '../../actions/VoterActions';
-import { heightOfIOSSpacer } from '../../common/utils/cordovaUtils';
+import { heightOfCordovaSpacer } from '../../common/utils/cordovaUtils';
 import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
 import VoterConstants from '../../constants/VoterConstants';
@@ -99,7 +99,7 @@ HowItWorksModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: heightOfIOSSpacer() ? heightOfIOSSpacer() : 48,
+    marginTop: heightOfCordovaSpacer() ? heightOfCordovaSpacer() : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/CompleteYourProfile/PersonalizedScoreIntroModal.jsx b/src/js/components/CompleteYourProfile/PersonalizedScoreIntroModal.jsx
index 10b4571e3..2488319ab 100644
--- a/src/js/components/CompleteYourProfile/PersonalizedScoreIntroModal.jsx
+++ b/src/js/components/CompleteYourProfile/PersonalizedScoreIntroModal.jsx
@@ -6,7 +6,7 @@ import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import VoterActions from '../../actions/VoterActions';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { isCordova } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
@@ -86,7 +86,7 @@ const styles = () => ({
     height: isCordova() ? '83%' : '90%',
     margin: '0 auto',
     padding: '0 !important',
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     transitionDuration: '.25s',
     '@media (min-width: 400px)': {   // Doesn't work in cordova
       width: '90%',
diff --git a/src/js/components/CompleteYourProfile/ValuesIntroModal.jsx b/src/js/components/CompleteYourProfile/ValuesIntroModal.jsx
index 897dfe3ba..7aabc1ed0 100644
--- a/src/js/components/CompleteYourProfile/ValuesIntroModal.jsx
+++ b/src/js/components/CompleteYourProfile/ValuesIntroModal.jsx
@@ -7,7 +7,7 @@ import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import IssueActions from '../../actions/IssueActions';
 import VoterActions from '../../actions/VoterActions';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { renderLog } from '../../common/utils/logging';
 import { ContinueButtonType1Wrapper, ExplanationTextType1, ExplanationTextLighterType1, ModalTitleType1, ModalTitleAreaType1 } from '../Style/ModalType1Styles';
 import VoterConstants from '../../constants/VoterConstants';
@@ -121,7 +121,7 @@ ValuesIntroModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/Drawers/DrawerTemplateHeaderProfile.jsx b/src/js/components/Drawers/DrawerTemplateHeaderProfile.jsx
index eedc6f52a..9d112c337 100644
--- a/src/js/components/Drawers/DrawerTemplateHeaderProfile.jsx
+++ b/src/js/components/Drawers/DrawerTemplateHeaderProfile.jsx
@@ -6,10 +6,9 @@ import React, { useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
 import DesignTokenColors from '../../common/components/Style/DesignTokenColors';
 import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
-import { hasIPhoneNotch, isIPadSmallerThan13 } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch, heightOfCordovaSpacer, isIPadSmallerThan13 } from '../../common/utils/cordovaUtils';
 import { renderLog } from '../../common/utils/logging';
-import { cordovaDrawerTopMargin } from '../../utils/cordovaOffsets';
-import { DrawerHeaderAnimateDownInnerContainer, DrawerHeaderAnimateDownOuterContainer, DrawerHeaderWrapper, DrawerTitle } from '../Style/drawerLayoutStyles';
+import { CloseDrawerIconWrapper, DrawerHeaderAnimateDownInnerContainer, DrawerHeaderAnimateDownOuterContainer, DrawerHeaderWrapper, DrawerTitle } from '../Style/drawerLayoutStyles';
 
 const DrawerTemplateHeaderProfile = (props) => {
   const { classes, drawerId, drawerOpenGlobalVariableName, headerFixedJsx, headerTitleJsx, mainContentJsx, onDrawerClose } = props;
@@ -133,7 +132,7 @@ DrawerTemplateHeaderProfile.propTypes = {
 
 const styles = () => ({
   drawer: {
-    marginTop: cordovaDrawerTopMargin(),
+    marginTop: `${heightOfCordovaSpacer(true)} !important`,
     width: '80%',
   },
   dialogPaper: {
@@ -145,7 +144,7 @@ const styles = () => ({
     maxHeight: '100%',
     height: '100%',
     margin: '0 auto',
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 577px)': {
       maxWidth: '550px',
       width: '90%',
@@ -226,9 +225,4 @@ const DrawerTemplateHeaderProfileWrapper = styled('div')`
   min-width: 300px;
 `;
 
-const CloseDrawerIconWrapper = styled('div')`
-  display: flex;
-  justify-content: flex-end;
-`;
-
 export default withStyles(styles)(DrawerTemplateHeaderProfile);
diff --git a/src/js/components/FriendIntro/FAQModal.jsx b/src/js/components/FriendIntro/FAQModal.jsx
index c0768dbf2..056da696d 100644
--- a/src/js/components/FriendIntro/FAQModal.jsx
+++ b/src/js/components/FriendIntro/FAQModal.jsx
@@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import styled from 'styled-components';
 import FAQBody from '../../common/components/FAQBody';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { renderLog } from '../../common/utils/logging';
 
 // const FAQ = React.lazy(() => import(/* webpackChunkName: 'FAQModal' */ '../../components/FriendIntro/FAQModal'));
@@ -71,7 +71,7 @@ FAQModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/Friends/AskFriendsModal.jsx b/src/js/components/Friends/AskFriendsModal.jsx
index e4e037062..de6b4337e 100644
--- a/src/js/components/Friends/AskFriendsModal.jsx
+++ b/src/js/components/Friends/AskFriendsModal.jsx
@@ -15,7 +15,7 @@ import FriendList from './FriendList';
 import FriendActions from '../../actions/FriendActions';
 import apiCalming from '../../common/utils/apiCalming';
 import { formatDateMMMDoYYYY } from '../../common/utils/dateFormat';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import daysUntil from '../../common/utils/daysUntil';
 import { renderLog } from '../../common/utils/logging';
 import { ModalTitleType1 } from '../Style/ModalType1Styles';
@@ -38,7 +38,7 @@ class AskFriendsModal extends Component {
       numberOfIncreases: 0,
       numberOfItemsToDisplay: 20,
       searchFilterOn: false,
-      searchTerm: '',
+      // searchTerm: '',
     };
   }
 
@@ -144,7 +144,7 @@ class AskFriendsModal extends Component {
       this.setState({
         currentFriendListFilteredBySearch: [],
         searchFilterOn: false,
-        searchTerm: '',
+        // searchTerm: '',
       });
     } else {
       const searchTermLowercase = searchTerm.toLowerCase();
@@ -155,7 +155,7 @@ class AskFriendsModal extends Component {
       this.setState({
         currentFriendListFilteredBySearch: searchedFriendList,
         searchFilterOn: true,
-        searchTerm,
+        // searchTerm,
       });
     }
   }
@@ -163,7 +163,7 @@ class AskFriendsModal extends Component {
   clearSearch = () => {
     this.setState({
       searchFilterOn: false,
-      searchTerm: '',
+      // searchTerm: '',
       currentFriendListFilteredBySearch: [],
     });
   }
@@ -276,7 +276,7 @@ AskFriendsModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/Navigation/FooterBar.jsx b/src/js/components/Navigation/FooterBar.jsx
index 239d7ece0..d280b3655 100644
--- a/src/js/components/Navigation/FooterBar.jsx
+++ b/src/js/components/Navigation/FooterBar.jsx
@@ -11,15 +11,15 @@ import AppObservableStore, { messageService } from '../../common/stores/AppObser
 import { isIOS } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { normalizedHref } from '../../common/utils/hrefUtils';
-import { isAndroid, isCordova } from '../../common/utils/isCordovaOrWebApp';
+import { isAndroid } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
 import normalizedImagePath from '../../common/utils/normalizedImagePath';
 import stringContains from '../../common/utils/stringContains';
+import webAppConfig from '../../config';
 import FriendStore from '../../stores/FriendStore';
 import VoterStore from '../../stores/VoterStore';
 import { cordovaFooterHeight } from '../../utils/cordovaOffsets';
 import ShareButtonFooter from '../Share/ShareButtonFooter';
-import webAppConfig from '../../config';
 
 const nextReleaseFeaturesEnabled = webAppConfig.ENABLE_NEXT_RELEASE_FEATURES === undefined ? false : webAppConfig.ENABLE_NEXT_RELEASE_FEATURES;
 
@@ -105,7 +105,7 @@ class FooterBar extends React.Component {
       // inPrivateLabelMode: false, // setState onAppObservableStoreChange is not working sometimes for some reason
       showingOneCompleteYourProfileModal: false,
       showSignInModal: false,
-      voterIsSignedIn: false,
+      // voterIsSignedIn: false,
     };
   }
 
@@ -169,15 +169,15 @@ class FooterBar extends React.Component {
   }
 
   onVoterStoreChange () {
-    const voter = VoterStore.getVoter();
-    const voterIsSignedIn = voter.is_signed_in || false;
-    this.setState({
-      voterIsSignedIn,
-    });
+    // const voter = VoterStore.getVoter();
+    // const voterIsSignedIn = voter.is_signed_in || false;
+    // this.setState({
+    //   voterIsSignedIn,
+    // });
   }
 
   handleChange = (event, value) => {
-    if (isCordova()) {
+    if (isIOS()) {
       const { impact } = window.TapticEngine;
       impact({
         style: 'heavy', // light | medium | heavy
@@ -273,12 +273,12 @@ class FooterBar extends React.Component {
     // console.log('friendInvitationsSentToMeCount:', friendInvitationsSentToMeCount);
     // If NOT signed in, turn Discuss off and How It Works on
     let donateVisible;
-    if (isCordova() || inPrivateLabelMode) {
-      donateVisible  = true;  // 2025-06-17 Enabling donations, we hear it is now permissible for nonprofits in iOS & Android
+    if (inPrivateLableMode) {
+      donateVisible = false; // Turn off donate link if an org has private labeled WeVote
     } else {
-      donateVisible  = true;
+      donateVisible = true; // 2025-06-17 Enabling donations, we hear it is now permissible for nonprofits in iOS & Android
+      // console.log('--------- Footer bar donateVisible ', donateVisible, 'squadsVisible', squadsVisible);
     }
-    // console.log('--------- Footer bar donateVisible ', donateVisible, 'squadsVisible', squadsVisible);
     return (
       <FooterBarWrapper>
         {showShareButtonFooter && (
diff --git a/src/js/components/Navigation/Header.jsx b/src/js/components/Navigation/Header.jsx
index 951375431..d3385b548 100644
--- a/src/js/components/Navigation/Header.jsx
+++ b/src/js/components/Navigation/Header.jsx
@@ -4,7 +4,7 @@ import styled from 'styled-components';
 import VoterActions from '../../actions/VoterActions';
 import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
 import apiCalming from '../../common/utils/apiCalming';
-import { isAndroidSizeWide, isCordovaWide, isIOS, isIOSAppOnMac, isIPad } from '../../common/utils/cordovaUtils';
+import { isAndroidSizeWide, isCordovaWide, isIOSAppOnMac, isIPad } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
@@ -15,7 +15,7 @@ import stringContains from '../../common/utils/stringContains';
 import VoterStore from '../../stores/VoterStore';
 import { dumpCssFromId } from '../../utils/appleSiliconUtils';
 import { getApplicationViewBooleans, weVoteBrandingOff } from '../../utils/applicationUtils';
-import { HeadroomWrapper, IOSTopOfScreenSpacer } from '../Style/pageLayoutStyles';
+import { CordovaTopOfScreenSpacer, HeadroomWrapper } from '../Style/pageLayoutStyles';
 import HeaderBar from './HeaderBar';
 
 
@@ -251,7 +251,7 @@ export default class Header extends Component {
       }
       return (
         <div id="app-header">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <HeadroomWrapper id="hw1">
             <div className={pageHeaderClasses} id="header-container">
               <Suspense fallback={<></>}>
@@ -310,7 +310,7 @@ export default class Header extends Component {
       // console.log('isCordovaWide()', isCordovaWide(), 'innerWidth', innerWidth, 'tabMin', tabMin, 'isTablet()', isTablet());
       return (
         <div id="app-header">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <HeadroomWrapper id="hw2">
             <div className={pageHeaderClasses} id="header-container">
               { showBackToSettingsDesktop && (
@@ -416,7 +416,7 @@ export default class Header extends Component {
 
       return (
         <div id="app-header">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <HeadroomWrapper id="hw3">
             {/* <div className={isWebApp ? 'headroom-wrapper-webapp__default' : ''} id="headroom-wrapper"> */}
             <div className={pageHeaderClasses} id="header-container">
@@ -483,7 +483,7 @@ export default class Header extends Component {
       // console.log('Header not in any mode, headerNotVisible:', headerNotVisible);
       return (
         <div id="app-header">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <HeadroomWrapper id="hw4">
             <div className={pageHeaderClasses} id="header-container">
               {(showNotificationBannerAboveHeader && isCandidatePage) && (
diff --git a/src/js/components/Navigation/HeaderBackTo.jsx b/src/js/components/Navigation/HeaderBackTo.jsx
index 85173b7ce..7948371cc 100644
--- a/src/js/components/Navigation/HeaderBackTo.jsx
+++ b/src/js/components/Navigation/HeaderBackTo.jsx
@@ -8,11 +8,10 @@ import VoterGuideActions from '../../actions/VoterGuideActions';
 import LazyImage from '../../common/components/LazyImage';
 import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
 import apiCalming from '../../common/utils/apiCalming';
-import { heightOfIOSSpacer, isIOSAppOnMac, isIPad } from '../../common/utils/cordovaUtils';
+import { heightOfCordovaSpacer, isIOSAppOnMac, isIPad } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
-import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
 import stringContains from '../../common/utils/stringContains';
 import voterPhoto from '../../common/utils/voterPhoto';
@@ -201,7 +200,7 @@ class HeaderBackTo extends Component {
     const voterPhotoUrlMedium = voterPhoto(voter);
     const pathname = normalizedHref();
     const shareButtonInHeader = pathname && stringContains('/office', pathname.toLowerCase());
-    const pad = `${heightOfIOSSpacer(true)} 15px 0 0`;
+    const pad = `${heightOfCordovaSpacer(true)} 15px 0 0`;
     const cordovaStyles = {
       marginLeft: 0,
       padding: pad,
diff --git a/src/js/components/Navigation/HeaderBackToBallot.jsx b/src/js/components/Navigation/HeaderBackToBallot.jsx
index a0ce7ee3f..d3d95a8f5 100644
--- a/src/js/components/Navigation/HeaderBackToBallot.jsx
+++ b/src/js/components/Navigation/HeaderBackToBallot.jsx
@@ -13,7 +13,6 @@ import { isIOSAppOnMac, isIPad, isIPadGiantSize } from '../../common/utils/cordo
 import historyPush from '../../common/utils/historyPush';
 import { normalizedHref, normalizedHrefPage } from '../../common/utils/hrefUtils';
 import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
-import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
 import stringContains from '../../common/utils/stringContains';
 import voterPhoto from '../../common/utils/voterPhoto';
@@ -709,7 +708,7 @@ class HeaderBackToBallot extends Component {
     //   if (['candidate', 'office', 'measure'].includes(page)) {
     //     if (isWebApp()) {
     //       cname = `page-header ${!isMobileScreenSize() ? 'page-header__back-to-ballot' : ''}`;
-    //     } else if (hasIPhoneNotch()) {
+    //     } else if (hasCordovaNotch()) {
     //       cname = 'page-header page-header__back-to-ballot-cordova  page-header__cordova-iphonex';
     //     } else {
     //       cname = 'page-header page-header__back-to-ballot-cordova  page-header__cordova';
diff --git a/src/js/components/Navigation/HeaderBackToVoterGuides.jsx b/src/js/components/Navigation/HeaderBackToVoterGuides.jsx
index 9d5f9e672..c9413ed02 100644
--- a/src/js/components/Navigation/HeaderBackToVoterGuides.jsx
+++ b/src/js/components/Navigation/HeaderBackToVoterGuides.jsx
@@ -8,7 +8,7 @@ import OrganizationActions from '../../actions/OrganizationActions';
 import VoterGuideActions from '../../actions/VoterGuideActions';
 import LazyImage from '../../common/components/LazyImage';
 import apiCalming from '../../common/utils/apiCalming';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
@@ -285,7 +285,7 @@ class HeaderBackToVoterGuides extends Component {
     );
 
     let appBarCname = 'page-header page-header__voter-guide-creator';
-    if (hasIPhoneNotch()) {
+    if (hasCordovaNotch()) {
       appBarCname = 'page-header page-header__cordova-iphonex page-header__voter-guide-creator';
     } else if (isCordova()) {
       appBarCname = 'page-header page-header__cordova page-header__voter-guide-creator';
diff --git a/src/js/components/Navigation/HeaderBar.jsx b/src/js/components/Navigation/HeaderBar.jsx
index d03d9baba..3c55229fe 100644
--- a/src/js/components/Navigation/HeaderBar.jsx
+++ b/src/js/components/Navigation/HeaderBar.jsx
@@ -13,7 +13,7 @@ import standardBoxShadow from '../../common/components/Style/standardBoxShadow';
 import signInModalGlobalState from '../../common/components/Widgets/signInModalGlobalState';
 import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
 import apiCalming from '../../common/utils/apiCalming';
-import { historyPush, isDeviceZoomed, isIOS } from '../../common/utils/cordovaUtils';
+import { historyPush } from '../../common/utils/cordovaUtils';
 import { normalizedHrefPage } from '../../common/utils/hrefUtils';
 import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import isMobileScreenSize, { handleResize, isSmallTablet, isTablet } from '../../common/utils/isMobileScreenSize';
@@ -459,14 +459,14 @@ class HeaderBar extends Component {
     if (isSmallTablet()) {
       avatarStyle = { ...avatarStyle, paddingRight: 10 };
     }
-    // console.log('HeaderBar hasNotch, scrolledDown, hasSubmenu', hasIPhoneNotch(), scrolledDown, displayTopMenuShadow());
+    // console.log('HeaderBar hasNotch, scrolledDown, hasSubmenu', hasCordovaNotch(), scrolledDown, displayTopMenuShadow());
     const displayMenu = !isMobileScreenSize() || isTablet();
     // console.log('HeaderBar isMobileScreenSize(), isTablet()', isMobileScreenSize(), isTablet());
     let donateValue;
     let donateVisible;
-    if (isCordova() || inPrivateLabelMode) {
+    if (inPrivateLabelMode) {
       donateValue = 3;
-      donateVisible = true;
+      donateVisible = false;
     } else {
       donateValue = 3;
       donateVisible = true;
diff --git a/src/js/components/PositionItem/PositionPublicToggle.jsx b/src/js/components/PositionItem/PositionPublicToggle.jsx
index 3811da8c6..1d87ed765 100644
--- a/src/js/components/PositionItem/PositionPublicToggle.jsx
+++ b/src/js/components/PositionItem/PositionPublicToggle.jsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import styled from 'styled-components';
 import SupportActions from '../../actions/SupportActions';
-import { isAndroidSizeMD } from '../../common/utils/cordovaUtils'; // hasIPhoneNotch,
+import { isAndroidSizeMD } from '../../common/utils/cordovaUtils'; // hasCordovaNotch,
 import isMobileScreenSize from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
 import SupportStore from '../../stores/SupportStore';
diff --git a/src/js/components/Ready/VoterPlanModal.jsx b/src/js/components/Ready/VoterPlanModal.jsx
index 431203e31..5d33285b9 100644
--- a/src/js/components/Ready/VoterPlanModal.jsx
+++ b/src/js/components/Ready/VoterPlanModal.jsx
@@ -8,7 +8,7 @@ import styled from 'styled-components';
 import VoterPlan from './VoterPlan';
 import AnalyticsActions from '../../actions/AnalyticsActions';
 import ReadyActions from '../../actions/ReadyActions';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { formatDateToMonthDayYear } from '../../common/utils/dateFormat';
 import { renderLog } from '../../common/utils/logging';
 import BallotStore from '../../stores/BallotStore';
@@ -288,7 +288,7 @@ VoterPlanModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
@@ -301,9 +301,9 @@ const styles = () => ({
     minWidth: '100%',
     maxWidth: '100%',
     width: '100%',
-    minHeight: hasIPhoneNotch() ? '84%' : '90%',
-    maxHeight: hasIPhoneNotch() ? '84%' : '90%',
-    height: hasIPhoneNotch() ? '84%' : '90%',
+    minHeight: hasCordovaNotch() ? '84%' : '90%',
+    maxHeight: hasCordovaNotch() ? '84%' : '90%',
+    height: hasCordovaNotch() ? '84%' : '90%',
     margin: '0 auto',
   },
   dialogContent: {
diff --git a/src/js/components/Settings/ImageUploadModal.jsx b/src/js/components/Settings/ImageUploadModal.jsx
index bcb4527c5..e25b8e18d 100644
--- a/src/js/components/Settings/ImageUploadModal.jsx
+++ b/src/js/components/Settings/ImageUploadModal.jsx
@@ -4,7 +4,7 @@ import withStyles from '@mui/styles/withStyles';
 import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { renderLog } from '../../common/utils/logging';
 import { ModalTitleType1, ModalTitleAreaType1 } from '../Style/ModalType1Styles';
 import DragAndDrop from './DragAndDrop';
@@ -81,7 +81,7 @@ ImageUploadModal.propTypes = {
 
 const styles = () => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
diff --git a/src/js/components/Settings/PaidAccountUpgradeModal.jsx b/src/js/components/Settings/PaidAccountUpgradeModal.jsx
index da383df04..3604d729f 100644
--- a/src/js/components/Settings/PaidAccountUpgradeModal.jsx
+++ b/src/js/components/Settings/PaidAccountUpgradeModal.jsx
@@ -9,7 +9,7 @@ import React, { Component, Suspense } from 'react';
 import DonateActions from '../../common/actions/DonateActions';
 // TODO 5/11/21: import webAppConfig from '../../config';
 import DonateStore from '../../common/stores/DonateStore';
-import { hasIPhoneNotch, isIOS } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch, isIOS } from '../../common/utils/cordovaUtils';
 import extractNumber from '../../common/utils/extractNumber';
 import { normalizedHref } from '../../common/utils/hrefUtils';
 import { renderLog } from '../../common/utils/logging';
@@ -1061,7 +1061,7 @@ const styles = () => ({
     marginRight: 8,
   },
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 769px)': {
       maxWidth: '600px',
       width: '85%',
diff --git a/src/js/components/Share/ShareButtonFooter.jsx b/src/js/components/Share/ShareButtonFooter.jsx
index 9824005c3..947cbb3b9 100644
--- a/src/js/components/Share/ShareButtonFooter.jsx
+++ b/src/js/components/Share/ShareButtonFooter.jsx
@@ -12,7 +12,7 @@ import { openSnackbar } from '../../common/components/Widgets/SnackNotifier';
 import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
 import ShareStore from '../../common/stores/ShareStore';
 import apiCalming from '../../common/utils/apiCalming';
-import { hasDynamicIsland, hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch, hasDynamicIsland } from '../../common/utils/cordovaUtils';
 import { isAndroid, isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
 import stringContains from '../../common/utils/stringContains';
@@ -24,9 +24,11 @@ import { shareBottomOffset } from '../../utils/cordovaOffsets';
 import createMessageToFriendDefaults from '../../utils/createMessageToFriendDefaults';
 import sortFriendListByMutualFriends from '../../utils/friendFunctions';
 import isMobile from '../../utils/isMobile';
-import { CopyLink, getKindOfShareFromURL, getWhatAndHowMuchToShareDefault, saveActionShareAnalytics, ShareFacebook, SharePreviewFriends, shareStyles, ShareTwitter, ShareWeVoteFriends } from './shareButtonCommon'; // cordovaSocialSharingByEmail // cordovaSocialSharingByEmail
+import { getKindOfShareFromURL } from './getKindOfShareFromURL';
+import { getWhatAndHowMuchToShareDefault } from './getWhatAndHowMuchToShareDefault';
+import { CopyLink, saveActionShareAnalytics, ShareFacebook, SharePreviewFriends, shareStyles, ShareTwitter, ShareWeVoteFriends } from './shareButtonCommon'; // cordovaSocialSharingByEmail // cordovaSocialSharingByEmail
+import { generateShareLinks } from './sharedLinks';
 import ShareModalOption from './ShareModalOption';
-import { generateShareLinks } from './ShareModalText';
 import ShareModalTitleArea from './ShareModalTitleArea';
 
 
@@ -178,6 +180,7 @@ class ShareButtonFooter extends Component {
     }, () => this.openShareOptions()); // openShareOptions advances directly to share
   }
 
+  // eslint-disable-next-line no-unused-vars
   handleCloseShareButtonDrawer = (buttonId = '') => {
     this.setState({
       openShareButtonDrawer: false,
@@ -305,7 +308,7 @@ class ShareButtonFooter extends Component {
           onClose={this.handleCloseShareButtonDrawer}
           open={openShareButtonDrawer}
         >
-          <ModalTitleAreaFixed notchOrIsland={hasIPhoneNotch() || hasDynamicIsland()}>
+          <ModalTitleAreaFixed notchOrIsland={hasCordovaNotch() || hasDynamicIsland()}>
             <ModalTitleAreaFixedInnerWrapper>
               <Button
                 className={classes.backButton}
diff --git a/src/js/components/Share/ShareModal.jsx b/src/js/components/Share/ShareModal.jsx
index 0a11902b5..d749f819c 100644
--- a/src/js/components/Share/ShareModal.jsx
+++ b/src/js/components/Share/ShareModal.jsx
@@ -18,16 +18,17 @@ import { isWebApp } from '../../common/utils/isCordovaOrWebApp'; // isCordova
 import { renderLog } from '../../common/utils/logging';
 import stringContains from '../../common/utils/stringContains';
 import webAppConfig from '../../config';
+import BallotStore from '../../stores/BallotStore';
 import FriendStore from '../../stores/FriendStore';
 import VoterStore from '../../stores/VoterStore';
 import createMessageToFriendDefaults from '../../utils/createMessageToFriendDefaults';
 import sortFriendListByMutualFriends from '../../utils/friendFunctions';
 import lookupPageNameAndPageTypeDict from '../../utils/lookupPageNameAndPageTypeDict';
 import MessageCard from '../Widgets/MessageCard';
-import { CopyLink, getKindOfShareFromURL, saveActionShareAnalytics, ShareFacebook, SharePreviewFriends, shareStyles, ShareTwitter, ShareWeVoteFriends } from './shareButtonCommon'; // cordovaSocialSharingByEmail
-import { generateShareLinks } from './ShareModalText';
+import { getKindOfShareFromURL } from './getKindOfShareFromURL';
+import { CopyLink, saveActionShareAnalytics, ShareFacebook, SharePreviewFriends, shareStyles, ShareTwitter, ShareWeVoteFriends } from './shareButtonCommon'; // cordovaSocialSharingByEmail
+import { generateShareLinks } from './sharedLinks';
 import ShareModalTitleArea from './ShareModalTitleArea';
-import BallotStore from '../../stores/BallotStore';
 
 const ShareWithFriendsModalBodyWithController = React.lazy(() => import(/* webpackChunkName: 'ShareWithFriendsModalBodyWithController' */ '../Friends/ShareWithFriendsModalBodyWithController'));
 const ShareWithFriendsModalTitleWithController = React.lazy(() => import(/* webpackChunkName: 'ShareWithFriendsModalTitleWithController' */ '../Friends/ShareWithFriendsModalTitleWithController'));
diff --git a/src/js/components/Share/ShareModalOption.jsx b/src/js/components/Share/ShareModalOption.jsx
index 2191f848f..d369fb06a 100644
--- a/src/js/components/Share/ShareModalOption.jsx
+++ b/src/js/components/Share/ShareModalOption.jsx
@@ -10,7 +10,8 @@ import AppObservableStore, { messageService } from '../../common/stores/AppObser
 import { renderLog } from '../../common/utils/logging';
 import VoterStore from '../../stores/VoterStore';
 import { getPageDetails } from '../../utils/lookupPageNameAndPageTypeDict';
-import { generateShareLinks } from './ShareModalText';
+import { generateShareLinks } from './sharedLinks';
+
 
 const OpenExternalWebSite = React.lazy(() => import(/* webpackChunkName: 'OpenExternalWebSite' */ '../../common/components/Widgets/OpenExternalWebSite'));
 
diff --git a/src/js/components/Share/ShareModalText.jsx b/src/js/components/Share/ShareModalText.jsx
index 84df22d37..cd9b4f9ce 100644
--- a/src/js/components/Share/ShareModalText.jsx
+++ b/src/js/components/Share/ShareModalText.jsx
@@ -1,48 +1,4 @@
-import { getWhatAndHowMuchToShareDefault } from './shareButtonCommon';
-import AppObservableStore from '../../common/stores/AppObservableStore';
-import ShareStore from '../../common/stores/ShareStore';
-import { cordovaLinkToBeSharedFixes } from '../../common/utils/cordovaUtils';
-import stringContains from '../../common/utils/stringContains';
-
-export function generateShareLinks () {
-  const currentFullUrlAdjusted = cordovaLinkToBeSharedFixes(window.location.href || '');
-  const currentFullUrlToShare = currentFullUrlAdjusted.replace('/modal/share', ''); // .toLowerCase(); // toLowerCase messes with shared link codes
-  const urlWithSharedItemCode = ShareStore.getUrlWithSharedItemCodeByFullUrl(currentFullUrlToShare, false);
-  const urlWithSharedItemCodeAllOpinions = ShareStore.getUrlWithSharedItemCodeByFullUrl(currentFullUrlToShare, true);
-  // console.log('generateShareLinks urlWithSharedItemCode:', urlWithSharedItemCode);
-
-  let linkToBeShared = '';
-  let linkToBeSharedUrlEncoded = '';
-  let whatAndHowMuchToShare = AppObservableStore.getWhatAndHowMuchToShare();
-  // console.log('generateShareLinks BEFORE whatAndHowMuchToShare:', whatAndHowMuchToShare);
-  if (whatAndHowMuchToShare === '') {
-    const whatAndHowMuchToShareDefault = getWhatAndHowMuchToShareDefault();
-    AppObservableStore.setWhatAndHowMuchToShare(whatAndHowMuchToShareDefault);
-    whatAndHowMuchToShare = whatAndHowMuchToShareDefault;
-  }
-  // console.log('generateShareLinks AFTER whatAndHowMuchToShare:', whatAndHowMuchToShare);
-  if (stringContains('AllOpinions', whatAndHowMuchToShare)) {
-    if (urlWithSharedItemCodeAllOpinions) {
-      linkToBeShared = urlWithSharedItemCodeAllOpinions;
-    } else {
-      linkToBeShared = currentFullUrlToShare;
-    }
-  } else if (urlWithSharedItemCode) {
-    linkToBeShared = urlWithSharedItemCode;
-  } else {
-    linkToBeShared = currentFullUrlToShare;
-  }
-  linkToBeShared = cordovaLinkToBeSharedFixes(linkToBeShared);
-  linkToBeSharedUrlEncoded = encodeURI(linkToBeShared);
-  return {
-    currentFullUrlToShare,
-    linkToBeShared,
-    linkToBeSharedUrlEncoded,
-    urlWithSharedItemCode,
-    urlWithSharedItemCodeAllOpinions,
-  };
-}
-
+// eslint-disable-next-line import/prefer-default-export
 export function returnShareModalText (whatAndHowMuchToShare) {
   let allOpinionsRadioButtonText;
   let noOpinionsRadioButtonText;
diff --git a/src/js/components/Share/SharedItemModal.jsx b/src/js/components/Share/SharedItemModal.jsx
index e192740b3..8a4500783 100644
--- a/src/js/components/Share/SharedItemModal.jsx
+++ b/src/js/components/Share/SharedItemModal.jsx
@@ -11,7 +11,7 @@ import OrganizationActions from '../../actions/OrganizationActions';
 import VoterActions from '../../actions/VoterActions';
 import ShareActions from '../../common/actions/ShareActions';
 import ShareStore from '../../common/stores/ShareStore';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch } from '../../common/utils/cordovaUtils';
 import { formatDateToMonthDayYear } from '../../common/utils/dateFormat';
 import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
@@ -591,7 +591,7 @@ SharedItemModal.propTypes = {
 
 const styles = (theme) => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     // overflow: 'scroll',
     [theme.breakpoints.up('sm')]: {
       maxWidth: '720px',
diff --git a/src/js/components/Share/getKindOfShareFromURL.jsx b/src/js/components/Share/getKindOfShareFromURL.jsx
new file mode 100644
index 000000000..9a45e8465
--- /dev/null
+++ b/src/js/components/Share/getKindOfShareFromURL.jsx
@@ -0,0 +1,29 @@
+import { normalizedHref } from '../../common/utils/hrefUtils';
+
+// eslint-disable-next-line import/prefer-default-export
+export function getKindOfShareFromURL () {
+  const pathname = normalizedHref();
+
+  const ballotShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/ballot');
+  const candidateShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/candidate');
+  const measureShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/measure');
+  const officeShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/office');
+  const readyShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/ready');
+  const organizationShare = !ballotShare && !candidateShare && !measureShare && !officeShare && !readyShare;
+
+  let kindOfShare;
+  if (candidateShare) {
+    kindOfShare = 'CANDIDATE';
+  } else if (measureShare) {
+    kindOfShare = 'MEASURE';
+  } else if (officeShare) {
+    kindOfShare = 'OFFICE';
+  } else if (organizationShare) {
+    kindOfShare = 'ORGANIZATION';
+  } else if (readyShare) {
+    kindOfShare = 'READY';
+  } else {
+    kindOfShare = 'BALLOT';
+  }
+  return kindOfShare;
+}
diff --git a/src/js/components/Share/getWhatAndHowMuchToShareDefault.jsx b/src/js/components/Share/getWhatAndHowMuchToShareDefault.jsx
new file mode 100644
index 000000000..5b554cad7
--- /dev/null
+++ b/src/js/components/Share/getWhatAndHowMuchToShareDefault.jsx
@@ -0,0 +1,46 @@
+import VoterStore from '../../stores/VoterStore';
+import { getKindOfShareFromURL } from './getKindOfShareFromURL';
+
+// eslint-disable-next-line import/prefer-default-export
+export function getWhatAndHowMuchToShareDefault () {
+  const kindOfShare = getKindOfShareFromURL();
+  const voterIsSignedIn = VoterStore.getVoterIsSignedIn();
+  let whatAndHowMuchToShare;
+  if (kindOfShare === 'CANDIDATE') {
+    if (voterIsSignedIn) {
+      whatAndHowMuchToShare = 'candidateShareOptionsAllOpinions';
+    } else {
+      whatAndHowMuchToShare = 'candidateShareOptions';
+    }
+  } else if (kindOfShare === 'MEASURE') {
+    if (voterIsSignedIn) {
+      whatAndHowMuchToShare = 'measureShareOptionsAllOpinions';
+    } else {
+      whatAndHowMuchToShare = 'measureShareOptions';
+    }
+  } else if (kindOfShare === 'OFFICE') {
+    if (voterIsSignedIn) {
+      whatAndHowMuchToShare = 'officeShareOptionsAllOpinions';
+    } else {
+      whatAndHowMuchToShare = 'officeShareOptions';
+    }
+  } else if (kindOfShare === 'ORGANIZATION') {
+    if (voterIsSignedIn) {
+      whatAndHowMuchToShare = 'organizationShareOptionsAllOpinions';
+    } else {
+      whatAndHowMuchToShare = 'organizationShareOptions';
+    }
+  } else if (kindOfShare === 'READY') {
+    if (voterIsSignedIn) {
+      whatAndHowMuchToShare = 'readyShareOptionsAllOpinions';
+    } else {
+      whatAndHowMuchToShare = 'readyShareOptions';
+    }
+    // Default to ballot
+  } else if (voterIsSignedIn) {
+    whatAndHowMuchToShare = 'ballotShareOptionsAllOpinions';
+  } else {
+    whatAndHowMuchToShare = 'ballotShareOptions';
+  }
+  return whatAndHowMuchToShare;
+}
diff --git a/src/js/components/Share/shareButtonCommon.jsx b/src/js/components/Share/shareButtonCommon.jsx
index 147354821..9672ccc74 100644
--- a/src/js/components/Share/shareButtonCommon.jsx
+++ b/src/js/components/Share/shareButtonCommon.jsx
@@ -7,19 +7,19 @@ import { FacebookIcon, FacebookShareButton, TwitterIcon, TwitterShareButton } fr
 import styled from 'styled-components';
 import AnalyticsActions from '../../actions/AnalyticsActions';
 import { openSnackbar } from '../../common/components/Widgets/SnackNotifier';
-import { cordovaOpenSafariView, hasDynamicIsland, hasIPhoneNotch, isIPhone6p5in } from '../../common/utils/cordovaUtils';
-import { normalizedHref } from '../../common/utils/hrefUtils';
-import { isAndroid, isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import AppObservableStore from '../../common/stores/AppObservableStore';
-import { getPageDetails } from '../../utils/lookupPageNameAndPageTypeDict';
+import { cordovaOpenSafariView, hasCordovaNotch, hasDynamicIsland, isIPhone6p5in } from '../../common/utils/cordovaUtils';
+import { isAndroid, isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import VoterStore from '../../stores/VoterStore';
+import { getPageDetails } from '../../utils/lookupPageNameAndPageTypeDict';
+import { getKindOfShareFromURL } from './getKindOfShareFromURL';
 import ShareModalOption from './ShareModalOption';
 
 const OpenExternalWebSite = React.lazy(() => import(/* webpackChunkName: 'OpenExternalWebSite' */ '../../common/components/Widgets/OpenExternalWebSite'));
 
 export const shareStyles = () => ({
   dialogPaper: {
-    // marginTop: hasIPhoneNotch() ? 68 : 48,
+    // marginTop: hasCordovaNotch() ? 68 : 48,
     '@media (min-width: 576px)': {
       maxWidth: '600px',
       width: '90%',
@@ -82,7 +82,7 @@ export const shareStyles = () => ({
   closeButtonAbsolute: {
     position: 'absolute',
     right: 5,
-    top: hasIPhoneNotch() || hasDynamicIsland() ? 30 : 3,
+    top: hasCordovaNotch() || hasDynamicIsland() ? 30 : 3,
   },
   informationIcon: {
     color: '#999',
@@ -137,76 +137,6 @@ export function androidTwitterClickHandler (linkToBeShared) {
   cordovaOpenSafariView(twitURL, null, 50);
 }
 
-export function getKindOfShareFromURL () {
-  const pathname = normalizedHref();
-
-  const ballotShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/ballot');
-  const candidateShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/candidate');
-  const measureShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/measure');
-  const officeShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/office');
-  const readyShare = typeof pathname !== 'undefined' && pathname && pathname.startsWith('/ready');
-  const organizationShare = !ballotShare && !candidateShare && !measureShare && !officeShare && !readyShare;
-
-  let kindOfShare;
-  if (candidateShare) {
-    kindOfShare = 'CANDIDATE';
-  } else if (measureShare) {
-    kindOfShare = 'MEASURE';
-  } else if (officeShare) {
-    kindOfShare = 'OFFICE';
-  } else if (organizationShare) {
-    kindOfShare = 'ORGANIZATION';
-  } else if (readyShare) {
-    kindOfShare = 'READY';
-  } else {
-    kindOfShare = 'BALLOT';
-  }
-  return kindOfShare;
-}
-
-export function getWhatAndHowMuchToShareDefault () {
-  const kindOfShare = getKindOfShareFromURL();
-  const voterIsSignedIn = VoterStore.getVoterIsSignedIn();
-  let whatAndHowMuchToShare;
-  if (kindOfShare === 'CANDIDATE') {
-    if (voterIsSignedIn) {
-      whatAndHowMuchToShare = 'candidateShareOptionsAllOpinions';
-    } else {
-      whatAndHowMuchToShare = 'candidateShareOptions';
-    }
-  } else if (kindOfShare === 'MEASURE') {
-    if (voterIsSignedIn) {
-      whatAndHowMuchToShare = 'measureShareOptionsAllOpinions';
-    } else {
-      whatAndHowMuchToShare = 'measureShareOptions';
-    }
-  } else if (kindOfShare === 'OFFICE') {
-    if (voterIsSignedIn) {
-      whatAndHowMuchToShare = 'officeShareOptionsAllOpinions';
-    } else {
-      whatAndHowMuchToShare = 'officeShareOptions';
-    }
-  } else if (kindOfShare === 'ORGANIZATION') {
-    if (voterIsSignedIn) {
-      whatAndHowMuchToShare = 'organizationShareOptionsAllOpinions';
-    } else {
-      whatAndHowMuchToShare = 'organizationShareOptions';
-    }
-  } else if (kindOfShare === 'READY') {
-    if (voterIsSignedIn) {
-      whatAndHowMuchToShare = 'readyShareOptionsAllOpinions';
-    } else {
-      whatAndHowMuchToShare = 'readyShareOptions';
-    }
-    // Default to ballot
-  } else if (voterIsSignedIn) {
-    whatAndHowMuchToShare = 'ballotShareOptionsAllOpinions';
-  } else {
-    whatAndHowMuchToShare = 'ballotShareOptions';
-  }
-  return whatAndHowMuchToShare;
-}
-
 export function saveActionShareAnalytics () {
   const kindOfShare = getKindOfShareFromURL();
   const voterIsSignedIn = VoterStore.getVoterIsSignedIn();
@@ -268,6 +198,7 @@ function onEmailSendError (error) {
   }
 }
 
+// Do not remove, this is used by code that only is generated in Cordova
 export function cordovaSocialSharingByEmail (subject, linkToBeShared, handleClose) {
   this.closeFunc = handleClose;
   const body = `This is a website I am using to get ready to vote. ${linkToBeShared}`;
@@ -465,7 +396,7 @@ export function ShareTwitter (props) {
     }
     const twitterRedirectUrl = `https://x.com/intent/post?url=${encodeURIComponent(linkToBeSharedTwitter)}&text=${encodeURIComponent('Please join me and vote.')}`;
     const buttonId = twitterButtonRef.current.id;
-    pushDataLayer(buttonId, 'x.com', 'externalShare', 'ballot', 'twitter',linkToBeSharedTwitter, twitterRedirectUrl);
+    pushDataLayer(buttonId, 'x.com', 'externalShare', 'ballot', 'twitter', linkToBeSharedTwitter, twitterRedirectUrl);
   };
 
   return (
diff --git a/src/js/components/Share/sharedLinks.jsx b/src/js/components/Share/sharedLinks.jsx
new file mode 100644
index 000000000..eefd3df25
--- /dev/null
+++ b/src/js/components/Share/sharedLinks.jsx
@@ -0,0 +1,46 @@
+import AppObservableStore from '../../common/stores/AppObservableStore';
+import ShareStore from '../../common/stores/ShareStore';
+import { cordovaLinkToBeSharedFixes } from '../../common/utils/cordovaUtils';
+import stringContains from '../../common/utils/stringContains';
+import { getWhatAndHowMuchToShareDefault } from './getWhatAndHowMuchToShareDefault';
+
+
+// eslint-disable-next-line import/prefer-default-export
+export function generateShareLinks () {
+  const currentFullUrlAdjusted = cordovaLinkToBeSharedFixes(window.location.href || '');
+  const currentFullUrlToShare = currentFullUrlAdjusted.replace('/modal/share', ''); // .toLowerCase(); // toLowerCase messes with shared link codes
+  const urlWithSharedItemCode = ShareStore.getUrlWithSharedItemCodeByFullUrl(currentFullUrlToShare, false);
+  const urlWithSharedItemCodeAllOpinions = ShareStore.getUrlWithSharedItemCodeByFullUrl(currentFullUrlToShare, true);
+  // console.log('generateShareLinks urlWithSharedItemCode:', urlWithSharedItemCode);
+
+  let linkToBeShared = '';
+  let linkToBeSharedUrlEncoded = '';
+  let whatAndHowMuchToShare = AppObservableStore.getWhatAndHowMuchToShare();
+  // console.log('generateShareLinks BEFORE whatAndHowMuchToShare:', whatAndHowMuchToShare);
+  if (whatAndHowMuchToShare === '') {
+    const whatAndHowMuchToShareDefault = getWhatAndHowMuchToShareDefault();
+    AppObservableStore.setWhatAndHowMuchToShare(whatAndHowMuchToShareDefault);
+    whatAndHowMuchToShare = whatAndHowMuchToShareDefault;
+  }
+  // console.log('generateShareLinks AFTER whatAndHowMuchToShare:', whatAndHowMuchToShare);
+  if (stringContains('AllOpinions', whatAndHowMuchToShare)) {
+    if (urlWithSharedItemCodeAllOpinions) {
+      linkToBeShared = urlWithSharedItemCodeAllOpinions;
+    } else {
+      linkToBeShared = currentFullUrlToShare;
+    }
+  } else if (urlWithSharedItemCode) {
+    linkToBeShared = urlWithSharedItemCode;
+  } else {
+    linkToBeShared = currentFullUrlToShare;
+  }
+  linkToBeShared = cordovaLinkToBeSharedFixes(linkToBeShared);
+  linkToBeSharedUrlEncoded = encodeURI(linkToBeShared);
+  return {
+    currentFullUrlToShare,
+    linkToBeShared,
+    linkToBeSharedUrlEncoded,
+    urlWithSharedItemCode,
+    urlWithSharedItemCodeAllOpinions,
+  };
+}
diff --git a/src/js/components/Style/drawerLayoutStyles.js b/src/js/components/Style/drawerLayoutStyles.js
index 3cc1b491e..bfbe2146d 100644
--- a/src/js/components/Style/drawerLayoutStyles.js
+++ b/src/js/components/Style/drawerLayoutStyles.js
@@ -1,6 +1,6 @@
 import styled, { css, keyframes } from 'styled-components';
 import standardBoxShadow from '../../common/components/Style/standardBoxShadow';
-import { isAndroidNotch } from '../../common/utils/cordovaUtils';
+import { hasAndroidNotch } from '../../common/utils/cordovaUtils';
 
 const slideIn = keyframes`
   from {
@@ -67,7 +67,7 @@ export const DrawerHeaderWrapper = styled('div')`
   align-items: center;
   margin-right: 0;
   min-height: 28px;
-  padding-top: ${isAndroidNotch() ? '40px' : ''};
+  padding-top: ${hasAndroidNotch() ? '40px' : ''};
 `;
 
 export const NavLinksContainer = styled('div')`
@@ -75,6 +75,10 @@ export const NavLinksContainer = styled('div')`
   flex-direction: column;
   margin-left: -16px;
   position: fixed;
-  padding-top: ${isAndroidNotch() ? '40px' : ''};
+  padding-top: ${hasAndroidNotch() ? '40px' : ''};
 `;
 
+export const CloseDrawerIconWrapper = styled('div')`
+  display: flex;
+  justify-content: flex-end;
+`;
diff --git a/src/js/components/Style/pageLayoutStyles.js b/src/js/components/Style/pageLayoutStyles.js
index 620afa053..3ab3cfa70 100644
--- a/src/js/components/Style/pageLayoutStyles.js
+++ b/src/js/components/Style/pageLayoutStyles.js
@@ -2,7 +2,7 @@ import { AppBar } from '@mui/material';
 import styled from 'styled-components';
 import standardBoxShadow from '../../common/components/Style/standardBoxShadow';
 import AppObservableStore from '../../common/stores/AppObservableStore';
-import { heightOfIOSSpacer, isAndroidSizeMD, isAndroidSizeWide, isAndroidSizeXL, isIOS, isIOSAppOnMac, isIPad } from '../../common/utils/cordovaUtils';
+import { heightOfCordovaSpacer, isAndroidSizeMD, isAndroidSizeWide, isAndroidSizeXL, isIOS, isIOSAppOnMac, isIPad } from '../../common/utils/cordovaUtils';
 import { normalizedHrefPage } from '../../common/utils/hrefUtils';
 import { isAndroid, isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import isMobileScreenSize, { isTablet } from '../../common/utils/isMobileScreenSize';
@@ -15,8 +15,8 @@ import scrollablePaneTopPaddingWebApp from '../../utils/scrollablePaneTopPadding
 
 /* global $ */
 
-export const IOSTopOfScreenSpacer = styled('div')`
-  height: ${() => heightOfIOSSpacer(true)};
+export const CordovaTopOfScreenSpacer = styled('div')`
+  height: ${() => heightOfCordovaSpacer(true)};
   top: 0;
   position: fixed;
   background: white;
@@ -34,18 +34,11 @@ function getPaddingTop () {
   }
   const normalizedHref = normalizedHrefPage();
   if (isCordova()) {
-    if (normalizedHref === 'ballot') {
-      if (isIOS()) {
-        return '';
-      } else {
-        const dualHeaderContainer = $(`div[class*="${'DualHeaderContainer'}"]`);
-        const offs = dualHeaderContainer.length > 0 ? dualHeaderContainer.height() : 0;
-        cordovaOffsetLog(`PageContentContainer paddingTop Android ballot: '${offs}px !important'   for page: ${normalizedHref}`);
-        return `${offs}px !important`;
-      }
+    if (normalizedHref === 'ballot' && isIOS()) {
+      return '';
     } else {
       const offs = offsetToBottomOfHeadroomWrapper('getPaddingTop', 'HeadroomWrapper');
-      cordovaOffsetLog(`PageContentContainer paddingTop iOS: '${offs}px !important' for page: ${normalizedHref}`);
+      cordovaOffsetLog(`PageContentContainer paddingTop Cordova: '${offs}px !important' for page: ${normalizedHref}`);
       return `${offs}px !important`;
     }
   }
@@ -63,23 +56,27 @@ function getPaddingBottom () {
   return '';
 }
 
-function getDHCMargins () {
+// this is for DualHeaderContainer or PageContentContainer
+function getOuterContainerMargins () {
   if (isWebApp()) return '0 !important';
   const page = normalizedHrefPage();
-  let dhcHeight = 0;
+  let outerContainerHeight = 0;
   let marginBottom = 35;
   if (page === 'ballot') {
     // Ballot is an unusual page, where part of the header is defined within the ballot_root, not the Headroom wrapper
     // this requires unusual processing.
     const dualHeaderContainer = $('div[class*=\'DualHeaderContainer\']');
     if (dualHeaderContainer.length > 0) {        // If it has rendered yet for the ballot page
-      dhcHeight = dualHeaderContainer.outerHeight() + dualHeaderContainer.position().top;
+      outerContainerHeight = dualHeaderContainer.outerHeight() + dualHeaderContainer.position().top;
     }
+  } else if (isAndroid() && window.androidNotchCutout) {
+    outerContainerHeight = window.androidNotchInset;
   }
+
   if (page === 'challenges') {
     marginBottom = 60;
   }
-  const marginStr = `${dhcHeight}px 10px ${marginBottom}px 10px`;
+  const marginStr = `${outerContainerHeight}px 10px ${marginBottom}px 10px`;
   cordovaOffsetLog(`PageContentContainer ${page} page offset for DualHeaderContainer : ${marginStr}`);
   return marginStr;    // all other Cordova pages
 }
@@ -94,7 +91,7 @@ export const PageContentContainer = styled('div')(({ theme }) => (`
   z-index: 0;
   ${theme.breakpoints.down('sm')} {
     min-height: ${isWebApp() ? '10px' : `${window.innerHeight}px`};
-    margin: ${getDHCMargins()};
+    margin: ${getOuterContainerMargins()};
   }
 `));
 
@@ -145,7 +142,7 @@ export const DualHeaderContainer = styled('div', {
 export const HeadroomWrapper = styled('div')`
   position: fixed;
   top: ${() => {
-    return heightOfIOSSpacer(true);
+    return heightOfCordovaSpacer(true);
   }};
   left: 0;
   width: 100%;
@@ -165,7 +162,7 @@ export const TopOfPageHeader = styled('div')(({ theme }) => (`
     padding-left: 15px;
     padding-right: 15px;
   }
-  paddingTop: ${heightOfIOSSpacer(true)};
+  paddingTop: ${heightOfCordovaSpacer(true)};
 `));
 
 export const TopRowOneLeftContainer = styled('div')`
@@ -236,7 +233,7 @@ function getBackToPaddingTop () {
   }
   const headerBack = $('#headerBackToBallotAppBar');
   if (isIOS() && headerBack.length) {
-    const height = heightOfIOSSpacer();
+    const height = heightOfCordovaSpacer();
     const heightAppBar = headerBack.outerHeight();
     const total = height + heightAppBar;
     const ret = total > 0 ? `${total}px` : '';
diff --git a/src/js/components/VoterGuide/OrganizationModal.jsx b/src/js/components/VoterGuide/OrganizationModal.jsx
index 450a9ec59..24026ac50 100644
--- a/src/js/components/VoterGuide/OrganizationModal.jsx
+++ b/src/js/components/VoterGuide/OrganizationModal.jsx
@@ -1,42 +1,35 @@
 import { Close } from '@mui/icons-material'; // Info
 import { Drawer, IconButton } from '@mui/material';
-import styled from 'styled-components';
 import withStyles from '@mui/styles/withStyles';
 import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
+import styled from 'styled-components';
 import AnalyticsActions from '../../actions/AnalyticsActions';
 import CandidateActions from '../../actions/CandidateActions';
 import IssueActions from '../../actions/IssueActions';
 import MeasureActions from '../../actions/MeasureActions';
 import OrganizationActions from '../../actions/OrganizationActions';
-import PoliticianActions from '../../common/actions/PoliticianActions';
 import VoterGuideActions from '../../actions/VoterGuideActions';
+import PoliticianActions from '../../common/actions/PoliticianActions';
+import CampaignSupportThermometer from '../../common/components/CampaignSupport/CampaignSupportThermometer';
+import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
 import apiCalming from '../../common/utils/apiCalming';
-import { hasIPhoneNotch } from '../../common/utils/cordovaUtils';
-import { cordovaOffsetLog, renderLog } from '../../common/utils/logging';
+import convertToInteger from '../../common/utils/convertToInteger';
+import { hasCordovaNotch, heightOfCordovaSpacer } from '../../common/utils/cordovaUtils';
+import { renderLog } from '../../common/utils/logging';
+import normalizedImagePath from '../../common/utils/normalizedImagePath';
 import stringContains from '../../common/utils/stringContains';
-import ShowMoreButtons from '../Widgets/ShowMoreButtons';
 import BallotStore from '../../stores/BallotStore';
 import CandidateStore from '../../stores/CandidateStore';
 import IssueStore from '../../stores/IssueStore';
 import MeasureStore from '../../stores/MeasureStore';
 import VoterGuideStore from '../../stores/VoterGuideStore';
 import VoterStore from '../../stores/VoterStore';
-import {
-  DrawerHeaderAnimateDownInnerContainer, DrawerHeaderAnimateDownOuterContainer,
-} from '../Style/drawerLayoutStyles';
-import { cordovaDrawerTopMargin } from '../../utils/cordovaOffsets';
-import convertToInteger from '../../common/utils/convertToInteger';
-import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
-import { headroomWrapperOffset } from '../../utils/cordovaCalculatedOffsets';
-import { getPageKey } from '../../utils/cordovaPageUtils';
-import AppObservableStore, { messageService } from '../../common/stores/AppObservableStore';
-import { Candidate, CandidateNameAndPartyWrapper, CandidateNameH4, CandidateParty, CandidateTopRow } from '../Style/BallotStyles';
-import normalizedImagePath from '../../common/utils/normalizedImagePath';
-import CampaignSupportThermometer from '../../common/components/CampaignSupport/CampaignSupportThermometer';
 import VoterPositionEntryAndDisplay from '../PositionItem/VoterPositionEntryAndDisplay';
-// import { handleResize } from '../../common/utils/isMobileScreenSize';
+import { Candidate, CandidateNameAndPartyWrapper, CandidateNameH4, CandidateParty, CandidateTopRow } from '../Style/BallotStyles';
+import { DrawerHeaderAnimateDownInnerContainer, DrawerHeaderAnimateDownOuterContainer } from '../Style/drawerLayoutStyles';
+import ShowMoreButtons from '../Widgets/ShowMoreButtons';
 
 const CampaignRetrieveController = React.lazy(() => import(/* webpackChunkName: 'CampaignRetrieveController' */ '../../common/components/Campaign/CampaignRetrieveController'));
 const DelayedLoad = React.lazy(() => import(/* webpackChunkName: 'DelayedLoad' */ '../../common/components/Widgets/DelayedLoad'));
@@ -59,7 +52,7 @@ class OrganizationModal extends Component {
       positionListHasBeenRetrievedOnce: {},
       scrolledDown: false,
       unFurlPositions: false,
-      finalElectionDateInPast: false,
+      // finalElectionDateInPast: false,
       voterGuidesFromFriendsUpcomingHasBeenRetrievedOnce: {},
     };
 
@@ -343,11 +336,11 @@ class OrganizationModal extends Component {
         anchor="right"
         classes={{ paper: classes.drawer }}
         direction="left"
-        id="share-menu"
+        id="organization-modal"
         onClose={this.closeOrganizationModal}
         open={modalOpen}
       >
-        <CloseDrawerIconWrapper>
+        <CloseDrawerIconWrapperOrganization>
           <div>
             <IconButton
               aria-label="Close"
@@ -361,7 +354,7 @@ class OrganizationModal extends Component {
               </span>
             </IconButton>
           </div>
-        </CloseDrawerIconWrapper>
+        </CloseDrawerIconWrapperOrganization>
         <DrawerHeaderAnimateDownOuterContainer id="organizationModalHeaderContainer" scrolledDown={scrolledDown}>
           <DrawerHeaderAnimateDownInnerContainer>
             <CandidateTopRow>
@@ -511,14 +504,14 @@ OrganizationModal.propTypes = {
   hideBallotItemInfo: PropTypes.bool,
   hidePositions: PropTypes.bool,
   modalOpen: PropTypes.bool,
-  organizationWeVoteId: PropTypes.string,
+  // organizationWeVoteId: PropTypes.string,
   toggleFunction: PropTypes.func.isRequired,
   params: PropTypes.object,
 };
 
 const styles = () => ({
   drawer: {
-    marginTop: cordovaDrawerTopMargin(),
+    marginTop: `${heightOfCordovaSpacer(true)} !important`,
     maxWidth: '550px !important',
     '& *': {
       maxWidth: '550px !important',
@@ -532,7 +525,7 @@ const styles = () => ({
   },
   dialogPaper: {
     display: 'block',
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     minWidth: '100%',
     maxWidth: '100%',
     width: '100%',
@@ -602,7 +595,7 @@ const BallotItemBottomSpacer = styled('div')`
   margin-bottom: 32px;
 `;
 
-const CloseDrawerIconWrapper = styled('div')`
+const CloseDrawerIconWrapperOrganization = styled('div')`
   display: flex;
   justify-content: flex-end;
   margin-right: 12px;
diff --git a/src/js/components/Widgets/DeviceDialog.jsx b/src/js/components/Widgets/DeviceDialog.jsx
index 4a6747d03..008091268 100644
--- a/src/js/components/Widgets/DeviceDialog.jsx
+++ b/src/js/components/Widgets/DeviceDialog.jsx
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
-import { getAndroidSize, getCordovaBuildVersion, getIOSDiagonalValue, getIOSNameString, getIOSSizeString, hasIPhoneNotch, isIOS, isSimulator } from '../../common/utils/cordovaUtils';
+import { getAndroidSize, getCordovaBuildVersion, getIOSDiagonalValue, getIOSNameString, getIOSSizeString, hasCordovaNotch, isIOS, isSimulator } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { getTabletSize } from '../../common/utils/isMobileScreenSize';
 import { renderLog } from '../../common/utils/logging';
@@ -224,7 +224,7 @@ DeviceDialog.propTypes = {
 
 const styles = (theme) => ({
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     [theme.breakpoints.down('sm')]: {
       minWidth: '95%',
       maxWidth: '95%',
diff --git a/src/js/components/Widgets/ModalDisplayTemplateA.jsx b/src/js/components/Widgets/ModalDisplayTemplateA.jsx
index b4ce09f28..5ced2171a 100644
--- a/src/js/components/Widgets/ModalDisplayTemplateA.jsx
+++ b/src/js/components/Widgets/ModalDisplayTemplateA.jsx
@@ -5,7 +5,7 @@ import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import { hasIPhoneNotch, isAndroidSizeWide } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch, isAndroidSizeWide } from '../../common/utils/cordovaUtils';
 import { isAndroid, isCordova } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
 
@@ -78,7 +78,7 @@ export const templateAStyles = (theme) => ({
     paddingTop: !isAndroid() ? 16 : 'inherit',
   },
   dialogPaper: {
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     minHeight: isAndroid() ? '257px' : '200px',
     // maxHeight: '350px',
     // height: '80%',
diff --git a/src/js/components/Widgets/ModalDisplayTemplateB.jsx b/src/js/components/Widgets/ModalDisplayTemplateB.jsx
index 6b65d5132..1f9523eef 100644
--- a/src/js/components/Widgets/ModalDisplayTemplateB.jsx
+++ b/src/js/components/Widgets/ModalDisplayTemplateB.jsx
@@ -5,7 +5,7 @@ import withTheme from '@mui/styles/withTheme';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import styled from 'styled-components';
-import { hasIPhoneNotch, isAndroidSizeWide } from '../../common/utils/cordovaUtils';
+import { hasCordovaNotch, isAndroidSizeWide } from '../../common/utils/cordovaUtils';
 import { isAndroid, isCordova } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
 import DesignTokenColors from '../../common/components/Style/DesignTokenColors';
@@ -97,7 +97,7 @@ export const templateBStyles = (theme) => ({
     border: `1px solid ${DesignTokenColors.neutral100}`,
     borderRadius: '30px',
     boxShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)',
-    marginTop: hasIPhoneNotch() ? 68 : 48,
+    marginTop: hasCordovaNotch() ? 68 : 48,
     minHeight: isAndroid() ? '257px' : '200px',
     maxWidth: '600px',
     top: '50px',
diff --git a/src/js/pages/Campaigns/CampaignsHome.jsx b/src/js/pages/Campaigns/CampaignsHome.jsx
index aedabe970..40ecf41df 100644
--- a/src/js/pages/Campaigns/CampaignsHome.jsx
+++ b/src/js/pages/Campaigns/CampaignsHome.jsx
@@ -6,7 +6,9 @@ import ActivityActions from '../../actions/ActivityActions';
 import IssueActions from '../../actions/IssueActions';
 import OrganizationActions from '../../actions/OrganizationActions';
 import SupportActions from '../../actions/SupportActions';
+import DelayedLoad from '../../common/components/Widgets/DelayedLoad';
 import CampaignStore from '../../common/stores/CampaignStore';
+import PoliticianStore from '../../common/stores/PoliticianStore';
 import { convertStateCodeToStateText, convertStateTextToStateCode } from '../../common/utils/addressFunctions';
 import apiCalming from '../../common/utils/apiCalming';
 import arrayContains from '../../common/utils/arrayContains';
@@ -18,13 +20,11 @@ import { isAndroid } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
 import CampaignsHomeFilter from '../../components/CampaignsHome/CampaignsHomeFilter';
 import CandidateListRootPlaceholder from '../../components/CampaignsHome/CandidateListRootPlaceholder';
-import DelayedLoad from '../../common/components/Widgets/DelayedLoad';
 import NoSearchResult from '../../components/Search/NoSearchResult';
 import webAppConfig from '../../config';
 import BallotStore from '../../stores/BallotStore';
 import CandidateStore from '../../stores/CandidateStore';
 import IssueStore from '../../stores/IssueStore';
-import PoliticianStore from '../../common/stores/PoliticianStore';
 import RepresentativeStore from '../../stores/RepresentativeStore';
 import VoterStore from '../../stores/VoterStore';
 import { getPageDetails } from '../../utils/lookupPageNameAndPageTypeDict';
@@ -49,9 +49,9 @@ class CampaignsHome extends Component {
     super(props);
     this.state = {
       battlegroundDataFoundByStateDict: {},
-      battlegroundDataNotReturnedInTime: false,
+      // battlegroundDataNotReturnedInTime: false,
       battlegroundDataNotReturnedInTimeByStateDict: {},
-      battlegroundWaitingForData: false,
+      // battlegroundWaitingForData: false,
       campaignList: [],
       campaignListTimeStampOfChange: 0,
       candidateList: [],
@@ -198,8 +198,8 @@ class CampaignsHome extends Component {
       const campaignsHomeMode = (stateCandidatesPhrase.includes('-candidates'));
       const detailsListMode = (stateCandidatesPhrase.includes('-politicians-list'));
       this.setState({
-        battlegroundDataNotReturnedInTime: false,
-        battlegroundWaitingForData: false,
+        // battlegroundDataNotReturnedInTime: false,
+        // battlegroundWaitingForData: false,
         detailsListMode,
       });
       let stateName;
@@ -269,7 +269,7 @@ class CampaignsHome extends Component {
       //  set battlegroundWaitingForData to false, but if found, we can set battlegroundWaitingForData to false
       this.setState({
         battlegroundDataFoundByStateDict,
-        battlegroundWaitingForData: false,
+        // battlegroundWaitingForData: false,
       });
     }
     this.setState({
@@ -302,7 +302,7 @@ class CampaignsHome extends Component {
       //  set battlegroundWaitingForData to false, but if found, we can set battlegroundWaitingForData to false
       this.setState({
         battlegroundDataFoundByStateDict,
-        battlegroundWaitingForData: false,
+        // battlegroundWaitingForData: false,
       });
     }
     this.setState({
@@ -554,23 +554,23 @@ class CampaignsHome extends Component {
     // This gets fired after a state-specific request happens in FirstCandidateListController
     // console.log('CampaignsHome.candidatesQueryInitiatedLocal reset battlegroundWaitingForData to true');
     this.setState({
-      battlegroundWaitingForData: true,
+      // battlegroundWaitingForData: true,
     });
     const howLongWeWaitForData = 1000;
     this.timer = setTimeout(() => {
       const { battlegroundDataFoundByStateDict, battlegroundDataNotReturnedInTimeByStateDict, candidateListIsBattleground, stateCode } = this.state;
       const battlegroundDataFound = !!(candidateListIsBattleground && candidateListIsBattleground.length > 0);
       // console.log('CampaignsHome.candidatesQueryInitiatedLocal after 1 second battlegroundDataFound:', battlegroundDataFound, ', and reset battlegroundWaitingForData to false');
-      this.setState({
-        battlegroundWaitingForData: false,
-      });
+      // this.setState({
+      //   battlegroundWaitingForData: false,
+      // });
       if (!battlegroundDataFound) {
         battlegroundDataFoundByStateDict[stateCode] = false;
         battlegroundDataNotReturnedInTimeByStateDict[stateCode] = true;
         this.setState({
           battlegroundDataFoundByStateDict,
           battlegroundDataNotReturnedInTimeByStateDict,
-          battlegroundDataNotReturnedInTime: true,
+          // battlegroundDataNotReturnedInTime: true,
         });
       }
     }, howLongWeWaitForData);
@@ -698,25 +698,25 @@ class CampaignsHome extends Component {
     }, () => this.updateActiveFilters());
   }
 
-  displayBattlegroundPlaceholderForState = (stateCode) => {
-    // For one state, should we display a placeholder for the "Candidates in Close Races" horizontal section as the data is loaded?
-    const { battlegroundDataNotReturnedInTimeByStateDict, battlegroundDataNotReturnedInTime, isSearching } = this.state;
-    if (battlegroundDataNotReturnedInTimeByStateDict && stateCode && (stateCode in battlegroundDataNotReturnedInTimeByStateDict)) {
-      return !battlegroundDataNotReturnedInTimeByStateDict[stateCode] && !isSearching;
-    } else {
-      return !battlegroundDataNotReturnedInTime && !isSearching;
-    }
-  }
+  // displayBattlegroundPlaceholderForState = (stateCode) => {
+  //   // For one state, should we display a placeholder for the "Candidates in Close Races" horizontal section as the data is loaded?
+  //   const { battlegroundDataNotReturnedInTimeByStateDict, battlegroundDataNotReturnedInTime, isSearching } = this.state;
+  //   if (battlegroundDataNotReturnedInTimeByStateDict && stateCode && (stateCode in battlegroundDataNotReturnedInTimeByStateDict)) {
+  //     return !battlegroundDataNotReturnedInTimeByStateDict[stateCode] && !isSearching;
+  //   } else {
+  //     return !battlegroundDataNotReturnedInTime && !isSearching;
+  //   }
+  // }
 
-  useMinimumBattlegroundHeightForState = (stateCode) => {
-    // For one state, should we block out space for the "Candidates in Close Races" horizontal section as the data is loaded?
-    const { battlegroundDataFoundByStateDict, battlegroundDataFound, battlegroundWaitingForData, isSearching } = this.state;
-    if (battlegroundDataFoundByStateDict && battlegroundDataFoundByStateDict[stateCode]) {
-      return !isSearching && battlegroundDataFoundByStateDict[stateCode];
-    } else {
-      return !isSearching && (battlegroundWaitingForData || battlegroundDataFound);
-    }
-  }
+  // useMinimumBattlegroundHeightForState = (stateCode) => {
+  //   // For one state, should we block out space for the "Candidates in Close Races" horizontal section as the data is loaded?
+  //   const { battlegroundDataFoundByStateDict, battlegroundDataFound, battlegroundWaitingForData, isSearching } = this.state;
+  //   if (battlegroundDataFoundByStateDict && battlegroundDataFoundByStateDict[stateCode]) {
+  //     return !isSearching && battlegroundDataFoundByStateDict[stateCode];
+  //   } else {
+  //     return !isSearching && (battlegroundWaitingForData || battlegroundDataFound);
+  //   }
+  // }
 
   handleNumberOfCampaignResults = (listResults, searchResults) => {
     this.setState({
@@ -825,7 +825,7 @@ class CampaignsHome extends Component {
     const representativesShowing = (representativeListOnYourBallot && representativeListOnYourBallot.length > 0) || (representativeListShownAsRepresentatives && representativeListShownAsRepresentatives.length > 0);
     const otherTitlesShown = (campaignsShowing && nextReleaseFeaturesEnabled) || (candidateListOnYourBallot && candidateListOnYourBallot.length > 0) || (candidateListIsBattleground && candidateListIsBattleground.length > 0) || representativesShowing;
     // const useMinimumBattlegroundHeight = this.useMinimumBattlegroundHeightForState(stateCode);
-    const displayBattlegroundPlaceholder = this.displayBattlegroundPlaceholderForState(stateCode);
+    // const displayBattlegroundPlaceholder = this.displayBattlegroundPlaceholderForState(stateCode);
     // console.log('CampaignsHome render politicianListToShow:', politicianListToShow);
     // const politicianListToShowLength = politicianListToShow ? politicianListToShow.length : 0;
     // console.log('CampaignsHome render politicianListToShow.length:', politicianListToShowLength, ', numberOfPoliticiansResults:', numberOfPoliticiansResults, ', politicianListTimeStampOfChange: ', politicianListTimeStampOfChange);
@@ -989,7 +989,7 @@ CampaignsHome.propTypes = {
 };
 
 const CampaignsHomeWrapper = styled('div')`
-  padding-top: ${isAndroid() ? '30px' : ''};
+  // padding-top: ${isAndroid() ? '30px' : ''};
 `;
 
 const WhatIsHappeningSection = styled('div', {
diff --git a/src/js/pages/Process/TwitterSignInProcess.jsx b/src/js/pages/Process/TwitterSignInProcess.jsx
index 582a0b557..03c4e5b41 100644
--- a/src/js/pages/Process/TwitterSignInProcess.jsx
+++ b/src/js/pages/Process/TwitterSignInProcess.jsx
@@ -9,11 +9,11 @@ import AppObservableStore, { messageService } from '../../common/stores/AppObser
 import { hasDynamicIsland, isCordovaWide, isIOS } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { normalizedHref } from '../../common/utils/hrefUtils';
-import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
+import { isCordova, isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import Cookies from '../../common/utils/js-cookie/Cookies';
 import { oAuthLog, renderLog } from '../../common/utils/logging';
 import stringContains from '../../common/utils/stringContains';
-import { IOSTopOfScreenSpacer, PageContentContainer } from '../../components/Style/pageLayoutStyles';
+import { CordovaTopOfScreenSpacer, PageContentContainer } from '../../components/Style/pageLayoutStyles';
 import TwitterStore from '../../stores/TwitterStore';
 import VoterStore from '../../stores/VoterStore';
 
@@ -235,7 +235,7 @@ export default class TwitterSignInProcess extends Component {
     if (window.$ === undefined) {
       return (
         <div className="twitter_sign_in_root">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <PageContentContainer>
             <SnackNotifier />
             <LoadingDiv>
@@ -260,7 +260,7 @@ export default class TwitterSignInProcess extends Component {
       oAuthLog('STOPPED, missing twitter_retrieve_attempted: twitterAuthResponse:', twitterAuthResponse);
       return (
         <div className="twitter_sign_in_root">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <PageContentContainer>
             <SnackNotifier />
             <LoadingDiv>
@@ -289,7 +289,7 @@ export default class TwitterSignInProcess extends Component {
     if (twitterAuthResponse.existing_twitter_account_found) {
       return (
         <div className="twitter_sign_in_root">
-          {isIOS() ? <IOSTopOfScreenSpacer /> : ''}
+          {isCordova() ? <CordovaTopOfScreenSpacer /> : ''}
           <PageContentContainer>
             <SnackNotifier />
             <LoadingDiv>
diff --git a/src/js/startCordova.js b/src/js/startCordova.js
index 3a15a68e6..3062b85dc 100644
--- a/src/js/startCordova.js
+++ b/src/js/startCordova.js
@@ -114,6 +114,18 @@ export function initializationForCordova (startReact) {
       const { $ } = window;
       console.log('Cordova:   Startup sequence 3: Wait for an initial voterRetrieve, found jQuery $.fn.jquery = ', $.fn.jquery);
     });
+
+    window.AndroidNotch.hasCutout((cutout) => {
+      console.log(`Cordova:   Android Cutout: ${cutout}`);
+      window.androidNotchCutout  = cutout;
+    });
+
+    window.AndroidNotch.getInsetTop((insetSize) => {
+      const offset = Math.trunc(insetSize);
+      console.log(`Cordova:   Android Top Inset: ${offset}`);
+      window.androidNotchInset  = offset || 0;
+    });
+
     const cookie = Cookies.get('voter_device_id');
     const idPathComponent = (cookie && cookie.length > 10) ? `/?voter_device_id=${cookie}` : '';
     const initialAjaxUrl = `${webAppConfig.WE_VOTE_SERVER_API_ROOT_URL}voterRetrieve${idPathComponent}`;
@@ -129,7 +141,6 @@ export function initializationForCordova (startReact) {
         console.log('Cordova:   voterRetrieve returned voter_device_id', voterDeviceId);
         VoterStore.setVoterDeviceIdCookie(voterDeviceId);
         window.voterDeviceId = voterDeviceId;
-        // --
 
         // Initialize incoming URL handler for oAuth and wevotetwitterscheme
         window.handleOpenURL = (url) => {
@@ -174,7 +185,6 @@ export function initializationForCordova (startReact) {
               postLockInitialization(voterDeviceId, startReact);
             }
           }
-          // });
         } catch (err) {
           console.log('Cordova: ERROR ', err);
         }
diff --git a/src/js/utils/cordovaCalculatedOffsets.js b/src/js/utils/cordovaCalculatedOffsets.js
index 919f5989f..34804df70 100644
--- a/src/js/utils/cordovaCalculatedOffsets.js
+++ b/src/js/utils/cordovaCalculatedOffsets.js
@@ -1,5 +1,5 @@
 import AppObservableStore from '../common/stores/AppObservableStore';
-import { heightOfIOSSpacer, isAndroidSizeWide, isAndroidSizeXL, isIOS, isIOSAppOnMac, isIPad, isIPhoneSmall } from '../common/utils/cordovaUtils';
+import { heightOfCordovaSpacer, isAndroidSizeWide, isAndroidSizeXL, isIOS, isIOSAppOnMac, isIPad, isIPhoneSmall } from '../common/utils/cordovaUtils';
 import decorativeSpacing from '../common/utils/decorativeSpacing';
 import { normalizedHrefPage } from '../common/utils/hrefUtils';
 import { isAndroid, isCordova, isWebApp } from '../common/utils/isCordovaOrWebApp';
@@ -36,64 +36,6 @@ function clearAllOnSignInStateChange (isSignedIn) {
   }
 }
 
-// export function setBallotDualHeaderContentContainerTopOffset (isSignedIn) {
-//   if (isWebApp()) return;
-//   clearAllOnSignInStateChange(isSignedIn);
-//   // const dhc = $('div[class*=\'DualHeaderContainer\']');  // none
-//   if (isIPad()) {
-//     debugLogging('setBallotDualHeaderContentContainerTopOffset no Top Offset set, for iPad');
-//     return;
-//   }
-//   if (ballotHeaderOffset > 0) {  // global to this file, ballotHeaderOffset
-//     // Removed October 25, 2025 (for Cordova only)
-//     // debugLogging('setBallotDualHeaderContentContainerTopOffset Top Offset set, Cordova, top = ', ballotHeaderOffset);
-//     // dhc.css('top', ballotHeaderOffset);
-//     return;
-//   }
-//   const page = getPageKey();
-//   if (pageData.previousPage !== page || ballotHeaderOffset <= 0) {
-//     pageData.previousPage = page;
-//     for (let i = 0; i < 4; i++) {
-//       let topOffset = 0;
-//       setTimeout(() => {
-//         debugLogging(`setBallotDualHeaderContentContainerTopOffset loop, i = ${i}`);
-//         const preAdjustDatumMin = 50;
-//         const headerContentContainerMin = 60;
-//         const initDatumOffset = $('#cordovaHeaderBottomDatum').offset() || { left: 0, top: 0 };
-//         if (initDatumOffset !== undefined && initDatumOffset.top > 0) {
-//           const preAdjustDatum = initDatumOffset.top;
-//           if (preAdjustDatum >= preAdjustDatumMin) {
-//             debugLogging(`acceptable preAdjustDatum from dom ${preAdjustDatum}`);
-//             const headerContentContainerHeight = $('div[class*=\'HeaderContentContainer\']').height();
-//             let iOsSpacerHeight = 0;
-//             const iosSpacerElem = $('div[class*=\'IOSNotchedSpacer\']');
-//             if (iosSpacerElem.length) {
-//               iOsSpacerHeight = heightOfIOSSpacer();
-//               const headerBarWrapperHeight = $('div[class*=\'HeaderBarWrapper\']').height();
-//               topOffset = iOsSpacerHeight + headerBarWrapperHeight + headerContentContainerHeight - preAdjustDatum - 2;
-//             }
-//
-//             debugLogging(`setBallotDualHeaderContentContainerTopOffset headerContentContainerHeight ${headerContentContainerHeight}`);
-//             if (headerContentContainerHeight !== undefined && headerContentContainerHeight > headerContentContainerMin) {
-//               debugLogging(`calculation ios ${iOsSpacerHeight}, hcc ${headerContentContainerHeight}, preAdjustDatum ${preAdjustDatum}, calc ${topOffset}`);
-//               if (topOffset > 0) {
-//                 debugLogging(`DualHeaderContainer top set to: ${topOffset}`);
-//                 setBallotHeaderOffset(topOffset);
-//                 // Removed October 25, 2025 (for Cordova only)
-//                 // dhc.css('top', topOffset);
-//               }
-//             } else {
-//               debugLogging(`headerContentContainer ${headerContentContainerHeight}`);
-//             }
-//           } else {
-//             debugLogging(`preAdjustDatum >= preAdjustDatumMin ${preAdjustDatum} ${preAdjustDatumMin}`);
-//           }
-//         }
-//       }, 100);  // Wait for Ballot header to render, if initial URL is /ballot
-//     }
-//   }
-// }
-
 function calcOffset (wrapper, wrapperContainer, type, pageHref, heightOfHW) {
   // console.log(`offsetToBottomOfHeadroomWrapper SUCCESSFUL FOR wrapType: ${wrapper}`);
   const outerHeight = wrapperContainer.outerHeight();
@@ -103,7 +45,7 @@ function calcOffset (wrapper, wrapperContainer, type, pageHref, heightOfHW) {
     // console.log(`calcOffset adding ${offset} to offset`);
     offset += heightOfHW;
   }
-  // console.log(`offsetToBottomOfHeadroomWrapper  type: ${type}, pageHref: %c${pageHref}%c, wrapType: ${wrapper}, offset: ${offset}, position: ${position}, outerHeight: ${outerHeight}`, 'font-weight: bold;', 'font-weight: 400;');
+  cordovaOffsetLog(`offsetToBottomOfHeadroomWrapper -> calcOffset  type: ${type}, pageHref: %c${pageHref}%c, wrapType: ${wrapper}, offset: ${offset}, position: ${position}, outerHeight: ${outerHeight}`, 'font-weight: bold;', 'font-weight: 400;');
   return offset;
 }
 
@@ -116,12 +58,13 @@ export function outerHeightOfDualHeaderContainer () {
 export function offsetToBottomOfHeadroomWrapper (type, override = false) {
   const headroomWrapper = $(`div[class*="${'HeadroomWrapper'}"]`);
   const heightOfHW = headroomWrapper.length > 0 ? headroomWrapper.height() : 0;
-  const outerHeightOfDHC = outerHeightOfDualHeaderContainer();
+  const outerHeightOfHW = headroomWrapper.length > 0 ? headroomWrapper.outerHeight() : 0;
+  // const outerHeightOfDHC = outerHeightOfDualHeaderContainer();
   const pageHref = normalizedHrefPage();
   // console.log('offsetToBottomOfHeadroomWrapper heightOfHW', heightOfHW);
   const dualHeaderContainer = $(`div[class*="${'DualHeaderContainer'}"]`);
-  if (isAndroid() && dualHeaderContainer.length && outerHeightOfDHC > 0) {
-    return heightOfHW;
+  if (isAndroid()) {
+    return outerHeightOfHW;
   } else if (headroomWrapper.length > 0) {
     if (heightOfHW === 0) {
       // Fallback for value and measure pages which end up with a zero height headroom wrapper (probably because of a fixed top value inside)
@@ -221,7 +164,7 @@ export function cordovaSimplePageContainerTopOffset (/* isSignedIn */) {
   setTimeout(() => {
     const page = pageEnumeration();
     const pageContentContainer = $('div[class*=\'PageContentContainer\']');
-    const spacerHeight = heightOfIOSSpacer();
+    const spacerHeight = heightOfCordovaSpacer();
     let height = headroomWrapperOffset(false);  // 11/21/22 now includes the notch height (Value if not backTo)
     const friendsMenu           = $('friendsHorizontalMenu');
     let                 appBar = $('#headerBackToBallotAppBar');
diff --git a/src/js/utils/cordovaOffsets.js b/src/js/utils/cordovaOffsets.js
index c1cdd6c7a..715919426 100644
--- a/src/js/utils/cordovaOffsets.js
+++ b/src/js/utils/cordovaOffsets.js
@@ -1,4 +1,4 @@
-import { getAndroidSize, hasIPhoneNotch, heightOfIOSSpacer, isIOS, isIOSAppOnMac, isIPad, isIPadGiantSize, isIPhone4in, isIPhone4p7in, isIPhone5p5inEarly, isIPhone5p5inMini, isIPhone5p8in, isIPhone6p1in, isIPhone6p5in, isIPhoneMiniOrSmaller, isSimulator } from '../common/utils/cordovaUtils';
+import { getAndroidSize, hasCordovaNotch, heightOfCordovaSpacer, isIOS, isIOSAppOnMac, isIPad, isIPadGiantSize, isIPhone4in, isIPhone4p7in, isIPhone5p5inEarly, isIPhone5p5inMini, isIPhone5p8in, isIPhone6p1in, isIPhone6p5in, isIPhoneMiniOrSmaller, isSimulator } from '../common/utils/cordovaUtils';
 import { normalizedHref } from '../common/utils/hrefUtils';
 import { isAndroid, isWebApp } from '../common/utils/isCordovaOrWebApp';
 import isMobileScreenSize from '../common/utils/isMobileScreenSize';
@@ -54,7 +54,7 @@ export function cordovaBallotFilterTopMargin () {
         return '79px';
       }
       return '89px';
-    } else if (hasIPhoneNotch()) {
+    } else if (hasCordovaNotch()) {
       if (page === CordovaPageConstants.candidateWild) {
         return '65px';
       }
@@ -117,7 +117,7 @@ export function cordovaNetworkNextButtonTop () {
       return '85vh';
     } else if (isIPhone4p7in()) {
       return '89vh';
-    } else if (hasIPhoneNotch()) {
+    } else if (hasCordovaNotch()) {
       return '88vh';
     } else if (isIPad()) {
       return '89vh';
@@ -142,7 +142,7 @@ export function cordovaFooterHeight () {
         paddingTop: '4px',
       };
     }
-    if (hasIPhoneNotch()) {
+    if (hasCordovaNotch()) {
       return {
         height: '95px',
         paddingTop: '10px',
@@ -153,34 +153,6 @@ export function cordovaFooterHeight () {
   return undefined;
 }
 
-// URLs that end with a twitter handle...
-// <div id="the styled div that follows is the wrapper for voter guide mode">
-//   <Wrapper padTop={cordovaVoterGuideTopPadding()}>
-// This pushes down the voter guide organization Twitter banner - parallel to voterGuideWild
-// export function cordovaVoterGuideTopPadding () {
-//   if (isIOS()) {
-//     const page = pageEnumeration();
-//     if (isIPhone5p5inEarly()) {
-//       return '11px';
-//     } else if (isIPhone5p5inMini()) {
-//       return '11px';
-//     } else if (isIPhone4p7in()) {
-//       return '0px';
-//     } else if (hasIPhoneNotch()) {
-//       return '28px';
-//     } else if (isIPad()) {
-//       switch (page) {
-//         case CordovaPageConstants.news:             return '19px';
-//         case CordovaPageConstants.voterGuideWild:   return '26px';
-//         default:                                    return '0px';
-//       }
-//     }
-//   } else if (isAndroid()) {
-//     return '0px';
-//   }
-//   return '12px';
-// }
-
 // <Toolbar classes={{ root: classes.toolbar }} disableGutters style={{ top: cordovaWelcomeAppToolbarTop() }}>
 export function cordovaWelcomeAppToolbarTop () {
   if (isIOS()) {
@@ -190,7 +162,7 @@ export function cordovaWelcomeAppToolbarTop () {
       return '10px';
     } else if (isIPhone4p7in()) {
       return '10px';
-    } else if (hasIPhoneNotch()) {
+    } else if (hasCordovaNotch()) {
       return '14px';
     } else if (isIPad()) {
       return '10px';
@@ -239,7 +211,7 @@ export function cordovaVoteMiniHeader () {
         top: '91px',
         height: '118px',
       };
-    } else if (hasIPhoneNotch()) {
+    } else if (hasCordovaNotch()) {
       return {
         top: '82px',
         height: '125px',
@@ -273,7 +245,7 @@ export function cordovaStickyHeaderPaddingTop () {
     // 11/20/25, we want to cover the Measure title (on TopRowTwo), so it does not appear twice
     const rowOneLeft = $("div[class^='TopRowOneLeftContainer']");
     if (isIOS() && rowOneLeft.length) {
-      const height = heightOfIOSSpacer();
+      const height = heightOfCordovaSpacer();
       const heightAppBar = rowOneLeft.outerHeight();
       const total = height + heightAppBar;
       const ret = total > 0 ? `${total}px` : '';
@@ -346,7 +318,7 @@ export function shareBottomOffset (pinToBottom) {
   const { showFooterBar } = getApplicationViewBooleans(normalizedHref());
 
   if (isIOS()) {
-    if (hasIPhoneNotch()) {
+    if (hasCordovaNotch()) {
       return showFooterBar ? `${measureFooterContainer()}px` : '18px';
     } else if (isIPhone4p7in() || isIPhone5p5inEarly()) {
       return showFooterBar ? `${measureFooterContainer()}px` : '0px';
@@ -386,7 +358,7 @@ export function cordovaFriendsWrapper () {
     }
     if (isIPad()) {
       return {
-        paddingTop: `${heightOfIOSSpacer(false) + 10}px`,
+        paddingTop: `${heightOfCordovaSpacer(false) + 10}px`,
         paddingBottom: '90px',
       };
     }
@@ -433,7 +405,7 @@ export function cordovaDrawerTopMargin () {
   if (isIOS()) {
     if (isIPhone4in() || isIPhone4p7in() || isIPhone5p5inEarly()) {
       return '22px';
-    } else if (hasIPhoneNotch()) {
+    } else if (hasCordovaNotch()) {
       return '40px';
     } else if (isIPad()) {
       return '26px';
@@ -446,14 +418,6 @@ export function cordovaDrawerTopMargin () {
   return '0px';
 }
 
-
-// export function cordovaDualHeaderContainerPadding () {
-//   if (isIPhone5p5inMini()) return '18px';
-//   if (hasIPhoneNotch()) return '0px';
-//   if (isCordova()) return '80px';
-//   return '8px';
-// }
-
 export function welcomeAppBarPaddingTop () {
   const page = pageEnumeration();
   switch (page) {
@@ -475,7 +439,7 @@ export function welcomeAppBarPaddingTop () {
 
 export function cordovaDualHeaderContainerTopOffset () {
   if (isWebApp()) return '';
-  const heightIOSSpacer = heightOfIOSSpacer();
+  const heightIOSSpacer = heightOfCordovaSpacer();
   cordovaOffsetLog(`cordovaDualHeaderContainerTopOffset heightIOSSpacer: ${heightIOSSpacer} returned ${heightIOSSpacer}px`);
   return  `${heightIOSSpacer}px`;
 }
diff --git a/src/js/utils/cordovaTopHeaderTopMargin.js b/src/js/utils/cordovaTopHeaderTopMargin.js
index 7754faf89..7b7aaf33d 100644
--- a/src/js/utils/cordovaTopHeaderTopMargin.js
+++ b/src/js/utils/cordovaTopHeaderTopMargin.js
@@ -1,4 +1,4 @@
-import { getThisAppleDeviceParameters, hasIPhoneNotch, heightOfIOSSpacer, isAndroidSimulator, isIOS, isIOSAppOnMac, isIOsSmallerThanPlus, isIPad, isIPhone4p7in, isIPhone5p5inEarly, isIPhone5p5inMini, isSimulator } from '../common/utils/cordovaUtils';
+import { getThisAppleDeviceParameters, hasCordovaNotch, heightOfCordovaSpacer, isAndroidSimulator, isIOS, isIOSAppOnMac, isIOsSmallerThanPlus, isIPad, isIPhone4p7in, isIPhone5p5inEarly, isIPhone5p5inMini, isSimulator } from '../common/utils/cordovaUtils';
 import { isCordova } from '../common/utils/isCordovaOrWebApp';
 import { cordovaOffsetLog } from '../common/utils/logging';
 import CordovaPageConstants from '../constants/CordovaPageConstants';
@@ -31,7 +31,7 @@ export default function cordovaTopHeaderTopMargin () {
     const { $ } = window;
     if (isIOS()) {
       const headerBackToAppBar = $('#headerBackToAppBar');
-      const iOsSpacerHeight = heightOfIOSSpacer();
+      const iOsSpacerHeight = heightOfCordovaSpacer();
       // Calculated approach Nov 2022 and October 2025
       if (headerBackToAppBar.length) {
         const marginTop = headerBackToAppBar.outerHeight();
@@ -105,7 +105,7 @@ export default function cordovaTopHeaderTopMargin () {
           case CordovaPageConstants.voterGuideWild:        style.marginTop = '38px'; break; // Any voter page with btcand or btmeas
           default:                                         style.marginTop = '16px'; break;
         }
-      } else if (hasIPhoneNotch()) {
+      } else if (hasCordovaNotch()) {
         switch (page) {
           case CordovaPageConstants.ballotLgHdrWild:       style.marginTop = '16px'; break;
           case CordovaPageConstants.ballotSmHdrWild:       style.marginTop = '34px'; break;
@@ -150,7 +150,7 @@ export default function cordovaTopHeaderTopMargin () {
       } else {
         const isIphoneAir = getThisAppleDeviceParameters().marketingNumber === 'Air';
         if (isIphoneAir) {
-          style.marginTop = heightOfIOSSpacer(true);
+          style.marginTop = heightOfCordovaSpacer(true);
         } else {
           style.marginTop = '20px';
         }