Resolves 4 jira issues, plus more Cordova offset adjustments for iOS and Android, will be Cordova release 2.4.1

node/buildSrcCordova.js

@@ -50,7 +50,21 @@ function addUShowStylesImport (fileTxt, path) {
   return ret;
 }
 
-function fileRewriterForCordova (path) {
+function getVersionFromConfigXML () {
+  const path = '../WeVoteCordova/config.xml';
+  const data = fs.readFileSync(path, 'utf-8');
+  const regex = /version="(.*?)"/;
+  const found = data.match(regex);
+  if (found.length > 0) {
+    console.log('version from config.xml: ', found[1]);
+    return found[1];
+  } else {
+    console.log('version from config.xml: error');
+    return 'error';
+  }
+}
+
+function fileRewriterForCordova (path, version) {
   // console.log('Do  ', path);
   if (path.endsWith('.css') || path.endsWith('cordovaOffsets.js')) {
     return;
@@ -125,22 +139,28 @@ function fileRewriterForCordova (path) {
     // append an import of cordovaFriendlyUShowStyles.js at top of each file where needed
     newValue = addUShowStylesImport(newValue, path);
 
+    // Inject version string
+    newValue = newValue.replace(/{window\.weVoteAppVersion}/, version);
+
     fs.writeFile(path, newValue, 'utf-8', (err2) => {
       if (err2) throw err2;
       // console.log('Done! with ', path);
     });
   });
 }
 
+// Inline node
+
 console.log('> Cordova: Preparing to set up parallel /srcCordova directory.');
+const version = getVersionFromConfigXML();
 fs.remove('./build').then(() => {
   console.log('> Cordova: Removed build directory');
   fs.remove('./srcCordova').then(() => {
     console.log('> Cordova: Removed /srcCordova directory, if it existed');
     try {
       fs.copy('./src', './srcCordova', () => {
         console.log('> Cordova: Copied the /src dir to a newly created /srcCordova directory');
-        exec('egrep -rl "React.lazy|BrowserRouter|initializeMoment|Suspense|u-show-desktop-tablet|u-show-mobile|uShowMobile|uShowDesktopTablet" ./srcCordova', (error, stdout, stderr) => {
+        exec('egrep -rl "React.lazy|BrowserRouter|initializeMoment|Suspense|u-show-desktop-tablet|u-show-mobile|uShowMobile|uShowDesktopTablet|window.weVoteAppVersion" ./srcCordova', (error, stdout, stderr) => {
           if (error) {
             console.log(`> Cordova bldSrcCordova error: ${error.message}`);
             return;
@@ -156,7 +176,7 @@ fs.remove('./build').then(() => {
             const path = listOfFiles[i];
             // console.log(`path: ${path}`);
             if (path.length) {
-              fileRewriterForCordova(path);
+              fileRewriterForCordova(path, version);
             }
           }
           console.log(`> Cordova: ${listOfFiles.length} files in ./srcCordova, rewritten without React.lazy`);

node/unSymLinkIOS.sh

@@ -0,0 +1,14 @@
+# 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 (new in Oct 2023)'
+cd ../WeVoteCordova/platforms/ios/www || exit
+rm bundle.js
+cp ../../../../WebApp/build/bundle.js .
+rm bundle.js.map
+cp  ../../../../WebApp/build/bundle.js.map .
+rm css
+cp -r ../../../../WebApp/build/css .
+rm img
+cp -r ../../../../WebApp/build/img .
+rm index.html
+cp ../../../www/index.html .
+

package.json

@@ -17,7 +17,7 @@
     "wdio:upgrade": "ncu -u *wdio* webdriver*",
     "build": "node node/buildDateFile.js && MINIMIZED=1 webpack --mode production",
     "buildCordova": "node node/buildDateFile.js && node node/buildSrcCordova && CORDOVA=1 && webpack --mode development && node node/logCompileDate.js",
-    "buildCordovaAndLinks": "node node/buildDateFile.js && node node/buildSrcCordova && CORDOVA=1 && webpack --mode development && node node/buildSymLinksRemote.js && node node/logCompileDate.js",
+    "buildCordovaAndLinks": "node node/buildDateFile.js && node node/buildSrcCordova && CORDOVA=1 && webpack --mode development && node node/buildSymLinksRemote.js && node node/logCompileDate.js && bash ./node/unSymLinkIOS.sh",
     "lint": "eslint --format stylish --ext .jsx --ext .js src/js",
     "lintCordova": "eslint --format stylish --ext .jsx --ext .js srcCordova/js",
     "prod": "node node/buildDateFile.js && MINIMIZED=1 webpack --mode production",

src/App.jsx

@@ -169,7 +169,7 @@ class App extends Component {
     // console.log('normalizedHrefPage in App.js componentDidMount: ', normalizedHref());
     const onWeVoteUS = (hostname && (hostname.toLowerCase() === 'wevote.us'));
     const onMobileApp = false;
-    if (onWeVoteUS || onMobileApp) {
+    if ((onWeVoteUS || onMobileApp) && isWebApp()) {
       if (webAppConfig.FULL_STORY_ORG) {
         setTimeout(() => {
           console.log('FullStory ENABLED');

src/js/common/components/SignIn/SignInOptionsPanel.jsx

@@ -8,25 +8,25 @@ import FacebookActions from '../../../actions/FacebookActions';
 import TwitterActions from '../../../actions/TwitterActions';
 import VoterActions from '../../../actions/VoterActions';
 import VoterSessionActions from '../../../actions/VoterSessionActions';
-import LoadingWheel from '../Widgets/LoadingWheel';
-import { isAndroid, restoreStylesAfterCordovaKeyboard } from '../../utils/cordovaUtils';
-import historyPush from '../../utils/historyPush';
-import { normalizedHref } from '../../utils/hrefUtils';
-import { isWebApp } from '../../utils/isCordovaOrWebApp';
-import Cookies from '../../utils/js-cookie/Cookies';
-import { oAuthLog, renderLog } from '../../utils/logging';
-import stringContains from '../../utils/stringContains';
-import AppObservableStore, { messageService } from '../../stores/AppObservableStore';
-import FacebookStore from '../../../stores/FacebookStore';
-import VoterStore from '../../../stores/VoterStore';
-import initializeAppleSDK from '../../../utils/initializeAppleSDK';
-import initializeFacebookSDK from '../../../utils/initializeFacebookSDK';
 import AppleSignIn from '../../../components/Apple/AppleSignIn';
 import FacebookSignIn from '../../../components/Facebook/FacebookSignIn';
 import VoterEmailAddressEntry from '../../../components/Settings/VoterEmailAddressEntry';
 import VoterPhoneVerificationEntry from '../../../components/Settings/VoterPhoneVerificationEntry';
 import TwitterSignIn from '../../../components/Twitter/TwitterSignIn';
 import BrowserPushMessage from '../../../components/Widgets/BrowserPushMessage';
+import FacebookStore from '../../../stores/FacebookStore';
+import VoterStore from '../../../stores/VoterStore';
+import initializeAppleSDK from '../../../utils/initializeAppleSDK';
+import initializeFacebookSDK from '../../../utils/initializeFacebookSDK';
+import AppObservableStore, { messageService } from '../../stores/AppObservableStore';
+import { isAndroid, restoreStylesAfterCordovaKeyboard } from '../../utils/cordovaUtils';
+import historyPush from '../../utils/historyPush';
+import { normalizedHref } from '../../utils/hrefUtils';
+import { isCordova, isWebApp } from '../../utils/isCordovaOrWebApp';
+import Cookies from '../../utils/js-cookie/Cookies';
+import { oAuthLog, renderLog } from '../../utils/logging';
+import stringContains from '../../utils/stringContains';
+import LoadingWheel from '../Widgets/LoadingWheel';
 import signInModalGlobalState from '../Widgets/signInModalGlobalState';
 import SnackNotifier, { openSnackbar } from '../Widgets/SnackNotifier';
 
@@ -685,6 +685,7 @@ const SignInOptionsPanelWrapper = styled('div')`
   display: flex;
   justify-content: center;
   width: 100%;
+  ${() => (isCordova() ? { paddingTop: '10px' } : {})}
 `;
 
 const SignInSubtitle = styled('p')`

src/js/common/components/Style/CampaignDetailsStyles.jsx

@@ -284,7 +284,6 @@ export const SupportButtonFooterWrapperAboveFooterButtons = styled('div')`
     if (isAndroid()) return '68px';
     return '88px';
   }};
-  display: ${() => (isCordova() ? 'none' : 'block')};
 `;
 
 export const SupportButtonPanel = styled('div')`

src/js/common/components/Style/CampaignSupportStyles.jsx

@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+import { isCordova, isWebApp } from '../../utils/isCordovaOrWebApp';
 
 export const CampaignSupportDesktopButtonPanel = styled('div')`
   background-color: #fff;
@@ -60,11 +61,12 @@ export const CampaignSupportSectionWrapper = styled('div', {
 
 export const SkipForNowButtonPanel = styled('div')`
   background-color: #fff;
-  margin-top: 40px;
+  margin-top: ${isWebApp() ? '40px' : ''};
 `;
 
 export const SkipForNowButtonWrapper = styled('div')`
   display: flex;
   justify-content: center;
   width: 100%;
+  ${isCordova() ? 'padding-bottom: 16px' : ''};
 `;

src/js/common/components/Style/stepDisplayStyles.js

@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+import { isCordova } from '../../utils/isCordovaOrWebApp';
 
 export const InnerWrapper = styled('div')`
   display: flex;
@@ -39,6 +40,7 @@ export const OuterWrapperStepsOff = styled('div')(({ theme }) => (`
 export const PageWrapper = styled('div')`
   margin: 0 auto;
   max-width: 960px;
+  ${isCordova() ? 'padding-top: 14px' : ''};
   @media (max-width: 1005px) {
     // Switch to 15px left/right margin when auto is too small
     margin: 0 15px;

src/js/common/pages/Settings/CompleteYourProfileMobile.jsx

@@ -1,15 +1,16 @@
 import { Close } from '@mui/icons-material';
 import { IconButton } from '@mui/material';
-import styled from 'styled-components';
 import withStyles from '@mui/styles/withStyles';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { Helmet } from 'react-helmet-async';
+import styled from 'styled-components';
+import CompleteYourProfile from '../../components/Settings/CompleteYourProfile';
 import { OuterWrapper } from '../../components/Style/stepDisplayStyles';
+import AppObservableStore, { messageService } from '../../stores/AppObservableStore';
 import historyPush from '../../utils/historyPush';
+import { isCordova, isWebApp } from '../../utils/isCordovaOrWebApp';
 import { renderLog } from '../../utils/logging';
-import CompleteYourProfile from '../../components/Settings/CompleteYourProfile';
-import AppObservableStore, { messageService } from '../../stores/AppObservableStore';
 
 
 class CompleteYourProfileMobile extends Component {
@@ -116,7 +117,7 @@ class CompleteYourProfileMobile extends Component {
                 {completeProfileTitle}
                 <IconButton
                   aria-label="Close"
-                  classes={{ root: classes.closeButton }}
+                  classes={isWebApp() ? { root: classes.closeButton } : { root: classes.closeButtonCordova }}
                   onClick={() => { this.cancelFunction(); }}
                   id="completeYourProfileMobileClose"
                   size="large"
@@ -158,6 +159,11 @@ const styles = () => ({
     right: 0,
     top: 0,
   },
+  closeButtonCordova: {
+    position: 'absolute',
+    right: 5,
+    top: 50,
+  },
 });
 
 const ContentTitle = styled('h1')(({ theme }) => (`
@@ -175,6 +181,7 @@ const InnerWrapper = styled('div')`
 const PageWrapperComplete = styled('div')`
   margin: 0 auto;
   max-width: 480px;
+  ${() => (isCordova() ? 'padding: 28px 0 100px 0;' : '')};
 `;
 
 export default withStyles(styles)(CompleteYourProfileMobile);

src/js/components/Friends/FindFriendsStart.jsx

@@ -1,33 +1,28 @@
-import withStyles from '@mui/styles/withStyles';
 import { Button } from '@mui/material';
+import withStyles from '@mui/styles/withStyles';
 import { filter } from 'lodash-es';
 import PropTypes from 'prop-types';
 import React, { Component, Suspense } from 'react';
 import styled from 'styled-components';
-import FriendActions from '../../actions/FriendActions';
 import BallotActions from '../../actions/BallotActions';
+import FriendActions from '../../actions/FriendActions';
 import VoterActions from '../../actions/VoterActions';
+// import NextStepButtons from '../FriendIntro/NextStepButtons';
+import AppObservableStore from '../../common/stores/AppObservableStore';
 import apiCalming from '../../common/utils/apiCalming';
 import { isCordovaWide } from '../../common/utils/cordovaUtils';
 import historyPush from '../../common/utils/historyPush';
 import { isWebApp } from '../../common/utils/isCordovaOrWebApp';
 import { renderLog } from '../../common/utils/logging';
 import normalizedImagePath from '../../common/utils/normalizedImagePath';
+import VoterStore from '../../stores/VoterStore';
 import DownloadAppsButtons from '../Remind/DownloadAppsButtons';
-import Reassurance from '../SetUpAccount/Reassurance';
 import { reassuranceTextRemindContacts } from '../Remind/reassuranceTextRemindContacts';
-// import NextStepButtons from '../FriendIntro/NextStepButtons';
-import AppObservableStore from '../../common/stores/AppObservableStore';
-import VoterStore from '../../stores/VoterStore';
-import {
-  DesktopNextButtonsInnerWrapper, DesktopNextButtonsOuterWrapperUShowDesktopTablet,
-} from '../Style/NextButtonStyles';
+import Reassurance from '../SetUpAccount/Reassurance';
+import { DesktopNextButtonsInnerWrapper, DesktopNextButtonsOuterWrapperUShowDesktopTablet } from '../Style/NextButtonStyles';
 import { RemindContactsImportText, RemindMainImageImg } from '../Style/RemindStyles';
-import {
-  SetUpAccountContactsText,
-  SetUpAccountContactsTextWrapper,
-  SetUpAccountTitle, SetUpAccountTop,
-} from '../Style/SetUpAccountStyles';
+import { SetUpAccountContactsText, SetUpAccountContactsTextWrapper, SetUpAccountTitle, SetUpAccountTop } from '../Style/SetUpAccountStyles';
+import { SetUpSignInOptionsPanelWrapper } from '../Style/SignInStyles';
 
 const AddContactsFromGoogleButton = React.lazy(() => import(/* webpackChunkName: 'AddContactsFromGoogleButton' */ '../SetUpAccount/AddContactsFromGoogleButton'));
 const ContactsImportedPreview = React.lazy(() => import(/* webpackChunkName: 'ContactsImportedPreview' */ './ContactsImportedPreview'));
@@ -149,14 +144,14 @@ class FindFriendsStart extends Component {
             <Suspense fallback={<></>}>
               <ContactsImportedPreview showOnlyContactsWithAccounts />
             </Suspense>
-            <SignInOptionsPanelWrapper>
+            <SetUpSignInOptionsPanelWrapper>
               <Suspense fallback={<></>}>
                 <SignInOptionsPanel
                   pleaseSignInTitle={(contactsWithAccountCount > 0) ? 'Sign in to connect with your friends' : ''}
                   pleaseSignInSubTitle={(contactsWithAccountCount > 0) ? 'After you sign in, you will be able to choose which friends to collaborate with.' : ''}
                 />
               </Suspense>
-            </SignInOptionsPanelWrapper>
+            </SetUpSignInOptionsPanelWrapper>
           </FindFriendsStartWithContactsWrapper>
         ) : (
           <FindFriendsStartWrapper>
@@ -252,11 +247,4 @@ const FindFriendsStartWrapper = styled('div')`
   margin-top: 36px;
 `;
 
-const SignInOptionsPanelWrapper = styled('div')(({ theme }) => (`
-  margin-top: 32px;
-  ${theme.breakpoints.up('sm')} {
-    min-width: 500px;
-  }
-`));
-
 export default withStyles(styles)(FindFriendsStart);

src/js/components/Navigation/Footer.jsx

@@ -165,6 +165,7 @@ const FooterMainWrapper = styled('div')`
 `;
 
 const FooterWrapper = styled('div')`
+  // In Cordova, display=none, can be set in prepareForCordovaKeyboard()
 `;
 
 export default withStyles(styles)(Footer);

src/js/components/SetUpAccount/SetUpAccountInviteContactsSignIn.jsx

@@ -5,6 +5,7 @@ import React, { Suspense } from 'react';
 import styled from 'styled-components';
 import VoterActions from '../../actions/VoterActions';
 import apiCalming from '../../common/utils/apiCalming';
+import { SetUpSignInOptionsPanelWrapper } from '../Style/SignInStyles';
 import { renderLog } from '../../common/utils/logging';
 import VoterStore from '../../stores/VoterStore';
 import {
@@ -144,14 +145,14 @@ class SetUpAccountInviteContactsSignIn extends React.Component {
         <Suspense fallback={<></>}>
           <ContactsImportedPreview showOnlyContactsWithAccounts />
         </Suspense>
-        <SignInOptionsPanelWrapper>
+        <SetUpSignInOptionsPanelWrapper>
           <Suspense fallback={<></>}>
             <SignInOptionsPanel
               pleaseSignInTitle={(contactsWithAccountCount > 0) ? 'Sign in to connect with your friends' : ''}
               pleaseSignInSubTitle={(contactsWithAccountCount > 0) ? 'After you sign in, you will be able to choose which friends to collaborate with.' : ''}
             />
           </Suspense>
-        </SignInOptionsPanelWrapper>
+        </SetUpSignInOptionsPanelWrapper>
       </StepCenteredWrapper>
     );
   }
@@ -165,11 +166,5 @@ const CircularProgressWrapper = styled('div')`
   margin-top: 12px;
 `;
 
-const SignInOptionsPanelWrapper = styled('div')(({ theme }) => (`
-  margin-top: 32px;
-  ${theme.breakpoints.up('sm')} {
-    min-width: 500px;
-  }
-`));
 
 export default SetUpAccountInviteContactsSignIn;