shufflecom-calculations 1.12.18 → 1.12.21

package/src/utils/derive-vip-bonus.spec.ts

@@ -18,7 +18,7 @@ describe('VipBonusUtils', () => {
     const expiryPerOccurrence = 5 * 60;
     const firstOccurrenceActivationPeriod = 5;
     const occurrence = 4;
-    const bonusClaims: VipBonusIssuanceModel[] = []
+    const bonusClaims: VipBonusIssuanceModel[] = [];
 
     const vipBonus: VipBonusPartial = {
       type: VipBonusType.RELOADED,
@@ -28,56 +28,63 @@ describe('VipBonusUtils', () => {
       occurrence,
       cancelledAt: null,
       createdAt: startDate.toISOString(),
-      endAt: startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence * occurrence, 'seconds').toISOString(),
+      endAt: startDate
+        .add(firstOccurrenceActivationPeriod, 'hours')
+        .add(expiryPerOccurrence * occurrence, 'seconds')
+        .toISOString(),
       bonusClaims,
       firstOccurrenceActivationPeriod,
       expiryPerOccurrence,
-    }
+    };
 
-    let timeNow = startDate
+    let timeNow = startDate;
     mockdatetime(timeNow.toDate());
 
-    let issuances = deriveBonusIssuances(vipBonus)
+    let issuances = deriveBonusIssuances(vipBonus);
 
-    let firstIssuance = issuances[0]
-    expect(firstIssuance.expiryDate).toEqual(startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString())
-    expect(firstIssuance.availableDate).toEqual(startDate.toISOString())
-    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM)
-
-    let secondIssuance = issuances[1]
-    expect(secondIssuance.expiryDate).toBeUndefined()
-    expect(secondIssuance.availableDate).toBeUndefined()
-    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED)
+    let firstIssuance = issuances[0];
+    expect(firstIssuance.expiryDate).toEqual(
+      startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString(),
+    );
+    expect(firstIssuance.availableDate).toEqual(startDate.toISOString());
+    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM);
 
+    let secondIssuance = issuances[1];
+    expect(secondIssuance.expiryDate).toBeUndefined();
+    expect(secondIssuance.availableDate).toBeUndefined();
+    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
 
     // first claim before the activation period ends
-    timeNow = startDate.add(firstOccurrenceActivationPeriod / 2, 'hours')
-    mockdatetime(timeNow.toDate())
+    timeNow = startDate.add(firstOccurrenceActivationPeriod / 2, 'hours');
+    mockdatetime(timeNow.toDate());
 
     bonusClaims.push({
       currency: Currency.BTC,
+      amount: '10',
       bonusAmountUsd: BigNumber(bonusAmountUsd).dividedBy(occurrence).toString(),
       occurrenceIndex: 1,
       createdAt: timeNow.toISOString(),
-    })
-
-    vipBonus.bonusClaims = bonusClaims
+    });
 
-    issuances = deriveBonusIssuances(vipBonus)
+    vipBonus.bonusClaims = bonusClaims;
 
-    firstIssuance = issuances[0]
-    expect(firstIssuance.expiryDate).toEqual(startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString())
-    expect(firstIssuance.availableDate).toEqual(startDate.toISOString())
-    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.CLAIMED)
+    issuances = deriveBonusIssuances(vipBonus);
 
-    secondIssuance = issuances[1]
-    expect(secondIssuance.expiryDate).toEqual(timeNow.add(cadence + expiryPerOccurrence, 'seconds').toISOString())
-    expect(secondIssuance.availableDate).toEqual(timeNow.add(cadence, 'seconds').toISOString())
-    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED)
-    expect(secondIssuance.currency).toEqual(Currency.BTC)
+    firstIssuance = issuances[0];
+    expect(firstIssuance.expiryDate).toEqual(
+      startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString(),
+    );
+    expect(firstIssuance.availableDate).toEqual(startDate.toISOString());
+    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.CLAIMED);
+    expect(firstIssuance.amount).toEqual('10');
 
