@@ -217,12 +217,11 @@ class Bridge extends React.Component {
217217 }
218218
219219 setWallet(wallet) {
220− if (Just.hasInstance(wallet) &&
221− wallet.value.publicKey &&
222− typeof wallet.value.address === 'undefined') {
223− wallet.value.address = addressFromSecp256k1Public(wallet.value.publicKey);
224− }
225− this.setState({ wallet })
220+ wallet.map(wal => {
221+ wal.address = wal.address || addressFromSecp256k1Public(wal.publicKey);
222+ return wal;
223+ });
224+ this.setState({ wallet });
226225 }
227226
228227 setWalletHdPath(walletHdPath) {
@@ -239,7 +238,10 @@ class Bridge extends React.Component {
239238 DEFAULT_HD_PATH,
240239 urbitWallet.value.meta.passphrase
241240 );
242− wallet.value.address = urbitWallet.value.ownership.keys.address;
241+ wallet.map(wal => {
242+ wal.address = urbitWallet.value.ownership.keys.address;
243+ return wal;
244+ });
243245 }
244246 this.setState({ urbitWallet, wallet })
245247 }