fix: made some changes on flow due to wrong Receipt handling (#24)

fix: made some changes on flow due to wrong Receipt handling (#24) #109