@jolibox/implement 1.1.53-beta.0 → 1.1.54

package/dist/native/payment/payment-helper.d.ts

@@ -1,4 +1,4 @@
-export type PaymentType = 'JOLI_COIN' | 'JOLI_COIN_IAP' | 'JOLI_GEM_IAP';
+export type PaymentType = 'JOLI_COIN' | 'JOLI_COIN_IAP';
 import { StandardResponse } from '@jolibox/types';
 type PaymentResult = StandardResponse<void>;
 export interface PaymentHandlerMap {
@@ -7,10 +7,6 @@ export interface PaymentHandlerMap {
         productId: string;
         appStoreProductId: string;
     }) => Promise<PaymentResult>;
-    JOLI_GEM_IAP: (params: {
-        productId: string;
-        appStoreProductId: string;
-    }) => Promise<PaymentResult>;
 }
 export type PaymentHandler<T extends PaymentType> = PaymentHandlerMap[T];
 export declare function createPaymentHelper(): {

package/dist/native/rewards/check-frequency.d.ts

@@ -19,30 +19,6 @@ export declare const checkUnloginModalFrequency: (config: {
     canShow: boolean;
     isFirst: boolean;
 }>;
-export declare const checkUseModalFrequencyGem: (config: {
-    dailyMaxPopUps?: number;
-    minInterval?: number;
-}) => Promise<{
-    canShow: boolean;
-    isFirst: boolean;
-}>;
-export declare const checkPaymentFrequencyGem: (config: {
-    dailyMaxPopUps?: number;
-    minInterval?: number;
-}) => Promise<{
-    canShow: boolean;
-    isFirst: boolean;
-}>;
-export declare const checkUnloginModalFrequencyGem: (config: {
-    dailyMaxPopUps?: number;
-    minInterval?: number;
-}) => Promise<{
-    canShow: boolean;
-    isFirst: boolean;
-}>;
 export declare const updateUseModalFrequency: () => Promise<void>;
 export declare const updatePaymentFrequency: () => Promise<void>;
 export declare const updateUnloginModalFrequency: () => Promise<void>;
-export declare const updateUseModalFrequencyGem: () => Promise<void>;
-export declare const updatePaymentFrequencyGem: () => Promise<void>;
-export declare const updateUnloginModalFrequencyGem: () => Promise<void>;

package/implement.build.log

@@ -1,9 +1,9 @@
 Invoking: npm run clean && npm run build:esm && tsc 
 
-> @jolibox/implement@1.1.53-beta.0 clean
+> @jolibox/implement@1.1.54 clean
 > rimraf ./dist
 
 
-> @jolibox/implement@1.1.53-beta.0 build:esm
+> @jolibox/implement@1.1.54 build:esm
 > BUILD_VERSION=$(node -p "require('./package.json').version")  node esbuild.config.js --format=esm
 

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@jolibox/implement",
   "description": "This project is Jolibox JS-SDk implement for Native && H5",
-  "version": "1.1.53-beta.0",
+  "version": "1.1.54",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
-    "@jolibox/common": "1.1.53-beta.0",
-    "@jolibox/types": "1.1.53-beta.0",
-    "@jolibox/native-bridge": "1.1.53-beta.0",
-    "@jolibox/ads": "1.1.53-beta.0",
+    "@jolibox/common": "1.1.54",
+    "@jolibox/types": "1.1.54",
+    "@jolibox/native-bridge": "1.1.54",
+    "@jolibox/ads": "1.1.54",
     "localforage": "1.10.0",
     "@jolibox/ui": "1.0.0",
     "web-vitals": "4.2.4"
@@ -19,7 +19,7 @@
     "@types/jest": "28.1.1",
     "rimraf": "6.0.1",
     "esbuild": "0.24.2",
-    "@jolibox/eslint-config": "1.0.1-beta.8"
+    "@jolibox/eslint-config": "1.0.0"
   },
   "scripts": {
     "clean": "rimraf ./dist",

package/src/common/context/index.ts

@@ -1,4 +1,4 @@
-import { getAdvertisingId, mergeArray, mergeWith } from '@jolibox/common';
+import { getAdvertisingId, mergeArray, mergeWith, getApiDomain } from '@jolibox/common';
 import { DeviceInfo, HostInfo, HostUserInfo, SdkInfo } from './types';
 import { Env } from '@jolibox/types';
 import { parseUrlQuery, encodeJoliSourceQuery, QueryParams } from './url-parse';
@@ -130,7 +130,7 @@ const wrapContext = () => {
       return payloadJson?.__from;
     },
     get baseApiHost(): string {
-      return testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
+      return getApiDomain(testMode);
     },
     get adId(): string {
       return env.deviceInfo.adId ?? env.deviceInfo.did;

package/src/common/report/base-tracker.ts

@@ -1,5 +1,5 @@
 import { context } from '@/common/context';
-import { logger } from '@jolibox/common';
+import { logger, getApiHost } from '@jolibox/common';
 import { IDevice, IPage, IEventPackage, IEvent, EProject, serializeEventPackage } from '@jolibox/common';
 
 interface ISamplesConfig {
@@ -27,7 +27,7 @@ export abstract class EventTracker {
   }
 
   private async fetchSamplesConfig() {
-    const host = context.testMode ? 'https://stg-api.jolibox.com' : 'https://api.jolibox.com';
+    const host = getApiHost(context.testMode);
     const path = `${host}/api/fe-configs/js-sdk/samples-config`;
     const samplesConfig = (await (await fetch(path)).json()) as ISamplesConfig;
     this.samplesConfig = samplesConfig;

package/src/common/rewards/__tests__/can-use-jolicoin.test.ts

@@ -1,13 +1,12 @@
-import { IUnlockOptionType, IGem } from '../type';
-import { canUseJolicoin, joliCoinIsEnough, canUseGem, gemIsEnough } from '../registers/utils';
+import { IUnlockOptionType } from '../type';
+import { canUseJolicoin } from '../registers/utils';
 
 describe('canUseJolicoin', () => {
   it('should return true when joliCoin balance is sufficient and autoDeduct is enabled', () => {
     const unlockOptions = [
       {
         type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 100 }],
-        joliGemChoices: null
+        joliCoinChoices: [{ joliCoinQuantity: 100 }]
       }
     ];
     const joliCoin = { balance: 100, enableAutoDeduct: true };
@@ -19,8 +18,7 @@ describe('canUseJolicoin', () => {
     const unlockOptions = [
       {
         type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 50 }],
-        joliGemChoices: null
+        joliCoinChoices: [{ joliCoinQuantity: 50 }]
       }
     ];
     const joliCoin = { balance: 100, enableAutoDeduct: true };
@@ -32,8 +30,7 @@ describe('canUseJolicoin', () => {
     const unlockOptions = [
       {
         type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 150 }],
-        joliGemChoices: null
+        joliCoinChoices: [{ joliCoinQuantity: 150 }]
       }
     ];
     const joliCoin = { balance: 100, enableAutoDeduct: true };
@@ -45,8 +42,7 @@ describe('canUseJolicoin', () => {
     const unlockOptions = [
       {
         type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 50 }],
-        joliGemChoices: null
+        joliCoinChoices: [{ joliCoinQuantity: 50 }]
       }
     ];
     const joliCoin = { balance: 100, enableAutoDeduct: false };
@@ -58,8 +54,7 @@ describe('canUseJolicoin', () => {
     const unlockOptions = [
       {
         type: 'ADS' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: null
+        joliCoinChoices: []
       }
     ];
     const joliCoin = { balance: 100, enableAutoDeduct: true };
@@ -78,8 +73,7 @@ describe('canUseJolicoin', () => {
     const unlockOptions = [
       {
         type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 50 }],
-        joliGemChoices: null
+        joliCoinChoices: [{ joliCoinQuantity: 50 }]
       }
     ];
 
@@ -90,8 +84,7 @@ describe('canUseJolicoin', () => {
     const unlockOptions = [
       {
         type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 200 }, { joliCoinQuantity: 50 }],
-        joliGemChoices: null
+        joliCoinChoices: [{ joliCoinQuantity: 200 }, { joliCoinQuantity: 50 }]
       }
     ];
     const joliCoin = { balance: 100, enableAutoDeduct: true };
@@ -99,252 +92,3 @@ describe('canUseJolicoin', () => {
     expect(canUseJolicoin(unlockOptions, joliCoin)).toBe(true);
   });
 });
-
-describe('joliCoinIsEnough', () => {
-  it('should return true when joliCoin balance is sufficient', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 100 }],
-        joliGemChoices: null
-      }
-    ];
-    const joliCoin = { balance: 100, enableAutoDeduct: false }; // autoDeduct disabled but should still return true
-
-    expect(joliCoinIsEnough(unlockOptions, joliCoin)).toBe(true);
-  });
-
-  it('should return false when joliCoin balance is insufficient', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 150 }],
-        joliGemChoices: null
-      }
-    ];
-    const joliCoin = { balance: 100, enableAutoDeduct: true };
-
-    expect(joliCoinIsEnough(unlockOptions, joliCoin)).toBe(false);
-  });
-
-  it('should return false when there is no JOLI_COIN option', () => {
-    const unlockOptions = [
-      {
-        type: 'ADS' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: null
-      }
-    ];
-    const joliCoin = { balance: 100, enableAutoDeduct: true };
-
-    expect(joliCoinIsEnough(unlockOptions, joliCoin)).toBe(false);
-  });
-});
-
-describe('canUseGem', () => {
-  it('should return true when gem balance is sufficient and autoDeduct is enabled', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 50 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(true);
-  });
-
-  it('should return true when gem balance is more than required', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 25 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(true);
-  });
-
-  it('should return false when gem balance is insufficient', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 75 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(false);
-  });
-
-  it('should return false when autoDeduct is disabled', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 25 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: false };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(false);
-  });
-
-  it('should return false when there is no JOLI_GEM option', () => {
-    const unlockOptions = [
-      {
-        type: 'ADS' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: null
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(false);
-  });
-
-  it('should return false with empty unlockOptions', () => {
-    const unlockOptions: any[] = [];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(false);
-  });
-
-  it('should return false when gem is undefined', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 25 }
-      }
-    ];
-
-    expect(canUseGem(unlockOptions, undefined)).toBe(false);
-  });
-
-  it('should return true when at least one gem choice is valid', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 25 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(true);
-  });
-});
-
-describe('gemIsEnough', () => {
-  it('should return true when gem balance is sufficient', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 50 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: false }; // autoDeduct disabled but should still return true
-
-    expect(gemIsEnough(unlockOptions, gem)).toBe(true);
-  });
-
-  it('should return false when gem balance is insufficient', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 75 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(gemIsEnough(unlockOptions, gem)).toBe(false);
-  });
-
-  it('should return false when there is no JOLI_GEM option', () => {
-    const unlockOptions = [
-      {
-        type: 'ADS' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: null
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(gemIsEnough(unlockOptions, gem)).toBe(false);
-  });
-
-  it('should return true when at least one gem choice has sufficient balance', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 24 }
-      }
-    ];
-    const gem = { balance: 50, enableAutoDeduct: false };
-
-    expect(gemIsEnough(unlockOptions, gem)).toBe(true);
-  });
-});
-
-describe('Mixed currency options', () => {
-  it('should work correctly with both JOLI_COIN and JOLI_GEM options', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 100 }],
-        joliGemChoices: null
-      },
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 50 }
-      }
-    ];
-
-    const joliCoin = { balance: 100, enableAutoDeduct: true };
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseJolicoin(unlockOptions, joliCoin)).toBe(true);
-    expect(canUseGem(unlockOptions, gem)).toBe(true);
-    expect(joliCoinIsEnough(unlockOptions, joliCoin)).toBe(true);
-    expect(gemIsEnough(unlockOptions, gem)).toBe(true);
-  });
-
-  it('should return false for coin when only gem options available', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_GEM' as IUnlockOptionType,
-        joliCoinChoices: [],
-        joliGemChoices: { joliGemQuantity: 50 }
-      }
-    ];
-
-    const joliCoin = { balance: 100, enableAutoDeduct: true };
-
-    expect(canUseJolicoin(unlockOptions, joliCoin)).toBe(false);
-    expect(joliCoinIsEnough(unlockOptions, joliCoin)).toBe(false);
-  });
-
-  it('should return false for gem when only coin options available', () => {
-    const unlockOptions = [
-      {
-        type: 'JOLI_COIN' as IUnlockOptionType,
-        joliCoinChoices: [{ joliCoinQuantity: 100 }],
-        joliGemChoices: null
-      }
-    ];
-
-    const gem = { balance: 50, enableAutoDeduct: true };
-
-    expect(canUseGem(unlockOptions, gem)).toBe(false);
-    expect(gemIsEnough(unlockOptions, gem)).toBe(false);
-  });
-});

