fix logical and api integration issues

2025-10-01 16:40:51 +05:30
parent 017c470fd3
commit 2aebed4386
6 changed files with 67 additions and 23 deletions
@@ -605,7 +605,7 @@ const EditGroupScreen: React.FC<EditGroupScreenProps> = ({ route }) => {
          </TouchableOpacity>
        </View>
      )}
-      {selectedUser?.cycleStatus !== "PENDING_PAYMENTS" && groupDetails.status === 'ACTIVE' &&(
+      {selectedUser?.cycleStatus !== "PENDING_PAYMENTS" && groupDetails.status === 'ACTIVE'  && selectedUser?.cycleStatus === "PENDING_SELECTION" &&(
        <View style={styles.floatingButtonContainer}>
          <TouchableOpacity
            style={styles.activateButton}
@@ -623,7 +623,7 @@ const EditGroupScreen: React.FC<EditGroupScreenProps> = ({ route }) => {
      }

      {
-        selectedUser?.selectedUser !== null  && selectedUser?.cycleStatus === "READY_FOR_WITHDRAWAL" && selectedUser?.canProceedToWithdrawal &&
+        selectedUser?.selectedUser !== null  && selectedUser?.cycleStatus === "READY_FOR_WITHDRAWAL"  &&
        <View style={styles.floatingButtonContainer}>
          <CustomButton
            buttonBackground={colors?.pastelBlue}