THX-6 - Fixes issues with reward sorting and camera image upload

Author: peterpolman

src/components/Reward.vue

@@ -32,7 +32,6 @@
 
                         </span>
                     </div>
-
                     <small>{{reward.startTime | moment("MMMM Do YYYY HH:mm") }}</small>
                 </div>
 
@@ -79,7 +78,6 @@
             </button>
 
             <template slot="footer">
-
                 <template v-if="isManager">
                     <div class="row" v-if="now < reward.endTime">
                         <div class="col-md-6" v-if="!reward.hasVoted">
@@ -93,8 +91,8 @@
                             </button>
                         </div>
                         <div class="col-md-12" v-if="reward.hasVoted">
-                            <button @click="revokeVote()" :class="{ disabled: reward.loading }" class="btn btn-primary btn-block">
-                                Revoke
+                            <button @click="revokeVote()" :class="{ disabled: reward.loading }" class="btn btn-link btn-block">
+                                Revoke your vote
                             </button>
                         </div>
                     </div>

src/services/PoolService.ts

@@ -163,7 +163,7 @@ export default class PoolService extends Vue {
     }
 
     public async revokeVoteForReward(reward: Reward, pool: RewardPool) {
-        return await this.callPoolMethod(reward.contract.methods.revokeVote(reward.id), pool);
+        return await this.callPoolMethod(reward.contract.methods.revokeVote(reward.beneficiaryAddress), pool);
     }
 
     public async voteForReward(reward: Reward, pool: RewardPool, agree: boolean) {

src/views/Camera.ts

@@ -31,7 +31,6 @@ export default class Camera extends Vue {
     }
 
     private async onDecode(decodedString: string) {
-        console.log(decodedString);
         if (decodedString.length > 0) {
             this.data = JSON.parse(decodedString);
             this.error = '';

src/views/Camera.vue

@@ -40,7 +40,7 @@
         </template>
 
         <div class="ui-file">
-            <qrcode-capture @decode="onDecode"></qrcode-capture>
+            <qrcode-capture :capture="false" :multiple="false" @decode="onDecode"></qrcode-capture>
             <small>Upload QR code image if the camera does not work on your device.</small>
         </div>
 

src/views/Pool.ts

@@ -88,12 +88,13 @@ export default class PoolDetail extends Vue {
     }
 
     get sortedRewards() {
-        return _.orderBy(this.rewards.filter((reward: Reward) => {
+        const filtered = this.rewards.filter((reward: Reward) => {
             const isMyReward = (reward.beneficiaryAddress)
                 ? reward.beneficiaryAddress.toLowerCase() === this.$network.extdev.account
                 : false;
             return (reward.state === 'Pending') || ((reward.state === 'Approved') && isMyReward) || ((reward.state === 'Withdrawn') && isMyReward);
-        }), 'startTime', 'asc');
+        });
+        return _.orderBy(filtered, 'startTime', 'desc');
     }
 
     public created() {