find by to where for gift card screen
fix conflicts
 add compelte gift card method