fix actionCallback order (#211)

namiml · Jul 12, 2023 · eb0c5f7 · eb0c5f7
1 parent b6f0a87
commit eb0c5f7
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 47 deletions.
diff --git a/examples/Basic/config/index.ts b/examples/Basic/config/index.ts
@@ -11,7 +11,7 @@ export function getConfigObject() {
         'appPlatformID-apple': 'APPLE_STG_APP_PLATFORM_ID',
         'appPlatformID-android': 'ANDROID_STG_APP_PLATFORM_ID',
         logLevel: 'DEBUG',
-        namiCommands: ['useStagingAPI'],
+        namiCommands: ['useStagingAPI', 'useNamiWindow'],
         initialConfig: getInitialConfig(),
       };
     default:

diff --git a/examples/Basic/containers/CampaignScreen.tsx b/examples/Basic/containers/CampaignScreen.tsx
@@ -99,35 +99,35 @@ const CampaignScreen: FC<CampaignScreenProps> = ({navigation}) => {
       },
       (
         action,
-        skuId,
-        purchaseError,
-        purchases,
         campaignId,
-        campaignLabel,
         paywallId,
+        campaignLabel,
         campaignName,
         campaignType,
         campaignUrl,
         segmentId,
         externalSegmentId,
         paywallName,
         deeplinkUrl,
+        skuId,
+        purchaseError,
+        purchases,
       ) => {
         console.log('action', action);
         setAction(action);
-        console.log('skuId', skuId);
-        console.log('purchaseError', purchaseError);
-        console.log('purchases', purchases);
         console.log('campaignId', campaignId);
+        console.log('paywallId', paywallId);
         console.log('campaignLabel', campaignLabel);
         console.log('campaignName', campaignName);
         console.log('campaignType', campaignType);
         console.log('campaignUrl', campaignUrl);
-        console.log('paywallId', paywallId);
         console.log('paywallName', paywallName);
         console.log('segmentId', segmentId);
         console.log('externalSegmentId', externalSegmentId);
         console.log('deeplinkUrl', deeplinkUrl);
+        console.log('skuId', skuId);
+        console.log('purchaseError', purchaseError);
+        console.log('purchases', purchases);
       },
     );
   };

diff --git a/examples/Basic/services/deeplinking.ts b/examples/Basic/services/deeplinking.ts
@@ -20,34 +20,34 @@ export async function handleDeepLink(event) {
       },
       (
         action,
-        skuId,
-        purchaseError,
-        purchases,
         campaignId,
-        campaignLabel,
         paywallId,
+        campaignLabel,
         campaignName,
         campaignType,
         campaignUrl,
         segmentId,
         externalSegmentId,
         paywallName,
         deeplinkUrl,
+        skuId,
+        purchaseError,
+        purchases,
       ) => {
         console.log('action', action);
-        console.log('skuId', skuId);
-        console.log('purchaseError', purchaseError);
-        console.log('purchases', purchases);
         console.log('campaignId', campaignId);
+        console.log('paywallId', paywallId);
         console.log('campaignLabel', campaignLabel);
         console.log('campaignName', campaignName);
         console.log('campaignType', campaignType);
         console.log('campaignUrl', campaignUrl);
-        console.log('paywallId', paywallId);
         console.log('paywallName', paywallName);
         console.log('segmentId', segmentId);
         console.log('externalSegmentId', externalSegmentId);
         console.log('deeplinkUrl', deeplinkUrl);
+        console.log('skuId', skuId);
+        console.log('purchaseError', purchaseError);
+        console.log('purchases', purchases);
       },
     );
   }

