Merge pull request #309 from sparrowapp-dev/bug/fix-processing-when-workspacemodal-cancelled

fix: fixed processing button when activeworkspace modal is closed

Author: aakashreddy-p

src/pages/Payment/Overview/Overview.svelte

@@ -397,10 +397,12 @@
 
   function closeActiveWorkspaceModal(){
     showWorkspaceModal = false;
+    cancelInProgress = false;
   }
 
   function closeActiveMembersModal(){
     showMembersModal = false;
+    cancelInProgress = false;
   }
 
   function closeReviewModal(){
@@ -927,7 +929,9 @@
 
     {#if showMembersModal}
         <ChooseActiveMembersModal
-          users = {membersFromSelectedWorkspaces}
+          users={workspaces.length > plans.community.monthly.workspaces
+            ? membersFromSelectedWorkspaces
+            : removeAdminFromMembersList(hubOwner, hubUsers)}          
           planLimits = {plans.community.monthly.collaborators}
           isOpen={showMembersModal}
           expiryDate={expiryDate}

src/pages/Payment/PaymentInformation/ChangePlanPage.svelte

@@ -709,7 +709,8 @@
       : filterOutOwners(hubUsers)}
     on:close={() => {
       downgradeFlow.chooseMembersModal = false;
-      downgradeFlow.chooseWorkspaceModal = true;
+      const c = getDowngradeConstraints();
+      if (c.workspaceCount > c.maxWorkspaces) downgradeFlow.chooseWorkspaceModal = true;
     }}
     on:next={(e) => {
       downgradeData.selectedMembers = e.detail.selected;