status-im/MyCrypto
2
0
Fork 0
mirror of https://github.com/status-im/MyCrypto.git synced 2025-02-19 22:38:12 +00:00
Code Issues Projects Releases Wiki Activity

More RC Bugfixes (#1669)

Browse Source 
* Fix #1653

* Fix #1648

* Fix #1638

* Fix test
This commit is contained in:
HenryNguyen5 2018-04-24 23:26:53 -04:00 committed by Daniel Ternyak
parent ab4eaf1b05
commit 54102d07b0
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/containers/OnboardModal/index.tsx
View File

@ -120,12 +120,7 @@ class OnboardModal extends React.Component<Props, State> {
return ( return (
<div className="OnboardModal"> <div className="OnboardModal">
<Modal <Modal isOpen={isOpen} buttons={buttons} maxWidth={800} handleClose={this.closeModal}>
isOpen={isOpen}
buttons={buttons}
maxWidth={800}
handleClose={() => (slideNumber === NUMBER_OF_SLIDES ? this.closeModal : null)}
>
<div className="OnboardModal-stepper"> <div className="OnboardModal-stepper">
<Stepper <Stepper
steps={steps} steps={steps}

14
common/libs/wallet/deterministic/ledger.ts
View File

@ -47,14 +47,14 @@ export class LedgerWallet extends DeterministicWallet implements IFullWallet {
// modeled after // modeled after
// https://github.com/kvhnuke/etherwallet/blob/3f7ff809e5d02d7ea47db559adaca1c930025e24/app/scripts/controllers/signMsgCtrl.js#L53 // https://github.com/kvhnuke/etherwallet/blob/3f7ff809e5d02d7ea47db559adaca1c930025e24/app/scripts/controllers/signMsgCtrl.js#L53
public async signMessage(msg: string): Promise<string> { public async signMessage(msg: string): Promise<string> {
const msgHex = Buffer.from(msg).toString('hex'); if (!msg) {
try { throw Error('No message to sign');
const signed = await this.ethApp.signPersonalMessage_async(this.getPath(), msgHex);
const combined = addHexPrefix(signed.r + signed.s + signed.v.toString(16));
return combined;
} catch (error) {
throw (this.ethApp as any).getError(error);
} }
const msgHex = Buffer.from(msg).toString('hex');
const signed = await this.ethApp.signPersonalMessage_async(this.getPath(), msgHex);
const combined = addHexPrefix(signed.r + signed.s + signed.v.toString(16));
return combined;
} }
public displayAddress = ( public displayAddress = (

3
common/reducers/transaction/meta/meta.ts
View File

@ -60,7 +60,8 @@ const tokenToToken = (
const reset = (state: State): State => ({ const reset = (state: State): State => ({
...INITIAL_STATE, ...INITIAL_STATE,
isContractInteraction: state.isContractInteraction isContractInteraction: state.isContractInteraction,
unit: state.unit
}); });
const unitMeta = (state: State, { payload }: SetUnitMetaAction): State => ({ const unitMeta = (state: State, { payload }: SetUnitMetaAction): State => ({

2
spec/reducers/transaction/meta/meta.spec.ts
View File

@ -105,6 +105,6 @@ describe('meta reducer', () => {
...INITIAL_STATE, ...INITIAL_STATE,
unit: 'modified' unit: 'modified'
}; };
expect(meta(modifiedState, resetAction)).toEqual(INITIAL_STATE); expect(meta(modifiedState, resetAction)).toEqual(modifiedState);
}); });
}); });