Merge branch 'main' into david/firebase-issues

Author: PoojaB26

docs/ff-concepts/notifications/push-notifications.md

@@ -27,7 +27,7 @@ You can add and send push notifications manually or trigger them based on user a
 :::info[General Prerequisites]
 Before you begin, ensure that you:
 - Complete all the steps in 
-[**Firebase Setup**](../../ff-integrations/firebase/connect-to-firebase-setup.md).
+[**Firebase Setup**](../../ff-integrations/firebase/connect-to-firebase-setup.md). Note that, while setting up, make sure to follow step number 5 and 8 carefully from [**Allow FlutterFlow to Access Your Project**](../../ff-integrations/firebase/connect-to-firebase-setup.md#allow-flutterflow-to-access-your-project) section to properly add the **Cloud Functions Admin** role to **[email protected]** user.
 - Upgrade your Firebase project to the [**Blaze plan**](https://firebase.google.com/pricing) to enable [**Cloud Functions**](https://firebase.google.com/docs/functions), which are required specifically for FlutterFlow’s push notification setup, such as retrieving the FCM token and sending notifications trigger from FlutterFlow.  
 :::
 

docs/ff-integrations/ai/ai-agents.md

@@ -21,7 +21,7 @@ Here are some examples of AI Agents:
 
 :::info[Prerequisite]
 Before you begin setting up AI Agents, make sure you:
-1. Connect your project to Firebase by completing the [**Firebase Setup**](../firebase/connect-to-firebase-setup.md).
+1. Complete all the steps in [**Firebase Setup**](../firebase/connect-to-firebase-setup.md). Note that, while setting up, make sure to follow step number 5 and 8 carefully from [**Allow FlutterFlow to Access Your Project**](../firebase/connect-to-firebase-setup.md#allow-flutterflow-to-access-your-project) section to properly add the **Cloud Functions Admin** role to **[email protected]** user.
 2. Upgrade your Firebase project to the [**Blaze Plan**](https://firebase.google.com/pricing), as we rely on [**Firebase Cloud Functions**](https://firebase.google.com/docs/functions) to handle AI-related communication securely.
 :::
 

docs/ff-integrations/payments/stripe.md

@@ -58,7 +58,7 @@ Integrating the Stripe Payments in your app comprises the following steps:
 4. [Testing](#4-testing)
 5. [Releasing to production](#5-releasing-to-production)
 
-### 1. Setup Stripe payment
+### 1. Setup Stripe Payment
 
 Setting up the Stripe payment includes acquiring the keys from your Stripe account and adding them to FlutterFlow.
 
@@ -76,7 +76,7 @@ Follow the steps below to set up payment using Stripe:
 6. Copy the **Publishable Key** and **Secret Key** from the Stripe API keys page and paste them into the respective fields inside FlutterFlow. If you are using Stripe in test mode, make sure you paste them inside the **Test Credentials** section.
 7. Under the **Additional Settings**, you need to specify the following:
     1. **Merchant Display Name** (*Required*): Enter a name for the merchant (you) that the user will see while performing the payment.
-    2. **Merchant Country Code** (*Required*): Enter your country code. This must be the 3-digit ISO country code, such as USA, IND, and NGA.
+    2. **Merchant Country Code** (*Required*): Enter your country code. This must be the 2 digit ISO country code, such as US, IN, and AU.
     3. **Apple Merchant ID** (*Optional*): You need to enter this if you want to accept payments through Apple Pay as well. The instructions for using Apple Pay are in [this section](#2-apple-pay-setup-optional).
 8. Click **Deploy**.
 
@@ -86,7 +86,7 @@ Follow the steps below to set up payment using Stripe:
     height: 0,
     width: '100%'}}>
     <iframe 
-        src="https://www.loom.com/embed/0e4ba1f7f055433e96a7fa6cede2c127?sid=400ef912-1580-44ad-81a9-25051bed0256"
+        src="https://demo.arcade.software/PcikYUtB8cSug9CyUAOv?embed&show_copy_link=true"
         title=""
         style={{
             position: 'absolute',
@@ -108,7 +108,7 @@ Follow the steps below to set up payment using Stripe:
 
 This would deploy the Stripe payment service as a Firebase Cloud Function. Now, you are ready to trigger payments inside your app.
 
-### 2. Apple Pay setup (optional)
+### 2. Apple Pay Setup (optional)
 
 Setting up Apple Pay comprises the following steps:
 
@@ -185,7 +185,7 @@ To add Apple Merchant ID in FlutterFlow:
 
 ![Adding Apple Merchant ID in FlutterFlow](imgs/adding-apple-merchant-id.png)
 
-### 3. Trigger Stripe payment [Action]
+### 3. Trigger Stripe Payment [Action]
 
 In order to initiate a payment using Stripe, you have to use the **Stripe Payment** action.
 
@@ -244,7 +244,7 @@ You can test Stripe payments on mobile and the Web before deployment. To do that
 4. [Download](../../testing-deployment-publishing/exporting-code/ff-cli.md) and [run](../../testing-deployment-publishing/running-your-app/run-your-app.md) your project..
 5. To test the purchase, you can use any of these [basic test card numbers](https://stripe.com/docs/testing#cards).
 
-### 5. Releasing to production
+### 5. Releasing to Production
 
 Before you release the app to production, complete the following steps:
 

docs/resources/projects/libraries.md

@@ -430,3 +430,14 @@ We're working on Library Values, which will allow users to set specific values w
 Projects can import libraries that themselves have imported other Libraries as dependencies. However, if the project and the library share the same dependency, the version must match exactly to avoid conflicts.
 </p>
 </details>
+
+<details>
+<summary>Why do I get collision errors when importing a duplicated project as a library?</summary>
+<p>
+When you duplicate a project and publish it as a library, the unique identifiers (keys) for components and other resources are not automatically changed. If you then import this library back into the original project, it causes key collisions between the original and duplicated resources.
+
+To help with this, FlutterFlow shows a dialog that offers to automatically delete the original resources in your base project and update all references to point to the library versions.
+
+If you prefer to resolve this manually, you can duplicate individual components within the library after importing, this will generate new keys and avoid the collision.
+</p>
+</details>