package/src/common/rewards/fetch-reward.ts

@@ -14,24 +14,15 @@ import { hostEmitter } from '@jolibox/common';
 
 const priority = () => {
   return (a: RewardType, b: RewardType) => {
-    // Priority order: GEM > JOLI_COIN > ADS
-    const priorityMap: Record<RewardType, number> = {
-      JOLI_GEM: 3,
-      JOLI_GEM_ONLY: 3,
-      JOLI_COIN: 2,
-      JOLI_COIN_ONLY: 2,
-      ADS: 1
-    };
-
-    return priorityMap[b] - priorityMap[a];
+    if (a === 'JOLI_COIN' && b === 'ADS') return -1;
+    if (a === 'ADS' && b === 'JOLI_COIN') return 1;
+    return 0;
   };
 };
 
 const sortRewards = (rewardsTypes: RewardType[]): RewardType[] => {
   if (!rewardsTypes.length) return ['ADS'];
-  if (rewardsTypes.includes('JOLI_GEM') && rewardsTypes.length <= 1) return ['JOLI_GEM_ONLY'];
   if (rewardsTypes.includes('JOLI_COIN') && rewardsTypes.length <= 1) return ['JOLI_COIN_ONLY'];
-
   return rewardsTypes.sort(priority());
 };
 
