Improve sub cancellation error handling

httptoolkit · Apr 27, 2023 · 26a4f21 · 26a4f21
1 parent 78ac7d0
commit 26a4f21
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/components/settings/settings-page.tsx b/src/components/settings/settings-page.tsx
@@ -368,7 +368,6 @@ class SettingsPage extends React.Component<SettingsPageProps> {
 
         this.props.accountStore.cancelSubscription().catch((e) => {
             alert(e.message);
-            reportError(e);
         });
     };
 }

diff --git a/src/model/account/account-store.ts b/src/model/account/account-store.ts
@@ -317,16 +317,21 @@ export class AccountStore {
     }
 
     cancelSubscription = flow(function * (this: AccountStore) {
-        yield cancelSubscription();
-
-        console.log('Subscription cancel requested');
-        this.isAccountUpdateInProcess = true;
-        yield this.waitForUserUpdate(() =>
-            !this.user.subscription ||
-            this.user.subscription.status === 'deleted'
-        );
-        this.isAccountUpdateInProcess = false;
-        console.log('Subscription cancellation confirmed');
+        try {
+            this.isAccountUpdateInProcess = true;
+            yield cancelSubscription();
+            yield this.waitForUserUpdate(() =>
+                !this.user.subscription ||
+                this.user.subscription.status === 'deleted'
+            );
+            console.log('Subscription cancellation confirmed');
+        } catch (e: any) {
+            console.log(e);
+            reportError(`Subscription cancellation failed: ${e.message || e}`);
+            throw e;
+        } finally {
+            this.isAccountUpdateInProcess = false;
+        }
     });
 
 }