Merge 103cd15 into 6497dcf

helpscout · Apr 23, 2019 · c56b699 · c56b699
2 parents 6497dcf + 103cd15
commit c56b699
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/components/AvatarGrid/AvatarGrid.js b/src/components/AvatarGrid/AvatarGrid.js
@@ -38,7 +38,7 @@ class AvatarGrid extends Component<Props> {
     borderColor: 'transparent',
     center: true,
     max: 9,
-    shape: 'rounded',
+    shape: 'circle',
     showStatusBorderColor: true,
     size: 'md',
   }

diff --git a/src/components/Message/Message.js b/src/components/Message/Message.js
@@ -66,7 +66,7 @@ export class Message extends Component<Props> {
 
     const avatarMarkup = avatar
       ? React.cloneElement(avatar, {
-          shape: isThemeEmbed ? 'circle' : 'rounded',
+          shape: 'circle',
           size: isThemeEmbed ? 'xxs' : 'xs',
         })
       : null

diff --git a/src/components/Message/__tests__/Message.test.js b/src/components/Message/__tests__/Message.test.js
@@ -208,10 +208,10 @@ describe('Context', () => {
       expect(o.length).toBe(0)
     })
 
-    test('Always render Circle avatars for embed', () => {
+    test('Always render Circle avatars', () => {
       const a = <Avatar name="Mugatu" shape="square" />
       const wrapper = mount(
-        <Message.Provider theme="embed">
+        <Message.Provider>
           <Message avatar={a} showAvatar from />
         </Message.Provider>
       )
@@ -220,6 +220,19 @@ describe('Context', () => {
 
       expect(o.prop('shape')).toBe('circle')
     })
+
+    test('Always render size xxs for embed', () => {
+      const a = <Avatar name="Mugatu" shape="square" />
+      const wrapper = mount(
+        <Message.Provider theme="embed">
+          <Message avatar={a} showAvatar from />
+        </Message.Provider>
+      )
+
+      const o = wrapper.find(Avatar)
+
+      expect(o.prop('size')).toBe('xxs')
+    })
   })
 })
 

diff --git a/src/components/StatusAvatar/StatusAvatar.js b/src/components/StatusAvatar/StatusAvatar.js
@@ -20,7 +20,7 @@ type Props = {
 class StatusAvatar extends Component<Props> {
   static defaultProps = {
     isOnline: true,
-    shape: 'rounded',
+    shape: 'circle',
     size: 'smmd',
   }