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?