@@ -43,17 +34,11 @@ export const createRewardFetcher = (rewardsHelper: RewardsHelper) => {
       if (res.code !== 'SUCCESS') {
         return defaultRewards;
       }
-
-      console.log('-----res fetch reward-----', res);
       rewardsEmitter.emit(UnlockOptionsEventName, {
         options: res.data?.unlockOptions || [],
         userJoliCoin: res.extra?.joliCoin || {
           balance: 0,
           enableAutoDeduct: false
-        },
-        userGem: res.extra?.joliGem || {
-          balance: 0,
-          enableAutoDeduct: false
         }
       });
 

package/src/common/rewards/index.ts

@@ -8,5 +8,3 @@ createRewardFrequencyConfigFetcher(rewardsHelper);
 export * from './registers/use-ads';
 export * from './registers/use-jolicoin';
 export * from './registers/use-jolicoin-only';
-export * from './registers/use-gem';
-export * from './registers/use-gem-only';

package/src/common/rewards/registers/use-jolicoin-only.ts

@@ -1,9 +1,9 @@
 import { IHttpClient } from '@/common/http';
 import { IAdBreakParams } from '@/common/ads';
-import { createCommonJolicoinRewardHandler } from './utils/coins/jolicoin/jolicoin-handler';
+import { createCommonJolicoinRewardHandler } from './utils/coins';
 import { unlockOptionsHandler } from './utils/common';
 import {
-  createShowUnlockWithCurrencyModal,
+  createShowUnlockWithJolicoinModal,
   createInitiateAndAwaitPayment,
   createShowUnloginModal
 } from './utils/coins/commands';
@@ -28,7 +28,7 @@ export const createJolicoinOnlyRewardHandler = (
     });
   })();
 
