I'm not sure if this is working as intended or not. I negotiated a last minute ceasefire with another player. He switched one of his subs to a gift 4 minutes before we were scheduled to collide. It still came through as combat instead.
Is this because there's a 10 minute window before the gift finalizes? I would think that in this particular case it should hedge on the side of gift if it hasn't committed yet? Honestly though, I'm not even 100% sure he didn't cancel it, but his other gifts did commit.