You need to talk to the dwarven jeweler about the amulet, not the smith.
It is normal for the smith to keep the original dragon breastplate and dragonheart gem in his inventory after giving you the upgraded armour. If you end up with an upgrade that is not as good, or just bonuses that don't match your play style as well, you can buy back the original.
