From 09b04fb302ee6b12de731483f44d516293e5807a Mon Sep 17 00:00:00 2001
From: yashar <darkyashi@gmail.com>
Date: Wed, 16 Aug 2017 15:01:56 +0430
Subject: [PATCH 1/6] Rename label of primary button in votingConfirm

---
 src/components/voting/confirmVotes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/voting/confirmVotes.js b/src/components/voting/confirmVotes.js
index d13cc7d11..7ebeb57de 100644
--- a/src/components/voting/confirmVotes.js
+++ b/src/components/voting/confirmVotes.js
@@ -87,7 +87,7 @@ export class ConfirmVotes extends React.Component {
             onClick: this.props.closeDialog,
           }}
           primaryButton={{
-            label: 'Vote',
+            label: 'Confirm',
             fee: Fees.vote,
             disabled: (
               this.props.votedList.length === 0 &&

From 295d6ab306d2c5e883bf67684314142cdb2fa9e4 Mon Sep 17 00:00:00 2001
From: yashar <darkyashi@gmail.com>
Date: Wed, 16 Aug 2017 15:03:06 +0430
Subject: [PATCH 2/6] Fix a bug in confirmVotes test file

---
 src/components/voting/confirmVotes.test.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/voting/confirmVotes.test.js b/src/components/voting/confirmVotes.test.js
index 3b0fca9fd..941a02a98 100644
--- a/src/components/voting/confirmVotes.test.js
+++ b/src/components/voting/confirmVotes.test.js
@@ -7,7 +7,7 @@ import sinonChai from 'sinon-chai';
 import PropTypes from 'prop-types';
 import sinonStubPromise from 'sinon-stub-promise';
 import store from '../../store';
-import ConfrimVotesContainer, { ConfirmVotes } from './confirmVotes';
+import ConfirmVotesContainer, { ConfirmVotes } from './confirmVotes';
 import * as delegateApi from '../../utils/api/delegate';
 
 sinonStubPromise(sinon);
@@ -43,16 +43,16 @@ const props = {
   pendingVotesAdded: sinon.spy(),
   addTransaction: sinon.spy(),
 };
-describe('ConfrimVotesContainer', () => {
-  it('should render ConfrimVotes', () => {
-    const wrapper = mount(<ConfrimVotesContainer {...props} store={store} />, {
+describe('ConfirmVotesContainer', () => {
+  it('should render ConfirmVotes', () => {
+    const wrapper = mount(<ConfirmVotesContainer {...props} store={store} />, {
       context: { store },
       childContextTypes: { store: PropTypes.object.isRequired },
     });
     expect(wrapper.find('ConfirmVotes').exists()).to.be.equal(true);
   });
 });
-describe('ConfrimVotes', () => {
+describe('ConfirmVotes', () => {
   let wrapper;
   const delegateApiMock = sinon.stub(delegateApi, 'vote');
   beforeEach(() => {
@@ -69,7 +69,7 @@ describe('ConfrimVotes', () => {
     expect(props.pendingVotesAdded).to.have.been.calledWith();
     expect(props.addTransaction).to.have.been.calledWith();
     expect(props.showSuccessAlert).to.have.been.calledWith();
-    // it should triger 'props.clearVoteLists' after 10000 ms
+    // it should trigger 'props.clearVoteLists' after 10000 ms
     clock.tick(10000);
     expect(props.clearVoteLists).to.have.been.calledWith();
   });

From eed5816c9a3c608757b4042fa7eac7e53c9d7654 Mon Sep 17 00:00:00 2001
From: yashar <darkyashi@gmail.com>
Date: Wed, 16 Aug 2017 15:04:33 +0430
Subject: [PATCH 3/6] Change title of ConfirmVotes modal

---
 src/components/voting/votingHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/voting/votingHeader.js b/src/components/voting/votingHeader.js
index c7a29fe6a..786337171 100644
--- a/src/components/voting/votingHeader.js
+++ b/src/components/voting/votingHeader.js
@@ -72,7 +72,7 @@ class VotingHeader extends React.Component {
           </IconMenu>
           <Button icon='done' flat
             onClick={() => this.props.setActiveDialog({
-              title: 'Verify Vote for delegates',
+              title: 'Vote for delegates',
               childComponent: Confirm,
               childComponentProps: {
                 addTransaction: this.props.addTransaction,

From fa8fbf5e5be3dbaa774eb0e6028b03de4d46447c Mon Sep 17 00:00:00 2001
From: yashar <darkyashi@gmail.com>
Date: Wed, 16 Aug 2017 15:05:23 +0430
Subject: [PATCH 4/6] Fix a bug in voting component

---
 src/components/voting/voting.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/voting/voting.js b/src/components/voting/voting.js
index 0f5c196ce..25a5f7b83 100644
--- a/src/components/voting/voting.js
+++ b/src/components/voting/voting.js
@@ -46,11 +46,13 @@ class Voting extends React.Component {
 
   loadVotedDelegates(refresh) {
     listAccountDelegates(this.props.activePeer, this.props.address).then((res) => {
-      const votedDelegates = res.delegates
-        .map(delegate => Object.assign({}, delegate, { voted: true }));
-      this.setState({
-        votedDelegates,
-      });
+      if (res.delegates) {
+        const votedDelegates = res.delegates
+          .map(delegate => Object.assign({}, delegate, { voted: true }));
+        this.setState({
+          votedDelegates,
+        });
+      }
       if (refresh) {
         setTimeout(() => {
           const delegates = this.state.delegates.map(delegate => this.setStatus(delegate));

From 51f0729a9863df6dd158b031cc5f6a8c5d8a79dc Mon Sep 17 00:00:00 2001
From: yashar <darkyashi@gmail.com>
Date: Wed, 16 Aug 2017 16:26:50 +0430
Subject: [PATCH 5/6] Fix new account's bug

---
 src/components/voting/voting.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/voting/voting.js b/src/components/voting/voting.js
index 25a5f7b83..a5266b3be 100644
--- a/src/components/voting/voting.js
+++ b/src/components/voting/voting.js
@@ -63,6 +63,9 @@ class Voting extends React.Component {
       } else {
         this.loadDelegates(this.query);
       }
+    })
+    .catch(() => {
+      this.loadDelegates(this.query);
     });
   }
 

From 9910605f33abe06e4f10a17c05b347a80a31cfda Mon Sep 17 00:00:00 2001
From: yashar <darkyashi@gmail.com>
Date: Wed, 16 Aug 2017 16:27:55 +0430
Subject: [PATCH 6/6] Add debounce to search delegates input

---
 src/components/voting/votingHeader.js      | 7 ++++++-
 src/components/voting/votingHeader.test.js | 9 ++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/voting/votingHeader.js b/src/components/voting/votingHeader.js
index 786337171..3088b7d57 100644
--- a/src/components/voting/votingHeader.js
+++ b/src/components/voting/votingHeader.js
@@ -21,7 +21,12 @@ class VotingHeader extends React.Component {
       query: value,
       searchIcon: icon,
     });
-    this.props.search(value);
+    clearTimeout(this.timeout);
+    this.timeout = setTimeout(() => {
+      if (value === this.state.query) {
+        this.props.search(value);
+      }
+    }, 250);
   }
 
   clearSearch() {
diff --git a/src/components/voting/votingHeader.test.js b/src/components/voting/votingHeader.test.js
index d30e6ef97..33fdbcd02 100644
--- a/src/components/voting/votingHeader.test.js
+++ b/src/components/voting/votingHeader.test.js
@@ -75,17 +75,12 @@ describe('VotingHeader', () => {
   });
 
   it('should this.props.search when this.search is called', () => {
+    const clock = sinon.useFakeTimers();
     wrapper.instance().search('query', '555');
+    clock.tick(250);
     expect(props.search).to.have.been.calledWith('555');
   });
 
-
-  it('should this.props.search when this.search is called', () => {
-    wrapper.instance().search('query', '555');
-    expect(props.search).to.have.been.calledWith('555');
-  });
-
-
   it('click on #searchIcon should clear vlaue of search input', () => {
     wrapper.instance().search('query', '555');
     wrapper.find('#searchIcon').simulate('click');