on master help sign in
Use Maybe's .map where appropriate
c522690Fang
src/bridge/Bridge.js+9−7
@@ -217,12 +217,11 @@ class Bridge extends React.Component {
217 }
217 }
218
218
219 setWallet(wallet) {
219 setWallet(wallet) {
220− if (Just.hasInstance(wallet) &&
220+ wallet.map(wal => {
221− wallet.value.publicKey &&
222− typeof wallet.value.address === 'undefined') {
223− wallet.value.address = addressFromSecp256k1Public(wallet.value.publicKey);
221+ wal.address = wal.address || addressFromSecp256k1Public(wal.publicKey);
222+ return wal;
224− }
223+ });
225− this.setState({ wallet })
224+ this.setState({ wallet });
226 }
225 }
227
226
228 setWalletHdPath(walletHdPath) {
227 setWalletHdPath(walletHdPath) {
@@ -239,7 +238,10 @@ class Bridge extends React.Component {
239 DEFAULT_HD_PATH,
238 DEFAULT_HD_PATH,
240 urbitWallet.value.meta.passphrase
239 urbitWallet.value.meta.passphrase
241 );
240 );
241+ wallet.map(wal => {
242− wallet.value.address = urbitWallet.value.ownership.keys.address;
242+ wal.address = urbitWallet.value.ownership.keys.address;
243+ return wal;
244+ });
243 }
245 }
244 this.setState({ urbitWallet, wallet })
246 this.setState({ urbitWallet, wallet })
245 }
247 }