Unhide rows one by one using command button

[wanders]

I am trying to use a command button to unhide rows within my range. I have 8 command buttons each for a different range/table. Currently this button is unhiding all rows in all ranges. Not sure what I have done wrong here.

Private Sub CommandButton1_Click()
 
    Dim i As Integer

    i = 18
    For i = 18 To 41
   Do
        If Rows(i).Hidden = True Then
        Rows(i).Hidden = False
        Exit Do
        ElseIf Rows(i).Hidden = False Then
        i = i + 1
        Else
    End If
    Loop Until i = 41
    
 If i = 41 Then
 MsgBox "There are no more rows for hourly labor remaining"
 Else
 End If
    Cancel = True
    
    Next i
End Sub

 

[wanders]

here is a picture of my spreadsheet!

 

[Akuini]

@wanders
Welcome to MrExcel
Since you have multiple command button that do the same thing then you can use a sub (i.e "toUnhide") and call it from each command button, like this:

Sub toUnhide(a As Long, b As Long, msg As String)

    Dim i As Long
    
    If Rows(b).Hidden = False Then MsgBox msg: Exit Sub
    
    For i = a To b
        If Rows(i).Hidden = True Then Rows(i).Hidden = False:  Exit For
    Next i

End Sub

Sub CommandButton1_Click()

toUnhide 18, 21, "There are no more rows for hourly labor remaining"

End Sub

Sub CommandButton2_Click()

toUnhide 44, 65, "There are no more rows for ...."

End Sub

I've written the code for the first 2 commandbutton, you can do the rest.
The arguments are: the first row, the last row, and the message.