diff --git a/examples/TestNamiTV/config/index.ts b/examples/TestNamiTV/config/index.ts
@@ -8,8 +8,8 @@ export function getConfigObject() {
   switch (flavor) {
     case 'staging':
       return {
-        'appPlatformID-apple': 'APPLE_STG_APP_PLATFORM_ID',
-        'appPlatformID-android': 'ANDROID_STG_APP_PLATFORM_ID',
+        'appPlatformID-apple': '4a2f6dbf-e684-4d65-a4df-0488771c577d',
+        'appPlatformID-android': 'b7232eba-ff1d-4b7f-b8d0-55593b66c1d5',
         logLevel: 'DEBUG',
         namiCommands: ['useStagingAPI'],
         initialConfig: getInitialConfig(),

diff --git a/examples/TestNamiTV/containers/CampaignScreen.tsx b/examples/TestNamiTV/containers/CampaignScreen.tsx
@@ -66,33 +66,34 @@ const CampaignScreen: FC<CampaignScreenProps> = ({navigation}) => {
       },
       (
         action,
-        skuId,
-        purchaseError,
-        purchases,
         campaignId,
-        campaignLabel,
         paywallId,
+        campaignLabel,
         campaignName,
         campaignType,
         campaignUrl,
         segmentId,
         externalSegmentId,
         paywallName,
         deeplinkUrl,
+        skuId,
+        purchaseError,
+        purchases,
       ) => {
         console.log('action', action);
-        console.log('skuId', skuId);
-        console.log('purchaseError', purchaseError);
-        console.log('purchases', purchases);
         console.log('campaignId', campaignId);
+        console.log('paywallId', paywallId);
         console.log('campaignLabel', campaignLabel);
         console.log('campaignName', campaignName);
         console.log('campaignType', campaignType);
         console.log('campaignUrl', campaignUrl);
+        console.log('paywallName', paywallName);
         console.log('segmentId', segmentId);
         console.log('externalSegmentId', externalSegmentId);
-        console.log('paywallName', paywallName);
         console.log('deeplinkUrl', deeplinkUrl);
+        console.log('skuId', skuId);
+        console.log('purchaseError', purchaseError);
+        console.log('purchases', purchases);
       },
     );
   };

diff --git a/examples/TestNamiTV/services/deeplinking.ts b/examples/TestNamiTV/services/deeplinking.ts
@@ -20,34 +20,34 @@ export async function handleDeepLink(event) {
       },
       (
         action,
-        skuId,
-        purchaseError,
-        purchases,
         campaignId,
-        campaignLabel,
         paywallId,
+        campaignLabel,
         campaignName,
         campaignType,
         campaignUrl,
         segmentId,
         externalSegmentId,
         paywallName,
         deeplinkUrl,
+        skuId,
+        purchaseError,
+        purchases,
       ) => {
         console.log('action', action);
-        console.log('skuId', skuId);
-        console.log('purchaseError', purchaseError);
-        console.log('purchases', purchases);
         console.log('campaignId', campaignId);
+        console.log('paywallId', paywallId);
         console.log('campaignLabel', campaignLabel);
         console.log('campaignName', campaignName);
         console.log('campaignType', campaignType);
         console.log('campaignUrl', campaignUrl);
-        console.log('paywallId', paywallId);
         console.log('paywallName', paywallName);
         console.log('segmentId', segmentId);
         console.log('externalSegmentId', externalSegmentId);
         console.log('deeplinkUrl', deeplinkUrl);
+        console.log('skuId', skuId);
+        console.log('purchaseError', purchaseError);
+        console.log('purchases', purchases);
       },
     );
   }

diff --git a/src/NamiCampaignManager.d.ts b/src/NamiCampaignManager.d.ts
@@ -11,9 +11,9 @@ export const NamiCampaignManager: {
     context?: PaywallLaunchContext,
     resultCallback?: (success: boolean, error?: LaunchCampaignError) => void,
     actionCallback?: (
+      action: NamiPaywallAction,
       campaignId: string,
       paywallId: string,
-      action: NamiPaywallAction,
       campaignName?: string,
       campaignType?: string,
       campaignLabel?: string,

diff --git a/src/NamiCampaignManager.js b/src/NamiCampaignManager.js
@@ -17,35 +17,35 @@ export const NamiCampaignManager = {
 
         const {
           action,
-          skuId,
-          purchaseError,
-          purchases,
           campaignId,
-          campaignLabel,
           paywallId,
+          campaignLabel,
           campaignName,
           campaignType,
           campaignUrl,
+          paywallName,
           segmentId,
           externalSegmentId,
-          paywallName,
           deeplinkUrl,
+          skuId,
+          purchaseError,
+          purchases
         } = body;
         actionCallback(
           action,
-          skuId,
-          purchaseError,
-          purchases,
           campaignId,
-          campaignLabel,
           paywallId,
+          campaignLabel,
           campaignName,
           campaignType,
           campaignUrl,
+          paywallName,
           segmentId,
           externalSegmentId,
-          paywallName,
-          deeplinkUrl
+          deeplinkUrl,
+          skuId,
+          purchaseError,
+          purchases,
         );
       }
     );