Skip to content

Commit 7a0f9ed

Browse files
committed
Merge branch 'main' of https://github.com/Expensify/App into mkzie2-issue/68656
2 parents 18bdf2a + ed4c640 commit 7a0f9ed

5 files changed

Lines changed: 11 additions & 10 deletions

File tree

docs/articles/travel/event-management/View-Event-As-Employee-or-Guest.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,27 @@ If your event organizer has provided a central billing card, select it under **P
4040
2. Click **View Event Details** in the email.
4141
3. You’ll be redirected to Expensify Travel. Select **My Trips** to see your upcoming event.
4242

43-
On the **Trips** page, you’ll find your event details and travel options (flight, hotel, car, rail), along with their booking status.
43+
On the **Trips** page, you’ll find your event details and travel options (flight, hotel, car, rail), along with their booking status.
4444

4545
If you haven’t booked yet, follow the same steps as employees to complete your booking.
4646

4747
---
4848

4949
# FAQ
5050

51-
## What if I can’t find my event on the Trips page?
51+
## What if I can’t find my event on the Trips page?
5252
Confirm with your event organizer that you were added to the guest list. Employees should also make sure they’re signed in with their company email address.
5353

54-
## Can I view event details without an Expensify account?
54+
## Can I view event details without an Expensify account?
5555
Yes. Guests can use their event invitation email to view event details, even without an Expensify account.
5656

57-
## How do I know if my travel has been booked?
57+
## How do I know if my travel has been booked?
5858
The **Trips** page shows the status of each travel type (flight, hotel, car, rail). If the status says **Booked**, your reservation is confirmed.
5959

60-
## Can I change or cancel my travel from the Trips page?
60+
## Can I change or cancel my travel from the Trips page?
6161
Yes. Open the trip details and follow the prompts to change or cancel. Keep in mind that change and cancellation policies depend on the airline, hotel, or rental provider.
6262

63-
## What should I do if I didn’t receive an invitation email?
63+
## What should I do if I didn’t receive an invitation email?
6464
Check your spam or junk folder first. If you still can’t find it, contact your event organizer or company administrator to confirm your email was added correctly.
6565

6666
</div>

docs/articles/travel/travel-analytics/Overview-of-Analytics.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,3 @@ Yes, analytics are updated automatically as bookings are made, changed, or cance
8282

8383
**Can I filter company-wide reports by department or cost center?**
8484
Yes, depending on how your organization is set up, filters for departments or cost centers may be available in the Company Reports view.
85-
86-
</div>

src/pages/settings/Profile/PersonalDetails/PhoneNumberPage.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import INPUT_IDS from '@src/types/form/PersonalDetailsForm';
2323
import type {PrivatePersonalDetails} from '@src/types/onyx';
2424

2525
function PhoneNumberPage() {
26-
const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
27-
const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
26+
const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS, {canBeMissing: true});
27+
const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP, {canBeMissing: true});
2828
const styles = useThemeStyles();
2929
const {translate} = useLocalize();
3030
const {inputCallbackRef} = useAutoFocusInput();
@@ -117,6 +117,7 @@ function PhoneNumberPage() {
117117
}
118118
clearPhoneNumberError();
119119
}}
120+
inputMode={CONST.INPUT_MODE.TEL}
120121
/>
121122
</OfflineWithFeedback>
122123
</FormProvider>

src/pages/settings/Security/MergeAccounts/AccountDetailsPage.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ function AccountDetailsPage() {
199199
autoCorrect={false}
200200
onChangeText={setEmail}
201201
value={email}
202+
inputMode={CONST.INPUT_MODE.EMAIL}
202203
/>
203204
<InputWrapper
204205
style={[styles.mt8]}

src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ function Size({onNext}: SizeProps) {
7272
role={CONST.ROLE.PRESENTATION}
7373
defaultValue={defaultValues[INPUT_IDS.SUBSCRIPTION_SIZE]}
7474
shouldSaveDraft
75+
inputMode={CONST.INPUT_MODE.NUMERIC}
7576
/>
7677
<Text style={[styles.formHelp, styles.mt2]}>{translate('subscription.subscriptionSize.eachMonth')}</Text>
7778
<Text style={[styles.formHelp, styles.mt2]}>{translate('subscription.subscriptionSize.note')}</Text>

0 commit comments

Comments
 (0)