-    
-  })
+    secondIssuance = issuances[1];
+    expect(secondIssuance.expiryDate).toEqual(timeNow.add(cadence + expiryPerOccurrence, 'seconds').toISOString());
+    expect(secondIssuance.availableDate).toEqual(timeNow.add(cadence, 'seconds').toISOString());
+    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
+    expect(secondIssuance.currency).toEqual(Currency.BTC);
+    expect(secondIssuance.amount).toEqual(undefined);
+  });
 
   it('should derive bonus issuance status correctly (first claim after activation period)', () => {
     const bonusAmountUsd = '100';
@@ -86,7 +93,7 @@ describe('VipBonusUtils', () => {
     const expiryPerOccurrence = 20 * 60;
     const firstOccurrenceActivationPeriod = 5;
     const occurrence = 4;
-    const bonusClaims: VipBonusIssuanceModel[] = []
+    const bonusClaims: VipBonusIssuanceModel[] = [];
 
     const vipBonus: VipBonusPartial = {
       type: VipBonusType.RELOADED,
@@ -96,54 +103,85 @@ describe('VipBonusUtils', () => {
       occurrence,
       cancelledAt: null,
       createdAt: startDate.toISOString(),
-      endAt: startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence * occurrence, 'seconds').toISOString(),
+      endAt: startDate
+        .add(firstOccurrenceActivationPeriod, 'hours')
+        .add(expiryPerOccurrence * occurrence, 'seconds')
+        .toISOString(),
       bonusClaims,
       firstOccurrenceActivationPeriod,
       expiryPerOccurrence,
-    }
+    };
 
-    let timeNow = startDate
+    let timeNow = startDate;
     mockdatetime(timeNow.toDate());
 
-    let issuances = deriveBonusIssuances(vipBonus)
+    let issuances = deriveBonusIssuances(vipBonus);
 
-    let firstIssuance = issuances[0]
-    expect(firstIssuance.expiryDate).toEqual(startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString())
-    expect(firstIssuance.availableDate).toEqual(startDate.toISOString())
-    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM)
-
-    let secondIssuance = issuances[1]
-    expect(secondIssuance.expiryDate).toBeUndefined()
-    expect(secondIssuance.availableDate).toBeUndefined()
-    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED)
+    let firstIssuance = issuances[0];
+    expect(firstIssuance.expiryDate).toEqual(
+      startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString(),
+    );
+    expect(firstIssuance.availableDate).toEqual(startDate.toISOString());
+    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM);
 
+    let secondIssuance = issuances[1];
+    expect(secondIssuance.expiryDate).toBeUndefined();
+    expect(secondIssuance.availableDate).toBeUndefined();
+    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
 
     // first claim after the activation period ends
-    timeNow = startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence / 2, 'seconds')
-    const activationTime = startDate.add(firstOccurrenceActivationPeriod, 'hours')
-    mockdatetime(timeNow.toDate())
+    timeNow = startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence / 2, 'seconds');
+    const activationTime = startDate.add(firstOccurrenceActivationPeriod, 'hours');
+    mockdatetime(timeNow.toDate());
 
     bonusClaims.push({
       currency: Currency.BTC,
+      amount: '10',
       bonusAmountUsd: BigNumber(bonusAmountUsd).dividedBy(occurrence).toString(),
       occurrenceIndex: 1,
       createdAt: timeNow.toISOString(),
-    })
-
-    vipBonus.bonusClaims = bonusClaims
-
-    issuances = deriveBonusIssuances(vipBonus)
-    firstIssuance = issuances[0]
-    expect(firstIssuance.expiryDate).toEqual(startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString())
-    expect(firstIssuance.availableDate).toEqual(startDate.toISOString())
-    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.CLAIMED)
+    });
 
