Merge pull request #5409 from Expensify/update-staging-from-main

.github/ISSUE_TEMPLATE/Accessibility.md

@@ -0,0 +1,51 @@
+---
+name: Accessibility issue template
+about: A template to follow when creating a new issue for accessibility failures
+---
+
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
+___
+
+## Action Performed:
+Break down in numbered steps
+
+## Expected Result:
+Describe what you think should've happened
+
+## Actual Result:
+Describe what actually happened
+
+## Workaround:
+Can the user still use Expensify without this being fixed? Have you informed them of the workaround?
+
+## Area issue was found in:
+Where did we find this issue?
+
+## Failed WCAG checkpoints
+What WCAG checkpoints were failed?
+
+## User impact:
+How does this affect the user?
+
+## Suggested resolution:
+What can we do to fix the issue?
+
+## Platform:
+<!--- 
+Remove any platforms that aren't affected by this issue
+--->
+Where is this issue occurring?
+
+- Web
+- iOS
+- Android
+- Desktop App
+- Mobile Web
+
+**Version Number:**
+**Reproducible in staging?:**
+**Reproducible in production?:**
+**Notes/Photos/Videos:** Any additional supporting documentation
+**Issue reported by:**
+
+[View all open jobs on GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22)

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010002
-        versionName "1.1.0-2"
+        versionCode 1001010003
+        versionName "1.1.0-3"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.0.2</string>
+	<string>1.1.0.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.0.2</string>
+	<string>1.1.0.3</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.0-2",
+  "version": "1.1.0-3",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/CONST.js

