@transferwise/components 0.0.0-experimental-76bb7cd → 0.0.0-experimental-54cbbb2

package/src/decision/Decision.story.tsx

@@ -2,7 +2,7 @@ import { action } from '@storybook/addon-actions';
 import { boolean, select } from '@storybook/addon-knobs';
 import { Illustration } from '@wise/art';
 
-import Avatar from '../avatar';
+import AvatarView from '../avatarView';
 import { Size } from '../common';
 
 import Decision, { DecisionPresentation, DecisionType } from '.';
@@ -33,11 +33,7 @@ export const Basic = () => {
           disabled,
           media: {
             block: <Illustration name="globe" alt="" disablePadding />,
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click to see something',
           title: 'Hank Miller',
@@ -50,11 +46,7 @@ export const Basic = () => {
           href: '#href2',
           media: {
             block: <Illustration name="confetti" alt="" disablePadding />,
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           title: 'Hank Miller',
@@ -109,11 +101,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click to see something',
           title: 'Hank Miller',
@@ -131,11 +119,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           title: 'Hank Miller',
@@ -152,11 +136,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           disabled,
@@ -175,11 +155,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           title: 'Hank Miller',
@@ -197,11 +173,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           title: 'Hank Miller',
@@ -219,11 +191,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           title: 'Hank Miller',
@@ -241,11 +209,7 @@ export const grid = () => {
                 alt=""
               />
             ),
-            list: (
-              <Avatar size="md" type="initials">
-                HM
-              </Avatar>
-            ),
+            list: <AvatarView profileName="Hank Miller" />,
           },
           'aria-label': 'Click here to send money to Hank Miller.',
           title: 'Hank Miller',

package/src/flowNavigation/FlowNavigation.story.tsx

@@ -1,12 +1,10 @@
 import { boolean, select, text } from '@storybook/addon-knobs';
-import { Person as ProfileIcon, Briefcase as BriefcaseIcon } from '@transferwise/icons';
 import { useState } from 'react';
 
-import Avatar, { AvatarType } from '../avatar';
-import AvatarWrapper from '../avatarWrapper';
+import AvatarView from '../avatarView';
 import Body from '../body';
 import Button from '../button';
-import { ProfileType, Size, Typography } from '../common';
+import { ProfileType, Typography } from '../common';
 import Logo from '../logo';
 import OverlayHeader from '../overlayHeader';
 
@@ -19,28 +17,14 @@ export default {
   component: FlowNavigation,
   title: 'Navigation/FlowNavigation',
 };
-const avatarProfiles = {
-  '': null,
-  Business: <BriefcaseIcon />,
-  Profile: <ProfileIcon />,
-};
-type ProfileTypeKeys = keyof typeof ProfileType;
-
-const getAvatarProfile = (showAvatar: string) =>
-  showAvatar in avatarProfiles ? avatarProfiles[showAvatar as keyof typeof avatarProfiles] : null;
 
 export const Variants = () => {
   const [activeStep, setActiveStep] = useState(2);
   const [closed, setClosed] = useState(false);
-  const showAvatar = select('avatar', Object.keys(avatarProfiles), 'Profile');
+  const showAvatar = select('avatar', ['', ProfileType.PERSONAL, ProfileType.BUSINESS], 'Profile');
   const showCloseButton = boolean('show closeButton', true);
   const showMobileBackButton = boolean('show mobile backButton', true);
   const done = boolean('done', false);
-  const profileType: ProfileTypeKeys | undefined = select(
-    'profileType',
-    Object.keys(ProfileType) as ProfileTypeKeys[],
-    undefined,
-  );
   const avatarURL = text(
     'avatarURL',
     'https://wise.com/web-art/assets/illustrations/heart-small@2x.webp',
@@ -49,13 +33,7 @@ export const Variants = () => {
   return !closed ? (
     <>
       <FlowNavigation
-        avatar={
-          !showAvatar ? null : (
-            <Avatar type={AvatarType.ICON} size={Size.MEDIUM}>
-              {getAvatarProfile(showAvatar)}
-            </Avatar>
-          )
-        }
+        avatar={!showAvatar ? null : <AvatarView profileType={showAvatar.toLowerCase()} />}
         logo={<Logo />}
         activeStep={activeStep}
         done={done}
@@ -132,7 +110,7 @@ export const Variants = () => {
 
       <FlowNavigation
         done={done}
-        avatar={<AvatarWrapper url={avatarURL} profileType={profileType} />}
+        avatar={<AvatarView imgSrc={avatarURL} profileType={showAvatar?.toLowerCase()} />}
         activeStep={activeStep}
         steps={[
           {
@@ -178,7 +156,7 @@ export const Variants = () => {
       {/* Instance of always `done` FlowNav for visual testing */}
       <FlowNavigation
         done
-        avatar={<AvatarWrapper url={avatarURL} profileType={profileType} />}
+        avatar={<AvatarView imgSrc={avatarURL} profileType={showAvatar.toLowerCase()} />}
         activeStep={activeStep}
         steps={[
           { label: 'Recipient', hoverLabel: 'Daniele Tomboro', onClick: () => setActiveStep(0) },
@@ -240,11 +218,7 @@ export const SendFlow = () => {
   return (
     <>
       <FlowNavigation
-        avatar={
-          <Avatar type={AvatarType.ICON} size={Size.MEDIUM}>
-            <ProfileIcon />
-          </Avatar>
-        }
+        avatar={<AvatarView />}
         logo={<Logo />}
         activeStep={activeStep}
         steps={steps}
@@ -272,7 +246,7 @@ export const SendFlow = () => {
 export const WithOverlayHeaderComparison = () => {
   const [activeStep, setActiveStep] = useState(4);
   const [closed, setClosed] = useState(false);
-  const showAvatar = select('avatar', Object.keys(avatarProfiles), 'Profile');
+  const showAvatar = select('avatar', ['', ProfileType.PERSONAL, ProfileType.BUSINESS], 'Profile');
   const showCloseButton = boolean('show closeButton', true);
   const showMobileBackButton = boolean('show mobile backButton', true);
   const done = boolean('done', false);
@@ -281,13 +255,7 @@ export const WithOverlayHeaderComparison = () => {
     <>
       <div style={{ border: '1px solid #e8e8e8' }}>
         <FlowNavigation
-          avatar={
-            showAvatar ? (
-              <Avatar type={AvatarType.ICON} size={Size.MEDIUM}>
-                {getAvatarProfile(showAvatar)}
-              </Avatar>
-            ) : null
-          }
+          avatar={showAvatar ? <AvatarView profileType={showAvatar.toLowerCase()} /> : null}
           activeStep={activeStep}
           done={done}
           steps={[]}
@@ -301,13 +269,7 @@ export const WithOverlayHeaderComparison = () => {
       </div>
       <div style={{ border: '1px solid #e8e8e8' }}>
         <OverlayHeader
-          avatar={
-            showAvatar ? (
-              <Avatar type={AvatarType.ICON} size={Size.MEDIUM}>
-                {getAvatarProfile(showAvatar)}
-              </Avatar>
-            ) : null
-          }
+          avatar={showAvatar ? <AvatarView profileType={showAvatar.toLowerCase()} /> : null}
           onClose={showCloseButton ? () => setClosed(true) : undefined}
         />
       </div>

package/src/index.ts

@@ -8,6 +8,7 @@ export type { ActionOptionProps } from './actionOption';
 export type { SelectOptionProps, SelectOptionValue, SelectOptiopsSection } from './selectOption';
 export type { AlertAction, AlertProps, AlertType } from './alert';
 export type { AvatarProps } from './avatar';
+export type { AvatarViewProps } from './avatarView';
 export type { BadgeProps } from './badge';
 export type { CardProps } from './card';
 export type { CarouselProps } from './carousel';
@@ -103,6 +104,7 @@ export { default as ActionOption } from './actionOption';
 export { default as SelectOption } from './selectOption';
 export { default as Alert } from './alert';
 export { default as Avatar } from './avatar';
+export { default as AvatarView } from './avatarView';
 export { default as AvatarWrapper } from './avatarWrapper';
 export { default as Badge } from './badge';
 export { default as Body } from './body';
@@ -244,6 +246,8 @@ export {
   getLangFromLocale,
   isBrowser,
   isServerSide,
+  getInitials,
+  getBrandColorFromSeed,
 } from './common';
 
 /**

package/src/listItem/ListItem.story.tsx

@@ -1,15 +1,13 @@
 /* eslint-disable react/jsx-child-element-spacing */
 
 import { action } from '@storybook/addon-actions';
-import { Documents } from '@transferwise/icons';
+import { Documents, FastFlag } from '@transferwise/icons';
 import { ComponentProps } from 'react';
 
 import ActionButton from '../actionButton/ActionButton';
-import Avatar from '../avatar';
-import Badge from '../badge';
+import AvatarView from '../avatarView';
 import Info from '../info';
 import Title from '../title/Title';
-
 import ListItem, { List } from '.';
 
 export default {
@@ -42,13 +40,7 @@ export const Variants = () => {
         <List>
           <Template
             media={
-              <Avatar>
-                <img
-                  style={{ width: 32, height: 32 }}
-                  src="https://wise.com/public-resources/assets/balances/savings-emoji/google/✈️.png"
-                  alt=""
-                />
-              </Avatar>
+              <AvatarView imgSrc="https://wise.com/web-art/assets/illustrations/heart-small@2x.webp" />
             }
           />
         </List>
@@ -59,22 +51,7 @@ export const Variants = () => {
           <Template
             title="Sandra Pepper"
             value="Personal account"
-            media={
-              <Badge
-                badge={
-                  <img
-                    src="https://wise.com/public-resources/assets/brand/fast_flag_badge_personal.svg"
-                    alt=""
-                    height="24px"
-                    width="24px"
-                  />
-                }
-              >
-                <Avatar type="initials" size="md">
-                  <span aria-hidden>SP</span>
-                </Avatar>
-              </Badge>
-            }
+            media={<AvatarView profileName="Super Pepa" badge={{ icon: <FastFlag /> }} />}
           />
         </List>
       </div>
@@ -84,22 +61,7 @@ export const Variants = () => {
           <Template
             title="Account holder"
             value="Sandra Pepper"
-            media={
-              <Badge
-                badge={
-                  <img
-                    src="https://wise.com/public-resources/assets/brand/fast_flag_badge_personal.svg"
-                    alt=""
-                    height="24px"
-                    width="24px"
-                  />
-                }
-              >
-                <Avatar type="initials" size="md">
-                  <span aria-hidden>SP</span>
-                </Avatar>
-              </Badge>
-            }
+            media={<AvatarView profileName="Super Pepa" badge={{ icon: <FastFlag /> }} />}
             action={<ActionButton>Share details</ActionButton>}
           />
         </List>

package/src/main.css

@@ -469,6 +469,77 @@ div.critical-comms .critical-comms-body {
 .np-theme-personal .tw-avatar--outlined:not(.disabled):not(:disabled):hover {
   border-color: var(--color-interactive-primary-hover);
 }
+.np-notification-dot {
+  --np-notification-dot-size: 14px;
+  position: relative;
+  display: inline-block;
+}
+.np-notification-dot-mask {
+  -webkit-mask-image: radial-gradient(circle at bottom calc(100% - (var(--np-notification-dot-size) / 2)) left calc(100% - (var(--np-notification-dot-size) / 2)), transparent 0, transparent calc(var(--np-notification-dot-size) / 2 + var(--np-notification-dot-offset)), black 0);
+          mask-image: radial-gradient(circle at bottom calc(100% - (var(--np-notification-dot-size) / 2)) left calc(100% - (var(--np-notification-dot-size) / 2)), transparent 0, transparent calc(var(--np-notification-dot-size) / 2 + var(--np-notification-dot-offset)), black 0);
+  -webkit-mask-image: radial-gradient(circle at bottom calc(100% - calc(var(--np-notification-dot-size) / 2)) left calc(100% - calc(var(--np-notification-dot-size) / 2)), transparent 0, transparent calc(var(--np-notification-dot-size) / 2 + var(--np-notification-dot-offset)), black 0);
+          mask-image: radial-gradient(circle at bottom calc(100% - calc(var(--np-notification-dot-size) / 2)) left calc(100% - calc(var(--np-notification-dot-size) / 2)), transparent 0, transparent calc(var(--np-notification-dot-size) / 2 + var(--np-notification-dot-offset)), black 0);
+}
+.np-notification-dot-badge {
+  position: absolute;
+  width: var(--np-notification-dot-size);
+  height: var(--np-notification-dot-size);
+  background-color: var(--color-sentiment-negative);
+  border-radius: 9999px;
+  border-radius: var(--radius-full);
+  right: 0;
+}
+.np-avatar-view .np-avatar-view-content {
+  color: var(--color-interactive-primary);
+}
+.np-avatar-view-interactive {
+  cursor: pointer;
+}
+.np-avatar-view-interactive .np-circle {
+  background-color: rgba(134,167,189,0.10196);
+  background-color: var(--color-background-neutral);
+}
+.np-avatar-view-interactive:hover {
+  background-color: var(--color-background-neutral-hover);
+}
+.np-avatar-view-interactive:active {
+  background-color: var(--color-background-neutral-active);
+}
+.np-avatar-view-non-interactive .np-circle {
+  background-color: transparent;
+}
+.np-avatar-view-non-interactive .np-avatar-view-content .wds-flag {
+  box-shadow: none;
+}
+.np-avatar-group {
+  display: inline-flex;
+  position: relative;
+}
+.np-avatar-group-diagonal {
+  width: var(--np-avatar-group-size);
+  height: var(--np-avatar-group-size);
+}
+.np-avatar-group-diagonal-mask {
+  -webkit-mask-image: radial-gradient(circle at bottom calc(100% - var(--np-avatar-group-size) / 1.5) right calc(100% - var(--np-avatar-group-size) / 1.5), transparent 0, transparent calc(var(--np-avatar-group-single-size) / 2 + 0.5px), black 0);
+          mask-image: radial-gradient(circle at bottom calc(100% - var(--np-avatar-group-size) / 1.5) right calc(100% - var(--np-avatar-group-size) / 1.5), transparent 0, transparent calc(var(--np-avatar-group-single-size) / 2 + 0.5px), black 0);
+}
+.np-avatar-group-diagonal-child {
+  position: absolute;
+  top: var(--np-avatar-group-diagonal-child-position);
+  right: 0;
+}
+.np-avatar-group-horizontal {
+  height: var(--np-avatar-group-size);
+}
+.np-avatar-group-horizontal-mask {
+  -webkit-mask-image: radial-gradient(circle at top calc(100% - var(--np-avatar-group-single-size) / 2) right calc((100% - var(--np-avatar-group-single-size) / 1.5) * -1), transparent 0, transparent calc((var(--np-avatar-group-single-size) / 2.5) + var(--np-avatar-group-horizontal-child-position)), black 0);
+          mask-image: radial-gradient(circle at top calc(100% - var(--np-avatar-group-single-size) / 2) right calc((100% - var(--np-avatar-group-single-size) / 1.5) * -1), transparent 0, transparent calc((var(--np-avatar-group-single-size) / 2.5) + var(--np-avatar-group-horizontal-child-position)), black 0);
+  -webkit-mask-image: radial-gradient(circle at top calc(100% - var(--np-avatar-group-single-size) / 2) right calc(calc(100% - var(--np-avatar-group-single-size) / 1.5) * -1), transparent 0, transparent calc(calc(var(--np-avatar-group-single-size) / 2.5) + var(--np-avatar-group-horizontal-child-position)), black 0);
+          mask-image: radial-gradient(circle at top calc(100% - var(--np-avatar-group-single-size) / 2) right calc(calc(100% - var(--np-avatar-group-single-size) / 1.5) * -1), transparent 0, transparent calc(calc(var(--np-avatar-group-single-size) / 2.5) + var(--np-avatar-group-horizontal-child-position)), black 0);
+}
+.np-avatar-group-horizontal-child {
+  margin-left: calc(var(--np-avatar-group-horizontal-child-position) * -1);
+}
 .tw-badge {
   position: relative;
   display: inline-block;
@@ -476,6 +547,7 @@ div.critical-comms .critical-comms-body {
   --badge-mask: 2px;
   --badge-mask-offset: calc(var(--badge-size) / 2);
   --badge-border-color: rgba(255, 255, 255, 0.08);
+  --badge-content-position: 0px;
 }
 .tw-badge.tw-badge-lg {
   --badge-size: 24px;
@@ -485,8 +557,8 @@ div.critical-comms .critical-comms-body {
   --badge-border-color: rgba(0, 0, 0, 0.08);
 }
 .tw-badge > .tw-badge__children {
-  -webkit-mask-image: radial-gradient(circle at top calc(100% - var(--badge-mask-offset)) left calc(100% - var(--badge-mask-offset)), transparent 0, transparent calc(var(--badge-size) / 2 + var(--badge-mask)), black calc(var(--badge-size) / 2 + var(--badge-mask) + 0.5px));
-          mask-image: radial-gradient(circle at top calc(100% - var(--badge-mask-offset)) left calc(100% - var(--badge-mask-offset)), transparent 0, transparent calc(var(--badge-size) / 2 + var(--badge-mask)), black calc(var(--badge-size) / 2 + var(--badge-mask) + 0.5px));
+  -webkit-mask-image: radial-gradient(circle at top calc(100% - var(--badge-mask-offset) - var(--badge-content-position)) left calc(100% - var(--badge-mask-offset) - var(--badge-content-position)), transparent 0, transparent calc(var(--badge-size) / 2 + var(--badge-mask)), black calc(var(--badge-size) / 2 + var(--badge-mask) + 0.5px));
+          mask-image: radial-gradient(circle at top calc(100% - var(--badge-mask-offset) - var(--badge-content-position)) left calc(100% - var(--badge-mask-offset) - var(--badge-content-position)), transparent 0, transparent calc(var(--badge-size) / 2 + var(--badge-mask)), black calc(var(--badge-size) / 2 + var(--badge-mask) + 0.5px));
 }
 [dir="rtl"] .tw-badge > .tw-badge__children {
   -webkit-mask-image: radial-gradient(circle at top calc(100% - var(--badge-mask-offset)) right calc(100% - var(--badge-mask-offset)), transparent 0, transparent calc(var(--badge-size) / 2 + var(--badge-mask)), black calc(var(--badge-size) / 2 + var(--badge-mask) + 0.5px));
@@ -496,8 +568,8 @@ div.critical-comms .critical-comms-body {
   position: absolute;
   width: var(--badge-size);
   height: var(--badge-size);
-  bottom: 0;
-  right: 0;
+  bottom: var(--badge-content-position);
+  right: var(--badge-content-position);
   box-sizing: border-box;
   border-radius: 50%;
   text-align: center;
@@ -510,7 +582,7 @@ div.critical-comms .critical-comms-body {
           user-select: none;
 }
 [dir="rtl"] .tw-badge > .tw-badge__content {
-  left: 0;
+  left: var(--badge-content-position);
   right: auto;
   right: initial;
 }
@@ -1211,11 +1283,43 @@ div.critical-comms .critical-comms-body {
   width: var(--circle-size);
   height: var(--circle-size);
   flex-shrink: 0;
+  --circle-border-color: var(--color-border-neutral);
+  --circle-border-width: 1px;
+  font-size: var(--circle-font-size);
+  font-weight: 600;
+  font-weight: var(--font-weight-semi-bold);
+  line-height: 1;
+}
+.np-circle .np-display {
+  font-size: var(--circle-font-size);
 }
 .np-circle .tw-icon > svg {
   height: var(--circle-icon-size);
   width: var(--circle-icon-size);
 }
+.np-circle img,
+.np-circle .wds-flag {
+  border-radius: 9999px;
+  border-radius: var(--radius-full);
+  width: 100%;
+  height: 100%;
+  -o-object-fit: cover;
+     object-fit: cover;
+}
+.np-circle-border {
+  position: relative;
+}
+.np-circle-border::after {
+  content: "";
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border-radius: 9999px;
+  border-radius: var(--radius-full);
+  box-shadow: inset 0 0 0 var(--circle-border-width) var(--circle-border-color);
+}
 .np-bottom-sheet {
   border-radius: 10px 10px 0 0;
 }

package/src/main.less

@@ -3,6 +3,8 @@
 @import "./actionButton/ActionButton.less";
 @import "./alert/Alert.less";
 @import "./avatar/Avatar.less";
+@import "./avatarView/AvatarView.less";
+@import "./avatarGroup/AvatarGroup.less";
 @import "./badge/Badge.less";
 @import "./button/Button.less";
 @import "./card/Card.less";

package/src/navigationOption/NavigationOption.story.tsx

@@ -4,13 +4,13 @@ import { text, boolean } from '@storybook/addon-knobs';
 import {
   FastFlag as FastFlagIcon,
   Bank as BankIcon,
-  PlusCircle,
-  Profile,
   UpwardGraph as UpwardGraphIcon,
+  Plus as PlusIcon,
+  FastFlag,
 } from '@transferwise/icons';
 import { Illustration, Assets, Flag } from '@wise/art';
 
-import { Badge, Nudge, Avatar, Header, Title, Typography } from '..';
+import { Nudge, Header, Title, Typography, AvatarView } from '..';
 
 import NavigationOption from './NavigationOption';
 
@@ -82,37 +82,13 @@ export const Variants = () => (
     </div>
     <div className="m-b-2">
       <div className="title-4 m-b-1">With Icon Avatar</div>
-      <Template
-        showMediaCircle={false}
-        media={
-          <Badge badge={<PlusCircle className="tw-contacts__new-contact-badge" />}>
-            <Avatar type="icon">
-              <Profile size="24" />
-            </Avatar>
-          </Badge>
-        }
-      />
+      <Template showMediaCircle={false} media={<AvatarView badge={{ icon: <PlusIcon /> }} />} />
     </div>
     <div className="m-b-2">
       <div className="title-4 m-b-1">With Contact Avatar</div>
       <Template
         showMediaCircle={false}
-        media={
-          <Badge
-            badge={
-              <img
-                src="https://wise.com/public-resources/assets/brand/fast_flag_badge_personal.svg"
-                alt=""
-                height="24px"
-                width="24px"
-              />
-            }
-          >
-            <Avatar type="initials" size="md">
-              <span aria-hidden>SP</span>
-            </Avatar>
-          </Badge>
-        }
+        media={<AvatarView profileName="Super Pepa" badge={{ icon: <FastFlag /> }} />}
       />
     </div>
     <div className="m-t-4 m-b-2">
@@ -124,22 +100,7 @@ export const Variants = () => (
       </p>
       <Template
         showMediaCircle
-        media={
-          <Badge
-            badge={
-              <img
-                src="https://wise.com/public-resources/assets/brand/fast_flag_badge_personal.svg"
-                alt=""
-                height="24px"
-                width="24px"
-              />
-            }
-          >
-            <Avatar type="initials" size="md">
-              <span aria-hidden>SP</span>
-            </Avatar>
-          </Badge>
-        }
+        media={<AvatarView profileName="Super Pepa" badge={{ icon: <FastFlag /> }} />}
       />
     </div>
   </>
@@ -222,9 +183,9 @@ export const BalanceContent = () => (
     content="British pound"
     showMediaCircle={false}
     media={
-      <Avatar type="icon">
+      <AvatarView>
         <Flag code="GBP" />
-      </Avatar>
+      </AvatarView>
     }
   />
 );
@@ -233,13 +194,7 @@ export const NewContactContent = () => (
   <NavigationOptionTemplate
     title="New Contact"
     showMediaCircle={false}
-    media={
-      <Badge badge={<PlusCircle className="tw-contacts__new-contact-badge" />}>
-        <Avatar type="icon">
-          <Profile size="24" />
-        </Avatar>
-      </Badge>
-    }
+    media={<AvatarView badge={{ type: 'action' }} />}
   />
 );
 
@@ -248,13 +203,7 @@ export const ExistingContactContent = () => (
     title="Wise Customer"
     content="EUR account ending in 1111"
     showMediaCircle={false}
-    media={
-      <Badge badge={<Flag code="EUR" />}>
-        <Avatar type="initials" size="md">
-          <span aria-hidden>WS</span>
-        </Avatar>
-      </Badge>
-    }
+    media={<AvatarView profileName="Wise Steve" badge={{ flagCode: 'EUR' }} />}
   />
 );
 
@@ -280,9 +229,9 @@ export const ManageAccountContent = () => (
       content="View and share your account details to get paid."
       showMediaCircle={false}
       media={
-        <Avatar type="icon">
+        <AvatarView>
           <BankIcon size={24} />
-        </Avatar>
+        </AvatarView>
       }
     />
     <NavigationOptionTemplate
@@ -290,9 +239,9 @@ export const ManageAccountContent = () => (
       content="Convert money between your balances at your desired exchange rate."
       showMediaCircle={false}
       media={
-        <Avatar type="icon">
+        <AvatarView>
           <UpwardGraphIcon size={24} />
-        </Avatar>
+        </AvatarView>
       }
     />
   </>