-    secondIssuance = issuances[1]
-    expect(secondIssuance.expiryDate).toEqual(activationTime.add(cadence + expiryPerOccurrence, 'seconds').toISOString())
-    expect(secondIssuance.availableDate).toEqual(activationTime.add(cadence, 'seconds').toISOString())
-    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM)
-    expect(secondIssuance.currency).toEqual(Currency.BTC)
-  })
+    vipBonus.bonusClaims = bonusClaims;
+
+    issuances = deriveBonusIssuances(vipBonus);
+    firstIssuance = issuances[0];
+    expect(firstIssuance.expiryDate).toEqual(
+      startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'seconds').toISOString(),
+    );
+    expect(firstIssuance.availableDate).toEqual(startDate.toISOString());
+    expect(firstIssuance.status).toEqual(VipBonusIssuanceStatus.CLAIMED);
+    expect(firstIssuance.amount).toEqual('10');
+
+    secondIssuance = issuances[1];
+    expect(secondIssuance.expiryDate).toEqual(activationTime.add(cadence + expiryPerOccurrence, 'seconds').toISOString());
+    expect(secondIssuance.availableDate).toEqual(activationTime.add(cadence, 'seconds').toISOString());
+    expect(secondIssuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM);
+    expect(secondIssuance.currency).toEqual(Currency.BTC);
+    expect(secondIssuance.amount).toEqual(undefined);
+
+    timeNow = startDate.add(firstOccurrenceActivationPeriod, 'hours').add(cadence + 1, 'seconds');
+    mockdatetime(timeNow.toDate());
+    const bonusClaimNotInOrder = [
+      {
+        currency: Currency.BTC,
+        bonusAmountUsd: BigNumber(bonusAmountUsd).dividedBy(occurrence).toString(),
+        occurrenceIndex: 2,
+        createdAt: timeNow.toISOString(),
+      },
+      bonusClaims[0],
+    ];
+
+    vipBonus.bonusClaims = bonusClaimNotInOrder;
+    issuances = deriveBonusIssuances(vipBonus);
+    firstIssuance = issuances[0];
+    expect(firstIssuance.createdAt).toEqual(
+      startDate
+        .add(firstOccurrenceActivationPeriod, 'hours')
+        .add(expiryPerOccurrence / 2, 'seconds')
+        .toISOString(),
+    );
+  });
 
   it('should update bonus issuance status correctly sequential vip reload', () => {
     const vipBonusId = uuidv4();
@@ -156,15 +194,22 @@ describe('VipBonusUtils', () => {
     const firstOccurrenceActivationPeriod = 0;
     const occurrence = 10;
     const claimed = [2, 3];
-    const activationTime = dayjs(startDate)
+    const activationTime = dayjs(startDate);
 
-    const issuances = range(1, occurrence + 1).map((occurrenceIndex) => ({
+    const issuances = range(1, occurrence + 1).map(occurrenceIndex => ({
       vipBonusId,
       userId,
       currency,
       bonusAmountUsd,
       occurrenceIndex,
-      expiryDate: getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, occurrenceIndex, startDate, firstOccurrenceActivationPeriod)?.toISOString(),
+      expiryDate: getReloadExpiryDate(
+        activationTime,
+        cadence,
+        expiryPerOccurrence,
+        occurrenceIndex,
+        startDate,
+        firstOccurrenceActivationPeriod,
+      )?.toISOString(),
       availableDate: getReloadAvailableDate(activationTime, cadence, occurrenceIndex, startDate)?.toISOString(),
       status: claimed.includes(occurrenceIndex) ? VipBonusIssuanceStatus.CLAIMED : null,
       createdAt: startDate.toISOString(),
@@ -175,7 +220,7 @@ describe('VipBonusUtils', () => {
 
     // fast forward into reward 3 claiming interval
     mockdatetime(startDate.add(cadence * fastForward + 1, 'seconds').toDate());
-    let updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    let updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
@@ -190,7 +235,7 @@ describe('VipBonusUtils', () => {
     // fast forward into reward 6 claiming interval
     fastForward = 5;
     mockdatetime(startDate.add(cadence * fastForward, 'seconds').toDate());
-    updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
@@ -216,27 +261,41 @@ describe('VipBonusUtils', () => {
     const firstOccurrenceActivationPeriod = 10;
     const occurrence = 10;
     let activationTime: Dayjs | null = null; // first one not claimed yet
-    
-    let issuances = range(1, occurrence + 1).map((occurrenceIndex) => ({
+
+    let issuances = range(1, occurrence + 1).map(occurrenceIndex => ({
       vipBonusId,
       userId,
       currency,
       bonusAmountUsd,
       occurrenceIndex,
-      expiryDate: getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, occurrenceIndex, startDate, firstOccurrenceActivationPeriod)?.toISOString(),
+      expiryDate: getReloadExpiryDate(
+        activationTime,
+        cadence,
+        expiryPerOccurrence,
+        occurrenceIndex,
+        startDate,
+        firstOccurrenceActivationPeriod,
+      )?.toISOString(),
       availableDate: getReloadAvailableDate(activationTime, cadence, occurrenceIndex, startDate)?.toISOString(),
       status: null as VipBonusIssuanceStatus | null,
       createdAt: startDate.toISOString(),
       expiryPerOccurrence,
       firstOccurrenceActivationPeriod,
-    }))
+    }));
 
     // fast forward within first occurrence activation period
     mockdatetime(startDate.add(firstOccurrenceActivationPeriod / 2, 'hours').toDate());
     // first issuance has to recalculate based on current time
-    issuances[0].expiryDate = getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, 1, startDate, firstOccurrenceActivationPeriod)?.toISOString()
+    issuances[0].expiryDate = getReloadExpiryDate(
+      activationTime,
+      cadence,
+      expiryPerOccurrence,
+      1,
+      startDate,
+      firstOccurrenceActivationPeriod,
+    )?.toISOString();
 
-    let updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    let updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (index + 1 === 1) {
@@ -244,39 +303,63 @@ describe('VipBonusUtils', () => {
       } else {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
       }
-    })
+    });
 
     // fast forward after first occurrence activation period
-    mockdatetime(startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence / 2, 'seconds').toDate());
-    issuances[0].expiryDate = getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, 1, startDate, firstOccurrenceActivationPeriod)?.toISOString()
-    updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    mockdatetime(
+      startDate
+        .add(firstOccurrenceActivationPeriod, 'hours')
+        .add(expiryPerOccurrence / 2, 'seconds')
+        .toDate(),
+    );
+    issuances[0].expiryDate = getReloadExpiryDate(
+      activationTime,
+      cadence,
+      expiryPerOccurrence,
+      1,
+      startDate,
+      firstOccurrenceActivationPeriod,
+    )?.toISOString();
+    updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
-      if (index + 1 === 1) {  
+      if (index + 1 === 1) {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.PENDING_CLAIM);
       } else {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
       }
-    })
+    });
 
     // fast forward after expiry
-    mockdatetime(startDate.add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence + 1, 'seconds').toDate());
-    activationTime = dayjs(startDate).add(firstOccurrenceActivationPeriod, 'hours')
-    issuances = range(1, occurrence + 1).map((occurrenceIndex) => ({
+    mockdatetime(
+      startDate
+        .add(firstOccurrenceActivationPeriod, 'hours')
+        .add(expiryPerOccurrence + 1, 'seconds')
+        .toDate(),
+    );
+    activationTime = dayjs(startDate).add(firstOccurrenceActivationPeriod, 'hours');
+    issuances = range(1, occurrence + 1).map(occurrenceIndex => ({
       vipBonusId,
       userId,
       currency,
       bonusAmountUsd,
       occurrenceIndex,
-      expiryDate: getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, occurrenceIndex, startDate, firstOccurrenceActivationPeriod)?.toISOString(),
+      expiryDate: getReloadExpiryDate(
+        activationTime,
+        cadence,
+        expiryPerOccurrence,
+        occurrenceIndex,
+        startDate,
+        firstOccurrenceActivationPeriod,
+      )?.toISOString(),
       availableDate: getReloadAvailableDate(activationTime, cadence, occurrenceIndex, startDate)?.toISOString(),
       status: null as VipBonusIssuanceStatus | null,
       createdAt: startDate.toISOString(),
       expiryPerOccurrence,
       firstOccurrenceActivationPeriod,
-    }))
+    }));
 
-    updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (index + 1 === 1) {
@@ -284,8 +367,8 @@ describe('VipBonusUtils', () => {
       } else {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
       }
-    })
-  })
+    });
+  });
 
   it('should update bonus issuance status correctly for independent vip reload (overlapping vip reloads)', () => {
     const vipBonusId = uuidv4();
@@ -298,15 +381,22 @@ describe('VipBonusUtils', () => {
     const firstOccurrenceActivationPeriod = 10;
     const occurrence = 10;
     const claimed = [1];
-    const activationTime = dayjs(startDate).add(5, 'hours') // user claimed within first occurrence activation period
+    const activationTime = dayjs(startDate).add(5, 'hours'); // user claimed within first occurrence activation period
 
-    const issuances = range(1, occurrence + 1).map((occurrenceIndex) => ({
+    const issuances = range(1, occurrence + 1).map(occurrenceIndex => ({
       vipBonusId,
       userId,
       currency,
       bonusAmountUsd,
       occurrenceIndex,
-      expiryDate: getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, occurrenceIndex, startDate, firstOccurrenceActivationPeriod)?.toISOString(),
+      expiryDate: getReloadExpiryDate(
+        activationTime,
+        cadence,
+        expiryPerOccurrence,
+        occurrenceIndex,
+        startDate,
+        firstOccurrenceActivationPeriod,
+      )?.toISOString(),
       availableDate: getReloadAvailableDate(activationTime, cadence, occurrenceIndex, startDate)?.toISOString(),
       status: claimed.includes(occurrenceIndex) ? VipBonusIssuanceStatus.CLAIMED : null,
       createdAt: startDate.toISOString(),
@@ -318,9 +408,9 @@ describe('VipBonusUtils', () => {
 
     // fast forward into reward 3 claiming interval
     mockdatetime(activationTime.add(cadence * fastForward + 1, 'seconds').toDate());
-    let updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    let updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
-    let pendingClaims = [2, 3]
+    let pendingClaims = [2, 3];
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.CLAIMED);
@@ -331,14 +421,14 @@ describe('VipBonusUtils', () => {
       }
     });
 
-    fastForward = 7
+    fastForward = 7;
 
     // fast forward into reward 8 just after expiry
     mockdatetime(activationTime.add(cadence * fastForward + expiryPerOccurrence + 1, 'seconds').toDate());
-    updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
-    pendingClaims = [9, 10]
-    let expired = [ 2, 3, 4, 5, 6, 7, 8]
+    pendingClaims = [9, 10];
+    const expired = [2, 3, 4, 5, 6, 7, 8];
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.CLAIMED);
@@ -349,8 +439,8 @@ describe('VipBonusUtils', () => {
       } else {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.SCHEDULED);
       }
-    })
-  })
+    });
+  });
 
   it('should update bonus issuance status correctly for independent vip reload (no overlapping vip reloads', () => {
     const vipBonusId = uuidv4();
@@ -364,26 +454,33 @@ describe('VipBonusUtils', () => {
     const occurrence = 10;
     const claimed = [2, 3];
     const activationTime = dayjs(startDate).add(firstOccurrenceActivationPeriod, 'hours');
-    
-    const issuances = range(1, occurrence + 1).map((occurrenceIndex) => ({
+
+    const issuances = range(1, occurrence + 1).map(occurrenceIndex => ({
       vipBonusId,
       userId,
       currency,
       bonusAmountUsd,
       occurrenceIndex,
-      expiryDate: getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, occurrenceIndex, startDate, firstOccurrenceActivationPeriod)?.toISOString(),
+      expiryDate: getReloadExpiryDate(
+        activationTime,
+        cadence,
+        expiryPerOccurrence,
+        occurrenceIndex,
+        startDate,
+        firstOccurrenceActivationPeriod,
+      )?.toISOString(),
       availableDate: getReloadAvailableDate(activationTime, cadence, occurrenceIndex, startDate)?.toISOString(),
       status: claimed.includes(occurrenceIndex) ? VipBonusIssuanceStatus.CLAIMED : null,
       createdAt: startDate.toISOString(),
       expiryPerOccurrence,
       firstOccurrenceActivationPeriod,
-    }))
+    }));
 
     let fastForward = 2;
-    let pendingClaims = [4, 5, 6, 7, 8, 9, 10]
+    let pendingClaims = [4, 5, 6, 7, 8, 9, 10];
     // fast forward into reward 3 claiming interval
     mockdatetime(activationTime.add(cadence * fastForward + 1, 'seconds').toDate());
-    let updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    let updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
@@ -393,14 +490,14 @@ describe('VipBonusUtils', () => {
       } else {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.EXPIRED);
       }
-    })
+    });
 
