Merge branch 'develop' into feature/following_reblogs

src/components/follow_card/follow_card.js

@@ -9,8 +9,7 @@ const FollowCard = {
   ],
   data () {
     return {
-      inProgress: false,
-      requestSent: false
+      inProgress: false
     }
   },
   components: {
@@ -28,9 +27,8 @@ const FollowCard = {
   methods: {
     followUser () {
       this.inProgress = true
-      requestFollow(this.user, this.$store).then(({ sent }) => {
+      requestFollow(this.user, this.$store).then(() => {
         this.inProgress = false
-        this.requestSent = sent
       })
     },
     unfollowUser () {

src/components/follow_card/follow_card.vue

@@ -20,13 +20,13 @@
           v-if="!user.following"
           class="btn btn-default follow-card-follow-button"
           :disabled="inProgress"
-          :title="requestSent ? $t('user_card.follow_again') : ''"
+          :title="user.requested ? $t('user_card.follow_again') : ''"
           @click="followUser"
         >
           <template v-if="inProgress">
             {{ $t('user_card.follow_progress') }}
           </template>
-          <template v-else-if="requestSent">
+          <template v-else-if="user.requested">
             {{ $t('user_card.follow_sent') }}
           </template>
           <template v-else>