-  const showUnlockWithJolicoinModal = createShowUnlockWithCurrencyModal('JOLI_COIN', {
+  const showUnlockWithJolicoinModal = createShowUnlockWithJolicoinModal('JOLI_COIN', {
     confirmButtonText: 'jolicoin.useJolicoin',
     cancelButtonText: 'jolicoin.noThanks'
   });
@@ -49,7 +49,7 @@ export const createJolicoinOnlyRewardHandler = (
       handleUnlockFailed,
       unlockOptionsHandler,
       initiateAndAwaitPayment,
-      showUnlockWithCurrencyModal: showUnlockWithJolicoinModal,
+      showUnlockWithJolicoinModal,
       showUnloginModal
     }
   });

package/src/common/rewards/registers/use-jolicoin.ts

@@ -1,9 +1,9 @@
 import { IHttpClient } from '@/common/http';
 import { IAdBreakParams } from '@/common/ads';
 import { unlockOptionsHandler } from './utils/common';
-import { createCommonJolicoinRewardHandler } from './utils/coins/jolicoin/jolicoin-handler';
+import { createCommonJolicoinRewardHandler } from './utils/coins';
 import {
-  createShowUnlockWithCurrencyModal,
+  createShowUnlockWithJolicoinModal,
   createInitiateAndAwaitPayment,
   createShowUnloginModal
 } from './utils/coins/commands';
