fix: bug fixing the renewal flow (#34)

package.json

@@ -14,6 +14,7 @@
     "start": "vite --host --open",
     "build": "tsc && vite build && dts-bundle-generator --config ./dts-bundle-generator.config.ts",
     "watch": "tsc && vite build --watch",
+    "test": "vitest run",
     "test:integration": "vitest run --coverage",
     "localnet:start": "pipx run algokit localnet start",
     "localnet:stop": "pipx run algokit localnet start",

src/clients/SubtopiaClient.ts

@@ -738,6 +738,19 @@ export class SubtopiaClient {
       }
     }
 
+    const currentSubscription = await this.getSubscription({
+      algodClient: this.algodClient,
+      subscriberAddress: subscriber.addr,
+    }).catch(() => {
+      return null;
+    });
+    const isHoldingSubscription = currentSubscription !== null;
+    const isActiveSubscriber = await this.isSubscriber({
+      subscriberAddress: subscriber.addr,
+    });
+    const isHoldingExpiredSubscription =
+      isHoldingSubscription && !isActiveSubscriber;
+
     const createSubscriptionAtc = new AtomicTransactionComposer();
     createSubscriptionAtc.addMethodCall({
       appID: this.appID,
@@ -791,9 +804,10 @@ export class SubtopiaClient {
           txn: makePaymentTxnWithSuggestedParamsFromObject({
             from: subscriber.addr,
             to: this.appAddress,
-            amount:
-              calculateProductSubscriptionBoxCreateMbr(subscriber.addr) +
-              algosToMicroalgos(MIN_ASA_CREATE_MBR),
+            amount: isHoldingExpiredSubscription
+              ? 0
+              : calculateProductSubscriptionBoxCreateMbr(subscriber.addr) +
+                algosToMicroalgos(MIN_ASA_CREATE_MBR),
             suggestedParams: await getParamsWithFeeCount(this.algodClient, 0),
           }),
           signer: subscriber.signer,