@@ -127,8 +127,8 @@ const CONST = {
     PRIVACY_URL: 'https://use.expensify.com/privacy',
     LICENSES_URL: 'https://use.expensify.com/licenses',
     PLAY_STORE_URL: 'https://play.google.com/store/apps/details?id=com.expensify.chat&hl=en',
-    ADD_SECONDARY_LOGIN_URL: '/settings?param={%22section%22:%22account%22}',
-    MANAGE_CARDS_URL: '/domain_companycards',
+    ADD_SECONDARY_LOGIN_URL: 'settings?param={%22section%22:%22account%22}',
+    MANAGE_CARDS_URL: 'domain_companycards',
     FEES_URL: 'https://use.expensify.com/fees',
     CFPB_PREPAID_URL: 'https://cfpb.gov/prepaid',
     STAGING_SECURE_URL: 'https://staging-secure.expensify.com/',

src/components/CheckboxWithLabel.js

@@ -64,6 +64,7 @@ const CheckboxWithLabel = ({
                         styles.w100,
                         styles.flexRow,
                         styles.flexWrap,
+                        styles.flexShrink1,
                         styles.alignItemsCenter,
                     ]}
                 >

src/components/InboxCallButton.js

@@ -22,14 +22,14 @@ const defaultProps = {
 
 const InboxCallButton = props => (
     <Tooltip
-        text={props.translate('requestCallPage.needHelpTooltip')}
+        text={props.translate('requestCallPage.callButtonTooltip')}
         containerStyles={[styles.justifyContentCenter, styles.alignItemsCenter]}
     >
         <Button
             onPress={() => {
                 Navigation.navigate(ROUTES.getRequestCallRoute(props.taskID));
             }}
-            text={props.translate('requestCallPage.needHelp')}
+            text={props.translate('requestCallPage.callButton')}
             small
             icon={Phone}
         />

src/languages/en.js

@@ -595,10 +595,10 @@ export default {
             genericFailureMessage: 'An error occurred creating the workspace, please try again.',
         },
         people: {
-            assignee: 'Assignee',
             genericFailureMessage: 'An error occurred removing a user from the workspace, please try again.',
             removeMembersPrompt: 'Are you sure you want to remove the selected people from your workspace?',
             removeMembersTitle: 'Remove members',
+            selectAll: 'Select all',
         },
         card: {
             addEmail: 'Add email',
@@ -643,8 +643,8 @@ export default {
         errorMessageInvalidPhone: 'That doesn’t look like a valid phone number. Try again with the country code. e.g. +15005550006',
         growlMessageEmptyName: 'Please provide both a first and last name so our guides know how to address you!',
         growlMessageNoPersonalPolicy: 'I wasn’t able to find a personal policy to associate this Guides call with, please check your connection and try again.',
-        needHelp: 'Help',
-        needHelpTooltip: 'Get live help from our team',
+        callButton: 'Call',
+        callButtonTooltip: 'Get live help from our team',
     },
     emojiPicker: {
         skinTonePickerLabel: 'Change default skin tone',

src/languages/es.js

@@ -597,10 +597,10 @@ export default {
             genericFailureMessage: 'Se ha producido un error al intentar crear el espacio de trabajo. Por favor, inténtalo de nuevo.',
         },
         people: {
-            assignee: 'Persona asignada',
             genericFailureMessage: 'Se ha producido un error al intentar eliminar a un usuario del espacio de trabajo. Por favor inténtalo más tarde.',
             removeMembersPrompt: '¿Estás seguro que quieres eliminar a las personas seleccionadas de tu espacio de trabajo?',
             removeMembersTitle: 'Eliminar miembros',
+            selectAll: 'Seleccionar todo',
         },
         card: {
             addEmail: 'Agregar correo electrónico',
@@ -645,8 +645,8 @@ export default {
         errorMessageInvalidPhone: 'El teléfono no es valido. Inténtalo de nuevo agregando el código de país. P. ej.: +15005550006',
         growlMessageEmptyName: 'Por favor ingresa tu nombre completo',
         growlMessageNoPersonalPolicy: 'No he podido encontrar una póliza personal con la que asociar esta llamada a las Guías, compruebe su conexión e inténtelo de nuevo.',
-        needHelp: 'Ayuda',
-        needHelpTooltip: 'Recibe ayuda telefónica de nuestro equipo',
+        callButton: 'Llamar',
+        callButtonTooltip: 'Recibe ayuda telefónica de nuestro equipo',
     },
     emojiPicker: {
         skinTonePickerLabel: 'Elige el tono de piel por defecto',

src/libs/API.js

@@ -433,11 +433,11 @@ function GetAccountStatus(parameters) {
 }
 
 /**
- * Returns a validate code for this account
+ * Returns a short lived authToken for this account
  * @returns {Promise}
  */
-function GetAccountValidateCode() {
-    const commandName = 'GetAccountValidateCode';
+function GetShortLivedAuthToken() {
+    const commandName = 'GetShortLivedAuthToken';
     return Network.post(commandName);
 }
 
@@ -1086,7 +1086,7 @@ export {
     DeleteLogin,
     Get,
     GetAccountStatus,
-    GetAccountValidateCode,
+    GetShortLivedAuthToken,
     GetIOUReport,
     GetPolicyList,
     GetPolicySummaryList,

src/libs/actions/App.js

@@ -48,10 +48,8 @@ function setLocale(locale) {
  * @param {string} url relative URL starting with `/` to open in expensify.com
  */
 function openSignedInLink(url = '') {
-    API.GetAccountValidateCode().then((response) => {
-        const exitToURL = url ? `?exitTo=${url}` : '';
-        const validateCodeUrl = `v/${currentUserAccountID}/${response.validateCode}${exitToURL}`;
-        Linking.openURL(CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + validateCodeUrl);
+    API.GetShortLivedAuthToken().then((response) => {
+        Linking.openURL(`${CONFIG.EXPENSIFY.URL_EXPENSIFY_COM}${url}${url.indexOf('?') === -1 ? '?' : '&'}authToken=${response.authToken}&email=${encodeURIComponent(response.email)}`);
     });
 }
 

src/libs/actions/Session.js

@@ -272,7 +272,7 @@ function setPassword(password, validateCode, accountID) {
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
         })
         .catch((response) => {
-            if (response.message === CONST.PASSWORD_PAGE.ERROR.VALIDATE_CODE_FAILED) {
+            if (response.title === CONST.PASSWORD_PAGE.ERROR.VALIDATE_CODE_FAILED) {
                 Onyx.merge(ONYXKEYS.ACCOUNT, {error: translateLocal('setPasswordPage.accountNotValidated')});
             }
         })

src/pages/ReimbursementAccount/BeneficialOwnersStep.js

@@ -149,7 +149,7 @@ class BeneficialOwnersStep extends React.Component {
                         <Text>{this.props.translate('beneficialOwnersStep.checkAllThatApply')}</Text>
                     </Text>
                     <CheckboxWithLabel
-                        style={[styles.mb2, styles.mr2]}
+                        style={[styles.mb2]}
                         isChecked={this.state.ownsMoreThan25Percent}
                         onPress={() => this.toggleCheckbox('ownsMoreThan25Percent')}
                         LabelComponent={() => (
@@ -160,7 +160,7 @@ class BeneficialOwnersStep extends React.Component {
                         )}
                     />
                     <CheckboxWithLabel
-                        style={[styles.mb2, styles.mr2]}
+                        style={[styles.mb2]}
                         isChecked={this.state.hasOtherBeneficialOwners}
                         onPress={() => {
                             this.setState((prevState) => {
@@ -224,7 +224,7 @@ class BeneficialOwnersStep extends React.Component {
                             )}
                         </View>
                     )}
-                    <Text style={[styles.textStrong, styles.mb5]}>
+                    <Text style={[styles.mv5]}>
                         {this.props.translate('beneficialOwnersStep.agreement')}
                     </Text>
                     <CheckboxWithLabel
@@ -235,7 +235,7 @@ class BeneficialOwnersStep extends React.Component {
                             <View style={[styles.flexRow]}>
                                 <Text>{this.props.translate('common.iAcceptThe')}</Text>
                                 <TextLink href="https://use.expensify.com/achterms">
-                                    {`${this.props.translate('beneficialOwnersStep.termsAndConditions')}.`}
+                                    {`${this.props.translate('beneficialOwnersStep.termsAndConditions')}`}
                                 </TextLink>
                             </View>
                         )}

src/pages/workspace/WorkspacePeoplePage.js

@@ -259,8 +259,8 @@ class WorkspacePeoplePage extends React.Component {
                                 />
                             </View>
                             <View style={[styles.peopleRowCell, styles.flex1]}>
-                                <Text style={[styles.textStrong, styles.textUppercase, styles.ph5]}>
-                                    {this.props.translate('workspace.people.assignee')}
+                                <Text style={[styles.textStrong, styles.ph5]}>
+                                    {this.props.translate('workspace.people.selectAll')}
                                 </Text>
                             </View>
                         </View>