-    fastForward = 7
-    pendingClaims = [9, 10]
+    fastForward = 7;
+    pendingClaims = [9, 10];
 
     // fast forward into reward 8 just after expiry
     mockdatetime(activationTime.add(cadence * fastForward + expiryPerOccurrence + 1, 'seconds').toDate());
-    updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, null, dayjs()));
+    updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, null, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
@@ -410,9 +507,9 @@ describe('VipBonusUtils', () => {
       } else {
         expect(issuance.status).toEqual(VipBonusIssuanceStatus.EXPIRED);
       }
-    })
-  })
-    
+    });
+  });
+
   it('should update bonus issuance status correctly with cancelledAt', () => {
     const vipBonusId = uuidv4();
     const userId = uuidv4();
@@ -428,15 +525,22 @@ describe('VipBonusUtils', () => {
     const cancelledAt = dayjs(startDate)
       .add(cadence * (cancelledIndex - 1), 'seconds')
       .toDate();
-    const activationTime = dayjs(startDate)
+    const activationTime = dayjs(startDate);
 
-    const issuances = range(1, occurrence + 1).map((occurrenceIndex) => ({
+    const issuances = range(1, occurrence + 1).map(occurrenceIndex => ({
       vipBonusId,
       userId,
       currency,
       bonusAmountUsd,
       occurrenceIndex,
-      expiryDate: getReloadExpiryDate(activationTime, cadence, expiryPerOccurrence, occurrenceIndex, startDate, firstOccurrenceActivationPeriod)?.toISOString(),
+      expiryDate: getReloadExpiryDate(
+        activationTime,
+        cadence,
+        expiryPerOccurrence,
+        occurrenceIndex,
+        startDate,
+        firstOccurrenceActivationPeriod,
+      )?.toISOString(),
       availableDate: getReloadAvailableDate(activationTime, cadence, occurrenceIndex, startDate)?.toISOString(),
       status: claimed.includes(occurrenceIndex) ? VipBonusIssuanceStatus.CLAIMED : null,
       createdAt: startDate.toISOString(),
@@ -447,7 +551,7 @@ describe('VipBonusUtils', () => {
     // fast forward into reward 7 claiming interval
     let fastForward = 6;
     mockdatetime(startDate.add(cadence * fastForward, 'seconds').toDate());
-    let updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, cancelledAt, dayjs()));
+    let updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, cancelledAt, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {
@@ -464,7 +568,7 @@ describe('VipBonusUtils', () => {
     // fast forward into reward 8 claiming interval
     fastForward = 7;
     mockdatetime(startDate.add(cadence * fastForward, 'seconds').toDate());
-    updatedStatusList = issuances.map((issuance) => updateBonusIssuanceStatus(issuance, cancelledAt, dayjs()));
+    updatedStatusList = issuances.map(issuance => updateBonusIssuanceStatus(issuance, cancelledAt, dayjs()));
 
     updatedStatusList.forEach((issuance, index) => {
       if (claimed.includes(index + 1)) {

package/src/utils/derive-vip-bonus.ts

@@ -21,19 +21,26 @@ export function getReloadAvailableDate(activationTime: Dayjs | null, cadence: nu
   return activationTime.add(cadence * (index - 1), 'second').toDate();
 }
 
-export function getReloadExpiryDate(activationTime: Dayjs | null, cadence: number, expiryPerOccurrence: number, index: number, createdAt: Dayjs, firstOccurrenceActivationPeriod: number) {
+export function getReloadExpiryDate(
+  activationTime: Dayjs | null,
+  cadence: number,
+  expiryPerOccurrence: number,
+  index: number,
+  createdAt: Dayjs,
+  firstOccurrenceActivationPeriod: number,
+) {
   const availableDate = getReloadAvailableDate(activationTime, cadence, index, createdAt);
 
   if (index === 1) {
     return dayjs(createdAt).add(firstOccurrenceActivationPeriod, 'hours').add(expiryPerOccurrence, 'second').toDate();
   }
-  
+
   if (!availableDate) {
-    return null
+    return null;
   }
 
   const result = dayjs(availableDate).add(expiryPerOccurrence, 'second').toDate();
-  return result
+  return result;
 }
 
 export function deriveBonusIssuances(vipBonus: VipBonusPartial) {
@@ -42,7 +49,7 @@ export function deriveBonusIssuances(vipBonus: VipBonusPartial) {
   const bonusCreatedAt = dayjs(vipBonus.createdAt);
   const now = dayjs();
 
-  const firstClaim = claims?.find((claim) => claim.occurrenceIndex == 1);
+  const firstClaim = claims?.find(claim => claim.occurrenceIndex == 1);
   let activationTime: Dayjs | null = null;
   const maxBonusActivationTime = bonusCreatedAt.add(vipBonus.firstOccurrenceActivationPeriod ?? 0, 'hours');
 
@@ -52,11 +59,18 @@ export function deriveBonusIssuances(vipBonus: VipBonusPartial) {
     activationTime = maxBonusActivationTime;
   }
 
-  return range(1, vipBonus.occurrence + 1).map((occurrenceIndex) => {
-    const claim = claims?.find((claim) => claim.occurrenceIndex == occurrenceIndex);
+  return range(1, vipBonus.occurrence + 1).map(occurrenceIndex => {
+    const claim = claims?.find(claim => claim.occurrenceIndex == occurrenceIndex);
     const expiryDate =
       vipBonus.type === VipBonusType.RELOADED
-        ? getReloadExpiryDate(activationTime, vipBonus.cadence!, vipBonus.expiryPerOccurrence ?? 0, occurrenceIndex, bonusCreatedAt, vipBonus.firstOccurrenceActivationPeriod ?? 0)?.toISOString()
+        ? getReloadExpiryDate(
+            activationTime,
+            vipBonus.cadence!,
+            vipBonus.expiryPerOccurrence ?? 0,
+            occurrenceIndex,
+            bonusCreatedAt,
+            vipBonus.firstOccurrenceActivationPeriod ?? 0,
+          )?.toISOString()
         : vipBonus.endAt;
     const availableDate =
       vipBonus.type === VipBonusType.RELOADED
@@ -65,18 +79,16 @@ export function deriveBonusIssuances(vipBonus: VipBonusPartial) {
     return updateBonusIssuanceStatus(
       {
         currency,
-        bonusAmountUsd: new BigNumber(vipBonus.bonusAmountUsd)
-          .dividedBy(vipBonus.occurrence)
-          .decimalPlaces(8, BigNumber.ROUND_DOWN)
-          .toFixed(),
+        amount: claim?.amount,
+        bonusAmountUsd: new BigNumber(vipBonus.bonusAmountUsd).dividedBy(vipBonus.occurrence).decimalPlaces(8, BigNumber.ROUND_DOWN).toFixed(),
         occurrenceIndex,
         expiryDate,
         availableDate,
         status: claim ? VipBonusIssuanceStatus.CLAIMED : null,
-        createdAt: vipBonus.bonusClaims?.[occurrenceIndex - 1]?.createdAt
+        createdAt: claim?.createdAt,
       },
       vipBonus.cancelledAt ? new Date(vipBonus.cancelledAt) : null,
-      now
+      now,
     );
   });
 }