From 352473ac9f5b87745261e6490e46293a72af6275 Mon Sep 17 00:00:00 2001
From: HenryNguyen5 <ngu.henry@hotmail.com>
Date: Mon, 21 May 2018 14:11:08 -0400
Subject: [PATCH 1/7] Strip hex prefix for bytes inputs (#1811)

---
 common/libs/contracts/ABIFunction.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/libs/contracts/ABIFunction.ts b/common/libs/contracts/ABIFunction.ts
index 54502edd..3240e652 100644
--- a/common/libs/contracts/ABIFunction.ts
+++ b/common/libs/contracts/ABIFunction.ts
@@ -1,5 +1,5 @@
 import abi from 'ethereumjs-abi';
-import { toChecksumAddress, addHexPrefix } from 'ethereumjs-util';
+import { toChecksumAddress, addHexPrefix, stripHexPrefix } from 'ethereumjs-util';
 import BN from 'bn.js';
 import {
   FuncParams,
@@ -97,7 +97,7 @@ export default class AbiFunction {
 
   private parsePreEncodedValue = (type: string, value: any) => {
     if (type === 'bytes') {
-      return Buffer.from(value, 'hex');
+      return Buffer.from(stripHexPrefix(value), 'hex');
     }
     return BN.isBN(value) ? value.toString() : value;
   };

From 693e1972e5b21d929d6a26b05697282d135adff0 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Thu, 24 May 2018 17:10:57 -0500
Subject: [PATCH 2/7] Update Electron Expiration (#1844)

---
 common/config/data.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/config/data.tsx b/common/config/data.tsx
index 5e3e9b0f..541c8d31 100644
--- a/common/config/data.tsx
+++ b/common/config/data.tsx
@@ -16,9 +16,9 @@ export const N_FACTOR = 8192;
 
 // Bricks the app once this date has been exceeded. Remember to update these 2
 // whenever making a new app release.
-// It is currently set to: 05/25/2018 @ 12:00am (UTC)
+// It is currently set to: Wednesday, July 25, 2018 12:00:00 AM (GMT)
 // TODO: Remove me once app alpha / release candidates are done
-export const APP_ALPHA_EXPIRATION = 1527206400000;
+export const APP_ALPHA_EXPIRATION = 1532476800000;
 
 // Displays at the top of the site, make message empty string to remove.
 // Type can be primary, warning, danger, success, info, or blank for grey.

From 28da18e84a10c7e7bc5e4fb809ccfebf072239a7 Mon Sep 17 00:00:00 2001
From: HenryNguyen5 <ngu.henry@hotmail.com>
Date: Thu, 24 May 2018 19:22:33 -0400
Subject: [PATCH 3/7] Add dropdown for boolean inputs (#1845)

---
 .../components/InteractExplorer/index.tsx     | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx b/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx
index ec0cc59d..8c9687d4 100644
--- a/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx
+++ b/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx
@@ -109,18 +109,36 @@ class InteractExplorerClass extends Component<Props, State> {
             {/* TODO: Use reusable components with validation */}
             {selectedFunction.contract.inputs.map(input => {
               const { type, name } = input;
-
+              const inputState = this.state.inputs[name];
               return (
                 <div key={name} className="input-group-wrapper InteractExplorer-func-in">
                   <label className="input-group">
                     <div className="input-group-header">{name + ' ' + type}</div>
-                    <Input
-                      className="InteractExplorer-func-in-input"
-                      isValid={!!(inputs[name] && inputs[name].rawData)}
-                      name={name}
-                      value={(inputs[name] && inputs[name].rawData) || ''}
-                      onChange={this.handleInputChange}
-                    />
+                    {type === 'bool' ? (
+                      <Dropdown
+                        options={[{ value: false, label: 'false' }, { value: true, label: 'true' }]}
+                        value={
+                          inputState
+                            ? {
+                                label: inputState.rawData,
+                                value: inputState.parsedData as any
+                              }
+                            : undefined
+                        }
+                        clearable={false}
+                        onChange={({ value }: { value: boolean }) => {
+                          this.handleBooleanDropdownChange({ value, name });
+                        }}
+                      />
+                    ) : (
+                      <Input
+                        className="InteractExplorer-func-in-input"
+                        isValid={!!(inputs[name] && inputs[name].rawData)}
+                        name={name}
+                        value={(inputs[name] && inputs[name].rawData) || ''}
+                        onChange={this.handleInputChange}
+                      />
+                    )}
                   </label>
                 </div>
               );
@@ -244,6 +262,17 @@ class InteractExplorerClass extends Component<Props, State> {
     }
   }
 
+  private handleBooleanDropdownChange = ({ value, name }: { value: boolean; name: string }) => {
+    this.setState({
+      inputs: {
+        ...this.state.inputs,
+        [name as any]: {
+          rawData: value.toString(),
+          parsedData: value
+        }
+      }
+    });
+  };
   private handleInputChange = (ev: React.FormEvent<HTMLInputElement>) => {
     const rawValue: string = ev.currentTarget.value;
     const isArr = rawValue.startsWith('[') && rawValue.endsWith(']');

From 61fa74492719a76beaf30f29e70c3e06bae7761d Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Thu, 24 May 2018 18:28:17 -0500
Subject: [PATCH 4/7] Update Versions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ac0440df..ad811f33 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "MyCrypto",
   "author": "MyCryptoHQ",
-  "version": "1.0.0",
-  "electron-version": "1.0.0-alpha.3",
+  "version": "1.0.1",
+  "electron-version": "1.0.1-alpha.4",
   "main": "main.js",
   "description": "MyCrypto web and electron app",
   "repository": "https://github.com/MyCryptoHQ/MyCrypto",

From 5200bf54ace8b3caf4a30a912edaefab7434d5a8 Mon Sep 17 00:00:00 2001
From: Danny Skubak <skubakdj@gmail.com>
Date: Tue, 22 May 2018 14:04:10 -0400
Subject: [PATCH 5/7] Add Electron Build to Travis (#1830)

* introduce build matrix to travis config

* remove branch exclusion

* trigger mycryptobuild
---
 .travis.yml | 70 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b322a69a..0b22ddef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,65 @@
-dist: trusty
-sudo: required
+
 language: node_js
 
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.3
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+
+    - os: linux
+      dist: trusty
+      sudo: required
+      services: docker
+
 cache:
+  yarn: true
   directories:
     - node_modules
+    - $HOME/.cache/electron
+    - $HOME/.cache/electron-builder
 
-services:
-  - docker
+before_cache:
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      rm -rf $HOME/.cache/electron-builder/wine
+    fi
 
 before_install:
-  - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-# uncomment once integration tests are included in CI
-#  - docker pull dternyak/eth-priv-to-addr:latest
-  - sudo apt-get install libusb-1.0
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      export CHROME_BIN=chromium-browser
+      export DISPLAY=:99.0
+      sh -e /etc/init.d/xvfb start
+      # uncomment once integration tests are included in CI
+      # docker pull dternyak/eth-priv-to-addr:latest
+      sudo apt-get install libusb-1.0     
+    fi
   
 install:
-  - npm install --silent
+  - yarn --silent
 
-jobs:
-  include:
-    - stage: test
-      script: npm run prettier:diff
-    - stage: test
-      script: npm run test:coverage -- --maxWorkers=2 && npm run report-coverage
-    - stage: test
-      script: npm run tslint && npm run tscheck && npm run freezer && npm run freezer:validate
+script:
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
+      npm run prettier:diff
+      npm run test:coverage -- --maxWorkers=2
+      npm run report-coverage
+      npm run tslint
+      npm run tscheck
+      npm run freezer
+      npm run freezer:validate
+    fi
+
+  - | 
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      npm run build:electron
+      ls -la dist/electron-builds
+    fi
 
 notifications:
   email:
     on_success: never
-    on_failure: never
\ No newline at end of file
+    on_failure: never

From 4d536f71fd95c043d1c302a140bcba98125e1707 Mon Sep 17 00:00:00 2001
From: HenryNguyen5 <ngu.henry@hotmail.com>
Date: Fri, 25 May 2018 13:30:22 -0400
Subject: [PATCH 6/7] Clear transaction state on tab changes (#1852)

---
 .../Tabs/Contracts/components/Deploy.tsx      | 12 ++++---
 .../components/InteractExplorer/index.tsx     | 31 +++++++++++++++++--
 common/containers/Tabs/Contracts/index.tsx    | 23 ++------------
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/common/containers/Tabs/Contracts/components/Deploy.tsx b/common/containers/Tabs/Contracts/components/Deploy.tsx
index a571eaf7..cc7da768 100644
--- a/common/containers/Tabs/Contracts/components/Deploy.tsx
+++ b/common/containers/Tabs/Contracts/components/Deploy.tsx
@@ -3,7 +3,7 @@ import { DataFieldFactory } from 'components/DataFieldFactory';
 import { SendButtonFactory } from 'components/SendButtonFactory';
 import WalletDecrypt, { DISABLE_WALLETS } from 'components/WalletDecrypt';
 import React, { Component } from 'react';
-import { setToField, TSetToField } from 'actions/transaction';
+import { resetTransactionRequested, TResetTransactionRequested } from 'actions/transaction';
 import { resetWallet, TResetWallet } from 'actions/wallet';
 import { connect } from 'react-redux';
 import { FullWalletOnly } from 'components/renderCbs';
@@ -13,11 +13,15 @@ import { ConfirmationModal } from 'components/ConfirmationModal';
 import { TextArea } from 'components/ui';
 
 interface DispatchProps {
-  setToField: TSetToField;
   resetWallet: TResetWallet;
+  resetTransactionRequested: TResetTransactionRequested;
 }
 
 class DeployClass extends Component<DispatchProps> {
+  public componentDidMount() {
+    this.props.resetTransactionRequested();
+  }
+
   public render() {
     const makeContent = () => (
       <main className="Deploy Tab-content-pane" role="main">
@@ -93,6 +97,6 @@ class DeployClass extends Component<DispatchProps> {
 }
 
 export const Deploy = connect(null, {
-  setToField,
-  resetWallet
+  resetWallet,
+  resetTransactionRequested
 })(DeployClass);
diff --git a/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx b/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx
index 8c9687d4..35e0b73a 100644
--- a/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx
+++ b/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/index.tsx
@@ -8,7 +8,16 @@ import { GenerateTransaction } from 'components/GenerateTransaction';
 import { AppState } from 'reducers';
 import { connect } from 'react-redux';
 import { Fields } from './components';
-import { setDataField, TSetDataField } from 'actions/transaction';
+import {
+  setDataField,
+  resetTransactionRequested,
+  TSetDataField,
+  TResetTransactionRequested,
+  TSetAsContractInteraction,
+  TSetAsViewAndSend,
+  setAsContractInteraction,
+  setAsViewAndSend
+} from 'actions/transaction';
 import { Data } from 'libs/units';
 import { Input, Dropdown } from 'components/ui';
 import { INode } from 'libs/nodes';
@@ -23,6 +32,9 @@ interface StateProps {
 interface DispatchProps {
   showNotification: TShowNotification;
   setDataField: TSetDataField;
+  resetTransactionRequested: TResetTransactionRequested;
+  setAsContractInteraction: TSetAsContractInteraction;
+  setAsViewAndSend: TSetAsViewAndSend;
 }
 
 interface OwnProps {
@@ -64,6 +76,15 @@ class InteractExplorerClass extends Component<Props, State> {
     outputs: {}
   };
 
+  public componentDidMount() {
+    this.props.setAsContractInteraction();
+    this.props.resetTransactionRequested();
+  }
+
+  public componentWillUnmount() {
+    this.props.setAsViewAndSend();
+  }
+
   public render() {
     const { inputs, outputs, selectedFunction } = this.state;
     const contractFunctionsOptions = this.contractOptions();
@@ -296,5 +317,11 @@ export const InteractExplorer = connect(
     to: getTo(state),
     dataExists: getDataExists(state)
   }),
-  { showNotification, setDataField }
+  {
+    showNotification,
+    setDataField,
+    resetTransactionRequested,
+    setAsContractInteraction,
+    setAsViewAndSend
+  }
 )(InteractExplorerClass);
diff --git a/common/containers/Tabs/Contracts/index.tsx b/common/containers/Tabs/Contracts/index.tsx
index 62ae7527..35b515aa 100644
--- a/common/containers/Tabs/Contracts/index.tsx
+++ b/common/containers/Tabs/Contracts/index.tsx
@@ -1,13 +1,6 @@
 import translate from 'translations';
 import { Interact } from './components/Interact';
 import { Deploy } from './components/Deploy';
-import {
-  setAsContractInteraction,
-  TSetAsContractInteraction,
-  setAsViewAndSend,
-  TSetAsViewAndSend
-} from 'actions/transaction';
-
 import TabSection from 'containers/TabSection';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
@@ -15,11 +8,6 @@ import { Switch, Route, Redirect, RouteComponentProps } from 'react-router';
 import SubTabs from 'components/SubTabs';
 import { RouteNotFound } from 'components/RouteNotFound';
 
-interface DispatchProps {
-  setAsContractInteraction: TSetAsContractInteraction;
-  setAsViewAndSend: TSetAsViewAndSend;
-}
-
 const tabs = [
   {
     path: 'interact',
@@ -31,14 +19,7 @@ const tabs = [
   }
 ];
 
-class Contracts extends Component<DispatchProps & RouteComponentProps<{}>> {
-  public componentDidMount() {
-    this.props.setAsContractInteraction();
-  }
-  public componentWillUnmount() {
-    this.props.setAsViewAndSend();
-  }
-
+class Contracts extends Component<RouteComponentProps<{}>> {
   public render() {
     const { match, location, history } = this.props;
     const currentPath = match.url;
@@ -65,4 +46,4 @@ class Contracts extends Component<DispatchProps & RouteComponentProps<{}>> {
   }
 }
 
-export default connect(null, { setAsContractInteraction, setAsViewAndSend })(Contracts);
+export default connect(null, {})(Contracts);

From 6ba78b89bf96604dc67d793d4f1db17918ebd372 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak <dternyak@gmail.com>
Date: Fri, 25 May 2018 12:32:26 -0500
Subject: [PATCH 7/7] update versions

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ad811f33..7c481bdb 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "MyCrypto",
   "author": "MyCryptoHQ",
-  "version": "1.0.1",
-  "electron-version": "1.0.1-alpha.4",
+  "version": "1.0.2",
+  "electron-version": "1.0.2-alpha.5",
   "main": "main.js",
   "description": "MyCrypto web and electron app",
   "repository": "https://github.com/MyCryptoHQ/MyCrypto",