Merge branch 'Amplitude' into develop - version to review

versioned_docs/version-3.0/amplitude.md

@@ -15,8 +15,14 @@ Adapty provides a complete set of data that lets you track [subscription events]
 
 ### How to set up Amplitude integration
 
-To set up the integration with [Amplitude](https://amplitude.com/), go to [Integrations > Amplitude](https://app.adapty.io/integrations/amplitude) in the Adapty Dashboard, turn on a toggle from off to on, and fill out fields.
+Within Adapty, you can set up separate flows for **production** and **test events** from the Apple or Stripe sandbox environment or Google test account.
 
+- For production events, enter the **Production** API keys from the Amplitude dashboard, with a unique API key for each platform: iOS, Android, and Stripe.
+- For test events, use the **Sandbox** fields as needed.
+
+To set up the Amplitude integration:
+
+1. Open [**Integrations** -> **Amplitude**](https://app.adapty.io/integrations/amplitude) in your Adapty Dashboard.
 
 <Zoom>
   <img src={require('./img/3b50552-CleanShot_2023-08-15_at_16.47.102x.webp').default}
@@ -30,34 +36,46 @@ To set up the integration with [Amplitude](https://amplitude.com/), go to [Integ
 </Zoom>
 
 
+2. Toggle on **Amplitude integration** to enable it.
 
+3. Fill in the integration fields:
 
+    | Field                                      | Description                                                  |
+    | ------------------------------------------ | ------------------------------------------------------------ |
+    | **Amplitude iOS/ Android. Stripe API key** | Enter the Amplitude **API Key** for iOS/ Android/ Stripe into Adapty. Locate it under **Project settings** in Amplitude. For help, check [Amplitude docs](https://amplitude.com/docs/apis/authentication). Start with **Sandbox** keys for testing, then switch to **Production** keys after successful tests. |
 
-You need to enter the **API Key** into Adapty. To find a token, go to your **Project settings** in Amplitude. In case you need help, refer to [official docs](https://amplitude.com/docs/apis/authentication). 
+    <Zoom>
+      <img src={require('./img/2297782-CleanShot_2023-08-15_at_16.53.512x.webp').default}
+      style={{
+        border: '1px solid #727272', /* border width and color */
+        width: '700px', /* image width */
+        display: 'block', /* for alignment */
+        margin: '0 auto' /* center alignment */
+      }}
+    />
+    </Zoom>
 
+4. Optional settings for further customization:
 
-<Zoom>
-  <img src={require('./img/2297782-CleanShot_2023-08-15_at_16.53.512x.webp').default}
-  style={{
-    border: '1px solid #727272', /* border width and color */
-    width: '700px', /* image width */
-    display: 'block', /* for alignment */
-    margin: '0 auto' /* center alignment */
-  }}
-/>
-</Zoom>
-
+   | Parameter                               | Description                                                  |
+   | --------------------------------------- | ------------------------------------------------------------ |
+   | **How the revenue data should be sent** | Choose whether to send gross revenue or revenue after taxes and commissions. See [Store commission and taxes](controls-filters-grouping-compare-proceeds#store-commission-and-taxes) for details. |
+   | **Exclude historical events**           | Choose to exclude events before Adapty SDK installation, preventing duplicate data. For example, if a user subscribed on January 10th but installed the Adapty SDK on March 6th, Adapty will only send events from March 6th onward. |
+   | **Send User Attributes**                | Select this option to send user-specific attributes like language preferences. |
+   | **Always populate user_id**             | Adapty automatically sends `device_id` as `amplitudeDeviceId`. For `user_id`, this setting defines behavior: <ul><li>**ON**: Sends Adapty `profile_id` if `amplitudeUserId` or `customer_user_id` aren’t available.</li><li>**OFF**: Leaves `user_id` empty if neither ID is available.</li></ul> |
 
+5. Choose the events you want to receive and [map their names](amplitude#events-and-tags).
 
+6. Click **Save** to confirm your changes.
 
+Note: Once you click **Save**, Adapty will start sending events to Amplitude.
 
-Along with events, Adapty also sends the[ subscription status](subscription-status) and subscription product ID to the [Amplitude user properties.](https://help.amplitude.com/hc/en-us/articles/115002380567#h_39e46c92-7b7f-4358-a96f-c82cc3342e3e)
+In addition to events, Adapty sends [subscription status](subscription-status) and the subscription product ID to [Amplitude user properties](https://help.amplitude.com/hc/en-us/articles/115002380567#h_39e46c92-7b7f-4358-a96f-c82cc3342e3e).
 
 ### Events and tags
 
 Below the credentials, there are three groups of events you can send to Amplitude from Adapty. Simply turn on the ones you need. Check the full list of the events offered by Adapty [here](events).
 
-
 <Zoom>
   <img src={require('./img/da67694-CleanShot_2023-08-15_at_16.52.352x.webp').default}
   style={{
@@ -69,15 +87,16 @@ Below the credentials, there are three groups of events you can send to Amplitud
 />
 </Zoom>
 
-
-
-
-
 We recommend using the default event names provided by Adapty. But you can change the event names based on your needs. Adapty will send subscription events to Amplitude using a server-to-server integration, allowing you to view all subscription events in your Amplitude dashboard.
 
 ### SDK configuration
 
-Use `Adapty.updateProfile()` method to set `amplitudeDeviceId` or `amplitudeUserId`.  If not set, Adapty uses your user ID (`customerUserId`) or if it's null Adapty ID. Make sure that the user id you use to send data to Amplitude from your app is the same one you send to Adapty.
+Use the `Adapty.updateProfile()` method to set either `amplitudeDeviceId` or `amplitudeUserId`. If neither is set, Adapty will default to using your user ID (`customerUserId`). If `customerUserId` is also absent, Adapty will handle `user_id` based on the **Always populate user_id** checkbox:
+
+- **If selected**, Adapty will set `user_id` to the Adapty `profile_id`.
+- **If cleared**, `user_id` will not be set.
+
+Make sure that any user ID you use to send data to Amplitude from your app matches the one you send to Adapty.
 
 <Tabs>
 <TabItem value="Swift" label="iOS (Swift)" default>
@@ -95,8 +114,8 @@ Adapty.updateProfile(params: builder.build())
 ```kotlin 
 //for Amplitude maintenance SDK (obsolete)
 val amplitude = Amplitude.getInstance()
-val amplitudeDeviceId = amplitude.deviceId
-val amplitudeUserId = amplitude.userId
+val amplitudeDeviceId = amplitude.getDeviceId()
+val amplitudeUserId = amplitude.getUserId()
 
 //for actual Amplitude Kotlin SDK
 val amplitude = Amplitude(

versioned_docs/version-3.0/analytics-integration.md

@@ -27,7 +27,7 @@ Let us know! [Write to the Adapty support](mailto:[email protected]) and we'll c
 
 ### Setting the profile's identifier
 
-Set the profile's identifier for the selected analytics using [`.updateProfile()`](setting-user-attributes#setting-user-attributes) method. For example, for Amplitude integration, you can set either `amplitudeUserId` or `amplitudeDeviceId`. For Mixpanel integration, you have to set `mixpanelUserId`. When these identifiers are not set, Adapty will use `customerUserId` instead. If the `customerUserId` is not set, we will use our internal profile id.
+Set the profile's identifier for the selected analytics using [`.updateProfile()`](setting-user-attributes#setting-user-attributes) method. For example, for Amplitude integration, you can set either `amplitudeUserId` or `amplitudeDeviceId`. For Mixpanel integration, you have to set `mixpanelUserId`. When these identifiers are not set, Adapty will use `customerUserId` instead. If the `customerUserId` is not set, we will use our internal profile ID.
 
 :::warning
 Avoiding duplication

versioned_docs/version-3.0/appmetrica.md

@@ -75,59 +75,80 @@ We recommend using the default event names provided by Adapty. But you can chang
 
 ## SDK configuration
 
-Use `Adapty.updateProfile()` method to set `appmetricaProfileId` or `appmetricaDeviceId`.  If not set, Adapty uses your user ID (`customerUserId`). Make sure that the user id you use to send data to AppMetrica from your app is the same one you send to Adapty. These links should help to set up a user id for AppMetrica in your app.
+Use the `Adapty.updateProfile()` method to set the `appmetricaProfileId` or `appmetricaDeviceId` parameter. Setting `appmetricaDeviceId` is preferred!
 
-- [Set profile ID](https://appmetrica.yandex.ru/docs/en/sdk/ios/analytics/swift/AppMetrica#property_userProfileID) iOS;
-- [Get device ID](https://appmetrica.yandex.ru/docs/en/sdk/ios/analytics/swift/AppMetrica#requestStartupIdentifiersWithKeys__completionQueue__completionBlock) iOS;
-- [Set profile id](https://yastatic.net/s3/doc-binary/src/dev/appmetrica/ru/javadoc-7.0.0/io/appmetrica/analytics/AppMetrica.html#setUserProfileID(java.lang.String)) Android;
-- [Get device ID](https://yastatic.net/s3/doc-binary/src/dev/appmetrica/ru/javadoc-7.0.0/io/appmetrica/analytics/AppMetrica.html#requestStartupParams(android.content.Context,io.appmetrica.analytics.StartupParamsCallback,java.util.List)) Android.
+If these aren’t set, Adapty will default to using your user ID (`customerUserId`). Make sure the user ID you use to send data to AppMetrica from your app matches the one you send to Adapty. These links can help you set up a user ID for AppMetrica in your app.
+
+- [Set profile ID](https://appmetrica.yandex.com/docs/mobile-sdk-dg/ios/objective-c/ref/YMMYandexMetrica.html#method_detail__method_setUserProfileID) iOS;
+- [Get device ID](https://appmetrica.yandex.ru/docs/ru/sdk/react-native/analytics/methods#appmetrica) iOS;
+- [Set profile id](https://yastatic.net/s3/doc-binary/src/dev/appmetrica/ru/javadoc-7.2.2/io/appmetrica/analytics/AppMetrica.html#setUserProfileID(java.lang.String)) Android;
+- [Get device ID](https://yastatic.net/s3/doc-binary/src/dev/appmetrica/ru/javadoc-7.2.2/io/appmetrica/analytics/AppMetrica.html#requestStartupParams(android.content.Context,io.appmetrica.analytics.StartupParamsCallback,java.util.List)) Android.
 
 <Tabs>
 <TabItem value="Swift" label="iOS (Swift)" default>
 ```swift 
-import YandexMobileMetrica
+import AppMetricaCore
 
-YMMYandexMetrica.requestAppMetricaDeviceID(withCompletionQueue: .main) { deviceId, error in
-    guard let deviceId = deviceId else { return }
-
-    let builder = AdaptyProfileParameters.Builder()
-        .with(appmetricaDeviceId: deviceId)
-        .with(appmetricaProfileId: "YOUR_ADAPTY_CUSTOMER_USER_ID")
+
+if let deviceID = AppMetrica.deviceID {
+  let builder = AdaptyProfileParameters.Builder()
+    .with(appmetricaDeviceId: deviceID)
+    .with(appmetricaProfileId: "YOUR_ADAPTY_CUSTOMER_USER_ID")
 
-        Adapty.updateProfile(params: builder.build())
+  Adapty.updateProfile(params: builder.build())
 }
 ```
 </TabItem>
 <TabItem value="kotlin" label="Android (Kotlin)" default>
 ```kotlin 
-val params = AdaptyProfileParameters.Builder()
-    .withAppmetricaDeviceId(appmetricaDeviceId)
-    .withAppmetricaProfileId(appmetricaProfileId)
-    .build()
-Adapty.updateProfile(params) { error ->
-    if (error != null) {
-        // handle the error
+val startupParamsCallback = object: StartupParamsCallback {
+    override fun onReceive(result: StartupParamsCallback.Result?) {
+        val deviceId = result?.deviceId ?: return
+
+        val params = AdaptyProfileParameters.Builder()
+            .withAppmetricaDeviceId(deviceId)
+            .withAppmetricaProfileId("YOUR_ADAPTY_CUSTOMER_USER_ID")
+            .build()
+        Adapty.updateProfile(params) { error ->
+            if (error != null) {
+                // handle the error
+            }
+        }
+    }
+
+    override fun onRequestError(
+        reason: StartupParamsCallback.Reason,
+        result: StartupParamsCallback.Result?
+    ) {
+        //handle error
     }
 }
+
+AppMetrica.requestStartupParams(context, startupParamsCallback, listOf(StartupParamsCallback.APPMETRICA_DEVICE_ID))
 ```
 </TabItem>
 <TabItem value="Flutter" label="Flutter (Dart)" default>
 ```javascript
 import 'package:appmetrica_plugin/appmetrica_plugin.dart';
 
-final builder = AdaptyProfileParametersBuilder()
-    ..setAppmetricaDeviceId(await AppMetrica.requestAppMetricaDeviceID())
-    ..setAppmetricaProfileId("YOUR_ADAPTY_CUSTOMER_USER_ID")
+final deviceId = await AppMetrica.deviceId;
+
+if (deviceId != null) {
+  final builder = AdaptyProfileParametersBuilder()
+    ..setAppmetricaDeviceId(deviceId)
+    ..setAppmetricaProfileId("YOUR_ADAPTY_CUSTOMER_USER_ID");
 
-try {
+  try {
     await adapty.updateProfile(builder.build());
-} on AdaptyError catch (adaptyError) {
+  } on AdaptyError catch (adaptyError) {
     // handle error
-} catch (e) {}
+  } catch (e) {}
+}
 ```
 </TabItem>
 <TabItem value="Unity" label="Unity (C#)" default>
 ```csharp 
+<<<<<<< HEAD
 AppMetrica.Instance.RequestAppMetricaDeviceID((deviceId, error) => {
     if (error != null) {
         // handle error
@@ -143,21 +164,46 @@ AppMetrica.Instance.RequestAppMetricaDeviceID((deviceId, error) => {
         // handle error
     });
 });
+=======
+var deviceId = AppMetrica.GetDeviceId();
+
+if (deviceId != null {
+  var builder = new Adapty.ProfileParameters.Builder();
+
+  builder.SetAppmetricaProfileId("YOUR_ADAPTY_CUSTOMER_USER_ID");
+  builder.SetAppmetricaDeviceId(deviceId);
+
+  Adapty.UpdateProfile(builder.Build(), (error) => {
+      // handle error
+  });
+}
+>>>>>>> Amplitude
 ```
 </TabItem>
 <TabItem value="RN" label="React Native (TS)" default>
 ```typescript 
 import { adapty } from 'react-native-adapty';
+import AppMetrica, { DEVICE_ID_KEY, StartupParams, StartupParamsReason } from '@appmetrica/react-native-analytics';
 
 // ...
-try {
-  await adapty.updateProfile({
-    appmetricaProfileId: appmetricaProfileId,
-    appmetricaDeviceId: appmetricaDeviceId,
-  });
-} catch (error) {
-  // handle `AdaptyError`
+const startupParamsCallback = async (
+  params?: StartupParams,
+  reason?: StartupParamsReason
+) => {
+  const deviceId = params?.deviceId
+  if (deviceId) {
+    try {
+      await adapty.updateProfile({
+        appmetricaProfileId: 'YOUR_ADAPTY_CUSTOMER_USER_ID',
+        appmetricaDeviceId: deviceId,
+      });
+    } catch (error) {
+      // handle `AdaptyError`
+    }
+  }
 }
+
+AppMetrica.requestStartupParams(startupParamsCallback, [DEVICE_ID_KEY])
 ```
 </TabItem>
 </Tabs>

versioned_docs/version-3.0/paywall-product-block.md

@@ -164,7 +164,7 @@ To add a toggle:
 </Zoom>
 
 2. Add products to both subsections to create views for when the toggle is on or off.
-3. In the **Toggle** element, define whether the toggle should be on or off by default in the paywall by the **Default state** toggle.
+3. In the **Toggle** element, set the **Default state** to choose whether the toggle should start as on or off in the paywall.
 
 <Zoom>
   <img src={require('./img/4127a67-PB_toggle_default_state.webp').default}