Refactor and fix foreign currency list value bug