Merge branch 'block-fix' into 'develop'

oops + release prep

See merge request pleroma/pleroma-fe!2247

.gitlab/merge_request_templates/Release.md

@@ -0,0 +1,8 @@
+### Release checklist
+* [ ] Bump version in `package.json`
+* [ ] Compile a changelog with the `tools/collect-changelog` script
+* [ ] Create an MR with an announcement to pleroma.social
+#### post-merge
+* [ ] Tag the release on the merge commit
+* [ ] Make the tag into a Gitlab Release™
+* [ ] Merge `master` into `develop` (in case the fixes are already in develop, use `git merge -s ours --no-commit` and manually merge the changelogs)

src/components/account_actions/account_actions.vue

@@ -95,7 +95,7 @@
     </Popover>
     <teleport to="#modal">
       <confirm-modal
-        v-if="showingConfirmBlock && blockExpirationSupported"
+        v-if="showingConfirmBlock && !blockExpirationSupported"
         ref="blockDialog"
         :title="$t('user_card.block_confirm_title')"
         :confirm-text="$t('user_card.block_confirm_accept_button')"
@@ -138,7 +138,7 @@
         </i18n-t>
       </confirm-modal>
       <UserTimedFilterModal
-        v-if="!blockExpirationSupported"
+        v-if="blockExpirationSupported"
         ref="timedBlockDialog"
         :is-mute="false"
         :user="user"