Merge branch 'muting_with_duration' into 'develop'

Support mutes duration See merge request soapbox-pub/soapbox!913
2022-11-04 16:29:08 +00:00
parent 67f2125917 ac83c9c18c
commit f11ba14093
8 changed files with 95 additions and 6 deletions
--- a/app/soapbox/components/account.tsx
+++ b/app/soapbox/components/account.tsx
@@ -235,6 +235,14 @@ const Account = ({
                    <Icon className='h-5 w-5 text-gray-700 dark:text-gray-600' src={require('@tabler/icons/pencil.svg')} />
                  </>
                ) : null}
+
+                {actionType === 'muting' && account.mute_expires_at ? (
+                  <>
+                    <Text tag='span' theme='muted' size='sm'>&middot;</Text>
+
+                    <Text theme='muted' size='sm'><RelativeTimestamp timestamp={account.mute_expires_at} futureDate /></Text>
+                  </>
+                ) : null}
              </HStack>

              {withAccountNote && (