Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions apps/expo-go/android/expoview/src/main/res/values-v23/styles.xml

This file was deleted.

4 changes: 3 additions & 1 deletion apps/expo-go/android/expoview/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</style>

<style name="Theme.Exponent.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand All @@ -16,6 +17,7 @@
</style>

<style name="Theme.Exponent.Dark" parent="Theme.MaterialComponents.Light.NoActionBar">
<item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand All @@ -28,7 +30,7 @@
</style>

<style name="Theme.Exponent.Light.LightStatusBar" parent="Theme.Exponent.Light">
<!-- dummy theme here: see v23 styles -->
<item name="android:windowLightStatusBar">true</item>
</style>

<!-- Theme passed to RN. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,14 @@ function SharedStateToggle() {

return (
<>
<SyncToggle isOn={isOn} label="Shared State Toggle" />
<SyncToggle
isOn={isOn}
label="Shared State Toggle"
onIsOnChangeSync={(value) => {
'worklet';
console.log('[UI thread] isOn:', value);
}}
/>
<Button label="Toggle from JS" onPress={() => (isOn.value = !isOn.value)} />
<Button label="Toggle from Worklet" onPress={toggleFromWorklet} />
</>
Expand Down
14 changes: 7 additions & 7 deletions docs/pages/billing/faq.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ See [Cancel a plan](/billing/manage/#cancel-a-plan) for more information.

If you've subscribed to a plan from the wrong account:

- From the EAS dashboard's navigation menu, under **Account**, switch to the account from which you intend to subscribe.
- From the EAS dashboard sidebar, click the account switcher at the top and select the account you intend to subscribe.
- Go to [Billing](https://expo.dev/settings/billing) and under **Current Plan**, [follow the steps to subscribe to the right plan](/billing/manage/#upgrade-to-a-new-plan).
- From the wrong account, go to **[Receipts](https://expo.dev/accounts/[account]/settings/receipts)** and initiate a [request for a refund](/billing/invoices-and-receipts/#request-a-refund).

Expand Down Expand Up @@ -56,7 +56,7 @@ For [all paid plans](/billing/plans/#plans), the billing period starts from the

To update your Organization account's billing information or add a tax ID, make sure that you have either an [Owner or Admin role](/accounts/account-types/#manage-access). For a Personal account, you always have an **Owner** role. After confirming your role:

- Go to your [account's Billing](https://expo.dev/settings/billing), and click on **Manage billing information**. This will take you to Stripe's portal.
- Go to your [account's Billing](https://expo.dev/settings/billing), and in the right sidebar, click **Manage billing**. This will take you to Stripe's portal.
- On Stripe's portal, under **Billing information**, click on **Update information** to update billing-related information such as billing name, email, address, and tax ID.

See [Manage billing information](/billing/manage/#manage-billing-information) for more details.
Expand All @@ -77,7 +77,7 @@ For more information, see [How to optimize build usage](/billing/usage-based-pri

### How do I estimate my next bill?

To estimate your next bill, go to [Billing](https://expo.dev/settings/billing). Under **Usage this month**, you will find a summary of your EAS Build usage based on the [resource class](/build/eas-json/#selecting-resource-class), EAS Update usage based on monthly active users and global edge bandwidth, and the amount spent for both.
To estimate your next bill, go to [Billing](https://expo.dev/settings/billing) and see the **Usage** section. You will find a summary of your EAS Build usage based on the [resource class](/build/eas-json/#selecting-resource-class), EAS Update usage based on monthly active users and global edge bandwidth, and the amount spent for both.

See [How usage-based pricing works](/billing/usage-based-pricing/#how-usage-based-pricing-works) for more information.

Expand All @@ -95,7 +95,7 @@ Annual plans are available for [Enterprise plan](/billing/plans/#enterprise) cus

To update your Organization account's payment information, make sure that you have either an [Owner or Admin role](/accounts/account-types/#manage-access). For a Personal account, you always have an **Owner** role. After confirming your role:

- Go to your [account's **Billing**](https://expo.dev/settings/billing), and click on **Manage billing information**. This will take you to Stripe's portal.
- Go to your [account's **Billing**](https://expo.dev/settings/billing), and in the right sidebar, click **Manage billing**. This will take you to Stripe's portal.
- On Stripe's portal, under **Payment method**, click on **Add payment method** to add a new payment method.

See [Manage billing information](/billing/manage/#payment-method) for more details.
Expand All @@ -116,14 +116,14 @@ No, Expo does not. We use Stripe to handle the payment system and they do. See [

### How much did I pay for a large build this month?

To view the cost of a large build, go to [Billing](https://expo.dev/settings/billing). Under **Usage this month** you will find a summary of your EAS Build usage based on the [resource class](/build/eas-json/#selecting-resource-class) and the amount spent.
To view the cost of a large build, go to [Billing](https://expo.dev/settings/billing) and see the **Usage** section. You will find a summary of your EAS Build usage based on the [resource class](/build/eas-json/#selecting-resource-class) and the amount spent.

## Add-ons

### How do I increase build concurrencies on my account?

If you're already subscribed to a paid EAS plan, you can buy additional concurrencies in the [**Add-ons**](https://expo.dev/settings/billing) section under **Billing**.
If you are already subscribed to a paid EAS plan, you can buy additional concurrencies in the [**Add-ons**](https://expo.dev/settings/billing) section under **Billing**.

If you're on the Free plan, you'll need to set up a paid subscription. [Click here](https://expo.dev/accounts/[account]/settings/billing/cart) to choose a new plan. Then, select the number of additional concurrencies to add to your subscription on the checkout page.
If you are on the Free plan, you will need to set up a paid subscription. [Click here](https://expo.dev/accounts/[account]/settings/billing/cart) to choose a new plan. Then, select the number of additional concurrencies to add to your subscription on the checkout page.

Each plan has different number of concurrencies included. If you need more than 5 additional concurrencies, [contact us](https://expo.dev/contact).
2 changes: 1 addition & 1 deletion docs/pages/billing/invoices-and-receipts.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { ContentSpotlight } from '~/ui/components/ContentSpotlight';

## Receipts

To view your account's payment history, click [Receipts](https://expo.dev/settings/receipts) in the navigation menu under **Account settings** or **Organization settings**.
To view your account's payment history, click [Receipts](https://expo.dev/settings/receipts) in the navigation menu under **Subscription**.

For example, an [Organization account's](/accounts/account-types/#organizations) receipts are shown below:

Expand Down
34 changes: 6 additions & 28 deletions docs/pages/billing/manage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,22 @@ This guide explains how to manage your account's plans and billing information.

### View the current plan

<Tabs>

<Tab label="For Organization accounts">

- Click [Billing](https://expo.dev/settings/billing) from the navigation menu under **Organization settings**.
- Click [Billing](https://expo.dev/settings/billing) from the navigation menu under **Subscription**.
- Under **Current Plan**, you can see the current plan for your account.

For example, an Organization account is subscribed to the Free plan below:
For example, an account is subscribed to the Free plan below:

<ContentSpotlight
alt="Billing page in EAS dashboard displays the current plan for an Organization account."
src="/static/images/billing/management/billing-02.png"
/>

</Tab>

<Tab label="For Personal accounts">

- Click [Billing](https://expo.dev/settings/billing) from the navigation menu under **Account settings**.
- Under **Current Plan**, you can see the current plan for your account.

For example, a Personal account is subscribed to the Free plan below:

<ContentSpotlight
alt="Billing page in EAS dashboard displays the current plan for a Personal account."
src="/static/images/billing/management/billing-02.png"
/>

</Tab>

</Tabs>

### Upgrade to a new plan

To upgrade to a different plan:

- Click [Billing](https://expo.dev/settings/billing) from the navigation menu in EAS dashboard.
- Under **Current Plan**, click **Change Plan** if you are already on a paid plan. If you are on the Free plan, click **See Plans** > **Select your account**. It opens the **Upgrade plan** popup.
- Under **Current Plan**, click **Change Plan** if you are already on a paid plan. If you are on the Free plan, click **See plans** > **Select your account**. It opens the **Upgrade plan** popup.
- Under **Upgrade plan**, you can see a list of all available plans. Choose the plan you want to upgrade to and click the **Upgrade** button under the desired plan.

<ContentSpotlight
Expand Down Expand Up @@ -148,7 +126,7 @@ You can manage your billing-related details such as name, email, address, and pa

To update your billing name, email, or address:

- On [Billing](https://expo.dev/settings/billing), click **Manage billing information**. This will open Stripe's portal where you can view payment methods, billing information, invoicing history, and update your billing information. Then, click **Update information**.
- On [Billing](https://expo.dev/settings/billing), under **Manage billing information**, click **Manage billing**. This will open Stripe's portal where you can view payment methods, billing information, invoicing history, and update your billing information. Then, click **Update information**.

<ContentSpotlight
alt="Billing page in EAS dashboard displays the Update billing information button to update billing details."
Expand All @@ -168,7 +146,7 @@ To update your billing name, email, or address:

To add or update your billing tax ID:

- On [Billing](https://expo.dev/settings/billing), click **Manage billing information**. This will open Stripe's portal where you can view and update your billing information. Then, click **Update information**.
- On [Billing](https://expo.dev/settings/billing), under **Manage billing information**, click **Manage billing**. This will open Stripe's portal where you can view and update your billing information. Then, click **Update information**.

<ContentSpotlight
alt="Billing page in EAS dashboard displays the Update billing information button to update billing details."
Expand All @@ -188,7 +166,7 @@ To add or update your billing tax ID:

To add a new payment method information:

- On [Billing](https://expo.dev/settings/billing), click **Manage billing information**. This will open Stripe's portal where you can view and update your billing information.
- On [Billing](https://expo.dev/settings/billing), under **Manage billing information**, click **Manage billing**. This will open Stripe's portal where you can view and update your billing information.
- Under **Payment method**, click on **Add payment method** to add a new payment method.

<ContentSpotlight
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/billing/usage-based-pricing.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ You can enable **Plan credit usage** notifications to closely monitor your EAS B

To enable EAS Build credit usage notification:

- Click **Email notifications** in the navigation menu under your account's settings:
- Under **EAS Build notifications**, click **Subscribe** for **Plan credit usage notifications**.
- Click **Email notifications** in the navigation menu
- Under **EAS Build notifications**, click **Subscribe** for **Plan credit usage notifications**

<ContentSpotlight
alt="Enabling EAS Build plan credit usage notifications in the EAS dashboard."
Expand Down
18 changes: 9 additions & 9 deletions docs/pages/eas/workflows/get-started.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ on:
branches: ['main']
# @end #

jobs:
build_android:
type: build
params:
platform: android
build_ios:
type: build
params:
platform: ios
jobs:
build_android:
type: build
params:
platform: android
build_ios:
type: build
params:
platform: ios
```

### Trigger workflows from App Store Connect events
Expand Down
Binary file modified docs/public/static/images/billing/management/billing-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/management/billing-12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/plan-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/receipts-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/receipts-04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/receipts-05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/usage-01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/usage-02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/usage-03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/public/static/images/billing/usage-04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading