Remove unnecessary if statement and add the resolve to the other when of the gift detail page