Jinaayaat

Woman in haidh giving damm to come out of ihraam while in Makkah Mukarramah

Q: A girl goes for umrah and puts on ihraam in haiz then she's going to be in haiz till she leaves so she gives Damm and comes out of ihraam. 

Few years later she makes another Umrah but doesn't make niyyah of qadha. Will her qadha umrah be counted? 

If she's going for hajj this year can she make the umrah as the qadha umrah and put on a separate ihraam for hajj and make ifraad hajj?

If she makes ifraad hajj does she still have to make a Damm shukr?

If she doesn't have to make a Damm shukar but another damm is compulsory on her can she make niyyah for that damm instead?

Woman performing umrah thinking that her haidh ended

Q: 

1. A lady in haidh had entered into ihram, entered Makkah, then thought that her haidh was over (no bleeding for two days) so she completed the rites of Umrah. She then started bleeding again and realised that her haidh was still continuing. 

What should she do after her haidh has completed? 

Will she need to go to tan'eem and renew her ihraam as well? 

Was her coming out of ihraam valid such that using scented items etc. would not require any compensation? 

2. She performed a nafl tawaaf during that time as well (wherein she was actually still in haidh), what should she do in this case?