@@ -23,7 +23,7 @@ export const createJolicoinRewardHandler = (
     onUnlockFailed?.();
   };
 
-  const showUnlockWithJolicoinModal = createShowUnlockWithCurrencyModal('ADS-JOLI_COIN', {
+  const showUnlockWithJolicoinModal = createShowUnlockWithJolicoinModal('ADS-JOLI_COIN', {
     confirmButtonText: 'jolicoin.useJolicoin',
     cancelButtonText: 'jolicoin.noWatchAds'
   });
@@ -44,7 +44,7 @@ export const createJolicoinRewardHandler = (
       handleUnlockFailed,
       unlockOptionsHandler,
       initiateAndAwaitPayment,
-      showUnlockWithCurrencyModal: showUnlockWithJolicoinModal,
+      showUnlockWithJolicoinModal,
       showUnloginModal
     }
   });

package/src/common/rewards/registers/utils/coins/commands/index.ts

@@ -1,3 +1,3 @@
-export { registerUseJolicoinCommand, createShowUnlockWithCurrencyModal } from './use-jolicoin';
+export { registerUseJolicoinCommand, createShowUnlockWithJolicoinModal } from './use-jolicoin';
 export { registerUsePaymentCommand, createInitiateAndAwaitPayment } from './use-payment';
 export { registerUseUnloginCommand, createShowUnloginModal } from './use-unlogin';

package/src/common/rewards/registers/utils/coins/commands/use-jolicoin.ts

@@ -1,39 +1,33 @@
-import { IGem, IJoliCoin } from '@/common/rewards/type';
+import { IJoliCoin } from '@/common/rewards/type';
 import { rewardsCommands } from '../rewards-command';
 import { unlockOptionsHandler } from '@/common/rewards/registers/utils/common';
 import { createEventPromiseHandler } from '../../event-listener';
 import { IUseModalResultEvent, UseModalResultEventName } from '@/common/rewards/reward-emitter';
 import { rewardsEmitter, UseModalEventName } from '@/common/rewards/reward-emitter';
-import { CURRENCY_HANDLERS } from './currency-handlers';
 
