From 00390756c8f173d510ca37e705892e04f181a13a Mon Sep 17 00:00:00 2001 From: dannami Date: Wed, 12 Jul 2023 10:56:16 -0600 Subject: [PATCH] fix actionCallback order --- examples/Basic/config/index.ts | 2 +- examples/Basic/containers/CampaignScreen.tsx | 16 +++++++------- examples/Basic/services/deeplinking.ts | 16 +++++++------- examples/TestNamiTV/config/index.ts | 4 ++-- .../TestNamiTV/containers/CampaignScreen.tsx | 17 +++++++------- examples/TestNamiTV/services/deeplinking.ts | 16 +++++++------- src/NamiCampaignManager.d.ts | 2 +- src/NamiCampaignManager.js | 22 +++++++++---------- 8 files changed, 48 insertions(+), 47 deletions(-) diff --git a/examples/Basic/config/index.ts b/examples/Basic/config/index.ts index f8fe0e93..a92cad35 100644 --- 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 index 6ab36fb6..c2e7d684 100644 --- a/examples/Basic/containers/CampaignScreen.tsx +++ b/examples/Basic/containers/CampaignScreen.tsx @@ -99,12 +99,9 @@ const CampaignScreen: FC = ({navigation}) => { }, ( action, - skuId, - purchaseError, - purchases, campaignId, - campaignLabel, paywallId, + campaignLabel, campaignName, campaignType, campaignUrl, @@ -112,22 +109,25 @@ const CampaignScreen: FC = ({navigation}) => { 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 index 4a3fe44d..5e10904a 100644 --- a/examples/Basic/services/deeplinking.ts +++ b/examples/Basic/services/deeplinking.ts @@ -20,12 +20,9 @@ export async function handleDeepLink(event) { }, ( action, - skuId, - purchaseError, - purchases, campaignId, - campaignLabel, paywallId, + campaignLabel, campaignName, campaignType, campaignUrl, @@ -33,21 +30,24 @@ export async function handleDeepLink(event) { 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 index f8fe0e93..22bd2bb5 100644 --- 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 index c1ca42a1..7340c616 100644 --- a/examples/TestNamiTV/containers/CampaignScreen.tsx +++ b/examples/TestNamiTV/containers/CampaignScreen.tsx @@ -66,12 +66,9 @@ const CampaignScreen: FC = ({navigation}) => { }, ( action, - skuId, - purchaseError, - purchases, campaignId, - campaignLabel, paywallId, + campaignLabel, campaignName, campaignType, campaignUrl, @@ -79,20 +76,24 @@ const CampaignScreen: FC = ({navigation}) => { 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 index 4a3fe44d..5e10904a 100644 --- a/examples/TestNamiTV/services/deeplinking.ts +++ b/examples/TestNamiTV/services/deeplinking.ts @@ -20,12 +20,9 @@ export async function handleDeepLink(event) { }, ( action, - skuId, - purchaseError, - purchases, campaignId, - campaignLabel, paywallId, + campaignLabel, campaignName, campaignType, campaignUrl, @@ -33,21 +30,24 @@ export async function handleDeepLink(event) { 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 index 04e026d6..ea2deff6 100644 --- 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 index 382b8239..1a36aa05 100644 --- 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, ); } );