-export const registerUseJolicoinCommand = <T extends IJoliCoin | IGem>(
-  prefix: 'JOLI_COIN' | 'ADS-JOLI_COIN' | 'JOLI_GEM' | 'ADS-JOLI_GEM',
-  currency: 'JOLI_COIN' | 'JOLI_GEM',
+export const registerUseJolicoinCommand = (
+  prefix: 'JOLI_COIN' | 'ADS-JOLI_COIN',
   params: {
-    showUnlockWithCurrencyModal: (params: {
+    showUnlockWithJolicoinModal: (params: {
       enableAutoDeduct: boolean;
-      userCurrency: T;
-      quantity: number;
-      currency: T extends IJoliCoin ? 'JOLI_COIN' : 'JOLI_GEM';
+      userJoliCoin: IJoliCoin;
+      joliCoinQuantity: number;
     }) => Promise<'CONFIRM' | 'CANCEL' | 'FAILED'>;
   }
 ) => {
-  const { showUnlockWithCurrencyModal } = params;
+  const { showUnlockWithJolicoinModal } = params;
   rewardsCommands.registerCommand(`Rewards.${prefix}.useJolicoin`, async () => {
     const unlockOptions = await unlockOptionsHandler.getData();
-
-    // Use currency handler for unified logic
-    const handler = CURRENCY_HANDLERS['JOLI_COIN'];
-    const currentUser = handler.getCurrentUser(unlockOptions) as IJoliCoin;
-    const joliCoinQuantity = handler.getQuantity(unlockOptions);
-    const enableAutoDeduct = !!currentUser?.enableAutoDeduct;
+    const enableAutoDeduct = !!unlockOptions?.userJoliCoin?.enableAutoDeduct;
+    const joliCoinQuantity =
+      unlockOptions?.options?.find((option) => option.type === 'JOLI_COIN')?.joliCoinChoices[0]
+        .joliCoinQuantity ?? 0;
 
     console.log('-----unlockOptions usemodal-----', unlockOptions, enableAutoDeduct, joliCoinQuantity);
-    const shouldUnlock = await showUnlockWithCurrencyModal({
+    const shouldUnlock = await showUnlockWithJolicoinModal({
       enableAutoDeduct,
-      userCurrency: currentUser as T,
-      quantity: joliCoinQuantity,
-      currency: currency as T extends IJoliCoin ? 'JOLI_COIN' : 'JOLI_GEM'
+      userJoliCoin: unlockOptions?.userJoliCoin,
+      joliCoinQuantity
     });
 
     if (shouldUnlock !== 'CONFIRM') {
@@ -48,28 +42,22 @@ export const registerUseJolicoinCommand = <T extends IJoliCoin | IGem>(
 };
 
 // EVENTS
-export const createShowUnlockWithCurrencyModal = <T extends IJoliCoin | IGem>(
-  type: 'JOLI_COIN' | 'ADS-JOLI_COIN' | 'JOLI_GEM' | 'ADS-JOLI_GEM',
+export const createShowUnlockWithJolicoinModal = (
+  type: 'JOLI_COIN' | 'ADS-JOLI_COIN',
   buttons: {
     confirmButtonText: string;
     cancelButtonText: string;
   }
 ) => {
-  return async (params: {
-    enableAutoDeduct: boolean;
-    userCurrency: T;
-    quantity: number;
-    currency: T extends IJoliCoin ? 'JOLI_COIN' : 'JOLI_GEM';
-  }) => {
+  return async (params: { enableAutoDeduct: boolean; userJoliCoin: IJoliCoin; joliCoinQuantity: number }) => {
     const modalHandler = createEventPromiseHandler<IUseModalResultEvent, typeof UseModalResultEventName>(
       rewardsEmitter,
       UseModalResultEventName
     );
     rewardsEmitter.emit(UseModalEventName, type, {
       enableAutoDeduct: params.enableAutoDeduct,
-      userCurrency: params.userCurrency as T,
-      quantity: params.quantity,
-      currency: params.currency,
+      userJoliCoin: params.userJoliCoin,
+      joliCoinQuantity: params.joliCoinQuantity,
       confirmButtonText: buttons.confirmButtonText,
       cancelButtonText: buttons.cancelButtonText
     });